Date: Fri, 21 Nov 2003 16:39:02 +0300 From: "Samy Al Bahra" <samy@kerneled.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/59557: Fix palm/jfconv build on FreeBSD 5.X Message-ID: 1069421932@beastie.freebsd.local Resent-Message-ID: <200311211740.hALHeKLj088993@freefall.freebsd.org>
| raw e-mail | index | archive | help
>Number: 59557
>Category: ports
>Synopsis: Fix palm/jfconv build on FreeBSD 5.X
>Confidential: no
>Severity: critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri Nov 21 09:40:20 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Samy Al Bahra
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
Kerneled
>Environment:
System: FreeBSD beastie.freebsd.local 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Wed Aug 20 18:35:24 AST 2003 samy@beastie.freebsd.local:/usr/src/sys/i386/compile/KERNELED i386
>Description:
palm/jfconv does not build on 5.X
machines due to its usage of multistring
literals (depreciated with gcc 3.X).
The following patch fixes this.
>How-To-Repeat:
Build with gcc 3.X.
>Fix:
diff -ruN jfconv/files/patch-aa /home/samy/tmp/jfconv/files/patch-aa
--- jfconv/files/patch-aa Wed May 17 00:24:55 2000
+++ /home/samy/tmp/jfconv/files/patch-aa Fri Nov 21 16:36:24 2003
@@ -1,5 +1,5 @@
---- jconv.c.orig Tue Nov 2 23:03:59 1999
-+++ jconv.c Thu May 4 20:05:51 2000
+--- jconv.c.orig Fri Nov 21 16:35:40 2003
++++ jconv.c Fri Nov 21 16:35:40 2003
@@ -67,7 +67,7 @@
strcpy(infile, "");
@@ -45,6 +45,15 @@
char inputString[MAX_RECORD_LENGTH];
int inputStringLoc, inputStringLen;
JFileAppInfoType appInfo;
+@@ -747,7 +747,7 @@
+ if(inputStringLoc - dataLocs[currentField] > MAX_DATA_LENGTH)
+ {
+ sprintf(errorNum, "%d", currentRecord+1);
+- sprintf(errorStr, "Field data too long
++ sprintf(errorStr, "Field data too long\n\
+ at record: %s", errorNum);
+ MessageBox2( errorStr, NULL, MB_OK );
+ fclose(input);
@@ -1165,10 +1165,6 @@
sprintf(recNumStr, "%d", currentRecord+1);
sprintf(endMsg, "Conversion of %s records in %s to %s was successful!",
@@ -56,3 +65,51 @@
}
int TypeIsString(int t)
+@@ -1599,16 +1595,16 @@
+ void showsynopsis()
+ {
+ fprintf(stderr,
+-"jconv [-e|-d] [-i <infofile>] [-t title] <infile> <outfile>
+-
+- -e encode: csv -> pdb
+- -d decode: pdb -> csv
+- -s use semicolon as delimiter
+- -i <infofile> use <infofile> as infofile
+- -t title title is the db-name
+- -v print version information
+- -h print this message
+-
++"jconv [-e|-d] [-i <infofile>] [-t title] <infile> <outfile>\n\
++\n\
++ -e encode: csv -> pdb\n\
++ -d decode: pdb -> csv\n\
++ -s use semicolon as delimiter\n\
++ -i <infofile> use <infofile> as infofile\n\
++ -t title title is the db-name\n\
++ -v print version information\n\
++ -h print this message\n\
++\n\
+ ");
+ return;
+ }
+@@ -1625,13 +1621,13 @@
+
+ void showversion()
+ {
+- fprintf(stderr, "
+-jconv: Converts JFile Pro database files to csv-files and vica versa
+-Version 1.0
+-copyright 1999 by Andreas Mock <AMock@osram.com>
+-with permission of J. J. Lehett <JLehett@land-j.com>
+-see also www.land-j.com
+-
++ fprintf(stderr, "\n\
++jconv: Converts JFile Pro database files to csv-files and vica versa\n\
++Version 1.0\n\
++copyright 1999 by Andreas Mock <AMock@osram.com>\n\
++with permission of J. J. Lehett <JLehett@land-j.com>\n\
++see also www.land-j.com\n\
++\n\
+ ");
+ return;
+ }
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1069421932>