From ccb596735a9a843a907535c99ea2a1df22201038 Mon Sep 17 00:00:00 2001
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Sat, 26 Apr 2014 18:28:46 +0000
Subject: - While I'm here, convert to new options helper

PR:		ports/188729
Submitted by:	Helmut Ritter <freebsd-ports@charlieroot.de> (maintainer)
---
 www/typo345/Makefile | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

(limited to 'www')

diff --git a/www/typo345/Makefile b/www/typo345/Makefile
index 0526fe6357df..0b4bedb07284 100644
--- a/www/typo345/Makefile
+++ b/www/typo345/Makefile
@@ -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}/graphics/ImageMagick-nox11
 .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
-- 
cgit debian/1.2.3+git2.25.1-1-2-gaceb0