Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Jun 2014 21:32:54 +0000 (UTC)
From:      Koop Mast <kwm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r359926 - in head: games/gnome-games net/vinagre
Message-ID:  <201406302132.s5ULWsbl035437@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kwm
Date: Mon Jun 30 21:32:54 2014
New Revision: 359926
URL: http://svnweb.freebsd.org/changeset/ports/359926
QAT: https://qat.redports.org/buildarchive/r359926/

Log:
  Stage these suckers.
  
  And bring them more up to date with current practices.
  USES=desktop-file-utils/shared-mime-info/tar

Deleted:
  head/games/gnome-games/pkg-install
Modified:
  head/games/gnome-games/Makefile
  head/games/gnome-games/pkg-plist
  head/net/vinagre/Makefile
  head/net/vinagre/pkg-plist

Modified: head/games/gnome-games/Makefile
==============================================================================
--- head/games/gnome-games/Makefile	Mon Jun 30 21:28:26 2014	(r359925)
+++ head/games/gnome-games/Makefile	Mon Jun 30 21:32:54 2014	(r359926)
@@ -10,24 +10,22 @@ MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	The game applications package for the GNOME 2 Desktop Environment
+COMMENT=	Game applications package for the GNOME 2 Desktop Environment
 
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	guile:${PORTSDIR}/lang/guile \
-		clutter-gtk-0.10:${PORTSDIR}/graphics/clutter-gtk \
-		clutter-glx-1.0:${PORTSDIR}/graphics/clutter
+LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile \
+		libclutter-gtk-0.10.so:${PORTSDIR}/graphics/clutter-gtk \
+		libclutter-glx-1.0.so:${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
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_GL=		gl
-USES=		pathfix gettext gmake pkgconfig
-USE_GNOME=	gnomeprefix intlhack librsvg2 desktopfileutils \
-		pygnomedesktop gnomedocutils
+USES=		desktop-file-utils pathfix gettext gmake pkgconfig tar:bzip2
+USE_GNOME=	gnomeprefix intlhack librsvg2 pygnomedesktop gnomedocutils
 USE_GSTREAMER=	vorbis ogg
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-sound=gstreamer \
@@ -41,18 +39,33 @@ GCONF_SCHEMAS=	aisleriot.schemas glchess
 		gnotski.schemas gtali.schemas iagno.schemas lightsoff.schemas \
 		mahjongg.schemas quadrapassel.schemas swell-foop.schemas
 
-#DSC_FILES=	iagno/iagno-client.dsc gnect/data/gnect-client.dsc \
-#		gnibbles/gnibbles-client.dsc
+SCOREFILES=	glines.Large glines.Medium glines.Small gnibbles.1.0 \
+	gnibbles.1.1 gnibbles.2.0 gnibbles.2.1 gnibbles.3.0 gnibbles.3.1 \
+	gnibbles.4.0 gnibbles.4.1 gnobots2.classic_robots-safe \
+	gnobots2.classic_robots-super-safe gnobots2.classic_robots \
+	gnobots2.nightmare-safe gnobots2.nightmare-super-safe \
+	gnobots2.nightmare gnobots2.robots2-safe gnobots2.robots2-super-safe \
+	gnobots2.robots2 gnobots2.robots2_easy-safe \
+	gnobots2.robots2_easy-super-safe gnobots2.robots2_easy \
+	gnobots2.robots_with_safe_teleport-safe \
+	gnobots2.robots_with_safe_teleport-super-safe \
+	gnobots2.robots_with_safe_teleport gnomine.Custom \
+	gnomine.Large gnomine.Medium gnomine.Small gnotravex.2x2 \
+	gnotravex.3x3 gnotravex.4x4 gnotravex.5x5 gnotravex.6x6 gnotski.1 \
+	gnotski.10 gnotski.11 gnotski.12 gnotski.13 gnotski.14 gnotski.15 \
+	gnotski.16 gnotski.17 gnotski.18 gnotski.19 gnotski.2 gnotski.20 \
+	gnotski.21 gnotski.22 gnotski.23 gnotski.24 gnotski.25 gnotski.26 \
+	gnotski.27 gnotski.28 gnotski.29 gnotski.3 gnotski.30 gnotski.31 \
+	gnotski.32 gnotski.33 gnotski.34 gnotski.35 gnotski.36 gnotski.37 \
+	gnotski.4 gnotski.5 gnotski.6 gnotski.7 gnotski.8 gnotski.9 \
+	gtali.Colors gtali.Regular mahjongg.bridges mahjongg.cloud \
+	mahjongg.confounding mahjongg.difficult mahjongg.dragon mahjongg.easy \
+	mahjongg.pyramid mahjongg.tictactoe mahjongg.ziggurat quadrapassel
 
-MAN6=		glchess.6 glines.6 gnect.6 gnibbles.6 gnobots2.6 \
-		gnome-sudoku.6 gnomine.6 gnotravex.6 gnotski.6 \
-		gtali.6 iagno.6 mahjongg.6 quadrapassel.6 sol.6
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/lib/libavahi-client.a) || defined(WITH_MDNS)
-LIB_DEPENDS+=	avahi-client:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS+=	libavahi-client.so:${PORTSDIR}/net/avahi-app
 .endif
 
 post-patch:
