diff options
| author | apb <apb@pkgsrc.org> | 2013-01-13 20:44:55 +0000 |
|---|---|---|
| committer | apb <apb@pkgsrc.org> | 2013-01-13 20:44:55 +0000 |
| commit | 0c16714b5101370972680c331a653c2fd39acdf3 (patch) | |
| tree | 93f75e94518473e8cfef1320960ecd397432f6eb /devel/gtexinfo | |
| parent | cb15bc59e0f86e615227a4489342e4fb7bdc59dd (diff) | |
| download | pkgsrc-0c16714b5101370972680c331a653c2fd39acdf3.tar.gz | |
In util/texi2dvi, don't try to re-exec under /bin/ksh, and improve the
test for whether "local" works. Now ksh93 is correctly detected as
a shell that does not have a working 'local' command.
Use REPLACE_SH to edit the #!/bin/sh line in util/texi2dvi, to make
it use the value of ${SH} instead of /bin/sh.
Set PKGREVISION=1.
Diffstat (limited to 'devel/gtexinfo')
| -rw-r--r-- | devel/gtexinfo/Makefile | 5 | ||||
| -rw-r--r-- | devel/gtexinfo/distinfo | 3 | ||||
| -rw-r--r-- | devel/gtexinfo/patches/patch-util_texi2dvi | 28 |
3 files changed, 34 insertions, 2 deletions
diff --git a/devel/gtexinfo/Makefile b/devel/gtexinfo/Makefile index 31ee87a51b3..1e99f41a8ae 100644 --- a/devel/gtexinfo/Makefile +++ b/devel/gtexinfo/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.81 2013/01/11 14:57:26 seanb Exp $ +# $NetBSD: Makefile,v 1.82 2013/01/13 20:44:55 apb Exp $ DISTNAME= texinfo-4.13a PKGNAME= g${DISTNAME} +PKGREVISION= 1 CATEGORIES= devel sysutils MASTER_SITES= ${MASTER_SITE_GNU:=texinfo/} @@ -22,6 +23,8 @@ PLIST_SRC= ${PKGDIR}/PLIST PKGSRC_INFOPATH= ${PREFIX}/${PKGINFODIR}:${X11BASE}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR} MAKE_ENV+= PKGSRC_INFOPATH=${PKGSRC_INFOPATH:Q} +REPLACE_SH+= util/texi2dvi + .include "../../mk/bsd.prefs.mk" .include "options.mk" diff --git a/devel/gtexinfo/distinfo b/devel/gtexinfo/distinfo index 701f30ae6a3..32ca2aba110 100644 --- a/devel/gtexinfo/distinfo +++ b/devel/gtexinfo/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.35 2012/12/16 11:24:05 wiz Exp $ +$NetBSD: distinfo,v 1.36 2013/01/13 20:44:55 apb Exp $ SHA1 (texinfo-4.13a.tar.gz) = a1533cf8e03ea4fa6c443b73f4c85e4da04dead0 RMD160 (texinfo-4.13a.tar.gz) = 2473fc7ef3f82f47a990ee48c1d262b1f420eabd @@ -9,3 +9,4 @@ SHA1 (patch-aj) = 8a215583bab47628a350cfb3874eef4930d255e9 SHA1 (patch-ak) = 51a4b155fa6a3bd0c30c9ec2c6007cd4ee69248c SHA1 (patch-gnulib_lib_mbiter.h) = b031213dfb68ae79bbce0c6dbe180a164c3a12af SHA1 (patch-gnulib_lib_mbuiter.h) = 3b3cf6867ee064d150fdd7ec847c444b9df8e638 +SHA1 (patch-util_texi2dvi) = 3cc779909e54294000ea3fa560820a295373951e diff --git a/devel/gtexinfo/patches/patch-util_texi2dvi b/devel/gtexinfo/patches/patch-util_texi2dvi new file mode 100644 index 00000000000..1ce24bb9e82 --- /dev/null +++ b/devel/gtexinfo/patches/patch-util_texi2dvi @@ -0,0 +1,28 @@ +$NetBSD: patch-util_texi2dvi,v 1.1 2013/01/13 20:44:55 apb Exp $ + +--- util/texi2dvi.orig 2008-09-18 18:46:01.000000000 +0000 ++++ util/texi2dvi +@@ -24,10 +24,10 @@ + # If possible, please send a copy of the output of the script called with + # the `--debug' option when making a bug report. + +-test -f /bin/ksh && test -z "$RUNNING_KSH" \ +- && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \ +- && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; } +-unset RUNNING_KSH ++#test -f /bin/ksh && test -z "$RUNNING_KSH" \ ++# && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \ ++# && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; } ++#unset RUNNING_KSH + + # No failure shall remain unpunished. + set -e +@@ -127,7 +127,7 @@ test -n "$TEX" && test -d "$TEX" && unse + test_local () { + local foo=foo + } +- test_local ++ test_local 2>/dev/null || exit 1 + test $foo = bar + ) || local () { + case $1 in |