o Update to version 2.4.2p1

o Use SourceForge master site
o Fixed if statement for OSVERSION

10 files changed, 30 insertions, 25 deletions

diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 46eded0fde59..5e5b9f7bfd61 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME?=	${MASTERPORTNAME}
-PORTVERSION=	2.4.2
+PORTVERSION=	2.4.2p1
 PORTREVISION?=	0
 CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.amanda.org/pub/amanda/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	amanda
 DISTFILES=	amanda-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	jeh@FreeBSD.org
@@ -87,9 +88,9 @@ CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 #
 # Before 4.0, pre-CAM scsiio.h existed
 .if ${OSVERSION} < 400000
-PLIST_SUB+=	SCSICHG='@comment '
-.else
 PLIST_SUB+=	SCSICHG=''
+.else
+PLIST_SUB+=	SCSICHG='@comment '
 .endif
 
 # amanda24-client part
diff --git a/misc/amanda-server/distinfo b/misc/amanda-server/distinfo
index 11c39fd7d06c..02f40e60b50c 100644
--- a/misc/amanda-server/distinfo
+++ b/misc/amanda-server/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.2.tar.gz) = b10c0ada724694d0bbc46a0d3ebee3c9
+MD5 (amanda-2.4.2p1.tar.gz) = c35e8aa916bcc53b1e2164fd975c8cf0
diff --git a/misc/amanda24-server/Makefile b/misc/amanda24-server/Makefile
index 46eded0fde59..5e5b9f7bfd61 100644
--- a/misc/amanda24-server/Makefile
+++ b/misc/amanda24-server/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME?=	${MASTERPORTNAME}
-PORTVERSION=	2.4.2
+PORTVERSION=	2.4.2p1
 PORTREVISION?=	0
 CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.amanda.org/pub/amanda/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	amanda
 DISTFILES=	amanda-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	jeh@FreeBSD.org
@@ -87,9 +88,9 @@ CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 #
 # Before 4.0, pre-CAM scsiio.h existed
 .if ${OSVERSION} < 400000
-PLIST_SUB+=	SCSICHG='@comment '
-.else
 PLIST_SUB+=	SCSICHG=''
+.else
+PLIST_SUB+=	SCSICHG='@comment '
 .endif
 
 # amanda24-client part
diff --git a/misc/amanda24-server/distinfo b/misc/amanda24-server/distinfo
index 11c39fd7d06c..02f40e60b50c 100644
--- a/misc/amanda24-server/distinfo
+++ b/misc/amanda24-server/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.2.tar.gz) = b10c0ada724694d0bbc46a0d3ebee3c9
+MD5 (amanda-2.4.2p1.tar.gz) = c35e8aa916bcc53b1e2164fd975c8cf0
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index 46eded0fde59..5e5b9f7bfd61 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME?=	${MASTERPORTNAME}
-PORTVERSION=	2.4.2
+PORTVERSION=	2.4.2p1
 PORTREVISION?=	0
 CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.amanda.org/pub/amanda/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	amanda
 DISTFILES=	amanda-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	jeh@FreeBSD.org
@@ -87,9 +88,9 @@ CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 #
 # Before 4.0, pre-CAM scsiio.h existed
 .if ${OSVERSION} < 400000
-PLIST_SUB+=	SCSICHG='@comment '
-.else
 PLIST_SUB+=	SCSICHG=''
+.else
+PLIST_SUB+=	SCSICHG='@comment '
 .endif
 
 # amanda24-client part
diff --git a/misc/amanda25-server/distinfo b/misc/amanda25-server/distinfo
index 11c39fd7d06c..02f40e60b50c 100644
--- a/misc/amanda25-server/distinfo
+++ b/misc/amanda25-server/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.2.tar.gz) = b10c0ada724694d0bbc46a0d3ebee3c9
+MD5 (amanda-2.4.2p1.tar.gz) = c35e8aa916bcc53b1e2164fd975c8cf0
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index 46eded0fde59..5e5b9f7bfd61 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME?=	${MASTERPORTNAME}
-PORTVERSION=	2.4.2
+PORTVERSION=	2.4.2p1
 PORTREVISION?=	0
 CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.amanda.org/pub/amanda/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	amanda
 DISTFILES=	amanda-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	jeh@FreeBSD.org
@@ -87,9 +88,9 @@ CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 #
 # Before 4.0, pre-CAM scsiio.h existed
 .if ${OSVERSION} < 400000
-PLIST_SUB+=	SCSICHG='@comment '
-.else
 PLIST_SUB+=	SCSICHG=''
+.else
+PLIST_SUB+=	SCSICHG='@comment '
 .endif
 
 # amanda24-client part
diff --git a/misc/amanda26-server/distinfo b/misc/amanda26-server/distinfo
index 11c39fd7d06c..02f40e60b50c 100644
--- a/misc/amanda26-server/distinfo
+++ b/misc/amanda26-server/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.2.tar.gz) = b10c0ada724694d0bbc46a0d3ebee3c9
+MD5 (amanda-2.4.2p1.tar.gz) = c35e8aa916bcc53b1e2164fd975c8cf0
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index 46eded0fde59..5e5b9f7bfd61 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME?=	${MASTERPORTNAME}
-PORTVERSION=	2.4.2
+PORTVERSION=	2.4.2p1
 PORTREVISION?=	0
 CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.amanda.org/pub/amanda/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	amanda
 DISTFILES=	amanda-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	jeh@FreeBSD.org
@@ -87,9 +88,9 @@ CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 #
 # Before 4.0, pre-CAM scsiio.h existed
 .if ${OSVERSION} < 400000
-PLIST_SUB+=	SCSICHG='@comment '
-.else
 PLIST_SUB+=	SCSICHG=''
+.else
+PLIST_SUB+=	SCSICHG='@comment '
 .endif
 
 # amanda24-client part
diff --git a/misc/amanda32-server/distinfo b/misc/amanda32-server/distinfo
index 11c39fd7d06c..02f40e60b50c 100644
--- a/misc/amanda32-server/distinfo
+++ b/misc/amanda32-server/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.2.tar.gz) = b10c0ada724694d0bbc46a0d3ebee3c9
+MD5 (amanda-2.4.2p1.tar.gz) = c35e8aa916bcc53b1e2164fd975c8cf0