Date: Sat, 24 Feb 2018 00:55:48 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r462764 - head/java/linux-oracle-jre18 Message-ID: <201802240055.w1O0tm0G086883@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Sat Feb 24 00:55:48 2018 New Revision: 462764 URL: https://svnweb.freebsd.org/changeset/ports/462764 Log: Respect the LINUX_ARCH setting . Install either the i386 or amd64 version of the JDK, depending upon the value of LINUX_ARCH. . Add appropriate packing list conditionals to account for this. Modified: head/java/linux-oracle-jre18/Makefile head/java/linux-oracle-jre18/distinfo head/java/linux-oracle-jre18/pkg-plist Modified: head/java/linux-oracle-jre18/Makefile ============================================================================== --- head/java/linux-oracle-jre18/Makefile Sat Feb 24 00:55:40 2018 (r462763) +++ head/java/linux-oracle-jre18/Makefile Sat Feb 24 00:55:48 2018 (r462764) @@ -5,7 +5,7 @@ PORTVERSION= ${JRE_VERSION}.${JRE_UPDATE_VERSION} CATEGORIES= java MASTER_SITES= # PKGNAMEPREFIX= linux-${JRE_VENDOR}- -DISTNAME= jre-${JRE_VERSION}u${JRE_UPDATE_VERSION}-linux-i586 +DISTNAME= jre-${JRE_VERSION}u${JRE_UPDATE_VERSION}-linux-${JAVA_DISTFILE_ARCH} MAINTAINER= java@FreeBSD.org COMMENT= Oracle Java ${JRE_VERSION} Runtime Environment for Linux @@ -17,7 +17,8 @@ RESTRICTED= Redistribution of repackaged binaries not PKGNAMESUFFIX= 1${JRE_VERSION} WRKSRC= ${WRKDIR}/jre${DL_JRE_VERSION} -PLIST_SUB= T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION} +PLIST_SUB= T=${APP_HOME:S/^${PREFIX}\///} \ + PORTVERSION=${PORTVERSION} NO_BUILD= yes USES= linux shebangfix @@ -44,6 +45,18 @@ SHEBANG_FILES= ${BIN_DIRS:S|$|/jcontrol|} bash_CMD= ${SH} .include <bsd.port.pre.mk> + +.if ${LINUX_ARCH} == "i386" +PLIST_SUB+= JAVA_ARCHLIBDIR="i386" \ + I386_ONLY="" \ + AMD64_ONLY="@comment " +JAVA_DISTFILE_ARCH= i586 +.else +PLIST_SUB+= JAVA_ARCHLIBDIR="amd64" \ + I386_ONLY="@comment " \ + AMD64_ONLY="" +JAVA_DISTFILE_ARCH= x64 +.endif .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) IGNORE?=You must manually fetch the J2SE RE download for the Linux platform (${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again Modified: head/java/linux-oracle-jre18/distinfo ============================================================================== --- head/java/linux-oracle-jre18/distinfo Sat Feb 24 00:55:40 2018 (r462763) +++ head/java/linux-oracle-jre18/distinfo Sat Feb 24 00:55:48 2018 (r462764) @@ -1,3 +1,5 @@ -TIMESTAMP = 1517263575 +TIMESTAMP = 1519433018 SHA256 (jre-8u162-linux-i586.tar.gz) = b0752798b28ce6e6bb133070f06fbdbd0a5bbbaf678f6c40a6def5c25e102289 SIZE (jre-8u162-linux-i586.tar.gz) = 83185844 +SHA256 (jre-8u162-linux-x64.tar.gz) = dfa25ebd1f90bf74ad7ba2dacb0e08d884594e733c9a522b58256778031341a4 +SIZE (jre-8u162-linux-x64.tar.gz) = 80107578 Modified: head/java/linux-oracle-jre18/pkg-plist ============================================================================== --- head/java/linux-oracle-jre18/pkg-plist Sat Feb 24 00:55:40 2018 (r462763) +++ head/java/linux-oracle-jre18/pkg-plist Sat Feb 24 00:55:48 2018 (r462764) @@ -19,6 +19,75 @@ %%T%%/bin/servertool %%T%%/bin/tnameserv %%T%%/bin/unpack200 +%%I386_ONLY%%%%T%%/lib/%%JAVA_ARCHLIBDIR%%/client/Xusage.txt +%%I386_ONLY%%%%T%%/lib/%%JAVA_ARCHLIBDIR%%/client/libjsig.so +%%I386_ONLY%%%%T%%/lib/%%JAVA_ARCHLIBDIR%%/client/libjvm.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/jli/libjli.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/jvm.cfg +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libavplugin-53.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libavplugin-54.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libavplugin-55.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libavplugin-56.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libavplugin-57.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libavplugin-ffmpeg-56.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libavplugin-ffmpeg-57.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libawt.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libawt_headless.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libawt_xawt.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libbci.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libdcpr.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libdecora_sse.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libdeploy.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libdt_socket.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libfontmanager.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libfxplugins.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libglass.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libgstreamer-lite.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libhprof.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libinstrument.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libj2gss.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libj2pcsc.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libj2pkcs11.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libjaas_unix.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libjava.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libjava_crw_demo.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libjavafx_font.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libjavafx_font_freetype.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libjavafx_font_pango.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libjavafx_font_t2k.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libjavafx_iio.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libjawt.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libjdwp.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libjfr.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libjfxmedia.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libjfxwebkit.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libjpeg.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libjsdt.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libjsig.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libjsound.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libjsoundalsa.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libkcms.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/liblcms.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libmanagement.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libmlib_image.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libnet.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libnio.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libnpjp2.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libnpt.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libprism_common.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libprism_es2.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libprism_sw.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libresource.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libsctp.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libsplashscreen.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libsunec.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libt2k.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libunpack.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libverify.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libzip.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/server/Xusage.txt +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/server/libjsig.so +%%T%%/lib/%%JAVA_ARCHLIBDIR%%/server/libjvm.so %%T%%/lib/calendars.properties %%T%%/lib/charsets.jar %%T%%/lib/classlist @@ -139,75 +208,6 @@ %%T%%/lib/fonts/LucidaTypewriterRegular.ttf %%T%%/lib/fonts/fonts.dir %%T%%/lib/hijrah-config-umalqura.properties -%%T%%/lib/i386/client/Xusage.txt -%%T%%/lib/i386/client/libjsig.so -%%T%%/lib/i386/client/libjvm.so -%%T%%/lib/i386/jli/libjli.so -%%T%%/lib/i386/jvm.cfg -%%T%%/lib/i386/libavplugin-53.so -%%T%%/lib/i386/libavplugin-54.so -%%T%%/lib/i386/libavplugin-55.so -%%T%%/lib/i386/libavplugin-56.so -%%T%%/lib/i386/libavplugin-57.so -%%T%%/lib/i386/libavplugin-ffmpeg-56.so -%%T%%/lib/i386/libavplugin-ffmpeg-57.so -%%T%%/lib/i386/libawt.so -%%T%%/lib/i386/libawt_headless.so -%%T%%/lib/i386/libawt_xawt.so -%%T%%/lib/i386/libbci.so -%%T%%/lib/i386/libdcpr.so -%%T%%/lib/i386/libdecora_sse.so -%%T%%/lib/i386/libdeploy.so -%%T%%/lib/i386/libdt_socket.so -%%T%%/lib/i386/libfontmanager.so -%%T%%/lib/i386/libfxplugins.so -%%T%%/lib/i386/libglass.so -%%T%%/lib/i386/libgstreamer-lite.so -%%T%%/lib/i386/libhprof.so -%%T%%/lib/i386/libinstrument.so -%%T%%/lib/i386/libj2gss.so -%%T%%/lib/i386/libj2pcsc.so -%%T%%/lib/i386/libj2pkcs11.so -%%T%%/lib/i386/libjaas_unix.so -%%T%%/lib/i386/libjava.so -%%T%%/lib/i386/libjava_crw_demo.so -%%T%%/lib/i386/libjavafx_font.so -%%T%%/lib/i386/libjavafx_font_freetype.so -%%T%%/lib/i386/libjavafx_font_pango.so -%%T%%/lib/i386/libjavafx_font_t2k.so -%%T%%/lib/i386/libjavafx_iio.so -%%T%%/lib/i386/libjawt.so -%%T%%/lib/i386/libjdwp.so -%%T%%/lib/i386/libjfr.so -%%T%%/lib/i386/libjfxmedia.so -%%T%%/lib/i386/libjfxwebkit.so -%%T%%/lib/i386/libjpeg.so -%%T%%/lib/i386/libjsdt.so -%%T%%/lib/i386/libjsig.so -%%T%%/lib/i386/libjsound.so -%%T%%/lib/i386/libjsoundalsa.so -%%T%%/lib/i386/libkcms.so -%%T%%/lib/i386/liblcms.so -%%T%%/lib/i386/libmanagement.so -%%T%%/lib/i386/libmlib_image.so -%%T%%/lib/i386/libnet.so -%%T%%/lib/i386/libnio.so -%%T%%/lib/i386/libnpjp2.so -%%T%%/lib/i386/libnpt.so -%%T%%/lib/i386/libprism_common.so -%%T%%/lib/i386/libprism_es2.so -%%T%%/lib/i386/libprism_sw.so -%%T%%/lib/i386/libresource.so -%%T%%/lib/i386/libsctp.so -%%T%%/lib/i386/libsplashscreen.so -%%T%%/lib/i386/libsunec.so -%%T%%/lib/i386/libt2k.so -%%T%%/lib/i386/libunpack.so -%%T%%/lib/i386/libverify.so -%%T%%/lib/i386/libzip.so -%%T%%/lib/i386/server/Xusage.txt -%%T%%/lib/i386/server/libjsig.so -%%T%%/lib/i386/server/libjvm.so %%T%%/lib/images/cursors/cursors.properties %%T%%/lib/images/cursors/invalid32x32.gif %%T%%/lib/images/cursors/motif_CopyDrop32x32.gif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802240055.w1O0tm0G086883>