diff options
28 files changed, 128 insertions, 172 deletions
diff --git a/misc/amanda-client/Makefile b/misc/amanda-client/Makefile index 6af1cc3c3b1f..9de355565384 100644 --- a/misc/amanda-client/Makefile +++ b/misc/amanda-client/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ${MASTERPORTNAME:S/-server/-client/g} -PORTREVISION= 3 +PORTREVISION= 0 MASTERDIR= ${.CURDIR}/../amanda-server COMMENT= The Advanced Maryland Automatic Network Disk Archiver (client) diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile index 7f088b4ed7ad..ef10443fe5ec 100644 --- a/misc/amanda-server/Makefile +++ b/misc/amanda-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 2.4.4p2 +PORTVERSION= 2.4.4p4 PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= misc @@ -22,7 +22,7 @@ SLAVEDIRS= misc/amanda-client MASTERPORTNAME= amanda-server NO_LATEST_LINK= yes -USE_AUTOCONF_VER= 253 +USE_AUTOCONF_VER= 259 USE_GMAKE= yes PATCH_STRIP= diff --git a/misc/amanda-server/distinfo b/misc/amanda-server/distinfo index f0fdc886458b..fe1c22a4fcf5 100644 --- a/misc/amanda-server/distinfo +++ b/misc/amanda-server/distinfo @@ -1,2 +1,2 @@ -MD5 (amanda-2.4.4p2.tar.gz) = 95f772203801999bd4b96606859f8910 -SIZE (amanda-2.4.4p2.tar.gz) = 1263075 +MD5 (amanda-2.4.4p4.tar.gz) = 3c1d80de30b97a892b7972781c5fb557 +SIZE (amanda-2.4.4p4.tar.gz) = 1422735 diff --git a/misc/amanda-server/files/patch-aa b/misc/amanda-server/files/patch-aa index fb82d3eb80fc..c5029f0fdfde 100644 --- a/misc/amanda-server/files/patch-aa +++ b/misc/amanda-server/files/patch-aa @@ -1,21 +1,20 @@ ---- man/Makefile.in.orig Sat Nov 25 09:02:01 2000 -+++ man/Makefile.in Wed Jan 31 06:45:07 2001 -@@ -151,7 +151,7 @@ - - @WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = @WANT_AMPLOT_TRUE@amplot.8 - +--- man/Makefile.in.orig Fri Oct 22 09:12:40 2004 ++++ man/Makefile.in Mon Nov 8 06:24:40 2004 +@@ -254,7 +254,7 @@ + target_os = @target_os@ + target_vendor = @target_vendor@ + @WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = amplot.8 -COMMON_MAN_PAGES = amanda.8 -+@WANT_CLIENT_TRUE@COMMON_MAN_PAGES = @WANT_CLIENT_TRUE@amanda.8 - - @WANT_SERVER_TRUE@SERVER_MAN_PAGES = @WANT_SERVER_TRUE@amadmin.8 \ ++@WANT_CLIENT_TRUE@COMMON_MAN_PAGES = amanda.8 + @WANT_SERVER_TRUE@SERVER_MAN_PAGES = amadmin.8 \ @WANT_SERVER_TRUE@ amcheck.8 \ -@@ -171,7 +171,7 @@ + @WANT_SERVER_TRUE@ amcheckdb.8 \ +@@ -276,7 +276,7 @@ + @WANT_SERVER_TRUE@ amverifyrun.8 @WANT_RECOVER_TRUE@RECOVER_MAN_PAGES = amrecover.8 - -@WANT_RESTORE_TRUE@RESTORE_MAN_PAGES = amrestore.8 - -+@WANT_CLIENT_TRUE@RESTORE_MAN_PAGES = @WANT_CLIENT_TRUE@amrestore.8 ++@WANT_CLIENT_TRUE@RESTORE_MAN_PAGES = amrestore.8 # not autoconf-generated: - EXTRA_DIST = amplot.8 amrestore.8 amtape.8 + EXTRA_DIST = amplot.8 amrestore.8 amtape.8 amdd.8 ammt.8 diff --git a/misc/amanda-server/files/patch-ac b/misc/amanda-server/files/patch-ac index 3e2977e53a1f..c2af6273b054 100644 --- a/misc/amanda-server/files/patch-ac +++ b/misc/amanda-server/files/patch-ac @@ -1,22 +1,11 @@ ---- tape-src/Makefile.in.orig Mon Feb 24 21:45:25 2003 -+++ tape-src/Makefile.in Tue Apr 15 19:54:39 2003 -@@ -158,7 +158,8 @@ - lib_LTLIBRARIES = libamtape.la - LIB_EXTENSION = la - --sbin_PROGRAMS = ammt amdd amtapetype -+@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt amdd amtapetype -+@WANT_CLIENT_TRUE@sbin_PROGRAMS = - - libamtape_la_SOURCES = output-file.c \ - output-null.c \ -@@ -215,7 +216,8 @@ - output-tape.lo tapeio.lo - libamtape_la_OBJECTS = $(am_libamtape_la_OBJECTS) - EXTRA_PROGRAMS = amtapeio$(EXEEXT) +--- tape-src/Makefile.in.orig Fri Oct 22 09:12:42 2004 ++++ tape-src/Makefile.in Mon Nov 8 06:27:54 2004 +@@ -41,7 +41,7 @@ + PRE_UNINSTALL = : + POST_UNINSTALL = : + host_triplet = @host@ -sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT) +@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT) -+@WANT_CLIENT_TRUE@sbin_PROGRAMS = - PROGRAMS = $(sbin_PROGRAMS) - - amdd_SOURCES = amdd.c + EXTRA_PROGRAMS = $(am__EXEEXT_1) + subdir = tape-src + DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ diff --git a/misc/amanda-server/pkg-plist b/misc/amanda-server/pkg-plist index a8d761929fa0..28d4c84c1a0f 100644 --- a/misc/amanda-server/pkg-plist +++ b/misc/amanda-server/pkg-plist @@ -1,8 +1,8 @@ -lib/libamserver-2.4.4p2.so +lib/libamserver-2.4.4p4.so lib/libamserver.so lib/libamserver.la lib/libamserver.a -lib/libamtape-2.4.4p2.so +lib/libamtape-2.4.4p4.so lib/libamtape.so lib/libamtape.la lib/libamtape.a @@ -18,6 +18,7 @@ libexec/amanda/amtrmlog libexec/amanda/chg-chio libexec/amanda/chg-chs libexec/amanda/chg-disk +libexec/amanda/chg-iomega libexec/amanda/chg-juke libexec/amanda/chg-manual libexec/amanda/chg-mcutil diff --git a/misc/amanda-server/pkg-plist.client b/misc/amanda-server/pkg-plist.client index 2e7306c851f5..a740f71856fd 100644 --- a/misc/amanda-server/pkg-plist.client +++ b/misc/amanda-server/pkg-plist.client @@ -1,8 +1,8 @@ -lib/libamanda-2.4.4p2.so +lib/libamanda-2.4.4p4.so lib/libamanda.so lib/libamanda.la lib/libamanda.a -lib/libamclient-2.4.4p2.so +lib/libamclient-2.4.4p4.so lib/libamclient.so lib/libamclient.la lib/libamclient.a diff --git a/misc/amanda25-client/Makefile b/misc/amanda25-client/Makefile index 6af1cc3c3b1f..9de355565384 100644 --- a/misc/amanda25-client/Makefile +++ b/misc/amanda25-client/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ${MASTERPORTNAME:S/-server/-client/g} -PORTREVISION= 3 +PORTREVISION= 0 MASTERDIR= ${.CURDIR}/../amanda-server COMMENT= The Advanced Maryland Automatic Network Disk Archiver (client) diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile index 7f088b4ed7ad..ef10443fe5ec 100644 --- a/misc/amanda25-server/Makefile +++ b/misc/amanda25-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 2.4.4p2 +PORTVERSION= 2.4.4p4 PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= misc @@ -22,7 +22,7 @@ SLAVEDIRS= misc/amanda-client MASTERPORTNAME= amanda-server NO_LATEST_LINK= yes -USE_AUTOCONF_VER= 253 +USE_AUTOCONF_VER= 259 USE_GMAKE= yes PATCH_STRIP= diff --git a/misc/amanda25-server/distinfo b/misc/amanda25-server/distinfo index f0fdc886458b..fe1c22a4fcf5 100644 --- a/misc/amanda25-server/distinfo +++ b/misc/amanda25-server/distinfo @@ -1,2 +1,2 @@ -MD5 (amanda-2.4.4p2.tar.gz) = 95f772203801999bd4b96606859f8910 -SIZE (amanda-2.4.4p2.tar.gz) = 1263075 +MD5 (amanda-2.4.4p4.tar.gz) = 3c1d80de30b97a892b7972781c5fb557 +SIZE (amanda-2.4.4p4.tar.gz) = 1422735 diff --git a/misc/amanda25-server/files/patch-aa b/misc/amanda25-server/files/patch-aa index fb82d3eb80fc..c5029f0fdfde 100644 --- a/misc/amanda25-server/files/patch-aa +++ b/misc/amanda25-server/files/patch-aa @@ -1,21 +1,20 @@ ---- man/Makefile.in.orig Sat Nov 25 09:02:01 2000 -+++ man/Makefile.in Wed Jan 31 06:45:07 2001 -@@ -151,7 +151,7 @@ - - @WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = @WANT_AMPLOT_TRUE@amplot.8 - +--- man/Makefile.in.orig Fri Oct 22 09:12:40 2004 ++++ man/Makefile.in Mon Nov 8 06:24:40 2004 +@@ -254,7 +254,7 @@ + target_os = @target_os@ + target_vendor = @target_vendor@ + @WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = amplot.8 -COMMON_MAN_PAGES = amanda.8 -+@WANT_CLIENT_TRUE@COMMON_MAN_PAGES = @WANT_CLIENT_TRUE@amanda.8 - - @WANT_SERVER_TRUE@SERVER_MAN_PAGES = @WANT_SERVER_TRUE@amadmin.8 \ ++@WANT_CLIENT_TRUE@COMMON_MAN_PAGES = amanda.8 + @WANT_SERVER_TRUE@SERVER_MAN_PAGES = amadmin.8 \ @WANT_SERVER_TRUE@ amcheck.8 \ -@@ -171,7 +171,7 @@ + @WANT_SERVER_TRUE@ amcheckdb.8 \ +@@ -276,7 +276,7 @@ + @WANT_SERVER_TRUE@ amverifyrun.8 @WANT_RECOVER_TRUE@RECOVER_MAN_PAGES = amrecover.8 - -@WANT_RESTORE_TRUE@RESTORE_MAN_PAGES = amrestore.8 - -+@WANT_CLIENT_TRUE@RESTORE_MAN_PAGES = @WANT_CLIENT_TRUE@amrestore.8 ++@WANT_CLIENT_TRUE@RESTORE_MAN_PAGES = amrestore.8 # not autoconf-generated: - EXTRA_DIST = amplot.8 amrestore.8 amtape.8 + EXTRA_DIST = amplot.8 amrestore.8 amtape.8 amdd.8 ammt.8 diff --git a/misc/amanda25-server/files/patch-ac b/misc/amanda25-server/files/patch-ac index 3e2977e53a1f..c2af6273b054 100644 --- a/misc/amanda25-server/files/patch-ac +++ b/misc/amanda25-server/files/patch-ac @@ -1,22 +1,11 @@ ---- tape-src/Makefile.in.orig Mon Feb 24 21:45:25 2003 -+++ tape-src/Makefile.in Tue Apr 15 19:54:39 2003 -@@ -158,7 +158,8 @@ - lib_LTLIBRARIES = libamtape.la - LIB_EXTENSION = la - --sbin_PROGRAMS = ammt amdd amtapetype -+@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt amdd amtapetype -+@WANT_CLIENT_TRUE@sbin_PROGRAMS = - - libamtape_la_SOURCES = output-file.c \ - output-null.c \ -@@ -215,7 +216,8 @@ - output-tape.lo tapeio.lo - libamtape_la_OBJECTS = $(am_libamtape_la_OBJECTS) - EXTRA_PROGRAMS = amtapeio$(EXEEXT) +--- tape-src/Makefile.in.orig Fri Oct 22 09:12:42 2004 ++++ tape-src/Makefile.in Mon Nov 8 06:27:54 2004 +@@ -41,7 +41,7 @@ + PRE_UNINSTALL = : + POST_UNINSTALL = : + host_triplet = @host@ -sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT) +@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT) -+@WANT_CLIENT_TRUE@sbin_PROGRAMS = - PROGRAMS = $(sbin_PROGRAMS) - - amdd_SOURCES = amdd.c + EXTRA_PROGRAMS = $(am__EXEEXT_1) + subdir = tape-src + DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ diff --git a/misc/amanda25-server/pkg-plist b/misc/amanda25-server/pkg-plist index a8d761929fa0..28d4c84c1a0f 100644 --- a/misc/amanda25-server/pkg-plist +++ b/misc/amanda25-server/pkg-plist @@ -1,8 +1,8 @@ -lib/libamserver-2.4.4p2.so +lib/libamserver-2.4.4p4.so lib/libamserver.so lib/libamserver.la lib/libamserver.a -lib/libamtape-2.4.4p2.so +lib/libamtape-2.4.4p4.so lib/libamtape.so lib/libamtape.la lib/libamtape.a @@ -18,6 +18,7 @@ libexec/amanda/amtrmlog libexec/amanda/chg-chio libexec/amanda/chg-chs libexec/amanda/chg-disk +libexec/amanda/chg-iomega libexec/amanda/chg-juke libexec/amanda/chg-manual libexec/amanda/chg-mcutil diff --git a/misc/amanda25-server/pkg-plist.client b/misc/amanda25-server/pkg-plist.client index 2e7306c851f5..a740f71856fd 100644 --- a/misc/amanda25-server/pkg-plist.client +++ b/misc/amanda25-server/pkg-plist.client @@ -1,8 +1,8 @@ -lib/libamanda-2.4.4p2.so +lib/libamanda-2.4.4p4.so lib/libamanda.so lib/libamanda.la lib/libamanda.a -lib/libamclient-2.4.4p2.so +lib/libamclient-2.4.4p4.so lib/libamclient.so lib/libamclient.la lib/libamclient.a diff --git a/misc/amanda26-client/Makefile b/misc/amanda26-client/Makefile index 6af1cc3c3b1f..9de355565384 100644 --- a/misc/amanda26-client/Makefile +++ b/misc/amanda26-client/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ${MASTERPORTNAME:S/-server/-client/g} -PORTREVISION= 3 +PORTREVISION= 0 MASTERDIR= ${.CURDIR}/../amanda-server COMMENT= The Advanced Maryland Automatic Network Disk Archiver (client) diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile index 7f088b4ed7ad..ef10443fe5ec 100644 --- a/misc/amanda26-server/Makefile +++ b/misc/amanda26-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 2.4.4p2 +PORTVERSION= 2.4.4p4 PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= misc @@ -22,7 +22,7 @@ SLAVEDIRS= misc/amanda-client MASTERPORTNAME= amanda-server NO_LATEST_LINK= yes -USE_AUTOCONF_VER= 253 +USE_AUTOCONF_VER= 259 USE_GMAKE= yes PATCH_STRIP= diff --git a/misc/amanda26-server/distinfo b/misc/amanda26-server/distinfo index f0fdc886458b..fe1c22a4fcf5 100644 --- a/misc/amanda26-server/distinfo +++ b/misc/amanda26-server/distinfo @@ -1,2 +1,2 @@ -MD5 (amanda-2.4.4p2.tar.gz) = 95f772203801999bd4b96606859f8910 -SIZE (amanda-2.4.4p2.tar.gz) = 1263075 +MD5 (amanda-2.4.4p4.tar.gz) = 3c1d80de30b97a892b7972781c5fb557 +SIZE (amanda-2.4.4p4.tar.gz) = 1422735 diff --git a/misc/amanda26-server/files/patch-aa b/misc/amanda26-server/files/patch-aa index fb82d3eb80fc..c5029f0fdfde 100644 --- a/misc/amanda26-server/files/patch-aa +++ b/misc/amanda26-server/files/patch-aa @@ -1,21 +1,20 @@ ---- man/Makefile.in.orig Sat Nov 25 09:02:01 2000 -+++ man/Makefile.in Wed Jan 31 06:45:07 2001 -@@ -151,7 +151,7 @@ - - @WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = @WANT_AMPLOT_TRUE@amplot.8 - +--- man/Makefile.in.orig Fri Oct 22 09:12:40 2004 ++++ man/Makefile.in Mon Nov 8 06:24:40 2004 +@@ -254,7 +254,7 @@ + target_os = @target_os@ + target_vendor = @target_vendor@ + @WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = amplot.8 -COMMON_MAN_PAGES = amanda.8 -+@WANT_CLIENT_TRUE@COMMON_MAN_PAGES = @WANT_CLIENT_TRUE@amanda.8 - - @WANT_SERVER_TRUE@SERVER_MAN_PAGES = @WANT_SERVER_TRUE@amadmin.8 \ ++@WANT_CLIENT_TRUE@COMMON_MAN_PAGES = amanda.8 + @WANT_SERVER_TRUE@SERVER_MAN_PAGES = amadmin.8 \ @WANT_SERVER_TRUE@ amcheck.8 \ -@@ -171,7 +171,7 @@ + @WANT_SERVER_TRUE@ amcheckdb.8 \ +@@ -276,7 +276,7 @@ + @WANT_SERVER_TRUE@ amverifyrun.8 @WANT_RECOVER_TRUE@RECOVER_MAN_PAGES = amrecover.8 - -@WANT_RESTORE_TRUE@RESTORE_MAN_PAGES = amrestore.8 - -+@WANT_CLIENT_TRUE@RESTORE_MAN_PAGES = @WANT_CLIENT_TRUE@amrestore.8 ++@WANT_CLIENT_TRUE@RESTORE_MAN_PAGES = amrestore.8 # not autoconf-generated: - EXTRA_DIST = amplot.8 amrestore.8 amtape.8 + EXTRA_DIST = amplot.8 amrestore.8 amtape.8 amdd.8 ammt.8 diff --git a/misc/amanda26-server/files/patch-ac b/misc/amanda26-server/files/patch-ac index 3e2977e53a1f..c2af6273b054 100644 --- a/misc/amanda26-server/files/patch-ac +++ b/misc/amanda26-server/files/patch-ac @@ -1,22 +1,11 @@ ---- tape-src/Makefile.in.orig Mon Feb 24 21:45:25 2003 -+++ tape-src/Makefile.in Tue Apr 15 19:54:39 2003 -@@ -158,7 +158,8 @@ - lib_LTLIBRARIES = libamtape.la - LIB_EXTENSION = la - --sbin_PROGRAMS = ammt amdd amtapetype -+@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt amdd amtapetype -+@WANT_CLIENT_TRUE@sbin_PROGRAMS = - - libamtape_la_SOURCES = output-file.c \ - output-null.c \ -@@ -215,7 +216,8 @@ - output-tape.lo tapeio.lo - libamtape_la_OBJECTS = $(am_libamtape_la_OBJECTS) - EXTRA_PROGRAMS = amtapeio$(EXEEXT) +--- tape-src/Makefile.in.orig Fri Oct 22 09:12:42 2004 ++++ tape-src/Makefile.in Mon Nov 8 06:27:54 2004 +@@ -41,7 +41,7 @@ + PRE_UNINSTALL = : + POST_UNINSTALL = : + host_triplet = @host@ -sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT) +@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT) -+@WANT_CLIENT_TRUE@sbin_PROGRAMS = - PROGRAMS = $(sbin_PROGRAMS) - - amdd_SOURCES = amdd.c + EXTRA_PROGRAMS = $(am__EXEEXT_1) + subdir = tape-src + DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ diff --git a/misc/amanda26-server/pkg-plist b/misc/amanda26-server/pkg-plist index a8d761929fa0..28d4c84c1a0f 100644 --- a/misc/amanda26-server/pkg-plist +++ b/misc/amanda26-server/pkg-plist @@ -1,8 +1,8 @@ -lib/libamserver-2.4.4p2.so +lib/libamserver-2.4.4p4.so lib/libamserver.so lib/libamserver.la lib/libamserver.a -lib/libamtape-2.4.4p2.so +lib/libamtape-2.4.4p4.so lib/libamtape.so lib/libamtape.la lib/libamtape.a @@ -18,6 +18,7 @@ libexec/amanda/amtrmlog libexec/amanda/chg-chio libexec/amanda/chg-chs libexec/amanda/chg-disk +libexec/amanda/chg-iomega libexec/amanda/chg-juke libexec/amanda/chg-manual libexec/amanda/chg-mcutil diff --git a/misc/amanda26-server/pkg-plist.client b/misc/amanda26-server/pkg-plist.client index 2e7306c851f5..a740f71856fd 100644 --- a/misc/amanda26-server/pkg-plist.client +++ b/misc/amanda26-server/pkg-plist.client @@ -1,8 +1,8 @@ -lib/libamanda-2.4.4p2.so +lib/libamanda-2.4.4p4.so lib/libamanda.so lib/libamanda.la lib/libamanda.a -lib/libamclient-2.4.4p2.so +lib/libamclient-2.4.4p4.so lib/libamclient.so lib/libamclient.la lib/libamclient.a diff --git a/misc/amanda32-client/Makefile b/misc/amanda32-client/Makefile index 6af1cc3c3b1f..9de355565384 100644 --- a/misc/amanda32-client/Makefile +++ b/misc/amanda32-client/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ${MASTERPORTNAME:S/-server/-client/g} -PORTREVISION= 3 +PORTREVISION= 0 MASTERDIR= ${.CURDIR}/../amanda-server COMMENT= The Advanced Maryland Automatic Network Disk Archiver (client) diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile index 7f088b4ed7ad..ef10443fe5ec 100644 --- a/misc/amanda32-server/Makefile +++ b/misc/amanda32-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 2.4.4p2 +PORTVERSION= 2.4.4p4 PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= misc @@ -22,7 +22,7 @@ SLAVEDIRS= misc/amanda-client MASTERPORTNAME= amanda-server NO_LATEST_LINK= yes -USE_AUTOCONF_VER= 253 +USE_AUTOCONF_VER= 259 USE_GMAKE= yes PATCH_STRIP= diff --git a/misc/amanda32-server/distinfo b/misc/amanda32-server/distinfo index f0fdc886458b..fe1c22a4fcf5 100644 --- a/misc/amanda32-server/distinfo +++ b/misc/amanda32-server/distinfo @@ -1,2 +1,2 @@ -MD5 (amanda-2.4.4p2.tar.gz) = 95f772203801999bd4b96606859f8910 -SIZE (amanda-2.4.4p2.tar.gz) = 1263075 +MD5 (amanda-2.4.4p4.tar.gz) = 3c1d80de30b97a892b7972781c5fb557 +SIZE (amanda-2.4.4p4.tar.gz) = 1422735 diff --git a/misc/amanda32-server/files/patch-aa b/misc/amanda32-server/files/patch-aa index fb82d3eb80fc..c5029f0fdfde 100644 --- a/misc/amanda32-server/files/patch-aa +++ b/misc/amanda32-server/files/patch-aa @@ -1,21 +1,20 @@ ---- man/Makefile.in.orig Sat Nov 25 09:02:01 2000 -+++ man/Makefile.in Wed Jan 31 06:45:07 2001 -@@ -151,7 +151,7 @@ - - @WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = @WANT_AMPLOT_TRUE@amplot.8 - +--- man/Makefile.in.orig Fri Oct 22 09:12:40 2004 ++++ man/Makefile.in Mon Nov 8 06:24:40 2004 +@@ -254,7 +254,7 @@ + target_os = @target_os@ + target_vendor = @target_vendor@ + @WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = amplot.8 -COMMON_MAN_PAGES = amanda.8 -+@WANT_CLIENT_TRUE@COMMON_MAN_PAGES = @WANT_CLIENT_TRUE@amanda.8 - - @WANT_SERVER_TRUE@SERVER_MAN_PAGES = @WANT_SERVER_TRUE@amadmin.8 \ ++@WANT_CLIENT_TRUE@COMMON_MAN_PAGES = amanda.8 + @WANT_SERVER_TRUE@SERVER_MAN_PAGES = amadmin.8 \ @WANT_SERVER_TRUE@ amcheck.8 \ -@@ -171,7 +171,7 @@ + @WANT_SERVER_TRUE@ amcheckdb.8 \ +@@ -276,7 +276,7 @@ + @WANT_SERVER_TRUE@ amverifyrun.8 @WANT_RECOVER_TRUE@RECOVER_MAN_PAGES = amrecover.8 - -@WANT_RESTORE_TRUE@RESTORE_MAN_PAGES = amrestore.8 - -+@WANT_CLIENT_TRUE@RESTORE_MAN_PAGES = @WANT_CLIENT_TRUE@amrestore.8 ++@WANT_CLIENT_TRUE@RESTORE_MAN_PAGES = amrestore.8 # not autoconf-generated: - EXTRA_DIST = amplot.8 amrestore.8 amtape.8 + EXTRA_DIST = amplot.8 amrestore.8 amtape.8 amdd.8 ammt.8 diff --git a/misc/amanda32-server/files/patch-ac b/misc/amanda32-server/files/patch-ac index 3e2977e53a1f..c2af6273b054 100644 --- a/misc/amanda32-server/files/patch-ac +++ b/misc/amanda32-server/files/patch-ac @@ -1,22 +1,11 @@ ---- tape-src/Makefile.in.orig Mon Feb 24 21:45:25 2003 -+++ tape-src/Makefile.in Tue Apr 15 19:54:39 2003 -@@ -158,7 +158,8 @@ - lib_LTLIBRARIES = libamtape.la - LIB_EXTENSION = la - --sbin_PROGRAMS = ammt amdd amtapetype -+@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt amdd amtapetype -+@WANT_CLIENT_TRUE@sbin_PROGRAMS = - - libamtape_la_SOURCES = output-file.c \ - output-null.c \ -@@ -215,7 +216,8 @@ - output-tape.lo tapeio.lo - libamtape_la_OBJECTS = $(am_libamtape_la_OBJECTS) - EXTRA_PROGRAMS = amtapeio$(EXEEXT) +--- tape-src/Makefile.in.orig Fri Oct 22 09:12:42 2004 ++++ tape-src/Makefile.in Mon Nov 8 06:27:54 2004 +@@ -41,7 +41,7 @@ + PRE_UNINSTALL = : + POST_UNINSTALL = : + host_triplet = @host@ -sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT) +@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT) -+@WANT_CLIENT_TRUE@sbin_PROGRAMS = - PROGRAMS = $(sbin_PROGRAMS) - - amdd_SOURCES = amdd.c + EXTRA_PROGRAMS = $(am__EXEEXT_1) + subdir = tape-src + DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ diff --git a/misc/amanda32-server/pkg-plist b/misc/amanda32-server/pkg-plist index a8d761929fa0..28d4c84c1a0f 100644 --- a/misc/amanda32-server/pkg-plist +++ b/misc/amanda32-server/pkg-plist @@ -1,8 +1,8 @@ -lib/libamserver-2.4.4p2.so +lib/libamserver-2.4.4p4.so lib/libamserver.so lib/libamserver.la lib/libamserver.a -lib/libamtape-2.4.4p2.so +lib/libamtape-2.4.4p4.so lib/libamtape.so lib/libamtape.la lib/libamtape.a @@ -18,6 +18,7 @@ libexec/amanda/amtrmlog libexec/amanda/chg-chio libexec/amanda/chg-chs libexec/amanda/chg-disk +libexec/amanda/chg-iomega libexec/amanda/chg-juke libexec/amanda/chg-manual libexec/amanda/chg-mcutil diff --git a/misc/amanda32-server/pkg-plist.client b/misc/amanda32-server/pkg-plist.client index 2e7306c851f5..a740f71856fd 100644 --- a/misc/amanda32-server/pkg-plist.client +++ b/misc/amanda32-server/pkg-plist.client @@ -1,8 +1,8 @@ -lib/libamanda-2.4.4p2.so +lib/libamanda-2.4.4p4.so lib/libamanda.so lib/libamanda.la lib/libamanda.a -lib/libamclient-2.4.4p2.so +lib/libamclient-2.4.4p4.so lib/libamclient.so lib/libamclient.la lib/libamclient.a |