summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2012-05-31 18:27:13 +0000
committerTim Harder <radhermit@gentoo.org>2012-05-31 18:27:13 +0000
commit2a91ac947120cc08a36f8113339254611074677c (patch)
treec161eb4910b8fcaee27619b00588ba1b4c3b8ccd /app-text/csvfix/files
parentVersion bump. (diff)
downloadhistorical-2a91ac947120cc08a36f8113339254611074677c.tar.gz
historical-2a91ac947120cc08a36f8113339254611074677c.tar.bz2
historical-2a91ac947120cc08a36f8113339254611074677c.zip
Remove old.
Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64
Diffstat (limited to 'app-text/csvfix/files')
-rw-r--r--app-text/csvfix/files/csvfix-1.00c-make.patch91
-rw-r--r--app-text/csvfix/files/csvfix-1.10a-escape-exec.patch13
-rw-r--r--app-text/csvfix/files/csvfix-1.20-make.patch91
3 files changed, 0 insertions, 195 deletions
diff --git a/app-text/csvfix/files/csvfix-1.00c-make.patch b/app-text/csvfix/files/csvfix-1.00c-make.patch
deleted file mode 100644
index 37c768f4b536..000000000000
--- a/app-text/csvfix/files/csvfix-1.00c-make.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- csvfix-build.orig/alib/Makefile
-+++ csvfix-build/alib/Makefile
-@@ -5,9 +5,8 @@
- CC = g++
- IDIR = inc
- ODIR = obj
--XDIR = expat
- SDIR = src
--INC = -Iinc -Iexpat
-+INC = -Iinc
-
- _OBJS = a_chsrc.o a_csv.o a_enc.o a_env.o a_except.o \
- a_expr.o a_myth.o a_inifile.o a_exec.o \
-@@ -21,9 +20,6 @@
- _WINOBJS = a_db.o a_dir.o a_opsys.o a_winerr.o
- WINOBJS = $(patsubst %,$(ODIR)/%,$(_WINOBJS))
-
--_EXPAT = xmlparse.o xmlrole.o xmltok.o xmltok_impl.o xmltok_ns.o
--EXPAT = $(patsubst %,$(ODIR)/%,$(_EXPAT))
--
- $(ODIR)/%.o: $(SDIR)/%.cpp $(IDIR)/%.h
- $(CC) -c $(INC) $(CFLAGS) -o $@ $<
-
-@@ -31,10 +27,10 @@
- $(CC) -c $(INC) $(CFLAGS) -o $@ $<
-
- win: $(OBJS) $(EXPAT) $(WINOBJS)
-- ar rvs $(OUT) $^
-+ $(AR) rvs $(OUT) $^
-
--lin: $(OBJS) $(EXPAT)
-- ar rvs $(OUT) $^
-+lin: $(OBJS)
-+ $(AR) rvs $(OUT) $^
-
- .PHONY: clean
-
---- csvfix-build.orig/csvfix/Makefile
-+++ csvfix-build/csvfix/Makefile
-@@ -17,7 +17,7 @@
- INC = -Iinc -I../alib/inc
-
- WINLIBS = ../alib/lib/alib.a -lodbc32
--LINLIBS = ../alib/lib/alib.a
-+LINLIBS = ../alib/lib/alib.a -lexpat
-
- _OBJS = csved_atable.o \
- csved_case.o \
-@@ -81,16 +81,15 @@
- strip $(WINOUT)
-
- $(LINOUT): $(OBJS)
-- $(CC) -o $@ $^ $(LINLIBS)
-- strip $(LINOUT)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LINLIBS)
-
- .PHONY: win
- win:
-- make $(WINOUT)
-+ $(MAKE) $(WINOUT)
-
- .PHONY: lin
- lin:
-- make $(LINOUT)
-+ $(MAKE) $(LINOUT)
-
- .PHONY: clean
- clean:
---- csvfix-build.orig/Makefile
-+++ csvfix-build/Makefile
-@@ -3,14 +3,14 @@
-
- win:
- mkdir -p alib/{obj,lib} csvfix/{obj,bin}
-- cd alib; make win
-- cd csvfix; make win
-+ cd alib; $(MAKE) win
-+ cd csvfix; $(MAKE) win
-
- lin:
- mkdir -p alib/{obj,lib} csvfix/{obj,bin}
-- cd alib; make lin
-- cd csvfix; make lin
-+ cd alib; $(MAKE) lin
-+ cd csvfix; $(MAKE) lin
-
- clean:
-- cd alib; make clean
-- cd csvfix; make clean
-+ cd alib; $(MAKE) clean
-+ cd csvfix; $(MAKE) clean
diff --git a/app-text/csvfix/files/csvfix-1.10a-escape-exec.patch b/app-text/csvfix/files/csvfix-1.10a-escape-exec.patch
deleted file mode 100644
index fe349f139086..000000000000
--- a/app-text/csvfix/files/csvfix-1.10a-escape-exec.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- csvfix-build/csvfix/src/csved_exec.cpp.orig
-+++ csvfix-build/csvfix/src/csved_exec.cpp
-@@ -144,7 +144,9 @@
- if ( n < 0 || n > MAX_PARAM ) {
- CSVTHROW( "Invalid parameter: %" << p );
- }
-- return (unsigned int) n < row.size() ? row[n] : "";
-+ return (unsigned int) n < row.size()
-+ ? ALib::Escape( row[n], "\\'\"", "\\" )
-+ : "";
- }
- else {
- ATHROW( "Invalid parameter" );
diff --git a/app-text/csvfix/files/csvfix-1.20-make.patch b/app-text/csvfix/files/csvfix-1.20-make.patch
deleted file mode 100644
index 7610bf8919fd..000000000000
--- a/app-text/csvfix/files/csvfix-1.20-make.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- csvfix-build.orig/alib/Makefile
-+++ csvfix-build/alib/Makefile
-@@ -5,9 +5,8 @@
- CC = g++
- IDIR = inc
- ODIR = obj
--XDIR = expat
- SDIR = src
--INC = -Iinc -Iexpat
-+INC = -Iinc
-
- _OBJS = a_chsrc.o a_csv.o a_enc.o a_env.o a_except.o \
- a_expr.o a_myth.o a_inifile.o a_exec.o \
-@@ -21,9 +20,6 @@
- _WINOBJS = a_db.o a_dir.o a_opsys.o a_winerr.o
- WINOBJS = $(patsubst %,$(ODIR)/%,$(_WINOBJS))
-
--_EXPAT = xmlparse.o xmlrole.o xmltok.o xmltok_impl.o xmltok_ns.o
--EXPAT = $(patsubst %,$(ODIR)/%,$(_EXPAT))
--
- $(ODIR)/%.o: $(SDIR)/%.cpp $(IDIR)/%.h
- $(CC) -c $(INC) $(CFLAGS) -o $@ $<
-
-@@ -31,10 +27,10 @@
- $(CC) -c $(INC) $(CFLAGS) -o $@ $<
-
- win: $(OBJS) $(EXPAT) $(WINOBJS)
-- ar rvs $(OUT) $^
-+ $(AR) rvs $(OUT) $^
-
--lin: $(OBJS) $(EXPAT)
-- ar rvs $(OUT) $^
-+lin: $(OBJS)
-+ $(AR) rvs $(OUT) $^
-
- .PHONY: clean
-
---- csvfix-build.orig/csvfix/Makefile
-+++ csvfix-build/csvfix/Makefile
-@@ -17,7 +17,7 @@
- INC = -Iinc -I../alib/inc
-
- WINLIBS = ../alib/lib/alib.a -lodbc32
--LINLIBS = ../alib/lib/alib.a
-+LINLIBS = ../alib/lib/alib.a -lexpat
-
- _OBJS = csved_atable.o \
- csved_case.o \
-@@ -86,16 +86,15 @@
- strip $(WINOUT)
-
- $(LINOUT): $(OBJS)
-- $(CC) -o $@ $^ $(LINLIBS)
-- strip $(LINOUT)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LINLIBS)
-
- .PHONY: win
- win:
-- make $(WINOUT)
-+ $(MAKE) $(WINOUT)
-
- .PHONY: lin
- lin:
-- make $(LINOUT)
-+ $(MAKE) $(LINOUT)
-
- .PHONY: clean
- clean:
---- csvfix-build.orig/Makefile
-+++ csvfix-build/Makefile
-@@ -3,14 +3,14 @@
-
- win:
- mkdir -p alib/obj alib/lib csvfix/obj csvfix/bin
-- cd alib; make win
-- cd csvfix; make win
-+ cd alib; $(MAKE) win
-+ cd csvfix; $(MAKE) win
-
- lin:
- mkdir -p alib/obj alib/lib csvfix/obj csvfix/bin
-- cd alib; make lin
-- cd csvfix; make lin
-+ cd alib; $(MAKE) lin
-+ cd csvfix; $(MAKE) lin
-
- clean:
-- cd alib; make clean
-- cd csvfix; make clean
-+ cd alib; $(MAKE) clean
-+ cd csvfix; $(MAKE) clean