pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
csvutils and libcsv were imported to pkgsrc, so, removed from WIP
Module Name: pkgsrc-wip
Committed By: Aleksey Cheusov <vle%gmx.net@localhost>
Pushed By: cheusov
Date: Thu Jul 21 02:22:09 2016 +0300
Changeset: 71d3ee64192a0c53f1d393afbe3b191329cf7b3c
Removed Files:
csvutils/DESCR
csvutils/Makefile
csvutils/PLIST
csvutils/distinfo
csvutils/patches/patch-Makefile
csvutils/patches/patch-src_csvgrep.c
libcsv/DESCR
libcsv/Makefile
libcsv/PLIST
libcsv/buildlink3.mk
libcsv/distinfo
Log Message:
csvutils and libcsv were imported to pkgsrc, so, removed from WIP
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=71d3ee64192a0c53f1d393afbe3b191329cf7b3c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
csvutils/DESCR | 1 -
csvutils/Makefile | 30 --------------
csvutils/PLIST | 14 -------
csvutils/distinfo | 7 ----
csvutils/patches/patch-Makefile | 76 ------------------------------------
csvutils/patches/patch-src_csvgrep.c | 15 -------
libcsv/DESCR | 4 --
libcsv/Makefile | 17 --------
libcsv/PLIST | 4 --
libcsv/buildlink3.mk | 12 ------
libcsv/distinfo | 5 ---
11 files changed, 185 deletions(-)
diffs:
diff --git a/csvutils/DESCR b/csvutils/DESCR
deleted file mode 100644
index 469be98..0000000
--- a/csvutils/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-A set of command-line utilities for managing CSV data using the libcsv library.
diff --git a/csvutils/Makefile b/csvutils/Makefile
deleted file mode 100644
index 272fa88..0000000
--- a/csvutils/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2015/03/29 16:28:02 leot1990 Exp $
-
-DISTNAME= csvutils-0.9.3
-CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=csvutils/}
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= leot%NetBSD.org@localhost
-HOMEPAGE= http://csvutils.sourceforge.net/
-COMMENT= Command-line utilities for managing CSV data using libcsv
-LICENSE= gnu-gpl-v2
-
-CONFLICTS= csvkit-[0-9]*
-
-USE_TOOLS+= gmake gunzip
-
-MAKE_ENV+= INCLUDES="-I${PREFIX}/include" PREFIX="${PREFIX}" MANDIR="${PKGMANDIR}"
-MAKE_ENV+= LDFLAGS="-R,-L${PREFIX}/lib"
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-pre-install:
- set -e ; \
- for f in ${WRKSRC}/*.gz; do \
- gunzip "$${f}" ; \
- done
-
-.include "../../devel/pcre/buildlink3.mk"
-.include "../../wip/libcsv/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/csvutils/PLIST b/csvutils/PLIST
deleted file mode 100644
index 0fcb68c..0000000
--- a/csvutils/PLIST
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2015/03/29 13:45:31 leot1990 Exp $
-bin/csvbreak
-bin/csvcheck
-bin/csvcount
-bin/csvcut
-bin/csvfix
-bin/csvgrep
-man/man1/csvbreak.1
-man/man1/csvcheck.1
-man/man1/csvcount.1
-man/man1/csvcut.1
-man/man1/csvfix.1
-man/man1/csvgrep.1
-man/man1/csvutils.1
diff --git a/csvutils/distinfo b/csvutils/distinfo
deleted file mode 100644
index 538a47a..0000000
--- a/csvutils/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.1 2015/03/29 13:45:31 leot1990 Exp $
-
-SHA1 (csvutils-0.9.3.tgz) = 0153f39f899c85cdf276316ebadfa4b2b537c7b3
-RMD160 (csvutils-0.9.3.tgz) = 0805b32ac3df05a399bdf0028114985afd3118d7
-Size (csvutils-0.9.3.tgz) = 47046 bytes
-SHA1 (patch-Makefile) = fa6490dc31fa4b55898f0c1ec24a933192fc2a31
-SHA1 (patch-src_csvgrep.c) = 402b7eaea8c4db04ba76e86ecc65e66e397c4427
diff --git a/csvutils/patches/patch-Makefile b/csvutils/patches/patch-Makefile
deleted file mode 100644
index 2417c26..0000000
--- a/csvutils/patches/patch-Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2015/03/29 13:45:31 leot1990 Exp $
-
-o Do not force various variables and do not ignore user's CFLAGS and LDFLAGS.
-o Properly use DESTDIR, PREFIX and MANDIR.
-o Convert INCLUDES to INCS, add LIBS and also honor other include.
-
---- Makefile.orig 2008-07-26 23:09:18.000000000 +0000
-+++ Makefile
-@@ -1,9 +1,13 @@
--CC=gcc
--CFLAGS=-Wall -ansi
--DESTDIR=/usr/local/bin
--MANDIR=/usr/share/man/man1
--INCLUDES=-I include
--CPPFLAGS=
-+CC?=gcc
-+
-+PREFIX?=/usr/local
-+MANDIR?=man
-+
-+INCS = -I ./include -I ${PREFIX}/include
-+LIBS = -L ${PREFIX}/lib
-+
-+CFLAGS += -Wall -ansi ${INCS}
-+LDFLAGS += ${LIBS}
-
- VPATH=src
-
-@@ -15,35 +19,35 @@ csvcut csvgrep csvcount csvcheck csvfix
- csvcut csvgrep csvcount csvcheck csvfix csvbreak: helper.o
-
- csvcut: csvcut.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $^ -o $@ -lcsv
-+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lcsv
-
- csvgrep: csvgrep.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $^ -o $@ -lcsv -lpcre
-+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lcsv -lpcre
-
- csvcount: csvcount.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $^ -o $@ -lcsv
-+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lcsv
-
- csvcheck: csvcheck.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $^ -o $@ -lcsv
-+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lcsv
-
- csvfix: csvfix.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $^ -o $@ -lcsv
-+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lcsv
-
- csvbreak: csvbreak.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $^ -o $@ -lcsv
-+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lcsv
-
- version.o: version.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -c $<
-+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c $<
-
- helper.o: helper.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -c $<
-+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c $<
-
- install_utils: csvcut csvgrep csvcount csvcheck csvfix csvbreak
-- cp -f $^ $(DESTDIR)
-+ cp -f $^ $(DESTDIR)$(PREFIX)/bin
-
--install_man: csvutils.1.gz csvcut.1.gz csvgrep.1.gz csvcount.1.gz \
-- csvcheck.1.gz csvfix.1.gz csvbreak.1.gz
-- cp -f $^ $(MANDIR)
-+install_man: csvutils.1 csvcut.1 csvgrep.1 csvcount.1 \
-+ csvcheck.1 csvfix.1 csvbreak.1
-+ cp -f $^ $(DESTDIR)$(PREFIX)/$(MANDIR)/man1
-
- clean:
- rm *.o csvcut csvgrep csvcount csvcheck csvfix csvbreak
diff --git a/csvutils/patches/patch-src_csvgrep.c b/csvutils/patches/patch-src_csvgrep.c
deleted file mode 100644
index c3e53ef..0000000
--- a/csvutils/patches/patch-src_csvgrep.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Properly use toupper(3).
-
---- src/csvgrep.c.orig 2008-07-27 17:45:20.000000000 +0000
-+++ src/csvgrep.c
-@@ -778,7 +778,7 @@ main (int argc, char *argv[])
- /* Upcase string for case insensitive fixed match*/
- char *ptr = pattern;
- while (*ptr)
-- *ptr = toupper(*ptr), ptr++;
-+ *ptr = toupper((unsigned char)*ptr), ptr++;
- }
- } else if (match_type == PCRE) {
- #ifdef WITHOUT_PCRE
diff --git a/libcsv/DESCR b/libcsv/DESCR
deleted file mode 100644
index b0e0d8b..0000000
--- a/libcsv/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-libcsv is a small, simple and fast CSV library written in pure ANSI C89
-that can read and write CSV data. It provides a straight-forward interface
-using callback functions to handle parsed fields and rows and can parse
-improperly formatted CSV files.
diff --git a/libcsv/Makefile b/libcsv/Makefile
deleted file mode 100644
index fba89be..0000000
--- a/libcsv/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2015/03/29 13:44:15 leot1990 Exp $
-
-DISTNAME= libcsv-3.0.3
-CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libcsv/}
-
-MAINTAINER= leot%NetBSD.org@localhost
-HOMEPAGE= http://libcsv.sourceforge.net/
-COMMENT= CSV library written in pure ANSI C89
-LICENSE= gnu-gpl-v2 OR gnu-lgpl-v2
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-
-CONFIGURE_ARGS+= --includedir=${PREFIX}/include/libcsv
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/libcsv/PLIST b/libcsv/PLIST
deleted file mode 100644
index dab4216..0000000
--- a/libcsv/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2015/03/29 13:44:15 leot1990 Exp $
-include/libcsv/csv.h
-lib/libcsv.la
-man/man3/csv.3
diff --git a/libcsv/buildlink3.mk b/libcsv/buildlink3.mk
deleted file mode 100644
index e313ed2..0000000
--- a/libcsv/buildlink3.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/03/29 13:44:15 leot1990 Exp $
-
-BUILDLINK_TREE+= libcsv
-
-.if !defined(LIBCSV_BUILDLINK3_MK)
-LIBCSV_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.libcsv+= libcsv>=3.0.3
-BUILDLINK_PKGSRCDIR.libcsv?= ../../wip/libcsv
-.endif # LIBCSV_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -libcsv
diff --git a/libcsv/distinfo b/libcsv/distinfo
deleted file mode 100644
index cdeafdd..0000000
--- a/libcsv/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1 2015/03/29 13:44:15 leot1990 Exp $
-
-SHA1 (libcsv-3.0.3.tar.gz) = 2f637343c3dfac80559595f519e8f78f25acc7c1
-RMD160 (libcsv-3.0.3.tar.gz) = 8cf16e810924dd0f41b0444cf2a02d5e6da2ab21
-Size (libcsv-3.0.3.tar.gz) = 331491 bytes
Home |
Main Index |
Thread Index |
Old Index