[pkgsrc/trunk]: pkgsrc/net/proftpd Fixed PLIST when using quota and mysql opt...

[martti <martti%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bdf73b0b84dd
branches:  trunk
changeset: 524355:bdf73b0b84dd
user:      martti <martti%pkgsrc.org@localhost>
date:      Wed Jan 24 05:22:01 2007 +0000

description:
Fixed PLIST when using quota and mysql options.

diffstat:

 net/proftpd/Makefile        |  42 ++++++++++++++++++++++--------------------
 net/proftpd/PLIST.mod_quota |   2 ++
 net/proftpd/PLIST.mod_sql   |   2 ++
 net/proftpd/options.mk      |  11 +++++++++--
 4 files changed, 35 insertions(+), 22 deletions(-)

diffs (119 lines):

diff -r 70a2cdd5437b -r bdf73b0b84dd net/proftpd/Makefile
--- a/net/proftpd/Makefile      Wed Jan 24 05:05:27 2007 +0000
+++ b/net/proftpd/Makefile      Wed Jan 24 05:22:01 2007 +0000
@@ -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@localhost
-HOMEPAGE=      http://www.proftpd.org/
-COMMENT=       FTP server with Apache like configuration
+MAINTAINER=            martti%NetBSD.org@localhost
+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+=       --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 @@
 INSTALLATION_DIRS+=    share/doc/proftpd
 INSTALLATION_DIRS+=    share/examples/proftpd
 
+PLIST_SRC+=            ${PKGDIR}/PLIST
+
 .include "options.mk"
 
 post-install:
diff -r 70a2cdd5437b -r bdf73b0b84dd net/proftpd/PLIST.mod_quota
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/proftpd/PLIST.mod_quota       Wed Jan 24 05:22:01 2007 +0000
@@ -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 -r 70a2cdd5437b -r bdf73b0b84dd net/proftpd/PLIST.mod_sql
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/proftpd/PLIST.mod_sql Wed Jan 24 05:22:01 2007 +0000
@@ -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 -r 70a2cdd5437b -r bdf73b0b84dd net/proftpd/options.mk
--- a/net/proftpd/options.mk    Wed Jan 24 05:05:27 2007 +0000
+++ b/net/proftpd/options.mk    Wed Jan 24 05:22:01 2007 +0000
@@ -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:=      ${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 @@
 
 .if !empty(PKG_OPTIONS:Mmysql)
 MODULES:=      ${MODULES}:mod_sql:mod_sql_mysql
+PLIST_SRC+=    ${PKGDIR}/PLIST.mod_sql
 .include "../../mk/mysql.buildlink3.mk"
 .endif