summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--archivers/dar/Makefile9
-rw-r--r--archivers/dar/PLIST14
-rw-r--r--archivers/dar/distinfo18
-rw-r--r--archivers/dar/patches/patch-aa12
-rw-r--r--archivers/dar/patches/patch-ab12
-rw-r--r--archivers/dar/patches/patch-af10
-rw-r--r--archivers/dar/patches/patch-ag32
-rw-r--r--archivers/dar/patches/patch-src_check_all__features.cpp14
-rw-r--r--archivers/dar/patches/patch-src_libdar_secu__string.hpp8
9 files changed, 46 insertions, 83 deletions
diff --git a/archivers/dar/Makefile b/archivers/dar/Makefile
index a8f95af8ed9..3bf8f4928c6 100644
--- a/archivers/dar/Makefile
+++ b/archivers/dar/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2013/05/31 12:39:35 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2013/06/28 15:03:55 ryoon Exp $
-DISTNAME= dar-2.4.1
-PKGREVISION= 2
+DISTNAME= dar-2.4.10
CATEGORIES= archivers sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dar/}
@@ -104,6 +103,10 @@ SUBST_FILES.static= src/testing/Makefile.in
SUBST_SED.static= -e 's,-all-static,-static,g'
.endif
+.if ${OPSYS} == "NetBSD"
+BUILDLINK_TRANSFORM= l:execinfo:execinfo:elf
+.endif
+
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff --git a/archivers/dar/PLIST b/archivers/dar/PLIST
index cf2404a2005..cfa9baa0c81 100644
--- a/archivers/dar/PLIST
+++ b/archivers/dar/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2011/08/20 16:02:23 cheusov Exp $
+@comment $NetBSD: PLIST,v 1.12 2013/06/28 15:03:55 ryoon Exp $
bin/dar
bin/dar_cp
bin/dar_manager
@@ -60,8 +60,8 @@ include/dar/tuyau.hpp
include/dar/user_group_bases.hpp
include/dar/user_interaction.hpp
include/dar/wrapperlib.hpp
-lib/libdar${DARBITS}.la
-lib/pkgconfig/libdar${DARBITS}.pc
+lib/libdar64.la
+lib/pkgconfig/libdar64.pc
man/man1/dar.1
man/man1/dar_cp.1
man/man1/dar_manager.1
@@ -72,13 +72,21 @@ 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/PN_backup-root.options
+share/dar/samples/PN_backup-root.sh
+share/dar/samples/PN_backup-storage.options
+share/dar/samples/PN_backup-storage.sh
+share/dar/samples/PN_ftpbackup.sh
+share/dar/samples/Patrick_Nagel_Note.txt
share/dar/samples/README
share/dar/samples/automatic_backup
share/dar/samples/automatic_backup.txt
+share/dar/samples/available_space.duc
share/dar/samples/cdbackup.sh
share/dar/samples/cluster_digital_backups.sh
share/dar/samples/cluster_digital_readme.txt
share/dar/samples/dar_backup
+share/dar/samples/dar_backups.sh
share/dar/samples/dar_par.dcf
share/dar/samples/dar_par_create.duc
share/dar/samples/dar_par_test.duc
diff --git a/archivers/dar/distinfo b/archivers/dar/distinfo
index fa6cb46b7a0..e8978667126 100644
--- a/archivers/dar/distinfo
+++ b/archivers/dar/distinfo
@@ -1,16 +1,14 @@
-$NetBSD: distinfo,v 1.27 2013/06/26 15:49:31 joerg Exp $
+$NetBSD: distinfo,v 1.28 2013/06/28 15:03:55 ryoon Exp $
-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 (dar-2.4.10.tar.gz) = bf02ba10bfcd2ad959017706f167fc390aafe932
+RMD160 (dar-2.4.10.tar.gz) = 26161a09a60e36a3094f94d8831a157b7c3e4d0a
+Size (dar-2.4.10.tar.gz) = 1760827 bytes
+SHA1 (patch-aa) = 734ec162dbc339b2015a169bb9fe723e45d0a29b
+SHA1 (patch-ab) = f07d55861f21545b0ae8ac6b187a94526e44e345
SHA1 (patch-ac) = dcbf4e31071c83a167a60a20e4980b35f055a46e
SHA1 (patch-ad) = df21f72b12ab19123f1c61e8e1645519c43d7f7b
SHA1 (patch-ae) = 54220384bf2031df64c38f5abea038382ca37e8e
-SHA1 (patch-af) = 0fc93ae2638d77b247e6339f3a5819e5eeb059f0
-SHA1 (patch-ag) = 3873d5dd9e387c90977b169e4532891bcf242e49
-SHA1 (patch-src_check_all__features.cpp) = 2d962e4c17d93242b281b72bec8ed5cec8aa0e49
+SHA1 (patch-af) = 414e58277c946b59f57352e260ac5d49673ef008
SHA1 (patch-src_dar__suite_command__line.cpp) = 63d3004bf7d49277c1508fe5d9ac52ec0d5bf11f
SHA1 (patch-src_dar__suite_crit__action__cmd__line.cpp) = bc9484e836fbde98f682f6031aaadd99cc8eb479
SHA1 (patch-src_dar__suite_dar__manager.cpp) = 2ed9008b5e7629ef8e279b7d1218a4fae5101df1
@@ -20,7 +18,7 @@ SHA1 (patch-src_examples_factoriel.cpp) = 6c9e038b7a3bbfdc96dbbdf1b7e100c159353f
SHA1 (patch-src_examples_formula.cpp) = 583ceeba0a232e657ab0696711f630476ec2e495
SHA1 (patch-src_examples_prime.cpp) = 09fc3b96642945042a2d13bb4c1995546cdb7607
SHA1 (patch-src_libdar_mask__list.hpp) = b16686706cb7ad7065467decfd93271f01d9c663
-SHA1 (patch-src_libdar_secu__string.hpp) = 021d3b5a126b66b2afc28d24b952eeb47b6ffe81
+SHA1 (patch-src_libdar_secu__string.hpp) = 6793cb79bf5f8c4d3ac83ba4f2cd2fd9f452afb1
SHA1 (patch-src_testing_test__catalogue.cpp) = 2d1a8299f01776e3fa9996819aa8be523b73b4cc
SHA1 (patch-src_testing_test__deci.cpp) = 053e2123a5219dc0cb827743e348f9463ce84615
SHA1 (patch-src_testing_test__escape.cpp) = b7959b2e5e3675d2e64f232face3b18384f8e3da
diff --git a/archivers/dar/patches/patch-aa b/archivers/dar/patches/patch-aa
index 295e7e5126f..475b0232af5 100644
--- a/archivers/dar/patches/patch-aa
+++ b/archivers/dar/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2007/04/13 09:11:20 dsainty Exp $
+$NetBSD: patch-aa,v 1.5 2013/06/28 15:03:55 ryoon Exp $
---- doc/Makefile.in.orig 2003-12-07 05:48:29.000000000 -0600
-+++ doc/Makefile.in 2003-12-07 05:48:29.000000000 -0600
-@@ -15,7 +15,7 @@
+--- doc/Makefile.in.orig 2013-03-09 12:40:15.000000000 +0000
++++ doc/Makefile.in
+@@ -16,7 +16,7 @@
@SET_MAKE@
VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
+pkgdatadir = $(datadir)/doc/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkglibexecdir = $(libexecdir)/@PACKAGE@
diff --git a/archivers/dar/patches/patch-ab b/archivers/dar/patches/patch-ab
index 661b3ac4f53..748ae0c9465 100644
--- a/archivers/dar/patches/patch-ab
+++ b/archivers/dar/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.4 2007/04/13 09:11:20 dsainty Exp $
+$NetBSD: patch-ab,v 1.5 2013/06/28 15:03:55 ryoon 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
-@@ -15,7 +15,7 @@
+--- doc/mini-howto/Makefile.in.orig 2013-03-09 12:40:15.000000000 +0000
++++ doc/mini-howto/Makefile.in
+@@ -16,7 +16,7 @@
@SET_MAKE@
VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
+pkgdatadir = $(datadir)/doc/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkglibexecdir = $(libexecdir)/@PACKAGE@
diff --git a/archivers/dar/patches/patch-af b/archivers/dar/patches/patch-af
index 22b447d8fe2..6b337709be4 100644
--- a/archivers/dar/patches/patch-af
+++ b/archivers/dar/patches/patch-af
@@ -1,11 +1,11 @@
-$NetBSD: patch-af,v 1.4 2011/08/20 16:02:23 cheusov Exp $
+$NetBSD: patch-af,v 1.5 2013/06/28 15:03:55 ryoon Exp $
Make sure we link with AM_LDFLAGS, which arranges the link and rpath for
libintl.so.
---- src/libdar/Makefile.in.orig 2011-07-21 14:52:31.000000000 +0000
+--- src/libdar/Makefile.in.orig 2013-03-09 12:40:16.000000000 +0000
+++ src/libdar/Makefile.in
-@@ -78,7 +78,7 @@ am_libdar_la_OBJECTS = $(am__objects_1)
+@@ -98,7 +98,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 =
-@@ -86,14 +86,14 @@ am_libdar32_la_OBJECTS = $(am__objects_1
+@@ -106,14 +106,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) \
@@ -30,4 +30,4 @@ libintl.so.
+ $(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@
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
diff --git a/archivers/dar/patches/patch-ag b/archivers/dar/patches/patch-ag
deleted file mode 100644
index 35f3e2d293b..00000000000
--- a/archivers/dar/patches/patch-ag
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2008/08/02 17:10:13 dholland Exp $
-
---- src/testing/test_libdar.cpp~ 2007-07-22 12:35:01.000000000 -0400
-+++ src/testing/test_libdar.cpp 2008-08-02 13:01:08.000000000 -0400
-@@ -89,7 +89,7 @@ void f1()
-
- void warning(const string &x, void *context)
- {
-- printf("[%d]%s\n", (U_I)context, x.c_str());
-+ printf("[%p]%s\n", context, x.c_str());
- }
-
- bool question(const string & x, void *context)
-@@ -97,7 +97,7 @@ bool question(const string & x, void *co
- bool rep = false;
- char r;
-
-- printf("[%d]%s\n", (U_I)context, x.c_str());
-+ printf("[%p]%s\n", context, x.c_str());
- scanf("%c", &r);
- rep = r == 'y';
-
-@@ -120,7 +120,8 @@ void listing(const std::string & flag,
- bool has_children,
- void *context)
- {
-- ui.printf("[[%d]][%S][%S][%S][%S][%S][%S][%S][%s][%s]\n", (U_I)context, &flag, &perm, &uid, &gid, &size, &date, &filename, is_dir ? "dir" : "not_dir", has_children ? "has children" : "no children");
-+ /* note: ui.printf isn't printf and can't do %p */
-+ ui.printf("[[%d]][%S][%S][%S][%S][%S][%S][%S][%s][%s]\n", (U_I)(uintptr_t)context, &flag, &perm, &uid, &gid, &size, &date, &filename, is_dir ? "dir" : "not_dir", has_children ? "has children" : "no children");
- }
-
- void f2()
diff --git a/archivers/dar/patches/patch-src_check_all__features.cpp b/archivers/dar/patches/patch-src_check_all__features.cpp
deleted file mode 100644
index 6481494fa3a..00000000000
--- a/archivers/dar/patches/patch-src_check_all__features.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$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;
-
diff --git a/archivers/dar/patches/patch-src_libdar_secu__string.hpp b/archivers/dar/patches/patch-src_libdar_secu__string.hpp
index a355ea77afd..a50af0d1f82 100644
--- a/archivers/dar/patches/patch-src_libdar_secu__string.hpp
+++ b/archivers/dar/patches/patch-src_libdar_secu__string.hpp
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_libdar_secu__string.hpp,v 1.1 2012/11/23 19:08:20 marino Exp $
+$NetBSD: patch-src_libdar_secu__string.hpp,v 1.2 2013/06/28 15:03:55 ryoon Exp $
---- src/libdar/secu_string.hpp.orig 2011-01-09 17:25:58.000000000 +0000
+--- src/libdar/secu_string.hpp.orig 2012-11-30 20:51:11.000000000 +0000
+++ src/libdar/secu_string.hpp
-@@ -39,6 +39,7 @@
+@@ -35,6 +35,7 @@
#include "../my_config.h"
#include <string>
+#include <unistd.h>
#include "integers.hpp"
-
+ #include "special_alloc.hpp"
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-26 07:19:14 +0000