43 files changed, 86 insertions, 86 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 8a17ad7c6c90..85b64eda6d1e 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -3,14 +3,14 @@
 # Date created:				20 January 1999
 # Whom:					Jeremy Lea <reg@shale.csir.co.za>
 #
-# $Id: $
+# $Id: Makefile,v 1.1.1.1 1999/03/09 01:22:43 nectar Exp $
 #
 
 DISTNAME=	gnome-media-1.0.1
 PKGNAME=	gnomemedia-1.0.1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-1.0/sources
+MASTER_SITE_SUBDIR=	sources/gnome-media
 
 MAINTAINER=	reg@shale.csir.co.za
 
diff --git a/audio/gnomemedia/Makefile b/audio/gnomemedia/Makefile
index 8a17ad7c6c90..85b64eda6d1e 100644
--- a/audio/gnomemedia/Makefile
+++ b/audio/gnomemedia/Makefile
@@ -3,14 +3,14 @@
 # Date created:				20 January 1999
 # Whom:					Jeremy Lea <reg@shale.csir.co.za>
 #
-# $Id: $
+# $Id: Makefile,v 1.1.1.1 1999/03/09 01:22:43 nectar Exp $
 #
 
 DISTNAME=	gnome-media-1.0.1
 PKGNAME=	gnomemedia-1.0.1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-1.0/sources
+MASTER_SITE_SUBDIR=	sources/gnome-media
 
 MAINTAINER=	reg@shale.csir.co.za
 
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index 8a17ad7c6c90..85b64eda6d1e 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -3,14 +3,14 @@
 # Date created:				20 January 1999
 # Whom:					Jeremy Lea <reg@shale.csir.co.za>
 #
-# $Id: $
+# $Id: Makefile,v 1.1.1.1 1999/03/09 01:22:43 nectar Exp $
 #
 
 DISTNAME=	gnome-media-1.0.1
 PKGNAME=	gnomemedia-1.0.1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-1.0/sources
+MASTER_SITE_SUBDIR=	sources/gnome-media
 
 MAINTAINER=	reg@shale.csir.co.za
 
diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
index 9457990217d2..69b2c350b7b9 100644
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@@ -3,14 +3,14 @@
 # Date created:				22 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1999/01/27 08:31:48 fenner Exp $
+# $Id: Makefile,v 1.3 1999/03/09 01:08:48 nectar Exp $
 #
 
 DISTNAME=	audiofile-0.1.6
 PKGNAME=	libaudiofile-0.1.6
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-1.0/sources
+MASTER_SITE_SUBDIR=	sources/libaudiofile
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile
index 78e51b04fe45..e23d387bb3cd 100644
--- a/deskutils/gnome-pim/Makefile
+++ b/deskutils/gnome-pim/Makefile
@@ -3,14 +3,14 @@
 # Date created:				17 Jan 1999
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.5 1999/03/09 01:08:48 nectar Exp $
+# $Id: Makefile,v 1.6 1999/03/27 10:35:55 vanilla Exp $
 #
 
 DISTNAME=	gnome-pim-1.0.1
 PKGNAME=	gnomepim-1.0.1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-pim
+MASTER_SITE_SUBDIR=	sources/gnome-pim
 
 MAINTAINER=	nacai@iname.com
 
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 638052b77150..4d6dd9237df1 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -3,14 +3,14 @@
 # Date created:				03 July 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.6 1999/02/02 09:56:05 vanilla Exp $
+# $Id: Makefile,v 1.7 1999/03/09 01:09:00 nectar Exp $
 #
 
 DISTNAME=	gnome-utils-1.0.1
 PKGNAME=	gnomeutils-1.0.1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-1.0/sources
+MASTER_SITE_SUBDIR=	sources/gnome-utils
 
 MAINTAINER=	nacai@iname.com
 
diff --git a/deskutils/gnomepim/Makefile b/deskutils/gnomepim/Makefile
index 78e51b04fe45..e23d387bb3cd 100644
--- a/deskutils/gnomepim/Makefile
+++ b/deskutils/gnomepim/Makefile
@@ -3,14 +3,14 @@
 # Date created:				17 Jan 1999
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.5 1999/03/09 01:08:48 nectar Exp $
+# $Id: Makefile,v 1.6 1999/03/27 10:35:55 vanilla Exp $
 #
 
 DISTNAME=	gnome-pim-1.0.1
 PKGNAME=	gnomepim-1.0.1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-pim
+MASTER_SITE_SUBDIR=	sources/gnome-pim
 
 MAINTAINER=	nacai@iname.com
 
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index 638052b77150..4d6dd9237df1 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -3,14 +3,14 @@
 # Date created:				03 July 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.6 1999/02/02 09:56:05 vanilla Exp $
+# $Id: Makefile,v 1.7 1999/03/09 01:09:00 nectar Exp $
 #
 
 DISTNAME=	gnome-utils-1.0.1
 PKGNAME=	gnomeutils-1.0.1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-1.0/sources
+MASTER_SITE_SUBDIR=	sources/gnome-utils
 
 MAINTAINER=	nacai@iname.com
 
diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index 7317e7015572..8620a810ceaf 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -3,13 +3,13 @@
 # Date Created:			16 Aug 1998
 # Whom:				Chia-liang Kao <clkao@CirX.ORG>
 #
-# $Id: Makefile,v 1.14 1999/02/18 17:49:05 vanilla Exp $
+# $Id: Makefile,v 1.15 1999/03/09 01:08:50 nectar Exp $
 #
 
 DISTNAME=	ORBit-0.4.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	ORBit
+MASTER_SITE_SUBDIR=	sources/ORBit
 
 MAINTAINER=	clkao@CirX.ORG
 
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 7317e7015572..8620a810ceaf 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -3,13 +3,13 @@
 # Date Created:			16 Aug 1998
 # Whom:				Chia-liang Kao <clkao@CirX.ORG>
 #
-# $Id: Makefile,v 1.14 1999/02/18 17:49:05 vanilla Exp $
+# $Id: Makefile,v 1.15 1999/03/09 01:08:50 nectar Exp $
 #
 
 DISTNAME=	ORBit-0.4.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	ORBit
+MASTER_SITE_SUBDIR=	sources/ORBit
 
 MAINTAINER=	clkao@CirX.ORG
 
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 20c8a4d1930d..320b0f875865 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -3,13 +3,13 @@
 # Date Created:			26 Sep 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.16 1999/02/25 01:17:23 asami Exp $
+# $Id: Makefile,v 1.17 1999/03/09 01:08:53 nectar Exp $
 #
 
 DISTNAME=	libgtop-1.0.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-1.0/sources
+MASTER_SITE_SUBDIR=	sources/libgtop
 
 MAINTAINER=	nacai@iname.com
 
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 20c8a4d1930d..320b0f875865 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -3,13 +3,13 @@
 # Date Created:			26 Sep 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.16 1999/02/25 01:17:23 asami Exp $
+# $Id: Makefile,v 1.17 1999/03/09 01:08:53 nectar Exp $
 #
 
 DISTNAME=	libgtop-1.0.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-1.0/sources
+MASTER_SITE_SUBDIR=	sources/libgtop
 
 MAINTAINER=	nacai@iname.com
 
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 3d41cefdec38..357b6f690212 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -3,14 +3,14 @@
 # Date created:				03 July 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.13 1999/02/24 22:09:22 vanilla Exp $
+# $Id: Makefile,v 1.14 1999/03/09 01:08:56 nectar Exp $
 #
 
 DISTNAME=	gnome-games-1.0.1
 PKGNAME=	gnomegames-1.0.1
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-1.0/sources
+MASTER_SITE_SUBDIR=	sources/gnome-games
 
 MAINTAINER=	nacai@iname.com
 
diff --git a/games/gnomegames/Makefile b/games/gnomegames/Makefile
index 3d41cefdec38..357b6f690212 100644
--- a/games/gnomegames/Makefile
+++ b/games/gnomegames/Makefile
@@ -3,14 +3,14 @@
 # Date created:				03 July 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.13 1999/02/24 22:09:22 vanilla Exp $
