Update to version 1.0.12.

PR:		12781 (14 of 19)
Submitted by:	Ade Lovett <ade@lovett.com>

10 files changed, 38 insertions, 30 deletions

diff --git a/misc/gnomeutils/Makefile b/misc/gnomeutils/Makefile
index 090fd8c6012b..8a46c2eaaadc 100644
--- a/misc/gnomeutils/Makefile
+++ b/misc/gnomeutils/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	gnomeutils
-# Version required:			1.0.1
+# Version required:			1.0.12
 # Date created:				03 July 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.8 1999/04/08 18:08:34 steve Exp $
+# $Id: Makefile,v 1.9 1999/05/30 03:51:37 steve Exp $
 #
 
-DISTNAME=	gnome-utils-1.0.1
-PKGNAME=	gnomeutils-1.0.1
+DISTNAME=	gnome-utils-1.0.12
+PKGNAME=	gnomeutils-1.0.12
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-utils
diff --git a/misc/gnomeutils/distinfo b/misc/gnomeutils/distinfo
index b35b2a17cd4c..d3f5f51413e8 100644
--- a/misc/gnomeutils/distinfo
+++ b/misc/gnomeutils/distinfo
@@ -1 +1 @@
-MD5 (gnome-utils-1.0.1.tar.gz) = c267d32ddf310b3e9f70a2d915cccf5a
+MD5 (gnome-utils-1.0.12.tar.gz) = bf95eb57c0d41d770d1709bbbfbbe897
diff --git a/misc/gnomeutils/files/patch-aa b/misc/gnomeutils/files/patch-aa
index c814062cbc36..57811b29cd9c 100644
--- a/misc/gnomeutils/files/patch-aa
+++ b/misc/gnomeutils/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Tue Mar  2 00:23:40 1999
-+++ configure	Sat May 22 21:54:01 1999
-@@ -2387,7 +2387,7 @@
+--- configure.orig	Thu Jul 29 14:41:22 1999
++++ configure	Wed Aug 18 11:31:10 1999
+@@ -2410,7 +2410,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -9,16 +9,16 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
-@@ -3143,7 +3143,7 @@
+@@ -3191,7 +3191,7 @@
    
  	echo $ac_n "checking for an obGnomeConf.sh""... $ac_c" 1>&6
- echo "configure:3146: checking for an obGnomeConf.sh" >&5
+ echo "configure:3194: 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
-@@ -5389,7 +5389,7 @@
+@@ -5500,7 +5500,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
diff --git a/misc/gnomeutils/files/patch-ad b/misc/gnomeutils/files/patch-ad
index 4da63dbc1270..65ebff071c14 100644
--- a/misc/gnomeutils/files/patch-ad
+++ b/misc/gnomeutils/files/patch-ad
@@ -1,5 +1,5 @@
---- gdialog/dialog.h.orig	Tue Jan  5 17:55:34 1999
-+++ gdialog/dialog.h	Tue Jan  5 17:55:48 1999
+--- gdialog/dialog.h.orig	Tue Jul  6 16:23:33 1999
++++ gdialog/dialog.h	Wed Aug 18 11:34:23 1999
 @@ -36,24 +36,7 @@
  #include <gnome.h>
  #endif
@@ -10,7 +10,7 @@
 -#  if defined(USE_NCURSES) && !defined(RENAMED_NCURSES)
 -#    include <ncurses.h>
 -#  else
--#    ifndef _XOPEN_SOURCE_EXTENDED
+-#    if !defined(_XOPEN_SOURCE_EXTENDED) && !defined(__sgi)
 -#        define hacked 1
 -#        define _XOPEN_SOURCE_EXTENDED
 -#        define _ACS_COMPAT_CODE
diff --git a/misc/gnomeutils/pkg-plist b/misc/gnomeutils/pkg-plist
index 43750e5c635e..7841daeb34fc 100644
--- a/misc/gnomeutils/pkg-plist
+++ b/misc/gnomeutils/pkg-plist
@@ -16,7 +16,7 @@ bin/splac
 bin/splash
 share/gnome/apps/Applications/ghex.desktop
 share/gnome/apps/Applications/gtt.desktop
-share/gnome/apps/Settings/gshutdown.desktop
+share/gnome/apps/System/gshutdown.desktop
 share/gnome/apps/Utilities/gcalc.desktop
 share/gnome/apps/Utilities/gcolorsel.desktop
 share/gnome/apps/Utilities/gdiskfree.desktop
@@ -44,9 +44,11 @@ share/gnome/help/gtt/de/index.html
 share/gnome/help/gtt/de/topic.dat
 share/gnome/help/gtt/es/index.html
 share/gnome/help/gtt/es/topic.dat
+share/gnome/idl/gsu.idl
 share/gnome/pixmaps/gnome-ghex.png
 share/locale/cs/LC_MESSAGES/gnome-utils.mo
 share/locale/de/LC_MESSAGES/gnome-utils.mo
+share/locale/en_GB/LC_MESSAGES/gnome-utils.mo
 share/locale/es/LC_MESSAGES/gnome-utils.mo
 share/locale/fi/LC_MESSAGES/gnome-utils.mo
 share/locale/fr/LC_MESSAGES/gnome-utils.mo
@@ -59,6 +61,8 @@ share/locale/no/LC_MESSAGES/gnome-utils.mo
 share/locale/pt/LC_MESSAGES/gnome-utils.mo
 share/locale/ru/LC_MESSAGES/gnome-utils.mo
 share/locale/sv/LC_MESSAGES/gnome-utils.mo
+share/locale/wa/LC_MESSAGES/gnome-utils.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/gnome-utils.mo
 @dirrm share/gnome/help/gtt/es
 @dirrm share/gnome/help/gtt/de
 @dirrm share/gnome/help/gtt/C
