5 files changed, 23 insertions, 19 deletions

diff --git a/x11-toolkits/gtkdatabox/Makefile b/x11-toolkits/gtkdatabox/Makefile
index 250ac214682f..be84dad67337 100644
--- a/x11-toolkits/gtkdatabox/Makefile
+++ b/x11-toolkits/gtkdatabox/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gtkdatabox
-PORTVERSION=	0.9.3.0
+PORTVERSION=	0.9.3.1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF
 DIST_SUBDIR=	gnome2
@@ -13,12 +13,16 @@ COMMENT=	GTK+2 widget to display large amounts of numerical data
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		libtool pathfix pkgconfig
-USE_GNOME=	gtk20
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
+
+USES=		gnome libtool pathfix pkgconfig
+USE_GNOME=	cairo gdkpixbuf2 gtk20
+USE_LDCONFIG=	yes
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--includedir="${PREFIX}/include/${PORTNAME}" \
 		--with-html-dir="${PREFIX}/share/doc"
-USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 PORTDOCS=	*
diff --git a/x11-toolkits/gtkdatabox/distinfo b/x11-toolkits/gtkdatabox/distinfo
index 968dab35496e..8f5c7d9b828b 100644
--- a/x11-toolkits/gtkdatabox/distinfo
+++ b/x11-toolkits/gtkdatabox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509095425
-SHA256 (gnome2/gtkdatabox-0.9.3.0.tar.gz) = 1f426b525c31a9ba8bf2b61084b7aef89eaed11f8d0b2a54bde467da16692ff2
-SIZE (gnome2/gtkdatabox-0.9.3.0.tar.gz) = 2883977
+TIMESTAMP = 1546007506
+SHA256 (gnome2/gtkdatabox-0.9.3.1.tar.gz) = d04938d969d5458bd0df1b4fa22f647fb2eeeef75555a71f967e6c039fb4bde5
+SIZE (gnome2/gtkdatabox-0.9.3.1.tar.gz) = 3680148
diff --git a/x11-toolkits/gtkdatabox/files/patch-gtkdatabox.c b/x11-toolkits/gtkdatabox/files/patch-gtk_gtkdatabox.c
index 2e3d07faa0ed..f39e86aaf6dc 100644
--- a/x11-toolkits/gtkdatabox/files/patch-gtkdatabox.c
+++ b/x11-toolkits/gtkdatabox/files/patch-gtk_gtkdatabox.c
@@ -1,7 +1,7 @@
---- gtk/gtkdatabox.c.orig	2011-07-16 04:24:33.000000000 +0900
-+++ gtk/gtkdatabox.c	2012-06-02 13:32:51.000000000 +0900
-@@ -26,6 +26,11 @@
- #include <gtk/gtkgc.h>
+--- gtk/gtkdatabox.c.orig	2018-11-02 17:08:28 UTC
++++ gtk/gtkdatabox.c
+@@ -23,6 +23,11 @@
+ #include <gtk/gtk.h>
  #include <math.h>
  
 +#include <sys/param.h>
@@ -11,4 +11,4 @@
 +
  
  static gint gtk_databox_button_press (GtkWidget * widget,
- 				      GdkEventButton * event);
+                                       GdkEventButton * event);
diff --git a/x11-toolkits/gtkdatabox/files/patch-gtkdatabox_ruler.c b/x11-toolkits/gtkdatabox/files/patch-gtk_gtkdatabox__ruler.c
index 4a66632a4c69..f00bda605f88 100644
--- a/x11-toolkits/gtkdatabox/files/patch-gtkdatabox_ruler.c
+++ b/x11-toolkits/gtkdatabox/files/patch-gtk_gtkdatabox__ruler.c
@@ -1,8 +1,8 @@
---- gtk/gtkdatabox_ruler.c.orig	2011-07-16 04:25:04.000000000 +0900
-+++ gtk/gtkdatabox_ruler.c	2012-06-02 13:36:15.000000000 +0900
-@@ -32,6 +32,11 @@
- #include <math.h>
- #include <glib/gprintf.h>
+--- gtk/gtkdatabox_ruler.c.orig	2018-06-29 20:20:11 UTC
++++ gtk/gtkdatabox_ruler.c
+@@ -34,6 +34,11 @@
+ 
+ #include <string.h>
  
 +#include <sys/param.h>
 +#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
diff --git a/x11-toolkits/gtkdatabox/pkg-plist b/x11-toolkits/gtkdatabox/pkg-plist
index 46d64bb11986..efe14d4b68be 100644
--- a/x11-toolkits/gtkdatabox/pkg-plist
+++ b/x11-toolkits/gtkdatabox/pkg-plist
@@ -18,8 +18,8 @@ include/gtkdatabox/gtkdatabox_xyyc_graph.h
 %%GLADEUI%%lib/glade3/modules/libgladedatabox.so
 %%GLADE%%lib/libglade/2.0/libdatabox.a
 %%GLADE%%lib/libglade/2.0/libdatabox.so
-lib/libgtkdatabox-0.9.3.so.0
-lib/libgtkdatabox-0.9.3.so.0.0.0
+lib/libgtkdatabox-0.9.3.so.1
+lib/libgtkdatabox-0.9.3.so.1.0.0
 lib/libgtkdatabox.a
 lib/libgtkdatabox.so
 libdata/pkgconfig/gtkdatabox.pc