Update to the latest GNOME 2.0 snapshot, the "Stay on target!" release.

4 files changed, 11 insertions, 15 deletions

diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 820774037a98..2da8b85e050f 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	1.1.16
+PORTVERSION=	1.1.17
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
 DIST_SUBDIR=	gnome2
 DISTNAME=	nautilus-${PORTVERSION}
 
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
index 76c3658eb785..4f5c69535381 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/nautilus-1.1.16.tar.bz2) = 182bc2ec3b04c8442496244fa696a781
+MD5 (gnome2/nautilus-1.1.17.tar.bz2) = 2c12ff181865d1690fe21bb320f779eb
diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa
index e8202cff9feb..1352642e2602 100644
--- a/x11-fm/nautilus2/files/patch-aa
+++ b/x11-fm/nautilus2/files/patch-aa
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig	Fri May 17 18:08:30 2002
-+++ configure	Fri May 17 18:09:02 2002
-@@ -7480,6 +7480,7 @@
+--- configure.orig	Tue May 28 00:57:18 2002
++++ configure	Tue May 28 01:00:25 2002
+@@ -7495,6 +7495,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,7 +8,7 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -12030,14 +12031,14 @@
+@@ -12398,14 +12399,14 @@
  
  LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`"
  
@@ -28,7 +25,7 @@ $FreeBSD$
  
  COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0"
  COMPONENT_CFLAGS="`$PKG_CONFIG --cflags $COMPONENT_MODULES`"
-@@ -12746,9 +12747,9 @@
+@@ -13114,9 +13115,9 @@
  s,@ORBIT_CONFIG@,$ORBIT_CONFIG,;t t
  s,@ORBIT_IDL@,$ORBIT_IDL,;t t
  s,@ORBIT_CFLAGS@,$ORBIT_CFLAGS,;t t
@@ -40,13 +37,12 @@ $FreeBSD$
  s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
  s,@ALLOCA@,$ALLOCA,;t t
  s,@USE_NLS@,$USE_NLS,;t t
-@@ -12799,23 +12800,23 @@
+@@ -13171,22 +13172,22 @@
  s,@HAVE_JW_FALSE@,$HAVE_JW_FALSE,;t t
  s,@HAVE_JW@,$HAVE_JW,;t t
  s,@MEDUSA_CFLAGS@,$MEDUSA_CFLAGS,;t t
 -s,@MEDUSA_LIBS@,$MEDUSA_LIBS,;t t
 +s~@MEDUSA_LIBS@~$MEDUSA_LIBS~;t t
- s,@LIBPNG@,$LIBPNG,;t t
  s,@LIBJPEG@,$LIBJPEG,;t t
  s,@GIMPHWRAPBOX_CFLAGS@,$GIMPHWRAPBOX_CFLAGS,;t t
  s,@LIBNAUTILUS_CFLAGS@,$LIBNAUTILUS_CFLAGS,;t t
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index 62a3a7d41bf8..a6dcde2304f7 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -2,9 +2,7 @@ bin/nautilus
 bin/nautilus-adapter
 bin/nautilus-content-loser
 bin/nautilus-hardware-view
-bin/nautilus-history-view
 bin/nautilus-music-view
-bin/nautilus-notes
 bin/nautilus-sample-content-view
 bin/nautilus-sidebar-loser
 bin/nautilus-text-view
@@ -44,6 +42,8 @@ include/libnautilus/nautilus-view.h
 lib/libnautilus-adapter.a
 lib/libnautilus-adapter.so
 lib/libnautilus-adapter.so.2
+lib/libnautilus-history-view.so
+lib/libnautilus-notes-view.so
 lib/libnautilus-private.a
 lib/libnautilus-private.so
 lib/libnautilus-private.so.2