svn commit: r468924 - in head/mail: squirrelmail squirrelmail-plugins squirrelmail-shared_calendars-plugin squirrelmail-translations
Mathieu Arnold
mat at FreeBSD.org
Thu May 3 12:44:01 UTC 2018
On Thu, May 03, 2018 at 12:42:57PM +0000, Mathieu Arnold wrote:
> Author: mat
> Date: Thu May 3 12:42:57 2018
> New Revision: 468924
> URL: https://svnweb.freebsd.org/changeset/ports/468924
>
> Log:
> flavorize squirrelmail*
PR: 227930
Approved by: maintainers
> Modified:
> head/mail/squirrelmail-plugins/Makefile (contents, props changed)
> head/mail/squirrelmail-shared_calendars-plugin/Makefile (contents, props changed)
> head/mail/squirrelmail-translations/Makefile (contents, props changed)
> head/mail/squirrelmail/Makefile (contents, props changed)
> head/mail/squirrelmail/bsd.squirrelmail.mk (contents, props changed)
>
> Modified: head/mail/squirrelmail-plugins/Makefile
> ==============================================================================
> --- head/mail/squirrelmail-plugins/Makefile Thu May 3 12:42:48 2018 (r468923)
> +++ head/mail/squirrelmail-plugins/Makefile Thu May 3 12:42:57 2018 (r468924)
> @@ -5,6 +5,7 @@ PORTNAME= squirrelmail-plugins
> PORTVERSION= 1.0
> PORTREVISION= 2
> CATEGORIES= mail www
> +PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}
>
> MAINTAINER= ports at FreeBSD.org
> COMMENT= "meta-port" to install SquirrelMail plugins
> @@ -16,71 +17,71 @@ OPTIONS_DEFINE= BUTTONS CALENDAR LDAPPW LGAUTH LGNOTES
> SQLPW TIMEOUT TMDA VLOGIN WEBSEARCH WETTER
>
> BUTTONS_DESC= Custom (spam/ham/etc.) buttons
> -BUTTONS_RUN_DEPENDS= squirrelmail-spam-buttons-plugin>0:mail/squirrelmail-spam-buttons-plugin
> +BUTTONS_RUN_DEPENDS= squirrelmail-spam-buttons-plugin${PHP_PKGNAMESUFFIX}>0:mail/squirrelmail-spam-buttons-plugin@${PHP_FLAVOR}
>
> CALENDAR_DESC= Shared Calendars plugin
> -CALENDAR_RUN_DEPENDS= squirrelmail-shared_calendars-plugin>0:mail/squirrelmail-shared_calendars-plugin
> +CALENDAR_RUN_DEPENDS= squirrelmail-shared_calendars-plugin${PHP_PKGNAMESUFFIX}>0:mail/squirrelmail-shared_calendars-plugin@${PHP_FLAVOR}
>
> LDAPPW_DESC= Change LDAP passwords plugin
> -LDAPPW_RUN_DEPENDS= squirrelmail-change_ldappass-plugin>0:mail/squirrelmail-change_ldappass-plugin
> +LDAPPW_RUN_DEPENDS= squirrelmail-change_ldappass-plugin${PHP_PKGNAMESUFFIX}>0:mail/squirrelmail-change_ldappass-plugin@${PHP_FLAVOR}
>
> LGAUTH_DESC= HTTP-auth based login plugin
> -LGAUTH_RUN_DEPENDS= squirrelmail-login_auth-plugin>0:mail/squirrelmail-login_auth-plugin
> +LGAUTH_RUN_DEPENDS= squirrelmail-login_auth-plugin${PHP_PKGNAMESUFFIX}>0:mail/squirrelmail-login_auth-plugin@${PHP_FLAVOR}
>
> LGNOTES_DESC= Notes on login screen plugin
> -LGNOTES_RUN_DEPENDS= squirrelmail-login_notes-plugin>0:mail/squirrelmail-login_notes-plugin
> +LGNOTES_RUN_DEPENDS= squirrelmail-login_notes-plugin${PHP_PKGNAMESUFFIX}>0:mail/squirrelmail-login_notes-plugin@${PHP_FLAVOR}
>
> MAILFT_DESC= E-mail footer plugin
> -MAILFT_RUN_DEPENDS= squirrelmail-email_footer-plugin>0:mail/squirrelmail-email_footer-plugin
> +MAILFT_RUN_DEPENDS= squirrelmail-email_footer-plugin${PHP_PKGNAMESUFFIX}>0:mail/squirrelmail-email_footer-plugin@${PHP_FLAVOR}
>
> MLOGIN_DESC= Multilogin plugin
> -MLOGIN_RUN_DEPENDS= squirrelmail-multilogin-plugin>0:mail/squirrelmail-multilogin-plugin
> +MLOGIN_RUN_DEPENDS= squirrelmail-multilogin-plugin${PHP_PKGNAMESUFFIX}>0:mail/squirrelmail-multilogin-plugin@${PHP_FLAVOR}
>
> NOTES_DESC= Notes plugin
> -NOTES_RUN_DEPENDS= squirrelmail-notes-plugin>0:mail/squirrelmail-notes-plugin
> +NOTES_RUN_DEPENDS= squirrelmail-notes-plugin${PHP_PKGNAMESUFFIX}>0:mail/squirrelmail-notes-plugin@${PHP_FLAVOR}
>
> NOTIFY_DESC= New mail notify plugin
> -NOTIFY_RUN_DEPENDS= squirrelmail-notify-plugin>0:mail/squirrelmail-notify-plugin
> +NOTIFY_RUN_DEPENDS= squirrelmail-notify-plugin${PHP_PKGNAMESUFFIX}>0:mail/squirrelmail-notify-plugin@${PHP_FLAVOR}
>
> PUPDATE_DESC= Plugin update check plugin
> -PUPDATE_RUN_DEPENDS= squirrelmail-pupdate-plugin>0:mail/squirrelmail-pupdate-plugin
> +PUPDATE_RUN_DEPENDS= squirrelmail-pupdate-plugin${PHP_PKGNAMESUFFIX}>0:mail/squirrelmail-pupdate-plugin@${PHP_FLAVOR}
>
> PW4GET_DESC= Password forget plugin
> -PW4GET_RUN_DEPENDS= squirrelmail-password_forget-plugin>0:mail/squirrelmail-password_forget-plugin
> +PW4GET_RUN_DEPENDS= squirrelmail-password_forget-plugin${PHP_PKGNAMESUFFIX}>0:mail/squirrelmail-password_forget-plugin@${PHP_FLAVOR}
>
> QMADMIN_DESC= Qmailadmin login plugin
> -QMADMIN_RUN_DEPENDS= squirrelmail-qmailadmin_login-plugin>0:mail/squirrelmail-qmailadmin_login-plugin
> +QMADMIN_RUN_DEPENDS= squirrelmail-qmailadmin_login-plugin${PHP_PKGNAMESUFFIX}>0:mail/squirrelmail-qmailadmin_login-plugin@${PHP_FLAVOR}
>
> QUOTA_DESC= Quota usage plugin
> -QUOTA_RUN_DEPENDS= squirrelmail-quota_usage-plugin>0:mail/squirrelmail-quota_usage-plugin
> +QUOTA_RUN_DEPENDS= squirrelmail-quota_usage-plugin${PHP_PKGNAMESUFFIX}>0:mail/squirrelmail-quota_usage-plugin@${PHP_FLAVOR}
>
> SASQL_DESC= SpamAssassin SQL plugin
> -SASQL_RUN_DEPENDS= squirrelmail-sasql-plugin>0:mail/squirrelmail-sasql-plugin
> +SASQL_RUN_DEPENDS= squirrelmail-sasql-plugin${PHP_PKGNAMESUFFIX}>0:mail/squirrelmail-sasql-plugin@${PHP_FLAVOR}
>
> SIEVE_DESC= Sieve Mail Filters plugin
> -SIEVE_RUN_DEPENDS= squirrelmail-avelsieve-plugin>0:mail/squirrelmail-avelsieve-plugin
> +SIEVE_RUN_DEPENDS= squirrelmail-avelsieve-plugin${PHP_PKGNAMESUFFIX}>0:mail/squirrelmail-avelsieve-plugin@${PHP_FLAVOR}
>
> SLOGIN_DESC= SSL login plugin
> -SLOGIN_RUN_DEPENDS= squirrelmail-secure_login-plugin>0:mail/squirrelmail-secure_login-plugin
> +SLOGIN_RUN_DEPENDS= squirrelmail-secure_login-plugin${PHP_PKGNAMESUFFIX}>0:mail/squirrelmail-secure_login-plugin@${PHP_FLAVOR}
>
> SQLPW_DESC= Change *SQL passwords plugin
> -SQLPW_RUN_DEPENDS= squirrelmail-change-sqlpass-plugin>0:mail/squirrelmail-change_sqlpass-plugin
> +SQLPW_RUN_DEPENDS= squirrelmail-change-sqlpass-plugin${PHP_PKGNAMESUFFIX}>0:mail/squirrelmail-change_sqlpass-plugin@${PHP_FLAVOR}
>
> TIMEOUT_DESC= User session timeout plugin
> -TIMEOUT_RUN_DEPENDS= squirrelmail-timeout_user-plugin>0:mail/squirrelmail-timeout_user-plugin
> +TIMEOUT_RUN_DEPENDS= squirrelmail-timeout_user-plugin${PHP_PKGNAMESUFFIX}>0:mail/squirrelmail-timeout_user-plugin@${PHP_FLAVOR}
>
> TMDA_DESC= TMDA plugin
> -TMDA_RUN_DEPENDS= squirrelmail-tmda-plugin>0:mail/squirrelmail-tmda-plugin
> +TMDA_RUN_DEPENDS= squirrelmail-tmda-plugin${PHP_PKGNAMESUFFIX}>0:mail/squirrelmail-tmda-plugin@${PHP_FLAVOR}
>
> VLOGIN_DESC= Multi-site-hosting capabilities plugin
> -VLOGIN_RUN_DEPENDS= squirrelmail-vlogin-plugin>0:mail/squirrelmail-vlogin-plugin
> +VLOGIN_RUN_DEPENDS= squirrelmail-vlogin-plugin${PHP_PKGNAMESUFFIX}>0:mail/squirrelmail-vlogin-plugin@${PHP_FLAVOR}
>
> WEBSEARCH_DESC= Web search engines plugin
> -WEBSEARCH_RUN_DEPENDS= squirrelmail-web_search-plugin>0:mail/squirrelmail-websearch-plugin
> +WEBSEARCH_RUN_DEPENDS= squirrelmail-web_search-plugin${PHP_PKGNAMESUFFIX}>0:mail/squirrelmail-websearch-plugin@${PHP_FLAVOR}
>
> WETTER_DESC= Weather in Germany plugin
> -WETTER_RUN_DEPENDS= squirrelmail-wetteronline-plugin>0:mail/squirrelmail-wetteronline-plugin
> +WETTER_RUN_DEPENDS= squirrelmail-wetteronline-plugin${PHP_PKGNAMESUFFIX}>0:mail/squirrelmail-wetteronline-plugin@${PHP_FLAVOR}
>
> -USES= metaport
> +USES= metaport php:flavors
>
> .include <bsd.port.mk>
>
> Modified: head/mail/squirrelmail-shared_calendars-plugin/Makefile
> ==============================================================================
> --- head/mail/squirrelmail-shared_calendars-plugin/Makefile Thu May 3 12:42:48 2018 (r468923)
> +++ head/mail/squirrelmail-shared_calendars-plugin/Makefile Thu May 3 12:42:57 2018 (r468924)
> @@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-1.4.0
> MAINTAINER= ports at FreeBSD.org
> COMMENT= iCal-compliant calendaring for SquirrelMail
>
> -RUN_DEPENDS= squirrelmail-calendar_file_backend-plugin>0:mail/squirrelmail-calendar_file_backend-plugin
> +RUN_DEPENDS= squirrelmail-calendar_file_backend-plugin${PHP_PKGNAMESUFFIX}>0:mail/squirrelmail-calendar_file_backend-plugin@${PHP_FLAVOR}
>
> USE_SM_COMPAT= yes
> USE_GENERIC_PKGMESSAGE= yes
>
> Modified: head/mail/squirrelmail-translations/Makefile
> ==============================================================================
> --- head/mail/squirrelmail-translations/Makefile Thu May 3 12:42:48 2018 (r468923)
> +++ head/mail/squirrelmail-translations/Makefile Thu May 3 12:42:57 2018 (r468924)
> @@ -6,6 +6,7 @@ PORTVERSION= 20170705
> CATEGORIES= mail www
> MASTER_SITES= http://snapshots.squirrelmail.org/ \
> http://freebsd.uzsolt.hu/src/
> +PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}
> DISTNAME= squirrelmail-${PORTVERSION}_0200-SVN.locales
> DIST_SUBDIR= squirrelmail
>
> @@ -14,9 +15,9 @@ COMMENT= NLS translations for Squirrelmail (mail/squir
>
> LICENSE= GPLv2
>
> -RUN_DEPENDS= squirrelmail>=${PORTVERSION}:mail/squirrelmail
> +RUN_DEPENDS= squirrelmail${PHP_PKGNAMESUFFIX}>=${PORTVERSION}:mail/squirrelmail@${PHP_FLAVOR}
>
> -USES= tar:bzip2 gettext
> +USES= tar:bzip2 gettext php:flavors
> WRKSRC= ${WRKDIR}/squirrelmail.locales
> NO_ARCH= yes
> PORTSCOUT= ignore:1
>
> Modified: head/mail/squirrelmail/Makefile
> ==============================================================================
> --- head/mail/squirrelmail/Makefile Thu May 3 12:42:48 2018 (r468923)
> +++ head/mail/squirrelmail/Makefile Thu May 3 12:42:57 2018 (r468924)
> @@ -6,6 +6,7 @@ PORTVERSION= 20180404
> CATEGORIES= mail www
> MASTER_SITES= http://snapshots.squirrelmail.org/ \
> http://freebsd.uzsolt.hu/src/
> +PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}
> DISTNAME= ${PORTNAME}-${PORTVERSION}_0202-SVN.stable
> DIST_SUBDIR= ${PORTNAME}
>
> @@ -15,7 +16,7 @@ COMMENT= Webmail system which accesses mail over IMAP
> LICENSE= GPLv2+
> LICENSE_FILE= ${WRKSRC}/doc/COPYING
>
> -USES= cpe gettext perl5 php:web tar:bzip2
> +USES= cpe gettext perl5 php:web,flavors tar:bzip2
> USE_PHP= session hash gettext mbstring pcre openssl xml
> USE_PERL5= run
> NO_ARCH= yes
>
> Modified: head/mail/squirrelmail/bsd.squirrelmail.mk
> ==============================================================================
> --- head/mail/squirrelmail/bsd.squirrelmail.mk Thu May 3 12:42:48 2018 (r468923)
> +++ head/mail/squirrelmail/bsd.squirrelmail.mk Thu May 3 12:42:57 2018 (r468924)
> @@ -30,13 +30,13 @@
>
> MASTER_SITES?= http://www.squirrelmail.org/plugins/
> PKGNAMEPREFIX?= squirrelmail-
> -PKGNAMESUFFIX?= -plugin
> +PKGNAMESUFFIX?= -plugin${PHP_PKGNAMESUFFIX}
> DIST_SUBDIR?= squirrelmail
>
> -RUN_DEPENDS+= ${LOCALBASE}/${SQUIRRELDIR_REL}/index.php:mail/squirrelmail
> +RUN_DEPENDS+= ${LOCALBASE}/${SQUIRRELDIR_REL}/index.php:mail/squirrelmail@${PHP_FLAVOR}
>
> .ifdef USE_SM_COMPAT
> -RUN_DEPENDS+= squirrelmail-compatibility-plugin>0:mail/squirrelmail-compatibility-plugin
> +RUN_DEPENDS+= squirrelmail-compatibility-plugin${PHP_PKGNAMESUFFIX}>0:mail/squirrelmail-compatibility-plugin@${PHP_FLAVOR}
> .endif
>
> .ifndef WITHOUT_ACTIVATE
> @@ -49,7 +49,7 @@ NO_ARCH= yes
> NO_WRKSUBDIR= yes
> USE_PHP?= yes
> .if empty(USES:Mphp*)
> -USES+= php:web
> +USES+= php:web,flavors
> .endif
>
> SQUIRREL_PLUGIN_NAME?= ${PORTNAME}
>
>
--
Mathieu Arnold
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 949 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20180503/628ecad2/attachment.sig>
More information about the svn-ports-all
mailing list