Update to version 1.0.6.

PR:		11017
Submitted by:	maintainer

24 files changed, 168 insertions, 162 deletions

diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index dc2e6ac3e2a1..6b61084db477 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	gnomelibs
-# Version required:			1.0.4
+# Version required:			1.0.6
 # Date created:				17 June 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.37 1999/03/27 10:35:55 vanilla Exp $
+# $Id: Makefile,v 1.38 1999/04/02 03:25:28 steve Exp $
 #
 
-DISTNAME=	gnome-libs-1.0.4
-PKGNAME=	gnomelibs-1.0.4
+DISTNAME=	gnome-libs-1.0.6
+PKGNAME=	gnomelibs-1.0.6
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-libs
diff --git a/x11/gnome-libs/distinfo b/x11/gnome-libs/distinfo
index c7883b5e8af8..ce385c23ca7f 100644
--- a/x11/gnome-libs/distinfo
+++ b/x11/gnome-libs/distinfo
@@ -1 +1 @@
-MD5 (gnome-libs-1.0.4.tar.gz) = d490198ff59f398520a470e801943498
+MD5 (gnome-libs-1.0.6.tar.gz) = b85fa169eae7c6630f5c6258147b91ad
diff --git a/x11/gnome-libs/files/patch-bc b/x11/gnome-libs/files/patch-bc
index 2ed5bfffd348..9ccd0f82295d 100644
--- a/x11/gnome-libs/files/patch-bc
+++ b/x11/gnome-libs/files/patch-bc
@@ -1,15 +1,15 @@
---- libgnome/Makefile.in.orig	Tue Feb 16 01:09:10 1999
-+++ libgnome/Makefile.in	Fri Feb 19 00:21:51 1999
-@@ -170,10 +170,10 @@
+--- libgnome/Makefile.in.orig	Wed Apr  7 21:33:54 1999
++++ libgnome/Makefile.in	Fri Apr 30 17:35:08 1999
+@@ -172,10 +172,10 @@
  
  EXTRA_DIST = parse-path.cP 
  
--libgnome_la_LDFLAGS = -version-info 35:0:3 #-rpath $(libdir)
-+libgnome_la_LDFLAGS = -version-info 1:0:0
+-libgnome_la_LDFLAGS = -version-info 35:2:3 #-rpath $(libdir)
++libgnome_la_LDFLAGS = -version-info 1:0:0 #-rpath $(libdir)
  libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB)
  
 -bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote 	gconfigger gnome-gen-mimedb
-+bin_PROGRAMS = gnome-dump-metadata gnome-moz-remote gconfigger gnome-gen-mimedb
++bin_PROGRAMS = gnome-dump-metadata gnome-moz-remote 	gconfigger gnome-gen-mimedb
  
  
  dns_helper_SOURCES = dns-helper.c
diff --git a/x11/gnome-libs/files/patch-bd b/x11/gnome-libs/files/patch-bd
index 75cdbb379495..327f8ebbbee3 100644
--- a/x11/gnome-libs/files/patch-bd
+++ b/x11/gnome-libs/files/patch-bd
@@ -1,15 +1,15 @@
---- libgnomeui/Makefile.in.orig	Tue Feb 16 01:09:16 1999
-+++ libgnomeui/Makefile.in	Fri Feb 19 00:26:03 1999
-@@ -200,7 +200,7 @@
+--- libgnomeui/Makefile.in.orig	Wed Apr  7 21:34:11 1999
++++ libgnomeui/Makefile.in	Fri Apr 30 17:30:51 1999
+@@ -202,7 +202,7 @@
  EXTRA_DIST =  	$(SGML)						$(gtkrc_DATA)					AUTHORS						gnome.defs 					maketypes.awk					makeenums.pl					gnome-boxed.defs				gnometypebuiltins_vars.c			gnometypebuiltins_ids.c				gnometypebuiltins_evals.c
  
  
--libgnomeui_la_LDFLAGS = -version-info 40:0:8 -rpath $(libdir)
-+libgnomeui_la_LDFLAGS = -version-info 1:0:0
+-libgnomeui_la_LDFLAGS = -version-info 41:0:9 -rpath $(libdir)
++libgnomeui_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
  libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS)
  
- gnome_segv_LDADD =  	$(top_builddir)/libgnomeui/libgnomeui.la 		$(top_builddir)/libgnome/libgnome.la 			$(top_builddir)/libart_lgpl/libart_lgpl.la 		@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) 	$(INTLLIBS)
-@@ -1468,7 +1468,7 @@
+ gnome_segv_LDADD =  	libgnomeui.la 						$(top_builddir)/libgnome/libgnome.la 			$(top_builddir)/libart_lgpl/libart_lgpl.la 		@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) 	$(INTLLIBS)
+@@ -1478,7 +1478,7 @@
  check: check-recursive
  installcheck-am:
  installcheck: installcheck-recursive
@@ -18,7 +18,7 @@
  install-exec: install-exec-recursive
  
  install-data-am: install-gtkrcDATA install-libgnomeuiincludeHEADERS
-@@ -1480,7 +1480,7 @@
+@@ -1490,7 +1490,7 @@
  uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \
  		uninstall-gtkrcDATA uninstall-libgnomeuiincludeHEADERS
  uninstall: uninstall-recursive
