11 files changed, 104 insertions, 72 deletions

diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 118947deb5a6..63de374358a3 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	gnomelibs
-# Version required:			1.0.9
+# Version required:			1.0.14
 # Date created:				17 June 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.40 1999/05/09 17:13:15 steve Exp $
+# $Id: Makefile,v 1.41 1999/05/30 03:58:28 steve Exp $
 #
 
-DISTNAME=	gnome-libs-1.0.9
-PKGNAME=	gnomelibs-1.0.9
+DISTNAME=	gnome-libs-1.0.14
+PKGNAME=	gnomelibs-1.0.14
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-libs
@@ -20,6 +20,7 @@ LIB_DEPENDS=	gdk_imlib.4:${PORTSDIR}/graphics/imlib \
 		esd.1:${PORTSDIR}/audio/esound
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
@@ -33,8 +34,9 @@ CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
 			-I${LOCALBASE}/include/giflib" \
 		GTK_CONFIG="${GTK_CONFIG}" \
+		GLIB_CONFIG="${GLIB_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
-MAN1=		gnome.1	
+MAN1=		gnome.1 gnome-config.1
 
 .include <bsd.port.mk>
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index 5420a4b484e0..4ff3df7d4692 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1 +1 @@
-MD5 (gnome-libs-1.0.9.tar.gz) = 05ce799adb4a341807d978c7bd8ae7e9
+MD5 (gnome-libs-1.0.14.tar.gz) = 1a8dc9e378076c75ab67480c2cf3aab9
diff --git a/x11/libgnome/files/patch-ac b/x11/libgnome/files/patch-ac
index 184d5e79b184..3f491f338654 100644
--- a/x11/libgnome/files/patch-ac
+++ b/x11/libgnome/files/patch-ac
@@ -1,17 +1,26 @@
---- gnome-config.in.orig	Thu Apr 15 13:59:46 1999
-+++ gnome-config.in	Sat May  8 17:32:13 1999
-@@ -43,25 +43,25 @@
+--- gnome-config.in.orig	Mon May 31 06:04:01 1999
++++ gnome-config.in	Mon Jul 12 10:27:28 1999
+@@ -19,7 +19,7 @@
+ pkglibdir=${libdir}/@PACKAGE@
+ pkgincludedir=${includedir}/@PACKAGE@
+ MODULE_VERSION=@PACKAGE@-@VERSION@
+-module_dirs="$libdir:$GNOME_LIBCONFIG_PATH"
++module_dirs="$sysconfdir:$GNOME_LIBCONFIG_PATH"
+ 
+ usage()
+ {
+@@ -46,18 +46,18 @@
  
  Known values for LIBRARY are:
  
 -    glib	(calls glib-config)
-+    glib	(calls glib12-config)
++    glib	(calls GLIB_CONFIG)
      idl         (to be used with orbit-idl)
      gnome
      gnomeui
      gnorba
 -    gtk		(calls gtk-config)
-+    gtk		(calls gtk12-config)
++    gtk		(calls GTK_CONFIG)
      gtkxmhtml	(only --libs)
      zvt		(only --libs)
  
@@ -22,28 +31,20 @@
  
  is looked in for the necessary information.  Those currently installed 
  appear to be:
- 
- EOF
- 
--    conf_shs=`cd ${libdir}; echo *Conf.sh`
-+    conf_shs=`cd ${sysconfdir}; echo *Conf.sh`
- 
-     if test "x$conf_shs" = x || test "x$conf_shs" = 'x*Conf.sh'; then
- 	echo "    <NONE>"
-@@ -146,19 +146,19 @@
+@@ -149,19 +149,19 @@
  	usage 1
  	;;
      glib)
 -	the_libs="$the_libs `glib-config --libs`"
 -	the_flags="$the_flags `glib-config --cflags`"
-+	the_libs="$the_libs `glib12-config --libs`"
-+	the_flags="$the_flags `glib12-config --cflags`"
++	the_libs="$the_libs `$GLIB_CONFIG --libs`"
++	the_flags="$the_flags `$GLIB_CONFIG --cflags`"
  	;;
      gtk)
 -	the_libs="$the_libs `gtk-config --libs`"
 -	the_flags="$the_flags `gtk-config --cflags`"
