9 files changed, 76 insertions, 128 deletions

diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index 86bb98223610..52e6c65ad3ce 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -6,21 +6,33 @@
 #
 
 PORTNAME=	gtkextra
-PORTVERSION=	0.99.17
-PORTREVISION=	1
+PORTVERSION=	2.1.1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://gtkextra.sourceforge.net/src/ \
-		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	scigraphica
 DISTNAME=	${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A useful widget set complementary to GTK+
+COMMENT=	A useful widget set complementary to GTK+ 2.0
 
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=13
-USE_GNOME=	gtk12
+USE_LIBTOOL_VER=15
+USE_GNOME=	gtk20 gnomehack
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
+LATEST_LINK=	gtkextra2
+DOCSDIR=	${PREFIX}/share/doc/gtkextra2
+
+PORTDOCS=	*
+
+post-install:
+.if !defined(NOPORTDOCS)
+.  for d in reference tutorial
+	cd ${WRKSRC}/docs && \
+	${FIND} ${d} -type d ! -empty -exec ${MKDIR} "${DOCSDIR}/{}" \; && \
+	${FIND} ${d} -type f -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/{}" \;
+.  endfor
+.endif
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtkextra2/distinfo b/x11-toolkits/gtkextra2/distinfo
index 54bed6c57962..ae7183cea550 100644
--- a/x11-toolkits/gtkextra2/distinfo
+++ b/x11-toolkits/gtkextra2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gtk+extra-0.99.17.tar.gz) = 390e622c12a5c7f7845ee144ae13ab93
-SIZE (gtk+extra-0.99.17.tar.gz) = 426952
+MD5 (gtk+extra-2.1.1.tar.gz) = 1a933ca1286829383a0554cc2deb9e04
+SIZE (gtk+extra-2.1.1.tar.gz) = 893481
diff --git a/x11-toolkits/gtkextra2/files/patch-aa b/x11-toolkits/gtkextra2/files/patch-aa
deleted file mode 100644
index 78234c32d161..000000000000
--- a/x11-toolkits/gtkextra2/files/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-
-$FreeBSD$
-
---- 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)
--libgtkextra_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE) 	-export-dynamic 	$(shell gtk-config --libs) $(GTKGL_LIBS)
-+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 testgtkplotdt.in
- 
- # test programs, not to be installed
- 
--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-ab b/x11-toolkits/gtkextra2/files/patch-ab
deleted file mode 100644
index 12426187d2e9..000000000000
--- a/x11-toolkits/gtkextra2/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtkextra-config.in	2000/08/29 08:25:13	1.1
-+++ gtkextra-config.in	2000/08/29 08:26:26
-@@ -86,7 +86,7 @@
- 
- if test "$echo_libs" = "yes"; then
-       libdirs=-L@libdir@
--      echo $libdirs -lgtk -lgdk -lgtkextra -lglib -lm
-+      echo @GTK_LIBS@ $libdirs -lgtkextra -lm
- fi
- 
- 
diff --git a/x11-toolkits/gtkextra2/files/patch-ac b/x11-toolkits/gtkextra2/files/patch-ac
deleted file mode 100644
index b640137d09c7..000000000000
--- a/x11-toolkits/gtkextra2/files/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	Fri Mar  9 17:19:15 2001
-+++ Makefile.in	Sun Mar 11 12:36:59 2001
-@@ -448,6 +448,8 @@
- installdirs mostlyclean-generic distclean-generic clean-generic \
- maintainer-clean-generic clean mostlyclean distclean maintainer-clean
- 
-+gtk+extra.m4:
-+	cp gtk.m4 gtk+extra.m4
- 
- files:
-         @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
diff --git a/x11-toolkits/gtkextra2/files/patch-gtkextra::gtkplotdt.c b/x11-toolkits/gtkextra2/files/patch-gtkextra::gtkplotdt.c
deleted file mode 100644
index bfc112f0e900..000000000000
--- a/x11-toolkits/gtkextra2/files/patch-gtkextra::gtkplotdt.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$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
deleted file mode 100644
index 69cb86b60e9a..000000000000
--- a/x11-toolkits/gtkextra2/files/patch-gtkextra::gtkplotps.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- 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>
- #include <gtk/gtk.h>
-+#if __FreeBSD_version >= 500019
- #include <wctype.h>
-+#endif
- #include <locale.h>
- 
- #include "gtkplot.h"
diff --git a/x11-toolkits/gtkextra2/pkg-descr b/x11-toolkits/gtkextra2/pkg-descr
index 719c1361c8e0..cf241bbabf6e 100644
--- a/x11-toolkits/gtkextra2/pkg-descr
+++ b/x11-toolkits/gtkextra2/pkg-descr
@@ -1,5 +1,5 @@
-GTK+extra is a useful widget set complementary to GTK+ for creating graphical
-interfaces for the X Windows System. It is written in C and requires GTK+
-version 1.2.x.
+GtkExtra is a useful set of widgets for creating GUI's for the X
+Window System using GTK+ 2.0. You can use it complementary to GTK+ 2.0
+and it is written in C.
 
 WWW: http://gtkextra.sourceforge.net/
