Updated dar to 2.2.2

* lots of new options
* lots of bug fixes
* translation updates
* documentation updates

14 files changed, 30 insertions, 178 deletions

diff --git a/archivers/dar/Makefile b/archivers/dar/Makefile
index 716c937ebea..25e3cf06eb0 100644
--- a/archivers/dar/Makefile
+++ b/archivers/dar/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:44:48 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/29 07:38:40 martti Exp $
 
-DISTNAME=	dar-2.1.5
+DISTNAME=	dar-2.2.2
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dar/}
 
diff --git a/archivers/dar/PLIST b/archivers/dar/PLIST
index e868d8e71de..4c2483d812c 100644
--- a/archivers/dar/PLIST
+++ b/archivers/dar/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2004/11/09 13:02:39 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/06/29 07:38:40 martti Exp $
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/dar.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/dar.mo
 bin/dar
 bin/dar_cp
 bin/dar_manager
@@ -13,6 +15,7 @@ include/dar/deci.hpp
 include/dar/ea.hpp
 include/dar/erreurs.hpp
 include/dar/generic_file.hpp
+include/dar/gettext.h
 include/dar/header_version.hpp
 include/dar/infinint.hpp
 include/dar/int_tools.hpp
@@ -20,13 +23,16 @@ include/dar/integers.hpp
 include/dar/libdar.hpp
 include/dar/limitint.hpp
 include/dar/mask.hpp
+include/dar/my_config.h
 include/dar/path.hpp
 include/dar/real_infinint.hpp
 include/dar/scrambler.hpp
 include/dar/special_alloc.hpp
 include/dar/statistics.hpp
 include/dar/storage.hpp
+include/dar/thread_cancellation.hpp
 include/dar/tools.hpp
+include/dar/tronconneuse.hpp
 include/dar/tuyau.hpp
 include/dar/user_interaction.hpp
 include/dar/wrapperlib.hpp
@@ -39,8 +45,7 @@ man/man1/dar_xform.1
 share/dar/dar_par.dcf
 share/dar/dar_par_create.duc
 share/dar/dar_par_test.duc
-share/doc/dar/DOC_API_V1
-share/doc/dar/DOC_API_V2
+share/doc/dar/FAQ
 share/doc/dar/FEATURES
 share/doc/dar/GOOD_BACKUP_PRACTICE
 share/doc/dar/LIMITATIONS
@@ -48,7 +53,10 @@ share/doc/dar/LINKS
 share/doc/dar/NOTES
 share/doc/dar/README
 share/doc/dar/TUTORIAL
+share/doc/dar/api_tutorial.html
 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
 @dirrm share/doc/dar
 @dirrm share/dar
 @dirrm include/dar
diff --git a/archivers/dar/distinfo b/archivers/dar/distinfo
index ee017bde9b1..59b0c37d8f6 100644
--- a/archivers/dar/distinfo
+++ b/archivers/dar/distinfo
@@ -1,17 +1,7 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 14:45:23 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/06/29 07:38:40 martti Exp $
 
-SHA1 (dar-2.1.5.tar.gz) = 992836c05c685933e56e8035e00313008567948a
-RMD160 (dar-2.1.5.tar.gz) = f76796f902dbf851eb39d8de96e439a5c7f65ada
-Size (dar-2.1.5.tar.gz) = 652534 bytes
+SHA1 (dar-2.2.2.tar.gz) = b362ad3e192c7239a13a314d0f4750bc080b62d8
+RMD160 (dar-2.2.2.tar.gz) = 79dc8ac63d52af64774d982a388027f60707b48e
+Size (dar-2.2.2.tar.gz) = 1067171 bytes
 SHA1 (patch-aa) = 6f07f2bf85194cdad58d99c7cafd85e3b2c06031
-SHA1 (patch-ab) = 215f457ca03dcf86fba50c00198c934cfe0c915d
-SHA1 (patch-ac) = 0c3ae6c7c247b85257c4ebdfb7b1da8b2baf6e45
-SHA1 (patch-ad) = 45c1532ec5cf72d148fa331986e1680e7dcb099c
-SHA1 (patch-ae) = ab19ec5783d24df4e3e73c0cea7262aefb4196e1
-SHA1 (patch-af) = 967783c3d53fb975d436662121dd8f9db285b9aa
-SHA1 (patch-ag) = c99b58ae072c22ec2e4b85a6fc9a35edb7968385
-SHA1 (patch-ah) = 01916f19ad0e14d0840de5223d8625e610b83f51
-SHA1 (patch-ai) = a22efc4a16f79ab80a74a3bae21f403d128f54ae
-SHA1 (patch-aj) = 87aad964117f53b56acad9f9ba902a48adc01c24
-SHA1 (patch-ak) = e0d95bb0ff987cc7b6e32c38d3d47f693f7f8d93
-SHA1 (patch-al) = 767b836e0e30acd05d978a33ec3636b1b0e45684
+SHA1 (patch-ab) = 1d8fb3bcd9c0d6a07cb6413d0b94453264f3d499
diff --git a/archivers/dar/patches/patch-ab b/archivers/dar/patches/patch-ab
index 9013f7079d7..f584b439bf4 100644
--- a/archivers/dar/patches/patch-ab
+++ b/archivers/dar/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1 2005/01/24 16:58:06 tv Exp $
+$NetBSD: patch-ab,v 1.2 2005/06/29 07:38:40 martti Exp $
 
---- configure.ac.orig	2005-01-24 11:28:25.000000000 -0500
-+++ configure.ac
-@@ -47,7 +47,7 @@ AC_HEADER_STDC
- AC_HEADER_SYS_WAIT
- AC_CHECK_HEADER(zlib.h, [], [AC_MSG_ERROR([Cannot find zlib.h header file])])
- AC_CHECK_HEADER(bzlib.h, [], [AC_MSG_ERROR([Cannot find bzlib.h header file])])
--AC_CHECK_HEADERS([fcntl.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h termios.h unistd.h utime.h sys/types.h signal.h errno.h sys/un.h sys/stat.h time.h fnmatch.h regex.h pwd.h grp.h getopt.h stdio.h])
-+AC_CHECK_HEADERS([fcntl.h netinet/in.h arpa/inet.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h termios.h unistd.h utime.h sys/types.h signal.h errno.h sys/un.h sys/stat.h time.h fnmatch.h regex.h pwd.h grp.h getopt.h stdio.h])
- 
- AC_SYS_LARGEFILE
- 
+--- 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@
+ VPATH = @srcdir@
+-pkgdatadir = $(datadir)/@PACKAGE@
++pkgdatadir = $(datadir)/doc/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
diff --git a/archivers/dar/patches/patch-ac b/archivers/dar/patches/patch-ac
deleted file mode 100644
index a325ae4b029..00000000000
--- a/archivers/dar/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/01/24 16:58:06 tv Exp $
-
---- configure.orig	2005-01-24 11:28:21.000000000 -0500
-+++ configure
-@@ -20128,7 +20128,7 @@ fi
- 
- 
- 
--for ac_header in fcntl.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h termios.h unistd.h utime.h sys/types.h signal.h errno.h sys/un.h sys/stat.h time.h fnmatch.h regex.h pwd.h grp.h getopt.h stdio.h
-+for ac_header in fcntl.h netinet/in.h arpa/inet.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h termios.h unistd.h utime.h sys/types.h signal.h errno.h sys/un.h sys/stat.h time.h fnmatch.h regex.h pwd.h grp.h getopt.h stdio.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
diff --git a/archivers/dar/patches/patch-ad b/archivers/dar/patches/patch-ad
deleted file mode 100644
index 541853b5692..00000000000
--- a/archivers/dar/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/01/24 16:58:06 tv Exp $
-
---- src/libdar/catalogue.cpp.orig	2005-01-24 11:29:06.000000000 -0500
-+++ src/libdar/catalogue.cpp
-@@ -35,6 +35,9 @@ extern "C"
- #if HAVE_NETINET_IN_H
- #include <netinet/in.h>
- #endif
-+#if HAVE_ARPA_INET_H
-+#include <arpa/inet.h>
-+#endif
- 
- #ifdef STDC_HEADERS
- #include <ctype.h>
diff --git a/archivers/dar/patches/patch-ae b/archivers/dar/patches/patch-ae
deleted file mode 100644
index f80bc00c50f..00000000000
--- a/archivers/dar/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/01/24 16:58:06 tv Exp $
-
---- src/libdar/header.cpp.orig	2005-01-24 11:29:34.000000000 -0500
-+++ src/libdar/header.cpp
-@@ -35,6 +35,9 @@ extern "C"
- #if HAVE_NETINET_IN_H
- #include <netinet/in.h>
- #endif
-+#if HAVE_ARPA_INET_H
-+#include <arpa/inet.h>
-+#endif
- 
- #if TIME_WITH_SYS_TIME
- # include <sys/time.h>
diff --git a/archivers/dar/patches/patch-af b/archivers/dar/patches/patch-af
deleted file mode 100644
index aff68884080..00000000000
--- a/archivers/dar/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/01/24 16:58:06 tv Exp $
-
---- src/libdar/zapette.cpp.orig	2005-01-24 11:30:02.000000000 -0500
-+++ src/libdar/zapette.cpp
-@@ -36,6 +36,9 @@ extern "C"
- #if HAVE_NETINET_IN_H
- #include <netinet/in.h>
- #endif
-+#if HAVE_ARPA_INET_H
-+#include <arpa/inet.h>
-+#endif
- } // end extern "C"
- 
- #include <string>
diff --git a/archivers/dar/patches/patch-ag b/archivers/dar/patches/patch-ag
deleted file mode 100644
index 052230673c7..00000000000
--- a/archivers/dar/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/01/24 16:58:06 tv Exp $
-
---- src/dar_suite/data_tree.cpp.orig	2005-01-24 11:30:25.000000000 -0500
-+++ src/dar_suite/data_tree.cpp
-@@ -35,6 +35,9 @@ extern "C"
- #if HAVE_NETINET_IN_H
- #include <netinet/in.h>
- #endif
-+#if HAVE_ARPA_INET_H
-+#include <arpa/inet.h>
-+#endif
- } // end extern "C"
- 
- #include <iomanip>
diff --git a/archivers/dar/patches/patch-ah b/archivers/dar/patches/patch-ah
deleted file mode 100644
index 2ee656f5d0d..00000000000
--- a/archivers/dar/patches/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/01/24 16:58:06 tv Exp $
-
---- config.h.in.orig	2005-01-24 11:40:24.000000000 -0500
-+++ config.h.in
-@@ -21,6 +21,9 @@
-    */
- #undef HAVE_ALLOCA_H
- 
-+/* Define to 1 if you have the <arpa/inet.h> header file. */
-+#undef HAVE_ARPA_INET_H
-+
- /* Define to 1 if you have the `btowc' function. */
- #undef HAVE_BTOWC
- 
diff --git a/archivers/dar/patches/patch-ai b/archivers/dar/patches/patch-ai
deleted file mode 100644
index 79b8acd6b1d..00000000000
--- a/archivers/dar/patches/patch-ai
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2005/01/24 16:58:06 tv Exp $
-
---- src/libdar/filesystem.cpp.orig	2005-01-24 11:52:38.000000000 -0500
-+++ src/libdar/filesystem.cpp
-@@ -93,6 +93,9 @@ char *strchr (), *strrchr ();
- 
- #if MAJOR_IN_MKDEV
- #include <sys/mkdev.h>
-+#if !defined(makedev) && defined(mkdev)
-+#define makedev(a,b) mkdev((a),(b))
-+#endif
- #else
- #if MAJOR_IN_SYSMACROS
- #include <sys/sysmacros.h>
diff --git a/archivers/dar/patches/patch-aj b/archivers/dar/patches/patch-aj
deleted file mode 100644
index a8fbd26e948..00000000000
--- a/archivers/dar/patches/patch-aj
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2005/01/24 17:51:57 tv Exp $
-
---- src/testing/Makefile.am.orig	2005-01-24 12:46:13.000000000 -0500
-+++ src/testing/Makefile.am
-@@ -13,7 +13,9 @@ endif
- 
- noinst_PROGRAMS = test_hide_file test_terminateur test_catalogue test_infinint test_tronc test_compressor test_mask test_tuyau test_deci test_path test_erreurs test_sar test_filesystem test_scrambler test_generic_file test_storage test_special_alloc test_limitint test_libdar
- LDADD = -L../libdar -l$(MYLIB)
-+if DEBUG_STATIC
- AM_LDFLAGS = -all-static
-+endif
- noinst_HEADERS = testtools.hpp
- 
- test_hide_file_SOURCES = test_hide_file.cpp ../dar_suite/no_comment.cpp ../dar_suite/hide_file.cpp ../dar_suite/config_file.cpp
diff --git a/archivers/dar/patches/patch-ak b/archivers/dar/patches/patch-ak
deleted file mode 100644
index 622748e46ca..00000000000
--- a/archivers/dar/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2005/01/24 17:51:57 tv Exp $
-
---- src/testing/Makefile.in.orig	2005-01-24 12:46:14.000000000 -0500
-+++ src/testing/Makefile.in
-@@ -155,7 +155,7 @@ upx = @upx@
- 
- noinst_PROGRAMS = test_hide_file test_terminateur test_catalogue test_infinint test_tronc test_compressor test_mask test_tuyau test_deci test_path test_erreurs test_sar test_filesystem test_scrambler test_generic_file test_storage test_special_alloc test_limitint test_libdar
- LDADD = -L../libdar -l$(MYLIB)
--AM_LDFLAGS = -all-static
-+@DEBUG_STATIC_TRUE@AM_LDFLAGS = -all-static
- noinst_HEADERS = testtools.hpp
- 
- test_hide_file_SOURCES = test_hide_file.cpp ../dar_suite/no_comment.cpp ../dar_suite/hide_file.cpp ../dar_suite/config_file.cpp
diff --git a/archivers/dar/patches/patch-al b/archivers/dar/patches/patch-al
deleted file mode 100644
index 9a733fb514d..00000000000
--- a/archivers/dar/patches/patch-al
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-al,v 1.1 2005/01/24 17:57:15 tv Exp $
-
---- src/testing/test_filesystem.cpp.orig	2005-01-24 12:53:17.000000000 -0500
-+++ src/testing/test_filesystem.cpp
-@@ -53,6 +53,17 @@ extern "C"
- #if HAVE_SYS_UN_H
- #include <sys/un.h>
- #endif
-+
-+#if MAJOR_IN_MKDEV
-+#include <sys/mkdev.h>
-+#if !defined(makedev) && defined(mkdev)
-+#define makedev(a,b) mkdev((a),(b))
-+#endif
-+#else
-+#if MAJOR_IN_SYSMACROS
-+#include <sys/sysmacros.h>
-+#endif
-+#endif
- } // end extern "C"
- 
- #include <string.h>