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

(-)ports/Mk/bsd.php.mk (-33 / +1 lines)
Lines 38-43 Link Here
38
.if !defined(_PHPMKINCLUDED)
38
.if !defined(_PHPMKINCLUDED)
39
39
40
PHP_Include_MAINTAINER=	ale@FreeBSD.org
40
PHP_Include_MAINTAINER=	ale@FreeBSD.org
41
PHP_EXT_DIR?= modules
41
42
42
_PHPMKINCLUDED=	yes
43
_PHPMKINCLUDED=	yes
43
44
Lines 50-94 Link Here
50
PHPBASE?=	${LOCALBASE}
51
PHPBASE?=	${LOCALBASE}
51
.if exists(${PHPBASE}/etc/php.conf)
52
.if exists(${PHPBASE}/etc/php.conf)
52
.include "${PHPBASE}/etc/php.conf"
53
.include "${PHPBASE}/etc/php.conf"
53
PHP_EXT_DIR!=	${PHPBASE}/bin/php-config --extension-dir | ${SED} -ne 's,^${PHPBASE}/lib/php/\(.*\),\1,p'
54
54
55
.else
55
.else
56
DEFAULT_PHP_VER?=	${PHP_DEFAULT:S/.//}
56
DEFAULT_PHP_VER?=	${PHP_DEFAULT:S/.//}
57
57
58
PHP_VER?=	${DEFAULT_PHP_VER}
58
PHP_VER?=	${DEFAULT_PHP_VER}
59
.if ${PHP_VER}  == 53
60
PHP_EXT_DIR=	20090626
61
PHP_EXT_INC=	pcre spl
62
.elif ${PHP_VER}  == 56
63
PHP_EXT_DIR=	20131226
64
PHP_EXT_INC=	pcre spl
65
.elif ${PHP_VER}  == 55
66
PHP_EXT_DIR=	20121212
67
PHP_EXT_INC=	pcre spl
68
.elif ${PHP_VER}  == 54
69
PHP_VER=	5
70
PHP_EXT_DIR=	20100525
71
PHP_EXT_INC=	pcre spl
72
.else
73
PHP_EXT_DIR=	20100525
74
PHP_EXT_INC=	pcre spl
75
.endif
76
77
HTTPD?=		${LOCALBASE}/sbin/httpd
78
.if exists(${HTTPD})
79
APACHE_THR!=	${HTTPD} -V | ${GREP} threaded
80
.	if ${APACHE_THR:Myes}
81
PHP_EXT_DIR:=	${PHP_EXT_DIR}-zts
82
.	endif
83
.elif defined(APACHE_PORT) && (${APACHE_PORT:M*worker*} != "" || ${APACHE_PORT:M*event*} != "")
84
PHP_EXT_DIR:=	${PHP_EXT_DIR}-zts
85
.elif defined(WITH_MPM) && (${WITH_MPM} == "worker" || ${WITH_MPM} == "event")
86
PHP_EXT_DIR:=	${PHP_EXT_DIR}-zts
87
.endif
88
59
89
.if defined(WITH_DEBUG)
90
PHP_EXT_DIR:=	${PHP_EXT_DIR}-debug
91
.endif
92
PHP_SAPI?=	""
60
PHP_SAPI?=	""
93
.endif	# .if exists(${PHPBASE}/etc/php.conf)
61
.endif	# .if exists(${PHPBASE}/etc/php.conf)
94
PHP_EXT_INC?=	""
62
PHP_EXT_INC?=	""
(-)ports/lang/php55/Makefile (-2 / +8 lines)
Lines 89-95 Link Here
89
89
90
.if defined(OPTIONS_FILE_SET) && ${OPTIONS_FILE_SET:MAPACHE}
90
.if defined(OPTIONS_FILE_SET) && ${OPTIONS_FILE_SET:MAPACHE}
91
IGNORE=		doesn't install the Apache module anymore:\
91
IGNORE=		doesn't install the Apache module anymore:\
92
		update your OPTIONS and build www/mod_php55 port instead 
92
		update your OPTIONS and build www/mod_php55 port instead
93
.endif
93
.endif
94
94
95
.if defined(PKGNAMEPREFIX)
95
.if defined(PKGNAMEPREFIX)
Lines 135-145 Link Here
135
CONFIGURE_ARGS+=--with-zend-vm=GOTO
135
CONFIGURE_ARGS+=--with-zend-vm=GOTO
136
.endif
136
.endif
137
137
138
PHP_EXT_DIR?=	${PREFIX}/lib/php/modules
139
138
CONFIGURE_ENV+=	ac_cv_pthreads_lib="" \
140
CONFIGURE_ENV+=	ac_cv_pthreads_lib="" \
139
		ac_cv_pthreads_cflags="" \
141
		ac_cv_pthreads_cflags="" \
140
		ac_cv_decimal_fp_supported="no" \
142
		ac_cv_decimal_fp_supported="no" \
141
		pthreads_working="yes" \
143
		pthreads_working="yes" \
142
		lt_cv_path_SED="sed"
144
		lt_cv_path_SED="sed" \
145
		EXTENSION_DIR="${PHP_EXT_DIR}"
146
147
MAKE_ENV+=	EXTENSION_DIR="${PHP_EXT_DIR}"
143
148
144
.if ${PORT_OPTIONS:MLINKTHR}
149
.if ${PORT_OPTIONS:MLINKTHR}
145
LIBS+=		-lpthread
150
LIBS+=		-lpthread
Lines 181-186 Link Here
181
		${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'`
186
		${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'`
182
	@${RM} ${WRKSRC}/configure
187
	@${RM} ${WRKSRC}/configure
183
	@${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4
188
	@${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4
189
	${MKDIR} ${STAGEDIR}${PHP_EXT_DIR}
184
190
185
.if !defined(PKGNAMEPREFIX)
191
.if !defined(PKGNAMEPREFIX)
186
post-build:
192
post-build:
(-)ports/lang/php55/pkg-plist (+1 lines)
Lines 237-242 Link Here
237
lib/php/build/run-tests.php
237
lib/php/build/run-tests.php
238
lib/php/build/scan_makefile_in.awk
238
lib/php/build/scan_makefile_in.awk
239
lib/php/build/shtool
239
lib/php/build/shtool
240
@dir lib/php/modules
240
%%CGI%%man/man1/php-cgi.1.gz
241
%%CGI%%man/man1/php-cgi.1.gz
241
man/man1/php-config.1.gz
242
man/man1/php-config.1.gz
242
%%CLI%%man/man1/php.1.gz
243
%%CLI%%man/man1/php.1.gz

Return to bug 201193