1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

Fix include directory for postgresql7.1's new layout.

This commit is contained in:
Vanilla I. Shu 2001-04-21 11:43:12 +00:00
parent bfb9f8e6c9
commit 7b48829512
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=41759
26 changed files with 129 additions and 73 deletions

View File

@ -7,6 +7,7 @@
PORTNAME= gtksql
PORTVERSION= 0.3
PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= http://www.multimania.com/bbrox/GtkSQL/

View File

@ -11,8 +11,8 @@
-PGSQLIBS = -L/usr/local/pgsql/lib -lpq
-PGSQLCFLAGS = -I/usr/local/pgsql/include -DUSE_POSTGRESQL
-PGSQLOBJS = postgres.o
+#PGSQLIBS = -L/usr/local/pgsql/lib -lpq
+#PGSQLCFLAGS = -I/usr/local/pgsql/include -DUSE_POSTGRESQL
+#PGSQLIBS = -L/usr/local/lib -lpq
+#PGSQLCFLAGS = -I/usr/local/include/pgsql -DUSE_POSTGRESQL
+#PGSQLOBJS = postgres.o
# Here, what you need for MySQL

View File

@ -0,0 +1,11 @@
--- postgres.c.orig Sat Apr 21 19:16:37 2001
+++ postgres.c Sat Apr 21 19:16:47 2001
@@ -18,7 +18,7 @@
#include <libpq-fe.h>
#include <string.h>
-#include <postgres.h>
+#include <c.h>
#include "common.h"
#include "status.h"

View File

@ -5,25 +5,25 @@
# $FreeBSD$
#
PORTNAME= DBD-Pg
PORTNAME= DBD-Pg
PORTVERSION= 0.96
PORTREVISION= 1
CATEGORIES= databases perl5
PORTREVISION= 2
CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= DBD
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
MAINTAINER= demon@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
LIB_DEPENDS= pq.2:${PORTSDIR}/databases/postgresql7
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
CONFIGURE_ENV+= POSTGRES_INCLUDE=${PREFIX}/pgsql/include \
POSTGRES_LIB=${PREFIX}/pgsql/lib
CONFIGURE_ENV+= POSTGRES_INCLUDE=${PREFIX}/include/pgsql \
POSTGRES_LIB=${PREFIX}/lib
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= DBD::Pg.3 DBD::dbd-pg.3
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= DBD::Pg.3 DBD::dbd-pg.3
.include <bsd.port.mk>

View File

@ -5,25 +5,25 @@
# $FreeBSD$
#
PORTNAME= DBD-Pg
PORTNAME= DBD-Pg
PORTVERSION= 0.96
PORTREVISION= 1
CATEGORIES= databases perl5
PORTREVISION= 2
CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= DBD
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
MAINTAINER= demon@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
LIB_DEPENDS= pq.2:${PORTSDIR}/databases/postgresql7
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
CONFIGURE_ENV+= POSTGRES_INCLUDE=${PREFIX}/pgsql/include \
POSTGRES_LIB=${PREFIX}/pgsql/lib
CONFIGURE_ENV+= POSTGRES_INCLUDE=${PREFIX}/include/pgsql \
POSTGRES_LIB=${PREFIX}/lib
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= DBD::Pg.3 DBD::dbd-pg.3
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= DBD::Pg.3 DBD::dbd-pg.3
.include <bsd.port.mk>

View File

@ -7,6 +7,7 @@
PORTNAME= Pg
PORTVERSION= 1.9.0
PORTREVISION= 1
CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Pg
@ -18,8 +19,8 @@ MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= pq.2:${PORTSDIR}/databases/postgresql7
PERL_CONFIGURE= yes
CONFIGURE_ENV= POSTGRES_INCLUDE=${LOCALBASE}/pgsql/include \
POSTGRES_LIB=${LOCALBASE}/pgsql/lib
CONFIGURE_ENV= POSTGRES_INCLUDE=${LOCALBASE}/include/pgsql \
POSTGRES_LIB=${LOCALBASE}/lib
MAN3= Pg.3
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}

View File

@ -6,14 +6,14 @@
#
PORTNAME= pgaccess
PORTVERSION= 0.98.6
PORTVERSION= 0.98.7
CATEGORIES= databases
MASTER_SITES= ftp://speedy.flex.ro/pub/pgaccess/
MASTER_SITES= http://www.flex.ro/pgaccess/download/
MAINTAINER= ports@FreeBSD.org
RUN_DEPENDS= ${LOCALBASE}/pgsql/bin/postmaster:${PORTSDIR}/databases/postgresql7\
wish8.3:${PORTSDIR}/x11-toolkits/tk83
RUN_DEPENDS= wish8.3:${PORTSDIR}/x11-toolkits/tk83
LIB_DEPENDS= pgtcl.2:${PORTSDIR}/databases/postgresql7
WRKSRC= ${WRKDIR}/pgaccess
NO_BUILD= yes

