Update to version 2.3.6:

    Changes within pkgsrc:

 	(*)	While here, add some logic to allow REPLACE_PERL and
		REPLACE_BASH to work without USE_TOOLS+="perl bash".
		Thus, the paths in share/dar/samples will now [usually]
		be correct.  Simplify options handling.


	(*)	Use PTHREAD_AUTO_VARS to ensure harmony with the
		rest of pkgsrc, add USE_FEATURES.openssl=threads
		when necessary.  Threads are enabled if a built-in
		thread library is used.


    Changes in source (since version 2.3.5):

	(*)	fixed:  Makefile.am in src/dar_suite
		        (removed "/" after $(DESTDIR))

	(*) 	fixed:  bug in regex mask building when not using
		        ordered masks

	(*) 	fixed:  bug that led dar_manager to report no error while
	 	        some files failed to be restored due to command-line
		        for dar being too large.

	(*) 	fixed:  bug encountered when user aborts operation while
		        dar is finalizing archive creation [SF #1800507]

	(*)	fixed:  problem with execvp when dar_manager launches dar

2 files changed, 67 insertions, 28 deletions

diff --git a/archivers/dar/Makefile b/archivers/dar/Makefile
index b5a8086601d..6a1891f6f76 100644
--- a/archivers/dar/Makefile
+++ b/archivers/dar/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2007/10/23 11:15:25 dsainty Exp $
+# $NetBSD: Makefile,v 1.32 2007/12/11 22:34:49 bjs Exp $
 
-DISTNAME=	dar-2.3.5
+DISTNAME=	dar-2.3.6
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dar/}
 
@@ -9,56 +9,95 @@ HOMEPAGE=	http://dar.linux.free.fr/
 COMMENT=	Disk archiver
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
+
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-dar-static
+CONFIGURE_ARGS+=	--enable-static=no
 CONFIGURE_ARGS+=	--disable-nodump-flag
 CONFIGURE_ARGS+=	--disable-upx
 CONFIGURE_ARGS+=	--enable-examples
 CONFIGURE_ARGS+=	doxygen=no
 
-# Since these are only examples, avoid the dependencies on Bash and
-# Perl.  Unfortunately the interpreter replacements won't work unless
-# we USE_TOOLS the two interpreters, so the samples are left as is.
+PKGCONFIG_OVERRIDE=	src/libdar/libdar.pc.tmpl.in
+
+## We use the logic below to find a path for a non-existent ${BASH}.
+## Yeah, I suppose it's a hack, but it does work.
+#
 CHECK_INTERPRETER_SKIP+=	share/dar/samples/*
-#USE_TOOLS+=		bash:run perl:run
-#REPLACE_PERL+=		doc/samples/dar_backup
-#REPLACE_BASH+=		doc/samples/*.bash doc/samples/clust*.sh
+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
+.  include "../../mk/pthread.builtin.mk"
+CHECK_BUILTIN.pthread:=no
+
+## XXX I'm following the USE_FEATURES semantics used in security/openssl.
+#
+.if !empty(USE_BUILTIN.pthread:tl:Myes)
+USE_FEATURES.dar=	threads
+.else
+USE_FEATURES.dar=	# empty
+.endif
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.dar
 PKG_OPTIONS_OPTIONAL_GROUPS+=	int
 PKG_OPTIONS_GROUP.int=		dar-int32 dar-int64
-PKG_SUGGESTED_OPTIONS+=		dar-int64
+PKG_SUGGESTED_OPTIONS=		dar-int64 ${USE_FEATURES.dar}
+PKG_SUPPORTED_OPTIONS=		threads
 
 .include "../../mk/bsd.options.mk"
 
-# Dar is built by default with an arbitrary-size-integer library for
-# managing all file length/timestamp details.  If 32-bit or 64-bit
-# integers (with overflow protection) are sufficient for requirements,
-# the following options can significantly reduce the run-time memory
-# and CPU overheads of Dar.
-.if !empty(PKG_OPTIONS:Mdar-int64)
-CONFIGURE_ARGS+=	--enable-mode=64
-PLIST_SUBST+=		DARBITS=64
-.elif !empty(PKG_OPTIONS:Mdar-int32)
-CONFIGURE_ARGS+=	--enable-mode=32
-PLIST_SUBST+=		DARBITS=32
+## Dar is built by default with an arbitrary-size-integer library for
+## managing all file length/timestamp details.  If 32-bit or 64-bit
+## integers (with overflow protection) are sufficient for requirements,
+## the following options can significantly reduce the run-time memory
+## and CPU overheads of Dar.
+#
+DARBITS=		${PKG_OPTIONS:C/[^[:digit:]]*//:M[36][24]}
+PLIST_SUBST+=		DARBITS=${DARBITS}
+
+.if !empty(DARBITS)
+CONFIGURE_ARGS+=	--enable-mode=${DARBITS:Q}
+.endif
+
+## 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
+## then patching configure.
+#
+.if !empty(PKG_OPTIONS:Mthreads)
+USE_FEATURES.openssl+=	threads
+PTHREAD_AUTO_VARS=	yes
+BUILDLINK_TRANSFORM+=	rm:-lpthread
 .else
-PLIST_SUBST+=		DARBITS=
+CONFIGURE_ARGS+=	--disable-thread-safe
 .endif
 
-PKGCONFIG_OVERRIDE=	src/libdar/libdar.pc.tmpl.in
 UNLIMIT_RESOURCES=	datasize
 
-# Needed for getopt() with SunPro
+## XXX Needed for getopt() with SunPro (USE_FEATURES?)
+#
 CPPFLAGS.SunOS+=	-D__EXTENSIONS__
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/dar/distinfo b/archivers/dar/distinfo
index 4b22bff2412..c9a35bb437e 100644
--- a/archivers/dar/distinfo
+++ b/archivers/dar/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2007/09/16 07:33:16 dsainty Exp $
+$NetBSD: distinfo,v 1.22 2007/12/11 22:34:49 bjs Exp $
 
-SHA1 (dar-2.3.5.tar.gz) = f92b2533b810d87eeb15eedb7e32ce3f12b1e0d4
-RMD160 (dar-2.3.5.tar.gz) = 9a0a3c41dbbb2e182b11227d29c3220c471682b4
-Size (dar-2.3.5.tar.gz) = 1190027 bytes
+SHA1 (dar-2.3.6.tar.gz) = 374ecd8655fc105cfcaef974951f55cb48038de7
+RMD160 (dar-2.3.6.tar.gz) = df78cdd068b893caad43a72e45e90e2af5c66cc7
+Size (dar-2.3.6.tar.gz) = 1189996 bytes
 SHA1 (patch-aa) = d9d9cef20573582c2f56aa70ae1b3af98b11725a
 SHA1 (patch-ab) = d442f8ec95909bf9a5e72e1ff10042ec263ec8d2
 SHA1 (patch-ac) = 34ba67a1ae794c1069824347b67a204455d18f2e