12 files changed, 212 insertions, 268 deletions

diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index f5e7c191226e..ae01bbc5c8f5 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	py-gtk
-# Version required:			0.5.10
+# Version required:			0.5.12
 # Date created:				12/26/1998
 # Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.20 1999/02/28 09:28:34 obrien Exp $
+# $Id: Makefile,v 1.21 1999/02/28 18:48:50 nectar Exp $
 #
 
-DISTNAME=	pygtk-0.5.11
-PKGNAME=	py-gtk-0.5.11
+DISTNAME=	pygtk-0.5.12
+PKGNAME=	py-gtk-0.5.12
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
 		ftp://ftp.gimp.org/pub/gtk/python/ \
@@ -18,24 +18,63 @@ MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
 MAINTAINER=	nectar@FreeBSD.ORG
 
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
-LIB_DEPENDS=	Imlib.2:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	gdk_imlib.2:${PORTSDIR}/graphics/imlib
 RUN_DEPENDS=	python:${PORTSDIR}/lang/python
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GTK_CONFIG=${X11BASE}/bin/gtk11d-config
+USE_GMAKE=	yes
+CONFIGURE_ENV=	GTK_CONFIG=${X11BASE}/bin/gtk12-config
 MAKE_FLAGS=	OPT="${CFLAGS}"
 
+PLIST=		${WRKDIR}/PLIST
+SORT?=		sort
+
+DOCDIR=		share/doc/py-gtk
+DOCFILES=	README MAPPING
+
+EXAMDIR=	share/examples/py-gtk
+EXAMSUBDIRS=	glade ide imlib neil simple testgtk
+EXAMFILES=	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
+
 # NOTE: for packaging to work properly, this port should be
 # built with PREFIX set the same as when the python port
 # was built.
 
-post-install:
-	@${MKDIR} ${PREFIX}/share/examples/py-gtk
-	@(cd ${WRKSRC}/examples; tar cf - *) | \
-		(cd ${PREFIX}/share/examples/py-gtk; tar xf -)
+pre-install:
+	@${CP} ${PKGDIR}/PLIST ${PLIST}
+	@${CP} /dev/null ${PLIST}.dirrm
+.for d in ${EXAMSUBDIRS}
+	@${MKDIR} ${PREFIX}/${EXAMDIR}/${d}
+	@${ECHO} @dirrm ${EXAMDIR}/${d} >> ${PLIST}.dirrm
+.endfor
+	@${ECHO} @dirrm ${EXAMDIR} >> ${PLIST}.dirrm
+.for f in ${EXAMFILES}
+	${INSTALL_DATA} ${WRKSRC}/examples/${f} \
+		${PREFIX}/${EXAMDIR}/${f}
+	@${ECHO} ${EXAMDIR}/${f} >> ${PLIST}
+.endfor
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/py-gtk
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/py-gtk
+	@${MKDIR} ${PREFIX}/${DOCDIR}
+	@${ECHO} @dirrm ${DOCDIR} >> ${PLIST}.dirrm
+.for f in ${DOCFILES}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${DOCDIR}/${f}
+	@${ECHO} ${DOCDIR}/${f} >> ${PLIST}
+.endfor
 .endif
+	@${SORT} -r ${PLIST}.dirrm >> ${PLIST}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-gnome/distinfo b/x11-toolkits/py-gnome/distinfo
index 86f2fd7483a8..9a158787def8 100644
--- a/x11-toolkits/py-gnome/distinfo
+++ b/x11-toolkits/py-gnome/distinfo
@@ -1 +1 @@
-MD5 (pygtk-0.5.11.tar.gz) = 0d56e509daba354e5fe4ba191a615596
+MD5 (pygtk-0.5.12.tar.gz) = e5d705b6d06e47a02385f859f0bc8610
diff --git a/x11-toolkits/py-gnome/pkg-plist b/x11-toolkits/py-gnome/pkg-plist
index 71ab2476f33b..5cd184bedaa7 100644
--- a/x11-toolkits/py-gnome/pkg-plist
+++ b/x11-toolkits/py-gnome/pkg-plist
@@ -31,57 +31,4 @@ lib/python1.5/site-packages/GTK.pyo
 lib/python1.5/site-packages/GDK.pyo
 lib/python1.5/site-packages/GtkExtra.pyo
 lib/python1.5/site-packages/GdkImlib.pyo