+# $Id: Makefile,v 1.14 1999/03/09 01:08:56 nectar Exp $
 #
 
 DISTNAME=	gnome-games-1.0.1
 PKGNAME=	gnomegames-1.0.1
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-1.0/sources
+MASTER_SITE_SUBDIR=	sources/gnome-games
 
 MAINTAINER=	nacai@iname.com
 
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index 3d41cefdec38..357b6f690212 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -3,14 +3,14 @@
 # Date created:				03 July 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.13 1999/02/24 22:09:22 vanilla Exp $
+# $Id: Makefile,v 1.14 1999/03/09 01:08:56 nectar Exp $
 #
 
 DISTNAME=	gnome-games-1.0.1
 PKGNAME=	gnomegames-1.0.1
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-1.0/sources
+MASTER_SITE_SUBDIR=	sources/gnome-games
 
 MAINTAINER=	nacai@iname.com
 
diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile
index ba5b6688ecb0..250c8f22a3f6 100644
--- a/graphics/electriceyes/Makefile
+++ b/graphics/electriceyes/Makefile
@@ -3,14 +3,14 @@
 # Date created:				21 August 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.11 1999/02/24 22:04:23 vanilla Exp $
+# $Id: Makefile,v 1.12 1999/03/09 01:08:57 nectar Exp $
 #
 
 DISTNAME=	ee-0.3.8
 PKGNAME=	electriceyes-0.3.8
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-1.0/sources
+MASTER_SITE_SUBDIR=	sources/ee
 
 MAINTAINER=	nacai@iname.com
 
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 058865785013..34e677e1137e 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -3,13 +3,13 @@
 # Date created:		10 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.45 1999/03/09 01:08:57 nectar Exp $
+# $Id: Makefile,v 1.46 1999/03/27 10:35:57 vanilla Exp $
 #
 
 DISTNAME=	imlib-1.9.4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	imlib
+MASTER_SITE_SUBDIR=	sources/imlib
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile
index 058865785013..34e677e1137e 100644
--- a/graphics/imlib2-tmp/Makefile
+++ b/graphics/imlib2-tmp/Makefile
@@ -3,13 +3,13 @@
 # Date created:		10 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.45 1999/03/09 01:08:57 nectar Exp $
+# $Id: Makefile,v 1.46 1999/03/27 10:35:57 vanilla Exp $
 #
 
 DISTNAME=	imlib-1.9.4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	imlib
+MASTER_SITE_SUBDIR=	sources/imlib
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 058865785013..34e677e1137e 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -3,13 +3,13 @@
 # Date created:		10 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.45 1999/03/09 01:08:57 nectar Exp $
+# $Id: Makefile,v 1.46 1999/03/27 10:35:57 vanilla Exp $
 #
 
 DISTNAME=	imlib-1.9.4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	imlib
+MASTER_SITE_SUBDIR=	sources/imlib
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 19263d94b096..2d3423f64fa1 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -3,13 +3,13 @@
 # Date created:				08 October 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.8 1999/03/09 01:08:59 nectar Exp $
+# $Id: Makefile,v 1.9 1999/03/26 04:48:08 nectar Exp $
 #
 
 DISTNAME=	gnumeric-0.18
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-1.0/sources
+MASTER_SITE_SUBDIR=	sources/gnumeric
 
 MAINTAINER=	nacai@iname.com
 
diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index 19263d94b096..2d3423f64fa1 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -3,13 +3,13 @@
 # Date created:				08 October 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.8 1999/03/09 01:08:59 nectar Exp $
+# $Id: Makefile,v 1.9 1999/03/26 04:48:08 nectar Exp $
 #
 
 DISTNAME=	gnumeric-0.18
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-1.0/sources
+MASTER_SITE_SUBDIR=	sources/gnumeric
 
 MAINTAINER=	nacai@iname.com
 
diff --git a/misc/gnomeutils/Makefile b/misc/gnomeutils/Makefile
index 638052b77150..4d6dd9237df1 100644
--- a/misc/gnomeutils/Makefile
+++ b/misc/gnomeutils/Makefile
@@ -3,14 +3,14 @@
 # Date created:				03 July 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.6 1999/02/02 09:56:05 vanilla Exp $
