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>
author: Jacques Vidrine <nectar@FreeBSD.org> 1999-03-09 01:13:40 +0000
committer: Jacques Vidrine <nectar@FreeBSD.org> 1999-03-09 01:13:40 +0000
commit: f4442a7aa7d134c8de8574845b26edddcac65935 (patch)
tree: 0f55c576fb88ce09083373c32ab8312529d29dc5 /x11
parent: Upgrade to strobe 1.05 (diff)
22 files changed, 600 insertions, 629 deletions
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 61e7c65fd0fd..39dccdb790ba 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/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/gnome-libs/distinfo b/x11/gnome-libs/distinfo
index f7e1fd302f48..455cc546ff06 100644
--- a/x11/gnome-libs/distinfo
+++ b/x11/gnome-libs/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/gnome-libs/files/patch-aa b/x11/gnome-libs/files/patch-aa
index cfa5a37c0dc2..02ba2b3b8c3c 100644
--- a/x11/gnome-libs/files/patch-aa
+++ b/x11/gnome-libs/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/gnome-libs/files/patch-ac b/x11/gnome-libs/files/patch-ac
index 91dbb7fa8ed8..be621cf51bcc 100644
--- a/x11/gnome-libs/files/patch-ac
+++ b/x11/gnome-libs/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/gnome-libs/pkg-plist b/x11/gnome-libs/pkg-plist
index 5ac61c20790c..021e4eabd18b 100644
--- a/x11/gnome-libs/pkg-plist
+++ b/x11/gnome-libs/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
diff --git a/x11/gnome/Makefile b/x11/gnome/Makefile
index dd818ad0312a..a7a5eacf7bc4 100644
--- a/x11/gnome/Makefile
+++ b/x11/gnome/Makefile
@@ -1,29 +1,29 @@
 # New ports collection makefile for:	gnome
-# Version required:	0.99.3
+# Version required:	1.0.0
 # Date created:		17 Aug 1998
 # Whom:			Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.3 1999/01/20 22:11:43 vanilla Exp $
+# $Id: Makefile,v 1.4 1999/01/21 06:10:09 jkh Exp $
 #
 
-DISTNAME=	gnome-0.99.3
-CATEGORIES=	x11
+DISTNAME=	gnome-1.0.0
+CATEGORIES=	x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
 MAINTAINER=	nacai@iname.com
 
-LIB_DEPENDS=	gnome.1:${PORTSDIR}/x11/gnomelibs \
-		panel_applet.1:${PORTSDIR}/x11/gnomecore \
-		gdkcardimage.1:${PORTSDIR}/games/gnomegames \
-		gnomeprint.0:${PORTSDIR}/print/gnomeprint
-#		gxsnmp.1:${PORTSDIR}/sysutils/gnomeadmin
-RUN_DEPENDS=	gcalc:${PORTSDIR}/misc/gnomeutils \
+RUN_DEPENDS=	gtcd:${PORTSDIR}/audio/gnomemedia \
+		gnomecard:${PORTSDIR}/deskutils/gnomepim \
+		gnomine:${PORTSDIR}/games/gnomegames \
 		ElectricEyes:${PORTSDIR}/graphics/electriceyes \
-		gtop:${PORTSDIR}/sysutils/gtop \
+		gnumeric:${PORTSDIR}/math/gnumeric \
+		gcalc:${PORTSDIR}/misc/gnomeutils \
+		gtalk:${PORTSDIR}/net/gnomenetwork \
+		gulp:${PORTSDIR}/sysutils/gnomeadmin \
 		gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter \
-		gnomecard:${PORTSDIR}/deskutils/gnomepim \
-		gnumeric:${PORTSDIR}/math/gnumeric
+		gtop:${PORTSDIR}/sysutils/gtop \
+		gmc:${PORTSDIR}/x11-fm/gnomemc
 
 EXTRACT_ONLY=	# empty
 NO_BUILD=	yes
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index dd818ad0312a..a7a5eacf7bc4 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -1,29 +1,29 @@
 # New ports collection makefile for:	gnome
-# Version required:	0.99.3
+# Version required:	1.0.0
 # Date created:		17 Aug 1998
 # Whom:			Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.3 1999/01/20 22:11:43 vanilla Exp $
+# $Id: Makefile,v 1.4 1999/01/21 06:10:09 jkh Exp $
 #
 
-DISTNAME=	gnome-0.99.3
-CATEGORIES=	x11
+DISTNAME=	gnome-1.0.0
+CATEGORIES=	x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
 MAINTAINER=	nacai@iname.com
 
-LIB_DEPENDS=	gnome.1:${PORTSDIR}/x11/gnomelibs \
-		panel_applet.1:${PORTSDIR}/x11/gnomecore \
-		gdkcardimage.1:${PORTSDIR}/games/gnomegames \
-		gnomeprint.0:${PORTSDIR}/print/gnomeprint
-#		gxsnmp.1:${PORTSDIR}/sysutils/gnomeadmin
-RUN_DEPENDS=	gcalc:${PORTSDIR}/misc/gnomeutils \
+RUN_DEPENDS=	gtcd:${PORTSDIR}/audio/gnomemedia \
+		gnomecard:${PORTSDIR}/deskutils/gnomepim \
+		gnomine:${PORTSDIR}/games/gnomegames \
 		ElectricEyes:${PORTSDIR}/graphics/electriceyes \
-		gtop:${PORTSDIR}/sysutils/gtop \
+		gnumeric:${PORTSDIR}/math/gnumeric \
+		gcalc:${PORTSDIR}/misc/gnomeutils \
+		gtalk:${PORTSDIR}/net/gnomenetwork \
+		gulp:${PORTSDIR}/sysutils/gnomeadmin \
 		gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter \
-		gnomecard:${PORTSDIR}/deskutils/gnomepim \
-		gnumeric:${PORTSDIR}/math/gnumeric
+		gtop:${PORTSDIR}/sysutils/gtop \
+		gmc:${PORTSDIR}/x11-fm/gnomemc
 
 EXTRACT_ONLY=	# empty
 NO_BUILD=	yes
diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile
index 8012cd447da5..074755689656 100644
--- a/x11/gnomecore/Makefile
+++ b/x11/gnomecore/Makefile
@@ -1,20 +1,20 @@
 # New ports collection makefile for:	gnomecore
-# Version required:			0.99.8.1
+# Version required:			1.0.1
 # Date created:				17 March 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.17 1999/02/02 08:30:21 vanilla Exp $
+# $Id: Makefile,v 1.18 1999/02/19 04:26:33 vanilla Exp $
 #
 
-DISTNAME=	gnome-core-0.99.8.1
-PKGNAME=	gnomecore-0.99.8.1
+DISTNAME=	gnome-core-1.0.1
+PKGNAME=	gnomecore-1.0.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-core
+MASTER_SITE_SUBDIR=	gnome-1.0/sources
 
 MAINTAINER=	nacai@iname.com
 
-RUN_DEPENDS=	${X11BASE}/share/gnome/sounds/duck.wav:${PORTSDIR}/audio/gnomeaudio
+RUN_DEPENDS=	${X11BASE}/share/gnome/sounds/startup.wav:${PORTSDIR}/audio/gnomeaudio
 LIB_DEPENDS=	gtop.1:${PORTSDIR}/devel/libgtop \
 		ghttp.0:${PORTSDIR}/www/libghttp
 