-share/doc/py-gtk/README
-@dirrm share/doc/py-gtk
-share/examples/py-gtk/glade/README
-share/examples/py-gtk/glade/test2.glade
-share/examples/py-gtk/glade/glade.py
-share/examples/py-gtk/glade/test.glade
-@dirrm share/examples/py-gtk/glade
-share/examples/py-gtk/ide/gtkcons.py
-share/examples/py-gtk/ide/gtkdb.py
-share/examples/py-gtk/ide/edit.py
-share/examples/py-gtk/ide/browse.py
-share/examples/py-gtk/ide/minibreak.xpm
-share/examples/py-gtk/ide/README
-share/examples/py-gtk/ide/gtkprof.py
-share/examples/py-gtk/ide/pyide.py
-share/examples/py-gtk/ide/break.xpm
-share/examples/py-gtk/ide/return.xpm
-share/examples/py-gtk/ide/next.xpm
-share/examples/py-gtk/ide/continue.xpm
-share/examples/py-gtk/ide/step.xpm
-share/examples/py-gtk/ide/edit.xpm
-share/examples/py-gtk/ide/run.xpm
-share/examples/py-gtk/ide/quit.xpm
-@dirrm share/examples/py-gtk/ide
-share/examples/py-gtk/imlib/view.py
-@dirrm share/examples/py-gtk/imlib
-share/examples/py-gtk/neil/TAppli.py
-share/examples/py-gtk/neil/TAppli2.py
-share/examples/py-gtk/neil/TAppli3.py
-share/examples/py-gtk/neil/TAppli4.py
-share/examples/py-gtk/neil/TAppli5.py
-share/examples/py-gtk/neil/bomb.xpm
-share/examples/py-gtk/neil/gtk-logo.xpm
-share/examples/py-gtk/neil/question.xpm
-share/examples/py-gtk/neil/notebook.py
-share/examples/py-gtk/neil/README
-@dirrm share/examples/py-gtk/neil
-share/examples/py-gtk/simple/hello1.py
-share/examples/py-gtk/simple/hello2.py
-share/examples/py-gtk/simple/simple1.py
-share/examples/py-gtk/simple/simple2.py
-share/examples/py-gtk/simple/tooltip1.py
-share/examples/py-gtk/simple/tooltip2.py
-share/examples/py-gtk/simple/scribble.py
-share/examples/py-gtk/simple/dnd.py
-share/examples/py-gtk/simple/dndpixmap.py
-share/examples/py-gtk/simple/README
-@dirrm share/examples/py-gtk/simple
-share/examples/py-gtk/testgtk/testgtk.py
-share/examples/py-gtk/testgtk/test.xpm
-share/examples/py-gtk/testgtk/testgtkrc
-share/examples/py-gtk/testgtk/README
-@dirrm share/examples/py-gtk/testgtk
-@dirrm share/examples/py-gtk
+@dirrm lib/python1.5/site-packages
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index f5e7c191226e..ae01bbc5c8f5 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	py-gtk
-# Version required:			0.5.10
+# Version required:			0.5.12
 # Date created:				12/26/1998
 # Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.20 1999/02/28 09:28:34 obrien Exp $
+# $Id: Makefile,v 1.21 1999/02/28 18:48:50 nectar Exp $
 #
 
-DISTNAME=	pygtk-0.5.11
-PKGNAME=	py-gtk-0.5.11
+DISTNAME=	pygtk-0.5.12
+PKGNAME=	py-gtk-0.5.12
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
 		ftp://ftp.gimp.org/pub/gtk/python/ \
@@ -18,24 +18,63 @@ MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
 MAINTAINER=	nectar@FreeBSD.ORG
 
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
-LIB_DEPENDS=	Imlib.2:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	gdk_imlib.2:${PORTSDIR}/graphics/imlib
 RUN_DEPENDS=	python:${PORTSDIR}/lang/python
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GTK_CONFIG=${X11BASE}/bin/gtk11d-config
+USE_GMAKE=	yes
+CONFIGURE_ENV=	GTK_CONFIG=${X11BASE}/bin/gtk12-config
 MAKE_FLAGS=	OPT="${CFLAGS}"
 
