Minor update in where the files are fetched from. Maybe now

I will stop getting "Unfetchable distfiles" message for files that
do get fetched in the real-world (tm).  Suggested by sf, and changed.

Also update i386-rtems-g77/Makefile: s/F77/G77/g

Submitted by:	FUJISHIMA Satsuki <sf@FreeBSD.org>

6 files changed, 16 insertions, 16 deletions

diff --git a/devel/i386-rtems-chill/Makefile b/devel/i386-rtems-chill/Makefile
index 0ce5addd068a..f35c08b6564b 100644
--- a/devel/i386-rtems-chill/Makefile
+++ b/devel/i386-rtems-chill/Makefile
@@ -10,8 +10,8 @@ PORTVERSION=	2.95.3
 PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR=	newlib
-DISTFILES=	${CHILLNAME}.tar.gz ${NEWLIBNAME}.tar.gz
+MASTER_SITE_SUBDIR=	newlib gcc/releases/${CHILLNAME}
+DISTFILES=	${NEWLIBNAME}.tar.gz ${CHILLNAME}.tar.gz 
 PATCHFILES=	${CHILLNAME}-rtems-20010622a.diff \
 		${NEWLIBNAME}-rtems-20010622.diff
 PATCH_SITES=	ftp://ftp.oarcorp.com/pub/rtems/snapshots/c_tools/source/ \
diff --git a/devel/i386-rtems-g77/Makefile b/devel/i386-rtems-g77/Makefile
index 1d714f982868..dc8b32510296 100644
--- a/devel/i386-rtems-g77/Makefile
+++ b/devel/i386-rtems-g77/Makefile
@@ -10,9 +10,9 @@ PORTVERSION=	2.95.3
 PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR=	newlib
-DISTFILES=	${F77NAME}.tar.gz ${NEWLIBNAME}.tar.gz
-PATCHFILES=	${F77NAME}-rtems-20010622a.diff \
+MASTER_SITE_SUBDIR=	newlib gcc/releases/${G77NAME}
+DISTFILES=	${NEWLIBNAME}.tar.gz ${G77NAME}.tar.gz 
+PATCHFILES=	${G77NAME}-rtems-20010622a.diff \
 		${NEWLIBNAME}-rtems-20010622.diff
 PATCH_SITES=	ftp://ftp.oarcorp.com/pub/rtems/snapshots/c_tools/source/ \
 		http://rtems.thehousleys.net/
@@ -21,7 +21,7 @@ MAINTAINER=	jeh@FreeBSD.org
 
 LCLTARGET?=	i386-rtems
 
-F77NAME=	gcc-2.95.3
+G77NAME=	gcc-2.95.3
 NEWLIBNAME=	newlib-1.9.0
 MASTERDIR=	${.CURDIR}/../i386-rtems-g77
 PLIST=		${PKGDIR}/pkg-plist.${LCLTARGET}
@@ -40,7 +40,7 @@ CONFIGURE_TARGET?=	--target=${LCLTARGET}
 CONFIGURE_ARGS?=	--with-gnu-as --with-gnu-ld --with-newlib --verbose \
 			--enable-languages="f77"
 CONFIGURE_WRKSRC?=	${WRKDIR}/build-${LCLTARGET}
-CONFIGURE_SCRIPT?=	../${F77NAME}/configure
+CONFIGURE_SCRIPT?=	../${G77NAME}/configure
 
 PATCH_WRKSRC=		${WRKDIR}
 PATCH_STRIP=		-p
@@ -49,7 +49,7 @@ MAKE_FLAGS=	LANGUAGES="f77"
 
 pre-configure:
 	@(cd ${WRKDIR} ; \
-	cd ${F77NAME} ; ${LN} -fs ../${NEWLIBNAME}/newlib . ; \
+	cd ${G77NAME} ; ${LN} -fs ../${NEWLIBNAME}/newlib . ; \
 	cd .. ; \
 	${MKDIR} build-${LCLTARGET})
 
diff --git a/devel/i386-rtems-gcc/Makefile b/devel/i386-rtems-gcc/Makefile
index d2b7adc73267..74b6c326b6e2 100644
--- a/devel/i386-rtems-gcc/Makefile
+++ b/devel/i386-rtems-gcc/Makefile
@@ -10,8 +10,8 @@ PORTVERSION=	2.95.3
 PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR=	newlib
-DISTFILES=	${GCCNAME}.tar.gz ${NEWLIBNAME}.tar.gz
+MASTER_SITE_SUBDIR=	newlib gcc/releases/${GCCNAME}
+DISTFILES=	${NEWLIBNAME}.tar.gz ${GCCNAME}.tar.gz
 PATCHFILES=	${GCCNAME}-rtems-20010622a.diff \
 		${NEWLIBNAME}-rtems-20010622.diff
 PATCH_SITES=	ftp://ftp.oarcorp.com/pub/rtems/snapshots/c_tools/source/ \
diff --git a/devel/i386-rtems-gcj/Makefile b/devel/i386-rtems-gcj/Makefile
index 6a72860c5c8b..3efae046a7f5 100644
--- a/devel/i386-rtems-gcj/Makefile
+++ b/devel/i386-rtems-gcj/Makefile
@@ -10,8 +10,8 @@ PORTVERSION=	2.95.3
 PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR=	newlib
-DISTFILES=	${JAVANAME}.tar.gz ${NEWLIBNAME}.tar.gz
+MASTER_SITE_SUBDIR=	newlib gcc/releases/${JAVANAME}
+DISTFILES=	${NEWLIBNAME}.tar.gz ${JAVANAME}.tar.gz 
 PATCHFILES=	${JAVANAME}-rtems-20010622a.diff \
 		${NEWLIBNAME}-rtems-20010622.diff
 PATCH_SITES=	ftp://ftp.oarcorp.com/pub/rtems/snapshots/c_tools/source/ \
diff --git a/devel/i386-rtems-objc/Makefile b/devel/i386-rtems-objc/Makefile
index 3c59beb4f298..f5efeb16fb0e 100644
--- a/devel/i386-rtems-objc/Makefile
+++ b/devel/i386-rtems-objc/Makefile
@@ -10,8 +10,8 @@ PORTVERSION=	2.95.3
 PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR=	newlib
-DISTFILES=	${OBJCNAME}.tar.gz ${NEWLIBNAME}.tar.gz
+MASTER_SITE_SUBDIR=	newlib gcc/releases/${OBJCNAME}
+DISTFILES=	${NEWLIBNAME}.tar.gz ${OBJCNAME}.tar.gz 
 PATCHFILES=	${OBJCNAME}-rtems-20010622a.diff \
 		${NEWLIBNAME}-rtems-20010622.diff
 PATCH_SITES=	ftp://ftp.oarcorp.com/pub/rtems/snapshots/c_tools/source/ \
diff --git a/devel/rtems-gcc/Makefile b/devel/rtems-gcc/Makefile
index 47b612a50b18..840e68d549e9 100644
--- a/devel/rtems-gcc/Makefile
+++ b/devel/rtems-gcc/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	gcc
 PORTVERSION=	2.95.3
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	gcc
+MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
+MASTER_SITE_SUBDIR=	gcc/releases/${PORTNAME}-${PORTVERSION}
 EXTRACT_ONLY=	# Empty
 
 MAINTAINER=	jeh@FreeBSD.org