@@ -28,16 +28,10 @@ CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-gnome=${X11BASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
+		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
 
 post-install:
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-	chown root.kmem ${PREFIX}/bin/cpumemusage_applet
-	chown root.kmem ${PREFIX}/bin/diskusage_applet
-	chown root.kmem ${PREFIX}/bin/multiload_applet
-	chmod 2555 ${PREFIX}/bin/cpumemusage_applet
-	chmod 2555 ${PREFIX}/bin/diskusage_applet
-	chmod 2555 ${PREFIX}/bin/multiload_applet
 
 .include <bsd.port.mk>
diff --git a/x11/gnomecore/distinfo b/x11/gnomecore/distinfo
index 4dbf7775d069..01226fad42fa 100644
--- a/x11/gnomecore/distinfo
+++ b/x11/gnomecore/distinfo
@@ -1 +1 @@
-MD5 (gnome-core-0.99.8.1.tar.gz) = 927e5ffaaba7a8fd5cd1b55be993d5b0
+MD5 (gnome-core-1.0.1.tar.gz) = 9ce27fa72576f0dc3291ec8d5c71b96f
diff --git a/x11/gnomecore/files/patch-aa b/x11/gnomecore/files/patch-aa
index 32da72ad6ce5..b46bf15f1c0b 100644
--- a/x11/gnomecore/files/patch-aa
+++ b/x11/gnomecore/files/patch-aa
@@ -1,25 +1,6 @@
---- configure.orig	Tue Feb 16 01:45:51 1999
-+++ configure	Fri Feb 19 03:41:47 1999
-@@ -1133,13 +1133,13 @@
- 	    fi
- 	
- 	    if test "$no_gnome_config" = "yes"; then
--              echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
--echo "configure:1138: checking for gnomeConf.sh file in $gnome_prefix" >&5
--	      if test -f $gnome_prefix/gnomeConf.sh; then
-+              echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
-+echo "configure:1138: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
-+	      if test -f $prefix/share/gnome/gnomeConf.sh; then
- 	        echo "$ac_t""found" 1>&6
- 	        echo "loading gnome configuration from" \
--		     "$gnome_prefix/gnomeConf.sh"
--	        . $gnome_prefix/gnomeConf.sh
-+		     "$prefix/share/gnome/gnomeConf.sh"
-+	        . $prefix/share/gnome/gnomeConf.sh
- 	        
- 	      else
- 	        echo "$ac_t""not found" 1>&6
-@@ -5071,7 +5071,7 @@
+--- configure.orig	Sun Feb 28 23:24:44 1999
++++ configure	Tue Mar  2 19:12:49 1999
+@@ -5076,7 +5076,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -28,7 +9,7 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -5333,7 +5333,7 @@
+@@ -5338,7 +5338,7 @@
  		 USE_INCLUDED_LIBINTL=yes
  		 CATOBJEXT=.cat
  		 INSTOBJEXT=.cat
@@ -37,3 +18,11 @@
  		 INTLDEPS='$(top_builddir)/intl/libintl.a'
  		 INTLLIBS=$INTLDEPS
  		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+@@ -6247,6 +6247,7 @@
+ case "$host" in
+ *linux*) CDROM_HOST=linux;;
+ *solaris*) CDROM_HOST=solaris;;
++*freebsd*) CDROM_HOST=freebsd;;
+ esac
+ 
+ 
diff --git a/x11/gnomecore/files/patch-ae b/x11/gnomecore/files/patch-ae
index 320b3643a70b..464ef2979f01 100644
--- a/x11/gnomecore/files/patch-ae
+++ b/x11/gnomecore/files/patch-ae
@@ -1,7 +1,18 @@
---- applets/asclock/Makefile.in.orig	Mon Feb  1 07:46:49 1999
-+++ applets/asclock/Makefile.in	Tue Feb  2 05:58:39 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/Makefile.in.orig	Tue Mar  2 01:53:28 1999
++++ applets/Makefile.in	Sat Mar  6 17:59:43 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+ 
+-always_built_SUBDIRS = applet-dirs gen_util asclock 	 fish dialer webcontrol 	 drivemount clockmail fifteen battery charpick 	 gnome-pager mini-commander gkb jbc
++always_built_SUBDIRS = applet-dirs gen_util asclock 	 fish dialer webcontrol 	clockmail fifteen battery charpick 	 gnome-pager mini-commander gkb jbc
+ 
+ @FALSE_TRUE@@HAVE_LIBESD_TRUE@esdmanager = esd-manager
+ @FALSE_TRUE@@HAVE_LIBESD_FALSE@esdmanager = 
+--- applets/asclock/Makefile.in.orig	Tue Mar  2 01:53:34 1999
++++ applets/asclock/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
  l = @l@
  
 -INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../panel					-I$(top_builddir)/panel					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)			-DVERSION=\""$(VERSION)"\"
@@ -9,10 +20,10 @@
  
  
  bin_PROGRAMS = asclock_applet
---- applets/battery/Makefile.in.orig	Mon Feb  1 07:47:01 1999
-+++ applets/battery/Makefile.in	Tue Feb  2 05:58:56 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/battery/Makefile.in.orig	Tue Mar  2 01:54:01 1999
++++ applets/battery/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
  l = @l@
  
 -INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl 	-I$(top_builddir)/intl		-I$(top_builddir)/panel		-I$(srcdir)/../../panel					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)
@@ -20,10 +31,10 @@
  
  
  bin_PROGRAMS = battery_applet
---- applets/cdplayer/Makefile.in.orig	Mon Feb  1 07:47:23 1999
-+++ applets/cdplayer/Makefile.in	Tue Feb  2 05:59:18 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/cdplayer/Makefile.in.orig	Tue Mar  2 01:54:53 1999
++++ applets/cdplayer/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
  l = @l@
  
 -INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(top_builddir)/panel 	-I$(srcdir)/../../panel					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)
@@ -31,10 +42,10 @@
  
  
  bin_PROGRAMS = cdplayer_applet
---- applets/charpick/Makefile.in.orig	Mon Feb  1 07:47:03 1999
-+++ applets/charpick/Makefile.in	Tue Feb  2 05:59:36 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/charpick/Makefile.in.orig	Tue Mar  2 01:54:05 1999
++++ applets/charpick/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
  l = @l@
  
 -INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(top_builddir)/panel 	-I$(srcdir)/../../panel					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)
@@ -42,10 +53,10 @@
  
  
  bin_PROGRAMS = charpick_applet
---- applets/clockmail/Makefile.in.orig	Mon Feb  1 07:46:58 1999
-+++ applets/clockmail/Makefile.in	Tue Feb  2 05:59:54 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/clockmail/Makefile.in.orig	Tue Mar  2 01:53:53 1999
++++ applets/clockmail/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
  l = @l@
  
 -INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../panel					-I$(top_builddir)/panel 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)
@@ -53,10 +64,10 @@
  
  
  bin_PROGRAMS = clockmail_applet