diff --git a/x11/gnome-libs/files/patch-be b/x11/gnome-libs/files/patch-be
index 80e4c5ae33e9..f5bdd3c1180c 100644
--- a/x11/gnome-libs/files/patch-be
+++ b/x11/gnome-libs/files/patch-be
@@ -1,11 +1,11 @@
---- libgnorba/Makefile.in.orig	Tue Feb 16 01:09:31 1999
-+++ libgnorba/Makefile.in	Fri Feb 19 00:22:52 1999
-@@ -172,7 +172,7 @@
- libgnorbainclude_HEADERS =  	gnorba.h 						gnome-factory.h
+--- libgnorba/Makefile.in.orig	Wed Apr  7 21:34:31 1999
++++ libgnorba/Makefile.in	Fri Apr 30 17:40:01 1999
+@@ -185,7 +185,7 @@
+ libgnorbainclude_HEADERS =  	gnorba.h 						gnome-factory.h						GnomeObject.h						Table.h
  
  
--libgnorba_la_LDFLAGS = -version-info 28:4:1 -rpath $(libdir)
-+libgnorba_la_LDFLAGS = -version-info 1:0:0
+-libgnorba_la_LDFLAGS = -version-info 28:5:1 -rpath $(libdir)
++libgnorba_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
  libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm
  
  loadshlib_SOURCES = loadshlib.c
diff --git a/x11/gnome-libs/files/patch-bf b/x11/gnome-libs/files/patch-bf
index c41f89447f8e..26760886d0b3 100644
--- a/x11/gnome-libs/files/patch-bf
+++ b/x11/gnome-libs/files/patch-bf
@@ -1,15 +1,15 @@
---- support/Makefile.in.orig	Tue Feb 16 01:08:59 1999
-+++ support/Makefile.in	Fri Feb 19 00:20:20 1999
-@@ -146,7 +146,7 @@
+--- support/Makefile.in.orig	Thu Apr  8 11:33:39 1999
++++ support/Makefile.in	Thu Apr  8 08:46:59 1999
+@@ -148,7 +148,7 @@
  mcserv = @mcserv@
  need_gnome_support = @need_gnome_support@
  
--supportincludedir = $(pkglibdir)/include
-+supportincludedir = $(includedir)
+-supportexecincludedir = $(pkglibdir)/include
++supportexecincludedir = $(includedir)
  
  INCLUDES = -D_GNU_SOURCE
  
-@@ -171,7 +171,7 @@
+@@ -170,7 +170,7 @@
  
  libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c
  libgnomesupport_la_LIBADD = @LTLIBOBJS@
diff --git a/x11/gnome-libs/files/patch-bg b/x11/gnome-libs/files/patch-bg
index daa774b86a6c..8c70d648c004 100644
--- a/x11/gnome-libs/files/patch-bg
+++ b/x11/gnome-libs/files/patch-bg
@@ -1,15 +1,15 @@
---- zvt/Makefile.in.orig	Sun Feb 28 02:22:21 1999
-+++ zvt/Makefile.in	Mon Mar  1 21:01:11 1999
-@@ -158,7 +158,7 @@
+--- zvt/Makefile.in.orig	Wed Apr  7 21:34:27 1999
++++ zvt/Makefile.in	Fri Apr 30 17:53:45 1999
+@@ -160,7 +160,7 @@
  libzvt_la_SOURCES =  	gnome-login-support.h		gnome-login-support.c		lists.c				subshell.h			subshell.c			subshell-includes.h		update.c			vt.c				zvtterm.c
  
  
--libzvt_la_LDFLAGS = -version-info 4:0:2 -rpath $(libdir)
+-libzvt_la_LDFLAGS = -version-info 4:2:2 -rpath $(libdir)
 +libzvt_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
  
  libzvtinclude_HEADERS =  	lists.h				vt.h				vtx.h				zvtterm.h
  
-@@ -433,8 +433,7 @@
+@@ -435,8 +435,7 @@
  check: check-am
  installcheck-am:
  installcheck: installcheck-am
@@ -19,7 +19,7 @@
  install-exec: install-exec-am
  
  install-data-am: install-libzvtincludeHEADERS
-@@ -446,7 +445,7 @@
+@@ -448,7 +447,7 @@
  uninstall-am: uninstall-libLTLIBRARIES uninstall-sbinPROGRAMS \
  		uninstall-libzvtincludeHEADERS
  uninstall: uninstall-am
diff --git a/x11/gnome-libs/pkg-plist b/x11/gnome-libs/pkg-plist
index 4d9d72ec2765..79c24bcb630a 100644
--- a/x11/gnome-libs/pkg-plist
+++ b/x11/gnome-libs/pkg-plist
@@ -8,7 +8,6 @@ bin/gnome-name-service
 bin/goad-browser
 bin/libart-config
 bin/loadshlib
-bin/new-object
 etc/gnomeConf.sh
 etc/libartConf.sh
 etc/mime-magic
@@ -16,8 +15,6 @@ etc/mime-magic.dat
 etc/paper.config
 etc/sound/events/gnome.soundlist
 etc/sound/events/gtk-events.soundlist
-@dirrm etc/sound/events
-@dirrm etc/sound
 include/gnome.h
 include/gnomesupport.h
 include/gtk-xmhtml/HTML.h
@@ -28,7 +25,6 @@ include/gtk-xmhtml/gtk-xmhtml-p.h
 include/gtk-xmhtml/gtk-xmhtml.h
 include/gtk-xmhtml/miniparse.h
 include/gtk-xmhtml/toolkit.h
-@dirrm include/gtk-xmhtml
 include/libart_lgpl/art_affine.h
 include/libart_lgpl/art_alphagamma.h
 include/libart_lgpl/art_bpath.h
@@ -60,7 +56,6 @@ include/libart_lgpl/art_uta_vpath.h
 include/libart_lgpl/art_vpath.h
 include/libart_lgpl/art_vpath_bpath.h
 include/libart_lgpl/art_vpath_svp.h
