Update to 0.8.1.
Install documentation into share/doc/dbf instead of share/dbf. 0.8.1 STABLE 2003-20-10 (Release-Date) - fixed CSV converting, data sets are now converted properly - using '-' as a filename means stdout - fixed csv output. separator char within a field value are now treated propperly (Uwe) - Do not put the separator char after the last field in csv output (Uwe) - Add field type, size and decimals to field name in first line of csv output (Uwe) 0.8 STABLE 2003-11-09 (Release-Date) - Changed the options parsing system and the options id, so that options with a single hyphen can also be used and displayed in the help. - Inserted a fail safe routine which checks that the original file will never be overwritten if the options filename is missing - Tab-separated files without quoted text-passages can be created by using 't' as separator. - Fix for date strings in SQL: According the PostgreSQL manual, SQL (ANSI) requires date strings to be quoted, ie. '20031029' send in by Tommi Rintala, t2r@wasalab.com - Can differentiate between dBASE, FoxPro, FoxBase and Clipper - --view-info reports the database type and version number - supports datatypes int, float, double and logical in SQL and CSV - introduced cast operations for CSV and SQL export - differentiates between deleted and existent data sets 0.7 STABLE 2003-09-14 (Release-Date) Changelog send in by Mikhail Teterin: - Totally reworked options parsing. - Using the new options-parsing scheme, I added the way to specify the desired CSV separator, debug level, and string-trimming option (below). - When outputing the SQL file, strings, probably, should not be trimmed, and that is now a default. The trimming can now be specified as: --trim {r|l|b} - The two codepage-conversion functions combined into one, which is also made table-driven. - Record-conversion can now be turned off with the --noconv option. - While input is still opened and read directly with open/read (perhaps, it should stay that way), the output file is operated on using the stdio functions fopen() and fprintf(), fputs, putc(). - Some reorganization in the variable-declaration and other cleanups... 0.6 STABLE (Release-Date) - dbf can export dBASE files to SQL instruction sets - new Makefiles - works on AIX 4.3.3 - new file system structure -> src contains all header and source files - fixes in macro definitions - increased macro MAX_FIELDS from 50 to 500 to solve bug #003 reported in the document BUGS - fixes in endian.c, reported by Uwe Steinmann
This commit is contained in:
parent
9b839a16eb
commit
77175d1822
6 changed files with 78 additions and 85 deletions
10
dbf/Makefile
10
dbf/Makefile
|
@ -1,8 +1,9 @@
|
|||
# $NetBSD: Makefile,v 1.1.1.1 2003/09/17 16:11:55 xtraeme Exp $
|
||||
# $NetBSD: Makefile,v 1.2 2003/11/21 15:07:30 thomasklausner Exp $
|
||||
#
|
||||
|
||||
DISTNAME= dbf-0.5.1.src
|
||||
PKGNAME= dbf-0.5.1
|
||||
DISTNAME= dbf-0.8.1.src
|
||||
PKGNAME= dbf-0.8.1
|
||||
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
|
||||
CATEGORIES= converters
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dbf/}
|
||||
|
||||
|
@ -10,8 +11,9 @@ MAINTAINER= packages@netbsd.org
|
|||
HOMEPAGE= http://dbf.sourceforge.net/
|
||||
COMMENT= Converts dBASE files to comma separated values text files
|
||||
|
||||
WRKSRC= ${WRKDIR}/dbf-0.5.1
|
||||
USE_BUILDLINK2= YES
|
||||
USE_GMAKE= YES
|
||||
BUILD_DIRS= ${WRKSRC}/src
|
||||
INSTALL_DIRS= ${WRKSRC}
|
||||
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
17
dbf/PLIST
17
dbf/PLIST
|
@ -1,9 +1,10 @@
|
|||
@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/17 16:11:55 xtraeme Exp $
|
||||
@comment $NetBSD: PLIST,v 1.2 2003/11/21 15:07:30 thomasklausner Exp $
|
||||
bin/dbf
|
||||
share/dbf/CHANGELOG
|
||||
share/dbf/CREDITS
|
||||
share/dbf/FAQ
|
||||
share/dbf/INSTALL
|
||||
share/dbf/MANIFEST
|
||||
share/dbf/README
|
||||
@dirrm share/dbf
|
||||
share/doc/dbf/BUGS
|
||||
share/doc/dbf/ChangeLog
|
||||
share/doc/dbf/CREDITS
|
||||
share/doc/dbf/FAQ
|
||||
share/doc/dbf/INSTALL
|
||||
share/doc/dbf/MANIFEST
|
||||
share/doc/dbf/README
|
||||
@dirrm share/doc/dbf
|
||||
|
|
11
dbf/distinfo
11
dbf/distinfo
|
@ -1,6 +1,7 @@
|
|||
$NetBSD: distinfo,v 1.1.1.1 2003/09/17 16:11:55 xtraeme Exp $
|
||||
$NetBSD: distinfo,v 1.2 2003/11/21 15:07:30 thomasklausner Exp $
|
||||
|
||||
SHA1 (dbf-0.5.1.src.tar.gz) = 53c216ddf17b74e8fff4f04d6d163e71335791e7
|
||||
Size (dbf-0.5.1.src.tar.gz) = 16869 bytes
|
||||
SHA1 (patch-aa) = da023ad38f066f0331e21c95a43e88f0fa839111
|
||||
SHA1 (patch-ab) = 67ca9452e442b64d6f5290ab41931374b5b32677
|
||||
SHA1 (dbf-0.8.1.src.tar.gz) = 89dc6813e6b238280ec7011c508dbdb1d44a51be
|
||||
Size (dbf-0.8.1.src.tar.gz) = 26217 bytes
|
||||
SHA1 (patch-aa) = 3351a802ad75132b9c20ce28e21fe7a7e73424db
|
||||
SHA1 (patch-ab) = f7a1538815890a1459da707f6e98fd5239a0a3ac
|
||||
SHA1 (patch-ac) = 88c598a88b5ea9a3ae4e23eaec56e36a93914ed2
|
||||
|
|
|
@ -1,41 +1,17 @@
|
|||
$NetBSD: patch-aa,v 1.1.1.1 2003/09/17 16:11:55 xtraeme Exp $
|
||||
$NetBSD: patch-aa,v 1.2 2003/11/21 15:07:30 thomasklausner Exp $
|
||||
|
||||
--- Makefile.orig Tue Mar 11 10:32:08 2003
|
||||
--- Makefile.orig Wed Nov 12 13:36:13 2003
|
||||
+++ Makefile
|
||||
@@ -7,7 +7,6 @@
|
||||
# Do not change the lines between START and END
|
||||
# START - Configuration
|
||||
# ROOTDIR has to be set to the current development version directory
|
||||
-CC = /usr/bin/gcc
|
||||
|
||||
SRC = dbf.c
|
||||
HDR = iodbf.h tables.h an_string.h codepages.h statistic.h congraph.h dbfversion.h endian.h
|
||||
@@ -24,12 +23,12 @@ RM = /bin/rm -f
|
||||
#END
|
||||
|
||||
# Change this line to install dbf anywhere you want
|
||||
-PREFIX = /usr/local/bin
|
||||
+PREFIX = ${LOCALBASE}
|
||||
|
||||
dbf: $(SRC) $(HDR)
|
||||
@(echo "")
|
||||
@(echo "Compiling dbf:")
|
||||
- $(CC) -Wall -o $(BIN) $(SRC)
|
||||
+ $(CC) -O2 -Wall -o $(BIN) $(SRC)
|
||||
@(echo "")
|
||||
@(echo "Now install with 'make install'")
|
||||
@(echo "source will installed to: $(PREFIX)")
|
||||
@@ -41,8 +40,11 @@ dbf: $(SRC) $(HDR)
|
||||
all: dbf
|
||||
|
||||
install:
|
||||
- cp $(BIN) $(PREFIX)
|
||||
-
|
||||
+ if [ ! -d $(PREFIX)/bin ]; then install -d $(PREFIX)/bin; fi
|
||||
+ install -c -m 755 -g wheel -o root $(BIN) $(PREFIX)/bin
|
||||
+ if [ ! -d $(PREFIX)/share/dbf ]; then install -d $(PREFIX)/share/dbf; fi
|
||||
+ install -c -m 644 -g wheel -o root $(DOC) $(PREFIX)/share/dbf
|
||||
+
|
||||
uninstall:
|
||||
@(echo "Uninstall dbf: "; rm -f $(PREFIX)/$(BIN))
|
||||
|
||||
@@ -18,8 +18,10 @@ all:
|
||||
install:
|
||||
@(echo "");
|
||||
@(echo -en "Copying dbf to $(PREFIX)... ");
|
||||
- @(install -d $(PREFIX)/bin)
|
||||
- cp $(DIRS)/$(BIN) $(PREFIX)/bin
|
||||
+ ${BSD_INSTALL_DATA_DIR} $(PREFIX)/bin
|
||||
+ ${BSD_INSTALL_PROGRAM} $(DIRS)/$(BIN) $(PREFIX)/bin
|
||||
+ ${BSD_INSTALL_DATA_DIR} $(PREFIX)/share/doc/dbf
|
||||
+ ${BSD_INSTALL_DATA} $(DOC) $(PREFIX)/share/doc/dbf/
|
||||
|
||||
uninstall:
|
||||
@(echo "");
|
||||
|
|
|
@ -1,30 +1,23 @@
|
|||
$NetBSD: patch-ab,v 1.1.1.1 2003/09/17 16:11:55 xtraeme Exp $
|
||||
$NetBSD: patch-ab,v 1.2 2003/11/21 15:07:30 thomasklausner Exp $
|
||||
|
||||
--- dbf.c.orig Tue Mar 11 01:35:10 2003
|
||||
+++ dbf.c
|
||||
@@ -190,20 +190,20 @@ void show_help(char *pname) {
|
||||
/*printf("\n --sql [sql-file] \t converts dBASE File to sql (tested with Postgres)");*/
|
||||
printf("\n --view-info \t\t displays statistics about current dbf file");
|
||||
/*printf("\n --ppc \t\t force dbf not to check the system architecture");*/
|
||||
- printf("\n\nPlease note that the current version automatically detects\n\
|
||||
-the codepage used in the dbf file.\n\
|
||||
-At the moment only english, american and western european codepages are supported.\n");
|
||||
+ printf("\n\nPlease note that the current version automatically detects\n"
|
||||
+ "the codepage used in the dbf file.\n"
|
||||
+ "At the moment only english, american and western european codepages are supported.\n");
|
||||
}
|
||||
|
||||
/* - - - THE MAIN PROGRAM - - -*/
|
||||
/* the part of Joachim Astel was completely re-written and adopted for version 0.2 */
|
||||
int main (int argc, char *argv[])
|
||||
{
|
||||
- int dbfhandle, handle;
|
||||
+ int dbfhandle, handle = 0;
|
||||
int header_length, i;
|
||||
char *filename;
|
||||
int ppc_override; // Big Endian Check Override
|
||||
- int type;
|
||||
+ int type = 0;
|
||||
char *foo, *p;
|
||||
int k;
|
||||
ppc_override = 0;
|
||||
--- Makefile.rules.orig Thu Nov 20 13:48:35 2003
|
||||
+++ Makefile.rules
|
||||
@@ -11,15 +11,15 @@
|
||||
#
|
||||
|
||||
# Compiler flags
|
||||
-CC = gcc
|
||||
-CFLAGS = -Wall
|
||||
+#CC = gcc
|
||||
+CFLAGS += -Wall
|
||||
|
||||
# Settings
|
||||
LOG = make.log
|
||||
DIRS = src
|
||||
BIN = dbf
|
||||
VERSION = 0.8.1
|
||||
-PREFIX = /usr/local
|
||||
+#PREFIX = /usr/local
|
||||
|
||||
# Compiler settings - do not change
|
||||
# erased dbfversion.o
|
||||
|
|
20
dbf/patches/patch-ac
Normal file
20
dbf/patches/patch-ac
Normal file
|
@ -0,0 +1,20 @@
|
|||
$NetBSD: patch-ac,v 1.1 2003/11/21 15:07:30 thomasklausner Exp $
|
||||
|
||||
--- src/dbf.c.orig Thu Nov 20 13:22:03 2003
|
||||
+++ src/dbf.c
|
||||
@@ -357,6 +357,7 @@ main(int argc, char *argv[])
|
||||
exit(1);
|
||||
|
||||
if (writeLine) {
|
||||
+ char *flag_byte;
|
||||
if ((record = malloc(record_length + 1)) == NULL) {
|
||||
perror("malloc"); exit(1);
|
||||
}
|
||||
@@ -369,7 +370,6 @@ main(int argc, char *argv[])
|
||||
//lseek(dbfhandle, rotate2b(db->header_length) + 1, SEEK_SET);
|
||||
|
||||
/* At this point we look if the following data set is deleted */
|
||||
- char *flag_byte;
|
||||
lseek(dbfhandle, rotate2b(db->header_length), SEEK_SET);
|
||||
|
||||
if ( (flag_byte = malloc(1)) == NULL ) {
|
Loading…
Reference in a new issue