sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix postgresql7's new layout & include file problem.

Browse source 
PR:		ports/26755
Submitted by:	Palle Girgensohn <girgen@partitur.se>
This commit is contained in:
Vanilla I. Shu 2001-04-23 04:25:26 +00:00
parent a2dae98959
commit 7c60afc437
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=41816
6 changed files with 40 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
www/mod_php4/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME?= mod_php4 PORTNAME?= mod_php4
PORTVERSION= 4.0.4pl1 PORTVERSION= 4.0.4pl1
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES?= www CATEGORIES?= www
MASTER_SITES= http://us.php.net/${PHP_DISTDIR}/ \ MASTER_SITES= http://us.php.net/${PHP_DISTDIR}/ \
http://php.he.net/${PHP_DISTDIR}/ \ http://php.he.net/${PHP_DISTDIR}/ \

10
www/mod_php4/files/patch-pgsql Normal file
View file

@ -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

11
www/mod_php4/scripts/configure.php
View file

@ -113,8 +113,15 @@ while [ "$1" ]; do
;; ;;
\"PostgreSQL\") \"PostgreSQL\")
echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7"
echo "CONFIGURE_ARGS+=--with-pgsql=\${PREFIX}" if [ -x ${PREFIX}/pgsql/bin/postgres -a ! -x ${PREFIX}/bin/postgres ]; then
if /usr/bin/ldd ${PREFIX}/bin/postgres 2> /dev/null | /usr/bin/grep -q "libssl"; 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" echo "USE_OPENSSL= yes"
LIBS="${LIBS} -L\${OPENSSLBASE}/lib -lcrypto -lssl" LIBS="${LIBS} -L\${OPENSSLBASE}/lib -lcrypto -lssl"
fi fi

2
www/mod_php5/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME?= mod_php4 PORTNAME?= mod_php4
PORTVERSION= 4.0.4pl1 PORTVERSION= 4.0.4pl1
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES?= www CATEGORIES?= www
MASTER_SITES= http://us.php.net/${PHP_DISTDIR}/ \ MASTER_SITES= http://us.php.net/${PHP_DISTDIR}/ \
http://php.he.net/${PHP_DISTDIR}/ \ http://php.he.net/${PHP_DISTDIR}/ \

10
www/mod_php5/files/patch-pgsql Normal file
View file

@ -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

11
www/mod_php5/scripts/configure.php
View file

@ -113,8 +113,15 @@ while [ "$1" ]; do
;; ;;
\"PostgreSQL\") \"PostgreSQL\")
echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7"
echo "CONFIGURE_ARGS+=--with-pgsql=\${PREFIX}" if [ -x ${PREFIX}/pgsql/bin/postgres -a ! -x ${PREFIX}/bin/postgres ]; then
if /usr/bin/ldd ${PREFIX}/bin/postgres 2> /dev/null | /usr/bin/grep -q "libssl"; 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" echo "USE_OPENSSL= yes"
LIBS="${LIBS} -L\${OPENSSLBASE}/lib -lcrypto -lssl" LIBS="${LIBS} -L\${OPENSSLBASE}/lib -lcrypto -lssl"
fi fi