[pkgsrc/trunk]: pkgsrc/lang/php5 put items only pertinent to interpreter buil...

[jdolecek <jdolecek%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fceb998565ef
branches:  trunk
changeset: 482886:fceb998565ef
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Thu Nov 04 18:38:55 2004 +0000

description:
put items only pertinent to interpreter build to new file Makefile.php
(similar to PHP4 package), and also update to use PKG_OPTIONS

this fixes environment pollution for extension modules, particularily
CONFIGURE_ARGS

diffstat:

 lang/php5/Makefile        |   4 +-
 lang/php5/Makefile.common |  42 ++---------------------------------
 lang/php5/Makefile.php    |  55 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 41 deletions(-)

diffs (134 lines):

diff -r 088ea61ae100 -r fceb998565ef lang/php5/Makefile
--- a/lang/php5/Makefile        Thu Nov 04 17:01:11 2004 +0000
+++ b/lang/php5/Makefile        Thu Nov 04 18:38:55 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/11/02 21:03:03 jdolecek Exp $
+# $NetBSD: Makefile,v 1.4 2004/11/04 18:38:55 jdolecek Exp $
 #
 
 PKGNAME=               php-${PHP_BASE_VERS}
@@ -14,7 +14,7 @@
 USE_GNU_TOOLS+=                make
 LIBTOOL_OVERRIDE=      # empty
 
-.include "Makefile.common"
+.include "Makefile.php"
 
 CGIDIR=                        ${PREFIX}/libexec/cgi-bin
 EGDIR=                 ${PREFIX}/share/examples/php
diff -r 088ea61ae100 -r fceb998565ef lang/php5/Makefile.common
--- a/lang/php5/Makefile.common Thu Nov 04 17:01:11 2004 +0000
+++ b/lang/php5/Makefile.common Thu Nov 04 18:38:55 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2004/11/02 21:03:03 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.4 2004/11/04 18:38:55 jdolecek Exp $
 #
 
 DISTNAME?=             php-${PHP_BASE_VERS}
@@ -14,45 +14,9 @@
 
 PHP_BASE_VERS=         5.0.2
 
-BUILD_DEFS=            USE_INET6
-
-USE_LIBTOOL=           YES
-GNU_CONFIGURE=         YES
-
-CONFIGURE_ENV+=                EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
-
 PHP_EXTENSION_DIR=     lib/php/20040412
 PLIST_SUBST+=          PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
 
-.include "../../mk/bsd.prefs.mk"
-
-CONFIGURE_ARGS+=       --with-config-file-path=${PREFIX}/etc/
-CONFIGURE_ARGS+=       --with-regex=system
-
-CONFIGURE_ARGS+=       --without-mysql
-CONFIGURE_ARGS+=       --without-sqlite
-CONFIGURE_ARGS+=       --without-iconv
-
-CONFIGURE_ARGS+=       --enable-discard-path
-CONFIGURE_ARGS+=       --enable-force-cgi-redirect
-CONFIGURE_ARGS+=       --enable-memory-limit
-CONFIGURE_ARGS+=       --enable-track-vars
+PKG_SYSCONFVAR?=       php
 
-CONFIGURE_ARGS+=       --disable-posix
-CONFIGURE_ARGS+=       --disable-dom
-
-.if defined(USE_INET6) && ${USE_INET6} == "NO"
-CONFIGURE_ARGS+=       --disable-ipv6
-.else
-CONFIGURE_ARGS+=       --enable-ipv6
-.endif
-
-CONFIGURE_ARGS+=       --enable-xml
-CONFIGURE_ARGS+=       --with-libxml-dir=${PREFIX}
-.include "../../textproc/libxml2/buildlink3.mk"
-
-BUILD_DEFS+=           USE_SSL
-.if defined(USE_SSL) && !empty(USE_SSL:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=       --with-openssl
-.include "../../security/openssl/buildlink3.mk"
-.endif
+.include "../../mk/bsd.prefs.mk"
diff -r 088ea61ae100 -r fceb998565ef lang/php5/Makefile.php
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php5/Makefile.php    Thu Nov 04 18:38:55 2004 +0000
@@ -0,0 +1,55 @@
+# $NetBSD: Makefile.php,v 1.1 2004/11/04 18:38:55 jdolecek Exp $
+#
+
+.include "../../lang/php5/Makefile.common"
+
+BUILD_DEFS=            USE_INET6
+
+USE_LIBTOOL=           YES
+GNU_CONFIGURE=         YES
+
+CONFIGURE_ENV+=                EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
+
+PHP_EXTENSION_DIR=     lib/php/20040412
+PLIST_SUBST+=          PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
+
+.include "../../mk/bsd.prefs.mk"
+
+CONFIGURE_ARGS+=       --with-config-file-path=${PREFIX}/etc/
+CONFIGURE_ARGS+=       --with-regex=system
+
+CONFIGURE_ARGS+=       --without-mysql
+CONFIGURE_ARGS+=       --without-sqlite
+CONFIGURE_ARGS+=       --without-iconv
+
+CONFIGURE_ARGS+=       --enable-discard-path
+CONFIGURE_ARGS+=       --enable-force-cgi-redirect
+CONFIGURE_ARGS+=       --enable-memory-limit
+CONFIGURE_ARGS+=       --enable-track-vars
+
+CONFIGURE_ARGS+=       --disable-posix
+CONFIGURE_ARGS+=       --disable-dom
+
+.if defined(USE_INET6) && ${USE_INET6} == "NO"
+CONFIGURE_ARGS+=       --disable-ipv6
+.else
+CONFIGURE_ARGS+=       --enable-ipv6
+.endif
+
+CONFIGURE_ARGS+=       --enable-xml
+CONFIGURE_ARGS+=       --with-libxml-dir=${PREFIX}
+.include "../../textproc/libxml2/buildlink3.mk"
+
+# Global and legacy options
+.if defined(USE_SSL) && !empty(USE_SSL:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=  ssl
+.endif
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.${PKGNAME:C/-[^-]*$//}
+PKG_SUPPORTED_OPTIONS+=        ssl
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mssl)
+.  include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-openssl
+.endif