From owner-svn-ports-head@FreeBSD.ORG  Sat Apr 26 18:28:47 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 91C6827E;
 Sat, 26 Apr 2014 18:28:47 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7E80E16D3;
 Sat, 26 Apr 2014 18:28:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3QISlab082822;
 Sat, 26 Apr 2014 18:28:47 GMT (envelope-from sunpoet@svn.freebsd.org)
Received: (from sunpoet@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3QISlnn082821;
 Sat, 26 Apr 2014 18:28:47 GMT (envelope-from sunpoet@svn.freebsd.org)
Message-Id: <201404261828.s3QISlnn082821@svn.freebsd.org>
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Sat, 26 Apr 2014 18:28:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r352363 - head/www/typo345
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
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/options/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: Sat, 26 Apr 2014 18:28:47 -0000

Author: sunpoet
Date: Sat Apr 26 18:28:46 2014
New Revision: 352363
URL: http://svnweb.freebsd.org/changeset/ports/352363
QAT: https://qat.redports.org/buildarchive/r352363/

Log:
  - While I'm here, convert to new options helper
  
  PR:		ports/188729
  Submitted by:	Helmut Ritter <freebsd-ports@charlieroot.de> (maintainer)

Modified:
  head/www/typo345/Makefile

Modified: head/www/typo345/Makefile
==============================================================================
--- head/www/typo345/Makefile	Sat Apr 26 18:27:27 2014	(r352362)
+++ head/www/typo345/Makefile	Sat Apr 26 18:28:46 2014	(r352363)
@@ -35,15 +35,12 @@ GD_DESC=	GDlib/freetype support
 IMAGICK_DESC=	${IMAGEMAGICK_DESC}
 MBSTRING_DESC=	${MULTIBYTE_DESC}
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MCURL}
-USE_PHP+=	curl
-.endif
+CURL_USE=	PHP=curl
+GD_USE=		PHP=gd
+MBSTRING_USE=	PHP=mbstring
+ZLIB_USE=	PHP=zlib
 
-.if ${PORT_OPTIONS:MGD}
-USE_PHP+=	gd
-.endif
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIMAGICK}
 .if ${PORT_OPTIONS:MX11}
@@ -53,14 +50,6 @@ RUN_DEPENDS+=	convert:${PORTSDIR}/graphi
 .endif
 .endif
 
-.if ${PORT_OPTIONS:MMBSTRING}
-USE_PHP+=	mbstring
-.endif
-
-.if ${PORT_OPTIONS:MZLIB}
-USE_PHP+=	zlib
-.endif
-
 pre-install:
 	${MV} ${WRKDIR}/${TYPO3DUMMY}/typo3conf/localconf.php \
 		${WRKDIR}/${TYPO3DUMMY}/typo3conf/localconf.php.dist