Upgrade to GNOME 1.0. The following are the details:

 ports/audio/esound			0.2.7    ->  0.2.8	PR ports/10422
 ports/audio/gnomeaudio			0.99.8   ->  1.0.0	PR ports/10426
 ports/audio/libaudiofile		0.1.5    ->  0.1.6	PR ports/10421
 ports/deskutils/gnomepim		0.99.8.1 ->  1.0.1	PR ports/10435
 ports/devel/ORBit			0.3.98   ->  0.4.0	PR ports/10423
 ports/devel/gettext			shared libs now		PR ports/10293
 ports/devel/glib12			1.1.16   ->  1.2.0	PR ports/10419
 ports/devel/libgtop			0.99.8   ->  1.0.1	PR ports/10430
 ports/games/gnomegames			0.99.8   ->  1.0.1	PR ports/10436
 ports/graphics/electriceyes		distfile moved		PR ports/10437
 ports/graphics/imlib			1.9.3    ->  1.9.4	PR ports/10424
 ports/lang/gnomeobjc			0.99.3   ->  1.0.1	PR ports/10441
 ports/math/gnumeric			0.6      ->  0.15	PR ports/10439
 ports/misc/gnomeutils			0.99.5   ->  1.0.1	PR ports/10442
 ports/sysutils/gnomeadmin		0.99.1   ->  1.0.1	PR ports/10445
 ports/sysutils/gnomecontrolcenter	0.99.3.1 ->  1.0.1	PR ports/10446
 ports/sysutils/gtop			0.99.2   ->  1.0.1	PR ports/10477
 ports/textproc/libxml			0.99.8   ->  1.0.0	PR ports/10438
 ports/www/libghttp			distfile moved		PR ports/10429
 ports/x11/gnome			0.99.3   ->  1.0.0	PR ports/10450
 ports/x11/gnomecore			0.99.8.1 ->  1.0.1	PR ports/10432
 ports/x11/gnomelibs			0.99.8.1 ->  1.0.1	PR ports/10425
 ports/x11-fm/gnomemc			4.5.10   ->  4.5.23	PR ports/10448
 ports/x11-toolkits/gtk-engines		0.1      ->  0.5	PR ports/10427
 ports/x11-toolkits/gtk12		1.1.6    ->  1.2.0	PR ports/10420

Note that repository copies were made before this commit, as follows:

 ports/devel/glib11-devel       -> ports/devel/glib12
 ports/x11-toolkits/gtk11-devel -> ports/x11-toolkits/gtk12

Submitted by:	Jeremy Lea <reg@shale.csir.co.za>

5 files changed, 74 insertions, 90 deletions

diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 61e7c65fd0fd..39dccdb790ba 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	gnomelibs
-# Version required:			0.99.8.1
+# Version required:			1.0.1
 # Date created:				17 June 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.31 1999/02/01 20:58:45 vanilla Exp $
+# $Id: Makefile,v 1.32 1999/02/18 17:53:23 vanilla Exp $
 #
 
-DISTNAME=	gnome-libs-0.99.8.1
-PKGNAME=	gnomelibs-0.99.8.1
+DISTNAME=	gnome-libs-1.0.1
+PKGNAME=	gnomelibs-1.0.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-libs
+MASTER_SITE_SUBDIR=	gnome-1.0/sources
 
 MAINTAINER=	nacai@iname.com
 
@@ -20,7 +20,7 @@ LIB_DEPENDS=	gdk_imlib.2:${PORTSDIR}/graphics/imlib \
 		esd.1:${PORTSDIR}/audio/esound
 
 # implicit dependencies:
