Fix the "pam" option to leave out PAM when it is not wanted.

Add an "inet6" option for enabling IPv6 support.
Add a "ban" option for enabling mod_ban.
Make the "wrap" option compile all binaries successfully.
Fix generating language catalog with older versions of msgfmt.

6 files changed, 67 insertions, 9 deletions

diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile
index 18800a4f0fa..ea70c581a11 100644
--- a/net/proftpd/Makefile
+++ b/net/proftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2008/11/21 08:00:36 martti Exp $
+# $NetBSD: Makefile,v 1.51 2008/12/28 08:42:01 kim Exp $
 
 DISTNAME=		proftpd-1.3.2rc3
 #PKGREVISION=		1
@@ -8,7 +8,7 @@ MASTER_SITES=		ftp://ftp.proftpd.org/distrib/source/ \
 			ftp://ftp.fsn.hu/pub/proftpd/distrib/source/
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		martti@NetBSD.org
+MAINTAINER=		kim@tac.nyc.ny.us
 HOMEPAGE=		http://www.proftpd.org/
 COMMENT=		FTP server with Apache like configuration
 #LICENSE=		gnu-gpl-v2
diff --git a/net/proftpd/distinfo b/net/proftpd/distinfo
index b5f8351c08c..a58cf266f65 100644
--- a/net/proftpd/distinfo
+++ b/net/proftpd/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.27 2008/11/21 08:00:36 martti Exp $
+$NetBSD: distinfo,v 1.28 2008/12/28 08:42:01 kim Exp $
 
 SHA1 (proftpd-1.3.2rc3.tar.bz2) = 941e283d04e63d14f62556330b3fce75436af0b2
 RMD160 (proftpd-1.3.2rc3.tar.bz2) = 20e26b46baa42419cd0ad86899c7c3cb60dcb5e1
 Size (proftpd-1.3.2rc3.tar.bz2) = 2407996 bytes
-SHA1 (patch-aa) = e254d3a2d31ec43a408d80c8974f1b346fbc7e5a
+SHA1 (patch-aa) = 09b842233ba545a2354c4e141ddd7a5478237774
 SHA1 (patch-ab) = 08f1f4be777c3af2ce63d94d4797b4f818270306
 SHA1 (patch-ac) = 9e17ad4085860575964adbbaf956350acf39e785
+SHA1 (patch-ad) = 8ef75eadeeb57ba06c6846113e8ead4db910ae44
+SHA1 (patch-ae) = 0bf4d13e9a6c2a2c1c73ffc9fb7e6e3c3e57a8a8
diff --git a/net/proftpd/options.mk b/net/proftpd/options.mk
index 95a53ce3035..886662bae8d 100644
--- a/net/proftpd/options.mk
+++ b/net/proftpd/options.mk
@@ -1,8 +1,9 @@
-# $NetBSD: options.mk,v 1.7 2007/01/24 05:22:01 martti Exp $
+# $NetBSD: options.mk,v 1.8 2008/12/28 08:42:01 kim Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.proftpd
-PKG_SUPPORTED_OPTIONS=	pam wrap quota ldap proftpd-readme tls
+PKG_SUGGESTED_OPTIONS=	pam inet6
+PKG_SUPPORTED_OPTIONS=	pam inet6 wrap tls quota ldap proftpd-readme ban
 PKG_OPTIONS_OPTIONAL_GROUPS+=	sql
 PKG_OPTIONS_GROUP.sql=		mysql pgsql
 
@@ -11,6 +12,14 @@ PKG_OPTIONS_GROUP.sql=		mysql pgsql
 .if !empty(PKG_OPTIONS:Mpam)
 CONFIGURE_ARGS+=	--enable-auth-pam
 .include "../../mk/pam.buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-auth-pam
+.endif
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
 MODULES=	# empty
@@ -61,6 +70,10 @@ MODULES:=	${MODULES}:mod_sql:mod_sql_postgres
 MODULES:=	${MODULES}:mod_readme
 .endif
 
