21 files changed, 85 insertions, 55 deletions

diff --git a/palm/coldsync/Makefile b/palm/coldsync/Makefile
index 894e2f9c34d4..dfa75defb115 100644
--- a/palm/coldsync/Makefile
+++ b/palm/coldsync/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	coldsync
-# Version required:	1.1.2
 # Date created:		21 January 2000
 # Whom:			Andrew Arensburger <arensb@ooblick.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	coldsync-1.1.2
+PORTNAME=	coldsync
+PORTVERSION= 	1.1.2
 CATEGORIES=	palm comms
 MASTER_SITES=	http://www.ooblick.com/software/coldsync/
 
diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile
index 160f0d2b972f..b587cd7f09c5 100644
--- a/palm/gnome-pilot-conduits/Makefile
+++ b/palm/gnome-pilot-conduits/Makefile
@@ -1,14 +1,15 @@
 # New ports collection makefile for:	gnomepilot-conduits
-# Version required:	0.2
 # Date created:		16th March 2000
 # Whom:			Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
+#
 
-DISTNAME=	gnome-pilot-conduits-0.2
-PKGNAME=	gnomepilot-conduits-0.2
+PORTNAME=	gnomepilot-conduits
+PORTVERSION= 	0.2
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	http://www.gnome.org/gnome-pilot/download/
+DISTNAME=	gnome-pilot-conduits-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index b3adc4224ea8..0f1199f18d64 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -1,14 +1,15 @@
 # New ports collection makefile for:	gnomepilot
-# Version required:	0.1.50
 # Date created:		28th October 1999
 # Whom:			Ade Lovett <ade@lovett.com>
 #
 # $FreeBSD$
+#
 
-DISTNAME=	gnome-pilot-0.1.50
-PKGNAME=	gnomepilot-0.1.50
+PORTNAME=	gnomepilot
+PORTVERSION= 	0.1.50
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	http://www.gnome.org/gnome-pilot/download/
+DISTNAME=	gnome-pilot-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
diff --git a/palm/gnomepilot-conduits/Makefile b/palm/gnomepilot-conduits/Makefile
index 160f0d2b972f..b587cd7f09c5 100644
--- a/palm/gnomepilot-conduits/Makefile
+++ b/palm/gnomepilot-conduits/Makefile
@@ -1,14 +1,15 @@
 # New ports collection makefile for:	gnomepilot-conduits
-# Version required:	0.2
 # Date created:		16th March 2000
 # Whom:			Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
+#
 
-DISTNAME=	gnome-pilot-conduits-0.2
-PKGNAME=	gnomepilot-conduits-0.2
+PORTNAME=	gnomepilot-conduits
+PORTVERSION= 	0.2
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	http://www.gnome.org/gnome-pilot/download/
+DISTNAME=	gnome-pilot-conduits-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
diff --git a/palm/gnomepilot-conduits2/Makefile b/palm/gnomepilot-conduits2/Makefile
index 160f0d2b972f..b587cd7f09c5 100644
--- a/palm/gnomepilot-conduits2/Makefile
+++ b/palm/gnomepilot-conduits2/Makefile
@@ -1,14 +1,15 @@
 # New ports collection makefile for:	gnomepilot-conduits
-# Version required:	0.2
 # Date created:		16th March 2000
 # Whom:			Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
+#
 
-DISTNAME=	gnome-pilot-conduits-0.2
-PKGNAME=	gnomepilot-conduits-0.2
+PORTNAME=	gnomepilot-conduits
+PORTVERSION= 	0.2
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	http://www.gnome.org/gnome-pilot/download/
+DISTNAME=	gnome-pilot-conduits-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
diff --git a/palm/gnomepilot/Makefile b/palm/gnomepilot/Makefile
index b3adc4224ea8..0f1199f18d64 100644
--- a/palm/gnomepilot/Makefile
+++ b/palm/gnomepilot/Makefile
@@ -1,14 +1,15 @@
 # New ports collection makefile for:	gnomepilot
-# Version required:	0.1.50
 # Date created:		28th October 1999
 # Whom:			Ade Lovett <ade@lovett.com>
 #
 # $FreeBSD$
+#
 