-# gettext, gtk11-devel, tiff34, jpeg, giflib, png
+# gettext, gtk12, tiff34, jpeg, giflib, png
 
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
@@ -30,9 +30,9 @@ CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--disable-gnome-hello \
 		--disable-test-gnome
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \
-		-I${X11BASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
+			-I${LOCALBASE}/include/giflib" \
+		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
 
 post-install:
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index f7e1fd302f48..455cc546ff06 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1 +1 @@
-MD5 (gnome-libs-0.99.8.1.tar.gz) = 1f11250f9fd5c9632e1b0e920d250d31
+MD5 (gnome-libs-1.0.1.tar.gz) = ec15a4281426ea664d501edc3fdba47f
diff --git a/x11/libgnome/files/patch-aa b/x11/libgnome/files/patch-aa
index cfa5a37c0dc2..02ba2b3b8c3c 100644
--- a/x11/libgnome/files/patch-aa
+++ b/x11/libgnome/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Tue Feb 16 00:40:19 1999
-+++ configure	Fri Feb 19 00:19:26 1999
-@@ -5137,7 +5137,7 @@
+--- configure.orig	Mon Mar  1 21:51:08 1999
++++ configure	Sat Mar  6 13:33:05 1999
+@@ -5149,7 +5149,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -9,59 +9,17 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -6747,7 +6747,7 @@
+@@ -7233,7 +7233,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff -ljpeg -lz -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 6753 "configure"
+ #line 7239 "configure"
  #include "confdefs.h"
-@@ -7001,16 +7001,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:7007: 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:7007: 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 7012 "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:7017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -7077,16 +7077,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:7083: 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:7083: 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 7088 "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:7093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -10218,7 +10218,7 @@
- ZVT_LIBS="-lzvt $GTK_LIBS"
+@@ -10704,7 +10704,7 @@
+ ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS"
  
  GNOME_LIBDIR='-L${libdir}'
 -GNOME_INCLUDEDIR='-I${includedir} -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include'
@@ -69,3 +27,14 @@
  GNOME_IDLDIR='-I${datadir}/idl'
  
  
+@@ -11548,10 +11548,6 @@
+       *) # Relative path.
+         ac_sub_cache_file="$ac_dots$cache_file" ;;
+       esac
+-  case "$ac_given_INSTALL" in
+-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
+-        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+-        esac
+ 
+       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+       # The eval makes quoting arguments work.
diff --git a/x11/libgnome/files/patch-ac b/x11/libgnome/files/patch-ac
index 91dbb7fa8ed8..be621cf51bcc 100644
--- a/x11/libgnome/files/patch-ac
+++ b/x11/libgnome/files/patch-ac
@@ -1,42 +1,49 @@
---- gnome-config.in.orig	Wed Jan 13 07:42:48 1999
-+++ gnome-config.in	Fri Jan 15 00:02:56 1999
-@@ -41,18 +41,18 @@
+--- gnome-config.in.orig	Mon Feb 15 20:05:33 1999
++++ gnome-config.in	Tue Mar  2 09:00:51 1999
+@@ -43,25 +43,25 @@
  
  Known values for LIBRARY are:
  
 -    glib	(calls glib-config)
-+    glib11d	(calls glib11d-config)
++    glib	(calls glib12-config)
      idl         (to be used with orbit-idl)
      gnome
      gnomeui
      gnorba
 -    gtk		(calls gtk-config)
-+    gtk11d		(calls gtk11d-config)
++    gtk		(calls gtk12-config)
      gtkxmhtml	(only --libs)
      zvt		(only --libs)
  
  If LIBRARY is none of these,
      
 -    ${libdir}/<LIBRARY>Conf.sh
-+    ${datadir}/<LIBRARY>Conf.sh
++    ${sysconfdir}/<LIBRARY>Conf.sh
+ 
+ is looked in for the necessary information.  Those currently installed 
+ appear to be:
  
- is looked in for the necessary information. 
  EOF
-@@ -114,33 +114,33 @@
+ 
+-    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,36 +146,36 @@
  	usage 1
  	;;
      glib)
 -	the_libs="$the_libs `glib-config --libs`"
 -	the_flags="$the_flags `glib-config --cflags`"
-+	the_libs="$the_libs `glib11d-config --libs`"
-+	the_flags="$the_flags `glib11d-config --cflags`"
++	the_libs="$the_libs `glib12-config --libs`"
++	the_flags="$the_flags `glib12-config --cflags`"
  	;;
