Upgrade to 0.30.

18 files changed, 168 insertions, 657 deletions

diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index e77ba6edf8c..9f11a1a13c9 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:   gnomelibs
-# Version required:    0.27
+# Version required:    0.30
 # Date created:        17 June 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.10 1998/09/25 09:52:45 asami Exp $
+# $Id: Makefile,v 1.11 1998/09/26 00:02:36 asami Exp $
 #
 
-DISTNAME=	gnome-libs-0.27
-PKGNAME=	gnomelibs-0.27
+DISTNAME=	gnome-libs-0.30
+PKGNAME=	gnomelibs-0.30
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
 		ftp://ftp.gnome.org/pub/GNOME/sources/
@@ -22,18 +22,21 @@ LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	gif.3:${PORTSDIR}/graphics/giflib
 LIB_DEPENDS+=	png.2:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS+=	ORBit.0:${PORTSDIR}/devel/ORBit
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lxpg4"
+CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \
+		-I${X11BASE}/include" \
+		GTK_CONFIG="${X11BASE}/bin/gtk11-config" \
+		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
 
 pre-build:
 	( cd ${WRKSRC}/support; ${GMAKE} gnomesupport.h )
 
 post-install:
-	${LDCONFIG} -m ${PREFIX}/lib
+	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/x11/gnome-libs/distinfo b/x11/gnome-libs/distinfo
index f312b12758e..68a501f426f 100644
--- a/x11/gnome-libs/distinfo
+++ b/x11/gnome-libs/distinfo
@@ -1 +1 @@
-MD5 (gnome-libs-0.27.tar.gz) = 61883a7f9d1f7d91a00dbc9e91b6b991
+MD5 (gnome-libs-0.30.tar.gz) = aff53f69fcb7945320edb85a80583881
diff --git a/x11/gnome-libs/files/patch-aa b/x11/gnome-libs/files/patch-aa
index e8b35adcca6..f4cbc514134 100644
--- a/x11/gnome-libs/files/patch-aa
+++ b/x11/gnome-libs/files/patch-aa
@@ -1,198 +1,48 @@
---- configure.orig	Fri Aug 14 07:36:30 1998
-+++ configure	Thu Sep 17 19:42:01 1998
-@@ -78,6 +78,8 @@
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-+CFLAGS='-I../intl -I/usr/X11R6/include -I/usr/local/include'
-+LDFLAGS='-L/usr/X11R6/lib -L/usr/local/lib'
- # Maximum number of lines to put in a shell here document.
- ac_max_here_lines=12
- 
-@@ -1837,18 +1839,18 @@
-   if test x$gtk_config_exec_prefix != x ; then
-      gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-      if test x${GTK_CONFIG+set} != xset ; then
--        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-+        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk11-config
-      fi
-   fi
-   if test x$gtk_config_prefix != x ; then
-      gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-      if test x${GTK_CONFIG+set} != xset ; then
--        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-+        GTK_CONFIG=$gtk_config_prefix/bin/gtk11-config
-      fi
-   fi
- 
--  # Extract the first word of "gtk-config", so it can be a program name with args.
--set dummy gtk-config; ac_word=$2
-+  # Extract the first word of "gtk11-config", so it can be a program name with args.
-+set dummy gtk11-config; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
- echo "configure:1854: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
-@@ -1930,16 +1932,16 @@
-       (gtk_minor_version != $gtk_config_minor_version) ||
-       (gtk_micro_version != $gtk_config_micro_version))
-     {
--      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
-+      printf("\n*** 'gtk11-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
-              $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-              gtk_major_version, gtk_minor_version, gtk_micro_version);
--      printf ("*** was found! If gtk-config was correct, then it is best\n");
-+      printf ("*** was found! If gtk11-config was correct, then it is best\n");
-       printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-       printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-       printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-       printf("*** required on your system.\n");
--      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
--      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
-+      printf("*** If gtk11-config was wrong, set the environment variable GTK_CONFIG\n");
-+      printf("*** to point to the correct copy of gtk11-config, and remove the file config.cache\n");
-       printf("*** before re-running configure\n");
-     } 
-   else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-@@ -1968,10 +1970,10 @@
-         printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-         printf("***\n");
-         printf("*** If you have already installed a sufficiently new version, this error\n");
--        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
-+        printf("*** probably means that the wrong copy of the gtk11-config shell script is\n");
-         printf("*** being found. The easiest way to fix this is to remove the old version\n");
-         printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
--        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
-+        printf("*** correct copy of gtk11-config. (In this case, you will have to\n");
-         printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-         printf("*** so that the correct libraries are found at run-time))\n");
-       }
-@@ -2002,10 +2004,10 @@
-   else
-      echo "$ac_t""no" 1>&6
-      if test "$GTK_CONFIG" = "no" ; then
--       echo "*** The gtk-config script installed by GTK could not be found"
-+       echo "*** The gtk11-config script installed by GTK could not be found"
-        echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
-        echo "*** your path, or set the GTK_CONFIG environment variable to the"
--       echo "*** full path to gtk-config."
-+       echo "*** full path to gtk11-config."
-      else
-        if test -f conf.gtktest ; then
-         :
-@@ -2047,7 +2049,7 @@
-    echo "*** The test program failed to compile or link. See the file config.log for the"
-           echo "*** exact error that occured. This usually means GTK was incorrectly installed"
-           echo "*** or that you have moved GTK since it was installed. In the latter case, you"
--          echo "*** may want to edit the gtk-config script: $GTK_CONFIG" 
-+          echo "*** may want to edit the gtk11-config script: $GTK_CONFIG" 
- fi
- rm -f conftest*
-           CFLAGS="$ac_save_CFLAGS"
-@@ -5847,16 +5849,16 @@
+--- configure.orig	Wed Sep 23 23:37:33 1998
++++ configure	Sat Sep 26 22:02:01 1998
+@@ -6129,16 +6129,16 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
--echo "configure:5853: checking for tiffio.h" >&5
+-echo "configure:6135: checking for tiffio.h" >&5
 +  ac_safe=`echo "tiff34/tiffio.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for tiff34/tiffio.h""... $ac_c" 1>&6
-+echo "configure:5853: checking for tiff34/tiffio.h" >&5
++echo "configure:6135: checking for tiff34/tiffio.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
- #line 5858 "configure"
+ #line 6140 "configure"
  #include "confdefs.h"
 -#include <tiffio.h>
 +#include <tiff34/tiffio.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:5863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -5920,16 +5922,16 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
--echo "configure:5926: checking for tiffio.h" >&5
-+  ac_safe=`echo "tiff34/tiffio.h" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for tiff34/tiffio.h""... $ac_c" 1>&6
-+echo "configure:5926: checking for tiff34/tiffio.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
- #line 5931 "configure"
- #include "confdefs.h"
--#include <tiffio.h>
-+#include <tiff34/tiffio.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:5936: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -5993,16 +5995,16 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
--echo "configure:5999: checking for tiffio.h" >&5
-+  ac_safe=`echo "tiff34/tiffio.h" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for tiff34/tiffio.h""... $ac_c" 1>&6
-+echo "configure:5999: checking for tiff34/tiffio.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
- #line 6004 "configure"
- #include "confdefs.h"
--#include <tiffio.h>
-+#include <tiff34/tiffio.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:6009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -6073,16 +6075,16 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
-+  ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:6079: checking for gif_lib.h" >&5
-+echo "configure:6079: checking for giflib/gif_lib.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
- #line 6084 "configure"
- #include "confdefs.h"
--#include <gif_lib.h>
-+#include <giflib/gif_lib.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:6089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -6149,16 +6151,16 @@
+ { (eval echo configure:6145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -6209,16 +6209,16 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:6155: checking for gif_lib.h" >&5
+-echo "configure:6215: checking for gif_lib.h" >&5
 +  ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
-+echo "configure:6155: checking for giflib/gif_lib.h" >&5
++echo "configure:6215: checking for giflib/gif_lib.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
- #line 6160 "configure"
+ #line 6220 "configure"
  #include "confdefs.h"
 -#include <gif_lib.h>
 +#include <giflib/gif_lib.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:6165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -6362,7 +6364,7 @@
+ { (eval echo configure:6225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -6842,7 +6842,7 @@
  GNOME_LIBDIR='-L${libdir}'
  GNOME_INCLUDEDIR='-I${includedir}'
  if test "$need_gnome_support" = yes; then
diff --git a/x11/gnome-libs/files/patch-ac b/x11/gnome-libs/files/patch-ac
index 88f5d387577..c3b4928b732 100644
--- a/x11/gnome-libs/files/patch-ac
+++ b/x11/gnome-libs/files/patch-ac
@@ -1,15 +1,15 @@
---- gnome-config.in.orig	Wed Aug 26 19:16:24 1998
-+++ gnome-config.in	Wed Aug 26 19:16:57 1998
-@@ -36,7 +36,7 @@
-     glib	(calls glib-config)
+--- gnome-config.in.orig	Mon Sep 21 23:15:02 1998
++++ gnome-config.in	Sat Sep 26 22:12:16 1998
+@@ -45,7 +45,7 @@
      gnome
      gnomeui
+     gnorba
 -    gtk		(calls gtk-config)
 +    gtk11	(calls gtk11-config)
      gtkxmhtml	(only --libs)
      zvt		(only --libs)
  
-@@ -92,9 +92,9 @@
+@@ -116,9 +116,9 @@
  	the_libs="$the_libs `glib-config --libs`"
  	the_flags="$the_flags `glib-config --cflags`"
  	;;
diff --git a/x11/gnome-libs/files/patch-ad b/x11/gnome-libs/files/patch-ad
index 7cc203212e1..dc6621a9830 100644
--- a/x11/gnome-libs/files/patch-ad
+++ b/x11/gnome-libs/files/patch-ad
@@ -1,5 +1,5 @@
---- libgnome/gnome-help.c.orig	Tue Sep  1 13:30:25 1998
-+++ libgnome/gnome-help.c	Tue Sep  1 13:30:44 1998
+--- libgnome/gnome-help.c.orig	Fri Jul 24 02:08:29 1998
++++ libgnome/gnome-help.c	Sat Sep 26 22:12:34 1998
 @@ -35,7 +35,7 @@
        lang= language_list->data;
  
diff --git a/x11/gnome-libs/pkg-plist b/x11/gnome-libs/pkg-plist
index 7a7803f80d5..7af8d01e8ec 100644
--- a/x11/gnome-libs/pkg-plist
+++ b/x11/gnome-libs/pkg-plist
@@ -1,4 +1,6 @@
+bin/convertrgb
 bin/gnome-config
+bin/gnome-dump-metadata
 include/argp.h
 include/error.h
 include/getopt.h
@@ -14,11 +16,6 @@ include/gtk-xmhtml/gtk-xmhtml-p.h
 include/gtk-xmhtml/gtk-xmhtml.h
 include/gtk-xmhtml/miniparse.h
 include/gtk-xmhtml/toolkit.h
-include/gtktty/gtkled.h
-include/gtktty/gtkterm.h
-include/gtktty/gtktty.h
-include/gtktty/gtkvtemu.h
-include/gtktty/libgtktty.h
 include/libgnome/gnome-config.h
 include/libgnome/gnome-defs.h
 include/libgnome/gnome-dentry.h
@@ -29,12 +26,17 @@ include/libgnome/gnome-help.h
 include/libgnome/gnome-history.h
 include/libgnome/gnome-hook.h
 include/libgnome/gnome-i18n.h
+include/libgnome/gnome-metadata.h
 include/libgnome/gnome-mime.h
 include/libgnome/gnome-parse.h
+include/libgnome/gnome-regex.h
+include/libgnome/gnome-remote.h
 include/libgnome/gnome-score.h
 include/libgnome/gnome-string.h
 include/libgnome/gnome-triggers.h
 include/libgnome/gnome-util.h
+include/libgnome/lib_date.h
+include/libgnome/lib_defs.h
 include/libgnome/libgnome.h
 include/libgnomeui/gnome-about.h
 include/libgnomeui/gnome-actionarea.h
@@ -51,6 +53,7 @@ include/libgnomeui/gnome-canvas-util.h
 include/libgnomeui/gnome-canvas-widget.h
 include/libgnomeui/gnome-canvas.h
 include/libgnomeui/gnome-client.h
+include/libgnomeui/gnome-color-picker.h
 include/libgnomeui/gnome-color-selector.h
 include/libgnomeui/gnome-dateedit.h
 include/libgnomeui/gnome-dentry-edit.h
@@ -61,6 +64,7 @@ include/libgnomeui/gnome-entry.h
 include/libgnomeui/gnome-file-entry.h
 include/libgnomeui/gnome-font-selector.h
 include/libgnomeui/gnome-geometry.h
+include/libgnomeui/gnome-gtk-utils.h
 include/libgnomeui/gnome-ice.h
 include/libgnomeui/gnome-icon-list.h
 include/libgnomeui/gnome-icon-sel.h
@@ -72,7 +76,7 @@ include/libgnomeui/gnome-messagebox.h
 include/libgnomeui/gnome-net.h
 include/libgnomeui/gnome-number-entry.h
 include/libgnomeui/gnome-pixmap.h
-include/libgnomeui/gnome-popupmenu.h
+include/libgnomeui/gnome-popup-menu.h
 include/libgnomeui/gnome-preferences.h
 include/libgnomeui/gnome-properties.h
 include/libgnomeui/gnome-propertybox.h
@@ -82,6 +86,7 @@ include/libgnomeui/gnome-startup.h
 include/libgnomeui/gnome-stock.h
 include/libgnomeui/gnome-types.h
 include/libgnomeui/gnome-uidefs.h
+include/libgnomeui/gnome-winhints.h
 include/libgnomeui/gnometypebuiltins.h
 include/libgnomeui/gtk-clock.h
 include/libgnomeui/gtk-plug.h
@@ -93,6 +98,8 @@ include/libgnomeui/gtkdial.h
 include/libgnomeui/gtklayout.h
 include/libgnomeui/gtkspell.h
 include/libgnomeui/libgnomeui.h
+include/libgnorba/gnorba.h
+include/libgnorba/name-service.h
 include/zvt/lists.h
 include/zvt/subshell.h
 include/zvt/vt.h
@@ -101,31 +108,32 @@ include/zvt/zvtterm.h
 lib/libgnome.a
 lib/libgnome.la
 lib/libgnome.so
-lib/libgnome.so.0.27
+lib/libgnome.so.0.30
 lib/libgnomesupport.a
 lib/libgnomesupport.la
 lib/libgnomesupport.so
-lib/libgnomesupport.so.0.27
+lib/libgnomesupport.so.0.30
 lib/libgnomeui.a
 lib/libgnomeui.la
 lib/libgnomeui.so
-lib/libgnomeui.so.0.27
-lib/libgtktty.la
-lib/libgtktty.so
-lib/libgtktty.so.0.4
+lib/libgnomeui.so.0.30
+lib/libgnorba.a
+lib/libgnorba.la
+lib/libgnorba.so
+lib/libgnorba.so.0.30
 lib/libgtkxmhtml.a
 lib/libgtkxmhtml.la
 lib/libgtkxmhtml.so
-lib/libgtkxmhtml.so.0.27
+lib/libgtkxmhtml.so.0.30
 lib/libzvt.a
 lib/libzvt.la
 lib/libzvt.so
 lib/libzvt.so.0.0
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/gnome/gnomeConf.sh
 share/gnome/gtkrc
-share/gnome/pixmaps/calculator-font.xpm
+share/gnome/pixmaps/calculator-font.png
 share/locale/cs/LC_MESSAGES/gnome-libs.mo
 share/locale/de/LC_MESSAGES/gnome-libs.mo
 share/locale/es/LC_MESSAGES/gnome-libs.mo
@@ -139,35 +147,11 @@ share/locale/no/LC_MESSAGES/gnome-libs.mo
 share/locale/pt/LC_MESSAGES/gnome-libs.mo
 share/locale/sv/LC_MESSAGES/gnome-libs.mo
 @dirrm include/gtk-xmhtml
-@dirrm include/gtktty
 @dirrm include/libgnome
 @dirrm include/libgnomeui
+@dirrm include/libgnorba
 @dirrm include/zvt
 @dirrm share/gnome/games
 @dirrm share/gnome/html
 @dirrm share/gnome/pixmaps
 @dirrm share/gnome
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs/
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de/
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es/
-@dirrm share/locale/fi/LC_MESSAGES
-@dirrm share/locale/fi/
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr/
-@dirrm share/locale/ga/LC_MESSAGES
-@dirrm share/locale/ga/
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/it/
-@dirrm share/locale/ja/LC_MESSAGES
-@dirrm share/locale/ja/
-@dirrm share/locale/ko/LC_MESSAGES
-@dirrm share/locale/ko/
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no/
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt/
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv/
diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile
index e77ba6edf8c..9f11a1a13c9 100644
--- a/x11/gnomelibs/Makefile
+++ b/x11/gnomelibs/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:   gnomelibs
-# Version required:    0.27
+# Version required:    0.30
 # Date created:        17 June 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.10 1998/09/25 09:52:45 asami Exp $
+# $Id: Makefile,v 1.11 1998/09/26 00:02:36 asami Exp $
 #
 
-DISTNAME=	gnome-libs-0.27
-PKGNAME=	gnomelibs-0.27
+DISTNAME=	gnome-libs-0.30
+PKGNAME=	gnomelibs-0.30
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
 		ftp://ftp.gnome.org/pub/GNOME/sources/
@@ -22,18 +22,21 @@ LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	gif.3:${PORTSDIR}/graphics/giflib
 LIB_DEPENDS+=	png.2:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS+=	ORBit.0:${PORTSDIR}/devel/ORBit
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lxpg4"
+CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \
+		-I${X11BASE}/include" \
+		GTK_CONFIG="${X11BASE}/bin/gtk11-config" \
+		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
 
 pre-build:
 	( cd ${WRKSRC}/support; ${GMAKE} gnomesupport.h )
 
 post-install:
-	${LDCONFIG} -m ${PREFIX}/lib
+	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/x11/gnomelibs/distinfo b/x11/gnomelibs/distinfo
index f312b12758e..68a501f426f 100644
--- a/x11/gnomelibs/distinfo
+++ b/x11/gnomelibs/distinfo
@@ -1 +1 @@
-MD5 (gnome-libs-0.27.tar.gz) = 61883a7f9d1f7d91a00dbc9e91b6b991
+MD5 (gnome-libs-0.30.tar.gz) = aff53f69fcb7945320edb85a80583881
diff --git a/x11/gnomelibs/files/patch-aa b/x11/gnomelibs/files/patch-aa
index e8b35adcca6..f4cbc514134 100644
--- a/x11/gnomelibs/files/patch-aa
+++ b/x11/gnomelibs/files/patch-aa
@@ -1,198 +1,48 @@
---- configure.orig	Fri Aug 14 07:36:30 1998
-+++ configure	Thu Sep 17 19:42:01 1998
-@@ -78,6 +78,8 @@
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-+CFLAGS='-I../intl -I/usr/X11R6/include -I/usr/local/include'
-+LDFLAGS='-L/usr/X11R6/lib -L/usr/local/lib'
- # Maximum number of lines to put in a shell here document.
- ac_max_here_lines=12
- 
-@@ -1837,18 +1839,18 @@
-   if test x$gtk_config_exec_prefix != x ; then
-      gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-      if test x${GTK_CONFIG+set} != xset ; then
--        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-+        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk11-config
-      fi
-   fi
-   if test x$gtk_config_prefix != x ; then
-      gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-      if test x${GTK_CONFIG+set} != xset ; then
--        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-+        GTK_CONFIG=$gtk_config_prefix/bin/gtk11-config
-      fi
-   fi
- 
--  # Extract the first word of "gtk-config", so it can be a program name with args.
--set dummy gtk-config; ac_word=$2
-+  # Extract the first word of "gtk11-config", so it can be a program name with args.
-+set dummy gtk11-config; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
- echo "configure:1854: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
-@@ -1930,16 +1932,16 @@
-       (gtk_minor_version != $gtk_config_minor_version) ||
-       (gtk_micro_version != $gtk_config_micro_version))
-     {
--      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
-+      printf("\n*** 'gtk11-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
-              $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-              gtk_major_version, gtk_minor_version, gtk_micro_version);
--      printf ("*** was found! If gtk-config was correct, then it is best\n");
-+      printf ("*** was found! If gtk11-config was correct, then it is best\n");
-       printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-       printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-       printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-       printf("*** required on your system.\n");
--      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
--      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
-+      printf("*** If gtk11-config was wrong, set the environment variable GTK_CONFIG\n");
-+      printf("*** to point to the correct copy of gtk11-config, and remove the file config.cache\n");
-       printf("*** before re-running configure\n");
-     } 
-   else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-@@ -1968,10 +1970,10 @@
-         printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-         printf("***\n");
-         printf("*** If you have already installed a sufficiently new version, this error\n");
--        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
-+        printf("*** probably means that the wrong copy of the gtk11-config shell script is\n");
-         printf("*** being found. The easiest way to fix this is to remove the old version\n");
-         printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
--        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
-+        printf("*** correct copy of gtk11-config. (In this case, you will have to\n");
-         printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-         printf("*** so that the correct libraries are found at run-time))\n");
-       }
-@@ -2002,10 +2004,10 @@
-   else
-      echo "$ac_t""no" 1>&6
-      if test "$GTK_CONFIG" = "no" ; then
--       echo "*** The gtk-config script installed by GTK could not be found"
-+       echo "*** The gtk11-config script installed by GTK could not be found"
-        echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
-        echo "*** your path, or set the GTK_CONFIG environment variable to the"
--       echo "*** full path to gtk-config."
-+       echo "*** full path to gtk11-config."
-      else
-        if test -f conf.gtktest ; then
-         :
-@@ -2047,7 +2049,7 @@
-    echo "*** The test program failed to compile or link. See the file config.log for the"
-           echo "*** exact error that occured. This usually means GTK was incorrectly installed"
-           echo "*** or that you have moved GTK since it was installed. In the latter case, you"
--          echo "*** may want to edit the gtk-config script: $GTK_CONFIG" 
-+          echo "*** may want to edit the gtk11-config script: $GTK_CONFIG" 
- fi
- rm -f conftest*
-           CFLAGS="$ac_save_CFLAGS"
-@@ -5847,16 +5849,16 @@
+--- configure.orig	Wed Sep 23 23:37:33 1998
++++ configure	Sat Sep 26 22:02:01 1998
+@@ -6129,16 +6129,16 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
--echo "configure:5853: checking for tiffio.h" >&5
+-echo "configure:6135: checking for tiffio.h" >&5
 +  ac_safe=`echo "tiff34/tiffio.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for tiff34/tiffio.h""... $ac_c" 1>&6
