- update gtk+extra to 2.1.1 (switches from gtk+1 to gtk+2)

- remove ckuethe@ as maintainer, chris agrees

x11/gtk+extra/Makefile

@@ -1,28 +1,30 @@
-# $OpenBSD: Makefile,v 1.8 2008/02/01 21:38:27 steven Exp $
+# $OpenBSD: Makefile,v 1.9 2009/03/06 21:10:30 jasper Exp $
 
-COMMENT=	GTK Extra Widget Set
+COMMENT=	GTK+2 Extra Widget Set
 
-DISTNAME=	gtk+extra-0.99.17
+DISTNAME=	gtk+extra-2.1.1
-PKGNAME=	${DISTNAME}p3
+SHARED_LIBS +=  gtkextra-x11-2.0     0.0      # .1.0
-SHARED_LIBS=	gtkextra 17.0
 CATEGORIES=	x11 devel
 
-HOMEPAGE=	http://gtkextra.sourceforge.net
+HOMEPAGE=	http://gtkextra.sourceforge.net/
-MAINTAINER=	Chris Kuethe <ckuethe@ualberta.ca>
 
-# LGPL
+# LGPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	${HOMEPAGE}/src/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scigraphica/}
 
-WANTLIB=	X11 Xext Xi Xau Xdmcp m glib gmodule
+WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
+WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig
+WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0
+WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
+WANTLIB += png z
 
 MODULES=	devel/gettext
 
-LIB_DEPENDS=	gtk.>=2,gdk.>=2::x11/gtk+
+LIB_DEPENDS=	gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
 
 USE_X11=	Yes
 USE_GMAKE=	Yes

x11/gtk+extra/distinfo

@@ -1,5 +1,5 @@
-MD5 (gtk+extra-0.99.17.tar.gz) = OQ5iLBKlx/eEXuFErhOrkw==
+MD5 (gtk+extra-2.1.1.tar.gz) = GpM8oShoKTg6BVTMLeueBA==
-RMD160 (gtk+extra-0.99.17.tar.gz) = 8wY4S90V9k0gCdO2pBg+ayf5DlE=
+RMD160 (gtk+extra-2.1.1.tar.gz) = cTT+TFqqpF7jp+ZR88R3unxHchQ=
-SHA1 (gtk+extra-0.99.17.tar.gz) = XewAjvVkaQJPUdZjGFa1sx8hWOc=
+SHA1 (gtk+extra-2.1.1.tar.gz) = lNeunLOu8FFZz/8UgmX8nOCXOYA=
-SHA256 (gtk+extra-0.99.17.tar.gz) = Ga8apJ+V3lGo/MJNmu/5PKTwePUFO/9tVKBIWcQlKWs=
+SHA256 (gtk+extra-2.1.1.tar.gz) = gtF5/S6z/VrLyfxNdFB8VZxrwyacSI3IZC+bykel2+Q=
-SIZE (gtk+extra-0.99.17.tar.gz) = 426952
+SIZE (gtk+extra-2.1.1.tar.gz) = 893481

x11/gtk+extra/patches/patch-gtkextra_Makefile_in

@@ -1,12 +0,0 @@
-$OpenBSD: patch-gtkextra_Makefile_in,v 1.2 2006/01/01 22:23:04 naddy Exp $
---- gtkextra/Makefile.in.orig	Tue Jan 21 20:22:23 2003
-+++ gtkextra/Makefile.in	Tue Jan 21 20:22:50 2003
-@@ -126,7 +126,7 @@ libgtkextrainclude_HEADERS = $(gtkextra_
- 
- 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 =  	$(LIBgtkextra_LTVERSION) 	-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

x11/gtk+extra/pkg/PFRAG.shared

@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2006/01/01 22:23:04 naddy Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.4 2009/03/06 21:10:30 jasper Exp $
-@lib lib/libgtkextra.so.${LIBgtkextra_VERSION}
+@lib lib/libgtkextra-x11-2.0.so.${LIBgtkextra-x11-2.0_VERSION}

x11/gtk+extra/pkg/PLIST

@@ -1,40 +1,54 @@
-@comment $OpenBSD: PLIST,v 1.3 2006/01/01 22:23:04 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.4 2009/03/06 21:10:30 jasper Exp $
-bin/gtkextra-config
-include/gtkextra/
-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.la
-share/aclocal/gtkextra.m4
 %%SHARED%%
+include/gtkextra-2.0/
+include/gtkextra-2.0/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.la
+lib/pkgconfig/
+lib/pkgconfig/gtkextra-2.0.pc