From nobody@FreeBSD.org  Mon Oct  8 16:38:31 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4DE67106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  8 Oct 2012 16:38:31 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 2DEAE8FC12
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  8 Oct 2012 16:38:31 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q98GcV38067101
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 8 Oct 2012 16:38:31 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id q98GcUlA067100;
	Mon, 8 Oct 2012 16:38:30 GMT
	(envelope-from nobody)
Message-Id: <201210081638.q98GcUlA067100@red.freebsd.org>
Date: Mon, 8 Oct 2012 16:38:30 GMT
From: Boris Samorodov <bsam@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] net/unison: make use icon
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         172492
>Category:       ports
>Synopsis:       [patch] net/unison: make use icon
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    madpilot
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 08 16:40:11 UTC 2012
>Closed-Date:    Sat Oct 13 08:42:56 UTC 2012
>Last-Modified:  Sat Oct 13 08:42:56 UTC 2012
>Originator:     Boris Samorodov
>Release:        FreeBSD 10.0-CURRENT
>Organization:
BSDprint
>Environment:
FreeBSD bsam.wart.ru 10.0-CURRENT FreeBSD 10.0-CURRENT #36 r241156: Wed Oct  3 13:44:36 SAMT 2012     bsam@bsam.wart.ru:/usr/obj/usr/src/sys/BBX  i386
>Description:
The distribution tarball has icons packed for Win*. Let's extract, convert to PNG and use it!
>How-To-Repeat:

>Fix:
. extract and convert icons from *.ico to *.png with graphics/icoutils while building;
. install 48x48 icon and make use of it;
. insert icon to the desktop file;
. bump PORTREVISION;
. adopt new headres style;
. remove the indefinite article from COMMENT.


Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 305532)
+++ Makefile	(working copy)
@@ -1,13 +1,9 @@
-# New ports collection makefile for: unison
-# Date created:		4 October 2000
-# Whom:			Dan Pelleg <dpelleg+unison@cs.cmu.edu>
-#
+# Created by: Dan Pelleg <dpelleg+unison@cs.cmu.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	unison
 PORTVERSION=	2.40.63
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
 DISTFILES=	${EXTRACT_ONLY} ${EXTRA_DOCS}
@@ -15,7 +11,7 @@
 EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
 
 MAINTAINER?=	madpilot@FreeBSD.org
-COMMENT?=	A user-level file synchronization tool
+COMMENT?=	User-level file synchronization tool
 
 LICENSE=	GPLv3
 
@@ -43,12 +39,14 @@
 MAKE_ARGS+=	UISTYLE=gtk2
 PLIST_SUB+=	TEXT=""
 BUILD_DEPENDS+=	ocamlc:${PORTSDIR}/lang/ocaml \
-		lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
+		lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \
+		icotool:${PORTSDIR}/graphics/icoutils
 RUN_DEPENDS+=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
 PATCH_DEPENDS+=	${BUILD_DEPENDS}
 CONFLICTS+=	ocaml-nox11*
 USE_GNOME=	desktopfileutils
 SUB_FILES+=	${PORTNAME}.desktop
+PLIST_FILES+=	share/pixmaps/${PORTNAME}.png
 .else
 MAKE_ARGS+=	UISTYLE=text
 PLIST_SUB+=	TEXT="@comment "
@@ -61,6 +59,7 @@
 	@${ECHO} Building text-only version
 	@${ECHO} ${WRKSRC}
 	@${GMAKE} -C ${WRKSRC} UISTYLE=text NAME=unison-text
+	@cd ${WRKSRC}/win32rc && ${LOCALBASE}/bin/icotool -x U.ico
 .endif
 
 do-install:
@@ -77,6 +76,7 @@
 	@${MKDIR} ${DESKTOPDIR}
 	@${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${DESKTOPDIR}
 	@-update-desktop-database > /dev/null
+	@${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
 	@${CAT} ${PKGMESSAGE}
 .else
 	@${CAT} ${PKGMESSAGE}.nox11
Index: files/unison.desktop.in
===================================================================
--- files/unison.desktop.in	(revision 305532)
+++ files/unison.desktop.in	(working copy)
@@ -7,5 +7,6 @@
 StartupNotify=true
 Categories=GTK;Utility;
 Exec=unison
+Icon=unison.png
 Comment=Synchronize files (directories) over different disks (hosts)
 Comment[ru]=Синхронизация файлов (каталогов) на нескольких дисках (компьютерах)


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->madpilot 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Oct 8 16:40:25 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172492 
State-Changed-From-To: open->closed 
State-Changed-By: madpilot 
State-Changed-When: Sat Oct 13 08:42:56 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172492 
>Unformatted:
