diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2007-10-26 08:41:48 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2007-10-26 08:41:48 +0000 |
| commit | 263eb9a506b8d8f84cc9e08156dd882903e376ff (patch) | |
| tree | 3d2eed4c9145bb2a24bcecebdb8fb82c57125509 /mail/vpopmail | |
| parent | 461e42c1cc1e1c8761e3bd1b1c15966ce8f5baec (diff) | |
| download | ports-263eb9a506b8d8f84cc9e08156dd882903e376ff.tar.gz ports-263eb9a506b8d8f84cc9e08156dd882903e376ff.zip | |
- Conditionalize vpopmail/etc/vpopmail.mysql-dist in plist, it's installed only
when WITH_MYSQL is defined
Reported by: pointyhat
Notes
Notes:
svn path=/head/; revision=202066
Diffstat (limited to 'mail/vpopmail')
| -rw-r--r-- | mail/vpopmail/Makefile | 3 | ||||
| -rw-r--r-- | mail/vpopmail/pkg-plist | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile index 9ba7579674aa..d2019e42af78 100644 --- a/mail/vpopmail/Makefile +++ b/mail/vpopmail/Makefile @@ -147,6 +147,7 @@ USE_MYSQL= yes CONFIGURE_ARGS+= --enable-auth-module=mysql \ --enable-incdir=${LOCALBASE}/include/mysql \ --enable-libdir=${LOCALBASE}/lib/mysql +PLIST_SUB+= MYSQL="" .if defined(WITH_MYSQL_REPLICATION) CONFIGURE_ARGS+= --enable-mysql-replication .endif @@ -172,6 +173,8 @@ BROKEN_MYSQL_PARAMS= true .if defined(BROKEN_MYSQL_PARAMS) BROKEN= The MySQL connection parameters are no longer setup at compile time - please edit the ${PREFIX}/vpopmail/etc/vpopmail.mysql file instead .endif +.else +PLIST_SUB+= MYSQL="@comment " .endif .if defined(DEFAULT_DOMAIN) diff --git a/mail/vpopmail/pkg-plist b/mail/vpopmail/pkg-plist index 3612913b4f4b..79c8b3077f70 100644 --- a/mail/vpopmail/pkg-plist +++ b/mail/vpopmail/pkg-plist @@ -71,9 +71,9 @@ vpopmail/etc/vlimits.default-dist %%LDAP%%@unexec if cmp -s %D/vpopmail/etc/vpopmail.ldap %D/vpopmail/etc/vpopmail.ldap-dist; then rm -f %D/vpopmail/etc/vpopmail.ldap; fi %%LDAP%%vpopmail/etc/vpopmail.ldap-dist %%LDAP%%@exec if [ ! -f %D/vpopmail/etc/vpopmail.ldap ] ; then cp -p %D/%F %B/vpopmail.ldap; fi -@unexec if cmp -s %D/vpopmail/etc/vpopmail.mysql %D/vpopmail/etc/vpopmail.mysql-dist; then rm -f %D/vpopmail/etc/vpopmail.mysql; fi -vpopmail/etc/vpopmail.mysql-dist -@exec if [ ! -f %D/vpopmail/etc/vpopmail.mysql ] ; then cp -p %D/%F %B/vpopmail.mysql; fi +%%MYSQL%%@unexec if cmp -s %D/vpopmail/etc/vpopmail.mysql %D/vpopmail/etc/vpopmail.mysql-dist; then rm -f %D/vpopmail/etc/vpopmail.mysql; fi +%%MYSQL%%vpopmail/etc/vpopmail.mysql-dist +%%MYSQL%%@exec if [ ! -f %D/vpopmail/etc/vpopmail.mysql ] ; then cp -p %D/%F %B/vpopmail.mysql; fi vpopmail/include/config.h vpopmail/include/vauth.h vpopmail/include/vlimits.h |