Catch the 'cklatest' target up to changes on the MASTER_SITES.

12 files changed, 132 insertions, 52 deletions

diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index b82228b56512..090ab5ae04e2 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -158,7 +158,7 @@ post-install: fake-manpages
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
-	@-ncftpls ${SITE} | ${GREP} 'LATEST.*3\.4'
+	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*3\.4'
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 16e2b8745717..f808bf3d8f34 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -6,6 +6,9 @@
 # $FreeBSD$
 #
 
+# FIXME: needed to make gcc40 port work for now.
+WITHOUT_LIBJAVA=	yes
+
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
 PORTREVISION=	20041024
@@ -17,9 +20,16 @@ MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
+.if !defined(WITHOUT_OBJC)
+DISTFILES+=	gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
+.if !defined(WITHOUT_FORTRAN)
+DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
+.if !defined(WITHOUT_LIBJAVA)
+DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
 
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.0
@@ -47,8 +57,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
-# FIXME: needed to make gcc40 port work for now.
-WITHOUT_LIBJAVA=	yes
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
@@ -160,7 +168,7 @@ post-install: fake-manpages
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
-	@-ncftpls ${SITE} | ${GREP} 'LATEST.*4\.0'
+	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.0'
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index b82228b56512..090ab5ae04e2 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -158,7 +158,7 @@ post-install: fake-manpages
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
-	@-ncftpls ${SITE} | ${GREP} 'LATEST.*3\.4'
+	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*3\.4'
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 16e2b8745717..f808bf3d8f34 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -6,6 +6,9 @@
 # $FreeBSD$
 #
 
+# FIXME: needed to make gcc40 port work for now.
+WITHOUT_LIBJAVA=	yes
+
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
 PORTREVISION=	20041024
@@ -17,9 +20,16 @@ MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
+.if !defined(WITHOUT_OBJC)
+DISTFILES+=	gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
+.if !defined(WITHOUT_FORTRAN)
+DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
+.if !defined(WITHOUT_LIBJAVA)
+DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
 
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.0
@@ -47,8 +57,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
-# FIXME: needed to make gcc40 port work for now.
-WITHOUT_LIBJAVA=	yes
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
@@ -160,7 +168,7 @@ post-install: fake-manpages
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
-	@-ncftpls ${SITE} | ${GREP} 'LATEST.*4\.0'
+	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.0'
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 16e2b8745717..f808bf3d8f34 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -6,6 +6,9 @@
 # $FreeBSD$
 #
 
+# FIXME: needed to make gcc40 port work for now.
+WITHOUT_LIBJAVA=	yes
+
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
 PORTREVISION=	20041024
@@ -17,9 +20,16 @@ MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
+.if !defined(WITHOUT_OBJC)
+DISTFILES+=	gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
+.if !defined(WITHOUT_FORTRAN)
+DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
+.if !defined(WITHOUT_LIBJAVA)
+DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
 
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.0
@@ -47,8 +57,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
-# FIXME: needed to make gcc40 port work for now.
-WITHOUT_LIBJAVA=	yes
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
@@ -160,7 +168,7 @@ post-install: fake-manpages
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
-	@-ncftpls ${SITE} | ${GREP} 'LATEST.*4\.0'
+	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.0'
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 16e2b8745717..f808bf3d8f34 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -6,6 +6,9 @@
 # $FreeBSD$
 #
 
+# FIXME: needed to make gcc40 port work for now.
+WITHOUT_LIBJAVA=	yes
+
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
 PORTREVISION=	20041024
@@ -17,9 +20,16 @@ MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
+.if !defined(WITHOUT_OBJC)
+DISTFILES+=	gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
+.if !defined(WITHOUT_FORTRAN)
+DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
+.if !defined(WITHOUT_LIBJAVA)
+DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
 
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.0
@@ -47,8 +57,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
-# FIXME: needed to make gcc40 port work for now.
-WITHOUT_LIBJAVA=	yes
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
@@ -160,7 +168,7 @@ post-install: fake-manpages
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
-	@-ncftpls ${SITE} | ${GREP} 'LATEST.*4\.0'
+	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.0'
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 16e2b8745717..f808bf3d8f34 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -6,6 +6,9 @@
 # $FreeBSD$
 #
 
+# FIXME: needed to make gcc40 port work for now.
+WITHOUT_LIBJAVA=	yes
+
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
 PORTREVISION=	20041024
