Date: Thu, 1 Jul 2021 13:40:33 GMT From: Juraj Lutter <otis@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 09b9b34473ac - main - misc/pinfo: Update to 0.6.13 and take maintainership Message-ID: <202107011340.161DeXiY016822@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=09b9b34473ac7efae714589e296510a3d9ac8a19 commit 09b9b34473ac7efae714589e296510a3d9ac8a19 Author: Juraj Lutter <otis@FreeBSD.org> AuthorDate: 2021-07-01 13:30:49 +0000 Commit: Juraj Lutter <otis@FreeBSD.org> CommitDate: 2021-07-01 13:40:21 +0000 misc/pinfo: Update to 0.6.13 and take maintainership --- misc/pinfo/Makefile | 34 +++++++++++++++++------------- misc/pinfo/distinfo | 5 +++-- misc/pinfo/files/patch-macros_curses.m4 | 15 ------------- misc/pinfo/files/patch-parse_config.h | 11 ---------- misc/pinfo/files/patch-src_manual.c | 11 ++++++++++ misc/pinfo/files/patch-src_parse__config.h | 11 ++++++++++ misc/pinfo/files/patch-src_utils.c | 10 +++++++++ 7 files changed, 54 insertions(+), 43 deletions(-) diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile index f0a7bade7d10..cd7384625a1a 100644 --- a/misc/pinfo/Makefile +++ b/misc/pinfo/Makefile @@ -1,42 +1,46 @@ # Created by: Thomas Gellekum <tg@FreeBSD.org> PORTNAME= pinfo -PORTVERSION= 0.6.10 -PORTREVISION= 5 +DISTVERSION= 0.6.13 CATEGORIES= misc -MASTER_SITES= GENTOO \ - http://alioth.debian.org/frs/download.php/file/3351/ +MASTER_SITES= -MAINTAINER= ports@FreeBSD.org +MAINTAINER= otis@FreeBSD.org COMMENT= Ncurses based, lynx style info documentation browser LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_aarch64= Fails to link: missing sbrk -BROKEN_riscv64= Fails to link: missing sbrk +#BROKEN_aarch64= Fails to link: missing sbrk +#BROKEN_riscv64= Fails to link: missing sbrk + +USES= autoreconf gettext-tools libtool localbase makeinfo ncurses +USE_GITHUB= yes +GH_ACCOUNT= baszoetekouw +GH_TAGNAME= v${DISTVERSION} -USES= autoreconf gettext-tools libtool localbase makeinfo ncurses tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-curses=${NCURSESBASE} INFO= pinfo -PLIST_FILES= bin/pinfo etc/pinforc man/man1/pinfo.1.gz +PLIST_FILES= bin/pinfo \ + etc/pinforc \ + man/man1/pinfo.1.gz -OPTIONS_DEFINE= READLINE NLS -OPTIONS_DEFAULT=READLINE -READLINE_USES= readline +OPTIONS_DEFINE= NLS READLINE +OPTIONS_DEFAULT= READLINE +READLINE_USES= readline READLINE_CONFIGURE_WITH= readline .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNLS} -USES+= gettext-runtime +USES+= gettext-runtime .for lang in cs de eu ja nl pl pt_BR ro ru sv vi -PLIST_FILES+= share/locale/${lang}/LC_MESSAGES/pinfo.mo +PLIST_FILES+= share/locale/${lang}/LC_MESSAGES/pinfo.mo .endfor .else -CONFIGURE_ARGS+=--disable-nls +CONFIGURE_ARGS+= --disable-nls .endif .include <bsd.port.mk> diff --git a/misc/pinfo/distinfo b/misc/pinfo/distinfo index f770742032f4..1f818f6ac018 100644 --- a/misc/pinfo/distinfo +++ b/misc/pinfo/distinfo @@ -1,2 +1,3 @@ -SHA256 (pinfo-0.6.10.tar.bz2) = 122180a0c23d11bc9eb569a4de3ff97d3052af96e32466fa62f2daf46ff61c5d -SIZE (pinfo-0.6.10.tar.bz2) = 133059 +TIMESTAMP = 1625145544 +SHA256 (baszoetekouw-pinfo-0.6.13-v0.6.13_GH0.tar.gz) = 9dc5e848a7a86cb665a885bc5f0fdf6d09ad60e814d75e78019ae3accb42c217 +SIZE (baszoetekouw-pinfo-0.6.13-v0.6.13_GH0.tar.gz) = 157103 diff --git a/misc/pinfo/files/patch-macros_curses.m4 b/misc/pinfo/files/patch-macros_curses.m4 deleted file mode 100644 index ab83a943c5ba..000000000000 --- a/misc/pinfo/files/patch-macros_curses.m4 +++ /dev/null @@ -1,15 +0,0 @@ ---- macros/curses.m4.orig 2006-03-09 19:44:48 UTC -+++ macros/curses.m4 -@@ -182,6 +182,12 @@ AC_DEFUN([AC_SEARCH_CURSES_H], [ - if test "x$curses_location" != "xfalse" - then - dnl check this particular location -+ AC_SEARCH_CURSES_FILE($curses_location/include, ncurses/ncurses.h, -+ -L$curses_location/lib -lncursesw, -+ -I$curses_location/include ) -+ AC_SEARCH_CURSES_FILE($curses_location/include, ncurses.h, -+ -L$curses_location/lib -lncursesw, -+ -I$curses_location/include ) - AC_SEARCH_CURSES_FILE($curses_location/include, ncursesw/ncurses.h, - -L$curses_location/lib -lncursesw, - -I$curses_location/include ) diff --git a/misc/pinfo/files/patch-parse_config.h b/misc/pinfo/files/patch-parse_config.h deleted file mode 100644 index 2ecddb1e78dd..000000000000 --- a/misc/pinfo/files/patch-parse_config.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/parse_config.h.orig 2020-08-21 00:28:18.377783000 +0700 -+++ src/parse_config.h 2020-08-21 00:28:12.579209000 +0700 -@@ -85,7 +85,7 @@ - colours; - #endif /* NO_COLOR_CURSES */ - --int use_manual; -+extern int use_manual; - - int parse_config (void); - int parse_line (char *line); diff --git a/misc/pinfo/files/patch-src_manual.c b/misc/pinfo/files/patch-src_manual.c new file mode 100644 index 000000000000..8bdd8fa3fec1 --- /dev/null +++ b/misc/pinfo/files/patch-src_manual.c @@ -0,0 +1,11 @@ +--- src/manual.c.orig 2021-07-01 13:36:26 UTC ++++ src/manual.c +@@ -182,7 +182,7 @@ set_initial_history(char *name) + char buf[1024]; + char *str, *lastSlash, *lastButOneSlash; + FILE *pathFile; +- snprintf(buf, sizeof(buf), "man -w -W %s %s", ManOptions, name); ++ snprintf(buf, sizeof(buf), "man -w %s %s", ManOptions, name); + pathFile = popen(buf, "r"); + if (fgets(buf, sizeof(buf), pathFile)==NULL) + { diff --git a/misc/pinfo/files/patch-src_parse__config.h b/misc/pinfo/files/patch-src_parse__config.h new file mode 100644 index 000000000000..6e2b9a797351 --- /dev/null +++ b/misc/pinfo/files/patch-src_parse__config.h @@ -0,0 +1,11 @@ +--- src/parse_config.h.orig 2021-07-01 13:25:26 UTC ++++ src/parse_config.h +@@ -85,7 +85,7 @@ typedef struct colours + colours; + #endif /* HAVE_CURSES_COLOR */ + +-int use_manual; ++extern int use_manual; + + int parse_config (void); + int parse_line (char *line); diff --git a/misc/pinfo/files/patch-src_utils.c b/misc/pinfo/files/patch-src_utils.c new file mode 100644 index 000000000000..6031a8c66027 --- /dev/null +++ b/misc/pinfo/files/patch-src_utils.c @@ -0,0 +1,10 @@ +--- src/utils.c.orig 2021-07-01 13:24:17 UTC ++++ src/utils.c +@@ -24,6 +24,7 @@ + #include <regex.h> + #include <ctype.h> + #include <sys/select.h> ++#include <sys/wait.h> + + #ifdef USE_WCHAR + #include <wchar.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107011340.161DeXiY016822>