diff options
| author | jlam <jlam@pkgsrc.org> | 2000-04-09 03:53:50 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2000-04-09 03:53:50 +0000 |
| commit | e2104b8abbd824b77c27997e1b0e9d549be08d52 (patch) | |
| tree | 05201b1af8d2cc6039a3a92efbec24e58b67ff9e /databases/gtksql | |
| parent | 26b81e569891db09dd1ab4b46c2729ba3d5d1ac4 (diff) | |
| download | pkgsrc-e2104b8abbd824b77c27997e1b0e9d549be08d52.tar.gz | |
Adapt to new postgresql include/library locations.
Diffstat (limited to 'databases/gtksql')
| -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 |
3 files changed, 17 insertions, 27 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 |