From nobody Sun Mar 3 17:40:21 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 4Tnpxx27bSz5By9X; Sun, 3 Mar 2024 17:40:21 +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 4Tnpxx1h0vz4bV5; Sun, 3 Mar 2024 17:40:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709487621; 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=ea1jRJbU+oX2AZ9R/WhMVO6i7ZATbIOWU4GuNoB6c8Y=; b=qlNtCZ3i7cfB3MW3f1rjAkkSNZgx0Xwkchz9kIZsuk1wfA9v/VNg7Ghe4B4sEVm8scha8a jMBG9IBLgr7P0hlDWfY9a/b/7LnDkZ2NYrDwFNYPI9R+9ne1K6hD9sPb5plE2JSAjgGXs4 zJCFWRWyTGUqHi1WEfyczW2ID5Ytu/PiOymEUyZLUATyV9PiLKTjWyrtqtpOmgIea8a1V5 HIuApRRa7qrF+f7vGSBokUpEveJagjDW8oqLEN6Vw5qadYyKnHzF30FYeQV6khrXIX2Cwu 4DONpxhru2P3jKBFt9uOfcCVaPxw0avxBoQ0jPi0APL0hP6VS97WFKPky2OIXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709487621; a=rsa-sha256; cv=none; b=oAmfWVWTdpXVb/rrRK7l8BFBjILPLqmkKwdVOtkiEPzi3Lde6Cn5ihq01f1Zd9qY1Mpabi 2O8cllwGjpqhmMobcRI69ACNSI2042E8GtqXtT2ZlHB3eLIQgYIbw0aUSZrr7Thlo1ENZN jmGpQU7qw1Tno7GCGEVpEgs+FDqXXdADwgt6Vv9j3mmcBZIFhVcjBhwoF8JhU7aHQUv1Ct 0BLjf+uNClofWe0elpj8pgmmB16LP41vqAnTcBrxVZWZktf598AzVr03QKVTMLDj2WV6DF jqNS1WPjRbABR8IlPf9VJQAzGa4I9PSCCzXc2ARG8elO0RSyN8j77etgGy+8hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709487621; 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=ea1jRJbU+oX2AZ9R/WhMVO6i7ZATbIOWU4GuNoB6c8Y=; b=FgsiQDFFXnpj09qfZnOq4yA/NRJjJrOWCnYhiKbmlhUeDmhOtKDWUB+9sS1m/9MQ+cAopO R1J9TC9rWXLSHx1wcGiZVCorEaALgGq2+DCoffBXQG+PiAF/nMCoHG4qs06IdRM+wesZxO jrjUeKf5QlScL4oADG+PxALE7vjs9JQ3LbUiivvovQyjsjFpEPf2uHpUwaDc7/w8XBhvh1 Lp4ab3FyFx4B8uGxcyguDIWpqz7Ft3W8gddFyuGpuFXIffirCYbw2Uyl3rIgeNRVxCdN39 2lirUQGWHG7D6wvPHjkFUqk0+Ik0wU/dG3Z5D3K8cKIt+MMtB1VCLjmWUXU+6w== 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 4Tnpxx11SqznPn; Sun, 3 Mar 2024 17:40:21 +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 423HeLFP059669; Sun, 3 Mar 2024 17:40:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 423HeLW9059666; Sun, 3 Mar 2024 17:40:21 GMT (envelope-from git) Date: Sun, 3 Mar 2024 17:40:21 GMT Message-Id: <202403031740.423HeLW9059666@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: eda7dc55648b - main - net-p2p/jigdo: Upgrade to 0.8.2 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: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eda7dc55648b0f6003a5b6c546234e380d5fc60c Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=eda7dc55648b0f6003a5b6c546234e380d5fc60c commit eda7dc55648b0f6003a5b6c546234e380d5fc60c Author: Fernando Apesteguía AuthorDate: 2024-03-02 18:33:24 +0000 Commit: Fernando Apesteguía CommitDate: 2024-03-03 17:40:10 +0000 net-p2p/jigdo: Upgrade to 0.8.2 PR: 275329 Reported by: mc.dhuibh@proton.me --- net-p2p/jigdo/Makefile | 32 ++++++++--------- net-p2p/jigdo/distinfo | 5 +-- net-p2p/jigdo/files/patch-Makefile.in | 18 ++++++++++ net-p2p/jigdo/files/patch-doc_Makefile.in | 49 +++++++++++++++++++++++++++ net-p2p/jigdo/files/patch-doc_jigdo-file.sgml | 11 ++++++ net-p2p/jigdo/files/patch-src__compat.hh | 10 ------ net-p2p/jigdo/pkg-plist | 13 ++----- 7 files changed, 97 insertions(+), 41 deletions(-) diff --git a/net-p2p/jigdo/Makefile b/net-p2p/jigdo/Makefile index 3899d48b3779..735c61ea12eb 100644 --- a/net-p2p/jigdo/Makefile +++ b/net-p2p/jigdo/Makefile @@ -1,46 +1,42 @@ PORTNAME= jigdo -PORTVERSION= 0.7.3 -PORTREVISION= 9 +PORTVERSION= 0.8.2 CATEGORIES= net-p2p -MASTER_SITES= http://atterer.org/sites/atterer/files/2009-08/${PORTNAME}/ +MASTER_SITES= https://www.einval.com/~steve/software/jigdo/download/ +DISTNAME= jigdo-0.8.2 MAINTAINER= ports@FreeBSD.org COMMENT= Utility used to retrieve large files over the Internet -WWW= http://atterer.org/jigdo/ +WWW= https://www.einval.com/~steve/software/jigdo/ -DEPRECATED= Outdated version that's not longer supported upstream -EXPIRATION_DATE=2024-03-31 +LICENSE_FILE= ${WRKDIR}/README +BUILD_DEPENDS= brename>0:sysutils/brename \ + docbook-utils>0:textproc/docbook-utils \ + sgmlformat>0:textproc/sgmlformat RUN_DEPENDS= ${LOCALBASE}/bin/wget:ftp/wget -USES= gmake tar:bzip2 +USES= gmake tar:xz localbase + USE_CXXSTD= c++98 USE_SUBMAKE= yes GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share +MAKE_JOBS_UNSAFE=yes -CPPFLAGS+= -I${LOCALBASE}/include - -OPTIONS_DEFINE= GUI BDB NLS +OPTIONS_DEFINE= BDB NLS OPTIONS_DEFAULT= BDB OPTIONS_SUB= yes -GUI_DESC= GTK2 Graphical User Interface BDB_DESC= Berkeley DB support (for jigdo-file cache) -GUI_CONFIGURE_WITH= gui -GUI_LIB_DEPENDS= libgtk-x11-2.0.so:x11-toolkits/gtk20 \ - libcurl.so:ftp/curl -GUI_USES= pkgconfig - +BDB_USES= bdb BDB_CONFIGURE_ON= --with-libdb=-l${BDB_LIB_CXX_NAME} BDB_CONFIGURE_OFF= --without-libdb BDB_CPPFLAGS= -I${BDB_INCLUDE_DIR} BDB_LIBS= -L${BDB_LIB_DIR} -BDB_USES= bdb -NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/jigdo-file diff --git a/net-p2p/jigdo/distinfo b/net-p2p/jigdo/distinfo index 45556161294b..7072864931c4 100644 --- a/net-p2p/jigdo/distinfo +++ b/net-p2p/jigdo/distinfo @@ -1,2 +1,3 @@ -SHA256 (jigdo-0.7.3.tar.bz2) = 875c069abad67ce67d032a9479228acdb37c8162236c0e768369505f264827f0 -SIZE (jigdo-0.7.3.tar.bz2) = 644670 +TIMESTAMP = 1700906294 +SHA256 (jigdo-0.8.2.tar.xz) = 36f286d93fa6b6bf7885f4899c997894d21da3a62176592ac162d9c6a8644f9e +SIZE (jigdo-0.8.2.tar.xz) = 576560 diff --git a/net-p2p/jigdo/files/patch-Makefile.in b/net-p2p/jigdo/files/patch-Makefile.in new file mode 100644 index 000000000000..45472a1190e0 --- /dev/null +++ b/net-p2p/jigdo/files/patch-Makefile.in @@ -0,0 +1,18 @@ +--- Makefile.in.orig 2023-11-24 10:05:57 UTC ++++ Makefile.in +@@ -180,7 +180,6 @@ bindist: Makefile + $(INSTALL_EXE) src/jigdo-file "$$jdir"; \ + grep -v "^##" $(srcdir)/doc/README-bindist.txt \ + >"$$jdir/README"; \ +- $(INSTALL_DATA) $(srcdir)/doc/*.html "$$jdir"; \ + $(INSTALL_DATA) $(srcdir)/doc/*.1 "$$jdir"; \ + $(INSTALL_DATA) $(srcdir)/COPYING "$$jdir"; \ + $(INSTALL_DATA) $(srcdir)/scripts/debian-mirrors.jigdo \ +@@ -207,7 +206,6 @@ windist: Makefile all + $(INSTALL_EXE) src/jigdo-file.exe "../$$jdir/jigdo-bin"; \ + grep -v "^##" $(srcdir)/doc/README-windist.txt \ + | todos >"../$$jdir/README.txt"; \ +- $(INSTALL_DATA) $(srcdir)/doc/*.html "../$$jdir"; \ + $(INSTALL_DATA) $(srcdir)/scripts/debian-mirrors.jigdo \ + "../$$jdir/jigdo-bin/mirrors.jigdo"; \ + $(INSTALL_EXE) $(srcdir)/win-binaries/* "../$$jdir/jigdo-bin"; \ diff --git a/net-p2p/jigdo/files/patch-doc_Makefile.in b/net-p2p/jigdo/files/patch-doc_Makefile.in new file mode 100644 index 000000000000..9d7671543466 --- /dev/null +++ b/net-p2p/jigdo/files/patch-doc_Makefile.in @@ -0,0 +1,49 @@ +--- doc/Makefile.in.orig 2023-08-03 19:55:46 UTC ++++ doc/Makefile.in +@@ -8,32 +8,25 @@ DOCBOOK2MAN = docbook2man + + AWK = @AWK@ + DOCBOOK2MAN = docbook2man +-DOCBOOK2HTML = docbook2html + #______________________________ + + .SUFFIXES: +-.SUFFIXES: .1 .sgml .html ++.SUFFIXES: .1 .sgml + + .sgml.1: + mkdir -p tmp && cp "$<" tmp \ + && cd tmp && $(DOCBOOK2MAN) "`echo $< | sed 's%.*/%%'`" +- sed -e 's/ */ /g' <"`ls tmp/*.1`" >"$@" ++ cd tmp && $(LOCALBASE)/bin/brename -p '[.].+.1$$' -r ".1" -f '\.1$$' ++ mv tmp/*.1 ./ + rm -rf tmp + # sed -e 's%\\%\\\\%g;' <"$<" | tr -s '[:space:]' ' ' \ + # | $(DOCBOOKTOMAN) - >"$@" +-.sgml.html: +- rm -f "$@" +- $(DOCBOOK2HTML) "$<" --nochunks +- mv "$@" "$@~" +- $(AWK) -f "$(srcdir)/../scripts/html-beautify.awk" \ +- "$@~" >"$@" + #______________________________________________________________________ + + .PHONY: all clean distclean mostlyclean maintainer-clean \ + dep depend doc check +-all: jigdo-file.1 jigdo-file.html jigdo-lite.1 jigdo-lite.html \ +- jigdo-mirror.1 jigdo-mirror.html \ +- debian-jigdo-mini-howto.html ++all: jigdo-file.1 jigdo-lite.1 \ ++ jigdo-mirror.1 + doc mostlyclean dep depend check: ; + + clean: Makefile +@@ -43,7 +36,7 @@ maintainer-clean: Makefile distclean + rm -f *~ \#*\# *.bak + rm -f Makefile + maintainer-clean: Makefile distclean +- rm -f *.html *.1 ++ rm -f *.1 + + Makefile: Makefile.in + cd .. && sh config.status # update Makefile from Makefile.in diff --git a/net-p2p/jigdo/files/patch-doc_jigdo-file.sgml b/net-p2p/jigdo/files/patch-doc_jigdo-file.sgml new file mode 100644 index 000000000000..9d23aaa70a6c --- /dev/null +++ b/net-p2p/jigdo/files/patch-doc_jigdo-file.sgml @@ -0,0 +1,11 @@ +--- doc/jigdo-file.sgml.orig 2023-11-24 10:45:22 UTC ++++ doc/jigdo-file.sgml +@@ -1580,7 +1580,7 @@ Any text, except that lines must not begin with `['.Steve McIntyre 93sam@debian.org picked up + later development of jigdo after Richard had moved on - see + the git +- repo work or packages in Debian for more recent releases. ++ repo work or packages in Debian for more recent releases. + + + diff --git a/net-p2p/jigdo/files/patch-src__compat.hh b/net-p2p/jigdo/files/patch-src__compat.hh deleted file mode 100644 index ecbf5d6dbc4b..000000000000 --- a/net-p2p/jigdo/files/patch-src__compat.hh +++ /dev/null @@ -1,10 +0,0 @@ ---- ./src/compat.hh.orig 2013-12-27 16:00:53.907143596 +0100 -+++ ./src/compat.hh 2013-12-27 16:01:15.205152700 +0100 -@@ -20,6 +20,7 @@ - - #include - #include -+#include - #include - #include - #include diff --git a/net-p2p/jigdo/pkg-plist b/net-p2p/jigdo/pkg-plist index a12d530f8650..af6774c33129 100644 --- a/net-p2p/jigdo/pkg-plist +++ b/net-p2p/jigdo/pkg-plist @@ -4,14 +4,5 @@ bin/jigdo-mirror share/man/man1/jigdo-file.1.gz share/man/man1/jigdo-lite.1.gz share/man/man1/jigdo-mirror.1.gz -share/jigdo/debian-mirrors.jigdo -%%GUI%%bin/jigdo -%%GUI%%share/man/man1/jigdo.1.gz -%%GUI%%share/jigdo/COPYING -%%GUI%%share/jigdo/pixmaps/close.png -%%GUI%%share/jigdo/pixmaps/jigdo-logo.png -%%GUI%%share/jigdo/pixmaps/pause.png -%%GUI%%share/jigdo/pixmaps/progress-green.png -%%GUI%%share/jigdo/pixmaps/restart.png -%%GUI%%share/jigdo/pixmaps/start.png -%%GUI%%share/jigdo/pixmaps/stop.png +%%DATADIR%%/debian-mirrors.jigdo +share/locale/de/LC_MESSAGES/jigdo.mo