@@ -63,13 +76,10 @@ post-patch:
 		${WRKSRC}/libgames-support/Makefile.in
 
 post-install:
-	${MKDIR} ${PREFIX}/share/ggz/gnome-games
-	${CHGRP} games ${LOCALBASE}/share/games
-	${CHMOD} g=rwXs ${LOCALBASE}/share/games
-
-#.for dsc in ${DSC_FILES}
-#	${INSTALL_DATA} ${WRKSRC}/${dsc} ${PREFIX}/share/ggz/gnome-games/${dsc:T}
-#.endfor
-	@-update-desktop-database
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/ggz/gnome-games
+.for i in ${SCOREFILES}
+	${MV} ${STAGEDIR}${PREFIX}/share/games/${i}.scores \
+		${STAGEDIR}${PREFIX}/share/games/${i}.scores.sample
+.endfor
 
 .include <bsd.port.post.mk>

Modified: head/games/gnome-games/pkg-plist
==============================================================================
--- head/games/gnome-games/pkg-plist	Mon Jun 30 21:28:26 2014	(r359925)
+++ head/games/gnome-games/pkg-plist	Mon Jun 30 21:32:54 2014	(r359926)
@@ -15,93 +15,112 @@ bin/mahjongg
 bin/quadrapassel
 bin/sol
 bin/swell-foop