---- applets/cpumemusage/Makefile.in.orig	Mon Feb  1 07:47:14 1999
-+++ applets/cpumemusage/Makefile.in	Tue Feb  2 06:00:13 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/cpumemusage/Makefile.in.orig	Tue Mar  2 01:54:37 1999
++++ applets/cpumemusage/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
  l = @l@
  
 -INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../panel					-I$(top_builddir)/panel 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)			-I$(LIBGTOP_INCS)
@@ -64,10 +75,10 @@
  
  
  bin_PROGRAMS = cpumemusage_applet
---- applets/dialer/Makefile.in.orig	Mon Feb  1 07:46:52 1999
-+++ applets/dialer/Makefile.in	Tue Feb  2 06:00:34 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/dialer/Makefile.in.orig	Tue Mar  2 01:53:41 1999
++++ applets/dialer/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
  l = @l@
  
 -INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../panel					-I$(top_builddir)/panel 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)			-DVERSION=\""$(VERSION)"\"
@@ -75,10 +86,10 @@
  
  
  bin_PROGRAMS = dialer_applet
---- applets/diskusage/Makefile.in.orig	Mon Feb  1 07:47:15 1999
-+++ applets/diskusage/Makefile.in	Tue Feb  2 06:00:51 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/diskusage/Makefile.in.orig	Tue Mar  2 01:54:40 1999
++++ applets/diskusage/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
  l = @l@
  
 -INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../panel					-I$(top_builddir)/panel 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS)
@@ -86,10 +97,10 @@
  
  
  bin_PROGRAMS = diskusage_applet
---- applets/drivemount/Makefile.in.orig	Mon Feb  1 07:46:56 1999
-+++ applets/drivemount/Makefile.in	Tue Feb  2 06:01:10 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/drivemount/Makefile.in.orig	Tue Mar  2 01:53:49 1999
++++ applets/drivemount/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
  l = @l@
  
 -INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../panel					-I$(top_builddir)/panel 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)
@@ -97,10 +108,10 @@
  
  
  bin_PROGRAMS = drivemount_applet
---- applets/esd-manager/Makefile.in.orig	Mon Feb  1 07:47:12 1999
-+++ applets/esd-manager/Makefile.in	Tue Feb  2 06:01:26 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/esd-manager/Makefile.in.orig	Tue Mar  2 01:54:35 1999
++++ applets/esd-manager/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
  l = @l@
  
 -INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../panel					-I$(top_builddir)/panel 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR) $(shell esd-config --cflags)
@@ -108,10 +119,10 @@
  
  
  bin_PROGRAMS = esdmanager_applet
---- applets/fifteen/Makefile.in.orig	Mon Feb  1 07:46:59 1999
-+++ applets/fifteen/Makefile.in	Tue Feb  2 06:01:43 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/fifteen/Makefile.in.orig	Tue Mar  2 01:53:57 1999
++++ applets/fifteen/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
  l = @l@
  
 -INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../panel					-I$(top_builddir)/panel 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)
@@ -119,10 +130,10 @@
  
  
  bin_PROGRAMS = fifteen_applet
---- applets/fish/Makefile.in.orig	Mon Feb  1 07:46:51 1999
-+++ applets/fish/Makefile.in	Tue Feb  2 06:01:58 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/fish/Makefile.in.orig	Tue Mar  2 01:53:38 1999
++++ applets/fish/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
  l = @l@
  
 -INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../panel					-I$(top_builddir)/panel 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)
@@ -130,21 +141,24 @@
  
  
  #if DO_EXE
---- applets/fvwm-pager/Makefile.in.orig	Mon Feb  1 07:47:32 1999
-+++ applets/fvwm-pager/Makefile.in	Tue Feb  2 06:02:15 1999
-@@ -151,7 +151,7 @@
+--- applets/fvwm-pager/Makefile.in.orig	Tue Mar  2 01:55:08 1999
++++ applets/fvwm-pager/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -153,9 +153,9 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
  
- Utilitiesdir = $(datadir)/apps/Utilities
+-Utilitiesdir = $(datadir)/gnome/apps/Utilities
++Utilitiesdir = $(datadir)/apps/Utilities
  
 -INCLUDES =  	-Dsafemalloc=g_malloc                           	-I. -I$(srcdir)                                 	-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../../panel				-I$(top_builddir)/panel 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)
 +INCLUDES =  	-Dsafemalloc=g_malloc                           	-I. -I$(srcdir)                                 	-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../../panel				-I$(top_builddir)/panel 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)
  
  
  bin_PROGRAMS = fvwm-pager
---- applets/gen_util/Makefile.in.orig	Mon Feb  1 07:46:46 1999
-+++ applets/gen_util/Makefile.in	Tue Feb  2 06:07:49 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/gen_util/Makefile.in.orig	Tue Mar  2 01:53:32 1999
++++ applets/gen_util/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
  l = @l@
  
 -INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../panel					-I$(top_builddir)/panel					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)
@@ -152,9 +166,9 @@
  
  
  bin_PROGRAMS = gen_util_applet
---- applets/gkb/Makefile.in.orig	Fri Feb 19 03:47:32 1999
-+++ applets/gkb/Makefile.in	Fri Feb 19 03:47:52 1999
-@@ -152,7 +152,7 @@
+--- applets/gkb/Makefile.in.orig	Tue Mar  2 01:54:21 1999
++++ applets/gkb/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
  cxxflags_set = @cxxflags_set@
  l = @l@
  
@@ -163,10 +177,10 @@
  
  
  #if DO_EXE
---- applets/gnome-pager/Makefile.in.orig	Mon Feb  1 07:47:04 1999
-+++ applets/gnome-pager/Makefile.in	Tue Feb  2 06:02:53 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/gnome-pager/Makefile.in.orig	Tue Mar  2 01:54:08 1999
++++ applets/gnome-pager/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
  l = @l@
  
 -INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../panel					-I$(top_builddir)/panel 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)			-DVERSION=\""$(VERSION)"\"
@@ -174,10 +188,30 @@
  
  
  bin_PROGRAMS = gnomepager_applet
---- applets/mini-commander/src/Makefile.in.orig	Tue Feb  2 06:03:17 1999
-+++ applets/mini-commander/src/Makefile.in	Tue Feb  2 06:03:29 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/mini-commander/docs/Makefile.in.orig	Tue Mar  2 01:54:17 1999
++++ applets/mini-commander/docs/Makefile.in	Sat Mar  6 17:59:43 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+ 
+-docdir = $(datadir)/gnome/help/mini-commander_applet/C
++docdir = $(datadir)/help/mini-commander_applet/C
+ 
+ # .html files which are generated by db2html;  precompiled .html files 
+ # are included, so people without db2html (the DocBook to HTML converter) 
+@@ -247,7 +247,7 @@
+ install: install-am
+ uninstall-am: uninstall-docDATA
+ uninstall: uninstall-am
+-all-am: Makefile $(DATA)
++all-am: Makefile
+ all-redirect: all-am
+ install-strip:
+ 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+--- applets/mini-commander/src/Makefile.in.orig	Tue Mar  2 01:54:14 1999
++++ applets/mini-commander/src/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
  l = @l@
  
 -INCLUDES =  	-I.							-I$(srcdir)						-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(top_builddir)/panel -I$(top_srcdir)/panel		-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)
