summaryrefslogtreecommitdiff
path: root/archivers/dar
diff options
context:
space:
mode:
authordsainty <dsainty>2007-03-18 04:36:23 +0000
committerdsainty <dsainty>2007-03-18 04:36:23 +0000
commit07cbb5c77e0521d97ce8dd89bcc8e6c3044f9b90 (patch)
treea11ade5f95fa49048bf0b6a5758eceb5182fc6e8 /archivers/dar
parent32a601c7f1309351f2bfc1b386dd43817cc064b9 (diff)
downloadpkgsrc-07cbb5c77e0521d97ce8dd89bcc8e6c3044f9b90.tar.gz
Update to dar 2.3.3, and also fix PLIST for dar-int32 and dar-int64 Pkgsrc
options. Upgrading to 2.3.3 is strongly recommended if you use Dar to backup across multiple filesystems: http://article.gmane.org/gmane.comp.sysutils.backup.dar.announce/31 Changelog entry from 2.3.2 to 2.3.3: - avoid using getpwuid() and getgrgid() for static linking. - fixed typo in dar's man page - update FAQ - fixed bug: uncaught exception thrown when CTRC-C was hit while dar waits an answer from the user [SF #1612205] - fixed bug: unusable archive generated when CTRC-C was hit and blowfish encryption used [SF #1632273] - added a check to verify that the libdar used is compatible with the current dar suite programs [SF #1587643] - fixed bug: added workaround for the right arithmetic shift operator (the binary produced by gcc-3.4.2 produces computes "v>>s" equal to "v" when when v is a integer field composed of s exactly bits. It should rather compute it to zero...). this problem leads 32 bits generated archive incompatible with 64 bits generated archive only when blowfish is used. - fixed bug met when the inode space is exhausted, thanks to "Jo - Ex-Bart" for this new feedback. [SF #1632738] - replaced &, <, >, ' and " in XML listing by &...; corresponding sequence. [SF #1597403] - dar_manager can receive arguments after stick to -o options (it is an error in regard to documentation, but no warning was issued in that case, leading to confusion for some users) [SF #1598138] - updated Veysel Ozer's automatic_backup script - fixed hard link detection problem [SF #1667400] - verbose output did not displayed hard links information - merged patch on dar_cp by Andrea Palazzi to have it to return EXIT_DATA_ERROR when some data have been reported [SF #1622913]
Diffstat (limited to 'archivers/dar')
-rw-r--r--archivers/dar/Makefile8
-rw-r--r--archivers/dar/PLIST6
-rw-r--r--archivers/dar/distinfo13
-rw-r--r--archivers/dar/patches/patch-aa9
-rw-r--r--archivers/dar/patches/patch-ab9
-rw-r--r--archivers/dar/patches/patch-af34
6 files changed, 58 insertions, 21 deletions
diff --git a/archivers/dar/Makefile b/archivers/dar/Makefile
index 1bd0e527190..cb544ef0718 100644
--- a/archivers/dar/Makefile
+++ b/archivers/dar/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2007/01/07 13:29:20 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2007/03/18 04:36:23 dsainty Exp $
-DISTNAME= dar-2.3.2
+DISTNAME= dar-2.3.3
CATEGORIES= archivers sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dar/}
@@ -38,8 +38,12 @@ PKG_SUGGESTED_OPTIONS=
# 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
+.else
+PLIST_SUBST+= DARBITS=
.endif
PKGCONFIG_OVERRIDE= src/libdar/libdar.pc.tmpl.in
diff --git a/archivers/dar/PLIST b/archivers/dar/PLIST
index 16788804901..e55306eb101 100644
--- a/archivers/dar/PLIST
+++ b/archivers/dar/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/09/07 14:18:38 rillig Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/03/18 04:36:23 dsainty Exp $
bin/dar
bin/dar_cp
bin/dar_manager
@@ -38,8 +38,8 @@ include/dar/tronconneuse.hpp
include/dar/tuyau.hpp
include/dar/user_interaction.hpp
include/dar/wrapperlib.hpp
-lib/libdar.la
-lib/pkgconfig/libdar.pc
+lib/libdar${DARBITS}.la
+lib/pkgconfig/libdar${DARBITS}.pc
man/man1/dar.1
man/man1/dar_cp.1
man/man1/dar_manager.1
diff --git a/archivers/dar/distinfo b/archivers/dar/distinfo
index 47a0f83fd00..de6bf479bc9 100644
--- a/archivers/dar/distinfo
+++ b/archivers/dar/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.17 2007/01/07 13:29:20 rillig Exp $
+$NetBSD: distinfo,v 1.18 2007/03/18 04:36:23 dsainty Exp $
-SHA1 (dar-2.3.2.tar.gz) = b2f134aed3f628d312e718f6937f66a1732e4144
-RMD160 (dar-2.3.2.tar.gz) = be4d92bb272fa32a229664f0e3b66ed5cbbc565d
-Size (dar-2.3.2.tar.gz) = 1164461 bytes
-SHA1 (patch-aa) = 6f07f2bf85194cdad58d99c7cafd85e3b2c06031
-SHA1 (patch-ab) = 1d8fb3bcd9c0d6a07cb6413d0b94453264f3d499
+SHA1 (dar-2.3.3.tar.gz) = ec52d7d75b3414b54f03988874c51b2e655561ab
+RMD160 (dar-2.3.3.tar.gz) = 7e426a21633205738b1262fb643e1a91c8feb793
+Size (dar-2.3.3.tar.gz) = 1179147 bytes
+SHA1 (patch-aa) = 21728dd16aaeae50f0e28e60e4360e7a3eb2412b
+SHA1 (patch-ab) = f559c5fd99ab1f4b164b26762caadcb909c53aaa
SHA1 (patch-ac) = 34ba67a1ae794c1069824347b67a204455d18f2e
SHA1 (patch-ad) = b880e88531a834a69e72b9450b0aee756024fd25
SHA1 (patch-ae) = 54220384bf2031df64c38f5abea038382ca37e8e
+SHA1 (patch-af) = c25351dbf2f115b649207f88981710e04a0a038e
diff --git a/archivers/dar/patches/patch-aa b/archivers/dar/patches/patch-aa
index ff5ab4978b4..7a18f723c7b 100644
--- a/archivers/dar/patches/patch-aa
+++ b/archivers/dar/patches/patch-aa
@@ -1,13 +1,12 @@
-$NetBSD: patch-aa,v 1.2 2004/05/29 18:07:38 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2007/03/18 04:36:23 dsainty Exp $
--- doc/Makefile.in.orig 2003-12-07 05:48:29.000000000 -0600
+++ doc/Makefile.in
-@@ -17,7 +17,7 @@
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
+@@ -15,6 +15,6 @@
+ @SET_MAKE@
+
VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
+pkgdatadir = $(datadir)/doc/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
diff --git a/archivers/dar/patches/patch-ab b/archivers/dar/patches/patch-ab
index f584b439bf4..329d5d327b6 100644
--- a/archivers/dar/patches/patch-ab
+++ b/archivers/dar/patches/patch-ab
@@ -1,13 +1,12 @@
-$NetBSD: patch-ab,v 1.2 2005/06/29 07:38:40 martti Exp $
+$NetBSD: patch-ab,v 1.3 2007/03/18 04:36:23 dsainty Exp $
--- doc/mini-howto/Makefile.in.orig 2005-06-09 13:19:08.000000000 +0300
+++ doc/mini-howto/Makefile.in 2005-06-09 13:19:21.000000000 +0300
-@@ -17,7 +17,7 @@
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
+@@ -15,6 +15,6 @@
+ @SET_MAKE@
+
VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
+pkgdatadir = $(datadir)/doc/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
diff --git a/archivers/dar/patches/patch-af b/archivers/dar/patches/patch-af
new file mode 100644
index 00000000000..3594d66f9ec
--- /dev/null
+++ b/archivers/dar/patches/patch-af
@@ -0,0 +1,34 @@
+$NetBSD: patch-af,v 1.3 2007/03/18 04:36:23 dsainty 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 @@
+ libdar_la_OBJECTS = $(am_libdar_la_OBJECTS)
+ libdar_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(libdar_la_LDFLAGS) $(LDFLAGS) -o $@
++ $(CXXFLAGS) $(AM_LDFLAGS) $(libdar_la_LDFLAGS) $(LDFLAGS) -o $@
+ @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 @@
+ libdar32_la_OBJECTS = $(am_libdar32_la_OBJECTS)
+ libdar32_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(libdar32_la_LDFLAGS) $(LDFLAGS) -o $@
++ $(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 @@
+ libdar64_la_OBJECTS = $(am_libdar64_la_OBJECTS)
+ libdar64_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(libdar64_la_LDFLAGS) $(LDFLAGS) -o $@
++ $(CXXFLAGS) $(AM_LDFLAGS) $(libdar64_la_LDFLAGS) $(LDFLAGS) -o $@
+ @BUILD_MODE32_FALSE@@BUILD_MODE64_TRUE@am_libdar64_la_rpath = -rpath \
+ @BUILD_MODE32_FALSE@@BUILD_MODE64_TRUE@ $(libdir)
+ DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@