5 files changed, 118 insertions, 107 deletions

diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index f4a2337e918a..5df66d0ee0de 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -5,24 +5,24 @@
 # $FreeBSD$
 
 PORTNAME=	gtk
-PORTVERSION=	1.99.12
+PORTVERSION=	1.99.13
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/pygtk/1.99
-DISTNAME=	pygtk-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	pygtk-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	marc@informatik.uni-bremen.de
 
-LIB_DEPENDS=	gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20 \
-		glade-2.0.0:${PORTSDIR}/devel/libglade2 \
+LIB_DEPENDS=	glade-2.0.0:${PORTSDIR}/devel/libglade2 \
 		gtkgl-2.0:${PORTSDIR}/x11-toolkits/gtkglarea2
 RUN_DEPENDS=	${PYNUMERIC}
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOMENG=	yes
+USE_GNOME=	gnomehack
 USE_PYTHON=	yes
 USE_LIBTOOL=	yes
 
diff --git a/x11-toolkits/py-gtk2/distinfo b/x11-toolkits/py-gtk2/distinfo
index 60c919687bbf..e58fa8f0b2c3 100644
--- a/x11-toolkits/py-gtk2/distinfo
+++ b/x11-toolkits/py-gtk2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/pygtk-1.99.12.tar.bz2) = f6897f613d83282d69e3cf911bc23c51
+MD5 (gnome2/pygtk-1.99.13.tar.bz2) = 1c774e143704a2755fc25b19399775a8
diff --git a/x11-toolkits/py-gtk2/files/patch-configure b/x11-toolkits/py-gtk2/files/patch-configure
new file mode 100644
index 000000000000..ae3ea6ce6ead
--- /dev/null
+++ b/x11-toolkits/py-gtk2/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Sat Oct 12 17:21:22 2002
++++ configure	Sat Oct 12 17:21:49 2002
+@@ -7487,6 +7487,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11-toolkits/py-gtk2/pkg-install b/x11-toolkits/py-gtk2/pkg-install
index 5bedff250f38..a26468bf3372 100644
--- a/x11-toolkits/py-gtk2/pkg-install
+++ b/x11-toolkits/py-gtk2/pkg-install
@@ -10,7 +10,7 @@ export PATH
 if [ "$2" = "PRE-INSTALL" ]; then
      if pkg_info | grep "^py-gtk-[0-9]"; then
          echo "py-gtk for GTK+ 1.x was detected."
-         echo "This packages cannot coexist with py-gtk2."
+         echo "This packages cannot coexist with py-gtk."
 	 false
      fi
 fi
diff --git a/x11-toolkits/py-gtk2/pkg-plist b/x11-toolkits/py-gtk2/pkg-plist
index 3aa97c9f3b85..a6a1199d5443 100644
--- a/x11-toolkits/py-gtk2/pkg-plist
+++ b/x11-toolkits/py-gtk2/pkg-plist
@@ -1,26 +1,26 @@
 bin/pygtk-codegen-2.0
 include/pygtk-2.0/pygtk/pygtk.h
 include/pygtk-2.0/pygobject.h
-%%PYTHON_SITELIBDIR%%/atkmodule.la
-%%PYTHON_SITELIBDIR%%/atkmodule.so
-%%PYTHON_SITELIBDIR%%/gobjectmodule.la
-%%PYTHON_SITELIBDIR%%/gobjectmodule.so
-%%PYTHON_SITELIBDIR%%/gtk/__init__.py
-%%PYTHON_SITELIBDIR%%/gtk/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gtk/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gtk/_gtkmodule.la
-%%PYTHON_SITELIBDIR%%/gtk/_gtkmodule.so
-%%PYTHON_SITELIBDIR%%/gtk/compat.py
-%%PYTHON_SITELIBDIR%%/gtk/compat.pyc
-%%PYTHON_SITELIBDIR%%/gtk/compat.pyo
-%%PYTHON_SITELIBDIR%%/gtk/glademodule.la
-%%PYTHON_SITELIBDIR%%/gtk/glademodule.so
-%%PYTHON_SITELIBDIR%%/gtk/keysyms.py
-%%PYTHON_SITELIBDIR%%/gtk/keysyms.pyc
-%%PYTHON_SITELIBDIR%%/gtk/keysyms.pyo
-%%PYTHON_SITELIBDIR%%/pangomodule.la
-%%PYTHON_SITELIBDIR%%/pangomodule.so
-lib/pkgconfig/pygtk-2.0.pc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/_gtkmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/glademodule.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/glmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/__init__.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/keysyms.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/compat.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/keysyms.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/compat.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/keysyms.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/compat.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gobjectmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/pangomodule.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/atkmodule.so
+%%PYTHON_SITELIBDIR%%/pygtk.pth
+%%PYTHON_SITELIBDIR%%/pygtk.py
+%%PYTHON_SITELIBDIR%%/pygtk.pyc
+%%PYTHON_SITELIBDIR%%/pygtk.pyo
+libdata/pkgconfig/pygtk-2.0.pc
 %%PORTDOCS%%share/doc/py-gtk/MAPPING
 %%PORTDOCS%%share/doc/py-gtk/THREADS
 %%PORTDOCS%%share/examples/py-gtk/atk/atk-demo.py
@@ -31,25 +31,24 @@ lib/pkgconfig/pygtk-2.0.pc
 %%PORTDOCS%%share/examples/py-gtk/glade/README
 %%PORTDOCS%%share/examples/py-gtk/glade/glade-demo.py
 %%PORTDOCS%%share/examples/py-gtk/glade/test.glade
-%%PORTDOCS%%share/examples/py-gtk/gobject/properties.py
 %%PORTDOCS%%share/examples/py-gtk/gobject/signal.py
-%%PORTDOCS%%share/examples/py-gtk/ide/README
-%%PORTDOCS%%share/examples/py-gtk/ide/break.xpm
-%%PORTDOCS%%share/examples/py-gtk/ide/browse.py
-%%PORTDOCS%%share/examples/py-gtk/ide/continue.xpm
-%%PORTDOCS%%share/examples/py-gtk/ide/edit.py
-%%PORTDOCS%%share/examples/py-gtk/ide/edit.xpm
+%%PORTDOCS%%share/examples/py-gtk/gobject/properties.py
 %%PORTDOCS%%share/examples/py-gtk/ide/gtkcons.py
 %%PORTDOCS%%share/examples/py-gtk/ide/gtkdb.py
-%%PORTDOCS%%share/examples/py-gtk/ide/gtkprof.py
+%%PORTDOCS%%share/examples/py-gtk/ide/edit.py
+%%PORTDOCS%%share/examples/py-gtk/ide/browse.py
 %%PORTDOCS%%share/examples/py-gtk/ide/minibreak.xpm
-%%PORTDOCS%%share/examples/py-gtk/ide/next.xpm
+%%PORTDOCS%%share/examples/py-gtk/ide/README
+%%PORTDOCS%%share/examples/py-gtk/ide/gtkprof.py
 %%PORTDOCS%%share/examples/py-gtk/ide/pyide.py
-%%PORTDOCS%%share/examples/py-gtk/ide/quit.xpm
+%%PORTDOCS%%share/examples/py-gtk/ide/break.xpm
 %%PORTDOCS%%share/examples/py-gtk/ide/return.xpm
-%%PORTDOCS%%share/examples/py-gtk/ide/run.xpm
+%%PORTDOCS%%share/examples/py-gtk/ide/next.xpm
+%%PORTDOCS%%share/examples/py-gtk/ide/continue.xpm
 %%PORTDOCS%%share/examples/py-gtk/ide/step.xpm
