Date: Tue, 18 Feb 2014 12:40:01 +0000 (UTC) From: Martin Wilke <miwi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344880 - in head/mail: squirrelmail squirrelmail-abook_import_export-plugin squirrelmail-askuserinfo-plugin squirrelmail-avelsieve-plugin squirrelmail-calendar_file_backend-plugin squi... Message-ID: <201402181240.s1ICe2bp019962@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: miwi Date: Tue Feb 18 12:40:01 2014 New Revision: 344880 URL: http://svnweb.freebsd.org/changeset/ports/344880 QAT: https://qat.redports.org/buildarchive/r344880/ Log: - Stage support - While here cleanup some whitespaces / dependencys Modified: head/mail/squirrelmail-abook_import_export-plugin/Makefile head/mail/squirrelmail-askuserinfo-plugin/Makefile head/mail/squirrelmail-avelsieve-plugin/Makefile head/mail/squirrelmail-calendar_file_backend-plugin/Makefile head/mail/squirrelmail-change_ldappass-plugin/Makefile head/mail/squirrelmail-change_sqlpass-plugin/Makefile head/mail/squirrelmail-check_quota-plugin/Makefile head/mail/squirrelmail-compatibility-plugin/Makefile head/mail/squirrelmail-email_footer-plugin/Makefile head/mail/squirrelmail-login_auth-plugin/Makefile head/mail/squirrelmail-login_notes-plugin/Makefile head/mail/squirrelmail-mark_read-plugin/Makefile head/mail/squirrelmail-multilogin-plugin/Makefile head/mail/squirrelmail-notes-plugin/Makefile head/mail/squirrelmail-notify-plugin/Makefile head/mail/squirrelmail-password_forget-plugin/Makefile head/mail/squirrelmail-pupdate-plugin/Makefile head/mail/squirrelmail-qmailadmin_login-plugin/Makefile head/mail/squirrelmail-quota_usage-plugin/Makefile head/mail/squirrelmail-sasql-plugin/Makefile head/mail/squirrelmail-secure_login-plugin/Makefile head/mail/squirrelmail-shared_calendars-plugin/Makefile head/mail/squirrelmail-spam-buttons-plugin/Makefile head/mail/squirrelmail-squirrel_logger-plugin/Makefile head/mail/squirrelmail-timeout_user-plugin/Makefile head/mail/squirrelmail-tmda-plugin/Makefile head/mail/squirrelmail-unsafe_image_rules-plugin/Makefile head/mail/squirrelmail-user_special_mailboxes-plugin/Makefile head/mail/squirrelmail-vlogin-plugin/Makefile head/mail/squirrelmail-websearch-plugin/Makefile head/mail/squirrelmail-wetteronline-plugin/Makefile head/mail/squirrelmail/Makefile head/mail/squirrelmail/bsd.squirrelmail.mk Modified: head/mail/squirrelmail-abook_import_export-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-abook_import_export-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-abook_import_export-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -13,8 +13,6 @@ COMMENT= Allows for the importing of add SQUIRREL_PLUGIN_NAME= ${PORTNAME:S/-/_/} -NO_STAGE= yes - .include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" .include <bsd.port.post.mk> Modified: head/mail/squirrelmail-askuserinfo-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-askuserinfo-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-askuserinfo-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -9,8 +9,6 @@ DISTNAME= ${PORTNAME}.${PORTVERSION}-1.4 MAINTAINER= ports@FreeBSD.org COMMENT= Ask user to enter Full name and Email address at initial logon -NO_STAGE= yes - .include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" .include <bsd.port.post.mk> Modified: head/mail/squirrelmail-avelsieve-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-avelsieve-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-avelsieve-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -9,8 +9,6 @@ CATEGORIES= mail www MAINTAINER= neil@darlow.co.uk COMMENT= SquirrelMail plugin for Server-Side Mail Filtering management -NO_STAGE= yes - pre-install: ${RM} -Rf ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/po ${FIND} ${WRKSRC}/${SQUIRREL_PLUGIN_NAME} -type f \ Modified: head/mail/squirrelmail-calendar_file_backend-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-calendar_file_backend-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-calendar_file_backend-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -10,8 +10,6 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-2. MAINTAINER= ports@FreeBSD.org COMMENT= File backend for SquirrelMail Calendar plugin -NO_STAGE= yes - .include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" .include <bsd.port.post.mk> Modified: head/mail/squirrelmail-change_ldappass-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-change_ldappass-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-change_ldappass-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -17,8 +17,6 @@ USES= gettext USE_GENERIC_PKGMESSAGE= yes -NO_STAGE= yes - .include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" .include <bsd.port.mk> Modified: head/mail/squirrelmail-change_sqlpass-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-change_sqlpass-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-change_sqlpass-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -16,8 +16,6 @@ RUN_DEPENDS= ${LOCALBASE}/share/pear/DB. SQUIRREL_PLUGIN_NAME= ${PORTNAME:S/-/_/} -NO_STAGE= yes - .include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" .include <bsd.port.post.mk> Modified: head/mail/squirrelmail-check_quota-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-check_quota-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-check_quota-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -14,8 +14,6 @@ USE_SM_COMPAT= YES SQUIRREL_PLUGIN_NAME= ${PORTNAME:S/-/_/} -NO_STAGE= yes - .include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" .include <bsd.port.post.mk> Modified: head/mail/squirrelmail-compatibility-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-compatibility-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-compatibility-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -9,8 +9,6 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-1.0 MAINTAINER= ports@FreeBSD.org COMMENT= Required by many plugins for compatibility with SquirrelMail -NO_STAGE= yes - .include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" .include <bsd.port.post.mk> Modified: head/mail/squirrelmail-email_footer-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-email_footer-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-email_footer-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -15,8 +15,6 @@ USE_GENERIC_PKGMESSAGE= yes LICENSE= GPLv2 -NO_STAGE= yes - .include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" .include <bsd.port.post.mk> Modified: head/mail/squirrelmail-login_auth-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-login_auth-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-login_auth-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -14,8 +14,6 @@ COMMENT= Automatically log in user base SQUIRREL_PLUGIN_NAME= ${PORTNAME} -NO_STAGE= yes - .include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" .include <bsd.port.post.mk> Modified: head/mail/squirrelmail-login_notes-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-login_notes-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-login_notes-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -15,8 +15,6 @@ LICENSE= GPLv2 USE_SM_COMPAT= yes USE_GENERIC_PKGMESSAGE= yes -NO_STAGE= yes - .include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" .include <bsd.port.post.mk> Modified: head/mail/squirrelmail-mark_read-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-mark_read-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-mark_read-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -14,7 +14,6 @@ USE_SM_COMPAT= YES SQUIRREL_PLUGIN_NAME= ${PORTNAME:S/-/_/} -NO_STAGE= yes post-patch: @${RM} ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/mark_read.php.orig Modified: head/mail/squirrelmail-multilogin-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-multilogin-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-multilogin-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -13,8 +13,6 @@ COMMENT= Allows manual selection of logi USE_SM_COMPAT= yes USE_GENERIC_PKGMESSAGE= yes -NO_STAGE= yes - .include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" .include <bsd.port.post.mk> Modified: head/mail/squirrelmail-notes-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-notes-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-notes-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -13,8 +13,6 @@ COMMENT= Allows you to create notes USE_SM_COMPAT= yes USE_GENERIC_PKGMESSAGE= yes -NO_STAGE= yes - .include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" .include <bsd.port.post.mk> Modified: head/mail/squirrelmail-notify-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-notify-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-notify-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -12,8 +12,6 @@ COMMENT= Notify when new mail arrives USE_SM_COMPAT= yes -NO_STAGE= yes - .include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" .include <bsd.port.post.mk> Modified: head/mail/squirrelmail-password_forget-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-password_forget-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-password_forget-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -12,8 +12,6 @@ COMMENT= Prevent reuse of login details USE_SM_COMPAT= yes -NO_STAGE= yes - .include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" .include <bsd.port.post.mk> Modified: head/mail/squirrelmail-pupdate-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-pupdate-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-pupdate-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -14,8 +14,6 @@ LICENSE= GPLv2 USE_GENERIC_PKGMESSAGE= yes -NO_STAGE= yes - .include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" .include <bsd.port.post.mk> Modified: head/mail/squirrelmail-qmailadmin_login-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-qmailadmin_login-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-qmailadmin_login-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -14,8 +14,6 @@ RUN_DEPENDS= ${PREFIX}/www/cgi-bin.defau USE_GENERIC_PKGMESSAGE= yes -NO_STAGE= yes - .include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" .include <bsd.port.post.mk> Modified: head/mail/squirrelmail-quota_usage-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-quota_usage-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-quota_usage-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -13,8 +13,6 @@ COMMENT= View quota and current usage USE_SM_COMPAT= yes USE_GENERIC_PKGMESSAGE= yes -NO_STAGE= yes - .include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" .include <bsd.port.post.mk> Modified: head/mail/squirrelmail-sasql-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-sasql-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-sasql-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -14,8 +14,6 @@ RUN_DEPENDS= ${LOCALBASE}/share/pear/DB. USE_SM_COMPAT= yes USE_GENERIC_PKGMESSAGE= yes -NO_STAGE= yes - post-patch: @${REINPLACE_CMD} -e "s/\(\$$imap_server_type == \'cyrus\'\)/\1 || \$$imap_server_type == \'courier\'/g" \ -e 's/session_register/sqsession_register/g' \ Modified: head/mail/squirrelmail-secure_login-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-secure_login-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-secure_login-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -13,8 +13,6 @@ LICENSE= GPLv2 USE_GENERIC_PKGMESSAGE= yes -NO_STAGE= yes - .include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" .include <bsd.port.post.mk> Modified: head/mail/squirrelmail-shared_calendars-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-shared_calendars-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-shared_calendars-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -16,8 +16,6 @@ USE_SM_COMPAT= yes USE_GENERIC_PKGMESSAGE= yes _SMSRCDIR= calendar -NO_STAGE= yes - .include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" .include <bsd.port.mk> Modified: head/mail/squirrelmail-spam-buttons-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-spam-buttons-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-spam-buttons-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -15,7 +15,6 @@ USE_SM_COMPAT= yes SQUIRREL_PLUGIN_NAME= ${PORTNAME:S/-/_/} -NO_STAGE= yes .include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" Modified: head/mail/squirrelmail-squirrel_logger-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-squirrel_logger-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-squirrel_logger-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -12,8 +12,6 @@ COMMENT= Logging functionality for your USE_SM_COMPAT= yes -NO_STAGE= yes - .include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" .include <bsd.port.post.mk> Modified: head/mail/squirrelmail-timeout_user-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-timeout_user-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-timeout_user-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -14,7 +14,6 @@ LICENSE= GPLv2 USE_SM_COMPAT= yes USE_GENERIC_PKGMESSAGE= yes -NO_STAGE= yes post-patch: @${MV} ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/config.php ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/config.php.sample Modified: head/mail/squirrelmail-tmda-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-tmda-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-tmda-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -31,7 +31,6 @@ PLIST_SUB+= SQUIRRELDIR=squirrelmail TMDATOOLDIR?= ${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME} PLIST_SUB+= TMDATOOLDIR=plugins/${SQUIRREL_PLUGIN_NAME} -NO_STAGE= yes pre-everything:: @${ECHO} "The plugin expects SquirrelMail install in ${SQUIRRELDIR}" @${ECHO} "To use the old location ${PREFIX}/squirrelmail define WITHOUT_WWWDIR=yes" @@ -44,9 +43,9 @@ post-patch: @${RM} ${WRKSRC}/tmdatools_config.php.sample.bak do-install: - @${MKDIR} ${TMDATOOLDIR} - @${CP} -Rp ${WRKSRC}/ ${TMDATOOLDIR} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TMDATOOLDIR} + @${MKDIR} ${STAGEDIR}${TMDATOOLDIR} + @${CP} -Rp ${WRKSRC}/ ${STAGEDIR}${TMDATOOLDIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${TMDATOOLDIR} @${RM} -f ${WRKSRC}/tmdatools_config.php.sample.bak post-install: Modified: head/mail/squirrelmail-unsafe_image_rules-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-unsafe_image_rules-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-unsafe_image_rules-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -14,8 +14,6 @@ USE_SM_COMPAT= yes SQUIRREL_PLUGIN_NAME= ${PORTNAME:S/-/_/} -NO_STAGE= yes - .include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" .include <bsd.port.post.mk> Modified: head/mail/squirrelmail-user_special_mailboxes-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-user_special_mailboxes-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-user_special_mailboxes-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -14,8 +14,6 @@ USE_SM_COMPAT= yes SQUIRREL_PLUGIN_NAME= ${PORTNAME:S/-/_/} -NO_STAGE= yes - .include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" .include <bsd.port.post.mk> Modified: head/mail/squirrelmail-vlogin-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-vlogin-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-vlogin-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -14,7 +14,6 @@ USE_SM_COMPAT= yes DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} -NO_STAGE= yes .include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" @@ -24,8 +23,8 @@ pre-install:: .if !defined(NOPORTDOCS) cd ${WRKSRC}/${PORTNAME}/docs \ && ${RM} .htaccess index.php \ - && ${MKDIR} ${DOCSDIR} \ - && ${COPYTREE_SHARE} \* ${DOCSDIR} \ + && ${MKDIR} ${STAGEDIR}${DOCSDIR} \ + && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} \ && cd ${WRKSRC}/${PORTNAME} \ && ${RM} -rf README docs .else Modified: head/mail/squirrelmail-websearch-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-websearch-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-websearch-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -16,8 +16,6 @@ USE_GENERIC_PKGMESSAGE= yes SQUIRREL_PLUGIN_CONFIG= ${SQUIRREL_PLUGIN_NAME}.conf.php -NO_STAGE= yes - post-patch: @${MV} ${WRKSRC}/${_SMSRCDIR}/${SQUIRREL_PLUGIN_CONFIG}.dist ${WRKSRC}/${_SMSRCDIR}/${SQUIRREL_PLUGIN_CONFIG}.sample Modified: head/mail/squirrelmail-wetteronline-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-wetteronline-plugin/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail-wetteronline-plugin/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -11,8 +11,6 @@ COMMENT= Plugin for the weather in Germ USE_SM_COMPAT= yes -NO_STAGE= yes - .include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" .include <bsd.port.post.mk> Modified: head/mail/squirrelmail/Makefile ============================================================================== --- head/mail/squirrelmail/Makefile Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail/Makefile Tue Feb 18 12:40:01 2014 (r344880) @@ -38,7 +38,7 @@ USERS= ${SMUSER} GROUPS= ${SMGROUP} PLIST_SUB= PORTVERSION=${PORTVERSION} \ - SQUIRRELDIR="${SQUIRRELDIR:S,^${PREFIX}/,,}" \ + SQUIRRELDIR="${SQUIRRELDIR:S,^${PREFIX}/,,}" \ SUB_FILES= pkg-message SUB_LIST= SQUIRRELDIR=${SQUIRRELDIR} SMUSER=${SMUSER} SMGROUP=${SMGROUP} Modified: head/mail/squirrelmail/bsd.squirrelmail.mk ============================================================================== --- head/mail/squirrelmail/bsd.squirrelmail.mk Tue Feb 18 12:39:42 2014 (r344879) +++ head/mail/squirrelmail/bsd.squirrelmail.mk Tue Feb 18 12:40:01 2014 (r344880) @@ -55,7 +55,7 @@ SUB_LIST+= SQUIRREL_PLUGIN_NAME=${SQUIR # As with mail/squirreldir, if you were using WITHOUT_WWWDIR=yes, # set SQUIRRELDIR=${PREFIX}/squirrelmail -SQUIRRELDIR?= ${PREFIX}/www/squirrelmail +SQUIRRELDIR?= ${PREFIX}/www/squirrelmail PLIST_SUB+= SQUIRRELDIR=${SQUIRRELDIR:S,${PREFIX}/,,} SUB_LIST+= SQUIRRELDIR=${SQUIRRELDIR} @@ -92,19 +92,19 @@ _SMSRCDIR?= ${SQUIRREL_PLUGIN_NAME} .if !target(do-install) do-install: cd ${WRKSRC}/${_SMSRCDIR} && ${FIND} -d . | \ - ${CPIO} -dump ${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME} >/dev/null 2>&1 && \ - ${FIND} ${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME} \ + ${CPIO} -dump ${STAGEDIR}${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME} >/dev/null 2>&1 && \ + ${FIND} ${STAGEDIR}${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME} \ -type d -exec chmod 755 {} \; && \ - ${FIND} ${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME} \ + ${FIND} ${STAGEDIR}${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME} \ -type f -exec chmod 644 {} \; .endif .if !target(post-install) post-install: .ifndef WITHOUT_ACTIVATE -.if exists( ${SQUIRRELDIR}/config/config.php ) +.if exists( ${STAGEDIR}${SQUIRRELDIR}/config/config.php ) @${ECHO_CMD} "Activating plug-in in SquirrelMail" - ${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME} + ${STAGEDIR}${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME} .endif .else @${ECHO_CMD} "To activate the plug-in in SquirrelMail use"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402181240.s1ICe2bp019962>