summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorbsiegert <bsiegert@pkgsrc.org>2017-05-18 19:02:33 +0000
committerbsiegert <bsiegert@pkgsrc.org>2017-05-18 19:02:33 +0000
commit2789ead47544561ba0a8a4720527e47581ad6a75 (patch)
treee21f2160039e908ac88822b89345b8a66fa022da /mk
parent2375b281ceb957febf338e3077026d44f5ef5888 (diff)
downloadpkgsrc-2789ead47544561ba0a8a4720527e47581ad6a75.tar.gz
Pullup tickets #5412 and #5413 - requested by sevan
lang/opendjk8: build fix for FreeBSD Revisions pulled up: - lang/openjdk8/Makefile 1.49 - lang/openjdk8/distinfo 1.47 - lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh 1.12 - lang/openjdk8/patches/patch-jdk_make_lib_Awt2dLibraries.gmk 1.3 - lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk 1.3 - lang/openjdk8/patches/patch-jdk_make_lib_ServiceabilityLibraries.gmk 1.1 - mk/java-vm.mk 1.109 --- Module Name: pkgsrc Committed By: ryoon Date: Wed May 10 13:59:57 UTC 2017 Modified Files: pkgsrc/lang/openjdk8/patches: patch-common_autoconf_generated-configure.sh Log Message: Ignore alsa on FreeBSD too --- Module Name: pkgsrc Committed By: ryoon Date: Wed May 10 14:01:58 UTC 2017 Modified Files: pkgsrc/lang/openjdk8: Makefile distinfo pkgsrc/lang/openjdk8/patches: patch-jdk_make_lib_Awt2dLibraries.gmk patch-jdk_make_lib_CoreLibraries.gmk Added Files: pkgsrc/lang/openjdk8/patches: patch-jdk_make_lib_ServiceabilityLibraries.gmk Log Message: Fix build with converters/libiconv and update distinfo for previous --- Module Name: pkgsrc Committed By: ryoon Date: Wed May 10 14:04:31 UTC 2017 Modified Files: pkgsrc/mk: java-vm.mk Log Message: lang/openjdk8 works under FreeBSD/amd64 10.3
Diffstat (limited to 'mk')
-rw-r--r--mk/java-vm.mk7
1 files changed, 5 insertions, 2 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk
index 70aa0559571..b9fb9add48e 100644
--- a/mk/java-vm.mk
+++ b/mk/java-vm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.108 2016/12/16 16:27:23 asau Exp $
+# $NetBSD: java-vm.mk,v 1.108.4.1 2017/05/18 19:02:34 bsiegert Exp $
#
# This Makefile fragment handles Java dependencies and make variables,
# and is meant to be included by packages that require Java either at
@@ -113,6 +113,8 @@ _PKG_JVM_DEFAULT?= openjdk7
_PKG_JVM_DEFAULT?= openjdk8
. elif !empty(MACHINE_PLATFORM:MDragonFly-*-*)
_PKG_JVM_DEFAULT?= openjdk8
+. elif !empty(MACHINE_PLATFORM:MFreeBSD-*-*)
+_PKG_JVM_DEFAULT?= openjdk8
. else
_PKG_JVM_DEFAULT?= kaffe
. endif
@@ -156,7 +158,8 @@ _ONLY_FOR_PLATFORMS.openjdk8= \
NetBSD-[7-9]*-sparc64 \
NetBSD-[7-9]*-earmv[67]hf \
SunOS-*-i386 \
- SunOS-*-x86_64
+ SunOS-*-x86_64 \
+ FreeBSD-10.*-x86_64
_ONLY_FOR_PLATFORMS.sun-jdk7= \
Darwin-9.*-i386 Darwin-9.*-x86_64 \
Darwin-[1-9][0-9].*-i386 Darwin-[1-9][0-9].*-x86_64 \