diff options
| author | agc <agc@pkgsrc.org> | 1999-11-19 12:32:26 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 1999-11-19 12:32:26 +0000 |
| commit | 3667af2477b9de9004dfa134feb2c2d312983d50 (patch) | |
| tree | 5870554d0480e340355a38e5356cb37eb3500114 /net/arpwatch | |
| parent | a1919bdd4d5b932aa6fd7fc60cced3fb243c238b (diff) | |
| download | pkgsrc-3667af2477b9de9004dfa134feb2c2d312983d50.tar.gz | |
Unfortunately, one of the files that is patched contains an RCS Id in
the surrounding context. Introduce a pre-patch stage which removes the
magic '$' characters from the source file, which allows us to have
package patch files which do not contain any RCS Ids, and which allows
us to patch without a fuzz factor.
Diffstat (limited to 'net/arpwatch')
| -rw-r--r-- | net/arpwatch/Makefile | 7 | ||||
| -rw-r--r-- | net/arpwatch/files/patch-sum | 4 | ||||
| -rw-r--r-- | net/arpwatch/patches/patch-ac | 8 |
3 files changed, 12 insertions, 7 deletions
diff --git a/net/arpwatch/Makefile b/net/arpwatch/Makefile index 81e1c9ae47a..2b67328466d 100644 --- a/net/arpwatch/Makefile +++ b/net/arpwatch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1999/04/07 13:01:17 agc Exp $ +# $NetBSD: Makefile,v 1.9 1999/11/19 12:32:26 agc Exp $ # DISTNAME= arpwatch-2.1a4 @@ -10,6 +10,11 @@ MAINTAINER= bouyer@netbsd.org GNU_CONFIGURE= yes +pre-patch: + f=arpwatch.h; \ + ${MV} ${WRKSRC}/$$f ${WRKSRC}/$$f-prepatch; \ + ${SED} -e '/Header/s|\$$||g' ${WRKSRC}/$$f-prepatch > ${WRKSRC}/$$f + post-install: ${INSTALL_MAN} ${WRKSRC}/arpwatch.8 ${PREFIX}/man/man8 ${INSTALL_MAN} ${WRKSRC}/arpsnmp.8 ${PREFIX}/man/man8 diff --git a/net/arpwatch/files/patch-sum b/net/arpwatch/files/patch-sum index 18b7fb7f46f..b963cf494df 100644 --- a/net/arpwatch/files/patch-sum +++ b/net/arpwatch/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 14:12:18 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/11/19 12:32:27 agc Exp $ MD5 (patch-aa) = 67217a057e1afbc6ffc7181dbad1b89d MD5 (patch-ab) = df25aed92d22d576471d93c4a348a907 -MD5 (patch-ac) = a5d5ef03c35ef6db20a30d1d90a49176 +MD5 (patch-ac) = 76bcd31595c7eef8e1e96790535ac5d0 MD5 (patch-ad) = 7112dafe7bbc3057437b07e4930ad808 diff --git a/net/arpwatch/patches/patch-ac b/net/arpwatch/patches/patch-ac index 028ba55afc9..cd80f29e69d 100644 --- a/net/arpwatch/patches/patch-ac +++ b/net/arpwatch/patches/patch-ac @@ -1,9 +1,9 @@ -$NetBSD: patch-ac,v 1.3 1998/11/04 17:25:12 mycroft Exp $ +$NetBSD: patch-ac,v 1.4 1999/11/19 12:32:27 agc Exp $ ---- arpwatch.h.orig Mon Feb 9 19:35:15 1998 -+++ arpwatch.h Wed Nov 4 12:15:33 1998 +--- arpwatch.h.orig Fri Nov 19 12:22:02 1999 ++++ arpwatch.h Fri Nov 19 12:22:02 1999 @@ -1,7 +1,9 @@ - /* @(#) $Header: /cvsroot/pkgsrc/net/arpwatch/patches/patch-ac,v 1.3 1998/11/04 17:25:12 mycroft Exp $ (LBL) */ + /* @(#) Header: arpwatch.h,v 1.28 98/02/09 16:35:15 leres Exp (LBL) */ #define ARPFILE "arp.dat" +#ifndef ETHERCODES |