Update to 1.4.1.2.

4 files changed, 48 insertions, 22 deletions

diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index a48a04aeb2b9..fa2a727c884a 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomeutils
-PORTVERSION=	1.4.1.1
+PORTVERSION=	1.4.1.2
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-utils
@@ -26,6 +26,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib" \
 		MSGFMT=${LOCALBASE}/bin/msgfmt-new \
 		XGETTEXT=${LOCALBASE}/bin/xgettext-new
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=	gcalc.1 gcharmap.1 gcolorsel.1 gdialog.1 gdict.1 gdiskfree.1 \
 	gfontsel.1 gless.1 gnome-exe-handler.1 gsearchtool.1 guname.1 gw.1 \
diff --git a/deskutils/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo
index f5846575595a..cc8dc6cb463a 100644
--- a/deskutils/gnomeutils2/distinfo
+++ b/deskutils/gnomeutils2/distinfo
@@ -1 +1 @@
-MD5 (gnome-utils-1.4.1.1.tar.gz) = 9e8a004bf2e6aec7175e9cab8263d609
+MD5 (gnome-utils-1.4.1.2.tar.gz) = 02bd79a6c5d7f89c2485f3a4258d22fd
diff --git a/deskutils/gnomeutils2/files/patch-configure b/deskutils/gnomeutils2/files/patch-configure
index a69ca4648e8f..f325cf4f329d 100644
--- a/deskutils/gnomeutils2/files/patch-configure
+++ b/deskutils/gnomeutils2/files/patch-configure
@@ -1,36 +1,59 @@
 
 $FreeBSD$
 
---- configure	2001/07/03 16:13:39	1.1
-+++ configure	2001/07/03 16:14:05
-@@ -6438,7 +6438,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
+--- 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 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   ac_save_LIBS="$LIBS"
+   ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpam -ldl $LIBS"
 +LIBS="-lpam $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 6444 "configure"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line 9472 "configure"
  #include "confdefs.h"
-@@ -6478,7 +6478,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -9522,7 +9522,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   ac_save_LIBS="$LIBS"
+   ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpam_misc -ldl -lpam $LIBS"
 +LIBS="-lpam_misc -lpam $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 6484 "configure"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line 9527 "configure"
  #include "confdefs.h"
-@@ -6506,10 +6506,10 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
+@@ -9566,9 +9566,9 @@
+ echo "$as_me:9566: 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"
 +  PAM_LIBS="-lpam -lpam_misc"
  else
-   echo "$ac_t""no" 1>&6
--PAM_LIBS="-ldl -lpam"
-+PAM_LIBS="-lpam"
+-  PAM_LIBS="-ldl -lpam"
++  PAM_LIBS="-lpam"
  fi
  
- 
+ else
diff --git a/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist
index 128041738797..c233d1ed4614 100644
--- a/deskutils/gnomeutils2/pkg-plist
+++ b/deskutils/gnomeutils2/pkg-plist
@@ -498,6 +498,7 @@ share/gnome/help/gtt/C/gtt.sgml
 share/gnome/help/gtt/C/index.html
 share/gnome/help/gtt/C/license.html
 share/gnome/help/gtt/C/ln10.html
+share/gnome/help/gtt/C/ln13.html
 share/gnome/help/gtt/C/preferences.html
 share/gnome/help/gtt/C/stylesheet-images/caution.gif
 share/gnome/help/gtt/C/stylesheet-images/home.gif
@@ -733,6 +734,7 @@ share/locale/el/LC_MESSAGES/gnome-utils.mo
 share/locale/en_GB/LC_MESSAGES/gnome-utils.mo
 share/locale/es/LC_MESSAGES/gnome-utils.mo
 share/locale/et/LC_MESSAGES/gnome-utils.mo
+share/locale/eu/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