5 files changed, 49 insertions, 113 deletions

diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index b6a5476b308f..65c4849a7725 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	py-gnome
 # Version required:			1.0.1
-# Date created:				03/14/1999
+# Date created:				3/14/1999
 # Whom:					nectar@FreeBSD.org
 #
 # $FreeBSD$
@@ -17,74 +17,38 @@ MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
 
 MAINTAINER=	nectar@FreeBSD.org
 
-BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
-LIB_DEPENDS=	capplet.1:${PORTSDIR}/sysutils/gnomecontrolcenter
-RUN_DEPENDS=	python:${PORTSDIR}/lang/python
+BUILD_DEPENDS=	python1.5:${PORTSDIR}/lang/python ${PYGTK_DEP}
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12                  \
+		capplet.1:${PORTSDIR}/sysutils/gnomecontrolcenter
+RUN_DEPENDS=	python1.5:${PORTSDIR}/lang/python ${PYGTK_DEP}
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
+GTK_CONFIG=	${X11BASE}/bin/gtk12-config
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
-PLIST=		${WRKSRC}/PLIST
+CONFIGURE_ENV=	GTK_CONFIG=${GTK_CONFIG}
+CONFIGURE_ARGS=	--with-python=python1.5                                 \
+		--with-gnome-config=${X11BASE}/bin/gnome-config
 
-DOCDIR=		share/doc/py-gnome
-DOCFILES=	README:py-gnome.README pygtk/README:py-gtk.README      \
-		pygtk/MAPPING:MAPPING.py-gtk
+EG_SRC_DIR=	${WRKSRC}/pygnome/examples
+EG_DST_DIR=	${PREFIX}/share/examples/py-gnome
+PYGTK_DEP=	${LOCALBASE}/lib/python1.5/site-packages/_gtkmodule.so:${PORTSDIR}/x11-toolkits/py-gtk
+PLIST_COMPLETE= ${PKGDIR}/PLIST
 
-EGDIR=		share/examples/py-gnome
-EGSUBDIRS=	gnome gtk gtk/glade gtk/ide gtk/imlib gtk/neil         \
-		gtk/simple gtk/testgtk
-EGGNOME=	canvas.py fifteen.py html_demo.py stock_demo.py        \
-		ted_demo.py uiinfo_demo.py zterm.py
-EGGTK=		glade/README glade/test2.glade glade/glade.py          \
-		glade/test.glade ide/gtkcons.py ide/gtkdb.py           \
-		ide/edit.py ide/browse.py ide/minibreak.xpm ide/README \
-		ide/gtkprof.py ide/pyide.py ide/break.xpm              \
-		ide/return.xpm ide/next.xpm ide/continue.xpm           \
-		ide/step.xpm ide/edit.xpm ide/run.xpm ide/quit.xpm     \
-		imlib/view.py neil/TAppli.py neil/TAppli2.py           \
-		neil/TAppli3.py neil/TAppli4.py neil/TAppli5.py        \
-		neil/bomb.xpm neil/gtk-logo.xpm neil/question.xpm      \
-		neil/notebook.py neil/README simple/hello1.py          \
-		simple/hello2.py simple/simple1.py simple/simple2.py   \
-		simple/tooltip1.py simple/tooltip2.py                  \
-		simple/scribble.py simple/dnd.py simple/dndpixmap.py   \
-		simple/README testgtk/testgtk.py testgtk/test.xpm      \
-		testgtk/testgtkrc testgtk/README
-
-SORT?=		sort
-
-# Examples and docs are added to the packing list on the fly.
-pre-install:
-	@${CP} ${PKGDIR}/PLIST ${PLIST}
-	@${CP} /dev/null ${PLIST}.dirrm
-.for d in ${EGSUBDIRS}
-	@${MKDIR} ${PREFIX}/${EGDIR}/${d}
-	@${ECHO} @dirrm ${EGDIR}/${d} >> ${PLIST}.dirrm
-.endfor
-	@${ECHO} @dirrm ${EGDIR} >> ${PLIST}.dirrm
-.for f in ${EGGNOME}
-	${INSTALL_DATA} ${WRKSRC}/pygnome/examples/${f}                \
-		${PREFIX}/${EGDIR}/gnome/${f}
-	@${ECHO} ${EGDIR}/gnome/${f} >> ${PLIST}
-.endfor
-.for f in ${EGGTK}
-	${INSTALL_DATA} ${WRKSRC}/pygtk/examples/${f}                  \
-		${PREFIX}/${EGDIR}/gtk/${f}
-	@${ECHO} ${EGDIR}/gtk/${f} >> ${PLIST}
-.endfor
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/${DOCDIR}
-	@${ECHO} @dirrm ${DOCDIR} >> ${PLIST}.dirrm
-	@for i in ${DOCFILES}; do                                      \
-		src=`${ECHO} $$i | ${AWK} -F: '{ print $$1 }'`;        \
-		dst=`${ECHO} $$i | ${AWK} -F: '{ print $$2 }'`;        \
-		${INSTALL_DATA} ${WRKSRC}/$$src                        \
-			${PREFIX}/${DOCDIR}/$$dst &&                   \
-		${ECHO} ${DOCDIR}/$$dst >> ${PLIST};                   \
-	done
+PLIST=		${PLIST_COMPLETE}
+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
+.else
+PLIST=		${WRKDIR}/PLIST.nodocs
+pre-install:
+	${RM} -f ${PLIST}
+	${GREP} -E -v '^(@dirrm )?(share/examples/)|(share/doc/)'       \
+		${PLIST_COMPLETE} > ${PLIST}
 .endif
