From nobody Sun Mar 13 21:28:31 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 655781A0E7D2; Sun, 13 Mar 2022 21:28:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KGt7z2JNrz3LwY; Sun, 13 Mar 2022 21:28:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647206911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3aWptwBmcycS9210zoA2iWOlh817nrzqbcMbZ2v2xDw=; b=A43mtl8CdbA6LOQEmvYQdopc1Up/Ou+TOKpMhATmzgQlnc7tncdpxPkAUFydPwYGrmTnhn bNbm91vd7W20UPDHHToQY+Hfl101rqQzL6InzM4bdTFW+tn/Oe3WlRjB1Vx9uDJKfzWEbV XIqPvOHiiP5IfNUNTCwQzq8xuvIvk55u8uHvAv3mkGXJdzMUrwNQqZISReDNm0tQglb3zp MTnwdgLOTHn6soE7tlySkG235iDaVmKJKMmg/Pj+/zjnMBWT+m2+C310afsFd9EpFYmey1 qcbMAhXdQdK08XlafSDv+hfO9OnlmN67+No544NkU6GBlXCCKsJPF1k8w/NA2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2EE0920E14; Sun, 13 Mar 2022 21:28:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22DLSVVf054629; Sun, 13 Mar 2022 21:28:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22DLSV55054628; Sun, 13 Mar 2022 21:28:31 GMT (envelope-from git) Date: Sun, 13 Mar 2022 21:28:31 GMT Message-Id: <202203132128.22DLSV55054628@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: a27dcf53f655 - main - net/unison251: Add new port to preserve current old unison version. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a27dcf53f655fa61691b2e89c7a0fedf437a8f47 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647206911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3aWptwBmcycS9210zoA2iWOlh817nrzqbcMbZ2v2xDw=; b=x+0pI8oVU/bMaR5YAvgYQGJ+gvdoW1nVwvnSVb63IY1b+zJYR//TW1Nek7foeWFC1t0Eer cL9L/gGB3BE4t1HZN5eqVtHIZihH9oa1VcjvV5NibeRy6w7qIObdhKwTkWIKIsGs6zQLdu LmpR+RbsSkUPd+GG1zKeJEsX8qD4KV8GACjFKsKrhFRL45d7+mwV8DsaDYENMxAYP//gWM qgi955tUUx94TDp4pGwMoiz5E2EtGgkwtbggRgcBmX8ZvBoxqP+sil1JHsdY4ToAogzPUt zYAH67qv9JlHbUkvqIZ+InJq5tQ+TZBOGYuPOs1f4gzGLSNzjRF+TodnY2jGSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647206911; a=rsa-sha256; cv=none; b=WRVK/pqF1W6FQXV7+fW8aBn0JaMl4CLzJ0gRxTApyShnctuwVJO9GqG91v6L+EFaagCMge bqJZc1QEupqZ/iLhAw9UjrHGTA3b6k6WScBSS2VdHSh+/N0Q8mQep0EnSv6digypyfhcnU p9ILQThqDVFNBrGsmho/2qYPLsQoGxu3b+HqGxjD7YtZ4hApNQ8cX9p0qD8zh1hfi50YGF PfcpZUupjBKnqIahYF8esjrG7HYwhSsbQTo17jxbsu2Z2A+fl25XskQuaKTdHema+dTC1z CQNE6xv2fU/G/mIDo2NSOBRGaqmcnL0bbK4ug6SWUISXzFBrzhM5te1aZ6AtJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=a27dcf53f655fa61691b2e89c7a0fedf437a8f47 commit a27dcf53f655fa61691b2e89c7a0fedf437a8f47 Author: Guido Falsi AuthorDate: 2022-03-13 21:25:43 +0000 Commit: Guido Falsi CommitDate: 2022-03-13 21:28:26 +0000 net/unison251: Add new port to preserve current old unison version. Preserve old unison 2.51 version as net/unison251 before updating to the latest version. --- net/Makefile | 1 + net/unison251/Makefile | 109 +++++++++++++++++++++ net/unison251/distinfo | 3 + net/unison251/files/patch-Makefile.OCaml | 35 +++++++ net/unison251/files/patch-fsmonitor_linux_Makefile | 20 ++++ net/unison251/files/unison.desktop.in | 12 +++ net/unison251/pkg-descr | 11 +++ net/unison251/pkg-message | 8 ++ net/unison251/pkg-message.nox11 | 7 ++ net/unison251/pkg-plist | 7 ++ 10 files changed, 213 insertions(+) diff --git a/net/Makefile b/net/Makefile index 9dc4134e4e84..3d762fe2bb20 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1532,6 +1532,7 @@ SUBDIR += unison232 SUBDIR += unison240 SUBDIR += unison248 + SUBDIR += unison251 SUBDIR += unix2tcp SUBDIR += urelay SUBDIR += uriparser diff --git a/net/unison251/Makefile b/net/unison251/Makefile new file mode 100644 index 000000000000..4d3a66d5b3a4 --- /dev/null +++ b/net/unison251/Makefile @@ -0,0 +1,109 @@ +# Created by: Dan Pelleg + +PORTNAME= unison +PORTVERSION= 2.51.5 +DISTVERSIONPREFIX= v +CATEGORIES= net + +MAINTAINER= madpilot@FreeBSD.org +COMMENT= User-level file synchronization tool + +LICENSE= GPLv3+ +LICENSE_FILE= ${WRKSRC}/COPYING + +FLAVORS= x11 nox11 +FLAVOR?= ${FLAVORS:[1]} + +VERSIONSUFFIX= 251 + +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 \ + libharfbuzz.so:print/harfbuzz +x11_RUN_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 + +PLIST_SUB= PORTVERSION=${PORTVERSION} VERSIONSUFFIX=${VERSIONSUFFIX} +USES= gmake localbase +USE_OCAML= yes +WRKSRC_SUBDIR= src +NO_OCAML_RUNDEPENDS=yes +CONFLICTS= unison-devel +MAKE_ENV= CLIBS="${LIBS:S/^-/-ccopt -/}" COFLAGS="${CFLAGS:C/ *(-[^ ]*) */ -ccopt \"\1 \"/gW}" +ALL_TARGET= unison all + +USE_GITHUB= yes +GH_ACCOUNT= bcpierce00 + +DOCS= NEWS README + +OPTIONS_DEFINE= DOCS FSMONITOR +OPTIONS_DEFAULT?= FSMONITOR + +FSMONITOR_DESC= Compile and install fsmonitor plugin + +OPTIONS_SUB= YES + +FSMONITOR_LIB_DEPENDS= libinotify.so:devel/libinotify + +.if ${FLAVOR} == nox11 +MAKE_ARGS= UISTYLE=text +PKGMESSAGE= ${PKGDIR}/pkg-message.nox11 +PLIST_SUB+= X11="@comment " +.else +MAKE_ARGS= UISTYLE=gtk2 +SUB_FILES= ${PORTNAME}.desktop +USE_GNOME+= atk cairo gdkpixbuf2 glib20 gtk20 pango +USES+= gettext-runtime gnome +PLIST_SUB+= X11="" +.endif + +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' \ + ${WRKSRC}/Makefile.OCaml ${WRKSRC}/fsmonitor/linux/Makefile +.else + @${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \ + -e 's/CFLAGS/COFLAGS/g' \ + ${WRKSRC}/Makefile.OCaml ${WRKSRC}/fsmonitor/linux/Makefile +.endif + +post-build: + (cd ${WRKSRC} && HOME=${WRKSRC} ./unison -selftest -ui text -batch) +.if ${FLAVOR} == x11 + @${ECHO} Building text-only version + @${ECHO} ${WRKSRC} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} UISTYLE=text NAME=unison-text + @cd ${WRKSRC}/win32rc && ${LOCALBASE}/bin/icotool -x U.ico +.endif + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${VERSIONSUFFIX} +.if ${FLAVOR} == x11 + ${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-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} + +do-install-FSMONITOR-on: + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-fsmonitor ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-fsmonitor${VERSIONSUFFIX} + +.include diff --git a/net/unison251/distinfo b/net/unison251/distinfo new file mode 100644 index 000000000000..2216a412a298 --- /dev/null +++ b/net/unison251/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1639862759 +SHA256 (bcpierce00-unison-v2.51.5_GH0.tar.gz) = 7e876371992ebf890b60f32df880a98a75fe8c47c06b7b2ae2ad36be48013e83 +SIZE (bcpierce00-unison-v2.51.5_GH0.tar.gz) = 1385407 diff --git a/net/unison251/files/patch-Makefile.OCaml b/net/unison251/files/patch-Makefile.OCaml new file mode 100644 index 000000000000..45859e189c5a --- /dev/null +++ b/net/unison251/files/patch-Makefile.OCaml @@ -0,0 +1,35 @@ +--- Makefile.OCaml.orig 2021-06-23 14:30:30 UTC ++++ Makefile.OCaml +@@ -34,7 +34,11 @@ ifeq ($(shell uname),OpenBSD) + else + ifeq ($(shell uname),NetBSD) + OSARCH=NetBSD ++else ++ifeq ($(shell uname),FreeBSD) ++ OSARCH=FreeBSD + endif ++endif + ifeq ($(shell uname),Linux) + OSARCH=Linux + endif +@@ -290,6 +294,11 @@ ifeq ($(OSARCH),Linux) + INCLFLAGS+=-I fsmonitor -I fsmonitor/linux + endif + ++ifeq ($(OSARCH),FreeBSD) ++-include fsmonitor/linux/Makefile src/fsmonitor/linux/Makefile ++INCLFLAGS+=-I fsmonitor -I fsmonitor/linux ++endif ++ + ifeq ($(OSARCH),solaris) + -include fsmonitor/solaris/Makefile src/fsmonitor/solaris/Makefile + INCLFLAGS+=-I fsmonitor -I fsmonitor/solaris +@@ -432,7 +441,7 @@ fswatch.cmi : ubase/prefs.cmi + + %.o %.obj: %.c + @echo "$(CAMLC): $< ---> $@" +- $(CAMLC) $(CAMLFLAGS) -ccopt $(OUTPUT_SEL)$(CWD)/$@ -c $(CWD)/$< ++ $(CAMLC) $(CAMLFLAGS) -ccopt $(OUTPUT_SEL)$(CWD)/$@ -c $(CFLAGS) $(CWD)/$< + + $(NAME)$(EXEC_EXT): $(CAMLOBJS) $(COBJS) + @echo Linking $@ diff --git a/net/unison251/files/patch-fsmonitor_linux_Makefile b/net/unison251/files/patch-fsmonitor_linux_Makefile new file mode 100644 index 000000000000..820041472d23 --- /dev/null +++ b/net/unison251/files/patch-fsmonitor_linux_Makefile @@ -0,0 +1,20 @@ +--- fsmonitor/linux/Makefile.orig 2017-03-23 16:47:46 UTC ++++ fsmonitor/linux/Makefile +@@ -18,6 +18,10 @@ else + FSMCAMLLIBS=$(FSMOCAMLLIBS) + endif + ++ifeq ($(OSARCH),FreeBSD) ++ CLIBS+=-cclib -linotify ++endif ++ + buildexecutable:: $(FSMONITOR)$(EXEC_EXT) + + $(FSMONITOR)$(EXEC_EXT): $(FSMCAMLOBJS) $(FSMCOBJS) +@@ -26,4 +30,4 @@ $(FSMONITOR)$(EXEC_EXT): $(FSMCAMLOBJS) $(FSMCOBJS) + + clean:: + rm -f $(DIR)/*.cm[iox] $(DIR)/*.o $(DIR)/*~ +- rm -f $(FSMONITOR)$(EXEC_EXT) +\ No newline at end of file ++ rm -f $(FSMONITOR)$(EXEC_EXT) diff --git a/net/unison251/files/unison.desktop.in b/net/unison251/files/unison.desktop.in new file mode 100644 index 000000000000..789ccaa366b6 --- /dev/null +++ b/net/unison251/files/unison.desktop.in @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Unison +GenericName=File-synchronization tool +Type=Application +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/unison251/pkg-descr b/net/unison251/pkg-descr new file mode 100644 index 000000000000..0fdae72e6019 --- /dev/null +++ b/net/unison251/pkg-descr @@ -0,0 +1,11 @@ +Unison is a file-synchronization tool for Unix and Windows. It allows two +replicas of a collection of files and directories to be stored on different +hosts (or different disks on the same host), modified separately, and then +brought up to date by propagating the changes in each replica to the other. + +Unison shares a number of features with tools such as configuration +management packages (CVS, PRCS, etc.) distributed filesystems (Coda, etc.) +uni-directional mirroring utilities (rsync, etc.) and other synchronizers +(Intellisync, Reconcile, etc). + +WWW: https://www.cis.upenn.edu/~bcpierce/unison/ diff --git a/net/unison251/pkg-message b/net/unison251/pkg-message new file mode 100644 index 000000000000..1795b612e0a8 --- /dev/null +++ b/net/unison251/pkg-message @@ -0,0 +1,8 @@ +[ +{ type: install + message: <