Attachment 64911 Details for Bug 96350 – file.diff

[patch] file.diff

file.diff (text/plain), 12.03 KB, created by Henrik Brautaset Aronsen on 2006-04-26 08:40:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Henrik Brautaset Aronsen

Created: 2006-04-26 08:40:16 UTC

Size: 12.03 KB

patch

obsolete

>diff -urP ../sysutils/dar/Makefile dar/Makefile
>--- ../sysutils/dar/Makefile	Thu Feb 23 11:39:06 2006
>+++ dar/Makefile	Wed Apr 26 08:58:23 2006
>@@ -1,43 +1,36 @@
>-# 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:        19 April 2006
>+# Whom:                freebsd-ports@henrik.synth.no
> #
>-# $FreeBSD: ports/sysutils/dar/Makefile,v 1.12 2006/02/23 10:39:06 ade Exp $
>+# $FreeBSD$
> #
> 
> PORTNAME=	dar
>-PORTVERSION=	2.2.2
>-PORTREVISION=	1
>-CATEGORIES=	sysutils
>+PORTVERSION=	2.3.0
>+CATEGORIES=	archivers sysutils
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>-MASTER_SITE_SUBDIR=${PORTNAME}
>+MASTER_SITE_SUBDIR=	dar
> 
>-MAINTAINER=	ebrandi@fugspbr.org
>-COMMENT=	A full featured command-line backup tool, aimed for disks
>+MAINTAINER=	Edson Brandi <ebrandi@fugspbr.org>
>+COMMENT=	Dar is a shell command that backs up directory trees and files
> 
>-INSTALLS_SHLIB=	yes
>+MAN1=		dar.1 dar_cp.1 dar_slave.1 dar_manager.1 dar_xform.1
>+MANCOMPRESSED=	no
> GNU_CONFIGURE=	yes
>-USE_REINPLACE=	yes
>-
>-CPPFLAGS+=	-DHAVE_DECL_GETOPT=0
>+CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man
>+CONFIGURE_ARGS+=	--disable-build-html
>+CONFIGURE_ARGS+=	--datadir=${DATADIR}
>+USE_LIBTOOL_VER=	15
>+INSTALLS_SHLIB=	yes
> 
>-.if !defined(WITHOUT_NLS)
>-USE_GETTEXT=	yes
>-PLIST_SUB+=	NLS=""
>-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-libdar-integers.hpp
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>-CONFIGURE_ARGS+=--with-libintl-prefix=${PREFIX}
>-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
>-.else
>-CONFIGURE_ARGS+=--disable-nls
>-PLIST_SUB+=	NLS="@comment "
>+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
>-
>-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}
> 
> .include <bsd.port.mk>
>diff -urP ../sysutils/dar/distinfo dar/distinfo
>--- ../sysutils/dar/distinfo	Tue Jan 24 02:06:02 2006
>+++ dar/distinfo	Wed Apr 19 16:24:23 2006
>@@ -1,3 +1,2 @@
>-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
>+SIZE (dar-2.3.0.tar.gz) = 1142646
>Only in ../sysutils/dar/files: extra-patch-src-libdar-integers.hpp
>diff -urP ../sysutils/dar/files/patch-Makefile-am dar/files/patch-Makefile-am
>--- ../sysutils/dar/files/patch-Makefile-am	Thu Jan  1 01:00:00 1970
>+++ dar/files/patch-Makefile-am	Tue Apr 25 18:04:13 2006
>@@ -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 -urP ../sysutils/dar/files/patch-Makefile-in dar/files/patch-Makefile-in
>--- ../sysutils/dar/files/patch-Makefile-in	Thu Jan  1 01:00:00 1970
>+++ dar/files/patch-Makefile-in	Tue Apr 25 18:04:05 2006
>@@ -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
>Only in ../sysutils/dar/files: patch-configure-zlib.diff
>diff -urP ../sysutils/dar/files/patch-doc-man dar/files/patch-doc-man
>--- ../sysutils/dar/files/patch-doc-man	Thu Jan  1 01:00:00 1970
>+++ dar/files/patch-doc-man	Wed Apr 19 16:05:00 2006
>@@ -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 -urP ../sysutils/dar/files/patch-src-libdar dar/files/patch-src-libdar
>--- ../sysutils/dar/files/patch-src-libdar	Thu Jan  1 01:00:00 1970
>+++ dar/files/patch-src-libdar	Thu Apr 20 12:09:30 2006
>@@ -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 -urP ../sysutils/dar/pkg-descr dar/pkg-descr
>--- ../sysutils/dar/pkg-descr	Sat Jan  3 12:53:09 2004
>+++ dar/pkg-descr	Wed Apr 19 16:05:01 2006
>@@ -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 -urP ../sysutils/dar/pkg-plist dar/pkg-plist
>--- ../sysutils/dar/pkg-plist	Thu Feb 23 11:39:06 2006
>+++ dar/pkg-plist	Tue Apr 25 18:31:30 2006
>@@ -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%%

Actions: View | Diff

Attachments on bug 96350: 64911