From owner-freebsd-ports Tue Mar 19 15:30:14 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6296837B405 for ; Tue, 19 Mar 2002 15:30:01 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2JNU1q51825; Tue, 19 Mar 2002 15:30:01 -0800 (PST) (envelope-from gnats) Received: from gate.pc88.gr.jp (gate.pc88.gr.jp [202.224.239.170]) by hub.freebsd.org (Postfix) with ESMTP id 7DF6737B405 for ; Tue, 19 Mar 2002 15:24:26 -0800 (PST) Received: (from root@localhost) by gate.pc88.gr.jp (8.11.6/8.11.6) id g2JNOLZ14579; Wed, 20 Mar 2002 08:24:21 +0900 (JST) (envelope-from hidekazu) Message-Id: <200203192324.g2JNOLZ14579@gate.pc88.gr.jp> Date: Wed, 20 Mar 2002 08:24:21 +0900 (JST) From: Hidekazu Kuroki Reply-To: Hidekazu Kuroki To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/36113: Add gdbm, BerkeleyDB2, BerkeleyDB3, libiodbc, unixODBC support for www/mod_php4 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 36113 >Category: ports >Synopsis: Add gdbm, BerkeleyDB2, BerkeleyDB3, libiodbc, unixODBC support for www/mod_php4 >Confidential: no >Severity: non-critical >Priority: high >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Mar 19 15:30:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Hidekazu Kuroki >Release: FreeBSD 4.5-RELEASE i386 >Organization: Hidekazu Kuroki >Environment: System: FreeBSD gate.pc88.gr.jp 4.5-RELEASE FreeBSD 4.5-RELEASE #0: Mon Jan 28 14:31:56 GMT 2002 murray@builder.freebsdmall.com:/usr/src/sys/compile/GENERIC i386 >Description: This patch is add following to www/mod_php4, and require commit to PR 36109. - Add gdbm support. - Add BerkeleyDB2 support. - Add BerkeleyDB3 support. - Add libiodbc support. - Add unixODBC support. >How-To-Repeat: >Fix: ---BEGIN---- diff -rcN mod_php4.orig/files/patch-ext_dba_config.m4 mod_php4/files/patch-ext_dba_config.m4 *** mod_php4.orig/files/patch-ext_dba_config.m4 Thu Jan 1 09:00:00 1970 --- mod_php4/files/patch-ext_dba_config.m4 Wed Mar 20 08:08:40 2002 *************** *** 0 **** --- 1,46 ---- + *** ext/dba/config.m4.orig Fri Jun 29 00:16:28 2001 + --- ext/dba/config.m4 Wed Mar 20 07:37:53 2002 + *************** + *** 152,163 **** + [ --with-db3[=DIR] Include Berkeley DB3 support],[ + if test "$withval" != "no"; then + for i in /usr/local /usr /usr/local/BerkeleyDB.3.0 $withval; do + ! if test -f "$i/include/db.h" ; then + THIS_PREFIX=$i + DB3_EXTRA=db.h + fi + done + + if test -n "$DB3_EXTRA"; then + AC_DEFINE_UNQUOTED(DB3_INCLUDE_FILE, "$DB3_EXTRA", [ ]) + fi + --- 152,180 ---- + [ --with-db3[=DIR] Include Berkeley DB3 support],[ + if test "$withval" != "no"; then + for i in /usr/local /usr /usr/local/BerkeleyDB.3.0 $withval; do + ! if test -f "$i/db3/db.h"; then + ! THIS_PREFIX=$i + ! DB3_EXTRA=db3 + ! elif test -f "$i/include/db3/db.h"; then + ! THIS_PREFIX=$i + ! DB3_EXTRA=db3/db.h + ! elif test -f "$i/include/db/db3.h"; then + ! THIS_PREFIX=$i + ! DB3_EXTRA=db/db3.h + ! elif test -f "$i/include/db3.h"; then + ! THIS_PREFIX=$i + ! DB3_EXTRA=db3.h + ! elif test -f "$i/include/db.h" ; then + THIS_PREFIX=$i + DB3_EXTRA=db.h + fi + done + + + if test "$DB3_EXTRA" = "db3" ; then + + DBA_INCLUDE="$DBA_INCLUDE -I$THIS_PREFIX/db3" + + DB3_EXTRA=db.h + + fi + + + if test -n "$DB3_EXTRA"; then + AC_DEFINE_UNQUOTED(DB3_INCLUDE_FILE, "$DB3_EXTRA", [ ]) + fi diff -rcN mod_php4.orig/scripts/configure.php mod_php4/scripts/configure.php *** mod_php4.orig/scripts/configure.php Wed Mar 20 06:23:03 2002 --- mod_php4/scripts/configure.php Wed Mar 20 07:10:19 2002 *************** *** 27,38 **** --- 27,43 ---- pdflib "pdflib support" OFF \ IMAP "IMAP support" OFF \ IMAP-SSL "IMAP-SSL support (implies IMAP)" OFF \ + gdbm "GNU gdm database support" OFF \ + BerkeleyDB2 "Berkeley DB Rev.2 database support" OFF \ + BerkeleyDB3 "Berkeley DB Rev.3 database support" OFF \ MySQL "MySQL database support" ON \ PostgreSQL "PostgreSQL database support" OFF \ SybaseDB "Sybase/MS-SQL database support (DB-lib)" OFF \ SybaseCT "Sybase/MS-SQL database support (CT-lib)" OFF \ Interbase "Interbase 6 database support (Firebird)" OFF \ dBase "dBase database support" OFF \ + libiodbc "iODBC ODBC support" OFF \ + unixODBC "unixODBC ODBC support" OFF \ OpenLDAP1 "OpenLDAP 1.x support" OFF \ OpenLDAP2 "OpenLDAP 2.x support" OFF \ OpenSSL "OpenSSL support" OFF \ *************** *** 165,170 **** --- 170,199 ---- set $* \"IMAP\" fi ;; + \"gdbm\") + echo "LIB_DEPENDS+= gdbm:2:\${PORTSDIR}/databases/gdbm" + echo "CONFIGURE_ARGS+=--with-gdbm=\${LOCALBASE}" + ;; + \"BerkeleyDB2\") + echo "LIB_DEPENDS+= db2:0:\${PORTSDIR}/databases/db" + echo "CONFIGURE_ARGS+=--with-db2=\${LOCALBASE}" + if [ "$BERKELEYDB3" ]; then + echo "BerkeleyDB2 and BerkeleyDB3 are mutually exclusive." > /dev/stderr + rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc + exit 1 + fi + BERKELEYDB2=1 + ;; + \"BerkeleyDB3\") + echo "LIB_DEPENDS+= db3:2:\${PORTSDIR}/databases/db3" + echo "CONFIGURE_ARGS+=--with-db3=\${LOCALBASE}" + if [ "$BERKELEYDB2" ]; then + echo "BerkeleyDB2 and BerkeleyDB3 are mutually exclusive." > /dev/stderr + rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc + exit 1 + fi + BERKELEYDB3=1 + ;; \"MySQL\") echo "LIB_DEPENDS+= mysqlclient.10:\${PORTSDIR}/databases/mysql323-client" echo "CONFIGURE_ARGS+=--with-mysql=\${LOCALBASE}" *************** *** 212,217 **** --- 241,254 ---- ;; \"dBase\") echo "CONFIGURE_ARGS+=--with-dbase" + ;; + \"libiodbc\") + echo "LIB_DEPENDS+= iodbc.3:\${PORTSDIR}/databases/libiodbc" + echo "CONFIGURE_ARGS+=--with-iodbc=\${LOCALBASE}" + ;; + \"unixODBC\") + echo "LIB_DEPENDS+= odbc.1:\${PORTSDIR}/databases/unixODBC" + echo "CONFIGURE_ARGS+=--with-unixODBC=\${LOCALBASE}" ;; \"OpenLDAP1\") echo "LIB_DEPENDS+= ldap.1:\${PORTSDIR}/net/openldap" ----END----- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message