+.if !empty(PKG_OPTIONS:Mban)
+MODULES:=	${MODULES}:mod_ban
+.endif
+
 .if !empty(MODULES)
 CONFIGURE_ARGS+=	--with-modules=${MODULES:C/^://}
 .endif
diff --git a/net/proftpd/patches/patch-aa b/net/proftpd/patches/patch-aa
index e537856c752..c809fd293f4 100644
--- a/net/proftpd/patches/patch-aa
+++ b/net/proftpd/patches/patch-aa
@@ -1,9 +1,21 @@
-$NetBSD: patch-aa,v 1.10 2008/10/03 06:52:03 martti Exp $
+$NetBSD: patch-aa,v 1.11 2008/12/28 08:42:01 kim Exp $
 
 Make this pkgsrc friendly.
 
---- Makefile.in.orig	2008-09-08 23:56:02.000000000 +0300
-+++ Makefile.in	2008-10-03 09:35:29.000000000 +0300
+Linking ftpdctl does not (seem to) require all the libraries needed for
+various proftpd modules.  It definitely cannot include -lwrap.
+
+--- Makefile.in.orig	2008-11-19 05:51:38.000000000 +0200
++++ Makefile.in	2008-12-26 12:04:57.000000000 +0200
+@@ -58,7 +58,7 @@
+ 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPCOUNT_OBJS) $(UTILS_LIBS)
+ 
+ ftpdctl$(EXEEXT): src
+-	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPDCTL_OBJS) $(LIBS)
++	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPDCTL_OBJS) $(UTILS_LIBS)
+ 
+ ftpshut$(EXEEXT): utils
+ 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPSHUT_OBJS) $(UTILS_LIBS)
 @@ -142,7 +142,7 @@
  	$(INSTALL_MAN) $(top_srcdir)/utils/ftpwho.1   $(DESTDIR)$(mandir)/man1
  	$(INSTALL_MAN) $(top_srcdir)/src/xferlog.5    $(DESTDIR)$(mandir)/man5
diff --git a/net/proftpd/patches/patch-ad b/net/proftpd/patches/patch-ad
new file mode 100644
index 00000000000..055cf0d5d41
--- /dev/null
+++ b/net/proftpd/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.7 2008/12/28 08:42:01 kim Exp $
+
+The -lnsl library has its own check in configure.  We cannot hardcode it
+as it is not needed and does not even exist on all platforms.
+
+--- contrib/mod_wrap.c.orig	2008-01-25 03:53:34.000000000 +0200
++++ contrib/mod_wrap.c	2008-12-26 11:42:48.000000000 +0200
+@@ -23,7 +23,7 @@
+  * the source code for OpenSSL in the source distribution.
+  *
+  * -- DO NOT MODIFY THE TWO LINES BELOW --
+- * $Libraries: -lwrap -lnsl$
++ * $Libraries: -lwrap$
+  * $Id: patch-ad,v 1.7 2008/12/28 08:42:01 kim Exp $
+  */
+ 
diff --git a/net/proftpd/patches/patch-ae b/net/proftpd/patches/patch-ae
new file mode 100644
index 00000000000..cf98bfc1a03
--- /dev/null
+++ b/net/proftpd/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.7 2008/12/28 08:42:01 kim Exp $
+
+Old versions of msgfmt don't know about --check-format.
+
+--- locale/Makefile.in.orig	2008-11-19 05:51:38.000000000 +0200
++++ locale/Makefile.in	2008-12-26 12:27:18.000000000 +0200
+@@ -26,7 +26,7 @@
+ # gettext utilities.  Note that this assumes gettext is installed and
+ # available on the system.
+ MSGCMP=msgcmp
+-MSGFMT=msgfmt --check-format
++MSGFMT=msgfmt
+ MSGINIT=msginit
+ XGETTEXT=xgettext
+