-update to 0.99.17, changes:

 -additions:
  -GtkPlot: display grids on top/below data
            New function gtk_plot_set_pc
            New signal "tick_label" to retrieve axes tick labels
            New functions to handle axes labels
  -GtkPlotDT: delaunay triangulization algorithm
  -GtkSheet: New function gtk_sheet_get_entry_widget
             Background colors and grid handling
  -GtkPlotPC: New function gtk_plot_pc_set_viewport
  -GtkPlotData: New alternative to retrieve data points trough a callback
                 function
                Scale points size
                New functions to autoscale gradient according to field
                gtk_plot_data_get_point() to retrieve values
                Data markers
  -GtkPlotSurface: Use new Delaunay triangulization algorithm
                   New functions to colour the surface using a gradient
                    proportional to the height field
  -GtkPlotCSurface: Gradient with sublevels
  -GtkPlotCanvas: New child: CANVAS_MARKERS
                  New selection stretegy
                  New function gtk_plot_set_pc
                  gtk_plot_canvas_freeze/thaw methods
 -fixes:
  -build system
  -memory leaks
  -etc
-add a buildlink.mk

6 files changed, 74 insertions, 19 deletions

diff --git a/x11/gtk+extra/Makefile b/x11/gtk+extra/Makefile
index 7ee0d884278..30602162687 100644
--- a/x11/gtk+extra/Makefile
+++ b/x11/gtk+extra/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2001/07/11 10:35:56 drochner Exp $
+# $NetBSD: Makefile,v 1.7 2002/01/09 14:46:50 drochner Exp $
 #
 
-DISTNAME=	gtk+extra-0.99.15
+DISTNAME=	gtk+extra-0.99.17
 CATEGORIES=	x11
 MASTER_SITES=	http://gtkextra.sourceforge.net/src/
 
diff --git a/x11/gtk+extra/PLIST b/x11/gtk+extra/PLIST
index 088f9c4f16e..2d9cf8bcfd3 100644
--- a/x11/gtk+extra/PLIST
+++ b/x11/gtk+extra/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:10:54 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/09 14:46:51 drochner Exp $
 bin/gtkextra-config
 include/gtkextra/gtkbordercombo.h
 include/gtkextra/gtkcharsel.h
@@ -21,6 +21,7 @@ include/gtkextra/gtkplotbox.h
 include/gtkextra/gtkplotcanvas.h
 include/gtkextra/gtkplotcsurface.h
 include/gtkextra/gtkplotdata.h
+include/gtkextra/gtkplotdt.h
 include/gtkextra/gtkplotflux.h
 include/gtkextra/gtkplotgdk.h
 include/gtkextra/gtkplotpc.h
@@ -33,8 +34,8 @@ include/gtkextra/gtkpsfont.h
 include/gtkextra/gtksheet.h
 include/gtkextra/gtktogglecombo.h
 lib/libgtkextra.so
-lib/libgtkextra.so.15
-lib/libgtkextra.so.15.0
+lib/libgtkextra.so.17
+lib/libgtkextra.so.17.0
 lib/libgtkextra.a
 lib/libgtkextra.la
 @dirrm include/gtkextra
diff --git a/x11/gtk+extra/buildlink.mk b/x11/gtk+extra/buildlink.mk
new file mode 100644
index 00000000000..af1e6cefad1
--- /dev/null
+++ b/x11/gtk+extra/buildlink.mk
@@ -0,0 +1,54 @@
+# $NetBSD: buildlink.mk,v 1.1 2002/01/09 14:46:51 drochner Exp $
+#
+# This Makefile fragment is included by packages that use gtk.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally define BUILDLINK_DEPENDS.gtkextra to the dependency pattern
+#     for the version of gtk+extra desired.
+# (2) Include this Makefile fragment in the package Makefile,
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
+#     search path, and
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
+#     path.
+
+.if !defined(GTKEXTRA_BUILDLINK_MK)
+GTKEXTRA_BUILDLINK_MK=	# defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_DEPENDS.gtkextra?=	gtk+extra>=0.99.17
+DEPENDS+=		${BUILDLINK_DEPENDS.gtkextra}:../../x11/gtk+extra
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.gtkextra=gtk+extra
+BUILDLINK_PREFIX.gtkextra_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.gtkextra=	include/gtkextra/*
+BUILDLINK_FILES.gtkextra+=	lib/libgtkextra.*
+
+#REPLACE_BUILDLINK_SED+=	\
+#	-e "s|-I${BUILDLINK_DIR}/\(include/gtk-[^/]*/\)|-I${BUILDLINK_PREFIX.gtk}/\1|g"
+#BUILDLINK_CONFIG_WRAPPER_SED+=	\
+#	-e "s|-I${BUILDLINK_PREFIX.gtk}/\(include/gtk-[^/]*/\)|-I${BUILDLINK_DIR}/\1|g"
+
+.include "../../x11/gtk/buildlink.mk"
+
+BUILDLINK_TARGETS.gtkextra=	gtkextra-buildlink
+BUILDLINK_TARGETS.gtkextra+=	gtkextra-buildlink-config-wrapper
+BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.gtkextra}
+
+BUILDLINK_CONFIG.gtkextra=	${BUILDLINK_PREFIX.gtkextra}/bin/gtkextra-config
+BUILDLINK_CONFIG_WRAPPER.gtkextra=	${BUILDLINK_DIR}/bin/gtkextra-config
+#REPLACE_BUILDLINK_SED+=	\
+#	-e "s|${BUILDLINK_CONFIG_WRAPPER.gtkextra}|${BUILDLINK_CONFIG.gtkextra}|g"
+
+.if defined(USE_CONFIG_WRAPPER)
+GTKEXTRA_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.gtkextra}
+CONFIGURE_ENV+=		GTK_EXTRA_CONFIG="${GTKEXTRA_CONFIG}"
+#MAKE_ENV+=		GTK_EXTRA_CONFIG="${GTKEXTRA_CONFIG}"
+.endif
+
+pre-configure: ${BUILDLINK_TARGETS.gtkextra}
+gtkextra-buildlink: _BUILDLINK_USE
+gtkextra-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
+
+.endif	# GTKEXTRA_BUILDLINK_MK
diff --git a/x11/gtk+extra/distinfo b/x11/gtk+extra/distinfo
index c7e175ae7f6..d4b8eeadd0d 100644
--- a/x11/gtk+extra/distinfo
+++ b/x11/gtk+extra/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/07/11 10:35:56 drochner Exp $
+$NetBSD: distinfo,v 1.4 2002/01/09 14:46:51 drochner Exp $
 
