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

4 files changed, 15 insertions, 31 deletions

diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 806a496cf..184fd9c6c 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomegames2
-# Date created:				08 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/games/gnome-games/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-games
 PORTVERSION=	2.32.1
@@ -17,21 +13,20 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The game applications package for the GNOME 2 Desktop Environment
 
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile \
-		clutter-gtk-0.10.0:${PORTSDIR}/graphics/clutter-gtk \
-		clutter-glx-1.0.0:${PORTSDIR}/graphics/clutter
+LIB_DEPENDS=	guile:${PORTSDIR}/lang/guile \
+		clutter-gtk-0.10:${PORTSDIR}/graphics/clutter-gtk \
+		clutter-glx-1.0:${PORTSDIR}/graphics/clutter
 RUN_DEPENDS=	seed:${PORTSDIR}/devel/seed
 
 CONFLICTS=	sol-1.0.* glchess-[0-9]* gnomesudoku-[0-9]* gnome-games-3.[0-9]*
 
 USE_BZIP2=	yes
 USE_PYTHON=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix desktop-file-utils
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack \
-		librsvg2 desktopfileutils pygnomedesktop gnomedocutils
+USE_GNOME=	gnomeprefix intlhack librsvg2 pygnomedesktop gnomedocutils
 USE_GSTREAMER=	vorbis ogg
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-sound=gstreamer \
@@ -73,6 +68,5 @@ post-install:
 #.for dsc in ${DSC_FILES}
 #	${INSTALL_DATA} ${WRKSRC}/${dsc} ${PREFIX}/share/ggz/gnome-games/${dsc:T}
 #.endfor
-	@-update-desktop-database
 
 .include <bsd.port.post.mk>
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index 7ead24d3c..bec415cd8 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -3169,8 +3169,6 @@ share/omf/swell-foop/swell-foop-sv.omf
 @dirrm %%PYTHON_SITELIBDIR%%/glchess/chess
 @dirrm %%PYTHON_SITELIBDIR%%/glchess
 @dirrm lib/gnome-games
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
diff --git a/games/gnome-games3/Makefile b/games/gnome-games3/Makefile
index 2fbfed875..4d22910a8 100644
--- a/games/gnome-games3/Makefile
+++ b/games/gnome-games3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomegames2
-# Date created:				08 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/games/gnome-games3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-games
 PORTVERSION=	3.4.2
@@ -19,10 +15,10 @@ BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
 		yelp-tools>=0:${PORTSDIR}/textproc/yelp-tools \
 		itstool:${PORTSDIR}/textproc/itstool \
 		valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile \
-		canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3 \
-		clutter-gtk-1.0.0:${PORTSDIR}/graphics/clutter-gtk3 \
-		clutter-1.0.0:${PORTSDIR}/graphics/clutter
+LIB_DEPENDS=	guile:${PORTSDIR}/lang/guile \
+		canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 \
+		clutter-gtk-1.0:${PORTSDIR}/graphics/clutter-gtk3 \
+		clutter-1.0:${PORTSDIR}/graphics/clutter
 RUN_DEPENDS=	dbus-launch:${PORTSDIR}/devel/dbus
 
 CONFLICTS=	sol-1.0.* glchess-[0-9]* gnomesudoku-[0-9]* gnome-games-2.[0-9]*
@@ -30,14 +26,13 @@ CONFLICTS=	sol-1.0.* glchess-[0-9]* gnomesudoku-[0-9]* gnome-games-2.[0-9]*
 LATEST_LINK=	gnome-games3
 USE_XZ=		yes
 USE_PYTHON=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix desktop-file-utils pkgconfig
 INSTALLS_ICONS=	yes
 USE_GL=		gl glu
 USE_XORG=	ice x11
 USE_GMAKE=	yes
 USE_SQLITE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gtk30 pygobject3 \
-		librsvg2 desktopfileutils
+USE_GNOME=	gnomeprefix intlhack gtk30 pygobject3 librsvg2
 USE_GSTREAMER=	vorbis ogg
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gtk=3.0 --enable-games=all
@@ -68,6 +63,5 @@ MAN6=		glchess.6 glines.6 gnect.6 gnibbles.6 gnobots2.6 \
 post-install:
 	${CHGRP} games ${LOCALBASE}/share/games
 	${CHMOD} g=rwXs ${LOCALBASE}/share/games
-	@-update-desktop-database
 
 .include <bsd.port.mk>
diff --git a/games/gnome-games3/pkg-plist b/games/gnome-games3/pkg-plist
index 9d8b87888..2357b8f2a 100644
--- a/games/gnome-games3/pkg-plist
+++ b/games/gnome-games3/pkg-plist
@@ -4913,5 +4913,3 @@ share/quadrapassel/sounds/turn.ogg
 @dirrm %%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies
 @dirrm %%PYTHON_SITELIBDIR%%/gnome_sudoku
 @dirrm lib/gnome-games
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true