8 files changed, 36 insertions, 14 deletions

diff --git a/x11-toolkits/gtkextra/Makefile b/x11-toolkits/gtkextra/Makefile
index 7adf4fd1561b..99cfc2193499 100644
--- a/x11-toolkits/gtkextra/Makefile
+++ b/x11-toolkits/gtkextra/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	gtkextra
-PORTVERSION= 	0.99.11
+PORTVERSION= 	0.99.12
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://magnet.fsu.edu/~feiguin/gtk/src/
+MASTER_SITES=	http://gtkextra.sourceforge.net/src/ \
+		http://magnet.fsu.edu/~feiguin/gtk/src/
 DISTNAME=	${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
diff --git a/x11-toolkits/gtkextra/distinfo b/x11-toolkits/gtkextra/distinfo
index 6d4b6cb0d02d..ac4b529aea6a 100644
--- a/x11-toolkits/gtkextra/distinfo
+++ b/x11-toolkits/gtkextra/distinfo
@@ -1 +1 @@
-MD5 (gtk+extra-0.99.11.tar.gz) = d5a8f94552b751ef48ad4758ebd0da11
+MD5 (gtk+extra-0.99.12.tar.gz) = 106c7d44f2c3992b50e46ad22037aa63
diff --git a/x11-toolkits/gtkextra/files/patch-aa b/x11-toolkits/gtkextra/files/patch-aa
index 4fd4fa921239..aedd2eb7ce9f 100644
--- a/x11-toolkits/gtkextra/files/patch-aa
+++ b/x11-toolkits/gtkextra/files/patch-aa
@@ -1,11 +1,11 @@
---- gtkextra/Makefile.in	2000/10/18 11:13:56	1.1
-+++ gtkextra/Makefile.in	2000/10/18 11:14:01
+--- gtkextra/Makefile.in.orig	Sat Nov 18 23:02:45 2000
++++ gtkextra/Makefile.in	Wed Nov 22 13:38:22 2000
 @@ -123,7 +123,7 @@
  
  lib_LTLIBRARIES = libgtkextra.la
  libgtkextra_la_SOURCES = $(gtkextra_c_sources)
 -libgtkextra_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE) 	-export-dynamic 	$(shell gtk-config --libs)
-+libgtkextra_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-export-dynamic 	$(shell gtk-config --libs)
++libgtkextra_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-export-dynamic 	$(shell @GTK_CONFIG@ --libs)
  
  EXTRA_HEADERS =  
  EXTRA_DIST =  $(gtkextra_private_h_sources) gtkextra.def makefile.msc
diff --git a/x11-toolkits/gtkextra/pkg-plist b/x11-toolkits/gtkextra/pkg-plist
index c1c071643659..306342e49350 100644
--- a/x11-toolkits/gtkextra/pkg-plist
+++ b/x11-toolkits/gtkextra/pkg-plist
@@ -12,14 +12,24 @@ include/gtkextra/gtkiconfilesel.h
 include/gtkextra/gtkiconlist.h
 include/gtkextra/gtkitementry.h
 include/gtkextra/gtkplot.h
+include/gtkextra/gtkplot3d.h
+include/gtkextra/gtkplotbar.h
+include/gtkextra/gtkplotbox.h
 include/gtkextra/gtkplotcanvas.h
+include/gtkextra/gtkplotcsurface.h
+include/gtkextra/gtkplotdata.h
+include/gtkextra/gtkplotflux.h
+include/gtkextra/gtkplotgdk.h
 include/gtkextra/gtkplotpc.h
+include/gtkextra/gtkplotpolar.h
 include/gtkextra/gtkplotprint.h
 include/gtkextra/gtkplotps.h
+include/gtkextra/gtkplotsurface.h
 include/gtkextra/gtkpsfont.h
 include/gtkextra/gtksheet.h
+include/gtkextra/gtktogglecombo.h
 lib/libgtkextra.a
 lib/libgtkextra.so