@@ -185,10 +219,10 @@
  
  
  bin_PROGRAMS = mini_commander_applet
---- applets/mixer/Makefile.in.orig	Tue Feb  2 06:03:35 1999
-+++ applets/mixer/Makefile.in	Tue Feb  2 06:03:45 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/mixer/Makefile.in.orig	Tue Mar  2 01:54:57 1999
++++ applets/mixer/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
  l = @l@
  
 -INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../panel					-I$(top_builddir)/panel 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)
@@ -196,10 +230,10 @@
  
  
  bin_PROGRAMS = mixer_applet
---- applets/modemlights/Makefile.in.orig	Tue Feb  2 06:03:50 1999
-+++ applets/modemlights/Makefile.in	Tue Feb  2 06:04:01 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/modemlights/Makefile.in.orig	Tue Mar  2 01:55:01 1999
++++ applets/modemlights/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
  l = @l@
  
 -INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../panel					-I$(top_builddir)/panel 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)			-DVERSION=\""$(VERSION)"\"
@@ -207,10 +241,10 @@
  
  
  bin_PROGRAMS = modemlights_applet
---- applets/multiload/Makefile.in.orig	Tue Feb  2 06:04:06 1999
-+++ applets/multiload/Makefile.in	Tue Feb  2 06:04:18 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/multiload/Makefile.in.orig	Tue Mar  2 01:54:44 1999
++++ applets/multiload/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
  l = @l@
  
 -INCLUDES = -I. -I$(srcdir) 					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(top_builddir)/panel -I$(srcdir)/../../panel		-I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS)
@@ -218,10 +252,10 @@
  
  
  bin_PROGRAMS = multiload_applet
---- applets/netload/Makefile.in.orig	Tue Feb  2 06:04:23 1999
-+++ applets/netload/Makefile.in	Tue Feb  2 06:04:33 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/netload/Makefile.in.orig	Tue Mar  2 01:54:46 1999
++++ applets/netload/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
  l = @l@
  
 -INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../panel					-I$(top_builddir)/panel 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)			$(LIBGTOP_INCS)
@@ -229,10 +263,10 @@
  
  
  bin_PROGRAMS = netload_applet
---- applets/slashapp/Makefile.in.orig	Tue Feb  2 06:04:37 1999
-+++ applets/slashapp/Makefile.in	Tue Feb  2 06:04:51 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/slashapp/Makefile.in.orig	Tue Mar  2 01:54:49 1999
++++ applets/slashapp/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
  l = @l@
  
 -INCLUDES = -I. -I$(srcdir) 					-I$(srcdir)/../../panel					-I$(top_builddir)/panel 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)
@@ -240,10 +274,10 @@
  
  
  bin_PROGRAMS = slash_applet
---- applets/webcontrol/Makefile.in.orig	Tue Feb  2 06:04:56 1999
-+++ applets/webcontrol/Makefile.in	Tue Feb  2 06:05:06 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/webcontrol/Makefile.in.orig	Tue Mar  2 01:53:45 1999
++++ applets/webcontrol/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
  l = @l@
  
 -INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(top_builddir)/panel 	-I$(srcdir)/../../panel					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)
@@ -251,10 +285,10 @@
  
  
  bin_PROGRAMS = webcontrol_applet
---- applets/winlist/Makefile.in.orig	Tue Feb  2 06:05:11 1999
-+++ applets/winlist/Makefile.in	Tue Feb  2 06:05:23 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/winlist/Makefile.in.orig	Tue Mar  2 01:55:05 1999
++++ applets/winlist/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
  l = @l@
  
 -INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(top_builddir)/panel 	-I$(srcdir)/../../panel					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)
@@ -262,10 +296,32 @@
  
  
  bin_PROGRAMS = winlist_applet
---- gmenu/Makefile.in.orig	Tue Feb  2 06:11:35 1999
-+++ gmenu/Makefile.in	Tue Feb  2 06:11:47 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- core-docs/Makefile.in.orig	Tue Mar  2 01:52:59 1999
++++ core-docs/Makefile.in	Sat Mar  6 17:59:43 1999
+@@ -162,7 +162,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+ 
+-gnome_intro_helpdir = $(datadir)/gnome/help/gnome-intro/C
++gnome_intro_helpdir = $(datadir)/help/gnome-intro/C
+ 
+ GNOME_INTRO_HTML_FILES =  	gnome-intro/c93191.html 	gnome-intro/f13.html 	gnome-intro/a-sample-session.html 	gnome-intro/c93230.html 	gnome-intro/f1346.html 	gnome-intro/a-sample-session75.html 	gnome-intro/c93302.html 	gnome-intro/gnome-intro.html 	gnome-intro/c93.html 	gnome-intro/c93372.html 	gnome-intro/c93127.html 	gnome-intro/c93412.html 	gnome-intro/c93175.html 	gnome-intro/docbook.css
+ 
+--- desktop-links/Makefile.in.orig	Tue Mar  2 01:52:28 1999
++++ desktop-links/Makefile.in	Sat Mar  6 17:59:43 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+ 
+-appsdir = $(datadir)/gnome/apps
++appsdir = $(datadir)/apps
+ 
+ Rootdir = $(appsdir)
+ Applicationsdir = $(appsdir)/Applications
+--- gmenu/Makefile.in.orig	Tue Mar  2 01:53:06 1999
++++ gmenu/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
  l = @l@
  
 -INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(includedir) $(GNOME_INCLUDEDIR)
@@ -273,21 +329,53 @@
  
  
  bin_PROGRAMS = gmenu
---- gnome-terminal/Makefile.in.orig	Tue Feb  2 06:12:12 1999
-+++ gnome-terminal/Makefile.in	Tue Feb  2 06:12:21 1999
-@@ -153,7 +153,7 @@
+@@ -167,7 +167,7 @@
+ 
+ EXTRA_DIST = gmenu.desktop top.xpm folder.xpm unknown.xpm
  
- SUBDIRS = C
+-sysdir = $(datadir)/gnome/apps/Settings
++sysdir = $(datadir)/apps/Settings
+ sys_DATA = gmenu.desktop
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+--- gnome-terminal/C/Makefile.in.orig	Tue Mar  2 01:52:56 1999
++++ gnome-terminal/C/Makefile.in	Sat Mar  6 17:59:43 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+ 
+-gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/C
++gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/C
+ 
+ gnome_terminal_help_DATA =  	index.html			topic.dat
+ 
+--- gnome-terminal/Makefile.in.orig	Tue Mar  2 01:52:55 1999
++++ gnome-terminal/Makefile.in	Sat Mar  6 18:05:08 1999
+@@ -155,9 +155,9 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+ 
+-SUBDIRS = C
++# SUBDIRS = C
  
 -INCLUDES =  	-I$(includedir)			-I$(top_srcdir)/intl		-I$(top_builddir)/intl		$(GNOME_INCLUDEDIR)		-DGNOMELOCALEDIR=\""$(datadir)/locale\""
 +INCLUDES =  	-I$(includedir)			-I$(top_srcdir)/intl		-I$(top_builddir)/intl		$(GNOME_INCLUDEDIR)		-DGNOMELOCALEDIR=\""$(prefix)/share/locale\""
  
  
- LDADD =  	$(GNOME_LIBDIR)						$(GNOMEUI_LIBS)						-lzvt 							$(INTLLIBS)
---- gsm/Makefile.in.orig	Tue Feb  2 06:12:36 1999
-+++ gsm/Makefile.in	Tue Feb  2 06:12:47 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+ LDADD =  	$(GNOME_LIBDIR)						$(GNOMEUI_LIBS)						$(ZVT_LIBS)						$(INTLLIBS)
+@@ -174,7 +174,7 @@
+ 
+ CFLAGS = @CFLAGS@ -Wall
+ 
+-utildir = $(datadir)/gnome/apps/Utilities
++utildir = $(datadir)/apps/Utilities
+ util_DATA = gnome-terminal.desktop
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+--- gsm/Makefile.in.orig	Tue Mar  2 01:52:17 1999
++++ gsm/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
  l = @l@
  
 -INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) 	-I$(top_srcdir)/intl -I$(top_builddir)/intl		-DGNOMELOCALEDIR=\""$(datadir)/locale\"" 	-DDEFAULTDIR="\"$(datadir)\""
@@ -295,9 +383,29 @@
  
  
  LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS)
---- help-browser/help/C/Makefile.in.orig	Tue Feb  2 06:13:57 1999
-+++ help-browser/help/C/Makefile.in	Tue Feb  2 06:14:14 1999
-@@ -153,7 +153,7 @@
+--- help-browser/Makefile.in.orig	Tue Mar  2 01:52:32 1999
++++ help-browser/Makefile.in	Sat Mar  6 17:59:43 1999
+@@ -156,7 +156,7 @@
+ 
+ SUBDIRS = help gnome-man2html gnome-info2html
+ 
+-INCLUDES =  	-I$(includedir)							-I$(top_srcdir)/intl -I$(top_builddir)/intl			$(GNOME_INCLUDEDIR)						-DGNOMEHELPPATH=\""$(datadir)/gnome/help\"" 		-DGNOMELOCALEDIR=\""$(datadir)/locale\""		-DVERSION=\""$(VERSION)"\"
++INCLUDES =  	-I$(includedir)							-I$(top_srcdir)/intl -I$(top_builddir)/intl			$(GNOME_INCLUDEDIR)						-DGNOMEHELPPATH=\""$(datadir)/help\"" 		-DGNOMELOCALEDIR=\""$(prefix)/share/locale\""		-DVERSION=\""$(VERSION)"\"
+ 
+ 
+ LDADD =  	-lgnorba                                        	$(GNOMEUI_LIBS)						$(GNOME_LIBDIR)						$(ORBIT_LIBS)                                           $(INTLLIBS)
+@@ -197,7 +197,7 @@
+ gnorbadir = $(sysconfdir)/CORBA/servers
+ gnorba_DATA = help-browser.gnorba
+ 
+-sysdir = $(datadir)/gnome/apps
++sysdir = $(datadir)/apps
+ sys_DATA = gnome-help.desktop
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+--- help-browser/help/C/Makefile.in.orig	Tue Mar  2 01:52:38 1999
++++ help-browser/help/C/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -157,7 +157,7 @@
  EXTRA_DIST = gnome-help-browser-help.html 	     gnome-help-browser-topic.dat 	     default-page.html gnome-logo-large.png sample-help.html sample-topic.dat
  
  
@@ -306,9 +414,9 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../../config.h
  CONFIG_CLEAN_FILES = 
---- help-browser/help/es/Makefile.in.orig	Tue Feb  2 06:14:18 1999
-+++ help-browser/help/es/Makefile.in	Tue Feb  2 06:14:27 1999
-@@ -153,7 +153,7 @@
+--- help-browser/help/es/Makefile.in.orig	Tue Mar  2 01:52:41 1999
++++ help-browser/help/es/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -157,7 +157,7 @@
  EXTRA_DIST = gnome-help-browser-help.html 	     gnome-help-browser-topic.dat 	     default-page.html 
  
  
@@ -317,9 +425,9 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../../config.h
  CONFIG_CLEAN_FILES = 
---- help-browser/help/fr/Makefile.in.orig	Tue Feb  2 06:14:31 1999
-+++ help-browser/help/fr/Makefile.in	Tue Feb  2 06:14:40 1999
-@@ -153,7 +153,7 @@
+--- help-browser/help/fr/Makefile.in.orig	Tue Mar  2 01:52:43 1999
++++ help-browser/help/fr/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -157,7 +157,7 @@
  EXTRA_DIST = gnome-help-browser-help.html 	     gnome-help-browser-topic.dat 	     default-page.html 
  
  
@@ -328,9 +436,42 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../../config.h
  CONFIG_CLEAN_FILES = 
---- panel/Makefile.in.orig	Tue Feb  2 06:15:25 1999
-+++ panel/Makefile.in	Tue Feb  2 06:15:58 1999
-@@ -156,7 +156,7 @@
+--- help-browser/help/hu/Makefile.in.orig	Tue Mar  2 01:52:44 1999
++++ help-browser/help/hu/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -157,7 +157,7 @@
+ EXTRA_DIST = gnome-help-browser-help.html 	     gnome-help-browser-topic.dat 	     default-page.html gnome-logo-large.png sample-help.html sample-topic.dat
+ 
+ 
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/hu
++help_browser_helpdir = $(datadir)/help/help-browser/hu
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES = 
+--- help-browser/help/it/Makefile.in.orig	Tue Mar  2 01:52:46 1999
++++ help-browser/help/it/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -157,7 +157,7 @@
+ EXTRA_DIST = gnome-help-browser-help.html 	     gnome-help-browser-topic.dat 	     default-page.html 
+ 
+ 
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/it
++help_browser_helpdir = $(datadir)/help/help-browser/it
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES = 
+--- help-browser/help/no/Makefile.in.orig	Tue Mar  2 01:52:47 1999
++++ help-browser/help/no/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -157,7 +157,7 @@
+ EXTRA_DIST = gnome-help-browser-help.html 	     gnome-help-browser-topic.dat 	     default-page.html
+ 
+ 
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/no
++help_browser_helpdir = $(datadir)/help/help-browser/no
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES = 
+--- panel/Makefile.in.orig	Tue Mar  2 01:53:16 1999
++++ panel/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -160,7 +160,7 @@
  
  AUTOMAKE_OPTIONS = 1.3
  
@@ -339,7 +480,7 @@
  
  
  bin_PROGRAMS = panel
-@@ -176,7 +176,7 @@
+@@ -180,7 +180,7 @@
  libpanel_appletinclude_HEADERS =  	applet-widget.h			gnome-panel.h			panel-types.h
  
  
@@ -348,19 +489,19 @@
  libpanel_applet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB)
  
  BUILT_SOURCES = $(CORBA_SRCLIST)
-@@ -198,7 +198,7 @@
+@@ -202,7 +202,7 @@
  EXTRA_DIST =  	panelrc.in			panel.in			appletsConf.sh.in		panel.gnorba			panel.soundlist
  
  
 -confexecdir = $(libdir)
-+confexecdir = $(datadir)
++confexecdir = $(sysconfdir)
  confexec_DATA = appletsConf.sh
  
  panelgnorbadir = $(sysconfdir)/CORBA/servers