-+	the_libs="$the_libs `gtk12-config --libs`"
-+	the_flags="$the_flags `gtk12-config --cflags`"
++	the_libs="$the_libs `$GTK_CONFIG --libs`"
++	the_flags="$the_flags `$GTK_CONFIG --cflags`"
  	;;
      gnome)
         	the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@"
@@ -55,12 +56,3 @@
  	the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@"
  	;;
      gtkxmhtml)
-@@ -175,7 +175,7 @@
- 	the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@"
- 	;;
-     *)
--	cnf_sh=${libdir}/${1}Conf.sh
-+	cnf_sh=${sysconfdir}/${1}Conf.sh
- 	if test -f ${cnf_sh}; then
- 	    . ${cnf_sh}
- 	    up_name=`echo $1 | tr a-z A-Z`
diff --git a/x11/libgnome/files/patch-ad b/x11/libgnome/files/patch-ad
index 0a913989a542..32e656859e37 100644
--- a/x11/libgnome/files/patch-ad
+++ b/x11/libgnome/files/patch-ad
@@ -1,11 +1,20 @@
---- libgnome/gnome-help.c.orig	Wed Jan 13 07:43:11 1999
-+++ libgnome/gnome-help.c	Thu Jan 14 19:13:33 1999
-@@ -57,7 +57,7 @@
+--- libgnome/gnome-help.c.orig	Thu Apr  8 15:01:21 1999
++++ libgnome/gnome-help.c	Mon Jul 12 10:29:11 1999
+@@ -69,7 +69,7 @@
  		lang= language_list->data;
  		
  		buf= g_string_new (NULL);
 -		g_string_sprintf (buf, "gnome/help/%s/%s/%s", app, lang, path);
 +		g_string_sprintf (buf, "help/%s/%s/%s", app, lang, path);
  		res= (gchar *)gnome_unconditional_datadir_file (buf->str);
