9 files changed, 2 insertions, 252 deletions

diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index d7b9c0d32561..d36b27a0d7f9 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -197,7 +197,6 @@
     SUBDIR += py-Pmw
     SUBDIR += py-SciParam
     SUBDIR += py-fltk
-    SUBDIR += py-gnome
     SUBDIR += py-gnome-desktop
     SUBDIR += py-gnome-extras
     SUBDIR += py-gnome2
diff --git a/x11-toolkits/php-gtk/Makefile b/x11-toolkits/php-gtk/Makefile
index 41caf0060769..e94a2520c848 100644
--- a/x11-toolkits/php-gtk/Makefile
+++ b/x11-toolkits/php-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	php-gtk
 PORTVERSION=	1.0.2
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://gtk.php.net/distributions/ \
 		http://document-root.de/mirror/php-gtk/
@@ -29,8 +29,7 @@ WRKSRC=${WRKDIR}/php_gtk-${PORTVERSION}
 PORTSCOUT=	limit:^1\.
 
 OPTIONS=	LIBGLADE	"GladeXML support in php-gtk" on \
-		GDK_PIXBUF	"Enable pixbuf support" on \
-		GTKHTML		"Enable Gtkhtml support" on
+		GDK_PIXBUF	"Enable pixbuf support" on
 
 .include <bsd.port.pre.mk>
 
@@ -58,15 +57,6 @@ PLIST_SUB+=	GDKPIXBUF=""
 PLIST_SUB+=	GDKPIXBUF="@comment "
 .endif
 
-.if !defined(WITHOUT_GTKHTML)
-USE_GNOME+=	gtkhtml
-CONFIGURE_ARGS+=	--enable-gtkhtml
-ENVSCE+=	-DHAVE_HTML=1 -I${LOCALBASE}/include/gal-1.0 # -DPHP_GTK_COMPILE_DL_GTKHTML=1 -DGTKHTML_HAVE_GCONF=1 -I${LOCALBASE}/include/gal-1.0
-PLIST_SUB+=	GTKHTML=""
-.else
-PLIST_SUB+=	GTKHTML="@comment "
-.endif
-
 PLIST_SUB+=	PHPEXTDIR="${PHP_EXT_DIR}"
 
 CONFIGURE_ENV=	CPPFLAGS="${ENVSCE}"
diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
deleted file mode 100644
index e6614c1fbc98..000000000000
--- a/x11-toolkits/py-gnome/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# New ports collection makefile for:	py-gnome
-# Date created:				3/14/1999
-# Whom:					nectar@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnome
-PORTVERSION=	1.4.4
-PORTREVISION=	12
-CATEGORIES=	x11-toolkits python gnome
-MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	sources/gnome-python/1.4
-PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	gnome-python-${PORTVERSION}
-DIST_SUBDIR=	gnome
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A set of Python bindings for GNOME
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_PYTHON=	yes
-USE_GNOME=	gtkhtml gnometarget pygtk
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-python=${PYTHON_CMD}				\
-		--with-gnome-config=${LOCALBASE}/bin/gnome-config		\
-		--with-gtkhtml
-
-EG_SRC_DIR=	${WRKSRC}/pygnome/examples
-EG_DST_DIR=	${EXAMPLESDIR}
-
-CONFLICTS=	py*-gnome-2*
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' \
-		${WRKSRC}/configure ${WRKSRC}/pygtk/configure
-
-.if !defined(NOPORTEXAMPLES)
-post-install:
-	${MKDIR} ${EG_DST_DIR}
-	${TAR} -C ${EG_SRC_DIR} -cf - . | ${TAR} -C ${EG_DST_DIR} -xvf -
-	${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
-.endif
-
-.include <bsd.port.mk>
diff --git a/x11-toolkits/py-gnome/distinfo b/x11-toolkits/py-gnome/distinfo
deleted file mode 100644
index 790717de532e..000000000000
--- a/x11-toolkits/py-gnome/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome/gnome-python-1.4.4.tar.bz2) = b5069c8ac77ba7ad991afceeab332319
-SHA256 (gnome/gnome-python-1.4.4.tar.bz2) = 4ed42a6fbfddaf8500412b3f0331168a88c8c275dcc54c3963b38c4a63eeda7c
-SIZE (gnome/gnome-python-1.4.4.tar.bz2) = 550412
diff --git a/x11-toolkits/py-gnome/files/patch-ab b/x11-toolkits/py-gnome/files/patch-ab
deleted file mode 100644
index 103fec3cf319..000000000000
--- a/x11-toolkits/py-gnome/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-gnome/files/patch-configure b/x11-toolkits/py-gnome/files/patch-configure
deleted file mode 100644
index 7865ce50d7f9..000000000000
--- a/x11-toolkits/py-gnome/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- configure.orig	Thu Jan  3 15:20:36 2002
-+++ configure	Sun Jul 14 15:25:29 2002
-@@ -6322,6 +6322,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-gnome/files/patch-pygtk::configure b/x11-toolkits/py-gnome/files/patch-pygtk::configure
deleted file mode 100644
index d3a68b8efcfa..000000000000
--- a/x11-toolkits/py-gnome/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-gnome/pkg-descr b/x11-toolkits/py-gnome/pkg-descr
deleted file mode 100644
index 5bf5bd7955a0..000000000000
--- a/x11-toolkits/py-gnome/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Excerpt from the README:
-
- PyGNOME -- Python bindings for GNOME
- ====================================
- Author: James Henstridge <james@daa.com.au>
-
- This is a set of bindings for the GNOME libraries for use with python.
-
-WWW: http://www.pygtk.org/
--- Jacques Vidrine <nectar@FreeBSD.ORG>
diff --git a/x11-toolkits/py-gnome/pkg-plist b/x11-toolkits/py-gnome/pkg-plist
deleted file mode 100644
index 99b37f9a7c1b..000000000000
--- a/x11-toolkits/py-gnome/pkg-plist
+++ /dev/null
@@ -1,93 +0,0 @@
-%%PYTHON_SITELIBDIR%%/gtk-1.2/_cappletmodule.la
-%%PYTHON_SITELIBDIR%%/gtk-1.2/_cappletmodule.so
-%%PYTHON_SITELIBDIR%%/gtk-1.2/_gladegnomemodule.la
-%%PYTHON_SITELIBDIR%%/gtk-1.2/_gladegnomemodule.so
-%%PYTHON_SITELIBDIR%%/gtk-1.2/_gnomemodule.la
-%%PYTHON_SITELIBDIR%%/gtk-1.2/_gnomemodule.so
-%%PYTHON_SITELIBDIR%%/gtk-1.2/_gnomeuimodule.la
-%%PYTHON_SITELIBDIR%%/gtk-1.2/_gnomeuimodule.so
-%%PYTHON_SITELIBDIR%%/gtk-1.2/_gtkhtmlmodule.la
-%%PYTHON_SITELIBDIR%%/gtk-1.2/_gtkhtmlmodule.so
-%%PYTHON_SITELIBDIR%%/gtk-1.2/_gtkxmhtmlmodule.la
-%%PYTHON_SITELIBDIR%%/gtk-1.2/_gtkxmhtmlmodule.so
-%%PYTHON_SITELIBDIR%%/gtk-1.2/_zvtmodule.la
-%%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/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
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/about.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bookmarks-applet.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calculator.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/canvas-example.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/canvas.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clock-applet.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorpicker.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dial.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fifteen.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtkhtml_demo.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/html_demo.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stock_demo.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ted_demo.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/uiinfo_demo.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/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
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/gtk-1.2/gnome