From ef8e6bc3007147a0d7b96564bc28ea1817a41d00 Mon Sep 17 00:00:00 2001
From: gerald <gerald@FreeBSD.org>
Date: Sun, 7 Nov 2004 11:40:15 +0000
Subject: Revert those changes from the prevision commit (revision 1.181) that
 were accidental, considering obrien's log entry and the breakage caused.

Spotted by:	kris (on behalf of pointyhat)
---
 lang/gcc43/Makefile | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'lang/gcc43')

diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index f808bf3d8f3..f638b1a8aa7 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -6,9 +6,6 @@
 # $FreeBSD$
 #
 
-# FIXME: needed to make gcc40 port work for now.
-WITHOUT_LIBJAVA=	yes
-
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
 PORTREVISION=	20041024
@@ -20,16 +17,9 @@ 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
@@ -57,6 +47,8 @@ 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
-- 
cgit