Update to GNOME 1.4 -- massive changes all around, for the sake of

CVS repo bloat, I'll only list the updates.

  graphics/imlib		1.9.9  -> 1.9.10
  textproc/xml-i18n-tools	0.8    -> 0.8.1
  x11/gnomelibs			1.2.11 -> 1.2.13
  devel/oaf			0.6.2  -> 0.6.5
  devel/gconf			0.12   -> 1.0.0
  devel/gnomevfs		0.5    -> 1.0
  graphics/gdk-pixbuf		0.9.0  -> 0.11.0
  sysutils/gnomecontrolcenter	1.2.2  -> 1.4.0.1
  print/gnomeprint		0.25   -> 0.28
  devel/bonobo			0.37   -> 1.0.3
  audio/gnomeaudio		1.0.0  -> 1.4.0
  x11/gnomecore			1.2.4  -> 1.4.0.3
  devel/libgtop			1.0.11 -> 1.0.12
  x11/gnomeapplets		1.2.4  -> 1.4.0.1
  misc/gnomeuserdocs		          NEW 1.4.1
  misc/gnomeutils		1.2.1  -> 1.4.0
  deskutils/gnomepim		1.2.0  -> 1.4.0
  games/gnomegames		1.2.0  -> 1.4.0.1
  print/ggv			0.95   -> 1.0
  editors/ghex			1.1.4  -> 1.2
  devel/bugbuddy		1.2    -> 2.0.1
  devel/glade			0.5.11 -> 0.6.2
  sysutils/gtop			1.0.12 -> 1.0.13
  x11/xalf			          NEW 0.11
  x11-toolkits/py-gtk		0.6.6  -> 0.6.7
  x11-toolkits/py-gnome		1.0.53 -> 1.4.0
  x11-toolkits/guile-gtk	0.19   -> 0.20
  x11-toolkits/guile-gnome	0.10   -> 0.20
  devel/libsigc++		1.0.1  -> 1.0.3
  x11-toolkits/gnome--		1.1.15 -> 1.1.17
  x11-toolkits/panel--		          NEW 0.1
  x11-fm/gnomemc		4.5.51 -> 4.5.54

32 files changed, 169 insertions, 102 deletions

diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 323b4be1d1f2..abd356a98518 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -65,6 +65,7 @@
     SUBDIR += p5-GtkXmHTML
     SUBDIR += p5-Tcl-Tk
     SUBDIR += p5-Tk
+    SUBDIR += panel--
     SUBDIR += pango
     SUBDIR += paragui
     SUBDIR += pike-gtk
diff --git a/x11-toolkits/gnome--/Makefile b/x11-toolkits/gnome--/Makefile
index d406a21955cc..99531b01d326 100644
--- a/x11-toolkits/gnome--/Makefile
+++ b/x11-toolkits/gnome--/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomemm
-PORTVERSION=	1.1.15
-PORTREVISION=	1
+PORTVERSION=	1.1.17
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkmm
diff --git a/x11-toolkits/gnome--/distinfo b/x11-toolkits/gnome--/distinfo
index 7482b6754b17..f31ba9ff70eb 100644
--- a/x11-toolkits/gnome--/distinfo
+++ b/x11-toolkits/gnome--/distinfo
@@ -1 +1 @@
-MD5 (gnomemm-1.1.15.tar.gz) = da151132245dc0b739754b4534602e45
+MD5 (gnomemm-1.1.17.tar.gz) = 843a4b467a3c2833e1de626f242593b8
diff --git a/x11-toolkits/gnome--/files/patch-Makefile.in b/x11-toolkits/gnome--/files/patch-Makefile.in
new file mode 100644
index 000000000000..dc056f19846d
--- /dev/null
+++ b/x11-toolkits/gnome--/files/patch-Makefile.in
@@ -0,0 +1,7 @@
+--- Makefile.in.orig	Sun Apr 22 07:12:11 2001
++++ Makefile.in	Tue Apr 24 00:06:26 2001
+@@ -137,3 +137,3 @@
+ # that use Gtk-- and want to check for the correct version
+-m4datadir = $(datadir)/aclocal
++m4datadir = $(prefix)/share/aclocal
+ m4data_DATA = gnome--.m4
diff --git a/x11-toolkits/gnome--/pkg-plist b/x11-toolkits/gnome--/pkg-plist
index abdee1b20ad0..290cff20455e 100644
--- a/x11-toolkits/gnome--/pkg-plist
+++ b/x11-toolkits/gnome--/pkg-plist
@@ -1,6 +1,7 @@
 etc/gnomemmConf.sh
 include/gnome--.h
 include/gnome--/about.h
