9 files changed, 137 insertions, 152 deletions

diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile
index 89cbc63294ac..dffd51160f26 100644
--- a/databases/gtksql/Makefile
+++ b/databases/gtksql/Makefile
@@ -2,59 +2,74 @@
 # $FreeBSD$
 
 PORTNAME=	gtksql
-PORTVERSION=	0.3
-PORTREVISION=	6
+PORTVERSION=	0.4.5
 CATEGORIES=	databases
-MASTER_SITES=	http://membres.lycos.fr/bbrox/GtkSQL/
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-testing/${PORTNAME}-${PORTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Graphical query tool for PostgreSQL and/or MySQL
+COMMENT=	Graphical query tool for PostgreSQL/MySQL/SQLite
 
-.if defined(PACKAGE_BUILDING) && !defined(WITH_MYSQL) && !defined(WITH_PGSQL)
-BROKEN=		Needs modification to work with newer MySQL
-EXPIRATION_DATE=	2011-11-30
-WITH_MYSQL=	yes
-.endif
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	avahi-client:${PORTSDIR}/net/avahi-app
+
+GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	aclocal libtool
+ACLOCAL_ARGS=	-I${LOCALBASE}/share/aclocal
+USE_PKGCONFIG=	build
+USE_GMAKE=	yes
+USE_GNOME=	gtk20
 
-USE_GNOME=	gtk12
+MAN1=		${PORTNAME}.1
+PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
 
-.include <bsd.port.pre.mk>
+OPTIONS_MULTI=		DB
+OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE3
+OPTIONS_DEFAULT=	MYSQL PGSQL SQLITE3
 
-.if defined(WITH_MYSQL) || (exists(${LOCALBASE}/lib/mysql/libmysqlclient.a) \
-	&& !defined(WITHOUT_MYSQL))
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
-.endif
-.if defined(WITH_PGSQL) || (exists(${LOCALBASE}/lib/libpq.a) \
-	&& !defined(WITHOUT_PGSQL))
-HAVE_PGSQL=	yes
-USE_PGSQL=	yes
+.else
+CONFIGURE_ARGS+=--without-mysql
 .endif
 
-pre-patch:
-.if !defined(USE_MYSQL) && !defined(HAVE_PGSQL)
-	@${ECHO} "You must specify which database to use, possible are:"
-	@${ECHO}
-	@${ECHO} "make WITH_MYSQL=yes (for MySQL support)"
-	@${ECHO} "make WITH_PGSQL=yes (for PostgreSQL support)"
-	@${ECHO} "make WITH_MYSQL=yes WITH_PGSQL=yes (for both MySQL and PostgreSQL support)"
-	@${FALSE}
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .endif
 
-do-configure:
-.if defined(USE_MYSQL)
-	@${REINPLACE_CMD} -e "s/^#MYSQL/MYSQL/g" ${WRKSRC}/Makefile
+.if ${PORT_OPTIONS:MPGSQL}
+USE_PGSQL=	yes
+.else
+CONFIGURE_ARGS+=--without-postgresql
 .endif
-.if defined(HAVE_PGSQL)
-	@${REINPLACE_CMD} -e "s/^#PGSQL/PGSQL/g" ${WRKSRC}/Makefile
+
+.if ${PORT_OPTIONS:MSQLITE3}
+LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
+.else
+CONFIGURE_ARGS+=--without-sqlite
 .endif
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gtksql ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/gtksql
-.for file in Changelog README
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gtksql
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/include/mysql|${LOCALBASE}/include/mysql|g' \
+	-e 's|/usr/include/postgresql|${LOCALBASE}/include/postgresql/server|g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} 's|make|$$(MAKE)|' \
+		${WRKSRC}/scintilla/Makefile.in
+	@${REINPLACE_CMD} 's|-Os|${CFLAGS}|g' \
+		${WRKSRC}/scintilla/gtk/makefile
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/gtksql/distinfo b/databases/gtksql/distinfo
index 6de267306276..e24f4253979f 100644
--- a/databases/gtksql/distinfo
+++ b/databases/gtksql/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gtksql-0.3.tar.gz) = 736e93497e7a4e546144294e53c472e2ab67baaeb5e0442ef4c05b4e73a2d5c9
-SIZE (gtksql-0.3.tar.gz) = 50557
+SHA256 (gtksql-0.4.5.tar.gz) = 114f8a857f5987922c6d571cb498db033cc20dc8efe25201b3eb7297f77dc6e0
+SIZE (gtksql-0.4.5.tar.gz) = 1393651
diff --git a/databases/gtksql/files/patch-Makefile.am b/databases/gtksql/files/patch-Makefile.am
new file mode 100644
index 000000000000..6e1a7c97bfdf
--- /dev/null
+++ b/databases/gtksql/files/patch-Makefile.am
@@ -0,0 +1,21 @@
+--- ./Makefile.am.orig	2007-07-20 17:16:40.000000000 +0200
++++ ./Makefile.am	2013-02-26 19:07:58.000000000 +0100
+@@ -2,18 +2,6 @@
+ 
+ SUBDIRS = Pics po scintilla intl src pixmaps man gnome
+ 
+-gtksqldocdir = ${prefix}/doc/gtksql
+-gtksqldoc_DATA = \
+-	README\
+-	COPYING\
+-	AUTHORS\
+-	ChangeLog\
+-	INSTALL\
+-	NEWS\
+-	TODO
+-
+-EXTRA_DIST = $(gtksqldoc_DATA)
+-
+ # Copy all the spec files. Of course, only one is actually used.
+ dist-hook:
+ 	for specfile in *.spec; do \
diff --git a/databases/gtksql/files/patch-aa b/databases/gtksql/files/patch-aa
deleted file mode 100644
index e73f3c071a19..000000000000
--- a/databases/gtksql/files/patch-aa
+++ /dev/null
@@ -1,51 +0,0 @@
---- Makefile.orig	Sat Jun  5 22:05:36 1999
-+++ Makefile	Sat Jul  1 16:10:57 2000
-@@ -1,17 +1,17 @@
- # Your favorite compilation options here :-)
--MCFLAGS  = -Wall -O -g 
-+#MCFLAGS  = -Wall -O -g 
- LDFLAGS  =  -lcrypt
- 
- # 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
--PGSQLOBJS   = postgres.o
-+#PGSQLIBS    = -L$(LOCALBASE)/lib -lpq
-+#PGSQLCFLAGS = -I$(LOCALBASE)/include/postgresql/internal -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    = -L$(LOCALBASE)/lib/mysql -lmysqlclient
-+#MYSQLCFLAGS = -I$(LOCALBASE)/include/mysql -DUSE_MYSQL
-+#MYSQLOBJS   = mysql.o
- 
- # Nothing to change below this point...
- DBSQLIBS = $(PGSQLIBS) $(MYSQLIBS)
-@@ -22,13 +22,13 @@
-           config.o mytoolbar.o
- 
- OBJS    = $(MOBJS) $(DBSQLOBJS)
--CFLAGS  = $(MCFLAGS) $(DBSQLFLAGS)
-+CFLAGS  += $(MCFLAGS) $(DBSQLFLAGS)
- 
--GTKLIBS     = `gtk-config --libs`
--GTKCFLAGS   = `gtk-config --cflags`
-+GTKLIBS     = `$(GTK_CONFIG) --libs`
-+GTKCFLAGS   = `$(GTK_CONFIG) --cflags`
- 
- all: $(OBJS)
--	gcc -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS)
-+	$(CC) -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS)
- 
- clean:
- 	rm -f *.o gtksql
-@@ -37,4 +37,4 @@
- 	cp gtksql $(DESTDIR)usr/bin/
- 
- .c.o: 
--	gcc $(CFLAGS) $(GTKCFLAGS) $(DBSQLCFLAGS) -c $*.c -o ./$*.o
-+	$(CC) $(CFLAGS) $(GTKCFLAGS) $(DBSQLCFLAGS) -c $*.c -o ./$*.o
diff --git a/databases/gtksql/files/patch-po__Makefile.in.in b/databases/gtksql/files/patch-po__Makefile.in.in
new file mode 100644
index 000000000000..1d17c20310df
--- /dev/null
+++ b/databases/gtksql/files/patch-po__Makefile.in.in
@@ -0,0 +1,10 @@
+--- ./po/Makefile.in.in.orig	2013-02-26 19:25:06.000000000 +0100
++++ ./po/Makefile.in.in	2013-02-26 19:25:37.000000000 +0100
+@@ -13,6 +13,7 @@
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++GETTEXT_PACKAGE= @PACKAGE@
+ 
+ SHELL = /bin/sh
+ @SET_MAKE@
diff --git a/databases/gtksql/files/patch-postgres.c b/databases/gtksql/files/patch-postgres.c
deleted file mode 100644
index 51adb3745ef2..000000000000
--- a/databases/gtksql/files/patch-postgres.c
+++ /dev/null
@@ -1,55 +0,0 @@
---- postgres.c.orig	Sat Jun  5 15:05:36 1999
-+++ postgres.c	Wed Aug  3 17:22:55 2005
-@@ -18,7 +18,7 @@
- 
- #include <libpq-fe.h>
- #include <string.h>
--#include <postgres.h>
-+#include <c.h>
- 
- #include "common.h"
- #include "status.h"
-@@ -129,14 +129,7 @@
-   PGresult *table_info;
-   char query[512];
- 
--  sprintf(query, "SELECT a.attnum, a.attname, t.typname, a.attlen,
--                         a.atttypmod, a.attnotnull, a.atthasdef
--                  FROM pg_class c, pg_attribute a, pg_type t
--                  WHERE c.relname = '%s' AND
--                        a.attnum > 0 AND
--                        a.attrelid = c.oid AND
--                        a.atttypid = t.oid
--                  ORDER BY attnum", tbf->name);
-+  sprintf(query, "SELECT a.attnum, a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef FROM pg_class c, pg_attribute a, pg_type t WHERE c.relname = '%s' AND a.attnum > 0 AND a.attrelid = c.oid AND a.atttypid = t.oid ORDER BY attnum", tbf->name);
-   
-   table_info = PQexec(conn, query);
-   if ((table_info == NULL) ||
-@@ -183,11 +176,7 @@
-       if (rnotnull[0] == 't')
- 	strcat(type_str, " not null");
-       if (rhasdef[0] == 't') {
--	sprintf(buf, "SELECT d.adsrc
--                      FROM pg_attrdef d, pg_class c
--                      WHERE c.relname = '%s' AND
--                            c.oid = d.adrelid AND
--                            d.adnum = %s",
-+	sprintf(buf, "SELECT d.adsrc FROM pg_attrdef d, pg_class c WHERE c.relname = '%s' AND c.oid = d.adrelid AND d.adnum = %s",
- 		tbf->name, PQgetvalue(table_info, i, 0));
- 	table_info2 = PQexec(conn, buf);
- 	if ((table_info2 == NULL) ||
-@@ -240,13 +229,7 @@
-     PGresult *tables;
-     char query[512];
-     
--    sprintf(query, "SELECT usename, relname, relkind, relhasrules
--                    FROM pg_class, pg_user
--                    WHERE relkind = 'r' AND
--                          relname !~ '^pg_' AND
--                          relname !~ '^xin[vx][0-9]+' AND
--                          usesysid = relowner
--                    ORDER BY relname");
-+    sprintf(query, "SELECT usename, relname, relkind, relhasrules FROM pg_class, pg_user WHERE relkind = 'r' AND relname !~ '^pg_' AND relname !~ '^xin[vx][0-9]+' AND usesysid = relowner ORDER BY relname");
-   
-     tables = PQexec(conn->conn, query);
-     if ((tables == NULL) || (PQresultStatus(tables) != PGRES_TUPLES_OK)) {
diff --git a/databases/gtksql/files/patch-src__Makefile.am b/databases/gtksql/files/patch-src__Makefile.am
new file mode 100644
index 000000000000..4818e624cb5e
--- /dev/null
+++ b/databases/gtksql/files/patch-src__Makefile.am
@@ -0,0 +1,13 @@
+--- ./src/Makefile.am.orig	2007-11-01 15:06:11.000000000 +0100
++++ ./src/Makefile.am	2013-02-26 19:07:58.000000000 +0100
+@@ -4,9 +4,7 @@
+ 	$(PACKAGE_CFLAGS)
+ 
+ AM_CFLAGS =\
+-	 -Wall -Wimplicit -Wreturn-type -Wunused -Wswitch -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith\
+-	 -O1\
+-	 -g
++	 -Wall -Wimplicit -Wreturn-type -Wunused -Wswitch -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith
+ 
+ bin_PROGRAMS = gtksql
+ 
diff --git a/databases/gtksql/pkg-descr b/databases/gtksql/pkg-descr
index 4cc9d91bad77..a4da80c9e660 100644
--- a/databases/gtksql/pkg-descr
+++ b/databases/gtksql/pkg-descr
@@ -1,5 +1,5 @@
-GtkSQL is a graphical query tool for PostgreSQL/MySQL.  You can work on
-multiple queries simultaneously:
+GtkSQL is a graphical query tool for PostgreSQL/MySQL/SQLite. You can
+work on multiple queries simultaneously:
 
  * send the current query to the database
  * add a new query
@@ -11,4 +11,4 @@ multiple queries simultaneously:
  * SQL keyword, table name and field name autocompletion
  * rescan the table database.
 
-WWW: http://membres.lycos.fr/bbrox/GtkSQL/
+WWW: http://sourceforge.net/projects/gtksql/
diff --git a/databases/gtksql/pkg-plist b/databases/gtksql/pkg-plist
index 3b7e51a9fc06..447e0091e131 100644
--- a/databases/gtksql/pkg-plist
+++ b/databases/gtksql/pkg-plist
@@ -1,4 +1,36 @@
 bin/gtksql
-%%PORTDOCS%%share/doc/gtksql/Changelog
-%%PORTDOCS%%share/doc/gtksql/README
-%%PORTDOCS%%@dirrm share/doc/gtksql
+share/applications/gtksql.desktop
+%%NLS%%share/locale/de_DE/LC_MESSAGES/gtksql.mo
+share/pixmaps/connect-grey.xpm
+share/pixmaps/connect.png
+share/pixmaps/connect.xpm
+share/pixmaps/delete-grey.xpm
+share/pixmaps/delete.xpm
+share/pixmaps/disconnect-grey.xpm
+share/pixmaps/disconnect.png
+share/pixmaps/disconnect.xpm
+share/pixmaps/export-grey.xpm
+share/pixmaps/export.xpm
+share/pixmaps/gtksql.png
+share/pixmaps/gtksql.xpm
+share/pixmaps/gtksql_db.png
+share/pixmaps/gtksql_field.png
+share/pixmaps/gtksql_gnome_icon.png
+share/pixmaps/gtksql_table.png
+share/pixmaps/new-grey.xpm
+share/pixmaps/new.xpm
+share/pixmaps/open-grey.xpm
+share/pixmaps/open.xpm
+share/pixmaps/question.xpm
+share/pixmaps/refresh-grey.xpm
+share/pixmaps/refresh.xpm
+share/pixmaps/rename-grey.xpm
+share/pixmaps/rename.xpm
+share/pixmaps/save-grey.xpm
+share/pixmaps/save.xpm
+share/pixmaps/send-grey.xpm
+share/pixmaps/send.xpm
+share/pixmaps/warning.xpm
+%%NLS%%@dirrmtry share/locale/de_DE/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/de_DE
+@dirrmtry share/applications