Update to 2.4.1. For a list of changes in this release,

see the documentation.

7 files changed, 85 insertions, 44 deletions

diff --git a/archivers/dar/Makefile b/archivers/dar/Makefile
index c9c6fb0b3f3..ccf383a7eea 100644
--- a/archivers/dar/Makefile
+++ b/archivers/dar/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.36 2011/04/22 13:42:49 obache Exp $
+# $NetBSD: Makefile,v 1.37 2011/08/20 16:02:23 cheusov Exp $
 
-DISTNAME=	dar-2.3.8
-PKGREVISION=	2
+DISTNAME=	dar-2.4.1
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dar/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://dar.linux.free.fr/
 COMMENT=	Disk archiver
+LICENSE=	gnu-gpl-v2
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -15,7 +15,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake pkg-config bash:run
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-dar-static
@@ -34,13 +34,6 @@ CHECK_INTERPRETER_SKIP+=	share/dar/samples/*
 REPLACE_PERL+=			doc/samples/dar_backup
 REPLACE_BASH+=			doc/samples/*.bash doc/samples/clust*.sh
 
-.if defined(TOOLS_PLATFORM.bash) && exists(${${TOOLS_PLATFORM.bash}:L})
-BASH?=			${TOOLS_PLATFORM.bash}
-.else
-BASH?=			${TOOLS_PREFIX.bash}/bin/bash
-TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.bash=bash
-.endif
-
 ## Our threading check here is the same as the one used in devel/perl5.
 #
 CHECK_BUILTIN.pthread:=yes
@@ -56,7 +49,7 @@ USE_FEATURES.dar=	# empty
 .endif
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.dar
-PKG_OPTIONS_OPTIONAL_GROUPS+=	int
+PKG_OPTIONS_OPTIONAL_GROUPS=	int
 PKG_OPTIONS_GROUP.int=		dar-int32 dar-int64
 PKG_SUGGESTED_OPTIONS=		dar-int64 ${USE_FEATURES.dar}
 PKG_SUPPORTED_OPTIONS=		threads
@@ -76,6 +69,11 @@ PLIST_SUBST+=		DARBITS=${DARBITS}
 CONFIGURE_ARGS+=	--enable-mode=${DARBITS:Q}
 .endif
 
+EGDIR=			${PREFIX}/share/examples/dar
+INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR}
+
+CONF_FILES=		${EGDIR}/darrc ${PKG_SYSCONFDIR}/darrc
+
 ## We want the threading library to be specified by pkgsrc, and only
 ## when desired, viz. in the case below.  Using PTHREAD_AUTO_VARS
 ## with the accompanying BUILDLINK_TRANSFORM directive is easier
diff --git a/archivers/dar/PLIST b/archivers/dar/PLIST
index dc3fed51db8..cf2404a2005 100644
--- a/archivers/dar/PLIST
+++ b/archivers/dar/PLIST
@@ -1,40 +1,61 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 17:28:16 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2011/08/20 16:02:23 cheusov Exp $
 bin/dar
 bin/dar_cp
 bin/dar_manager
 bin/dar_slave
 bin/dar_xform
 include/dar/archive.hpp
+include/dar/archive_options.hpp
+include/dar/archive_version.hpp
 include/dar/catalogue.hpp
+include/dar/compile_time_features.hpp
 include/dar/compressor.hpp
-include/dar/config.h
+include/dar/crc.hpp
+include/dar/criterium.hpp
 include/dar/crypto.hpp
 include/dar/data_tree.hpp
 include/dar/database.hpp
+include/dar/database_options.hpp
 include/dar/deci.hpp
 include/dar/ea.hpp
 include/dar/erreurs.hpp
+include/dar/erreurs_ext.hpp
+include/dar/escape.hpp
+include/dar/escape_catalogue.hpp
+include/dar/fichier.hpp
 include/dar/generic_file.hpp
 include/dar/gettext.h
+include/dar/hash_fichier.hpp
 include/dar/header_version.hpp
 include/dar/infinint.hpp
 include/dar/int_tools.hpp
 include/dar/integers.hpp
+include/dar/label.hpp
 include/dar/libdar.hpp
+include/dar/libdar_4_4.hpp
+include/dar/libdar_config.h
+include/dar/libdar_my_config.h
 include/dar/limitint.hpp
 include/dar/mask.hpp
 include/dar/mask_list.hpp
-include/dar/my_config.h
+include/dar/mem_ui.hpp
+include/dar/memory_file.hpp
+include/dar/nls_swap.hpp
 include/dar/path.hpp
+include/dar/pile.hpp
 include/dar/real_infinint.hpp
 include/dar/scrambler.hpp
+include/dar/secu_string.hpp
 include/dar/special_alloc.hpp
 include/dar/statistics.hpp
 include/dar/storage.hpp
 include/dar/string_file.hpp
 include/dar/thread_cancellation.hpp
+include/dar/tlv.hpp
+include/dar/tlv_list.hpp
 include/dar/tools.hpp
 include/dar/tronconneuse.hpp
+include/dar/trontextual.hpp
 include/dar/tuyau.hpp
 include/dar/user_group_bases.hpp
 include/dar/user_interaction.hpp
@@ -50,6 +71,7 @@ share/dar/samples/JH-dar-make_user_backup.sh
 share/dar/samples/JH-readme.txt
 share/dar/samples/JH_dar_archiver.options
 share/dar/samples/JH_darrc
+share/dar/samples/MyBackup.sh.tar.gz
 share/dar/samples/README
 share/dar/samples/automatic_backup
 share/dar/samples/automatic_backup.txt
@@ -73,15 +95,18 @@ share/doc/dar/Limitations.html
 share/doc/dar/Notes.html
 share/doc/dar/README
 share/doc/dar/Tutorial.html
+share/doc/dar/api_4_4.html
 share/doc/dar/api_tutorial.html
 share/doc/dar/authentification.html
-share/doc/dar/dar-catalog-1.0.dtd
+share/doc/dar/dar-catalog.dtd
 share/doc/dar/dar-differential-backup-mini-howto.en.html
 share/doc/dar/dar-differential-backup-mini-howto.es.html
 share/doc/dar/dar-differential-backup-mini-howto.it.html
 share/doc/dar/dar_doc.jpg
 share/doc/dar/dar_key.txt
 share/doc/dar/dar_s_doc.jpg
+share/doc/dar/downloading.html
+share/doc/dar/from_sources.html
 share/doc/dar/index.html
 share/doc/dar/man/dar.html
 share/doc/dar/man/dar_cp.html
@@ -93,6 +118,9 @@ share/doc/dar/mini-howto/dar-differential-backup-mini-howto.en.html
 share/doc/dar/mini-howto/dar-differential-backup-mini-howto.es.html
 share/doc/dar/mini-howto/dar-differential-backup-mini-howto.it.html
 share/doc/dar/mini-howto/index.html
+share/doc/dar/presentation.html
+share/doc/dar/usage_notes.html
+share/examples/dar/darrc
 share/locale/de/LC_MESSAGES/dar.mo
 share/locale/fr/LC_MESSAGES/dar.mo
 share/locale/sv/LC_MESSAGES/dar.mo
diff --git a/archivers/dar/distinfo b/archivers/dar/distinfo
index 706b64bc459..02c0daea3c9 100644
--- a/archivers/dar/distinfo
+++ b/archivers/dar/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.24 2008/08/02 17:10:13 dholland Exp $
+$NetBSD: distinfo,v 1.25 2011/08/20 16:02:23 cheusov Exp $
 
-SHA1 (dar-2.3.8.tar.gz) = d0394ff9dd6a287e3b9b62ebe99e126bb6d8abd0
-RMD160 (dar-2.3.8.tar.gz) = 0927b59ba0426634ba5c2ca8b7cad157d6579b13
-Size (dar-2.3.8.tar.gz) = 1195944 bytes
+SHA1 (dar-2.4.1.tar.gz) = 1fac505e2b6e2b05acd96c42e9bfb135974e9807
+RMD160 (dar-2.4.1.tar.gz) = d835bd82f9f4f91defb2301084af4c0343e37faf
+Size (dar-2.4.1.tar.gz) = 1741146 bytes
 SHA1 (patch-aa) = d9d9cef20573582c2f56aa70ae1b3af98b11725a
 SHA1 (patch-ab) = d442f8ec95909bf9a5e72e1ff10042ec263ec8d2
-SHA1 (patch-ac) = 34ba67a1ae794c1069824347b67a204455d18f2e
-SHA1 (patch-ad) = a0089fd534a98d5daae87b92b61f869ed146bed3
+SHA1 (patch-ac) = dcbf4e31071c83a167a60a20e4980b35f055a46e
+SHA1 (patch-ad) = df21f72b12ab19123f1c61e8e1645519c43d7f7b
 SHA1 (patch-ae) = 54220384bf2031df64c38f5abea038382ca37e8e
-SHA1 (patch-af) = c25351dbf2f115b649207f88981710e04a0a038e
+SHA1 (patch-af) = 0fc93ae2638d77b247e6339f3a5819e5eeb059f0
 SHA1 (patch-ag) = 3873d5dd9e387c90977b169e4532891bcf242e49
+SHA1 (patch-src_check_all__features.cpp) = 2d962e4c17d93242b281b72bec8ed5cec8aa0e49
diff --git a/archivers/dar/patches/patch-ac b/archivers/dar/patches/patch-ac
index 48943d8a492..ea7fbb34b7b 100644
--- a/archivers/dar/patches/patch-ac
+++ b/archivers/dar/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.7 2006/08/30 15:58:25 rillig Exp $
+$NetBSD: patch-ac,v 1.8 2011/08/20 16:02:23 cheusov Exp $
 
 Solaris has <getopt.h>, but the plain getopt() function is defined in
 <unistd.h>, so it needs both headers.
 
---- configure.orig	2006-02-25 00:08:32.000000000 +0100
-+++ configure	2006-08-30 17:51:23.544802744 +0200
-@@ -29861,11 +29861,10 @@ cat >>conftest.$ac_ext <<_ACEOF
- extern "C" {
+--- configure.orig	2011-07-21 14:52:29.000000000 +0000
++++ configure
+@@ -28383,11 +28383,10 @@ extern "C" {
+ 				   #endif
                                     #if HAVE_GETOPT_H
                                     #include <getopt.h>
 -                                   #else
diff --git a/archivers/dar/patches/patch-ad b/archivers/dar/patches/patch-ad
index 79a9272b7d0..f91ddffa574 100644
--- a/archivers/dar/patches/patch-ad
+++ b/archivers/dar/patches/patch-ad
@@ -1,17 +1,18 @@
-$NetBSD: patch-ad,v 1.5 2008/06/22 22:33:37 dsainty Exp $
+$NetBSD: patch-ad,v 1.6 2011/08/20 16:02:23 cheusov Exp $
 
 On Solaris 10 with SunPro, vector<> does not have a method assign().
 
---- src/libdar/mask_list.cpp.orig	2008-06-22 20:15:54.000000000 +1200
-+++ src/libdar/mask_list.cpp	2008-06-22 20:16:37.000000000 +1200
-@@ -180,7 +180,9 @@
+--- src/libdar/mask_list.cpp.orig	2011-02-11 20:23:42.000000000 +0000
++++ src/libdar/mask_list.cpp
+@@ -200,7 +200,10 @@ namespace libdar
  	    my_tmp.unique(); // remove duplicates
  
- 		// but we need the indexing of vectors
+ 		// converting the sorted list to vector, to get the indexing feature of this type
 -	    contenu.assign(my_tmp.begin(), my_tmp.end());
-+	    contenu.clear();
-+	    for (list< basic_string<my_char> >::const_iterator it = my_tmp.begin(); it != my_tmp.end(); it++)
-+		contenu.push_back(*it);
++		contenu.clear();
++		for (list< basic_string<my_char> >::const_iterator it = my_tmp.begin(); it != my_tmp.end(); it++)
++			contenu.push_back(*it);
++
  	    taille = contenu.size();
  	    if(taille < contenu.size())
- 		throw Erange("mask_list::mask_list", tools_printf(gettext("Too much line in file %s (integer overflow)"), filename_list));
+ 		throw Erange("mask_list::mask_list", tools_printf(gettext("Too much line in file %S (integer overflow)"), &filename_list_st));
diff --git a/archivers/dar/patches/patch-af b/archivers/dar/patches/patch-af
index 3594d66f9ec..22b447d8fe2 100644
--- a/archivers/dar/patches/patch-af
+++ b/archivers/dar/patches/patch-af
@@ -1,11 +1,11 @@
-$NetBSD: patch-af,v 1.3 2007/03/18 04:36:23 dsainty Exp $
+$NetBSD: patch-af,v 1.4 2011/08/20 16:02:23 cheusov Exp $
 
 Make sure we link with AM_LDFLAGS, which arranges the link and rpath for
 libintl.so.
 
---- src/libdar/Makefile.in.orig	2007-02-26 11:05:04.000000000 +1300
-+++ src/libdar/Makefile.in	2007-03-13 00:31:49.000000000 +1300
-@@ -72,7 +72,7 @@
+--- src/libdar/Makefile.in.orig	2011-07-21 14:52:31.000000000 +0000
++++ src/libdar/Makefile.in
+@@ -78,7 +78,7 @@ am_libdar_la_OBJECTS = $(am__objects_1) 
  libdar_la_OBJECTS = $(am_libdar_la_OBJECTS)
  libdar_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
@@ -14,7 +14,7 @@ libintl.so.
  @BUILD_MODE32_FALSE@@BUILD_MODE64_FALSE@am_libdar_la_rpath = -rpath \
  @BUILD_MODE32_FALSE@@BUILD_MODE64_FALSE@	$(libdir)
  libdar32_la_LIBADD =
-@@ -89,7 +89,7 @@
+@@ -86,14 +86,14 @@ am_libdar32_la_OBJECTS = $(am__objects_1
  libdar32_la_OBJECTS = $(am_libdar32_la_OBJECTS)
  libdar32_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
@@ -22,8 +22,7 @@ libintl.so.
 +	$(CXXFLAGS) $(AM_LDFLAGS) $(libdar32_la_LDFLAGS) $(LDFLAGS) -o $@
  @BUILD_MODE32_TRUE@am_libdar32_la_rpath = -rpath $(libdir)
  libdar64_la_LIBADD =
- am_libdar64_la_OBJECTS = catalogue.lo compressor.lo deci.lo defile.lo \
-@@ -105,7 +105,7 @@
+ am_libdar64_la_OBJECTS = $(am__objects_1) limitint.lo
  libdar64_la_OBJECTS = $(am_libdar64_la_OBJECTS)
  libdar64_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
diff --git a/archivers/dar/patches/patch-src_check_all__features.cpp b/archivers/dar/patches/patch-src_check_all__features.cpp
new file mode 100644
index 00000000000..6481494fa3a
--- /dev/null
+++ b/archivers/dar/patches/patch-src_check_all__features.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_check_all__features.cpp,v 1.1 2011/08/20 16:02:23 cheusov Exp $
+
+exit(3) is declared in stdlib.h (fix for NetBSD)
+--- src/check/all_features.cpp.orig	2011-03-31 19:21:02.000000000 +0000
++++ src/check/all_features.cpp
+@@ -27,6 +27,8 @@
+ 
+ #include "libdar.hpp"
+ 
++#include <stdlib.h>
++
+ using namespace libdar;
+ using namespace std;
+