-SHA1 (gtk+extra-0.99.15.tar.gz) = a2520b0d839a6da2f7312e601c8437845b81a88b
-Size (gtk+extra-0.99.15.tar.gz) = 399398 bytes
+SHA1 (gtk+extra-0.99.17.tar.gz) = 5dec008ef56469024f51d6631856b5b31f2158e7
+Size (gtk+extra-0.99.17.tar.gz) = 426952 bytes
 SHA1 (patch-aa) = d798284aa820f24dec4d3764761810e6c4503122
-SHA1 (patch-ab) = b49ea18fc70e2d4234e29aba23edecc054aa6291
-SHA1 (patch-ac) = 4961623d8f4611ec0288ec08c08feaa4800f2dcd
+SHA1 (patch-ab) = 2206f755a7d9d4494e75d201413f1caca5c8ecf3
+SHA1 (patch-ac) = 56ca2e0570a2825bd6718feb20a1467fbef86f1a
diff --git a/x11/gtk+extra/patches/patch-ab b/x11/gtk+extra/patches/patch-ab
index 56e9287cdd2..46ba9878f6e 100644
--- a/x11/gtk+extra/patches/patch-ab
+++ b/x11/gtk+extra/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2001/07/11 10:35:57 drochner Exp $
+$NetBSD: patch-ab,v 1.3 2002/01/09 14:46:52 drochner Exp $
 
---- gtkextra/Makefile.in.orig	Thu Jun 28 17:25:32 2001
-+++ gtkextra/Makefile.in	Tue Jul 10 13:20:55 2001
-@@ -123,7 +123,7 @@
+--- gtkextra/Makefile.in.orig	Wed Jan  9 12:22:56 2002
++++ gtkextra/Makefile.in	Wed Jan  9 12:23:53 2002
+@@ -126,7 +126,7 @@
  
  lib_LTLIBRARIES = libgtkextra.la
  libgtkextra_la_SOURCES = $(gtkextra_c_sources)
@@ -10,4 +10,4 @@ $NetBSD: patch-ab,v 1.2 2001/07/11 10:35:57 drochner Exp $
 +libgtkextra_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-export-dynamic 	$(shell gtk-config --libs) $(GTKGL_LIBS)
  
  EXTRA_HEADERS =  
- EXTRA_DIST =  $(gtkextra_private_h_sources) gtkextra.def Makefile.win32 makefile.msc sat.xpm sg_small.xpm cloud.xpm suncloud.xpm
+ EXTRA_DIST =  $(gtkextra_private_h_sources) gtkextra.def Makefile.win32 makefile.msc sat.xpm sg_small.xpm cloud.xpm suncloud.xpm testgtkplotdt.in
diff --git a/x11/gtk+extra/patches/patch-ac b/x11/gtk+extra/patches/patch-ac
index 338eda9695a..e83f2b7c206 100644
--- a/x11/gtk+extra/patches/patch-ac
+++ b/x11/gtk+extra/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.1 2001/07/11 10:35:57 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2002/01/09 14:46:52 drochner Exp $
 
---- gtkextra/gtkplotps.c.orig	Tue Jul 10 13:27:39 2001
-+++ gtkextra/gtkplotps.c	Tue Jul 10 13:28:10 2001
+--- gtkextra/gtkplotps.c.orig	Wed Jan  9 12:09:03 2002
++++ gtkextra/gtkplotps.c	Wed Jan  9 12:09:20 2002
 @@ -34,7 +34,6 @@
  #include <ctype.h>
  #include <time.h>
  #include <gtk/gtk.h>
 -#include <wctype.h>
+ #include <locale.h>
  
  #include "gtkplot.h"
- #include "gtkpsfont.h"