details: https://anonhg.NetBSD.org/pkgsrc/rev/4175ea937bb2
branches: trunk
changeset: 487708:4175ea937bb2
user: tv <tv%pkgsrc.org@localhost>
date: Tue Jan 18 22:20:08 2005 +0000
description:
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:
textproc/awf/Makefile | 14 ++++++++++----
textproc/awf/distinfo | 3 ++-
textproc/awf/patches/patch-ab | 22 ++++++++++++++++++++++
3 files changed, 34 insertions(+), 5 deletions(-)
diffs (70 lines):
diff -r 3008d47dc835 -r 4175ea937bb2 textproc/awf/Makefile
--- a/textproc/awf/Makefile Tue Jan 18 22:10:29 2005 +0000
+++ b/textproc/awf/Makefile Tue Jan 18 22:20:08 2005 +0000
@@ -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 @@
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 -r 3008d47dc835 -r 4175ea937bb2 textproc/awf/distinfo
--- a/textproc/awf/distinfo Tue Jan 18 22:10:29 2005 +0000
+++ b/textproc/awf/distinfo Tue Jan 18 22:20:08 2005 +0000
@@ -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 -r 3008d47dc835 -r 4175ea937bb2 textproc/awf/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/awf/patches/patch-ab Tue Jan 18 22:20:08 2005 +0000
@@ -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