12 files changed, 56 insertions, 24 deletions

diff --git a/x11-toolkits/gtkextra/Makefile b/x11-toolkits/gtkextra/Makefile
index 2f44076325f7..82ec60bd2a5a 100644
--- a/x11-toolkits/gtkextra/Makefile
+++ b/x11-toolkits/gtkextra/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkextra
-PORTVERSION=	0.99.16
+PORTVERSION=	0.99.17
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://gtkextra.sourceforge.net/src/ \
 		${MASTER_SITE_SOURCEFORGE} \
diff --git a/x11-toolkits/gtkextra/distinfo b/x11-toolkits/gtkextra/distinfo
index 8a46af383fa9..695cb926ea15 100644
--- a/x11-toolkits/gtkextra/distinfo
+++ b/x11-toolkits/gtkextra/distinfo
@@ -1 +1 @@
-MD5 (gtk+extra-0.99.16.tar.gz) = 36846324144fc148c3e78781335044d6
+MD5 (gtk+extra-0.99.17.tar.gz) = 390e622c12a5c7f7845ee144ae13ab93
diff --git a/x11-toolkits/gtkextra/files/patch-aa b/x11-toolkits/gtkextra/files/patch-aa
index 4fede6ccf5c8..78234c32d161 100644
--- a/x11-toolkits/gtkextra/files/patch-aa
+++ b/x11-toolkits/gtkextra/files/patch-aa
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- gtkextra/Makefile.in.orig	Thu Jun 28 18:25:32 2001
-+++ gtkextra/Makefile.in	Mon Jul  2 17:45:25 2001
-@@ -123,14 +123,14 @@
+--- gtkextra/Makefile.in.orig	Fri Nov 30 17:28:46 2001
++++ gtkextra/Makefile.in	Wed Dec  5 10:57:22 2001
+@@ -126,14 +126,14 @@
  
  lib_LTLIBRARIES = libgtkextra.la
  libgtkextra_la_SOURCES = $(gtkextra_c_sources)
@@ -11,12 +11,12 @@ $FreeBSD$
 +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
  
  # test programs, not to be installed
  
--noinst_PROGRAMS = testgtksheet testgtkiconlist testgtkfilesel testgtkplot testgtkfont testrealtime testpolar testgtkplot3d testcontour testbubbles testflux testboxes testimage testpixmap testcharsel
-+noinst_PROGRAMS = #testgtksheet testgtkiconlist testgtkfilesel testgtkplot testgtkfont testrealtime testpolar testgtkplot3d testcontour testbubbles testflux testboxes testimage testpixmap testcharsel
+-noinst_PROGRAMS = testgtksheet testgtkiconlist testgtkfilesel testgtkplot testgtkfont testrealtime testiterator testpolar testgtkplot3d testcontour testbubbles testflux testboxes testimage testpixmap testcharsel testdt testgtkplotdt
++noinst_PROGRAMS = #testgtksheet testgtkiconlist testgtkfilesel testgtkplot testgtkfont testrealtime testiterator testpolar testgtkplot3d testcontour testbubbles testflux testboxes testimage testpixmap testcharsel testdt testgtkplotdt
  DEPS = libgtkextra.la
  LDADDS = libgtkextra.la $(GTK_LIBS)
  
