Date: Sat, 21 Apr 2001 20:41:00 +0200 (CEST) From: girgen@partitur.se To: FreeBSD-gnats-submit@FreeBSD.org Cc: dirk@FreeBSD.org Subject: ports/26755: www/mod_php4: fix for postgresql 7.1 Message-ID: <200104211841.f3LIf0G61285@palle.girgensohn.se>
next in thread | raw e-mail | index | archive | help
>Number: 26755
>Category: ports
>Synopsis: www/mod_php4: fix for postgresql 7.1
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Apr 21 11:50:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator: Palle Girgensohn
>Release: FreeBSD 4.3-BETA i386
>Organization:
Partitur
>Environment:
System: FreeBSD palle.girgensohn.se 4.3-BETA FreeBSD 4.3-BETA #7: Mon Mar 19 01:12:38 CET 2001 girgen@palle.girgensohn.se:/usr/obj/usr/src/sys/STORDATAN i386
>Description:
postgresql 7.1 doesn't install postgres.h anymore, since this should
only be used internally. Hence, it is not needed for php to compile,
so please cvs add the file files/patch-pgsql.
also, postgresql 7.1 can be installed either in ${PREFIX} (standard)
or ${PREFIX}/pgsql (old layout). Handle both cases in the configure
script.
>How-To-Repeat:
>Fix:
Index: scripts/configure.php
===================================================================
RCS file: /home/ncvs/ports/www/mod_php4/scripts/configure.php,v
retrieving revision 1.125
diff -u -r1.125 configure.php
--- scripts/configure.php 2001/04/17 14:32:37 1.125
+++ scripts/configure.php 2001/04/21 14:48:10
@@ -113,8 +113,15 @@
;;
\"PostgreSQL\")
echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7"
- echo "CONFIGURE_ARGS+=--with-pgsql=\${PREFIX}/pgsql"
- if /usr/bin/ldd ${PREFIX}/pgsql/bin/postgres 2> /dev/null | /usr/bin/grep -q "libssl"; then
+ if [ -x ${PREFIX}/pgsql/bin/postgres -a ! -x ${PREFIX}/bin/postgres ]; then
+ PGPREFIX=${PREFIX}/pgsql
+ else
+ PGPREFIX=${PREFIX}
+ echo "CFLAGS+=-I\${PREFIX}/include/pgsql"
+ fi
+ echo "PGPREFIX=${PGPREFIX}"
+ echo "CONFIGURE_ARGS+=--with-pgsql=\${PGPREFIX}"
+ if /usr/bin/ldd ${PGPREFIX}/bin/postgres 2> /dev/null | /usr/bin/grep -q "libssl"; then
echo "USE_OPENSSL= yes"
LIBS="${LIBS} -L\${OPENSSLBASE}/lib -lcrypto -lssl"
fi
--- /dev/null Sat Apr 21 20:31:45 2001
+++ files/patch-pgsql Sat Apr 21 20:27:26 2001
@@ -0,0 +1,10 @@
+--- ext/pgsql/php_pgsql.h~ Wed Sep 13 06:13:36 2000
++++ ext/pgsql/php_pgsql.h Sat Apr 21 20:26:21 2001
+@@ -29,7 +29,6 @@
+
+ #ifdef PHP_PGSQL_PRIVATE
+ #undef SOCKET_SIZE_TYPE
+-#include <postgres.h>
+ #include <libpq-fe.h>
+
+ #ifdef PHP_WIN32
>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?200104211841.f3LIf0G61285>