-+echo "configure:5853: checking for tiff34/tiffio.h" >&5
++echo "configure:6135: checking for tiff34/tiffio.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
- #line 5858 "configure"
+ #line 6140 "configure"
  #include "confdefs.h"
 -#include <tiffio.h>
 +#include <tiff34/tiffio.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:5863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -5920,16 +5922,16 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
--echo "configure:5926: checking for tiffio.h" >&5
-+  ac_safe=`echo "tiff34/tiffio.h" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for tiff34/tiffio.h""... $ac_c" 1>&6
-+echo "configure:5926: checking for tiff34/tiffio.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
- #line 5931 "configure"
- #include "confdefs.h"
--#include <tiffio.h>
-+#include <tiff34/tiffio.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:5936: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -5993,16 +5995,16 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
--echo "configure:5999: checking for tiffio.h" >&5
-+  ac_safe=`echo "tiff34/tiffio.h" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for tiff34/tiffio.h""... $ac_c" 1>&6
-+echo "configure:5999: checking for tiff34/tiffio.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
- #line 6004 "configure"
- #include "confdefs.h"
--#include <tiffio.h>
-+#include <tiff34/tiffio.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:6009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -6073,16 +6075,16 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
-+  ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:6079: checking for gif_lib.h" >&5
-+echo "configure:6079: checking for giflib/gif_lib.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
- #line 6084 "configure"
- #include "confdefs.h"
--#include <gif_lib.h>
-+#include <giflib/gif_lib.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:6089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -6149,16 +6151,16 @@
+ { (eval echo configure:6145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -6209,16 +6209,16 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:6155: checking for gif_lib.h" >&5
+-echo "configure:6215: checking for gif_lib.h" >&5
 +  ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
-+echo "configure:6155: checking for giflib/gif_lib.h" >&5
++echo "configure:6215: checking for giflib/gif_lib.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
- #line 6160 "configure"
+ #line 6220 "configure"
  #include "confdefs.h"
 -#include <gif_lib.h>
 +#include <giflib/gif_lib.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:6165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -6362,7 +6364,7 @@
+ { (eval echo configure:6225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -6842,7 +6842,7 @@
  GNOME_LIBDIR='-L${libdir}'
  GNOME_INCLUDEDIR='-I${includedir}'
  if test "$need_gnome_support" = yes; then
diff --git a/x11/gnomelibs/files/patch-ac b/x11/gnomelibs/files/patch-ac
index 88f5d387577..c3b4928b732 100644
--- a/x11/gnomelibs/files/patch-ac
+++ b/x11/gnomelibs/files/patch-ac
@@ -1,15 +1,15 @@
---- gnome-config.in.orig	Wed Aug 26 19:16:24 1998
-+++ gnome-config.in	Wed Aug 26 19:16:57 1998
-@@ -36,7 +36,7 @@
-     glib	(calls glib-config)
+--- gnome-config.in.orig	Mon Sep 21 23:15:02 1998
++++ gnome-config.in	Sat Sep 26 22:12:16 1998
+@@ -45,7 +45,7 @@
      gnome
      gnomeui
+     gnorba
 -    gtk		(calls gtk-config)
 +    gtk11	(calls gtk11-config)
      gtkxmhtml	(only --libs)
      zvt		(only --libs)
  
-@@ -92,9 +92,9 @@
+@@ -116,9 +116,9 @@
  	the_libs="$the_libs `glib-config --libs`"
  	the_flags="$the_flags `glib-config --cflags`"
  	;;
diff --git a/x11/gnomelibs/files/patch-ad b/x11/gnomelibs/files/patch-ad
index 7cc203212e1..dc6621a9830 100644
--- a/x11/gnomelibs/files/patch-ad
+++ b/x11/gnomelibs/files/patch-ad
@@ -1,5 +1,5 @@
---- libgnome/gnome-help.c.orig	Tue Sep  1 13:30:25 1998
-+++ libgnome/gnome-help.c	Tue Sep  1 13:30:44 1998
+--- libgnome/gnome-help.c.orig	Fri Jul 24 02:08:29 1998
++++ libgnome/gnome-help.c	Sat Sep 26 22:12:34 1998
 @@ -35,7 +35,7 @@
        lang= language_list->data;
  
diff --git a/x11/gnomelibs/pkg-plist b/x11/gnomelibs/pkg-plist
index 7a7803f80d5..7af8d01e8ec 100644
--- a/x11/gnomelibs/pkg-plist
+++ b/x11/gnomelibs/pkg-plist
@@ -1,4 +1,6 @@
+bin/convertrgb
 bin/gnome-config
+bin/gnome-dump-metadata
 include/argp.h
 include/error.h
 include/getopt.h
@@ -14,11 +16,6 @@ include/gtk-xmhtml/gtk-xmhtml-p.h
 include/gtk-xmhtml/gtk-xmhtml.h
 include/gtk-xmhtml/miniparse.h
 include/gtk-xmhtml/toolkit.h
-include/gtktty/gtkled.h
-include/gtktty/gtkterm.h
-include/gtktty/gtktty.h
-include/gtktty/gtkvtemu.h
-include/gtktty/libgtktty.h
 include/libgnome/gnome-config.h
 include/libgnome/gnome-defs.h
 include/libgnome/gnome-dentry.h
@@ -29,12 +26,17 @@ include/libgnome/gnome-help.h
 include/libgnome/gnome-history.h
 include/libgnome/gnome-hook.h
 include/libgnome/gnome-i18n.h
+include/libgnome/gnome-metadata.h
 include/libgnome/gnome-mime.h
 include/libgnome/gnome-parse.h
+include/libgnome/gnome-regex.h
+include/libgnome/gnome-remote.h
 include/libgnome/gnome-score.h
 include/libgnome/gnome-string.h
 include/libgnome/gnome-triggers.h
 include/libgnome/gnome-util.h
+include/libgnome/lib_date.h
+include/libgnome/lib_defs.h
 include/libgnome/libgnome.h
 include/libgnomeui/gnome-about.h
 include/libgnomeui/gnome-actionarea.h
@@ -51,6 +53,7 @@ include/libgnomeui/gnome-canvas-util.h
 include/libgnomeui/gnome-canvas-widget.h
 include/libgnomeui/gnome-canvas.h
 include/libgnomeui/gnome-client.h
+include/libgnomeui/gnome-color-picker.h
 include/libgnomeui/gnome-color-selector.h
 include/libgnomeui/gnome-dateedit.h
 include/libgnomeui/gnome-dentry-edit.h
@@ -61,6 +64,7 @@ include/libgnomeui/gnome-entry.h
 include/libgnomeui/gnome-file-entry.h
 include/libgnomeui/gnome-font-selector.h
 include/libgnomeui/gnome-geometry.h
+include/libgnomeui/gnome-gtk-utils.h
 include/libgnomeui/gnome-ice.h
 include/libgnomeui/gnome-icon-list.h
 include/libgnomeui/gnome-icon-sel.h
@@ -72,7 +76,7 @@ include/libgnomeui/gnome-messagebox.h
 include/libgnomeui/gnome-net.h
 include/libgnomeui/gnome-number-entry.h
 include/libgnomeui/gnome-pixmap.h
-include/libgnomeui/gnome-popupmenu.h
+include/libgnomeui/gnome-popup-menu.h
 include/libgnomeui/gnome-preferences.h
 include/libgnomeui/gnome-properties.h
 include/libgnomeui/gnome-propertybox.h
@@ -82,6 +86,7 @@ include/libgnomeui/gnome-startup.h
 include/libgnomeui/gnome-stock.h
 include/libgnomeui/gnome-types.h
 include/libgnomeui/gnome-uidefs.h
+include/libgnomeui/gnome-winhints.h
 include/libgnomeui/gnometypebuiltins.h
 include/libgnomeui/gtk-clock.h
 include/libgnomeui/gtk-plug.h
@@ -93,6 +98,8 @@ include/libgnomeui/gtkdial.h
 include/libgnomeui/gtklayout.h
 include/libgnomeui/gtkspell.h
 include/libgnomeui/libgnomeui.h
+include/libgnorba/gnorba.h
+include/libgnorba/name-service.h
 include/zvt/lists.h
 include/zvt/subshell.h
 include/zvt/vt.h
@@ -101,31 +108,32 @@ include/zvt/zvtterm.h
 lib/libgnome.a
 lib/libgnome.la
 lib/libgnome.so
-lib/libgnome.so.0.27
+lib/libgnome.so.0.30
 lib/libgnomesupport.a
 lib/libgnomesupport.la
 lib/libgnomesupport.so
-lib/libgnomesupport.so.0.27
+lib/libgnomesupport.so.0.30
 lib/libgnomeui.a
 lib/libgnomeui.la
 lib/libgnomeui.so
-lib/libgnomeui.so.0.27
-lib/libgtktty.la
-lib/libgtktty.so
-lib/libgtktty.so.0.4
+lib/libgnomeui.so.0.30
+lib/libgnorba.a
+lib/libgnorba.la
+lib/libgnorba.so
+lib/libgnorba.so.0.30
 lib/libgtkxmhtml.a
 lib/libgtkxmhtml.la
 lib/libgtkxmhtml.so
-lib/libgtkxmhtml.so.0.27
+lib/libgtkxmhtml.so.0.30
 lib/libzvt.a
 lib/libzvt.la
 lib/libzvt.so
 lib/libzvt.so.0.0
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/gnome/gnomeConf.sh
 share/gnome/gtkrc
-share/gnome/pixmaps/calculator-font.xpm
+share/gnome/pixmaps/calculator-font.png
 share/locale/cs/LC_MESSAGES/gnome-libs.mo
 share/locale/de/LC_MESSAGES/gnome-libs.mo
 share/locale/es/LC_MESSAGES/gnome-libs.mo
@@ -139,35 +147,11 @@ share/locale/no/LC_MESSAGES/gnome-libs.mo
 share/locale/pt/LC_MESSAGES/gnome-libs.mo
 share/locale/sv/LC_MESSAGES/gnome-libs.mo
 @dirrm include/gtk-xmhtml
-@dirrm include/gtktty
 @dirrm include/libgnome
 @dirrm include/libgnomeui
+@dirrm include/libgnorba
 @dirrm include/zvt
 @dirrm share/gnome/games
 @dirrm share/gnome/html
 @dirrm share/gnome/pixmaps
 @dirrm share/gnome
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs/
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de/
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es/
-@dirrm share/locale/fi/LC_MESSAGES
-@dirrm share/locale/fi/
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr/
-@dirrm share/locale/ga/LC_MESSAGES
-@dirrm share/locale/ga/
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/it/
-@dirrm share/locale/ja/LC_MESSAGES
-@dirrm share/locale/ja/
-@dirrm share/locale/ko/LC_MESSAGES
-@dirrm share/locale/ko/
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no/
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt/
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv/
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index e77ba6edf8c..9f11a1a13c9 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:   gnomelibs
-# Version required:    0.27
+# Version required:    0.30
 # Date created:        17 June 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.10 1998/09/25 09:52:45 asami Exp $
+# $Id: Makefile,v 1.11 1998/09/26 00:02:36 asami Exp $
 #
 
-DISTNAME=	gnome-libs-0.27
-PKGNAME=	gnomelibs-0.27
+DISTNAME=	gnome-libs-0.30
+PKGNAME=	gnomelibs-0.30
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
 		ftp://ftp.gnome.org/pub/GNOME/sources/
@@ -22,18 +22,21 @@ LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	gif.3:${PORTSDIR}/graphics/giflib
 LIB_DEPENDS+=	png.2:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS+=	ORBit.0:${PORTSDIR}/devel/ORBit
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lxpg4"
+CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \
+		-I${X11BASE}/include" \
+		GTK_CONFIG="${X11BASE}/bin/gtk11-config" \
+		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
 
 pre-build:
 	( cd ${WRKSRC}/support; ${GMAKE} gnomesupport.h )
 
 post-install:
-	${LDCONFIG} -m ${PREFIX}/lib
+	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index f312b12758e..68a501f426f 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1 +1 @@
-MD5 (gnome-libs-0.27.tar.gz) = 61883a7f9d1f7d91a00dbc9e91b6b991
+MD5 (gnome-libs-0.30.tar.gz) = aff53f69fcb7945320edb85a80583881
diff --git a/x11/libgnome/files/patch-aa b/x11/libgnome/files/patch-aa
index e8b35adcca6..f4cbc514134 100644
--- a/x11/libgnome/files/patch-aa
+++ b/x11/libgnome/files/patch-aa
@@ -1,198 +1,48 @@
---- configure.orig	Fri Aug 14 07:36:30 1998
-+++ configure	Thu Sep 17 19:42:01 1998
-@@ -78,6 +78,8 @@
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-+CFLAGS='-I../intl -I/usr/X11R6/include -I/usr/local/include'
-+LDFLAGS='-L/usr/X11R6/lib -L/usr/local/lib'
- # Maximum number of lines to put in a shell here document.
- ac_max_here_lines=12
- 
-@@ -1837,18 +1839,18 @@
-   if test x$gtk_config_exec_prefix != x ; then
-      gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-      if test x${GTK_CONFIG+set} != xset ; then
--        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-+        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk11-config
-      fi
-   fi
-   if test x$gtk_config_prefix != x ; then
-      gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-      if test x${GTK_CONFIG+set} != xset ; then
--        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-+        GTK_CONFIG=$gtk_config_prefix/bin/gtk11-config
-      fi
-   fi
- 
--  # Extract the first word of "gtk-config", so it can be a program name with args.
--set dummy gtk-config; ac_word=$2
-+  # Extract the first word of "gtk11-config", so it can be a program name with args.
-+set dummy gtk11-config; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
- echo "configure:1854: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
-@@ -1930,16 +1932,16 @@
-       (gtk_minor_version != $gtk_config_minor_version) ||
-       (gtk_micro_version != $gtk_config_micro_version))
-     {
--      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
-+      printf("\n*** 'gtk11-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
-              $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-              gtk_major_version, gtk_minor_version, gtk_micro_version);
--      printf ("*** was found! If gtk-config was correct, then it is best\n");
-+      printf ("*** was found! If gtk11-config was correct, then it is best\n");
-       printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-       printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-       printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-       printf("*** required on your system.\n");
--      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
--      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
-+      printf("*** If gtk11-config was wrong, set the environment variable GTK_CONFIG\n");
-+      printf("*** to point to the correct copy of gtk11-config, and remove the file config.cache\n");
-       printf("*** before re-running configure\n");
-     } 
-   else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-@@ -1968,10 +1970,10 @@
-         printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-         printf("***\n");
-         printf("*** If you have already installed a sufficiently new version, this error\n");
--        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
-+        printf("*** probably means that the wrong copy of the gtk11-config shell script is\n");
-         printf("*** being found. The easiest way to fix this is to remove the old version\n");
-         printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
--        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
-+        printf("*** correct copy of gtk11-config. (In this case, you will have to\n");
-         printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-         printf("*** so that the correct libraries are found at run-time))\n");
-       }
-@@ -2002,10 +2004,10 @@
-   else
-      echo "$ac_t""no" 1>&6
-      if test "$GTK_CONFIG" = "no" ; then
--       echo "*** The gtk-config script installed by GTK could not be found"
-+       echo "*** The gtk11-config script installed by GTK could not be found"
-        echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
-        echo "*** your path, or set the GTK_CONFIG environment variable to the"
--       echo "*** full path to gtk-config."
-+       echo "*** full path to gtk11-config."
-      else
-        if test -f conf.gtktest ; then
-         :
-@@ -2047,7 +2049,7 @@
-    echo "*** The test program failed to compile or link. See the file config.log for the"
-           echo "*** exact error that occured. This usually means GTK was incorrectly installed"
-           echo "*** or that you have moved GTK since it was installed. In the latter case, you"
--          echo "*** may want to edit the gtk-config script: $GTK_CONFIG" 
-+          echo "*** may want to edit the gtk11-config script: $GTK_CONFIG" 
- fi
- rm -f conftest*
-           CFLAGS="$ac_save_CFLAGS"
-@@ -5847,16 +5849,16 @@
+--- configure.orig	Wed Sep 23 23:37:33 1998
++++ configure	Sat Sep 26 22:02:01 1998
+@@ -6129,16 +6129,16 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
--echo "configure:5853: checking for tiffio.h" >&5
+-echo "configure:6135: checking for tiffio.h" >&5
 +  ac_safe=`echo "tiff34/tiffio.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for tiff34/tiffio.h""... $ac_c" 1>&6
-+echo "configure:5853: checking for tiff34/tiffio.h" >&5
++echo "configure:6135: checking for tiff34/tiffio.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
- #line 5858 "configure"
+ #line 6140 "configure"
  #include "confdefs.h"
 -#include <tiffio.h>
 +#include <tiff34/tiffio.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:5863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -5920,16 +5922,16 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
--echo "configure:5926: checking for tiffio.h" >&5
-+  ac_safe=`echo "tiff34/tiffio.h" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for tiff34/tiffio.h""... $ac_c" 1>&6
-+echo "configure:5926: checking for tiff34/tiffio.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
- #line 5931 "configure"
- #include "confdefs.h"
--#include <tiffio.h>
-+#include <tiff34/tiffio.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:5936: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -5993,16 +5995,16 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
--echo "configure:5999: checking for tiffio.h" >&5
-+  ac_safe=`echo "tiff34/tiffio.h" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for tiff34/tiffio.h""... $ac_c" 1>&6
-+echo "configure:5999: checking for tiff34/tiffio.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
- #line 6004 "configure"
- #include "confdefs.h"
--#include <tiffio.h>
-+#include <tiff34/tiffio.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:6009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -6073,16 +6075,16 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
-+  ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:6079: checking for gif_lib.h" >&5
-+echo "configure:6079: checking for giflib/gif_lib.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
- #line 6084 "configure"
- #include "confdefs.h"
--#include <gif_lib.h>
-+#include <giflib/gif_lib.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:6089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -6149,16 +6151,16 @@
+ { (eval echo configure:6145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -6209,16 +6209,16 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:6155: checking for gif_lib.h" >&5
+-echo "configure:6215: checking for gif_lib.h" >&5
 +  ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
-+echo "configure:6155: checking for giflib/gif_lib.h" >&5
++echo "configure:6215: checking for giflib/gif_lib.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
- #line 6160 "configure"
+ #line 6220 "configure"
  #include "confdefs.h"
 -#include <gif_lib.h>
 +#include <giflib/gif_lib.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:6165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -6362,7 +6364,7 @@
+ { (eval echo configure:6225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -6842,7 +6842,7 @@
  GNOME_LIBDIR='-L${libdir}'
  GNOME_INCLUDEDIR='-I${includedir}'
  if test "$need_gnome_support" = yes; then
diff --git a/x11/libgnome/files/patch-ac b/x11/libgnome/files/patch-ac
index 88f5d387577..c3b4928b732 100644
--- a/x11/libgnome/files/patch-ac
+++ b/x11/libgnome/files/patch-ac
@@ -1,15 +1,15 @@
---- gnome-config.in.orig	Wed Aug 26 19:16:24 1998
-+++ gnome-config.in	Wed Aug 26 19:16:57 1998
-@@ -36,7 +36,7 @@
-     glib	(calls glib-config)
+--- gnome-config.in.orig	Mon Sep 21 23:15:02 1998
++++ gnome-config.in	Sat Sep 26 22:12:16 1998
+@@ -45,7 +45,7 @@
      gnome
      gnomeui
+     gnorba
 -    gtk		(calls gtk-config)
 +    gtk11	(calls gtk11-config)
      gtkxmhtml	(only --libs)
      zvt		(only --libs)
  
-@@ -92,9 +92,9 @@
+@@ -116,9 +116,9 @@
  	the_libs="$the_libs `glib-config --libs`"
  	the_flags="$the_flags `glib-config --cflags`"
  	;;
diff --git a/x11/libgnome/files/patch-ad b/x11/libgnome/files/patch-ad
index 7cc203212e1..dc6621a9830 100644
--- a/x11/libgnome/files/patch-ad
+++ b/x11/libgnome/files/patch-ad
@@ -1,5 +1,5 @@
---- libgnome/gnome-help.c.orig	Tue Sep  1 13:30:25 1998
-+++ libgnome/gnome-help.c	Tue Sep  1 13:30:44 1998
+--- libgnome/gnome-help.c.orig	Fri Jul 24 02:08:29 1998
++++ libgnome/gnome-help.c	Sat Sep 26 22:12:34 1998
 @@ -35,7 +35,7 @@
        lang= language_list->data;
  
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index 7a7803f80d5..7af8d01e8ec 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -1,4 +1,6 @@
+bin/convertrgb
 bin/gnome-config
+bin/gnome-dump-metadata
 include/argp.h
 include/error.h
 include/getopt.h
@@ -14,11 +16,6 @@ include/gtk-xmhtml/gtk-xmhtml-p.h
 include/gtk-xmhtml/gtk-xmhtml.h
 include/gtk-xmhtml/miniparse.h
 include/gtk-xmhtml/toolkit.h
-include/gtktty/gtkled.h
-include/gtktty/gtkterm.h
-include/gtktty/gtktty.h
-include/gtktty/gtkvtemu.h
-include/gtktty/libgtktty.h
 include/libgnome/gnome-config.h
 include/libgnome/gnome-defs.h
 include/libgnome/gnome-dentry.h
@@ -29,12 +26,17 @@ include/libgnome/gnome-help.h
 include/libgnome/gnome-history.h
 include/libgnome/gnome-hook.h
 include/libgnome/gnome-i18n.h
+include/libgnome/gnome-metadata.h
 include/libgnome/gnome-mime.h
 include/libgnome/gnome-parse.h
+include/libgnome/gnome-regex.h
+include/libgnome/gnome-remote.h
 include/libgnome/gnome-score.h
 include/libgnome/gnome-string.h
 include/libgnome/gnome-triggers.h
 include/libgnome/gnome-util.h
+include/libgnome/lib_date.h
+include/libgnome/lib_defs.h
 include/libgnome/libgnome.h
 include/libgnomeui/gnome-about.h
 include/libgnomeui/gnome-actionarea.h
@@ -51,6 +53,7 @@ include/libgnomeui/gnome-canvas-util.h
 include/libgnomeui/gnome-canvas-widget.h
 include/libgnomeui/gnome-canvas.h
 include/libgnomeui/gnome-client.h
+include/libgnomeui/gnome-color-picker.h
 include/libgnomeui/gnome-color-selector.h
 include/libgnomeui/gnome-dateedit.h
 include/libgnomeui/gnome-dentry-edit.h
@@ -61,6 +64,7 @@ include/libgnomeui/gnome-entry.h
 include/libgnomeui/gnome-file-entry.h
 include/libgnomeui/gnome-font-selector.h
 include/libgnomeui/gnome-geometry.h
+include/libgnomeui/gnome-gtk-utils.h
 include/libgnomeui/gnome-ice.h
 include/libgnomeui/gnome-icon-list.h
 include/libgnomeui/gnome-icon-sel.h
@@ -72,7 +76,7 @@ include/libgnomeui/gnome-messagebox.h
 include/libgnomeui/gnome-net.h
 include/libgnomeui/gnome-number-entry.h
 include/libgnomeui/gnome-pixmap.h
-include/libgnomeui/gnome-popupmenu.h
+include/libgnomeui/gnome-popup-menu.h
 include/libgnomeui/gnome-preferences.h
 include/libgnomeui/gnome-properties.h
 include/libgnomeui/gnome-propertybox.h
@@ -82,6 +86,7 @@ include/libgnomeui/gnome-startup.h
 include/libgnomeui/gnome-stock.h
 include/libgnomeui/gnome-types.h
 include/libgnomeui/gnome-uidefs.h
+include/libgnomeui/gnome-winhints.h
 include/libgnomeui/gnometypebuiltins.h
 include/libgnomeui/gtk-clock.h
 include/libgnomeui/gtk-plug.h
@@ -93,6 +98,8 @@ include/libgnomeui/gtkdial.h
 include/libgnomeui/gtklayout.h
 include/libgnomeui/gtkspell.h
 include/libgnomeui/libgnomeui.h
+include/libgnorba/gnorba.h
+include/libgnorba/name-service.h
 include/zvt/lists.h
 include/zvt/subshell.h
 include/zvt/vt.h
@@ -101,31 +108,32 @@ include/zvt/zvtterm.h
 lib/libgnome.a
 lib/libgnome.la
 lib/libgnome.so
-lib/libgnome.so.0.27
+lib/libgnome.so.0.30
 lib/libgnomesupport.a
 lib/libgnomesupport.la
 lib/libgnomesupport.so
-lib/libgnomesupport.so.0.27
+lib/libgnomesupport.so.0.30
 lib/libgnomeui.a
 lib/libgnomeui.la
 lib/libgnomeui.so
-lib/libgnomeui.so.0.27
-lib/libgtktty.la
-lib/libgtktty.so
-lib/libgtktty.so.0.4
+lib/libgnomeui.so.0.30
+lib/libgnorba.a
+lib/libgnorba.la
+lib/libgnorba.so
+lib/libgnorba.so.0.30
 lib/libgtkxmhtml.a
 lib/libgtkxmhtml.la
 lib/libgtkxmhtml.so
-lib/libgtkxmhtml.so.0.27
+lib/libgtkxmhtml.so.0.30
 lib/libzvt.a
 lib/libzvt.la
 lib/libzvt.so
 lib/libzvt.so.0.0
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/gnome/gnomeConf.sh
 share/gnome/gtkrc
-share/gnome/pixmaps/calculator-font.xpm
+share/gnome/pixmaps/calculator-font.png
 share/locale/cs/LC_MESSAGES/gnome-libs.mo
 share/locale/de/LC_MESSAGES/gnome-libs.mo
 share/locale/es/LC_MESSAGES/gnome-libs.mo
@@ -139,35 +147,11 @@ share/locale/no/LC_MESSAGES/gnome-libs.mo
 share/locale/pt/LC_MESSAGES/gnome-libs.mo
 share/locale/sv/LC_MESSAGES/gnome-libs.mo
 @dirrm include/gtk-xmhtml
-@dirrm include/gtktty
 @dirrm include/libgnome
 @dirrm include/libgnomeui
+@dirrm include/libgnorba
 @dirrm include/zvt
 @dirrm share/gnome/games
 @dirrm share/gnome/html
 @dirrm share/gnome/pixmaps
 @dirrm share/gnome
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs/
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de/
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es/
-@dirrm share/locale/fi/LC_MESSAGES
-@dirrm share/locale/fi/
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr/
-@dirrm share/locale/ga/LC_MESSAGES
-@dirrm share/locale/ga/
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/it/
-@dirrm share/locale/ja/LC_MESSAGES
-@dirrm share/locale/ja/
-@dirrm share/locale/ko/LC_MESSAGES
-@dirrm share/locale/ko/
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no/
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt/
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv/