update with the new PORTNAME/PORTVERSION variables

15 files changed, 51 insertions, 53 deletions

diff --git a/biology/babel/Makefile b/biology/babel/Makefile
index e7d15b9bb520..869768fc3e53 100644
--- a/biology/babel/Makefile
+++ b/biology/babel/Makefile
@@ -1,12 +1,12 @@
 # New ports collection Makefile for: babel
-# Version required:     1.6
 # Date created:         Dec 4 1997
 # Whom:                 frankch@waru.life.nthu.edu.tw
 #
 # $FreeBSD$
 #
 
-DISTNAME=	babel-1.6
+PORTNAME=	babel
+PORTVERSION=	1.6
 CATEGORIES=     biology
 MASTER_SITES=	ftp://ccl.osc.edu/pub/chemistry/software/MAC/babel/
 EXTRACT_SUFX=	.tar.Z
diff --git a/biology/deft/Makefile b/biology/deft/Makefile
index 0f23b115b95b..47e5bbb8b9e2 100644
--- a/biology/deft/Makefile
+++ b/biology/deft/Makefile
@@ -1,20 +1,20 @@
 # New ports collection makefile for:  DeFT
-# Version required:  2.2
 # Date created:  1999-01-11
 # Whom:	 Ryo MIYAMOTO <rmiya@cc.hirosaki-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	DeFT_2.2
-PKGNAME=	deft-2.2
+PORTNAME=	deft
+PORTVERSION=	2.2
 CATEGORIES=	biology
 MASTER_SITES=	ftp://theory.chem.uottawa.ca/pub/