-@dirrm include/libart_lgpl
 include/libgnome/gnome-config.h
 include/libgnome/gnome-defs.h
 include/libgnome/gnome-dentry.h
@@ -83,7 +78,6 @@ include/libgnome/gnome-triggers.h
 include/libgnome/gnome-url.h
 include/libgnome/gnome-util.h
 include/libgnome/libgnome.h
-@dirrm include/libgnome
 include/libgnomeui/gnome-about.h
 include/libgnomeui/gnome-animator.h
 include/libgnomeui/gnome-app-helper.h
@@ -156,16 +150,15 @@ include/libgnomeui/gtkcauldron.h
 include/libgnomeui/gtkdial.h
 include/libgnomeui/gtkpixmapmenuitem.h
 include/libgnomeui/libgnomeui.h
-@dirrm include/libgnomeui
+include/libgnorba/GnomeObject.h
+include/libgnorba/Table.h
 include/libgnorba/gnome-factory.h
 include/libgnorba/gnorba.h
-@dirrm include/libgnorba
 include/popt-gnome.h
 include/zvt/lists.h
 include/zvt/vt.h
 include/zvt/vtx.h
 include/zvt/zvtterm.h
-@dirrm include/zvt
 lib/libart_lgpl.a
 lib/libart_lgpl.la
 lib/libart_lgpl.so
@@ -200,21 +193,17 @@ lib/libzvt.so
 lib/libzvt.so.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@exec mkdir -p %D/share/gnome/games
-@dirrm share/gnome/games
 share/gnome/gtkrc
 share/gnome/gtkrc.ja
 share/gnome/gtkrc.ko
 share/gnome/gtkrc.ru
 share/gnome/idl/GnomeObject.idl
 share/gnome/idl/Table.idl
-share/gnome/idl/base.idl
 share/gnome/idl/gnome-editor.idl
 share/gnome/idl/gnome-factory.idl
+share/gnome/idl/gnome-file.idl
 share/gnome/idl/name-service.idl
-@dirrm share/gnome/idl
 share/gnome/mime-info/gnome.mime
-@dirrm share/gnome/mime-info
 share/gnome/pixmaps/calculator-font.png
 share/gnome/pixmaps/gnome-default-dlg.png
 share/gnome/pixmaps/gnome-error.png
@@ -223,12 +212,9 @@ share/gnome/pixmaps/gnome-question.png
 share/gnome/pixmaps/gnome-warning.png
 share/gnome/pixmaps/no.xpm
 share/gnome/pixmaps/yes.xpm
-@dirrm share/gnome/pixmaps
 share/gnome/type-convert/gnome-make-postscript-mimes
 share/gnome/type-convert/postscript.convert
 share/gnome/type-convert/type.convert
-@dirrm share/gnome/type-convert
-@dirrm share/gnome
 share/locale/ca/LC_MESSAGES/gnome-libs.mo
 share/locale/cs/LC_MESSAGES/gnome-libs.mo
 share/locale/da/LC_MESSAGES/gnome-libs.mo
@@ -247,3 +233,19 @@ share/locale/pl/LC_MESSAGES/gnome-libs.mo
 share/locale/pt/LC_MESSAGES/gnome-libs.mo
 share/locale/ru/LC_MESSAGES/gnome-libs.mo
 share/locale/sv/LC_MESSAGES/gnome-libs.mo
+share/locale/wa/LC_MESSAGES/gnome-libs.mo
+@exec mkdir -p %D/share/gnome/games
+@dirrm etc/sound/events
+@dirrm etc/sound
+@dirrm include/gtk-xmhtml
+@dirrm include/libart_lgpl
+@dirrm include/libgnome
+@dirrm include/libgnomeui
+@dirrm include/libgnorba
+@dirrm include/zvt
+@dirrm share/gnome/games
+@dirrm share/gnome/idl
+@dirrm share/gnome/mime-info
+@dirrm share/gnome/pixmaps
+@dirrm share/gnome/type-convert
+@dirrm share/gnome
diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile
index dc2e6ac3e2a1..6b61084db477 100644
--- a/x11/gnomelibs/Makefile
+++ b/x11/gnomelibs/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	gnomelibs
-# Version required:			1.0.4
+# Version required:			1.0.6
 # Date created:				17 June 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.37 1999/03/27 10:35:55 vanilla Exp $
+# $Id: Makefile,v 1.38 1999/04/02 03:25:28 steve Exp $
 #
 
-DISTNAME=	gnome-libs-1.0.4
-PKGNAME=	gnomelibs-1.0.4
+DISTNAME=	gnome-libs-1.0.6
+PKGNAME=	gnomelibs-1.0.6
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-libs
diff --git a/x11/gnomelibs/distinfo b/x11/gnomelibs/distinfo
index c7883b5e8af8..ce385c23ca7f 100644
--- a/x11/gnomelibs/distinfo
+++ b/x11/gnomelibs/distinfo
@@ -1 +1 @@
-MD5 (gnome-libs-1.0.4.tar.gz) = d490198ff59f398520a470e801943498
+MD5 (gnome-libs-1.0.6.tar.gz) = b85fa169eae7c6630f5c6258147b91ad
diff --git a/x11/gnomelibs/files/patch-bc b/x11/gnomelibs/files/patch-bc
index 2ed5bfffd348..9ccd0f82295d 100644
--- a/x11/gnomelibs/files/patch-bc
+++ b/x11/gnomelibs/files/patch-bc
@@ -1,15 +1,15 @@
---- libgnome/Makefile.in.orig	Tue Feb 16 01:09:10 1999
-+++ libgnome/Makefile.in	Fri Feb 19 00:21:51 1999
-@@ -170,10 +170,10 @@
+--- libgnome/Makefile.in.orig	Wed Apr  7 21:33:54 1999
++++ libgnome/Makefile.in	Fri Apr 30 17:35:08 1999
+@@ -172,10 +172,10 @@
  
  EXTRA_DIST = parse-path.cP 
  
