- Update to 2.3.0

- Add secondary category
- portlint(1)

PR:		96350
Submitted by:	Henrik Brautaset Aronsen <freebsd-ports___henrik.synth.no>
Approved by:	maintainer

9 files changed, 191 insertions, 79 deletions

diff --git a/sysutils/dar/Makefile b/sysutils/dar/Makefile
index b50fbef97bbf..295741287ffd 100644
--- a/sysutils/dar/Makefile
+++ b/sysutils/dar/Makefile
@@ -1,24 +1,28 @@
-# New ports collection makefile for:   dar
-# Date created:        3 January 2004
-# Whom:                Edson Brandi <ebrandi@fugspbr.org>
+# New ports collection makefile for:	dar
+# Date created:				3 January 2004
+# Whom:					Edson Brandi <ebrandi@fugspbr.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	dar
-PORTVERSION=	2.2.2
-PORTREVISION=	1
-CATEGORIES=	sysutils
+PORTVERSION=	2.3.0
+CATEGORIES=	sysutils archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}
 
 MAINTAINER=	ebrandi@fugspbr.org
 COMMENT=	A full featured command-line backup tool, aimed for disks
 
+USE_AUTOTOOLS=	libtool:15
+
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man --disable-build-html --datadir=${DATADIR}
+
+CPPFLAGS=	-DHAVE_DECL_GETOPT=0
 
-CPPFLAGS+=	-DHAVE_DECL_GETOPT=0
+MAN1=		dar.1 dar_cp.1 dar_manager.1 dar_slave.1 dar_xform.1
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -33,10 +37,18 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-MAN1=		dar.1 dar_cp.1 dar_manager.1 dar_slave.1 dar_xform.1
-
 post-patch:
 	@${REINPLACE_CMD} -Ee 's,(_nl_expand_alias) \(0\),\1 (),g' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.dtd *.txt *.jpg [CR]* ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/samples
+	cd ${WRKSRC}/doc/samples && ${INSTALL_DATA} [JR]* [a-z]* ${DOCSDIR}/samples
+	@${MKDIR} ${DOCSDIR}/mini-howto
+	cd ${WRKSRC}/doc/mini-howto && ${INSTALL_DATA} *.html README ${DOCSDIR}/mini-howto
+.endif
+
 .include <bsd.port.mk>
