PKGREVISION++

- split PKG_OPTIONS to options.mk file
- fix issue with state directory in (typically) /var/run,
  noted by Justin Newcomer on tech-pkg@
- delint

6 files changed, 80 insertions, 56 deletions

diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile
index 689b40a344c..a7115984b4d 100644
--- a/net/proftpd/Makefile
+++ b/net/proftpd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2005/05/31 11:24:32 dillo Exp $
+# $NetBSD: Makefile,v 1.22 2005/06/22 22:43:37 salo Exp $
 
 DISTNAME=	proftpd-1.2.10
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		ftp://ftp.servus.at/ProFTPD/distrib/source/ \
@@ -15,12 +15,12 @@ COMMENT=	FTP server with Apache like configuration
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
-GNU_CONFIGURE=	# defined
+GNU_CONFIGURE=	yes
+USE_PKGINSTALL=	yes
 USE_TOOLS+=	gmake
-USE_PKGINSTALL=	YES
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/run
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--disable-sendfile
 CONFIGURE_ARGS+=	--enable-ctrls
 
@@ -29,54 +29,15 @@ RCD_SCRIPTS=	proftpd
 CONF_FILES=	${PREFIX}/share/examples/proftpd/basic.conf \
 		${PKG_SYSCONFDIR}/proftpd.conf
 
-PKG_SUPPORTED_OPTIONS = pam wrap quota pgsql
-PKG_OPTIONS_VAR       = PKG_OPTIONS.proftpd
+SUBST_CLASSES+=		man
+SUBST_MESSAGE.man=	"Fixing paths in manual pages."
+SUBST_STAGE.man=	pre-configure
+SUBST_FILES.man=	utils/ftpcount.1.in utils/ftptop.1.in utils/ftpwho.1.in
+SUBST_SED.man=		-e s,@LOCALSTATEDIR@/run/proftpd,${VARBASE}/run,
 
-# This (or something like this must be in mk/bsd.options.mk) to allow 
-# to see the supported options
-##BUILD_DEFS+=PKG_SUPPORTED_OPTIONS
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mpam)
-CONFIGURE_ARGS+=	--enable-auth-pam
-.include "../../mk/pam.buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mwrap)
-MODULES:=${MODULES}mod_wrap
-.endif
-
-MODULES=#defined
-.if !empty(PKG_OPTIONS:Mquota)
-MODULES:=${MODULES}mod_quota
-.endif
-
-## .if defined(PROFTPD_USE_LDAP) && ${PROFTPD_USE_LDAP} == "YES"
-## MODULES:=	${MODULES}:mod_ldap
-## DEPENDS+=	openldap-[0-9]*:../../databases/openldap
-## .endif
-##
-## .if defined(PROFTPD_USE_MYSQL) && ${PROFTPD_USE_MYSQL} == "YES"
-## MODULES:=	${MODULES}:mod_sql:mod_sql_mysql
-## DEPENDS+=	mysql-client-[0-9]*:../../databases/mysql-client
-## .endif
-##
-## .if defined(PROFTPD_USE_POSTGRES) && ${PROFTPD_USE_POSTGRES} == "YES"
-## MODULES:=	${MODULES}:mod_sql:mod_sql_postgres
-## DEPENDS+=	postgresql-client-[0-9]*:../../databases/postgresql-client
-## .endif
-##
-## .if defined(PROFTPD_USE_README) && ${PROFTPD_USE_README} == "YES"
-## MODULES:=	${MODULES}:mod_readme
-## .endif
-
-.if !empty(MODULES)
-CONFIGURE_ARGS+=	--with-modules=${MODULES}
-.endif
+.include "options.mk"
 
 post-install:
-	# documentation
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/proftpd
 .for i in NEWS README README.IPv6 README.LDAP README.PAM README.modules
 	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/proftpd
@@ -84,7 +45,6 @@ post-install:
 .for i in Configuration.html faq.html license.txt
 	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/proftpd
 .endfor