+PLIST=		${WRKDIR}/PLIST
+SORT?=		sort
+
+DOCDIR=		share/doc/py-gtk
+DOCFILES=	README MAPPING
+
+EXAMDIR=	share/examples/py-gtk
+EXAMSUBDIRS=	glade ide imlib neil simple testgtk
+EXAMFILES=	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
+
 # NOTE: for packaging to work properly, this port should be
 # built with PREFIX set the same as when the python port
 # was built.
 
-post-install:
-	@${MKDIR} ${PREFIX}/share/examples/py-gtk
-	@(cd ${WRKSRC}/examples; tar cf - *) | \
-		(cd ${PREFIX}/share/examples/py-gtk; tar xf -)
+pre-install:
+	@${CP} ${PKGDIR}/PLIST ${PLIST}
+	@${CP} /dev/null ${PLIST}.dirrm
+.for d in ${EXAMSUBDIRS}
+	@${MKDIR} ${PREFIX}/${EXAMDIR}/${d}
+	@${ECHO} @dirrm ${EXAMDIR}/${d} >> ${PLIST}.dirrm
+.endfor
+	@${ECHO} @dirrm ${EXAMDIR} >> ${PLIST}.dirrm
+.for f in ${EXAMFILES}
+	${INSTALL_DATA} ${WRKSRC}/examples/${f} \
+		${PREFIX}/${EXAMDIR}/${f}
+	@${ECHO} ${EXAMDIR}/${f} >> ${PLIST}
+.endfor
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/py-gtk
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/py-gtk
+	@${MKDIR} ${PREFIX}/${DOCDIR}
+	@${ECHO} @dirrm ${DOCDIR} >> ${PLIST}.dirrm
+.for f in ${DOCFILES}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${DOCDIR}/${f}
+	@${ECHO} ${DOCDIR}/${f} >> ${PLIST}
+.endfor
 .endif
+	@${SORT} -r ${PLIST}.dirrm >> ${PLIST}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-gnome2/distinfo b/x11-toolkits/py-gnome2/distinfo
index 86f2fd7483a8..9a158787def8 100644
--- a/x11-toolkits/py-gnome2/distinfo
+++ b/x11-toolkits/py-gnome2/distinfo
@@ -1 +1 @@
-MD5 (pygtk-0.5.11.tar.gz) = 0d56e509daba354e5fe4ba191a615596
+MD5 (pygtk-0.5.12.tar.gz) = e5d705b6d06e47a02385f859f0bc8610
diff --git a/x11-toolkits/py-gnome2/pkg-plist b/x11-toolkits/py-gnome2/pkg-plist
index 71ab2476f33b..5cd184bedaa7 100644
--- a/x11-toolkits/py-gnome2/pkg-plist
+++ b/x11-toolkits/py-gnome2/pkg-plist
@@ -31,57 +31,4 @@ lib/python1.5/site-packages/GTK.pyo
 lib/python1.5/site-packages/GDK.pyo
 lib/python1.5/site-packages/GtkExtra.pyo
 lib/python1.5/site-packages/GdkImlib.pyo
