diff options
| author | tv <tv@pkgsrc.org> | 2005-01-18 22:20:08 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2005-01-18 22:20:08 +0000 |
| commit | 1384343da8d5184b81e65cd4e4758e8d6af881f2 (patch) | |
| tree | 7319200792e685559cde5f54cf0d5fa5bf71ef9e /textproc | |
| parent | fe746490e140b9f45547cc87f07bc0575a680cb5 (diff) | |
| download | pkgsrc-1384343da8d5184b81e65cd4e4758e8d6af881f2.tar.gz | |
nb1: Mainly Interix fix, but to add portability: Kill explicit PATH
override, and allow overriding awk implementation with $AWK. Default it
to the value of ${AWK} in platform-specific pkgsrc config.
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/awf/Makefile | 14 | ||||
| -rw-r--r-- | textproc/awf/distinfo | 3 | ||||
| -rw-r--r-- | textproc/awf/patches/patch-ab | 22 |
3 files changed, 34 insertions, 5 deletions
diff --git a/textproc/awf/Makefile b/textproc/awf/Makefile index dbcdce031c0..417035fd831 100644 --- a/textproc/awf/Makefile +++ b/textproc/awf/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2005/01/18 22:10:29 tv Exp $ +# $NetBSD: Makefile,v 1.4 2005/01/18 22:20:08 tv Exp $ # DISTNAME= nroff-clone PKGNAME= awf-19900907 +PKGREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.scn.rain.com/pub/text/ EXTRACT_SUFX= .shar.Z @@ -14,10 +15,15 @@ COMMENT= Text formatter (nroff-clone) written in awk EXTRACT_CMD= ${DECOMPRESS_CMD.shar.Z} ${DOWNLOADED_DISTFILE} | ${SED} -e '1,/^\#!/d' | ${SH} WRKSRC= ${WRKDIR} +NO_BUILDLINK= # defined +NO_TOOLS= # defined +NO_WRAPPER= # defined + SUBST_CLASSES+= awflib -SUBST_MESSAGE.awflib= "Fixing awf library path." +SUBST_MESSAGE.awflib= "Fixing awf library path and awk pathname." SUBST_FILES.awflib= Makefile awf awf.1 -SUBST_SED.awflib= -e 's|/usr/lib/awf|${PREFIX}/share/awf|' -SUBST_STAGE.awflib= post-patch +SUBST_SED.awflib+= -e 's|/usr/lib/awf|${PREFIX}/share/awf|' +SUBST_SED.awflib+= -e 's|@AWK@|${AWK}|g' +SUBST_STAGE.awflib= pre-configure .include "../../mk/bsd.pkg.mk" diff --git a/textproc/awf/distinfo b/textproc/awf/distinfo index 38fe4ce62e6..d83225a5750 100644 --- a/textproc/awf/distinfo +++ b/textproc/awf/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/12/04 08:33:59 agc Exp $ +$NetBSD: distinfo,v 1.2 2005/01/18 22:20:08 tv Exp $ SHA1 (nroff-clone.shar.Z) = 4e4527234f97b16f62341b4b844d128b4cabd617 Size (nroff-clone.shar.Z) = 26302 bytes SHA1 (patch-aa) = 486c404fcd90638c59fb3df01eb41ffeb2595982 +SHA1 (patch-ab) = c2574a55bb9a9ab3b79c3a59d639ef534015a45c diff --git a/textproc/awf/patches/patch-ab b/textproc/awf/patches/patch-ab new file mode 100644 index 00000000000..e8ce05c7736 --- /dev/null +++ b/textproc/awf/patches/patch-ab @@ -0,0 +1,22 @@ +$NetBSD: patch-ab,v 1.1 2005/01/18 22:20:08 tv Exp $ + +--- awf.orig 2005-01-18 17:16:21.000000000 -0500 ++++ awf +@@ -1,7 +1,7 @@ + #! /bin/sh +-PATH=/bin:/usr/bin ; export PATH + # AWFLIB is where the pieces live + AWFLIB=${AWFLIB-/usr/lib/awf} ++AWK=${AWK-@AWK@} + + tmp=/tmp/awp$$ # tempfile for building pass 2 + errs=/tmp/awe$$ # error messages (awk can't send to stderr) +@@ -48,7 +48,7 @@ trap "rm -f $tmp $errs ; exit 0" 0 1 2 + done + fi + echo ".^e" +-) | awk -f $AWFLIB/pass1 | awk -f $tmp | awk -f $AWFLIB/pass3 ++) | $AWK -f $AWFLIB/pass1 | $AWK -f $tmp | $AWK -f $AWFLIB/pass3 + + # error messages, if any + if test -s $errs |