Update to 2.30.0.

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

5 files changed, 49 insertions, 60 deletions

diff --git a/deskutils/nautilus-actions/Makefile b/deskutils/nautilus-actions/Makefile
index 18c7d4286..f1525281e 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.17 2010/01/05 23:21:42 marcus Exp $
+#   $MCom: ports/deskutils/nautilus-actions/Makefile,v 1.18 2010/02/10 22:18:21 kwm Exp $
 #
 
 PORTNAME=	nautilus-actions
-PORTVERSION=	2.29.4
+PORTVERSION=	2.30.0
 CATEGORIES=	deskutils
 MASTER_SITES=	GNOME
 
@@ -27,8 +27,9 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-nautilus-extdir=${LOCALBASE}/lib/nautilus/extensions-2.0
 
-PORTDOCS=	AUTHORS COPYING ChangeLog ChangeLog-2008 INSTALL MAINTAINERS \
-		NEWS README TODO objects-hierarchy.odg
+PORTDOCS=	AUTHORS COPYING ChangeLog ChangeLog-2008 ChangeLog-2009 INSTALL \
+		MAINTAINERS NEWS README TODO export-format-id io-provider-id \
+		objects-hierarchy.odg
 
 .include <bsd.port.pre.mk>
 
@@ -45,4 +46,4 @@ post-patch:
 		${WRKSRC}/Makefile.in ${WRKSRC}/doc/Makefile.in
 .endif
 
-.include <bsd.port.post.mk>>
+.include <bsd.port.post.mk>
diff --git a/deskutils/nautilus-actions/distinfo b/deskutils/nautilus-actions/distinfo
index 09cf64025..b5849fa49 100644
--- a/deskutils/nautilus-actions/distinfo
+++ b/deskutils/nautilus-actions/distinfo
@@ -1,3 +1,3 @@
-MD5 (nautilus-actions-2.29.4.tar.gz) = 474207fcfd53ed30249c017d9c99dabd
-SHA256 (nautilus-actions-2.29.4.tar.gz) = 4dd25324c4e236280a31e4f0730547ca48cda0255292af4303a679493b5078e3
-SIZE (nautilus-actions-2.29.4.tar.gz) = 1275249
+MD5 (nautilus-actions-2.30.0.tar.gz) = ba577d7fa88539b0431257927b2dc8be
+SHA256 (nautilus-actions-2.30.0.tar.gz) = 17f2327448273d14b00d805ce722a22a47e141bcdc56b5a0fa16c964804f6504
+SIZE (nautilus-actions-2.30.0.tar.gz) = 1422321
diff --git a/deskutils/nautilus-actions/files/extra-patch-configure b/deskutils/nautilus-actions/files/extra-patch-configure
index 898bb4fc6..577f55c12 100644
--- a/deskutils/nautilus-actions/files/extra-patch-configure
+++ b/deskutils/nautilus-actions/files/extra-patch-configure
@@ -1,15 +1,15 @@
 --- configure.orig	2009-10-19 21:06:41.000000000 +1000
 +++ configure	2009-10-19 23:38:22.000000000 +1000
-@@ -4710,7 +4710,7 @@
+@@ -4718,7 +4718,7 @@
  
  
  	_ac_warning_def=error
--	_ac_compliant_def="-ansi -pedantic -Wno-overlength-strings"
-+	_ac_compliant_def="-ansi -pedantic"
+-	_ac_compliant_def="-ansi -Wno-overlength-strings -Wformat=2"
++	_ac_compliant_def="-ansi -Wformat=2"
  
  
      # Check whether --enable-compile-warnings was given.
-@@ -4800,7 +4800,7 @@
+@@ -4808,7 +4808,7 @@
  	done
  	unset option
  	if test "$enable_compile_warnings" = "error" ; then