diff --git a/x11-toolkits/gtkextra/files/patch-gtkextra::gtkplotdt.c b/x11-toolkits/gtkextra/files/patch-gtkextra::gtkplotdt.c
new file mode 100644
index 000000000000..bfc112f0e900
--- /dev/null
+++ b/x11-toolkits/gtkextra/files/patch-gtkextra::gtkplotdt.c
@@ -0,0 +1,15 @@
+
+$FreeBSD$
+
+--- gtkextra/gtkplotdt.c	2001/12/05 09:01:36	1.1
++++ gtkextra/gtkplotdt.c	2001/12/05 09:02:12
+@@ -20,7 +20,9 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <math.h>
++#ifndef __FreeBSD__
+ #include <malloc.h>
++#endif
+ #include <string.h>
+ #include <gtk/gtk.h>
+ #include "gtkplotdt.h"
diff --git a/x11-toolkits/gtkextra/files/patch-gtkextra::gtkplotps.c b/x11-toolkits/gtkextra/files/patch-gtkextra::gtkplotps.c
index 2f634944ab6c..69cb86b60e9a 100644
--- a/x11-toolkits/gtkextra/files/patch-gtkextra::gtkplotps.c
+++ b/x11-toolkits/gtkextra/files/patch-gtkextra::gtkplotps.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- gtkextra/gtkplotps.c	2001/07/05 08:52:19	1.1
-+++ gtkextra/gtkplotps.c	2001/07/05 08:52:48
+--- gtkextra/gtkplotps.c.orig	Fri Nov 30 17:13:40 2001
++++ gtkextra/gtkplotps.c	Wed Dec  5 10:58:27 2001
 @@ -34,7 +34,9 @@
  #include <ctype.h>
  #include <time.h>
@@ -10,6 +10,6 @@ $FreeBSD$
 +#if __FreeBSD_version >= 500019
  #include <wctype.h>
 +#endif
+ #include <locale.h>
  
  #include "gtkplot.h"
- #include "gtkpsfont.h"
diff --git a/x11-toolkits/gtkextra/pkg-plist b/x11-toolkits/gtkextra/pkg-plist
index 0ef6222aaca0..a49850b21179 100644
--- a/x11-toolkits/gtkextra/pkg-plist
+++ b/x11-toolkits/gtkextra/pkg-plist
@@ -20,6 +20,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,6 +34,6 @@ include/gtkextra/gtksheet.h
 include/gtkextra/gtktogglecombo.h
 lib/libgtkextra.a
 lib/libgtkextra.so
-lib/libgtkextra.so.16
+lib/libgtkextra.so.17
 share/aclocal/gtkextra.m4
 @dirrm include/gtkextra
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index 2f44076325f7..82ec60bd2a5a 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkextra
-PORTVERSION=	0.99.16
+PORTVERSION=	0.99.17
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://gtkextra.sourceforge.net/src/ \
 		${MASTER_SITE_SOURCEFORGE} \
diff --git a/x11-toolkits/gtkextra2/distinfo b/x11-toolkits/gtkextra2/distinfo
index 8a46af383fa9..695cb926ea15 100644
--- a/x11-toolkits/gtkextra2/distinfo
+++ b/x11-toolkits/gtkextra2/distinfo
@@ -1 +1 @@
-MD5 (gtk+extra-0.99.16.tar.gz) = 36846324144fc148c3e78781335044d6
+MD5 (gtk+extra-0.99.17.tar.gz) = 390e622c12a5c7f7845ee144ae13ab93
diff --git a/x11-toolkits/gtkextra2/files/patch-aa b/x11-toolkits/gtkextra2/files/patch-aa
index 4fede6ccf5c8..78234c32d161 100644
--- a/x11-toolkits/gtkextra2/files/patch-aa
+++ b/x11-toolkits/gtkextra2/files/patch-aa
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- gtkextra/Makefile.in.orig	Thu Jun 28 18:25:32 2001
-+++ gtkextra/Makefile.in	Mon Jul  2 17:45:25 2001
-@@ -123,14 +123,14 @@
+--- gtkextra/Makefile.in.orig	Fri Nov 30 17:28:46 2001
++++ gtkextra/Makefile.in	Wed Dec  5 10:57:22 2001
+@@ -126,14 +126,14 @@
  
  lib_LTLIBRARIES = libgtkextra.la
  libgtkextra_la_SOURCES = $(gtkextra_c_sources)
@@ -11,12 +11,12 @@ $FreeBSD$
 +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
  
  # test programs, not to be installed
  
