Upgrade to 1.2.10rc1

Allow for slave ports

10 files changed, 26 insertions, 46 deletions

diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile
index e5ce552206a4..a41459e4264d 100644
--- a/ftp/proftpd-devel/Makefile
+++ b/ftp/proftpd-devel/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	proftpd
-PORTVERSION=	1.2.9
-PORTREVISION=	3
+PORTVERSION=	1.2.10.r1
+PORTREVISION=	0
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.net/distrib/source/ \
 		ftp://ftp.stikman.com/pub/proftpd/ \
@@ -23,10 +23,11 @@ MASTER_SITES=	ftp://ftp.proftpd.net/distrib/source/ \
 		ftp://proftpd.networkedsystems.co.uk/ \
 		ftp://www.linuxceptional.com/proftpd/ \
 		ftp://ftp.ethereal.com/mirrors/ftp.proftpd.org/ \
-		ftp://mirror.cybercomm.nl/ \
+		ftp://mirror.cybercomm.nl/
+DISTNAME=	${PORTNAME}-1.2.10rc1
 
-MAINTAINER=	mharo@FreeBSD.org
-COMMENT=	Highly configurable ftp daemon
+MAINTAINER?=	mharo@FreeBSD.org
+COMMENT?=	Highly configurable ftp daemon
 
 MAN1=	ftpcount.1 ftpwho.1 ftptop.1
 MAN5=	xferlog.5
diff --git a/ftp/proftpd-devel/distinfo b/ftp/proftpd-devel/distinfo
index 69152d3155fb..aea25c740f82 100644
--- a/ftp/proftpd-devel/distinfo
+++ b/ftp/proftpd-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (proftpd-1.2.9.tar.bz2) = 7c85503b160a36a96594ef75f3180a07
-SIZE (proftpd-1.2.9.tar.bz2) = 778953
+MD5 (proftpd-1.2.10rc1.tar.bz2) = fefde742d34b573fab56d9acbac45593
+SIZE (proftpd-1.2.10rc1.tar.bz2) = 908722
diff --git a/ftp/proftpd-devel/files/patch-af b/ftp/proftpd-devel/files/patch-af
index 102a7f802220..87c4b028f886 100644
--- a/ftp/proftpd-devel/files/patch-af
+++ b/ftp/proftpd-devel/files/patch-af
@@ -1,8 +1,8 @@
---- src/proftpd.8.orig	Wed Jul  5 23:13:50 2000
-+++ src/proftpd.8	Fri Jul 28 10:54:41 2000
+--- src/proftpd.8.in.orig	Thu May 13 23:37:05 2004
++++ src/proftpd.8.in	Thu May 13 23:37:55 2004
 @@ -22,6 +22,12 @@
  connection to the FTP service is made, or alternatively it can be run as a
- stand-alone daemon.
+ standalone daemon.
  .PP
 +.br
 +Each successful and failed ftp(1) session is logged using syslog with a
diff --git a/ftp/proftpd-devel/files/patch-ah b/ftp/proftpd-devel/files/patch-ah
index 2b9dc49f0b01..1cea5a3ce4a0 100644
--- a/ftp/proftpd-devel/files/patch-ah
+++ b/ftp/proftpd-devel/files/patch-ah
@@ -1,5 +1,5 @@
---- modules/mod_auth_unix.c.orig	Thu Mar 13 14:00:00 2003
-+++ modules/mod_auth_unix.c	Thu Mar 13 14:04:45 2003
+--- modules/mod_auth_unix.c.orig	Thu May 13 23:40:18 2004
++++ modules/mod_auth_unix.c	Thu May 13 23:40:27 2004
 @@ -57,6 +57,7 @@
  #endif /* HAVE_HPSECURITY_H or HPUX10 or HPUX11 */
  
diff --git a/ftp/proftpd-devel/files/patch-configure b/ftp/proftpd-devel/files/patch-configure
deleted file mode 100644
index 1f7399541f8d..000000000000
--- a/ftp/proftpd-devel/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.orig	Fri Mar 14 18:19:10 2003
-+++ ./configure	Fri Mar 14 18:19:25 2003
-@@ -11202,8 +11202,8 @@
-     #if HAVE_NETDB_H
-     #include <netdb.h>
-     #endif
--    #include <sys/socket.h>
-     #include <sys/types.h>
-+    #include <sys/socket.h>
- 
- int
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index e5ce552206a4..a41459e4264d 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	proftpd
-PORTVERSION=	1.2.9
-PORTREVISION=	3
+PORTVERSION=	1.2.10.r1
+PORTREVISION=	0
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.net/distrib/source/ \
 		ftp://ftp.stikman.com/pub/proftpd/ \
