aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorAlexey Zelkin <phantom@FreeBSD.org>2005-01-31 16:47:37 +0000
committerAlexey Zelkin <phantom@FreeBSD.org>2005-01-31 16:47:37 +0000
commit994fbfdfa0575dcc9e1a523813a7645fa59e25ef (patch)
tree643141eb6cb458526ebc1093bbd91767882160a4 /java
parented821b9a7ddd233f15a0d462bb18af9ba1314282 (diff)
downloadports-994fbfdfa0575dcc9e1a523813a7645fa59e25ef.tar.gz
ports-994fbfdfa0575dcc9e1a523813a7645fa59e25ef.zip
Notes
Diffstat (limited to 'java')
-rw-r--r--java/jdk14/Makefile25
1 files changed, 22 insertions, 3 deletions
diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile
index 211a22df6661..1f4020bed97c 100644
--- a/java/jdk14/Makefile
+++ b/java/jdk14/Makefile
@@ -21,13 +21,18 @@ COMMENT= Java Development Kit 1.4.2
EXTRACT_DEPENDS=zip:${PORTSDIR}/archivers/zip
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
zip:${PORTSDIR}/archivers/zip \
- ${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif \
${LOCALBASE}/include/nspr/prtypes.h:${PORTSDIR}/devel/nspr
RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper
.if !defined(MINIMAL)
RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts
.endif
+.if defined(WITH_OPENMOTIF_JDK)
+BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/x11-toolkits/open-motif-jdk:extract
+.else
+BUILD_DEPENDS+= ${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif
+.endif
+
PKGINSTALL= ${WRKDIR}/pkg-install
WRKSRC= ${WRKDIR}/control/make
@@ -53,6 +58,12 @@ LINUX_BOOTSTRAP_JDKS= ${LOCALBASE}/linux-sun-jdk1.4.2_03 \
.include <bsd.port.pre.mk>
+.if defined(WITH_OPENMOTIF_JDK)
+OPENMOTIF_DIR= ${WRKDIR}/jdkmotif
+.else
+OPENMOTIF_DIR= ${X11BASE}
+.endif
+
# do we have valid native jdk installed?
.if !defined(WITH_LINUX_BOOTSTRAP)
.for CJDK in ${NATIVE_BOOTSTRAP_JDKS}
@@ -89,7 +100,7 @@ USE_REINPLACE= YES
RESTRICTED= "Redistribution of pre-compiled binaries is not permitted"
NO_CDROM= "Redistribution of pre-compiled binaries is not permitted"
MAKE_ENV= ALT_BOOTDIR="${JDK14DIR}" \
- ALT_MOTIF_DIR="${X11BASE}" \
+ ALT_MOTIF_DIR="${OPENMOTIF_DIR}" \
SYS_CFLAGS="${CFLAGS}" \
DEV_ONLY="YES" \
LANG="C" \
@@ -229,8 +240,8 @@ post-patch:
${WRKSRC}/$${file}; \
done
+pre-build-linuxcheck:
.if defined(WITH_LINUX_BOOTSTRAP)
-pre-build:
@if [ "$${WRKDIRPREFIX}" -a \
-L "/compat/linux/$${WRKDIRPREFIX}" -a \
x`${LS} -ld "/compat/linux/$${WRKDIRPREFIX}" 2>/dev/null | awk '/->/{print $$NF;exit 0}END{exit 1}'` = x"$${WRKDIRPREFIX}" ]; \
@@ -266,6 +277,14 @@ pre-build:
fi
.endif
+pre-build: pre-build-linuxcheck
+.if defined(WITH_OPENMOTIF_JDK)
+ cd ${PORTSDIR}/x11-toolkits/open-motif-jdk && \
+ ${MAKE} WITH_JDK_PATCH=${WRKDIR}/patch-java-dnd-fix \
+ PREFIX=${OPENMOTIF_DIR} \
+ NO_PKG_REGISTER=YES install
+.endif
+
do-build:
# Start of jdk build
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})