diff options
| author | hans <hans> | 2012-02-25 14:07:59 +0000 |
|---|---|---|
| committer | hans <hans> | 2012-02-25 14:07:59 +0000 |
| commit | 58da8589c66c140e78a3aaf147f26ba047408b03 (patch) | |
| tree | 7111a252345f7e939ab4fd9cb5161b1ade5157f7 /textproc/rfcutil | |
| parent | 5749c7adf247b488f7b2e98008ff391c4b6093ea (diff) | |
| download | pkgsrc-58da8589c66c140e78a3aaf147f26ba047408b03.tar.gz | |
Fix build with options lynx or w3m.
Don't use sed directly at do-extract, instead use SUBST at post-patch.
Change patch-aa to apply against the original source.
Diffstat (limited to 'textproc/rfcutil')
| -rw-r--r-- | textproc/rfcutil/Makefile | 16 | ||||
| -rw-r--r-- | textproc/rfcutil/distinfo | 4 | ||||
| -rw-r--r-- | textproc/rfcutil/patches/patch-aa | 10 |
3 files changed, 16 insertions, 14 deletions
diff --git a/textproc/rfcutil/Makefile b/textproc/rfcutil/Makefile index bb09e4cec61..905802bad3e 100644 --- a/textproc/rfcutil/Makefile +++ b/textproc/rfcutil/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2011/11/23 13:30:30 hubertf Exp $ +# $NetBSD: Makefile,v 1.22 2012/02/25 14:07:59 hans Exp $ # DISTNAME= rfc-3.2 @@ -25,15 +25,17 @@ RFCINDEXURL= http://www.ietf.org/download/ INSTALLATION_DIRS= bin +SUBST_CLASSES+= rfcutil +SUBST_STAGE.rfcutil= post-patch +SUBST_FILES.rfcutil= rfc +SUBST_SED.rfcutil+= -e 's,/usr/local,${PREFIX},' +SUBST_SED.rfcutil+= -e '/VIEWER=/s,w3m lynx,${RFCVIEWER},' +SUBST_SED.rfcutil+= -e '/viewer/s,-dump,${RFCDUMPOPT},' +SUBST_SED.rfcutil+= -e '/viewer/s,http://ftp.isi.edu/in-notes/,${RFCINDEXURL},' .include "options.mk" do-extract: - ${SED} \ - -e 's,/usr/local,${PREFIX},' \ - -e '/VIEWER=/s,w3m lynx,${RFCVIEWER},' \ - -e '/viewer/s,-dump,${RFCDUMPOPT},' \ - -e '/viewer/s,http://ftp.isi.edu/in-notes/,${RFCINDEXURL},' \ - <${DISTDIR}/${DISTNAME} >${WRKSRC}/rfc + ${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC}/rfc do-install: ${INSTALL_SCRIPT} ${WRKSRC}/rfc ${DESTDIR}${PREFIX}/bin/rfc diff --git a/textproc/rfcutil/distinfo b/textproc/rfcutil/distinfo index 390f5486fda..dca28b77279 100644 --- a/textproc/rfcutil/distinfo +++ b/textproc/rfcutil/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2011/11/23 13:30:30 hubertf Exp $ +$NetBSD: distinfo,v 1.7 2012/02/25 14:07:59 hans Exp $ SHA1 (rfc-3.2) = 1dd1b8f90d0e24fcd8447ff563ca6c47931a826c RMD160 (rfc-3.2) = 40c8bfb3baa4bee7060cc69cd908395df19d678b Size (rfc-3.2) = 15308 bytes -SHA1 (patch-aa) = 00d83c095cf6e79a16a0a6615552280465df07d0 +SHA1 (patch-aa) = f44e69176d7f8c2f361d0dba1be8a0d1589d1786 diff --git a/textproc/rfcutil/patches/patch-aa b/textproc/rfcutil/patches/patch-aa index 1719d8f9fd0..aa71eb2d1d6 100644 --- a/textproc/rfcutil/patches/patch-aa +++ b/textproc/rfcutil/patches/patch-aa @@ -1,12 +1,12 @@ -$NetBSD: patch-aa,v 1.3 2011/11/23 13:31:58 hubertf Exp $ +$NetBSD: patch-aa,v 1.4 2012/02/25 14:07:59 hans Exp $ --- rfc.orig 2011-11-23 13:08:42.000000000 +0000 +++ rfc @@ -106,6 +106,9 @@ if ($ARGV[0] eq "-i") { - #system ("$viewer -source http://www.faqs.org/rfc/rfc-index.txt > $indexpath"); - #system ("$viewer -source http://www.dewn.com/rfc/rfc-index.txt > $indexpath"); - system ("$viewer -source http://www.ietf.org/download/rfc-index.txt > $indexpath"); -+ + #system ("$viewer -dump http://www.faqs.org/rfc/rfc-index.txt > $indexpath"); + #system ("$viewer -dump http://www.dewn.com/rfc/rfc-index.txt > $indexpath"); + system ("$viewer -dump http://ftp.isi.edu/in-notes/rfc-index.txt > $indexpath"); ++ + my $filetype = `file '$indexpath'`; + system("if expr \"$filetype\" : \".*gzip.*\" 2>&1 >/dev/null ; then mv ${indexpath} ${indexpath}.gz ; gunzip ${indexpath}.gz ; fi"); $indexlength=numlines($indexpath); print "new lines \t= $indexlength\t$indexpath\n"; |