Attachment #38695 for bug #61169

View | Details | Raw Unified | Return to bug 61169
Collapse All | Expand All




EXT_DIR=	20020429
SAPI_FILE=	"@comment "

.if defined(WITH_DEBUG)
CONFIGURE_ARGS+=--enable-debug
EXT_DIR:=	${EXT_DIR}-debug
.endif

CONFLICTS=	php4-cli-4* mod_php4-4* php4-cgi-4*
.if defined(WITHOUT_APACHE)
.if defined(WITHOUT_CLI)

.if !defined(WITHOUT_APACHE)
.if exists(${LOCALBASE}/include/apache2/apr.h)
WITH_APACHE2=	yes
APACHE_MPM!=	${APXS} -q MPM_NAME
.endif
.if defined(WITH_APACHE2)
APACHE_MPM?=	${WITH_MPM}
APACHE_PORT?=	www/apache2
CONFIGURE_ARGS+=--with-apxs2=${APXS}
SAPI_FILE=	libexec/apache2/libphp4.so
.if ${APACHE_MPM} == "worker"
EXT_DIR:=	${EXT_DIR}-zts
.endif
.else
APACHE_PORT?=	www/apache13
CONFIGURE_ARGS+=--with-apxs=${APXS}

RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
.endif

.if defined(WITH_DEBUG)
CONFIGURE_ARGS+=--enable-debug
EXT_DIR:=	${EXT_DIR}-debug
.endif

PLIST_SUB+=	SAPI_FILE=${SAPI_FILE} \
		EXT_DIR=${EXT_DIR}


	@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc
	@${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc
	@${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc
	@${TOUCH} ${PREFIX}/lib/php/${EXT_DIR}/.php
.if !defined(WITHOUT_APACHE)
	@${ECHO_CMD} "*****************************************************************************"
	@${ECHO_CMD} ""

Lines 18-27 Link Here

(-)php4/bsd.php.mk (-4 / +15 lines)
18	.endif	18	.endif
19		19
20	PHP_VER?= 4	20	PHP_VER?= 4
21	.if !defined(WITH_DEBUG)	21	.if !defined(PHP_EXT_DIR)
22	PHP_EXT_DIR?= 20020429	22	PHP_EXT_DIR= 20020429
		23	.if exists(${LOCALBASE}/include/apache2/apr.h)
		24	APACHE_MPM!= ${APXS} -q MPM_NAME
		25	.if ${APACHE_MPM} == "worker"
		26	PHP_EXT_DIR:= ${PHP_EXT_DIR}-zts
		27	.endif
23	.else	28	.else
24	PHP_EXT_DIR?= 20020429-debug	29	.if defined(WITH_APACHE2) && defined(WITH_MPM) && ${WITH_MPM} == "worker"
		30	PHP_EXT_DIR:= ${PHP_EXT_DIR}-zts
		31	.endif
		32	.endif
		33	.if defined(WITH_DEBUG)
		34	PHP_EXT_DIR:= ${PHP_EXT_DIR}-debug
		35	.endif
25	.endif	36	.endif
26	.if !defined(WITHOUT_PEAR)	37	.if !defined(WITHOUT_PEAR)
27	PHP_PEAR?= yes	38	PHP_PEAR?= yes
Lines 32-38 Link Here
32		43
33	.if defined(BROKEN_WITH_PHP)	44	.if defined(BROKEN_WITH_PHP)
34	. for VER in ${BROKEN_WITH_PHP}	45	. for VER in ${BROKEN_WITH_PHP}
35	. if (${PHP_VER} == "${VER}")	46	. if ${PHP_VER} == "${VER}"
36	BROKEN= "Doesn't work with PHP version : ${PHP_VER} (Doesn't support PHP ${BROKEN_WITH_PHP})"	47	BROKEN= "Doesn't work with PHP version : ${PHP_VER} (Doesn't support PHP ${BROKEN_WITH_PHP})"
37	. endif	48	. endif
38	. endfor	49	. endfor

Lines 193-199 Link Here

(-)php4/pkg-plist (-1 / +1 lines)
193	include/php/regex/regex2.h	193	include/php/regex/regex2.h
194	include/php/regex/regex_extra.h	194	include/php/regex/regex_extra.h
195	include/php/regex/utils.h	195	include/php/regex/utils.h
196	lib/php/%%EXT_DIR%%/.php
197	lib/php/build/Makefile.global	196	lib/php/build/Makefile.global
198	lib/php/build/acinclude.m4	197	lib/php/build/acinclude.m4
199	lib/php/build/mkdep.awk	198	lib/php/build/mkdep.awk
Lines 242-247 Link Here
242	@dirrm include/php/main	241	@dirrm include/php/main
243	@dirrm include/php/regex	242	@dirrm include/php/regex
244	@dirrm include/php/	243	@dirrm include/php/
		244	@exec mkdir %D/lib/php/%%EXT_DIR%%
245	@unexec rmdir %D/lib/php/%%EXT_DIR%% 2> /dev/null \|\| true	245	@unexec rmdir %D/lib/php/%%EXT_DIR%% 2> /dev/null \|\| true
246	@dirrm lib/php/build	246	@dirrm lib/php/build
247	@unexec rmdir %D/lib/php 2> /dev/null \|\| true	247	@unexec rmdir %D/lib/php 2> /dev/null \|\| true

Return to bug 61169

Lines 87-97 Link Here

(-)php4/Makefile (-6 / +10 lines)
87	EXT_DIR= 20020429	87	EXT_DIR= 20020429
88	SAPI_FILE= "@comment "	88	SAPI_FILE= "@comment "
89		89
90	.if defined(WITH_DEBUG)
91	CONFIGURE_ARGS+=--enable-debug
92	EXT_DIR:= ${EXT_DIR}-debug
93	.endif
94
95	CONFLICTS= php4-cli-4* mod_php4-4* php4-cgi-4*	90	CONFLICTS= php4-cli-4* mod_php4-4* php4-cgi-4*
96	.if defined(WITHOUT_APACHE)	91	.if defined(WITHOUT_APACHE)
97	.if defined(WITHOUT_CLI)	92	.if defined(WITHOUT_CLI)
Lines 535-545 Link Here
535	.if !defined(WITHOUT_APACHE)	530	.if !defined(WITHOUT_APACHE)
536	.if exists(${LOCALBASE}/include/apache2/apr.h)	531	.if exists(${LOCALBASE}/include/apache2/apr.h)
537	WITH_APACHE2= yes	532	WITH_APACHE2= yes
		533	APACHE_MPM!= ${APXS} -q MPM_NAME
538	.endif	534	.endif
539	.if defined(WITH_APACHE2)	535	.if defined(WITH_APACHE2)
		536	APACHE_MPM?= ${WITH_MPM}
540	APACHE_PORT?= www/apache2	537	APACHE_PORT?= www/apache2
541	CONFIGURE_ARGS+=--with-apxs2=${APXS}	538	CONFIGURE_ARGS+=--with-apxs2=${APXS}
542	SAPI_FILE= libexec/apache2/libphp4.so	539	SAPI_FILE= libexec/apache2/libphp4.so
		540	.if ${APACHE_MPM} == "worker"
		541	EXT_DIR:= ${EXT_DIR}-zts
		542	.endif
543	.else	543	.else
544	APACHE_PORT?= www/apache13	544	APACHE_PORT?= www/apache13
545	CONFIGURE_ARGS+=--with-apxs=${APXS}	545	CONFIGURE_ARGS+=--with-apxs=${APXS}
Lines 549-554 Link Here
549	RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT}	549	RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT}
550	.endif	550	.endif
551		551
		552	.if defined(WITH_DEBUG)
		553	CONFIGURE_ARGS+=--enable-debug
		554	EXT_DIR:= ${EXT_DIR}-debug
		555	.endif
		556
552	PLIST_SUB+= SAPI_FILE=${SAPI_FILE} \	557	PLIST_SUB+= SAPI_FILE=${SAPI_FILE} \
553	EXT_DIR=${EXT_DIR}	558	EXT_DIR=${EXT_DIR}
554		559
Lines 675-681 Link Here
675	@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc	680	@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc
676	@${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc	681	@${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc
677	@${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc	682	@${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc
678	@${TOUCH} ${PREFIX}/lib/php/${EXT_DIR}/.php
679	.if !defined(WITHOUT_APACHE)	683	.if !defined(WITHOUT_APACHE)
680	@${ECHO_CMD} "*****************************************************************************"	684	@${ECHO_CMD} "*****************************************************************************"
681	@${ECHO_CMD} ""	685	@${ECHO_CMD} ""