Fixed PLIST when using quota and mysql options.

4 files changed, 35 insertions, 22 deletions

diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile
index 356517e463b..305e1a509d0 100644
--- a/net/proftpd/Makefile
+++ b/net/proftpd/Makefile
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.39 2007/01/13 09:47:38 martti Exp $
+# $NetBSD: Makefile,v 1.40 2007/01/24 05:22:01 martti Exp $
 
-DISTNAME=	proftpd-1.3.1rc2
-#PKGREVISION=	1
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
-		ftp://ftp.servus.at/ProFTPD/distrib/source/ \
-		ftp://ftp.fsn.hu/pub/proftpd/distrib/source/ \
-		ftp://ftp.middle-earth.it/proftpd/
-EXTRACT_SUFX=	.tar.bz2
+DISTNAME=		proftpd-1.3.1rc2
+#PKGREVISION=		1
+CATEGORIES=		net
+MASTER_SITES=		ftp://ftp.proftpd.org/distrib/source/ \
+			ftp://ftp.servus.at/ProFTPD/distrib/source/ \
+			ftp://ftp.fsn.hu/pub/proftpd/distrib/source/ \
+			ftp://ftp.middle-earth.it/proftpd/
+EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=	martti@NetBSD.org
-HOMEPAGE=	http://www.proftpd.org/
-COMMENT=	FTP server with Apache like configuration
+MAINTAINER=		martti@NetBSD.org
+HOMEPAGE=		http://www.proftpd.org/
+COMMENT=		FTP server with Apache like configuration
 
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake intltool
+GNU_CONFIGURE=		yes
+USE_TOOLS+=		gmake intltool
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
@@ -24,14 +24,14 @@ CONFIGURE_ARGS+=	--disable-sendfile
 CONFIGURE_ARGS+=	--enable-ctrls
 CONFIGURE_ARGS+=	--enable-nls
 
-CONFIGURE_ENV+=	install_user=${ROOT_USER} install_group=${ROOT_GROUP}
+CONFIGURE_ENV+=		install_user=${ROOT_USER} install_group=${ROOT_GROUP}
 
-BUILD_DEFS+=	VARBASE
+BUILD_DEFS+=		VARBASE
 
-RCD_SCRIPTS=	proftpd
+RCD_SCRIPTS=		proftpd
 
-CONF_FILES=	${PREFIX:Q}/share/examples/proftpd/basic.conf \
-		${PKG_SYSCONFDIR:Q}/proftpd.conf
+CONF_FILES=		${PREFIX:Q}/share/examples/proftpd/basic.conf \
+			${PKG_SYSCONFDIR:Q}/proftpd.conf
 
 SUBST_CLASSES+=		man
 SUBST_MESSAGE.man=	Fixing paths in manual pages.
@@ -42,6 +42,8 @@ SUBST_SED.man=		-e s,@LOCALSTATEDIR@/run/proftpd,${VARBASE:Q}/run,
 INSTALLATION_DIRS+=	share/doc/proftpd
 INSTALLATION_DIRS+=	share/examples/proftpd
 
+PLIST_SRC+=		${PKGDIR}/PLIST
+
 .include "options.mk"
 
 post-install:
diff --git a/net/proftpd/PLIST.mod_quota b/net/proftpd/PLIST.mod_quota
new file mode 100644
index 00000000000..d01aeaffe94
--- /dev/null
+++ b/net/proftpd/PLIST.mod_quota
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.mod_quota,v 1.1 2007/01/24 05:22:01 martti Exp $
+include/proftpd/mod_quotatab.h
diff --git a/net/proftpd/PLIST.mod_sql b/net/proftpd/PLIST.mod_sql
new file mode 100644
index 00000000000..733bf33c8a2
--- /dev/null
+++ b/net/proftpd/PLIST.mod_sql
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.mod_sql,v 1.1 2007/01/24 05:22:01 martti Exp $
+include/proftpd/mod_sql.h
diff --git a/net/proftpd/options.mk b/net/proftpd/options.mk
index 9b0b86c4483..95a53ce3035 100644
--- a/net/proftpd/options.mk
+++ b/net/proftpd/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.6 2006/05/31 18:22:24 ghen Exp $
+# $NetBSD: options.mk,v 1.7 2007/01/24 05:22:01 martti Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.proftpd
-PKG_SUPPORTED_OPTIONS=	pam wrap quota ldap proftpd-readme
+PKG_SUPPORTED_OPTIONS=	pam wrap quota ldap proftpd-readme tls
 PKG_OPTIONS_OPTIONAL_GROUPS+=	sql
 PKG_OPTIONS_GROUP.sql=		mysql pgsql
 
@@ -19,8 +19,14 @@ MODULES=	# empty
 MODULES:=	${MODULES}:mod_wrap
 .endif
 
+.if !empty(PKG_OPTIONS:Mtls)
+MODULES:=	${MODULES}:mod_tls
+.include "../../security/openssl/buildlink3.mk"
+.endif
+
 .if !empty(PKG_OPTIONS:Mquota)
 MODULES:=	${MODULES}:mod_quotatab:mod_quotatab_file
+PLIST_SRC+=	${PKGDIR}/PLIST.mod_quota
 .endif
 
 .if !empty(PKG_OPTIONS:Mquota) && !empty(PKG_OPTIONS:Mmysql)
@@ -42,6 +48,7 @@ MODULES:=	${MODULES}:mod_ldap
 
 .if !empty(PKG_OPTIONS:Mmysql)
 MODULES:=	${MODULES}:mod_sql:mod_sql_mysql
+PLIST_SRC+=	${PKGDIR}/PLIST.mod_sql
 .include "../../mk/mysql.buildlink3.mk"
 .endif