diff options
| author | richard <richard@pkgsrc.org> | 2014-04-15 05:27:00 +0000 |
|---|---|---|
| committer | richard <richard@pkgsrc.org> | 2014-04-15 05:27:00 +0000 |
| commit | 36a7c1b548dae5cd8055812bbb1e0926e4473a6f (patch) | |
| tree | 12a3cf551b1d8e3a16ec33f0afc03c7ed1063417 /devel/gtexinfo | |
| parent | 0542cb0cad55fc982a47024fde1db0f841b8fee0 (diff) | |
| download | pkgsrc-36a7c1b548dae5cd8055812bbb1e0926e4473a6f.tar.gz | |
Revert previous superficial patch and push the Mr Zingelman's suggestion
as indicated in pkg/48075, wherein pdksh doesn't support double-parens
if not containing an arithmetic expression of a particular form.
Older bash and ast-ksh apparently also had problems with this.
Diffstat (limited to 'devel/gtexinfo')
| -rw-r--r-- | devel/gtexinfo/distinfo | 5 | ||||
| -rw-r--r-- | devel/gtexinfo/patches/patch-man_Makefile.in | 14 | ||||
| -rw-r--r-- | devel/gtexinfo/patches/patch-util_texi2dvi | 18 |
3 files changed, 17 insertions, 20 deletions
diff --git a/devel/gtexinfo/distinfo b/devel/gtexinfo/distinfo index 038da738758..597e34a31d9 100644 --- a/devel/gtexinfo/distinfo +++ b/devel/gtexinfo/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.39 2014/04/07 13:34:49 richard Exp $ +$NetBSD: distinfo,v 1.40 2014/04/15 05:27:00 richard Exp $ SHA1 (texinfo-5.2.tar.gz) = dc54edfbb623d46fb400576b3da181f987e63516 RMD160 (texinfo-5.2.tar.gz) = f5df93674e520507c6bd5b2c47de7a02ad7e2fe3 @@ -7,5 +7,4 @@ SHA1 (patch-ab) = 89a06d42120c3b4a7d90b991add8973e80077187 SHA1 (patch-ac) = 3fb50380e0406a9ee81db92e5ce1e2f6bd87701a SHA1 (patch-gnulib_lib_mbiter.h) = 34c291e6994c6eb51aba803f3ebf5f09d46e9bdd SHA1 (patch-gnulib_lib_mbuiter.h) = be293674c37cb91746527be07aa40acbd285d2f4 -SHA1 (patch-man_Makefile.in) = 750c5a93e4ef6b7ea8b5805a45ceb266d611cbe3 -SHA1 (patch-util_texi2dvi) = bda9705be3957b3136d4e7278cd788793d64b54f +SHA1 (patch-util_texi2dvi) = 1406ba8b1b0c55c534f59b95c4e16de47b916c07 diff --git a/devel/gtexinfo/patches/patch-man_Makefile.in b/devel/gtexinfo/patches/patch-man_Makefile.in deleted file mode 100644 index 4d4ae3856a8..00000000000 --- a/devel/gtexinfo/patches/patch-man_Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-man_Makefile.in,v 1.1 2014/04/07 13:34:49 richard Exp $ -help2man says to try `--no-discard-stderr' if option outputs to stderr - ---- man/Makefile.in.orig 2014-04-04 21:37:08.330805790 +0000 -+++ man/Makefile.in -@@ -670,7 +670,7 @@ HAVE_WMEMSET = @HAVE_WMEMSET@ - HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ - HAVE__BOOL = @HAVE__BOOL@ - HAVE__EXIT = @HAVE__EXIT@ --HELP2MAN = @HELP2MAN@ -+HELP2MAN = @HELP2MAN@ --no-discard-stderr - INCLUDE_NEXT = @INCLUDE_NEXT@ - INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ - INSTALL = @INSTALL@ diff --git a/devel/gtexinfo/patches/patch-util_texi2dvi b/devel/gtexinfo/patches/patch-util_texi2dvi index 96e4fb742b8..5ac0b1611de 100644 --- a/devel/gtexinfo/patches/patch-util_texi2dvi +++ b/devel/gtexinfo/patches/patch-util_texi2dvi @@ -1,6 +1,9 @@ -$NetBSD: patch-util_texi2dvi,v 1.2 2013/07/04 16:19:16 wiz Exp $ - ---- util/texi2dvi.orig 2013-03-12 22:56:34.000000000 +0000 +$NetBSD: patch-util_texi2dvi,v 1.3 2014/04/15 05:27:00 richard Exp $ +As indicated in pkg/48075, pdksh doesn't support double-parens +if not containing an arithmetic expression of a particular form. +Older bash and ast-ksh apparently also had problems with this. + +--- util/texi2dvi.orig 2013-09-26 23:04:02.000000000 +0000 +++ util/texi2dvi @@ -25,10 +25,10 @@ # If possible, please send a copy of the output of the script called with @@ -17,3 +20,12 @@ $NetBSD: patch-util_texi2dvi,v 1.2 2013/07/04 16:19:16 wiz Exp $ # No failure shall remain unpunished. set -e +@@ -1103,7 +1103,7 @@ run_bibtex () + # bibtex would never be run. + if test -r "$in_noext.aux" \ + && test -r "$in_noext.log" \ +- && ((grep 'Warning:.*Citation.*undefined' "$in_noext.log" \ ++ && ( (grep 'Warning:.*Citation.*undefined' "$in_noext.log" \ + || grep '.*Undefined citation' "$in_noext.log" \ + || grep 'No file .*\.bbl\.' "$in_noext.log") \ + || (grep 'No \.aux file' "$in_noext.log" \ |