From owner-svn-ports-all@FreeBSD.ORG  Tue Nov 18 12:05:45 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3D43FCF;
 Tue, 18 Nov 2014 12:05:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0FFD8BD2;
 Tue, 18 Nov 2014 12:05:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAIC5iKn008367;
 Tue, 18 Nov 2014 12:05:44 GMT (envelope-from madpilot@FreeBSD.org)
Received: (from madpilot@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAIC5iIc008364;
 Tue, 18 Nov 2014 12:05:44 GMT (envelope-from madpilot@FreeBSD.org)
Message-Id: <201411181205.sAIC5iIc008364@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: madpilot set sender to
 madpilot@FreeBSD.org using -f
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Tue, 18 Nov 2014 12:05:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r372715 - head/net/unison
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Nov 2014 12:05:45 -0000

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 || :