9 files changed, 107 insertions, 195 deletions

diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 30c88288d53f..df978b47cad1 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -1,52 +1,53 @@
 # New ports collection makefile for:	py-gnome
-# Date created:				3/14/1999
-# Whom:					nectar@FreeBSD.org
+# Date created:				09 February 2003
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	py-gnome
-PORTVERSION=	1.4.4
-PORTREVISION=	1
+PORTVERSION=	1.99.15
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-python/1.4
+MASTER_SITE_SUBDIR=	sources/gnome-python/1.99
 DISTNAME=	gnome-python-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A set of Python bindings for GNOME 2
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/pygtk.pth:${PORTSDIR}/x11-toolkits/py-gtk
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygtk.pth:${PORTSDIR}/x11-toolkits/py-gtk
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/_gtkmodule.so:${PORTSDIR}/x11-toolkits/py-gtk2
+LIB_DEPENDS=	gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
+		gtkhtml-2.0:${PORTSDIR}/www/libgtkhtml \
+		nautilus.2:${PORTSDIR}/x11-fm/nautilus2
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/_gtkmodule.so:${PORTSDIR}/x11-toolkits/py-gtk2
 
+LATEST_LINK=	py-gnome2
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gtkhtml libpanel
+USE_GNOME=	gnomehack
 USE_LIBTOOL=	yes
-LIBTOOLFILES=	configure pygtk/configure
-CONFIGURE_ARGS=	--with-python=${PYTHON_CMD}				\
-		--with-gnome-config=${X11BASE}/bin/gnome-config		\
-		--with-gtkhtml
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 
-EG_SRC_DIR=	${WRKSRC}/pygnome/examples
+EG_SRC_DIR=	${WRKSRC}/examples
 EG_DST_DIR=	${PREFIX}/share/examples/py-gnome
 
+.if !defined(PACKAGE_BUILDING)
+pre-build:
+	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+.endif
+
 .if !defined(NOPORTDOCS)
 post-install:
 	${MKDIR} ${EG_DST_DIR}
-	${TAR} -C ${EG_SRC_DIR} -cf - . | ${TAR} -C ${EG_DST_DIR} -xvf -
+	${TAR} -C ${EG_SRC_DIR} -cf - . | ${TAR} -C ${EG_DST_DIR} -xf -
 	${CHOWN} -R ${BINOWN}:${BINGRP} ${EG_DST_DIR}