--libgnome_la_LDFLAGS = -version-info 35:0:3 #-rpath $(libdir)
-+libgnome_la_LDFLAGS = -version-info 1:0:0
+-libgnome_la_LDFLAGS = -version-info 35:2:3 #-rpath $(libdir)
++libgnome_la_LDFLAGS = -version-info 1:0:0 #-rpath $(libdir)
  libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB)
  
 -bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote 	gconfigger gnome-gen-mimedb
-+bin_PROGRAMS = gnome-dump-metadata gnome-moz-remote gconfigger gnome-gen-mimedb
++bin_PROGRAMS = gnome-dump-metadata gnome-moz-remote 	gconfigger gnome-gen-mimedb
  
  
  dns_helper_SOURCES = dns-helper.c
diff --git a/x11/gnomelibs/files/patch-bd b/x11/gnomelibs/files/patch-bd
index 75cdbb379495..327f8ebbbee3 100644
--- a/x11/gnomelibs/files/patch-bd
+++ b/x11/gnomelibs/files/patch-bd
@@ -1,15 +1,15 @@
---- libgnomeui/Makefile.in.orig	Tue Feb 16 01:09:16 1999
-+++ libgnomeui/Makefile.in	Fri Feb 19 00:26:03 1999
-@@ -200,7 +200,7 @@
+--- libgnomeui/Makefile.in.orig	Wed Apr  7 21:34:11 1999
++++ libgnomeui/Makefile.in	Fri Apr 30 17:30:51 1999
+@@ -202,7 +202,7 @@
  EXTRA_DIST =  	$(SGML)						$(gtkrc_DATA)					AUTHORS						gnome.defs 					maketypes.awk					makeenums.pl					gnome-boxed.defs				gnometypebuiltins_vars.c			gnometypebuiltins_ids.c				gnometypebuiltins_evals.c
  
  
--libgnomeui_la_LDFLAGS = -version-info 40:0:8 -rpath $(libdir)
-+libgnomeui_la_LDFLAGS = -version-info 1:0:0
+-libgnomeui_la_LDFLAGS = -version-info 41:0:9 -rpath $(libdir)
++libgnomeui_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
  libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS)
  
- gnome_segv_LDADD =  	$(top_builddir)/libgnomeui/libgnomeui.la 		$(top_builddir)/libgnome/libgnome.la 			$(top_builddir)/libart_lgpl/libart_lgpl.la 		@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) 	$(INTLLIBS)
-@@ -1468,7 +1468,7 @@
+ gnome_segv_LDADD =  	libgnomeui.la 						$(top_builddir)/libgnome/libgnome.la 			$(top_builddir)/libart_lgpl/libart_lgpl.la 		@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) 	$(INTLLIBS)
+@@ -1478,7 +1478,7 @@
  check: check-recursive
  installcheck-am:
  installcheck: installcheck-recursive
@@ -18,7 +18,7 @@
  install-exec: install-exec-recursive
  
  install-data-am: install-gtkrcDATA install-libgnomeuiincludeHEADERS
-@@ -1480,7 +1480,7 @@
+@@ -1490,7 +1490,7 @@
  uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \
  		uninstall-gtkrcDATA uninstall-libgnomeuiincludeHEADERS
  uninstall: uninstall-recursive
diff --git a/x11/gnomelibs/files/patch-be b/x11/gnomelibs/files/patch-be
index 80e4c5ae33e9..f5bdd3c1180c 100644
--- a/x11/gnomelibs/files/patch-be
+++ b/x11/gnomelibs/files/patch-be
@@ -1,11 +1,11 @@
---- libgnorba/Makefile.in.orig	Tue Feb 16 01:09:31 1999
-+++ libgnorba/Makefile.in	Fri Feb 19 00:22:52 1999
-@@ -172,7 +172,7 @@
- libgnorbainclude_HEADERS =  	gnorba.h 						gnome-factory.h
+--- libgnorba/Makefile.in.orig	Wed Apr  7 21:34:31 1999
++++ libgnorba/Makefile.in	Fri Apr 30 17:40:01 1999
+@@ -185,7 +185,7 @@
+ libgnorbainclude_HEADERS =  	gnorba.h 						gnome-factory.h						GnomeObject.h						Table.h
  
  
--libgnorba_la_LDFLAGS = -version-info 28:4:1 -rpath $(libdir)
-+libgnorba_la_LDFLAGS = -version-info 1:0:0
+-libgnorba_la_LDFLAGS = -version-info 28:5:1 -rpath $(libdir)
++libgnorba_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
  libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm
  
  loadshlib_SOURCES = loadshlib.c
diff --git a/x11/gnomelibs/files/patch-bf b/x11/gnomelibs/files/patch-bf
index c41f89447f8e..26760886d0b3 100644
--- a/x11/gnomelibs/files/patch-bf
+++ b/x11/gnomelibs/files/patch-bf
@@ -1,15 +1,15 @@
---- support/Makefile.in.orig	Tue Feb 16 01:08:59 1999
-+++ support/Makefile.in	Fri Feb 19 00:20:20 1999
-@@ -146,7 +146,7 @@
+--- support/Makefile.in.orig	Thu Apr  8 11:33:39 1999
++++ support/Makefile.in	Thu Apr  8 08:46:59 1999
+@@ -148,7 +148,7 @@
  mcserv = @mcserv@
  need_gnome_support = @need_gnome_support@
  