-@unexec [ -s %D/share/games/glines.Large.scores ] || rm -f %D/share/games/glines.Large.scores
-@unexec [ -s %D/share/games/glines.Medium.scores ] || rm -f %D/share/games/glines.Medium.scores
-@unexec [ -s %D/share/games/glines.Small.scores ] || rm -f %D/share/games/glines.Small.scores
-@unexec [ -s %D/share/games/gnibbles.1.0.scores ] || rm -f %D/share/games/gnibbles.1.0.scores
-@unexec [ -s %D/share/games/gnibbles.1.1.scores ] || rm -f %D/share/games/gnibbles.1.1.scores
-@unexec [ -s %D/share/games/gnibbles.2.0.scores ] || rm -f %D/share/games/gnibbles.2.0.scores
-@unexec [ -s %D/share/games/gnibbles.2.1.scores ] || rm -f %D/share/games/gnibbles.2.1.scores
-@unexec [ -s %D/share/games/gnibbles.3.0.scores ] || rm -f %D/share/games/gnibbles.3.0.scores
-@unexec [ -s %D/share/games/gnibbles.3.1.scores ] || rm -f %D/share/games/gnibbles.3.1.scores
-@unexec [ -s %D/share/games/gnibbles.4.0.scores ] || rm -f %D/share/games/gnibbles.4.0.scores
-@unexec [ -s %D/share/games/gnibbles.4.1.scores ] || rm -f %D/share/games/gnibbles.4.1.scores
-@unexec [ -s %D/share/games/gnobots2.classic_robots-safe.scores ] || rm -f %D/share/games/gnobots2.classic_robots-safe.scores
-@unexec [ -s %D/share/games/gnobots2.classic_robots-super-safe.scores ] || rm -f %D/share/games/gnobots2.classic_robots-super-safe.scores
-@unexec [ -s %D/share/games/gnobots2.classic_robots.scores ] || rm -f %D/share/games/gnobots2.classic_robots.scores
-@unexec [ -s %D/share/games/gnobots2.nightmare-safe.scores ] || rm -f %D/share/games/gnobots2.nightmare-safe.scores
-@unexec [ -s %D/share/games/gnobots2.nightmare-super-safe.scores ] || rm -f %D/share/games/gnobots2.nightmare-super-safe.scores
-@unexec [ -s %D/share/games/gnobots2.nightmare.scores ] || rm -f %D/share/games/gnobots2.nightmare.scores
-@unexec [ -s %D/share/games/gnobots2.robots2-safe.scores ] || rm -f %D/share/games/gnobots2.robots2-safe.scores
-@unexec [ -s %D/share/games/gnobots2.robots2-super-safe.scores ] || rm -f %D/share/games/gnobots2.robots2-super-safe.scores
-@unexec [ -s %D/share/games/gnobots2.robots2.scores ] || rm -f %D/share/games/gnobots2.robots2.scores
-@unexec [ -s %D/share/games/gnobots2.robots2_easy-safe.scores ] || rm -f %D/share/games/gnobots2.robots2_easy-safe.scores
-@unexec [ -s %D/share/games/gnobots2.robots2_easy-super-safe.scores ] || rm -f %D/share/games/gnobots2.robots2_easy-super-safe.scores
-@unexec [ -s %D/share/games/gnobots2.robots2_easy.scores ] || rm -f %D/share/games/gnobots2.robots2_easy.scores
-@unexec [ -s %D/share/games/gnobots2.robots_with_safe_teleport-safe.scores ] || rm -f %D/share/games/gnobots2.robots_with_safe_teleport-safe.scores
-@unexec [ -s %D/share/games/gnobots2.robots_with_safe_teleport-super-safe.scores ] || rm -f %D/share/games/gnobots2.robots_with_safe_teleport-super-safe.scores
-@unexec [ -s %D/share/games/gnobots2.robots_with_safe_teleport.scores ] || rm -f %D/share/games/gnobots2.robots_with_safe_teleport.scores
-@unexec [ -s %D/share/games/gnomine.Custom.scores ] || rm -f %D/share/games/gnomine.Custom.scores
-@unexec [ -s %D/share/games/gnomine.Large.scores ] || rm -f %D/share/games/gnomine.Large.scores
-@unexec [ -s %D/share/games/gnomine.Medium.scores ] || rm -f %D/share/games/gnomine.Medium.scores
-@unexec [ -s %D/share/games/gnomine.Small.scores ] || rm -f %D/share/games/gnomine.Small.scores
-@unexec [ -s %D/share/games/gnotravex.2x2.scores ] || rm -f %D/share/games/gnotravex.2x2.scores
-@unexec [ -s %D/share/games/gnotravex.3x3.scores ] || rm -f %D/share/games/gnotravex.3x3.scores
-@unexec [ -s %D/share/games/gnotravex.4x4.scores ] || rm -f %D/share/games/gnotravex.4x4.scores
-@unexec [ -s %D/share/games/gnotravex.5x5.scores ] || rm -f %D/share/games/gnotravex.5x5.scores
-@unexec [ -s %D/share/games/gnotravex.6x6.scores ] || rm -f %D/share/games/gnotravex.6x6.scores
-@unexec [ -s %D/share/games/gnotski.1.scores ] || rm -f %D/share/games/gnotski.1.scores
-@unexec [ -s %D/share/games/gnotski.10.scores ] || rm -f %D/share/games/gnotski.10.scores
-@unexec [ -s %D/share/games/gnotski.11.scores ] || rm -f %D/share/games/gnotski.11.scores
-@unexec [ -s %D/share/games/gnotski.12.scores ] || rm -f %D/share/games/gnotski.12.scores
-@unexec [ -s %D/share/games/gnotski.13.scores ] || rm -f %D/share/games/gnotski.13.scores
-@unexec [ -s %D/share/games/gnotski.14.scores ] || rm -f %D/share/games/gnotski.14.scores
-@unexec [ -s %D/share/games/gnotski.15.scores ] || rm -f %D/share/games/gnotski.15.scores
-@unexec [ -s %D/share/games/gnotski.16.scores ] || rm -f %D/share/games/gnotski.16.scores
-@unexec [ -s %D/share/games/gnotski.17.scores ] || rm -f %D/share/games/gnotski.17.scores
-@unexec [ -s %D/share/games/gnotski.18.scores ] || rm -f %D/share/games/gnotski.18.scores
-@unexec [ -s %D/share/games/gnotski.19.scores ] || rm -f %D/share/games/gnotski.19.scores
-@unexec [ -s %D/share/games/gnotski.2.scores ] || rm -f %D/share/games/gnotski.2.scores
-@unexec [ -s %D/share/games/gnotski.20.scores ] || rm -f %D/share/games/gnotski.20.scores
-@unexec [ -s %D/share/games/gnotski.21.scores ] || rm -f %D/share/games/gnotski.21.scores
-@unexec [ -s %D/share/games/gnotski.22.scores ] || rm -f %D/share/games/gnotski.22.scores
-@unexec [ -s %D/share/games/gnotski.23.scores ] || rm -f %D/share/games/gnotski.23.scores
-@unexec [ -s %D/share/games/gnotski.24.scores ] || rm -f %D/share/games/gnotski.24.scores
-@unexec [ -s %D/share/games/gnotski.25.scores ] || rm -f %D/share/games/gnotski.25.scores
-@unexec [ -s %D/share/games/gnotski.26.scores ] || rm -f %D/share/games/gnotski.26.scores
-@unexec [ -s %D/share/games/gnotski.27.scores ] || rm -f %D/share/games/gnotski.27.scores
-@unexec [ -s %D/share/games/gnotski.28.scores ] || rm -f %D/share/games/gnotski.28.scores
-@unexec [ -s %D/share/games/gnotski.29.scores ] || rm -f %D/share/games/gnotski.29.scores
-@unexec [ -s %D/share/games/gnotski.3.scores ] || rm -f %D/share/games/gnotski.3.scores
-@unexec [ -s %D/share/games/gnotski.30.scores ] || rm -f %D/share/games/gnotski.30.scores
-@unexec [ -s %D/share/games/gnotski.31.scores ] || rm -f %D/share/games/gnotski.31.scores
-@unexec [ -s %D/share/games/gnotski.32.scores ] || rm -f %D/share/games/gnotski.32.scores
-@unexec [ -s %D/share/games/gnotski.33.scores ] || rm -f %D/share/games/gnotski.33.scores
-@unexec [ -s %D/share/games/gnotski.34.scores ] || rm -f %D/share/games/gnotski.34.scores
-@unexec [ -s %D/share/games/gnotski.35.scores ] || rm -f %D/share/games/gnotski.35.scores
-@unexec [ -s %D/share/games/gnotski.36.scores ] || rm -f %D/share/games/gnotski.36.scores
-@unexec [ -s %D/share/games/gnotski.37.scores ] || rm -f %D/share/games/gnotski.37.scores
-@unexec [ -s %D/share/games/gnotski.4.scores ] || rm -f %D/share/games/gnotski.4.scores
-@unexec [ -s %D/share/games/gnotski.5.scores ] || rm -f %D/share/games/gnotski.5.scores
-@unexec [ -s %D/share/games/gnotski.6.scores ] || rm -f %D/share/games/gnotski.6.scores
-@unexec [ -s %D/share/games/gnotski.7.scores ] || rm -f %D/share/games/gnotski.7.scores
-@unexec [ -s %D/share/games/gnotski.8.scores ] || rm -f %D/share/games/gnotski.8.scores
-@unexec [ -s %D/share/games/gnotski.9.scores ] || rm -f %D/share/games/gnotski.9.scores
-@unexec [ -s %D/share/games/gtali.Colors.scores ] || rm -f %D/share/games/gtali.Colors.scores
-@unexec [ -s %D/share/games/gtali.Regular.scores ] || rm -f %D/share/games/gtali.Regular.scores
-@unexec [ -s %D/share/games/mahjongg.bridges.scores ] || rm -f %D/share/games/mahjongg.bridges.scores
-@unexec [ -s %D/share/games/mahjongg.cloud.scores ] || rm -f %D/share/games/mahjongg.cloud.scores
-@unexec [ -s %D/share/games/mahjongg.confounding.scores ] || rm -f %D/share/games/mahjongg.confounding.scores
-@unexec [ -s %D/share/games/mahjongg.difficult.scores ] || rm -f %D/share/games/mahjongg.difficult.scores
-@unexec [ -s %D/share/games/mahjongg.dragon.scores ] || rm -f %D/share/games/mahjongg.dragon.scores
-@unexec [ -s %D/share/games/mahjongg.easy.scores ] || rm -f %D/share/games/mahjongg.easy.scores
-@unexec [ -s %D/share/games/mahjongg.pyramid.scores ] || rm -f %D/share/games/mahjongg.pyramid.scores
-@unexec [ -s %D/share/games/mahjongg.tictactoe.scores ] || rm -f %D/share/games/mahjongg.tictactoe.scores
-@unexec [ -s %D/share/games/mahjongg.ziggurat.scores ] || rm -f %D/share/games/mahjongg.ziggurat.scores
-@unexec [ -s %D/share/games/quadrapassel.scores ] || rm -f %D/share/games/quadrapassel.scores
-@unexec [ -s %D/share/games/sweel-foop.Large.scores ] || rm -f %D/share/games/swell-foop.Large.scores
-@unexec [ -s %D/share/games/sweel-foop.Medium.scores ] || rm -f %D/share/games/swell-foop.Medium.scores
-@unexec [ -s %D/share/games/sweel-foop.Small.scores ] || rm -f %D/share/games/swell-foop.Small.scores
+man/man6/glchess.6.gz
+man/man6/glines.6.gz
+man/man6/gnect.6.gz
+man/man6/gnibbles.6.gz
+man/man6/gnobots2.6.gz
+man/man6/gnome-sudoku.6.gz
+man/man6/gnomine.6.gz
+man/man6/gnotravex.6.gz
+man/man6/gnotski.6.gz
+man/man6/gtali.6.gz
+man/man6/iagno.6.gz
+man/man6/mahjongg.6.gz
+man/man6/quadrapassel.6.gz
+man/man6/sol.6.gz
+@owner games
+@group games
+@mode 2775
+@exec mkdir -p %D/share/games
+@sample share/games/glines.Large.scores.sample
+@sample share/games/glines.Medium.scores.sample
+@sample share/games/glines.Small.scores.sample
+@sample share/games/gnibbles.1.0.scores.sample
+@sample share/games/gnibbles.1.1.scores.sample
+@sample share/games/gnibbles.2.0.scores.sample
+@sample share/games/gnibbles.2.1.scores.sample
+@sample share/games/gnibbles.3.0.scores.sample
+@sample share/games/gnibbles.3.1.scores.sample
+@sample share/games/gnibbles.4.0.scores.sample
+@sample share/games/gnibbles.4.1.scores.sample
+@sample share/games/gnobots2.classic_robots-safe.scores.sample
+@sample share/games/gnobots2.classic_robots-super-safe.scores.sample
+@sample share/games/gnobots2.classic_robots.scores.sample
+@sample share/games/gnobots2.nightmare-safe.scores.sample
+@sample share/games/gnobots2.nightmare-super-safe.scores.sample
+@sample share/games/gnobots2.nightmare.scores.sample
+@sample share/games/gnobots2.robots2-safe.scores.sample
+@sample share/games/gnobots2.robots2-super-safe.scores.sample
+@sample share/games/gnobots2.robots2.scores.sample
+@sample share/games/gnobots2.robots2_easy-safe.scores.sample
+@sample share/games/gnobots2.robots2_easy-super-safe.scores.sample
+@sample share/games/gnobots2.robots2_easy.scores.sample
+@sample share/games/gnobots2.robots_with_safe_teleport-safe.scores.sample
+@sample share/games/gnobots2.robots_with_safe_teleport-super-safe.scores.sample
+@sample share/games/gnobots2.robots_with_safe_teleport.scores.sample
+@sample share/games/gnomine.Custom.scores.sample
+@sample share/games/gnomine.Large.scores.sample
+@sample share/games/gnomine.Medium.scores.sample
+@sample share/games/gnomine.Small.scores.sample
+@sample share/games/gnotravex.2x2.scores.sample
+@sample share/games/gnotravex.3x3.scores.sample
+@sample share/games/gnotravex.4x4.scores.sample
+@sample share/games/gnotravex.5x5.scores.sample
+@sample share/games/gnotravex.6x6.scores.sample
+@sample share/games/gnotski.1.scores.sample
+@sample share/games/gnotski.10.scores.sample
+@sample share/games/gnotski.11.scores.sample
+@sample share/games/gnotski.12.scores.sample
+@sample share/games/gnotski.13.scores.sample
+@sample share/games/gnotski.14.scores.sample
+@sample share/games/gnotski.15.scores.sample
+@sample share/games/gnotski.16.scores.sample
+@sample share/games/gnotski.17.scores.sample
+@sample share/games/gnotski.18.scores.sample
+@sample share/games/gnotski.19.scores.sample
+@sample share/games/gnotski.2.scores.sample
+@sample share/games/gnotski.20.scores.sample
+@sample share/games/gnotski.21.scores.sample
+@sample share/games/gnotski.22.scores.sample
+@sample share/games/gnotski.23.scores.sample
+@sample share/games/gnotski.24.scores.sample
+@sample share/games/gnotski.25.scores.sample
+@sample share/games/gnotski.26.scores.sample
+@sample share/games/gnotski.27.scores.sample
+@sample share/games/gnotski.28.scores.sample
+@sample share/games/gnotski.29.scores.sample
+@sample share/games/gnotski.3.scores.sample
+@sample share/games/gnotski.30.scores.sample
+@sample share/games/gnotski.31.scores.sample
+@sample share/games/gnotski.32.scores.sample
+@sample share/games/gnotski.33.scores.sample
+@sample share/games/gnotski.34.scores.sample
+@sample share/games/gnotski.35.scores.sample
+@sample share/games/gnotski.36.scores.sample
+@sample share/games/gnotski.37.scores.sample
+@sample share/games/gnotski.4.scores.sample
+@sample share/games/gnotski.5.scores.sample
+@sample share/games/gnotski.6.scores.sample
+@sample share/games/gnotski.7.scores.sample
+@sample share/games/gnotski.8.scores.sample
+@sample share/games/gnotski.9.scores.sample
+@sample share/games/gtali.Colors.scores.sample
+@sample share/games/gtali.Regular.scores.sample
+@sample share/games/mahjongg.bridges.scores.sample
+@sample share/games/mahjongg.cloud.scores.sample
+@sample share/games/mahjongg.confounding.scores.sample
+@sample share/games/mahjongg.difficult.scores.sample
+@sample share/games/mahjongg.dragon.scores.sample
+@sample share/games/mahjongg.easy.scores.sample
+@sample share/games/mahjongg.pyramid.scores.sample
+@sample share/games/mahjongg.tictactoe.scores.sample
+@sample share/games/mahjongg.ziggurat.scores.sample
+@sample share/games/quadrapassel.scores.sample
+@owner
+@group
+@mode
+@exec mkdir -p %D/share/ggz/gnome-games
 lib/girepository-1.0/GnomeGamesSupport-1.0.typelib
 lib/gnome-games/ar-cards-renderer
 lib/gnome-games/libgames-support-gi.a
