5 files changed, 63 insertions, 54 deletions

diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile
index c48489a0bb92..ee27b9f524c8 100644
--- a/databases/gtksql/Makefile
+++ b/databases/gtksql/Makefile
@@ -1,22 +1,50 @@
 # New ports collection makefile for:	gtksql
-# Version required:			0.2
+# Version required:			0.3
 # Date created:				19 November 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/03/20 05:28:38 taoka Exp $
 #
 
-DISTNAME=	gtksql-0.2
+DISTNAME=	gtksql-0.3
 CATEGORIES=	databases
 MASTER_SITES=	http://www.multimania.com/bbrox/GtkSQL/
 
-MAINTAINER=	andy@icc.surw.chel.su
+MAINTAINER=	domi@saargate.de
 
-LIB_DEPENDS=	gtk10.1:${PORTSDIR}/x11-toolkits/gtk10 \
-		pq.2:${PORTSDIR}/databases/postgresql
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+
+.if defined(PACKAGE_BUILDING) && !defined(USE_MYSQL) && !defined(USE_PGSQL)
+USE_MYSQL=	yes
+.endif
+
+.if defined(USE_MYSQL)
+LIB_DEPENDS +=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+.endif
+.if defined(USE_PGSQL)
+LIB_DEPENDS +=	pq.2:${PORTSDIR}/databases/postgresql
+.endif
 
 USE_X_PREFIX=	yes
 
+fetch-depends:
+.if !defined(USE_MYSQL) && !defined(USE_PGSQL)
+	@ ${ECHO} "You must specify which database to use, possible are:"
+	@ ${ECHO}
+	@ ${ECHO} "make USE_MYSQL=yes (for MySQL support)"
+	@ ${ECHO} "make USE_PGSQL=yes (for PostgreSQL support)"
+	@ ${ECHO} "make USE_MYSQL=yes USE_PGSQL=yes (for both MySQL and PostgreSQL support)"
+	@ ${FALSE}
+.endif
+
+do-configure:
+.if defined(USE_MYSQL)
+	@ ${PERL} -i -pe "s/^#MYSQL/MYSQL/g" ${WRKDIR}/${DISTNAME}/Makefile
+.endif
+.if defined(USE_PGSQL)
+	@ ${PERL} -i -pe "s/^#PGSQL/PGSQL/g" ${WRKDIR}/${DISTNAME}/Makefile
+.endif
+
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/gtksql ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
diff --git a/databases/gtksql/distinfo b/databases/gtksql/distinfo
index a595d5eb3488..1a5fd75170e7 100644
--- a/databases/gtksql/distinfo
+++ b/databases/gtksql/distinfo
@@ -1 +1 @@
-MD5 (gtksql-0.2.tar.gz) = 74cdab5745874b5bdcef21398e95c066
+MD5 (gtksql-0.3.tar.gz) = 8f7a0a565e761fb649240cb46d6dd9cb
diff --git a/databases/gtksql/files/patch-aa b/databases/gtksql/files/patch-aa
index 766a6b22f479..dcf697d8aea9 100644
--- a/databases/gtksql/files/patch-aa
+++ b/databases/gtksql/files/patch-aa
@@ -1,53 +1,34 @@
---- Makefile.orig	Sat Mar 20 13:36:17 1999
-+++ Makefile	Sat Mar 20 13:36:17 1999
-@@ -1,8 +1,23 @@
-+#
-+# C compiler
-+#
-+CC?= gcc
-+
-+#
-+# Local packages
-+#
-+LOCALBASE?= /usr/local
-+
-+#
-+# Installation prefix
-+#
-+PREFIX?= $(LOCALBASE)
-+
- # Here, what you need for Pgsql
+--- Makefile.orig	Mon Jul 26 19:30:44 1999
++++ Makefile	Mon Jul 26 19:41:39 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
-+PGSQLIBS    = -L$(LOCALBASE)/pgsql/lib -lpq -lcrypt
-+PGSQLCFLAGS = -I$(LOCALBASE)/pgsql/include
- # Your favorite compilation options here :-)
--MCFLAGS  = -Wall -O -g
-+CFLAGS?= -Wall -O -g
+-PGSQLCFLAGS = -I/usr/local/pgsql/include -DUSE_POSTGRESQL
+-PGSQLOBJS   = postgres.o
++#PGSQLIBS    = -L/usr/local/pgsql/lib -lpq
++#PGSQLCFLAGS = -I/usr/local/pgsql/include -DUSE_POSTGRESQL
++#PGSQLOBJS   = postgres.o
  
- # The database modules you want to be built
- DBOBJS  = postgres.o
-@@ -12,19 +27,19 @@
- MOBJS   = main.o queries.o dialogs.o tables.o common.o export.o status.o
+ # Here, what you need for MySQL
+-MYSQLIBS    = -L/usr/lib/mysql -lmysqlclient
+-MYSQLCFLAGS = -I/usr/include/mysql -DUSE_MYSQL
+-MYSQLOBJS   = mysql.o
++#MYSQLIBS    = -L/usr/local/lib/mysql -lmysqlclient
++#MYSQLCFLAGS = -I/usr/local/include/mysql -DUSE_MYSQL
++#MYSQLOBJS   = mysql.o
  
- OBJS    = $(MOBJS) $(DBOBJS)
--CFLAGS  = $(MCFLAGS) $(DBFLAGS)
-+CFLAGS+=  $(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     = `gtk10-config --libs`
-+GTKCFLAGS   = `gtk10-config --cflags`
++GTKLIBS     = `gtk12-config --libs`
++GTKCFLAGS   = `gtk12-config --cflags`
  
  all: $(OBJS)
--	gcc -o gtksql $(OBJS) $(PGSQLIBS) $(GTKLIBS) $(CFLAGS)
-+	$(CC) -o gtksql $(OBJS) $(PGSQLIBS) $(GTKLIBS) $(CFLAGS)
- 
- clean:
- 	rm *.o gtksql
- 
- install: all
--	cp gtksql $(DESTDIR)usr/bin/
-+	cp gtksql $(PREFIX)/bin
- 
- .c.o: 
+ 	gcc -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS)
diff --git a/databases/gtksql/pkg-comment b/databases/gtksql/pkg-comment
index 7d9b12fe7f71..df769d1dbe37 100644
--- a/databases/gtksql/pkg-comment
+++ b/databases/gtksql/pkg-comment
@@ -1 +1 @@
-Graphical query tool for PostgreSQL
+Graphical query tool for PostgreSQL and/or MySQL
diff --git a/databases/gtksql/pkg-descr b/databases/gtksql/pkg-descr
index 7121f77d7447..bde43470453b 100644
--- a/databases/gtksql/pkg-descr
+++ b/databases/gtksql/pkg-descr
@@ -1,4 +1,4 @@
-GtkSQL is a graphical query tool for PostgreSQL.  You can work on
+GtkSQL is a graphical query tool for PostgreSQL/MySQL.  You can work on
 multiple queries simultaneously:
 
  * send the current query to the database