From a5b07f43ef84ac3dda25caff8f39899c04eefb31 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Tue, 27 Jul 2010 16:19:36 +0200 Subject: [PATCH] libcsv: Updated (0.9.0 -> 3.0.0) and removed obsolete patches and conf file (see note) Note: The Makefile Alejandro provided to the upstream developers was included, so we do not need to patch it in! ;) --- textproc/libcsv/libcsv.conf | 15 ---------- textproc/libcsv/libcsv.desc | 6 ++-- textproc/libcsv/makefile.patch | 54 ---------------------------------- 3 files changed, 3 insertions(+), 72 deletions(-) delete mode 100644 textproc/libcsv/libcsv.conf delete mode 100644 textproc/libcsv/makefile.patch diff --git a/textproc/libcsv/libcsv.conf b/textproc/libcsv/libcsv.conf deleted file mode 100644 index 6eeb93b7a..000000000 --- a/textproc/libcsv/libcsv.conf +++ /dev/null @@ -1,15 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../libcsv/libcsv.conf -# Copyright (C) 2006 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. A copy of the -# GNU General Public License can be found in the file COPYING. -# --- SDE-COPYRIGHT-NOTE-END --- - -var_append makeinstopt ' ' "LIBDIR=$libdir" diff --git a/textproc/libcsv/libcsv.desc b/textproc/libcsv/libcsv.desc index 7f1f3b4ab..9d2947885 100644 --- a/textproc/libcsv/libcsv.desc +++ b/textproc/libcsv/libcsv.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../libcsv/libcsv.desc -[COPY] Copyright (C) 2006 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project [COPY] [COPY] More information can be found in the files COPYING and README. [COPY] @@ -28,8 +28,8 @@ [L] LGPL [S] Beta -[V] 0.9.0 +[V] 3.0.0 [P] X -----5---9 800.000 -[D] 2763314713 libcsv-0.9.0.tar.gz http://dl.sourceforge.net/sourceforge/libcsv/ +[D] 553364192 libcsv-3.0.0.tar.gz http://dl.sourceforge.net/sourceforge/libcsv/ diff --git a/textproc/libcsv/makefile.patch b/textproc/libcsv/makefile.patch deleted file mode 100644 index 59d1faaf7..000000000 --- a/textproc/libcsv/makefile.patch +++ /dev/null @@ -1,54 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../libcsv/makefile.patch -# Copyright (C) 2006 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- /dev/null 1970-01-01 01:00:00.000000000 +0100 -+++ ./Makefile 2006-10-18 18:32:18.000000000 +0200 -@@ -0,0 +1,35 @@ -+CC=gcc -+AR=ar -+ -+DESTDIR= -+LIBDIR=/usr/lib -+INCDIR=/usr/include -+ -+.PHONY: all install install_headers install_shared install_static -+ -+all: libcsv.so libcsv.a -+ -+install: install_headers install_shared install_static -+ -+install_headers: csv.h -+ mkdir -p $(DESTDIR)$(INCDIR)/libcsv/ -+ cp -f $^ $(DESTDIR)$(INCDIR)/libcsv/ -+ -+install_shared: libcsv.so -+ cp -f $< $(DESTDIR)$(LIBDIR)/$<.0.9.0 -+ ln -sf $<.0.9.0 $(DESTDIR)$(LIBDIR)/$<.0 -+ ln -sf $<.0 $(DESTDIR)$(LIBDIR)/$< -+ -+install_static: libcsv.a -+ cp -f $< $(DESTDIR)$(LIBDIR)/$< -+ -+libcsv.o: libcsv.c csv.h -+ $(CC) $< -c -o $@ -+ -+libcsv.so: libcsv.o -+ $(CC) -shared $< -o $@ -+ -+libcsv.a: libcsv.o -+ $(AR) -rc $@ $^ -+ $(AR) -s $@ -+