- Update to 1.3.2rc4

- Fix NLS knob

3 files changed, 25 insertions, 16 deletions

diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index 0875137086a1..2090c74d338b 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	proftpd
-DISTVERSION=	1.3.2rc3
-PORTREVISION=	1
+DISTVERSION=	1.3.2rc4
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
@@ -69,11 +68,11 @@ OPTIONS=	BAN "Include mod_ban (Requires CTRLS)" off \
 		CTRLS "Include controls" off \
 		DIGEST "Include mod_digest" off \
 		IFSESSION "Include mod_ifsession" on \
-		IPV6 "Use IPv6" off \
+		IPV6 "Use IPv6" on \
 		LDAP "Use LDAP" off \
 		LDAP_TLS "Use LDAP TLS (Requires LDAP, OPENSSL)" off\
 		MYSQL "MySQL auth (Can be combined with PGSQL)" off \
-		NLS "Use nls (builds mod_lang)" off \
+		NLS "Use nls (builds mod_lang)" on \
 		OPENSSL "Include mod_tls" on \
 		PGSQL "Postgres auth (Can be combined with MYSQL)" off \
 		QUOTA "Include mod_quota" off \
@@ -157,10 +156,13 @@ LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--enable-nls
 USE_GETTEXT=yes
 PROFTPD_LIBS+=	-lintl -L${LOCALBASE}/lib
+PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
 .endif
 
 #allow user to override
-MODULES?=	mod_ratio:mod_readme:mod_rewrite:mod_wrap2:mod_ifsession
+MODULES?=	mod_ratio:mod_readme:mod_rewrite:mod_wrap2:mod_ifsession:mod_lang
 
 INCLUDEDIRS?=
 LIBDIRS?=
@@ -227,9 +229,9 @@ MODULES:=${MODULES}:mod_clamav
 LIB_DEPENDS+=	clamav.5:${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/distinfo b/ftp/proftpd/distinfo
index a164097f1d2c..9c9c80293c63 100644
--- a/ftp/proftpd/distinfo
+++ b/ftp/proftpd/distinfo
@@ -1,12 +1,6 @@
-MD5 (proftpd-1.3.2rc3.tar.bz2) = 8ecfc2976aa6a5016bd4f4f6745aa3d4
-SHA256 (proftpd-1.3.2rc3.tar.bz2) = e98938c6ee38e036010d3c345facb7ebfc37a48d358aca8f311e0301747b7e94
-SIZE (proftpd-1.3.2rc3.tar.bz2) = 2407996
-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 (mod_digest.c) = e706e66fa4d82cf7875a1a5d6767fe00
-SHA256 (mod_digest.c) = 18174e3d3c1d61367d78c228e6510b0a21c11458f389630df281bb84d467d399
-SIZE (mod_digest.c) = 39073
+MD5 (proftpd-1.3.2rc4.tar.bz2) = d3dc40a21968ed0b315bf76a9022d1c4
+SHA256 (proftpd-1.3.2rc4.tar.bz2) = aede4b47bf72e0a8f7c326d8cf9dd6650b6441fb40ed093e47791eef7968db66
+SIZE (proftpd-1.3.2rc4.tar.bz2) = 2451444
 MD5 (mod_sql_tds-4.8.tar.bz2) = c5d2b59258ad99b0a4d9a28c8beefc43
 SHA256 (mod_sql_tds-4.8.tar.bz2) = bf5851d3786d756e2171c3c1a655028867dc3bd2b8429e527368931023ced406
 SIZE (mod_sql_tds-4.8.tar.bz2) = 10775
diff --git a/ftp/proftpd/pkg-plist b/ftp/proftpd/pkg-plist
index 065cd75dd9f0..ebc84b3fdb57 100644
--- a/ftp/proftpd/pkg-plist
+++ b/ftp/proftpd/pkg-plist
@@ -3,6 +3,7 @@ bin/ftpdctl
 bin/ftptop
 bin/ftpwho
 bin/prxs
+
 @unexec if cmp -s %D/etc/proftpd.conf %D/etc/proftpd.conf.sample; then rm -f %D/etc/proftpd.conf; fi
 etc/proftpd.conf.sample
 @exec cp -n %D/%F %B/proftpd.conf
@@ -63,5 +64,17 @@ libdata/pkgconfig/proftpd.pc
 sbin/ftpshut
 sbin/in.proftpd
 sbin/proftpd
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/proftpd.mo
+%%NLS%%share/locale/en_US/LC_MESSAGES/proftpd.mo
+%%NLS%%share/locale/it_IT/LC_MESSAGES/proftpd.mo
+%%NLS%%share/locale/ru_RU/LC_MESSAGES/proftpd.mo
+%%NLS%%@dirrm share/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm share/locale/en_US/LC_MESSAGES
+%%NLS%%@dirrm share/locale/it_IT/LC_MESSAGES
+%%NLS%%@dirrm share/locale/ru_RU/LC_MESSAGES
+%%NLS%%@dirrm share/locale/zh_CN
+%%NLS%%@dirrm share/locale/en_US
+%%NLS%%@dirrm share/locale/it_IT
+%%NLS%%@dirrm share/locale/ru_RU
 @dirrm include/proftpd
 @dirrmtry lib/proftpd