+include/gnome--/affinetrans.h
 include/gnome--/animator.h
 include/gnome--/app-callback.h
 include/gnome--/app-helper.h
@@ -55,6 +56,7 @@ include/gnome--/paper-selector.h
 include/gnome--/pixmap-entry.h
 include/gnome--/pixmap.h
 include/gnome--/pixmapmenuitem.h
+include/gnome--/point.h
 include/gnome--/private/about_p.h
 include/gnome--/private/animator_p.h
 include/gnome--/private/app_p.h
@@ -115,6 +117,7 @@ include/gnome--/stock.h
 include/gnome--/types.h
 lib/libgnomemm.a
 lib/libgnomemm.so
-lib/libgnomemm.so.4
+lib/libgnomemm.so.6
+share/aclocal/gnome--.m4
 @dirrm include/gnome--/private
 @dirrm include/gnome--
diff --git a/x11-toolkits/gtk-engines/Makefile b/x11-toolkits/gtk-engines/Makefile
index 587c9770e509..0dcbcd961a09 100644
--- a/x11-toolkits/gtk-engines/Makefile
+++ b/x11-toolkits/gtk-engines/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk-engines
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gtk-engines
@@ -17,7 +18,7 @@ USE_X_PREFIX=	yes
 USE_IMLIB=	yes
 USE_LIBTOOL=	yes
 
-THEMES=		metal notif pixmap redmond95
+THEMES=		metal notif pixmap raleigh redmond95
 
 post-patch:
 	@for theme in ${THEMES}; do \
diff --git a/x11-toolkits/gtk-engines2/Makefile b/x11-toolkits/gtk-engines2/Makefile
index 587c9770e509..0dcbcd961a09 100644
--- a/x11-toolkits/gtk-engines2/Makefile
+++ b/x11-toolkits/gtk-engines2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk-engines
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gtk-engines
@@ -17,7 +18,7 @@ USE_X_PREFIX=	yes
 USE_IMLIB=	yes
 USE_LIBTOOL=	yes
 
-THEMES=		metal notif pixmap redmond95
+THEMES=		metal notif pixmap raleigh redmond95
 
 post-patch:
 	@for theme in ${THEMES}; do \
diff --git a/x11-toolkits/guile-gnome/Makefile b/x11-toolkits/guile-gnome/Makefile
index 5ba9f9f05cdf..7a63c403e784 100644
--- a/x11-toolkits/guile-gnome/Makefile
+++ b/x11-toolkits/guile-gnome/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	guile-gnome
-PORTVERSION=	0.10
+PORTVERSION=	0.20
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gnome-guile
@@ -14,14 +14,14 @@ DISTNAME=	gnome-guile-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	guile.9:${PORTSDIR}/lang/guile \
-		guilegtk-1.2.0:${PORTSDIR}/x11-toolkits/guile-gtk \
-		glade.4:${PORTSDIR}/devel/libglade
+LIB_DEPENDS=	ghttp.1:${PORTSDIR}/www/libghttp \
+		guilegtk-1.2.0:${PORTSDIR}/x11-toolkits/guile-gtk
 
 USE_LIBTOOL=	yes
