Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 3 May 2018 14:43:49 +0200
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   Re: svn commit: r468924 - in head/mail: squirrelmail squirrelmail-plugins squirrelmail-shared_calendars-plugin squirrelmail-translations
Message-ID:  <20180503124349.sdbjdhbfkacznt5b@ogg.in.absolight.net>
In-Reply-To: <201805031242.w43Cgvdo056851@repo.freebsd.org>
References:  <201805031242.w43Cgvdo056851@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--zvo4anjlvxxkmxgp
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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
>=20
> 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, pr=
ops 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)
>=20
> Modified: head/mail/squirrelmail-plugins/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/mail/squirrelmail-plugins/Makefile	Thu May  3 12:42:48 2018	(r46=
8923)
> +++ head/mail/squirrelmail-plugins/Makefile	Thu May  3 12:42:57 2018	(r46=
8924)
> @@ -5,6 +5,7 @@ PORTNAME=3D	squirrelmail-plugins
>  PORTVERSION=3D	1.0
>  PORTREVISION=3D	2
>  CATEGORIES=3D	mail www
> +PKGNAMESUFFIX=3D	${PHP_PKGNAMESUFFIX}
> =20
>  MAINTAINER=3D	ports@FreeBSD.org
>  COMMENT=3D	"meta-port" to install SquirrelMail plugins
> @@ -16,71 +17,71 @@ OPTIONS_DEFINE=3D	BUTTONS CALENDAR LDAPPW LGAUTH LGNO=
TES
>  	SQLPW TIMEOUT TMDA VLOGIN WEBSEARCH WETTER
> =20
>  BUTTONS_DESC=3D	Custom (spam/ham/etc.) buttons
> -BUTTONS_RUN_DEPENDS=3D	squirrelmail-spam-buttons-plugin>0:mail/squirrelm=
ail-spam-buttons-plugin
> +BUTTONS_RUN_DEPENDS=3D	squirrelmail-spam-buttons-plugin${PHP_PKGNAMESUFF=
IX}>0:mail/squirrelmail-spam-buttons-plugin@${PHP_FLAVOR}
> =20
>  CALENDAR_DESC=3D	Shared Calendars plugin
> -CALENDAR_RUN_DEPENDS=3D	squirrelmail-shared_calendars-plugin>0:mail/squi=
rrelmail-shared_calendars-plugin
> +CALENDAR_RUN_DEPENDS=3D	squirrelmail-shared_calendars-plugin${PHP_PKGNAM=
ESUFFIX}>0:mail/squirrelmail-shared_calendars-plugin@${PHP_FLAVOR}
> =20
>  LDAPPW_DESC=3D	Change LDAP passwords plugin
> -LDAPPW_RUN_DEPENDS=3D	squirrelmail-change_ldappass-plugin>0:mail/squirre=
lmail-change_ldappass-plugin
> +LDAPPW_RUN_DEPENDS=3D	squirrelmail-change_ldappass-plugin${PHP_PKGNAMESU=
FFIX}>0:mail/squirrelmail-change_ldappass-plugin@${PHP_FLAVOR}
> =20
>  LGAUTH_DESC=3D	HTTP-auth based login plugin
> -LGAUTH_RUN_DEPENDS=3D	squirrelmail-login_auth-plugin>0:mail/squirrelmail=
-login_auth-plugin
> +LGAUTH_RUN_DEPENDS=3D	squirrelmail-login_auth-plugin${PHP_PKGNAMESUFFIX}=
>0:mail/squirrelmail-login_auth-plugin@${PHP_FLAVOR}
> =20
>  LGNOTES_DESC=3D	Notes on login screen plugin
> -LGNOTES_RUN_DEPENDS=3D	squirrelmail-login_notes-plugin>0:mail/squirrelma=
il-login_notes-plugin
> +LGNOTES_RUN_DEPENDS=3D	squirrelmail-login_notes-plugin${PHP_PKGNAMESUFFI=
X}>0:mail/squirrelmail-login_notes-plugin@${PHP_FLAVOR}
> =20
>  MAILFT_DESC=3D	E-mail footer plugin
> -MAILFT_RUN_DEPENDS=3D	squirrelmail-email_footer-plugin>0:mail/squirrelma=
il-email_footer-plugin
> +MAILFT_RUN_DEPENDS=3D	squirrelmail-email_footer-plugin${PHP_PKGNAMESUFFI=
X}>0:mail/squirrelmail-email_footer-plugin@${PHP_FLAVOR}
> =20
>  MLOGIN_DESC=3D	Multilogin plugin
> -MLOGIN_RUN_DEPENDS=3D	squirrelmail-multilogin-plugin>0:mail/squirrelmail=
-multilogin-plugin
> +MLOGIN_RUN_DEPENDS=3D	squirrelmail-multilogin-plugin${PHP_PKGNAMESUFFIX}=
>0:mail/squirrelmail-multilogin-plugin@${PHP_FLAVOR}
> =20
>  NOTES_DESC=3D	Notes plugin
> -NOTES_RUN_DEPENDS=3D	squirrelmail-notes-plugin>0:mail/squirrelmail-notes=
-plugin
> +NOTES_RUN_DEPENDS=3D	squirrelmail-notes-plugin${PHP_PKGNAMESUFFIX}>0:mai=
l/squirrelmail-notes-plugin@${PHP_FLAVOR}
> =20
>  NOTIFY_DESC=3D	New mail notify plugin
> -NOTIFY_RUN_DEPENDS=3D	squirrelmail-notify-plugin>0:mail/squirrelmail-not=
ify-plugin
> +NOTIFY_RUN_DEPENDS=3D	squirrelmail-notify-plugin${PHP_PKGNAMESUFFIX}>0:m=
ail/squirrelmail-notify-plugin@${PHP_FLAVOR}
> =20
>  PUPDATE_DESC=3D	Plugin update check plugin
> -PUPDATE_RUN_DEPENDS=3D	squirrelmail-pupdate-plugin>0:mail/squirrelmail-p=
update-plugin
> +PUPDATE_RUN_DEPENDS=3D	squirrelmail-pupdate-plugin${PHP_PKGNAMESUFFIX}>0=
:mail/squirrelmail-pupdate-plugin@${PHP_FLAVOR}
> =20
>  PW4GET_DESC=3D	Password forget plugin
> -PW4GET_RUN_DEPENDS=3D	squirrelmail-password_forget-plugin>0:mail/squirre=
lmail-password_forget-plugin
> +PW4GET_RUN_DEPENDS=3D	squirrelmail-password_forget-plugin${PHP_PKGNAMESU=
FFIX}>0:mail/squirrelmail-password_forget-plugin@${PHP_FLAVOR}
> =20
>  QMADMIN_DESC=3D	Qmailadmin login plugin
> -QMADMIN_RUN_DEPENDS=3D	squirrelmail-qmailadmin_login-plugin>0:mail/squir=
relmail-qmailadmin_login-plugin
> +QMADMIN_RUN_DEPENDS=3D	squirrelmail-qmailadmin_login-plugin${PHP_PKGNAME=
SUFFIX}>0:mail/squirrelmail-qmailadmin_login-plugin@${PHP_FLAVOR}
> =20
>  QUOTA_DESC=3D	Quota usage plugin
> -QUOTA_RUN_DEPENDS=3D	squirrelmail-quota_usage-plugin>0:mail/squirrelmail=
-quota_usage-plugin
> +QUOTA_RUN_DEPENDS=3D	squirrelmail-quota_usage-plugin${PHP_PKGNAMESUFFIX}=
>0:mail/squirrelmail-quota_usage-plugin@${PHP_FLAVOR}
> =20
>  SASQL_DESC=3D	SpamAssassin SQL plugin
> -SASQL_RUN_DEPENDS=3D	squirrelmail-sasql-plugin>0:mail/squirrelmail-sasql=
-plugin
> +SASQL_RUN_DEPENDS=3D	squirrelmail-sasql-plugin${PHP_PKGNAMESUFFIX}>0:mai=
l/squirrelmail-sasql-plugin@${PHP_FLAVOR}
> =20
>  SIEVE_DESC=3D	Sieve Mail Filters plugin
> -SIEVE_RUN_DEPENDS=3D	squirrelmail-avelsieve-plugin>0:mail/squirrelmail-a=
velsieve-plugin
> +SIEVE_RUN_DEPENDS=3D	squirrelmail-avelsieve-plugin${PHP_PKGNAMESUFFIX}>0=
:mail/squirrelmail-avelsieve-plugin@${PHP_FLAVOR}
> =20
>  SLOGIN_DESC=3D	SSL login plugin
> -SLOGIN_RUN_DEPENDS=3D	squirrelmail-secure_login-plugin>0:mail/squirrelma=
il-secure_login-plugin
> +SLOGIN_RUN_DEPENDS=3D	squirrelmail-secure_login-plugin${PHP_PKGNAMESUFFI=
X}>0:mail/squirrelmail-secure_login-plugin@${PHP_FLAVOR}
> =20
>  SQLPW_DESC=3D	Change *SQL passwords plugin
> -SQLPW_RUN_DEPENDS=3D	squirrelmail-change-sqlpass-plugin>0:mail/squirrelm=
ail-change_sqlpass-plugin
> +SQLPW_RUN_DEPENDS=3D	squirrelmail-change-sqlpass-plugin${PHP_PKGNAMESUFF=
IX}>0:mail/squirrelmail-change_sqlpass-plugin@${PHP_FLAVOR}
> =20
>  TIMEOUT_DESC=3D	User session timeout plugin
> -TIMEOUT_RUN_DEPENDS=3D	squirrelmail-timeout_user-plugin>0:mail/squirrelm=
ail-timeout_user-plugin
> +TIMEOUT_RUN_DEPENDS=3D	squirrelmail-timeout_user-plugin${PHP_PKGNAMESUFF=
IX}>0:mail/squirrelmail-timeout_user-plugin@${PHP_FLAVOR}
> =20
>  TMDA_DESC=3D	TMDA plugin
> -TMDA_RUN_DEPENDS=3D	squirrelmail-tmda-plugin>0:mail/squirrelmail-tmda-pl=
ugin
> +TMDA_RUN_DEPENDS=3D	squirrelmail-tmda-plugin${PHP_PKGNAMESUFFIX}>0:mail/=
squirrelmail-tmda-plugin@${PHP_FLAVOR}
> =20
>  VLOGIN_DESC=3D	Multi-site-hosting capabilities plugin
> -VLOGIN_RUN_DEPENDS=3D	squirrelmail-vlogin-plugin>0:mail/squirrelmail-vlo=
gin-plugin
> +VLOGIN_RUN_DEPENDS=3D	squirrelmail-vlogin-plugin${PHP_PKGNAMESUFFIX}>0:m=
ail/squirrelmail-vlogin-plugin@${PHP_FLAVOR}
> =20
>  WEBSEARCH_DESC=3D	Web search engines plugin
> -WEBSEARCH_RUN_DEPENDS=3D	squirrelmail-web_search-plugin>0:mail/squirrelm=
ail-websearch-plugin
> +WEBSEARCH_RUN_DEPENDS=3D	squirrelmail-web_search-plugin${PHP_PKGNAMESUFF=
IX}>0:mail/squirrelmail-websearch-plugin@${PHP_FLAVOR}
> =20
>  WETTER_DESC=3D	Weather in Germany plugin
> -WETTER_RUN_DEPENDS=3D	squirrelmail-wetteronline-plugin>0:mail/squirrelma=
il-wetteronline-plugin
> +WETTER_RUN_DEPENDS=3D	squirrelmail-wetteronline-plugin${PHP_PKGNAMESUFFI=
X}>0:mail/squirrelmail-wetteronline-plugin@${PHP_FLAVOR}
> =20
> -USES=3D		metaport
> +USES=3D		metaport php:flavors
> =20
>  .include <bsd.port.mk>
>=20
> Modified: head/mail/squirrelmail-shared_calendars-plugin/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3D	${PORTNAME}-${PORTVERSION}-1.4.0
>  MAINTAINER=3D	ports@FreeBSD.org
>  COMMENT=3D	iCal-compliant calendaring for SquirrelMail
> =20
> -RUN_DEPENDS=3D	squirrelmail-calendar_file_backend-plugin>0:mail/squirrel=
mail-calendar_file_backend-plugin
> +RUN_DEPENDS=3D	squirrelmail-calendar_file_backend-plugin${PHP_PKGNAMESUF=
FIX}>0:mail/squirrelmail-calendar_file_backend-plugin@${PHP_FLAVOR}
> =20
>  USE_SM_COMPAT=3D	yes
>  USE_GENERIC_PKGMESSAGE=3D	yes
>=20
> Modified: head/mail/squirrelmail-translations/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3D	20170705
>  CATEGORIES=3D	mail www
>  MASTER_SITES=3D	http://snapshots.squirrelmail.org/ \
>  	http://freebsd.uzsolt.hu/src/
> +PKGNAMESUFFIX=3D	${PHP_PKGNAMESUFFIX}
>  DISTNAME=3D	squirrelmail-${PORTVERSION}_0200-SVN.locales
>  DIST_SUBDIR=3D	squirrelmail
> =20
> @@ -14,9 +15,9 @@ COMMENT=3D	NLS translations for Squirrelmail (mail/squir
> =20
>  LICENSE=3D	GPLv2
> =20
> -RUN_DEPENDS=3D	squirrelmail>=3D${PORTVERSION}:mail/squirrelmail
> +RUN_DEPENDS=3D	squirrelmail${PHP_PKGNAMESUFFIX}>=3D${PORTVERSION}:mail/s=
quirrelmail@${PHP_FLAVOR}
> =20
> -USES=3D		tar:bzip2 gettext
> +USES=3D		tar:bzip2 gettext php:flavors
>  WRKSRC=3D		${WRKDIR}/squirrelmail.locales
>  NO_ARCH=3D	yes
>  PORTSCOUT=3D	ignore:1
>=20
> Modified: head/mail/squirrelmail/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3D	20180404
>  CATEGORIES=3D	mail www
>  MASTER_SITES=3D	http://snapshots.squirrelmail.org/ \
>  	http://freebsd.uzsolt.hu/src/
> +PKGNAMESUFFIX=3D	${PHP_PKGNAMESUFFIX}
>  DISTNAME=3D	${PORTNAME}-${PORTVERSION}_0202-SVN.stable
>  DIST_SUBDIR=3D	${PORTNAME}
> =20
> @@ -15,7 +16,7 @@ COMMENT=3D	Webmail system which accesses mail over IMAP
>  LICENSE=3D	GPLv2+
>  LICENSE_FILE=3D	${WRKSRC}/doc/COPYING
> =20
> -USES=3D		cpe gettext perl5 php:web tar:bzip2
> +USES=3D		cpe gettext perl5 php:web,flavors tar:bzip2
>  USE_PHP=3D	session hash gettext mbstring pcre openssl xml
>  USE_PERL5=3D	run
>  NO_ARCH=3D	yes
>=20
> Modified: head/mail/squirrelmail/bsd.squirrelmail.mk
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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 @@
> =20
>  MASTER_SITES?=3D	http://www.squirrelmail.org/plugins/
>  PKGNAMEPREFIX?=3D	squirrelmail-
> -PKGNAMESUFFIX?=3D	-plugin
> +PKGNAMESUFFIX?=3D	-plugin${PHP_PKGNAMESUFFIX}
>  DIST_SUBDIR?=3D	squirrelmail
> =20
> -RUN_DEPENDS+=3D	${LOCALBASE}/${SQUIRRELDIR_REL}/index.php:mail/squirrelm=
ail
> +RUN_DEPENDS+=3D	${LOCALBASE}/${SQUIRRELDIR_REL}/index.php:mail/squirrelm=
ail@${PHP_FLAVOR}
> =20
>  .ifdef USE_SM_COMPAT
> -RUN_DEPENDS+=3D	squirrelmail-compatibility-plugin>0:mail/squirrelmail-co=
mpatibility-plugin
> +RUN_DEPENDS+=3D	squirrelmail-compatibility-plugin${PHP_PKGNAMESUFFIX}>0:=
mail/squirrelmail-compatibility-plugin@${PHP_FLAVOR}
>  .endif
> =20
>  .ifndef WITHOUT_ACTIVATE
> @@ -49,7 +49,7 @@ NO_ARCH=3D	yes
>  NO_WRKSUBDIR=3D	yes
>  USE_PHP?=3D	yes
>  .if empty(USES:Mphp*)
> -USES+=3D		php:web
> +USES+=3D		php:web,flavors
>  .endif
> =20
>  SQUIRREL_PLUGIN_NAME?=3D   ${PORTNAME}
>=20
>=20

--=20
Mathieu Arnold

--zvo4anjlvxxkmxgp
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQJ8BAABCgBmBQJa6wQFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzQUI2OTc4OUQyRUQxMjEwNjQ0MEJBNUIz
QTQ1MTZGMzUxODNDRTQ4AAoJEDpFFvNRg85IJs8P/0nq/shfT4Yu2glFI2aD9H4t
A6pWeCPa7iFYaObNWQyeT55GAQoZBvtWa9rUYrZ9QPlvM4Vm8V3ijHjPKQpXUq0d
E16BrKODbXP3ZWwDZE+rbmxSD/wpdCbnYNaYsEy3M2ug5L9P/rdoW8vL0Nq4cpOM
/f/rQlqGqa2/94EXJxLnxcvpfC6JZ4UDaoCC3YNINXpNRDDXrw0fRdwqAwj/JBjL
TT9VJqBhcZ/FOAB5StpRf23gt0UXznFXYsmLsxzCpp0KCzzpbDlxkcBvKYuVzlFl
hGupSx6e6QwseknQQ2QtkD2jP/w2IL2760XF4dwe6xG+5BX83aIzr59kMaUGiX4n
6I05GERsGUiJol6fcz8pzLZ3+Gs3g/Dd9vLUB4Lx8G9B04Qef1EENNF8zT7osGPz
si+CNFgVF/nWhMgdqF1MkrBgQo3drTiJ8pwZB506jn7uezQB07fO/e8CdOqqK684
w6fYRNE5lQCw6/nfSyZdyQebWJsSQn2qkdVyvmcfF5ToXGByOgxyaJkt5Am+XfRd
Gv2TrQ/JSclLiYqNKqMiit6RAfLf4NZBhaH5cL/3bwMQexT/NuJX9G0gFvls+b05
UI3j9AL/2yRAkPwL9VL5sMVmlFumZ2LFFzksyBm/R9t4yka5lK2KcXFR8Aw07opU
EEBD4rq3cohjUvso8Z9R
=3K9E
-----END PGP SIGNATURE-----

--zvo4anjlvxxkmxgp--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180503124349.sdbjdhbfkacznt5b>