18 files changed, 15 insertions, 159 deletions

diff --git a/misc/amanda-client/Makefile b/misc/amanda-client/Makefile
index 4e059afb73e2..03f4f0473ffd 100644
--- a/misc/amanda-client/Makefile
+++ b/misc/amanda-client/Makefile
@@ -6,7 +6,6 @@
 #
 
 PKGNAMESUFFIX=	-client
-PORTREVISION=	1
 
 COMMENT=	The Advanced Maryland Automatic Network Disk Archiver (client)
 
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 765a7837dfad..5eb57b9c1f44 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	amanda
-PORTVERSION=	2.6.1
-PORTREVISION=	1
+PORTVERSION=	2.6.1p1
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -59,14 +58,6 @@ CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 .endif
 
-.if defined (AMANDA_UDPPORTRANGE)
-CONFIGURE_ARGS+=	--with-udpportrange=${AMANDA_UDPPORTRANGE}
-.endif
-
-.if defined (AMANDA_TCPPORTRANGE)
-CONFIGURE_ARGS+=	--with-tcpportrange=${AMANDA_TCPPORTRANGE}
-.endif
-
 .if !defined(WITHOUT_GNUTAR)
 CONFIGURE_ARGS+=--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \
 		--with-gnutar=${LOCALBASE}/bin/gtar
@@ -91,14 +82,6 @@ pre-fetch:
 	@${ECHO} "        The default is operator"
 	@${ECHO} "    AMANDA_GROUP=group to specify the default group"
 	@${ECHO} "        The default is operator"
-	@${ECHO} "    AMANDA_TCPPORTRANGE=low,high to restrict Amanda to TCP ports"
-	@${ECHO} "        between low and high when connecting from the server"
-	@${ECHO} "        to the client for data, messages, and indexing."
-	@${ECHO} "        The default is no restriction on TCP ports."
-	@${ECHO} "    AMANDA_UDPPORTRANGE=low,high to restrict Amanda to UDP ports"
-	@${ECHO} "        between low and high when connecting from the client"
-	@${ECHO} "        to the server. Use ports below 1024."
-	@${ECHO} "        The default is no restriction on UDP ports."
 	@${ECHO} "    AMANDA_DATES=path to client amandates file"
 	@${ECHO} ""
 
@@ -189,14 +172,6 @@ pre-fetch:
 	@${ECHO} "        The default is operator"
 	@${ECHO} "    AMANDA_GROUP=group to specify the default group"
 	@${ECHO} "        The default is operator"
-	@${ECHO} "    AMANDA_TCPPORTRANGE=low,high to restrict Amanda to TCP ports"
-	@${ECHO} "        between low and high when connecting from the server"
-	@${ECHO} "        to the client for data, messages, and indexing."
-	@${ECHO} "        The default is no restriction on TCP ports."
-	@${ECHO} "    AMANDA_UDPPORTRANGE=low,high to restrict Amanda to UDP ports"
-	@${ECHO} "        between low and high when connecting from the client"
-	@${ECHO} "        to the server. Use ports below 1024."
-	@${ECHO} "        The default is no restriction on UDP ports."
 	@${ECHO} "    AMANDA_DATES=path to client amandates file"
 	@${ECHO} ""
 