-USE_GTK=	yes
+USE_GNOME=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--without-bonobo --without-gtkhtml --with-libglade
+CONFIGURE_ARGS=	--without-bonobo --without-gtkhtml --without-gal \
+		--with-libglade --with-gdkpixbuf --with-ghttp
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/x11-toolkits/guile-gnome/distinfo b/x11-toolkits/guile-gnome/distinfo
index 71e7d57ca59a..98bdef9ef7d0 100644
--- a/x11-toolkits/guile-gnome/distinfo
+++ b/x11-toolkits/guile-gnome/distinfo
@@ -1 +1 @@
-MD5 (gnome-guile-0.10.tar.gz) = ed46d5db3714f7563e8f9d7e2b0e0f1c
+MD5 (gnome-guile-0.20.tar.gz) = 2be739e8bbc9fffe70e7ef19950bc984
diff --git a/x11-toolkits/guile-gnome/files/patch-aa b/x11-toolkits/guile-gnome/files/patch-aa
index db626d79d1c5..169b6af73724 100644
--- a/x11-toolkits/guile-gnome/files/patch-aa
+++ b/x11-toolkits/guile-gnome/files/patch-aa
@@ -1,11 +1,7 @@
---- Makefile.in.orig	Sat May 20 14:58:24 2000
-+++ Makefile.in	Fri Jun  9 14:38:57 2000
-@@ -94,7 +94,7 @@
- VERSION = @VERSION@
- ZVT_LIBS = @ZVT_LIBS@
+--- Makefile.in.orig	Sun Feb  4 20:53:35 2001
++++ Makefile.in	Wed Feb 28 11:07:30 2001
+@@ -100,3 +100,3 @@
  
--SUBDIRS = macros guile-gtk guile-gnome 
-+SUBDIRS = macros guile-gnome 
+-SUBDIRS = guile-gtk guile-gnome 
++SUBDIRS = guile-gnome 
  
- EXTRA_DIST = gnome-guile.spec.in gnome-guile.spec
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/x11-toolkits/guile-gnome/files/patch-ab b/x11-toolkits/guile-gnome/files/patch-ab
index dc1d71345ac4..5993edaa75a7 100644
--- a/x11-toolkits/guile-gnome/files/patch-ab
+++ b/x11-toolkits/guile-gnome/files/patch-ab
@@ -1,30 +1,11 @@
---- configure.orig	Sat May 20 14:55:24 2000
-+++ configure	Fri Jun  9 15:16:53 2000
-@@ -3094,9 +3094,9 @@
- try_libglade=true
- libglade_msg="no"
- build_libglade=false
--# Check whether --with-gtkhtml or --without-gtkhtml was given.
--if test "${with_gtkhtml+set}" = set; then
--  withval="$with_gtkhtml"
-+# Check whether --with-libglade or --without-libglade was given.
-+if test "${with_libglade+set}" = set; then
-+  withval="$with_libglade"
-   if test x$withval = xno; then
- 		try_libglade=false
- 	fi
-@@ -3129,7 +3129,7 @@
- 
- CPPFLAGS="$saved_CPPFLAGS"
+--- configure.orig	Fri Mar  9 11:06:26 2001
++++ configure	Thu Apr  5 11:39:56 2001
+@@ -3261,3 +3261,3 @@
  
 -subdirs="guile-gtk"
 +subdirs=""
  
- 
- trap '' 1 2 15
-@@ -3595,76 +3595,6 @@
-     esac
-   done
+@@ -3739,72 +3739,2 @@
  
 -  for ac_config_dir in guile-gtk; do
 -
@@ -97,5 +78,3 @@
 -    cd $ac_popdir
 -  done
  fi
- 
- 
diff --git a/x11-toolkits/guile-gnome/files/patch-ac b/x11-toolkits/guile-gnome/files/patch-ac
index ce7ba4e638ec..65e4af1f4a63 100644
--- a/x11-toolkits/guile-gnome/files/patch-ac
+++ b/x11-toolkits/guile-gnome/files/patch-ac
@@ -1,20 +1,22 @@
---- guile-gnome/Makefile.in.orig	Sat May 20 14:58:39 2000
-+++ guile-gnome/Makefile.in	Fri Jun  9 15:27:36 2000
-@@ -117,7 +117,7 @@
- libguilegnorba_la_LDFLAGS = -export-dynamic
- 
- gnomeg_SOURCES = main.c gnomeg.c client.c gnome-glue.c gnome-ui-infos.h
+--- guile-gnome/Makefile.in.orig	Sun Feb  4 20:53:40 2001
++++ guile-gnome/Makefile.in	Wed Feb 28 12:08:03 2001
+@@ -129,3 +129,3 @@
+ gnomeg_SOURCES = main.c gnomeg.c client.c gnome-glue.c gnome-ui-infos.h gnome-canvas-support.c gnome-canvas-support.h
 -gnomeg_LDADD =  	$(top_builddir)/guile-gtk/libguilegtk.la     	@GUILE_LIBS@ 				     	$(GNOME_LIBDIR)                              	$(GNOMEUI_LIBS)
 +gnomeg_LDADD =  	@GUILE_LIBS@ 				     	$(GNOME_LIBDIR)                              	$(GNOMEUI_LIBS) -lguilegtk-1.2
  