+# $Id: Makefile,v 1.7 1999/03/09 01:09:00 nectar Exp $
 #
 
 DISTNAME=	gnome-utils-1.0.1
 PKGNAME=	gnomeutils-1.0.1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-1.0/sources
+MASTER_SITE_SUBDIR=	sources/gnome-utils
 
 MAINTAINER=	nacai@iname.com
 
diff --git a/misc/gnomeutils2/Makefile b/misc/gnomeutils2/Makefile
index 638052b77150..4d6dd9237df1 100644
--- a/misc/gnomeutils2/Makefile
+++ b/misc/gnomeutils2/Makefile
@@ -3,14 +3,14 @@
 # Date created:				03 July 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.6 1999/02/02 09:56:05 vanilla Exp $
+# $Id: Makefile,v 1.7 1999/03/09 01:09:00 nectar Exp $
 #
 
 DISTNAME=	gnome-utils-1.0.1
 PKGNAME=	gnomeutils-1.0.1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-1.0/sources
+MASTER_SITE_SUBDIR=	sources/gnome-utils
 
 MAINTAINER=	nacai@iname.com
 
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index ab875f1ee11e..563f06383d55 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -3,13 +3,13 @@
 # Date created:		15 Jul 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.29 1999/03/15 04:39:10 nectar Exp $
+# $Id: Makefile,v 1.30 1999/03/19 04:39:58 nectar Exp $
 #
 
 DISTNAME=	mc-4.5.23
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-1.0/sources
+MASTER_SITE_SUBDIR=	sources/mc
 
 MAINTAINER=	reg@shale.csir.co.za
 
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index 8b476d0057ee..f6f9fb8b4eb7 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -3,13 +3,13 @@
 # Date created:				21 August 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.4 1999/01/27 08:31:51 fenner Exp $
+# $Id: Makefile,v 1.5 1999/02/02 13:04:05 vanilla Exp $
 #
 
 DISTNAME=	ggv-0.26
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	ggv
+MASTER_SITE_SUBDIR=	sources/ggv
 
 MAINTAINER=	nacai@iname.com
 
diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index 8b476d0057ee..f6f9fb8b4eb7 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -3,13 +3,13 @@
 # Date created:				21 August 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.4 1999/01/27 08:31:51 fenner Exp $
+# $Id: Makefile,v 1.5 1999/02/02 13:04:05 vanilla Exp $
 #
 
 DISTNAME=	ggv-0.26
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	ggv
+MASTER_SITE_SUBDIR=	sources/ggv
 
 MAINTAINER=	nacai@iname.com
 
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 3a68878cc7dd..47397038cf20 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -3,14 +3,14 @@
 # Date created:				15 Jan 1999
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1999/01/27 08:31:52 fenner Exp $
+# $Id: Makefile,v 1.3 1999/02/02 14:17:53 vanilla Exp $
 #
 
 DISTNAME=	gnome-print-0.0.3
 PKGNAME=	gnomeprint-0.0.3
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-print
+MASTER_SITE_SUBDIR=	sources/gnome-print
 
 MAINTAINER=	nacai@iname.com
 
diff --git a/print/gnomeprint/Makefile b/print/gnomeprint/Makefile
index 3a68878cc7dd..47397038cf20 100644
--- a/print/gnomeprint/Makefile
+++ b/print/gnomeprint/Makefile
@@ -3,14 +3,14 @@
 # Date created:				15 Jan 1999
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1999/01/27 08:31:52 fenner Exp $
+# $Id: Makefile,v 1.3 1999/02/02 14:17:53 vanilla Exp $
 #
 
 DISTNAME=	gnome-print-0.0.3
 PKGNAME=	gnomeprint-0.0.3
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-print
+MASTER_SITE_SUBDIR=	sources/gnome-print
 
 MAINTAINER=	nacai@iname.com
 
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 3a68878cc7dd..47397038cf20 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -3,14 +3,14 @@
 # Date created:				15 Jan 1999
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1999/01/27 08:31:52 fenner Exp $
+# $Id: Makefile,v 1.3 1999/02/02 14:17:53 vanilla Exp $
 #
 
 DISTNAME=	gnome-print-0.0.3
 PKGNAME=	gnomeprint-0.0.3
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-print
+MASTER_SITE_SUBDIR=	sources/gnome-print
 
 MAINTAINER=	nacai@iname.com
 
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 232c7066c4fc..79215d56a128 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,14 +3,14 @@
 # Date created:				29 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.7 1999/03/15 02:05:53 nectar Exp $
