Update gtksql to version 0.3

Notable changes are:
 * corrected some left-over bugs from the 1.0 -> 1.2 transition
 * finished list display for PostgreSQL
 * made it compile with Gtk+ 1.2.x

4 files changed, 39 insertions, 26 deletions

diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile
index 7b39028a308..d064b15f7a0 100644
--- a/databases/gtksql/Makefile
+++ b/databases/gtksql/Makefile
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile,v 1.5 1999/05/24 20:39:36 tv Exp $
+# $NetBSD: Makefile,v 1.6 1999/08/20 14:14:20 rh Exp $
 #
 
-DISTNAME=		gtksql-0.2
+DISTNAME=		gtksql-0.3
 CATEGORIES=		databases
 MASTER_SITES=		http://www.multimania.com/bbrox/GtkSQL/ \
-			ftp://ftp.infodrom.north.de/pub/unix/gtkbuffet/apps/gtksql/
+			${MASTER_SITE_SUNSITE:=X11/gtkbuffet/apps/gtksql/} \
+			ftp://ftp.infodrom.north.de/pub/unix/gtkbuffet/apps/gtksql/ \
+			ftp://ftp.loxinfo.co.th/pub/unix/database/
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.multimania.com/bbrox/GtkSQL/
 
-DEPENDS+=		gtk10-1.0.6:../../x11/gtk10
+DEPENDS+=		gtk+-1.2.2:../../x11/gtk
 DEPENDS+=		postgresql-6.4.2:../../databases/postgresql
 
 USE_X11BASE=
diff --git a/databases/gtksql/files/md5 b/databases/gtksql/files/md5
index 992c1ff3082..136e1a540c3 100644
--- a/databases/gtksql/files/md5
+++ b/databases/gtksql/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/01/04 13:08:47 frueauf Exp $
+$NetBSD: md5,v 1.2 1999/08/20 14:14:21 rh Exp $
 
-MD5 (gtksql-0.2.tar.gz) = 74cdab5745874b5bdcef21398e95c066
+MD5 (gtksql-0.3.tar.gz) = 8f7a0a565e761fb649240cb46d6dd9cb
diff --git a/databases/gtksql/files/patch-sum b/databases/gtksql/files/patch-sum
index e6fc65036db..744ce63d09b 100644
--- a/databases/gtksql/files/patch-sum
+++ b/databases/gtksql/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:29 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/08/20 14:14:21 rh Exp $
 
-MD5 (patch-aa) = a1c618735755a8e0d4fe0cade37d6940
+MD5 (patch-aa) = 0d027cc611ea0361e32f8184fd73b1e8
diff --git a/databases/gtksql/patches/patch-aa b/databases/gtksql/patches/patch-aa
index 400907fd712..41ba8d65764 100644
--- a/databases/gtksql/patches/patch-aa
+++ b/databases/gtksql/patches/patch-aa
@@ -1,30 +1,41 @@
-$NetBSD: patch-aa,v 1.3 1999/05/27 15:20:22 kleink Exp $
+$NetBSD: patch-aa,v 1.4 1999/08/20 14:14:21 rh Exp $
 
---- Makefile.orig	Wed Aug  5 21:10:26 1998
-+++ Makefile	Thu Feb 18 17:33:28 1999
-@@ -1,6 +1,6 @@
- # Here, what you need for Pgsql
+--- Makefile.orig	Sat Jun  5 15:05:36 1999
++++ Makefile	Fri Aug 20 15:29:45 1999
+@@ -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
+-PGSQLCFLAGS = -I/usr/local/pgsql/include -DUSE_POSTGRESQL
 +PGSQLIBS    = -L${LOCALBASE}/pgsql/lib -Wl,-R${LOCALBASE}/pgsql/lib -lpq
-+PGSQLCFLAGS = -I${LOCALBASE}/pgsql/include
- # Your favorite compilation options here :-)
- MCFLAGS  = -Wall -O -g
++PGSQLCFLAGS = -I${LOCALBASE}/pgsql/include -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   =
  
-@@ -14,8 +14,8 @@
- OBJS    = $(MOBJS) $(DBOBJS)
- CFLAGS  = $(MCFLAGS) $(DBFLAGS)
+ # Nothing to change below this point...
+ DBSQLIBS = $(PGSQLIBS) $(MYSQLIBS)
+@@ -24,8 +24,8 @@
+ OBJS    = $(MOBJS) $(DBSQLOBJS)
+ CFLAGS  = $(MCFLAGS) $(DBSQLFLAGS)
  
 -GTKLIBS     = `gtk-config --libs`
 -GTKCFLAGS   = `gtk-config --cflags`
-+GTKLIBS     = `${PREFIX}/bin/gtk10-config --libs`
-+GTKCFLAGS   = `${PREFIX}/bin/gtk10-config --cflags`
++GTKLIBS     = `${PREFIX}/bin/gtk-config --libs`
++GTKCFLAGS   = `${PREFIX}/bin/gtk-config --cflags`
  
  all: $(OBJS)
- 	gcc -o gtksql $(OBJS) $(PGSQLIBS) $(GTKLIBS) $(CFLAGS)
-@@ -23,8 +23,8 @@
+ 	gcc -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS)
+@@ -33,8 +33,8 @@
  clean:
- 	rm *.o gtksql
+ 	rm -f *.o gtksql
  
 -install: all
 -	cp gtksql $(DESTDIR)usr/bin/
@@ -32,4 +43,4 @@ $NetBSD: patch-aa,v 1.3 1999/05/27 15:20:22 kleink Exp $
 +	cp gtksql ${PREFIX}/bin/
  
  .c.o: 
- 	gcc $(CFLAGS) $(GTKCFLAGS) $(PGSQLCFLAGS) -c $*.c -o ./$*.o
+ 	gcc $(CFLAGS) $(GTKCFLAGS) $(DBSQLCFLAGS) -c $*.c -o ./$*.o