Date: Fri, 23 Nov 2001 12:18:28 -0500 From: Yarema <yds@dppl.com> To: FreeBSD-gnats-submit@freebsd.org Cc: Dirk Froemberg <dirk@freebsd.org> Subject: ports/32232: Update and bugfix port: www/mod_php4 Message-ID: <courier.3BFE84E4.0000BA22@dppl.com>
next in thread | raw e-mail | index | archive | help
>Number: 32232
>Category: ports
>Synopsis: Update and bugfix port: www/mod_php4
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Nov 23 09:20:00 PST 2001
>Closed-Date:
>Last-Modified:
>Originator: Yarema
>Release: FreeBSD 4.4-STABLE i386
>Organization:
Digital Page Publishers, Ltd.
>Environment:
System: FreeBSD volyn.dppl.net 4.4-STABLE FreeBSD 4.4-STABLE #0: Tue Nov 20 04:10:02 EST 2001 root@volyn.dppl.net:/usr/obj/usr/src/sys/INTELSMP i386
>Description:
New file patch-ext_imap_config.m4 fixes the library name from -lc-client to
-lc-client4 otherwise configure fails with IMAP-SSL enabled. New file
patch-ext_java_Makefile.in fixes the creation of php_java.jar. Added
options for BZip2 library support, Java support using KaffeVM, calendar
conversion support and mm support for session storage. Enabled TrueType
string function in GD. There's a typo in configure where --help displays
the option to be --enable-gd-native-ttf while the valid option is actually
--enable-gd-native-tt with out the f. Removed redundent LIB_DEPENDS from GD
and PDFlib sections. Those LIB_DEPENDS are anyway inherited from the
respective ports.
>How-To-Repeat:
>Fix:
diff -ruN mod_php4~/Makefile mod_php4/Makefile
--- mod_php4~/Makefile Mon Nov 19 03:06:09 2001
+++ mod_php4/Makefile Fri Nov 23 09:54:52 2001
@@ -51,7 +51,8 @@
--with-config-file-path=${PREFIX}/etc
.endif
-CONFIGURE_ARGS+=--enable-versioning \
+CONFIGURE_ARGS+=--enable-inline-optimization \
+ --enable-versioning \
--with-system-regex \
--disable-debug \
--enable-track-vars \
diff -ruN mod_php4~/files/patch-ext_imap_config.m4 mod_php4/files/patch-ext_imap_config.m4
--- mod_php4~/files/patch-ext_imap_config.m4 Wed Dec 31 19:00:00 1969
+++ mod_php4/files/patch-ext_imap_config.m4 Fri Nov 23 05:16:24 2001
@@ -0,0 +1,11 @@
+--- ext/imap/config.m4.orig Mon May 21 20:38:46 2001
++++ ext/imap/config.m4 Fri Nov 23 05:14:13 2001
+@@ -53,7 +53,7 @@
+ PHP_ADD_LIBRARY_DEFER(ssl)
+
+ old_LIBS=$LIBS
+- LIBS="$LIBS -lc-client"
++ LIBS="$LIBS -lc-client4"
+ if test $PHP_KERBEROS != "no"; then
+ LIBS="$LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
+ fi
diff -ruN mod_php4~/files/patch-ext_java_Makefile.in mod_php4/files/patch-ext_java_Makefile.in
--- mod_php4~/files/patch-ext_java_Makefile.in Wed Dec 31 19:00:00 1969
+++ mod_php4/files/patch-ext_java_Makefile.in Fri Nov 23 06:25:35 2001
@@ -0,0 +1,11 @@
+--- ext/java/Makefile.in.orig Mon May 15 12:02:42 2000
++++ ext/java/Makefile.in Fri Nov 23 06:25:05 2001
+@@ -17,7 +17,7 @@
+ $(mkinstalldirs) net/php
+ @cp $(srcdir)/reflect.java net/php
+ @echo library=php_java>net/php/reflect.properties
+- javac net/php/reflect.java
++ javac reflect.java
+ @test ! -f reflect.class || mv reflect.class net/php # bug in KJC javac
+ $(JAVA_JAR) php_java.jar net/php/*.class net/php/*.properties
+ @rm net/php/reflect.*
diff -ruN mod_php4~/pkg-plist mod_php4/pkg-plist
--- mod_php4~/pkg-plist Wed Aug 8 17:55:09 2001
+++ mod_php4/pkg-plist Fri Nov 23 10:47:34 2001
@@ -233,6 +233,7 @@
lib/php/build/rules_common.mk
lib/php/build/rules_pear.mk
lib/php/build/shtool
+%%SUB_JAVA%%lib/php/php_java.jar
libexec/apache/libphp4.so
@exec %D/sbin/apxs -e -a -n php4 %f
@unexec %D/sbin/apxs -e -A -n php4 %f
diff -ruN mod_php4~/scripts/configure.php mod_php4/scripts/configure.php
--- mod_php4~/scripts/configure.php Mon Nov 19 03:06:09 2001
+++ mod_php4/scripts/configure.php Fri Nov 23 11:30:42 2001
@@ -19,11 +19,13 @@
Please select desired options:" -1 -1 16 \
GD "GD library support" OFF \
zlib "zlib library support" ON \
+BZip2 "BZip2 library support" OFF \
mcrypt "Encryption support" OFF \
mhash "Crypto-hashing support" OFF \
pdflib "pdflib support" OFF \
IMAP "IMAP support" OFF \
IMAP-SSL "IMAP-SSL support (implies IMAP)" OFF \
+Java "Java support (Kaffe)" OFF \
MySQL "MySQL database support" ON \
PostgreSQL "PostgreSQL database support" OFF \
SybaseDB "Sybase/MS-SQL database support (DB-lib)" OFF \
@@ -46,11 +48,13 @@
mbstring "multibyte string module" OFF \
YP "YP/NIS support" OFF \
BCMath "BCMath support" OFF \
+Calendar "Calendar conversion support" OFF \
Hyperwave "Hyperwave support" OFF \
ming "ming library support" OFF \
sockets "sockets support" OFF \
sysvsem "System V semaphore support" OFF \
sysvshm "System V shared memory support" OFF \
+mm "mm support for session storage" OFF \
transsid "Transparent session id" OFF \
2> $tempfile
@@ -75,22 +79,25 @@
${MKDIR} ${WRKDIRPREFIX}${REALCURDIR}
exec > ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
+SUB_JAVA="@comment "
+
while [ "$1" ]; do
case $1 in
\"GD\")
echo "LIB_DEPENDS+= gd.2:\${PORTSDIR}/graphics/gd"
- echo "LIB_DEPENDS+= freetype.7:\${PORTSDIR}/print/freetype2"
- echo "LIB_DEPENDS+= png.5:\${PORTSDIR}/graphics/png"
- echo "LIB_DEPENDS+= jpeg.9:\${PORTSDIR}/graphics/jpeg"
echo "CONFIGURE_ARGS+=--with-gd=\${PREFIX} \\"
echo " --with-freetype-dir=\${PREFIX} \\"
echo " --with-jpeg-dir=\${PREFIX} \\"
- echo " --with-png-dir=\${PREFIX}"
+ echo " --with-png-dir=\${PREFIX} \\"
+ echo " --enable-gd-native-tt"
;;
\"zlib\")
echo "CONFIGURE_ARGS+=--with-zlib"
ZLIB=1
;;
+ \"BZip2\")
+ echo "CONFIGURE_ARGS+=--with-bz2"
+ ;;
\"mcrypt\")
echo "LIB_DEPENDS+= mcrypt.6:\${PORTSDIR}/security/libmcrypt"
echo "CONFIGURE_ARGS+=--with-mcrypt=\${PREFIX}"
@@ -101,9 +108,6 @@
;;
\"pdflib\")
echo "LIB_DEPENDS+= pdf.3:\${PORTSDIR}/print/pdflib3"
- echo "LIB_DEPENDS+= jpeg.9:\${PORTSDIR}/graphics/jpeg"
- echo "LIB_DEPENDS+= png.5:\${PORTSDIR}/graphics/png"
- echo "LIB_DEPENDS+= tiff.4:\${PORTSDIR}/graphics/tiff"
echo "CONFIGURE_ARGS+=--with-pdflib=\${PREFIX} \\"
echo " --with-zlib-dir=/usr \\"
echo " --with-jpeg-dir=\${PREFIX} \\"
@@ -120,6 +124,12 @@
set $* \"IMAP\"
fi
;;
+ \"Java\")
+ echo "BUILD_DEPENDS+= kaffe:\${PORTSDIR}/java/kaffe"
+ echo "RUN_DEPENDS+= kaffe:\${PORTSDIR}/java/kaffe"
+ echo "CONFIGURE_ARGS+=--with-java=\${PREFIX}"
+ SUB_JAVA=""
+ ;;
\"MySQL\")
echo "LIB_DEPENDS+= mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
echo "CONFIGURE_ARGS+=--with-mysql=\${PREFIX}"
@@ -210,7 +220,7 @@
XML=1
;;
\"XSLT\")
- echo "LIB_DEPENDS+= sablot.70:\${PORTSDIR}/textproc/sablotron"
+ echo "LIB_DEPENDS+= sablot.71:\${PORTSDIR}/textproc/sablotron"
echo "CONFIGURE_ARGS+=--with-sablot=\${PREFIX}"
echo "CONFIGURE_ARGS+=--with-expat-dir=\${PREFIX}"
if [ -z "$XML" ]; then
@@ -269,6 +279,9 @@
\"BCMath\")
echo "CONFIGURE_ARGS+=--enable-bcmath"
;;
+ \"Calendar\")
+ echo "CONFIGURE_ARGS+=--enable-calendar"
+ ;;
\"Hyperwave\")
echo "CONFIGURE_ARGS+=--with-hyperwave=yes"
;;
@@ -288,6 +301,10 @@
\"transsid\")
echo "CONFIGURE_ARGS+=--enable-trans-sid"
;;
+ \"mm\")
+ echo "LIB_DEPENDS+= mm.11:${PORTSDIR}/devel/mm"
+ echo "CONFIGURE_ARGS+=--with-mm"
+ ;;
*)
echo "Invalid option(s): $*" > /dev/stderr
rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
@@ -300,3 +317,5 @@
if [ "${LIBS}" ]; then
echo "CONFIGURE_ENV+= LIBS='${LIBS}'"
fi
+
+echo "PLIST_SUB+= SUB_JAVA='${SUB_JAVA}'"
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?courier.3BFE84E4.0000BA22>