-lib/libgtkextra.so.10
+lib/libgtkextra.so.12
 share/aclocal/gtk+extra.m4
 @dirrm include/gtkextra
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index 7adf4fd1561b..99cfc2193499 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	gtkextra
-PORTVERSION= 	0.99.11
+PORTVERSION= 	0.99.12
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://magnet.fsu.edu/~feiguin/gtk/src/
+MASTER_SITES=	http://gtkextra.sourceforge.net/src/ \
+		http://magnet.fsu.edu/~feiguin/gtk/src/
 DISTNAME=	${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
diff --git a/x11-toolkits/gtkextra2/distinfo b/x11-toolkits/gtkextra2/distinfo
index 6d4b6cb0d02d..ac4b529aea6a 100644
--- a/x11-toolkits/gtkextra2/distinfo
+++ b/x11-toolkits/gtkextra2/distinfo
@@ -1 +1 @@
-MD5 (gtk+extra-0.99.11.tar.gz) = d5a8f94552b751ef48ad4758ebd0da11
+MD5 (gtk+extra-0.99.12.tar.gz) = 106c7d44f2c3992b50e46ad22037aa63
diff --git a/x11-toolkits/gtkextra2/files/patch-aa b/x11-toolkits/gtkextra2/files/patch-aa
index 4fd4fa921239..aedd2eb7ce9f 100644
--- a/x11-toolkits/gtkextra2/files/patch-aa
+++ b/x11-toolkits/gtkextra2/files/patch-aa
@@ -1,11 +1,11 @@
---- gtkextra/Makefile.in	2000/10/18 11:13:56	1.1
-+++ gtkextra/Makefile.in	2000/10/18 11:14:01
+--- gtkextra/Makefile.in.orig	Sat Nov 18 23:02:45 2000
++++ gtkextra/Makefile.in	Wed Nov 22 13:38:22 2000
 @@ -123,7 +123,7 @@
  
  lib_LTLIBRARIES = libgtkextra.la
  libgtkextra_la_SOURCES = $(gtkextra_c_sources)
 -libgtkextra_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE) 	-export-dynamic 	$(shell gtk-config --libs)
-+libgtkextra_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-export-dynamic 	$(shell gtk-config --libs)
++libgtkextra_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-export-dynamic 	$(shell @GTK_CONFIG@ --libs)
  
  EXTRA_HEADERS =  
  EXTRA_DIST =  $(gtkextra_private_h_sources) gtkextra.def makefile.msc
diff --git a/x11-toolkits/gtkextra2/pkg-plist b/x11-toolkits/gtkextra2/pkg-plist
index c1c071643659..306342e49350 100644
--- a/x11-toolkits/gtkextra2/pkg-plist
+++ b/x11-toolkits/gtkextra2/pkg-plist
@@ -12,14 +12,24 @@ include/gtkextra/gtkiconfilesel.h
 include/gtkextra/gtkiconlist.h
 include/gtkextra/gtkitementry.h
 include/gtkextra/gtkplot.h
+include/gtkextra/gtkplot3d.h
+include/gtkextra/gtkplotbar.h
+include/gtkextra/gtkplotbox.h
 include/gtkextra/gtkplotcanvas.h
+include/gtkextra/gtkplotcsurface.h
+include/gtkextra/gtkplotdata.h
+include/gtkextra/gtkplotflux.h
+include/gtkextra/gtkplotgdk.h
 include/gtkextra/gtkplotpc.h
+include/gtkextra/gtkplotpolar.h
 include/gtkextra/gtkplotprint.h
 include/gtkextra/gtkplotps.h
+include/gtkextra/gtkplotsurface.h
 include/gtkextra/gtkpsfont.h
 include/gtkextra/gtksheet.h
+include/gtkextra/gtktogglecombo.h
 lib/libgtkextra.a
 lib/libgtkextra.so
-lib/libgtkextra.so.10
+lib/libgtkextra.so.12
 share/aclocal/gtk+extra.m4
 @dirrm include/gtkextra