-%%PORTDOCS%%share/examples/py-gtk/neil/README
+%%PORTDOCS%%share/examples/py-gtk/ide/edit.xpm
+%%PORTDOCS%%share/examples/py-gtk/ide/run.xpm
+%%PORTDOCS%%share/examples/py-gtk/ide/quit.xpm
 %%PORTDOCS%%share/examples/py-gtk/neil/TAppli.py
 %%PORTDOCS%%share/examples/py-gtk/neil/TAppli2.py
 %%PORTDOCS%%share/examples/py-gtk/neil/TAppli3.py
@@ -57,16 +56,17 @@ lib/pkgconfig/pygtk-2.0.pc
 %%PORTDOCS%%share/examples/py-gtk/neil/TAppli5.py
 %%PORTDOCS%%share/examples/py-gtk/neil/bomb.xpm
 %%PORTDOCS%%share/examples/py-gtk/neil/gtk-logo.xpm
-%%PORTDOCS%%share/examples/py-gtk/neil/notebook.py
 %%PORTDOCS%%share/examples/py-gtk/neil/question.xpm
+%%PORTDOCS%%share/examples/py-gtk/neil/notebook.py
+%%PORTDOCS%%share/examples/py-gtk/neil/README
 %%PORTDOCS%%share/examples/py-gtk/pango/utf8-demo.py
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/__init__.py
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/appwindow.py
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/buttonbox.py
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/colorsel.py
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/dialogs.py
-%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/dnd.py
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/dndpixmap.py
+%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/dnd.py
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/itemfactory.py
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/list_store.py
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/menu.py
@@ -75,76 +75,77 @@ lib/pkgconfig/pygtk-2.0.pc
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/toolbar.py
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/treemodel.py
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/pygtk-demo.py
-%%PORTDOCS%%share/examples/py-gtk/simple/README
-%%PORTDOCS%%share/examples/py-gtk/simple/dnd.py
-%%PORTDOCS%%share/examples/py-gtk/simple/dndpixmap.py
 %%PORTDOCS%%share/examples/py-gtk/simple/hello.py
-%%PORTDOCS%%share/examples/py-gtk/simple/scribble.py
 %%PORTDOCS%%share/examples/py-gtk/simple/simple.py
 %%PORTDOCS%%share/examples/py-gtk/simple/tooltip.py
