update with the new PORTNAME/PORTVERSION variables

9 files changed, 28 insertions, 28 deletions

diff --git a/german/BBBike/Makefile b/german/BBBike/Makefile
index 1935a6feb197..562998a7df74 100644
--- a/german/BBBike/Makefile
+++ b/german/BBBike/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	BBBike
-# Version required:	2.x
 # Date created:		Fri Aug 14 15:32:26 CEST 1998
 # Whom:			Slaven Rezic <eserte@cs.tu-berlin.de>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	BBBike-2.48
+PORTNAME=	BBBike
+PORTVERSION=	2.48
 CATEGORIES=	german
 MASTER_SITES=	http://pub.cs.tu-berlin.de/src/BBBike/
 
diff --git a/german/cheapcall/Makefile b/german/cheapcall/Makefile
index 47536cd411cb..ccd086e23a14 100644
--- a/german/cheapcall/Makefile
+++ b/german/cheapcall/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:   cheap-call
-# Version required:     0.7e-1.9.99
 # Date created:         9 Jun 1999
 # Whom:                 Peter Cornelius <pcc@gmx.net>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	cheap-call-${LONGVER}.tcl
-PKGNAME=	cheapcall-0.7e
+PORTNAME=	cheap-call
+PORTVERSION=	0.7e
 CATEGORIES=	german
 MASTER_SITES=	http://212.227.69.105/download/
+DISTNAME=	cheap-call-${LONGVER}.tcl
 EXTRACT_SUFX=	.bz2
 
 MAINTAINER=	pcc@gmx.net
diff --git a/german/dict/Makefile b/german/dict/Makefile
index 9890e00597b0..7e8f23c98e1d 100644
--- a/german/dict/Makefile
+++ b/german/dict/Makefile
@@ -6,18 +6,18 @@
 # $FreeBSD$
 #
 
-DISTNAME=       dict-1.2
-PKGNAME=        de-dict-1.2
+PORTNAME=	de-dict
+PORTVERSION=	1.2
 CATEGORIES=	german
-MASTER_SITES=   http://www.de.freebsd.org/~wosch/src/
+MASTER_SITES=	http://www.de.freebsd.org/~wosch/src/
+DISTNAME=	dict-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${dict}.gz
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=     wosch@FreeBSD.org
+MAINTAINER=	wosch@FreeBSD.org
 
 RUN_DEPENDS=	agrep:${PORTSDIR}/textproc/agrep
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-
 dict=		ger-eng.txt
 
 post-extract: ${dict}
diff --git a/german/manpages/Makefile b/german/manpages/Makefile
index 85ec7090d0a4..7d58b05acd20 100644
--- a/german/manpages/Makefile
+++ b/german/manpages/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for: German manpages
-# Version required:     1.0
 # Date created:         29 September 1997
 # Whom:                 wosch
 #
 # $FreeBSD$
 #
 
-DISTNAME=       de-manpages-1.0
+PORTNAME=	de-manpages
+PORTVERSION=	1.0
 CATEGORIES=	german
 MASTER_SITES=   http://www.de.freebsd.org/~wosch/src/ \
 		ftp://ftp.Infodrom.North.DE/pub/Linux/Devel/manpages-de/
diff --git a/german/phone/Makefile b/german/phone/Makefile
index ed3ba4f72e60..1ed7e80fe5d1 100644
--- a/german/phone/Makefile
+++ b/german/phone/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	German phone codes
-# Version required:     1.0
 # Date created:         1997-12-30
 # Whom:                 wosch
 #
 # $FreeBSD$
 #
 
-DISTNAME=	avon-1996
-PKGNAME=	de-phone-1.0
+PORTNAME=	de-phone
+PORTVERSION=	1.0
 CATEGORIES=	german misc
 MASTER_SITES=	http://www.de.freebsd.org/~wosch/src/
+DISTNAME=	avon-1996
 EXTRACT_SUFX=	.gz
 
 MAINTAINER=     wosch@FreeBSD.org
diff --git a/german/staroffice5/Makefile b/german/staroffice5/Makefile
index 2a3d6032f113..dd3fa2091785 100644
--- a/german/staroffice5/Makefile
+++ b/german/staroffice5/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for: StarOffice 5.1a german
-# Version required:     5.1a
 # Date created:		20 Dezember 1999
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
-DISTNAME=	so51a_lnx_49
-PKGNAME=	de-staroffice-5.1a
+PORTNAME=	de-staroffice
+PORTVERSION=	5.1a
 CATEGORIES=	editors linux
 MASTER_SITES=	ftp://ftp.hagenhomes.com/pub/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME=	so51a_lnx_49
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
diff --git a/german/staroffice52/Makefile b/german/staroffice52/Makefile
index 2a3d6032f113..dd3fa2091785 100644
--- a/german/staroffice52/Makefile
+++ b/german/staroffice52/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for: StarOffice 5.1a german
-# Version required:     5.1a
 # Date created:		20 Dezember 1999
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
-DISTNAME=	so51a_lnx_49
-PKGNAME=	de-staroffice-5.1a
+PORTNAME=	de-staroffice
+PORTVERSION=	5.1a
 CATEGORIES=	editors linux
 MASTER_SITES=	ftp://ftp.hagenhomes.com/pub/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME=	so51a_lnx_49
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
diff --git a/german/webalizer/Makefile b/german/webalizer/Makefile
index b87df8ed33f7..495a2b59b864 100644
--- a/german/webalizer/Makefile
+++ b/german/webalizer/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	webalizer
-# Version required:	1.30.*
 # Date created:		02.Jun 1998
 # Whom:			dirk.meyer@dinoex.sub.org
 #
 # $FreeBSD$
 
-DISTNAME=	webalizer-1.30-04-src
-PKGNAME=	de-webalizer-1.30.4
+PORTNAME=	de-webalizer
+PORTVERSION=	1.30.4
 CATEGORIES=	german www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/ \
 		ftp://ftp.lan-ks.de/pub/approved/
+DISTNAME=	webalizer-1.30-04-src
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	dirk.meyer@dinoex.sub.org
diff --git a/german/webalizer2/Makefile b/german/webalizer2/Makefile
index b87df8ed33f7..495a2b59b864 100644
--- a/german/webalizer2/Makefile
+++ b/german/webalizer2/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	webalizer
-# Version required:	1.30.*
 # Date created:		02.Jun 1998
 # Whom:			dirk.meyer@dinoex.sub.org
 #
 # $FreeBSD$
 
-DISTNAME=	webalizer-1.30-04-src
-PKGNAME=	de-webalizer-1.30.4
+PORTNAME=	de-webalizer
+PORTVERSION=	1.30.4
 CATEGORIES=	german www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/ \
 		ftp://ftp.lan-ks.de/pub/approved/
+DISTNAME=	webalizer-1.30-04-src
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	dirk.meyer@dinoex.sub.org