diff options
| author | beech <beech@FreeBSD.org> | 2007-07-07 19:35:24 +0800 |
|---|---|---|
| committer | beech <beech@FreeBSD.org> | 2007-07-07 19:35:24 +0800 |
| commit | 4b11064572a4397fae6a90a76c39cf438553118a (patch) | |
| tree | 6c2d3bc6bc95d308df9f684b83df461b94437ecf /ftp | |
| parent | 888579404454d99532008a120eb70a3ef89dffcb (diff) | |
| download | freebsd-ports-gnome-4b11064572a4397fae6a90a76c39cf438553118a.tar.gz freebsd-ports-gnome-4b11064572a4397fae6a90a76c39cf438553118a.tar.zst freebsd-ports-gnome-4b11064572a4397fae6a90a76c39cf438553118a.zip | |
- Fix pkg-plist
- Tweak Makefile
Reported by: pointyhat via pav
Approved by: sat (mentor)
Diffstat (limited to 'ftp')
| -rw-r--r-- | ftp/proftpd-devel/Makefile | 6 | ||||
| -rw-r--r-- | ftp/proftpd-devel/pkg-plist | 2 | ||||
| -rw-r--r-- | ftp/proftpd/Makefile | 6 | ||||
| -rw-r--r-- | ftp/proftpd/pkg-plist | 2 |
4 files changed, 6 insertions, 10 deletions
diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile index 7da527a16bed..b6519bda430c 100644 --- a/ftp/proftpd-devel/Makefile +++ b/ftp/proftpd-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= proftpd DISTVERSION= 1.3.1rc3 +PORTREVISION= 1 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \ @@ -167,9 +168,6 @@ USE_MYSQL= yes MODULES:=${MODULES}:mod_sql_mysql INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include:${LOCALBASE}/include/mysql LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib/mysql -PLIST_SUB+= MYSQL="" -.else -PLIST_SUB+= MYSQL="@comment " .endif .if defined(WITH_PGSQL) @@ -181,6 +179,7 @@ LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib .if ${MODULES:M*mod_sql_*} MODULES:=mod_sql${MODULES} +PLIST_FILES+= include/proftpd/mod_sql.h .endif .if defined(WITH_OPENSSL) @@ -203,6 +202,7 @@ MODULES:=${MODULES}:mod_ctrls_admin .if defined(WITH_QUOTA) MODULES:=${MODULES}:mod_quotatab:mod_quotatab_file +PLIST_FILES+= include/proftpd/mod_quotatab.h .if defined(WITH_LDAP) MODULES:=${MODULES}:mod_quotatab_ldap .endif diff --git a/ftp/proftpd-devel/pkg-plist b/ftp/proftpd-devel/pkg-plist index 2be4f84e42df..b4d6743b9f81 100644 --- a/ftp/proftpd-devel/pkg-plist +++ b/ftp/proftpd-devel/pkg-plist @@ -28,7 +28,6 @@ include/proftpd/libsupp.h include/proftpd/log.h include/proftpd/mkhome.h include/proftpd/mod_ctrls.h -include/proftpd/mod_quotatab.h include/proftpd/modules.h include/proftpd/netacl.h include/proftpd/netaddr.h @@ -56,7 +55,6 @@ include/proftpd/xferlog.h sbin/ftpshut sbin/in.proftpd sbin/proftpd -%%MYSQL%%include/proftpd/mod_sql.h @unexec if cmp -s %D/etc/proftpd.conf %D/etc/proftpd.conf.sample; then rm -f %D/etc/proftpd.conf; fi etc/proftpd.conf.sample @exec cp -n %D/%F %B/proftpd.conf diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index 7da527a16bed..b6519bda430c 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -7,6 +7,7 @@ PORTNAME= proftpd DISTVERSION= 1.3.1rc3 +PORTREVISION= 1 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \ @@ -167,9 +168,6 @@ USE_MYSQL= yes MODULES:=${MODULES}:mod_sql_mysql INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include:${LOCALBASE}/include/mysql LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib/mysql -PLIST_SUB+= MYSQL="" -.else -PLIST_SUB+= MYSQL="@comment " .endif .if defined(WITH_PGSQL) @@ -181,6 +179,7 @@ LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib .if ${MODULES:M*mod_sql_*} MODULES:=mod_sql${MODULES} +PLIST_FILES+= include/proftpd/mod_sql.h .endif .if defined(WITH_OPENSSL) @@ -203,6 +202,7 @@ MODULES:=${MODULES}:mod_ctrls_admin .if defined(WITH_QUOTA) MODULES:=${MODULES}:mod_quotatab:mod_quotatab_file +PLIST_FILES+= include/proftpd/mod_quotatab.h .if defined(WITH_LDAP) MODULES:=${MODULES}:mod_quotatab_ldap .endif diff --git a/ftp/proftpd/pkg-plist b/ftp/proftpd/pkg-plist index 2be4f84e42df..b4d6743b9f81 100644 --- a/ftp/proftpd/pkg-plist +++ b/ftp/proftpd/pkg-plist @@ -28,7 +28,6 @@ include/proftpd/libsupp.h include/proftpd/log.h include/proftpd/mkhome.h include/proftpd/mod_ctrls.h -include/proftpd/mod_quotatab.h include/proftpd/modules.h include/proftpd/netacl.h include/proftpd/netaddr.h @@ -56,7 +55,6 @@ include/proftpd/xferlog.h sbin/ftpshut sbin/in.proftpd sbin/proftpd -%%MYSQL%%include/proftpd/mod_sql.h @unexec if cmp -s %D/etc/proftpd.conf %D/etc/proftpd.conf.sample; then rm -f %D/etc/proftpd.conf; fi etc/proftpd.conf.sample @exec cp -n %D/%F %B/proftpd.conf |