Index: Makefile =================================================================== RCS file: /home/ncvs/ports/java/jdk13/Makefile,v retrieving revision 1.53 diff -u -r1.53 Makefile --- Makefile 6 May 2003 14:55:19 -0000 1.53 +++ Makefile 13 May 2003 19:00:55 -0000 @@ -21,9 +21,6 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ zip:${PORTSDIR}/archivers/zip \ ${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif -.if !defined(NATIVE_BOOTSTRAP) -BUILD_DEPENDS+= ${JDK13DIR}/bin/javac:${PORTSDIR}/java/linux-sun-jdk13 -.endif .if !defined(WITHOUT_PLUGIN) BUILD_DEPENDS+= msgfmt:${PORTSDIR}/devel/gettext LIB_DEPENDS= glib12.3:$(PORTSDIR)/devel/glib12 \ @@ -49,11 +46,6 @@ JDK_VERSION= 1.3.1 JDK_PATCHSET_VERSION= 8 -.if defined(NATIVE_BOOTSTRAP) -JDK13DIR?= ${LOCALBASE}/jdk${JDK_VERSION} -.else -JDK13DIR?= ${LOCALBASE}/linux-sun-jdk${JDK_VERSION} -.endif ONLY_FOR_ARCHS= i386 USE_GMAKE= yes @@ -117,6 +109,16 @@ .endif .include +.if exists(${LOCALBASE}/jdk${JDK_VERSION}/bin/javac) +NATIVE_BOOTSTRAP= yes +.endif + +.if defined(NATIVE_BOOTSTRAP) +JDK13DIR?= ${LOCALBASE}/jdk${JDK_VERSION} +.else +JDK13DIR?= ${LOCALBASE}/linux-sun-jdk${JDK_VERSION} +BUILD_DEPENDS+= ${JDK13DIR}/bin/javac:${PORTSDIR}/java/linux-sun-jdk13 +.endif .if defined(WITH_HOTSPOT) && ${OSVERSION} < 500039 USE_GCC= 3.2