svn commit: r351749 - head/x11/gnome-pie

[Baptiste Daroussin]

Author: bapt
Date: Tue Apr 22 06:01:14 2014
New Revision: 351749
URL: http://svnweb.freebsd.org/changeset/ports/351749
QAT: https://qat.redports.org/buildarchive/r351749/

Log:
  Support stage
  Modernize

Modified:
  head/x11/gnome-pie/Makefile
  head/x11/gnome-pie/pkg-plist

Modified: head/x11/gnome-pie/Makefile
==============================================================================
--- head/x11/gnome-pie/Makefile	Tue Apr 22 05:50:18 2014	(r351748)
+++ head/x11/gnome-pie/Makefile	Tue Apr 22 06:01:14 2014	(r351749)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnome-pie
 PORTVERSION=	0.5.5
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	nivit at FreeBSD.org
@@ -14,11 +14,11 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
 RUN_DEPENDS=	gnome-icons-faenza>=1.3:${PORTSDIR}/x11-themes/gnome-icons-faenza \
 		gnome-settings-daemon>=2.32.1_4:${PORTSDIR}/sysutils/gnome-settings-daemon
-LIB_DEPENDS=	Xtst:${PORTSDIR}/x11/libXtst \
-		cairo:${PORTSDIR}/graphics/cairo \
-		gee:${PORTSDIR}/devel/libgee06 \
-		unique:${PORTSDIR}/x11-toolkits/unique
+LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
+		libgee.so:${PORTSDIR}/devel/libgee06 \
+		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
 
+USE_XORG=	xtst
 GH_ACCOUNT=	Simmesimme
 GH_PROJECT=	Gnome-Pie
 GH_COMMIT=	5ea8b11
@@ -28,30 +28,14 @@ INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=	DOCS MANPAGES NLS
 OPTIONS_DEFAULT=	MANPAGES
+OPTIONS_SUB=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+DOCS_CMAKE_ON=	-DINSTALL_DOCS:BOOL=ON
+MANPAGES_CMAKE_OFF=	-DNO_INSTALL_MANPAGES:BOOL=ON
 
-.if ${PORT_OPTIONS:MDOCS}
-CMAKE_ARGS+=	-DINSTALL_DOCS:BOOL=ON
-.endif
-
-.if ${PORT_OPTIONS:MMANPAGES}
-MAN1=	gnome-pie.1
-.else
-CMAKE_ARGS+=	-DNO_INSTALL_MANPAGES:BOOL=ON
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-CMAKE_ARGS+=	-DINSTALL_NLS:BOOL=ON
-USES+=		gettext
-PLIST_SUB=	NLS=""
-.else
-CMAKE_ARGS+=	-DINSTALL_NLS:BOOL=OFF
-PLIST_SUB=	NLS="@comment "
-.endif
-
-PLIST_SUB+=	DESKTOPDIR=${DESKTOPDIR:S,${PREFIX}/,,}
+NLS_CMAKE_ON=	-DINSTALL_NLS:BOOL=ON
+NLS_USES=		gettext
+NLS_CMAKE_OFF=	-DINSTALL_NLS:BOOL=OFF
 
 REINPLACE_ARGS=	-e 's,%%DATADIR%%,${DATADIR},1' \
 		-e 's,%%DESKTOPDIR%%,${DESKTOPDIR},1' \
@@ -71,9 +55,6 @@ post-patch:
 			${WRKSRC}/src/utilities/paths.vala \
 			${WRKSRC}/resources/ui/*.ui
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 gnome-pie-user:
 	gconftool-2 --type string --set /desktop/gnome/interface/icon_theme "Faenza"
 	gconftool-2 --type bool --set /desktop/gnome/interface/menus_have_icons true

Modified: head/x11/gnome-pie/pkg-plist
==============================================================================
--- head/x11/gnome-pie/pkg-plist	Tue Apr 22 05:50:18 2014	(r351748)
+++ head/x11/gnome-pie/pkg-plist	Tue Apr 22 06:01:14 2014	(r351749)
@@ -1,6 +1,6 @@
- at comment FreeBSD$
 bin/gnome-pie
-%%DESKTOPDIR%%/gnome-pie.desktop
+%%MANPAGES%%man/man1/gnome-pie.1.gz
+share/applications/gnome-pie.desktop
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%DATADIR%%/themes/adwaita/arrow.svg
 %%DATADIR%%/themes/adwaita/caption_mask.svg
@@ -95,4 +95,8 @@ share/icons/hicolor/scalable/apps/gnome-
 @dirrm %%DATADIR%%/themes/adwaita
 @dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%
+ at dirrmtry share/icons/hicolor/scalable/apps
+ at dirrmtry share/icons/hicolor/scalable
+ at dirrmtry share/icons/hicolor
+ at dirrmtry share/icons
 %%PORTDOCS%%@dirrm %%DOCSDIR%%