-	find ${EG_DST_DIR} -type d -print | xargs ${CHMOD} 0555
-	find ${EG_DST_DIR} -type f -print | xargs ${CHMOD} 0444
-.else
-PLIST=		${WRKDIR}/PLIST.nodocs
-pre-install:
-	${RM} -f ${PLIST}
-	${GREP} -E -v '^(@dirrm )?(share/examples/)|(share/doc/)'       \
-		${PKGDIR}/pkg-plist > ${PLIST}
+	${FIND} ${EG_DST_DIR} -type d -print | ${XARGS} ${CHMOD} 0555
+	${FIND} ${EG_DST_DIR} -type f -print | ${XARGS} ${CHMOD} 0444
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-gnome2/distinfo b/x11-toolkits/py-gnome2/distinfo
index 5df73588577b..dba2b61429e3 100644
--- a/x11-toolkits/py-gnome2/distinfo
+++ b/x11-toolkits/py-gnome2/distinfo
@@ -1 +1 @@
-MD5 (gnome/gnome-python-1.4.4.tar.bz2) = b5069c8ac77ba7ad991afceeab332319
+MD5 (gnome/gnome-python-1.99.15.tar.bz2) = ac558f9045866eb519333e88c6418f92
diff --git a/x11-toolkits/py-gnome2/files/patch-ab b/x11-toolkits/py-gnome2/files/patch-ab
deleted file mode 100644
index 103fec3cf319..000000000000
--- a/x11-toolkits/py-gnome2/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Mon Sep 13 23:01:39 1999
-+++ Makefile.in	Mon Sep 13 23:01:45 1999
-@@ -94,7 +94,7 @@
- pyexecdir = @pyexecdir@
- pythondir = @pythondir@
- 
--SUBDIRS = macros pygtk pygnome
-+SUBDIRS = macros pygnome
- 
- EXTRA_DIST = gnome-python.spec
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/x11-toolkits/py-gnome2/files/patch-configure b/x11-toolkits/py-gnome2/files/patch-configure
index 7865ce50d7f9..d9533855cf55 100644
--- a/x11-toolkits/py-gnome2/files/patch-configure
+++ b/x11-toolkits/py-gnome2/files/patch-configure
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig	Thu Jan  3 15:20:36 2002
-+++ configure	Sun Jul 14 15:25:29 2002
-@@ -6322,6 +6322,7 @@
+--- configure.orig	Sun Feb  9 22:46:03 2003
++++ configure	Sun Feb  9 22:46:32 2003
+@@ -7758,6 +7758,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
diff --git a/x11-toolkits/py-gnome2/files/patch-pygtk::configure b/x11-toolkits/py-gnome2/files/patch-pygtk::configure
deleted file mode 100644
index d3a68b8efcfa..000000000000
--- a/x11-toolkits/py-gnome2/files/patch-pygtk::configure
+++ /dev/null
@@ -1,61 +0,0 @@
-
-$FreeBSD$
-
---- pygtk/configure.orig	Sat Aug 24 10:37:08 2002
-+++ pygtk/configure	Wed Aug 28 20:20:53 2002
-@@ -7372,6 +7372,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'
-@@ -8888,6 +8889,7 @@
- #line $LINENO "configure"
- #include "confdefs.h"
- $ac_includes_default
-+#include <Python.h>
- #include <arrayobject.h>
- _ACEOF
- rm -f conftest.$ac_objext
-@@ -8918,6 +8920,7 @@
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
-+#include <Python.h>
- #include <arrayobject.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -8999,6 +9002,7 @@
- #line $LINENO "configure"
- #include "confdefs.h"
- $ac_includes_default
-+#include <Python.h>
- #include <Extensions/arrayobject.h>
- _ACEOF
- rm -f conftest.$ac_objext
-@@ -9029,6 +9033,7 @@
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
-+#include <Python.h>
- #include <Extensions/arrayobject.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -9110,6 +9115,7 @@
- #line $LINENO "configure"
- #include "confdefs.h"
- $ac_includes_default
-+#include <Python.h>
- #include <Numeric/arrayobject.h>
- _ACEOF
- rm -f conftest.$ac_objext
-@@ -9140,6 +9146,7 @@
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
-+#include <Python.h>
- #include <Numeric/arrayobject.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
diff --git a/x11-toolkits/py-gnome2/pkg-comment b/x11-toolkits/py-gnome2/pkg-comment
deleted file mode 100644
index 0e3a0dda9c55..000000000000
--- a/x11-toolkits/py-gnome2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A set of Python bindings for GNOME
diff --git a/x11-toolkits/py-gnome2/pkg-descr b/x11-toolkits/py-gnome2/pkg-descr
index 5ec95241ca68..5b7963de272a 100644
--- a/x11-toolkits/py-gnome2/pkg-descr
+++ b/x11-toolkits/py-gnome2/pkg-descr
@@ -1,9 +1,9 @@
 Excerpt from the README:
 
- PyGNOME -- Python bindings for GNOME
- ====================================
+ PyGNOME -- Python bindings for GNOME 2
+ ======================================
  Author: James Henstridge <james@daa.com.au>
 
- This is a set of bindings for the GNOME libraries for use with python.
+ This is a set of bindings for the GNOME 2 libraries for use with python.
 
 -- Jacques Vidrine <nectar@FreeBSD.ORG>