View File

@ -1 +1 @@
MD5 (pgaccess-0.98.6.tar.gz) = a7b49bb82974828ffa46b211b74885a0
MD5 (pgaccess-0.98.7.tar.gz) = 3da929e46db515809d9072a68d8d6407

View File

@ -99,8 +99,10 @@ share/pgaccess/lib/forms.tcl
share/pgaccess/lib/reports.tcl
share/pgaccess/lib/languages/czech
share/pgaccess/lib/languages/deutsch
share/pgaccess/lib/languages/euskara
share/pgaccess/lib/languages/francais
share/pgaccess/lib/languages/italiano
share/pgaccess/lib/languages/japanese
share/pgaccess/lib/languages/magyar
share/pgaccess/lib/languages/nederlands
share/pgaccess/lib/languages/portugues

View File

@ -7,18 +7,19 @@
PORTNAME= phppgadmin
PORTVERSION= 2.2.1.p1
PORTREVISION= 1
CATEGORIES= databases www
MASTER_SITES= ftp://ftp.greatbridge.org/pub/phppgadmin/stable/
DISTNAME= phpPgAdmin_2-2-1-pl1
MAINTAINER= nbm@FreeBSD.org
RUN_DEPENDS= ${LOCALBASE}/pgsql/lib/libpq.so:${PORTSDIR}/databases/postgresql7
.if defined(WITH_PHP4)
RUN_DEPENDS+= ${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
.else
RUN_DEPENDS+= ${LOCALBASE}/libexec/apache/libphp3.so:${PORTSDIR}/www/mod_php3
.endif
LIB_DEPENDS= pq.2:${PORTSDIR}/databases/postgresql7
WRKSRC= ${WRKDIR}/phpPgAdmin
NO_BUILD= YES
@ -27,5 +28,4 @@ do-install:
${MKDIR} ${PREFIX}/www/data.default/phpPgAdmin/
${CP} -R ${WRKSRC}/* ${PREFIX}/www/data.default/phpPgAdmin/
.include <bsd.port.mk>

View File

@ -5,28 +5,28 @@
# $FreeBSD$
#
PORTNAME= PyGreSQL
PORTVERSION= 3.0
CATEGORIES= databases python
MASTER_SITES= ftp://ftp.druid.net/pub/distrib/
PKGNAMEPREFIX= py-
DISTNAME= PyGreSQL-${PORTVERSION}
EXTRACT_SUFX= .tgz
PORTNAME= PyGreSQL
PORTVERSION= 3.1
CATEGORIES= databases python
MASTER_SITES= ftp://ftp.druid.net/pub/distrib/
PKGNAMEPREFIX= py-
DISTNAME= PyGreSQL-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= nectar@FreeBSD.org
MAINTAINER= nectar@FreeBSD.org
BUILD_DEPENDS= ${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
RUN_DEPENDS= ${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
LIB_DEPENDS= pq.2:${PORTSDIR}/databases/postgresql7
BUILD_DEPENDS= ${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
RUN_DEPENDS= ${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
LIB_DEPENDS= pq.2:${PORTSDIR}/databases/postgresql7
USE_PYTHON= yes
MAKE_ENV= PYTHON_VERSION=${PYTHON_VERSION} \
PYTHON_LIBDIR=${PYTHON_LIBDIR} \
PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} \
PYTHON=${PYTHON_CMD} \
LN="${LN}" SETENV="${SETENV}" MKDIR="${MKDIR}"
USE_PYTHON= yes
MAKE_ENV= PYTHON_VERSION=${PYTHON_VERSION} \
PYTHON_LIBDIR=${PYTHON_LIBDIR} \
PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} \
PYTHON=${PYTHON_CMD} \
LN="${LN}" SETENV="${SETENV}" MKDIR="${MKDIR}"
DATETIME_DEP= ${PYTHON_SITELIBDIR}/mx/DateTime/__init__.py
DATETIME_DEP= ${PYTHON_SITELIBDIR}/mx/DateTime/__init__.py
pre-build:
${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile

View File

@ -1 +1 @@
MD5 (PyGreSQL-3.0.tgz) = 3f67b76d6cfece4ac21eee1a9154a206
MD5 (PyGreSQL-3.1.tgz) = 6c7cef080d3c3b732ff7090dc9e051c1

View File

@ -15,12 +15,12 @@ clean:
_pgmodule.so: pgmodule.o
${LD} -Bshareable -lc_r -L${PYTHON_LIBDIR}/config \
-l${PYTHON_VERSION} -L${PREFIX}/pgsql/lib -lpq \
-l${PYTHON_VERSION} -L${PREFIX}/lib -lpq \
${.ALLSRC} -o ${.TARGET}
pgmodule.o: pgmodule.c
${CC} -c -I${PREFIX}/include/${PYTHON_VERSION} \
-I${PREFIX}/pgsql/include ${.ALLSRC}
-I${PREFIX}/include/pgsql ${.ALLSRC}
.py.pyc:
${SETENV} PYTHONPATH=${.CURDIR} ${PYTHON} -c 'import ${.IMPSRC:.py=}'

View File

@ -7,6 +7,7 @@
PORTNAME= postgres
PORTVERSION= 0.6.2
PORTREVISION= 1
CATEGORIES= databases ruby
MASTER_SITES= http://webclub.kcom.ne.jp/mb/noborus/ruby/archive/
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
@ -20,12 +21,9 @@ LIB_DEPENDS= pq.2:${PORTSDIR}/databases/postgresql7
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
CONFIGURE_ARGS= --with-pgsql-include-dir="${PGDIR}/include" \
--with-pgsql-lib-dir="${PGDIR}/lib"
CONFIGURE_ARGS= --with-pgsql-include-dir="${LOCALBASE}/include/pgsql"
INSTALL_TARGET= site-install
PGDIR?= ${PREFIX}/pgsql
DOCS_EN= ChangeLog README doc/postgres.html
DOCS_JA= README.jp doc/postgres.jp.html

View File

@ -7,6 +7,7 @@
PORTNAME= postgres
PORTVERSION= 0.6.2
PORTREVISION= 1
CATEGORIES= databases ruby
MASTER_SITES= http://webclub.kcom.ne.jp/mb/noborus/ruby/archive/
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
@ -20,12 +21,9 @@ LIB_DEPENDS= pq.2:${PORTSDIR}/databases/postgresql7
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
CONFIGURE_ARGS= --with-pgsql-include-dir="${PGDIR}/include" \
--with-pgsql-lib-dir="${PGDIR}/lib"
CONFIGURE_ARGS= --with-pgsql-include-dir="${LOCALBASE}/include/pgsql"
INSTALL_TARGET= site-install
PGDIR?= ${PREFIX}/pgsql
DOCS_EN= ChangeLog README doc/postgres.html
DOCS_JA= README.jp doc/postgres.jp.html

View File

@ -7,6 +7,7 @@
PORTNAME= zpygresqlda
PORTVERSION= 0.3.2
PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= http://www.zope.org/Members/reedstrm/ZPyGreSQLDA-rjr/
DISTNAME= ZPyGreSQLDA-0.3-rjr2
@ -34,8 +35,8 @@ do-build:
@${ECHO} '*shared*' > ${WRKSRC}/src/Setup
@${ECHO} '' >> ${WRKSRC}/src/Setup
@${ECHO} '_pg pgmodule.c ' \
'-I${LOCALBASE}/pgsql/include ' \
'-L${LOCALBASE}/pgsql/lib ' \
'-I${LOCALBASE}/include/pgsql ' \
'-L${LOCALBASE}/lib ' \
'-lpq -lcrypt' >> ${WRKSRC}/src/Setup
@(cd ${WRKSRC}/src && \
make -f Makefile.pre.in boot && \

View File

@ -7,6 +7,7 @@
PORTNAME= pam-pgsql
PORTVERSION= 0.3
PORTREVISION= 1
CATEGORIES= security databases
# When the family of Debian mirrors is added to bsd.port.mk,
# this will suddenly start making sense:
@ -18,7 +19,7 @@ DISTFILES= ${PORTNAME}_${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= mi@aldan.algebra.com
LIB_DEPENDS= pq:${PORTSDIR}/databases/postgresql7
LIB_DEPENDS= pq.2:${PORTSDIR}/databases/postgresql7
MAKEFILE= ${FILESDIR}/Makefile.bsd
MAKE_ARGS+= -j 2

View File

@ -4,9 +4,9 @@ SRCS= pam_pgsql.c pam_get_pass.c pam_std_option.c pam_get_service.c
LIB= pam_pgsql
SHLIB_NAME=${LIB}.so
LDADD= -lpam -L${LOCALBASE}/pgsql/lib -lpq
INCLUDE= -I${LOCALBASE}/pgsql/include
CFLAGS+= -Wall -D_GNU_SOURCE -I${LOCALBASE}/pgsql/include
LDADD= -lpam -L${LOCALBASE}/lib -lpq
INCLUDE= -I${LOCALBASE}/include/pgsql
CFLAGS+= -Wall -D_GNU_SOURCE -I${LOCALBASE}/include/pgsql
INTERNALLIB= we don't need no stinking static lib

View File

@ -6,15 +6,15 @@
PORTNAME= mod_auth_pgsql
PORTVERSION= 0.9.5a
PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= ftp://ftp.eurolink.it/pub/linux/postgreSQL/mod_auth_pgsql/
MAINTAINER= mi@aldan.algebra.com
BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/${AP_PORT} \
${LOCALBASE}/pgsql/lib/libpq.so:${PORTSDIR}/databases/postgresql7
RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/www/${AP_PORT} \
${LOCALBASE}/pgsql/lib/libpq.so:${PORTSDIR}/databases/postgresql7
BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/${AP_PORT}
RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/www/${AP_PORT}
LIB_DEPENDS= pq.2:${PORTSDIR}/databases/postgresql7
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/a//}
@ -46,7 +46,7 @@ PLIST_SUB+= AUTH_PGSQL_DOCS="${AUTH_PGSQL_DOCS}"
PKGMESSAGE= ${WRKSRC}/.install_notes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --with-pgsql=${PREFIX}/pgsql \
CONFIGURE_ARGS= --with-pgsql=${PREFIX} \
--with-apxs=${APXS}
.if !defined(NOPORTDOCS)

View File

@ -0,0 +1,40 @@
--- configure.orig Sat Apr 21 19:23:27 2001
+++ configure Sat Apr 21 19:24:38 2001
@@ -1077,20 +1077,20 @@
withval="$with_pgsql"
if test "$withval" != "no" ; then
- if test -f "$withval/include/libpq-fe.h" ; then
+ if test -f "$withval/include/pgsql/libpq-fe.h" ; then
PG_DIR=$withval
- PG_INCLUDE="$withval/include"
+ PG_INCLUDE="$withval/include/pgsql"
PG_LIB="$withval/lib"
fi
if test "$PG_DIR" = "" ; then
- if test -f "$withval/include/libpq-fe.h" ; then
+ if test -f "$withval/include/pgsql/libpq-fe.h" ; then
XML_DIR=$withval
- XML_INCLUDE="$withval/include"
+ XML_INCLUDE="$withval/include/pgsql"
XML_LIB="$withval/lib"
fi
fi
if test "$PG_DIR" = "" ; then
- if test -f "$withval/lib/libpq.a" -a -f "$withval/include/libpq-fe.h" ; then
+ if test -f "$withval/lib/libpq.a" -a -f "$withval/include/pgsql/libpq-fe.h" ; then
XML_DIR=$withval
XML_INCLUDE="$withval/include"
XML_LIB=$withval/lib
@@ -1106,9 +1106,9 @@
if test "$PG_DIR" = ""; then
for i in /usr /usr/local /usr/local/postgres; do
- if test -f "$i/include/libpq-fe.h"; then
+ if test -f "$i/include/pgsql/libpq-fe.h"; then
PG_DIR=$i
- PG_INCLUDE="$i/include"
+ PG_INCLUDE="$i/include/pgsql"
PG_LIB="$i/lib"
elif test -f "$i/include/pgsql/libpq-fe.h"; then
PG_DIR=$i

View File

@ -7,6 +7,7 @@
PORTNAME?= mod_php3
PORTVERSION= 3.0.18
PORTREVISION= 1
CATEGORIES?= www
MASTER_SITES= ftp://ftp.php.net/pub/${PHP_DISTDIR}/ \
http://us.php.net/${PHP_DISTDIR}/ \

View File

@ -105,8 +105,8 @@ while [ "$1" ]; do
;;
\"PostgreSQL\")
echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7"
echo "CONFIGURE_ARGS+=--with-pgsql=\${PREFIX}/pgsql"
if /usr/bin/ldd ${PREFIX}/pgsql/bin/postgres | /usr/bin/grep -q "libssl"; then
echo "CONFIGURE_ARGS+=--with-pgsql=\${PREFIX}"
if /usr/bin/ldd ${PREFIX}/bin/postgres | /usr/bin/grep -q "libssl"; then
LIBS="-lcrypto -lssl"
fi
;;

View File

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

View File

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

View File

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

View File

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