From owner-svn-ports-all@freebsd.org Fri Mar 9 21:11:56 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7B0A0F4C04E; Fri, 9 Mar 2018 21:11:56 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EB6FA6CC36; Fri, 9 Mar 2018 21:11:55 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E65B324525; Fri, 9 Mar 2018 21:11:55 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w29LBtYL019670; Fri, 9 Mar 2018 21:11:55 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w29LBt9G019662; Fri, 9 Mar 2018 21:11:55 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201803092111.w29LBt9G019662@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Fri, 9 Mar 2018 21:11:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464009 - in head: . net net/unison net/unison/files net/unison248 net/unison248/files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in head: . net net/unison net/unison/files net/unison248 net/unison248/files X-SVN-Commit-Revision: 464009 X-SVN-Commit-Repository: ports 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.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Mar 2018 21:11:56 -0000 Author: madpilot Date: Fri Mar 9 21:11:54 2018 New Revision: 464009 URL: https://svnweb.freebsd.org/changeset/ports/464009 Log: - Update net/unison to new major release 2.51.2 - Preserve previous major release 2.48.14 as net/unison248 for compatibility reasons Added: head/net/unison248/ - copied from r463792, head/net/unison/ Deleted: head/net/unison/files/patch-copy.ml Modified: head/UPDATING head/net/Makefile head/net/unison/Makefile head/net/unison/distinfo head/net/unison248/Makefile head/net/unison248/files/unison.desktop.in head/net/unison248/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Fri Mar 9 21:04:18 2018 (r464008) +++ head/UPDATING Fri Mar 9 21:11:54 2018 (r464009) @@ -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. +20180309: + AFFECTS: users of net/unison + AUTHOR: madpilot@FreeBSD.org + + Unison has been upgraded to version 2.51, which uses a different + wire protocol than 2.48 did. In order to support synchronization + with other computers where Unison is still at version 2.48, a new + port net/unison248 has been created. It provides unison248 and, + for the x11 flavor, also unison248-text. This unison248 port can + be installed in parallel with the existing net/unison port. + 20180308: AFFECTS: */php* */pecl* */pear* AUTHOR: mat@FreeBSD.org Modified: head/net/Makefile ============================================================================== --- head/net/Makefile Fri Mar 9 21:04:18 2018 (r464008) +++ head/net/Makefile Fri Mar 9 21:11:54 2018 (r464009) @@ -1435,6 +1435,7 @@ SUBDIR += unison-devel SUBDIR += unison232 SUBDIR += unison240 + SUBDIR += unison248 SUBDIR += unix2tcp SUBDIR += uplog SUBDIR += urelay Modified: head/net/unison/Makefile ============================================================================== --- head/net/unison/Makefile Fri Mar 9 21:04:18 2018 (r464008) +++ head/net/unison/Makefile Fri Mar 9 21:11:54 2018 (r464009) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= unison -PORTVERSION= 2.48.15 +PORTVERSION= 2.51.2 DISTVERSIONPREFIX= v -DISTVERSIONSUFFIX= v4 CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org Modified: head/net/unison/distinfo ============================================================================== --- head/net/unison/distinfo Fri Mar 9 21:04:18 2018 (r464008) +++ head/net/unison/distinfo Fri Mar 9 21:11:54 2018 (r464009) @@ -1,3 +1,3 @@ -TIMESTAMP = 1518118647 -SHA256 (bcpierce00-unison-v2.48.15v4_GH0.tar.gz) = f8c7e982634bbe1ed6510fe5b36b6c5c55c06caefddafdd9edc08812305fdeec -SIZE (bcpierce00-unison-v2.48.15v4_GH0.tar.gz) = 1911781 +TIMESTAMP = 1520431786 +SHA256 (bcpierce00-unison-v2.51.2_GH0.tar.gz) = a2efcbeab651be6df69cc9b253011a07955ecb91fb407a219719451197849d5e +SIZE (bcpierce00-unison-v2.51.2_GH0.tar.gz) = 1398790 Modified: head/net/unison248/Makefile ============================================================================== --- head/net/unison/Makefile Wed Mar 7 14:00:28 2018 (r463792) +++ head/net/unison248/Makefile Fri Mar 9 21:11:54 2018 (r464009) @@ -15,17 +15,20 @@ LICENSE= GPLv3 FLAVORS= x11 nox11 FLAVOR?= ${FLAVORS[1]} -nox11_PKGNAMESUFFIX= -nox11 -nox11_CONFLICTS_INSTALL= unison +VERSIONSUFFIX= 248 -x11_CONFLICTS_INSTALL= unison-nox11 +nox11_PKGNAMESUFFIX= ${VERSIONSUFFIX}-nox11 +nox11_CONFLICTS_INSTALL= unison${VERSIONSUFFIX} + +x11_PKGNAMESUFFIX= ${VERSIONSUFFIX} +x11_CONFLICTS_INSTALL= unison${VERSIONSUFFIX}-nox11 x11_BUILD_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 \ icotool:graphics/icoutils x11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 x11_RUN_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 -PLIST_SUB= PORTVERSION=${PORTVERSION} +PLIST_SUB= PORTVERSION=${PORTVERSION} VERSIONSUFFIX=${VERSIONSUFFIX} USES= gmake localbase USE_OCAML= yes WRKSRC_SUBDIR= src @@ -56,6 +59,7 @@ PLIST_SUB+= X11="@comment " .else MAKE_ARGS= UISTYLE=gtk2 SUB_FILES= ${PORTNAME}.desktop +SUB_LIST= PORTVERSION=${PORTVERSION} VERSIONSUFFIX=${VERSIONSUFFIX} USE_GNOME+= atk cairo gdkpixbuf2 glib20 gtk20 pango USES+= gettext-runtime PLIST_SUB+= X11="" @@ -65,6 +69,11 @@ post-patch-FSMONITOR-off: @${REINPLACE_CMD} -e 's/-include fsmonitor/#&/' \ ${WRKSRC}/Makefile.OCaml +post-patch-FSMONITOR-on: + @${REINPLACE_CMD} \ + -e '/let suffix = if Util.osType/s/else "" in/else "${VERSIONSUFFIX}" in/' \ + ${WRKSRC}/fswatch.ml + post-patch: .if ${FLAVOR} == nox11 @${REINPLACE_CMD} -e 's/CFLAGS/COFLAGS/g' \ @@ -84,16 +93,16 @@ post-build: .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${VERSIONSUFFIX} @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} .if ${FLAVOR} == x11 - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${STAGEDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} - ${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${VERSIONSUFFIX}-text + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}/${PORTNAME}${VERSIONSUFFIX}.desktop + ${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}${VERSIONSUFFIX}.png .endif do-install-FSMONITOR-on: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-fsmonitor ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-fsmonitor ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-fsmonitor${VERSIONSUFFIX} .include Modified: head/net/unison248/files/unison.desktop.in ============================================================================== --- head/net/unison/files/unison.desktop.in Wed Mar 7 14:00:28 2018 (r463792) +++ head/net/unison248/files/unison.desktop.in Fri Mar 9 21:11:54 2018 (r464009) @@ -1,12 +1,12 @@ [Desktop Entry] Encoding=UTF-8 -Name=Unison +Name=Unison %%PORTVERSION%% GenericName=File-synchronization tool Type=Application Terminal=false StartupNotify=true Categories=GTK;Utility; -Exec=unison -Icon=unison.png +Exec=unison%%VERSIONSUFFIX%% +Icon=unison%%VERSIONSUFFIX%%.png Comment=Synchronize files (directories) over different disks (hosts) Comment[ru]=Синхронизация файлов (каталогов) на нескольких дисках (компьютерах) Modified: head/net/unison248/pkg-plist ============================================================================== --- head/net/unison/pkg-plist Wed Mar 7 14:00:28 2018 (r463792) +++ head/net/unison248/pkg-plist Fri Mar 9 21:11:54 2018 (r464009) @@ -1,8 +1,8 @@ -bin/unison -%%FSMONITOR%%bin/unison-fsmonitor -%%X11%%share/applications/unison.desktop -%%X11%%bin/unison-text -%%X11%%share/pixmaps/unison.png +bin/unison%%VERSIONSUFFIX%% +%%FSMONITOR%%bin/unison-fsmonitor%%VERSIONSUFFIX%% +%%X11%%share/applications/unison%%VERSIONSUFFIX%%.desktop +%%X11%%bin/unison%%VERSIONSUFFIX%%-text +%%X11%%share/pixmaps/unison%%VERSIONSUFFIX%%.png %%PORTDOCS%%%%DOCSDIR%%/BUGS.txt %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README