13 files changed, 14 insertions, 28 deletions

diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index c1c28d8e146c..504d65c0d275 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -6,12 +6,11 @@
 #   $MCom: ports-stable/accessibility/gnomemag/Makefile,v 1.1 2006/03/13 23:49:23 mezz Exp $
 #
 
-PORTNAME=	gnomemag
+PORTNAME=	gnome-mag
 PORTVERSION=	0.12.5
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-mag/0.12
-DISTNAME=	gnome-mag-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/accessibility/gnome-speech/Makefile b/accessibility/gnome-speech/Makefile
index cfaac7a94ec7..94781a3f0cc8 100644
--- a/accessibility/gnome-speech/Makefile
+++ b/accessibility/gnome-speech/Makefile
@@ -5,12 +5,11 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gnomespeech
+PORTNAME=	gnome-speech
 PORTVERSION=	0.3.10
 CATEGORIES=	accessibility audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-speech/0.3
-DISTNAME=	gnome-speech-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index aa6a2611649c..1c2fcf87ee76 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -6,13 +6,12 @@
 #   $MCom: ports/archivers/fileroller/Makefile,v 1.95 2006/04/18 18:52:18 ahze Exp $
 #
 
-PORTNAME=	fileroller
+PORTNAME=	file-roller
 PORTVERSION=	2.14.2
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/file-roller/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	file-roller-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile
index 7bb0197155ca..0ec434e9168e 100644
--- a/audio/gnome-audio/Makefile
+++ b/audio/gnome-audio/Makefile
@@ -5,13 +5,11 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gnomeaudio
+PORTNAME=	gnome-audio
 PORTVERSION=	2.0.0
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-audio/2.0
-PKGNAMESUFFIX=	2
-DISTNAME=	gnome-audio-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Sound files for use with GNOME 2
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 9834f8e5f892..87bb30e9312c 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -6,12 +6,11 @@
 #   $MCom: ports/audio/gnomemedia2/Makefile,v 1.95 2006/04/13 07:52:30 bland Exp $
 #
 
-PORTNAME=	gnomemedia2
+PORTNAME=	gnome-media
 PORTVERSION=	2.14.0
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-media/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	gnome-media-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile
index c202fdf6c282..11094c771458 100644
--- a/databases/gnome-db/Makefile
+++ b/databases/gnome-db/Makefile
@@ -5,13 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gnomedb
+PORTNAME=	gnome-db
 PORTVERSION=	0.2.96
 PORTREVISION=	4
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-db/0.2
-DISTNAME=	gnome-db-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/deskutils/gnome-blog/Makefile b/deskutils/gnome-blog/Makefile
index b08fa1a2af08..02023ca474da 100644
--- a/deskutils/gnome-blog/Makefile
+++ b/deskutils/gnome-blog/Makefile
@@ -5,13 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gnomeblog
+PORTNAME=	gnome-blog
 PORTVERSION=	0.8
 PORTREVISION=	2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-blog/0.8
-DISTNAME=	gnome-blog-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME app to post to blogs
diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile
index b00e5c95dccd..69ddefbd68d1 100644
--- a/deskutils/gnome-pim/Makefile
+++ b/deskutils/gnome-pim/Makefile
@@ -5,12 +5,11 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gnomepim
+PORTNAME=	gnome-pim
 PORTVERSION=	1.4.9
 PORTREVISION=	3
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.jroger.in-berlin.de/gnome-pim/
-DISTNAME=	gnome-pim-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index d58281da2f51..137894e34b6b 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -6,14 +6,13 @@
 #   $MCom: ports/deskutils/gnomeutils2/Makefile,v 1.92 2006/04/19 04:46:41 marcus Exp $
 #
 
-PORTNAME=	gnomeutils2
+PORTNAME=	gnome-utils
 PORTVERSION=	2.14.0
 PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-utils/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	gnome-utils-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index 10e9f77a0e5a..d220c6e9dc84 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -6,12 +6,11 @@
 #   $MCom: ports/devel/bugbuddy/Makefile,v 1.29 2006/04/13 07:52:31 bland Exp $
 #
 
-PORTNAME=	bugbuddy
+PORTNAME=	bug-buddy
 PORTVERSION=	2.14.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/bug-buddy/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	bug-buddy-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/gnome-build/Makefile b/devel/gnome-build/Makefile
index 5d4cd4b5c40c..4fe238851b54 100644
--- a/devel/gnome-build/Makefile
+++ b/devel/gnome-build/Makefile
@@ -5,12 +5,11 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gnomebuild
+PORTNAME=	gnome-build
 PORTVERSION=	0.1.3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/gnome/gnome-/}/0.1
-DISTNAME=	${PORTNAME:S/gnome/gnome-/}-${PORTVERSION}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.1
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNOME Build Framework (GBF)
diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
index 764daaf916a3..0b85f85ee7b0 100644
--- a/devel/gnome-common/Makefile
+++ b/devel/gnome-common/Makefile
@@ -6,12 +6,11 @@
 #    $MCom: ports/devel/gnomecommon/Makefile,v 1.5 2005/09/20 09:39:51 ahze Exp $
 #
 
-PORTNAME=	gnomecommon
+PORTNAME=	gnome-common
 PORTVERSION=	2.12.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-common/2.12
-DISTNAME=	gnome-common-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/gnome-crash/Makefile b/devel/gnome-crash/Makefile
index 8da7e969a14c..9cf50e40b842 100644
--- a/devel/gnome-crash/Makefile
+++ b/devel/gnome-crash/Makefile
@@ -5,13 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gnomecrash
+PORTNAME=	gnome-crash
 PORTVERSION=	0.0.5
 PORTREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-crash/0.0
-DISTNAME=	gnome-crash-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A small coredump analysis tool for GNOME