diff --git a/misc/amanda-server/distinfo b/misc/amanda-server/distinfo
index 07347bda0c39..c50498ad6292 100644
--- a/misc/amanda-server/distinfo
+++ b/misc/amanda-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (amanda-2.6.1.tar.gz) = cf084afc6fd993f088c91c3ba5062b40
-SHA256 (amanda-2.6.1.tar.gz) = a7eb2874129e9289600a5fa46a27fe3b17f078977818df07cc41ac6614c4a4ff
-SIZE (amanda-2.6.1.tar.gz) = 2850868
+MD5 (amanda-2.6.1p1.tar.gz) = eae0a75f21aa708a8dccf9ea7ac1c631
+SHA256 (amanda-2.6.1p1.tar.gz) = 23e8523abe5623d4f1f5d7271460d1250309d10897e6da3af8c849bdd20ee921
+SIZE (amanda-2.6.1p1.tar.gz) = 2848295
diff --git a/misc/amanda-server/files/patch-common-src::event.c b/misc/amanda-server/files/patch-common-src::event.c
deleted file mode 100644
index 3011960848e4..000000000000
--- a/misc/amanda-server/files/patch-common-src::event.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- common-src/event.c.orig	2009-02-04 07:50:43.000000000 +0900
-+++ common-src/event.c	2009-02-04 07:50:20.000000000 +0900
-@@ -480,7 +480,7 @@
-  * some tricky race conditions and extra machinery.  Since there are few, if any,
-  * users of a glib version this old, such machinery wouldn't get much testing.
-  */
--#if (GLIB_MAJOR_VERSION < 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 6))
-+#if (1 || GLIB_MAJOR_VERSION < 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 6))
- typedef struct ChildWatchSource {
-     GSource source; /* must be the first element in the struct */
- 
diff --git a/misc/amanda-server/files/patch-man::amanda.conf.5 b/misc/amanda-server/files/patch-man::amanda.conf.5
deleted file mode 100644
index 438be98f0ab9..000000000000
--- a/misc/amanda-server/files/patch-man::amanda.conf.5
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/amanda.conf.5.orig	2009-02-03 15:08:31.000000000 +0900
-+++ man/amanda.conf.5	2009-02-03 15:10:14.000000000 +0900
-@@ -972,6 +972,8 @@
- .\}
- the width of the column itself\&. If set to a negative value, the width will be calculated on demand to fit the largest entry in this column\&.
- .RE
-+.sp
-+.RE
- .RS 4
- Here is an example:
- .sp
diff --git a/misc/amanda-server/pkg-plist b/misc/amanda-server/pkg-plist
index f18f1c829cde..655238c1d854 100644
--- a/misc/amanda-server/pkg-plist
+++ b/misc/amanda-server/pkg-plist
@@ -6,10 +6,10 @@ lib/amanda/libamserver-%%SHLIBVER%%.so
 lib/amanda/libamserver.a
 lib/amanda/libamserver.la
 lib/amanda/libamserver.so
+lib/amanda/libamxfer-%%SHLIBVER%%.so
 lib/amanda/libamxfer.a
 lib/amanda/libamxfer.la
 lib/amanda/libamxfer.so
-lib/amanda/libamxfer.so.0
 lib/amanda/librestore-%%SHLIBVER%%.so
 lib/amanda/librestore.a
 lib/amanda/librestore.la
diff --git a/misc/amanda26-client/Makefile b/misc/amanda26-client/Makefile
index 4e059afb73e2..03f4f0473ffd 100644
--- a/misc/amanda26-client/Makefile
+++ b/misc/amanda26-client/Makefile
@@ -6,7 +6,6 @@
 #
 
 PKGNAMESUFFIX=	-client
-PORTREVISION=	1
 
 COMMENT=	The Advanced Maryland Automatic Network Disk Archiver (client)
 
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index 765a7837dfad..5eb57b9c1f44 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	amanda
-PORTVERSION=	2.6.1
-PORTREVISION=	1
+PORTVERSION=	2.6.1p1
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -59,14 +58,6 @@ CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 .endif
 
-.if defined (AMANDA_UDPPORTRANGE)
-CONFIGURE_ARGS+=	--with-udpportrange=${AMANDA_UDPPORTRANGE}
-.endif
-
-.if defined (AMANDA_TCPPORTRANGE)
-CONFIGURE_ARGS+=	--with-tcpportrange=${AMANDA_TCPPORTRANGE}
-.endif
-
 .if !defined(WITHOUT_GNUTAR)
 CONFIGURE_ARGS+=--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \
 		--with-gnutar=${LOCALBASE}/bin/gtar
