Date: Sun, 3 Mar 2024 17:40:21 GMT From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= <fernape@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: eda7dc55648b - main - net-p2p/jigdo: Upgrade to 0.8.2 Message-ID: <202403031740.423HeLW9059666@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=eda7dc55648b0f6003a5b6c546234e380d5fc60c commit eda7dc55648b0f6003a5b6c546234e380d5fc60c Author: Fernando Apesteguía <fernape@FreeBSD.org> AuthorDate: 2024-03-02 18:33:24 +0000 Commit: Fernando Apesteguía <fernape@FreeBSD.org> 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 `['.</ + <para>Steve McIntyre <email>93sam@debian.org</email> picked up + later development of jigdo after Richard had moved on - see + the <ulink url="https://git.einval.com/cgi-bin/gitweb.cgi?p=jigdo.git;a=summary">git +- repo work</ulink> or packages in Debian for more recent releases. ++ repo work</ulink> or packages in Debian for more recent releases.</para> + + </refsect1> + </refentry> 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 <string> - #include <stdio.h> -+#include <stdlib.h> - #include <unistd-jigdo.h> - #include <sys/stat.h> - #include <sys/types.h> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403031740.423HeLW9059666>