@@ -3168,8 +3187,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

Modified: head/net/vinagre/Makefile
==============================================================================
--- head/net/vinagre/Makefile	Mon Jun 30 21:28:26 2014	(r359925)
+++ head/net/vinagre/Makefile	Mon Jun 30 21:32:54 2014	(r359926)
@@ -4,7 +4,7 @@
 
 PORTNAME=	vinagre
 PORTVERSION=	2.30.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -12,16 +12,16 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	VNC client for the GNOME Desktop
 
-LIB_DEPENDS=	gtk-vnc-1.0:${PORTSDIR}/net/gtk-vnc \
-    		avahi-core:${PORTSDIR}/net/avahi-app \
-		avahi-ui:${PORTSDIR}/net/avahi-gtk \
-		gdbm:${PORTSDIR}/databases/gdbm \
-		gnome-keyring:${PORTSDIR}/security/libgnome-keyring
+LIB_DEPENDS=	libgtk-vnc-1.0.so:${PORTSDIR}/net/gtk-vnc \
+		libavahi-core.so:${PORTSDIR}/net/avahi-app \
+		libavahi-ui.so:${PORTSDIR}/net/avahi-gtk \
+		libgdbm.so:${PORTSDIR}/databases/gdbm \
+		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
 
 CONFLICTS=	vinagre-3.[0-9]*
 
-USE_BZIP2=	yes
-USES=		pathfix gettext gmake pkgconfig
+USES=		desktop-file-utils pathfix gettext gmake pkgconfig \
+		shared-mime-info tar:bzip2
 USE_GNOME=	gnomeprefix intlhack vte gconf2 gnomedocutils gnomepanel
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
@@ -32,31 +32,20 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	vinagre.schemas
 
-MAN1=		vinagre.1
-
 OPTIONS_DEFINE=	TELEPATHY
 OPTIONS_DEFAULT=TELEPATHY
+OPTIONS_SUB=	yes
 TELEPATHY_DESC=	Telepathy integration
+TELEPATHY_LIB_DEPENDS=	libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib
+TELEPATHY_CONFIGURE_ENABLE=	telepathy
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MTELEPATHY}
-CONFIGURE_ARGS+=--enable-telepathy
-LIB_DEPENDS+=	telepathy-glib:${PORTSDIR}/net-im/telepathy-glib
-PLIST_SUB+=	TELEPATHY=""
-.else
-CONFIGURE_ARGS+=--disable-telepathy
-PLIST_SUB+=	TELEPATHY="@comment "
-.endif
-
 post-install:
-	@-update-desktop-database > /dev/null
-	@-update-mime-database ${PREFIX}/share/mime > /dev/null
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in AUTHORS COPYING ChangeLog MAINTAINERS NEWS README
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 