--    gtk)
+     gtk)
 -	the_libs="$the_libs `gtk-config --libs`"
 -	the_flags="$the_flags `gtk-config --cflags`"
-+    gtk11)
-+	the_libs="$the_libs `gtk11d-config --libs`"
-+	the_flags="$the_flags `gtk11d-config --cflags`"
++	the_libs="$the_libs `gtk12-config --libs`"
++	the_flags="$the_flags `gtk12-config --cflags`"
  	;;
      gnome)
 -       	the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@"
@@ -65,4 +72,8 @@
 +	the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@ -lintl"
  	;;
      *)
- 	cnf_sh=${libdir}/${1}Conf.sh
+-	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/pkg-plist b/x11/libgnome/pkg-plist
index 5ac61c20790c..021e4eabd18b 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -9,6 +9,8 @@ bin/goad-browser
 bin/libart-config
 bin/loadshlib
 bin/new-object
+etc/gnomeConf.sh
+etc/libartConf.sh
 etc/mime-magic
 etc/mime-magic.dat
 etc/paper.config
@@ -16,7 +18,6 @@ etc/sound/events/gnome.soundlist
 etc/sound/events/gtk-events.soundlist
 include/gnome.h
 include/gnomesupport.h
-include/popt-gnome.h
 include/gtk-xmhtml/HTML.h
 include/gtk-xmhtml/XmHTML.h
 include/gtk-xmhtml/XmHTMLI.h
@@ -32,8 +33,8 @@ include/libart_lgpl/art_filterlevel.h
 include/libart_lgpl/art_gray_svp.h
 include/libart_lgpl/art_misc.h
 include/libart_lgpl/art_pathcode.h
-include/libart_lgpl/art_point.h
 include/libart_lgpl/art_pixbuf.h
+include/libart_lgpl/art_point.h
 include/libart_lgpl/art_rect.h
 include/libart_lgpl/art_rect_svp.h
 include/libart_lgpl/art_rect_uta.h
@@ -152,6 +153,7 @@ include/libgnomeui/gtkpixmapmenuitem.h
 include/libgnomeui/libgnomeui.h
 include/libgnorba/gnome-factory.h
 include/libgnorba/gnorba.h
+include/popt-gnome.h
 include/zvt/lists.h
 include/zvt/vt.h
 include/zvt/vtx.h
@@ -190,15 +192,14 @@ 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
-share/gnome/gnomeConf.sh
 share/gnome/gtkrc
 share/gnome/gtkrc.ja
 share/gnome/gtkrc.ko
+share/gnome/gtkrc.ru
 share/gnome/idl/Table.idl
 share/gnome/idl/base.idl
 share/gnome/idl/gnome-factory.idl
 share/gnome/idl/name-service.idl
-share/gnome/libartConf.sh
 share/gnome/mime-info/gnome.mime
 share/gnome/pixmaps/calculator-font.png
 share/gnome/pixmaps/gnome-default-dlg.png
@@ -208,6 +209,8 @@ share/gnome/pixmaps/gnome-question.png
 share/gnome/pixmaps/gnome-warning.png
 share/gnome/pixmaps/no.xpm
 share/gnome/pixmaps/yes.xpm
+share/gnome/type-convert/gnome-make-postscript-mimes
+share/gnome/type-convert/postscript.convert
 share/gnome/type-convert/type.convert
 share/locale/ca/LC_MESSAGES/gnome-libs.mo
 share/locale/cs/LC_MESSAGES/gnome-libs.mo
@@ -227,17 +230,18 @@ 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
-@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
+@exec mkdir -p %D/share/gnome/games
 @dirrm share/gnome/type-convert
+@dirrm share/gnome/pixmaps
+@dirrm share/gnome/mime-info
+@dirrm share/gnome/idl
+@dirrm share/gnome/games
 @dirrm share/gnome
+@dirrm include/zvt
+@dirrm include/libgnorba
+@dirrm include/libgnomeui
+@dirrm include/libgnome
+@dirrm include/libart_lgpl
+@dirrm include/gtk-xmhtml
+@dirrm etc/sound/events
+@dirrm etc/sound