4 files changed, 21 insertions, 37 deletions
diff --git a/deskutils/nautilus-actions/Makefile b/deskutils/nautilus-actions/Makefile
index 8671ea0183f2..6e285a73ab64 100644
--- a/deskutils/nautilus-actions/Makefile
+++ b/deskutils/nautilus-actions/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nautilus-actions
-PORTVERSION=	0.5
+PORTVERSION=	0.6
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://people.freebsd.org/~ahze/distfiles/
@@ -15,8 +15,16 @@ MASTER_SITE_SUBDIR=	ahze
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Extension for Nautilus to configure programs to launch on files
 
-USE_GNOME=	nautilus2 pygtk2
+USE_GNOME=	nautilus2 pygtk2 intlhack
+USE_GMAKE=	yes
+USE_LIBTOOL_VER=15
 USE_PYTHON=	yes
 USE_X_PREFIX=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+INTLTOOLIZE?=	${LOCALBASE}/bin/intltoolize
+
+pre-configure:
+	cd ${WRKSRC} && ${INTLTOOLIZE} --force
 
 .include <bsd.port.mk>
diff --git a/deskutils/nautilus-actions/distinfo b/deskutils/nautilus-actions/distinfo
index 892a8d8c7616..c7ce4067556e 100644
--- a/deskutils/nautilus-actions/distinfo
+++ b/deskutils/nautilus-actions/distinfo
@@ -1,2 +1,2 @@
-MD5 (nautilus-actions-0.5.tar.gz) = c3606d293eb4cf0d49dcaa603169ddfd
-SIZE (nautilus-actions-0.5.tar.gz) = 49272
+MD5 (nautilus-actions-0.6.tar.gz) = 22cddf44c5922de057f3318a00797236
+SIZE (nautilus-actions-0.6.tar.gz) = 393778
diff --git a/deskutils/nautilus-actions/files/patch-Makefile b/deskutils/nautilus-actions/files/patch-Makefile
deleted file mode 100644
index 2498b90f55d2..000000000000
--- a/deskutils/nautilus-actions/files/patch-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.orig	Wed Aug 31 02:54:22 2005
-+++ Makefile	Wed Aug 31 22:25:42 2005
-@@ -1,9 +1,9 @@
--prefix=/usr
-+prefix=$(PREFIX)
- libdir=$(prefix)/lib
- bindir=${prefix}/bin
- DESTDIR=
--GNOME_MENU_DIR=$(prefix)/share/applications
--DEFAULT_CONFIG_PATH=$(prefix)/share/nautilus-actions
-+GNOME_MENU_DIR=$(prefix)/share/gnome/applications
-+DEFAULT_CONFIG_PATH=$(prefix)/share/gnome/nautilus-actions
- DEFAULT_PER_USER_PATH=.config/.nautilus-actions
- OLD_DEFAULT_PER_USER_PATH=.nautilus-actions
- DEFAULT_NACT_DATA_PATH=$(DEFAULT_CONFIG_PATH)/nact
-@@ -16,7 +16,7 @@
- all: $(EXT_NAME) nact/nautilus-actions-config.py nact/nact nact/nautilus-actions-config.glade nact/nact.desktop
- 
- $(EXT_NAME): $(SOURCES) $(HEADERS)
--	gcc -o $(EXT_NAME) -shared -fPIC -DDEFAULT_CONFIG_PATH="\"$(DEFAULT_CONFIG_PATH)\"" -DDEFAULT_PER_USER_PATH="\"$(DEFAULT_PER_USER_PATH)\"" -I. `pkg-config --libs --cflags libnautilus-extension libxml-2.0 gobject-2.0` $(SOURCES)
-+	$(CC) -o $(EXT_NAME) -shared -fPIC $(CFLAGS) -DDEFAULT_CONFIG_PATH="\"$(DEFAULT_CONFIG_PATH)\"" -DDEFAULT_PER_USER_PATH="\"$(DEFAULT_PER_USER_PATH)\"" -I. `pkg-config --libs --cflags libnautilus-extension libxml-2.0 gobject-2.0` $(SOURCES)
- 
- nact/nautilus-actions-config.py: nact/nautilus-actions-config.py.template
- 	sed -e 's#%%%DEFAULT_CONFIG_PATH%%%#$(DEFAULT_CONFIG_PATH)#' -e 's#%%%DATA_DIR%%%#$(DEFAULT_NACT_DATA_PATH)#' -e 's#%%%VERSION%%%#$(VERSION)#' -e 's#%%%DEFAULT_PER_USER_PATH%%%#$(DEFAULT_PER_USER_PATH)#' -e 's#%%%OLD_DEFAULT_PER_USER_PATH%%%#$(OLD_DEFAULT_PER_USER_PATH)#' nact/nautilus-actions-config.py.template > nact/nautilus-actions-config.py
diff --git a/deskutils/nautilus-actions/pkg-plist b/deskutils/nautilus-actions/pkg-plist
index 6291b1def98b..f7c77955afa0 100644
--- a/deskutils/nautilus-actions/pkg-plist
+++ b/deskutils/nautilus-actions/pkg-plist
@@ -1,9 +1,9 @@
-bin/nact
-lib/nautilus/extensions-1.0/nautilus-action.so
-share/gnome/applications/nact.desktop
-share/gnome/nautilus-actions/config_newaction.xml
-share/gnome/nautilus-actions/nact/nautilus-actions-config.glade
-share/gnome/nautilus-actions/nact/nautilus-actions-config.py
-share/gnome/nautilus-actions/nact/nautilus-launch-icon.png
-@dirrm share/gnome/nautilus-actions/nact
-@dirrm share/gnome/nautilus-actions
+bin/nautilus-actions-config
+share/applications/nact.desktop
+share/locale/es/LC_MESSAGES/nautilus-actions.mo
+%%DATADIR%%/config_newaction.xml
+%%DATADIR%%/nact/nautilus-actions-config.glade
+%%DATADIR%%/nact/nautilus-launch-icon.png
+@dirrm %%DATADIR%%/nact
+@dirrm %%DATADIR%%
+@unexec rmdir %D/share/applications 2> /dev/null || true