---- smproxy/Makefile.in.orig	Tue Feb  2 06:16:19 1999
-+++ smproxy/Makefile.in	Tue Feb  2 06:16:30 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- smproxy/Makefile.in.orig	Tue Mar  2 01:52:21 1999
++++ smproxy/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
  l = @l@
  
 -INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) 	-DGNOMELOCALEDIR=\""$(datadir)/locale\""
@@ -368,108 +509,3 @@
  
  
  LDADD = -lXt -lXmu $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS)
---- core-docs/Makefile.in.orig	Tue Feb  2 06:16:47 1999
-+++ core-docs/Makefile.in	Tue Feb  2 06:16:58 1999
-@@ -158,7 +158,7 @@
- YACC = @YACC@
- l = @l@
- 
--gnome_intro_helpdir = $(datadir)/gnome/help/gnome-intro/C
-+gnome_intro_helpdir = $(datadir)/help/gnome-intro/C
- 
- GNOME_INTRO_HTML_FILES =  	gnome-intro/c93191.html 	gnome-intro/f13.html 	gnome-intro/a-sample-session.html 	gnome-intro/c93230.html 	gnome-intro/f1346.html 	gnome-intro/a-sample-session75.html 	gnome-intro/c93302.html 	gnome-intro/gnome-intro.html 	gnome-intro/c93.html 	gnome-intro/c93372.html 	gnome-intro/c93127.html 	gnome-intro/c93412.html 	gnome-intro/c93175.html 	gnome-intro/docbook.css
- 
---- po/Makefile.in.in.orig	Tue Feb  2 06:17:12 1999
-+++ po/Makefile.in.in	Tue Feb  2 06:17:23 1999
-@@ -18,7 +18,7 @@
- 
- prefix = @prefix@
- exec_prefix = @exec_prefix@
--datadir = $(prefix)/@DATADIRNAME@
-+datadir = $(prefix)/share
- localedir = $(datadir)/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
---- applets/mini-commander/docs/Makefile.in.orig	Tue Feb  2 06:17:44 1999
-+++ applets/mini-commander/docs/Makefile.in	Tue Feb  2 06:18:12 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
- l = @l@
- 
--docdir = $(datadir)/gnome/help/mini-commander_applet/C
-+docdir = $(datadir)/help/mini-commander_applet/C
- 
- # .html files which are generated by db2html;  precompiled .html files 
- # are included, so people without db2html (the DocBook to HTML converter) 
-@@ -243,7 +243,7 @@
- install: install-am
- uninstall-am: uninstall-docDATA
- uninstall: uninstall-am
--all-am: Makefile $(DATA)
-+all-am: Makefile
- all-redirect: all-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
---- help-browser/Makefile.in.orig	Tue Feb  2 06:13:07 1999
-+++ help-browser/Makefile.in	Tue Feb  2 06:19:22 1999
-@@ -152,7 +152,7 @@
- 
- SUBDIRS = help gnome-man2html gnome-info2html
- 
--INCLUDES =  	-I$(includedir)							-I$(top_srcdir)/intl -I$(top_builddir)/intl			$(GNOME_INCLUDEDIR)						-DGNOMEHELPPATH=\""$(datadir)/gnome/help\"" 		-DGNOMELOCALEDIR=\""$(datadir)/locale\""		-DVERSION=\""$(VERSION)"\"
-+INCLUDES =  	-I$(includedir)							-I$(top_srcdir)/intl -I$(top_builddir)/intl			$(GNOME_INCLUDEDIR)						-DGNOMEHELPPATH=\""$(datadir)/help\"" 		-DGNOMELOCALEDIR=\""$(prefix)/share/locale\""		-DVERSION=\""$(VERSION)"\"
- 
- 
- LDADD =  	-lgnorba                                        	$(GNOMEUI_LIBS)						$(GNOME_LIBDIR)						$(ORBIT_LIBS)                                           $(INTLLIBS)
---- gnome-terminal/C/Makefile.in.orig	Tue Feb  2 07:21:51 1999
-+++ gnome-terminal/C/Makefile.in	Tue Feb  2 07:22:07 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
- l = @l@
- 
--gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/C
-+gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/C
- 
- gnome_terminal_help_DATA =  	index.html			topic.dat
- 
---- applets/cpumemusage/proc.c.orig	Fri Feb 19 04:07:15 1999
-+++ applets/cpumemusage/proc.c	Fri Feb 19 04:07:29 1999
-@@ -1,3 +1,4 @@
-+#include <sys/types.h>
- #include <glibtop.h>
- #include <glibtop/cpu.h>
- #include <glibtop/mem.h>
---- applets/diskusage/diskusage_read.c.orig	Fri Feb 19 04:09:00 1999
-+++ applets/diskusage/diskusage_read.c	Fri Feb 19 04:09:13 1999
-@@ -1,3 +1,4 @@
-+#include <sys/types.h>
- #include <glibtop.h>
- #include <glibtop/fsusage.h>
- #include <glibtop/mountlist.h>
---- applets/Makefile.in.orig	Fri Feb 19 04:43:52 1999
-+++ applets/Makefile.in	Fri Feb 19 04:44:40 1999
-@@ -152,13 +152,13 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
- 
--always_built_SUBDIRS = applet-dirs gen_util asclock 	 fish dialer webcontrol 	 drivemount clockmail fifteen battery charpick 	 gnome-pager mini-commander gkb
-+always_built_SUBDIRS = applet-dirs gen_util asclock 	 fish dialer webcontrol clockmail fifteen battery charpick 	 gnome-pager mini-commander gkb
- 
- @FALSE_TRUE@@HAVE_LIBESD_TRUE@esdmanager = esd-manager
- @FALSE_TRUE@@HAVE_LIBESD_FALSE@esdmanager = 
- 
- @FALSE_TRUE@@HAVE_FVWM_TRUE@fvwm = fvwm-pager
--@HAVE_LIBGTOP_TRUE@libgtop_SUBDIRS = cpumemusage diskusage multiload netload
-+@HAVE_LIBGTOP_TRUE@libgtop_SUBDIRS = cpumemusage diskusage multiload
- @HAVE_LIBGTOP_FALSE@libgtop_SUBDIRS = 
- 
- @HAVE_LIBGHTTP_TRUE@slashapp = slashapp
-@@ -174,7 +174,7 @@
- SUBDIRS = $(always_built_SUBDIRS) $(libgtop_SUBDIRS) 	 $(cdplayer) $(mixer) $(modemlights) $(winlist)          $(slashapp) $(esdmanager) $(fvwm)
- 
- 
--DIST_SUBDIRS = $(always_built_SUBDIRS) esd-manager cpumemusage 	diskusage multiload netload slashapp cdplayer 	 mixer modemlights winlist fvwm-pager
-+DIST_SUBDIRS = $(always_built_SUBDIRS) esd-manager cpumemusage 	diskusage multiload slashapp cdplayer 	 mixer modemlights winlist fvwm-pager
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
diff --git a/x11/gnomecore/pkg-plist b/x11/gnomecore/pkg-plist
index 1156beda4fd1..ec18080d5f2c 100644
--- a/x11/gnomecore/pkg-plist
+++ b/x11/gnomecore/pkg-plist
@@ -1,5 +1,6 @@
 bin/asclock_applet
 bin/battery_applet
