From dcee19701bf6b5125da32b6082f23cea60655343 Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Mon, 13 Oct 2003 03:31:42 +0000 Subject: [PATCH] . Override PKGINSTALL to place it in WRKDIR, which is writeable, rather than PORTSDIR, which may not be. Submitted by: kris --- java/jdk14/Makefile | 1 + java/jdk15/Makefile | 1 + java/jdk16/Makefile | 1 + java/linux-sun-jdk14/Makefile | 1 + 4 files changed, 4 insertions(+) diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile index 6e984ef1b7d2..fa04170a2e70 100644 --- a/java/jdk14/Makefile +++ b/java/jdk14/Makefile @@ -60,6 +60,7 @@ MAKE_ENV= ALT_BOOTDIR="${JDK14DIR}" \ LD_LIBRARY_PATH="" ALL_TARGET= all PLIST_SUB+= JDK_VERSION=${JDK_VERSION} +PKGINSTALL= ${WRKDIR}/pkg-install JDKIMAGEDIR= ${WRKSRC}/../build/bsd-i586/j2sdk-image JDKIMAGEDIR_G= ${WRKSRC}/../build/bsd-i586/j2sdk-debug-image diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index 6e984ef1b7d2..fa04170a2e70 100644 --- a/java/jdk15/Makefile +++ b/java/jdk15/Makefile @@ -60,6 +60,7 @@ MAKE_ENV= ALT_BOOTDIR="${JDK14DIR}" \ LD_LIBRARY_PATH="" ALL_TARGET= all PLIST_SUB+= JDK_VERSION=${JDK_VERSION} +PKGINSTALL= ${WRKDIR}/pkg-install JDKIMAGEDIR= ${WRKSRC}/../build/bsd-i586/j2sdk-image JDKIMAGEDIR_G= ${WRKSRC}/../build/bsd-i586/j2sdk-debug-image diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile index 6e984ef1b7d2..fa04170a2e70 100644 --- a/java/jdk16/Makefile +++ b/java/jdk16/Makefile @@ -60,6 +60,7 @@ MAKE_ENV= ALT_BOOTDIR="${JDK14DIR}" \ LD_LIBRARY_PATH="" ALL_TARGET= all PLIST_SUB+= JDK_VERSION=${JDK_VERSION} +PKGINSTALL= ${WRKDIR}/pkg-install JDKIMAGEDIR= ${WRKSRC}/../build/bsd-i586/j2sdk-image JDKIMAGEDIR_G= ${WRKSRC}/../build/bsd-i586/j2sdk-debug-image diff --git a/java/linux-sun-jdk14/Makefile b/java/linux-sun-jdk14/Makefile index 752a7bcbacac..6e0b9d041124 100644 --- a/java/linux-sun-jdk14/Makefile +++ b/java/linux-sun-jdk14/Makefile @@ -26,6 +26,7 @@ RESTRICTED= "Redistribution of repackaged binaries not permitted" WRKSRC= ${WRKDIR}/j2sdk${DL_JDK_VERSION} PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION} +PKGINSTALL= ${WRKDIR}/pkg-install NO_BUILD= yes USE_LINUX= yes