Say hello to GNOME 1.2

	audio/gnomemedia		1.2.0
	deskutils/gnomepim		1.2.0
	devel/bugbuddy			1.0
	devel/glade			0.5.9
	devel/libgtop			1.0.9
	games/gnomegames		1.2.0
	graphics/imlib			1.9.8.1
	misc/gnomeusersguide		1.2
	misc/gnomeutils			1.2.0
	sysutils/gnomecontrolcenter	1.2.0
	sysutils/gtop			1.0.8
	x11-fm/gmomemc			4.5.50
	x11/gnomecore			1.2.0
	x11/gnomelibs			1.2.1

Along with cosmetic changes to other parts of the metaport
for the new shared library version numbers.

Plus.  The metaport has been reworked to bring in a few more
often-requested items.

Please note that you absolutely need GTK/GLIB 1.2.8 or higher
for this release.

2 files changed, 80 insertions, 21 deletions

diff --git a/deskutils/gnome-utils/files/patch-aa b/deskutils/gnome-utils/files/patch-aa
index a8dc69285a9d..149087c84669 100644
--- a/deskutils/gnome-utils/files/patch-aa
+++ b/deskutils/gnome-utils/files/patch-aa
@@ -1,24 +1,6 @@
---- configure.orig	Wed Mar  8 09:07:49 2000
-+++ configure	Sat Mar 11 15:35:52 2000
-@@ -2480,7 +2480,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  PTHREAD_LIB="-lc_r"
-+  PTHREAD_LIB=""
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
-@@ -3277,7 +3277,7 @@
-   
- 	echo $ac_n "checking for an obGnomeConf.sh""... $ac_c" 1>&6
- echo "configure:3280: checking for an obGnomeConf.sh" >&5
--	my_gnome_libdir=`$GNOME_CONFIG --libdir`
-+	my_gnome_libdir=`$GNOME_CONFIG --sysconfdir`
- 	if test -f $my_gnome_libdir/obGnomeConf.sh; then
- 	    . $my_gnome_libdir/obGnomeConf.sh
- 	    echo "$ac_t""found $my_gnome_libdir" 1>&6
-@@ -5531,7 +5531,7 @@
+--- configure.orig	Fri May 19 14:49:06 2000
++++ configure	Tue May 30 13:31:24 2000
+@@ -5101,7 +5101,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -27,3 +9,32 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
+@@ -6350,17 +6350,13 @@
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   build_gfloppy=true
++  subdirs="gfloppy"
+ else
++  build_gfloppy=false
+   echo "$ac_t""no" 1>&6
+ echo "configure: warning: *** gfloppy will not be built." 1>&2
+ fi
+ 
+-if $build_gfloppy; then
+-  subdirs="gfloppy"
+-
+-fi
+-
+-
+ if test "$build_gfloppy" = true; then
+   BUILD_GFLOPPY_TRUE=
+   BUILD_GFLOPPY_FALSE='#'
+@@ -8453,7 +8449,7 @@
+     esac
+   done
+ 
+-  for ac_config_dir in gfloppy; do
++  for ac_config_dir in $subdirs ; do
+ 
+     # Do not complain, so a configure script can configure whichever
+     # parts of a large source tree are present.
diff --git a/deskutils/gnome-utils/files/patch-ah b/deskutils/gnome-utils/files/patch-ah
new file mode 100644
index 000000000000..ba467beaa5a6
--- /dev/null
+++ b/deskutils/gnome-utils/files/patch-ah
@@ -0,0 +1,48 @@
+--- logview/actions.c.orig	Wed Apr 26 22:32:02 2000
++++ logview/actions.c	Tue May 30 13:34:05 2000
+@@ -1,6 +1,7 @@
+ #include "logview.h"
+ #include <string.h>
+ #include <stdlib.h>
++#include <sys/types.h>
+ #include <regex.h>
+ #include <config.h>
+ #include <gnome.h>
+--- logview/desc_db.c.orig	Wed Apr 26 22:32:02 2000
++++ logview/desc_db.c	Tue May 30 13:34:36 2000
+@@ -1,5 +1,6 @@
+ #include "logview.h"
+ #include <string.h>
++#include <sys/types.h>
+ #include <regex.h>
+ #include <stdlib.h>
+ 
+--- logview/logrtns.c.orig	Tue May 30 13:35:22 2000
++++ logview/logrtns.c	Tue May 30 13:37:45 2000
+@@ -679,7 +679,7 @@
+       if (IsLeapYear (curmark->year - lastyear + thisyear))
+ 	 curmark->time += 24 * 60 * 60;		/*  Add one day */
+ 
+-#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__FreeBSD__)
+       curmark->time += correction - tmptm->tm_gmtoff;
+ #else
+       curmark->time += correction - timezone;
+@@ -705,7 +705,7 @@
+    if (IsLeapYear (thisyear))
+       log->lstats.enddate += 24 * 60 * 60;	/*  Add one day */
+ 
+-#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__FreeBSD__)
+    log->lstats.enddate += correction - tmptm->tm_gmtoff;
+ #else
+    log->lstats.enddate += correction - timezone;
+@@ -716,7 +716,7 @@
+    if (IsLeapYear (thisyear - lastyear))
+       log->lstats.startdate += 24 * 60 * 60;	/*  Add one day */
+ 
+-#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__FreeBSD__)
+    log->lstats.startdate += correction - tmptm->tm_gmtoff;
+ #else
+    log->lstats.startdate += correction - timezone;