diff --git a/x11-toolkits/py-gnome2/pkg-install b/x11-toolkits/py-gnome2/pkg-install
new file mode 100644
index 000000000000..10d19fac73bf
--- /dev/null
+++ b/x11-toolkits/py-gnome2/pkg-install
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+if [ -n "${PACKAGE_BUILDING}" ]; then
+    exit 0
+fi
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin:${PATH}
+export PATH
+
+if [ "$2" = "PRE-INSTALL" ]; then
+     if pkg_info | grep "^py-gnome-[0-9]"; then
+         echo "py-gnome for GTK+ 1.x was detected."
+         echo "This packages cannot coexist with py-gnome."
+	 false
+     fi
+fi
diff --git a/x11-toolkits/py-gnome2/pkg-plist b/x11-toolkits/py-gnome2/pkg-plist
index 06b350c57c5a..587a5971884e 100644
--- a/x11-toolkits/py-gnome2/pkg-plist
+++ b/x11-toolkits/py-gnome2/pkg-plist
@@ -1,90 +1,61 @@
-%%PYTHON_SITELIBDIR%%/gtk-1.2/_appletmodule.so
-%%PYTHON_SITELIBDIR%%/gtk-1.2/_cappletmodule.so
-%%PYTHON_SITELIBDIR%%/gtk-1.2/_gladegnomemodule.so
-%%PYTHON_SITELIBDIR%%/gtk-1.2/_gnomemodule.so
-%%PYTHON_SITELIBDIR%%/gtk-1.2/_gnomeuimodule.so
-%%PYTHON_SITELIBDIR%%/gtk-1.2/_gtkhtmlmodule.so
-%%PYTHON_SITELIBDIR%%/gtk-1.2/_gtkxmhtmlmodule.so
-%%PYTHON_SITELIBDIR%%/gtk-1.2/_zvtmodule.so
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/__init__.py
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/affine.py
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/affine.pyc
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/affine.pyo
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/applet.py
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/applet.pyc
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/applet.pyo
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/capplet.py
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/capplet.pyc
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/capplet.pyo
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/config.py
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/config.pyc
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/config.pyo
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/file.py
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/file.pyc
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/file.pyo
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/help.py
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/help.pyc
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/help.pyo
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/history.py
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/history.pyc
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/history.pyo
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/metadata.py
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/metadata.pyc
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/metadata.pyo
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/mime.py
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/mime.pyc
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/mime.pyo
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/score.py
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/score.pyc
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/score.pyo
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/triggers.py
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/triggers.pyc
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/triggers.pyo
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/ui.py
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/ui.pyc
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/ui.pyo
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/uiconsts.py
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/uiconsts.pyc
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/uiconsts.pyo
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/url.py
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/url.pyc
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/url.pyo
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/util.py
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/util.pyc
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/util.pyo
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/xmhtml.py
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/xmhtml.pyc
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/xmhtml.pyo
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/zvt.py
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/zvt.pyc
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/zvt.pyo
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gtkhtml.py
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gtkhtml.pyc
-%%PYTHON_SITELIBDIR%%/gtk-1.2/gtkhtml.pyo
-share/examples/py-gnome/about.py
-share/examples/py-gnome/bookmarks-applet.py
-share/examples/py-gnome/calculator.py
-share/examples/py-gnome/canvas-example.py
-share/examples/py-gnome/canvas.py
-share/examples/py-gnome/clock-applet.py
-share/examples/py-gnome/colorpicker.py
-share/examples/py-gnome/dial.py
-share/examples/py-gnome/fifteen.py
-share/examples/py-gnome/gtkhtml_demo.py
-share/examples/py-gnome/html_demo.py
-share/examples/py-gnome/stock_demo.py
-share/examples/py-gnome/ted_demo.py
-share/examples/py-gnome/uiinfo_demo.py
-share/examples/py-gnome/zterm.py
-share/pygtk/1.2/defs/applet.defs
-share/pygtk/1.2/defs/capplet.defs
-share/pygtk/1.2/defs/gnome-enums.defs
-share/pygtk/1.2/defs/gnome.defs
-share/pygtk/1.2/defs/gnomeui.defs
-share/pygtk/1.2/defs/gtkhtml.defs
-share/pygtk/1.2/defs/xmhtml.defs
-share/pygtk/1.2/defs/zvt.defs
-@dirrm share/examples/py-gnome
-@dirrm %%PYTHON_SITELIBDIR%%/gtk-1.2/gnome
+%%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo/__init__.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gconfmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/__init__.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/_gnomemodule.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/appletmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/canvasmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/vfsmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/zvtmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/_printmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/printuimodule.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkhtml2module.so
+libdata/pkgconfig/gnome-python-2.0.pc
+%%PORTDOCS%%share/examples/py-gnome/bonobo/bonoboui/Bonobo_Sample_Hello.xml
+%%PORTDOCS%%share/examples/py-gnome/bonobo/bonoboui/hello.py
+%%PORTDOCS%%share/examples/py-gnome/bonobo/echo/README
+%%PORTDOCS%%share/examples/py-gnome/bonobo/echo/echo-client.py
+%%PORTDOCS%%share/examples/py-gnome/canvas/canvas-example.py
+%%PORTDOCS%%share/examples/py-gnome/gconf/basic-gconf-app.py
+%%PORTDOCS%%share/examples/py-gnome/gconf/simple-controller.py
+%%PORTDOCS%%share/examples/py-gnome/gconf/simple-view.py
+%%PORTDOCS%%share/examples/py-gnome/gtkhtml2/simple-browser.py
+%%PORTDOCS%%share/examples/py-gnome/nautilus/Nautilus_View_pysample.server
+%%PORTDOCS%%share/examples/py-gnome/nautilus/README
+%%PORTDOCS%%share/examples/py-gnome/nautilus/sample.py
+%%PORTDOCS%%share/examples/py-gnome/vfs/shell.py
+%%PORTDOCS%%share/examples/py-gnome/zvt/zvt-demo.py
+share/pygtk/2.0/defs/applet.defs
+share/pygtk/2.0/defs/art.defs
+share/pygtk/2.0/defs/bonobo-types.defs
+share/pygtk/2.0/defs/bonobo.defs
+share/pygtk/2.0/defs/bonoboui-types.defs
+share/pygtk/2.0/defs/bonoboui.defs
+share/pygtk/2.0/defs/canvas.defs
+share/pygtk/2.0/defs/gconf.defs
+share/pygtk/2.0/defs/gnome.defs
+share/pygtk/2.0/defs/gtkhtml2.defs
+share/pygtk/2.0/defs/nautilus.defs
+share/pygtk/2.0/defs/print.defs
+share/pygtk/2.0/defs/printui.defs
+share/pygtk/2.0/defs/ui.defs
+share/pygtk/2.0/defs/zvt.defs
+@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint
+@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gnome
+@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo
+@dirrm %%PORTDOCS%%share/examples/py-gnome/zvt
+@dirrm %%PORTDOCS%%share/examples/py-gnome/vfs
+@dirrm %%PORTDOCS%%share/examples/py-gnome/nautilus
+@dirrm %%PORTDOCS%%share/examples/py-gnome/gtkhtml2
+@dirrm %%PORTDOCS%%share/examples/py-gnome/gconf
+@dirrm %%PORTDOCS%%share/examples/py-gnome/canvas
+@dirrm %%PORTDOCS%%share/examples/py-gnome/bonobo/echo
+@dirrm %%PORTDOCS%%share/examples/py-gnome/bonobo/bonoboui
+@dirrm %%PORTDOCS%%share/examples/py-gnome/bonobo
+@dirrm %%PORTDOCS%%share/examples/py-gnome