-DISTNAME=	gnome-pilot-0.1.50
-PKGNAME=	gnomepilot-0.1.50
+PORTNAME=	gnomepilot
+PORTVERSION= 	0.1.50
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	http://www.gnome.org/gnome-pilot/download/
+DISTNAME=	gnome-pilot-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile
index b3adc4224ea8..0f1199f18d64 100644
--- a/palm/gnomepilot2/Makefile
+++ b/palm/gnomepilot2/Makefile
@@ -1,14 +1,15 @@
 # New ports collection makefile for:	gnomepilot
-# Version required:	0.1.50
 # Date created:		28th October 1999
 # Whom:			Ade Lovett <ade@lovett.com>
 #
 # $FreeBSD$
+#
 
-DISTNAME=	gnome-pilot-0.1.50
-PKGNAME=	gnomepilot-0.1.50
+PORTNAME=	gnomepilot
+PORTVERSION= 	0.1.50
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	http://www.gnome.org/gnome-pilot/download/
+DISTNAME=	gnome-pilot-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
diff --git a/palm/imgvtopgm/Makefile b/palm/imgvtopgm/Makefile
index 21a85caeeef1..c64b7292a65c 100644
--- a/palm/imgvtopgm/Makefile
+++ b/palm/imgvtopgm/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    imgvtopgm
-# Version required:     2.0
 # Date created:         Wed Jun 16 04:42:22 JST 1999
 # Whom:                 sumikawa@ebina.hitachi.co.jp
 #
 # $FreeBSD$
 #
 
-DISTNAME=	imgvtopgm-2.0
+PORTNAME=	imgvtopgm
+PORTVERSION= 	2.0
 CATEGORIES=	palm graphics
 MASTER_SITES=	http://www.trends.net/~mu/srcs/
 
diff --git a/palm/isilo/Makefile b/palm/isilo/Makefile
index 87427fed623b..593087fef0ce 100644
--- a/palm/isilo/Makefile
+++ b/palm/isilo/Makefile
@@ -1,15 +1,15 @@
 # New ports collection Makefile for:	isilo
-# Version required:	2.55
 # Date created:		20 December 1999
 # Whom:			nik
 #
 # $FreeBSD$
 #
 
-DISTNAME=	iSiloBSD
-PKGNAME=	isilo-2.55
+PORTNAME=	isilo
+PORTVERSION= 	2.55
 CATEGORIES=	palm textproc
 MASTER_SITES=	ftp://ftp.iSilo.com/pub/
+DISTNAME=	iSiloBSD
 
 MAINTAINER=	nik@FreeBSD.org
 
diff --git a/palm/kpilot/Makefile b/palm/kpilot/Makefile
index e612946cfbb7..b97db8a19dd0 100644
--- a/palm/kpilot/Makefile
+++ b/palm/kpilot/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   kpilot
-# Version required:    3.0.2
 # Date created:        09 April 1998
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	kpilot-3.0.2
+PORTNAME=	kpilot
+PORTVERSION= 	3.0.2
 CATEGORIES=	palm comms kde
 MASTER_SITES=	http://www.slac.com/pilone/kpilot_home/download/
 
diff --git a/palm/malsync/Makefile b/palm/malsync/Makefile
index 5b9989879e63..de90140e1227 100644
--- a/palm/malsync/Makefile
+++ b/palm/malsync/Makefile
@@ -1,16 +1,16 @@
 # ports collection makefile for:	malsync
-# Version required:		1.8
 # Date created:			Tue Feb 22 00:06:07 CET 2000
 # Whom:				Dirk Froemberg <dirk@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	malsync_src_1_8
-PKGNAME=	malsync-1.8
+PORTNAME=	malsync
+PORTVERSION= 	1.8
 CATEGORIES=	palm
 MASTER_SITES=	http://www.tomw.org/ \
 		http://people.FreeBSD.org/~dirk/ports/distfiles/
+DISTNAME=	malsync_src_1_8
 
 MAINTAINER=	dirk@FreeBSD.org
 
diff --git a/palm/palmos-sdk/Makefile b/palm/palmos-sdk/Makefile
index 3f3023dd4055..9640c4c04c16 100644
--- a/palm/palmos-sdk/Makefile
+++ b/palm/palmos-sdk/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	Palm OS SDK
-# Version required:	3.5
 # Date created:		Mar 22 2000
 # Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	sdk35
-PKGNAME=	palmos-sdk-3.5
+PORTNAME=	palmos-sdk
+PORTVERSION= 	3.5
 CATEGORIES=	palm
 MASTER_SITES=	
+DISTNAME=	sdk35
 
 MAINTAINER=	kuriyama@FreeBSD.org
 
diff --git a/palm/pilot-link-devel/Makefile b/palm/pilot-link-devel/Makefile
index 2ddd24a88daf..892cf2824025 100644
--- a/palm/pilot-link-devel/Makefile
+++ b/palm/pilot-link-devel/Makefile
@@ -1,14 +1,15 @@
 # New ports collection makefile for:    pilot-link
-# Version required:     0.8.7
 # Date created:         November, 1997
 # Whom:                 Paul Traina <pst@freebsd.org>
 #
 # $FreeBSD$
+#
 
-DISTNAME=	pilot-link.0.9.3
-PKGNAME=	pilot-link-0.9.3
+PORTNAME=	pilot-link
+PORTVERSION= 	0.9.3
 CATEGORIES=	palm comms tk82
 MASTER_SITES=	ftp://ryeham.ee.ryerson.ca/pub/PalmOS/
+DISTNAME=	${PORTNAME}.${PORTVERSION}
 
 MAINTAINER=	dima@freebsd.org
 
diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile
index 2ddd24a88daf..892cf2824025 100644
--- a/palm/pilot-link/Makefile
+++ b/palm/pilot-link/Makefile
@@ -1,14 +1,15 @@
 # New ports collection makefile for:    pilot-link
-# Version required:     0.8.7
 # Date created:         November, 1997
 # Whom:                 Paul Traina <pst@freebsd.org>
 #
 # $FreeBSD$
+#
 
-DISTNAME=	pilot-link.0.9.3
-PKGNAME=	pilot-link-0.9.3
+PORTNAME=	pilot-link
+PORTVERSION= 	0.9.3
 CATEGORIES=	palm comms tk82
 MASTER_SITES=	ftp://ryeham.ee.ryerson.ca/pub/PalmOS/
+DISTNAME=	${PORTNAME}.${PORTVERSION}
 
 MAINTAINER=	dima@freebsd.org
 
diff --git a/palm/pilot_makedoc/Makefile b/palm/pilot_makedoc/Makefile
index 73e9833f06e1..afc2c6029d83 100644
--- a/palm/pilot_makedoc/Makefile
+++ b/palm/pilot_makedoc/Makefile
@@ -1,11 +1,33 @@
 # New ports collection makefile for:	pilot_makedoc
-# Version required:			0.7a
 # Date created:				May 10th 1997
 # Whom:					jfitz@FreeBSD.org
 #
 # $FreeBSD$
 #
 
+PORTNAME=	piloit_makedoc
+PORTVERSION= 	0.7a
+CATEGORIES=	palm textproc
+MASTER_SITES=	ftp://ftp.forth.org/pub/PalmOS/ \
+		ftp://ftp.cs.tu-berlin.de/pub/palmtops/pilot/ \
+		ftp://ftp.cso.uiuc.edu/pub/systems/PalmOS/
+DISTNAME=	makedoc7
+EXTRACT_SUFX=	.cpp
+
+MAINTAINER=	jfitz@FreeBSD.org
+
+NO_WRKSUBDIR=	YES
+ALL_TARGET=	pilot_makedoc
+
+do-extract:
+		@${MKDIR} ${WRKDIR}
+		@${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}
+		@${CP} ${FILESDIR}/Makefile ${WRKDIR}
+
+do-install:
+		@${INSTALL_PROGRAM} ${WRKDIR}/pilot_makedoc ${PREFIX}/bin
+
+.include <bsd.port.mk>
 DISTNAME=	makedoc7
 PKGNAME=	pilot_makedoc-0.7a
 CATEGORIES=	palm textproc
diff --git a/palm/pilrc/Makefile b/palm/pilrc/Makefile
index 365d59b357e7..a1c9f140b6d3 100644
--- a/palm/pilrc/Makefile
+++ b/palm/pilrc/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	PilRC
-# Version required:	2.5b1
 # Date created:		29 Mar 2000
 # Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	pilrcsrc
-PKGNAME=	pilrc-2.5b1
+PORTNAME=	pilrc
+PORTVERSION= 	2.5b1
 CATEGORIES=	palm
 MASTER_SITES=	http://www.hig.se/~ardiri/development/palmIII/pilrc/
+DISTNAME=	pilrcsrc
 
 MAINTAINER=	kuriyama@FreeBSD.org
 
diff --git a/palm/prc-tools-binutils/Makefile b/palm/prc-tools-binutils/Makefile
index ca99daf72d3e..5c16e9c37ee9 100644
--- a/palm/prc-tools-binutils/Makefile
+++ b/palm/prc-tools-binutils/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:	Palm OS PRC-tools (binutils part)
-# Version required:	2.0
 # Date created:		Mar 22 2000
 # Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	prc-tools-2.0
-PKGNAME=	prc-tools-binutils-2.0
+PORTNAME=	prc-tools-binutils
+PORTVERSION= 	2.0
 CATEGORIES=	palm
 MASTER_SITES=	http://www.palm.com/devzone/tools/gcc/dist/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	binutils
+DISTNAME=	prc-tools-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} binutils-2.9.1.tar.gz
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/palm/prc-tools-gcc/Makefile b/palm/prc-tools-gcc/Makefile
index bf96dac980b6..0b7a27f795f9 100644
--- a/palm/prc-tools-gcc/Makefile
+++ b/palm/prc-tools-gcc/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	Palm OS PRC-Tools (gcc part)
-# Version required:	2.0
 # Date created:		Mar 22 2000
 # Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	prc-tools-2.0
-PKGNAME=	prc-tools-gcc-2.0
+PORTNAME=	prc-tools-gcc
+PORTVERSION= 	2.0
 CATEGORIES=	palm
 MASTER_SITES=	http://www.palm.com/devzone/tools/gcc/dist/ \
 		${MASTER_SITE_GNU}
+DISTNAME=	prc-tools-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		gdb/gdb-4.18.tar.gz gcc/gcc-2.95.2.tar.gz
 
diff --git a/palm/prc-tools/Makefile b/palm/prc-tools/Makefile
index 217ec8ba4365..250c08a8f570 100644
--- a/palm/prc-tools/Makefile
+++ b/palm/prc-tools/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	Palm OS PRC-tools
-# Version required:	2.0
 # Date created:		Mar 22 2000
 # Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	prc-tools-2.0
+PORTNAME=	prc-tools
+PORTVERSION= 	2.0
 CATEGORIES=	palm
 MASTER_SITES=	http://www.palm.com/devzone/tools/gcc/dist/
 
diff --git a/palm/syncal/Makefile b/palm/syncal/Makefile
index a2c5fed6b2ba..3a4f0923ecc0 100644
--- a/palm/syncal/Makefile
+++ b/palm/syncal/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    tclock
-# Version required:     1.0.1
 # Date created:		So   7 Feb 1999 20:50:43 MET
 # Whom:			Lars Koeller <lkoeller@cc.fh-lippe.de>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	syncal-0.8.3
+PORTNAME=	syncal
+PORTVERSION= 	0.8.3
 CATEGORIES=	palm comms deskutils
 MASTER_SITES=	http://hopf.math.nwu.edu/syncal/
 
diff --git a/palm/xcopilot/Makefile b/palm/xcopilot/Makefile
index 15ddd3ffd7b2..80ea62c5c6de 100644
--- a/palm/xcopilot/Makefile
+++ b/palm/xcopilot/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xcopilot
-# Version required:		0.6.6
 # Date created:			July 17 1997
 # Whom:				Nick Sayer <nsayer@quack.kfu.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xcopilot-0.6.6
+PORTNAME=	xcopilot
+PORTVERSION= 	0.6.6
 CATEGORIES=	palm emulators
 MASTER_SITES=	http://xcopilot.cuspy.com/build/