Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 Jun 2013 09:36:34 +0200
From:      Remko Lodder <remko@FreeBSD.org>
To:        Wen Heping <wen@FreeBSD.org>
Cc:        svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org
Subject:   Re: svn commit: r319557 - head/www/mediawiki118
Message-ID:  <D54CEC4D-DF68-43EC-B736-53D78988289D@FreeBSD.org>
In-Reply-To: <201306010720.r517KVEN080362@svn.freebsd.org>
References:  <201306010720.r517KVEN080362@svn.freebsd.org>

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

--Apple-Mail=_8FBBFE10-D12A-4019-92D0-F59DB81BA4BA
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=us-ascii


Thanks for both commits!!

Cheers
Remko

On Jun 1, 2013, at 9:20 AM, Wen Heping <wen@FreeBSD.org> wrote:

> Author: wen
> Date: Sat Jun  1 07:20:30 2013
> New Revision: 319557
> URL: http://svnweb.freebsd.org/changeset/ports/319557
>=20
> Log:
>  - Do not depend on MySQL server but client
>  - Trim Makefile headers
>  - Add LICENSE
>  - Convert to optionsNG
>=20
>  PR:		179137
>  Submitted by:	remko@
>=20
> Modified:
>  head/www/mediawiki118/Makefile
>=20
> Modified: head/www/mediawiki118/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/www/mediawiki118/Makefile	Sat Jun  1 07:16:13 2013	=
(r319556)
> +++ head/www/mediawiki118/Makefile	Sat Jun  1 07:20:30 2013	=
(r319557)
> @@ -1,9 +1,5 @@
> -# New ports collection makefile for:	www/mediawiki
> -# Date created:				February 1st 2005
> -# Whom:	      				Gerrit Beine =
<tux@pinguru.net>
> -#
> +# Created by: Gerrit Beine <tux@pinguru.net>
> # $FreeBSD$
> -#
>=20
> PORTNAME=3D	mediawiki
> PORTVERSION=3D	1.18.6
> @@ -13,48 +9,63 @@ MASTER_SITES=3D	http://dumps.wikimedia.org
> MAINTAINER=3D	wen@FreeBSD.org
> COMMENT=3D	The wiki engine used by Wikipedia
>=20
> +LICENSE=3D	GPLv2
> +
> DEPRECATED=3D	Unmaintained upstream
> EXPIRATION_DATE=3D2013-08-01
>=20
> CONFLICTS=3D	mediawiki-1.19.* mediawiki-1.2[0-9].*
>=20
> FETCH_ARGS=3D	-pr
> -NO_LATEST_LINK=3D	yes
> USE_PHP=3D	ctype iconv mbstring pcre session xml zlib readline dom
> -IGNORE_WITH_PHP=3D	4
> +IGNORE_WITH_PHP=3D4
> WANT_PHP_WEB=3D	yes
> MEDIAWIKIDIR?=3D	www/mediawiki
> +
> NO_BUILD=3D	yes
>=20
> -OPTIONS=3D	PGSQL "Use PostgreSQL (instead of MySQL)" off \
> -		LDAP "Use LDAP authentication" off \
> -		APC "Use pecl-APC" on \
> -		EACCEL "Use eAccelerator (instead of pecl-APC)" off \
> -		IMAGICK "Use ImageMagick" off
> +OPTIONS_DEFINE=3D	MYSQL PGSQL SQLITE LDAP MEMCACHED APC EACCEL =
XCACHE IMAGICK
> +OPTIONS_DEFAULT=3DMYSQL APC
>=20
> -.include <bsd.port.pre.mk>
> +MEMCACHED_DESC=3D	use memcached
> +APC_DESC=3D	use pecl-APC(Mediawiki recommended)
> +EACCEL_DESC=3D	use eAccelerator (instead of pecl-APC)
> +XCACHE_DESC=3D	use xCache (instead of pecl-APC)
> +IMAGICK_DESC=3D	use ImageMagick
>=20
> -.if defined(WITH_PGSQL)
> -USE_PHP+=3D	pgsql
> -.else
> -USE_MYSQL=3D	server
> +.include <bsd.port.options.mk>
> +
> +.if ${PORT_OPTIONS:MMYSQL}
> +USE_MYSQL=3D	client
> USE_PHP+=3D	mysql
> .endif
>=20
> -.if defined(WITH_LDAP)
> +.if ${PORT_OPTIONS:MPGSQL}
> +USE_PHP+=3D	pgsql
> +.endif
> +
> +.if ${PORT_OPTIONS:MSQLITE}
> +USE_PHP+=3D	sqlite
> +.endif
> +
> +.if ${PORT_OPTIONS:MLDAP}
> USE_PHP+=3D	ldap
> .endif
>=20
> -.if defined(WITH_IMAGICK)
> +.if ${PORT_OPTIONS:MMEMCACHED}
> +RUN_DEPENDS=3D	memcached:${PORTSDIR}/databases/memcached
> +.endif
> +
> +.if ${PORT_OPTIONS:MIMAGICK}
> RUN_DEPENDS+=3D	=
${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:${PORTSDIR}/graphics/pecl-i=
magick
> .endif
>=20
> -.if defined(WITH_APC) || defined(WITH_EACCEL)
> -.if defined(WITH_EACCEL)
> -RUN_DEPENDS+=3D	=
${LOCALBASE}/lib/php/${PHP_EXT_DIR}/eaccelerator.so:${PORTSDIR}/www/eaccel=
erator
> -.else
> +.if ${PORT_OPTIONS:MAPC}
> RUN_DEPENDS+=3D	=
${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:${PORTSDIR}/www/pecl-APC
> -.endif
> +.elif ${PORT_OPTIONS:MEACCEL}
> +RUN_DEPENDS+=3D	=
${LOCALBASE}/lib/php/${PHP_EXT_DIR}/eaccelerator.so:${PORTSDIR}/www/eaccel=
erator
> +.elif ${PORT_OPTIONS:MXCACHE}
> +RUN_DEPENDS+=3D	=
${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:${PORTSDIR}/www/xcache
> .endif
>=20
> do-install:
> @@ -69,4 +80,4 @@ post-install:
> 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> =
${TMPPLIST}
> 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' =
${PKGMESSAGE}
>=20
> -.include <bsd.port.post.mk>
> +.include <bsd.port.mk>
> _______________________________________________
> svn-ports-all@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/svn-ports-all
> To unsubscribe, send any mail to =
"svn-ports-all-unsubscribe@freebsd.org"

--=20
/"\   With kind regards,			| remko@elvandar.org
\ /   Remko Lodder			| remko@FreeBSD.org
X    FreeBSD					| =
http://www.evilcoder.org
/ \   The Power to Serve		| Quis custodiet ipsos custodes


--Apple-Mail=_8FBBFE10-D12A-4019-92D0-F59DB81BA4BA
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename=signature.asc
Content-Type: application/pgp-signature;
	name=signature.asc
Content-Description: Message signed with OpenPGP using GPGMail

-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.19 (Darwin)

iQIcBAEBAgAGBQJRqaSCAAoJEKjD27JZ84ywxowP/2vVmKGWPlE1jifXwVKoEeLA
NapwMeLdZGhajzdv1Ed15WsZ7NUzC0BXoQtK24GK9JXJnJIZAYYTSb/M45knZx20
HPSbxB3/591OomiF1FzFS6COgHtrTxakJMXmrJbjwtuyw3/KIlNQtqPvfR5vu5yt
bVQZRQ2Y8aW2IYYTqAiCESjcuIu0kWlf2VUG7t8QCT5vO5xMb1uHGQ8NcsqmYMOV
UvIjOkuxF1+vKteb6eVQnYMVr5MH2R951aSeW3fRGpu9RWtyhIQg/i3QCvZZk74p
FgZQPaqGpehdEBp9czm8f8RchxqVFSMZmy0n0QOXU4ofPk9bCRB0iPvJjMUeTbaK
vrovBWkEZYM5nlSwvLutttgSXTW2mQw7OzRtg1UjQTGE12nc0oHb0YpvzyP0X4qd
n4U/5CKgKI4A44bDIFdEThHXXUwjn7D7gY0WvstnAT+yz3JWjnAyBImghTElYmmR
EMU0y3kRVW7ZNGJbkBnVmWvBVXriVykBO52Yje88pDsISgszFWiZJifvNWb0XjSy
/XO89CCrvt6dI95DBWDsJ5MtSfJz4VyzKn1vfh+bu/KKviTFb9Qrmgo/uQZg26TU
gy1wCKogDotbPspzoW9WMw/BclRPmeA/Km3LhieqBnuYSw1oi6NdvPTXJbVaSwub
MboOm7Qe14A03+M5G8lU
=bW70
-----END PGP SIGNATURE-----

--Apple-Mail=_8FBBFE10-D12A-4019-92D0-F59DB81BA4BA--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?D54CEC4D-DF68-43EC-B736-53D78988289D>