-share/doc/py-gtk/README
-@dirrm share/doc/py-gtk
-share/examples/py-gtk/glade/README
-share/examples/py-gtk/glade/test2.glade
-share/examples/py-gtk/glade/glade.py
-share/examples/py-gtk/glade/test.glade
-@dirrm share/examples/py-gtk/glade
-share/examples/py-gtk/ide/gtkcons.py
-share/examples/py-gtk/ide/gtkdb.py
-share/examples/py-gtk/ide/edit.py
-share/examples/py-gtk/ide/browse.py
-share/examples/py-gtk/ide/minibreak.xpm
-share/examples/py-gtk/ide/README
-share/examples/py-gtk/ide/gtkprof.py
-share/examples/py-gtk/ide/pyide.py
-share/examples/py-gtk/ide/break.xpm
-share/examples/py-gtk/ide/return.xpm
-share/examples/py-gtk/ide/next.xpm
-share/examples/py-gtk/ide/continue.xpm
-share/examples/py-gtk/ide/step.xpm
-share/examples/py-gtk/ide/edit.xpm
-share/examples/py-gtk/ide/run.xpm
-share/examples/py-gtk/ide/quit.xpm
-@dirrm share/examples/py-gtk/ide
-share/examples/py-gtk/imlib/view.py
-@dirrm share/examples/py-gtk/imlib
-share/examples/py-gtk/neil/TAppli.py
-share/examples/py-gtk/neil/TAppli2.py
-share/examples/py-gtk/neil/TAppli3.py
-share/examples/py-gtk/neil/TAppli4.py
-share/examples/py-gtk/neil/TAppli5.py
-share/examples/py-gtk/neil/bomb.xpm
-share/examples/py-gtk/neil/gtk-logo.xpm
-share/examples/py-gtk/neil/question.xpm
-share/examples/py-gtk/neil/notebook.py
-share/examples/py-gtk/neil/README
-@dirrm share/examples/py-gtk/neil
-share/examples/py-gtk/simple/hello1.py
-share/examples/py-gtk/simple/hello2.py
-share/examples/py-gtk/simple/simple1.py
-share/examples/py-gtk/simple/simple2.py
-share/examples/py-gtk/simple/tooltip1.py
-share/examples/py-gtk/simple/tooltip2.py
-share/examples/py-gtk/simple/scribble.py
-share/examples/py-gtk/simple/dnd.py
-share/examples/py-gtk/simple/dndpixmap.py
-share/examples/py-gtk/simple/README
-@dirrm share/examples/py-gtk/simple
-share/examples/py-gtk/testgtk/testgtk.py
-share/examples/py-gtk/testgtk/test.xpm
-share/examples/py-gtk/testgtk/testgtkrc
-share/examples/py-gtk/testgtk/README
-@dirrm share/examples/py-gtk/testgtk
-@dirrm share/examples/py-gtk
+@dirrm lib/python1.5/site-packages
diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile
index f5e7c191226e..ae01bbc5c8f5 100644
--- a/x11-toolkits/py-gtk/Makefile
+++ b/x11-toolkits/py-gtk/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	py-gtk
-# Version required:			0.5.10
+# Version required:			0.5.12
 # Date created:				12/26/1998
 # Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.20 1999/02/28 09:28:34 obrien Exp $
+# $Id: Makefile,v 1.21 1999/02/28 18:48:50 nectar Exp $
 #
 
-DISTNAME=	pygtk-0.5.11
-PKGNAME=	py-gtk-0.5.11
+DISTNAME=	pygtk-0.5.12
+PKGNAME=	py-gtk-0.5.12
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
 		ftp://ftp.gimp.org/pub/gtk/python/ \
@@ -18,24 +18,63 @@ MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
 MAINTAINER=	nectar@FreeBSD.ORG
 
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
-LIB_DEPENDS=	Imlib.2:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	gdk_imlib.2:${PORTSDIR}/graphics/imlib
 RUN_DEPENDS=	python:${PORTSDIR}/lang/python
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GTK_CONFIG=${X11BASE}/bin/gtk11d-config
+USE_GMAKE=	yes
+CONFIGURE_ENV=	GTK_CONFIG=${X11BASE}/bin/gtk12-config
 MAKE_FLAGS=	OPT="${CFLAGS}"
 
+PLIST=		${WRKDIR}/PLIST
+SORT?=		sort
+
+DOCDIR=		share/doc/py-gtk
+DOCFILES=	README MAPPING
+
+EXAMDIR=	share/examples/py-gtk
+EXAMSUBDIRS=	glade ide imlib neil simple testgtk
+EXAMFILES=	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
+
 # NOTE: for packaging to work properly, this port should be
 # built with PREFIX set the same as when the python port
 # was built.
 
-post-install:
-	@${MKDIR} ${PREFIX}/share/examples/py-gtk
-	@(cd ${WRKSRC}/examples; tar cf - *) | \
-		(cd ${PREFIX}/share/examples/py-gtk; tar xf -)
+pre-install:
+	@${CP} ${PKGDIR}/PLIST ${PLIST}
+	@${CP} /dev/null ${PLIST}.dirrm
+.for d in ${EXAMSUBDIRS}
+	@${MKDIR} ${PREFIX}/${EXAMDIR}/${d}
+	@${ECHO} @dirrm ${EXAMDIR}/${d} >> ${PLIST}.dirrm
+.endfor
+	@${ECHO} @dirrm ${EXAMDIR} >> ${PLIST}.dirrm
+.for f in ${EXAMFILES}
+	${INSTALL_DATA} ${WRKSRC}/examples/${f} \
+		${PREFIX}/${EXAMDIR}/${f}
+	@${ECHO} ${EXAMDIR}/${f} >> ${PLIST}
+.endfor
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/py-gtk
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/py-gtk
+	@${MKDIR} ${PREFIX}/${DOCDIR}
+	@${ECHO} @dirrm ${DOCDIR} >> ${PLIST}.dirrm
+.for f in ${DOCFILES}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${DOCDIR}/${f}
+	@${ECHO} ${DOCDIR}/${f} >> ${PLIST}
+.endfor
 .endif
+	@${SORT} -r ${PLIST}.dirrm >> ${PLIST}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-gtk/distinfo b/x11-toolkits/py-gtk/distinfo
index 86f2fd7483a8..9a158787def8 100644
--- a/x11-toolkits/py-gtk/distinfo
+++ b/x11-toolkits/py-gtk/distinfo
@@ -1 +1 @@
-MD5 (pygtk-0.5.11.tar.gz) = 0d56e509daba354e5fe4ba191a615596
+MD5 (pygtk-0.5.12.tar.gz) = e5d705b6d06e47a02385f859f0bc8610
diff --git a/x11-toolkits/py-gtk/pkg-plist b/x11-toolkits/py-gtk/pkg-plist
index 71ab2476f33b..5cd184bedaa7 100644
--- a/x11-toolkits/py-gtk/pkg-plist
+++ b/x11-toolkits/py-gtk/pkg-plist
@@ -31,57 +31,4 @@ lib/python1.5/site-packages/GTK.pyo
 lib/python1.5/site-packages/GDK.pyo
 lib/python1.5/site-packages/GtkExtra.pyo
 lib/python1.5/site-packages/GdkImlib.pyo
-share/doc/py-gtk/README
-@dirrm share/doc/py-gtk
-share/examples/py-gtk/glade/README
-share/examples/py-gtk/glade/test2.glade
-share/examples/py-gtk/glade/glade.py
-share/examples/py-gtk/glade/test.glade
-@dirrm share/examples/py-gtk/glade
-share/examples/py-gtk/ide/gtkcons.py
-share/examples/py-gtk/ide/gtkdb.py
-share/examples/py-gtk/ide/edit.py
-share/examples/py-gtk/ide/browse.py
-share/examples/py-gtk/ide/minibreak.xpm
-share/examples/py-gtk/ide/README
-share/examples/py-gtk/ide/gtkprof.py
-share/examples/py-gtk/ide/pyide.py
-share/examples/py-gtk/ide/break.xpm
-share/examples/py-gtk/ide/return.xpm
-share/examples/py-gtk/ide/next.xpm
-share/examples/py-gtk/ide/continue.xpm
-share/examples/py-gtk/ide/step.xpm
-share/examples/py-gtk/ide/edit.xpm
-share/examples/py-gtk/ide/run.xpm
-share/examples/py-gtk/ide/quit.xpm
-@dirrm share/examples/py-gtk/ide
-share/examples/py-gtk/imlib/view.py
-@dirrm share/examples/py-gtk/imlib
-share/examples/py-gtk/neil/TAppli.py
-share/examples/py-gtk/neil/TAppli2.py
-share/examples/py-gtk/neil/TAppli3.py
-share/examples/py-gtk/neil/TAppli4.py
-share/examples/py-gtk/neil/TAppli5.py
-share/examples/py-gtk/neil/bomb.xpm
-share/examples/py-gtk/neil/gtk-logo.xpm
-share/examples/py-gtk/neil/question.xpm
-share/examples/py-gtk/neil/notebook.py
-share/examples/py-gtk/neil/README
-@dirrm share/examples/py-gtk/neil
-share/examples/py-gtk/simple/hello1.py
-share/examples/py-gtk/simple/hello2.py
-share/examples/py-gtk/simple/simple1.py
-share/examples/py-gtk/simple/simple2.py
-share/examples/py-gtk/simple/tooltip1.py
-share/examples/py-gtk/simple/tooltip2.py
-share/examples/py-gtk/simple/scribble.py
-share/examples/py-gtk/simple/dnd.py
-share/examples/py-gtk/simple/dndpixmap.py
-share/examples/py-gtk/simple/README
-@dirrm share/examples/py-gtk/simple
-share/examples/py-gtk/testgtk/testgtk.py
-share/examples/py-gtk/testgtk/test.xpm
-share/examples/py-gtk/testgtk/testgtkrc
-share/examples/py-gtk/testgtk/README
-@dirrm share/examples/py-gtk/testgtk
-@dirrm share/examples/py-gtk
+@dirrm lib/python1.5/site-packages
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index f5e7c191226e..ae01bbc5c8f5 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	py-gtk
-# Version required:			0.5.10
+# Version required:			0.5.12
 # Date created:				12/26/1998
 # Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.20 1999/02/28 09:28:34 obrien Exp $
