- Update to 0.8.2.2

2007-12-30 (0.8.2.2)
- Small bug fixes (hints by Brian Phelbs)
- Corrected internal signal definition.
2007-12-20 (0.8.2.1)
- Corrected configuration file for pkg-config.
2007-12-09 (0.8.2.0)
- Removal of struct GtkDataboxValue
- Introduction of struct GtkDataboxValueRectangle
- Results:
- Changed selection signal API (instead of two pairs of pixel
coordinates, now one struct of "real" values is sent with the
signal). Since most applications are interested in values instead
of pixels, this should simplify application code. It also should
eliminate signal marshaller problems.
- the set/get limits functions use parameters, left, right, top and
bottom instead of top_left and bottom_right (which led to much
confusion in the past).
- similar with the get_extrema_function
- in order to transform pixel coordinates into values and vice
versa, there are now four functions:
gtk_databox_value_to_pixel_x
gtk_databox_value_to_pixel_y
gtk_databox_pixel_to_value_x
gtk_databox_pixel_to_value_y
2007-12-06 (0.8.1.1)
- Configure script and Makefile changes (mainly thanks to Hans
Nieuwenhuis)
2007-12-04 (0.8.1.0)
- Configure script now checks for pango and cairo (thanks to Brian
Phelps)
- Support for glade added (thanks to Hans Nieuwenhuis)
2007-11-26 (0.8.0.1)
- Maintenance release (Code cleanup, based on hints from
Fabian Foerg.
2007-11-25 (0.8.0.0)
- Added support for logarithmic scales for drawing
- Replaced original gtkruler with gtkdatabox_ruler.
- GtkDataboxRuler supports logarithmic scales
- Instead of HRuler and VRuler, GtkDataboxRuler has an orientation
- No big changes in existing projects required, see examples
- renamed the following functions:
gtk_databox_get_canvas => gtk_databox_get_total_limits
gtk_databox_set_canvas => gtk_databox_set_total_limits
gtk_databox_get_visible_canvas => gtk_databox_get_visible_limits
gtk_databox_set_visible_canvas => gtk_databox_set_visible_limits
- replaced GtkDataboxCoord by GdkPoint (which is just the same)
- Added example which shows linear, logarithmic and double logarithmic
graphs
- Added example which shows easiest way to start with GtkDatabox

PR:		ports/116120
Submitted by:	Alexey Shuvaev <shuvaev@physik.uni-wuerzburg.de>
Approved by:	maintainer timeout (> 5 months)

4 files changed, 73 insertions, 27 deletions

diff --git a/x11-toolkits/gtkdatabox2/Makefile b/x11-toolkits/gtkdatabox2/Makefile
index 8e3c04ad14c0..c88270643929 100644
--- a/x11-toolkits/gtkdatabox2/Makefile
+++ b/x11-toolkits/gtkdatabox2/Makefile
@@ -6,20 +6,60 @@
 #
 
 PORTNAME=	gtkdatabox2
-PORTVERSION=	0.2.4.5
-PORTREVISION=	5
+PORTVERSION=	0.8.2.2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.eudoxos.de/gtk/gtkdatabox/download/
-DISTNAME=	gtkdatabox-${PORTVERSION}
+DISTNAME=	${PORTNAME:S/2//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	leoz.2005@gmail.com
 COMMENT=	A GTK+2 widget to display large amounts of numerical data
 
-USE_GNOME=	gtk20
-USE_AUTOTOOLS=	libtool:15
+CONFLICTS=	gtkdatabox-0.1.*
 USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack gtk20
+USE_AUTOTOOLS=	libtool:15
+CONFIGURE_ARGS+=	--includedir="${PREFIX}/include/${PORTNAME:S/2//}"
 
 CONFLICTS=	gtkdatabox-0.1.*
 
-.include <bsd.port.mk>
+OPTIONS=	GLADE "Enable libglade2 support" off \
+		GLADEUI "Enable glade3 support" off
+
+.include <bsd.port.pre.mk>
+
+.if !defined(NOPORTEXAMPLES)
+PORTEXAMPLES=	*.c
+.endif
+
+.if !defined(WITHOUT_GLADE)
+USE_GNOME+=	libglade2
+CONFIGURE_ARGS+=	--enable-libglade
+PLIST_SUB+=	GLADE=""
+.else
+CONFIGURE_ARGS+=	--disable-libglade
+PLIST_SUB+=	GLADE="@comment "
+.endif
+
+.if !defined(WITHOUT_GLADEUI)
+LIB_DEPENDS+=	gladeui-1.7:${PORTSDIR}/devel/glade3
+CONFIGURE_ARGS+=	--enable-glade
+PLIST_SUB+=	GLADEUI=""
+.else
+CONFIGURE_ARGS+=	--disable-glade
+PLIST_SUB+=	GLADEUI="@comment "
+.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'
+
+post-install:
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/${PORTEXAMPLES} ${EXAMPLESDIR}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/gtkdatabox2/distinfo b/x11-toolkits/gtkdatabox2/distinfo
index 95b02a0c568c..1ef45f83e438 100644
--- a/x11-toolkits/gtkdatabox2/distinfo
+++ b/x11-toolkits/gtkdatabox2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkdatabox-0.2.4.5.tar.gz) = f26cf3e51845dbb6d41e683dd407d887
-SHA256 (gnome2/gtkdatabox-0.2.4.5.tar.gz) = b09830e3b3c5c4a52fbcb6d294e0e407090260c64cf82e47e56f9fc7034e3778
-SIZE (gnome2/gtkdatabox-0.2.4.5.tar.gz) = 212005
+MD5 (gnome2/gtkdatabox-0.8.2.2.tar.gz) = 582c1618410fc53c0586c542cca20285
+SHA256 (gnome2/gtkdatabox-0.8.2.2.tar.gz) = 5a024b5e711ba147af462a6f38248a867035f40b5653b562b6bef9d28342a151
+SIZE (gnome2/gtkdatabox-0.8.2.2.tar.gz) = 384455
diff --git a/x11-toolkits/gtkdatabox2/files/patch-examples::colors.c b/x11-toolkits/gtkdatabox2/files/patch-examples::colors.c
deleted file mode 100644
index 3d5265ca5c2a..000000000000
--- a/x11-toolkits/gtkdatabox2/files/patch-examples::colors.c
+++ /dev/null
@@ -1,14 +0,0 @@
-*** examples/colors.c.orig	Mon Jul  5 22:42:37 2004
---- examples/colors.c	Mon Jul  5 22:37:05 2004
-***************
-*** 16,21 ****
---- 16,24 ----
-   * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   * Boston, MA 02111-1307, USA.
-   */
-+ #ifdef    GTK_DISABLE_DEPRECATED
-+ #undef    GTK_DISABLE_DEPRECATED
-+ #endif /* GTK_DISABLE_DEPRECATED */
-  #include <stdio.h>
-  #include <gtk/gtk.h>
-  #include <gtk/gtkcolorsel.h>
diff --git a/x11-toolkits/gtkdatabox2/pkg-plist b/x11-toolkits/gtkdatabox2/pkg-plist
index 8cb2a0ef79b1..02dc92aab113 100644
--- a/x11-toolkits/gtkdatabox2/pkg-plist
+++ b/x11-toolkits/gtkdatabox2/pkg-plist
@@ -1,7 +1,27 @@
-include/gtkdatabox.h
-include/gtkdataboxmarshal.h
-lib/libgtkdatabox-0.2.4.so
-lib/libgtkdatabox-0.2.4.so.5
+include/gtkdatabox/gtkdatabox.h
+include/gtkdatabox/gtkdatabox_bars.h
+include/gtkdatabox/gtkdatabox_canvas.h
+include/gtkdatabox/gtkdatabox_cross_simple.h
+include/gtkdatabox/gtkdatabox_graph.h
+include/gtkdatabox/gtkdatabox_grid.h
+include/gtkdatabox/gtkdatabox_lines.h
+include/gtkdatabox/gtkdatabox_marker.h
+include/gtkdatabox/gtkdatabox_marshal.h
+include/gtkdatabox/gtkdatabox_points.h
+include/gtkdatabox/gtkdatabox_ruler.h
+include/gtkdatabox/gtkdatabox_scale.h
+include/gtkdatabox/gtkdatabox_xyc_graph.h
+%%GLADEUI%%lib/glade3/modules/libgladedatabox.a
+%%GLADEUI%%lib/glade3/modules/libgladedatabox.la
+%%GLADEUI%%lib/glade3/modules/libgladedatabox.so
+%%GLADE%%lib/libglade/2.0/libdatabox.a
+%%GLADE%%lib/libglade/2.0/libdatabox.la
+%%GLADE%%lib/libglade/2.0/libdatabox.so
+lib/libgtkdatabox-0.8.2.so
+lib/libgtkdatabox-0.8.2.so.2
 lib/libgtkdatabox.a
 lib/libgtkdatabox.la
 lib/libgtkdatabox.so
+libdata/pkgconfig/gtkdatabox.pc
+%%GLADEUI%%share/glade3/catalogs/gtkdatabox.xml
+@dirrm include/gtkdatabox