-share/pygtk/2.0/codegen/__init__.py
-share/pygtk/2.0/codegen/__init__.pyc
-share/pygtk/2.0/codegen/__init__.pyo
-share/pygtk/2.0/codegen/argtypes.py
-share/pygtk/2.0/codegen/argtypes.pyc
-share/pygtk/2.0/codegen/argtypes.pyo
-share/pygtk/2.0/codegen/codegen.py
-share/pygtk/2.0/codegen/codegen.pyc
-share/pygtk/2.0/codegen/codegen.pyo
-share/pygtk/2.0/codegen/definitions.py
-share/pygtk/2.0/codegen/definitions.pyc
-share/pygtk/2.0/codegen/definitions.pyo
-share/pygtk/2.0/codegen/defsparser.py
-share/pygtk/2.0/codegen/defsparser.pyc
-share/pygtk/2.0/codegen/defsparser.pyo
-share/pygtk/2.0/codegen/docextract.py
-share/pygtk/2.0/codegen/docextract.pyc
-share/pygtk/2.0/codegen/docextract.pyo
-share/pygtk/2.0/codegen/docgen.py
-share/pygtk/2.0/codegen/docgen.pyc
-share/pygtk/2.0/codegen/docgen.pyo
-share/pygtk/2.0/codegen/h2def.py
-share/pygtk/2.0/codegen/h2def.pyc
-share/pygtk/2.0/codegen/h2def.pyo
-share/pygtk/2.0/codegen/mergedefs.py
-share/pygtk/2.0/codegen/mergedefs.pyc
-share/pygtk/2.0/codegen/mergedefs.pyo
-share/pygtk/2.0/codegen/mkskel.py
-share/pygtk/2.0/codegen/mkskel.pyc
-share/pygtk/2.0/codegen/mkskel.pyo
-share/pygtk/2.0/codegen/override.py
-share/pygtk/2.0/codegen/override.pyc
-share/pygtk/2.0/codegen/override.pyo
-share/pygtk/2.0/codegen/scmexpr.py
-share/pygtk/2.0/codegen/scmexpr.pyc
-share/pygtk/2.0/codegen/scmexpr.pyo
-share/pygtk/2.0/defs/gtk.defs
-share/pygtk/2.0/defs/gtk-types.defs
-share/pygtk/2.0/defs/gtk-extrafuncs.defs
-share/pygtk/2.0/defs/gdk.defs
-share/pygtk/2.0/defs/gdk-types.defs
-share/pygtk/2.0/defs/libglade.defs
-share/pygtk/2.0/defs/gtkgl.defs
-share/pygtk/2.0/defs/pango.defs
-share/pygtk/2.0/defs/pango-types.defs
-share/pygtk/2.0/defs/atk.defs
-share/pygtk/2.0/defs/atk-types.defs
-@dirrm share/pygtk/2.0/defs
-@dirrm share/pygtk/2.0/codegen
-@dirrm share/pygtk/2.0
-@dirrm share/pygtk
-%%PORTDOCS%%@dirrm share/examples/py-gtk/simple
+%%PORTDOCS%%share/examples/py-gtk/simple/scribble.py
+%%PORTDOCS%%share/examples/py-gtk/simple/dnd.py
+%%PORTDOCS%%share/examples/py-gtk/simple/dndpixmap.py
+%%PORTDOCS%%share/examples/py-gtk/simple/README
+%%PORTDOCS%%share/pygtk/2.0/codegen/__init__.py
+%%PORTDOCS%%share/pygtk/2.0/codegen/argtypes.py
+%%PORTDOCS%%share/pygtk/2.0/codegen/codegen.py
+%%PORTDOCS%%share/pygtk/2.0/codegen/definitions.py
+%%PORTDOCS%%share/pygtk/2.0/codegen/defsparser.py
+%%PORTDOCS%%share/pygtk/2.0/codegen/docextract.py
+%%PORTDOCS%%share/pygtk/2.0/codegen/docgen.py
+%%PORTDOCS%%share/pygtk/2.0/codegen/h2def.py
+%%PORTDOCS%%share/pygtk/2.0/codegen/mergedefs.py
+%%PORTDOCS%%share/pygtk/2.0/codegen/mkskel.py
+%%PORTDOCS%%share/pygtk/2.0/codegen/override.py
+%%PORTDOCS%%share/pygtk/2.0/codegen/scmexpr.py
+%%PORTDOCS%%share/pygtk/2.0/codegen/__init__.pyc
+%%PORTDOCS%%share/pygtk/2.0/codegen/argtypes.pyc
+%%PORTDOCS%%share/pygtk/2.0/codegen/codegen.pyc
+%%PORTDOCS%%share/pygtk/2.0/codegen/definitions.pyc
+%%PORTDOCS%%share/pygtk/2.0/codegen/defsparser.pyc
+%%PORTDOCS%%share/pygtk/2.0/codegen/docextract.pyc
+%%PORTDOCS%%share/pygtk/2.0/codegen/docgen.pyc
+%%PORTDOCS%%share/pygtk/2.0/codegen/h2def.pyc
+%%PORTDOCS%%share/pygtk/2.0/codegen/mergedefs.pyc
+%%PORTDOCS%%share/pygtk/2.0/codegen/mkskel.pyc
+%%PORTDOCS%%share/pygtk/2.0/codegen/override.pyc
+%%PORTDOCS%%share/pygtk/2.0/codegen/scmexpr.pyc
+%%PORTDOCS%%share/pygtk/2.0/codegen/__init__.pyo
+%%PORTDOCS%%share/pygtk/2.0/codegen/argtypes.pyo
+%%PORTDOCS%%share/pygtk/2.0/codegen/codegen.pyo
+%%PORTDOCS%%share/pygtk/2.0/codegen/definitions.pyo
+%%PORTDOCS%%share/pygtk/2.0/codegen/defsparser.pyo
+%%PORTDOCS%%share/pygtk/2.0/codegen/docextract.pyo
+%%PORTDOCS%%share/pygtk/2.0/codegen/docgen.pyo
+%%PORTDOCS%%share/pygtk/2.0/codegen/h2def.pyo
+%%PORTDOCS%%share/pygtk/2.0/codegen/mergedefs.pyo
+%%PORTDOCS%%share/pygtk/2.0/codegen/mkskel.pyo
+%%PORTDOCS%%share/pygtk/2.0/codegen/override.pyo
+%%PORTDOCS%%share/pygtk/2.0/codegen/scmexpr.pyo
+%%PORTDOCS%%share/pygtk/2.0/defs/gtk.defs
+%%PORTDOCS%%share/pygtk/2.0/defs/gtk-types.defs
+%%PORTDOCS%%share/pygtk/2.0/defs/gtk-extrafuncs.defs
+%%PORTDOCS%%share/pygtk/2.0/defs/gdk.defs
+%%PORTDOCS%%share/pygtk/2.0/defs/gdk-types.defs
+%%PORTDOCS%%share/pygtk/2.0/defs/libglade.defs
+%%PORTDOCS%%share/pygtk/2.0/defs/gtkgl.defs
+%%PORTDOCS%%share/pygtk/2.0/defs/pango.defs
+%%PORTDOCS%%share/pygtk/2.0/defs/pango-types.defs
+%%PORTDOCS%%share/pygtk/2.0/defs/atk.defs
+%%PORTDOCS%%share/pygtk/2.0/defs/atk-types.defs
+@dirrm include/pygtk-2.0/pygtk
+@dirrm include/pygtk-2.0
+@dirrm lib/python2.2/site-packages/gtk-2.0/gtk
+@dirrm lib/python2.2/site-packages/gtk-2.0
+%%PORTDOCS%%@dirrm share/doc/py-gtk
+%%PORTDOCS%%@dirrm share/examples/py-gtk/atk
+%%PORTDOCS%%@dirrm share/examples/py-gtk/gl
+%%PORTDOCS%%@dirrm share/examples/py-gtk/glade
+%%PORTDOCS%%@dirrm share/examples/py-gtk/gobject
+%%PORTDOCS%%@dirrm share/examples/py-gtk/ide
+%%PORTDOCS%%@dirrm share/examples/py-gtk/neil
+%%PORTDOCS%%@dirrm share/examples/py-gtk/pango
 %%PORTDOCS%%@dirrm share/examples/py-gtk/pygtk-demo/demos
 %%PORTDOCS%%@dirrm share/examples/py-gtk/pygtk-demo
-%%PORTDOCS%%@dirrm share/examples/py-gtk/pango
-%%PORTDOCS%%@dirrm share/examples/py-gtk/neil
-%%PORTDOCS%%@dirrm share/examples/py-gtk/ide
-%%PORTDOCS%%@dirrm share/examples/py-gtk/gobject
-%%PORTDOCS%%@dirrm share/examples/py-gtk/glade
-%%PORTDOCS%%@dirrm share/examples/py-gtk/gl
-%%PORTDOCS%%@dirrm share/examples/py-gtk/atk
+%%PORTDOCS%%@dirrm share/examples/py-gtk/simple
 %%PORTDOCS%%@dirrm share/examples/py-gtk
-%%PORTDOCS%%@dirrm share/doc/py-gtk
-@dirrm %%PYTHON_SITELIBDIR%%/gtk
-@dirrm include/pygtk-2.0/pygtk
-@dirrm include/pygtk-2.0
+%%PORTDOCS%%@dirrm share/pygtk/2.0/codegen
+%%PORTDOCS%%@dirrm share/pygtk/2.0/defs
+%%PORTDOCS%%@dirrm share/pygtk/2.0
+%%PORTDOCS%%@dirrm share/pygtk