diff options
| author | ale <ale@FreeBSD.org> | 2005-01-11 01:00:34 +0800 |
|---|---|---|
| committer | ale <ale@FreeBSD.org> | 2005-01-11 01:00:34 +0800 |
| commit | 0c8861b65f6e76212df2cf2e415b6c7427bc5bc1 (patch) | |
| tree | 537d01bff83ba02865621fd9abf68c892f1e4841 /lang/php5 | |
| parent | 1e6246ba6e20505d3a258d008490906b1e74f069 (diff) | |
| download | freebsd-ports-gnome-0c8861b65f6e76212df2cf2e415b6c7427bc5bc1.tar.gz freebsd-ports-gnome-0c8861b65f6e76212df2cf2e415b6c7427bc5bc1.tar.zst freebsd-ports-gnome-0c8861b65f6e76212df2cf2e415b6c7427bc5bc1.zip | |
- Fix overloading objects [1] (bump php4 PORTREVISION)
- Fix crash with threaded apache2 [2]
- Fix build when SSL is in not in base system [3] [4]
PR: ports/75737 [1], ports/74780 [2],
ports/73896 [3], ports/74886 [4]
Submitted by: Toni Viemero <toni.viemero@iki.fi> [1],
Peter Jeffery <peterj@qubesoft.com> [2],
oliver [3], William Fletcher <ultraviolet@omina.co.za> [4]
Patch by: Simon Barner <barner@gmx.de> [4]
Diffstat (limited to 'lang/php5')
| -rw-r--r-- | lang/php5/Makefile.ext | 6 | ||||
| -rw-r--r-- | lang/php5/files/patch-Zend::zend.h | 12 |
2 files changed, 15 insertions, 3 deletions
diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext index 248df410681e..27b1ee61528a 100644 --- a/lang/php5/Makefile.ext +++ b/lang/php5/Makefile.ext @@ -169,7 +169,7 @@ LIB_DEPENDS+= mcve.3:${PORTSDIR}/devel/libmcve CONFIGURE_ARGS+=--with-mcve=${LOCALBASE} \ --with-openssl-dir=${OPENSSLBASE} -LDFLAGS+= -lcrypto -lssl +LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl USE_OPENSSL= yes .endif @@ -226,7 +226,7 @@ CONFIGURE_ARGS+=--with-unixODBC=${LOCALBASE} CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} \ --with-openssl-dir=${OPENSSLBASE} -LDFLAGS+= -lcrypto -lssl +LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl USE_OPENSSL= yes .endif @@ -294,7 +294,7 @@ CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} \ --with-openssl-dir=${OPENSSLBASE} \ --enable-ucd-snmp-hack -LDFLAGS+= -lcrypto -lssl +LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl USE_OPENSSL= yes OPTIONS= SNMP4 "Use old UCD SNMP instead of the new NET SNMP" off diff --git a/lang/php5/files/patch-Zend::zend.h b/lang/php5/files/patch-Zend::zend.h new file mode 100644 index 000000000000..50625c403417 --- /dev/null +++ b/lang/php5/files/patch-Zend::zend.h @@ -0,0 +1,12 @@ +--- Zend/zend.h.orig Mon Dec 6 15:42:56 2004 ++++ Zend/zend.h Mon Dec 6 15:46:40 2004 +@@ -176,7 +176,7 @@ + #endif + + +-#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(__darwin__) && !defined(__APPLE__) ++#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(__darwin__) && !defined(__APPLE__) && !(defined(ZTS) && defined(__FreeBSD__)) + # define do_alloca(p) alloca(p) + # define free_alloca(p) + #else + |