-	@${SORT} -r ${PLIST}.dirrm >> ${PLIST}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-gnome/files/patch-ab b/x11-toolkits/py-gnome/files/patch-ab
index 1d12346a4679..103fec3cf319 100644
--- a/x11-toolkits/py-gnome/files/patch-ab
+++ b/x11-toolkits/py-gnome/files/patch-ab
@@ -1,11 +1,11 @@
---- pygtk/configure.orig	Mon Mar 15 11:25:18 1999
-+++ pygtk/configure	Mon Mar 15 11:25:27 1999
-@@ -901,7 +901,7 @@
-   OPT="$am_cv_python_OPT"
-   SO="$am_cv_python_SO"
-   PYTHON_CFLAGS="$am_cv_python_CCSHARED \$(OPT)"
--  PYTHON_LINK="$am_cv_python_LDSHARED -o \$@"
-+  PYTHON_LINK="$am_cv_python_CC -shared -o \$@"
+--- 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/pkg-comment b/x11-toolkits/py-gnome/pkg-comment
index 28f936033f20..0e3a0dda9c55 100644
--- a/x11-toolkits/py-gnome/pkg-comment
+++ b/x11-toolkits/py-gnome/pkg-comment
@@ -1 +1 @@
-A set of Python bindings for GNOME and GTK
+A set of Python bindings for GNOME
diff --git a/x11-toolkits/py-gnome/pkg-descr b/x11-toolkits/py-gnome/pkg-descr
index ea8a30053778..5ec95241ca68 100644
--- a/x11-toolkits/py-gnome/pkg-descr
+++ b/x11-toolkits/py-gnome/pkg-descr
@@ -1,15 +1,9 @@
-Excerpts from the READMEs:
+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.
 
- PyGTK
- =====
- Author: James Henstridge <james@daa.com.au>
-
- This archive contains modules that allow you to use gtk in Python
- programs.  At present, it is a fairly complete set of bindings.
-
 -- Jacques Vidrine <nectar@FreeBSD.ORG>
diff --git a/x11-toolkits/py-gnome/pkg-plist b/x11-toolkits/py-gnome/pkg-plist
index 21ea4fc5c421..8c08283cc82c 100644
--- a/x11-toolkits/py-gnome/pkg-plist
+++ b/x11-toolkits/py-gnome/pkg-plist
@@ -1,24 +1,7 @@
-lib/python1.5/site-packages/GDK.py
-lib/python1.5/site-packages/GDK.pyc
-lib/python1.5/site-packages/GDK.pyo
-lib/python1.5/site-packages/GTK.py
-lib/python1.5/site-packages/GTK.pyc
-lib/python1.5/site-packages/GTK.pyo
-lib/python1.5/site-packages/GdkImlib.py
-lib/python1.5/site-packages/GdkImlib.pyc
-lib/python1.5/site-packages/GdkImlib.pyo
-lib/python1.5/site-packages/GtkExtra.py
-lib/python1.5/site-packages/GtkExtra.pyc
-lib/python1.5/site-packages/GtkExtra.pyo
-lib/python1.5/site-packages/Gtkinter.py
-lib/python1.5/site-packages/Gtkinter.pyc
-lib/python1.5/site-packages/Gtkinter.pyo
 lib/python1.5/site-packages/_appletmodule.so
 lib/python1.5/site-packages/_cappletmodule.so
-lib/python1.5/site-packages/_gdkimlibmodule.so
 lib/python1.5/site-packages/_gnomemodule.so
 lib/python1.5/site-packages/_gnomeuimodule.so
-lib/python1.5/site-packages/_gtkmodule.so
 lib/python1.5/site-packages/_gtkxmhtmlmodule.so
 lib/python1.5/site-packages/_zvtmodule.so
 lib/python1.5/site-packages/gettext.py
@@ -75,20 +58,15 @@ lib/python1.5/site-packages/gnome/xmhtml.pyo
 lib/python1.5/site-packages/gnome/zvt.py
 lib/python1.5/site-packages/gnome/zvt.pyc
 lib/python1.5/site-packages/gnome/zvt.pyo
-lib/python1.5/site-packages/gtk.py
-lib/python1.5/site-packages/gtk.pyc
-lib/python1.5/site-packages/gtk.pyo
-lib/python1.5/site-packages/pyglade/__init__.py
-lib/python1.5/site-packages/pyglade/__init__.pyc
-lib/python1.5/site-packages/pyglade/__init__.pyo
-lib/python1.5/site-packages/pyglade/build.py
-lib/python1.5/site-packages/pyglade/build.pyc
-lib/python1.5/site-packages/pyglade/build.pyo
-lib/python1.5/site-packages/pyglade/style.py
-lib/python1.5/site-packages/pyglade/style.pyc
-lib/python1.5/site-packages/pyglade/style.pyo
-lib/python1.5/site-packages/pyglade/xmlparse.py
-lib/python1.5/site-packages/pyglade/xmlparse.pyc
-lib/python1.5/site-packages/pyglade/xmlparse.pyo
+share/examples/py-gnome/bookmarks-applet.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/fifteen.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
 @dirrm lib/python1.5/site-packages/gnome
-@dirrm lib/python1.5/site-packages/pyglade
+@dirrm share/examples/py-gnome