From owner-svn-ports-head@FreeBSD.ORG Wed Jun 5 13:45:34 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 0579EC9F; Wed, 5 Jun 2013 13:45:34 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id EB73B1A72; Wed, 5 Jun 2013 13:45:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r55DjXTm003799; Wed, 5 Jun 2013 13:45:33 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r55DjXw3003796; Wed, 5 Jun 2013 13:45:33 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201306051345.r55DjXw3003796@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 5 Jun 2013 13:45:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r319990 - in head/lang: php52 php52-extensions 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.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jun 2013 13:45:34 -0000 Author: bapt Date: Wed Jun 5 13:45:33 2013 New Revision: 319990 URL: http://svnweb.freebsd.org/changeset/ports/319990 Log: Convert to new options framework Modified: head/lang/php52-extensions/Makefile head/lang/php52/Makefile head/lang/php52/Makefile.ext Modified: head/lang/php52-extensions/Makefile ============================================================================== --- head/lang/php52-extensions/Makefile Wed Jun 5 13:35:16 2013 (r319989) +++ head/lang/php52-extensions/Makefile Wed Jun 5 13:45:33 2013 (r319990) @@ -1,9 +1,5 @@ -# New ports collection makefile for: php52-extensions -# Date created: 17 Apr 2010 -# Whom: Alex Keda -# +# Created by: Alex Keda # $FreeBSD$ -# PORTNAME= php52 PORTVERSION= 1.3 @@ -23,115 +19,76 @@ USE_PHP_BUILD= yes NO_BUILD= yes -WITH_CTYPE= yes -WITH_DOM= yes -WITH_FILTER= yes -WITH_HASH= yes -WITH_ICONV= yes -WITH_JSON= yes -WITH_PCRE= yes -WITH_PDO= yes -WITH_PDO_SQLITE=yes -WITH_POSIX= yes -WITH_SESSION= yes -WITH_SIMPLEXML= yes -WITH_SPL= yes -WITH_SQLITE= yes -WITH_TOKENIZER= yes -WITH_XML= yes -WITH_XMLREADER= yes -WITH_XMLWRITER= yes - -OPTIONS= BCMATH "bc style precision math functions" off \ - BZ2 "bzip2 library support" off \ - CALENDAR "calendar conversion support" off \ - CTYPE "ctype functions" on \ - CURL "CURL support" off \ - DBA "dba support" off \ - DBASE "dBase library support" off \ - DOM "DOM support" on \ - EXIF "EXIF support" off \ - FILEINFO "fileinfo support" off \ - FILTER "input filter support" on \ - FTP "FTP support" off \ - GD "GD library support" off \ - GETTEXT "gettext library support" off \ - GMP "GNU MP support" off \ - HASH "HASH Message Digest Framework" on \ - ICONV "iconv support" on \ - IMAP "IMAP support" off \ - INTERBASE "Interbase 6 database support (Firebird)" off \ - JSON "JavaScript Object Serialization support" on \ - LDAP "OpenLDAP support" off \ - MBSTRING "multibyte string support" off \ - MCRYPT "Encryption support" off \ - MHASH "Crypto-hashing support" off \ - MING "ming shockwave flash support" off \ - MSSQL "MS-SQL database support" off \ - MYSQL "MySQL database support" off \ - MYSQLI "MySQLi database support" off \ - NCURSES "ncurses support (CLI only)" off \ - ODBC "unixODBC support" off \ - OPENSSL "OpenSSL support" off \ - PCNTL "pcntl support (CLI only)" off \ - PCRE "Perl Compatible Regular Expression support" on \ - PDF "PDFlib support (implies GD)" off \ - PDO "PHP Data Objects Interface (PDO)" on \ - PDO_SQLITE "PDO sqlite driver" on \ - PDO_MYSQL "PDO mysql driver" on \ - PGSQL "PostgreSQL database support" off \ - POSIX "POSIX-like functions" on \ - PSPELL "pspell support" off \ - READLINE "readline support (CLI only)" off \ - RECODE "recode support" off \ - SESSION "session support" on \ - SHMOP "shmop support" off \ - SIMPLEXML "simplexml support" on \ - SNMP "SNMP support" off \ - SOAP "SOAP support" off \ - SOCKETS "sockets support" off \ - SPL "Standard PHP Library" on \ - SQLITE "sqlite support" on \ - SYBASE_CT "Sybase database support" off \ - SYSVMSG "System V message support" off \ - SYSVSEM "System V semaphore support" off \ - SYSVSHM "System V shared memory support" off \ - TIDY "TIDY support" off \ - TOKENIZER "tokenizer support" on \ - WDDX "WDDX support (implies XML)" off \ - XML "XML support" on \ - XMLREADER "XMLReader support" on \ - XMLRPC "XMLRPC-EPI support" off \ - XMLWRITER "XMLWriter support" on \ - XSL "XSL support (Implies DOM)" off \ - ZIP "ZIP support" off \ - ZLIB "ZLIB support" off +OPTIONS_DEFINE= BCMATH BZ2 CALENDAR CTYPE CURL DBA DBASE DOM EXIF FILEINFO \ + FILTER FTP GD GETTEXT GMP HASH ICONV IMAP INTERBASE JSON LDAP \ + MBSTRING MCRYPT MHASH MING MSSQL MYSQL MYSQLI NCURSES ODBC \ + OPENSSL PCNTL PCRE PDF PDO PDO_SQLITE PDO_MYSQL PGSQL POSIX \ + PSPELL READLINE RECODE SESSION SHMOP SIMPLEXML SNMP SOAP SOCKETS \ + SPL SQLITE SYBASE_CT SYSVMSH SYSVSEM SYSVSHM TITY TOKENIZER \ + WDDX XML XMLREADER XMLRPC XMLWRITER XSL ZIP ZLIB +OPTIONS_DEFAULT= CTYPE DOM FILTER HASH ICONV JSON PCRE PDO PDO_SQLITE \ + PDO_MYSQL POSIX SESSION SIMPLEXML SPL SQLITE TOKENIZER \ + XML XMLREADER XMLWRITER +BCMATH_DESC= bc style precision math functions +BZ2_DESC= bzip2 library support +CALENDAR_DESC= calendar conversion support +CTYPE_DESC= ctype functions +DBA_DESC= dba support +DBASE_DESC= dBase library support +DOM_DESC= DOM support +EXIF_DESC= EXIF support +FILEINFO_DESC= fileinfo support +FILTER_DESC= input filter support +GETTEXT_DESC= gettext library support +HASH_DESC= HASH Message Digest Framework +IMAP_DESC= IMAP support +INTERBASE_DESC= Interbase 6 database support (Firebird) +MBSTRING_DESC= multibyte string support +MCRYPT_DESC= Encryption support +MHASH_DESC= Crypto-hashing support +MING_DESC= ming shockwave flash support +MYSQLI_DESC= MySQLi database support +NCURSES_DESC= ncurses support (CLI only) +ODBC_DESC= unixODBC support +PCNTL_DESC= pcntl support (CLI only) +PDF_DESC= PDFlib support (implies GD) +PDO_DESC= PHP Data Objects Interface (PDO) +PDO_SQLITE_DESC= PDO sqlite driver +PDO_MYSQL_DESC= PDO mysql driver +POSIX_DESC= POSIX-like functions +PSPELL_DESC= pspell support +READLINE_DESC= readline support (CLI only) +RECODE_DESC= recode support +SESSION_DESC= session support +SHMOP_DESC= shmop support +SIMPLEXML_DESC= simplexml support +SOAP_DESC= SOAP support +SOCKETS_DESC= sockets support +SPL_DESC= Standard PHP Library +SYBASE_CT_DESC= Sybase database support +SYSVMSG_DESC= System V message support +SYSVSEM_DESC= System V semaphore support +SYSVSHM_DESC= System V shared memory support +TIDY_DESC= TIDY support +TOKENIZER_DESC= tokenizer support +WDDX_DESC= WDDX support (implies XML) +XMLREADER_DESC= XMLReader support +XMLRPC_DESC= XMLRPC-EPI support +XMLWRITER_DESC= XMLWriter support +XSL_DESC= XSL support (Implies DOM) +ZIP_DESC= ZIP support PORT_DBDIR?= /var/db/ports LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} OPTIONSFILE?= ${PORT_DBDIR}/${LATEST_LINK}/options -.if exists(${OPTIONSFILE}) -.include "${OPTIONSFILE}" -.endif - -ALL_OPTIONS= BCMATH BZ2 CALENDAR CTYPE CURL DBA DBASE \ - DOM EXIF FILEINFO FILTER FTP GD GETTEXT \ - GMP HASH ICONV IMAP INTERBASE JSON LDAP MBSTRING MCRYPT \ - MHASH MING MSSQL MYSQL MYSQLI NCURSES ODBC OPENSSL \ - PCNTL PCRE PDF PDO PDO_SQLITE PDO_MYSQL PGSQL POSIX \ - PSPELL READLINE RECODE SESSION SHMOP SIMPLEXML SNMP SOAP \ - SOCKETS SPL SQLITE SYBASE_CT SYSVMSG SYSVSEM SYSVSHM \ - TIDY TOKENIZER WDDX XML XMLREADER XMLRPC XMLWRITER XSL \ - ZIP ZLIB - -SEL_OPTIONS= yes -.for opt in ${ALL_OPTIONS} -. if defined(WITH_${opt}) && !defined(WITHOUT_${opt}) -SEL_OPTIONS+= ${opt:L} +.include + +.for opt in ${OPTIONS_DEFINE} +. if ${PORT_OPTIONS:M${opt}} +USE_PHP+= ${opt:L} . endif .endfor -USE_PHP= ${SEL_OPTIONS} do-install: build @${DO_NADA} Modified: head/lang/php52/Makefile ============================================================================== --- head/lang/php52/Makefile Wed Jun 5 13:35:16 2013 (r319989) +++ head/lang/php52/Makefile Wed Jun 5 13:45:33 2013 (r319990) @@ -40,20 +40,25 @@ CONFIGURE_ARGS= \ USE_GNOME= libxml2 -OPTIONS= CLI "Build CLI version" on \ - CGI "Build CGI version" on \ - APACHE "Build Apache module" off \ - DEBUG "Enable debug" off \ - SUHOSIN "Enable Suhosin protection system (not for jails)" on \ - MULTIBYTE "Enable zend multibyte support" off \ - IPV6 "Enable ipv6 support" on \ - MAILHEAD "Enable mail header patch" off \ - REDIRECT "Enable force-cgi-redirect support (CGI only)" off \ - DISCARD "Enable discard-path support (CGI only)" off \ - FASTCGI "Enable fastcgi support (CGI only)" on \ - FPM "Enable fastcgi process manager (CGI only)" off \ - PATHINFO "Enable path-info-check support (CGI only)" on \ - LINKTHR "Link thread lib (for threaded extensions)" off +OPTIONS_DEFINE= CLI CGI APACHE DEBUG SUHOSIN MULTIBYTE IPV6 MAILHEAD REDIRECT DISCARD \ + FASTCGI FPM PATHINFO LINKTHR + +OPTIONS_DEFAULT= CLI CGI SUHOSIN PATHINFO FASTCGI PATHINFO + +CLI_DESC= Build CLI version +CGI_DESC= Build CGI version +FPM_DESC= Build FPM version (experimental) +APACHE_DESC= Build Apache module +AP2FILTER_DESC= Use Apache 2.x filter interface (experimental) +SUHOSIN_DESC= Suhosin protection system +MULTIBYTE_DESC= zend multibyte support +MAILHEAD_DESC= mail header patch +LINKTHR_DESC= Link thread lib (for threaded extensions) +REDIRECT_DESC= force-cgi-redirect support (CGI only) +DISCARD_DESC= discard-path support (CGI only) +FASTCGI_DESC= fastcgi support (CGI only) +FPM_DESC= fastcgi process manager (CGI only) +PATHINFO_DESC= path-info-check support (CGI only) CONFLICTS= php53-5* php5-5* @@ -63,8 +68,8 @@ MAN1= php-config.1 phpize.1 PATCH_DIST_STRIP= -p1 -.if defined(WITH_FPM) && defined(WITH_CGI) -. if defined(WITHOUT_FASTCGI) +.if ${PORT_OPTIONS:MFPM} && ${PORT_OPTIONS:MCGI} +. if ! ${PORT_OPTIONS:MFASTCGI} IGNORE= FPM requires FastCGI support . endif PATCHFILES+= php-5.2.14-fpm-0.5.14-freebsd.patch.gz @@ -94,7 +99,7 @@ CONFIGURE_ARGS+= --enable-fpm \ PLIST_SUB+= FPM="@comment " .endif -.if !defined(WITHOUT_SUHOSIN) +.if ${PORT_OPTIONS:MSUHOSIN} PATCHFILES+= suhosin-patch-5.2.16-0.9.7.patch.gz:suhosin PATCH_SITES+= http://download.suhosin.org/:suhosin PLIST_SUB+= SUHOSIN="" @@ -102,13 +107,13 @@ PLIST_SUB+= SUHOSIN="" PLIST_SUB+= SUHOSIN="@comment " .endif -.if defined(WITH_MAILHEAD) +.if ${PORT_OPTIONS:MMAILHEAD} #PATCHFILES+= php-${PORTVERSION}-mail-header.patch:mail PATCHFILES+= php-5.2.10-mail-header.patch:mail PATCH_SITES+= http://choon.net/opensource/php/:mail .endif -.if !defined(WITHOUT_CLI) +.if ${PORT_OPTIONS:MCLI} PHP_SAPI+= cli PLIST_SUB+= CLI="" MAN1+= php.1 @@ -117,19 +122,19 @@ PLIST_SUB+= CLI="@comment " CONFIGURE_ARGS+=--disable-cli .endif -.if !defined(WITHOUT_CGI) +.if ${PORT_OPTIONS:MCGI} PHP_SAPI+= cgi PLIST_SUB+= CGI="" -.if defined(WITH_REDIRECT) +.if ${PORT_OPTIONS:MREDIRECT} CONFIGURE_ARGS+=--enable-force-cgi-redirect .endif -.if defined(WITH_DISCARD) +.if ${PORT_OPTIONS:MDISCARD} CONFIGURE_ARGS+=--enable-discard-path .endif -.if !defined(WITHOUT_FASTCGI) +.if ${PORT_OPTIONS:MFASTCGI} CONFIGURE_ARGS+=--enable-fastcgi .endif -.if defined(WITHOUT_PATHINFO) +.if ! ${PORT_OPTIONS:MPATHINFO} CONFIGURE_ARGS+=--disable-path-info-check .endif .else @@ -137,7 +142,7 @@ PLIST_SUB+= CGI="@comment " CONFIGURE_ARGS+=--disable-cgi .endif -.if defined(WITH_APACHE) +.if ${PORT_OPTIONS:MAPACHE} PHP_SAPI+= mod USE_APACHE= 22+ .include "${PORTSDIR}/Mk/bsd.apache.mk" @@ -150,19 +155,19 @@ PLIST_SUB+= APACHE="" PLIST_SUB+= APACHE="@comment " .endif -.if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php" +.if ! ${PORT_OPTIONS:MREGEX_TYPE} || ${WITH_REGEX_TYPE} == "php" CONFIGURE_ARGS+=--with-regex=php -.elif defined(WITH_REGEX_TYPE) && ${WITH_REGEX_TYPE} == "system" +.elif ${PORT_OPTIONS:MREGEX_TYPE} && ${WITH_REGEX_TYPE} == "system" CONFIGURE_ARGS+=--with-regex=system -.elif defined(WITH_REGEX_TYPE) && ${WITH_REGEX_TYPE} == "apache" +.elif ${PORT_OPTIONS:MREGEX_TYPE} && ${WITH_REGEX_TYPE} == "apache" CONFIGURE_ARGS+=--with-regex=apache .endif -.if !defined(WITH_ZEND_VM) || ${WITH_ZEND_VM} == "CALL" +.if ! ${PORT_OPTIONS:MZEND_VM} || ${WITH_ZEND_VM} == "CALL" CONFIGURE_ARGS+=--with-zend-vm=CALL -.elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "SWITCH" +.elif ${PORT_OPTIONS:MZEND_VM} && ${WITH_ZEND_VM} == "SWITCH" CONFIGURE_ARGS+=--with-zend-vm=SWITCH -.elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "GOTO" +.elif ${PORT_OPTIONS:MZEND_VM} && ${WITH_ZEND_VM} == "GOTO" CONFIGURE_ARGS+=--with-zend-vm=GOTO .endif @@ -171,26 +176,26 @@ CONFIGURE_ENV+= ac_cv_pthreads_lib="" \ pthreads_working="yes" \ lt_cv_path_SED="sed" -.if defined(WITH_LINKTHR) +.if ${PORT_OPTIONS:MLINKTHR} CONFIGURE_ENV+= LIBS="${LIBS} ${PTHREAD_LIBS}" .endif -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-debug .endif -.if defined(WITH_MULTIBYTE) +.if ${PORT_OPTIONS:MMULTIBYTE} CONFIGURE_ARGS+=--enable-zend-multibyte .endif -.if defined(WITHOUT_IPV6) +.if ! ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+=--disable-ipv6 .endif post-patch: @${TOUCH} ${WRKSRC}/ext/php_config.h @${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-* -.if defined(WITH_FPM) && defined(WITH_CGI) +.if ${PORT_OPTIONS:MFPM} && ${PORT_OPTIONS:MCGI} @${REINPLACE_CMD} -e 's,BUILD_CGI=\"\\$$\(.*\)\\$$(EXTRA_LIBS),BUILD_CGI=\"\\$$\1\\$$(EXTRA_LIBS) \\$$(SAPI_EXTRA_LIBS),g' \ ${WRKSRC}/sapi/cgi/config9.m4 .endif @@ -212,13 +217,13 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc @${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc @${TOUCH} ${PREFIX}/include/php/ext/php_config.h -.if defined(WITH_FPM) && defined(WITH_CGI) +.if ${PORT_OPTIONS:MFPM} && ${PORT_OPTIONS:MCGI} @${INSTALL_DATA} ${WRKDIR}/php-fpm.conf.sample ${PREFIX}/etc @${MKDIR} `dirname ${PHP_FPM_PID}` @${MKDIR} `dirname ${PHP_FPM_LOG}` @cd ${PREFIX}/etc && ${CP} -n php-fpm.conf.sample php-fpm.conf || ${TRUE} .endif -.if defined(WITH_APACHE) +.if ${PORT_OPTIONS:MAPACHE} @${CAT} ${PKGMESSAGE} .endif Modified: head/lang/php52/Makefile.ext ============================================================================== --- head/lang/php52/Makefile.ext Wed Jun 5 13:35:16 2013 (r319989) +++ head/lang/php52/Makefile.ext Wed Jun 5 13:45:33 2013 (r319990) @@ -48,12 +48,17 @@ CONFIGURE_ARGS+=--with-curl=${LOCALBASE} .if ${PHP_MODNAME} == "dba" CONFIGURE_ARGS+=--enable-dba -OPTIONS= CDB "cdb database support" on \ - DB4 "Berkeley DB4 support" off \ - GDBM "GDBM database support" off \ - QDBM "QDBM database support" off \ - INIFILE "INI file support" on \ - FLATFILE "flatfile support" on +OPTIONS_DEFINE= CDB DB4 INIFILE FLATFILE +OPTIONS_DEFAULT= CDB INIFILE FLATFILE +OPTIONS_RADIO= DBM +OPTIONS_RADIO_DBM= GDBM QDBM + +CDB_DESC= cdb database support +DB4_DESC= Berkeley DB4 support +GDBM_DESC= GDBM database support +QDBM_DESC= QDBM database support +INIFILE_DESC= INI file support +FLATFILE_DESC= flatfile support PHP_HEADER_DIRS= libcdb libflatfile libinifile .endif @@ -96,22 +101,19 @@ USE_OPENSSL= yes LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg -. if !defined(WITHOUT_X11) -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 !defined(WITHOUT_X11) -CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE} -. endif -OPTIONS= T1LIB "Include T1lib support" on \ - TRUETYPE "Enable TrueType string function" on \ - JIS "Enable JIS-mapped Japanese font support" off +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 @@ -143,13 +145,8 @@ USES+= iconv LIB_DEPENDS+= c-client4.9:${PORTSDIR}/mail/cclient CONFIGURE_ARGS+=--with-imap=${LOCALBASE} -.if !defined(WITHOUT_SSL) -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} @@ -174,7 +171,10 @@ CONFIGURE_ARGS+=--with-ldap-sasl .if ${PHP_MODNAME} == "mbstring" CONFIGURE_ARGS+=--enable-mbstring -OPTIONS= REGEX "Enable multibyte regex support" on +OPTIONS_DEFINE= REGEX +OPTIONS_DEFAULT= REGEX + +REGEX_DESC= multibyte regex support PHP_HEADER_DIRS=libmbfl libmbfl/filters libmbfl/mbfl libmbfl/nls oniguruma .endif @@ -251,7 +251,8 @@ CONFIGURE_ARGS+=--enable-pcntl .endif .if ${PHP_MODNAME} == "pcre" -OPTIONS= BUNDLED_PCRE "Select if you use apache 2.0.x" off +OPTIONS_DEFINE= BUNDLE_PCRE +BUNDLED_PCRE_DESC= Select if you use apache 2.0.x .endif .if ${PHP_MODNAME} == "pdo" @@ -264,7 +265,9 @@ CONFIGURE_ARGS+=--with-pdo-dblib=${LOCAL USE_PHP= pdo USE_PHP_BUILD= yes -OPTIONS= MSSQL "Enable Microsoft SQL Server support" off +OPTIONS_DEFINE= MSSQL + +MSSQL_DESC= Microsoft SQL Server support .endif .if ${PHP_MODNAME} == "pdo_firebird" @@ -322,7 +325,6 @@ CONFIGURE_ARGS+=--with-pdo-sqlite=${LOCA . else CONFIGURE_ARGS+=--with-pdo-sqlite . endif - USE_PHP= pdo USE_PHP_BUILD= yes PHP_HEADER_DIRS=sqlite/src @@ -418,7 +420,7 @@ PHP_HEADER_DIRS=libsqlite/src USE_PHP= spl USE_PHP_BUILD= yes -OPTIONS= UTF8 "Enable UTF-8 support" off +OPTIONS_DEFINE= UTF8 .endif .if ${PHP_MODNAME} == "sybase_ct" @@ -517,49 +519,60 @@ CONFIGURE_ARGS+=--with-zlib=/usr .include .if ${PHP_MODNAME} == "dba" -. if defined(WITHOUT_CDB) +. if ! ${PORT_OPTIONS:MCDB} CONFIGURE_ARGS+=--without-cdb . endif -. if defined(WITH_DB4) +. if ${PORT_OPTIONS:MDB4} CONFIGURE_ARGS+=--with-db4=${LOCALBASE} USE_BDB= 40+ WITH_BDB_HIGHEST= yes . endif -. if defined(WITH_GDBM) +. if ${PORT_OPTIONS:MGDBM} LIB_DEPENDS+= gdbm.4:${PORTSDIR}/databases/gdbm CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE} . endif -. if defined(WITH_QDBM) +. if ${PORT_OPTIONS:MQDBM} LIB_DEPENDS+= qdbm.14:${PORTSDIR}/databases/qdbm CONFIGURE_ARGS+=--with-qdbm=${LOCALBASE} . endif -. if defined(WITHOUT_INIFILE) +. if ! ${PORT_OPTIONS:MINIFILE} CONFIGURE_ARGS+=--disable-inifile . endif -. if defined(WITHOUT_FLATFILE) +. if ! ${PORT_OPTIONS:MFLATFILE} CONFIGURE_ARGS+=--disable-flatfile . endif .endif .if ${PHP_MODNAME} == "gd" -. if !defined(WITHOUT_T1LIB) +. if ${PORT_OPTIONS:MX11} +USE_XORG= xpm +CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE} +. endif +. if ${PORT_OPTIONS:MT1LIB} LIB_DEPENDS+= t1.5:${PORTSDIR}/devel/t1lib CONFIGURE_ARGS+=--with-t1lib=${LOCALBASE} . endif -. if !defined(WITHOUT_TRUETYPE) +. if ${PORT_OPTIONS:MTRUETYPE} CONFIGURE_ARGS+=--enable-gd-native-ttf . endif -. if defined(WITH_JIS) +. if ${PORT_OPTIONS:MJIS} 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 -lssl +. endif +.endif + .if ${PHP_MODNAME} == "mbstring" -. if defined(WITHOUT_REGEX) +. if ! ${PORT_OPTIONS:MREGEX} CONFIGURE_ARGS+=--disable-mbregex . endif .endif @@ -579,7 +592,7 @@ pre-configure: .endif .if ${PHP_MODNAME} == "pcre" -. if defined(WITH_BUNDLED_PCRE) +. if ${PORT_OPTIONS:MBUNDLED_PCRE} CONFIGURE_ARGS+=--with-pcre-regex=yes PHP_HEADER_DIRS=pcrelib @@ -593,8 +606,9 @@ post-extract: @${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4 .endif + .if ${PHP_MODNAME} == "pdo_dblib" -.if defined(WITH_MSSQL) +.if ${PORT_OPTIONS:MMSSQL} LIB_DEPENDS+= sybdb.5:${PORTSDIR}/databases/freetds-msdblib .else LIB_DEPENDS+= ct.4:${PORTSDIR}/databases/freetds @@ -602,7 +616,7 @@ LIB_DEPENDS+= ct.4:${PORTSDIR}/databases .endif .if ${PHP_MODNAME} == "sqlite" -. if defined(WITH_UTF8) +. if ${PORT_OPTIONS:MUTF8} CONFIGURE_ARGS+=--enable-sqlite-utf8 . endif .endif