- 
- scmgnomedir = $(datadir)/guile/gnome
-@@ -151,7 +151,7 @@
- PROGRAMS =  $(bin_PROGRAMS)
- 
- gnomeg_OBJECTS =  main.o gnomeg.o client.o gnome-glue.o
+@@ -165,4 +165,4 @@
+ gnome-canvas-support.o
 -gnomeg_DEPENDENCIES =  $(top_builddir)/guile-gtk/libguilegtk.la
-+gnomeg_DEPENDENCIES =  
- gnomeg_LDFLAGS = 
+-gnomeg_LDFLAGS = 
++gnomeg_DEPENDENCIES =
++gnomeg_LDFLAGS = -pthread
  CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@@ -190,7 +190,2 @@
+ 	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps guile-gnome/Makefile
+-
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) \
+-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+-
+ 
diff --git a/x11-toolkits/guile-gnome/files/patch-ad b/x11-toolkits/guile-gnome/files/patch-ad
index 7b9b2527dd24..090457d9b8e5 100644
--- a/x11-toolkits/guile-gnome/files/patch-ad
+++ b/x11-toolkits/guile-gnome/files/patch-ad
@@ -1,11 +1,14 @@
---- guile-gnome/libglade/Makefile.in.orig	Mon Oct  2 01:09:47 2000
-+++ guile-gnome/libglade/Makefile.in	Mon Oct  2 01:11:08 2000
-@@ -97,7 +97,7 @@
- INCLUDES = -I.. -I$(srcdir)/.. -I../../guile-gtk -I$(srcdir)/../../guile-gtk 	-I$(includedir) $(GUILE_INCS) $(GNOME_INCLUDEDIR)
+--- guile-gnome/libglade/Makefile.in.orig	Sun Feb  4 20:53:44 2001
++++ guile-gnome/libglade/Makefile.in	Wed Feb 28 11:11:15 2001
+@@ -103,3 +103,3 @@
  
- 
--GLADE_LIBS = -lglade -lglade-gnome -lglade-bonobo
+-GLADE_LIBS = -lglade -lglade-gnome 
 +GLADE_LIBS = `libglade-config --libs gnome`
  
- lib_LTLIBRARIES = libguileglade.la
- libguileglade_la_SOURCES = libglade-glue.c 
+--- guile-gnome/bonobo/Makefile.in.orig	Sun Feb  4 20:53:42 2001
++++ guile-gnome/bonobo/Makefile.in	Wed Feb 28 11:15:12 2001
+@@ -103,3 +103,3 @@
+ 
+-BONOBO_LIBS = -lbonobo 
++BONOBO_LIBS = `gnome-config --libs bonobo`
+ 
diff --git a/x11-toolkits/guile-gnome/pkg-plist b/x11-toolkits/guile-gnome/pkg-plist
index dd32cf9eb74b..2a6ecdf50375 100644
--- a/x11-toolkits/guile-gnome/pkg-plist
+++ b/x11-toolkits/guile-gnome/pkg-plist
@@ -1,4 +1,10 @@
 bin/gnomeg
+lib/libguilegdkpixbuf.a
+lib/libguilegdkpixbuf.so
+lib/libguilegdkpixbuf.so.0
+lib/libguileghttp.a
+lib/libguileghttp.so
+lib/libguileghttp.so.0
 lib/libguileglade.a
 lib/libguileglade.so
 lib/libguileglade.so.0
@@ -11,13 +17,20 @@ lib/libguilegnorba.so.0
 lib/libguilezvt.a
 lib/libguilezvt.so
 lib/libguilezvt.so.0
-share/guile-gnome/gnome.defs
-share/guile-gnome/gnorba.defs
-share/guile-gnome/libglade.defs
-share/guile-gnome/zvt.defs
-share/guile/gnome/gnome.scm
-share/guile/gnome/gnorba.scm
-share/guile/gnome/zvt.scm
-share/guile/gtk/libglade.scm
-@dirrm share/guile-gnome
-@dirrm share/guile/gnome
+share/gnome/guile-gnome/ghttp.defs
+share/gnome/guile-gnome/gnome.defs
+share/gnome/guile-gnome/gnorba.defs
+share/gnome/guile-gnome/zvt.defs
+share/gnome/guile-gtk/gdkpixbuf.defs
+share/gnome/guile-gtk/libglade.defs
+share/gnome/guile/gnome/ghttp.scm
+share/gnome/guile/gnome/gnome.scm
+share/gnome/guile/gnome/gnorba.scm
+share/gnome/guile/gnome/zvt.scm
+share/gnome/guile/gtk/gdkpixbuf.scm
+share/gnome/guile/gtk/libglade.scm
+@dirrm share/gnome/guile/gtk
+@dirrm share/gnome/guile/gnome
+@dirrm share/gnome/guile
+@dirrm share/gnome/guile-gtk
+@dirrm share/gnome/guile-gnome
diff --git a/x11-toolkits/guile-gtk/Makefile b/x11-toolkits/guile-gtk/Makefile
index 7f7c4158e991..b4c7f74896dd 100644
--- a/x11-toolkits/guile-gtk/Makefile
+++ b/x11-toolkits/guile-gtk/Makefile
@@ -6,15 +6,18 @@
 #
 
 PORTNAME=	guile-gtk
-PORTVERSION=	0.19
+PORTVERSION=	0.20
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://www.ping.de/sites/zagadka/guile-gtk/download/
+MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gnome-guile
+DISTNAME=	gnome-guile-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	guile.9:${PORTSDIR}/lang/guile
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/guile-gtk
+
 USE_GTK=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/guile-gtk/distinfo b/x11-toolkits/guile-gtk/distinfo
index d978dbd86235..98bdef9ef7d0 100644
--- a/x11-toolkits/guile-gtk/distinfo
+++ b/x11-toolkits/guile-gtk/distinfo
@@ -1 +1 @@
-MD5 (guile-gtk-0.19.tar.gz) = ec4c28e1edfc21e075046eae6b99d945
+MD5 (gnome-guile-0.20.tar.gz) = 2be739e8bbc9fffe70e7ef19950bc984
diff --git a/x11-toolkits/guile-gtk/files/patch-aa b/x11-toolkits/guile-gtk/files/patch-aa
new file mode 100644
index 000000000000..034254596eb8
--- /dev/null
+++ b/x11-toolkits/guile-gtk/files/patch-aa
@@ -0,0 +1,10 @@
+--- gtk-threads.c.orig	Thu Nov 30 09:22:53 2000
++++ gtk-threads.c	Wed Feb 28 10:40:06 2001
+@@ -244,3 +244,7 @@
+ 
++#ifdef __FreeBSD__
++  timed_out = (result == ETIMEDOUT);
++#else
+   timed_out = (result == ETIME);
++#endif
+ 
diff --git a/x11-toolkits/guile-gtk/pkg-plist b/x11-toolkits/guile-gtk/pkg-plist
index 3a04ec9dac7c..bf3bd8a34caf 100644
--- a/x11-toolkits/guile-gtk/pkg-plist
+++ b/x11-toolkits/guile-gtk/pkg-plist
@@ -12,9 +12,10 @@ share/guile/gtk-1.2/gtk.scm
 share/guile/gtk/config.scm
 share/guile/gtk/dynlink.scm
 share/guile/gtk/dynlink-old.scm
-share/guile/gtk/event-repl.scm
 share/guile/gtk/gdk.scm
 share/guile/gtk/gtk.scm