@@ -91,14 +82,6 @@ pre-fetch:
 	@${ECHO} "        The default is operator"
 	@${ECHO} "    AMANDA_GROUP=group to specify the default group"
 	@${ECHO} "        The default is operator"
-	@${ECHO} "    AMANDA_TCPPORTRANGE=low,high to restrict Amanda to TCP ports"
-	@${ECHO} "        between low and high when connecting from the server"
-	@${ECHO} "        to the client for data, messages, and indexing."
-	@${ECHO} "        The default is no restriction on TCP ports."
-	@${ECHO} "    AMANDA_UDPPORTRANGE=low,high to restrict Amanda to UDP ports"
-	@${ECHO} "        between low and high when connecting from the client"
-	@${ECHO} "        to the server. Use ports below 1024."
-	@${ECHO} "        The default is no restriction on UDP ports."
 	@${ECHO} "    AMANDA_DATES=path to client amandates file"
 	@${ECHO} ""
 
@@ -189,14 +172,6 @@ pre-fetch:
 	@${ECHO} "        The default is operator"
 	@${ECHO} "    AMANDA_GROUP=group to specify the default group"
 	@${ECHO} "        The default is operator"
-	@${ECHO} "    AMANDA_TCPPORTRANGE=low,high to restrict Amanda to TCP ports"
-	@${ECHO} "        between low and high when connecting from the server"
-	@${ECHO} "        to the client for data, messages, and indexing."
-	@${ECHO} "        The default is no restriction on TCP ports."
-	@${ECHO} "    AMANDA_UDPPORTRANGE=low,high to restrict Amanda to UDP ports"
-	@${ECHO} "        between low and high when connecting from the client"
-	@${ECHO} "        to the server. Use ports below 1024."
-	@${ECHO} "        The default is no restriction on UDP ports."
 	@${ECHO} "    AMANDA_DATES=path to client amandates file"
 	@${ECHO} ""
 
diff --git a/misc/amanda26-server/distinfo b/misc/amanda26-server/distinfo
index 07347bda0c39..c50498ad6292 100644
--- a/misc/amanda26-server/distinfo
+++ b/misc/amanda26-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (amanda-2.6.1.tar.gz) = cf084afc6fd993f088c91c3ba5062b40
-SHA256 (amanda-2.6.1.tar.gz) = a7eb2874129e9289600a5fa46a27fe3b17f078977818df07cc41ac6614c4a4ff
-SIZE (amanda-2.6.1.tar.gz) = 2850868
+MD5 (amanda-2.6.1p1.tar.gz) = eae0a75f21aa708a8dccf9ea7ac1c631
+SHA256 (amanda-2.6.1p1.tar.gz) = 23e8523abe5623d4f1f5d7271460d1250309d10897e6da3af8c849bdd20ee921
+SIZE (amanda-2.6.1p1.tar.gz) = 2848295
diff --git a/misc/amanda26-server/files/patch-common-src::event.c b/misc/amanda26-server/files/patch-common-src::event.c
deleted file mode 100644
index 3011960848e4..000000000000
--- a/misc/amanda26-server/files/patch-common-src::event.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- common-src/event.c.orig	2009-02-04 07:50:43.000000000 +0900
-+++ common-src/event.c	2009-02-04 07:50:20.000000000 +0900
-@@ -480,7 +480,7 @@
-  * some tricky race conditions and extra machinery.  Since there are few, if any,
-  * users of a glib version this old, such machinery wouldn't get much testing.
-  */
--#if (GLIB_MAJOR_VERSION < 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 6))
-+#if (1 || GLIB_MAJOR_VERSION < 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 6))
- typedef struct ChildWatchSource {
-     GSource source; /* must be the first element in the struct */
- 
diff --git a/misc/amanda26-server/files/patch-man::amanda.conf.5 b/misc/amanda26-server/files/patch-man::amanda.conf.5
deleted file mode 100644
index 438be98f0ab9..000000000000
--- a/misc/amanda26-server/files/patch-man::amanda.conf.5
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/amanda.conf.5.orig	2009-02-03 15:08:31.000000000 +0900
-+++ man/amanda.conf.5	2009-02-03 15:10:14.000000000 +0900
-@@ -972,6 +972,8 @@
- .\}
- the width of the column itself\&. If set to a negative value, the width will be calculated on demand to fit the largest entry in this column\&.
- .RE
-+.sp
-+.RE
- .RS 4
- Here is an example:
- .sp
diff --git a/misc/amanda26-server/pkg-plist b/misc/amanda26-server/pkg-plist
index f18f1c829cde..655238c1d854 100644
--- a/misc/amanda26-server/pkg-plist
+++ b/misc/amanda26-server/pkg-plist
@@ -6,10 +6,10 @@ lib/amanda/libamserver-%%SHLIBVER%%.so
 lib/amanda/libamserver.a
 lib/amanda/libamserver.la
 lib/amanda/libamserver.so