@@ -17,9 +20,16 @@ MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
+.if !defined(WITHOUT_OBJC)
+DISTFILES+=	gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
+.if !defined(WITHOUT_FORTRAN)
+DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
+.if !defined(WITHOUT_LIBJAVA)
+DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
 
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.0
@@ -47,8 +57,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
-# FIXME: needed to make gcc40 port work for now.
-WITHOUT_LIBJAVA=	yes
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
@@ -160,7 +168,7 @@ post-install: fake-manpages
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
-	@-ncftpls ${SITE} | ${GREP} 'LATEST.*4\.0'
+	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.0'
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 16e2b8745717..f808bf3d8f34 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -6,6 +6,9 @@
 # $FreeBSD$
 #
 
+# FIXME: needed to make gcc40 port work for now.
+WITHOUT_LIBJAVA=	yes
+
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
 PORTREVISION=	20041024
@@ -17,9 +20,16 @@ MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
+.if !defined(WITHOUT_OBJC)
+DISTFILES+=	gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
+.if !defined(WITHOUT_FORTRAN)
+DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
+.if !defined(WITHOUT_LIBJAVA)
+DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
 
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.0
@@ -47,8 +57,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
-# FIXME: needed to make gcc40 port work for now.
-WITHOUT_LIBJAVA=	yes
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
@@ -160,7 +168,7 @@ post-install: fake-manpages
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
-	@-ncftpls ${SITE} | ${GREP} 'LATEST.*4\.0'
+	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.0'
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 16e2b8745717..f808bf3d8f34 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -6,6 +6,9 @@
 # $FreeBSD$
 #
 
+# FIXME: needed to make gcc40 port work for now.
+WITHOUT_LIBJAVA=	yes
+
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
 PORTREVISION=	20041024
@@ -17,9 +20,16 @@ MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
+.if !defined(WITHOUT_OBJC)
+DISTFILES+=	gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
+.if !defined(WITHOUT_FORTRAN)
+DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
+.if !defined(WITHOUT_LIBJAVA)
+DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
 
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.0
@@ -47,8 +57,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
-# FIXME: needed to make gcc40 port work for now.
-WITHOUT_LIBJAVA=	yes
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
@@ -160,7 +168,7 @@ post-install: fake-manpages
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
-	@-ncftpls ${SITE} | ${GREP} 'LATEST.*4\.0'
+	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.0'
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 16e2b8745717..f808bf3d8f34 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -6,6 +6,9 @@
 # $FreeBSD$
 #
 
+# FIXME: needed to make gcc40 port work for now.
+WITHOUT_LIBJAVA=	yes
+
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
 PORTREVISION=	20041024
@@ -17,9 +20,16 @@ MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
+.if !defined(WITHOUT_OBJC)
+DISTFILES+=	gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
+.if !defined(WITHOUT_FORTRAN)
+DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
+.if !defined(WITHOUT_LIBJAVA)
+DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
 
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.0
@@ -47,8 +57,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
-# FIXME: needed to make gcc40 port work for now.
-WITHOUT_LIBJAVA=	yes
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
@@ -160,7 +168,7 @@ post-install: fake-manpages
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
-	@-ncftpls ${SITE} | ${GREP} 'LATEST.*4\.0'
+	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.0'
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 16e2b8745717..f808bf3d8f34 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -6,6 +6,9 @@
 # $FreeBSD$
 #
 
+# FIXME: needed to make gcc40 port work for now.
+WITHOUT_LIBJAVA=	yes
+
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
 PORTREVISION=	20041024
@@ -17,9 +20,16 @@ MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
+.if !defined(WITHOUT_OBJC)
+DISTFILES+=	gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
+.if !defined(WITHOUT_FORTRAN)
+DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
+.if !defined(WITHOUT_LIBJAVA)
+DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
 
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.0
@@ -47,8 +57,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
-# FIXME: needed to make gcc40 port work for now.
-WITHOUT_LIBJAVA=	yes
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
@@ -160,7 +168,7 @@ post-install: fake-manpages
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
-	@-ncftpls ${SITE} | ${GREP} 'LATEST.*4\.0'
+	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.0'
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 16e2b8745717..f808bf3d8f34 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -6,6 +6,9 @@
 # $FreeBSD$
 #
 
+# FIXME: needed to make gcc40 port work for now.
+WITHOUT_LIBJAVA=	yes
+
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
 PORTREVISION=	20041024
@@ -17,9 +20,16 @@ MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
+.if !defined(WITHOUT_OBJC)
+DISTFILES+=	gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
+.if !defined(WITHOUT_FORTRAN)
+DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
+.if !defined(WITHOUT_LIBJAVA)
+DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
+.endif
 
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.0
@@ -47,8 +57,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
-# FIXME: needed to make gcc40 port work for now.
-WITHOUT_LIBJAVA=	yes
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
@@ -160,7 +168,7 @@ post-install: fake-manpages
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
-	@-ncftpls ${SITE} | ${GREP} 'LATEST.*4\.0'
+	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.0'
 .endfor
 
 .include <bsd.port.post.mk>