diff --git a/x11-toolkits/gtkextra2/pkg-plist b/x11-toolkits/gtkextra2/pkg-plist
index a49850b21179..2816563eb5ad 100644
--- a/x11-toolkits/gtkextra2/pkg-plist
+++ b/x11-toolkits/gtkextra2/pkg-plist
@@ -1,39 +1,52 @@
-bin/gtkextra-config
-include/gtkextra/gtkbordercombo.h
-include/gtkextra/gtkcharsel.h
-include/gtkextra/gtkcheckitem.h
-include/gtkextra/gtkcolorcombo.h
-include/gtkextra/gtkcombobox.h
-include/gtkextra/gtkdirtree.h
-include/gtkextra/gtkextra.h
-include/gtkextra/gtkextrafeatures.h
-include/gtkextra/gtkfileicons.h
-include/gtkextra/gtkfilelist.h
-include/gtkextra/gtkfontcombo.h
-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/gtkplotdt.h
-include/gtkextra/gtkplotflux.h
-include/gtkextra/gtkplotgdk.h
-include/gtkextra/gtkplotpc.h
-include/gtkextra/gtkplotpixmap.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.17
-share/aclocal/gtkextra.m4
-@dirrm include/gtkextra
+include/gtkextra-2.0/gtkextra/gtkbordercombo.h
+include/gtkextra-2.0/gtkextra/gtkcharsel.h
+include/gtkextra-2.0/gtkextra/gtkcheckitem.h
+include/gtkextra-2.0/gtkextra/gtkcolorcombo.h
+include/gtkextra-2.0/gtkextra/gtkcombobutton.h
+include/gtkextra-2.0/gtkextra/gtkdirtree.h
+include/gtkextra-2.0/gtkextra/gtkextra-marshal.h
+include/gtkextra-2.0/gtkextra/gtkextra.h
+include/gtkextra-2.0/gtkextra/gtkextrafeatures.h
+include/gtkextra-2.0/gtkextra/gtkextraicons.h
+include/gtkextra-2.0/gtkextra/gtkextratypebuiltins.h
+include/gtkextra-2.0/gtkextra/gtkfileicons.h
+include/gtkextra-2.0/gtkextra/gtkfilelist.h
+include/gtkextra-2.0/gtkextra/gtkfontcombo.h
+include/gtkextra-2.0/gtkextra/gtkiconfilesel.h
+include/gtkextra-2.0/gtkextra/gtkiconlist.h
+include/gtkextra-2.0/gtkextra/gtkitementry.h
+include/gtkextra-2.0/gtkextra/gtkplot.h
+include/gtkextra-2.0/gtkextra/gtkplot3d.h
+include/gtkextra-2.0/gtkextra/gtkplotarray.h
+include/gtkextra-2.0/gtkextra/gtkplotbar.h
+include/gtkextra-2.0/gtkextra/gtkplotbox.h
+include/gtkextra-2.0/gtkextra/gtkplotbubble.h
+include/gtkextra-2.0/gtkextra/gtkplotcandle.h
+include/gtkextra-2.0/gtkextra/gtkplotcanvas.h
+include/gtkextra-2.0/gtkextra/gtkplotcanvasellipse.h
+include/gtkextra-2.0/gtkextra/gtkplotcanvasline.h
+include/gtkextra-2.0/gtkextra/gtkplotcanvaspixmap.h
+include/gtkextra-2.0/gtkextra/gtkplotcanvasplot.h
+include/gtkextra-2.0/gtkextra/gtkplotcanvasrectangle.h
+include/gtkextra-2.0/gtkextra/gtkplotcanvastext.h
+include/gtkextra-2.0/gtkextra/gtkplotcsurface.h
+include/gtkextra-2.0/gtkextra/gtkplotdata.h
+include/gtkextra-2.0/gtkextra/gtkplotdt.h
+include/gtkextra-2.0/gtkextra/gtkplotflux.h
+include/gtkextra-2.0/gtkextra/gtkplotgdk.h
+include/gtkextra-2.0/gtkextra/gtkplotpc.h
+include/gtkextra-2.0/gtkextra/gtkplotpixmap.h
+include/gtkextra-2.0/gtkextra/gtkplotpolar.h
+include/gtkextra-2.0/gtkextra/gtkplotprint.h
+include/gtkextra-2.0/gtkextra/gtkplotps.h
+include/gtkextra-2.0/gtkextra/gtkplotsegment.h
+include/gtkextra-2.0/gtkextra/gtkplotsurface.h
+include/gtkextra-2.0/gtkextra/gtkpsfont.h
+include/gtkextra-2.0/gtkextra/gtksheet.h
+include/gtkextra-2.0/gtkextra/gtktogglecombo.h
+lib/libgtkextra-x11-2.0.a
+lib/libgtkextra-x11-2.0.so
+lib/libgtkextra-x11-2.0.so.1
+libdata/pkgconfig/gtkextra-2.0.pc
+@dirrm include/gtkextra-2.0/gtkextra
+@dirrm include/gtkextra-2.0