+# $Id: Makefile,v 1.8 1999/03/27 10:35:54 vanilla Exp $
 #
 
 DISTNAME=	control-center-1.0.2
 PKGNAME=	gnomecontrolcenter-1.0.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	control-center
+MASTER_SITE_SUBDIR=	sources/control-center
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile
index 232c7066c4fc..79215d56a128 100644
--- a/sysutils/gnome-control-center1/Makefile
+++ b/sysutils/gnome-control-center1/Makefile
@@ -3,14 +3,14 @@
 # Date created:				29 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.7 1999/03/15 02:05:53 nectar Exp $
+# $Id: Makefile,v 1.8 1999/03/27 10:35:54 vanilla Exp $
 #
 
 DISTNAME=	control-center-1.0.2
 PKGNAME=	gnomecontrolcenter-1.0.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	control-center
+MASTER_SITE_SUBDIR=	sources/control-center
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 1915b37f6850..99065bc786d8 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -3,13 +3,13 @@
 # Date created:				28 September 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.7 1999/02/02 14:19:19 vanilla Exp $
+# $Id: Makefile,v 1.8 1999/03/09 01:09:02 nectar Exp $
 #
 
 DISTNAME=	gtop-1.0.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-1.0/sources
+MASTER_SITE_SUBDIR=	sources/gtop
 
 MAINTAINER=	nacai@iname.com
 
diff --git a/sysutils/gnomecontrolcenter/Makefile b/sysutils/gnomecontrolcenter/Makefile
index 232c7066c4fc..79215d56a128 100644
--- a/sysutils/gnomecontrolcenter/Makefile
+++ b/sysutils/gnomecontrolcenter/Makefile
@@ -3,14 +3,14 @@
 # Date created:				29 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.7 1999/03/15 02:05:53 nectar Exp $
+# $Id: Makefile,v 1.8 1999/03/27 10:35:54 vanilla Exp $
 #
 
 DISTNAME=	control-center-1.0.2
 PKGNAME=	gnomecontrolcenter-1.0.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	control-center
+MASTER_SITE_SUBDIR=	sources/control-center
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 232c7066c4fc..79215d56a128 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -3,14 +3,14 @@
 # Date created:				29 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.7 1999/03/15 02:05:53 nectar Exp $
+# $Id: Makefile,v 1.8 1999/03/27 10:35:54 vanilla Exp $
 #
 
 DISTNAME=	control-center-1.0.2
 PKGNAME=	gnomecontrolcenter-1.0.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	control-center
+MASTER_SITE_SUBDIR=	sources/control-center
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index 1915b37f6850..99065bc786d8 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -3,13 +3,13 @@
 # Date created:				28 September 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.7 1999/02/02 14:19:19 vanilla Exp $
+# $Id: Makefile,v 1.8 1999/03/09 01:09:02 nectar Exp $
 #
 
 DISTNAME=	gtop-1.0.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-1.0/sources
+MASTER_SITE_SUBDIR=	sources/gtop
 
 MAINTAINER=	nacai@iname.com
 
diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile
index 1915b37f6850..99065bc786d8 100644
--- a/sysutils/gtop/Makefile
+++ b/sysutils/gtop/Makefile
@@ -3,13 +3,13 @@
 # Date created:				28 September 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.7 1999/02/02 14:19:19 vanilla Exp $
+# $Id: Makefile,v 1.8 1999/03/09 01:09:02 nectar Exp $
 #
 
 DISTNAME=	gtop-1.0.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-1.0/sources
+MASTER_SITE_SUBDIR=	sources/gtop
 
 MAINTAINER=	nacai@iname.com
 
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index ef30bc49cb32..d6ce83682e2b 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -3,13 +3,13 @@
 # Date created:				28 September 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.7 1999/02/24 22:12:09 vanilla Exp $
