svn commit: r372715 - head/net/unison

[Guido Falsi]

Author: madpilot
Date: Tue Nov 18 12:05:44 2014
New Revision: 372715
URL: https://svnweb.freebsd.org/changeset/ports/372715
QAT: https://qat.redports.org/buildarchive/r372715/

Log:
  - Add USES desktop-file-utils
  - Make install targets verbose
  - Remove improper use of PLIST_FILES
  - Cleanup plist

Modified:
  head/net/unison/Makefile
  head/net/unison/pkg-plist

Modified: head/net/unison/Makefile
==============================================================================
--- head/net/unison/Makefile	Tue Nov 18 12:04:30 2014	(r372714)
+++ head/net/unison/Makefile	Tue Nov 18 12:05:44 2014	(r372715)
@@ -16,7 +16,7 @@ COMMENT?=	User-level file synchronizatio
 LICENSE=	GPLv3
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
-USES=		gmake
+USES=		desktop-file-utils gmake
 WANT_GNOME=	yes
 MAKE_ARGS=	CFLAGS=""
 CONFLICTS?=	unison-devel-[0-9]* unison-nox11-[0-9]*
@@ -43,7 +43,6 @@ RUN_DEPENDS+=	lablgtk2:${PORTSDIR}/x11-t
 PATCH_DEPENDS+=	${BUILD_DEPENDS}
 CONFLICTS+=	ocaml-nox11*
 SUB_FILES+=	${PORTNAME}.desktop
-PLIST_FILES+=	share/pixmaps/${PORTNAME}.png
 .else
 MAKE_ARGS+=	UISTYLE=text
 PLIST_SUB+=	TEXT="@comment "
@@ -72,10 +71,10 @@ post-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 	cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${STAGEDIR}${DOCSDIR}
 .if ${PORT_OPTIONS:MX11}
-	@${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
-	@${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
-	@${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
+	${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 .endif
 
 .include <bsd.port.mk>

Modified: head/net/unison/pkg-plist
==============================================================================
--- head/net/unison/pkg-plist	Tue Nov 18 12:04:30 2014	(r372714)
+++ head/net/unison/pkg-plist	Tue Nov 18 12:05:44 2014	(r372715)
@@ -1,12 +1,10 @@
 bin/unison
 %%TEXT%%share/applications/unison.desktop
 %%TEXT%%bin/unison-text
+%%TEXT%%share/pixmaps/unison.png
 %%PORTDOCS%%%%DOCSDIR%%/BUGS.txt
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/unison-%%PORTVERSION%%-manual.html
 %%PORTDOCS%%%%DOCSDIR%%/unison-%%PORTVERSION%%-manual.pdf
 %%PORTDOCS%%%%DOCSDIR%%/unison-%%PORTVERSION%%-manual.ps
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%TEXT%%@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || :
-%%TEXT%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || :