From nobody Tue Feb 20 09:47:41 2024 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 4TfF252w0Bz5BlYK; Tue, 20 Feb 2024 09:47:41 +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 4TfF252M7tz4hqY; Tue, 20 Feb 2024 09:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708422461; 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=mSKdcjkI/6vXS7kzGV4SPA87dK5EoIEHr+CnvE3ZJik=; b=jCaJ5iDft8GbApzTaIF5UniKzoTqRgJSmpLI0qnDxvu49wGQBGJUeGZmSrXvJy1L/oF//m Dmgpsr8EFTf3/kd7ikmERtkAUXfLTeicJJw4+iz5A6TMeWS+CopcspVKsXPaaN0HKJqYeW 2BzSF8jtMokN6TEwu4+kpl6iz1LOrn0oRgSB+va7kwElBuU7CPTREMw+Dd9wwqUkvwcujB 30unWYLI9r8nC/iDLXtXvamRD3RiIQDeCPcGxPrn14d6xNXJBdGhMPAYLNmj5N3vO35N4r gflkFx05O7yGe9a839fkeJnsWsCylbRBY6T9NlQblpzS8Cc8d5A0yifLHde/hA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708422461; 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=mSKdcjkI/6vXS7kzGV4SPA87dK5EoIEHr+CnvE3ZJik=; b=eOuugfMM+Xq1Qczn9vLhabkTT4u8TNOAzD+nElxWoNI1vx9u0RBD4yr8WD7cFggRVcu134 fdt08l9P6co2YvP+dVNk0VLsfAqduT+H0st4K6SYF+B4Z67XDfdgAr+FRBIImDyZPDG77p QYJemLqTB3Th/cJO//vTDEANrEp4E/bWPkVWl6yH7pKnrBVhtFCFZfQoNvS8S361OcP57t oab5LbZ7kC7LEk5rBWOl7y84hyVxjiwy23G7ObG2iVgKxLbZu9IcdOF6Bw+kYz+8zoFFHx 7VZ/yoiCovDgUTAgMsyhLFCiC4p9WxIWoM+tpdM/hRzcW0gQbm5VsYBs7Uee1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708422461; a=rsa-sha256; cv=none; b=Kvq+Y0OYcg5OXP1yXfXlxQVIBMK5mkqVrF/Ob0qCSD5RMYnh0sZsxKA6QNIs+eKLJbJ42/ YD1PAmyFzc7GnjbsrXjMmnojX80wUS466T2S2piBhZH3uCSb4a5ssFzbAd7yiSelqWnwHp 1cwBHvcPtPKLCXZdSLl/CNqaSEJet7Ye0vBoMcRG+wXSgnOJnYjzaE95jKdHQ0cfUwuGH0 pGNKAhLyCuk1Hjp4RQXeA1+VR3pQSBmuxHTRZK/yveYB9HET/pHAhy0gt1XcS4QCCX+SfO 3d3jH7cUrATPpj+rz8yh+8c9LZRES89FiT9bnWHonkYJmQ7DVQdPDy+1q7x11w== 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 4TfF251Jzsz1CJx; Tue, 20 Feb 2024 09:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41K9lfZb015627; Tue, 20 Feb 2024 09:47:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41K9lf1t015624; Tue, 20 Feb 2024 09:47:41 GMT (envelope-from git) Date: Tue, 20 Feb 2024 09:47:41 GMT Message-Id: <202402200947.41K9lf1t015624@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: a5f16599eda7 - main - net/unison: Update to 2.53.4 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: a5f16599eda7acbb466ac20beaef5f3025cff378 Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=a5f16599eda7acbb466ac20beaef5f3025cff378 commit a5f16599eda7acbb466ac20beaef5f3025cff378 Author: Guido Falsi AuthorDate: 2024-02-20 09:46:47 +0000 Commit: Guido Falsi CommitDate: 2024-02-20 09:47:36 +0000 net/unison: Update to 2.53.4 - Some cosmetic changes to the Makefile - DOCS option now has TeX as a build dependencies, so users wanting to avoid heavy dependencies should disable it - Port now installs a man page --- net/unison/Makefile | 58 ++++++++++++------------- net/unison/distinfo | 6 +-- net/unison/files/patch-Makefile.OCaml | 40 ++++++++--------- net/unison/files/patch-fsmonitor_linux_Makefile | 13 ------ net/unison/pkg-plist | 2 + 5 files changed, 53 insertions(+), 66 deletions(-) diff --git a/net/unison/Makefile b/net/unison/Makefile index 44b03db1d358..05f212a2fbff 100644 --- a/net/unison/Makefile +++ b/net/unison/Makefile @@ -1,7 +1,6 @@ PORTNAME= unison -PORTVERSION= 2.53.3 +PORTVERSION= 2.53.4 DISTVERSIONPREFIX= v -PORTREVISION= 2 CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org @@ -17,79 +16,80 @@ FLAVOR?= ${FLAVORS:[1]} nox11_PKGNAMESUFFIX= -nox11 nox11_CONFLICTS_INSTALL= unison -x11_CONFLICTS_INSTALL= unison-nox11 x11_BUILD_DEPENDS= icotool:graphics/icoutils \ ocaml-lablgtk3>0:x11-toolkits/ocaml-lablgtk3 x11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz +x11_CONFLICTS_INSTALL= unison-nox11 USES= gmake localbase +USE_GITHUB= yes +GH_ACCOUNT= bcpierce00 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 +WRKSRC_SUBDIR= src PLIST_SUB= PORTVERSION=${PORTVERSION} -USE_GITHUB= yes -GH_ACCOUNT= bcpierce00 - -DOCS= NEWS.md README.md - OPTIONS_DEFINE= DOCS FSMONITOR OPTIONS_DEFAULT?= FSMONITOR +OPTIONS_SUB= YES FSMONITOR_DESC= Compile and install fsmonitor plugin -OPTIONS_SUB= YES +DOCS_USES= tex +DOCS_USE= TEX=dvipsk:build,latex:build FSMONITOR_LIB_DEPENDS= libinotify.so:devel/libinotify .if ${FLAVOR} == nox11 -MAKE_ARGS= UISTYLE=text +ALL_TARGET= tui PKGMESSAGE= ${PKGDIR}/pkg-message.nox11 PLIST_SUB+= X11="@comment " .else -MAKE_ARGS= UISTYLE=gtk3 +ALL_TARGET= tui guimaybe SUB_FILES= ${PORTNAME}.desktop -USE_GNOME+= atk cairo gdkpixbuf2 glib20 gtk30 pango +USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 pango USES+= gettext-runtime gnome PLIST_SUB+= X11="" .endif -post-patch-FSMONITOR-off: - @${REINPLACE_CMD} -e 's/-include fsmonitor/#&/' \ - ${WRKSRC}/Makefile.OCaml +DOCS= NEWS.md README.md -post-patch: -.if ${FLAVOR} == x11 - @${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk3)@\1site-lib/\2@' \ - ${WRKSRC}/Makefile.OCaml +.include + +.if ${PORT_OPTIONS:MFSMONITOR} +ALL_TARGET+= fsmonitor .endif post-build: - (cd ${WRKSRC} && HOME=${WRKSRC} ./unison -selftest -ui text -batch) + cd ${WRKSRC} && HOME=${WRKSRC} ./unison -selftest -ui text -batch + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/../man +.if ${PORT_OPTIONS:MDOCS} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/../doc unison-manual.pdf +.endif .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 + cd ${WRKSRC}/win32rc && ${LOCALBASE}/bin/icotool -x U.ico .endif do-install: +.if ${FLAVOR} == nox11 ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin -.if ${FLAVOR} == x11 - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${STAGEDIR}${PREFIX}/bin +.else + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-gui ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-text ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png .endif + ${INSTALL_MAN} ${WRKSRC}/../man/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1 do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/.. && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/../doc && ${INSTALL_DATA} unison-manual.pdf ${STAGEDIR}${DOCSDIR} do-install-FSMONITOR-on: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-fsmonitor ${STAGEDIR}${PREFIX}/bin diff --git a/net/unison/distinfo b/net/unison/distinfo index 48327d0f92cb..fe03cfcf887e 100644 --- a/net/unison/distinfo +++ b/net/unison/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1682664394 -SHA256 (bcpierce00-unison-v2.53.3_GH0.tar.gz) = aaea04fc5bc76dcfe8627683c9659ee4c194d4f992cc8aaa15bbb2820fc8de46 -SIZE (bcpierce00-unison-v2.53.3_GH0.tar.gz) = 1415490 +TIMESTAMP = 1708372021 +SHA256 (bcpierce00-unison-v2.53.4_GH0.tar.gz) = d19e4293013581dbc4d149aef89b34c76221efcbd873c7aa5193de489addb85a +SIZE (bcpierce00-unison-v2.53.4_GH0.tar.gz) = 1407429 diff --git a/net/unison/files/patch-Makefile.OCaml b/net/unison/files/patch-Makefile.OCaml index 330f26d01721..a215227ad1cc 100644 --- a/net/unison/files/patch-Makefile.OCaml +++ b/net/unison/files/patch-Makefile.OCaml @@ -1,23 +1,21 @@ ---- Makefile.OCaml.orig 2023-04-24 16:49:02 UTC +--- Makefile.OCaml.orig 2024-02-18 15:03:04 UTC +++ Makefile.OCaml -@@ -248,7 +248,7 @@ OCAMLOBJS+=main.cmo - - # OCaml libraries for the bytecode version - # File extensions will be substituted for the native code version --OCAMLLIBS+=unix.cma str.cma -+OCAMLLIBS+=unix.cma str.cma bigarray.cma - INCLFLAGS+=-I +unix -I +str - - COBJS+=osxsupport$(OBJ_EXT) pty$(OBJ_EXT) bytearray_stubs$(OBJ_EXT) hash_compat$(OBJ_EXT) props_xattr$(OBJ_EXT) props_acl$(OBJ_EXT) -@@ -309,6 +309,11 @@ ifeq ($(OSARCH),Linux) - ### Filesystem monitoring - - ifeq ($(OSARCH),Linux) -+-include fsmonitor/linux/Makefile src/fsmonitor/linux/Makefile -+INCLFLAGS+=-I fsmonitor -I fsmonitor/linux -+endif -+ -+ifeq ($(OSARCH),FreeBSD) - -include fsmonitor/linux/Makefile src/fsmonitor/linux/Makefile - INCLFLAGS+=-I fsmonitor -I fsmonitor/linux +@@ -336,15 +336,9 @@ ifneq ($(findstring $(OSARCH),FreeBSD OpenBSD NetBSD D + ifneq ($(findstring $(OSARCH),FreeBSD OpenBSD NetBSD DragonFly),) + LIBINOTIFY_LIB:=-cclib '$(shell pkg-config --libs libinotify 2> /dev/null || printf ' -linotify')' + LIBINOTIFY_INC:=-ccopt '$(shell pkg-config --cflags libinotify 2> /dev/null)' +- FOUND_LIBINOTIFY := $(shell { printf '' > inotifytest__.ml ;\ +- $(CAMLC) $(CAMLCFLAGS) $(CAMLLDFLAGS) $(LIBINOTIFY_LIB) \ +- -o inotifytest__ inotifytest__.ml > /dev/null 2>&1 && printf true ; } ;\ +- rm -f inotifytest__.ml inotifytest__.cm[oix] inotifytest__.o inotifytest__ > /dev/null 2>&1) +- ifeq ($(FOUND_LIBINOTIFY), true) +- FSMDIR = fsmonitor/inotify +- $(NAME_FSM)$(EXEC_EXT): CAMLCFLAGS += $(LIBINOTIFY_INC) +- $(NAME_FSM)$(EXEC_EXT): CLIBS += $(LIBINOTIFY_LIB) +- endif ++ FSMDIR = fsmonitor/inotify ++ $(NAME_FSM)$(EXEC_EXT): CAMLCFLAGS += $(LIBINOTIFY_INC) ++ $(NAME_FSM)$(EXEC_EXT): CLIBS += $(LIBINOTIFY_LIB) endif + + ifeq ($(OSARCH),SunOS) diff --git a/net/unison/files/patch-fsmonitor_linux_Makefile b/net/unison/files/patch-fsmonitor_linux_Makefile deleted file mode 100644 index 7d44e1c8b925..000000000000 --- a/net/unison/files/patch-fsmonitor_linux_Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- fsmonitor/linux/Makefile.orig 2023-04-24 16:49:02 UTC -+++ fsmonitor/linux/Makefile -@@ -18,6 +18,10 @@ endif - FSMCAMLLIBS=$(FSMOCAMLLIBS) - endif - -+ifeq ($(OSARCH),FreeBSD) -+ CLIBS+=-cclib -linotify -+endif -+ - buildexecutable:: $(FSMONITOR)$(EXEC_EXT) - - $(FSMONITOR)$(EXEC_EXT): $(FSMCAMLOBJS) $(FSMCOBJS) diff --git a/net/unison/pkg-plist b/net/unison/pkg-plist index 6fdcfff3e067..69dd33226ec4 100644 --- a/net/unison/pkg-plist +++ b/net/unison/pkg-plist @@ -3,5 +3,7 @@ bin/unison %%X11%%share/applications/unison.desktop %%X11%%bin/unison-text %%X11%%share/pixmaps/unison.png +share/man/man1/unison.1.gz %%PORTDOCS%%%%DOCSDIR%%/NEWS.md %%PORTDOCS%%%%DOCSDIR%%/README.md +%%PORTDOCS%%%%DOCSDIR%%/unison-manual.pdf