- Make port convert and use icons which come with the distribution

- Remove indefinite article from COMMENT
- Trim Makefiles headers
- Bump PORTREVISION

PR:		ports/172492
Submitted by:	Boris Samorodov <bsam@FreeBSD.org>
Approved by:	mandree (implicit, maintainer of net/unison232)
Approved by:	tabthorpe (portmgr)
Feature safe:	yes

6 files changed, 27 insertions, 24 deletions

diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile
index fecfe3fe929e..daba15dae461 100644
--- a/net/unison-devel/Makefile
+++ b/net/unison-devel/Makefile
@@ -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.45.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
 PKGNAMESUFFIX=	-devel
@@ -16,7 +12,7 @@ DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 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
 
@@ -44,12 +40,14 @@ EXTRA_DOCS=	unison-${PORTVERSION}-manual.html \
 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 "
@@ -62,6 +60,7 @@ post-build:
 	@${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:
@@ -81,6 +80,7 @@ post-install:
 	@${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
diff --git a/net/unison-devel/files/unison.desktop.in b/net/unison-devel/files/unison.desktop.in
index a5c0a9c8dc31..95419f8fb648 100644
--- a/net/unison-devel/files/unison.desktop.in
+++ b/net/unison-devel/files/unison.desktop.in
@@ -7,5 +7,6 @@ Terminal=false
 StartupNotify=true
 Categories=GTK;Utility;
 Exec=unison
+Icon=unison.png
 Comment=Synchronize files (directories) over different disks (hosts)
 Comment[ru]=Синхронизация файлов (каталогов) на нескольких дисках (компьютерах)
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 7edfdfbb9696..8640ff2a16a9 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -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 @@ DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 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 @@ EXTRA_DOCS=	unison-${PORTVERSION}-manual.html \
 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 @@ post-build:
 	@${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 @@ post-install:
 	@${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
diff --git a/net/unison/files/unison.desktop.in b/net/unison/files/unison.desktop.in
index 9a85315843f7..789ccaa366b6 100644
--- a/net/unison/files/unison.desktop.in
+++ b/net/unison/files/unison.desktop.in
@@ -7,5 +7,6 @@ Terminal=false
 StartupNotify=true
 Categories=GTK;Utility;
 Exec=unison
+Icon=unison.png
 Comment=Synchronize files (directories) over different disks (hosts)
 Comment[ru]=Синхронизация файлов (каталогов) на нескольких дисках (компьютерах)
diff --git a/net/unison232/Makefile b/net/unison232/Makefile
index 0a6ae10d205f..9e2e2a05cb8c 100644
--- a/net/unison232/Makefile
+++ b/net/unison232/Makefile
@@ -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.32.52
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
 PKGNAMESUFFIX=	232
@@ -17,7 +13,7 @@ EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
 
 MAINTAINER=	mandree@FreeBSD.org
 # Implicit approval for port changes granted to Guido Falsi <madpilot@FreeBSD.org>
-COMMENT=	A user-level file synchronization tool
+COMMENT=	User-level file synchronization tool
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 USE_GMAKE=	yes
@@ -44,12 +40,14 @@ EXTRA_DOCS=	${PORTNAME}-${PORTVERSION}-manual.html \
 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}${PKGNAMESUFFIX}.png
 .else
 MAKE_ARGS+=	UISTYLE=text
 PLIST_SUB+=	TEXT="@comment "
@@ -62,6 +60,7 @@ post-build:
 	@${ECHO} Building text-only version
 	@${ECHO} ${WRKSRC}
 	${GMAKE} -C ${WRKSRC} UISTYLE=text NAME=${PORTNAME}-text
+	@cd ${WRKSRC}/win32rc && ${LOCALBASE}/bin/icotool -x U.ico
 .endif
 
 do-install:
@@ -78,6 +77,7 @@ post-install:
 	${MKDIR} ${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${DESKTOPDIR}/${PORTNAME}${PKGNAMESUFFIX}.desktop
 	-update-desktop-database > /dev/null
+	@${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${PREFIX}/share/pixmaps/${PORTNAME}${PKGNAMESUFFIX}.png
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/unison232/files/unison.desktop.in b/net/unison232/files/unison.desktop.in
index 24202d62f5e2..b5416954207d 100644
--- a/net/unison232/files/unison.desktop.in
+++ b/net/unison232/files/unison.desktop.in
@@ -7,6 +7,7 @@ Terminal=false
 StartupNotify=true
 Categories=GTK;Utility;
 Exec=unison232
+Icon=unison232.png
 Comment=Synchronize files (directories) over different disks (hosts)
 Comment[de]=Dateien oder Verzeichnisse über Festplatten oder Computer hinweg abgleichen
 Comment[ru]=Синхронизация файлов (каталогов) на нескольких дисках (компьютерах)