- Update to 1.3.3rc1

- Don't use ?= for MAINTAINER and COMMENT (there are no slave ports)
- Remove IGNORE
- Use PLIST_SUB in place of PLIST_FILES
- Use LOCALBASE instead of hardcoding /usr/local

PR:		ports/138977
Submitted by:	Chris Petrik <c.petrik.sosa@gmail.com> (maintainer)

3 files changed, 47 insertions, 24 deletions

diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile
index 3a4d4f5ca2e2..20c9abf5eb87 100644
--- a/ftp/proftpd-devel/Makefile
+++ b/ftp/proftpd-devel/Makefile
@@ -6,9 +6,12 @@
 #
 
 PORTNAME=	proftpd
-DISTVERSION=	1.3.20080922
+DISTVERSION=	1.3.3rc1
 CATEGORIES=	ftp
-MASTER_SITES=	http://www.alaskaparadise.com/freebsd/ \
+MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
+		ftp://ftp1.at.proftpd.org/distrib/source/ \
+		ftp://ftp1.ca.proftpd.org/distrib/source/ \
+		ftp://ftp1.us.proftpd.org/distrib/source/ \
 		LOCAL/beech \
 		LOCAL/beech:clam \
 		LOCAL/beech:digest
@@ -16,14 +19,12 @@ PKGNAMESUFFIX=	-devel
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER?=	chris@officialunix.com
-COMMENT?=	Highly configurable ftp daemon
-
-IGNORE=		Please use ftp/proftpd
+MAINTAINER=	chris@officialunix.com
+COMMENT=	Highly configurable ftp daemon
 
 MAN1=	ftpcount.1 ftpwho.1 ftptop.1
 MAN5=	xferlog.5
-MAN8=	proftpd.8 ftpshut.8 ftpdctl.8
+MAN8=	proftpd.8 ftpshut.8 ftpdctl.8 ftpscrub.8
 
 PORTDOCSdoc=	Configuration.html faq.html
 PORTDOCScontrib=mod_ifsession.html mod_radius.html mod_rewrite.html \
@@ -106,7 +107,9 @@ MODULES:=${MODULES}:mod_rewrite
 MODULES:=${MODULES}:mod_wrap2
 INCLUDEDIRS:=${INCLUDEDIRS}:${WORKDIR}/include
 LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
-PLIST_FILES+=	include/proftpd/mod_wrap2.h
+PLIST_SUB+=	WRAP=""
+.else
+PLIST_SUB+=	WRAP="@comment "
 .endif
 
 .if defined(WITH_WRAP_FILE)
@@ -196,12 +199,14 @@ LIB_DEPENDS=	iodbc.3:${PORTSDIR}/databases/libiodbc
 MODULES:=${MODULES}:mod_sql_odbc
 INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
 LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
-CONFIGURE_ARGS+=LIBS=-liodbc LD_LIBRARY_PATH=/usr/local/lib LDFLAGS=-L/usr/local/lib
+CONFIGURE_ARGS+=LIBS=-liodbc LD_LIBRARY_PATH=${LOCALBASE}/lib LDFLAGS=-L${LOCALBASE}/lib
 .endif
 
 .if ${MODULES:M*mod_sql_*}
 MODULES:=mod_sql${MODULES}
-PLIST_FILES+=	include/proftpd/mod_sql.h
+PLIST_SUB+=	SQL=""
+.else
+PLIST_SUB+=	SQL="@comment "
 .endif
 
 .if defined(WITH_OPENSSL)
@@ -209,19 +214,26 @@ PLIST_FILES+=	include/proftpd/mod_sql.h
 CFLAGS+=	-DHAVE_OPENSSL -I${OPENSSLINC}
 PROFTPD_LIBS+=	-lssl -lcrypto -L${OPENSSLLIB}
 MODULES:=${MODULES}:mod_tls
+PLIST_SUB+=	TLS=""
+.else
+PLIST_SUB+=	TLS="@comment "
 .endif
 
 .if defined(WITH_CTRLS)
 CONFIGURE_ARGS+=	--enable-ctrls
-PLIST_FILES+=	sbin/ftpdctl
 .if !defined(WITHOUT_CTRLS_ADMIN)
 MODULES:=${MODULES}:mod_ctrls_admin
 .endif
+PLIST_SUB+=	CTRLS_ADMIN=""
+.else
+PLIST_SUB+=	CTRLS_ADMIN="@comment "
 .endif
 
 .if defined(WITH_QUOTA)
 MODULES:=${MODULES}:mod_quotatab:mod_quotatab_file
-PLIST_FILES+=	include/proftpd/mod_quotatab.h
+PLIST_SUB+=	QUOTA=""
+.else
+PLIST_SUB+=	QUOTA="@comment "
 .if defined(WITH_LDAP)
 MODULES:=${MODULES}:mod_quotatab_ldap
 .endif
@@ -235,18 +247,17 @@ MODULES:=${MODULES}:mod_unique_id
 .endif
 
 .if defined(WITH_CLAMAV)
-#http://www.thrallingpenguin.com/resources/mod_clamav-0.10.tar.bz2
-DISTFILES+=	mod_clamav-0.10.tar.bz2:clam
-EXTRACT_ONLY+=	mod_clamav-0.10.tar.bz2
+DISTFILES+=	mod_clamav-0.11rc.tar.gz:clam
+EXTRACT_ONLY+=	mod_clamav-0.11rc.tar.gz
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-modules_mod_xfer.c
 USE_CLAMAV=	yes
 MODULES:=${MODULES}:mod_clamav
 LIB_DEPENDS+=	clamav.6:${PORTSDIR}/security/clamav
 INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
 LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
