Date: Thu, 28 Aug 2014 15:16:49 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366415 - in head/mail: squirrelmail squirrelmail-abook_import_export-plugin squirrelmail-askuserinfo-plugin squirrelmail-avelsieve-plugin squirrelmail-calendar_file_backend-plugin squi... Message-ID: <201408281516.s7SFGnKB097180@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Thu Aug 28 15:16:49 2014 New Revision: 366415 URL: http://svnweb.freebsd.org/changeset/ports/366415 QAT: https://qat.redports.org/buildarchive/r366415/ Log: 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. 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-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/bsd.squirrelmail.mk Modified: head/mail/squirrelmail-abook_import_export-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-abook_import_export-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-abook_import_export-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -3,7 +3,7 @@ PORTNAME= abook_import_export PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail www DISTNAME= ${PORTNAME:S/-/_/}-${PORTVERSION}-1.4.4 DIST_SUBDIR= squirrelmail @@ -13,6 +13,5 @@ COMMENT= Allows for the importing of add SQUIRREL_PLUGIN_NAME= ${PORTNAME:S/-/_/} -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-askuserinfo-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-askuserinfo-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-askuserinfo-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -2,13 +2,12 @@ PORTNAME= askuserinfo PORTVERSION= 1.1 -PORTREVISION= 1 -CATEGORIES= mail www +PORTREVISION= 2 +CATEGORIES= mail www DISTNAME= ${PORTNAME}.${PORTVERSION}-1.4.0 MAINTAINER= ports@FreeBSD.org COMMENT= Ask user to enter Full name and Email address at initial logon -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-avelsieve-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-avelsieve-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-avelsieve-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -3,7 +3,7 @@ PORTNAME= avelsieve PORTVERSION= 1.9.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail www MAINTAINER= ports@FreeBSD.org Modified: head/mail/squirrelmail-calendar_file_backend-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-calendar_file_backend-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-calendar_file_backend-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -1,15 +1,14 @@ # Created by: Gerrit Beine <gerrit.beine@gmx.de> # $FreeBSD$ -PORTNAME= calendar_file_backend +PORTNAME= calendar_file_backend PORTVERSION= 1.0 -PORTREVISION= 2 -CATEGORIES= mail www -DISTNAME= ${PORTNAME}-${PORTVERSION}-2.0 +PORTREVISION= 3 +CATEGORIES= mail www +DISTNAME= ${PORTNAME}-${PORTVERSION}-2.0 -MAINTAINER= ports@FreeBSD.org -COMMENT= File backend for SquirrelMail Calendar plugin +MAINTAINER= ports@FreeBSD.org +COMMENT= File backend for SquirrelMail Calendar plugin -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-change_ldappass-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-change_ldappass-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-change_ldappass-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -1,10 +1,10 @@ # Created by: Alexander Wittig <alexander@wittig.name> # $FreeBSD$ -PORTNAME= change_ldappass +PORTNAME= change_ldappass PORTVERSION= 2.2 -PORTREVISION= 5 -CATEGORIES= mail www +PORTREVISION= 6 +CATEGORIES= mail www DISTNAME= ${PORTNAME}-${PORTVERSION}-1.4.0 MAINTAINER= ports@FreeBSD.org @@ -17,6 +17,5 @@ USES= gettext USE_GENERIC_PKGMESSAGE= yes -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-change_sqlpass-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-change_sqlpass-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-change_sqlpass-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -3,8 +3,8 @@ PORTNAME= change-sqlpass PORTVERSION= 3.3 -PORTREVISION= 2 -CATEGORIES= mail www +PORTREVISION= 3 +CATEGORIES= mail www DISTNAME= ${PORTNAME:S/-/_/}-${PORTVERSION}-1.2 MAINTAINER= itetcu@FreeBSD.org @@ -16,6 +16,5 @@ RUN_DEPENDS= ${LOCALBASE}/share/pear/DB. SQUIRREL_PLUGIN_NAME= ${PORTNAME:S/-/_/} -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-check_quota-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-check_quota-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-check_quota-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -3,8 +3,8 @@ PORTNAME= check-quota PORTVERSION= 2.2 -PORTREVISION= 2 -CATEGORIES= mail www +PORTREVISION= 3 +CATEGORIES= mail www DISTNAME= ${PORTNAME:S/-/_/}-${PORTVERSION}-1.4.0 MAINTAINER= itetcu@FreeBSD.org @@ -14,6 +14,5 @@ USE_SM_COMPAT= YES SQUIRREL_PLUGIN_NAME= ${PORTNAME:S/-/_/} -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-compatibility-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-compatibility-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-compatibility-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -2,13 +2,13 @@ # $FreeBSD$ PORTNAME= compatibility -PORTVERSION=2.0.16 +PORTVERSION= 2.0.16 +PORTREVISION= 1 CATEGORIES= mail www DISTNAME= ${PORTNAME}-${PORTVERSION}-1.0 MAINTAINER= ports@FreeBSD.org COMMENT= Required by many plugins for compatibility with SquirrelMail -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-email_footer-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-email_footer-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-email_footer-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= email_footer -PORTVERSION=0.6 +PORTVERSION= 0.6 PORTREVISION= 1 CATEGORIES= mail www DISTNAME= ${PORTNAME}-${PORTVERSION}-1.4.2 @@ -15,6 +15,5 @@ USE_GENERIC_PKGMESSAGE= yes LICENSE= GPLv2 -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-login_auth-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-login_auth-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-login_auth-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -1,19 +1,18 @@ # Created by: Stefan Bethke <stb@lassitu.de> # $FreeBSD$ -PORTNAME= login_auth -PORTVERSION= 3.0 -PORTREVISION= 1 -CATEGORIES= mail www -MASTER_SITES= http://www.squirrelmail.org/plugins/ \ - http://www.transit.hanse.de/mirror/www.squirrelmail.org/plugins/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-1.4.0 +PORTNAME= login_auth +PORTVERSION= 3.0 +PORTREVISION= 2 +CATEGORIES= mail www +MASTER_SITES= http://www.squirrelmail.org/plugins/ \ + http://www.transit.hanse.de/mirror/www.squirrelmail.org/plugins/ +DISTNAME= ${PORTNAME}-${PORTVERSION}-1.4.0 -MAINTAINER= stb@lassitu.de -COMMENT= Automatically log in user based on HTTP authentication +MAINTAINER= stb@lassitu.de +COMMENT= Automatically log in user based on HTTP authentication SQUIRREL_PLUGIN_NAME= ${PORTNAME} -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-login_notes-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-login_notes-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-login_notes-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= login_notes -PORTVERSION=1.2 -PORTREVISION= 1 +PORTVERSION= 1.2 +PORTREVISION= 2 CATEGORIES= mail www DISTNAME= ${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}-1.4.0 @@ -15,6 +15,5 @@ LICENSE= GPLv2 USE_SM_COMPAT= yes USE_GENERIC_PKGMESSAGE= yes -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-mark_read-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-mark_read-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-mark_read-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -3,8 +3,8 @@ PORTNAME= mark_read PORTVERSION= 1.4.2 -PORTREVISION= 3 -CATEGORIES= mail www +PORTREVISION= 4 +CATEGORIES= mail www DISTNAME= ${PORTNAME:S/-/_/}-${PORTVERSION}-1.2 MAINTAINER= itetcu@FreeBSD.org @@ -17,6 +17,5 @@ SQUIRREL_PLUGIN_NAME= ${PORTNAME:S/-/_/} post-patch: @${RM} ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/mark_read.php.orig -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-multilogin-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-multilogin-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-multilogin-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -1,10 +1,10 @@ # Created by: Gerrit Beine <gerrit.beine@gmx.de> # $FreeBSD$ -PORTNAME= multilogin +PORTNAME= multilogin PORTVERSION= 2.4 -PORTREVISION= 2 -CATEGORIES= mail www +PORTREVISION= 3 +CATEGORIES= mail www DISTNAME= ${PORTNAME}-${PORTVERSION}-1.2.9 MAINTAINER= ports@FreeBSD.org @@ -13,6 +13,5 @@ COMMENT= Allows manual selection of logi USE_SM_COMPAT= yes USE_GENERIC_PKGMESSAGE= yes -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-notes-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-notes-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-notes-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -1,18 +1,17 @@ # Created by: Gerrit Beine <gerrit.beine@gmx.de> # $FreeBSD$ -PORTNAME= notes +PORTNAME= notes PORTVERSION= 1.2 -PORTREVISION= 2 -CATEGORIES= mail www -DISTNAME= ${PORTNAME}.${PORTVERSION}-1.4.0 +PORTREVISION= 3 +CATEGORIES= mail www +DISTNAME= ${PORTNAME}.${PORTVERSION}-1.4.0 -MAINTAINER= ports@FreeBSD.org -COMMENT= Allows you to create notes +MAINTAINER= ports@FreeBSD.org +COMMENT= Allows you to create notes USE_SM_COMPAT= yes USE_GENERIC_PKGMESSAGE= yes -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-notify-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-notify-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-notify-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -1,17 +1,16 @@ # Created by: Gerrit Beine <gerrit.beine@gmx.de> # $FreeBSD$ -PORTNAME= notify +PORTNAME= notify PORTVERSION= 1.3 -PORTREVISION= 2 -CATEGORIES= mail www -DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/g} +PORTREVISION= 3 +CATEGORIES= mail www +DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/g} -MAINTAINER= ports@FreeBSD.org -COMMENT= Notify when new mail arrives +MAINTAINER= ports@FreeBSD.org +COMMENT= Notify when new mail arrives USE_SM_COMPAT= yes -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-password_forget-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-password_forget-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-password_forget-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -3,7 +3,7 @@ PORTNAME= password_forget PORTVERSION= 2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail www DISTNAME= ${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}-1.0.1 Modified: head/mail/squirrelmail-pupdate-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-pupdate-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-pupdate-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -3,8 +3,8 @@ PORTNAME= pupdate PORTVERSION= 0.7 -PORTREVISION= 3 -CATEGORIES= mail www +PORTREVISION= 4 +CATEGORIES= mail www DISTNAME= ${PORTNAME}.${PORTVERSION}-1.4.2 MAINTAINER= ports@FreeBSD.org @@ -14,6 +14,5 @@ LICENSE= GPLv2 USE_GENERIC_PKGMESSAGE= yes -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-qmailadmin_login-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-qmailadmin_login-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-qmailadmin_login-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -1,11 +1,11 @@ # Created by: Gerrit Beine <gerrit.beine@gmx.de> # $FreeBSD$ -PORTNAME= qmailadmin_login +PORTNAME= qmailadmin_login PORTVERSION= 1.1 -PORTREVISION= 3 -CATEGORIES= mail www -DISTNAME= ${PORTNAME}-${PORTVERSION}-1.4.3 +PORTREVISION= 4 +CATEGORIES= mail www +DISTNAME= ${PORTNAME}-${PORTVERSION}-1.4.3 MAINTAINER= ports@FreeBSD.org COMMENT= Using the QmailAdmin cgi interface from SquirrelMail @@ -14,6 +14,5 @@ RUN_DEPENDS= ${PREFIX}/www/cgi-bin.defau USE_GENERIC_PKGMESSAGE= yes -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-quota_usage-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-quota_usage-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-quota_usage-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -1,18 +1,17 @@ # Created by: Gerrit Beine <gerrit.beine@gmx.de> # $FreeBSD$ -PORTNAME= quota_usage +PORTNAME= quota_usage PORTVERSION= 1.3.1 -PORTREVISION= 2 -CATEGORIES= mail www -DISTNAME= ${PORTNAME}-${PORTVERSION}-1.2.7 +PORTREVISION= 3 +CATEGORIES= mail www +DISTNAME= ${PORTNAME}-${PORTVERSION}-1.2.7 -MAINTAINER= ports@FreeBSD.org -COMMENT= View quota and current usage +MAINTAINER= ports@FreeBSD.org +COMMENT= View quota and current usage USE_SM_COMPAT= yes USE_GENERIC_PKGMESSAGE= yes -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-sasql-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-sasql-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-sasql-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -1,10 +1,10 @@ # Created by: Gerrit Beine <gerrit.beine@gmx.de> # $FreeBSD$ -PORTNAME= sasql +PORTNAME= sasql PORTVERSION= 3.2.0 -PORTREVISION= 2 -CATEGORIES= mail www +PORTREVISION= 3 +CATEGORIES= mail www MAINTAINER= ports@FreeBSD.org COMMENT= Edit SpamAssassin settings stored in an SQL DB @@ -20,6 +20,5 @@ post-patch: ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/sasql_hooks.php -@${RM} ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/*.bak ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/.cvsignore -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-secure_login-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-secure_login-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-secure_login-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -2,8 +2,8 @@ PORTNAME= secure_login PORTVERSION= 1.4 -PORTREVISION= 2 -CATEGORIES= mail www +PORTREVISION= 3 +CATEGORIES= mail www DISTNAME= ${PORTNAME}-${PORTVERSION}-1.2.8 MAINTAINER= ports@FreeBSD.org @@ -13,6 +13,5 @@ LICENSE= GPLv2 USE_GENERIC_PKGMESSAGE= yes -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-shared_calendars-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-shared_calendars-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-shared_calendars-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -1,14 +1,14 @@ # Created by: Gerrit Beine <gerrit.beine@gmx.de> # $FreeBSD$ -PORTNAME= shared_calendars +PORTNAME= shared_calendars PORTVERSION= 2.0.1 -PORTREVISION= 2 -CATEGORIES= mail www -DISTNAME= ${PORTNAME}-${PORTVERSION}-1.4.0 +PORTREVISION= 3 +CATEGORIES= mail www +DISTNAME= ${PORTNAME}-${PORTVERSION}-1.4.0 -MAINTAINER= ports@FreeBSD.org -COMMENT= iCal-compliant calendaring for SquirrelMail +MAINTAINER= ports@FreeBSD.org +COMMENT= iCal-compliant calendaring for SquirrelMail RUN_DEPENDS= ${SQUIRRELDIR}/plugins/calendar_file_backend:${PORTSDIR}/mail/squirrelmail-calendar_file_backend-plugin @@ -16,6 +16,5 @@ USE_SM_COMPAT= yes USE_GENERIC_PKGMESSAGE= yes _SMSRCDIR= calendar -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-spam-buttons-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-spam-buttons-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-spam-buttons-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -3,8 +3,8 @@ PORTNAME= spam-buttons PORTVERSION= 2.3.1 -PORTREVISION= 1 -CATEGORIES= mail www +PORTREVISION= 2 +CATEGORIES= mail www DISTNAME= ${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}-1.4.0 DIST_SUBDIR= squirrelmail @@ -17,7 +17,6 @@ SQUIRREL_PLUGIN_NAME= ${PORTNAME:S/-/_/} OPTIONS_DEFINE= DOCS -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" post-extract: @@ -25,4 +24,4 @@ post-extract: @${RM} ${WRKSRC}/${_SMSRCDIR}/README @${MV} ${WRKSRC}/${_SMSRCDIR}/docs ${WRKSRC}/${_SMSRCDIR}/doc -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-squirrel_logger-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-squirrel_logger-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-squirrel_logger-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -3,8 +3,8 @@ PORTNAME= squirrel_logger PORTVERSION= 2.3 -PORTREVISION= 1 -CATEGORIES= mail www +PORTREVISION= 2 +CATEGORIES= mail www DISTNAME= ${PORTNAME}-${PORTVERSION}-1.2.7 MAINTAINER= ports@FreeBSD.org @@ -12,6 +12,5 @@ COMMENT= Logging functionality for your USE_SM_COMPAT= yes -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-timeout_user-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-timeout_user-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-timeout_user-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -2,8 +2,8 @@ PORTNAME= timeout_user PORTVERSION= 1.1.1 -PORTREVISION= 4 -CATEGORIES= mail www +PORTREVISION= 5 +CATEGORIES= mail www DISTNAME= ${PORTNAME}-${PORTVERSION}-0.5 MAINTAINER= ports@FreeBSD.org @@ -18,6 +18,5 @@ USE_GENERIC_PKGMESSAGE= yes post-patch: @${MV} ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/config.php ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/config.php.sample -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-unsafe_image_rules-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-unsafe_image_rules-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-unsafe_image_rules-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -3,8 +3,8 @@ PORTNAME= unsafe_image_rules PORTVERSION= 0.8 -PORTREVISION= 2 -CATEGORIES= mail www +PORTREVISION= 3 +CATEGORIES= mail www DISTNAME= ${PORTNAME:S/-/_/}.${PORTVERSION}-1.4 MAINTAINER= itetcu@FreeBSD.org @@ -14,6 +14,5 @@ USE_SM_COMPAT= yes SQUIRREL_PLUGIN_NAME= ${PORTNAME:S/-/_/} -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-user_special_mailboxes-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-user_special_mailboxes-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-user_special_mailboxes-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -3,8 +3,8 @@ PORTNAME= user_special_mailboxes PORTVERSION= 0.1 -PORTREVISION= 2 -CATEGORIES= mail www +PORTREVISION= 3 +CATEGORIES= mail www DISTNAME= ${PORTNAME:S/-/_/}.${PORTVERSION}-1.4 MAINTAINER= itetcu@FreeBSD.org @@ -14,6 +14,5 @@ USE_SM_COMPAT= yes SQUIRREL_PLUGIN_NAME= ${PORTNAME:S/-/_/} -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-vlogin-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-vlogin-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-vlogin-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -3,7 +3,7 @@ PORTNAME= vlogin PORTVERSION= 3.10.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail www DISTNAME= ${PORTNAME}-${PORTVERSION}-1.2.7 @@ -19,12 +19,12 @@ OPTIONS_DEFINE= DOCS # We need to rearrange, install and cleanup documentation pre-install # because bsd.squirrelmail.mk installs everything under ${WRKSRC}/${PORTNAME}. pre-install:: - cd ${WRKSRC}/${PORTNAME}/docs \ - && ${RM} .htaccess index.php \ - && ${MKDIR} ${STAGEDIR}${DOCSDIR} \ - && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} \ - && cd ${WRKSRC}/${PORTNAME} \ - && ${RM} -rf README docs + ${RM} ${WRKSRC}/${PORTNAME}/docs/.htaccess + ${RM} ${WRKSRC}/${PORTNAME}/docs/index.php + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/${PORTNAME}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) + ${RM} -rf ${WRKSRC}/${PORTNAME}/README + ${RM} -rf ${WRKSRC}/${PORTNAME}/docs .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" .include <bsd.port.mk> Modified: head/mail/squirrelmail-websearch-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-websearch-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-websearch-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -3,8 +3,8 @@ PORTNAME= web_search PORTVERSION= 0.1.6 -PORTREVISION= 3 -CATEGORIES= mail www +PORTREVISION= 4 +CATEGORIES= mail www MAINTAINER= ports@FreeBSD.org COMMENT= Plugin for Websearch @@ -19,6 +19,5 @@ SQUIRREL_PLUGIN_CONFIG= ${SQUIRREL_PLUGI post-patch: @${MV} ${WRKSRC}/${_SMSRCDIR}/${SQUIRREL_PLUGIN_CONFIG}.dist ${WRKSRC}/${_SMSRCDIR}/${SQUIRREL_PLUGIN_CONFIG}.sample -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail-wetteronline-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-wetteronline-plugin/Makefile Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail-wetteronline-plugin/Makefile Thu Aug 28 15:16:49 2014 (r366415) @@ -1,16 +1,15 @@ # Created by: Gerrit Beine <gerrit.beine@gmx.de> # $FreeBSD$ -PORTNAME= wetteronline +PORTNAME= wetteronline PORTVERSION= 0.1 -PORTREVISION= 2 -CATEGORIES= mail www +PORTREVISION= 3 +CATEGORIES= mail www -MAINTAINER= ports@FreeBSD.org -COMMENT= Plugin for the weather in Germany +MAINTAINER= ports@FreeBSD.org +COMMENT= Plugin for the weather in Germany USE_SM_COMPAT= yes -.include <bsd.port.pre.mk> .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/squirrelmail/bsd.squirrelmail.mk ============================================================================== --- head/mail/squirrelmail/bsd.squirrelmail.mk Thu Aug 28 15:03:19 2014 (r366414) +++ head/mail/squirrelmail/bsd.squirrelmail.mk Thu Aug 28 15:16:49 2014 (r366415) @@ -56,7 +56,8 @@ SUB_LIST+= SQUIRREL_PLUGIN_NAME=${SQUIRR # 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408281516.s7SFGnKB097180>