-	# examples
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/proftpd
 	${INSTALL_DATA} ${WRKSRC}/sample-configurations/*.conf \
 		${PREFIX}/share/examples/proftpd
diff --git a/net/proftpd/PLIST b/net/proftpd/PLIST
index 1b1d8844ea2..2445b7e8ecd 100644
--- a/net/proftpd/PLIST
+++ b/net/proftpd/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.8 2005/05/02 20:34:03 reed Exp $
+@comment $NetBSD: PLIST,v 1.9 2005/06/22 22:43:37 salo Exp $
 bin/ftpcount
-bin/ftpwho
 bin/ftpdctl
 bin/ftptop
+bin/ftpwho
 man/man1/ftpcount.1
 man/man1/ftptop.1
 man/man1/ftpwho.1
diff --git a/net/proftpd/distinfo b/net/proftpd/distinfo
index 396239a7870..579e0854732 100644
--- a/net/proftpd/distinfo
+++ b/net/proftpd/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2005/02/24 12:14:01 agc Exp $
+$NetBSD: distinfo,v 1.10 2005/06/22 22:43:37 salo Exp $
 
 SHA1 (proftpd-1.2.10.tar.gz) = ea12d139b8b47168cabcd993b137b2360bba1465
 RMD160 (proftpd-1.2.10.tar.gz) = c96cadc6bfef0f77f2d44ed901b55474c6f6a464
 Size (proftpd-1.2.10.tar.gz) = 1182176 bytes
 SHA1 (patch-aa) = 3784f6aed87b327741685d45d453aa2ac98dd98b
+SHA1 (patch-ab) = cc760fc91846a0fc595e2e76d5a1ef582915034d
diff --git a/net/proftpd/files/proftpd.sh b/net/proftpd/files/proftpd.sh
index 336fdd1601a..0d24dcfe199 100644
--- a/net/proftpd/files/proftpd.sh
+++ b/net/proftpd/files/proftpd.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: proftpd.sh,v 1.1 2003/03/22 10:15:27 jmmv Exp $
+# $NetBSD: proftpd.sh,v 1.2 2005/06/22 22:43:37 salo Exp $
 #
 
 # PROVIDE: proftpd
@@ -12,7 +12,7 @@
 name="proftpd"
 rcvar=$name
 command="@PREFIX@/sbin/${name}"
-pidfile="/var/run/${name}.pid"
+pidfile="@VARBASE@/run/${name}.pid"
 required_files="@PKG_SYSCONFDIR@/proftpd.conf"
 
 load_rc_config $name
diff --git a/net/proftpd/options.mk b/net/proftpd/options.mk
new file mode 100644
index 00000000000..fab1419a059
--- /dev/null
+++ b/net/proftpd/options.mk
@@ -0,0 +1,45 @@
+# $NetBSD: options.mk,v 1.1 2005/06/22 22:43:37 salo Exp $
+#
+
+PKG_OPTIONS_VAR       = PKG_OPTIONS.proftpd
+PKG_SUPPORTED_OPTIONS = pam wrap quota
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mpam)
+CONFIGURE_ARGS+=	--enable-auth-pam
+.include "../../mk/pam.buildlink3.mk"
+.endif
+
+MODULES=#defined
+
+.if !empty(PKG_OPTIONS:Mwrap)
+MODULES:=${MODULES}mod_wrap
+.endif
+
+.if !empty(PKG_OPTIONS:Mquota)
+MODULES:=${MODULES}mod_quota
+.endif
+
+## .if defined(PROFTPD_USE_LDAP) && ${PROFTPD_USE_LDAP} == "YES"
+## MODULES:=	${MODULES}:mod_ldap
+## DEPENDS+=	openldap-[0-9]*:../../databases/openldap
+## .endif
+##
+## .if defined(PROFTPD_USE_MYSQL) && ${PROFTPD_USE_MYSQL} == "YES"
+## MODULES:=	${MODULES}:mod_sql:mod_sql_mysql
+## DEPENDS+=	mysql-client-[0-9]*:../../databases/mysql-client
+## .endif
+##
+## .if defined(PROFTPD_USE_POSTGRES) && ${PROFTPD_USE_POSTGRES} == "YES"
+## MODULES:=	${MODULES}:mod_sql:mod_sql_postgres
+## DEPENDS+=	postgresql-client-[0-9]*:../../databases/postgresql-client
+## .endif
+##
+## .if defined(PROFTPD_USE_README) && ${PROFTPD_USE_README} == "YES"
+## MODULES:=	${MODULES}:mod_readme
+## .endif
+
+.if !empty(MODULES)
+CONFIGURE_ARGS+=	--with-modules=${MODULES}
+.endif
diff --git a/net/proftpd/patches/patch-ab b/net/proftpd/patches/patch-ab
new file mode 100644
index 00000000000..597213bdb79
--- /dev/null
+++ b/net/proftpd/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.1 2005/06/22 22:43:37 salo Exp $
+
+--- configure.orig	2004-05-26 04:17:24.000000000 +0200
++++ configure	2005-06-23 00:25:54.000000000 +0200
+@@ -16809,11 +16809,11 @@
+ _ACEOF
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define PID_FILE_PATH "`eval echo "${localstatedir}/proftpd.pid"`"
++#define PID_FILE_PATH "`eval echo "${localstatedir}/run/proftpd.pid"`"
+ _ACEOF
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define RUN_DIR "`eval echo "${localstatedir}/proftpd"`"
++#define RUN_DIR "`eval echo "${localstatedir}/run"`"
+ _ACEOF
+ 
+