@@ -23,10 +23,11 @@ MASTER_SITES=	ftp://ftp.proftpd.net/distrib/source/ \
 		ftp://proftpd.networkedsystems.co.uk/ \
 		ftp://www.linuxceptional.com/proftpd/ \
 		ftp://ftp.ethereal.com/mirrors/ftp.proftpd.org/ \
-		ftp://mirror.cybercomm.nl/ \
+		ftp://mirror.cybercomm.nl/
+DISTNAME=	${PORTNAME}-1.2.10rc1
 
-MAINTAINER=	mharo@FreeBSD.org
-COMMENT=	Highly configurable ftp daemon
+MAINTAINER?=	mharo@FreeBSD.org
+COMMENT?=	Highly configurable ftp daemon
 
 MAN1=	ftpcount.1 ftpwho.1 ftptop.1
 MAN5=	xferlog.5
diff --git a/ftp/proftpd/distinfo b/ftp/proftpd/distinfo
index 69152d3155fb..aea25c740f82 100644
--- a/ftp/proftpd/distinfo
+++ b/ftp/proftpd/distinfo
@@ -1,2 +1,2 @@
-MD5 (proftpd-1.2.9.tar.bz2) = 7c85503b160a36a96594ef75f3180a07
-SIZE (proftpd-1.2.9.tar.bz2) = 778953
+MD5 (proftpd-1.2.10rc1.tar.bz2) = fefde742d34b573fab56d9acbac45593
+SIZE (proftpd-1.2.10rc1.tar.bz2) = 908722
diff --git a/ftp/proftpd/files/patch-af b/ftp/proftpd/files/patch-af
index 102a7f802220..87c4b028f886 100644
--- a/ftp/proftpd/files/patch-af
+++ b/ftp/proftpd/files/patch-af
@@ -1,8 +1,8 @@
---- src/proftpd.8.orig	Wed Jul  5 23:13:50 2000
-+++ src/proftpd.8	Fri Jul 28 10:54:41 2000
+--- src/proftpd.8.in.orig	Thu May 13 23:37:05 2004
++++ src/proftpd.8.in	Thu May 13 23:37:55 2004
 @@ -22,6 +22,12 @@
  connection to the FTP service is made, or alternatively it can be run as a
- stand-alone daemon.
+ standalone daemon.
  .PP
 +.br
 +Each successful and failed ftp(1) session is logged using syslog with a
diff --git a/ftp/proftpd/files/patch-ah b/ftp/proftpd/files/patch-ah
index 2b9dc49f0b01..1cea5a3ce4a0 100644
--- a/ftp/proftpd/files/patch-ah
+++ b/ftp/proftpd/files/patch-ah
@@ -1,5 +1,5 @@
---- modules/mod_auth_unix.c.orig	Thu Mar 13 14:00:00 2003
-+++ modules/mod_auth_unix.c	Thu Mar 13 14:04:45 2003
+--- modules/mod_auth_unix.c.orig	Thu May 13 23:40:18 2004
++++ modules/mod_auth_unix.c	Thu May 13 23:40:27 2004
 @@ -57,6 +57,7 @@
  #endif /* HAVE_HPSECURITY_H or HPUX10 or HPUX11 */
  
diff --git a/ftp/proftpd/files/patch-configure b/ftp/proftpd/files/patch-configure
deleted file mode 100644
index 1f7399541f8d..000000000000
--- a/ftp/proftpd/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.orig	Fri Mar 14 18:19:10 2003
-+++ ./configure	Fri Mar 14 18:19:25 2003
-@@ -11202,8 +11202,8 @@
-     #if HAVE_NETDB_H
-     #include <netdb.h>
-     #endif
--    #include <sys/socket.h>
-     #include <sys/types.h>
-+    #include <sys/socket.h>
- 
- int