Date: Sat, 13 Oct 2012 08:42:36 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305823 - in head/net: unison unison-devel unison-devel/files unison/files unison232 unison232/files Message-ID: <201210130842.q9D8gaGa075934@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Sat Oct 13 08:42:36 2012 New Revision: 305823 URL: http://svn.freebsd.org/changeset/ports/305823 Log: - 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 Modified: head/net/unison-devel/Makefile (contents, props changed) head/net/unison-devel/files/unison.desktop.in (contents, props changed) head/net/unison/Makefile (contents, props changed) head/net/unison/files/unison.desktop.in (contents, props changed) head/net/unison232/Makefile (contents, props changed) head/net/unison232/files/unison.desktop.in (contents, props changed) Modified: head/net/unison-devel/Makefile ============================================================================== --- head/net/unison-devel/Makefile Sat Oct 13 08:23:53 2012 (r305822) +++ head/net/unison-devel/Makefile Sat Oct 13 08:42:36 2012 (r305823) @@ -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 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 Modified: head/net/unison-devel/files/unison.desktop.in ============================================================================== --- head/net/unison-devel/files/unison.desktop.in Sat Oct 13 08:23:53 2012 (r305822) +++ head/net/unison-devel/files/unison.desktop.in Sat Oct 13 08:42:36 2012 (r305823) @@ -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]=Ð¡Ð¸Ð½Ñ ÑонизаÑÐ¸Ñ Ñайлов (каÑалогов) на неÑколÑÐºÐ¸Ñ Ð´Ð¸ÑÐºÐ°Ñ (компÑÑÑеÑÐ°Ñ ) Modified: head/net/unison/Makefile ============================================================================== --- head/net/unison/Makefile Sat Oct 13 08:23:53 2012 (r305822) +++ head/net/unison/Makefile Sat Oct 13 08:42:36 2012 (r305823) @@ -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 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 Modified: head/net/unison/files/unison.desktop.in ============================================================================== --- head/net/unison/files/unison.desktop.in Sat Oct 13 08:23:53 2012 (r305822) +++ head/net/unison/files/unison.desktop.in Sat Oct 13 08:42:36 2012 (r305823) @@ -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]=Синхронизация файлов (каталогов) на нескольких дисках (компьютерах) Modified: head/net/unison232/Makefile ============================================================================== --- head/net/unison232/Makefile Sat Oct 13 08:23:53 2012 (r305822) +++ head/net/unison232/Makefile Sat Oct 13 08:42:36 2012 (r305823) @@ -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} 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}-m 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> Modified: head/net/unison232/files/unison.desktop.in ============================================================================== --- head/net/unison232/files/unison.desktop.in Sat Oct 13 08:23:53 2012 (r305822) +++ head/net/unison232/files/unison.desktop.in Sat Oct 13 08:42:36 2012 (r305823) @@ -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]=Синхронизация файлов (каталогов) на нескольких дисках (компьютерах)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210130842.q9D8gaGa075934>