Update to use PORTNAME/PORTVERSION

14 files changed, 37 insertions, 37 deletions

diff --git a/russian/X.language/Makefile b/russian/X.language/Makefile
index a22f281bd08..df1d8e673b2 100644
--- a/russian/X.language/Makefile
+++ b/russian/X.language/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for: X.language
-# Version required:     X11R6
 # Date created:         31 Aug 1995
 # Whom:                 ache
 #
 # $FreeBSD$
 #
 
-DISTNAME=       ru-X11-3.3
+PORTNAME=	X11
+PORTVERSION=	3.3
 CATEGORIES=     russian x11
 MASTER_SITES=   http://nagual.pp.ru/~ache/koi8/dist/ \
 		ftp://ftp.kiarchive.ru/pub/misc/fonts/cyrillic/xwindows/
diff --git a/russian/apache13/Makefile b/russian/apache13/Makefile
index 2e9dca4578e..7ccb8635839 100644
--- a/russian/apache13/Makefile
+++ b/russian/apache13/Makefile
@@ -1,15 +1,13 @@
 # New ports collection makefile for:    apache HTTPD
-# Version required:     1.3*
 # Date created:         Sat Apr 10 22:30:36 EEST 1999
 # Whom:                 vns@delta.odessa.ua
 #
 # $FreeBSD$
 #
 
-VERSION=	1.3.11
+PORTNAME=	apache
+PORTVERSION= 	1.3.11
 RA_VERSION=	29.3
-DISTNAME=       apache_${VERSION}
-PKGNAME=        ru-apache-${VERSION}
 CATEGORIES=	www russian
 MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -26,10 +24,11 @@ MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://ftp.mtnranch.net/pub/apache/dist/ \
 		ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \
 		ftp://apache.nextpath.com/pub/apache/dist/
+DISTNAME=	apache_${PORTVERSION}
 
 PATCH_SITES=	ftp://ftp.lexa.ru/pub/apache-rus/ \
 		ftp://ftp.lexa.ru/pub/apache-rus/old-versions/
-PATCHFILES=	patches_${VERSION}rusPL${RA_VERSION}.tar.gz
+PATCHFILES=	patches_${PORTVERSION}rusPL${RA_VERSION}.tar.gz
 
 MAINTAINER=	vns@delta.odessa.ua
 
diff --git a/russian/cyrproxy/Makefile b/russian/cyrproxy/Makefile
index a2c507a123a..f4a970203c2 100644
--- a/russian/cyrproxy/Makefile
+++ b/russian/cyrproxy/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	cyrproxy
-# Version required:			1.4.2
 # Date created:				20 May 1997
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		cyrproxy-1.4.2
+PORTNAME=		cyrproxy
+PORTVERSION= 		1.4.2
 CATEGORIES=		russian net www
 MASTER_SITES=		ftp://ftp.lexa.ru/pub/domestic/lexa/
 
diff --git a/russian/d1489/Makefile b/russian/d1489/Makefile
index 3fb7e3feaa1..a50db15a0d2 100644
--- a/russian/d1489/Makefile
+++ b/russian/d1489/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for: d1489
-# Version required:     1.*
 # Date created:         1 May 1995
 # Whom:                 ache
 #
 # $FreeBSD$
 #
 
-DISTNAME=       d1489-1.4
-PKGNAME=        ru-d1489-1.4
+PORTNAME=	d1489
+PORTVERSION= 	1.4
 CATEGORIES=     russian
 MASTER_SITES=   ftp://ftp.kiarchive.ru/pub/unix/convert/char/
 EXTRACT_SUFX=   .tgz
diff --git a/russian/elm.language/Makefile b/russian/elm.language/Makefile
index 3fb2087b38d..700f653dc00 100644
--- a/russian/elm.language/Makefile
+++ b/russian/elm.language/Makefile
@@ -1,11 +1,11 @@
 # New ports collection makefile for:    ru-elm
-# Date created:         2 Dec 1995
 # Whom:                 ache
 #
 # $FreeBSD$
 #
 
-PKGNAME=        ru-elm-2.4ME
+PORTNAME=	elm
+PORTVERSION= 	2.4ME
 CATEGORIES=     russian mail
 
 RUN_DEPENDS+=   elm:${PORTSDIR}/mail/elm
diff --git a/russian/gd/Makefile b/russian/gd/Makefile
index 6426e82771a..0390e6bb502 100644
--- a/russian/gd/Makefile
+++ b/russian/gd/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for: gd
-# Version required:     1.3
 # Date created:         17 Aug 1998
 # Whom:                 gsm@infosite.ru
 #
 # $FreeBSD$
 #
 
-DISTNAME=       gd1.3
-PKGNAME=        ru-gd-1.3
+PORTNAME=	gd
+PORTVERSION= 	1.3
 CATEGORIES=	russian graphics
 MASTER_SITES=   http://www.boutell.com/gd/http/ \
 		ftp://ftp.boutell.com/pub/boutell/gd/
+DISTNAME=	gd${PORTVERSION}
 
 MAINTAINER=     gsm@infosite.ru
 
diff --git a/russian/koi8r-ps/Makefile b/russian/koi8r-ps/Makefile
index f0317856f99..9ef79c26344 100644
--- a/russian/koi8r-ps/Makefile
+++ b/russian/koi8r-ps/Makefile
@@ -1,11 +1,12 @@
 # New ports collection makefile for: koi8rPS
-# Version required:     1.0
 # Date created:         22 July 1999
 # Whom:                 mi@aldan.algebra.com
 #
 # $FreeBSD$
