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

1 files changed, 11 insertions, 51 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