+bin/cdplayer_applet
 bin/charpick_applet
 bin/clockmail_applet
 bin/cpumemusage_applet
@@ -8,6 +9,7 @@ bin/diskusage_applet
 bin/fifteen_applet
 bin/gen_util_applet
 bin/gmenu
+bin/gnome-edit
 bin/gnome-help-browser
 bin/gnome-help-caller
 bin/gnome-info2html
@@ -16,17 +18,18 @@ bin/gnome-session
 bin/gnome-smproxy
 bin/gnome-terminal
 bin/gnomepager_applet
+bin/jbc_applet
 bin/mini_commander_applet
 bin/mixer_applet
 bin/modemlights_applet
 bin/multiload_applet
 bin/panel
 bin/save-session
-bin/session-properties
 bin/slash_applet
 bin/webcontrol_applet
 etc/CORBA/servers/asclock_applet.gnorba
 etc/CORBA/servers/battery_applet.gnorba
+etc/CORBA/servers/cdplayer_applet.gnorba
 etc/CORBA/servers/charpick_applet.gnorba
 etc/CORBA/servers/clockmail_applet.gnorba
 etc/CORBA/servers/cpumemusage_applet.gnorba
@@ -38,6 +41,7 @@ etc/CORBA/servers/gen_util.gnorba
 etc/CORBA/servers/gkb_applet.gnorba
 etc/CORBA/servers/gnomepager_applet.gnorba
 etc/CORBA/servers/help-browser.gnorba
+etc/CORBA/servers/jbc_applet.gnorba
 etc/CORBA/servers/mini-commander_applet.gnorba
 etc/CORBA/servers/mixer_applet.gnorba
 etc/CORBA/servers/modemlights_applet.gnorba
@@ -45,6 +49,7 @@ etc/CORBA/servers/multiload_applet.gnorba
 etc/CORBA/servers/panel.gnorba
 etc/CORBA/servers/slash_applet.gnorba
 etc/CORBA/servers/webcontrol_applet.gnorba
+etc/appletsConf.sh
 etc/sound/events/panel.soundlist
 include/applet-widget.h
 include/gnome-panel.h
@@ -63,7 +68,6 @@ lib/libpanel_applet.so
 lib/libpanel_applet.so.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-share/gnome/appletsConf.sh
 share/gnome/applets/Amusements/.directory
 share/gnome/applets/Amusements/fifteen_applet.desktop
 share/gnome/applets/Amusements/fish_applet.desktop
@@ -76,6 +80,7 @@ share/gnome/applets/Monitors/diskusage_applet.desktop
 share/gnome/applets/Monitors/memload_applet.desktop
 share/gnome/applets/Monitors/swapload_applet.desktop
 share/gnome/applets/Multimedia/.directory
+share/gnome/applets/Multimedia/cdplayer_applet.desktop
 share/gnome/applets/Multimedia/mixer_applet.desktop
 share/gnome/applets/Network/.directory
 share/gnome/applets/Network/dialer_applet.desktop
@@ -89,26 +94,26 @@ share/gnome/applets/Utility/clock_applet.desktop
 share/gnome/applets/Utility/clockmail_applet.desktop
 share/gnome/applets/Utility/gkb_applet.desktop
 share/gnome/applets/Utility/gnomepager_applet.desktop
+share/gnome/applets/Utility/jbc_applet.desktop
 share/gnome/applets/Utility/mini-commander_applet.desktop
 share/gnome/applets/Utility/printer.desktop
 share/gnome/apps/.order
-share/gnome/apps/Administration/.directory
 share/gnome/apps/Applications/.directory
 share/gnome/apps/Applications/Emacs.desktop
 share/gnome/apps/Applications/Netscape.desktop
-share/gnome/apps/Audio/.directory
 share/gnome/apps/Games/.directory
 share/gnome/apps/Gmc.desktop
 share/gnome/apps/Graphics/.directory
 share/gnome/apps/Graphics/GIMP.desktop
-share/gnome/apps/Network/.directory
-share/gnome/apps/Network/Balsa.desktop
-share/gnome/apps/Network/Tkrat.desktop
-share/gnome/apps/Productivity/.directory
+share/gnome/apps/Internet/.directory
+share/gnome/apps/Internet/Balsa.desktop
+share/gnome/apps/Internet/Tkrat.desktop
+share/gnome/apps/Multimedia/.directory
+share/gnome/apps/Settings/.directory
+share/gnome/apps/Settings/.order
+share/gnome/apps/Settings/Imlib_config.desktop
+share/gnome/apps/Settings/gmenu.desktop
 share/gnome/apps/System/.directory
-share/gnome/apps/System/Imlib_config.desktop
-share/gnome/apps/System/gmenu.desktop
-share/gnome/apps/System/session.desktop
 share/gnome/apps/Utilities/.directory
 share/gnome/apps/Utilities/Eterm.desktop
 share/gnome/apps/Utilities/Kterm.desktop
@@ -166,19 +171,6 @@ share/gnome/help/gnome-intro/C/pix/panel-menu.gif
 share/gnome/help/gnome-intro/C/pix/same-gnome.gif
 share/gnome/help/gnome-intro/C/pix/terminal.gif
 share/gnome/help/gnome-intro/C/topic.dat
-share/gnome/help/gnome-terminal/C/authors.html
-share/gnome/help/gnome-terminal/C/classes.html
-share/gnome/help/gnome-terminal/C/config.html
-share/gnome/help/gnome-terminal/C/docbook.css
-share/gnome/help/gnome-terminal/C/emulation.html
-share/gnome/help/gnome-terminal/C/enviroment.html
-share/gnome/help/gnome-terminal/C/index.html
-share/gnome/help/gnome-terminal/C/menus.html
-share/gnome/help/gnome-terminal/C/options.html
-share/gnome/help/gnome-terminal/C/pointerusage.html
-share/gnome/help/gnome-terminal/C/terminal.html
-share/gnome/help/gnome-terminal/C/termtech.html
-share/gnome/help/gnome-terminal/C/topic.dat
 share/gnome/help/help-browser/C/default-page.html
 share/gnome/help/help-browser/C/gnome-logo-large.png
 share/gnome/help/help-browser/C/help-browser.html
@@ -192,6 +184,19 @@ share/gnome/help/help-browser/fr/default-page.html
 share/gnome/help/help-browser/fr/help-browser.html
 share/gnome/help/help-browser/fr/index.html
 share/gnome/help/help-browser/fr/topic.dat
+share/gnome/help/help-browser/hu/default-page.html
+share/gnome/help/help-browser/hu/gnome-logo-large.png
+share/gnome/help/help-browser/hu/help-browser.html
+share/gnome/help/help-browser/hu/index.html
+share/gnome/help/help-browser/hu/topic.dat
+share/gnome/help/help-browser/it/default-page.html
+share/gnome/help/help-browser/it/help-browser.html
+share/gnome/help/help-browser/it/index.html
+share/gnome/help/help-browser/it/topic.dat
+share/gnome/help/help-browser/no/default-page.html
+share/gnome/help/help-browser/no/help-browser.html
+share/gnome/help/help-browser/no/index.html
+share/gnome/help/help-browser/no/topic.dat
 share/gnome/help/mini-commander_applet/C/change-log.html
 share/gnome/help/mini-commander_applet/C/clock.html
 share/gnome/help/mini-commander_applet/C/command-completion.html