+lib/amanda/libamxfer-%%SHLIBVER%%.so
 lib/amanda/libamxfer.a
 lib/amanda/libamxfer.la
 lib/amanda/libamxfer.so
-lib/amanda/libamxfer.so.0
 lib/amanda/librestore-%%SHLIBVER%%.so
 lib/amanda/librestore.a
 lib/amanda/librestore.la
diff --git a/misc/amanda32-client/Makefile b/misc/amanda32-client/Makefile
index 4e059afb73e2..03f4f0473ffd 100644
--- a/misc/amanda32-client/Makefile
+++ b/misc/amanda32-client/Makefile
@@ -6,7 +6,6 @@
 #
 
 PKGNAMESUFFIX=	-client
-PORTREVISION=	1
 
 COMMENT=	The Advanced Maryland Automatic Network Disk Archiver (client)
 
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index 765a7837dfad..5eb57b9c1f44 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	amanda
-PORTVERSION=	2.6.1
-PORTREVISION=	1
+PORTVERSION=	2.6.1p1
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -59,14 +58,6 @@ CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 .endif
 
-.if defined (AMANDA_UDPPORTRANGE)
-CONFIGURE_ARGS+=	--with-udpportrange=${AMANDA_UDPPORTRANGE}
-.endif
-
-.if defined (AMANDA_TCPPORTRANGE)
-CONFIGURE_ARGS+=	--with-tcpportrange=${AMANDA_TCPPORTRANGE}
-.endif
-
 .if !defined(WITHOUT_GNUTAR)
 CONFIGURE_ARGS+=--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \
 		--with-gnutar=${LOCALBASE}/bin/gtar
@@ -91,14 +82,6 @@ pre-fetch:
 	@${ECHO} "        The default is operator"
 	@${ECHO} "    AMANDA_GROUP=group to specify the default group"
 	@${ECHO} "        The default is operator"
-	@${ECHO} "    AMANDA_TCPPORTRANGE=low,high to restrict Amanda to TCP ports"
-	@${ECHO} "        between low and high when connecting from the server"
-	@${ECHO} "        to the client for data, messages, and indexing."
-	@${ECHO} "        The default is no restriction on TCP ports."
-	@${ECHO} "    AMANDA_UDPPORTRANGE=low,high to restrict Amanda to UDP ports"
-	@${ECHO} "        between low and high when connecting from the client"
-	@${ECHO} "        to the server. Use ports below 1024."
-	@${ECHO} "        The default is no restriction on UDP ports."
 	@${ECHO} "    AMANDA_DATES=path to client amandates file"
 	@${ECHO} ""
 
@@ -189,14 +172,6 @@ pre-fetch:
 	@${ECHO} "        The default is operator"
 	@${ECHO} "    AMANDA_GROUP=group to specify the default group"
 	@${ECHO} "        The default is operator"
