Add gnomeutils2 after repo copy from gnomeutils. These are miscellaneous

utilities for the GNOME 2.0 desktop.

5 files changed, 48 insertions, 66 deletions

diff --git a/deskutils/gnomeutils2/files/patch-ai b/deskutils/gnomeutils2/files/patch-ai
index ec9d6d7b3f42..fb458fceab12 100644
--- a/deskutils/gnomeutils2/files/patch-ai
+++ b/deskutils/gnomeutils2/files/patch-ai
@@ -1,5 +1,5 @@
---- sgmldocs.make	2001/07/03 13:56:19	1.1
-+++ sgmldocs.make	2001/07/03 13:56:34
+--- sgmldocs.make.orig	Mon May  6 23:46:55 2002
++++ sgmldocs.make	Mon May  6 23:47:10 2002
 @@ -32,7 +32,7 @@
  #   dist-hook: app-dist-hook
  #
diff --git a/deskutils/gnomeutils2/files/patch-configure b/deskutils/gnomeutils2/files/patch-configure
index f325cf4f329d..05aa4ad72188 100644
--- a/deskutils/gnomeutils2/files/patch-configure
+++ b/deskutils/gnomeutils2/files/patch-configure
@@ -1,52 +1,25 @@
-
-$FreeBSD$
-
---- configure.orig	Fri Feb  8 11:02:55 2002
-+++ configure	Fri Feb  8 11:47:15 2002
-@@ -1193,10 +1193,10 @@
- 
- # The aliases save the names the user supplied, while $host etc.
- # will get canonicalized.
--test -n "$target_alias" &&
--  test "$program_prefix$program_suffix$program_transform_name" = \
--    NONENONEs,x,x, &&
--  program_prefix=${target_alias}-
-+#test -n "$target_alias" &&
-+#  test "$program_prefix$program_suffix$program_transform_name" = \
-+#    NONENONEs,x,x, &&
-+#  program_prefix=${target_alias}-
- 
- # Find a good install program.  We prefer a C program (faster),
- # so one script is as good as another.  But avoid the broken or
-@@ -8721,7 +8721,7 @@
- echo "$as_me:8721: result: $ac_cv_lib_dl_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
- if test $ac_cv_lib_dl_dlopen = yes; then
--  GUILE_LIBS="-ldl $GUILE_LIBS"
-+  GUILE_LIBS="$GUILE_LIBS"
- fi
- 
- 		echo "$as_me:8727: checking for t_accept in -lnsl" >&5
-@@ -9467,7 +9467,7 @@
+--- configure.orig	Tue May  7 00:01:18 2002
++++ configure	Tue May  7 00:01:47 2002
+@@ -7011,7 +7011,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpam -ldl $LIBS"
 +LIBS="-lpam $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line 9472 "configure"
+ #line 7016 "configure"
  #include "confdefs.h"
-@@ -9522,7 +9522,7 @@
+@@ -7066,7 +7066,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpam_misc -ldl -lpam $LIBS"
 +LIBS="-lpam_misc -lpam $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line 9527 "configure"
+ #line 7071 "configure"
  #include "confdefs.h"
-@@ -9566,9 +9566,9 @@
- echo "$as_me:9566: result: $ac_cv_lib_pam_misc_pam_misc_setenv" >&5
+@@ -7110,9 +7110,9 @@
+ echo "$as_me:7110: result: $ac_cv_lib_pam_misc_pam_misc_setenv" >&5
  echo "${ECHO_T}$ac_cv_lib_pam_misc_pam_misc_setenv" >&6
  if test $ac_cv_lib_pam_misc_pam_misc_setenv = yes; then
 -  PAM_LIBS="-ldl -lpam -lpam_misc"
@@ -57,3 +30,12 @@ $FreeBSD$
  fi
  
  else