--supportincludedir = $(pkglibdir)/include
-+supportincludedir = $(includedir)
+-supportexecincludedir = $(pkglibdir)/include
++supportexecincludedir = $(includedir)
  
  INCLUDES = -D_GNU_SOURCE
  
-@@ -171,7 +171,7 @@
+@@ -170,7 +170,7 @@
  
  libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c
  libgnomesupport_la_LIBADD = @LTLIBOBJS@
diff --git a/x11/gnomelibs/files/patch-bg b/x11/gnomelibs/files/patch-bg
index daa774b86a6c..8c70d648c004 100644
--- a/x11/gnomelibs/files/patch-bg
+++ b/x11/gnomelibs/files/patch-bg
@@ -1,15 +1,15 @@
---- zvt/Makefile.in.orig	Sun Feb 28 02:22:21 1999
-+++ zvt/Makefile.in	Mon Mar  1 21:01:11 1999
-@@ -158,7 +158,7 @@
+--- zvt/Makefile.in.orig	Wed Apr  7 21:34:27 1999
++++ zvt/Makefile.in	Fri Apr 30 17:53:45 1999
+@@ -160,7 +160,7 @@
  libzvt_la_SOURCES =  	gnome-login-support.h		gnome-login-support.c		lists.c				subshell.h			subshell.c			subshell-includes.h		update.c			vt.c				zvtterm.c
  
  
--libzvt_la_LDFLAGS = -version-info 4:0:2 -rpath $(libdir)
+-libzvt_la_LDFLAGS = -version-info 4:2:2 -rpath $(libdir)
 +libzvt_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
  
  libzvtinclude_HEADERS =  	lists.h				vt.h				vtx.h				zvtterm.h
  
-@@ -433,8 +433,7 @@
+@@ -435,8 +435,7 @@
  check: check-am
  installcheck-am:
  installcheck: installcheck-am
@@ -19,7 +19,7 @@
  install-exec: install-exec-am
  
  install-data-am: install-libzvtincludeHEADERS
-@@ -446,7 +445,7 @@
+@@ -448,7 +447,7 @@
  uninstall-am: uninstall-libLTLIBRARIES uninstall-sbinPROGRAMS \
  		uninstall-libzvtincludeHEADERS
  uninstall: uninstall-am
diff --git a/x11/gnomelibs/pkg-plist b/x11/gnomelibs/pkg-plist
index 4d9d72ec2765..79c24bcb630a 100644
--- a/x11/gnomelibs/pkg-plist
+++ b/x11/gnomelibs/pkg-plist
@@ -8,7 +8,6 @@ bin/gnome-name-service
 bin/goad-browser
 bin/libart-config
 bin/loadshlib
-bin/new-object
 etc/gnomeConf.sh
 etc/libartConf.sh
 etc/mime-magic
@@ -16,8 +15,6 @@ etc/mime-magic.dat
 etc/paper.config
 etc/sound/events/gnome.soundlist
 etc/sound/events/gtk-events.soundlist
-@dirrm etc/sound/events
-@dirrm etc/sound
 include/gnome.h
 include/gnomesupport.h
 include/gtk-xmhtml/HTML.h
@@ -28,7 +25,6 @@ include/gtk-xmhtml/gtk-xmhtml-p.h
 include/gtk-xmhtml/gtk-xmhtml.h
 include/gtk-xmhtml/miniparse.h
 include/gtk-xmhtml/toolkit.h
-@dirrm include/gtk-xmhtml
 include/libart_lgpl/art_affine.h
 include/libart_lgpl/art_alphagamma.h
 include/libart_lgpl/art_bpath.h
@@ -60,7 +56,6 @@ include/libart_lgpl/art_uta_vpath.h
 include/libart_lgpl/art_vpath.h
 include/libart_lgpl/art_vpath_bpath.h
 include/libart_lgpl/art_vpath_svp.h
-@dirrm include/libart_lgpl
 include/libgnome/gnome-config.h
 include/libgnome/gnome-defs.h
 include/libgnome/gnome-dentry.h
@@ -83,7 +78,6 @@ include/libgnome/gnome-triggers.h
 include/libgnome/gnome-url.h
 include/libgnome/gnome-util.h
 include/libgnome/libgnome.h
-@dirrm include/libgnome
 include/libgnomeui/gnome-about.h
 include/libgnomeui/gnome-animator.h
 include/libgnomeui/gnome-app-helper.h
@@ -156,16 +150,15 @@ include/libgnomeui/gtkcauldron.h
 include/libgnomeui/gtkdial.h
 include/libgnomeui/gtkpixmapmenuitem.h
 include/libgnomeui/libgnomeui.h
-@dirrm include/libgnomeui
+include/libgnorba/GnomeObject.h
+include/libgnorba/Table.h
 include/libgnorba/gnome-factory.h
 include/libgnorba/gnorba.h
-@dirrm include/libgnorba
 include/popt-gnome.h
 include/zvt/lists.h
 include/zvt/vt.h
 include/zvt/vtx.h
 include/zvt/zvtterm.h
-@dirrm include/zvt
 lib/libart_lgpl.a
 lib/libart_lgpl.la
 lib/libart_lgpl.so
@@ -200,21 +193,17 @@ lib/libzvt.so
 lib/libzvt.so.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@exec mkdir -p %D/share/gnome/games
-@dirrm share/gnome/games
 share/gnome/gtkrc
 share/gnome/gtkrc.ja
 share/gnome/gtkrc.ko
 share/gnome/gtkrc.ru
 share/gnome/idl/GnomeObject.idl
 share/gnome/idl/Table.idl
