Update to 2.3.4.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@856 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 24 insertions, 42 deletions

diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 6956296cf..859bba1e9 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -6,9 +6,7 @@
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.3.2
-#PORTREVISION=	0
-PORTREVISION=	1
+PORTVERSION=	2.3.4
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.3
@@ -37,6 +35,8 @@ CONFIGURE_ARGS=	--with-freetype2-lib-place=${LOCALBASE}/lib \
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
 post-install:
-	@${CHMOD} u+w ${PREFIX}/share/gnome/nautilus/*.desktop
+.if !defined(PACKAGE_BUILDING)
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif
 
 .include <bsd.port.mk>
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index 1419d17e9..a11e0a702 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1 +1 @@
-MD5 (gnome2/nautilus-2.3.2.tar.bz2) = f249e0699938ff433eda31064510e102
+MD5 (gnome2/nautilus-2.3.4.tar.bz2) = d7e011c2495531986c7f042021a2055c
diff --git a/x11-fm/nautilus/files/patch-ltmain.sh b/x11-fm/nautilus/files/patch-ltmain.sh
index 8afc42e39..89c6ef915 100644
--- a/x11-fm/nautilus/files/patch-ltmain.sh
+++ b/x11-fm/nautilus/files/patch-ltmain.sh
@@ -1,15 +1,6 @@
---- ltmain.sh.orig	Fri Apr 25 15:18:44 2003
-+++ ltmain.sh	Sun May 11 02:27:13 2003
-@@ -1061,7 +1061,7 @@
- 	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-@@ -1071,8 +1071,16 @@
+--- ltmain.sh.orig	Tue Jun 10 18:31:49 2003
++++ ltmain.sh	Fri Jun 13 14:37:37 2003
+@@ -1073,8 +1073,16 @@
  	continue
  	;;
  
@@ -26,8 +17,8 @@
  	continue
  	;;
  
-@@ -2471,6 +2479,9 @@
- 	  *-*-openbsd* | *-*-freebsd*)
+@@ -2502,6 +2510,9 @@
+ 	  *-*-openbsd*)
  	    # Do not include libc due to us having libc/libc_r.
  	    ;;
 +	  *-*-freebsd*)
@@ -36,7 +27,7 @@
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
  	    if test $build_libtool_need_lc = "yes"; then
-@@ -4280,10 +4291,12 @@
+@@ -4286,10 +4297,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index 9a52d2ed7..24dc9f1a3 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -301,6 +301,7 @@ 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/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
@@ -324,7 +325,6 @@ share/locale/sq/LC_MESSAGES/nautilus.mo
 share/locale/sr/LC_MESSAGES/nautilus.mo
 share/locale/sr@Latn/LC_MESSAGES/nautilus.mo
 share/locale/sv/LC_MESSAGES/nautilus.mo
-share/locale/ta/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
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 6956296cf..859bba1e9 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -6,9 +6,7 @@
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.3.2
-#PORTREVISION=	0
-PORTREVISION=	1
+PORTVERSION=	2.3.4
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.3
@@ -37,6 +35,8 @@ CONFIGURE_ARGS=	--with-freetype2-lib-place=${LOCALBASE}/lib \
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
 post-install:
-	@${CHMOD} u+w ${PREFIX}/share/gnome/nautilus/*.desktop
+.if !defined(PACKAGE_BUILDING)
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif
 
 .include <bsd.port.mk>
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
index 1419d17e9..a11e0a702 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/nautilus-2.3.2.tar.bz2) = f249e0699938ff433eda31064510e102
+MD5 (gnome2/nautilus-2.3.4.tar.bz2) = d7e011c2495531986c7f042021a2055c
diff --git a/x11-fm/nautilus2/files/patch-ltmain.sh b/x11-fm/nautilus2/files/patch-ltmain.sh
index 8afc42e39..89c6ef915 100644
--- a/x11-fm/nautilus2/files/patch-ltmain.sh
+++ b/x11-fm/nautilus2/files/patch-ltmain.sh
@@ -1,15 +1,6 @@
---- ltmain.sh.orig	Fri Apr 25 15:18:44 2003
-+++ ltmain.sh	Sun May 11 02:27:13 2003
-@@ -1061,7 +1061,7 @@
- 	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-@@ -1071,8 +1071,16 @@
+--- ltmain.sh.orig	Tue Jun 10 18:31:49 2003
++++ ltmain.sh	Fri Jun 13 14:37:37 2003
+@@ -1073,8 +1073,16 @@
  	continue
  	;;
  
@@ -26,8 +17,8 @@
  	continue
  	;;
  
-@@ -2471,6 +2479,9 @@
- 	  *-*-openbsd* | *-*-freebsd*)
+@@ -2502,6 +2510,9 @@
+ 	  *-*-openbsd*)
  	    # Do not include libc due to us having libc/libc_r.
  	    ;;
 +	  *-*-freebsd*)
@@ -36,7 +27,7 @@
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
  	    if test $build_libtool_need_lc = "yes"; then
-@@ -4280,10 +4291,12 @@
+@@ -4286,10 +4297,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index 9a52d2ed7..24dc9f1a3 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -301,6 +301,7 @@ 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/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
@@ -324,7 +325,6 @@ share/locale/sq/LC_MESSAGES/nautilus.mo
 share/locale/sr/LC_MESSAGES/nautilus.mo
 share/locale/sr@Latn/LC_MESSAGES/nautilus.mo
 share/locale/sv/LC_MESSAGES/nautilus.mo
-share/locale/ta/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