16 files changed, 35 insertions, 34 deletions

diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index 077b8cede0dd..2f47186196a1 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	everybuddy
-# Version required:		0.1.1
 # Date created:			1 Mar 2000
 # Whom:				Jim Mock <jim@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	everybuddy-0.1.1
+PORTNAME=	everybuddy
+PORTVERSION=	0.1.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.everybuddy.com/files/
 
diff --git a/net-im/centericq/Makefile b/net-im/centericq/Makefile
index 91de95d7894e..bc8bd79e94af 100644
--- a/net-im/centericq/Makefile
+++ b/net-im/centericq/Makefile
@@ -1,14 +1,15 @@
 # New ports collection makefile for:   	centericq
-# Version required:                    	2.0.0
 # Date created:                        	25 December 1999
 # Whom:                                 Chris Piazza <cpiazza@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	center-2.0.0
+PORTNAME=	centericq
+PORTVERSION=	2.0.0
 CATEGORIES=	net
 MASTER_SITES=	http://konst.org.ua/download/
+DISTNAME=	center-${PORTVERSION}
 
 MAINTAINER=	cpiazza@FreeBSD.org
 
diff --git a/net-im/climm/Makefile b/net-im/climm/Makefile
index 9e43fdd2914b..3ce86e375286 100644
--- a/net-im/climm/Makefile
+++ b/net-im/climm/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	micq
-# Version required:                     0.4.4
 # Date created:				11 Oct 1998
 # Whom:					mph
 #
 # $FreeBSD$
 #
 
-DISTNAME=       micq-0.4.4
+PORTNAME=	micq
+PORTVERSION=	0.4.4
 CATEGORIES=	net
 MASTER_SITES=   ftp://micq.chatzone.org/pub/micq/V0.4.4/
 EXTRACT_SUFX=	.tgz
diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 527c39d58a4c..3b49a1e46af4 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	gaim
-# Version required:		0.9.13
 # Date created:			26 Mar 1999
 # Whom:				Jim Mock <jim@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gaim-0.9.13
+PORTNAME=	gaim
+PORTVERSION=	0.9.13
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.marko.net/pub/gaim/
 
diff --git a/net-im/gicq/Makefile b/net-im/gicq/Makefile
index 2fe0b9425991..f273a0935cab 100644
--- a/net-im/gicq/Makefile
+++ b/net-im/gicq/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	gicq
-# Version required:			0.33
 # Date Created:				31 Oct 1998
 # Whom:					Seiichirou Hiraoka
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gicq-0.33
+PORTNAME=	gicq
+PORTVERSION=	0.33
 CATEGORIES=	net
 MASTER_SITES=	http://people.FreeBSD.org/~flathill/distfiles/ \
 		ftp://ftp.korsoft.com/pub/gicq/
diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile
index 68b9e4934e95..b0dd8c209478 100644
--- a/net-im/gnomeicu/Makefile
+++ b/net-im/gnomeicu/Makefile
@@ -1,12 +1,12 @@
 # Ports collection Makefile for:	GnomeICU
-# Version required:			0.90b
 # Date created:				03/16/1999
 # Whom:					nectar@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=		gnomeicu-0.90b
+PORTNAME=		gnomeicu
+PORTVERSION=		0.90.b
 CATEGORIES=		net gnome
 MASTER_SITES=		ftp://gnomeicu.gdev.net/pub/gnomeicu/          \
 			http://www.nectar.cc/distfiles/
diff --git a/net-im/gnomeicu2/Makefile b/net-im/gnomeicu2/Makefile
index 68b9e4934e95..b0dd8c209478 100644
--- a/net-im/gnomeicu2/Makefile
+++ b/net-im/gnomeicu2/Makefile
@@ -1,12 +1,12 @@
 # Ports collection Makefile for:	GnomeICU
-# Version required:			0.90b
 # Date created:				03/16/1999
 # Whom:					nectar@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=		gnomeicu-0.90b
+PORTNAME=		gnomeicu
+PORTVERSION=		0.90.b
 CATEGORIES=		net gnome
 MASTER_SITES=		ftp://gnomeicu.gdev.net/pub/gnomeicu/          \
 			http://www.nectar.cc/distfiles/
diff --git a/net-im/gtkyahoo/Makefile b/net-im/gtkyahoo/Makefile
index 9b7f63b36973..af38ea9e1a62 100644
--- a/net-im/gtkyahoo/Makefile
+++ b/net-im/gtkyahoo/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	gtkyahoo
-# Version required:		0.16
 # Date created:			18 August 1999
 # Whom:				dannyman@dannyland.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gtkyahoo-0.16
+PORTNAME=	gtkyahoo
+PORTVERSION=	0.16
 CATEGORIES=	net
 MASTER_SITES=	http://www.unixtools.org/gtkyahoo/dist/tars/
 
diff --git a/net-im/icb/Makefile b/net-im/icb/Makefile
index e506dbbff5c0..4ac82816c650 100644
--- a/net-im/icb/Makefile
+++ b/net-im/icb/Makefile
@@ -1,13 +1,13 @@
 # ex:ts=8
 # Ports collection makefile for:  icb