+# $Id: Makefile,v 1.21 1999/02/28 18:48:50 nectar Exp $
 #
 
-DISTNAME=	pygtk-0.5.11
-PKGNAME=	py-gtk-0.5.11
+DISTNAME=	pygtk-0.5.12
+PKGNAME=	py-gtk-0.5.12
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
 		ftp://ftp.gimp.org/pub/gtk/python/ \
@@ -18,24 +18,63 @@ MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
 MAINTAINER=	nectar@FreeBSD.ORG
 
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
-LIB_DEPENDS=	Imlib.2:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	gdk_imlib.2:${PORTSDIR}/graphics/imlib
 RUN_DEPENDS=	python:${PORTSDIR}/lang/python
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GTK_CONFIG=${X11BASE}/bin/gtk11d-config
+USE_GMAKE=	yes
+CONFIGURE_ENV=	GTK_CONFIG=${X11BASE}/bin/gtk12-config
 MAKE_FLAGS=	OPT="${CFLAGS}"
 
+PLIST=		${WRKDIR}/PLIST
+SORT?=		sort
+
+DOCDIR=		share/doc/py-gtk
+DOCFILES=	README MAPPING
+
+EXAMDIR=	share/examples/py-gtk
+EXAMSUBDIRS=	glade ide imlib neil simple testgtk
+EXAMFILES=	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
+
 # NOTE: for packaging to work properly, this port should be
 # built with PREFIX set the same as when the python port
 # was built.
 
-post-install:
-	@${MKDIR} ${PREFIX}/share/examples/py-gtk
-	@(cd ${WRKSRC}/examples; tar cf - *) | \
-		(cd ${PREFIX}/share/examples/py-gtk; tar xf -)
+pre-install:
+	@${CP} ${PKGDIR}/PLIST ${PLIST}
+	@${CP} /dev/null ${PLIST}.dirrm
+.for d in ${EXAMSUBDIRS}
+	@${MKDIR} ${PREFIX}/${EXAMDIR}/${d}
+	@${ECHO} @dirrm ${EXAMDIR}/${d} >> ${PLIST}.dirrm
+.endfor
+	@${ECHO} @dirrm ${EXAMDIR} >> ${PLIST}.dirrm
+.for f in ${EXAMFILES}
+	${INSTALL_DATA} ${WRKSRC}/examples/${f} \
+		${PREFIX}/${EXAMDIR}/${f}
+	@${ECHO} ${EXAMDIR}/${f} >> ${PLIST}
+.endfor
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/py-gtk
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/py-gtk
+	@${MKDIR} ${PREFIX}/${DOCDIR}
+	@${ECHO} @dirrm ${DOCDIR} >> ${PLIST}.dirrm
+.for f in ${DOCFILES}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${DOCDIR}/${f}
+	@${ECHO} ${DOCDIR}/${f} >> ${PLIST}
+.endfor
 .endif
