4 files changed, 78 insertions, 6 deletions

diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile
index 36beb6eff415..92c9f26b2346 100644
--- a/ftp/proftpd-devel/Makefile
+++ b/ftp/proftpd-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	proftpd
 DISTVERSION=	1.3.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
@@ -16,8 +16,13 @@ MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		ftp://proftpd.networkedsystems.co.uk/distrib/source/ \
 		http://mirrors.ibiblio.org/pub/mirrors/proftpd/distrib/source/ \
 		http://www.mirrorservice.org/sites/ftp.proftpd.org/distrib/source/ \
-		CENKES:clam
+		CENKES:clam \
+		http://www.smartftp.com/oss/proftpd/:digest \
+		http://lev.serebryakov.spb.ru/mod_comb/:comb\
+		LOCAL/beech:digest \
+		LOCAL/beech:comb
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	beech@FreeBSD.org
 COMMENT?=	Highly configurable ftp daemon
@@ -75,7 +80,9 @@ OPTIONS=	IPV6 "Use IPv6" off \
 		BAN "Include mod_ban (Requires CTRLS)" off \
 		NLS "Use nls (builds mod_lang)" off \
 		CYRFIX "Patch to fix cyrillic encoding" off \
-		CLAMAV "Include mod_clamav " off
+		CLAMAV "Include mod_clamav" off \
+		DIGEST "Include mod_digest" off \
+		COMB "Include mod_comb (multistream upload)" off
 
 MODULES?=
 LIBDIRS?=
@@ -215,6 +222,7 @@ MODULES:=${MODULES}:mod_quotatab_sql
 .if defined(WITH_CLAMAV)
 #http://www.uglyboxindustries.com/mod_clamav_new.c
 DISTFILES+=	mod_clamav-0.5.1.tar.bz2:clam
+EXTRACT_ONLY+=	mod_clamav-0.5.1.tar.bz2
 USE_CLAMAV=	yes
 MODULES:=${MODULES}:mod_clamav
 LIB_DEPENDS+=	clamav.3:${PORTSDIR}/security/clamav
@@ -222,6 +230,20 @@ INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
 LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
 .endif
 
+.if defined(WITH_DIGEST)
+DISTFILES+=	mod_digest.c:digest
+MODULES:=${MODULES}:mod_digest
+.endif
+
+.if defined(WITH_COMB)
+COMB_VERSION=	0.1
+DISTFILES+=	mod_comb-${COMB_VERSION}.tar.bz2:comb
+EXTRACT_ONLY+=	mod_comb-${COMB_VERSION}.tar.bz2
+MODULES:=${MODULES}:mod_comb
+PORTDOCScontrib+=mod_comb.html
+PORTDOCSreadme+=README.mod_comb
+.endif
+
 # mod_ifsession should be the last item in the modules list
 .if !defined(WITHOUT_IFSESSION)
 MODULES:=${MODULES}:mod_ifsession
@@ -248,6 +270,14 @@ post-extract:
 .if defined(WITH_CLAMAV)
 	@${MV} ${WRKDIR}/mod_clamav_new.c ${WRKSRC}/modules/mod_clamav.c
 .endif
+.if defined(WITH_DIGEST)
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/mod_digest.c ${WRKSRC}/modules/
+.endif
+.if defined(WITH_COMB)
+	@${MV} ${WRKDIR}/mod_comb-${COMB_VERSION}/mod_comb.c ${WRKSRC}/contrib/
+	@${MV} ${WRKDIR}/mod_comb-${COMB_VERSION}/README ${WRKSRC}/README.mod_comb
+	@${MV} ${WRKDIR}/mod_comb-${COMB_VERSION}/mod_comb.html ${WRKSRC}/doc/contrib/
+.endif
 
 post-patch:
 .if defined(WITH_NLS)
diff --git a/ftp/proftpd-devel/distinfo b/ftp/proftpd-devel/distinfo
index 6e9e27132d93..6539554a8c76 100644
--- a/ftp/proftpd-devel/distinfo
+++ b/ftp/proftpd-devel/distinfo
@@ -4,3 +4,9 @@ SIZE (proftpd-1.3.1.tar.bz2) = 2243888
 MD5 (mod_clamav-0.5.1.tar.bz2) = ce9e3f58f05d55d7ec98f97a69889bb8
 SHA256 (mod_clamav-0.5.1.tar.bz2) = de6779ed7a6fe8f5ab809366d7b7793c7658b513d2147c2b7ea0d530549dc92b
 SIZE (mod_clamav-0.5.1.tar.bz2) = 3054
+MD5 (mod_digest.c) = e706e66fa4d82cf7875a1a5d6767fe00
+SHA256 (mod_digest.c) = 18174e3d3c1d61367d78c228e6510b0a21c11458f389630df281bb84d467d399
+SIZE (mod_digest.c) = 39073
+MD5 (mod_comb-0.1.tar.bz2) = 99ee47c8b5147196c9a2faa4596eaae7
+SHA256 (mod_comb-0.1.tar.bz2) = 05786083c05cb3e53e3ff723b1ca2036af68d5cd9ebb26d2ae1e8009e05b77f1
+SIZE (mod_comb-0.1.tar.bz2) = 11617
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index 36beb6eff415..92c9f26b2346 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	proftpd
 DISTVERSION=	1.3.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
