From owner-svn-ports-head@FreeBSD.ORG  Sun Oct  7 07:19:38 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 861E91065676;
	Sun,  7 Oct 2012 07:19:38 +0000 (UTC) (envelope-from wen@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 65BF48FC19;
	Sun,  7 Oct 2012 07:19:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q977Jcm0046207;
	Sun, 7 Oct 2012 07:19:38 GMT (envelope-from wen@svn.freebsd.org)
Received: (from wen@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q977JcCF046205;
	Sun, 7 Oct 2012 07:19:38 GMT (envelope-from wen@svn.freebsd.org)
Message-Id: <201210070719.q977JcCF046205@svn.freebsd.org>
From: Wen Heping <wen@FreeBSD.org>
Date: Sun, 7 Oct 2012 07:19:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r305435 - head/www/mediawiki
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Oct 2012 07:19:38 -0000

Author: wen
Date: Sun Oct  7 07:19:37 2012
New Revision: 305435
URL: http://svn.freebsd.org/changeset/ports/305435

Log:
  - Convert to new Makefile format
  - Convert to new options framework

Modified:
  head/www/mediawiki/Makefile

Modified: head/www/mediawiki/Makefile
==============================================================================
--- head/www/mediawiki/Makefile	Sun Oct  7 07:17:34 2012	(r305434)
+++ head/www/mediawiki/Makefile	Sun Oct  7 07:19:37 2012	(r305435)
@@ -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$
-#
 
 PORTNAME=	mediawiki
 PORTVERSION=	1.19.2
@@ -19,47 +15,51 @@ CONFLICTS=	mediawiki-1.1[0-8].*
 
 FETCH_ARGS=	-pr
 USE_PHP=	ctype iconv mbstring pcre session xml zlib readline dom
-IGNORE_WITH_PHP=	4
+IGNORE_WITH_PHP=4
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/mediawiki
 
 NO_BUILD=	yes
 
-OPTIONS=	PGSQL "Use PostgreSQL (instead of MySQL)" off \
-		SQLITE "Use SQLite (instead of MySQL)" off \
-		LDAP "Use LDAP authentication" off \
-		MEMCACHED "Use memcached" off \
-		APC "Use pecl-APC(Mediawiki recommended)" on \
-		EACCEL "Use eAccelerator (instead of pecl-APC)" off \
-		IMAGICK "Use ImageMagick" off
+OPTIONS_DEFINE=	MYSQL PGSQL SQLITE LDAP MEMCACHED APC EACCEL IMAGICK
+OPTIONS_DEFAULT=MYSQL APC
 
-.include <bsd.port.pre.mk>
+MEMCACHED_DESCR=use memcached
+APC_DESCR=	use pecl-APC(Mediawiki recommended)
+EACCEL_DESCR=	use eAccelerator (instead of pecl-APC)
+IMAGICK_DESCR=	use ImageMagick
 
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-.elif defined(WITH_SQLITE)
-USE_PHP+=	sqlite
-.else
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	server
 USE_PHP+=	mysql
 .endif
 
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MPGSQL}
+USE_PHP+=	pgsql
+.endif
+
+.if ${PORT_OPTIONS:MSQLITE}
+USE_PHP+=	sqlite
+.endif
+
+.if ${PORT_OPTIONS:MLDAP}
 USE_PHP+=	ldap
 .endif
 
-.if defined(WITH_MEMCACHED)
+.if ${PORT_OPTIONS:MMEMCACHED}
 RUN_DEPENDS=	memcached:${PORTSDIR}/databases/memcached
 .endif
 
-.if defined(WITH_IMAGICK)
+.if ${PORT_OPTIONS:MIMAGICK}
 RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:${PORTSDIR}/graphics/pecl-imagick
 .endif
 
-.if defined(WITH_APC) || defined(WITH_EACCEL)||defined(WITH_XCACHE)
-.if defined(WITH_EACCEL)
+.if ${PORT_OPTIONS:MAPC} || ${PORTS_OPTIONS:MEACCEL} || ${PORTS_OPTIONS:MXCACHE}
+.if ${PORT_OPTIONS:MEACCEL}
 RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/eaccelerator.so:${PORTSDIR}/www/eaccelerator
-.elif defined(WITH_XCACHE)
+.elif ${PORT_OPTIONS:MXCACHE}
 RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:${PORTSDIR}/www/xcache
 .else
 RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:${PORTSDIR}/www/pecl-APC
@@ -78,4 +78,4 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>