Index: head/databases/gtksql/Makefile
===================================================================
--- head/databases/gtksql/Makefile	(revision 436102)
+++ head/databases/gtksql/Makefile	(revision 436103)
@@ -1,74 +1,75 @@
 # Created by: Andrey Zakhvatov
 # $FreeBSD$
 
 PORTNAME=	gtksql
 PORTVERSION=	0.4.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-testing/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical query tool for PostgreSQL/MySQL/SQLite
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libscintilla.so:x11-toolkits/scintilla
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libscintilla.so:x11-toolkits/scintilla
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
-BROKEN=		does not build (incomplete definition of type 'struct CharacterRange')
-
-USES=		gettext gmake pkgconfig
-USE_GNOME=	gtk20 cairo glib20 pango
+USES=		gettext gmake localbase pkgconfig
+USE_GNOME=	gdkpixbuf2 gtk20 cairo
 GNU_CONFIGURE=	yes
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
 
-CPPFLAGS+=	-I${LOCALBASE}/include/scintilla -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lscintilla -lscintilla_lexers
-LDFLAGS+=	-lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -latk-1.0 -lcairo
-
 OPTIONS_DEFINE=	AVAHI DOCS
 OPTIONS_MULTI=	DB
 OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
 OPTIONS_DEFAULT=	SQLITE
 
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_WITH=	postgresql
 
 AVAHI_LIB_DEPENDS=	libavahi-common.so:net/avahi-app
 AVAHI_CONFIGURE_OFF=	--without-avahi
 
 MYSQL_USES=		mysql
 MYSQL_CPPFLAGS=		-I${LOCALBASE}/include/mysql
 MYSQL_LDFLAGS=		-L${LOCALBASE}/lib/mysql
 MYSQL_CONFIGURE_OFF=	--without-mysql
 
 SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_OFF=	--without-sqlite
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		'/-lstdc++/s|^|#| ; \
-		 /scintilla.a/s|^|#| ; \
-		 /\/scintilla\/include/s|^|#| ; \
+		's|-lstdc++|| ; \
+		 /^PACKAGE_LIBS=/s|$${packagesrcdir}.*scintilla.a|-lscintilla -lscintilla_lexers| ; \
+		 /^CPPFLAGS=/s|../scintilla/include|${LOCALBASE}/include/scintilla| ; \
 		 /ac_header/s|postgres.h|libpq-fe.h| ; \
 		 s|/usr/local|${PREFIX}| ; \
 		 s|-R|-Wl,-rpath=| ; \
 		 /^packagedatadir/s|=.*|=share/gtksql|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		's|-O1|| ; \
 		 s|-g$$|-DGTK|' \
 		${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|<postgres\.h>|<postgresql/internal/c.h>|' \
 		${WRKSRC}/src/d_postgres_f.c
 	@${REINPLACE_CMD} -e \
 		's|mozilla|xdg-open|' \
 		${WRKSRC}/src/gtkui-object.c
 	@${REINPLACE_CMD} -e \
 		's|/usr/local/gtksql|${PREFIX}/lib/gtksql|' \
 		${WRKSRC}/src/plugins.c
+# Some structure names were renamed in Scintilla.h (v3.7.1)
+	@${REINPLACE_CMD} -E \
+		's|^#include <string.h>$$|#include <stdlib.h>\${.newline}&| ; \
+		 s|(CharacterRange\|TextRange)|Sci_&|' \
+		${WRKSRC}/src/gtksql_query_scintilla.c
 
 .include <bsd.port.mk>
Index: head/databases/gtksql/files/patch-Makefile.in
===================================================================
--- head/databases/gtksql/files/patch-Makefile.in	(revision 436102)
+++ head/databases/gtksql/files/patch-Makefile.in	(revision 436103)
@@ -1,19 +1,19 @@
---- Makefile.in.orig	2013-10-08 11:01:04.306764000 +0200
-+++ Makefile.in	2013-10-08 11:27:51.000000000 +0200
-@@ -237,14 +237,12 @@
+--- Makefile.in.orig	2007-11-01 14:05:59 UTC
++++ Makefile.in
+@@ -237,14 +237,12 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -SUBDIRS = Pics po scintilla intl src pixmaps man gnome
 -gtksqldocdir = ${prefix}/doc/gtksql
 +SUBDIRS = Pics po src pixmaps man gnome
 +gtksqldocdir = ${docdir}
  gtksqldoc_DATA = \
  	README\
 -	COPYING\
  	AUTHORS\
  	ChangeLog\
 -	INSTALL\
  	NEWS\
  	TODO
  
Index: head/databases/gtksql/files/patch-po__Makefile.in.in
===================================================================
--- head/databases/gtksql/files/patch-po__Makefile.in.in	(revision 436102)
+++ head/databases/gtksql/files/patch-po__Makefile.in.in	(revision 436103)
@@ -1,10 +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
+--- po/Makefile.in.in.orig	2006-06-13 16:40:55 UTC
++++ po/Makefile.in.in
 @@ -13,6 +13,7 @@
  PACKAGE = @PACKAGE@
  VERSION = @VERSION@
  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 +GETTEXT_PACKAGE= @PACKAGE@
  
  SHELL = /bin/sh
  @SET_MAKE@