+# $Id: Makefile,v 1.8 1999/03/09 01:09:03 nectar Exp $
 #
 
 DISTNAME=	libxml-1.0.0
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-1.0/sources
+MASTER_SITE_SUBDIR=	sources/libxml
 
 MAINTAINER=	nacai@iname.com
 
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index ef30bc49cb32..d6ce83682e2b 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -3,13 +3,13 @@
 # Date created:				28 September 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.7 1999/02/24 22:12:09 vanilla Exp $
+# $Id: Makefile,v 1.8 1999/03/09 01:09:03 nectar Exp $
 #
 
 DISTNAME=	libxml-1.0.0
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-1.0/sources
+MASTER_SITE_SUBDIR=	sources/libxml
 
 MAINTAINER=	nacai@iname.com
 
diff --git a/x11-fm/gnomemc/Makefile b/x11-fm/gnomemc/Makefile
index df1ef6181c4c..2f678e1fb66b 100644
--- a/x11-fm/gnomemc/Makefile
+++ b/x11-fm/gnomemc/Makefile
@@ -3,14 +3,14 @@
 # Date created:		26 Jnuary 1999
 # Whom:			Jeremy Lea <reg@shale.csir.co.za>
 #
-# $Id: Makefile,v 1.2 1999/02/12 02:33:17 asami Exp $
+# $Id: Makefile,v 1.3 1999/03/09 01:09:06 nectar Exp $
 #
 
 DISTNAME=	mc-4.5.23
 PKGNAME=	gnomemc-4.5.23
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-1.0/sources
+MASTER_SITE_SUBDIR=	sources/mc
 
 MAINTAINER=	reg@shale.csir.co.za
 
diff --git a/x11-themes/gtk-engines/Makefile b/x11-themes/gtk-engines/Makefile
index 6619641319f5..ccafe5b284fe 100644
--- a/x11-themes/gtk-engines/Makefile
+++ b/x11-themes/gtk-engines/Makefile
@@ -3,13 +3,13 @@
 # Date Created:				23 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.9 1999/03/15 18:30:06 nectar Exp $
+# $Id: Makefile,v 1.10 1999/03/27 10:35:56 vanilla Exp $
 #
 
 DISTNAME=	gtk-engines-0.5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gtk-engines
+MASTER_SITE_SUBDIR=	sources/gtk-engines
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index 6619641319f5..ccafe5b284fe 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -3,13 +3,13 @@
 # Date Created:				23 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.9 1999/03/15 18:30:06 nectar Exp $
+# $Id: Makefile,v 1.10 1999/03/27 10:35:56 vanilla Exp $
 #
 
 DISTNAME=	gtk-engines-0.5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gtk-engines
+MASTER_SITE_SUBDIR=	sources/gtk-engines
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
diff --git a/x11-toolkits/gtk-engines/Makefile b/x11-toolkits/gtk-engines/Makefile
index 6619641319f5..ccafe5b284fe 100644
--- a/x11-toolkits/gtk-engines/Makefile
+++ b/x11-toolkits/gtk-engines/Makefile
@@ -3,13 +3,13 @@
 # Date Created:				23 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.9 1999/03/15 18:30:06 nectar Exp $
+# $Id: Makefile,v 1.10 1999/03/27 10:35:56 vanilla Exp $
 #
 
 DISTNAME=	gtk-engines-0.5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gtk-engines
+MASTER_SITE_SUBDIR=	sources/gtk-engines
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
diff --git a/x11-toolkits/gtk-engines2/Makefile b/x11-toolkits/gtk-engines2/Makefile
index 6619641319f5..ccafe5b284fe 100644
--- a/x11-toolkits/gtk-engines2/Makefile
+++ b/x11-toolkits/gtk-engines2/Makefile
@@ -3,13 +3,13 @@
 # Date Created:				23 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.9 1999/03/15 18:30:06 nectar Exp $
+# $Id: Makefile,v 1.10 1999/03/27 10:35:56 vanilla Exp $
 #
 
 DISTNAME=	gtk-engines-0.5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gtk-engines
+MASTER_SITE_SUBDIR=	sources/gtk-engines
 
 MAINTAINER=	vanilla@FreeBSD.ORG