Modified: head/net/vinagre/pkg-plist
==============================================================================
--- head/net/vinagre/pkg-plist	Mon Jun 30 21:28:26 2014	(r359925)
+++ head/net/vinagre/pkg-plist	Mon Jun 30 21:32:54 2014	(r359926)
@@ -34,6 +34,7 @@ lib/vinagre-1/plugins/libvnc.so
 lib/vinagre-1/plugins/ssh.vinagre-plugin
 lib/vinagre-1/plugins/vnc.vinagre-plugin
 libdata/pkgconfig/vinagre-1.0.pc
+man/man1/vinagre.1.gz
 share/applications/vinagre-file.desktop
 share/applications/vinagre.desktop
 %%TELEPATHY%%share/dbus-1/services/org.freedesktop.Telepathy.Client.Vinagre.service
@@ -252,8 +253,6 @@ share/locale/uk/LC_MESSAGES/vinagre.mo
 share/locale/zh_CN/LC_MESSAGES/vinagre.mo
 share/locale/zh_HK/LC_MESSAGES/vinagre.mo
 share/locale/zh_TW/LC_MESSAGES/vinagre.mo
-share/mime/application/x-remote-connection.xml
-share/mime/application/x-vnc.xml
 share/mime/packages/vinagre-mime.xml
 share/omf/vinagre/vinagre-C.omf
 share/omf/vinagre/vinagre-ca.omf
@@ -326,10 +325,6 @@ share/vinagre-1/plugins/vnc/vnc.ui
 @dirrm lib/vinagre-1
 @dirrm include/vinagre-1.0/vinagre
 @dirrm include/vinagre-1.0
-@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
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/te/LC_MESSAGES



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406302132.s5ULWsbl035437>