@@ -16,8 +16,13 @@ MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		ftp://proftpd.networkedsystems.co.uk/distrib/source/ \
 		http://mirrors.ibiblio.org/pub/mirrors/proftpd/distrib/source/ \
 		http://www.mirrorservice.org/sites/ftp.proftpd.org/distrib/source/ \
-		CENKES:clam
+		CENKES:clam \
+		http://www.smartftp.com/oss/proftpd/:digest \
+		http://lev.serebryakov.spb.ru/mod_comb/:comb\
+		LOCAL/beech:digest \
+		LOCAL/beech:comb
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	beech@FreeBSD.org
 COMMENT?=	Highly configurable ftp daemon
@@ -75,7 +80,9 @@ OPTIONS=	IPV6 "Use IPv6" off \
 		BAN "Include mod_ban (Requires CTRLS)" off \
 		NLS "Use nls (builds mod_lang)" off \
 		CYRFIX "Patch to fix cyrillic encoding" off \
-		CLAMAV "Include mod_clamav " off
+		CLAMAV "Include mod_clamav" off \
+		DIGEST "Include mod_digest" off \
+		COMB "Include mod_comb (multistream upload)" off
 
 MODULES?=
 LIBDIRS?=
@@ -215,6 +222,7 @@ MODULES:=${MODULES}:mod_quotatab_sql
 .if defined(WITH_CLAMAV)
 #http://www.uglyboxindustries.com/mod_clamav_new.c
 DISTFILES+=	mod_clamav-0.5.1.tar.bz2:clam
+EXTRACT_ONLY+=	mod_clamav-0.5.1.tar.bz2
 USE_CLAMAV=	yes
 MODULES:=${MODULES}:mod_clamav
 LIB_DEPENDS+=	clamav.3:${PORTSDIR}/security/clamav
@@ -222,6 +230,20 @@ INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
 LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
 .endif
 
+.if defined(WITH_DIGEST)
+DISTFILES+=	mod_digest.c:digest
+MODULES:=${MODULES}:mod_digest
+.endif
+
+.if defined(WITH_COMB)
+COMB_VERSION=	0.1
+DISTFILES+=	mod_comb-${COMB_VERSION}.tar.bz2:comb
+EXTRACT_ONLY+=	mod_comb-${COMB_VERSION}.tar.bz2
+MODULES:=${MODULES}:mod_comb
+PORTDOCScontrib+=mod_comb.html
+PORTDOCSreadme+=README.mod_comb
+.endif
+
 # mod_ifsession should be the last item in the modules list
 .if !defined(WITHOUT_IFSESSION)
 MODULES:=${MODULES}:mod_ifsession
@@ -248,6 +270,14 @@ post-extract:
 .if defined(WITH_CLAMAV)
 	@${MV} ${WRKDIR}/mod_clamav_new.c ${WRKSRC}/modules/mod_clamav.c
 .endif
+.if defined(WITH_DIGEST)
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/mod_digest.c ${WRKSRC}/modules/
+.endif
+.if defined(WITH_COMB)
+	@${MV} ${WRKDIR}/mod_comb-${COMB_VERSION}/mod_comb.c ${WRKSRC}/contrib/
+	@${MV} ${WRKDIR}/mod_comb-${COMB_VERSION}/README ${WRKSRC}/README.mod_comb
+	@${MV} ${WRKDIR}/mod_comb-${COMB_VERSION}/mod_comb.html ${WRKSRC}/doc/contrib/
+.endif
 
 post-patch:
 .if defined(WITH_NLS)
diff --git a/ftp/proftpd/distinfo b/ftp/proftpd/distinfo
index 6e9e27132d93..6539554a8c76 100644
--- a/ftp/proftpd/distinfo
+++ b/ftp/proftpd/distinfo
@@ -4,3 +4,9 @@ SIZE (proftpd-1.3.1.tar.bz2) = 2243888
 MD5 (mod_clamav-0.5.1.tar.bz2) = ce9e3f58f05d55d7ec98f97a69889bb8
 SHA256 (mod_clamav-0.5.1.tar.bz2) = de6779ed7a6fe8f5ab809366d7b7793c7658b513d2147c2b7ea0d530549dc92b
 SIZE (mod_clamav-0.5.1.tar.bz2) = 3054
+MD5 (mod_digest.c) = e706e66fa4d82cf7875a1a5d6767fe00
+SHA256 (mod_digest.c) = 18174e3d3c1d61367d78c228e6510b0a21c11458f389630df281bb84d467d399
+SIZE (mod_digest.c) = 39073
+MD5 (mod_comb-0.1.tar.bz2) = 99ee47c8b5147196c9a2faa4596eaae7
+SHA256 (mod_comb-0.1.tar.bz2) = 05786083c05cb3e53e3ff723b1ca2036af68d5cd9ebb26d2ae1e8009e05b77f1
+SIZE (mod_comb-0.1.tar.bz2) = 11617