+share/guile/gtk/repl.scm
+share/guile/gtk/threads.scm
 @dirrm share/guile-gtk
 @dirrm share/guile/gtk-1.2
 @dirrm share/guile/gtk
diff --git a/x11-toolkits/panel--/Makefile b/x11-toolkits/panel--/Makefile
new file mode 100644
index 000000000000..127d8ca60b9a
--- /dev/null
+++ b/x11-toolkits/panel--/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for:    panelmm
+# Date created:				28th February 2001
+# Whom:					Ade Lovett <ade@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	panelmm
+PORTVERSION=	0.1
+CATEGORIES=	x11-toolkits gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	stable/sources/panelmm
+
+MAINTAINER=	ade@FreeBSD.org
+
+LIB_DEPENDS=	gnomemm.6:${PORTSDIR}/x11-toolkits/gnome--
+
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+USE_GNOME=	yes
+USE_LIBTOOL=	yes
+LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
+INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--enable-static
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/panel--/distinfo b/x11-toolkits/panel--/distinfo
new file mode 100644
index 000000000000..7420d103f6d9
--- /dev/null
+++ b/x11-toolkits/panel--/distinfo
@@ -0,0 +1 @@
+MD5 (panelmm-0.1.tar.gz) = c69464cf59468e82bb1bfdc3aa1c72b9
diff --git a/x11-toolkits/panel--/files/patch-aa b/x11-toolkits/panel--/files/patch-aa
new file mode 100644
index 000000000000..9591d6bfd3dc
--- /dev/null
+++ b/x11-toolkits/panel--/files/patch-aa
@@ -0,0 +1,7 @@
+--- Makefile.in.orig	Tue May 23 18:20:42 2000
++++ Makefile.in	Wed Feb 28 14:30:24 2001
+@@ -104,3 +104,3 @@
+ 
+-confexecdir = $(libdir)
++confexecdir = $(sysconfdir)
+ confexec_DATA = panelmmConf.sh
diff --git a/x11-toolkits/panel--/pkg-comment b/x11-toolkits/panel--/pkg-comment
new file mode 100644
index 000000000000..22e34f7970a4
--- /dev/null
+++ b/x11-toolkits/panel--/pkg-comment
@@ -0,0 +1 @@
+A powerful C++ binding for the GNOME panel libraries
diff --git a/x11-toolkits/panel--/pkg-descr b/x11-toolkits/panel--/pkg-descr
new file mode 100644
index 000000000000..fd3cd8de5e71
--- /dev/null
+++ b/x11-toolkits/panel--/pkg-descr
@@ -0,0 +1,8 @@
+Panel-- - A GTK-- wrapper for applet_widget
+
+This is a wrapper for the applet_widget component of GNOME for use
+with the GTK-- wrapper for GTK, the Gimp Toolkit and libgnomeui, the
+GNOME UI library.  The wrapper is distributed under the GNU LGPL and
+its demo is distibuted under the GNU GPL.
+
+WWW: http://www.gnome.org/
diff --git a/x11-toolkits/panel--/pkg-plist b/x11-toolkits/panel--/pkg-plist
new file mode 100644
index 000000000000..7dc7175ec8b5
--- /dev/null
+++ b/x11-toolkits/panel--/pkg-plist
@@ -0,0 +1,11 @@
+etc/panelmmConf.sh
+include/panel--.h
+include/panel--/applet-main.h
+include/panel--/applet.h
+include/panel--/private/applet-main_p.h
+include/panel--/private/applet_p.h
+lib/libpanelmm.a
+lib/libpanelmm.so
+lib/libpanelmm.so.0
+@dirrm include/panel--/private
+@dirrm include/panel--
diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index 56ac90886ea9..f5d99ecc1701 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	py-gnome
-PORTVERSION=	1.0.53
+PORTVERSION=	1.4.0
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-python
@@ -15,7 +15,6 @@ DISTNAME=	gnome-python-${PORTVERSION}
 MAINTAINER=	nectar@FreeBSD.org
 
 BUILD_DEPENDS=	${PYGTK_DEP}
-LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade
 RUN_DEPENDS=	${PYGTK_DEP}
 
 USE_GMAKE=	yes
