Index: head/java/Makefile =================================================================== --- head/java/Makefile (revision 545486) +++ head/java/Makefile (revision 545487) @@ -1,127 +1,128 @@ # $FreeBSD$ # COMMENT = Java language support SUBDIR += apache-bcel SUBDIR += apache-commons-beanutils SUBDIR += apache-commons-cli SUBDIR += apache-commons-codec SUBDIR += apache-commons-collections SUBDIR += apache-commons-dbcp SUBDIR += apache-commons-discovery SUBDIR += apache-commons-httpclient SUBDIR += apache-commons-lang SUBDIR += apache-commons-lang3 SUBDIR += apache-commons-logging SUBDIR += apache-commons-pool SUBDIR += apache-commons-primitives SUBDIR += aparapi SUBDIR += avis SUBDIR += berkeley-db SUBDIR += bluej SUBDIR += bootstrap-openjdk11 SUBDIR += bootstrap-openjdk6 SUBDIR += bootstrap-openjdk8 SUBDIR += bouncycastle SUBDIR += bouncycastle15 SUBDIR += cos SUBDIR += cryptix-jce SUBDIR += dbvis SUBDIR += eclipse SUBDIR += eclipse-EPIC SUBDIR += eclipse-cdt SUBDIR += eclipse-drjava SUBDIR += eclipse-ecj SUBDIR += eclipse-findbugs SUBDIR += eclipse-pydev SUBDIR += eclipse-shelled SUBDIR += hamcrest SUBDIR += icedtea-web SUBDIR += infobus SUBDIR += intellij SUBDIR += intellij-fsnotifier SUBDIR += intellij-pty4j SUBDIR += intellij-rubymine SUBDIR += intellij-ultimate SUBDIR += jad SUBDIR += jai SUBDIR += jakarta-oro SUBDIR += jasmin SUBDIR += jattach SUBDIR += java-cup SUBDIR += java-getopt SUBDIR += java-subversion SUBDIR += java-zoneinfo SUBDIR += java3d SUBDIR += javahelp SUBDIR += javamail SUBDIR += javavmwrapper SUBDIR += jaxen SUBDIR += jcalendar SUBDIR += jcckit SUBDIR += jcommon SUBDIR += jd-gui SUBDIR += jdk11-doc SUBDIR += jdk12-doc SUBDIR += jdk8-doc SUBDIR += jdom SUBDIR += jflex SUBDIR += jfreechart SUBDIR += jgraph SUBDIR += jgraphx SUBDIR += jikes SUBDIR += jlex SUBDIR += jlint SUBDIR += jmf SUBDIR += jode SUBDIR += jrosetta SUBDIR += jta SUBDIR += jtiger SUBDIR += jump SUBDIR += junit SUBDIR += jxgrabkey SUBDIR += lightweight-java-profiler SUBDIR += linux-oracle-jdk18 SUBDIR += linux-oracle-jre18 SUBDIR += linux-oracle-serverjre10 SUBDIR += mmake SUBDIR += mx4j SUBDIR += netbeans SUBDIR += netcomponents SUBDIR += netrexx SUBDIR += netty SUBDIR += openjdk11 + SUBDIR += openjdk11-jre SUBDIR += openjdk12 SUBDIR += openjdk13 SUBDIR += openjdk14 SUBDIR += openjdk7 SUBDIR += openjdk7-jre SUBDIR += openjdk8 SUBDIR += openjdk8-jre SUBDIR += openjfx8-devel SUBDIR += openjfx8-scenebuilder SUBDIR += phpeclipse SUBDIR += proguard SUBDIR += sablevm SUBDIR += sablevm-classpath SUBDIR += servingxml SUBDIR += sigar SUBDIR += springframework SUBDIR += springframework31 SUBDIR += sqlitejdbc SUBDIR += trove4j SUBDIR += veditor SUBDIR += visualvm SUBDIR += wildfly10 SUBDIR += wildfly11 SUBDIR += wildfly12 SUBDIR += wildfly13 SUBDIR += wildfly14 SUBDIR += wildfly15 SUBDIR += wildfly16 SUBDIR += wildfly17 SUBDIR += wildfly18 SUBDIR += wildfly90 .include Index: head/java/openjdk11/Makefile =================================================================== --- head/java/openjdk11/Makefile (revision 545486) +++ head/java/openjdk11/Makefile (revision 545487) @@ -1,183 +1,191 @@ # $FreeBSD$ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} MAINTAINER= java@FreeBSD.org -COMMENT= Java Development Kit ${JDK_MAJOR_VERSION} +COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION} LICENSE= GPLv2 ONLY_FOR_ARCHS= amd64 i386 powerpc64 BUILD_DEPENDS= zip:archivers/zip \ autoconf>0:devel/autoconf \ ${LOCALBASE}/include/cups/cups.h:print/cups \ bash:shells/bash \ gsed:textproc/gsed LIB_DEPENDS= libasound.so:audio/alsa-lib \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgif.so:graphics/giflib \ liblcms2.so:graphics/lcms2 \ libpng.so:graphics/png RUN_DEPENDS= javavm:java/javavmwrapper \ xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype USES= compiler:features gmake iconv jpeg pkgconfig xorg USE_XORG= x11 xext xi xrandr xrender xt xtst USE_GITHUB= yes GH_ACCOUNT= battleblow GH_PROJECT= openjdk-jdk11u NO_CCACHE= yes _MAKE_JOBS= # MAKE_ENV= LANG="C" \ LC_ALL="C" \ CLASSPATH="" \ JAVA_HOME="" \ LD_LIBRARY_PATH="" \ CC=${CC} \ CXX=${CXX} \ CPP=${CPP} \ MAKEFLAGS="" JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/} JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-normal-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE} +.if defined(BUILD_JRE) +JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jre +.else JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jdk +.endif INSTALLDIR= ${PREFIX}/${PKGBASE} NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 11 JDK_MINOR_VERSION= 0 JDK_PATCH_VERSION= 8 JDK_BUILD_NUMBER= 10 BSD_JDK_VERSION= 1 JDK_BUG_URL= https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Ports%20%26%20Packages&component=Individual%20Port(s)&short_desc=java/${PORTNAME}${JDK_MAJOR_VERSION}%3A%20 GNU_CONFIGURE= yes CONFIGURE_ENV= CC=${CC} \ CXX=${CXX} \ CPP=${CPP} \ ac_cv_path_SED=${LOCALBASE}/bin/gsed CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \ --disable-ccache \ --disable-javac-server \ --disable-hotspot-gtest \ --with-alsa=${LOCALBASE} \ --with-cups=${LOCALBASE} \ --with-fontconfig=${LOCALBASE} \ --with-freetype=system \ --with-freetype-include=${LOCALBASE}/include/freetype2 \ --with-freetype-lib=${LOCALBASE}/lib \ --with-libjpeg=system \ --with-giflib=system \ --with-giflib-include=${LOCALBASE}/include \ --with-giflib-lib=${LOCALBASE}/lib \ --with-libpng=system \ --with-zlib=system \ --with-lcms=system \ --x-includes=${LOCALBASE}/include \ --x-libraries=${LOCALBASE}/lib \ --with-cacerts-file=${FILESDIR}/cacerts \ --with-version-string=${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} \ --with-native-debug-symbols=none \ --with-debug-level=release \ --with-vendor-name="OpenJDK BSD Porting Team" \ --with-vendor-url="https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/" \ --with-vendor-bug-url="${JDK_BUG_URL}" \ --with-vendor-vm-bug-url="${JDK_BUG_URL}" JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION} +.if defined(BUILD_JRE) +ALL_TARGET= legacy-images +.else ALL_TARGET= images +.endif JDK_BUILD_TYPE= release .include # Support aarch64 on FreeBSD 12 and up .if ${OSVERSION} >= 1200500 ONLY_FOR_ARCHS+=aarch64 .endif BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk11 \ ${LOCALBASE}/bootstrap-openjdk11 # do we have valid native jdk installed? .for BJDK in ${BOOTSTRAP_JDKS} . if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac) BOOTSTRAPJDKDIR= ${BJDK} . endif .endfor # if no valid jdk found, set dependency .if !defined(BOOTSTRAPJDKDIR) BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk11 BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk11 .endif JDK_BUILD_JVM= server MAKE_ENV+= --with-toolchain-type=${COMPILER_TYPE} CONFIGURE_ARGS+= --with-toolchain-type=${COMPILER_TYPE} .if ${COMPILER_TYPE} == gcc USE_GCC= yes CONFIGURE_ARGS+= --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \ --with-extra-cflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \ --with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" .else MAKE_ENV+= USE_CLANG=true .endif .if ${ARCH} == aarch64 || ${ARCH} == powerpc64 CONFIGURE_ARGS+= --disable-warnings-as-errors \ --disable-dtrace .endif .if defined(PPC_ABI) && ${PPC_ABI} == ELFv2 CONFIGURE_ARGS+= --disable-precompiled-headers .endif .if ${ARCH} != amd64 CONFIGURE_ARGS+= --enable-aot=no .endif .if ${ARCH} == powerpc64 && ${OSREL:C/\.[0-9]//} == 12 EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp .endif .if empty(ICONV_LIB) ICONV_CFLAGS= -DLIBICONV_PLUG .else ICONV_CFLAGS= -I${LOCALBASE}/include ICONV_LDFLAGS= -L${LOCALBASE}/lib ICONV_LIBS= ${ICONV_LIB} .endif post-patch: @${FIND} ${WRKSRC} -name '*.orig' -delete @${CHMOD} 755 ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/configure \ ${WRKSRC}/src/hotspot/os/bsd/os_bsd.cpp @${REINPLACE_CMD} -e 's|%%ICONV_CFLAGS%%|${ICONV_CFLAGS}|' \ -e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \ -e 's|%%ICONV_LIBS%%|${ICONV_LIBS}|' \ ${WRKSRC}/make/autoconf/libraries.m4 do-install: @${MKDIR} ${STAGEDIR}${INSTALLDIR} @cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR} @cd ${STAGEDIR}${INSTALLDIR} && \ ${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \; @${CHMOD} ${BINMODE} ${STAGEDIR}${INSTALLDIR}/lib/jspawnhelper @${ECHO} "@javavm ${INSTALLDIR}/bin/java" >> ${TMPPLIST} @${FIND} ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \ ${SED} -e 's|^${STAGEDIR}${PREFIX}/||' >> ${TMPPLIST} .include Index: head/java/openjdk11-jre/Makefile =================================================================== --- head/java/openjdk11-jre/Makefile (nonexistent) +++ head/java/openjdk11-jre/Makefile (revision 545487) @@ -0,0 +1,10 @@ +# $FreeBSD$ + +PKGNAMESUFFIX= ${JDK_MAJOR_VERSION}-jre + +COMMENT= Java Runtime Environment ${JDK_MAJOR_VERSION} + +BUILD_JRE= yes +MASTERDIR= ${.CURDIR}/../openjdk11 + +.include "${MASTERDIR}/Makefile" Property changes on: head/java/openjdk11-jre/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property