diff options
| author | rh <rh@pkgsrc.org> | 1999-02-19 14:28:08 +0000 |
|---|---|---|
| committer | rh <rh@pkgsrc.org> | 1999-02-19 14:28:08 +0000 |
| commit | 41a80e1bb7d93bbbc24b56084dcb43b5c17df571 (patch) | |
| tree | ef3282177d4016c424b261f145dd5d2d673966a8 /databases | |
| parent | 0a0cd3f622a0225a3f1bba113dad3b0d88196956 (diff) | |
| download | pkgsrc-41a80e1bb7d93bbbc24b56084dcb43b5c17df571.tar.gz | |
Adapt in order to work together with new gtk10 package
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/gtksql/Makefile | 4 | ||||
| -rw-r--r-- | databases/gtksql/patches/patch-aa | 22 |
2 files changed, 18 insertions, 8 deletions
diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile index 5022d57ee3b..34993d3b368 100644 --- a/databases/gtksql/Makefile +++ b/databases/gtksql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1999/01/30 23:18:45 agc Exp $ +# $NetBSD: Makefile,v 1.4 1999/02/19 14:28:08 rh Exp $ # DISTNAME= gtksql-0.2 @@ -9,7 +9,7 @@ MASTER_SITES= http://www.multimania.com/bbrox/GtkSQL/ \ MAINTAINER= packages@NetBSD.org HOMEPAGE= http://www.multimania.com/bbrox/GtkSQL/ -DEPENDS+= gtk+-1.0.6:../../x11/gtk10 +DEPENDS+= gtk10-1.0.6:../../x11/gtk10 DEPENDS+= postgresql-6.4.2:../../databases/postgresql # restriction inherit from postgresql diff --git a/databases/gtksql/patches/patch-aa b/databases/gtksql/patches/patch-aa index 0e01a236ed0..ed2ffbfcf5b 100644 --- a/databases/gtksql/patches/patch-aa +++ b/databases/gtksql/patches/patch-aa @@ -1,16 +1,27 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/01/04 13:08:47 frueauf Exp $ +$NetBSD: patch-aa,v 1.2 1999/02/19 14:28:08 rh Exp $ --- Makefile.orig Wed Aug 5 21:10:26 1998 -+++ Makefile Mon Jan 4 13:43:43 1999 ++++ Makefile Thu Feb 18 17:33:28 1999 @@ -1,6 +1,6 @@ # Here, what you need for Pgsql -PGSQLIBS = -L/usr/local/pgsql/lib -lpq -PGSQLCFLAGS = -I/usr/local/pgsql/include -+PGSQLIBS = -L${LOCALBASE}/@PGUSER@/lib -lpq -+PGSQLCFLAGS = -I${LOCALBASE}/@PGUSER@/include ++PGSQLIBS = -L${LOCALBASE}/pgsql/lib -lpq ++PGSQLCFLAGS = -I${LOCALBASE}/pgsql/include # Your favorite compilation options here :-) MCFLAGS = -Wall -O -g +@@ -14,8 +14,8 @@ + OBJS = $(MOBJS) $(DBOBJS) + CFLAGS = $(MCFLAGS) $(DBFLAGS) + +-GTKLIBS = `gtk-config --libs` +-GTKCFLAGS = `gtk-config --cflags` ++GTKLIBS = `${PREFIX}/bin/gtk10-config --libs` ++GTKCFLAGS = `${PREFIX}/bin/gtk10-config --cflags` + + all: $(OBJS) + gcc -o gtksql $(OBJS) $(PGSQLIBS) $(GTKLIBS) $(CFLAGS) @@ -23,8 +23,8 @@ clean: rm *.o gtksql @@ -21,5 +32,4 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/01/04 13:08:47 frueauf Exp $ + cp gtksql ${PREFIX}/bin/ .c.o: -- gcc $(CFLAGS) $(GTKCFLAGS) $(PGSQLCFLAGS) -c $*.c -o ./$*.o -+ gcc $(CFLAGS) $(GTKCFLAGS) $(PGSQLCFLAGS) -c $*.c -o ./$*.o + gcc $(CFLAGS) $(GTKCFLAGS) $(PGSQLCFLAGS) -c $*.c -o ./$*.o |