diff options
| -rw-r--r-- | app-text/csvfix/ChangeLog | 10 | ||||
| -rw-r--r-- | app-text/csvfix/csvfix-1.3.ebuild | 44 | ||||
| -rw-r--r-- | app-text/csvfix/files/csvfix-1.3-make.patch | 61 |
3 files changed, 113 insertions, 2 deletions
diff --git a/app-text/csvfix/ChangeLog b/app-text/csvfix/ChangeLog index 6356cd602dc3..b5e799e95ded 100644 --- a/app-text/csvfix/ChangeLog +++ b/app-text/csvfix/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-text/csvfix -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/csvfix/ChangeLog,v 1.5 2011/12/14 03:56:06 radhermit Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/csvfix/ChangeLog,v 1.6 2012/05/31 18:25:41 radhermit Exp $ + +*csvfix-1.3 (31 May 2012) + + 31 May 2012; Tim Harder <radhermit@gentoo.org> +csvfix-1.3.ebuild, + +files/csvfix-1.3-make.patch: + Version bump. *csvfix-1.20 (14 Dec 2011) diff --git a/app-text/csvfix/csvfix-1.3.ebuild b/app-text/csvfix/csvfix-1.3.ebuild new file mode 100644 index 000000000000..49c46e49afc5 --- /dev/null +++ b/app-text/csvfix/csvfix-1.3.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/csvfix/csvfix-1.3.ebuild,v 1.1 2012/05/31 18:25:41 radhermit Exp $ + +EAPI="4" + +inherit eutils toolchain-funcs versionator + +MY_PV="$(delete_all_version_separators)" +DESCRIPTION="A stream editor for manipulating CSV files" +HOMEPAGE="http://code.google.com/p/csvfix/" +SRC_URI="http://dev.gentoo.org/~radhermit/dist/${P}.tar.bz2 + doc? ( http://csvfix.googlecode.com/files/CSVfix_man_html_${MY_PV}0.zip )" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc" + +RDEPEND="dev-libs/expat" +DEPEND="${RDEPEND} + doc? ( app-arch/unzip )" + +src_prepare() { + epatch "${FILESDIR}"/${P}-make.patch + epatch "${FILESDIR}"/${PN}-1.10a-tests.patch + + edos2unix $(find csvfix/tests -type f) +} + +src_compile() { + emake CC="$(tc-getCXX)" AR="$(tc-getAR)" lin +} + +src_test() { + cd ${PN}/tests + chmod +x run1 runtests + ./runtests || die "tests failed" +} + +src_install() { + dobin csvfix/bin/csvfix + use doc && dohtml -r "${WORKDIR}"/${PN}${MY_PV}/* +} diff --git a/app-text/csvfix/files/csvfix-1.3-make.patch b/app-text/csvfix/files/csvfix-1.3-make.patch new file mode 100644 index 000000000000..33ea0732107d --- /dev/null +++ b/app-text/csvfix/files/csvfix-1.3-make.patch @@ -0,0 +1,61 @@ +--- csvfix-1.3/alib/Makefile ++++ csvfix-1.3/alib/Makefile +@@ -2,12 +2,12 @@ + # Copyright (C) 2009 Neil Butterworth
+
+ OUT = lib/alib.a
++AR = ar
+ 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 +21,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 +28,10 @@ + $(CC) -c $(INC) $(CFLAGS) -o $@ $<
+
+ win: $(OBJS) $(EXPAT) $(WINOBJS)
+- ar rvs $(OUT) $^
++ $(AR) rvs $(OUT) $^
+
+ lin: $(OBJS) $(EXPAT)
+- ar rvs $(OUT) $^
++ $(AR) rvs $(OUT) $^
+
+ .PHONY: clean
+ clean:
+--- csvfix-1.3/csvfix/Makefile ++++ csvfix-1.3/csvfix/Makefile +@@ -18,7 +18,7 @@ +
+ ALIB = ../alib/lib/alib.a
+ WINLIBS = ../alib/lib/alib.a -lodbc32
+-LINLIBS = ../alib/lib/alib.a
++LINLIBS = ../alib/lib/alib.a -lexpat
+
+ _OBJS = csved_atable.o \
+ csved_block.o \
+@@ -89,8 +89,7 @@ + strip $(WINOUT)
+
+ $(LINOUT): $(OBJS) $(ALIB)
+- $(CC) -o $@ $^ $(LINLIBS)
+- strip $(LINOUT)
++ $(CC) $(LDFLAGS) -o $@ $^ $(LINLIBS)
+
+ .PHONY: win
+ win:
|