@@ -352,6 +357,7 @@ share/gnome/xmodmap/xmodmap.nl
 share/gnome/xmodmap/xmodmap.no
 share/gnome/xmodmap/xmodmap.pl
 share/gnome/xmodmap/xmodmap.pt
+share/gnome/xmodmap/xmodmap.pt-dead
 share/gnome/xmodmap/xmodmap.qc
 share/gnome/xmodmap/xmodmap.ru
 share/gnome/xmodmap/xmodmap.ru_koi8
@@ -372,13 +378,7 @@ share/locale/cs/LC_MESSAGES/gnome-core.mo
 share/locale/da/LC_MESSAGES/gnome-core.mo
 share/locale/de/LC_MESSAGES/gnome-core.mo
 share/locale/es/LC_MESSAGES/gnome-core.mo
-share/locale/es_DO/LC_MESSAGES/gnome-core.mo
-share/locale/es_GT/LC_MESSAGES/gnome-core.mo
-share/locale/es_HN/LC_MESSAGES/gnome-core.mo
 share/locale/es_MX/LC_MESSAGES/gnome-core.mo
-share/locale/es_PA/LC_MESSAGES/gnome-core.mo
-share/locale/es_PE/LC_MESSAGES/gnome-core.mo
-share/locale/es_SV/LC_MESSAGES/gnome-core.mo
 share/locale/fi/LC_MESSAGES/gnome-core.mo
 share/locale/fr/LC_MESSAGES/gnome-core.mo
 share/locale/ga/LC_MESSAGES/gnome-core.mo
@@ -392,41 +392,41 @@ share/locale/pl/LC_MESSAGES/gnome-core.mo
 share/locale/pt/LC_MESSAGES/gnome-core.mo
 share/locale/ru/LC_MESSAGES/gnome-core.mo
 share/locale/sv/LC_MESSAGES/gnome-core.mo
-@dirrm etc/CORBA/servers
-@dirrm etc/CORBA
-@dirrm share/gnome/applets/Amusements
-@dirrm share/gnome/applets/Monitors
-@dirrm share/gnome/applets/Multimedia
-@dirrm share/gnome/applets/Network
-@dirrm share/gnome/applets/Utility
-@dirrm share/gnome/applets
-@dirrm share/gnome/apps/Administration
-@dirrm share/gnome/apps/Applications
-@dirrm share/gnome/apps/Audio
-@dirrm share/gnome/apps/Games
-@dirrm share/gnome/apps/Graphics
-@dirrm share/gnome/apps/Network
-@dirrm share/gnome/apps/Productivity
-@dirrm share/gnome/apps/System
-@dirrm share/gnome/apps/Utilities
-@dirrm share/gnome/apps
+@dirrm share/gnome/xmodmap
+@dirrm share/gnome/pixmaps/tiles
+@dirrm share/gnome/pixmaps/mini-commander
+@dirrm share/gnome/pixmaps/mailcheck
+@dirrm share/gnome/pixmaps/gkb
+@dirrm share/gnome/pixmaps/fish
+@dirrm share/gnome/mc/templates
+@dirrm share/gnome/mc
+@dirrm share/gnome/help/mini-commander_applet/C
+@dirrm share/gnome/help/mini-commander_applet
+@dirrm share/gnome/help/help-browser/no
+@dirrm share/gnome/help/help-browser/it
+@dirrm share/gnome/help/help-browser/hu
+@dirrm share/gnome/help/help-browser/fr
+@dirrm share/gnome/help/help-browser/es
+@dirrm share/gnome/help/help-browser/C
+@dirrm share/gnome/help/help-browser
 @dirrm share/gnome/help/gnome-intro/C/pix
 @dirrm share/gnome/help/gnome-intro/C
 @dirrm share/gnome/help/gnome-intro
-@dirrm share/gnome/help/gnome-terminal/C
-@dirrm share/gnome/help/gnome-terminal
-@dirrm share/gnome/help/help-browser/C
-@dirrm share/gnome/help/help-browser/es
-@dirrm share/gnome/help/help-browser/fr
-@dirrm share/gnome/help/help-browser
-@dirrm share/gnome/help/mini-commander_applet/C
-@dirrm share/gnome/help/mini-commander_applet
 @dirrm share/gnome/help
-@dirrm share/gnome/mc/templates
-@dirrm share/gnome/mc
-@dirrm share/gnome/pixmaps/gkb
-@dirrm share/gnome/pixmaps/fish
-@dirrm share/gnome/pixmaps/mailcheck
-@dirrm share/gnome/pixmaps/mini-commander
-@dirrm share/gnome/pixmaps/tiles
-@dirrm share/gnome/xmodmap
+@dirrm share/gnome/apps/Utilities
+@dirrm share/gnome/apps/System
+@dirrm share/gnome/apps/Settings
+@dirrm share/gnome/apps/Multimedia
+@dirrm share/gnome/apps/Internet
+@dirrm share/gnome/apps/Graphics
+@dirrm share/gnome/apps/Games
+@dirrm share/gnome/apps/Applications
+@dirrm share/gnome/apps
+@dirrm share/gnome/applets/Utility
+@dirrm share/gnome/applets/Network
+@dirrm share/gnome/applets/Multimedia
+@dirrm share/gnome/applets/Monitors
+@dirrm share/gnome/applets/Amusements
+@dirrm share/gnome/applets
+@dirrm etc/CORBA/servers
+@dirrm etc/CORBA
diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile
index 61e7c65fd0fd..39dccdb790ba 100644
--- a/x11/gnomelibs/Makefile
+++ b/x11/gnomelibs/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/gnomelibs/distinfo b/x11/gnomelibs/distinfo
index f7e1fd302f48..455cc546ff06 100644
--- a/x11/gnomelibs/distinfo
+++ b/x11/gnomelibs/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/gnomelibs/files/patch-aa b/x11/gnomelibs/files/patch-aa
index cfa5a37c0dc2..02ba2b3b8c3c 100644
--- a/x11/gnomelibs/files/patch-aa
+++ b/x11/gnomelibs/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/gnomelibs/files/patch-ac b/x11/gnomelibs/files/patch-ac
index 91dbb7fa8ed8..be621cf51bcc 100644
--- a/x11/gnomelibs/files/patch-ac
+++ b/x11/gnomelibs/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/gnomelibs/pkg-plist b/x11/gnomelibs/pkg-plist
index 5ac61c20790c..021e4eabd18b 100644
--- a/x11/gnomelibs/pkg-plist
+++ b/x11/gnomelibs/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
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
author	Jacques Vidrine <nectar@FreeBSD.org>	1999-03-09 01:13:40 +0000
committer	Jacques Vidrine <nectar@FreeBSD.org>	1999-03-09 01:13:40 +0000
commit	f4442a7aa7d134c8de8574845b26edddcac65935 (patch)
tree	0f55c576fb88ce09083373c32ab8312529d29dc5 /x11
parent	Upgrade to strobe 1.05 (diff)