diff options
| -rw-r--r-- | databases/gtksql/Makefile | 12 | ||||
| -rw-r--r-- | databases/gtksql/files/patch-sum | 4 | ||||
| -rw-r--r-- | databases/gtksql/patches/patch-aa | 28 | ||||
| -rw-r--r-- | databases/gtranscript/Makefile | 6 | ||||
| -rw-r--r-- | databases/gtranscript/files/patch-sum | 3 | ||||
| -rw-r--r-- | databases/gtranscript/patches/patch-aa | 26 | ||||
| -rw-r--r-- | databases/py-postgresql/Makefile | 7 | ||||
| -rw-r--r-- | databases/py-postgresql/files/Setup.in | 4 | ||||
| -rw-r--r-- | www/ap-auth-postgresql/Makefile | 13 | ||||
| -rw-r--r-- | www/php3-pgsql/Makefile | 6 |
10 files changed, 35 insertions, 74 deletions
diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile index f566edb53ac..24ed4599c9c 100644 --- a/databases/gtksql/Makefile +++ b/databases/gtksql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 1999/12/02 01:47:04 darcy Exp $ +# $NetBSD: Makefile,v 1.12 2000/04/09 03:53:50 jlam Exp $ # DISTNAME= gtksql-0.3 @@ -14,14 +14,6 @@ HOMEPAGE= http://www.multimania.com/bbrox/GtkSQL/ DEPENDS+= gtk+-1.2.*:../../x11/gtk DEPENDS+= postgresql-6.5.3:../../databases/postgresql -USE_X11BASE= - -.include "../../mk/bsd.prefs.mk" -PGUSER?= pgsql - -post-patch: - ${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.bak - ${SED} -e 's|@PGUSER@|${PGUSER}|g' < ${WRKSRC}/Makefile.bak \ - > ${WRKSRC}/Makefile +USE_X11BASE= # defined .include "../../mk/bsd.pkg.mk" diff --git a/databases/gtksql/files/patch-sum b/databases/gtksql/files/patch-sum index 744ce63d09b..3ffc117cd2d 100644 --- a/databases/gtksql/files/patch-sum +++ b/databases/gtksql/files/patch-sum @@ -1,3 +1,3 @@ -$NetBSD: patch-sum,v 1.2 1999/08/20 14:14:21 rh Exp $ +$NetBSD: patch-sum,v 1.3 2000/04/09 03:53:51 jlam Exp $ -MD5 (patch-aa) = 0d027cc611ea0361e32f8184fd73b1e8 +MD5 (patch-aa) = c23c24e5d79f3bb9c576042b087ec43d diff --git a/databases/gtksql/patches/patch-aa b/databases/gtksql/patches/patch-aa index 41ba8d65764..82e04e1680b 100644 --- a/databases/gtksql/patches/patch-aa +++ b/databases/gtksql/patches/patch-aa @@ -1,24 +1,24 @@ -$NetBSD: patch-aa,v 1.4 1999/08/20 14:14:21 rh Exp $ +$NetBSD: patch-aa,v 1.5 2000/04/09 03:53:51 jlam Exp $ ---- Makefile.orig Sat Jun 5 15:05:36 1999 -+++ Makefile Fri Aug 20 15:29:45 1999 +--- Makefile.orig Sat Jun 5 09:05:36 1999 ++++ Makefile Fri Apr 7 20:44:08 2000 @@ -4,14 +4,14 @@ # Comment out the variables for the databases that you do not want # Here, what you need for PostgreSQL -PGSQLIBS = -L/usr/local/pgsql/lib -lpq -PGSQLCFLAGS = -I/usr/local/pgsql/include -DUSE_POSTGRESQL -+PGSQLIBS = -L${LOCALBASE}/pgsql/lib -Wl,-R${LOCALBASE}/pgsql/lib -lpq -+PGSQLCFLAGS = -I${LOCALBASE}/pgsql/include -DUSE_POSTGRESQL ++PGSQLIBS = -L${LOCALBASE}/lib -lpq ++PGSQLCFLAGS = -I${LOCALBASE}/include/pgsql -DUSE_POSTGRESQL PGSQLOBJS = postgres.o # Here, what you need for MySQL -MYSQLIBS = -L/usr/lib/mysql -lmysqlclient -MYSQLCFLAGS = -I/usr/include/mysql -DUSE_MYSQL -MYSQLOBJS = mysql.o -+MYSQLIBS = -+MYSQLCFLAGS = -+MYSQLOBJS = ++#MYSQLIBS = -L/usr/lib/mysql -lmysqlclient ++#MYSQLCFLAGS = -I/usr/include/mysql -DUSE_MYSQL ++#MYSQLOBJS = mysql.o # Nothing to change below this point... DBSQLIBS = $(PGSQLIBS) $(MYSQLIBS) @@ -28,19 +28,17 @@ $NetBSD: patch-aa,v 1.4 1999/08/20 14:14:21 rh Exp $ -GTKLIBS = `gtk-config --libs` -GTKCFLAGS = `gtk-config --cflags` -+GTKLIBS = `${PREFIX}/bin/gtk-config --libs` -+GTKCFLAGS = `${PREFIX}/bin/gtk-config --cflags` ++GTKLIBS = `${X11BASE}/bin/gtk-config --libs` ++GTKCFLAGS = `${X11BASE}/bin/gtk-config --cflags` all: $(OBJS) gcc -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS) -@@ -33,8 +33,8 @@ - clean: +@@ -34,7 +34,7 @@ rm -f *.o gtksql --install: all + install: all - cp gtksql $(DESTDIR)usr/bin/ -+install: -+ cp gtksql ${PREFIX}/bin/ ++ ${BSD_INSTALL_PROGRAM} gtksql ${PREFIX}/bin .c.o: gcc $(CFLAGS) $(GTKCFLAGS) $(DBSQLCFLAGS) -c $*.c -o ./$*.o diff --git a/databases/gtranscript/Makefile b/databases/gtranscript/Makefile index bd9099ba124..e241dac49a1 100644 --- a/databases/gtranscript/Makefile +++ b/databases/gtranscript/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1999/12/02 01:47:05 darcy Exp $ +# $NetBSD: Makefile,v 1.7 2000/04/09 03:55:02 jlam Exp $ # DISTNAME= gtranscript-0.0.1 @@ -21,6 +21,8 @@ DEPENDS+= postgresql-6.5.3:../../databases/postgresql GNU_CONFIGURE= YES USE_X11BASE= YES -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/pgsql/include" + +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" +CPPFLAGS+= -I${LOCALBASE}/include # pgsql/*.h .include "../../mk/bsd.pkg.mk" diff --git a/databases/gtranscript/files/patch-sum b/databases/gtranscript/files/patch-sum index 8fcebd7d297..a116d9667af 100644 --- a/databases/gtranscript/files/patch-sum +++ b/databases/gtranscript/files/patch-sum @@ -1,4 +1,3 @@ -$NetBSD: patch-sum,v 1.1.1.1 1999/08/20 16:11:22 rh Exp $ +$NetBSD: patch-sum,v 1.2 2000/04/09 03:55:03 jlam Exp $ -MD5 (patch-aa) = 956fcd301ad456013123ef44ad454dab MD5 (patch-ab) = d6d187b1d0660931f93dc54d7b218f46 diff --git a/databases/gtranscript/patches/patch-aa b/databases/gtranscript/patches/patch-aa deleted file mode 100644 index a00d8fdf18a..00000000000 --- a/databases/gtranscript/patches/patch-aa +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/08/20 16:11:22 rh Exp $ - ---- configure.orig Fri Aug 6 21:50:19 1999 -+++ configure Fri Aug 20 17:13:11 1999 -@@ -1396,7 +1396,7 @@ - GNOME_CFLAGS=`$gnomepath gnomeui --cflags 2>/dev/null` - GNOME_LIBS=`$gnomepath gnomeui --libs 2>/dev/null` - CFLAGS="$CFLAGS $GNOME_CFLAGS" --LIBS="$LIBS $GNOME_LIBS -lpq -lcrypt" -+LIBS="$LIBS $GNOME_LIBS -L${LOCALBASE}/pgsql/lib -Wl,-R${LOCALBASE}/pgsql/lib -lpq -lcrypt" - - - trap '' 1 2 15 -@@ -1673,6 +1673,12 @@ - chmod +x $CONFIG_STATUS - rm -fr confdefs* $ac_clean_files - test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 -+ -+ -+for i in src/*.c src/*.h ; do -+ mv $i $i.orig -+ sed "s:<pgsql/:<:g" <$i.orig >$i -+done - - - echo configure complete, now type \'make\' diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile index 4719de98ab6..da35947169f 100644 --- a/databases/py-postgresql/Makefile +++ b/databases/py-postgresql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/02/25 22:32:33 darcy Exp $ +# $NetBSD: Makefile,v 1.5 2000/04/09 03:55:35 jlam Exp $ DISTNAME= PyGreSQL-2.4 PKGNAME= py-postgresql-2.4 @@ -20,11 +20,8 @@ PLIST_SUBST+= PYTHON_LIBDIR=lib/python1.5 .include "../../mk/bsd.prefs.mk" -PGUSER?= pgsql -PGPREFIX= ${LOCALBASE}/${PGUSER} # PostgreSQL home directory - do-configure: - ${SED} -e "s,@PGPREFIX@,${PGPREFIX},g" \ + ${SED} -e "s,@LOCALBASE@,${LOCALBASE},g" \ ${FILESDIR}/Setup.in > ${WRKSRC}/Setup.in ${CP} ${PYTHON_LIBDIR}/config/Makefile.pre.in ${WRKSRC} cd ${WRKSRC}; ${MAKE} -f Makefile.pre.in boot diff --git a/databases/py-postgresql/files/Setup.in b/databases/py-postgresql/files/Setup.in index e191d36d2a2..e81b6bf8199 100644 --- a/databases/py-postgresql/files/Setup.in +++ b/databases/py-postgresql/files/Setup.in @@ -1,4 +1,4 @@ -# $NetBSD: Setup.in,v 1.4 2000/02/25 22:32:34 darcy Exp $ +# $NetBSD: Setup.in,v 1.5 2000/04/09 03:55:36 jlam Exp $ # *shared* -_pg pgmodule.c -I@PGPREFIX@/include -R@PGPREFIX@/lib -L@PGPREFIX@/lib -lpq -lcrypt -DNO_DIRECT +_pg pgmodule.c -I@LOCALBASE@/include/pgsql -R@LOCALBASE@/lib -L@LOCALBASE@/lib -lpq -lcrypt -DNO_DIRECT diff --git a/www/ap-auth-postgresql/Makefile b/www/ap-auth-postgresql/Makefile index 7ed23881dcd..dc46fff676e 100644 --- a/www/ap-auth-postgresql/Makefile +++ b/www/ap-auth-postgresql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2000/01/10 22:33:12 jwise Exp $ +# $NetBSD: Makefile,v 1.2 2000/04/09 03:58:13 jlam Exp $ DISTNAME= AuthPG-1.1b1 PKGNAME= ap-auth-postgresql-1.1b1 @@ -13,17 +13,16 @@ DEPENDS+= postgresql-*:../../databases/postgresql # For "apxs": BUILD_DEPENDS= ${LOCALBASE}/bin/perl:../../lang/perl5 -PGUSER?= pgsql - -INCLUDES= -I${PREFIX}/${PGUSER}/include -LIBS= -L${PREFIX}/${PGUSER}/lib -Wl,-R${PREFIX}/${PGUSER}/lib -lpq +CPPFLAGS+= -I${LOCALBASE}/include/pgsql +LIBS= -lpq -lcrypt do-build: - cd ${WRKSRC} && ${PREFIX}/sbin/apxs ${INCLUDES} ${LIBS} -c mod_auth_pg.c + cd ${WRKSRC} && ${PREFIX}/sbin/apxs \ + ${CPPFLAGS} ${LDFLAGS} ${LIBS} -c mod_auth_pg.c do-install: @cd ${WRKSRC} && ${PREFIX}/sbin/apxs -i mod_auth_pg.so - -${MKDIR} ${PREFIX}/share/doc/mod_auth_pg + -${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_auth_pg ${INSTALL_DATA} ${WRKSRC}/mod_auth_pg.html ${PREFIX}/share/doc/mod_auth_pg ${INSTALL_DATA} ${WRKSRC}/mod_auth_pg.ko.html ${PREFIX}/share/doc/mod_auth_pg ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/mod_auth_pg diff --git a/www/php3-pgsql/Makefile b/www/php3-pgsql/Makefile index 5f91f46d64d..24e1ebcfd17 100644 --- a/www/php3-pgsql/Makefile +++ b/www/php3-pgsql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/04/02 16:40:41 hubertf Exp $ +# $NetBSD: Makefile,v 1.6 2000/04/09 04:00:35 jlam Exp $ # PKGNAME= php-pgsql-${PHP_VERSION} @@ -11,8 +11,8 @@ BUILDING_EXTENSION_MODULE=yes do-build: cd ${WRKSRC}/functions && \ - ${COMPILE.c} -I.. -I. -I${LOCALBASE}/include -fPIC -DPIC -DCOMPILE_DL pgsql.c && \ - ld -Bshareable -o pgsql.so pgsql.o -L${LOCALBASE}/lib -R${LOCALBASE}/lib -lpq + ${COMPILE.c} -I.. -I. -I${LOCALBASE}/include/pgsql -fPIC -DPIC -DCOMPILE_DL pgsql.c && \ + ld -Bshareable -o pgsql.so pgsql.o -L${LOCALBASE}/lib -R${LOCALBASE}/lib -lpq -lcrypt do-install: ${INSTALL_DATA} ${WRKSRC}/functions/pgsql.so ${PREFIX}/lib/php3/ |