-share/gnome/idl/base.idl
 share/gnome/idl/gnome-editor.idl
 share/gnome/idl/gnome-factory.idl
+share/gnome/idl/gnome-file.idl
 share/gnome/idl/name-service.idl
-@dirrm share/gnome/idl
 share/gnome/mime-info/gnome.mime
-@dirrm share/gnome/mime-info
 share/gnome/pixmaps/calculator-font.png
 share/gnome/pixmaps/gnome-default-dlg.png
 share/gnome/pixmaps/gnome-error.png
@@ -223,12 +212,9 @@ share/gnome/pixmaps/gnome-question.png
 share/gnome/pixmaps/gnome-warning.png
 share/gnome/pixmaps/no.xpm
 share/gnome/pixmaps/yes.xpm
-@dirrm share/gnome/pixmaps
 share/gnome/type-convert/gnome-make-postscript-mimes
 share/gnome/type-convert/postscript.convert
 share/gnome/type-convert/type.convert
-@dirrm share/gnome/type-convert
-@dirrm share/gnome
 share/locale/ca/LC_MESSAGES/gnome-libs.mo
 share/locale/cs/LC_MESSAGES/gnome-libs.mo
 share/locale/da/LC_MESSAGES/gnome-libs.mo
@@ -247,3 +233,19 @@ share/locale/pl/LC_MESSAGES/gnome-libs.mo
 share/locale/pt/LC_MESSAGES/gnome-libs.mo
 share/locale/ru/LC_MESSAGES/gnome-libs.mo
 share/locale/sv/LC_MESSAGES/gnome-libs.mo
+share/locale/wa/LC_MESSAGES/gnome-libs.mo
+@exec mkdir -p %D/share/gnome/games
+@dirrm etc/sound/events
+@dirrm etc/sound
+@dirrm include/gtk-xmhtml
+@dirrm include/libart_lgpl
+@dirrm include/libgnome
+@dirrm include/libgnomeui
+@dirrm include/libgnorba
+@dirrm include/zvt
+@dirrm share/gnome/games
+@dirrm share/gnome/idl
+@dirrm share/gnome/mime-info
+@dirrm share/gnome/pixmaps
+@dirrm share/gnome/type-convert
+@dirrm share/gnome
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index dc2e6ac3e2a1..6b61084db477 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	gnomelibs
-# Version required:			1.0.4
+# Version required:			1.0.6
 # Date created:				17 June 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.37 1999/03/27 10:35:55 vanilla Exp $
+# $Id: Makefile,v 1.38 1999/04/02 03:25:28 steve Exp $
 #
 
-DISTNAME=	gnome-libs-1.0.4
-PKGNAME=	gnomelibs-1.0.4
+DISTNAME=	gnome-libs-1.0.6
+PKGNAME=	gnomelibs-1.0.6
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-libs
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index c7883b5e8af8..ce385c23ca7f 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1 +1 @@
-MD5 (gnome-libs-1.0.4.tar.gz) = d490198ff59f398520a470e801943498
+MD5 (gnome-libs-1.0.6.tar.gz) = b85fa169eae7c6630f5c6258147b91ad
diff --git a/x11/libgnome/files/patch-bc b/x11/libgnome/files/patch-bc
index 2ed5bfffd348..9ccd0f82295d 100644
--- a/x11/libgnome/files/patch-bc
+++ b/x11/libgnome/files/patch-bc
@@ -1,15 +1,15 @@
---- libgnome/Makefile.in.orig	Tue Feb 16 01:09:10 1999
-+++ libgnome/Makefile.in	Fri Feb 19 00:21:51 1999
-@@ -170,10 +170,10 @@
+--- libgnome/Makefile.in.orig	Wed Apr  7 21:33:54 1999
++++ libgnome/Makefile.in	Fri Apr 30 17:35:08 1999
+@@ -172,10 +172,10 @@
  
  EXTRA_DIST = parse-path.cP 
  
--libgnome_la_LDFLAGS = -version-info 35:0:3 #-rpath $(libdir)
-+libgnome_la_LDFLAGS = -version-info 1:0:0
+-libgnome_la_LDFLAGS = -version-info 35:2:3 #-rpath $(libdir)
++libgnome_la_LDFLAGS = -version-info 1:0:0 #-rpath $(libdir)
  libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB)
  
 -bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote 	gconfigger gnome-gen-mimedb
-+bin_PROGRAMS = gnome-dump-metadata gnome-moz-remote gconfigger gnome-gen-mimedb
++bin_PROGRAMS = gnome-dump-metadata gnome-moz-remote 	gconfigger gnome-gen-mimedb
  
  
  dns_helper_SOURCES = dns-helper.c
diff --git a/x11/libgnome/files/patch-bd b/x11/libgnome/files/patch-bd
index 75cdbb379495..327f8ebbbee3 100644
--- a/x11/libgnome/files/patch-bd
+++ b/x11/libgnome/files/patch-bd
@@ -1,15 +1,15 @@
---- libgnomeui/Makefile.in.orig	Tue Feb 16 01:09:16 1999
-+++ libgnomeui/Makefile.in	Fri Feb 19 00:26:03 1999
-@@ -200,7 +200,7 @@
+--- libgnomeui/Makefile.in.orig	Wed Apr  7 21:34:11 1999
++++ libgnomeui/Makefile.in	Fri Apr 30 17:30:51 1999
+@@ -202,7 +202,7 @@
  EXTRA_DIST =  	$(SGML)						$(gtkrc_DATA)					AUTHORS						gnome.defs 					maketypes.awk					makeenums.pl					gnome-boxed.defs				gnometypebuiltins_vars.c			gnometypebuiltins_ids.c				gnometypebuiltins_evals.c
  
  
