[csw-devel] SF.net SVN: gar:[15302] csw/mgar/pkg
opk at users.sourceforge.net
opk at users.sourceforge.net
Wed Aug 10 17:49:18 CEST 2011
Revision: 15302
http://gar.svn.sourceforge.net/gar/?rev=15302&view=rev
Author: opk
Date: 2011-08-10 15:49:18 +0000 (Wed, 10 Aug 2011)
Log Message:
-----------
package new version of wiggle using gar
Added Paths:
-----------
csw/mgar/pkg/wiggle/
csw/mgar/pkg/wiggle/Makefile
csw/mgar/pkg/wiggle/branches/
csw/mgar/pkg/wiggle/tags/
csw/mgar/pkg/wiggle/trunk/
csw/mgar/pkg/wiggle/trunk/Makefile
csw/mgar/pkg/wiggle/trunk/checksums
csw/mgar/pkg/wiggle/trunk/files/
csw/mgar/pkg/wiggle/trunk/files/0001-remove-gcc-options.patch
csw/mgar/pkg/wiggle/trunk/files/0002-fix-for-building-with-solstudio.patch
csw/mgar/pkg/wiggle/trunk/files/0003-fix-installation-target.patch
csw/mgar/pkg/wiggle/trunk/files/0004-skip-time-in-test-script.patch
Added: csw/mgar/pkg/wiggle/Makefile
===================================================================
--- csw/mgar/pkg/wiggle/Makefile (rev 0)
+++ csw/mgar/pkg/wiggle/Makefile 2011-08-10 15:49:18 UTC (rev 15302)
@@ -0,0 +1,2 @@
+%:
+ $(MAKE) -C trunk $*
Property changes on: csw/mgar/pkg/wiggle/Makefile
___________________________________________________________________
Added: svn:keywords
+ URL Id
Property changes on: csw/mgar/pkg/wiggle/trunk
___________________________________________________________________
Added: svn:ignore
+ cookies
download
work
Added: svn:externals
+ gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2
Added: csw/mgar/pkg/wiggle/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wiggle/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/wiggle/trunk/Makefile 2011-08-10 15:49:18 UTC (rev 15302)
@@ -0,0 +1,33 @@
+NAME = wiggle
+VERSION = 0.8
+GARTYPE = v2
+CATEGORIES = utils
+
+DESCRIPTION = Apply conflicting patches
+define BLURB
+ Wiggle is a program for applying patches that 'patch' cannot apply due
+ to conflicting changes in the original.
+
+ Wiggle will always apply all changes in the patch to the original. If
+ it cannot find a way to cleanly apply a patch, it inserts it in the
+ original in a manner similar to 'merge', and reports an unresolvable
+ conflict.
+endef
+
+BUILD_DEP_PKGS += CSWlibncurses-dev
+RUNTIME_DEP_PKGS += CSWlibncursesw5
+
+MASTER_SITES = http://neil.brown.name/wiggle/
+DISTFILES = $(DISTNAME).tar.gz
+
+CONFIGURE_SCRIPTS =
+PATCHFILES += 0001-remove-gcc-options.patch \
+ 0002-fix-for-building-with-solstudio.patch \
+ 0003-fix-installation-target.patch \
+ 0004-skip-time-in-test-script.patch
+BUILD_ARGS = wiggle wiggle.man
+TEST_TARGET = test
+
+include gar/category.mk
+
+CPPFLAGS := -I$(includedir)/ncursesw $(CPPFLAGS)
Property changes on: csw/mgar/pkg/wiggle/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
+ Id
Added: csw/mgar/pkg/wiggle/trunk/checksums
===================================================================
--- csw/mgar/pkg/wiggle/trunk/checksums (rev 0)
+++ csw/mgar/pkg/wiggle/trunk/checksums 2011-08-10 15:49:18 UTC (rev 15302)
@@ -0,0 +1 @@
+17aae004f63791faa4ff1d0e7639131d wiggle-0.8.tar.gz
Added: csw/mgar/pkg/wiggle/trunk/files/0001-remove-gcc-options.patch
===================================================================
--- csw/mgar/pkg/wiggle/trunk/files/0001-remove-gcc-options.patch (rev 0)
+++ csw/mgar/pkg/wiggle/trunk/files/0001-remove-gcc-options.patch 2011-08-10 15:49:18 UTC (rev 15302)
@@ -0,0 +1,25 @@
+From 5a542bbaf284fa51c2c8f9a5f1e22cc2a0dccc8e Mon Sep 17 00:00:00 2001
+From: Oliver Kiddle <oliver.kiddle at esa.int>
+Date: Wed, 10 Aug 2011 16:07:03 +0200
+Subject: [PATCH] remove gcc options
+
+---
+ Makefile | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 6725969..27924e0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,7 +3,7 @@
+ #OptDbg=-O3
+ #OptDbg=-O3 -march=pentium2
+ OptDbg=-ggdb
+-CFLAGS=$(OptDbg) -Wall -Werror
++#CFLAGS=$(OptDbg) -Wall -Werror
+
+ # STRIP = -s
+ INSTALL = /usr/bin/install
+--
+1.7.6
+
Added: csw/mgar/pkg/wiggle/trunk/files/0002-fix-for-building-with-solstudio.patch
===================================================================
--- csw/mgar/pkg/wiggle/trunk/files/0002-fix-for-building-with-solstudio.patch (rev 0)
+++ csw/mgar/pkg/wiggle/trunk/files/0002-fix-for-building-with-solstudio.patch 2011-08-10 15:49:18 UTC (rev 15302)
@@ -0,0 +1,25 @@
+From bbbc93dee71c5f051d2ae80b38833cd67301026c Mon Sep 17 00:00:00 2001
+From: Oliver Kiddle <oliver.kiddle at esa.int>
+Date: Wed, 10 Aug 2011 16:16:59 +0200
+Subject: [PATCH] fix for building with solstudio
+
+---
+ merge2.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/merge2.c b/merge2.c
+index 9c605ea..7f76e56 100644
+--- a/merge2.c
++++ b/merge2.c
+@@ -79,7 +79,7 @@ int check_alreadyapplied(struct file af, struct file cf,
+ return 1;
+ }
+
+-inline int isolate_conflicts(struct file af, struct file bf, struct file cf,
++static inline int isolate_conflicts(struct file af, struct file bf, struct file cf,
+ struct csl *csl1, struct csl *csl2, int words,
+ struct merge *m)
+ {
+--
+1.7.6
+
Added: csw/mgar/pkg/wiggle/trunk/files/0003-fix-installation-target.patch
===================================================================
--- csw/mgar/pkg/wiggle/trunk/files/0003-fix-installation-target.patch (rev 0)
+++ csw/mgar/pkg/wiggle/trunk/files/0003-fix-installation-target.patch 2011-08-10 15:49:18 UTC (rev 15302)
@@ -0,0 +1,25 @@
+From 9fe352174a969508d92d53582d6cd629bf3f09b2 Mon Sep 17 00:00:00 2001
+From: Oliver Kiddle <oliver.kiddle at esa.int>
+Date: Wed, 10 Aug 2011 16:55:06 +0200
+Subject: [PATCH] fix installation target
+
+---
+ Makefile | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 27924e0..59482a6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,7 +6,7 @@ OptDbg=-ggdb
+ #CFLAGS=$(OptDbg) -Wall -Werror
+
+ # STRIP = -s
+-INSTALL = /usr/bin/install
++INSTALL = ginstall
+ DESTDIR =
+ BINDIR = /usr/bin
+ MANDIR = /usr/share/man
+--
+1.7.6
+
Added: csw/mgar/pkg/wiggle/trunk/files/0004-skip-time-in-test-script.patch
===================================================================
--- csw/mgar/pkg/wiggle/trunk/files/0004-skip-time-in-test-script.patch (rev 0)
+++ csw/mgar/pkg/wiggle/trunk/files/0004-skip-time-in-test-script.patch 2011-08-10 15:49:18 UTC (rev 15302)
@@ -0,0 +1,88 @@
+From 10c8836418770cfe25d2cf7a2bf76cffaa98a11a Mon Sep 17 00:00:00 2001
+From: Oliver Kiddle <oliver.kiddle at esa.int>
+Date: Wed, 10 Aug 2011 17:41:08 +0200
+Subject: [PATCH] skip time in test script
+
+---
+ Makefile | 2 +-
+ dotest | 30 +++++++++++++++---------------
+ 2 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 59482a6..dc3335a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -22,7 +22,7 @@ wiggle.o load.o split.o extract.o diff.o bestmatch.o ReadMe.o merge.o \
+ merge2.o vpatch.o : wiggle.h
+
+ test: wiggle dotest
+- sh dotest
++ bash dotest
+
+ wiggle.man : wiggle.1
+ nroff -man wiggle.1 > wiggle.man
+diff --git a/dotest b/dotest
+index 6d3a27e..0e1b0a0 100755
+--- a/dotest
++++ b/dotest
+@@ -34,42 +34,42 @@ do
+ case $base in
+ script ) ./script ;;
+ diff ) if [ -f new ]
+- then /usr/bin/time -o .time -f '%U' $WIGGLE -dw orig new | diff -u diff - ; xit=$?
+- else /usr/bin/time -o .time -f '%U' $WIGGLE -dwp1 orig patch | diff -u diff - ; xit=$?
++ then $WIGGLE -dw orig new | diff -u diff - ; xit=$?
++ else $WIGGLE -dwp1 orig patch | diff -u diff - ; xit=$?
+ fi
+ ;;
+ ldiff ) if [ -f new ]
+- then /usr/bin/time -o .time -f '%U' $WIGGLE -dl orig new | diff -u ldiff - ; xit=$?
+- else /usr/bin/time -o .time -f '%U' $WIGGLE -dlp1 orig patch | diff -u ldiff - ; xit=$?
++ then $WIGGLE -dl orig new | diff -u ldiff - ; xit=$?
++ else $WIGGLE -dlp1 orig patch | diff -u ldiff - ; xit=$?
+ fi
+ ;;
+- reldiff ) /usr/bin/time -o .time -f '%U' $WIGGLE -dl patch | diff -u reldiff - ; xit=$?
++ reldiff ) $WIGGLE -dl patch | diff -u reldiff - ; xit=$?
+ ;;
+- rediff ) /usr/bin/time -o .time -f '%U' $WIGGLE -dw patch | diff -u rediff - ; xit=$?
++ rediff ) $WIGGLE -dw patch | diff -u rediff - ; xit=$?
+ ;;
+ merge ) if [ -f patch ]
+- then /usr/bin/time -o .time -f '%U' $WIGGLE -m orig patch | diff -u merge - ; xit=$?
++ then $WIGGLE -m orig patch | diff -u merge - ; xit=$?
+ elif [ -f new ]
+- then /usr/bin/time -o .time -f '%U' $WIGGLE -m orig new new2 | diff -u merge - ; xit=$?
+- else /usr/bin/time -o .time -f '%U' $WIGGLE -m orig | diff -u merge - ; xit=$?
++ then $WIGGLE -m orig new new2 | diff -u merge - ; xit=$?
++ else $WIGGLE -m orig | diff -u merge - ; xit=$?
+ fi
+ ;;
+ replace ) cp orig orig.tmp
+ if [ -f patch ]
+- then /usr/bin/time -o .time -f '%U' $WIGGLE -mr orig.tmp patch
+- else /usr/bin/time -o .time -f '%U' $WIGGLE -mr orig.tmp new new2
++ then $WIGGLE -mr orig.tmp patch
++ else $WIGGLE -mr orig.tmp new new2
+ fi
+ diff -u merge orig.tmp ; xit=$?
+ rm orig.tmp orig.tmp.porig
+ ;;
+ lmerge ) if [ -f patch ]
+- then /usr/bin/time -o .time -f '%U' $WIGGLE -ml orig patch | diff -u lmerge - ; xit=$?
+- else /usr/bin/time -o .time -f '%U' $WIGGLE -ml orig new new2 | diff -u lmerge - ; xit=$?
++ then $WIGGLE -ml orig patch | diff -u lmerge - ; xit=$?
++ else $WIGGLE -ml orig new new2 | diff -u lmerge - ; xit=$?
+ fi
+ ;;
+ wmerge ) if [ -f patch ]
+- then /usr/bin/time -o .time -f '%U' $WIGGLE -mw orig patch | diff -u wmerge - ; xit=$?
+- else /usr/bin/time -o .time -f '%U' $WIGGLE -mw orig new new2 | diff -u wmerge - ; xit=$?
++ then $WIGGLE -mw orig patch | diff -u wmerge - ; xit=$?
++ else $WIGGLE -mw orig new new2 | diff -u wmerge - ; xit=$?
+ fi
+ ;;
+ esac
+--
+1.7.6
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list