OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 03-Dec-2009 08:51:04
Branch: HEAD Handle: 2009120307510400
Modified files:
openpkg-src/patch patch.patch patch.spec
Log:
enable merge functionality
Summary:
Revision Changes Path
1.2 +34 -1 openpkg-src/patch/patch.patch
1.44 +2 -1 openpkg-src/patch/patch.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/patch/patch.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 patch.patch
--- openpkg-src/patch/patch.patch 27 Nov 2009 21:52:19 -0000 1.1
+++ openpkg-src/patch/patch.patch 3 Dec 2009 07:51:04 -0000 1.2
@@ -1,6 +1,39 @@
+Index: Makefile.in
+--- Makefile.in.orig 2009-11-02 20:09:57 +0100
++++ Makefile.in 2009-12-03 08:44:32 +0100
+@@ -45,9 +45,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ STDBOOL_H = @STDBOOL_H@
+-ifneq (@GETOPT_H@,)
+ GETOPT_H = gl/lib/@GETOPT_H@
+-endif
+ HAVE__BOOL = @HAVE__BOOL@
+ ENABLE_MERGE = @ENABLE_MERGE@
+
+@@ -107,9 +105,7 @@
+ src/util.c \
+ src/version.c
+
+-ifeq ($(ENABLE_MERGE),1)
+ MERGEOBJ = src/merge.$(OBJEXT)
+-endif
+
+ OBJS = $(LIBOBJS) $(MERGEOBJ) \
+ src/inp.$(OBJEXT) \
+@@ -222,9 +218,7 @@
+ @echo "[...@]"
+ @srcdir=$(srcdir)/tests $(TEST_SHELL) $@
+
+-ifeq ($(ENABLE_MERGE),1)
+ DEFINE_ENABLE_MERGE = -DENABLE_MERGE
+-endif
+ COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) -Ded_PROGRAM=\"$(ed_PROGRAM)\" \
+ $(DEFINE_ENABLE_MERGE) -I. -I$(srcdir)/src -I$(srcdir)/gl/lib $(CFLAGS)
+
Index: gl/lib/xstrndup.c
--- gl/lib/xstrndup.c.orig 2009-11-02 20:09:57 +0100
-+++ gl/lib/xstrndup.c 2009-11-27 22:49:55 +0100
++++ gl/lib/xstrndup.c 2009-12-03 08:42:53 +0100
@@ -23,13 +23,37 @@
#include <string.h>
#include "xalloc.h"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/patch/patch.spec
============================================================================
$ cvs diff -u -r1.43 -r1.44 patch.spec
--- openpkg-src/patch/patch.spec 27 Nov 2009 21:55:15 -0000 1.43
+++ openpkg-src/patch/patch.spec 3 Dec 2009 07:51:04 -0000 1.44
@@ -32,7 +32,7 @@
Group: Patching
License: GPL
Version: 2.6
-Release: 20091127
+Release: 20091203
# list of sources
Source0: ftp://ftp.gnu.org/gnu/patch/patch-%{version}.tar.gz
@@ -74,6 +74,7 @@
--cache-file=./config.cache \
--prefix=%{l_prefix} \
--mandir=%{l_prefix}/man \
+ --enable-merge \
--disable-largefile
%{l_make} %{l_mflags -O}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
