1 files changed, 16 insertions, 8 deletions

diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index 4fc134987376..7cf31d0c6f11 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -5,7 +5,7 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-03-08
+SNAPDATE=	2004-03-22
 
 PORTNAME=	gcc
 PORTVERSION=	3.3.4
@@ -48,16 +48,16 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == sparc64
-BROKEN=	"libgcj is not supported/packaging is broken on this platform"
-.endif
-
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .else
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
+.if ${ARCH} == ia64  ||  ${ARCH} == sparc64
+WITHOUT_LIBJAVA=	yes
+.endif
+
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 SUFFIX=		33
@@ -94,6 +94,13 @@ MAN1=		cpp${SUFFIX}.1 \
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
 INFO=		cpp cppinternals g77 gcc gccint gcj fastjar
 
+.if defined(WITHOUT_LIBJAVA)
+CONFIGURE_ARGS+=	--disable-libgcj
+PLIST_SUB+=	LIBJAVA="@comment "
+.else
+PLIST_SUB+=	LIBJAVA=""
+.endif
+
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 .if !defined(WITH_BOUNDSCHECKING)
@@ -140,9 +147,10 @@ post-install: fake-manpages
 	# gij and jv-convert, for example, are not built on all platforms.
 	if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \
 	  ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \
-	  ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \
-		|| ${MV} -f ${PREFIX}/man/man1/${f}.1 \
-		${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \
+	fi
+	if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \
+	  ${MV} -f ${PREFIX}/man/man1/${f}.1 \
+	           ${PREFIX}/man/man1/${f}${SUFFIX}.1; \
 	fi
 .endfor
 	${MV} -f ${PREFIX}/bin/g77${SUFFIX} ${PREFIX}/bin/g77-${SUFFIX}