14 files changed, 35 insertions, 21 deletions

diff --git a/x11-toolkits/gnome--/Makefile b/x11-toolkits/gnome--/Makefile
index dd047e31c80a..810ab7cc76dc 100644
--- a/x11-toolkits/gnome--/Makefile
+++ b/x11-toolkits/gnome--/Makefile
@@ -8,14 +8,16 @@
 PORTNAME=	gnomemm
 PORTVERSION=	1.2.2
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gtkmm
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	stable/sources/gnomemm
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk--
 BUILD_DEPENDS=	m4:${PORTSDIR}/devel/m4
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
diff --git a/x11-toolkits/gnome--/distinfo b/x11-toolkits/gnome--/distinfo
index 8bf32708245c..6fcb764dccf8 100644
--- a/x11-toolkits/gnome--/distinfo
+++ b/x11-toolkits/gnome--/distinfo
@@ -1 +1 @@
-MD5 (gnomemm-1.2.2.tar.gz) = 2a45f162a68cd4b42881fb72a1dc528e
+MD5 (gnome/gnomemm-1.2.2.tar.bz2) = 22d2460dbb083dfc0de2e94b6365fb3a
diff --git a/x11-toolkits/gtk--/Makefile b/x11-toolkits/gtk--/Makefile
index 2bd9b7cc2932..a697af900ee2 100644
--- a/x11-toolkits/gtk--/Makefile
+++ b/x11-toolkits/gtk--/Makefile
@@ -8,14 +8,16 @@
 PORTNAME=	gtkmm
 PORTVERSION=	1.2.8
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	stable/sources/gtkmm
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	sigc.1:${PORTSDIR}/devel/libsigc++
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 USE_GMAKE=	yes
diff --git a/x11-toolkits/gtk--/distinfo b/x11-toolkits/gtk--/distinfo
index 039952b6f879..503c38aa6aa2 100644
--- a/x11-toolkits/gtk--/distinfo
+++ b/x11-toolkits/gtk--/distinfo
@@ -1 +1 @@
-MD5 (gtkmm-1.2.8.tar.gz) = 9cefb49cb93f04f39508b92b390b5980
+MD5 (gnome/gtkmm-1.2.8.tar.bz2) = 0dfcf7df4825379cb42cf6ef93c0387c
diff --git a/x11-toolkits/gtk--2/Makefile b/x11-toolkits/gtk--2/Makefile
index 2bd9b7cc2932..a697af900ee2 100644
--- a/x11-toolkits/gtk--2/Makefile
+++ b/x11-toolkits/gtk--2/Makefile
@@ -8,14 +8,16 @@
 PORTNAME=	gtkmm
 PORTVERSION=	1.2.8
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	stable/sources/gtkmm
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	sigc.1:${PORTSDIR}/devel/libsigc++
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 USE_GMAKE=	yes
diff --git a/x11-toolkits/gtk--2/distinfo b/x11-toolkits/gtk--2/distinfo
index 039952b6f879..503c38aa6aa2 100644
--- a/x11-toolkits/gtk--2/distinfo
+++ b/x11-toolkits/gtk--2/distinfo
@@ -1 +1 @@
-MD5 (gtkmm-1.2.8.tar.gz) = 9cefb49cb93f04f39508b92b390b5980
+MD5 (gnome/gtkmm-1.2.8.tar.bz2) = 0dfcf7df4825379cb42cf6ef93c0387c
diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile
index 2bd9b7cc2932..a697af900ee2 100644
--- a/x11-toolkits/gtkmm12/Makefile
+++ b/x11-toolkits/gtkmm12/Makefile
@@ -8,14 +8,16 @@
 PORTNAME=	gtkmm
 PORTVERSION=	1.2.8
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	stable/sources/gtkmm
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	sigc.1:${PORTSDIR}/devel/libsigc++
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 USE_GMAKE=	yes
diff --git a/x11-toolkits/gtkmm12/distinfo b/x11-toolkits/gtkmm12/distinfo
index 039952b6f879..503c38aa6aa2 100644
--- a/x11-toolkits/gtkmm12/distinfo
+++ b/x11-toolkits/gtkmm12/distinfo
@@ -1 +1 @@
-MD5 (gtkmm-1.2.8.tar.gz) = 9cefb49cb93f04f39508b92b390b5980
+MD5 (gnome/gtkmm-1.2.8.tar.bz2) = 0dfcf7df4825379cb42cf6ef93c0387c
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index 2bd9b7cc2932..a697af900ee2 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -8,14 +8,16 @@
 PORTNAME=	gtkmm
 PORTVERSION=	1.2.8
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	stable/sources/gtkmm
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	sigc.1:${PORTSDIR}/devel/libsigc++
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 USE_GMAKE=	yes
diff --git a/x11-toolkits/gtkmm20/distinfo b/x11-toolkits/gtkmm20/distinfo
index 039952b6f879..503c38aa6aa2 100644
--- a/x11-toolkits/gtkmm20/distinfo
+++ b/x11-toolkits/gtkmm20/distinfo
@@ -1 +1 @@
-MD5 (gtkmm-1.2.8.tar.gz) = 9cefb49cb93f04f39508b92b390b5980
+MD5 (gnome/gtkmm-1.2.8.tar.bz2) = 0dfcf7df4825379cb42cf6ef93c0387c
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 2bd9b7cc2932..a697af900ee2 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -8,14 +8,16 @@
 PORTNAME=	gtkmm
 PORTVERSION=	1.2.8
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	stable/sources/gtkmm
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	sigc.1:${PORTSDIR}/devel/libsigc++
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 USE_GMAKE=	yes
diff --git a/x11-toolkits/gtkmm24/distinfo b/x11-toolkits/gtkmm24/distinfo
index 039952b6f879..503c38aa6aa2 100644
--- a/x11-toolkits/gtkmm24/distinfo
+++ b/x11-toolkits/gtkmm24/distinfo
@@ -1 +1 @@
-MD5 (gtkmm-1.2.8.tar.gz) = 9cefb49cb93f04f39508b92b390b5980
+MD5 (gnome/gtkmm-1.2.8.tar.bz2) = 0dfcf7df4825379cb42cf6ef93c0387c
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 2bd9b7cc2932..a697af900ee2 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -8,14 +8,16 @@
 PORTNAME=	gtkmm
 PORTVERSION=	1.2.8
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	stable/sources/gtkmm
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	sigc.1:${PORTSDIR}/devel/libsigc++
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 USE_GMAKE=	yes
diff --git a/x11-toolkits/gtkmm30/distinfo b/x11-toolkits/gtkmm30/distinfo
index 039952b6f879..503c38aa6aa2 100644
--- a/x11-toolkits/gtkmm30/distinfo
+++ b/x11-toolkits/gtkmm30/distinfo
@@ -1 +1 @@
-MD5 (gtkmm-1.2.8.tar.gz) = 9cefb49cb93f04f39508b92b390b5980
+MD5 (gnome/gtkmm-1.2.8.tar.bz2) = 0dfcf7df4825379cb42cf6ef93c0387c