aboutsummaryrefslogtreecommitdiff
path: root/deskutils
diff options
context:
space:
mode:
authorVanilla I. Shu <vanilla@FreeBSD.org>1999-01-05 12:59:34 +0000
committerVanilla I. Shu <vanilla@FreeBSD.org>1999-01-05 12:59:34 +0000
commitcac3c21193f057571dc8b0c22ee657e04d6c5fef (patch)
treedf8c82576549ae16f09b734418ff78cc6fe55a3f /deskutils
parent42d87f055b155104a3a24d0713462092ecfaa9ef (diff)
downloadports-cac3c21193f057571dc8b0c22ee657e04d6c5fef.tar.gz
ports-cac3c21193f057571dc8b0c22ee657e04d6c5fef.zip
Notes
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/gnome-utils/Makefile12
-rw-r--r--deskutils/gnome-utils/distinfo2
-rw-r--r--deskutils/gnome-utils/files/patch-aa281
-rw-r--r--deskutils/gnome-utils/files/patch-ad68
-rw-r--r--deskutils/gnome-utils/pkg-plist24
-rw-r--r--deskutils/gnomeutils2/Makefile12
-rw-r--r--deskutils/gnomeutils2/distinfo2
-rw-r--r--deskutils/gnomeutils2/files/patch-aa281
-rw-r--r--deskutils/gnomeutils2/files/patch-ad68
-rw-r--r--deskutils/gnomeutils2/pkg-plist24
10 files changed, 140 insertions, 634 deletions
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 1d0440818525..122bb0300e5c 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -1,13 +1,13 @@
# New ports collection makefile for: gnomeutils
-# Version required: 0.30
+# Version required: 0.99.1
# Date created: 03 July 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/10/10 15:59:18 vanilla Exp $
#
-DISTNAME= gnome-utils-0.30
-PKGNAME= gnomeutils-0.30
+DISTNAME= gnome-utils-0.99.1
+PKGNAME= gnomeutils-0.99.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
ftp://ftp.gnome.org/pub/GNOME/sources/
@@ -18,13 +18,15 @@ LIB_DEPENDS= gnome.0:${PORTSDIR}/x11/gnomelibs \
gtop.0:${PORTSDIR}/devel/libgtop
USE_X_PREFIX= yes
+USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
--datadir=${PREFIX}/share/gnome \
--with-gnome=${X11BASE}
CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \
-I${X11BASE}/include" \
- GTK_CONFIG="${X11BASE}/bin/gtk11-config" \
+ GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
+ GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
MAN1= gtt.1
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index 8ac080688c9d..8a8a6779c242 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1 +1 @@
-MD5 (gnome-utils-0.30.tar.gz) = 84c4eed5db14d65c1d81ed99987da9d4
+MD5 (gnome-utils-0.99.1.tar.gz) = 4957d79f5fcb7ded90ef1b53a6a8a262
diff --git a/deskutils/gnome-utils/files/patch-aa b/deskutils/gnome-utils/files/patch-aa
index 23b35a0f70cb..be0052528f43 100644
--- a/deskutils/gnome-utils/files/patch-aa
+++ b/deskutils/gnome-utils/files/patch-aa
@@ -1,260 +1,21 @@
---- configure.orig Wed Sep 23 00:11:28 1998
-+++ configure Fri Oct 2 22:58:32 1998
-@@ -940,12 +940,12 @@
-
-
- if test "$no_gnome_config" = "yes"; then
-- echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
--echo "configure:945: 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:945: 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
-+ echo "loading gnome configuration from $prefix/share/gnome/gnomeConf.sh"
-+ . $prefix/share/gnome/gnomeConf.sh
-
- else
- echo "$ac_t""not found" 1>&6
-@@ -2745,239 +2745,6 @@
-
-
- PROGRAMS_GNCAL="gncal"
--
--
-- for ac_prog in $OBJC egcs
--do
--# Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2756: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_OBJC'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- if test -n "$OBJC"; then
-- ac_cv_prog_OBJC="$OBJC" # Let the user override the test.
--else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_OBJC="$ac_prog"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
--fi
--fi
--OBJC="$ac_cv_prog_OBJC"
--if test -n "$OBJC"; then
-- echo "$ac_t""$OBJC" 1>&6
--else
-- echo "$ac_t""no" 1>&6
--fi
--
--test -n "$OBJC" && break
--done
--test -n "$OBJC" || OBJC=""""
--
-- if test "x$OBJC" = "x" ; then
-- for ac_prog in $OBJC gcc
--do
--# Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2791: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_OBJC'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- if test -n "$OBJC"; then
-- ac_cv_prog_OBJC="$OBJC" # Let the user override the test.
--else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_OBJC="$ac_prog"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
--fi
--fi
--OBJC="$ac_cv_prog_OBJC"
--if test -n "$OBJC"; then
-- echo "$ac_t""$OBJC" 1>&6
--else
-- echo "$ac_t""no" 1>&6
--fi
--
--test -n "$OBJC" && break
--done
--test -n "$OBJC" || OBJC=""""
--
-- fi
--
--
--
-- OBJC_LIBS="-lobjc $PTHREAD_LIB"
-- echo $ac_n "checking for sched_yield""... $ac_c" 1>&6
--echo "configure:2826: checking for sched_yield" >&5
--if eval "test \"`echo '$''{'ac_cv_func_sched_yield'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 2831 "configure"
--#include "confdefs.h"
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char sched_yield(); below. */
--#include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char sched_yield();
--
--int main() {
--
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined (__stub_sched_yield) || defined (__stub___sched_yield)
--choke me
--#else
--sched_yield();
--#endif
--
--; return 0; }
--EOF
--if { (eval echo configure:2854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-- rm -rf conftest*
-- eval "ac_cv_func_sched_yield=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_func_sched_yield=no"
--fi
--rm -f conftest*
--fi
--
--if eval "test \"`echo '$ac_cv_func_'sched_yield`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- :
--else
-- echo "$ac_t""no" 1>&6
--
-- echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
--echo "configure:2873: checking for sched_yield in -lposix4" >&5
--ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- ac_save_LIBS="$LIBS"
--LIBS="-lposix4 $OBJC_LIBS $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 2881 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char sched_yield();
--
--int main() {
--sched_yield()
--; return 0; }
--EOF
--if { (eval echo configure:2892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- OBJC_LIBS="$OBJC_LIBS -lposix4"
--else
-- echo "$ac_t""no" 1>&6
--fi
--
--fi
--
--
--
-- echo $ac_n "checking if Objective C compiler ($OBJC) works""... $ac_c" 1>&6
--echo "configure:2917: checking if Objective C compiler ($OBJC) works" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_objc_works'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
--
-- if test -n "$OBJC"; then
-- cat > conftest.m <<EOF
--#include <objc/Object.h>
--@interface myRandomObj : Object
--{
--}
--@end
--@implementation myRandomObj
--@end
--int main () {
-- /* No, you are not seeing double. Remember that square brackets
-- are the autoconf m4 quotes. */
-- id myid = [myRandomObj alloc];
-- [myid free];
-- return 0;
--}
--EOF
--
-- $OBJC -o conftest $LDFLAGS conftest.m $OBJC_LIBS 1>&5 2>&1
-- result=$?
-- rm -f conftest*
--
-- if test $result -eq 0; then
-- ac_cv_prog_objc_works=yes
-- fi
-- else
-- ac_cv_prog_objc_works=no
-- fi
--
--fi
--
--echo "$ac_t""$ac_cv_prog_objc_works" 1>&6
--
--
--
--if test x$ac_cv_prog_objc_works = xyes; then
-- OBJECTIVE_C_TRUE=
-- OBJECTIVE_C_FALSE='#'
--else
-- OBJECTIVE_C_TRUE='#'
-- OBJECTIVE_C_FALSE=
--fi
-- OBJECTIVE_C=$ac_cv_prog_objc_works
--
--if test $OBJECTIVE_C = yes; then
--
-- echo $ac_n "checking for obGnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
--echo "configure:2969: checking for obGnomeConf.sh file in $gnome_prefix" >&5
-- if test -f $gnome_prefix/obGnomeConf.sh; then
-- . $gnome_prefix/obGnomeConf.sh
-- echo "$ac_t""found" 1>&6
-- else
-- echo "$ac_t""not found" 1>&6
-- echo "configure: warning: Could not find the obGnomeConf.sh file that is generated by gnome-objc install" 1>&2
-- fi
--
--
--
--
--fi
-
- echo $ac_n "checking for working const""... $ac_c" 1>&6
- echo "configure:2984: checking for working const" >&5
+--- configure.orig Mon Jan 4 04:26:35 1999
++++ configure Tue Jan 5 17:15:09 1999
+@@ -1087,13 +1087,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:1092: 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:1092: 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
diff --git a/deskutils/gnome-utils/files/patch-ad b/deskutils/gnome-utils/files/patch-ad
index fa52d67cf7d3..4da63dbc1270 100644
--- a/deskutils/gnome-utils/files/patch-ad
+++ b/deskutils/gnome-utils/files/patch-ad
@@ -1,44 +1,28 @@
---- ltmain.sh.orig Fri Oct 2 21:17:15 1998
-+++ ltmain.sh Fri Oct 2 21:17:53 1998
-@@ -923,6 +923,16 @@
- versuffix="$current.$revision"
- ;;
+--- gdialog/dialog.h.orig Tue Jan 5 17:55:34 1999
++++ gdialog/dialog.h Tue Jan 5 17:55:48 1999
+@@ -36,24 +36,7 @@
+ #include <gnome.h>
+ #endif
-+ freebsd)
-+ version_vars="$version_vars major versuffix"
-+ major="$current"
-+ if [ $PORTOBJFORMAT = elf ]; then
-+ versuffix="$current";
-+ else
-+ versuffix="$current.$revision";
-+ fi
-+ ;;
-+
- *)
- $echo "$modename: unknown library version type \`$version_type'" 1>&2
- echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
---- ltconfig.orig Fri Oct 2 21:17:56 1998
-+++ ltconfig Fri Oct 2 21:18:47 1998
-@@ -1105,10 +1105,21 @@
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "$lib" | sed '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
- ;;
-
--freebsd2* | freebsd3*)
-+freebsd2*)
- version_type=sunos
- library_names_spec='$libname.so.$versuffix $libname.so'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+freebsd3*)
-+ version_type=freebsd
-+ library_names_spec='$libname.so.$versuffix $libname.so'
-+ if [ $PORTOBJFORMAT = elf ]; then
-+ finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m $libdir'
-+ else
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ fi
- shlibpath_var=LD_LIBRARY_PATH
- ;;
+-#ifdef ultrix
+-# include <cursesX.h>
+-#else
+-# if defined(USE_NCURSES) && !defined(RENAMED_NCURSES)
+-# include <ncurses.h>
+-# else
+-# ifndef _XOPEN_SOURCE_EXTENDED
+-# define hacked 1
+-# define _XOPEN_SOURCE_EXTENDED
+-# define _ACS_COMPAT_CODE
+-# endif
+-# include <curses.h>
+-# ifdef hacked
+-# undef _XOPEN_SOURCE_EXTENDED
+-# undef _ACS_COMPAT_CODE
+-# endif
+-# endif
+-#endif
++#include <ncurses.h>
+ /*
+ * Change these if you want
diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index d08c1297a91b..7f55fe5cfb56 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -1,22 +1,21 @@
bin/gcalc
bin/gcolorsel
+bin/gdialog
bin/gdiskfree
bin/gfontsel
bin/ghex
bin/gless
bin/gnome-run
-bin/gnomecal
-bin/gnomecard
bin/grun
bin/gsearchtool
bin/gshutdown
+bin/gstripchart
bin/gtt
bin/guname
bin/gw
bin/splac
bin/splash
share/gnome/apps/Applications/ghex.desktop
-share/gnome/apps/Productivity/gncal.desktop
share/gnome/apps/Productivity/gtt.desktop
share/gnome/apps/System/gshutdown.desktop
share/gnome/apps/Utilities/gcalc.desktop
@@ -24,32 +23,39 @@ share/gnome/apps/Utilities/gcolorsel.desktop
share/gnome/apps/Utilities/gfontsel.desktop
share/gnome/apps/Utilities/gless.desktop
share/gnome/apps/Utilities/gsearchtool.desktop
+share/gnome/apps/Utilities/gstripchart.desktop
+share/gnome/apps/Utilities/guname.desktop
share/gnome/apps/Utilities/gw.desktop
share/gnome/apps/gnome-run.desktop
-share/gnome/apps/guname.desktop
-share/gnome/help/cal/C/gnome-cal.html
-share/gnome/help/cal/C/index.html
-share/gnome/help/cal/C/topic.dat
+share/gnome/gstripchart/gstripchart.conf
share/gnome/help/ghex/C/index.html
share/gnome/help/ghex/C/topic.dat
share/gnome/help/gshutdown/C/index.html
share/gnome/help/gshutdown/C/topic.dat
+share/gnome/help/gstripchart/C/gstripchart.html
+share/gnome/help/gstripchart/C/index.html
+share/gnome/help/gstripchart/C/topic.dat
share/gnome/help/gtt/C/index.html
share/gnome/help/gtt/C/topic.dat
+share/gnome/pixmaps/gnome-ghex.png
share/locale/cs/LC_MESSAGES/gnome-utils.mo
share/locale/de/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
share/locale/ga/LC_MESSAGES/gnome-utils.mo
share/locale/it/LC_MESSAGES/gnome-utils.mo
+share/locale/ja/LC_MESSAGES/gnome-utils.mo
share/locale/ko/LC_MESSAGES/gnome-utils.mo
share/locale/no/LC_MESSAGES/gnome-utils.mo
share/locale/pt/LC_MESSAGES/gnome-utils.mo
-@dirrm share/gnome/help/cal/C
-@dirrm share/gnome/help/cal
+share/locale/sv/LC_MESSAGES/gnome-utils.mo
+@dirrm share/gnome/gstripchart
@dirrm share/gnome/help/ghex/C
@dirrm share/gnome/help/ghex
@dirrm share/gnome/help/gshutdown/C
@dirrm share/gnome/help/gshutdown
+@dirrm share/gnome/help/gstripchart/C
+@dirrm share/gnome/help/gstripchart
@dirrm share/gnome/help/gtt/C
@dirrm share/gnome/help/gtt
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index 1d0440818525..122bb0300e5c 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -1,13 +1,13 @@
# New ports collection makefile for: gnomeutils
-# Version required: 0.30
+# Version required: 0.99.1
# Date created: 03 July 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/10/10 15:59:18 vanilla Exp $
#
-DISTNAME= gnome-utils-0.30
-PKGNAME= gnomeutils-0.30
+DISTNAME= gnome-utils-0.99.1
+PKGNAME= gnomeutils-0.99.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
ftp://ftp.gnome.org/pub/GNOME/sources/
@@ -18,13 +18,15 @@ LIB_DEPENDS= gnome.0:${PORTSDIR}/x11/gnomelibs \
gtop.0:${PORTSDIR}/devel/libgtop
USE_X_PREFIX= yes
+USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
--datadir=${PREFIX}/share/gnome \
--with-gnome=${X11BASE}
CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \
-I${X11BASE}/include" \
- GTK_CONFIG="${X11BASE}/bin/gtk11-config" \
+ GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
+ GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
MAN1= gtt.1
diff --git a/deskutils/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo
index 8ac080688c9d..8a8a6779c242 100644
--- a/deskutils/gnomeutils2/distinfo
+++ b/deskutils/gnomeutils2/distinfo
@@ -1 +1 @@
-MD5 (gnome-utils-0.30.tar.gz) = 84c4eed5db14d65c1d81ed99987da9d4
+MD5 (gnome-utils-0.99.1.tar.gz) = 4957d79f5fcb7ded90ef1b53a6a8a262
diff --git a/deskutils/gnomeutils2/files/patch-aa b/deskutils/gnomeutils2/files/patch-aa
index 23b35a0f70cb..be0052528f43 100644
--- a/deskutils/gnomeutils2/files/patch-aa
+++ b/deskutils/gnomeutils2/files/patch-aa
@@ -1,260 +1,21 @@
---- configure.orig Wed Sep 23 00:11:28 1998
-+++ configure Fri Oct 2 22:58:32 1998
-@@ -940,12 +940,12 @@
-
-
- if test "$no_gnome_config" = "yes"; then
-- echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
--echo "configure:945: 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:945: 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
-+ echo "loading gnome configuration from $prefix/share/gnome/gnomeConf.sh"
-+ . $prefix/share/gnome/gnomeConf.sh
-
- else
- echo "$ac_t""not found" 1>&6
-@@ -2745,239 +2745,6 @@
-
-
- PROGRAMS_GNCAL="gncal"
--
--
-- for ac_prog in $OBJC egcs
--do
--# Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2756: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_OBJC'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- if test -n "$OBJC"; then
-- ac_cv_prog_OBJC="$OBJC" # Let the user override the test.
--else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_OBJC="$ac_prog"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
--fi
--fi
--OBJC="$ac_cv_prog_OBJC"
--if test -n "$OBJC"; then
-- echo "$ac_t""$OBJC" 1>&6
--else
-- echo "$ac_t""no" 1>&6
--fi
--
--test -n "$OBJC" && break
--done
--test -n "$OBJC" || OBJC=""""
--
-- if test "x$OBJC" = "x" ; then
-- for ac_prog in $OBJC gcc
--do
--# Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2791: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_OBJC'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- if test -n "$OBJC"; then
-- ac_cv_prog_OBJC="$OBJC" # Let the user override the test.
--else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_OBJC="$ac_prog"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
--fi
--fi
--OBJC="$ac_cv_prog_OBJC"
--if test -n "$OBJC"; then
-- echo "$ac_t""$OBJC" 1>&6
--else
-- echo "$ac_t""no" 1>&6
--fi
--
--test -n "$OBJC" && break
--done
--test -n "$OBJC" || OBJC=""""
--
-- fi
--
--
--
-- OBJC_LIBS="-lobjc $PTHREAD_LIB"
-- echo $ac_n "checking for sched_yield""... $ac_c" 1>&6
--echo "configure:2826: checking for sched_yield" >&5
--if eval "test \"`echo '$''{'ac_cv_func_sched_yield'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 2831 "configure"
--#include "confdefs.h"
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char sched_yield(); below. */
--#include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char sched_yield();
--
--int main() {
--
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined (__stub_sched_yield) || defined (__stub___sched_yield)
--choke me
--#else
--sched_yield();
--#endif
--
--; return 0; }
--EOF
--if { (eval echo configure:2854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-- rm -rf conftest*
-- eval "ac_cv_func_sched_yield=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_func_sched_yield=no"
--fi
--rm -f conftest*
--fi
--
--if eval "test \"`echo '$ac_cv_func_'sched_yield`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- :
--else
-- echo "$ac_t""no" 1>&6
--
-- echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
--echo "configure:2873: checking for sched_yield in -lposix4" >&5
--ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- ac_save_LIBS="$LIBS"
--LIBS="-lposix4 $OBJC_LIBS $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 2881 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char sched_yield();
--
--int main() {
--sched_yield()
--; return 0; }
--EOF
--if { (eval echo configure:2892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- OBJC_LIBS="$OBJC_LIBS -lposix4"
--else
-- echo "$ac_t""no" 1>&6
--fi
--
--fi
--
--
--
-- echo $ac_n "checking if Objective C compiler ($OBJC) works""... $ac_c" 1>&6
--echo "configure:2917: checking if Objective C compiler ($OBJC) works" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_objc_works'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
--
-- if test -n "$OBJC"; then
-- cat > conftest.m <<EOF
--#include <objc/Object.h>
--@interface myRandomObj : Object
--{
--}
--@end
--@implementation myRandomObj
--@end
--int main () {
-- /* No, you are not seeing double. Remember that square brackets
-- are the autoconf m4 quotes. */
-- id myid = [myRandomObj alloc];
-- [myid free];
-- return 0;
--}
--EOF
--
-- $OBJC -o conftest $LDFLAGS conftest.m $OBJC_LIBS 1>&5 2>&1
-- result=$?
-- rm -f conftest*
--
-- if test $result -eq 0; then
-- ac_cv_prog_objc_works=yes
-- fi
-- else
-- ac_cv_prog_objc_works=no
-- fi
--
--fi
--
--echo "$ac_t""$ac_cv_prog_objc_works" 1>&6
--
--
--
--if test x$ac_cv_prog_objc_works = xyes; then
-- OBJECTIVE_C_TRUE=
-- OBJECTIVE_C_FALSE='#'
--else
-- OBJECTIVE_C_TRUE='#'
-- OBJECTIVE_C_FALSE=
--fi
-- OBJECTIVE_C=$ac_cv_prog_objc_works
--
--if test $OBJECTIVE_C = yes; then
--
-- echo $ac_n "checking for obGnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
--echo "configure:2969: checking for obGnomeConf.sh file in $gnome_prefix" >&5
-- if test -f $gnome_prefix/obGnomeConf.sh; then
-- . $gnome_prefix/obGnomeConf.sh
-- echo "$ac_t""found" 1>&6
-- else
-- echo "$ac_t""not found" 1>&6
-- echo "configure: warning: Could not find the obGnomeConf.sh file that is generated by gnome-objc install" 1>&2
-- fi
--
--
--
--
--fi
-
- echo $ac_n "checking for working const""... $ac_c" 1>&6
- echo "configure:2984: checking for working const" >&5
+--- configure.orig Mon Jan 4 04:26:35 1999
++++ configure Tue Jan 5 17:15:09 1999
+@@ -1087,13 +1087,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:1092: 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:1092: 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
diff --git a/deskutils/gnomeutils2/files/patch-ad b/deskutils/gnomeutils2/files/patch-ad
index fa52d67cf7d3..4da63dbc1270 100644
--- a/deskutils/gnomeutils2/files/patch-ad
+++ b/deskutils/gnomeutils2/files/patch-ad
@@ -1,44 +1,28 @@
---- ltmain.sh.orig Fri Oct 2 21:17:15 1998
-+++ ltmain.sh Fri Oct 2 21:17:53 1998
-@@ -923,6 +923,16 @@
- versuffix="$current.$revision"
- ;;
+--- gdialog/dialog.h.orig Tue Jan 5 17:55:34 1999
++++ gdialog/dialog.h Tue Jan 5 17:55:48 1999
+@@ -36,24 +36,7 @@
+ #include <gnome.h>
+ #endif
-+ freebsd)
-+ version_vars="$version_vars major versuffix"
-+ major="$current"
-+ if [ $PORTOBJFORMAT = elf ]; then
-+ versuffix="$current";
-+ else
-+ versuffix="$current.$revision";
-+ fi
-+ ;;
-+
- *)
- $echo "$modename: unknown library version type \`$version_type'" 1>&2
- echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
---- ltconfig.orig Fri Oct 2 21:17:56 1998
-+++ ltconfig Fri Oct 2 21:18:47 1998
-@@ -1105,10 +1105,21 @@
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "$lib" | sed '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
- ;;
-
--freebsd2* | freebsd3*)
-+freebsd2*)
- version_type=sunos
- library_names_spec='$libname.so.$versuffix $libname.so'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+freebsd3*)
-+ version_type=freebsd
-+ library_names_spec='$libname.so.$versuffix $libname.so'
-+ if [ $PORTOBJFORMAT = elf ]; then
-+ finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m $libdir'
-+ else
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ fi
- shlibpath_var=LD_LIBRARY_PATH
- ;;
+-#ifdef ultrix
+-# include <cursesX.h>
+-#else
+-# if defined(USE_NCURSES) && !defined(RENAMED_NCURSES)
+-# include <ncurses.h>
+-# else
+-# ifndef _XOPEN_SOURCE_EXTENDED
+-# define hacked 1
+-# define _XOPEN_SOURCE_EXTENDED
+-# define _ACS_COMPAT_CODE
+-# endif
+-# include <curses.h>
+-# ifdef hacked
+-# undef _XOPEN_SOURCE_EXTENDED
+-# undef _ACS_COMPAT_CODE
+-# endif
+-# endif
+-#endif
++#include <ncurses.h>
+ /*
+ * Change these if you want
diff --git a/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist
index d08c1297a91b..7f55fe5cfb56 100644
--- a/deskutils/gnomeutils2/pkg-plist
+++ b/deskutils/gnomeutils2/pkg-plist
@@ -1,22 +1,21 @@
bin/gcalc
bin/gcolorsel
+bin/gdialog
bin/gdiskfree
bin/gfontsel
bin/ghex
bin/gless
bin/gnome-run
-bin/gnomecal
-bin/gnomecard
bin/grun
bin/gsearchtool
bin/gshutdown
+bin/gstripchart
bin/gtt
bin/guname
bin/gw
bin/splac
bin/splash
share/gnome/apps/Applications/ghex.desktop
-share/gnome/apps/Productivity/gncal.desktop
share/gnome/apps/Productivity/gtt.desktop
share/gnome/apps/System/gshutdown.desktop
share/gnome/apps/Utilities/gcalc.desktop
@@ -24,32 +23,39 @@ share/gnome/apps/Utilities/gcolorsel.desktop
share/gnome/apps/Utilities/gfontsel.desktop
share/gnome/apps/Utilities/gless.desktop
share/gnome/apps/Utilities/gsearchtool.desktop
+share/gnome/apps/Utilities/gstripchart.desktop
+share/gnome/apps/Utilities/guname.desktop
share/gnome/apps/Utilities/gw.desktop
share/gnome/apps/gnome-run.desktop
-share/gnome/apps/guname.desktop
-share/gnome/help/cal/C/gnome-cal.html
-share/gnome/help/cal/C/index.html
-share/gnome/help/cal/C/topic.dat
+share/gnome/gstripchart/gstripchart.conf
share/gnome/help/ghex/C/index.html
share/gnome/help/ghex/C/topic.dat
share/gnome/help/gshutdown/C/index.html
share/gnome/help/gshutdown/C/topic.dat
+share/gnome/help/gstripchart/C/gstripchart.html
+share/gnome/help/gstripchart/C/index.html
+share/gnome/help/gstripchart/C/topic.dat
share/gnome/help/gtt/C/index.html
share/gnome/help/gtt/C/topic.dat
+share/gnome/pixmaps/gnome-ghex.png
share/locale/cs/LC_MESSAGES/gnome-utils.mo
share/locale/de/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
share/locale/ga/LC_MESSAGES/gnome-utils.mo
share/locale/it/LC_MESSAGES/gnome-utils.mo
+share/locale/ja/LC_MESSAGES/gnome-utils.mo
share/locale/ko/LC_MESSAGES/gnome-utils.mo
share/locale/no/LC_MESSAGES/gnome-utils.mo
share/locale/pt/LC_MESSAGES/gnome-utils.mo
-@dirrm share/gnome/help/cal/C
-@dirrm share/gnome/help/cal
+share/locale/sv/LC_MESSAGES/gnome-utils.mo
+@dirrm share/gnome/gstripchart
@dirrm share/gnome/help/ghex/C
@dirrm share/gnome/help/ghex
@dirrm share/gnome/help/gshutdown/C
@dirrm share/gnome/help/gshutdown
+@dirrm share/gnome/help/gstripchart/C
+@dirrm share/gnome/help/gstripchart
@dirrm share/gnome/help/gtt/C
@dirrm share/gnome/help/gtt