diff --git a/deskutils/nautilus-actions/files/patch-nautilus-actions_plugin_nautilus-actions.c b/deskutils/nautilus-actions/files/patch-nautilus-actions_plugin_nautilus-actions.c
deleted file mode 100644
index 9b5eac3e4..000000000
--- a/deskutils/nautilus-actions/files/patch-nautilus-actions_plugin_nautilus-actions.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- nautilus-actions/plugin/nautilus-actions.c.orig	2010-01-03 00:33:06.000000000 -0500
-+++ nautilus-actions/plugin/nautilus-actions.c	2010-01-03 00:33:41.000000000 -0500
-@@ -468,7 +468,7 @@ is_action_candidate( NautilusActions *pl
- {
- 	static const gchar *thisfn = "nautilus_actions_is_action_candidate";
- 	NAObjectProfile *candidate = NULL;
--	gchar *action_label;
-+	gchar *action_label = NULL;
- 	gchar *profile_label;
- 	GList *profiles, *ip;
- 
diff --git a/deskutils/nautilus-actions/pkg-plist b/deskutils/nautilus-actions/pkg-plist
index bac520bd7..83b3e89fd 100644
--- a/deskutils/nautilus-actions/pkg-plist
+++ b/deskutils/nautilus-actions/pkg-plist
@@ -2,39 +2,38 @@ bin/nautilus-actions-config-tool
 bin/nautilus-actions-new
 bin/nautilus-actions-run
 bin/nautilus-actions-schemas
-include/nautilus-actions/api/na-api.h
-include/nautilus-actions/api/na-dbus.h
-include/nautilus-actions/api/na-gconf-keys.h
-include/nautilus-actions/api/na-gconf-monitor.h
-include/nautilus-actions/api/na-iio-provider.h
-include/nautilus-actions/api/na-object-api.h
-include/nautilus-actions/private/na-object-action-class.h
-include/nautilus-actions/private/na-object-action-fn.h
-include/nautilus-actions/private/na-object-class.h
-include/nautilus-actions/private/na-object-fn.h
-include/nautilus-actions/private/na-object-id-class.h
-include/nautilus-actions/private/na-object-id-fn.h
-include/nautilus-actions/private/na-object-item-class.h
-include/nautilus-actions/private/na-object-item-fn.h
-include/nautilus-actions/private/na-object-menu-class.h
-include/nautilus-actions/private/na-object-menu-fn.h
-include/nautilus-actions/private/na-object-profile-class.h
-include/nautilus-actions/private/na-object-profile-fn.h
-lib/nautilus-actions/libna-api.la
-lib/nautilus-actions/libna-api.so
-lib/nautilus-actions/libna-api.so.1
-lib/nautilus-actions/libna-io-provider-desktop.la
-lib/nautilus-actions/libna-io-provider-desktop.so
-lib/nautilus-actions/libna-io-provider-desktop.so.1
-lib/nautilus-actions/libna-io-provider-gconf.la
-lib/nautilus-actions/libna-io-provider-gconf.so
-lib/nautilus-actions/libna-io-provider-gconf.so.1
-lib/nautilus-actions/libna-private.la
-lib/nautilus-actions/libna-private.so
-lib/nautilus-actions/libna-private.so.1
-lib/nautilus-actions/libna-runtime.la
-lib/nautilus-actions/libna-runtime.so
-lib/nautilus-actions/libna-runtime.so.1
+include/nautilus-actions/na-core-utils.h
+include/nautilus-actions/na-data-boxed.h
+include/nautilus-actions/na-data-def.h
+include/nautilus-actions/na-data-types.h
+include/nautilus-actions/na-dbus.h
+include/nautilus-actions/na-extension.h
+include/nautilus-actions/na-gconf-monitor.h
+include/nautilus-actions/na-gconf-utils.h
+include/nautilus-actions/na-icontextual.h
+include/nautilus-actions/na-iduplicable.h
+include/nautilus-actions/na-iexporter.h
+include/nautilus-actions/na-ifactory-object-data.h
+include/nautilus-actions/na-ifactory-object.h
+include/nautilus-actions/na-ifactory-provider-provider.h
+include/nautilus-actions/na-ifactory-provider.h
+include/nautilus-actions/na-iimporter.h
+include/nautilus-actions/na-iio-provider.h
+include/nautilus-actions/na-object-action.h
+include/nautilus-actions/na-object-api.h
+include/nautilus-actions/na-object-id.h
+include/nautilus-actions/na-object-item.h
+include/nautilus-actions/na-object-menu.h
+include/nautilus-actions/na-object-profile.h
+include/nautilus-actions/na-object.h
+lib/nautilus-actions/libna-core.la
+lib/nautilus-actions/libna-core.so
+lib/nautilus-actions/libna-io-desktop.la
+lib/nautilus-actions/libna-io-desktop.so
+lib/nautilus-actions/libna-io-gconf.la
+lib/nautilus-actions/libna-io-gconf.so
+lib/nautilus-actions/libna-io-xml.la
+lib/nautilus-actions/libna-io-xml.so
 lib/nautilus/extensions-2.0/libnautilus-actions-tracker.la
 lib/nautilus/extensions-2.0/libnautilus-actions-tracker.so
 lib/nautilus/extensions-2.0/libnautilus-actions.la
@@ -92,17 +91,17 @@ 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%%/locked.png
+%%DATADIR%%/na-importer-ask.ui
+%%DATADIR%%/nact-assistant-export.ui
 %%DATADIR%%/nact-preferences.ui
-%%DATADIR%%/nautilus-actions.schemas
 %%DATADIR%%/nautilus-actions-config-tool.actions
 %%DATADIR%%/nautilus-actions-config-tool.ui
+%%DATADIR%%/nautilus-actions-confs.schemas
 %%DATADIR%%/nautilus-actions-maintainer.actions
-%%DATADIR%%/nact-assistant-export.ui
+%%DATADIR%%/nautilus-actions-prefs.schemas
 %%DATADIR%%/transparent.png
 @dirrm %%DATADIR%%
 @dirrm lib/nautilus-actions
-@dirrm include/nautilus-actions/private
-@dirrm include/nautilus-actions/api
 @dirrm include/nautilus-actions
 @dirrmtry share/applications
 @dirrmtry share/locale/zh_HK/LC_MESSAGES