Update to GNOME 2.0 RC2.

4 files changed, 18 insertions, 69 deletions

diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 979271857654..739e3f89bdb6 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	gnomeutils2
-PORTVERSION=	1.104.0
+PORTVERSION=	1.5.0
+PORTEPOCH=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020501
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020509
 DISTNAME=	gnome-utils-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -27,9 +28,9 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-MAN1=	archive-generator.1 gdialog.1 gnome-calculator.1 \
+MAN1=	archive-generator.1 gnome-calculator.1 \
 	gnome-character-map.1 gnome-dictionary.1 \
-	gnome-exe-handler.1 gnome-search-tool.1 gnome-system-log.1
+	gnome-search-tool.1 gnome-system-log.1
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index 46acda36ce55..9eb976f0a71a 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-utils-1.104.0.tar.bz2) = 49a1e34836787221c04d83a2c292dab0
+MD5 (gnome2/gnome-utils-1.5.0.tar.bz2) = 0a2d9859203a45d488de0cb01d95244c
diff --git a/deskutils/gnome-utils/files/patch-configure b/deskutils/gnome-utils/files/patch-configure
index 05aa4ad72188..5e293fbc04b0 100644
--- a/deskutils/gnome-utils/files/patch-configure
+++ b/deskutils/gnome-utils/files/patch-configure
@@ -1,36 +1,6 @@
---- 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 7016 "configure"
- #include "confdefs.h"
-@@ -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 7071 "configure"
- #include "confdefs.h"
-@@ -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"
-+  PAM_LIBS="-lpam -lpam_misc"
- else
--  PAM_LIBS="-ldl -lpam"
-+  PAM_LIBS="-lpam"
- fi
- 
- else
-@@ -8843,7 +8843,7 @@
+--- configure.orig	Sun May 12 01:05:15 2002
++++ configure	Sun May 12 01:08:20 2002
+@@ -8258,7 +8258,7 @@
  	< $srcdir/po/POTFILES.in > po/POTFILES
  
  cat >>confdefs.h <<EOF
@@ -38,4 +8,4 @@
 +#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"
+ 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"
diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index 80761326799a..7629db577869 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -1,20 +1,12 @@
 bin/archive-generator
-bin/gdialog
 bin/gdict-applet
 bin/gnome-calculator
 bin/gnome-character-map
 bin/gnome-dictionary
-bin/gnome-exe-handler
 bin/gnome-search-tool
 bin/gnome-system-log
-etc/gconf/gconf.xml.defaults/apps/gcharmap/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gdict/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gcharmap/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gdict/%gconf.xml
-etc/gconf/schemas/gcharmap.schemas
 etc/gconf/schemas/gdict.schemas
 libdata/bonobo/servers/GNOME_GDictApplet.server
-share/gnome/application-registry/gnome-exe.applications
 share/gnome/applications/archive-generator.desktop
 share/gnome/applications/gnome-calculator.desktop
 share/gnome/applications/gnome-character-map.desktop
@@ -25,11 +17,11 @@ share/gnome/gnome-2.0/ui/GNOME_GDictApplet.xml
 share/gnome/gnome-system-log/gnome-system-log-actions.db
 share/gnome/gnome-system-log/gnome-system-log-descript.db
 share/gnome/gnome-system-log/gnome-system-log-regexp.db
-share/gnome/help/gdialog/C/figures/example-dialog.png
-share/gnome/help/gdialog/C/figures/gdialog-msgbox.png
-share/gnome/help/gdialog/C/figures/gdialog-yesno.png
-share/gnome/help/gdialog/C/gdialog.xml
-share/gnome/help/gdialog/C/legal.xml
+share/gnome/help/archive-generator/C/archive-generator.xml
+share/gnome/help/archive-generator/C/figures/archive-generator-addfile.png
+share/gnome/help/archive-generator/C/figures/archive-generator-contents.png
+share/gnome/help/archive-generator/C/figures/archive-generator.png
+share/gnome/help/archive-generator/C/legal.xml
 share/gnome/help/gnome-calculator/C/figures/gcalc_window.png
 share/gnome/help/gnome-calculator/C/gnome-calculator.xml
 share/gnome/help/gnome-calculator/C/legal.xml
@@ -49,19 +41,13 @@ share/gnome/help/gnome-search-tool/C/legal.xml
 share/gnome/help/gnome-system-log/C/figures/gnome-system-log.png
 share/gnome/help/gnome-system-log/C/gnome-system-log.xml
 share/gnome/help/gnome-system-log/C/legal.xml
-share/gnome/help/meat-grinder/C/figures/meat-grinder-main-full.png
-share/gnome/help/meat-grinder/C/figures/meat-grinder-main.png
-share/gnome/help/meat-grinder/C/legal.xml
-share/gnome/help/meat-grinder/C/meat-grinder.xml
 share/gnome/idl/gsu.idl
-share/gnome/mime-info/gnome-exe.keys
-share/gnome/omf/gnome-utils/gdialog-C.omf
+share/gnome/omf/gnome-utils/archive-generator-C.omf
 share/gnome/omf/gnome-utils/gnome-calculator-C.omf
 share/gnome/omf/gnome-utils/gnome-character-map-C.omf
 share/gnome/omf/gnome-utils/gnome-dictionary-C.omf
 share/gnome/omf/gnome-utils/gnome-search-tool-C.omf
 share/gnome/omf/gnome-utils/gnome-system-log-C.omf
-share/gnome/omf/gnome-utils/meat-grinder-C.omf
 share/gnome/pixmaps/gdict.png
 share/gnome/pixmaps/gnome-character-map.png
 share/gnome/pixmaps/gnome-searchtool.png
@@ -75,6 +61,7 @@ share/locale/el/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/en_GB/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/es/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/et/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/eu/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/fi/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-utils-2.0.mo
@@ -100,14 +87,12 @@ share/locale/sv/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/vi/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/pixmaps/gnome-system-log
 @dirrm share/gnome/omf/gnome-utils
-@dirrm share/gnome/help/meat-grinder/C/figures
-@dirrm share/gnome/help/meat-grinder/C
-@dirrm share/gnome/help/meat-grinder
 @dirrm share/gnome/help/gnome-system-log/C/figures
 @dirrm share/gnome/help/gnome-system-log/C
 @dirrm share/gnome/help/gnome-system-log
@@ -122,11 +107,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/gnome-calculator/C/figures
 @dirrm share/gnome/help/gnome-calculator/C
 @dirrm share/gnome/help/gnome-calculator
-@dirrm share/gnome/help/gdialog/C/figures
-@dirrm share/gnome/help/gdialog/C
-@dirrm share/gnome/help/gdialog
 @dirrm share/gnome/gnome-system-log
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gdict
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gcharmap
-@dirrm etc/gconf/gconf.xml.defaults/apps/gdict
-@dirrm etc/gconf/gconf.xml.defaults/apps/gcharmap