Attachment 59774 Details for Bug 89896 – file.diff

[patch] file.diff

file.diff (text/plain), 3.03 KB, created by Melvyn Sopacua on 2005-12-03 21:30:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Melvyn Sopacua

Created: 2005-12-03 21:30:02 UTC

Size: 3.03 KB

patch

obsolete

>Index: bsd.php.mk
>===================================================================
>RCS file: /home/ncvs/ports/Mk/bsd.php.mk,v
>retrieving revision 1.20
>diff -u -r1.20 bsd.php.mk
>--- bsd.php.mk	20 Nov 2005 20:35:40 -0000	1.20
>+++ bsd.php.mk	3 Dec 2005 21:10:36 -0000
>@@ -29,14 +29,20 @@
> # WANT_PHP_WEB=yes  - Want the Apache Module or the CGI version of PHP.
> # WANT_PHP_PEAR=yes - Want the PEAR framework.
> #
>+# User tunable:
>+# PHP_PREFIX        - Prefix for the used version of php. Defaults to $LOCALBASE
>+# APACHE_PREFIX     - Prefix for apache. Defaults to $PHP_PREFIX
>+#
> # You may combine multiple WANT_PHP_* knobs.
> # Don't specify any WANT_PHP_* knob if your port will work with every PHP SAPI.
> #
> 
> PHP_Include_MAINTAINER=	ale@FreeBSD.org
>+PHP_PREFIX?=${LOCALBASE}
>+APACHE_PREFIX?=${PHP_PREFIX}
> 
>-.if exists(${LOCALBASE}/etc/php.conf)
>-.include "${LOCALBASE}/etc/php.conf"
>+.if exists(${PHP_PREFIX}/etc/php.conf)
>+.include "${PHP_PREFIX}/etc/php.conf"
> .endif
> 
> DEFAULT_PHP_VER?=	4
>@@ -48,8 +54,8 @@
> .else
> PHP_EXT_DIR=	20041030
> .endif
>-.if exists(${LOCALBASE}/include/apache2/httpd.h)
>-APXS?=		${LOCALBASE}/sbin/apxs
>+.if exists(${APACHE_PREFIX}/include/apache2/httpd.h)
>+APXS?=		${APACHE_PREFIX}/sbin/apxs
> APACHE_MPM!=	${APXS} -q MPM_NAME
> .if ${APACHE_MPM} == "worker"
> PHP_EXT_DIR:=	${PHP_EXT_DIR}-zts
>@@ -160,18 +166,18 @@
> .endif
> 
> .if defined(USE_PHP_BUILD)
>-BUILD_DEPENDS+=	${LOCALBASE}/include/php/main/php.h:${PHP_PORT}
>+BUILD_DEPENDS+=	${PHP_PREFIX}/include/php/main/php.h:${PHP_PORT}
> .endif
>-RUN_DEPENDS+=	${LOCALBASE}/include/php/main/php.h:${PHP_PORT}
>+RUN_DEPENDS+=	${PHP_PREFIX}/include/php/main/php.h:${PHP_PORT}
> 
> PLIST_SUB+=	PHP_EXT_DIR=${PHP_EXT_DIR}
> SUB_LIST+=	PHP_EXT_DIR=${PHP_EXT_DIR}
> 
> .if defined(USE_PHPIZE) || defined(USE_PHPEXT)
>-BUILD_DEPENDS+=	phpize:${PHP_PORT}
>+BUILD_DEPENDS+=	${PHP_PREFIX}/bin/phpize:${PHP_PORT}
> GNU_CONFIGURE=	YES
> USE_AUTOTOOLS+=	autoconf:259:env
>-CONFIGURE_ARGS+=--with-php-config=${LOCALBASE}/bin/php-config
>+CONFIGURE_ARGS+=--with-php-config=${PHP_PREFIX}/bin/php-config
> 
> configure-message: phpize-message do-phpize
> 
>@@ -179,12 +185,13 @@
> 	@${ECHO_MSG} "===>  PHPizing for ${PKGNAME}"
> 
> do-phpize:
>-	@(cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ${LOCALBASE}/bin/phpize)
>+	@(cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ${PHP_PREFIX}/bin/phpize)
> .endif
> 
> .if defined(USE_PHPEXT)
> PHP_MODNAME?=	${PORTNAME}
> PHP_HEADER_DIRS?=	""
>+PREFIX=${PHP_PREFIX}
> 
> do-install:
> 	@${MKDIR} ${PREFIX}/lib/php/${PHP_EXT_DIR}
>@@ -341,9 +348,9 @@
> .		if ${_USE_PHP_VER${PHP_VER}:M${extension}} != ""
> .			if ${PHP_EXT_INC:M${extension}} == ""
> .				if defined(USE_PHP_BUILD)
>-BUILD_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${PORTSDIR}/${${extension}_DEPENDS}
>+BUILD_DEPENDS+=	${PHP_PREFIX}/lib/php/${PHP_EXT_DIR}/${extension}.so:${PORTSDIR}/${${extension}_DEPENDS}
> .				endif
>-RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${PORTSDIR}/${${extension}_DEPENDS}
>+RUN_DEPENDS+=	${PHP_PREFIX}/lib/php/${PHP_EXT_DIR}/${extension}.so:${PORTSDIR}/${${extension}_DEPENDS}
> .			endif
> .		else
> isyes=		${extension}

Actions: View | Diff

Attachments on bug 89896: 59774