summaryrefslogtreecommitdiffstats
path: root/x11-fm
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2003-06-29 00:20:39 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2003-06-29 00:20:39 +0800
commit3406ce259a4555846d57ed8c72195b718ed58730 (patch)
treee30b72648a2d63465d4e01d543a318e2bb3b7dae /x11-fm
parent0b67979d94f05ec1507c6f44801e89cafefb2054 (diff)
downloadmarcuscom-ports-3406ce259a4555846d57ed8c72195b718ed58730.tar
marcuscom-ports-3406ce259a4555846d57ed8c72195b718ed58730.tar.gz
marcuscom-ports-3406ce259a4555846d57ed8c72195b718ed58730.tar.bz2
marcuscom-ports-3406ce259a4555846d57ed8c72195b718ed58730.tar.lz
marcuscom-ports-3406ce259a4555846d57ed8c72195b718ed58730.tar.xz
marcuscom-ports-3406ce259a4555846d57ed8c72195b718ed58730.tar.zst
marcuscom-ports-3406ce259a4555846d57ed8c72195b718ed58730.zip
Update to 2.3.6.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@929 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-fm')
-rw-r--r--x11-fm/nautilus/Makefile2
-rw-r--r--x11-fm/nautilus/distinfo2
-rw-r--r--x11-fm/nautilus/files/patch-aa17
-rw-r--r--x11-fm/nautilus/pkg-plist137
-rw-r--r--x11-fm/nautilus2/Makefile2
-rw-r--r--x11-fm/nautilus2/distinfo2
-rw-r--r--x11-fm/nautilus2/files/patch-aa17
-rw-r--r--x11-fm/nautilus2/pkg-plist137
8 files changed, 34 insertions, 282 deletions
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 1fd0f042f..0fbe82374 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= nautilus2
-PORTVERSION= 2.3.4
+PORTVERSION= 2.3.6
CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.3
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index a11e0a702..b45fbcae1 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1 +1 @@
-MD5 (gnome2/nautilus-2.3.4.tar.bz2) = d7e011c2495531986c7f042021a2055c
+MD5 (gnome2/nautilus-2.3.6.tar.bz2) = beab3c5af9084ba20552cede87fb7ea7
diff --git a/x11-fm/nautilus/files/patch-aa b/x11-fm/nautilus/files/patch-aa
index 4de4fc8fe..3881dec5e 100644
--- a/x11-fm/nautilus/files/patch-aa
+++ b/x11-fm/nautilus/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig Mon Jan 13 10:45:25 2003
-+++ configure Tue Jan 14 13:11:53 2003
-@@ -12661,7 +12662,7 @@
+--- configure.orig Sat Jun 28 00:42:27 2003
++++ configure Sat Jun 28 00:44:45 2003
+@@ -12860,7 +12860,7 @@
LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`"
@@ -9,7 +9,7 @@
CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES"
-@@ -12669,7 +12670,7 @@
+@@ -12868,7 +12868,7 @@
CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs"
@@ -18,16 +18,16 @@
COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0 gnome-desktop-2.0"
-@@ -13593,7 +13594,7 @@
- s,@LIBTOOL@,$LIBTOOL,;t t
+@@ -13849,7 +13849,7 @@
s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+ s,@STARTUP_NOTIFICATION_PACKAGE@,$STARTUP_NOTIFICATION_PACKAGE,;t t
s,@ALL_CFLAGS@,$ALL_CFLAGS,;t t
-s,@ALL_LIBS@,$ALL_LIBS,;t t
+s~@ALL_LIBS@~$ALL_LIBS~;t t
s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
- s,@ALLOCA@,$ALLOCA,;t t
s,@USE_NLS@,$USE_NLS,;t t
-@@ -13643,25 +13644,25 @@
+ s,@MSGFMT@,$MSGFMT,;t t
+@@ -13901,26 +13901,26 @@
s,@HAVE_JW_FALSE@,$HAVE_JW_FALSE,;t t
s,@HAVE_JW@,$HAVE_JW,;t t
s,@MEDUSA_CFLAGS@,$MEDUSA_CFLAGS,;t t
@@ -35,6 +35,7 @@
+s~@MEDUSA_LIBS@~$MEDUSA_LIBS~;t t
s,@LIBJPEG@,$LIBJPEG,;t t
s,@GIMPHWRAPBOX_CFLAGS@,$GIMPHWRAPBOX_CFLAGS,;t t
+ s,@GSEQUENCE_CFLAGS@,$GSEQUENCE_CFLAGS,;t t
s,@LIBEGG_CFLAGS@,$LIBEGG_CFLAGS,;t t
s,@LIBNAUTILUS_CFLAGS@,$LIBNAUTILUS_CFLAGS,;t t
-s,@LIBNAUTILUS_LIBS@,$LIBNAUTILUS_LIBS,;t t
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index 24dc9f1a3..dbaa33ac3 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -118,7 +118,6 @@ share/gnome/nautilus/starthere-link.desktop
share/gnome/nautilus/starthere.desktop
share/gnome/nautilus/static_bookmarks.xml
share/gnome/network/nautilus-server-connect.desktop
-share/gnome/pixmaps/nautilus/nautilus-desktop.png
share/gnome/pixmaps/nautilus/CD_drive.png
share/gnome/pixmaps/nautilus/HD_drive.png
share/gnome/pixmaps/nautilus/Search.png
@@ -129,161 +128,35 @@ share/gnome/pixmaps/nautilus/colors.png
share/gnome/pixmaps/nautilus/cpu.png
share/gnome/pixmaps/nautilus/crux_eggplant/Search.png
share/gnome/pixmaps/nautilus/crux_eggplant/crux_eggplant.xml
-share/gnome/pixmaps/nautilus/crux_eggplant/decrement-i.png
-share/gnome/pixmaps/nautilus/crux_eggplant/decrement.png
-share/gnome/pixmaps/nautilus/crux_eggplant/increment-i.png
-share/gnome/pixmaps/nautilus/crux_eggplant/increment.png
-share/gnome/pixmaps/nautilus/crux_eggplant/number_strip.png
-share/gnome/pixmaps/nautilus/crux_eggplant/theme_preview.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/001.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/002.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/003.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/004.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/005.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/006.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/007.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/008.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/009.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/010.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/011.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/012.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/013.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/014.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/015.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/016.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/017.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/018.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/019.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/020.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/021.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/022.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/023.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/024.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/025.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/026.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/027.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/028.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/029.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/030.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/rest.png
-share/gnome/pixmaps/nautilus/crux_eggplant/zoom_body.png
share/gnome/pixmaps/nautilus/crux_teal/Search.png
share/gnome/pixmaps/nautilus/crux_teal/crux_teal.xml
-share/gnome/pixmaps/nautilus/crux_teal/decrement-i.png
-share/gnome/pixmaps/nautilus/crux_teal/decrement.png
-share/gnome/pixmaps/nautilus/crux_teal/increment-i.png
-share/gnome/pixmaps/nautilus/crux_teal/increment.png
-share/gnome/pixmaps/nautilus/crux_teal/number_strip.png
-share/gnome/pixmaps/nautilus/crux_teal/theme_preview.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/001.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/002.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/003.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/004.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/005.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/006.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/007.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/008.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/009.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/010.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/011.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/012.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/013.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/014.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/015.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/016.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/017.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/018.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/019.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/020.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/021.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/022.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/023.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/024.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/025.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/026.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/027.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/028.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/029.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/030.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/rest.png
-share/gnome/pixmaps/nautilus/crux_teal/zoom_body.png
-share/gnome/pixmaps/nautilus/decrement.png
share/gnome/pixmaps/nautilus/default/Search.png
-share/gnome/pixmaps/nautilus/default/decrement.png
share/gnome/pixmaps/nautilus/default/default.xml
-share/gnome/pixmaps/nautilus/default/increment.png
-share/gnome/pixmaps/nautilus/default/number_strip.png
share/gnome/pixmaps/nautilus/default/side_bar_image.png
-share/gnome/pixmaps/nautilus/default/theme_preview.png
-share/gnome/pixmaps/nautilus/default/zoom_body.png
share/gnome/pixmaps/nautilus/emblems.png
share/gnome/pixmaps/nautilus/erase.png
share/gnome/pixmaps/nautilus/gnome/Services.png
share/gnome/pixmaps/nautilus/gnome/gnome.xml
-share/gnome/pixmaps/nautilus/gnome/theme_preview.png
-share/gnome/pixmaps/nautilus/gnome/throbber/001.png
-share/gnome/pixmaps/nautilus/gnome/throbber/002.png
-share/gnome/pixmaps/nautilus/gnome/throbber/003.png
-share/gnome/pixmaps/nautilus/gnome/throbber/004.png
-share/gnome/pixmaps/nautilus/gnome/throbber/005.png
-share/gnome/pixmaps/nautilus/gnome/throbber/006.png
-share/gnome/pixmaps/nautilus/gnome/throbber/rest.png
-share/gnome/pixmaps/nautilus/increment.png
share/gnome/pixmaps/nautilus/knob.png
share/gnome/pixmaps/nautilus/memory_chip.gif
+share/gnome/pixmaps/nautilus/nautilus-desktop.png
share/gnome/pixmaps/nautilus/nautilus-launch-icon.png
share/gnome/pixmaps/nautilus/nautilus-mini-logo.png
share/gnome/pixmaps/nautilus/nautilus-server-connect.png
share/gnome/pixmaps/nautilus/note-indicator.png
-share/gnome/pixmaps/nautilus/number_strip.png
+share/gnome/pixmaps/nautilus/side_bar_image.png
share/gnome/pixmaps/nautilus/sierra/green_weave.png
-share/gnome/pixmaps/nautilus/sierra/number_strip.png
share/gnome/pixmaps/nautilus/sierra/sierra.xml
-share/gnome/pixmaps/nautilus/sierra/theme_preview.png
-share/gnome/pixmaps/nautilus/side_bar_image.png
share/gnome/pixmaps/nautilus/tahoe/bluewall.png
-share/gnome/pixmaps/nautilus/tahoe/number_strip.png
share/gnome/pixmaps/nautilus/tahoe/tahoe.xml
-share/gnome/pixmaps/nautilus/tahoe/theme_preview.png
share/gnome/pixmaps/nautilus/text-selection-frame.png
-share/gnome/pixmaps/nautilus/throbber/001.png
-share/gnome/pixmaps/nautilus/throbber/002.png
-share/gnome/pixmaps/nautilus/throbber/003.png
-share/gnome/pixmaps/nautilus/throbber/004.png
-share/gnome/pixmaps/nautilus/throbber/005.png
-share/gnome/pixmaps/nautilus/throbber/006.png
-share/gnome/pixmaps/nautilus/throbber/007.png
-share/gnome/pixmaps/nautilus/throbber/008.png
-share/gnome/pixmaps/nautilus/throbber/009.png
-share/gnome/pixmaps/nautilus/throbber/010.png
-share/gnome/pixmaps/nautilus/throbber/011.png
-share/gnome/pixmaps/nautilus/throbber/012.png
-share/gnome/pixmaps/nautilus/throbber/013.png
-share/gnome/pixmaps/nautilus/throbber/014.png
-share/gnome/pixmaps/nautilus/throbber/015.png
-share/gnome/pixmaps/nautilus/throbber/016.png
-share/gnome/pixmaps/nautilus/throbber/017.png
-share/gnome/pixmaps/nautilus/throbber/018.png
-share/gnome/pixmaps/nautilus/throbber/019.png
-share/gnome/pixmaps/nautilus/throbber/020.png
-share/gnome/pixmaps/nautilus/throbber/021.png
-share/gnome/pixmaps/nautilus/throbber/022.png
-share/gnome/pixmaps/nautilus/throbber/023.png
-share/gnome/pixmaps/nautilus/throbber/024.png
-share/gnome/pixmaps/nautilus/throbber/025.png
-share/gnome/pixmaps/nautilus/throbber/026.png
-share/gnome/pixmaps/nautilus/throbber/027.png
-share/gnome/pixmaps/nautilus/throbber/028.png
-share/gnome/pixmaps/nautilus/throbber/029.png
-share/gnome/pixmaps/nautilus/throbber/030.png
-share/gnome/pixmaps/nautilus/throbber/rest.png
share/gnome/pixmaps/nautilus/thumbnail_frame.png
-share/gnome/pixmaps/nautilus/zoom_body.png
share/locale/am/LC_MESSAGES/nautilus.mo
share/locale/ar/LC_MESSAGES/nautilus.mo
share/locale/az/LC_MESSAGES/nautilus.mo
share/locale/be/LC_MESSAGES/nautilus.mo
share/locale/bg/LC_MESSAGES/nautilus.mo
+share/locale/bn/LC_MESSAGES/nautilus.mo
share/locale/ca/LC_MESSAGES/nautilus.mo
share/locale/cs/LC_MESSAGES/nautilus.mo
share/locale/da/LC_MESSAGES/nautilus.mo
@@ -301,10 +174,12 @@ share/locale/gl/LC_MESSAGES/nautilus.mo
share/locale/he/LC_MESSAGES/nautilus.mo
share/locale/hi/LC_MESSAGES/nautilus.mo
share/locale/hu/LC_MESSAGES/nautilus.mo
+share/locale/id/LC_MESSAGES/nautilus.mo
share/locale/is/LC_MESSAGES/nautilus.mo
share/locale/it/LC_MESSAGES/nautilus.mo
share/locale/ja/LC_MESSAGES/nautilus.mo
share/locale/ko/LC_MESSAGES/nautilus.mo
+share/locale/li/LC_MESSAGES/nautilus.mo
share/locale/lt/LC_MESSAGES/nautilus.mo
share/locale/lv/LC_MESSAGES/nautilus.mo
share/locale/mk/LC_MESSAGES/nautilus.mo
@@ -328,8 +203,8 @@ share/locale/sv/LC_MESSAGES/nautilus.mo
share/locale/th/LC_MESSAGES/nautilus.mo
share/locale/tr/LC_MESSAGES/nautilus.mo
share/locale/uk/LC_MESSAGES/nautilus.mo
-share/locale/wa/LC_MESSAGES/nautilus.mo
share/locale/vi/LC_MESSAGES/nautilus.mo
+share/locale/wa/LC_MESSAGES/nautilus.mo
share/locale/yi/LC_MESSAGES/nautilus.mo
share/locale/zh_CN/LC_MESSAGES/nautilus.mo
share/locale/zh_TW/LC_MESSAGES/nautilus.mo
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 1fd0f042f..0fbe82374 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= nautilus2
-PORTVERSION= 2.3.4
+PORTVERSION= 2.3.6
CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.3
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
index a11e0a702..b45fbcae1 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/nautilus-2.3.4.tar.bz2) = d7e011c2495531986c7f042021a2055c
+MD5 (gnome2/nautilus-2.3.6.tar.bz2) = beab3c5af9084ba20552cede87fb7ea7
diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa
index 4de4fc8fe..3881dec5e 100644
--- a/x11-fm/nautilus2/files/patch-aa
+++ b/x11-fm/nautilus2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig Mon Jan 13 10:45:25 2003
-+++ configure Tue Jan 14 13:11:53 2003
-@@ -12661,7 +12662,7 @@
+--- configure.orig Sat Jun 28 00:42:27 2003
++++ configure Sat Jun 28 00:44:45 2003
+@@ -12860,7 +12860,7 @@
LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`"
@@ -9,7 +9,7 @@
CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES"
-@@ -12669,7 +12670,7 @@
+@@ -12868,7 +12868,7 @@
CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs"
@@ -18,16 +18,16 @@
COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0 gnome-desktop-2.0"
-@@ -13593,7 +13594,7 @@
- s,@LIBTOOL@,$LIBTOOL,;t t
+@@ -13849,7 +13849,7 @@
s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+ s,@STARTUP_NOTIFICATION_PACKAGE@,$STARTUP_NOTIFICATION_PACKAGE,;t t
s,@ALL_CFLAGS@,$ALL_CFLAGS,;t t
-s,@ALL_LIBS@,$ALL_LIBS,;t t
+s~@ALL_LIBS@~$ALL_LIBS~;t t
s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
- s,@ALLOCA@,$ALLOCA,;t t
s,@USE_NLS@,$USE_NLS,;t t
-@@ -13643,25 +13644,25 @@
+ s,@MSGFMT@,$MSGFMT,;t t
+@@ -13901,26 +13901,26 @@
s,@HAVE_JW_FALSE@,$HAVE_JW_FALSE,;t t
s,@HAVE_JW@,$HAVE_JW,;t t
s,@MEDUSA_CFLAGS@,$MEDUSA_CFLAGS,;t t
@@ -35,6 +35,7 @@
+s~@MEDUSA_LIBS@~$MEDUSA_LIBS~;t t
s,@LIBJPEG@,$LIBJPEG,;t t
s,@GIMPHWRAPBOX_CFLAGS@,$GIMPHWRAPBOX_CFLAGS,;t t
+ s,@GSEQUENCE_CFLAGS@,$GSEQUENCE_CFLAGS,;t t
s,@LIBEGG_CFLAGS@,$LIBEGG_CFLAGS,;t t
s,@LIBNAUTILUS_CFLAGS@,$LIBNAUTILUS_CFLAGS,;t t
-s,@LIBNAUTILUS_LIBS@,$LIBNAUTILUS_LIBS,;t t
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index 24dc9f1a3..dbaa33ac3 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -118,7 +118,6 @@ share/gnome/nautilus/starthere-link.desktop
share/gnome/nautilus/starthere.desktop
share/gnome/nautilus/static_bookmarks.xml
share/gnome/network/nautilus-server-connect.desktop
-share/gnome/pixmaps/nautilus/nautilus-desktop.png
share/gnome/pixmaps/nautilus/CD_drive.png
share/gnome/pixmaps/nautilus/HD_drive.png
share/gnome/pixmaps/nautilus/Search.png
@@ -129,161 +128,35 @@ share/gnome/pixmaps/nautilus/colors.png
share/gnome/pixmaps/nautilus/cpu.png
share/gnome/pixmaps/nautilus/crux_eggplant/Search.png
share/gnome/pixmaps/nautilus/crux_eggplant/crux_eggplant.xml
-share/gnome/pixmaps/nautilus/crux_eggplant/decrement-i.png
-share/gnome/pixmaps/nautilus/crux_eggplant/decrement.png
-share/gnome/pixmaps/nautilus/crux_eggplant/increment-i.png
-share/gnome/pixmaps/nautilus/crux_eggplant/increment.png
-share/gnome/pixmaps/nautilus/crux_eggplant/number_strip.png
-share/gnome/pixmaps/nautilus/crux_eggplant/theme_preview.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/001.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/002.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/003.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/004.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/005.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/006.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/007.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/008.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/009.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/010.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/011.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/012.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/013.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/014.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/015.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/016.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/017.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/018.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/019.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/020.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/021.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/022.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/023.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/024.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/025.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/026.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/027.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/028.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/029.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/030.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/rest.png
-share/gnome/pixmaps/nautilus/crux_eggplant/zoom_body.png
share/gnome/pixmaps/nautilus/crux_teal/Search.png
share/gnome/pixmaps/nautilus/crux_teal/crux_teal.xml
-share/gnome/pixmaps/nautilus/crux_teal/decrement-i.png
-share/gnome/pixmaps/nautilus/crux_teal/decrement.png
-share/gnome/pixmaps/nautilus/crux_teal/increment-i.png
-share/gnome/pixmaps/nautilus/crux_teal/increment.png
-share/gnome/pixmaps/nautilus/crux_teal/number_strip.png
-share/gnome/pixmaps/nautilus/crux_teal/theme_preview.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/001.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/002.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/003.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/004.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/005.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/006.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/007.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/008.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/009.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/010.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/011.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/012.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/013.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/014.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/015.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/016.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/017.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/018.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/019.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/020.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/021.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/022.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/023.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/024.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/025.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/026.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/027.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/028.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/029.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/030.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/rest.png
-share/gnome/pixmaps/nautilus/crux_teal/zoom_body.png
-share/gnome/pixmaps/nautilus/decrement.png
share/gnome/pixmaps/nautilus/default/Search.png
-share/gnome/pixmaps/nautilus/default/decrement.png
share/gnome/pixmaps/nautilus/default/default.xml
-share/gnome/pixmaps/nautilus/default/increment.png
-share/gnome/pixmaps/nautilus/default/number_strip.png
share/gnome/pixmaps/nautilus/default/side_bar_image.png
-share/gnome/pixmaps/nautilus/default/theme_preview.png
-share/gnome/pixmaps/nautilus/default/zoom_body.png
share/gnome/pixmaps/nautilus/emblems.png
share/gnome/pixmaps/nautilus/erase.png
share/gnome/pixmaps/nautilus/gnome/Services.png
share/gnome/pixmaps/nautilus/gnome/gnome.xml
-share/gnome/pixmaps/nautilus/gnome/theme_preview.png
-share/gnome/pixmaps/nautilus/gnome/throbber/001.png
-share/gnome/pixmaps/nautilus/gnome/throbber/002.png
-share/gnome/pixmaps/nautilus/gnome/throbber/003.png
-share/gnome/pixmaps/nautilus/gnome/throbber/004.png
-share/gnome/pixmaps/nautilus/gnome/throbber/005.png
-share/gnome/pixmaps/nautilus/gnome/throbber/006.png
-share/gnome/pixmaps/nautilus/gnome/throbber/rest.png
-share/gnome/pixmaps/nautilus/increment.png
share/gnome/pixmaps/nautilus/knob.png
share/gnome/pixmaps/nautilus/memory_chip.gif
+share/gnome/pixmaps/nautilus/nautilus-desktop.png
share/gnome/pixmaps/nautilus/nautilus-launch-icon.png
share/gnome/pixmaps/nautilus/nautilus-mini-logo.png
share/gnome/pixmaps/nautilus/nautilus-server-connect.png
share/gnome/pixmaps/nautilus/note-indicator.png
-share/gnome/pixmaps/nautilus/number_strip.png
+share/gnome/pixmaps/nautilus/side_bar_image.png
share/gnome/pixmaps/nautilus/sierra/green_weave.png
-share/gnome/pixmaps/nautilus/sierra/number_strip.png
share/gnome/pixmaps/nautilus/sierra/sierra.xml
-share/gnome/pixmaps/nautilus/sierra/theme_preview.png
-share/gnome/pixmaps/nautilus/side_bar_image.png
share/gnome/pixmaps/nautilus/tahoe/bluewall.png
-share/gnome/pixmaps/nautilus/tahoe/number_strip.png
share/gnome/pixmaps/nautilus/tahoe/tahoe.xml
-share/gnome/pixmaps/nautilus/tahoe/theme_preview.png
share/gnome/pixmaps/nautilus/text-selection-frame.png
-share/gnome/pixmaps/nautilus/throbber/001.png
-share/gnome/pixmaps/nautilus/throbber/002.png
-share/gnome/pixmaps/nautilus/throbber/003.png
-share/gnome/pixmaps/nautilus/throbber/004.png
-share/gnome/pixmaps/nautilus/throbber/005.png
-share/gnome/pixmaps/nautilus/throbber/006.png
-share/gnome/pixmaps/nautilus/throbber/007.png
-share/gnome/pixmaps/nautilus/throbber/008.png
-share/gnome/pixmaps/nautilus/throbber/009.png
-share/gnome/pixmaps/nautilus/throbber/010.png
-share/gnome/pixmaps/nautilus/throbber/011.png
-share/gnome/pixmaps/nautilus/throbber/012.png
-share/gnome/pixmaps/nautilus/throbber/013.png
-share/gnome/pixmaps/nautilus/throbber/014.png
-share/gnome/pixmaps/nautilus/throbber/015.png
-share/gnome/pixmaps/nautilus/throbber/016.png
-share/gnome/pixmaps/nautilus/throbber/017.png
-share/gnome/pixmaps/nautilus/throbber/018.png
-share/gnome/pixmaps/nautilus/throbber/019.png
-share/gnome/pixmaps/nautilus/throbber/020.png
-share/gnome/pixmaps/nautilus/throbber/021.png
-share/gnome/pixmaps/nautilus/throbber/022.png
-share/gnome/pixmaps/nautilus/throbber/023.png
-share/gnome/pixmaps/nautilus/throbber/024.png
-share/gnome/pixmaps/nautilus/throbber/025.png
-share/gnome/pixmaps/nautilus/throbber/026.png
-share/gnome/pixmaps/nautilus/throbber/027.png
-share/gnome/pixmaps/nautilus/throbber/028.png
-share/gnome/pixmaps/nautilus/throbber/029.png
-share/gnome/pixmaps/nautilus/throbber/030.png
-share/gnome/pixmaps/nautilus/throbber/rest.png
share/gnome/pixmaps/nautilus/thumbnail_frame.png
-share/gnome/pixmaps/nautilus/zoom_body.png
share/locale/am/LC_MESSAGES/nautilus.mo
share/locale/ar/LC_MESSAGES/nautilus.mo
share/locale/az/LC_MESSAGES/nautilus.mo
share/locale/be/LC_MESSAGES/nautilus.mo
share/locale/bg/LC_MESSAGES/nautilus.mo
+share/locale/bn/LC_MESSAGES/nautilus.mo
share/locale/ca/LC_MESSAGES/nautilus.mo
share/locale/cs/LC_MESSAGES/nautilus.mo
share/locale/da/LC_MESSAGES/nautilus.mo
@@ -301,10 +174,12 @@ share/locale/gl/LC_MESSAGES/nautilus.mo
share/locale/he/LC_MESSAGES/nautilus.mo
share/locale/hi/LC_MESSAGES/nautilus.mo
share/locale/hu/LC_MESSAGES/nautilus.mo
+share/locale/id/LC_MESSAGES/nautilus.mo
share/locale/is/LC_MESSAGES/nautilus.mo
share/locale/it/LC_MESSAGES/nautilus.mo
share/locale/ja/LC_MESSAGES/nautilus.mo
share/locale/ko/LC_MESSAGES/nautilus.mo
+share/locale/li/LC_MESSAGES/nautilus.mo
share/locale/lt/LC_MESSAGES/nautilus.mo
share/locale/lv/LC_MESSAGES/nautilus.mo
share/locale/mk/LC_MESSAGES/nautilus.mo
@@ -328,8 +203,8 @@ share/locale/sv/LC_MESSAGES/nautilus.mo
share/locale/th/LC_MESSAGES/nautilus.mo
share/locale/tr/LC_MESSAGES/nautilus.mo
share/locale/uk/LC_MESSAGES/nautilus.mo
-share/locale/wa/LC_MESSAGES/nautilus.mo
share/locale/vi/LC_MESSAGES/nautilus.mo
+share/locale/wa/LC_MESSAGES/nautilus.mo
share/locale/yi/LC_MESSAGES/nautilus.mo
share/locale/zh_CN/LC_MESSAGES/nautilus.mo
share/locale/zh_TW/LC_MESSAGES/nautilus.mo