Massive port framework maintaince/update (long over due too)

Deal with recent USES changes, pet portlint here and there.
Sync with ports, more to come.


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

3 files changed, 9 insertions, 25 deletions

diff --git a/x11-fm/nautilus3/Makefile b/x11-fm/nautilus3/Makefile
index a7b126a1e..ac0cad410 100644
--- a/x11-fm/nautilus3/Makefile
+++ b/x11-fm/nautilus3/Makefile
@@ -1,10 +1,5 @@
-# New ports collection makefile for:    nautilus2
-# Date created:         		28th August 2000
-# Whom:                 		ade, archie
-#
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/x11-fm/nautilus3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	nautilus
 PORTVERSION=	3.4.2
@@ -18,9 +13,9 @@ COMMENT=	File manager for the GNOME desktop
 BUILD_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \
 		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas \
 		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif \
-		notify.4:${PORTSDIR}/devel/libnotify \
-		exempi.3:${PORTSDIR}/textproc/exempi
+LIB_DEPENDS=	exif:${PORTSDIR}/graphics/libexif \
+		notify:${PORTSDIR}/devel/libnotify \
+		exempi:${PORTSDIR}/textproc/exempi
 RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \
 		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
 
@@ -30,9 +25,9 @@ LATEST_LINK=	nautilus3
 INSTALLS_ICONS=	yes
 USE_XZ=		yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop3 libxml2 \
-		desktopfileutils ltverhack gvfs ltasneededhack
+USES=		gettext pathfix desktop-file-utils shared-mime-info
+USE_GNOME=	gnomeprefix intlhack gnomedesktop3 libxml2 \
+		ltverhack gvfs ltasneededhack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -44,7 +39,4 @@ GLIB_SCHEMAS=	org.gnome.nautilus.gschema.xml
 
 MAN1=		nautilus-connect-server.1 nautilus.1
 
-post-install:
-	@-update-desktop-database
-
 .include <bsd.port.mk>
diff --git a/x11-fm/nautilus3/pkg-plist b/x11-fm/nautilus3/pkg-plist
index 641689aeb..91735b3c6 100644
--- a/x11-fm/nautilus3/pkg-plist
+++ b/x11-fm/nautilus3/pkg-plist
@@ -186,10 +186,6 @@ share/mime/packages/nautilus.xml
 @dirrmtry lib/nautilus
 @dirrm include/nautilus/libnautilus-extension
 @dirrm include/nautilus
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrm share/doc/libnautilus-extension
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile
index 9396e3ae6..3751ebc43 100644
--- a/x11-fm/nemo/Makefile
+++ b/x11-fm/nemo/Makefile
@@ -27,9 +27,8 @@ GH_COMMIT=	63f7b44
 
 INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
-USES=		pathfix
-USE_GNOME=	gnomeprefix intlhack gnomedesktop3 libxml2 desktopfileutils
+USES=		gettext pathfix desktop-file-utils
+USE_GNOME=	gnomeprefix intlhack gnomedesktop3 libxml2
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool autoconf automake
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -59,7 +58,4 @@ post-patch:
 pre-configure:
 	cd ${WRKSRC} && NOCONFIGURE=yes ${SH} ./autogen.sh
 
-post-install:
-	@-update-desktop-database
-
 .include <bsd.port.mk>