diff --git a/sysutils/dar/distinfo b/sysutils/dar/distinfo
index d2f97b4d6726..471ebccdb11e 100644
--- a/sysutils/dar/distinfo
+++ b/sysutils/dar/distinfo
@@ -1,3 +1,3 @@
-MD5 (dar-2.2.2.tar.gz) = c98ef73f0ca8e3f8251c9ab149e28a65
-SHA256 (dar-2.2.2.tar.gz) = 0f5490498447a4144d16822e4a1dc831f869de3a1771f126781aa380c6a03dbc
-SIZE (dar-2.2.2.tar.gz) = 1067171
+MD5 (dar-2.3.0.tar.gz) = db33f61b31fcdb84d13205a96c3d7771
+SHA256 (dar-2.3.0.tar.gz) = 71ee99bb52814e75b20b06cd57e39713b67397ac0bc1d63c5e8cf365a7445d90
+SIZE (dar-2.3.0.tar.gz) = 1142646
diff --git a/sysutils/dar/files/patch-Makefile-am b/sysutils/dar/files/patch-Makefile-am
new file mode 100644
index 000000000000..201c2dcb58c0
--- /dev/null
+++ b/sysutils/dar/files/patch-Makefile-am
@@ -0,0 +1,8 @@
+--- Makefile.am-orig	Fri Apr 21 13:58:39 2006
++++ Makefile.am	Fri Apr 21 13:58:48 2006
+@@ -1,4 +1,4 @@
+-SUBDIRS = m4 man src doc misc po
++SUBDIRS = m4 man src misc 
+ dist_noinst_DATA = INSTALL README THANKS TODO AUTHORS COPYING ChangeLog NEWS ABOUT-NLS
+ ACLOCAL_AMFLAGS = -I m4
+ 
diff --git a/sysutils/dar/files/patch-Makefile-in b/sysutils/dar/files/patch-Makefile-in
new file mode 100644
index 000000000000..cc8fb061fe75
--- /dev/null
+++ b/sysutils/dar/files/patch-Makefile-in
@@ -0,0 +1,11 @@
+--- Makefile.in-orig	Fri Apr 21 13:46:43 2006
++++ Makefile.in	Fri Apr 21 13:46:50 2006
+@@ -214,7 +214,7 @@
+ target_alias = @target_alias@
+ tmp = @tmp@
+ upx = @upx@
+-SUBDIRS = m4 man src doc misc po
++SUBDIRS = m4 man src misc 
+ dist_noinst_DATA = INSTALL README THANKS TODO AUTHORS COPYING ChangeLog NEWS ABOUT-NLS
+ ACLOCAL_AMFLAGS = -I m4
+ EXTRA_DIST = config.rpath
diff --git a/sysutils/dar/files/patch-configure-zlib.diff b/sysutils/dar/files/patch-configure-zlib.diff
deleted file mode 100644
index f6b57c7a6177..000000000000
--- a/sysutils/dar/files/patch-configure-zlib.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Fri May 20 16:30:13 2005
-+++ configure	Fri May 20 16:30:37 2005
-@@ -33225,7 +33225,7 @@
- main ()
- {
- 
--                                                         z_stream *ptr = NULL;
-+                                                         z_stream *ptr = (z_stream *)0;
-                                                          deflate(ptr, 0);
- 
-   ;
diff --git a/sysutils/dar/files/patch-doc-man b/sysutils/dar/files/patch-doc-man
new file mode 100644
index 000000000000..d844d2e71833
--- /dev/null
+++ b/sysutils/dar/files/patch-doc-man
@@ -0,0 +1,24 @@
+diff -ru doc/man-orig/Makefile.am doc/man/Makefile.am
+--- doc/man-orig/Makefile.am	Wed Apr 19 15:57:01 2006
++++ doc/man/Makefile.am	Wed Apr 19 15:54:23 2006
+@@ -2,7 +2,7 @@
+ 
+ if USE_GROFF
+ 
+-TARGET=dar.html dar_slave.html dar_xform.html dar_manager.html dar_cp.html
++TARGET=#dar.html dar_slave.html dar_xform.html dar_manager.html dar_cp.html
+ 
+ %.1:
+ 	cp ../../man/$@ .
+diff -ru doc/man-orig/Makefile.in doc/man/Makefile.in
+--- doc/man-orig/Makefile.in	Wed Apr 19 15:57:01 2006
++++ doc/man/Makefile.in	Wed Apr 19 15:54:42 2006
+@@ -190,7 +190,7 @@
+ tmp = @tmp@
+ upx = @upx@
+ dist_noinst_DATA = index.html
+-@USE_GROFF_TRUE@TARGET = dar.html dar_slave.html dar_xform.html dar_manager.html dar_cp.html
++@USE_GROFF_TRUE@TARGET = #dar.html dar_slave.html dar_xform.html dar_manager.html dar_cp.html
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/sysutils/dar/files/patch-src-libdar b/sysutils/dar/files/patch-src-libdar
new file mode 100644
index 000000000000..6e7ffb962de8
--- /dev/null
+++ b/sysutils/dar/files/patch-src-libdar
@@ -0,0 +1,35 @@
+diff -ur src-orig/libdar/Makefile.am src/libdar/Makefile.am
+--- src-orig/libdar/Makefile.am	Thu Apr 20 11:41:47 2006
++++ src/libdar/Makefile.am	Thu Apr 20 11:42:57 2006
+@@ -56,11 +56,11 @@
+ 	grep DAR $(DESTDIR)$(pkgincludedir)/config.h | grep -v "#undef" >  $(DESTDIR)$(pkgincludedir)/config.h.tmp
+ 	mv  $(DESTDIR)$(pkgincludedir)/config.h.tmp  $(DESTDIR)$(pkgincludedir)/config.h
+ 	chmod 0644 $(DESTDIR)$(pkgincludedir)/*
+-	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
+-	$(INSTALL) -m 0644 libdar.pc $(DESTDIR)$(libdir)/pkgconfig/libdar$(LIBDAR_SUFFIX).pc
++	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/libdata/pkgconfig
++	$(INSTALL) -m 0644 libdar.pc $(DESTDIR)$(exec_prefix)/libdata/pkgconfig/libdar$(LIBDAR_SUFFIX).pc
+ 
+ uninstall-local:
+-	rm -rf $(DESTDIR)$(pkgincludedir) $(DESTDIR)$(libdir)/pkgconfig/libdar$(LIBDAR_SUFFIX).pc
++	rm -rf $(DESTDIR)$(pkgincludedir) $(DESTDIR)$(exec_prefix)/libdata/pkgconfig/libdar$(LIBDAR_SUFFIX).pc
+ 
+ all-local : libdar.pc
+ 
+diff -ur src-orig/libdar/Makefile.in src/libdar/Makefile.in
+--- src-orig/libdar/Makefile.in	Thu Apr 20 11:41:47 2006
++++ src/libdar/Makefile.in	Thu Apr 20 11:43:34 2006
+@@ -642,11 +642,11 @@
+ 	grep DAR $(DESTDIR)$(pkgincludedir)/config.h | grep -v "#undef" >  $(DESTDIR)$(pkgincludedir)/config.h.tmp
+ 	mv  $(DESTDIR)$(pkgincludedir)/config.h.tmp  $(DESTDIR)$(pkgincludedir)/config.h
+ 	chmod 0644 $(DESTDIR)$(pkgincludedir)/*
+-	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
+-	$(INSTALL) -m 0644 libdar.pc $(DESTDIR)$(libdir)/pkgconfig/libdar$(LIBDAR_SUFFIX).pc
++	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/libdata/pkgconfig
++	$(INSTALL) -m 0644 libdar.pc $(DESTDIR)$(exec_prefix)/libdata/pkgconfig/libdar$(LIBDAR_SUFFIX).pc
+ 
+ uninstall-local:
+-	rm -rf $(DESTDIR)$(pkgincludedir) $(DESTDIR)$(libdir)/pkgconfig/libdar$(LIBDAR_SUFFIX).pc
++	rm -rf $(DESTDIR)$(pkgincludedir) $(DESTDIR)$(exec_prefix)/libdata/pkgconfig/libdar$(LIBDAR_SUFFIX).pc
+ 
+ all-local : libdar.pc
diff --git a/sysutils/dar/pkg-descr b/sysutils/dar/pkg-descr
index 38afbc61d025..46ade6487a52 100644
--- a/sysutils/dar/pkg-descr
+++ b/sysutils/dar/pkg-descr
@@ -1,9 +1,10 @@
-DAR is a command-line backup tool, that uses compression,
-makes differential or full backups, which can be split over
-several files or disks. Dar saves *all* UNIX inode types,
-hard links, as well as Extended Attributes.
-And many other features ...
+dar is a shell command that backs up directory trees and files. It has been
+tested under Linux, Windows, Solaris, FreeBSD, NetBSD, MacOS X and several
+other systems, it is released under the GNU General Public License (GPL).
+Since version 2.0.0 an Application Interface (API) is available, opening the
+way for external/independent Graphical User Interfaces (GUIs) like kdar.
+This API relies on the libdar library, which is the core part of DAR
+programs; as such, the API is released under the GPL. Consequently, to use
+the API, your program must be released under the GPL as well.
 
 WWW: http://dar.linux.free.fr/
-
-Author: Denis Corbin <edrusb@users.sourceforge.net>
diff --git a/sysutils/dar/pkg-plist b/sysutils/dar/pkg-plist
index b78257008b8b..158a76f70f2e 100644
--- a/sysutils/dar/pkg-plist
+++ b/sysutils/dar/pkg-plist
@@ -1,58 +1,90 @@
-bin/dar
-bin/dar_cp
-bin/dar_manager
-bin/dar_slave
-bin/dar_xform
-include/dar/archive.hpp
-include/dar/catalogue.hpp
-include/dar/compressor.hpp
+lib/libdar.so.4
+lib/libdar.so
+lib/libdar.la
+lib/libdar.a
+libdata/pkgconfig/libdar.pc
 include/dar/config.h
-include/dar/crypto.hpp
-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
-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/mask.hpp
+include/dar/integers.hpp
 include/dar/real_infinint.hpp
-include/dar/scrambler.hpp
-include/dar/special_alloc.hpp
 include/dar/statistics.hpp
+include/dar/user_interaction.hpp
+include/dar/erreurs.hpp
+include/dar/deci.hpp
+include/dar/limitint.hpp
+include/dar/infinint.hpp
+include/dar/compressor.hpp
+include/dar/special_alloc.hpp
+include/dar/generic_file.hpp
+include/dar/wrapperlib.hpp
 include/dar/storage.hpp
-include/dar/thread_cancellation.hpp
+include/dar/tuyau.hpp
 include/dar/tools.hpp
+include/dar/catalogue.hpp
+include/dar/scrambler.hpp
+include/dar/archive.hpp
+include/dar/header_version.hpp
+include/dar/ea.hpp
+include/dar/crypto.hpp
+include/dar/int_tools.hpp
+include/dar/thread_cancellation.hpp
 include/dar/tronconneuse.hpp
-include/dar/tuyau.hpp
-include/dar/user_interaction.hpp
-include/dar/wrapperlib.hpp
-lib/libdar.a
-lib/libdar.la
-lib/libdar.so
-lib/libdar.so.3
-%%DATADIR%%/FAQ
-%%DATADIR%%/FEATURES
-%%DATADIR%%/GOOD_BACKUP_PRACTICE
-%%DATADIR%%/LIMITATIONS
-%%DATADIR%%/LINKS
-%%DATADIR%%/NOTES
-%%DATADIR%%/README
-%%DATADIR%%/TUTORIAL
-%%DATADIR%%/api_tutorial.html
-%%DATADIR%%/dar-differential-backup-mini-howto.en.html
-%%DATADIR%%/dar-differential-backup-mini-howto.es.html
-%%DATADIR%%/dar-differential-backup-mini-howto.it.html
-%%DATADIR%%/dar_par.dcf
-%%DATADIR%%/dar_par_create.duc
-%%DATADIR%%/dar_par_test.duc
-%%NLS%%share/locale/fr/LC_MESSAGES/dar.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/dar.mo
-@dirrm %%DATADIR%%
+include/dar/mask_list.hpp
+include/dar/database.hpp
+include/dar/data_tree.hpp
+include/dar/string_file.hpp
+include/dar/gettext.h
+include/dar/my_config.h
+bin/dar
+bin/dar_xform
+bin/dar_slave
+bin/dar_manager
+bin/dar_cp
+
+%%DOCSDIR%%/samples/dar_par.dcf
+%%DOCSDIR%%/samples/cdbackup.sh
+%%DOCSDIR%%/samples/darrc_sample
+%%DOCSDIR%%/samples/sample1.txt
+%%DOCSDIR%%/samples/README
+%%DOCSDIR%%/samples/pause_every_n_slice.duc
+%%DOCSDIR%%/samples/automatic_backup
+%%DOCSDIR%%/samples/automatic_backup.txt
+%%DOCSDIR%%/samples/dar_backup
+%%DOCSDIR%%/samples/dar_rqck.bash
+%%DOCSDIR%%/samples/JH-dar-make_user_backup.sh
+%%DOCSDIR%%/samples/JH-readme.txt
+%%DOCSDIR%%/samples/JH_dar_archiver.options
+%%DOCSDIR%%/samples/JH_darrc
+%%DOCSDIR%%/samples/cluster_digital_backups.sh
+%%DOCSDIR%%/samples/cluster_digital_readme.txt
+%%DOCSDIR%%/samples/index.html
+%%DOCSDIR%%/samples/dar_par_create.duc
+%%DOCSDIR%%/samples/dar_par_test.duc
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/mini-howto/dar-differential-backup-mini-howto.en.html
+%%DOCSDIR%%/mini-howto/dar-differential-backup-mini-howto.it.html
+%%DOCSDIR%%/mini-howto/dar-differential-backup-mini-howto.es.html
+%%DOCSDIR%%/mini-howto/index.html
+%%DOCSDIR%%/mini-howto/README
+%%DOCSDIR%%/COMMAND_LINE
+%%DOCSDIR%%/README
+%%DOCSDIR%%/Features.html
+%%DOCSDIR%%/Limitations.html
+%%DOCSDIR%%/Notes.html
+%%DOCSDIR%%/Tutorial.html
+%%DOCSDIR%%/Good_Backup_Practice.html
+%%DOCSDIR%%/FAQ.html
+%%DOCSDIR%%/api_tutorial.html
+%%DOCSDIR%%/dar_doc.jpg
+%%DOCSDIR%%/dar_s_doc.jpg
+%%DOCSDIR%%/dar-catalog-1.0.dtd
+%%DOCSDIR%%/Known_Bugs.html
+%%DOCSDIR%%/authentification.html
+%%DOCSDIR%%/dar_key.txt
+
 @dirrm include/dar
+@dirrm %%DOCSDIR%%/samples
+@dirrm %%DOCSDIR%%/mini-howto
+@dirrm %%DOCSDIR%%