From dd593b3654fe1b617713047adcec9fa5646de0f1 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 8 Feb 2017 21:12:36 +0100 Subject: [PATCH] mdocml: update to 1.14.1. --- srcpkgs/mdocml/patches/cross.patch | 22 +++++++-------- srcpkgs/mdocml/patches/stdout.patch | 42 ----------------------------- srcpkgs/mdocml/template | 12 ++++----- 3 files changed, 17 insertions(+), 59 deletions(-) delete mode 100644 srcpkgs/mdocml/patches/stdout.patch diff --git a/srcpkgs/mdocml/patches/cross.patch b/srcpkgs/mdocml/patches/cross.patch index 4fb351f8370..a074964984c 100644 --- a/srcpkgs/mdocml/patches/cross.patch +++ b/srcpkgs/mdocml/patches/cross.patch @@ -1,25 +1,25 @@ ---- configure.orig 2014-12-13 18:15:59.590223371 +0100 -+++ configure 2014-12-13 18:16:18.270172760 +0100 -@@ -131,13 +131,6 @@ __HEREDOC__ +--- configure.orig ++++ configure +@@ -155,13 +155,6 @@ - if ${COMP} ${3} -o "test-${1}" "test-${1}.c" 1>&3 2>&3; then - echo "${1}: ${CC} succeeded" 1>&3 + if ${COMP} -o "test-${1}" "test-${1}.c" ${3} 1>&3 2>&3; then + echo "${1}${3}: ${CC} succeeded" 1>&3 - else -- echo "${1}: ${CC} failed with $?" 1>&3 +- echo "${1}${3}: ${CC} failed with $?" 1>&3 - echo 1>&3 - return 1 - fi - - if ./test-${1} 1>&3 2>&3; then - echo "${1}: yes" 1>&2 - echo "${1}: yes" 1>&3 + echo "${1}${3}: yes" 1>&2 + echo "${1}${3}: yes" 1>&3 echo 1>&3 -@@ -145,9 +138,8 @@ __HEREDOC__ +@@ -169,9 +162,8 @@ rm "test-${1}" return 0 else -- echo "${1}: execution failed with $?" 1>&3 -+ echo "${1}: ${CC} failed with $?" 1>&3 +- echo "${1}${3}: execution failed with $?" 1>&3 ++ echo "${1}${3}: ${CC} failed with $?" 1>&3 echo 1>&3 - rm "test-${1}" return 1 diff --git a/srcpkgs/mdocml/patches/stdout.patch b/srcpkgs/mdocml/patches/stdout.patch deleted file mode 100644 index 460acf0118a..00000000000 --- a/srcpkgs/mdocml/patches/stdout.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- main.c.orig -+++ main.c -@@ -551,10 +551,10 @@ - - /* Stop here until moved to the foreground. */ - -- tc_pgid = tcgetpgrp(STDIN_FILENO); -+ tc_pgid = tcgetpgrp(tag_files->ofd); - if (tc_pgid != man_pgid) { - if (tc_pgid == pager_pid) { -- (void)tcsetpgrp(STDIN_FILENO, -+ (void)tcsetpgrp(tag_files->ofd, - man_pgid); - if (signum == SIGTTIN) - continue; -@@ -567,7 +567,7 @@ - /* Once in the foreground, activate the pager. */ - - if (pager_pid) { -- (void)tcsetpgrp(STDIN_FILENO, pager_pid); -+ (void)tcsetpgrp(tag_files->ofd, pager_pid); - kill(pager_pid, SIGCONT); - } else - pager_pid = spawn_pager(tag_files); -@@ -1082,7 +1082,7 @@ - break; - default: - (void)setpgid(pager_pid, 0); -- (void)tcsetpgrp(STDIN_FILENO, pager_pid); -+ (void)tcsetpgrp(tag_files->ofd, pager_pid); - #if HAVE_PLEDGE - if (pledge("stdio rpath tmppath tty proc", NULL) == -1) - err((int)MANDOCLEVEL_SYSERR, "pledge"); -@@ -1100,7 +1100,7 @@ - - /* Do not start the pager before controlling the terminal. */ - -- while (tcgetpgrp(STDIN_FILENO) != getpid()) -+ while (tcgetpgrp(STDOUT_FILENO) != getpid()) - nanosleep(&timeout, NULL); - - execvp(argv[0], argv); diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template index ab31dc0933a..385e524e6a9 100644 --- a/srcpkgs/mdocml/template +++ b/srcpkgs/mdocml/template @@ -1,18 +1,18 @@ # Template file for 'mdocml' pkgname=mdocml -version=1.13.4 -revision=2 +version=1.14.1 +revision=1 build_style=configure -makedepends="sqlite-devel zlib-devel" +makedepends="zlib-devel" depends="less" provides="man-0_1" conf_files="/etc/man.conf" short_desc="The mandoc UNIX manpage compiler toolset" -maintainer="Juan RP " +maintainer="Leah Neukirchen " license="ISC" homepage="http://mdocml.bsd.lv" -distfiles="${homepage}/snapshots/mdocml-$version.tar.gz" -checksum=0a55c1addb188071d6f784599303656b8465e98ec6b2f4f264e12fb96d79e0ef +distfiles="${homepage}/snapshots/mdocml-${version}.tar.gz" +checksum=356954f141ec6f5635e938c826f2e16e4619bb361c64d84a31f6775d030a615b alternatives=" man:man:/usr/bin/mandoc