diff options
| author | jlam <jlam> | 2002-09-21 07:56:28 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-09-21 07:56:28 +0000 |
| commit | f674182bc7a2509275c17155d15de6d91915a171 (patch) | |
| tree | 0a1017aa511bc4a4220c8d9ba7e2db9b6e0d25b8 /databases/gtksql | |
| parent | ce10798460dcdafc902d927ed6eaad611a8225db (diff) | |
| download | pkgsrc-f674182bc7a2509275c17155d15de6d91915a171.tar.gz | |
buildlink1 -> buildlink2
Diffstat (limited to 'databases/gtksql')
| -rw-r--r-- | databases/gtksql/Makefile | 10 | ||||
| -rw-r--r-- | databases/gtksql/distinfo | 4 | ||||
| -rw-r--r-- | databases/gtksql/patches/patch-aa | 18 |
3 files changed, 13 insertions, 19 deletions
diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile index c7abf256ecd..aec65a257fc 100644 --- a/databases/gtksql/Makefile +++ b/databases/gtksql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2001/10/24 22:10:50 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2002/09/21 08:10:55 jlam Exp $ # DISTNAME= gtksql-0.3 @@ -12,11 +12,11 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.multimania.com/bbrox/GtkSQL/ COMMENT= Query tool for PostgreSQL written with GTK +USE_BUILDLINK2= # defined USE_X11BASE= # defined -USE_BUILDLINK_ONLY= # defined MAKE_ENV+= MCFLAGS="${CFLAGS}" -.include "../../databases/postgresql-lib/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../databases/postgresql-lib/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/databases/gtksql/distinfo b/databases/gtksql/distinfo index 457b10e083d..6e9f25d86ac 100644 --- a/databases/gtksql/distinfo +++ b/databases/gtksql/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.6 2002/04/05 01:49:46 hubertf Exp $ +$NetBSD: distinfo,v 1.7 2002/09/21 08:10:56 jlam Exp $ SHA1 (gtksql-0.3.tar.gz) = b2d078cb0eb8816b26f3e0369fc440085071fc0c Size (gtksql-0.3.tar.gz) = 50557 bytes -SHA1 (patch-aa) = b5b4fef7202f76796429e36dac4e4ef718c09deb +SHA1 (patch-aa) = 6ec9ce239bcf5516e47aca39942168b16549f0a1 diff --git a/databases/gtksql/patches/patch-aa b/databases/gtksql/patches/patch-aa index a45011e0f2b..c0db304508c 100644 --- a/databases/gtksql/patches/patch-aa +++ b/databases/gtksql/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.9 2002/04/05 01:49:47 hubertf Exp $ +$NetBSD: patch-aa,v 1.10 2002/09/21 08:10:57 jlam Exp $ ---- Makefile.orig Sat Jun 5 15:05:36 1999 +--- Makefile.orig Sat Jun 5 06:05:36 1999 +++ Makefile @@ -1,17 +1,17 @@ # Your favorite compilation options here :-) @@ -13,8 +13,8 @@ $NetBSD: patch-aa,v 1.9 2002/04/05 01:49:47 hubertf Exp $ # Here, what you need for PostgreSQL -PGSQLIBS = -L/usr/local/pgsql/lib -lpq -PGSQLCFLAGS = -I/usr/local/pgsql/include -DUSE_POSTGRESQL -+PGSQLIBS = -L${BUILDLINK_DIR}/lib -lpq -+PGSQLCFLAGS = -I${BUILDLINK_DIR}/include/pgsql/server -I${BUILDLINK_DIR}/include/pgsql -DUSE_POSTGRESQL ++PGSQLIBS = -L${LOCALBASE}/lib -lpq ++PGSQLCFLAGS = -I${LOCALBASE}/include/pgsql/server -I${LOCALBASE}/include/pgsql -DUSE_POSTGRESQL PGSQLOBJS = postgres.o # Here, what you need for MySQL @@ -27,14 +27,8 @@ $NetBSD: patch-aa,v 1.9 2002/04/05 01:49:47 hubertf Exp $ # Nothing to change below this point... DBSQLIBS = $(PGSQLIBS) $(MYSQLIBS) -@@ -24,17 +24,17 @@ - OBJS = $(MOBJS) $(DBSQLOBJS) - CFLAGS = $(MCFLAGS) $(DBSQLFLAGS) - --GTKLIBS = `gtk-config --libs` --GTKCFLAGS = `gtk-config --cflags` -+GTKLIBS = `${GTK_CONFIG} --libs` -+GTKCFLAGS = `${GTK_CONFIG} --cflags` +@@ -28,13 +28,13 @@ GTKLIBS = `gtk-config --libs` + GTKCFLAGS = `gtk-config --cflags` all: $(OBJS) - gcc -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS) |