11 files changed, 11 insertions, 12 deletions

diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index bcc12e4bb248..76e7a1a65caf 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	dia
 PORTVERSION=	0.90
 CATEGORIES+=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/dia
+MASTER_SITE_SUBDIR=	sources/dia/0.90
 
 MAINTAINER?=	gnome@FreeBSD.org
 
diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile
index 1cc997001d11..bb195603d6e4 100644
--- a/graphics/electriceyes/Makefile
+++ b/graphics/electriceyes/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	electriceyes
 PORTVERSION=	0.3.12
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/ee
+MASTER_SITE_SUBDIR=	sources/ee/0.3
 DISTNAME=	ee-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index a357d3ee2594..d9c836313c91 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.6
 PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	unstable/sources/eog
+MASTER_SITE_SUBDIR=	sources/eog/0.6
 
 MAINTAINER=	gnome@FreeBSD.org
 
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 61717601a7b1..a83eced459ba 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	eog2
 PORTVERSION=	1.0.3
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.1/sources/${PORTNAME:S/2$//}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/1.0
 DISTNAME=	eog-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index c5adee6dc3ae..69ea8c732ea8 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -9,7 +9,7 @@ PORTNAME?=	gdk-pixbuf
 PORTVERSION=	0.18.0
 CATEGORIES?=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	unstable/sources/gdk-pixbuf
+MASTER_SITE_SUBDIR=	sources/gdk-pixbuf/0.18
 DISTNAME=	gdk-pixbuf-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 918b9116a8d4..713facbd1d90 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.9.14
 PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/imlib
+MASTER_SITE_SUBDIR=	sources/imlib/1.9
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -24,7 +24,6 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gtk12
-USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/imlib --disable-modules \
diff --git a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile
index 3dfcbe18c514..7e472fe7eb43 100644
--- a/graphics/libart_lgpl/Makefile
+++ b/graphics/libart_lgpl/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libart_lgpl2
 PORTVERSION=	2.3.10
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.0/sources/${PORTNAME:S/2$//}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.3
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/graphics/libart_lgpl2/Makefile b/graphics/libart_lgpl2/Makefile
index 3dfcbe18c514..7e472fe7eb43 100644
--- a/graphics/libart_lgpl2/Makefile
+++ b/graphics/libart_lgpl2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libart_lgpl2
 PORTVERSION=	2.3.10
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.0/sources/${PORTNAME:S/2$//}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.3
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 30ded4d286b2..c161b09892be 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libgnomecanvas
 PORTVERSION=	2.0.4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.1/sources/${PORTNAME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index 613a7f06a474..973285ff1e07 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.0.3
 PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/librsvg
+MASTER_SITE_SUBDIR=	sources/librsvg/1.0
 
 MAINTAINER=	gnome@FreeBSD.org
 
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index b6062821d72a..5effe902d47b 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	librsvg2
 PORTVERSION=	2.0.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.0/sources/${PORTNAME:S/2$//}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.0
 DIST_SUBDIR=	gnome2
 DISTNAME=	librsvg-${PORTVERSION}