10 files changed, 15 insertions, 21 deletions

diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index ff938496f935..faa0a7f52abc 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	aalib
-PORTVERSION=	1.4.r5
+DISTVERSION=	1.4rc5
 PORTREVISION=	11
 CATEGORIES=	graphics
 MASTER_SITES=	SF/aa-project/aa-lib/1.4rc5
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ASCII art library
diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile
index 560946cf3fc6..59bc82e113b3 100644
--- a/graphics/aview/Makefile
+++ b/graphics/aview/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	aview
-PORTVERSION=	1.3.0.r1
+DISTVERSION=	1.3.0rc1
 PORTREVISION=	5
 CATEGORIES=	graphics
-MASTER_SITES=	SF/aa-project/${PORTNAME}/1.3.0rc1
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
+MASTER_SITES=	SF/aa-project/${PORTNAME}/${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphics viewer for viewing netpbm format on console or X using aalib
diff --git a/graphics/cbrpager/Makefile b/graphics/cbrpager/Makefile
index 5e1b1926d9a6..0b828c86abce 100644
--- a/graphics/cbrpager/Makefile
+++ b/graphics/cbrpager/Makefile
@@ -7,9 +7,9 @@ PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		SF/nemysisfreebsdp/${CATEGORIES}/:icons
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}.png:icons
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Viewer for cbr (comic book archive) files
diff --git a/graphics/cbviewer/Makefile b/graphics/cbviewer/Makefile
index 2757a7d1519b..5341d6b962e2 100644
--- a/graphics/cbviewer/Makefile
+++ b/graphics/cbviewer/Makefile
@@ -7,10 +7,10 @@ PORTREVISION=	2
 CATEGORIES=	graphics java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/CBViewer%200.8/ \
 		SF/nemysisfreebsdp/graphics/:icons
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}.png:icons
 DIST_SUBDIR=	${PORTNAME}
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Comic book viewer for comic book archives in cbz, cbr, zip, rar
diff --git a/graphics/pencil/Makefile b/graphics/pencil/Makefile
index 0cb6742a4dac..0665018b07f9 100644
--- a/graphics/pencil/Makefile
+++ b/graphics/pencil/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.4.4b
 PORTREVISION=	13
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}-planner/Pencil/${PORTVERSION}eta
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFFIX}
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Pencil - a traditional 2D animation software
diff --git a/graphics/phplot/Makefile b/graphics/phplot/Makefile
index f7471a1a670c..46d951efbfaa 100644
--- a/graphics/phplot/Makefile
+++ b/graphics/phplot/Makefile
@@ -5,9 +5,9 @@ PORTNAME=	phplot
 PORTVERSION=	6.1.0
 PORTREVISION=	2
 CATEGORIES=	graphics www
-MASTER_SITES=	SF:source1 \
+MASTER_SITES=	SF \
 		SF/${PORTNAME}/Manual/20130511:source2
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:source1 \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}docs-20130511.zip:source2
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/graphics/ppsei/Makefile b/graphics/ppsei/Makefile
index 70b7abf686e5..dcacaf887457 100644
--- a/graphics/ppsei/Makefile
+++ b/graphics/ppsei/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	ppsei
 PORTVERSION=	0.3
 CATEGORIES=	graphics
 MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}-${PORTVERSION}.src
-EXTRACT_SUFX=	.tgz
+EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	PowerPoint images extractor
diff --git a/graphics/py-goocanvas/Makefile b/graphics/py-goocanvas/Makefile
index b68648f99a08..0e369ad104f6 100644
--- a/graphics/py-goocanvas/Makefile
+++ b/graphics/py-goocanvas/Makefile
@@ -6,8 +6,7 @@ PORTNAME=	goocanvas
 PORTVERSION=	0.14.1
 PORTREVISION=	5
 CATEGORIES=	graphics python
-MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	sources/py${PORTNAME}/${PORTVERSION:C/..$//}
+MASTER_SITES=	GNOME/sources/py${PORTNAME}/${PORTVERSION:C/..$//}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	py${PORTNAME}-${PORTVERSION}
 
diff --git a/graphics/ruby-svg/Makefile b/graphics/ruby-svg/Makefile
index e0686271d16e..4215a9957f2c 100644
--- a/graphics/ruby-svg/Makefile
+++ b/graphics/ruby-svg/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	svg
 PORTVERSION=	1.0.3
 CATEGORIES=	graphics ruby
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	ruby-svg/2288
+MASTER_SITES=	SFJP/ruby-svg/2288
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
diff --git a/graphics/truevision/Makefile b/graphics/truevision/Makefile
index 66b3ca11aa02..a8de6444c07c 100644
--- a/graphics/truevision/Makefile
+++ b/graphics/truevision/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	truevision
-PORTVERSION=	0.5.5.2
+DISTVERSION=	0.5.5-2
 PORTREVISION=	10
 CATEGORIES=	graphics
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20sources/0.5.5
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20sources/${PORTVERSION:R}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNOME 3D modeler