Attachment 161826 Details for Bug 201193 – Use one directory for PHP modules

[patch] Use one directory for PHP modules

php.patch (text/plain), 3.11 KB, created by Manuel Wiesinger on 2015-10-08 12:57:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Manuel Wiesinger

Created: 2015-10-08 12:57:48 UTC

Size: 3.11 KB

patch

obsolete

>diff -u -r -N ports_orig/Mk/bsd.php.mk ports/Mk/bsd.php.mk
>--- ports_orig/Mk/bsd.php.mk	2015-09-27 20:37:34.000000000 +0200
>+++ ports/Mk/bsd.php.mk	2015-10-08 14:08:09.000000000 +0200
>@@ -38,6 +38,7 @@
> .if !defined(_PHPMKINCLUDED)
> 
> PHP_Include_MAINTAINER=	ale@FreeBSD.org
>+PHP_EXT_DIR?= modules
> 
> _PHPMKINCLUDED=	yes
> 
>@@ -50,45 +51,12 @@
> PHPBASE?=	${LOCALBASE}
> .if exists(${PHPBASE}/etc/php.conf)
> .include "${PHPBASE}/etc/php.conf"
>-PHP_EXT_DIR!=	${PHPBASE}/bin/php-config --extension-dir | ${SED} -ne 's,^${PHPBASE}/lib/php/$.*$,\1,p'
> 
> .else
> DEFAULT_PHP_VER?=	${PHP_DEFAULT:S/.//}
> 
> PHP_VER?=	${DEFAULT_PHP_VER}
>-.if ${PHP_VER}  == 53
>-PHP_EXT_DIR=	20090626
>-PHP_EXT_INC=	pcre spl
>-.elif ${PHP_VER}  == 56
>-PHP_EXT_DIR=	20131226
>-PHP_EXT_INC=	pcre spl
>-.elif ${PHP_VER}  == 55
>-PHP_EXT_DIR=	20121212
>-PHP_EXT_INC=	pcre spl
>-.elif ${PHP_VER}  == 54
>-PHP_VER=	5
>-PHP_EXT_DIR=	20100525
>-PHP_EXT_INC=	pcre spl
>-.else
>-PHP_EXT_DIR=	20100525
>-PHP_EXT_INC=	pcre spl
>-.endif
>-
>-HTTPD?=		${LOCALBASE}/sbin/httpd
>-.if exists(${HTTPD})
>-APACHE_THR!=	${HTTPD} -V | ${GREP} threaded
>-.	if ${APACHE_THR:Myes}
>-PHP_EXT_DIR:=	${PHP_EXT_DIR}-zts
>-.	endif
>-.elif defined(APACHE_PORT) && (${APACHE_PORT:M*worker*} != "" || ${APACHE_PORT:M*event*} != "")
>-PHP_EXT_DIR:=	${PHP_EXT_DIR}-zts
>-.elif defined(WITH_MPM) && (${WITH_MPM} == "worker" || ${WITH_MPM} == "event")
>-PHP_EXT_DIR:=	${PHP_EXT_DIR}-zts
>-.endif
> 
>-.if defined(WITH_DEBUG)
>-PHP_EXT_DIR:=	${PHP_EXT_DIR}-debug
>-.endif
> PHP_SAPI?=	""
> .endif	# .if exists(${PHPBASE}/etc/php.conf)
> PHP_EXT_INC?=	""
>diff -u -r -N ports_orig/lang/php55/Makefile ports/lang/php55/Makefile
>--- ports_orig/lang/php55/Makefile	2015-10-05 11:37:54.000000000 +0200
>+++ ports/lang/php55/Makefile	2015-10-08 14:47:17.000000000 +0200
>@@ -89,7 +89,7 @@
> 
> .if defined(OPTIONS_FILE_SET) && ${OPTIONS_FILE_SET:MAPACHE}
> IGNORE=		doesn't install the Apache module anymore:\
>-		update your OPTIONS and build www/mod_php55 port instead 
>+		update your OPTIONS and build www/mod_php55 port instead
> .endif
> 
> .if defined(PKGNAMEPREFIX)
>@@ -135,11 +135,16 @@
> CONFIGURE_ARGS+=--with-zend-vm=GOTO
> .endif
> 
>+PHP_EXT_DIR?=	${PREFIX}/lib/php/modules
>+
> CONFIGURE_ENV+=	ac_cv_pthreads_lib="" \
> 		ac_cv_pthreads_cflags="" \
> 		ac_cv_decimal_fp_supported="no" \
> 		pthreads_working="yes" \
>-		lt_cv_path_SED="sed"
>+		lt_cv_path_SED="sed" \
>+		EXTENSION_DIR="${PHP_EXT_DIR}"
>+
>+MAKE_ENV+=	EXTENSION_DIR="${PHP_EXT_DIR}"
> 
> .if ${PORT_OPTIONS:MLINKTHR}
> LIBS+=		-lpthread
>@@ -181,6 +186,7 @@
> 		${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'`
> 	@${RM} ${WRKSRC}/configure
> 	@${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4
>+	${MKDIR} ${STAGEDIR}${PHP_EXT_DIR}
> 
> .if !defined(PKGNAMEPREFIX)
> post-build:
>diff -u -r -N ports_orig/lang/php55/pkg-plist ports/lang/php55/pkg-plist
>--- ports_orig/lang/php55/pkg-plist	2015-02-20 14:56:11.000000000 +0100
>+++ ports/lang/php55/pkg-plist	2015-10-08 14:42:45.000000000 +0200
>@@ -237,6 +237,7 @@
> lib/php/build/run-tests.php
> lib/php/build/scan_makefile_in.awk
> lib/php/build/shtool
>+@dir lib/php/modules
> %%CGI%%man/man1/php-cgi.1.gz
> man/man1/php-config.1.gz
> %%CLI%%man/man1/php.1.gz

Actions: View | Diff

Attachments on bug 201193: 158155 | 161826