- 		p = strrchr(res, '#');
- 		if (p)
+ 		p = strrchr (res, '#');
+ 		if (p) {
+@@ -118,7 +118,7 @@
+ 	if (!res)
+ 	{
+ 		buf = g_string_new(NULL);
+-		g_string_sprintf(buf, "gnome/help/%s/C/%s", app, path);
++		g_string_sprintf(buf, "help/%s/C/%s", app, path);
+ 		res = (gchar *)gnome_unconditional_datadir_file(buf->str);
+ 		g_string_free(buf, TRUE);
+ 	}
diff --git a/x11/libgnome/files/patch-ag b/x11/libgnome/files/patch-ag
index cb3304716bcb..8778bc26ffc9 100644
--- a/x11/libgnome/files/patch-ag
+++ b/x11/libgnome/files/patch-ag
@@ -1,6 +1,6 @@
---- libgnome/gnome-util.c.orig	Wed Dec 16 14:48:43 1998
-+++ libgnome/gnome-util.c	Thu Dec 24 03:49:23 1998
-@@ -340,8 +340,9 @@
+--- libgnome/gnome-util.c.orig	Fri Apr 23 16:14:08 1999
++++ libgnome/gnome-util.c	Mon Jul 12 10:31:19 1999
+@@ -371,8 +371,9 @@
  	int i;
  	char *shell;
  	static char *shells [] = {
@@ -8,7 +8,7 @@
 -		"/bin/csh", "/bin/sh", 0
 +		"/bin/csh", "/bin/sh", "/usr/local/bin/tcsh",
 +		"/usr/local/bin/bash", "/usr/local/bin/ksh",
-+		"/usr/local/bin/zsh", "/usr/local/bin/scsh", 0
++		"/usr/local/bin/zsh", "/usr/local/sbin/scsh", 0
  	};
  
  	if ((shell = getenv ("SHELL"))){
diff --git a/x11/libgnome/files/patch-ba b/x11/libgnome/files/patch-ba
index ab4a059b0c19..2d36fbacc97e 100644
--- a/x11/libgnome/files/patch-ba
+++ b/x11/libgnome/files/patch-ba
@@ -1,15 +1,15 @@
---- Makefile.in.orig	Wed May  5 19:03:43 1999
-+++ Makefile.in	Wed May  5 19:04:38 1999
-@@ -162,7 +162,7 @@
- # just distribute it, since we can 
- @FALSE_TRUE@libvfs = libvfs
+--- Makefile.in.orig	Fri Jul 23 21:06:26 1999
++++ Makefile.in	Wed Aug 18 10:15:43 1999
+@@ -156,7 +156,7 @@
+ @COMPILE_TEST_GNOME_TRUE@test_gnome = test-gnome test-suite
+ @COMPILE_TEST_GNOME_FALSE@test_gnome = 
  
--SUBDIRS = po intl support macros 	tools 	images 	libart_lgpl 	libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt 	libgnorba idl $(test_gnome) devel-docs gnome-data $(libvfs) man 	gnome-faq
-+SUBDIRS = po intl support macros 	tools 	images 	libart_lgpl 	libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt 	libgnorba idl $(test_gnome) gnome-data $(libvfs) man
+-SUBDIRS = po intl support macros 	tools 	images 	libart_lgpl 	libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt 	libgnorba idl $(test_gnome) devel-docs gnome-data man 	gnome-faq
++SUBDIRS = po intl support macros 	tools 	images 	libart_lgpl 	libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt 	libgnorba idl $(test_gnome) gnome-data man
  
  
  include_HEADERS = gnome.h
-@@ -170,7 +170,7 @@
+@@ -164,7 +164,7 @@
  EXTRA_DIST = HACKING gnomeConf.sh.in gnome-bug.in gnome-config.in 		gnome-libs.spec.in
  
  
diff --git a/x11/libgnome/files/patch-bc b/x11/libgnome/files/patch-bc
index d77e1256acb6..227404a56745 100644
--- a/x11/libgnome/files/patch-bc
+++ b/x11/libgnome/files/patch-bc
@@ -1,10 +1,10 @@
---- libgnome/Makefile.in.orig	Wed Apr  7 21:33:54 1999
-+++ libgnome/Makefile.in	Fri Apr 30 17:35:08 1999
-@@ -172,7 +172,7 @@
+--- libgnome/Makefile.in.orig	Fri Aug 20 15:01:42 1999
++++ libgnome/Makefile.in	Fri Aug 20 16:29:13 1999
+@@ -171,7 +171,7 @@
  
  EXTRA_DIST = parse-path.cP 
  
--libgnome_la_LDFLAGS = -version-info 35:3:3 #-rpath $(libdir)
+-libgnome_la_LDFLAGS = -version-info 35:5:3 #-rpath $(libdir)
 +libgnome_la_LDFLAGS = -version-info 2:0:0 #-rpath $(libdir)
  libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB)
  
diff --git a/x11/libgnome/files/patch-bd b/x11/libgnome/files/patch-bd
index dc9615aa82cd..5bbb0a918c47 100644
--- a/x11/libgnome/files/patch-bd
+++ b/x11/libgnome/files/patch-bd
@@ -1,16 +1,16 @@
---- libgnomeui/Makefile.in.orig	Wed Apr  7 21:34:11 1999
-+++ libgnomeui/Makefile.in	Fri Apr 30 17:30:51 1999
+--- libgnomeui/Makefile.in.orig	Fri Aug 20 15:01:47 1999
++++ libgnomeui/Makefile.in	Fri Aug 20 16:30:38 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 41:1:9 -rpath $(libdir)
+-libgnomeui_la_LDFLAGS = -version-info 42:1:10 -rpath $(libdir)
 +libgnomeui_la_LDFLAGS = -version-info 2:0:0 -rpath $(libdir)
  libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS)
  
  gnome_segv_LDADD =  	libgnomeui.la 						$(top_builddir)/libgnome/libgnome.la 			$(top_builddir)/libart_lgpl/libart_lgpl.la 		@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) 	$(INTLLIBS)
