diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2004-01-26 12:58:14 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2004-01-26 12:58:14 +0000 |
| commit | 0fbe9133fda64fb6966f1ec785ec72c28a38b88e (patch) | |
| tree | 07138a7ab9de6352de91b19918eca42e11e781ab /lang/php5 | |
| parent | Update to 3.12. (diff) | |
- Add support for PTHREAD_{LIBS/CFLAGS} [1]
- Add support for FastCGI [2]
- Fix PEAR installation in a particular scenario [3]
PR: ports/61790 [2]
Submitted by: clement [1],
Xavier Beaudouin <kiwi@oav.net> [2],
Balazs Nagy <js@iksz.hu> [3]
Approved by: nork (mentor/implicitly)
Notes
Notes:
svn path=/head/; revision=99178
Diffstat (limited to 'lang/php5')
| -rw-r--r-- | lang/php5/Makefile | 12 | ||||
| -rw-r--r-- | lang/php5/files/patch-pear::Makefile.frag | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile index b2f71a4bf5f1..43afe764eb32 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -67,6 +67,9 @@ GNU_CONFIGURE= yes USE_BISON= yes USE_REINPLACE= yes +CONFIGURE_ENV= ac_cv_pthreads_lib=${PTHREAD_LIBS} \ + ac_cv_pthreads_cflags=${PTHREAD_CFLAGS} + CONFIGURE_ARGS= --enable-versioning \ --enable-memory-limit \ --with-layout=GNU \ @@ -103,7 +106,12 @@ CONFLICTS+= php4-4* php4-cli-4* mod_php4-4* php4-cgi-4* .if defined(WITHOUT_APACHE) .if defined(WITHOUT_CLI) +.if defined(WITH_FASTCGI) +CONFIGURE_ARGS+=--enable-fastcgi +.else CONFIGURE_ARGS+=--enable-discard-path +.endif +SAPI_FILE= bin/php .else CONFIGURE_ARGS+=--disable-cgi .endif @@ -124,9 +132,6 @@ PLIST_SUB+= PEAR="@comment " MAN1= php.1 PLIST_SUB+= CLI="" .endif -.if defined(WITHOUT_APACHE) && defined(WITHOUT_CLI) -SAPI_FILE= "bin/php" -.endif ALL_OPTIONS= BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DB4 DBASE DBX DIO \ DOM EXIF FILEPRO FTP GD GDBM GETTEXT GMP ICONV IMAP INTERBASE \ @@ -534,7 +539,6 @@ CONFIGURE_ARGS+=--with-zlib .include <bsd.port.pre.mk> .if !defined(WITHOUT_APACHE) -APXS?= ${LOCALBASE}/sbin/apxs .if exists(${LOCALBASE}/include/apache2/apr.h) WITH_APACHE2= yes APACHE_MPM!= ${APXS} -q MPM_NAME diff --git a/lang/php5/files/patch-pear::Makefile.frag b/lang/php5/files/patch-pear::Makefile.frag index 6653c7852f69..060066c367b6 100644 --- a/lang/php5/files/patch-pear::Makefile.frag +++ b/lang/php5/files/patch-pear::Makefile.frag @@ -17,6 +17,6 @@ + $(INSTALL_ROOT)$(peardir)/bootstrap + @cp $(srcdir)/Archive/*.php $(INSTALL_ROOT)$(peardir)/bootstrap/Archive + @cp $(srcdir)/Console/*.php $(INSTALL_ROOT)$(peardir)/bootstrap/Console -+ @cp -R $(srcdir)/OS $(INSTALL_ROOT)$(peardir)/bootstrap/OS -+ @cp -R $(srcdir)/PEAR $(INSTALL_ROOT)$(peardir)/bootstrap/PEAR ++ @cp -R $(srcdir)/OS $(INSTALL_ROOT)$(peardir)/bootstrap ++ @cp -R $(srcdir)/PEAR $(INSTALL_ROOT)$(peardir)/bootstrap |