summaryrefslogtreecommitdiff
path: root/mail/squirrelmail
diff options
context:
space:
mode:
authorAdam Weinberger <adamw@FreeBSD.org>2014-08-28 15:16:49 +0000
committerAdam Weinberger <adamw@FreeBSD.org>2014-08-28 15:16:49 +0000
commite1630922bd6f640a126bbc8c26a939c6d9c16b7d (patch)
tree1876a62bdee7c4ff50f3b47d8cc690c1fc6727f5 /mail/squirrelmail
parentAdopt port (diff)
Move plugin installation into the plist, rather than post-install, so
that it will work when installed from binary pkg. Bump PORTREVISION on all plugins for this.
Notes
Notes: svn path=/head/; revision=366415
Diffstat (limited to 'mail/squirrelmail')
-rw-r--r--mail/squirrelmail/bsd.squirrelmail.mk23
1 files changed, 11 insertions, 12 deletions
diff --git a/mail/squirrelmail/bsd.squirrelmail.mk b/mail/squirrelmail/bsd.squirrelmail.mk
index 6cb3222bb4f2..903e70b886a2 100644
--- a/mail/squirrelmail/bsd.squirrelmail.mk
+++ b/mail/squirrelmail/bsd.squirrelmail.mk
@@ -56,7 +56,8 @@ SUB_LIST+= SQUIRREL_PLUGIN_NAME=${SQUIRREL_PLUGIN_NAME}
# As with mail/squirreldir, if you were using WITHOUT_WWWDIR=yes,
# set SQUIRRELDIR=${PREFIX}/squirrelmail
SQUIRRELDIR?= ${PREFIX}/www/squirrelmail
-PLIST_SUB+= SQUIRRELDIR=${SQUIRRELDIR:S,${PREFIX}/,,}
+SQUIRRELDIR_REL=${SQUIRRELDIR:S,${PREFIX}/,,}
+PLIST_SUB+= SQUIRRELDIR=${SQUIRRELDIR_REL}
SUB_LIST+= SQUIRRELDIR=${SQUIRRELDIR}
SQUIRREL_PLUGIN_CONFIG?= config.php
@@ -102,18 +103,16 @@ do-install:
.if !target(post-install)
post-install:
.ifndef WITHOUT_ACTIVATE
-.if exists(${SQUIRRELDIR}/config/config.php)
- @${ECHO_CMD} "Activating plug-in in SquirrelMail"
- ${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}
-.endif
+ @${ECHO_CMD} \
+ '@exec if [ -f %D/${SQUIRRELDIR_REL}/config/conf.pl ]; then %D/${SQUIRRELDIR_REL}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}; fi' \
+ >> ${TMPPLIST}
+ @${ECHO_CMD} \
+ '@unexec if [ -f %D/${SQUIRRELDIR_REL}/config/conf.pl ]; then %D/${SQUIRRELDIR_REL}/config/conf.pl --remove-plugin ${SQUIRREL_PLUGIN_NAME}; fi' \
+ >> ${TMPPLIST}
.else
- @${ECHO_CMD} "To activate the plug-in in SquirrelMail use"
- @${ECHO_CMD} "${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}"
+ @${ECHO_CMD} \
+ '@exec echo "To activate the plug-in in SquirrelMail use" && echo ""%D/${SQUIRRELDIR_REL}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}"' \
+ >> ${TMPPLIST}
.endif
- @${ECHO_CMD} ""
-.if exists(${FILESDIR}/pkg-message.in) || exists(${FILESDIR}/plugin-pkg-message.in)
- @${CAT} ${PKGMESSAGE}
- @${ECHO_CMD} ""
-.endif
.endif