Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the

new freetype2 where needed.

Submitted by:	mezz, ahze, pav, and many others
Approved by:	portmgr (implicit, kris)

3 files changed, 59 insertions, 21 deletions

diff --git a/deskutils/nautilus-actions/Makefile b/deskutils/nautilus-actions/Makefile
index 621d5424a00b..3bd3f196352b 100644
--- a/deskutils/nautilus-actions/Makefile
+++ b/deskutils/nautilus-actions/Makefile
@@ -3,28 +3,27 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/deskutils/nautilus-actions/Makefile,v 1.4 2006/10/01 02:12:23 ahze Exp $
 
 PORTNAME=	nautilus-actions
-PORTVERSION=	0.7.1
-PORTREVISION=	2
+PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	ftp://ftp2.grumz.net/grumz/
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Extension for Nautilus to configure programs to launch on files
 
-USE_GNOME=	nautilus2 intlhack pygtk2
+LIB_DEPENDS=	uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid
+
+INSTALLS_ICONS=	yes
+USE_GETTEXT=	yes
+USE_GNOME=	nautilus2 intlhack
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_PYTHON=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-nautilus-extdir=${X11BASE}/lib/nautilus/extensions-1.0
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|@datadir@datadir@/pixmaps|${DATADIR}/nact|' \
-		${WRKSRC}/nact/nact.desktop.in.in
+CONFIGURE_ARGS=	--with-nautilus-extdir=${LOCALBASE}/lib/nautilus/extensions-1.0
 
 .include <bsd.port.mk>
diff --git a/deskutils/nautilus-actions/distinfo b/deskutils/nautilus-actions/distinfo
index 74b7f4e2e6f7..4c043f918a91 100644
--- a/deskutils/nautilus-actions/distinfo
+++ b/deskutils/nautilus-actions/distinfo
@@ -1,3 +1,3 @@
-MD5 (nautilus-actions-0.7.1.tar.gz) = 98caa03d2d0616a9dd4a4c35c08d4502
-SHA256 (nautilus-actions-0.7.1.tar.gz) = 7456419bdc78953cd0321e0730574b063ec0d5e1ebe6839bd01c70b93be26dde
-SIZE (nautilus-actions-0.7.1.tar.gz) = 397906
+MD5 (nautilus-actions-1.4.tar.gz) = c3434900718401e13432533eab10e681
+SHA256 (nautilus-actions-1.4.tar.gz) = 61f05fcf7557eda96c9f275de5fb132858e80c8b7a33b04fbd06caafff4b056b
+SIZE (nautilus-actions-1.4.tar.gz) = 800222
diff --git a/deskutils/nautilus-actions/pkg-plist b/deskutils/nautilus-actions/pkg-plist
index fbb8286f7de5..9d25dff6b730 100644
--- a/deskutils/nautilus-actions/pkg-plist
+++ b/deskutils/nautilus-actions/pkg-plist
@@ -1,14 +1,53 @@
 bin/nautilus-actions-config
+bin/nautilus-actions-convert
+bin/nautilus-actions-new-config
 lib/nautilus/extensions-1.0/libnautilus-actions.la
 lib/nautilus/extensions-1.0/libnautilus-actions.so
 share/applications/nact.desktop
+share/icons/hicolor/16x16/apps/nautilus-actions.png
+share/icons/hicolor/22x22/apps/nautilus-actions.png
+share/icons/hicolor/48x48/apps/nautilus-actions.png
+share/icons/hicolor/scalable/apps/nautilus-actions.svg
+share/locale/bg/LC_MESSAGES/nautilus-actions.mo
+share/locale/bn/LC_MESSAGES/nautilus-actions.mo
+share/locale/ca/LC_MESSAGES/nautilus-actions.mo
+share/locale/cs/LC_MESSAGES/nautilus-actions.mo
+share/locale/da/LC_MESSAGES/nautilus-actions.mo
 share/locale/de/LC_MESSAGES/nautilus-actions.mo
+share/locale/en_CA/LC_MESSAGES/nautilus-actions.mo
 share/locale/es/LC_MESSAGES/nautilus-actions.mo
+share/locale/fi/LC_MESSAGES/nautilus-actions.mo
 share/locale/fr/LC_MESSAGES/nautilus-actions.mo
-%%DATADIR%%/config_newaction.xml
-%%DATADIR%%/nact/nautilus-actions-config.glade
-%%DATADIR%%/nact/nautilus-actions-icon.png
-share/pixmaps/nautilus-actions-icon.png
-@dirrmtry %%DATADIR%%/nact
-@dirrmtry %%DATADIR%%
-@dirrmtry share/applications
+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/ja/LC_MESSAGES/nautilus-actions.mo
+share/locale/lt/LC_MESSAGES/nautilus-actions.mo
+share/locale/lv/LC_MESSAGES/nautilus-actions.mo
+share/locale/nb/LC_MESSAGES/nautilus-actions.mo
+share/locale/nl/LC_MESSAGES/nautilus-actions.mo
+share/locale/pa/LC_MESSAGES/nautilus-actions.mo
+share/locale/pt_BR/LC_MESSAGES/nautilus-actions.mo
+share/locale/sv/LC_MESSAGES/nautilus-actions.mo
+share/locale/th/LC_MESSAGES/nautilus-actions.mo
+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
+share/nautilus-actions/nact/nautilus-actions-config.glade
+@dirrm share/nautilus-actions/nact
+@dirrm share/nautilus-actions
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca