Finally upgrade to 2.6.0p2.

Old 2.5.x version is repocopied as misc/amanda25-{server,client}.
If you have backup clients which cannot be upgraded to 2.6.x, use these
old ports or disable usetimestamps option (enabled by default, which
is incompatible with 2.5.x) in amanda.conf.

More minor improvements will follow.

PR:		ports/128836
Submitted by:	Goran Lowkrantz <glz@hidden-powers.com>
Urged by:	many

1 files changed, 115 insertions, 0 deletions

diff --git a/misc/amanda32-server/files/patch-perl::Makefile.in b/misc/amanda32-server/files/patch-perl::Makefile.in
new file mode 100644
index 000000000000..49f6a8c6e4c6
--- /dev/null
+++ b/misc/amanda32-server/files/patch-perl::Makefile.in
@@ -0,0 +1,115 @@
+--- perl/Makefile.in.orig	2008-08-23 03:20:01.000000000 +0900
++++ perl/Makefile.in	2008-09-02 07:36:59.000000000 +0900
+@@ -291,15 +291,15 @@
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(libCmdline_la_LDFLAGS) $(LDFLAGS) -o $@
+ @WANT_SERVER_TRUE@am_libCmdline_la_rpath = -rpath $(libCmdlinedir)
+-libConfig_la_DEPENDENCIES = libamglue.la \
+-	$(top_builddir)/common-src/libamanda.la
++@WANT_CLIENT_TRUE@libConfig_la_DEPENDENCIES = libamglue.la \
++@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
+ am_libConfig_la_OBJECTS = Config.lo $(am__objects_1)
+ libConfig_la_OBJECTS = $(am_libConfig_la_OBJECTS)
+ libConfig_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(libConfig_la_LDFLAGS) $(LDFLAGS) -o $@
+-libDebug_la_DEPENDENCIES = libamglue.la \
+-	$(top_builddir)/common-src/libamanda.la
++@WANT_CLIENT_TRUE@libDebug_la_DEPENDENCIES = libamglue.la \
++@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
+ am_libDebug_la_OBJECTS = Debug.lo $(am__objects_1)
+ libDebug_la_OBJECTS = $(am_libDebug_la_OBJECTS)
+ libDebug_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+@@ -343,22 +343,22 @@
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(libTapefile_la_LDFLAGS) $(LDFLAGS) -o $@
+ @WANT_SERVER_TRUE@am_libTapefile_la_rpath = -rpath $(libTapefiledir)
+-libTypes_la_DEPENDENCIES = libamglue.la \
+-	$(top_builddir)/common-src/libamanda.la
++@WANT_CLIENT_TRUE@libTypes_la_DEPENDENCIES = libamglue.la \
++@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
+ am_libTypes_la_OBJECTS = Types.lo $(am__objects_1)
+ libTypes_la_OBJECTS = $(am_libTypes_la_OBJECTS)
+ libTypes_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(libTypes_la_LDFLAGS) $(LDFLAGS) -o $@
+-libUtil_la_DEPENDENCIES = libamglue.la \
+-	$(top_builddir)/common-src/libamanda.la
+-am_libUtil_la_OBJECTS = Util.lo $(am__objects_1)
++@WANT_CLIENT_TRUE@libUtil_la_DEPENDENCIES = libamglue.la \
++@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
++@WANT_CLIENT_TRUE@am_libUtil_la_OBJECTS = Util.lo $(am__objects_1)
+ libUtil_la_OBJECTS = $(am_libUtil_la_OBJECTS)
+ libUtil_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(libUtil_la_LDFLAGS) $(LDFLAGS) -o $@
+ libamglue_la_LIBADD =
+-am_libamglue_la_OBJECTS = ghashtable.lo bigint.lo
++@WANT_CLIENT_TRUE@am_libamglue_la_OBJECTS = ghashtable.lo bigint.lo
+ libamglue_la_OBJECTS = $(am_libamglue_la_OBJECTS)
+ libamglue_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+@@ -914,39 +914,39 @@
+ 
+ 
+ # PACKAGE: Amanda::Debug
+-libDebugdir = $(amperldir)/auto/Amanda/Debug
+-libDebug_LTLIBRARIES = libDebug.la
+-libDebug_la_SOURCES = Amanda/Debug.c $(AMGLUE_SWG)
+-libDebug_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
+-libDebug_la_LIBADD = libamglue.la \
+-	$(top_builddir)/common-src/libamanda.la
++@WANT_CLIENT_TRUE@libDebugdir = $(amperldir)/auto/Amanda/Debug
++@WANT_CLIENT_TRUE@libDebug_LTLIBRARIES = libDebug.la
++@WANT_CLIENT_TRUE@libDebug_la_SOURCES = Amanda/Debug.c $(AMGLUE_SWG)
++@WANT_CLIENT_TRUE@libDebug_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
++@WANT_CLIENT_TRUE@libDebug_la_LIBADD = libamglue.la \
++@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
+ 
+ 
+ # PACKAGE: Amanda::Config
+-libConfigdir = $(amperldir)/auto/Amanda/Config
+-libConfig_LTLIBRARIES = libConfig.la
+-libConfig_la_SOURCES = Amanda/Config.c $(AMGLUE_SWG)
+-libConfig_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
+-libConfig_la_LIBADD = libamglue.la \
+-	$(top_builddir)/common-src/libamanda.la
++@WANT_CLIENT_TRUE@libConfigdir = $(amperldir)/auto/Amanda/Config
++@WANT_CLIENT_TRUE@libConfig_LTLIBRARIES = libConfig.la
++@WANT_CLIENT_TRUE@libConfig_la_SOURCES = Amanda/Config.c $(AMGLUE_SWG)
++@WANT_CLIENT_TRUE@libConfig_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
++@WANT_CLIENT_TRUE@libConfig_la_LIBADD = libamglue.la \
++@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
+ 
+ 
+ # PACKAGE: Amanda::Util
+-libUtildir = $(amperldir)/auto/Amanda/Util
+-libUtil_LTLIBRARIES = libUtil.la
+-libUtil_la_SOURCES = Amanda/Util.c $(AMGLUE_SWG)
+-libUtil_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
+-libUtil_la_LIBADD = libamglue.la \
+-	$(top_builddir)/common-src/libamanda.la
++@WANT_CLIENT_TRUE@libUtildir = $(amperldir)/auto/Amanda/Util
++@WANT_CLIENT_TRUE@libUtil_LTLIBRARIES = libUtil.la
++@WANT_CLIENT_TRUE@libUtil_la_SOURCES = Amanda/Util.c $(AMGLUE_SWG)
++@WANT_CLIENT_TRUE@libUtil_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
++@WANT_CLIENT_TRUE@libUtil_la_LIBADD = libamglue.la \
++@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
+ 
+ 
+ # PACKAGE: Amanda::Types
+-libTypesdir = $(amperldir)/auto/Amanda/Types
+-libTypes_LTLIBRARIES = libTypes.la
+-libTypes_la_SOURCES = Amanda/Types.c $(AMGLUE_SWG)
+-libTypes_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
+-libTypes_la_LIBADD = libamglue.la \
+-	$(top_builddir)/common-src/libamanda.la
++@WANT_CLIENT_TRUE@libTypesdir = $(amperldir)/auto/Amanda/Types
++@WANT_CLIENT_TRUE@libTypes_LTLIBRARIES = libTypes.la
++@WANT_CLIENT_TRUE@libTypes_la_SOURCES = Amanda/Types.c $(AMGLUE_SWG)
++@WANT_CLIENT_TRUE@libTypes_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
++@WANT_CLIENT_TRUE@libTypes_la_LIBADD = libamglue.la \
++@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
+ 
+ 
+ # perl doesn't use the cyg prefix and it doesn't search in the bin