9 files changed, 10 insertions, 106 deletions

diff --git a/palm/jconv/Makefile b/palm/jconv/Makefile
deleted file mode 100644
index b5a98f02261a..000000000000
--- a/palm/jconv/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# ports collection makefile for:	jconv
-# Date created:			14 May 2000
-# Whom:				Akinori MUSHA aka knu <knu@idaemons.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	jconv
-PORTVERSION=	2000.05.17
-CATEGORIES=	palm databases
-MASTER_SITES=	http://www.land-j.com/files/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	knu
-DISTNAME=	${PORTNAME}
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	knu@FreeBSD.org
-
-ALL_TARGET=	# none
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/jconv ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/share/doc/jconv/
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/jconv/
-
-.include <bsd.port.mk>
diff --git a/palm/jconv/distinfo b/palm/jconv/distinfo
deleted file mode 100644
index 5aedc6ed9cda..000000000000
--- a/palm/jconv/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (jconv.tgz) = 81217102c8d538a9a391941316723b85
diff --git a/palm/jconv/files/patch-aa b/palm/jconv/files/patch-aa
deleted file mode 100644
index d849e2516e93..000000000000
--- a/palm/jconv/files/patch-aa
+++ /dev/null
@@ -1,58 +0,0 @@
---- jconv.c.orig	Tue Nov  2 23:03:59 1999
-+++ jconv.c	Thu May  4 20:05:51 2000
-@@ -67,7 +67,7 @@
- 	strcpy(infile, "");
- 
- 	delimChar = ',';	/* standard */
--	m_CommaDelim = 1;	/* standard */
-+	m_CommandLineComma = 1;	/* standard */
- 	m_UseInfoFile = 0;
- 
- 	while((o = getopt(argc, argv, "edvht:i:s")) != EOF) {
-@@ -76,7 +76,7 @@
- 				break;
- 		case 'd':	encode = 'd';
- 				break;
--		case 's':	m_CommaDelim = 0;
-+		case 's':	m_CommandLineComma = 0;
- 				break;
- 		case 't':	strncpy(title, optarg, 32);
- 				title[31] = 0;
-@@ -176,7 +176,7 @@
- 	FILE*		input;
- 	FILE*		output;
- 	FILE*		info;
--	tHeader		header;
-+	tHeader		header = { 0 };
- 	WORD		oddity = 0x008C;  
- 	int 		numNonDeletedRecs;  	
- 	JFileAppInfoType	appInfo;
-@@ -185,7 +185,7 @@
- 	int		curDumpLoc;
- 	char*	 	tempPopupPtr; 
- 	int		usesInfoFile;
--	int		fldLens[MAX_FIELDS];
-+	int		fldLens[MAX_FIELDS] = { 0 };
- 	unsigned char	holdChr[2];
- 	char		endMsg[2048];
- 	char		recNumStr[10];
-@@ -437,7 +437,7 @@
- 	int		i,j;
- 	char		dbName[200];
- 	int		usesInfoFile;
--	tHeader		header;
-+	tHeader		header = { 0 };
- 	char 		inputString[MAX_RECORD_LENGTH];  
- 	int 		inputStringLoc, inputStringLen;  
- 	JFileAppInfoType	appInfo;
-@@ -1165,10 +1165,6 @@
- 	sprintf(recNumStr, "%d", currentRecord+1);
- 	sprintf(endMsg, "Conversion of %s  records in %s to %s was successful!",
- 			recNumStr, m_CSVPath, m_PDBPath);
--
--	if(!m_IsCommandLine)
--		MessageBox( endMsg, NULL, MB_OK );
--
- }
- 
- int TypeIsString(int t)
diff --git a/palm/jconv/pkg-comment b/palm/jconv/pkg-comment
deleted file mode 100644
index 53326e37aafa..000000000000
--- a/palm/jconv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Converts JFile database to CSV, and vice versa
diff --git a/palm/jconv/pkg-descr b/palm/jconv/pkg-descr
deleted file mode 100644
index ec6d29eb1e61..000000000000
--- a/palm/jconv/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-JConv is a quick port by Andreas Mock <AMock@osram.com> from the
-original gui-based, object-oriented program jconvpro.exe with
-permissions from J.J. Lehett.  All object-oriented and gui-derived
-stuff is thrown away. The source code was "c-ified" and command line
-options added.
-
-WWW:	http://www.land-j.com/jfileu.html
diff --git a/palm/jconv/pkg-plist b/palm/jconv/pkg-plist
deleted file mode 100644
index de995e4184f1..000000000000
--- a/palm/jconv/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/jconv
-share/doc/jconv/README
-@dirrm share/doc/jconv
diff --git a/palm/jfconv/Makefile b/palm/jfconv/Makefile
index b5a98f02261a..3229801af9c1 100644
--- a/palm/jfconv/Makefile
+++ b/palm/jfconv/Makefile
@@ -1,17 +1,17 @@
-# ports collection makefile for:	jconv
+# ports collection makefile for:	jfconv
 # Date created:			14 May 2000
 # Whom:				Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	jconv
+PORTNAME=	jfconv
 PORTVERSION=	2000.05.17
 CATEGORIES=	palm databases
 MASTER_SITES=	http://www.land-j.com/files/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	knu
-DISTNAME=	${PORTNAME}
+DISTNAME=	jconv
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	knu@FreeBSD.org
@@ -19,8 +19,8 @@ MAINTAINER=	knu@FreeBSD.org
 ALL_TARGET=	# none
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/jconv ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/share/doc/jconv/
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/jconv/
+	${INSTALL_PROGRAM} ${WRKSRC}/jconv ${PREFIX}/bin/jfconv
+	${MKDIR} ${PREFIX}/share/doc/jfconv/
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/jfconv/
 
 .include <bsd.port.mk>
diff --git a/palm/jfconv/pkg-descr b/palm/jfconv/pkg-descr
index ec6d29eb1e61..b926b6477724 100644
--- a/palm/jfconv/pkg-descr
+++ b/palm/jfconv/pkg-descr
@@ -1,4 +1,4 @@
-JConv is a quick port by Andreas Mock <AMock@osram.com> from the
+JFConv is a quick port by Andreas Mock <AMock@osram.com> from the
 original gui-based, object-oriented program jconvpro.exe with
 permissions from J.J. Lehett.  All object-oriented and gui-derived
 stuff is thrown away. The source code was "c-ified" and command line
diff --git a/palm/jfconv/pkg-plist b/palm/jfconv/pkg-plist
index de995e4184f1..66c697bf1f27 100644
--- a/palm/jfconv/pkg-plist
+++ b/palm/jfconv/pkg-plist
@@ -1,3 +1,3 @@
-bin/jconv
-share/doc/jconv/README
-@dirrm share/doc/jconv
+bin/jfconv
+share/doc/jfconv/README
+@dirrm share/doc/jfconv