cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix duplicate files in PFRAGs. okay sthen@

Browse Source
This commit is contained in:
kurt 2021-01-06 14:56:56 +00:00
parent e1f1a64f85
commit b0c7f70842
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/jdk/11/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.20 2020/11/20 20:49:59 kurt Exp $ # $OpenBSD: Makefile,v 1.21 2021/01/06 14:56:56 kurt Exp $
ONLY_FOR_ARCHS= i386 amd64 aarch64 ONLY_FOR_ARCHS= i386 amd64 aarch64
USE_WXNEEDED= Yes USE_WXNEEDED= Yes
@ -13,6 +13,7 @@ PACKAGE_VER= ${BASE_VER}.${PATCH_VER}.${BSD_PORT_REL}
PKGNAME= jdk-${PACKAGE_VER} PKGNAME= jdk-${PACKAGE_VER}
PKGSTEM= jdk-11 PKGSTEM= jdk-11
EPOCH= 0 EPOCH= 0
REVISION= 0
DIST_SUBDIR= jdk DIST_SUBDIR= jdk
DISTNAME= jdk-${VERSION_STR} DISTNAME= jdk-${VERSION_STR}
@ -138,7 +139,7 @@ CONFIGURE_ARGS+=--enable-aot=no
PKG_ARGS+= -Daot=0 PKG_ARGS+= -Daot=0
.endif .endif
.if ${MACHINE_ARCH} == "aarch64" .if ${MACHINE_ARCH} != "i386"
PKG_ARGS+= -Dci=1 PKG_ARGS+= -Dci=1
.else .else
PKG_ARGS+= -Dci=0 PKG_ARGS+= -Dci=0

7
devel/jdk/11/pkg/PFRAG.aot
View File

@ -1,17 +1,12 @@
@comment $OpenBSD: PFRAG.aot,v 1.1.1.1 2019/03/28 17:47:53 kurt Exp $ @comment $OpenBSD: PFRAG.aot,v 1.2 2021/01/06 14:56:56 kurt Exp $
@bin jdk-11/bin/jaotc @bin jdk-11/bin/jaotc
jdk-11/jmods/jdk.aot.jmod jdk-11/jmods/jdk.aot.jmod
jdk-11/jmods/jdk.internal.vm.ci.jmod
jdk-11/jmods/jdk.internal.vm.compiler.jmod jdk-11/jmods/jdk.internal.vm.compiler.jmod
jdk-11/jmods/jdk.internal.vm.compiler.management.jmod jdk-11/jmods/jdk.internal.vm.compiler.management.jmod
jdk-11/legal/jdk.aot/ jdk-11/legal/jdk.aot/
jdk-11/legal/jdk.aot/ADDITIONAL_LICENSE_INFO jdk-11/legal/jdk.aot/ADDITIONAL_LICENSE_INFO
jdk-11/legal/jdk.aot/ASSEMBLY_EXCEPTION jdk-11/legal/jdk.aot/ASSEMBLY_EXCEPTION
jdk-11/legal/jdk.aot/LICENSE jdk-11/legal/jdk.aot/LICENSE
jdk-11/legal/jdk.internal.vm.ci/
jdk-11/legal/jdk.internal.vm.ci/ADDITIONAL_LICENSE_INFO
jdk-11/legal/jdk.internal.vm.ci/ASSEMBLY_EXCEPTION
jdk-11/legal/jdk.internal.vm.ci/LICENSE
jdk-11/legal/jdk.internal.vm.compiler/ jdk-11/legal/jdk.internal.vm.compiler/
jdk-11/legal/jdk.internal.vm.compiler.management/ jdk-11/legal/jdk.internal.vm.compiler.management/
jdk-11/legal/jdk.internal.vm.compiler.management/ADDITIONAL_LICENSE_INFO jdk-11/legal/jdk.internal.vm.compiler.management/ADDITIONAL_LICENSE_INFO

4
devel/jdk/11/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2020/11/20 20:49:59 kurt Exp $ @comment $OpenBSD: PLIST,v 1.8 2021/01/06 14:56:56 kurt Exp $
@option no-default-conflict @option no-default-conflict
@option is-branch @option is-branch
@conflict jdk->=11v0,<12v0 @conflict jdk->=11v0,<12v0
@ -459,6 +459,7 @@ jdk-11/legal/jdk.internal.opt/ADDITIONAL_LICENSE_INFO
jdk-11/legal/jdk.internal.opt/ASSEMBLY_EXCEPTION jdk-11/legal/jdk.internal.opt/ASSEMBLY_EXCEPTION
jdk-11/legal/jdk.internal.opt/LICENSE jdk-11/legal/jdk.internal.opt/LICENSE
jdk-11/legal/jdk.internal.opt/jopt-simple.md jdk-11/legal/jdk.internal.opt/jopt-simple.md
%%ci%%
jdk-11/legal/jdk.jartool/ jdk-11/legal/jdk.jartool/
jdk-11/legal/jdk.jartool/ADDITIONAL_LICENSE_INFO jdk-11/legal/jdk.jartool/ADDITIONAL_LICENSE_INFO
jdk-11/legal/jdk.jartool/ASSEMBLY_EXCEPTION jdk-11/legal/jdk.jartool/ASSEMBLY_EXCEPTION
@ -680,4 +681,3 @@ jdk-11/man/man1/
jdk-11/release jdk-11/release
share/doc/pkg-readmes/${PKGSTEM} share/doc/pkg-readmes/${PKGSTEM}
%%aot%% %%aot%%
%%ci%%