diff --git a/misc/gnomeutils2/Makefile b/misc/gnomeutils2/Makefile
index 090fd8c6012b..8a46c2eaaadc 100644
--- a/misc/gnomeutils2/Makefile
+++ b/misc/gnomeutils2/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	gnomeutils
-# Version required:			1.0.1
+# Version required:			1.0.12
 # Date created:				03 July 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.8 1999/04/08 18:08:34 steve Exp $
+# $Id: Makefile,v 1.9 1999/05/30 03:51:37 steve Exp $
 #
 
-DISTNAME=	gnome-utils-1.0.1
-PKGNAME=	gnomeutils-1.0.1
+DISTNAME=	gnome-utils-1.0.12
+PKGNAME=	gnomeutils-1.0.12
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-utils
diff --git a/misc/gnomeutils2/distinfo b/misc/gnomeutils2/distinfo
index b35b2a17cd4c..d3f5f51413e8 100644
--- a/misc/gnomeutils2/distinfo
+++ b/misc/gnomeutils2/distinfo
@@ -1 +1 @@
-MD5 (gnome-utils-1.0.1.tar.gz) = c267d32ddf310b3e9f70a2d915cccf5a
+MD5 (gnome-utils-1.0.12.tar.gz) = bf95eb57c0d41d770d1709bbbfbbe897
diff --git a/misc/gnomeutils2/files/patch-aa b/misc/gnomeutils2/files/patch-aa
index c814062cbc36..57811b29cd9c 100644
--- a/misc/gnomeutils2/files/patch-aa
+++ b/misc/gnomeutils2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Tue Mar  2 00:23:40 1999
-+++ configure	Sat May 22 21:54:01 1999
-@@ -2387,7 +2387,7 @@
+--- configure.orig	Thu Jul 29 14:41:22 1999
++++ configure	Wed Aug 18 11:31:10 1999
+@@ -2410,7 +2410,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -9,16 +9,16 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
-@@ -3143,7 +3143,7 @@
+@@ -3191,7 +3191,7 @@
    
  	echo $ac_n "checking for an obGnomeConf.sh""... $ac_c" 1>&6
- echo "configure:3146: checking for an obGnomeConf.sh" >&5
+ echo "configure:3194: 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
-@@ -5389,7 +5389,7 @@
+@@ -5500,7 +5500,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
diff --git a/misc/gnomeutils2/files/patch-ad b/misc/gnomeutils2/files/patch-ad
index 4da63dbc1270..65ebff071c14 100644
--- a/misc/gnomeutils2/files/patch-ad
+++ b/misc/gnomeutils2/files/patch-ad
@@ -1,5 +1,5 @@
---- gdialog/dialog.h.orig	Tue Jan  5 17:55:34 1999
-+++ gdialog/dialog.h	Tue Jan  5 17:55:48 1999
+--- gdialog/dialog.h.orig	Tue Jul  6 16:23:33 1999
++++ gdialog/dialog.h	Wed Aug 18 11:34:23 1999
 @@ -36,24 +36,7 @@
  #include <gnome.h>
  #endif
@@ -10,7 +10,7 @@
 -#  if defined(USE_NCURSES) && !defined(RENAMED_NCURSES)
 -#    include <ncurses.h>
 -#  else
--#    ifndef _XOPEN_SOURCE_EXTENDED
+-#    if !defined(_XOPEN_SOURCE_EXTENDED) && !defined(__sgi)
 -#        define hacked 1
 -#        define _XOPEN_SOURCE_EXTENDED
 -#        define _ACS_COMPAT_CODE
diff --git a/misc/gnomeutils2/pkg-plist b/misc/gnomeutils2/pkg-plist
index 43750e5c635e..7841daeb34fc 100644
--- a/misc/gnomeutils2/pkg-plist
+++ b/misc/gnomeutils2/pkg-plist
@@ -16,7 +16,7 @@ bin/splac
 bin/splash
 share/gnome/apps/Applications/ghex.desktop
 share/gnome/apps/Applications/gtt.desktop
-share/gnome/apps/Settings/gshutdown.desktop
+share/gnome/apps/System/gshutdown.desktop
 share/gnome/apps/Utilities/gcalc.desktop
 share/gnome/apps/Utilities/gcolorsel.desktop
 share/gnome/apps/Utilities/gdiskfree.desktop
@@ -44,9 +44,11 @@ share/gnome/help/gtt/de/index.html
 share/gnome/help/gtt/de/topic.dat
 share/gnome/help/gtt/es/index.html
 share/gnome/help/gtt/es/topic.dat
+share/gnome/idl/gsu.idl
 share/gnome/pixmaps/gnome-ghex.png
 share/locale/cs/LC_MESSAGES/gnome-utils.mo
 share/locale/de/LC_MESSAGES/gnome-utils.mo
+share/locale/en_GB/LC_MESSAGES/gnome-utils.mo
 share/locale/es/LC_MESSAGES/gnome-utils.mo
 share/locale/fi/LC_MESSAGES/gnome-utils.mo
 share/locale/fr/LC_MESSAGES/gnome-utils.mo
@@ -59,6 +61,8 @@ share/locale/no/LC_MESSAGES/gnome-utils.mo
 share/locale/pt/LC_MESSAGES/gnome-utils.mo
 share/locale/ru/LC_MESSAGES/gnome-utils.mo
 share/locale/sv/LC_MESSAGES/gnome-utils.mo
+share/locale/wa/LC_MESSAGES/gnome-utils.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/gnome-utils.mo
 @dirrm share/gnome/help/gtt/es
 @dirrm share/gnome/help/gtt/de
 @dirrm share/gnome/help/gtt/C