diff --git a/x11-toolkits/py-gnome/distinfo b/x11-toolkits/py-gnome/distinfo
index 43387e5314c0..563b6e614aa0 100644
--- a/x11-toolkits/py-gnome/distinfo
+++ b/x11-toolkits/py-gnome/distinfo
@@ -1 +1 @@
-MD5 (gnome-python-1.0.53.tar.gz) = 597535c5e25596fe6f7924bde2b6a912
+MD5 (gnome-python-1.4.0.tar.gz) = bbb83517e6d042832c86c96c0451fdad
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 56ac90886ea9..f5d99ecc1701 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	py-gnome
-PORTVERSION=	1.0.53
+PORTVERSION=	1.4.0
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-python
@@ -15,7 +15,6 @@ DISTNAME=	gnome-python-${PORTVERSION}
 MAINTAINER=	nectar@FreeBSD.org
 
 BUILD_DEPENDS=	${PYGTK_DEP}
-LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade
 RUN_DEPENDS=	${PYGTK_DEP}
 
 USE_GMAKE=	yes
diff --git a/x11-toolkits/py-gnome2/distinfo b/x11-toolkits/py-gnome2/distinfo
index 43387e5314c0..563b6e614aa0 100644
--- a/x11-toolkits/py-gnome2/distinfo
+++ b/x11-toolkits/py-gnome2/distinfo
@@ -1 +1 @@
-MD5 (gnome-python-1.0.53.tar.gz) = 597535c5e25596fe6f7924bde2b6a912
+MD5 (gnome-python-1.4.0.tar.gz) = bbb83517e6d042832c86c96c0451fdad
diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile
index bfd04a556f91..a55ce9f4ea16 100644
--- a/x11-toolkits/py-gtk/Makefile
+++ b/x11-toolkits/py-gtk/Makefile
@@ -6,20 +6,18 @@
 #
 
 PORTNAME=	py-gtk
-PORTVERSION=	0.6.6
+PORTVERSION=	0.6.7
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-python	
-DISTNAME=	gnome-python-1.0.53
+DISTNAME=	gnome-python-1.4.0
 
 MAINTAINER=	nectar@FreeBSD.org
 
-LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/pygtk
 
 USE_GMAKE=	yes
-USE_IMLIB=	yes
+USE_GNOME=	yes
 USE_PYTHON=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	PYTHON=${PYTHON_CMD}
diff --git a/x11-toolkits/py-gtk/distinfo b/x11-toolkits/py-gtk/distinfo
index 43387e5314c0..563b6e614aa0 100644
--- a/x11-toolkits/py-gtk/distinfo
+++ b/x11-toolkits/py-gtk/distinfo
@@ -1 +1 @@
-MD5 (gnome-python-1.0.53.tar.gz) = 597535c5e25596fe6f7924bde2b6a912
+MD5 (gnome-python-1.4.0.tar.gz) = bbb83517e6d042832c86c96c0451fdad
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index bfd04a556f91..a55ce9f4ea16 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -6,20 +6,18 @@
 #
 
 PORTNAME=	py-gtk
-PORTVERSION=	0.6.6
+PORTVERSION=	0.6.7
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-python	
-DISTNAME=	gnome-python-1.0.53
+DISTNAME=	gnome-python-1.4.0
 
 MAINTAINER=	nectar@FreeBSD.org
 
-LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/pygtk
 
 USE_GMAKE=	yes
-USE_IMLIB=	yes
+USE_GNOME=	yes
 USE_PYTHON=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	PYTHON=${PYTHON_CMD}
diff --git a/x11-toolkits/py-gtk2/distinfo b/x11-toolkits/py-gtk2/distinfo
index 43387e5314c0..563b6e614aa0 100644
--- a/x11-toolkits/py-gtk2/distinfo
+++ b/x11-toolkits/py-gtk2/distinfo
@@ -1 +1 @@
-MD5 (gnome-python-1.0.53.tar.gz) = 597535c5e25596fe6f7924bde2b6a912
+MD5 (gnome-python-1.4.0.tar.gz) = bbb83517e6d042832c86c96c0451fdad