-@@ -258,7 +258,7 @@
- gnome-startup.lo gnome-stock.lo gnome-winhints.lo \
+@@ -260,7 +260,7 @@
+ gnome-spell.lo gnome-startup.lo gnome-stock.lo gnome-winhints.lo \
  gnome-paper-selector.lo gnome-procbar.lo gnometypes.lo gtkcauldron.lo \
  gtk-clock.lo gtk-ted.lo gtkdial.lo gtkpixmapmenuitem.lo
 -PROGRAMS =  $(bin_PROGRAMS) $(noinst_PROGRAMS)
diff --git a/x11/libgnome/files/patch-be b/x11/libgnome/files/patch-be
index 478ed9ab2813..b456d321518f 100644
--- a/x11/libgnome/files/patch-be
+++ b/x11/libgnome/files/patch-be
@@ -1,10 +1,10 @@
---- 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/Makefile.in.orig	Fri Aug 20 15:01:58 1999
++++ libgnorba/Makefile.in	Fri Aug 20 16:31:21 1999
+@@ -184,7 +184,7 @@
+ libgnorbainclude_HEADERS =  	gnorba.h 						gnome-factory.h						gnome-unknown.h						Table.h
  
  
--libgnorba_la_LDFLAGS = -version-info 28:5:1 -rpath $(libdir)
+-libgnorba_la_LDFLAGS = -version-info 28:7:1 -rpath $(libdir)
 +libgnorba_la_LDFLAGS = -version-info 2:0:0 -rpath $(libdir)
  libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm
  
diff --git a/x11/libgnome/files/patch-bg b/x11/libgnome/files/patch-bg
index 5a793e0dd1c7..1148e39c3f37 100644
--- a/x11/libgnome/files/patch-bg
+++ b/x11/libgnome/files/patch-bg
@@ -1,5 +1,5 @@
---- zvt/Makefile.in.orig	Wed Apr 28 02:58:32 1999
-+++ zvt/Makefile.in	Sat May  8 22:50:50 1999
+--- zvt/Makefile.in.orig	Fri Aug 20 15:01:56 1999
++++ zvt/Makefile.in	Fri Aug 20 16:32:31 1999
 @@ -20,7 +20,7 @@
  exec_prefix = @exec_prefix@
  
@@ -9,16 +9,16 @@
  libexecdir = @libexecdir@
  datadir = @datadir@
  sysconfdir = @sysconfdir@
-@@ -160,7 +160,7 @@
+@@ -159,7 +159,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:3:2 -rpath $(libdir)
+-libzvt_la_LDFLAGS = -version-info 4:5:2 -rpath $(libdir)
 +libzvt_la_LDFLAGS = -version-info 2:0:0 -rpath $(libdir)
  
  libzvtinclude_HEADERS =  	lists.h				vt.h				vtx.h				zvtterm.h
  
-@@ -200,7 +200,7 @@
+@@ -199,7 +199,7 @@
  libzvt_la_LIBADD = 
  libzvt_la_OBJECTS =  gnome-login-support.lo lists.lo subshell.lo \
  update.lo vt.lo zvtterm.lo
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index 56dd10dbbc6b..9febeca9f6c8 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -49,9 +49,11 @@ include/libart_lgpl/art_rgb_rgba_affine.h
 include/libart_lgpl/art_rgb_svp.h
 include/libart_lgpl/art_svp.h
 include/libart_lgpl/art_svp_ops.h
+include/libart_lgpl/art_svp_point.h
 include/libart_lgpl/art_svp_render_aa.h
 include/libart_lgpl/art_svp_vpath.h
 include/libart_lgpl/art_svp_vpath_stroke.h
+include/libart_lgpl/art_svp_wind.h
 include/libart_lgpl/art_uta.h
 include/libart_lgpl/art_uta_ops.h
 include/libart_lgpl/art_uta_rect.h
@@ -59,6 +61,7 @@ include/libart_lgpl/art_uta_svp.h
 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_dash.h
 include/libart_lgpl/art_vpath_svp.h
 include/libgnome/gnome-config.h
 include/libgnome/gnome-defs.h
@@ -110,6 +113,11 @@ include/libgnomeui/gnome-dock-band.h
 include/libgnomeui/gnome-dock-item.h
 include/libgnomeui/gnome-dock-layout.h
 include/libgnomeui/gnome-dock.h
