Update to 1.12.1.

Handle NOPORTDOCS.


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

4 files changed, 49 insertions, 18 deletions

diff --git a/deskutils/nautilus-actions/Makefile b/deskutils/nautilus-actions/Makefile
index c066c82d0..75e5c76d4 100644
--- a/deskutils/nautilus-actions/Makefile
+++ b/deskutils/nautilus-actions/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/nautilus-actions/Makefile,v 1.10 2009/08/08 19:24:28 ahze Exp $
+#   $MCom: ports/deskutils/nautilus-actions/Makefile,v 1.11 2009/08/12 01:48:23 ahze Exp $
 #
 
 PORTNAME=	nautilus-actions
-PORTVERSION=	1.12.0
+PORTVERSION=	1.12.1
 CATEGORIES=	deskutils
 MASTER_SITES=	GNOME \
 		http://www.nautilus-actions.org/downloads/ \
@@ -28,4 +28,22 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-nautilus-extdir=${LOCALBASE}/lib/nautilus/extensions-2.0
 
-.include <bsd.port.mk>
+PORTDOCS=	AUTHORS COPYING ChangeLog ChangeLog-2008 INSTALL MAINTAINERS \
+		NEWS README TODO objects-hierarchy.odg
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 700000
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure
+.endif
+
+post-patch:
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e 's| install-dist_pkgdocDATA||g' \
+		${WRKSRC}/Makefile.in ${WRKSRC}/doc/Makefile.in
+.else
+	@${REINPLACE_CMD} -e 's|doc/@PACKAGE@-@VERSION@|doc/@PACKAGE@|g' \
+		${WRKSRC}/Makefile.in ${WRKSRC}/doc/Makefile.in
+.endif
+
+.include <bsd.port.post.mk>>
diff --git a/deskutils/nautilus-actions/distinfo b/deskutils/nautilus-actions/distinfo
index 3c69083ed..29c71d83f 100644
--- a/deskutils/nautilus-actions/distinfo
+++ b/deskutils/nautilus-actions/distinfo
@@ -1,3 +1,3 @@
-MD5 (nautilus-actions-1.12.0.tar.gz) = 901f0c75419d9b7ca2a18ac4ed695323
-SHA256 (nautilus-actions-1.12.0.tar.gz) = d2c4d2be0542565d569749ba20ef0ce6237d8863944c833e43e20d41fc4457b4
-SIZE (nautilus-actions-1.12.0.tar.gz) = 968119
+MD5 (nautilus-actions-1.12.1.tar.gz) = feef45d6712c8c3b6deb1d172fb66504
+SHA256 (nautilus-actions-1.12.1.tar.gz) = 768ea9d07e0a385f3215b5b6328058044c4f1166f04b4294cf610c3ef0b5b564
+SIZE (nautilus-actions-1.12.1.tar.gz) = 991709
diff --git a/deskutils/nautilus-actions/files/extra-patch-configure b/deskutils/nautilus-actions/files/extra-patch-configure
new file mode 100644
index 000000000..898bb4fc6
--- /dev/null
+++ b/deskutils/nautilus-actions/files/extra-patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig	2009-10-19 21:06:41.000000000 +1000
++++ configure	2009-10-19 23:38:22.000000000 +1000
+@@ -4710,7 +4710,7 @@
+ 
+ 
+ 	_ac_warning_def=error
+-	_ac_compliant_def="-ansi -pedantic -Wno-overlength-strings"
++	_ac_compliant_def="-ansi -pedantic"
+ 
+ 
+     # Check whether --enable-compile-warnings was given.
+@@ -4800,7 +4800,7 @@
+ 	done
+ 	unset option
+ 	if test "$enable_compile_warnings" = "error" ; then
+-	    warning_flags="$warning_flags -Werror"
++	    warning_flags="$warning_flags"
+ 	fi
+ 	;;
+     *)
diff --git a/deskutils/nautilus-actions/pkg-plist b/deskutils/nautilus-actions/pkg-plist
index f701a68fe..76ae4b1c2 100644
--- a/deskutils/nautilus-actions/pkg-plist
+++ b/deskutils/nautilus-actions/pkg-plist
@@ -4,16 +4,6 @@ bin/nautilus-actions-schemas
 lib/nautilus/extensions-2.0/libnautilus-actions.la
 lib/nautilus/extensions-2.0/libnautilus-actions.so
 share/applications/nact.desktop
-share/doc/nautilus-actions-1.12.0/AUTHORS
-share/doc/nautilus-actions-1.12.0/COPYING
-share/doc/nautilus-actions-1.12.0/ChangeLog
-share/doc/nautilus-actions-1.12.0/ChangeLog-2008
-share/doc/nautilus-actions-1.12.0/INSTALL
-share/doc/nautilus-actions-1.12.0/MAINTAINERS
-share/doc/nautilus-actions-1.12.0/NEWS
-share/doc/nautilus-actions-1.12.0/README
-share/doc/nautilus-actions-1.12.0/TODO
-share/doc/nautilus-actions-1.12.0/objects-hierarchy.odg
 share/icons/hicolor/16x16/apps/nautilus-actions.png
 share/icons/hicolor/22x22/apps/nautilus-actions.png
 share/icons/hicolor/32x32/apps/nautilus-actions.png
@@ -38,6 +28,7 @@ share/locale/fr/LC_MESSAGES/nautilus-actions.mo
 share/locale/gl/LC_MESSAGES/nautilus-actions.mo
 share/locale/gu/LC_MESSAGES/nautilus-actions.mo
 share/locale/he/LC_MESSAGES/nautilus-actions.mo
+share/locale/hi/LC_MESSAGES/nautilus-actions.mo
 share/locale/it/LC_MESSAGES/nautilus-actions.mo
 share/locale/ja/LC_MESSAGES/nautilus-actions.mo
 share/locale/kn/LC_MESSAGES/nautilus-actions.mo
@@ -55,6 +46,7 @@ share/locale/pl/LC_MESSAGES/nautilus-actions.mo
 share/locale/pt/LC_MESSAGES/nautilus-actions.mo
 share/locale/pt_BR/LC_MESSAGES/nautilus-actions.mo
 share/locale/ru/LC_MESSAGES/nautilus-actions.mo
+share/locale/sl/LC_MESSAGES/nautilus-actions.mo
 share/locale/sv/LC_MESSAGES/nautilus-actions.mo
 share/locale/ta/LC_MESSAGES/nautilus-actions.mo
 share/locale/te/LC_MESSAGES/nautilus-actions.mo
@@ -63,8 +55,10 @@ share/locale/vi/LC_MESSAGES/nautilus-actions.mo
 share/locale/zh_CN/LC_MESSAGES/nautilus-actions.mo
 share/locale/zh_HK/LC_MESSAGES/nautilus-actions.mo
 share/locale/zh_TW/LC_MESSAGES/nautilus-actions.mo
-%%DATADIR%%/nautilus-actions-config-tool.ui
 %%DATADIR%%/nautilus-actions.schemas
+%%DATADIR%%/nautilus-actions-config-tool.actions
+%%DATADIR%%/nautilus-actions-config-tool.ui
+%%DATADIR%%/nact-assistant-export.ui
 @dirrm %%DATADIR%%
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
@@ -78,5 +72,4 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-actions.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
-@dirrm share/doc/nautilus-actions-1.12.0
 @dirrmtry share/applications