svn commit: r488610 - in head/x11-toolkits/gtkdatabox: . files

[Fernando Apesteguía]

Author: fernape
Date: Fri Dec 28 16:45:23 2018
New Revision: 488610
URL: https://svnweb.freebsd.org/changeset/ports/488610

Log:
  x11-toolkits/gtkdatabox: update to 0.9.3.1
  
  This is a bugfix release.
  
  While here:
  
  * Add USES=gnome
  * Add missing components to USE_GNOME
  * Add missing LIB_DEPENDS
  * Reorder some variables
  * Regenerate patches to match current conventions
  
  Reported by:	portscout

Added:
  head/x11-toolkits/gtkdatabox/files/patch-gtk_gtkdatabox.c   (contents, props changed)
  head/x11-toolkits/gtkdatabox/files/patch-gtk_gtkdatabox__ruler.c   (contents, props changed)
Deleted:
  head/x11-toolkits/gtkdatabox/files/patch-gtkdatabox.c
  head/x11-toolkits/gtkdatabox/files/patch-gtkdatabox_ruler.c
Modified:
  head/x11-toolkits/gtkdatabox/Makefile
  head/x11-toolkits/gtkdatabox/distinfo
  head/x11-toolkits/gtkdatabox/pkg-plist

Modified: head/x11-toolkits/gtkdatabox/Makefile
==============================================================================
--- head/x11-toolkits/gtkdatabox/Makefile	Fri Dec 28 15:54:43 2018	(r488609)
+++ head/x11-toolkits/gtkdatabox/Makefile	Fri Dec 28 16:45:23 2018	(r488610)
@@ -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 nume
 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=	*

Modified: head/x11-toolkits/gtkdatabox/distinfo
==============================================================================
--- head/x11-toolkits/gtkdatabox/distinfo	Fri Dec 28 15:54:43 2018	(r488609)
+++ head/x11-toolkits/gtkdatabox/distinfo	Fri Dec 28 16:45:23 2018	(r488610)
@@ -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

Added: head/x11-toolkits/gtkdatabox/files/patch-gtk_gtkdatabox.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-toolkits/gtkdatabox/files/patch-gtk_gtkdatabox.c	Fri Dec 28 16:45:23 2018	(r488610)
@@ -0,0 +1,14 @@
+--- 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>
++#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
++#define log2(x) (log(x) / log(2))
++#endif
++
+ 
+ static gint gtk_databox_button_press (GtkWidget * widget,
+                                       GdkEventButton * event);

Added: head/x11-toolkits/gtkdatabox/files/patch-gtk_gtkdatabox__ruler.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-toolkits/gtkdatabox/files/patch-gtk_gtkdatabox__ruler.c	Fri Dec 28 16:45:23 2018	(r488610)
@@ -0,0 +1,14 @@
+--- 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)
++#define log2(x) (log(x) / log(2))
++#endif
++
+ #define RULER_SIZE          14
+ 
+ #define ROUND(x) ((int) ((x) + 0.5))

Modified: head/x11-toolkits/gtkdatabox/pkg-plist
==============================================================================
--- head/x11-toolkits/gtkdatabox/pkg-plist	Fri Dec 28 15:54:43 2018	(r488609)
+++ head/x11-toolkits/gtkdatabox/pkg-plist	Fri Dec 28 16:45:23 2018	(r488610)
@@ -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