[cvs] cleanup patches

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

3 files changed, 63 insertions, 56 deletions

diff --git a/patches/cvs-1.11.22/remove_zlib.patch b/patches/cvs-1.11.22/cvs-1.11.22-use-system-zlib.patch
index 15c9cebce..28013207c 100644
--- a/patches/cvs-1.11.22/remove_zlib.patch
+++ b/patches/cvs-1.11.22/cvs-1.11.22-use-system-zlib.patch
@@ -1,3 +1,65 @@
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Subject: [cvs] link against system zlib
+
+Instead of building our own internal zlib, link against the variant
+provided by the system.
+
+This patch was taken from linux-from-scratch:
+
+  Submitted By:            Matthew Burgess <matthew@linuxfromscratch.org>
+  Date:                    2004-11-12
+  Initial Package Version: 1.11.2
+  Upstream Status:         Not submitted
+  Origin:                  BLFS Dev Post
+  Description:             Links against system zlib instead of the
+                           internal zlib.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+
+---
+
+diff -Naur cvs-1.11.18.orig/src/Makefile.in cvs-1.11.18/src/Makefile.in
+--- cvs-1.11.18.orig/src/Makefile.in	2004-11-11 18:17:20.000000000 +0000
++++ cvs-1.11.18/src/Makefile.in	2004-11-12 19:58:14.962293296 +0000
+@@ -86,7 +86,7 @@
+ 	version.$(OBJEXT) vers_ts.$(OBJEXT) watch.$(OBJEXT) \
+ 	wrapper.$(OBJEXT) zlib.$(OBJEXT)
+ cvs_OBJECTS = $(am_cvs_OBJECTS)
+-cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a ../zlib/libz.a
++cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a
+ binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ SCRIPTS = $(bin_SCRIPTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+@@ -199,7 +199,7 @@
+ # 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_SCRIPTS = cvsbug
+ 
+ # The cvs executable
+@@ -278,7 +278,7 @@
+ cvs_LDADD = \
+ 	../diff/libdiff.a \
+ 	../lib/libcvs.a \
+-	../zlib/libz.a
++	-lz
+ 
+ 
+ # extra clean targets
+diff -Naur cvs-1.11.18.orig/src/zlib.c cvs-1.11.18/src/zlib.c
+--- cvs-1.11.18.orig/src/zlib.c	2004-03-19 19:18:57.000000000 +0000
++++ cvs-1.11.18/src/zlib.c	2004-11-12 19:58:55.531125896 +0000
+@@ -22,7 +22,7 @@
+ 
+ #if defined (SERVER_SUPPORT) || defined (CLIENT_SUPPORT)
+ 
+-#include "zlib.h"
++#include <zlib.h>
+ 
+ /* OS/2 doesn't have EIO.  FIXME: this whole notion of turning
+    a different error into EIO strikes me as pretty dubious.  */
 --- cvs-1.11.22/Makefile.in.orig
 +++ cvs-1.11.22/Makefile.in
 @@ -53,7 +53,7 @@
diff --git a/patches/cvs-1.11.22/cvs-1.11.22-zlib-1.patch b/patches/cvs-1.11.22/cvs-1.11.22-zlib-1.patch
deleted file mode 100644
index 869a3645e..000000000
--- a/patches/cvs-1.11.22/cvs-1.11.22-zlib-1.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Submitted By:            Matthew Burgess <matthew@linuxfromscratch.org>
-Date:                    2004-11-12
-Initial Package Version: 1.11.2
-Upstream Status:         Not submitted
-Origin:                  BLFS Dev Post
-Description:             Links against system zlib instead of the
-                         internal zlib.
-
-$LastChangedBy: igor $
-$Date: 2005-10-28 09:20:09 -0500 (Fri, 28 Oct 2005) $
-
-diff -Naur cvs-1.11.18.orig/src/Makefile.in cvs-1.11.18/src/Makefile.in
---- cvs-1.11.18.orig/src/Makefile.in	2004-11-11 18:17:20.000000000 +0000
-+++ cvs-1.11.18/src/Makefile.in	2004-11-12 19:58:14.962293296 +0000
-@@ -86,7 +86,7 @@
- 	version.$(OBJEXT) vers_ts.$(OBJEXT) watch.$(OBJEXT) \
- 	wrapper.$(OBJEXT) zlib.$(OBJEXT)
- cvs_OBJECTS = $(am_cvs_OBJECTS)
--cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a ../zlib/libz.a
-+cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a
- binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
- SCRIPTS = $(bin_SCRIPTS)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-@@ -199,7 +199,7 @@
- # 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_SCRIPTS = cvsbug
- 
- # The cvs executable
-@@ -278,7 +278,7 @@
- cvs_LDADD = \
- 	../diff/libdiff.a \
- 	../lib/libcvs.a \
--	../zlib/libz.a
-+	-lz
- 
- 
- # extra clean targets
-diff -Naur cvs-1.11.18.orig/src/zlib.c cvs-1.11.18/src/zlib.c
---- cvs-1.11.18.orig/src/zlib.c	2004-03-19 19:18:57.000000000 +0000
-+++ cvs-1.11.18/src/zlib.c	2004-11-12 19:58:55.531125896 +0000
-@@ -22,7 +22,7 @@
- 
- #if defined (SERVER_SUPPORT) || defined (CLIENT_SUPPORT)
- 
--#include "zlib.h"
-+#include <zlib.h>
- 
- /* OS/2 doesn't have EIO.  FIXME: this whole notion of turning
-    a different error into EIO strikes me as pretty dubious.  */
diff --git a/patches/cvs-1.11.22/series b/patches/cvs-1.11.22/series
index 52f7c9406..675a2b6d2 100644
--- a/patches/cvs-1.11.22/series
+++ b/patches/cvs-1.11.22/series
@@ -1,3 +1 @@
-cvs-1.11.22-zlib-1.patch
-remove_zlib.patch
-
+cvs-1.11.22-use-system-zlib.patch