--libgnomeui_la_LDFLAGS = -version-info 40:0:8 -rpath $(libdir)
-+libgnomeui_la_LDFLAGS = -version-info 1:0:0
+-libgnomeui_la_LDFLAGS = -version-info 41:0:9 -rpath $(libdir)
++libgnomeui_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
  libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS)
  
- gnome_segv_LDADD =  	$(top_builddir)/libgnomeui/libgnomeui.la 		$(top_builddir)/libgnome/libgnome.la 			$(top_builddir)/libart_lgpl/libart_lgpl.la 		@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) 	$(INTLLIBS)
-@@ -1468,7 +1468,7 @@
+ gnome_segv_LDADD =  	libgnomeui.la 						$(top_builddir)/libgnome/libgnome.la 			$(top_builddir)/libart_lgpl/libart_lgpl.la 		@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) 	$(INTLLIBS)
+@@ -1478,7 +1478,7 @@
  check: check-recursive
  installcheck-am:
  installcheck: installcheck-recursive
@@ -18,7 +18,7 @@
  install-exec: install-exec-recursive
  
  install-data-am: install-gtkrcDATA install-libgnomeuiincludeHEADERS
-@@ -1480,7 +1480,7 @@
+@@ -1490,7 +1490,7 @@
  uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \
  		uninstall-gtkrcDATA uninstall-libgnomeuiincludeHEADERS
  uninstall: uninstall-recursive
diff --git a/x11/libgnome/files/patch-be b/x11/libgnome/files/patch-be
index 80e4c5ae33e9..f5bdd3c1180c 100644
--- a/x11/libgnome/files/patch-be
+++ b/x11/libgnome/files/patch-be
@@ -1,11 +1,11 @@
---- libgnorba/Makefile.in.orig	Tue Feb 16 01:09:31 1999
-+++ libgnorba/Makefile.in	Fri Feb 19 00:22:52 1999
-@@ -172,7 +172,7 @@
- libgnorbainclude_HEADERS =  	gnorba.h 						gnome-factory.h
+--- libgnorba/Makefile.in.orig	Wed Apr  7 21:34:31 1999
++++ libgnorba/Makefile.in	Fri Apr 30 17:40:01 1999
+@@ -185,7 +185,7 @@
+ libgnorbainclude_HEADERS =  	gnorba.h 						gnome-factory.h						GnomeObject.h						Table.h
  
  
--libgnorba_la_LDFLAGS = -version-info 28:4:1 -rpath $(libdir)
-+libgnorba_la_LDFLAGS = -version-info 1:0:0
+-libgnorba_la_LDFLAGS = -version-info 28:5:1 -rpath $(libdir)
++libgnorba_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
  libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm
  
  loadshlib_SOURCES = loadshlib.c
diff --git a/x11/libgnome/files/patch-bf b/x11/libgnome/files/patch-bf
index c41f89447f8e..26760886d0b3 100644
--- a/x11/libgnome/files/patch-bf
+++ b/x11/libgnome/files/patch-bf
@@ -1,15 +1,15 @@
---- support/Makefile.in.orig	Tue Feb 16 01:08:59 1999
-+++ support/Makefile.in	Fri Feb 19 00:20:20 1999
-@@ -146,7 +146,7 @@
+--- support/Makefile.in.orig	Thu Apr  8 11:33:39 1999
++++ support/Makefile.in	Thu Apr  8 08:46:59 1999
+@@ -148,7 +148,7 @@
  mcserv = @mcserv@
  need_gnome_support = @need_gnome_support@
  
--supportincludedir = $(pkglibdir)/include
-+supportincludedir = $(includedir)
+-supportexecincludedir = $(pkglibdir)/include
++supportexecincludedir = $(includedir)
  
  INCLUDES = -D_GNU_SOURCE
  
-@@ -171,7 +171,7 @@
+@@ -170,7 +170,7 @@
  
  libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c
  libgnomesupport_la_LIBADD = @LTLIBOBJS@
diff --git a/x11/libgnome/files/patch-bg b/x11/libgnome/files/patch-bg
index daa774b86a6c..8c70d648c004 100644
--- a/x11/libgnome/files/patch-bg
+++ b/x11/libgnome/files/patch-bg
@@ -1,15 +1,15 @@
---- zvt/Makefile.in.orig	Sun Feb 28 02:22:21 1999
-+++ zvt/Makefile.in	Mon Mar  1 21:01:11 1999
-@@ -158,7 +158,7 @@
+--- zvt/Makefile.in.orig	Wed Apr  7 21:34:27 1999
++++ zvt/Makefile.in	Fri Apr 30 17:53:45 1999
+@@ -160,7 +160,7 @@
  libzvt_la_SOURCES =  	gnome-login-support.h		gnome-login-support.c		lists.c				subshell.h			subshell.c			subshell-includes.h		update.c			vt.c				zvtterm.c
  
  
--libzvt_la_LDFLAGS = -version-info 4:0:2 -rpath $(libdir)
+-libzvt_la_LDFLAGS = -version-info 4:2:2 -rpath $(libdir)
 +libzvt_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
  
  libzvtinclude_HEADERS =  	lists.h				vt.h				vtx.h				zvtterm.h
  
-@@ -433,8 +433,7 @@
+@@ -435,8 +435,7 @@
  check: check-am
  installcheck-am:
  installcheck: installcheck-am
@@ -19,7 +19,7 @@
  install-exec: install-exec-am
  
  install-data-am: install-libzvtincludeHEADERS
