summaryrefslogtreecommitdiff
path: root/devel/cvs/patches
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-03-27 04:22:55 +0000
committerjlam <jlam@pkgsrc.org>2004-03-27 04:22:55 +0000
commitfe87ac2069c34c7d5507bdb12928e993ddcdc03b (patch)
tree425397df6bf5f254fafde46b1dd2f01cfb05d515 /devel/cvs/patches
parent10c8c0cce2dc7e26eda15c0032814575885bb369 (diff)
downloadpkgsrc-fe87ac2069c34c7d5507bdb12928e993ddcdc03b.tar.gz
Use the correct zlib.h, not the one distributed with cvs.
Diffstat (limited to 'devel/cvs/patches')
-rw-r--r--devel/cvs/patches/patch-ac13
1 files changed, 11 insertions, 2 deletions
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 \