From owner-svn-ports-all@FreeBSD.ORG Mon Jul 16 17:04:46 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C2A981065672; Mon, 16 Jul 2012 17:04:46 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 942BF8FC15; Mon, 16 Jul 2012 17:04:46 +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 q6GH4kZp062006; Mon, 16 Jul 2012 17:04:46 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6GH4k3x062002; Mon, 16 Jul 2012 17:04:46 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201207161704.q6GH4k3x062002@svn.freebsd.org> From: Florian Smeets Date: Mon, 16 Jul 2012 17:04:46 +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: r300957 - head/lang/php53 X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jul 2012 17:04:46 -0000 Author: flo Date: Mon Jul 16 17:04:46 2012 New Revision: 300957 URL: http://svn.freebsd.org/changeset/ports/300957 Log: More optionsNG fixes. (PORT_OPTIONS:M construct can only be used after bsd.options.mk/bsd.port.pre.mk) Reported by: Michael Ranner (michael@ranner.eu) Tested by: Michael Ranner (michael@ranner.eu) Discussed with: bapt Modified: head/lang/php53/Makefile.ext Modified: head/lang/php53/Makefile.ext ============================================================================== --- head/lang/php53/Makefile.ext Mon Jul 16 17:04:29 2012 (r300956) +++ head/lang/php53/Makefile.ext Mon Jul 16 17:04:46 2012 (r300957) @@ -88,27 +88,20 @@ USE_OPENSSL= yes LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg -. if !empty(PORT_OPTIONS:MX11) -USE_XORG= xpm -. endif CONFIGURE_ARGS+=--with-gd \ --with-freetype-dir=${LOCALBASE} \ --with-jpeg-dir=${LOCALBASE} \ --with-png-dir=${LOCALBASE} \ --with-zlib-dir=/usr -. if !empty(PORT_OPTIONS:MX11) -CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE} -. endif -OPTIONS_DEFINE= T1LIB TRUETYPE JIS -OPTIONS_DEFAULT= T1LIB TRUETYPE +OPTIONS_DEFINE= T1LIB TRUETYPE JIS X11 +OPTIONS_DEFAULT= T1LIB TRUETYPE X11 T1LIB_DESC= Include T1lib support TRUETYPE_DESC= TrueType string function JIS_DESC= JIS-mapped Japanese font support - PHP_HEADER_DIRS=libgd .endif @@ -136,17 +129,14 @@ USE_ICONV= yes .endif .if ${PHP_MODNAME} == "imap" +OPTIONS_DEFINE= SSL +OPTIONS_DEFAULT= SSL LIB_DEPENDS+= c-client4.9:${PORTSDIR}/mail/cclient CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \ --with-pcre-dir=${LOCALBASE} -.if !empty(PORT_OPTIONS:MSSL) -CONFIGURE_ARGS+=--with-imap-ssl=${OPENSSLBASE} - -LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl USE_OPENSSL= yes .endif -.endif .if ${PHP_MODNAME} == "interbase" CONFIGURE_ARGS+=--with-interbase=${LOCALBASE} @@ -505,6 +495,14 @@ CONFIGURE_ARGS+=--disable-flatfile .endif .if ${PHP_MODNAME} == "gd" +. if ${PORT_OPTIONS:MX11} +USE_XORG= xpm +. endif + +. if ${PORT_OPTIONS:MX11} +CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE} +. endif + . if ${PORT_OPTIONS:MT1LIB} LIB_DEPENDS+= t1.5:${PORTSDIR}/devel/t1lib @@ -518,6 +516,13 @@ CONFIGURE_ARGS+=--enable-gd-jis-conv . endif .endif +.if ${PHP_MODNAME} == "imap" +. if ${PORT_OPTIONS:MSSL} +CONFIGURE_ARGS+=--with-imap-ssl=${OPENSSLBASE} +LDFLAGS+= -L${OPENSSLLIB} -lcrypto -ssl +. endif +.endif + .if ${PHP_MODNAME} == "mbstring" . if ${PORT_OPTIONS:MREGEX} LIB_DEPENDS+= onig.1:${PORTSDIR}/devel/oniguruma4