-@@ -446,7 +445,7 @@
+@@ -448,7 +447,7 @@
  uninstall-am: uninstall-libLTLIBRARIES uninstall-sbinPROGRAMS \
  		uninstall-libzvtincludeHEADERS
  uninstall: uninstall-am
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index 4d9d72ec2765..79c24bcb630a 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -8,7 +8,6 @@ bin/gnome-name-service
 bin/goad-browser
 bin/libart-config
 bin/loadshlib
-bin/new-object
 etc/gnomeConf.sh
 etc/libartConf.sh
 etc/mime-magic
@@ -16,8 +15,6 @@ etc/mime-magic.dat
 etc/paper.config
 etc/sound/events/gnome.soundlist
 etc/sound/events/gtk-events.soundlist
-@dirrm etc/sound/events
-@dirrm etc/sound
 include/gnome.h
 include/gnomesupport.h
 include/gtk-xmhtml/HTML.h
@@ -28,7 +25,6 @@ include/gtk-xmhtml/gtk-xmhtml-p.h
 include/gtk-xmhtml/gtk-xmhtml.h
 include/gtk-xmhtml/miniparse.h
 include/gtk-xmhtml/toolkit.h
-@dirrm include/gtk-xmhtml
 include/libart_lgpl/art_affine.h
 include/libart_lgpl/art_alphagamma.h
 include/libart_lgpl/art_bpath.h
@@ -60,7 +56,6 @@ include/libart_lgpl/art_uta_vpath.h
 include/libart_lgpl/art_vpath.h
 include/libart_lgpl/art_vpath_bpath.h
 include/libart_lgpl/art_vpath_svp.h
-@dirrm include/libart_lgpl
 include/libgnome/gnome-config.h
 include/libgnome/gnome-defs.h
 include/libgnome/gnome-dentry.h
@@ -83,7 +78,6 @@ include/libgnome/gnome-triggers.h
 include/libgnome/gnome-url.h
 include/libgnome/gnome-util.h
 include/libgnome/libgnome.h
-@dirrm include/libgnome
 include/libgnomeui/gnome-about.h
 include/libgnomeui/gnome-animator.h
 include/libgnomeui/gnome-app-helper.h
@@ -156,16 +150,15 @@ include/libgnomeui/gtkcauldron.h
 include/libgnomeui/gtkdial.h
 include/libgnomeui/gtkpixmapmenuitem.h
 include/libgnomeui/libgnomeui.h
-@dirrm include/libgnomeui
+include/libgnorba/GnomeObject.h
+include/libgnorba/Table.h
 include/libgnorba/gnome-factory.h
 include/libgnorba/gnorba.h
-@dirrm include/libgnorba
 include/popt-gnome.h
 include/zvt/lists.h
 include/zvt/vt.h
 include/zvt/vtx.h
 include/zvt/zvtterm.h
-@dirrm include/zvt
 lib/libart_lgpl.a
 lib/libart_lgpl.la
 lib/libart_lgpl.so
@@ -200,21 +193,17 @@ lib/libzvt.so
 lib/libzvt.so.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@exec mkdir -p %D/share/gnome/games
-@dirrm share/gnome/games
 share/gnome/gtkrc
 share/gnome/gtkrc.ja
 share/gnome/gtkrc.ko
 share/gnome/gtkrc.ru
 share/gnome/idl/GnomeObject.idl
 share/gnome/idl/Table.idl
-share/gnome/idl/base.idl
 share/gnome/idl/gnome-editor.idl
 share/gnome/idl/gnome-factory.idl
+share/gnome/idl/gnome-file.idl
 share/gnome/idl/name-service.idl
-@dirrm share/gnome/idl
 share/gnome/mime-info/gnome.mime
-@dirrm share/gnome/mime-info
 share/gnome/pixmaps/calculator-font.png
 share/gnome/pixmaps/gnome-default-dlg.png
 share/gnome/pixmaps/gnome-error.png
@@ -223,12 +212,9 @@ share/gnome/pixmaps/gnome-question.png
 share/gnome/pixmaps/gnome-warning.png
 share/gnome/pixmaps/no.xpm
 share/gnome/pixmaps/yes.xpm
-@dirrm share/gnome/pixmaps
 share/gnome/type-convert/gnome-make-postscript-mimes
 share/gnome/type-convert/postscript.convert
 share/gnome/type-convert/type.convert
-@dirrm share/gnome/type-convert
-@dirrm share/gnome
 share/locale/ca/LC_MESSAGES/gnome-libs.mo
 share/locale/cs/LC_MESSAGES/gnome-libs.mo
 share/locale/da/LC_MESSAGES/gnome-libs.mo
@@ -247,3 +233,19 @@ share/locale/pl/LC_MESSAGES/gnome-libs.mo
 share/locale/pt/LC_MESSAGES/gnome-libs.mo
 share/locale/ru/LC_MESSAGES/gnome-libs.mo
 share/locale/sv/LC_MESSAGES/gnome-libs.mo
+share/locale/wa/LC_MESSAGES/gnome-libs.mo
+@exec mkdir -p %D/share/gnome/games
+@dirrm etc/sound/events
+@dirrm etc/sound
+@dirrm include/gtk-xmhtml
+@dirrm include/libart_lgpl
+@dirrm include/libgnome
+@dirrm include/libgnomeui
+@dirrm include/libgnorba
+@dirrm include/zvt
+@dirrm share/gnome/games
+@dirrm share/gnome/idl
+@dirrm share/gnome/mime-info
+@dirrm share/gnome/pixmaps
+@dirrm share/gnome/type-convert
+@dirrm share/gnome