-# Version required: 0.0
 # Date created:			  Tue Feb 03, 1998
 # Whom:				  David O'Brien (obrien@NUXI.ucdavis.edu)
 #
 # $FreeBSD$
 #
 
-DISTNAME=	icb-5.0.9
+PORTNAME=	icb
+PORTVERSION=	5.0.9
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.swcp.com/pub/icb/clients/unix/  \
 		ftp://ftp.empire.net/pub/icb/clients/  \
diff --git a/net-im/icqlib/Makefile b/net-im/icqlib/Makefile
index 6d5e43ea264d..41ace90baf34 100644
--- a/net-im/icqlib/Makefile
+++ b/net-im/icqlib/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    icqlib
-# Version required:                     0.1.3
 # Date created:                         16 March 1999
 # Whom:                                 Pavel Andreev
 #
 # $FreeBSD$
 #
 
-DISTNAME=	icqlib-0.1.3
+PORTNAME=	icqlib
+PORTVERSION=	0.1.3
 CATEGORIES=	net
 MASTER_SITES=	http://download.sourceforge.net/icqlib/
 
diff --git a/net-im/libicq/Makefile b/net-im/libicq/Makefile
index 669f47168647..8e6d1b548109 100644
--- a/net-im/libicq/Makefile
+++ b/net-im/libicq/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	libicq
-# Version required:			0.33
 # Date Created:				31 Oct 1998
 # Whom:					Seiichirou Hiraoka
 #
 # $FreeBSD$
 #
 
-DISTNAME=	libicq-0.33
+PORTNAME=	libicq
+PORTVERSION=	0.33
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.korsoft.com/pub/gicq/ \
 		http://www.nectar.com/distfiles/
diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile
index e15d82e516a5..925e5ac215e8 100644
--- a/net-im/licq/Makefile
+++ b/net-im/licq/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    licq
-# Version required:                     0.81
 # Date created:                         2 July 1998
 # Whom:                                 Brian Feldman & Matt Heckaman
 #
 # $FreeBSD$
 #
 
-DISTNAME=	licq-0.81
+PORTNAME=	licq
+PORTVERSION=	0.81
 CATEGORIES=	net
 MASTER_SITES=	http://download.sourceforge.net/licq/ \
 		ftp://ftp.wibble.net/pub/licq/srcs/ \
diff --git a/net-im/micq/Makefile b/net-im/micq/Makefile
index 9e43fdd2914b..3ce86e375286 100644
--- a/net-im/micq/Makefile
+++ b/net-im/micq/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	micq
-# Version required:                     0.4.4
 # Date created:				11 Oct 1998
 # Whom:					mph
 #
 # $FreeBSD$
 #
 
-DISTNAME=       micq-0.4.4
+PORTNAME=	micq
+PORTVERSION=	0.4.4
 CATEGORIES=	net
 MASTER_SITES=   ftp://micq.chatzone.org/pub/micq/V0.4.4/
 EXTRACT_SUFX=	.tgz
diff --git a/net-im/naim/Makefile b/net-im/naim/Makefile
index c93dd016029b..adbdcd9a78fb 100644
--- a/net-im/naim/Makefile
+++ b/net-im/naim/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for: naim
-# Version required:     	0.9.3
 # Date created:			02 March 1999
 # Whom:				mharo@area51.fremont.ca.us
 #
 # $FreeBSD$
 #
 
-DISTNAME=	naim-0.9.5-nicer2
-PKGNAME=	naim-0.9.5.2
+PORTNAME=	naim
+PORTVERSION=	0.9.5.2
 CATEGORIES=	net
 MASTER_SITES=	http://dev.n.ml.org/ \
 		ftp://ftp.netmug.org/pub/FreeBSD/distfiles/
+DISTNAME=	naim-0.9.5-nicer2
 
 MAINTAINER=	mharo@FreeBSD.org
 
diff --git a/net-im/tik/Makefile b/net-im/tik/Makefile
index f0d6171d0c0b..cef10658b190 100644
--- a/net-im/tik/Makefile
+++ b/net-im/tik/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	tik
-# Version required:			0.59
 # Date created:				13 January 1999
 # Whom:					Eugene M. Kim <astralblue@usa.net>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tik-0.59
+PORTNAME=	tik
+PORTVERSION=	0.59
 CATEGORIES=	net tk82
 MASTER_SITES=	http://www.aim.aol.com/tik/ \
 		http://www.nectar.com/distfiles/
diff --git a/net-im/xicq/Makefile b/net-im/xicq/Makefile
index dee8ff5b30a7..ab772c351d6b 100644
--- a/net-im/xicq/Makefile
+++ b/net-im/xicq/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	xicq
-# Version required:			12 July 1998
 # Date created:				29 June 1998
 # Whom:					scrappy
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xicq-071298-snapshot.src
-PKGNAME=	xicq-071298
+PORTNAME=	xicq
+PORTVERSION=	19980712	
 CATEGORIES=	net
 MASTER_SITES=	http://www.xtrophy.dk/xicq/
+DISTNAME=	xicq-071298-snapshot.src
 
 MAINTAINER=	scrappy@FreeBSD.org