-PLIST_SUB=	CLAMAV=""
+PLIST_SUB+=	CLAMAV=""
 .else
-PLIST_SUB=	CLAMAV="@comment "
+PLIST_SUB+=	CLAMAV="@comment "
 .endif
 
 .if defined(WITH_DIGEST)
diff --git a/ftp/proftpd-devel/distinfo b/ftp/proftpd-devel/distinfo
index 342bca346f64..651226d4a14b 100644
--- a/ftp/proftpd-devel/distinfo
+++ b/ftp/proftpd-devel/distinfo
@@ -1,9 +1,12 @@
-MD5 (proftpd-1.3.20080922.tar.bz2) = 5ee6eda1ef2beaacc01449b290e74461
-SHA256 (proftpd-1.3.20080922.tar.bz2) = 0da28a00ac939929150e99c65a2303389889fa80ace6c169b0ff5196ed2a3e3a
-SIZE (proftpd-1.3.20080922.tar.bz2) = 2330925
-MD5 (mod_clamav-0.10.tar.bz2) = 7150cde88f6c692711c007f6312bd495
-SHA256 (mod_clamav-0.10.tar.bz2) = 4f6d09979514a8b3f120890753dcf7c6247dfce0aa09d340edf8a359b031a1f4
-SIZE (mod_clamav-0.10.tar.bz2) = 5435
+MD5 (proftpd-1.3.3rc1.tar.bz2) = 23b8674208cceba595512c5d188a5f5d
+SHA256 (proftpd-1.3.3rc1.tar.bz2) = db0f658ca261f8bf8b8724b669d89d4ebe1ad26b32de4f30f7beba93a674f811
+SIZE (proftpd-1.3.3rc1.tar.bz2) = 4077391
+MD5 (mod_clamav-0.11rc.tar.gz) = 42e560ec0bd5964e13fad1b2bb7afe21
+SHA256 (mod_clamav-0.11rc.tar.gz) = 87630eb1866066d6320ee711897d8998b8f4915c0498b2e78cc0464abd34855a
+SIZE (mod_clamav-0.11rc.tar.gz) = 5115
 MD5 (mod_digest.c) = e706e66fa4d82cf7875a1a5d6767fe00
 SHA256 (mod_digest.c) = 18174e3d3c1d61367d78c228e6510b0a21c11458f389630df281bb84d467d399
 SIZE (mod_digest.c) = 39073
+MD5 (mod_sql_tds-4.11.tar.bz2) = 217d85806093f71cfe746838a7a9970d
+SHA256 (mod_sql_tds-4.11.tar.bz2) = 0fea4bc2107fb61d7ee45f3913007876f5d95d95dff00a3f355ad50437f1ecff
+SIZE (mod_sql_tds-4.11.tar.bz2)  = 11254
diff --git a/ftp/proftpd-devel/pkg-plist b/ftp/proftpd-devel/pkg-plist
index 1a3779a97dd3..8d8f960a7eb0 100644
--- a/ftp/proftpd-devel/pkg-plist
+++ b/ftp/proftpd-devel/pkg-plist
@@ -11,6 +11,7 @@ include/proftpd/bindings.h
 include/proftpd/buildstamp.h
 include/proftpd/child.h
 include/proftpd/class.h
+include/proftpd/cmd.h
 include/proftpd/compat.h
 include/proftpd/conf.h
 include/proftpd/config.h
@@ -24,6 +25,7 @@ include/proftpd/env.h
 include/proftpd/event.h
 include/proftpd/expr.h
 include/proftpd/feat.h
+include/proftpd/filter.h
 include/proftpd/fsio.h
 include/proftpd/ftp.h
 include/proftpd/glibc-glob.h
@@ -32,8 +34,12 @@ include/proftpd/inet.h
 include/proftpd/libsupp.h
 include/proftpd/log.h
 include/proftpd/mkhome.h
-%%CLAMAV%%include/proftpd/mod_clamav.h
 include/proftpd/mod_ctrls.h
+%%CLAMAV%%include/proftpd/mod_clamav.h
+%%WRAP%%include/proftpd/mod_wrap2.h
+%%SQL%%include/proftpd/mod_sql.h
+%%TLS%%include/proftpd/mod_tls.h
+%%QUOTA%%include/proftpd/mod_quotatab.h
 include/proftpd/modules.h
 include/proftpd/netacl.h
 include/proftpd/netaddr.h
@@ -49,6 +55,7 @@ include/proftpd/proftpd.h
 include/proftpd/regexp.h
 include/proftpd/response.h
 include/proftpd/scoreboard.h
+include/proftpd/session.h
 include/proftpd/sets.h
 include/proftpd/str.h
 include/proftpd/support.h
@@ -63,5 +70,7 @@ libdata/pkgconfig/proftpd.pc
 sbin/ftpshut
 sbin/in.proftpd
 sbin/proftpd
+sbin/ftpscrub
+%%CTRLS_ADMIN%%sbin/ftpdctl
 @dirrm include/proftpd
 @dirrm lib/proftpd