Date: Tue, 7 Oct 2003 15:29:00 +0200 (CEST) From: Alex Dupre <sysadmin@alexdupre.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: erwin@FreeBSD.org Subject: ports/57699: [Maintainer Update] Port: lang/php4 Message-ID: <200310071329.h97DT0o0076077@vaio.alexdupre.com> Resent-Message-ID: <200310071330.h97DUAAn052176@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 57699
>Category: ports
>Synopsis: [Maintainer Update] Port: lang/php4
>Confidential: no
>Severity: serious
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Oct 07 06:30:10 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Alex Dupre
>Release: FreeBSD 4.9-ALEXDUPRE i386
>Organization:
>Environment:
System: FreeBSD 4.9-ALEXDUPRE i386
>Description:
Mega-patch:
- Add mnogosearch extension
- Use USE_APACHE knob
- Use USE_OPENSSL knob instead of direct including of bsd.openssl.mk
- Fix OpenSSL undefind symbols at runtime
- Fix OpenLDAP/MySQL dependencies, by moving down the inclusion of the
bsd.port.pre.mk makefile
- Fix make describe/all-depends-list to catch correct libraries
- Fix mcrypt extension (add ltdl dependency)
Requires commit of PR 57698.
Supersedes PRs 57491, 55507, 57504, 57609, 55281, 56494, 57467.
>How-To-Repeat:
>Fix:
--- php4.diff begins here ---
diff -ruN php4.orig/Makefile php4/Makefile
--- php4.orig/Makefile Tue Oct 7 12:09:10 2003
+++ php4/Makefile Tue Oct 7 14:47:09 2003
@@ -127,10 +127,11 @@
ALL_OPTIONS= BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DB4 DBASE DBX \
DOMXML DOMXSLT EXIF FILEPRO FRIBIDI FTP GD GDBM GETTEXT GMP \
HYPERWAVE ICONV IMAP INTERBASE INIFILE MBSTRING MCAL MCVE \
- MCRYPT MHASH MIME MING MYSQL NCURSES OPENLDAP OPENSSL ORACLE \
- OVERLOAD PCNTL PCRE PDFLIB POSIX POSTGRESQL PSPELL READLINE \
- RECODE SESSION SHMOP SNMP SOCKETS SYBASEDB SYBASECT SYSVSEM \
- SYSVSHM TOKENIZER UNIXODBC WDDX XML XMLRPC XSLT YAZ YP ZIP ZLIB
+ MCRYPT MHASH MIME MING MNOGOSEARCH MYSQL NCURSES OPENLDAP \
+ OPENSSL ORACLE OVERLOAD PCNTL PCRE PDFLIB POSIX POSTGRESQL \
+ PSPELL READLINE RECODE SESSION SHMOP SNMP SOCKETS SYBASEDB \
+ SYBASECT SYSVSEM SYSVSHM TOKENIZER UNIXODBC WDDX XML XMLRPC \
+ XSLT YAZ YP ZIP ZLIB
.for opt in ${ALL_OPTIONS}
.if defined(WITH_${opt}) || defined(WITHOUT_${opt})
@@ -142,40 +143,13 @@
IS_INTERACTIVE= yes
.endif
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=--disable-ipv6
-.endif
-
.if !defined(WITHOUT_APACHE)
-.if exists(${LOCALBASE}/include/apache2/apr.h)
-WITH_APACHE2= yes
-.endif
-
-APXS?= ${LOCALBASE}/sbin/apxs
-
-.if defined(WITH_APACHE2)
-APACHE_PORT?= ${PORTSDIR}/www/apache2
-CONFIGURE_ARGS+=--with-apxs2=${APXS}
-SAPI_FILE= libexec/apache2/libphp4.so
-.else
-APACHE_PORT?= ${PORTSDIR}/www/apache13
-CONFIGURE_ARGS+=--with-apxs=${APXS}
-SAPI_FILE= libexec/apache/libphp4.so
-.endif
-
-BUILD_DEPENDS+= ${APXS}:${APACHE_PORT}
-RUN_DEPENDS+= ${APXS}:${APACHE_PORT}
-
+USE_APACHE= yes
PLIST_SUB+= APACHE=""
.else
PLIST_SUB+= APACHE="@comment "
.endif
-PLIST_SUB+= SAPI_FILE=${SAPI_FILE} \
- EXT_DIR=${EXT_DIR}
-
WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work
PHP4_OPTFILE?= ${HOME}/php4_options
@@ -189,6 +163,9 @@
.for opt in ${PHP4_OPTIONS}
.if !defined(WITHOUT_${opt})
SEL_OPTIONS+= ${opt}
+.if !exists(${WRKDIR}/Makefile.inc)
+WITH_${opt}= yes
+.endif
.endif
SCRIPTS_ENV+= WITH_${opt}=ON
.endfor
@@ -199,11 +176,6 @@
CAT="${CAT}" \
SED="${SED}"
-.ifmake describe
-WITH_MYSQL= yes
-WITH_XML= yes
-.endif
-
.if exists(${WRKDIR}/Makefile.inc)
.include "${WRKDIR}/Makefile.inc"
.endif
@@ -353,30 +325,13 @@
.if defined(WITH_ICONV) || defined(WITH_ICONV_DEP)
LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv
+CONFIGURE_ARGS+=--with-iconv-dir=${LOCALBASE}
.endif
.if defined(WITH_ICONV)
CONFIGURE_ARGS+=--with-iconv=${LOCALBASE}
.endif
-.if defined(WITH_IMAP)
-LIB_DEPENDS+= c-client4.8:${PORTSDIR}/mail/cclient
-.if !exists(${LOCALBASE}/lib/libc-client4.so)
-.if !defined(WITHOUT_SSL)
-CONFIGURE_ARGS+=--with-imap=${LOCALBASE} --with-imap-ssl=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--with-imap=${LOCALBASE}
-.endif
-.else
-WITH_IMAP_SSL!=/usr/bin/ldd ${LOCALBASE}/lib/libc-client4.so | ${GREP} libssl || ${TRUE}
-.if !empty(WITH_IMAP_SSL)
-CONFIGURE_ARGS+=--with-imap=${LOCALBASE} --with-imap-ssl=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--with-imap=${LOCALBASE}
-.endif
-.endif
-.endif
-
.if defined(WITH_INIFILE)
CONFIGURE_ARGS+=--with-inifile
.endif
@@ -402,6 +357,7 @@
.if defined(WITH_MCRYPT)
LIB_DEPENDS+= mcrypt.8:${PORTSDIR}/security/libmcrypt
+LIB_DEPENDS+= ltdl.4:${PORTSDIR}/devel/libltdl
CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
.endif
@@ -419,28 +375,25 @@
CONFIGURE_ARGS+=--with-ming=${LOCALBASE}
.endif
+.if defined(WITH_MNOGOSEARCH)
+LIB_DEPENDS+= udmsearch.1:${PORTSDIR}/www/mnogosearch
+CONFIGURE_ARGS+=--with-mnogosearch=${LOCALBASE}
+.endif
+
.if defined(WITH_MYSQL)
USE_MYSQL= yes
CONFIGURE_ARGS+=--with-mysql=${LOCALBASE}
.endif
-.if defined(WITH_NCURSES)
-.if ${OSVERSION} < 400000
-NCURSESBASE= ${LOCALBASE}
-LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses
-.else
-NCURSESBASE= /usr
-.endif
-CONFIGURE_ARGS+=--with-ncurses=${NCURSESBASE}
-.endif
-
.if defined(WITH_OPENLDAP)
USE_OPENLDAP= yes
CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
.endif
.if defined(WITH_OPENSSL) || defined(WITH_OPENSSL_DEP)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
+LDFLAGS+= -lcrypto -lssl
+CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+=--with-openssl-dir=${OPENSSLBASE}
.endif
@@ -502,15 +455,6 @@
CONFIGURE_ARGS+=--enable-shmop
.endif
-.if defined(WITH_SNMP)
-.if exists(${LOCALBASE}/lib/libsnmp.so.4)
-LIB_DEPENDS+= snmp.4:${PORTSDIR}/net/net-snmp4
-.else
-LIB_DEPENDS+= netsnmp.5:${PORTSDIR}/net/net-snmp
-.endif
-CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} --enable-ucd-snmp-hack
-.endif
-
.if defined(WITH_SOCKETS)
CONFIGURE_ARGS+=--enable-sockets
.endif
@@ -548,10 +492,11 @@
.if defined(WITH_XML) || defined(WITH_XML_DEP)
LIB_DEPENDS+= expat.4:${PORTSDIR}/textproc/expat2
+CONFIGURE_ARGS+=--with-expat-dir=${LOCALBASE}
.endif
.if defined(WITH_XML)
-CONFIGURE_ARGS+=--enable-xml --with-expat-dir=${LOCALBASE}
+CONFIGURE_ARGS+=--enable-xml
.endif
.if defined(WITH_XMLRPC)
@@ -579,6 +524,62 @@
.if defined(WITH_ZLIB)
CONFIGURE_ARGS+=--with-zlib=yes
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_APACHE)
+.if ${APACHE_VER} == 2
+CONFIGURE_ARGS+=--with-apxs2=${APXS}
+SAPI_FILE= libexec/apache2/libphp4.so
+.else
+CONFIGURE_ARGS+=--with-apxs=${APXS}
+SAPI_FILE= libexec/apache/libphp4.so
+.endif
+.endif
+
+PLIST_SUB+= SAPI_FILE=${SAPI_FILE} \
+ EXT_DIR=${EXT_DIR}
+
+.if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6)
+CONFIGURE_ARGS+=--disable-ipv6
+.endif
+
+.if defined(WITH_IMAP)
+LIB_DEPENDS+= c-client4.8:${PORTSDIR}/mail/cclient
+.if !exists(${LOCALBASE}/lib/libc-client4.so)
+.if !defined(WITHOUT_SSL)
+CONFIGURE_ARGS+=--with-imap=${LOCALBASE} --with-imap-ssl=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=--with-imap=${LOCALBASE}
+.endif
+.else
+WITH_IMAP_SSL!= /usr/bin/ldd ${LOCALBASE}/lib/libc-client4.so | ${GREP} libssl || ${TRUE}
+.if !empty(WITH_IMAP_SSL)
+CONFIGURE_ARGS+=--with-imap=${LOCALBASE} --with-imap-ssl=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=--with-imap=${LOCALBASE}
+.endif
+.endif
+.endif
+
+.if defined(WITH_NCURSES)
+.if ${OSVERSION} < 400000
+NCURSESBASE= ${LOCALBASE}
+LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses
+.else
+NCURSESBASE= /usr
+.endif
+CONFIGURE_ARGS+=--with-ncurses=${NCURSESBASE}
+.endif
+
+.if defined(WITH_SNMP)
+.if exists(${LOCALBASE}/lib/libsnmp.so.4)
+LIB_DEPENDS+= snmp.4:${PORTSDIR}/net/net-snmp4
+.else
+LIB_DEPENDS+= netsnmp.5:${PORTSDIR}/net/net-snmp
+.endif
+CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} --enable-ucd-snmp-hack
.endif
pre-patch:
diff -ruN php4.orig/scripts/configure.php php4/scripts/configure.php
--- php4.orig/scripts/configure.php Tue Oct 7 12:09:10 2003
+++ php4/scripts/configure.php Tue Oct 7 14:45:09 2003
@@ -50,6 +50,7 @@
MHASH "Crypto-hashing support" ${WITH_MHASH:-OFF} \
MIME "mime_magic support" ${WITH_MIME:-OFF} \
MING "ming shockwave flash support" ${WITH_MING:-OFF} \
+MNOGOSEARCH "mnoGoSearch support" ${WITH_MNOGOSEARCH:-OFF} \
MYSQL "MySQL database support" ${WITH_MYSQL:-OFF} \
NCURSES "ncurses support (CLI only)" ${WITH_NCURSES:-OFF} \
OPENLDAP "OpenLDAP support" ${WITH_OPENLDAP:-OFF} \
diff -ruN php4.orig/scripts/php4_options php4/scripts/php4_options
--- php4.orig/scripts/php4_options Tue Oct 7 12:09:10 2003
+++ php4/scripts/php4_options Tue Oct 7 14:44:26 2003
@@ -30,6 +30,7 @@
WITH_MHASH=OFF
WITH_MIME=OFF
WITH_MING=OFF
+WITH_MNOGOSEARCH=OFF
WITH_MYSQL=ON
WITH_NCURSES=OFF
WITH_OPENLDAP=OFF
--- php4.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200310071329.h97DT0o0076077>