+	@${SORT} -r ${PLIST}.dirrm >> ${PLIST}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-gtk2/distinfo b/x11-toolkits/py-gtk2/distinfo
index 86f2fd7483a8..9a158787def8 100644
--- a/x11-toolkits/py-gtk2/distinfo
+++ b/x11-toolkits/py-gtk2/distinfo
@@ -1 +1 @@
-MD5 (pygtk-0.5.11.tar.gz) = 0d56e509daba354e5fe4ba191a615596
+MD5 (pygtk-0.5.12.tar.gz) = e5d705b6d06e47a02385f859f0bc8610
diff --git a/x11-toolkits/py-gtk2/pkg-plist b/x11-toolkits/py-gtk2/pkg-plist
index 71ab2476f33b..5cd184bedaa7 100644
--- a/x11-toolkits/py-gtk2/pkg-plist
+++ b/x11-toolkits/py-gtk2/pkg-plist
@@ -31,57 +31,4 @@ lib/python1.5/site-packages/GTK.pyo
 lib/python1.5/site-packages/GDK.pyo
 lib/python1.5/site-packages/GtkExtra.pyo
 lib/python1.5/site-packages/GdkImlib.pyo
-share/doc/py-gtk/README
-@dirrm share/doc/py-gtk
-share/examples/py-gtk/glade/README
-share/examples/py-gtk/glade/test2.glade
-share/examples/py-gtk/glade/glade.py
-share/examples/py-gtk/glade/test.glade
-@dirrm share/examples/py-gtk/glade
-share/examples/py-gtk/ide/gtkcons.py
-share/examples/py-gtk/ide/gtkdb.py
-share/examples/py-gtk/ide/edit.py
-share/examples/py-gtk/ide/browse.py
-share/examples/py-gtk/ide/minibreak.xpm
-share/examples/py-gtk/ide/README
-share/examples/py-gtk/ide/gtkprof.py
-share/examples/py-gtk/ide/pyide.py
-share/examples/py-gtk/ide/break.xpm
-share/examples/py-gtk/ide/return.xpm
-share/examples/py-gtk/ide/next.xpm
-share/examples/py-gtk/ide/continue.xpm
-share/examples/py-gtk/ide/step.xpm
-share/examples/py-gtk/ide/edit.xpm
-share/examples/py-gtk/ide/run.xpm
-share/examples/py-gtk/ide/quit.xpm
-@dirrm share/examples/py-gtk/ide
-share/examples/py-gtk/imlib/view.py
-@dirrm share/examples/py-gtk/imlib
-share/examples/py-gtk/neil/TAppli.py
-share/examples/py-gtk/neil/TAppli2.py
-share/examples/py-gtk/neil/TAppli3.py
-share/examples/py-gtk/neil/TAppli4.py
-share/examples/py-gtk/neil/TAppli5.py
-share/examples/py-gtk/neil/bomb.xpm
-share/examples/py-gtk/neil/gtk-logo.xpm
-share/examples/py-gtk/neil/question.xpm
-share/examples/py-gtk/neil/notebook.py
-share/examples/py-gtk/neil/README
-@dirrm share/examples/py-gtk/neil
-share/examples/py-gtk/simple/hello1.py
-share/examples/py-gtk/simple/hello2.py
-share/examples/py-gtk/simple/simple1.py
-share/examples/py-gtk/simple/simple2.py
-share/examples/py-gtk/simple/tooltip1.py
-share/examples/py-gtk/simple/tooltip2.py
-share/examples/py-gtk/simple/scribble.py
-share/examples/py-gtk/simple/dnd.py
-share/examples/py-gtk/simple/dndpixmap.py
-share/examples/py-gtk/simple/README
-@dirrm share/examples/py-gtk/simple
-share/examples/py-gtk/testgtk/testgtk.py
-share/examples/py-gtk/testgtk/test.xpm
-share/examples/py-gtk/testgtk/testgtkrc
-share/examples/py-gtk/testgtk/README
-@dirrm share/examples/py-gtk/testgtk
-@dirrm share/examples/py-gtk
+@dirrm lib/python1.5/site-packages