+@@ -8843,7 +8843,7 @@
+ 	< $srcdir/po/POTFILES.in > po/POTFILES
+ 
+ cat >>confdefs.h <<EOF
+-#define GNOME_ICONDIR "${prefix}/share/pixmaps"
++#define GNOME_ICONDIR "${datadir}/pixmaps"
+ EOF
+ 
+ ac_config_files="$ac_config_files Makefile gnome-utils.spec po/Makefile.in idl/Makefile gcalc/Makefile gcalc/help/Makefile gcalc/help/C/Makefile logview/Makefile logview/gnome-system-log-security logview/pixmaps/Makefile logview/help/Makefile logview/help/C/Makefile gcharmap/Makefile gcharmap/src/Makefile gcharmap/pixmaps/Makefile gcharmap/help/Makefile gcharmap/help/C/Makefile gsearchtool/Makefile gsearchtool/help/Makefile gsearchtool/help/C/Makefile gdialog/Makefile gdialog/help/Makefile gdialog/help/C/Makefile gdictsrc/Makefile gdictsrc/help/Makefile gdictsrc/help/C/Makefile gfloppy/Makefile gfloppy/doc/Makefile gfloppy/doc/C/Makefile gfloppy/src/Makefile meat-grinder/Makefile meat-grinder/help/Makefile meat-grinder/help/C/Makefile exe-handler/Makefile"
diff --git a/deskutils/gnomeutils2/files/patch-gtt::util.c b/deskutils/gnomeutils2/files/patch-gtt::util.c
deleted file mode 100644
index e22969c3273c..000000000000
--- a/deskutils/gnomeutils2/files/patch-gtt::util.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- gtt/util.c	2001/10/10 09:55:09	1.1
-+++ gtt/util.c	2001/10/10 09:57:22
-@@ -32,7 +32,9 @@
- #include <gnome.h>
- 
- /* hack alert --xxx fixme -- we need to configure.in for have_langinfo */
-+#if (defined __FreeBSD__) && (__FreeBSD_version > 500000)
- #define HAVE_LANGINFO_D_FMT
-+#endif
- #ifdef HAVE_LANGINFO_D_FMT
- #include <langinfo.h>
- #endif
diff --git a/deskutils/gnomeutils2/files/patch-logview_logview.c b/deskutils/gnomeutils2/files/patch-logview_logview.c
new file mode 100644
index 000000000000..49e8b06b31bc
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-logview_logview.c
@@ -0,0 +1,29 @@
+--- logview/logview.c.orig	Tue May  7 00:03:16 2002
++++ logview/logview.c	Tue May  7 00:04:37 2002
+@@ -903,7 +903,7 @@
+ 
+ 	if ( ! found) {
+ 		g_snprintf (full_name, sizeof (full_name),
+-			    "%s/share/gnome-system-log/gnome-system-log-regexp.db", LOGVIEWINSTALLPREFIX);
++			    "%s/gnome-system-log/gnome-system-log-regexp.db", DATADIR);
+ 		if (access (full_name, R_OK) == 0) {
+ 			found = TRUE;
+ 			g_free (cfg->regexp_db_path);
+@@ -926,7 +926,7 @@
+ 
+ 	if ( ! found) {
+ 		g_snprintf (full_name, sizeof (full_name),
+-			    "%s/share/gnome-system-log/gnome-system-log-descript.db", LOGVIEWINSTALLPREFIX);
++			    "%s/gnome-system-log/gnome-system-log-descript.db", DATADIR);
+ 		if (access (full_name, R_OK) == 0) {
+ 			found = TRUE;
+ 			g_free (cfg->descript_db_path);
+@@ -960,7 +960,7 @@
+ 
+ 	if ( ! found) {
+ 		g_snprintf (full_name, sizeof (full_name),
+-			    "%s/share/gnome-system-log/gnome-system-log-actions.db", LOGVIEWINSTALLPREFIX);
++			    "%s/gnome-system-log/gnome-system-log-actions.db", DATADIR);
+ 		if (access (full_name, R_OK) == 0) {
+ 			found = TRUE;
+ 			g_free (cfg->action_db_path);
diff --git a/deskutils/gnomeutils2/files/patch-po::Makefile.in.in b/deskutils/gnomeutils2/files/patch-po::Makefile.in.in
deleted file mode 100644
index 2d1ff382a72f..000000000000
--- a/deskutils/gnomeutils2/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- po/Makefile.in.in.orig	Tue Jul  3 19:44:24 2001
-+++ po/Makefile.in.in	Tue Jul  3 19:51:42 2001
-@@ -106,7 +106,7 @@
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
--	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then \