--noinst_PROGRAMS = testgtksheet testgtkiconlist testgtkfilesel testgtkplot testgtkfont testrealtime testpolar testgtkplot3d testcontour testbubbles testflux testboxes testimage testpixmap testcharsel
-+noinst_PROGRAMS = #testgtksheet testgtkiconlist testgtkfilesel testgtkplot testgtkfont testrealtime testpolar testgtkplot3d testcontour testbubbles testflux testboxes testimage testpixmap testcharsel
+-noinst_PROGRAMS = testgtksheet testgtkiconlist testgtkfilesel testgtkplot testgtkfont testrealtime testiterator testpolar testgtkplot3d testcontour testbubbles testflux testboxes testimage testpixmap testcharsel testdt testgtkplotdt
++noinst_PROGRAMS = #testgtksheet testgtkiconlist testgtkfilesel testgtkplot testgtkfont testrealtime testiterator testpolar testgtkplot3d testcontour testbubbles testflux testboxes testimage testpixmap testcharsel testdt testgtkplotdt
  DEPS = libgtkextra.la
  LDADDS = libgtkextra.la $(GTK_LIBS)
  
diff --git a/x11-toolkits/gtkextra2/files/patch-gtkextra::gtkplotdt.c b/x11-toolkits/gtkextra2/files/patch-gtkextra::gtkplotdt.c
new file mode 100644
index 000000000000..bfc112f0e900
--- /dev/null
+++ b/x11-toolkits/gtkextra2/files/patch-gtkextra::gtkplotdt.c
@@ -0,0 +1,15 @@
+
+$FreeBSD$
+
+--- gtkextra/gtkplotdt.c	2001/12/05 09:01:36	1.1
++++ gtkextra/gtkplotdt.c	2001/12/05 09:02:12
+@@ -20,7 +20,9 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <math.h>
++#ifndef __FreeBSD__
+ #include <malloc.h>
++#endif
+ #include <string.h>
+ #include <gtk/gtk.h>
+ #include "gtkplotdt.h"
diff --git a/x11-toolkits/gtkextra2/files/patch-gtkextra::gtkplotps.c b/x11-toolkits/gtkextra2/files/patch-gtkextra::gtkplotps.c
index 2f634944ab6c..69cb86b60e9a 100644
--- a/x11-toolkits/gtkextra2/files/patch-gtkextra::gtkplotps.c
+++ b/x11-toolkits/gtkextra2/files/patch-gtkextra::gtkplotps.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- gtkextra/gtkplotps.c	2001/07/05 08:52:19	1.1
-+++ gtkextra/gtkplotps.c	2001/07/05 08:52:48
+--- gtkextra/gtkplotps.c.orig	Fri Nov 30 17:13:40 2001
++++ gtkextra/gtkplotps.c	Wed Dec  5 10:58:27 2001
 @@ -34,7 +34,9 @@
  #include <ctype.h>
  #include <time.h>
@@ -10,6 +10,6 @@ $FreeBSD$
 +#if __FreeBSD_version >= 500019
  #include <wctype.h>
 +#endif
+ #include <locale.h>
  
  #include "gtkplot.h"
- #include "gtkpsfont.h"
diff --git a/x11-toolkits/gtkextra2/pkg-plist b/x11-toolkits/gtkextra2/pkg-plist
index 0ef6222aaca0..a49850b21179 100644
--- a/x11-toolkits/gtkextra2/pkg-plist
+++ b/x11-toolkits/gtkextra2/pkg-plist
@@ -20,6 +20,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,6 +34,6 @@ include/gtkextra/gtksheet.h
 include/gtkextra/gtktogglecombo.h
 lib/libgtkextra.a
 lib/libgtkextra.so
-lib/libgtkextra.so.16
+lib/libgtkextra.so.17
 share/aclocal/gtkextra.m4
 @dirrm include/gtkextra