- Conditionalize vpopmail/etc/vpopmail.mysql-dist in plist, it's installed only

when WITH_MYSQL is defined

Reported by:	pointyhat
This commit is contained in:
Pav Lucistnik 2007-10-26 08:41:48 +00:00
parent 461e42c1cc
commit 263eb9a506
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=202066
2 changed files with 6 additions and 3 deletions

View file

@ -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)

View file

@ -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