-	@${ECHO} "    AMANDA_TCPPORTRANGE=low,high to restrict Amanda to TCP ports"
-	@${ECHO} "        between low and high when connecting from the server"
-	@${ECHO} "        to the client for data, messages, and indexing."
-	@${ECHO} "        The default is no restriction on TCP ports."
-	@${ECHO} "    AMANDA_UDPPORTRANGE=low,high to restrict Amanda to UDP ports"
-	@${ECHO} "        between low and high when connecting from the client"
-	@${ECHO} "        to the server. Use ports below 1024."
-	@${ECHO} "        The default is no restriction on UDP ports."
 	@${ECHO} "    AMANDA_DATES=path to client amandates file"
 	@${ECHO} ""
 
diff --git a/misc/amanda32-server/distinfo b/misc/amanda32-server/distinfo
index 07347bda0c39..c50498ad6292 100644
--- a/misc/amanda32-server/distinfo
+++ b/misc/amanda32-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (amanda-2.6.1.tar.gz) = cf084afc6fd993f088c91c3ba5062b40
-SHA256 (amanda-2.6.1.tar.gz) = a7eb2874129e9289600a5fa46a27fe3b17f078977818df07cc41ac6614c4a4ff
-SIZE (amanda-2.6.1.tar.gz) = 2850868
+MD5 (amanda-2.6.1p1.tar.gz) = eae0a75f21aa708a8dccf9ea7ac1c631
+SHA256 (amanda-2.6.1p1.tar.gz) = 23e8523abe5623d4f1f5d7271460d1250309d10897e6da3af8c849bdd20ee921
+SIZE (amanda-2.6.1p1.tar.gz) = 2848295
diff --git a/misc/amanda32-server/files/patch-common-src::event.c b/misc/amanda32-server/files/patch-common-src::event.c
deleted file mode 100644
index 3011960848e4..000000000000
--- a/misc/amanda32-server/files/patch-common-src::event.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- common-src/event.c.orig	2009-02-04 07:50:43.000000000 +0900
-+++ common-src/event.c	2009-02-04 07:50:20.000000000 +0900
-@@ -480,7 +480,7 @@
-  * some tricky race conditions and extra machinery.  Since there are few, if any,
-  * users of a glib version this old, such machinery wouldn't get much testing.
-  */
--#if (GLIB_MAJOR_VERSION < 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 6))
-+#if (1 || GLIB_MAJOR_VERSION < 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 6))
- typedef struct ChildWatchSource {
-     GSource source; /* must be the first element in the struct */
- 
diff --git a/misc/amanda32-server/files/patch-man::amanda.conf.5 b/misc/amanda32-server/files/patch-man::amanda.conf.5
deleted file mode 100644
index 438be98f0ab9..000000000000
--- a/misc/amanda32-server/files/patch-man::amanda.conf.5
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/amanda.conf.5.orig	2009-02-03 15:08:31.000000000 +0900
-+++ man/amanda.conf.5	2009-02-03 15:10:14.000000000 +0900
-@@ -972,6 +972,8 @@
- .\}
- the width of the column itself\&. If set to a negative value, the width will be calculated on demand to fit the largest entry in this column\&.
- .RE
-+.sp
-+.RE
- .RS 4
- Here is an example:
- .sp
diff --git a/misc/amanda32-server/pkg-plist b/misc/amanda32-server/pkg-plist
index f18f1c829cde..655238c1d854 100644
--- a/misc/amanda32-server/pkg-plist
+++ b/misc/amanda32-server/pkg-plist
@@ -6,10 +6,10 @@ lib/amanda/libamserver-%%SHLIBVER%%.so
 lib/amanda/libamserver.a
 lib/amanda/libamserver.la
 lib/amanda/libamserver.so
+lib/amanda/libamxfer-%%SHLIBVER%%.so
 lib/amanda/libamxfer.a
 lib/amanda/libamxfer.la
 lib/amanda/libamxfer.so
-lib/amanda/libamxfer.so.0
 lib/amanda/librestore-%%SHLIBVER%%.so
 lib/amanda/librestore.a
 lib/amanda/librestore.la