Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 26 Jun 2012 02:46:12 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/169423: x11-toolkits/gtkdatabox: Update to version 0.9.1.3
Message-ID:  <20120626024612.139fa666.tkato432@yahoo.com>
Resent-Message-ID: <201206251810.q5PIAEPd073973@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         169423
>Category:       ports
>Synopsis:       x11-toolkits/gtkdatabox: Update to version 0.9.1.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 25 18:10:14 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p9 i386
>Organization:
>Environment:
>Description:
- Update to version 0.9.1.3

New file:
files/patch-gtkdatabox.c
files/patch-gtkdatabox_ruler.c

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/x11-toolkits/gtkdatabox/Makefile x11-toolkits/gtkdatabox/Makefile
--- /usr/ports/x11-toolkits/gtkdatabox/Makefile	2012-06-18 05:13:20.000000000 +0900
+++ x11-toolkits/gtkdatabox/Makefile	2012-06-18 06:10:21.000000000 +0900
@@ -7,32 +7,28 @@
 #
 
 PORTNAME=	gtkdatabox
-PORTVERSION=	0.9.0.1
-PORTREVISION=	5
+PORTVERSION=	0.9.1.3
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	SF http://www.eudoxos.de/gtk/gtkdatabox/download/
+MASTER_SITES=	SF
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A GTK+2 widget to display large amounts of numerical data
 
-USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack gtk20
-USE_AUTOTOOLS=	libtool
-CONFIGURE_ARGS+=	--includedir="${PREFIX}/include/${PORTNAME}" \
-			--with-html-dir="${PREFIX}/share/doc"
+LICENSE=	LGPL21
 
-BROKEN=		does not package - does not install documentation
-
-OPTIONS_DEFINE= GLADE GLADEUI DOCS EXAMPLES
+OPTIONS_DEFINE=	GLADE GLADEUI DOCS EXAMPLES
 GLADE_DESC=	Enable libglade2 support
 GLADEUI_DESC=	Enable glade3 support
 
-.include <bsd.port.pre.mk>
+USE_GNOME=	gnomehack gtk20
+USE_AUTOTOOLS=	libtool
+CONFIGURE_ARGS=	--includedir="${PREFIX}/include/${PORTNAME}" \
+		--with-html-dir="${PREFIX}/share/doc"
+USE_LDCONFIG=	yes
+MAKE_JOBS_SAFE=	yes
 
-.if ${PORT_OPTIONS:MDOCS}
-USE_GNOME+=	referencehack
-.endif
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGLADE}
 USE_GNOME+=	libglade2