+#
 
-DISTNAME=	koi8rPS-1.0
+PORTNAME=	koi8rPS
+PORTVERSION= 	1.0
 CATEGORIES=	russian print
 MASTER_SITES=	ftp://ftp.ziplink.net/users/kot/CyrPS/ \
 		ftp://ftp.kapella.gpi.ru/pub/cyrillic/psfonts/
diff --git a/russian/netscape4.language/Makefile b/russian/netscape4.language/Makefile
index 57d27587304..bc0dfde2c37 100644
--- a/russian/netscape4.language/Makefile
+++ b/russian/netscape4.language/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for: netscape.language
-# Version required:     3.01
 # Date created:         8 Apr 1996
 # Whom:                 ache
 #
 # $FreeBSD$
 #
 
-PKGNAME=        ru-netscape-3.01
+PORTNAME=	netscape
+PORTVERSION= 	3.01
 CATEGORIES=     russian www
 
 MAINTAINER=	ache@FreeBSD.org
diff --git a/russian/pgp.language/Makefile b/russian/pgp.language/Makefile
index 518661fe566..37aa0b94558 100644
--- a/russian/pgp.language/Makefile
+++ b/russian/pgp.language/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for: pgp.language
-# Version required:     2.6.3ia
 # Date created:         4 May 1995
 # Whom:                 ache
 #
 # $FreeBSD$
 #
 
-DISTNAME=       pgp26ru
-PKGNAME=        ru-pgp-2.6.3ia
+PORTNAME=	pgp
+PORTVERSION= 	2.6.3ia
 CATEGORIES=     russian
 MASTER_SITES=   ftp://ftp.kiarchive.ru/pub/unix/crypto/pgp/
+DISTNAME=	pgp26ru
 
 MAINTAINER=	ache@FreeBSD.org
 
diff --git a/russian/pine.language/Makefile b/russian/pine.language/Makefile
index c7ea0139d8c..1ce8bb0eb49 100644
--- a/russian/pine.language/Makefile
+++ b/russian/pine.language/Makefile
@@ -1,11 +1,11 @@
 # New ports collection makefile for:    ru-pine
-# Date created:         2 Dec 1995
 # Whom:                 ache
 #
 # $FreeBSD$
 #
 
-PKGNAME=        ru-pine-4.21
+PORTNAME=	pine
+PORTVERSION= 	4.21
 CATEGORIES=     russian mail
 
 MAINTAINER=     ache@FreeBSD.org
diff --git a/russian/rispell/Makefile b/russian/rispell/Makefile
index 1d2420367b2..29cc0822af9 100644
--- a/russian/rispell/Makefile
+++ b/russian/rispell/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    rispell
-# Version required:	N/A
 # Date created:         16 Dec 1997
 # Whom:                 ache
 #
 # $FreeBSD$
 #
 
-DISTNAME=       rispell
-PKGNAME=        ru-ispell-1.0
+PORTNAME=	ispell
+PORTVERSION= 	1.0
 CATEGORIES=     textproc russian
 MASTER_SITES=   http://www.ispras.ru/~knizhnik/
+DISTNAME=	rispell
 
 MAINTAINER=     ache@FreeBSD.org
 
diff --git a/russian/wmcyrx/Makefile b/russian/wmcyrx/Makefile
index f27f0e841f0..75a00972233 100644
--- a/russian/wmcyrx/Makefile
+++ b/russian/wmcyrx/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for: CyrX-2
-# Version required: 2.1
 # Date created:		04 Janyary 1999
 # Whom:			Sergey Osokin aka oZZ <ozz@FreeBSD.org.ru>
 #
 # $FreeBSD$
 #
 
-DISTNAME=       cyrx-2.1
-PKGNAME=	ru-wmcyrx-2.1
+PORTNAME=	wmcyrx
+PORTVERSION= 	2.1
 CATEGORIES=     russian windowmaker
 MASTER_SITES=   http://yard.hitech.mipt.ru/~mini/distrib/
+DISTNAME=	cyrx-${PORTVERSION}
 
 MAINTAINER=     ozz@FreeBSD.org.ru
 
diff --git a/russian/xcode/Makefile b/russian/xcode/Makefile
index 03f777c7965..096fe602486 100644
--- a/russian/xcode/Makefile
+++ b/russian/xcode/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	xcode
-# Version required:	1.0
 # Date created:		13 January 2000
 # Whom:			Michael Vasilenko <acid@stu.cn.ua>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xcode
-PKGNAME=	xcode-1.0
+PORTNAME=	xcode
+PORTVERSION= 	1.0
 CATEGORIES=	russian
 MASTER_SITES=	ftp://ftp.yars.free.net/pub/software/unix/util/text/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/russian/xruskb/Makefile b/russian/xruskb/Makefile
index 32609927b05..649ed77c28d 100644
--- a/russian/xruskb/Makefile
+++ b/russian/xruskb/Makefile
@@ -1,11 +1,12 @@
 # New ports collection makefile for:	xruskb
-# Version required:	1.9.3
 # Date created:		14 Jan 1998
 # Whom:			Igor Vinokurov <igor@zynaps.ru>
 #
 # $FreeBSD$
+#
 
-DISTNAME=	xruskb-1.9.3
+PORTNAME=	xruskb
+PORTVERSION= 	1.9.3
 CATEGORIES=	russian x11
 MASTER_SITES=	ftp://ftp.yars.free.net/pub/software/unix/X11/xruskb-old/ \
 		# ftp://ftp.kiae.su/pub/x11/cyrillic/