+include/libgnomeui/gnome-druid.h
+include/libgnomeui/gnome-druid-page.h
+include/libgnomeui/gnome-druid-page-start.h
+include/libgnomeui/gnome-druid-page-standard.h
+include/libgnomeui/gnome-druid-page-finish.h
 include/libgnomeui/gnome-entry.h
 include/libgnomeui/gnome-file-entry.h
 include/libgnomeui/gnome-font-picker.h
@@ -155,9 +163,9 @@ include/libgnomeui/gtkcauldron.h
 include/libgnomeui/gtkdial.h
 include/libgnomeui/gtkpixmapmenuitem.h
 include/libgnomeui/libgnomeui.h
-include/libgnorba/GnomeObject.h
 include/libgnorba/Table.h
 include/libgnorba/gnome-factory.h
+include/libgnorba/gnome-unknown.h
 include/libgnorba/gnorba.h
 include/popt-gnome.h
 include/zvt/lists.h
@@ -192,14 +200,30 @@ lib/libzvt.so.2
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/aclocal/libart.m4
 share/gnome/gtkrc
+share/gnome/gtkrc.el
+share/gnome/gtkrc.eo
+share/gnome/gtkrc.he
+share/gnome/gtkrc.hy
 share/gnome/gtkrc.ja
 share/gnome/gtkrc.ko
 share/gnome/gtkrc.ru
+share/gnome/gtkrc.tr
+share/gnome/gtkrc.th
+share/gnome/gtkrc.uk
+share/gnome/gtkrc.iso88592
+share/gnome/gtkrc.iso88595
+share/gnome/gtkrc.zh_CN
+share/gnome/gtkrc.zh_TW.Big5
+share/gnome/gtkrc.ka_GE.georgianacademy
+share/gnome/gtkrc.ka_GE.georgianps
+share/gnome/gtkrc.vi_VN.tcvn
+share/gnome/gtkrc.vi_VN.viscii
 share/gnome/idl/GnomeObject.idl
 share/gnome/idl/Table.idl
-share/gnome/idl/gnome-editor.idl
+share/gnome/idl/desktop-editor.idl
+share/gnome/idl/desktop-textviewer.idl
 share/gnome/idl/gnome-factory.idl
-share/gnome/idl/gnome-file.idl
+share/gnome/idl/gnome-unknown.idl
 share/gnome/idl/name-service.idl
 share/gnome/mime-info/gnome.mime
 share/gnome/pixmaps/calculator-font.png
@@ -217,11 +241,14 @@ share/locale/ca/LC_MESSAGES/gnome-libs.mo
 share/locale/cs/LC_MESSAGES/gnome-libs.mo
 share/locale/da/LC_MESSAGES/gnome-libs.mo
 share/locale/de/LC_MESSAGES/gnome-libs.mo
+share/locale/el/LC_MESSAGES/gnome-libs.mo
+share/locale/en_GB/LC_MESSAGES/gnome-libs.mo
 share/locale/es/LC_MESSAGES/gnome-libs.mo
 share/locale/eu/LC_MESSAGES/gnome-libs.mo
 share/locale/fi/LC_MESSAGES/gnome-libs.mo
 share/locale/fr/LC_MESSAGES/gnome-libs.mo
 share/locale/ga/LC_MESSAGES/gnome-libs.mo
+share/locale/hr/LC_MESSAGES/gnome-libs.mo
 share/locale/hu/LC_MESSAGES/gnome-libs.mo
 share/locale/it/LC_MESSAGES/gnome-libs.mo
 share/locale/ja/LC_MESSAGES/gnome-libs.mo
@@ -231,8 +258,10 @@ share/locale/no/LC_MESSAGES/gnome-libs.mo
 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/sk/LC_MESSAGES/gnome-libs.mo
 share/locale/sv/LC_MESSAGES/gnome-libs.mo
 share/locale/wa/LC_MESSAGES/gnome-libs.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/gnome-libs.mo
 @exec mkdir -p %D/share/gnome/games
 @dirrm etc/sound/events
 @dirrm etc/sound