+DISTNAME=	DeFT_${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	rmiya@cc.hirosaki-u.ac.jp
 
-WRKSRC=		${WRKDIR}/DeFT_2.2/source
+WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
 post-configure:
 	${CP} ${FILESDIR}/Makefile.deft ${WRKSRC}/Makefile
diff --git a/biology/gperiodic/Makefile b/biology/gperiodic/Makefile
index 2a4950eb4930..131cbfa6a33a 100644
--- a/biology/gperiodic/Makefile
+++ b/biology/gperiodic/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	gperiodic
-# Version required:			1.2.2
 # Date created:				16 July 1999
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gperiodic-1.2.2
+PORTNAME=	gperiodic
+PORTVERSION=	1.2.2
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.seul.org/pub/gperiodic/
 
diff --git a/biology/hmmer/Makefile b/biology/hmmer/Makefile
index f134431e6f1e..9f080d6bb1bc 100644
--- a/biology/hmmer/Makefile
+++ b/biology/hmmer/Makefile
@@ -1,12 +1,12 @@
 # New ports collection Makefile for: hmmer
-# Version required:	2.0
 # Date created:		June 29 1998
 # Whom:			barnhart@genetics.wustl.edu
 #
 # $FreeBSD$
 #
 
-DISTNAME=	hmmer-2.1.1
+PORTNAME=	hmmer
+PORTVERSION=	2.1.1
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.genetics.wustl.edu/pub/eddy/hmmer/
 EXTRACT_SUFX=	.tar.Z
diff --git a/biology/kinemage/Makefile b/biology/kinemage/Makefile
index a859d9ddc154..b40906826b14 100644
--- a/biology/kinemage/Makefile
+++ b/biology/kinemage/Makefile
@@ -1,17 +1,17 @@
 # New ports collection Makefile for: kinemage
-# Version required:     4.2
 # Date created:         Dec 4 1997
 # Whom:                 frankch@waru.life.nthu.edu.tw
 #
 # $FreeBSD$
 #
 
-DISTNAME=	MAGE_4_2.LINUX
-PKGNAME=	kinemage-4.2
+PORTNAME=	kinemage
+PORTVERSION=	4.2
 CATEGORIES=     biology linux
 MASTER_SITES=	ftp://kinemage.biochem.duke.edu/LINUXprograms/ \
 		ftp://ftp.ebi.ac.uk/pub/databases/pdb/pub/xternal_software/kinemage/LINUX/ \
 		ftp://ftp.pdb.bnl.gov/pub/xternal_software/kinemage/LINUX/
+DISTNAME=	MAGE_4_2.LINUX
 EXTRACT_SUFX=	.Z
 
 MAINTAINER=     frankch@waru.life.nthu.edu.tw
diff --git a/biology/molden/Makefile b/biology/molden/Makefile
index ca2eea132c46..ca5b0b9f7a75 100644
--- a/biology/molden/Makefile
+++ b/biology/molden/Makefile
@@ -1,17 +1,16 @@
 # New ports collection makefile for:	molden
-# Version required:	3.4
 # Date created:		1998-11-14
 # Whom:			rmiya
 #
 # $FreeBSD$
 #
 
-DISTNAME=	molden3.4
-PKGNAME=	molden-3.4
+PORTNAME=	molden
+PORTVERSION=	3.4
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.caos.kun.nl/pub/molgraph/molden/
 MASTER_SITES+=	ftp://ftp.caos.kun.nl/pub/molgraph/molden/bin/
-DISTFILES=	molden3.4.tar.Z molden3.4-freebsd
+DISTFILES=	${PORTNAME}${PORTVERSION}.tar.Z ${PORTNAME}${PORTVERSION}-freebsd
 
 MAINTAINER=	rmiya@cc.hirosaki-u.ac.jp
 
diff --git a/biology/mopac/Makefile b/biology/mopac/Makefile
index c6a746db81e5..1db9eb2b4aba 100644
--- a/biology/mopac/Makefile
+++ b/biology/mopac/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:  mopac
-# Version required:  7
 # Date created:  1997-04-23
 # Whom:	 Ryo MIYAMOTO <rmiya@cc.hirosaki-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mopac7
-PKGNAME=	mopac-7.02
+PORTNAME=	mopac
+PORTVERSION=	7.02
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.ccl.net/pub/chemistry/software/SOURCES/FORTRAN/mopac7_sources/
 DISTFILES=	mopac7.tar.Z  mopac7-man.tar.Z
diff --git a/biology/ortep3/Makefile b/biology/ortep3/Makefile
index e19b211cd632..986cf1ae11f5 100644
--- a/biology/ortep3/Makefile
+++ b/biology/ortep3/Makefile
@@ -1,20 +1,20 @@
 # New ports collection makefile for:	ORTEP-III
-# Version required:	1.0
 # Date created:		1999-05-08
 # Whom:			Ryo MIYAMOTO
 #
 # $FreeBSD$
 #
 
-DISTNAME= ortep
-PKGNAME= ortep3-1.0
-CATEGORIES= biology
-MASTER_SITES= ftp://ftp.ccl.net/pub/chemistry/software/SOURCES/FORTRAN/ortep/
-EXTRACT_SUFX= .tar.Z
+PORTNAME=	ortep3
+PORTVERSION=	1.0
+CATEGORIES=	biology
+MASTER_SITES=	ftp://ftp.ccl.net/pub/chemistry/software/SOURCES/FORTRAN/ortep/
+DISTNAME=	ortep
+EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER= rmiya@cc.hirosaki-u.ac.jp
+MAINTAINER=	rmiya@cc.hirosaki-u.ac.jp
 
-LIB_DEPENDS= pgplot.5:${PORTSDIR}/graphics/pgplot
+LIB_DEPENDS=	pgplot.5:${PORTSDIR}/graphics/pgplot
 
 .include <bsd.port.pre.mk>
 .if ${OSVERSION} >= 400002
diff --git a/biology/platon/Makefile b/biology/platon/Makefile
index 40d2a1e3348f..b7e72b5a531e 100644
--- a/biology/platon/Makefile
+++ b/biology/platon/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	platon
-# Version required:	Version 07-apr-99
 # Date created:		1999-04-22
 # Whom:			Ryo MIYAMOTO <rmiya@cc.hirosaki-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	platon
-PKGNAME=	platon-070499
+PORTNAME=	platon
+PORTVERSION=	1999.04.07
 CATEGORIES=	biology
 MASTER_SITES=	ftp://xraysoft.chem.ruu.nl/pub/unix/
+DISTNAME=	platon
 
 MAINTAINER=	rmiya@cc.hirosaki-u.ac.jp
 
diff --git a/biology/povchem/Makefile b/biology/povchem/Makefile
index faf03cde2305..4c6a2fd5f8d5 100644
--- a/biology/povchem/Makefile
+++ b/biology/povchem/Makefile
@@ -1,12 +1,12 @@
 # New ports collection Makefile for: povchem
-# Version required:     1.0
 # Date created:         Mar 14 1998
 # Whom:                 frankch@waru.life.nthu.edu.tw
 #
 # $FreeBSD$
 #
 
-DISTNAME=	povchem-1.0
+PORTNAME=	povchem
+PORTVERSION=	1.0
 CATEGORIES=     biology graphics
 MASTER_SITES=   http://cherubino.med.jhmi.edu/~paul/PC_Dist/v1.00/
 DISTFILES=	povchem.c \
diff --git a/biology/psi88/Makefile b/biology/psi88/Makefile
index 4451c4e10dc9..36654e4ca86a 100644
--- a/biology/psi88/Makefile
+++ b/biology/psi88/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	Psi88
-# Version required:	88-1.0
 # Date created:		1998-11-11
 # Whom:			Ryo MIYAMOTO
 #
 # $FreeBSD$
 #
 
-DISTNAME=	psi88
-PKGNAME=	psi88-1.0
+PORTNAME=	psi88
+PORTVERSION=	1.0
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.ccl.net/pub/chemistry/software/SOURCES/FORTRAN/psi88/
+DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	rmiya@cc.hirosaki-u.ac.jp
diff --git a/biology/rasmol/Makefile b/biology/rasmol/Makefile
index 2a79989f02cf..c4f0e1ad8eda 100644
--- a/biology/rasmol/Makefile
+++ b/biology/rasmol/Makefile
@@ -1,17 +1,17 @@
 # New ports collection Makefile for: rasmol
-# Version required:     2.7.1
 # Date created:         Dec 4 1997
 # Whom:                 frankch@waru.life.nthu.edu.tw
 #
 # $FreeBSD$
 #
 
-DISTNAME=       RasMol_2.7.1
-PKGNAME=        rasmol-2.7.1
-CATEGORIES=     biology
-MASTER_SITES=   ftp://ftp.bernstein-plus-sons.com/software/
+PORTNAME=	rasmol
+PORTVERSION=	2.7.1
+CATEGORIES=	biology
+MASTER_SITES=	ftp://ftp.bernstein-plus-sons.com/software/
+DISTNAME=	RasMol_2.7.1
 
-MAINTAINER=     frankch@waru.life.nthu.edu.tw
+MAINTAINER=	frankch@waru.life.nthu.edu.tw
 
 WRKSRC=		$(WRKDIR)/RasMol_2.7.1/src/
 USE_IMAKE=	yes
diff --git a/biology/seaview/Makefile b/biology/seaview/Makefile
index 1621c26b080c..adf7019eec55 100644
--- a/biology/seaview/Makefile
+++ b/biology/seaview/Makefile
@@ -1,18 +1,18 @@
 # New ports collection Makefile for: seaview
-# Version required:     1.0
 # Date created:         Dec 5 1997
 # Whom:                 frankch@waru.life.nthu.edu.tw
 #
 # $FreeBSD$
 #
 
-DISTNAME=       seaview
-PKGNAME=        seaview-1.0
-CATEGORIES=     biology
-MASTER_SITES=   ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/
+PORTNAME=	seaview
+PORTVERSION=	1.0
+CATEGORIES=	biology
+MASTER_SITES=	ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/
+DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tar
 
-MAINTAINER=     frankch@waru.life.nthu.edu.tw
+MAINTAINER=	frankch@waru.life.nthu.edu.tw
 
 LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms
 
diff --git a/biology/tinker/Makefile b/biology/tinker/Makefile
index 1774a3b4a8e6..b00a496cad83 100644
--- a/biology/tinker/Makefile
+++ b/biology/tinker/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:   tinker
-# Version required:    3.7
 # Date Created:                26 August 1998
 # Whom:                        Glenn Johnson
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tinker
-PKGNAME=	tinker-3.7
+PORTNAME=	tinker
+PORTVERSION=	3.7
 CATEGORIES=	biology
 MASTER_SITES=	ftp://dasher.wustl.edu/pub/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	gjohnson@nola.srrc.usda.gov
 
diff --git a/biology/xmolwt/Makefile b/biology/xmolwt/Makefile
index 6383317f8394..e43a19ef0440 100644
--- a/biology/xmolwt/Makefile
+++ b/biology/xmolwt/Makefile
@@ -1,11 +1,11 @@
 # New ports collection makefile for: xmolwt/gmolwt
-# Version required: 0.3
 # Date created: 1999-08-30
 # Whom: Ryo MIYAMOTO <rmiya@cc.hirosaki-u.ac.jp>
 #
 # $FreeBSD$
 
-DISTNAME=	xmolwt-0.3
+PORTNAME=	xmolwt
+PORTVERSION=	0.3
 CATEGORIES=	biology
 MASTER_SITES=	http://www.st.hirosaki-u.ac.jp/~rmiya/xmolwt/