@@ -53,17 +49,22 @@
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|@libglade_moduledir@|@prefix@/lib/libglade/2.0|g ; \
-		 s|@glade_moduledir@|@prefix@/lib/glade3/modules|g ; \
-		 s|@glade_catalogdir@|@prefix@/share/glade3/catalogs|g'
-	@${REINPLACE_CMD} -e 's|-DGTK_DISABLE_DEPRECATED||g' \
-		${WRKSRC}/gtk/Makefile.in ${WRKSRC}/examples/Makefile.in
+	@${REINPLACE_CMD} -e \
+		'/^SUBDIR/s|examples||' ${WRKSRC}/Makefile.in
+.for dir in examples gtk
+	@${REINPLACE_CMD} -e \
+		'/-O2/d ; \
+		 /DISABLE_DEPRECATED/d' ${WRKSRC}/${dir}/Makefile.in
+.endfor
 
 post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/reference/html/*.* ${DOCSDIR}
+.endif
 .if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}
+	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.c ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/x11-toolkits/gtkdatabox/distinfo x11-toolkits/gtkdatabox/distinfo
--- /usr/ports/x11-toolkits/gtkdatabox/distinfo	2011-07-03 03:18:30.000000000 +0900
+++ x11-toolkits/gtkdatabox/distinfo	2012-06-02 03:43:20.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gtkdatabox-0.9.0.1.tar.gz) = ad700dc324d38489952e0d04fbd0fafc97c87cda7eeff677f85dd4ffc5dcca2c
-SIZE (gnome2/gtkdatabox-0.9.0.1.tar.gz) = 471904
+SHA256 (gnome2/gtkdatabox-0.9.1.3.tar.gz) = 90ff9fc20ea1541dfe75ae04ff98e02c3aa7ad1735d8f0e3b3352910a3f7427c
+SIZE (gnome2/gtkdatabox-0.9.1.3.tar.gz) = 453125
diff -urN /usr/ports/x11-toolkits/gtkdatabox/files/patch-gtkdatabox.c x11-toolkits/gtkdatabox/files/patch-gtkdatabox.c
--- /usr/ports/x11-toolkits/gtkdatabox/files/patch-gtkdatabox.c	1970-01-01 09:00:00.000000000 +0900
+++ x11-toolkits/gtkdatabox/files/patch-gtkdatabox.c	2012-06-02 13:33:43.000000000 +0900
@@ -0,0 +1,14 @@
+--- 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>
+ #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);
diff -urN /usr/ports/x11-toolkits/gtkdatabox/files/patch-gtkdatabox_ruler.c x11-toolkits/gtkdatabox/files/patch-gtkdatabox_ruler.c
--- /usr/ports/x11-toolkits/gtkdatabox/files/patch-gtkdatabox_ruler.c	1970-01-01 09:00:00.000000000 +0900
+++ x11-toolkits/gtkdatabox/files/patch-gtkdatabox_ruler.c	2012-06-02 13:37:11.000000000 +0900
@@ -0,0 +1,14 @@
+--- 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>
+ 
++#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))
diff -urN /usr/ports/x11-toolkits/gtkdatabox/pkg-descr x11-toolkits/gtkdatabox/pkg-descr
--- /usr/ports/x11-toolkits/gtkdatabox/pkg-descr	2008-07-12 03:45:44.000000000 +0900
+++ x11-toolkits/gtkdatabox/pkg-descr	2012-06-02 03:41:40.000000000 +0900
@@ -3,4 +3,4 @@
 The widget gives the possibility to zoom into and out of the data and to 
 scroll around. It also offers a grid like on an oscilloscope.
 
-WWW: http://www.eudoxos.de/gtk/gtkdatabox/
+WWW: http://sourceforge.net/projects/gtkdatabox/
diff -urN /usr/ports/x11-toolkits/gtkdatabox/pkg-plist x11-toolkits/gtkdatabox/pkg-plist
--- /usr/ports/x11-toolkits/gtkdatabox/pkg-plist	2008-11-10 12:12:56.000000000 +0900
+++ x11-toolkits/gtkdatabox/pkg-plist	2012-06-02 13:55:05.000000000 +0900
@@ -17,27 +17,26 @@
 %%GLADE%%lib/libglade/2.0/libdatabox.a
 %%GLADE%%lib/libglade/2.0/libdatabox.la
 %%GLADE%%lib/libglade/2.0/libdatabox.so
-lib/libgtkdatabox-0.9.0.so
-lib/libgtkdatabox-0.9.0.so.1
+lib/libgtkdatabox-0.9.1.so
+lib/libgtkdatabox-0.9.1.so.3
 lib/libgtkdatabox.a
 lib/libgtkdatabox.la
 lib/libgtkdatabox.so
 libdata/pkgconfig/gtkdatabox.pc
-%%GLADEUI%%share/glade3/catalogs/gtkdatabox.xml
-%%PORTDOCS%%%%DOCSDIR%%/GtkDatabox.html
-%%PORTDOCS%%%%DOCSDIR%%/GtkDataboxBars.html
-%%PORTDOCS%%%%DOCSDIR%%/GtkDataboxCrossSimple.html
-%%PORTDOCS%%%%DOCSDIR%%/GtkDataboxGraph.html
-%%PORTDOCS%%%%DOCSDIR%%/GtkDataboxGrid.html
-%%PORTDOCS%%%%DOCSDIR%%/GtkDataboxLines.html
-%%PORTDOCS%%%%DOCSDIR%%/GtkDataboxMarkers.html
-%%PORTDOCS%%%%DOCSDIR%%/GtkDataboxPoints.html
-%%PORTDOCS%%%%DOCSDIR%%/GtkDataboxRuler.html
-%%PORTDOCS%%%%DOCSDIR%%/GtkDataboxXYCGraph.html
 %%PORTDOCS%%%%DOCSDIR%%/ch01.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkdatabox-gtkdatabox-bars.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkdatabox-gtkdatabox-cross-simple.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkdatabox-gtkdatabox-graph.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkdatabox-gtkdatabox-grid.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkdatabox-gtkdatabox-lines.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkdatabox-gtkdatabox-markers.html
 %%PORTDOCS%%%%DOCSDIR%%/gtkdatabox-gtkdatabox-marshal.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkdatabox-gtkdatabox-points.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkdatabox-gtkdatabox-ruler.html
 %%PORTDOCS%%%%DOCSDIR%%/gtkdatabox-gtkdatabox-scale.html
 %%PORTDOCS%%%%DOCSDIR%%/gtkdatabox-gtkdatabox-typedefs.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkdatabox-gtkdatabox-xyc-graph.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkdatabox-gtkdatabox.html
 %%PORTDOCS%%%%DOCSDIR%%/gtkdatabox.devhelp
 %%PORTDOCS%%%%DOCSDIR%%/gtkdatabox.devhelp2
 %%PORTDOCS%%%%DOCSDIR%%/home.png
@@ -54,11 +53,13 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/enable_disable.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grid.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grid_array.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/keycontrol.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lissajous.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/logarithmic.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/markers.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/signals.c
-@dirrm include/gtkdatabox
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%GLADEUI%%share/glade3/catalogs/gtkdatabox.xml
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm include/gtkdatabox
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120626024612.139fa666.tkato432>