From owner-svn-ports-head@FreeBSD.ORG Thu Jan 1 18:17:16 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4152DD38; Thu, 1 Jan 2015 18:17:16 +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 22EC0305; Thu, 1 Jan 2015 18:17:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t01IHG1w072604; Thu, 1 Jan 2015 18:17:16 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t01IHD5v072594; Thu, 1 Jan 2015 18:17:13 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201501011817.t01IHD5v072594@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Thu, 1 Jan 2015 18:17:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376017 - in head: . net/unison net/unison-devel net/unison232 net/unison240 net/unison240/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jan 2015 18:17:16 -0000 Author: madpilot Date: Thu Jan 1 18:17:12 2015 New Revision: 376017 URL: https://svnweb.freebsd.org/changeset/ports/376017 QAT: https://qat.redports.org/buildarchive/r376017/ Log: - Update net/unison to 2.48.3 - Preserve unison 2.40 as net/unison240 and update to 2.40.128 - Remove uneeded USES=desktop-file-utils from unison ports [1] Approved by: mandree (implicit, for net/unison232) [1] Added: head/net/unison240/ - copied from r375913, head/net/unison/ Modified: head/UPDATING head/net/unison-devel/Makefile head/net/unison/Makefile head/net/unison/distinfo head/net/unison232/Makefile head/net/unison240/Makefile head/net/unison240/distinfo head/net/unison240/files/unison.desktop.in head/net/unison240/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Thu Jan 1 18:14:44 2015 (r376016) +++ head/UPDATING Thu Jan 1 18:17:12 2015 (r376017) @@ -5,6 +5,17 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20150101: + AFFECTS: users of net/unison and net/unison-nox11 + AUTHOR: madpilot@FreeBSD.org + + Unison has been upgraded to version 2.48, which uses a different wire + protocol than 2.40 did. In order to support synchronization with + other computers where Unison is still at version 2.40, a new port + net/unison240 has been created. It provides unison240 and if that is + GTK2-enabled, also unison240-text. This unison240 port can be + installed in parallel with the existing net/unison port. + 20141230: AFFECTS: users of deskutils/xpad AUTHOR: jgh@FreeBSD.org Modified: head/net/unison-devel/Makefile ============================================================================== --- head/net/unison-devel/Makefile Thu Jan 1 18:14:44 2015 (r376016) +++ head/net/unison-devel/Makefile Thu Jan 1 18:17:12 2015 (r376017) @@ -13,10 +13,13 @@ EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION} MAINTAINER= madpilot@FreeBSD.org COMMENT= User-level file synchronization tool +IGNORE= No devel release available. \ + Install net/unison which is the latest stable version. + LICENSE= GPLv3 PLIST_SUB= PORTVERSION=${PORTVERSION} -USES= desktop-file-utils gmake +USES= gmake WANT_GNOME= yes MAKE_ARGS= CFLAGS="" CONFLICTS= unison-[0-9]* unison-nox11-[0-9]* Modified: head/net/unison/Makefile ============================================================================== --- head/net/unison/Makefile Thu Jan 1 18:14:44 2015 (r376016) +++ head/net/unison/Makefile Thu Jan 1 18:17:12 2015 (r376017) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= unison -PORTVERSION= 2.40.102 -PORTREVISION= 3 +PORTVERSION= 2.48.3 CATEGORIES= net MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} @@ -16,7 +15,7 @@ COMMENT?= User-level file synchronizatio LICENSE= GPLv3 PLIST_SUB= PORTVERSION=${PORTVERSION} -USES= desktop-file-utils gmake +USES= gmake WANT_GNOME= yes MAKE_ARGS= CFLAGS="" CONFLICTS?= unison-devel-[0-9]* unison-nox11-[0-9]* @@ -64,14 +63,14 @@ post-build: .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/unison ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} 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}/${PORTNAME}-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 Modified: head/net/unison/distinfo ============================================================================== --- head/net/unison/distinfo Thu Jan 1 18:14:44 2015 (r376016) +++ head/net/unison/distinfo Thu Jan 1 18:17:12 2015 (r376017) @@ -1,8 +1,8 @@ -SHA256 (unison-2.40.102/unison-2.40.102.tar.gz) = 3d4a92f02b6998f156cb714d202d0358dd2846efbdce9de30e2c666d77c1e854 -SIZE (unison-2.40.102/unison-2.40.102.tar.gz) = 2694761 -SHA256 (unison-2.40.102/unison-2.40.102-manual.html) = d45cf43bff8805143c53b9f58c4250b781dae04caa0f8f30048c32eb8cf8bf75 -SIZE (unison-2.40.102/unison-2.40.102-manual.html) = 267095 -SHA256 (unison-2.40.102/unison-2.40.102-manual.pdf) = 145b427a32cc4e295b128238cf2106853906f3e31b0b06d6757c000fd1e3c56b -SIZE (unison-2.40.102/unison-2.40.102-manual.pdf) = 496539 -SHA256 (unison-2.40.102/unison-2.40.102-manual.ps) = 88aa2c9b19f680db3c425f378aeb8ca204dd0c1fc81bdd5405be47f7e09f4a8e -SIZE (unison-2.40.102/unison-2.40.102-manual.ps) = 752359 +SHA256 (unison-2.48.3/unison-2.48.3.tar.gz) = a695f9d45e95d3d9c3f25fcbf1891f5eb20e5aa51709f81b785a20e14270b7ee +SIZE (unison-2.48.3/unison-2.48.3.tar.gz) = 1172532 +SHA256 (unison-2.48.3/unison-2.48.3-manual.html) = 55eea95ff61d3b40891ea9ff069683e825415abf868c157fa04beeb5905ad17c +SIZE (unison-2.48.3/unison-2.48.3-manual.html) = 278110 +SHA256 (unison-2.48.3/unison-2.48.3-manual.pdf) = 3556b6d3bba7a020eceb49e90a7f410786e4ef67873a7a8c358030574e707729 +SIZE (unison-2.48.3/unison-2.48.3-manual.pdf) = 516344 +SHA256 (unison-2.48.3/unison-2.48.3-manual.ps) = 624090ba92aade7e7793370ab44bc5387b5e25bc715e5634451e69d61d532008 +SIZE (unison-2.48.3/unison-2.48.3-manual.ps) = 771393 Modified: head/net/unison232/Makefile ============================================================================== --- head/net/unison232/Makefile Thu Jan 1 18:14:44 2015 (r376016) +++ head/net/unison232/Makefile Thu Jan 1 18:17:12 2015 (r376017) @@ -3,7 +3,7 @@ PORTNAME= unison PORTVERSION= 2.32.52 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ PKGNAMESUFFIX= 232 @@ -18,7 +18,7 @@ COMMENT= User-level file synchronization LICENSE= GPLv3 PLIST_SUB= PORTVERSION=${PORTVERSION} -USES= desktop-file-utils gmake +USES= gmake WANT_GNOME= yes MAKE_ARGS= CFLAGS="" Modified: head/net/unison240/Makefile ============================================================================== --- head/net/unison/Makefile Thu Jan 1 01:13:11 2015 (r375913) +++ head/net/unison240/Makefile Thu Jan 1 18:17:12 2015 (r376017) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= unison -PORTVERSION= 2.40.102 -PORTREVISION= 3 +PORTVERSION= 2.40.128 CATEGORIES= net MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ +PKGNAMESUFFIX= 240 DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.gz @@ -16,15 +16,15 @@ COMMENT?= User-level file synchronizatio LICENSE= GPLv3 PLIST_SUB= PORTVERSION=${PORTVERSION} -USES= desktop-file-utils gmake +USES= gmake WANT_GNOME= yes MAKE_ARGS= CFLAGS="" -CONFLICTS?= unison-devel-[0-9]* unison-nox11-[0-9]* MAKE_JOBS_UNSAFE= yes ALL_TARGET= unison all DOCS= BUGS.txt NEWS README +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} EXTRA_DOCS= unison-${PORTVERSION}-manual.html \ unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps @@ -64,17 +64,17 @@ post-build: .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/unison ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} 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}/${PORTNAME}-text ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}-text @${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}/${PORTNAME}${PKGNAMESUFFIX}.desktop + ${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}${PKGNAMESUFFIX}.png .endif .include Modified: head/net/unison240/distinfo ============================================================================== --- head/net/unison/distinfo Thu Jan 1 01:13:11 2015 (r375913) +++ head/net/unison240/distinfo Thu Jan 1 18:17:12 2015 (r376017) @@ -1,8 +1,8 @@ -SHA256 (unison-2.40.102/unison-2.40.102.tar.gz) = 3d4a92f02b6998f156cb714d202d0358dd2846efbdce9de30e2c666d77c1e854 -SIZE (unison-2.40.102/unison-2.40.102.tar.gz) = 2694761 -SHA256 (unison-2.40.102/unison-2.40.102-manual.html) = d45cf43bff8805143c53b9f58c4250b781dae04caa0f8f30048c32eb8cf8bf75 -SIZE (unison-2.40.102/unison-2.40.102-manual.html) = 267095 -SHA256 (unison-2.40.102/unison-2.40.102-manual.pdf) = 145b427a32cc4e295b128238cf2106853906f3e31b0b06d6757c000fd1e3c56b -SIZE (unison-2.40.102/unison-2.40.102-manual.pdf) = 496539 -SHA256 (unison-2.40.102/unison-2.40.102-manual.ps) = 88aa2c9b19f680db3c425f378aeb8ca204dd0c1fc81bdd5405be47f7e09f4a8e -SIZE (unison-2.40.102/unison-2.40.102-manual.ps) = 752359 +SHA256 (unison-2.40.128/unison-2.40.128.tar.gz) = 2c979f3bcdc92fb6b009e9e79a6c973a70689e9b646341fff3ca8a220889efbf +SIZE (unison-2.40.128/unison-2.40.128.tar.gz) = 2717542 +SHA256 (unison-2.40.128/unison-2.40.128-manual.html) = 8cd3901dffab27203fab1702a7eb25555539f1b566ebe08036aef695f39e8593 +SIZE (unison-2.40.128/unison-2.40.128-manual.html) = 267099 +SHA256 (unison-2.40.128/unison-2.40.128-manual.pdf) = ad6ea7afdd07515193c1546c530f5ed997618ee44fc4dc6907ce6abe8e8d4293 +SIZE (unison-2.40.128/unison-2.40.128-manual.pdf) = 496607 +SHA256 (unison-2.40.128/unison-2.40.128-manual.ps) = 2f3b8508355ad1853be0e8af547a86404bb0efe58e150aea1a83218d86374781 +SIZE (unison-2.40.128/unison-2.40.128-manual.ps) = 753150 Modified: head/net/unison240/files/unison.desktop.in ============================================================================== --- head/net/unison/files/unison.desktop.in Thu Jan 1 01:13:11 2015 (r375913) +++ head/net/unison240/files/unison.desktop.in Thu Jan 1 18:17:12 2015 (r376017) @@ -1,12 +1,12 @@ [Desktop Entry] Encoding=UTF-8 -Name=Unison +Name=Unison 2.40 GenericName=File-synchronization tool Type=Application Terminal=false StartupNotify=true Categories=GTK;Utility; -Exec=unison -Icon=unison.png +Exec=unison240 +Icon=unison240.png Comment=Synchronize files (directories) over different disks (hosts) Comment[ru]=Синхронизация файлов (каталогов) на нескольких дисках (компьютерах) Modified: head/net/unison240/pkg-plist ============================================================================== --- head/net/unison/pkg-plist Thu Jan 1 01:13:11 2015 (r375913) +++ head/net/unison240/pkg-plist Thu Jan 1 18:17:12 2015 (r376017) @@ -1,7 +1,7 @@ -bin/unison -%%TEXT%%share/applications/unison.desktop -%%TEXT%%bin/unison-text -%%TEXT%%share/pixmaps/unison.png +bin/unison240 +%%TEXT%%share/applications/unison240.desktop +%%TEXT%%bin/unison240-text +%%TEXT%%share/pixmaps/unison240.png %%PORTDOCS%%%%DOCSDIR%%/BUGS.txt %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README