diff options
| author | jlam <jlam> | 2004-03-27 04:22:55 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-03-27 04:22:55 +0000 |
| commit | 86faae3f6e2ea7cd8190272909c4d7e77e006410 (patch) | |
| tree | 425397df6bf5f254fafde46b1dd2f01cfb05d515 | |
| parent | 8d893a9e5e0e5e674f075448d4bfefd64ef5c5d8 (diff) | |
| download | pkgsrc-86faae3f6e2ea7cd8190272909c4d7e77e006410.tar.gz | |
Use the correct zlib.h, not the one distributed with cvs.
| -rw-r--r-- | devel/cvs/distinfo | 4 | ||||
| -rw-r--r-- | devel/cvs/patches/patch-ac | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/devel/cvs/distinfo b/devel/cvs/distinfo index c8756dd7161..f8e46e633ac 100644 --- a/devel/cvs/distinfo +++ b/devel/cvs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2004/03/04 20:54:40 wiz Exp $ +$NetBSD: distinfo,v 1.18 2004/03/27 04:22:55 jlam Exp $ SHA1 (cvs-1.11.13.tar.bz2) = 1eaf715ebc322cb788807438af6a336350baff35 Size (cvs-1.11.13.tar.bz2) = 2232892 bytes @@ -6,7 +6,7 @@ SHA1 (cvs-1.11.13-v6-20040215.diff.gz) = 92b1683fa0acf889e82b6f699c6deeb4110a5f1 Size (cvs-1.11.13-v6-20040215.diff.gz) = 12831 bytes SHA1 (patch-aa) = 01f2d7bc29a97cd2d971b436483285c5206ca27a SHA1 (patch-ab) = 1c2e9f8f439bb2c0f8f87ae56754cf7ec0224642 -SHA1 (patch-ac) = 6b8c81ec9317010b077e5e2ffc9131b083498c3c +SHA1 (patch-ac) = c2142c0fab9603bf8d605fa53957d50bb0b40b3d SHA1 (patch-ae) = 250e58a640335e83119306112e22467cbdf78668 SHA1 (patch-af) = 3952be37a6654e65fb60c4c499d6ccf0cacb43bd SHA1 (patch-ah) = 38a1757ef83789bb780a83bde95c2c6e8f65e1ca diff --git a/devel/cvs/patches/patch-ac b/devel/cvs/patches/patch-ac index d5225dd93d4..ee9d81eaac1 100644 --- a/devel/cvs/patches/patch-ac +++ b/devel/cvs/patches/patch-ac @@ -1,7 +1,16 @@ -$NetBSD: patch-ac,v 1.8 2004/03/04 20:54:40 wiz Exp $ +$NetBSD: patch-ac,v 1.9 2004/03/27 04:22:56 jlam Exp $ ---- src/Makefile.in.orig Fri Feb 13 16:29:20 2004 +--- src/Makefile.in.orig Fri Feb 13 10:29:20 2004 +++ src/Makefile.in +@@ -146,7 +146,7 @@ target_alias = @target_alias@ + # some namespace hackery going on that maybe shouldn't be. Long term fix is to + # try and remove naming ocnflicts and fix Automake to allow particular includes + # to be attached only to particular object files. Short term fix is either or. +-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt) ++INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt) + + bin_PROGRAMS = cvs + bin_SCRIPTS = cvsbug @@ -228,7 +228,7 @@ cvs_SOURCES = \ cvs_LDADD = \ ../diff/libdiff.a \ |