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.

3 files changed, 121 insertions, 96 deletions

diff --git a/java/linux-oracle-jdk18/Makefile b/java/linux-oracle-jdk18/Makefile
index 2a4e433b888e..a8468076b166 100644
--- a/java/linux-oracle-jdk18/Makefile
+++ b/java/linux-oracle-jdk18/Makefile
@@ -5,7 +5,7 @@ PORTVERSION=	${JDK_VERSION}.${JDK_UPDATE_VERSION}
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	linux-${JDK_VENDOR}-
-DISTNAME=	jdk-${JDK_VERSION}u${JDK_UPDATE_VERSION}-linux-i586
+DISTNAME=	jdk-${JDK_VERSION}u${JDK_UPDATE_VERSION}-linux-${JAVA_DISTFILE_ARCH}
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Oracle Java ${JDK_VERSION} Development Kit for Linux
@@ -19,7 +19,8 @@ RESTRICTED=	Redistribution of repackaged binaries not permitted
 PKGNAMESUFFIX=	1${JDK_VERSION}
 
 WRKSRC=		${WRKDIR}/jdk${DL_JDK_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
@@ -47,6 +48,22 @@ bash_CMD=	${SH}
 
 .include <bsd.port.pre.mk>
 
+.if ${LINUX_ARCH} == "i386"
+PLIST_SUB+=		JAVA_ARCHLIBDIR="i386" \
+			ECLIPSE_ARCHPATH="x86" \
+			VISUALVM_ARCHLIBDIR="linux" \
+			I386_ONLY="" \
+			AMD64_ONLY="@comment "
+JAVA_DISTFILE_ARCH=	i586
+.else
+PLIST_SUB+=		JAVA_ARCHLIBDIR="amd64" \
+			ECLIPSE_ARCHPATH="x86_64" \
+			VISUALVM_ARCHLIBDIR="linux-amd64" \
+			I386_ONLY="@comment " \
+			AMD64_ONLY=""
+JAVA_DISTFILE_ARCH=	x64
+.endif
+
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 IGNORE?=You must manually fetch the J2SE SDK download for the Linux platform (${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
 .endif
@@ -54,7 +71,7 @@ IGNORE?=You must manually fetch the J2SE SDK download for the Linux platform (${
 .if ${PORT_OPTIONS:MDEMO}
 DEMO_UPDATE_VERSION=	${JDK_UPDATE_VERSION}
 .if ${DEMO_UPDATE_VERSION} != ${JDK_UPDATE_VERSION}
-DEMO_DISTNAME=	jdk-${JDK_VERSION}u${DEMO_UPDATE_VERSION}-linux-i586-demos
+DEMO_DISTNAME=	jdk-${JDK_VERSION}u${DEMO_UPDATE_VERSION}-linux-${JAVA_DISTFILE_ARCH}-demos
 DEMO_WRKSRC=	${WRKDIR}/jdk${JDK_INTERNAL_VERSION}_${DEMO_UPDATE_VERSION}
 .else
 DEMO_DISTNAME=	${DISTNAME}-demos
diff --git a/java/linux-oracle-jdk18/distinfo b/java/linux-oracle-jdk18/distinfo
index 0ec7fa4a50ef..7685c6b7bb00 100644
--- a/java/linux-oracle-jdk18/distinfo
+++ b/java/linux-oracle-jdk18/distinfo
@@ -1,5 +1,9 @@
-TIMESTAMP = 1517263544
+TIMESTAMP = 1519432970
 SHA256 (jdk-8u162-linux-i586.tar.gz) = eecf88dbcf7c78d236251d44350126f1297a522f2eab974b4027ef20f7a6fb24
 SIZE (jdk-8u162-linux-i586.tar.gz) = 192733880
 SHA256 (jdk-8u162-linux-i586-demos.tar.gz) = 09ba57c751a44a3326edda544bb869696e69bdb8fe6aabe3f988d89fcfca05bf
 SIZE (jdk-8u162-linux-i586-demos.tar.gz) = 55100252
+SHA256 (jdk-8u162-linux-x64.tar.gz) = 68ec82d47fd9c2b8eb84225b6db398a72008285fafc98631b1ff8d2229680257
+SIZE (jdk-8u162-linux-x64.tar.gz) = 189815615
+SHA256 (jdk-8u162-linux-x64-demos.tar.gz) = c7aa3e9136ba987b0972f5301ffadfc5c46a6a2cbbbed63d31d725932012cd19
+SIZE (jdk-8u162-linux-x64-demos.tar.gz) = 55164558
diff --git a/java/linux-oracle-jdk18/pkg-plist b/java/linux-oracle-jdk18/pkg-plist
index 523e96c82ea6..550e4c53f910 100644
--- a/java/linux-oracle-jdk18/pkg-plist
+++ b/java/linux-oracle-jdk18/pkg-plist
@@ -1594,6 +1594,77 @@
 %%T%%/jre/bin/servertool
 %%T%%/jre/bin/tnameserv
 %%T%%/jre/bin/unpack200
+%%I386_ONLY%%%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/client/Xusage.txt
+%%I386_ONLY%%%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/client/libjsig.so
+%%I386_ONLY%%%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/client/libjvm.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/jli/libjli.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/jvm.cfg
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libattach.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libavplugin-53.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libavplugin-54.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libavplugin-55.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libavplugin-56.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libavplugin-57.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libavplugin-ffmpeg-56.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libavplugin-ffmpeg-57.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libawt.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libawt_headless.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libawt_xawt.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libbci.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libdcpr.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libdecora_sse.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libdeploy.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libdt_socket.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libfontmanager.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libfxplugins.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libglass.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libgstreamer-lite.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libhprof.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libinstrument.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libj2gss.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libj2pcsc.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libj2pkcs11.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libjaas_unix.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libjava.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libjava_crw_demo.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libjavafx_font.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libjavafx_font_freetype.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libjavafx_font_pango.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libjavafx_font_t2k.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libjavafx_iio.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libjawt.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libjdwp.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libjfr.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libjfxmedia.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libjfxwebkit.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libjpeg.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libjsdt.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libjsig.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libjsound.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libjsoundalsa.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libkcms.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/liblcms.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libmanagement.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libmlib_image.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libnet.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libnio.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libnpjp2.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libnpt.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libprism_common.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libprism_es2.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libprism_sw.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libresource.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libsaproc.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libsctp.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libsplashscreen.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libsunec.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libt2k.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libunpack.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libverify.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/libzip.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/server/Xusage.txt
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/server/libjsig.so
+%%T%%/jre/lib/%%JAVA_ARCHLIBDIR%%/server/libjvm.so
 %%T%%/jre/lib/calendars.properties
 %%T%%/jre/lib/charsets.jar
 %%T%%/jre/lib/classlist
@@ -1714,77 +1785,6 @@
 %%T%%/jre/lib/fonts/LucidaTypewriterRegular.ttf
 %%T%%/jre/lib/fonts/fonts.dir
 %%T%%/jre/lib/hijrah-config-umalqura.properties
-%%T%%/jre/lib/i386/client/Xusage.txt
-%%T%%/jre/lib/i386/client/libjsig.so
-%%T%%/jre/lib/i386/client/libjvm.so
-%%T%%/jre/lib/i386/jli/libjli.so
-%%T%%/jre/lib/i386/jvm.cfg
-%%T%%/jre/lib/i386/libattach.so
-%%T%%/jre/lib/i386/libavplugin-53.so
-%%T%%/jre/lib/i386/libavplugin-54.so
-%%T%%/jre/lib/i386/libavplugin-55.so
-%%T%%/jre/lib/i386/libavplugin-56.so
-%%T%%/jre/lib/i386/libavplugin-57.so
-%%T%%/jre/lib/i386/libavplugin-ffmpeg-56.so
-%%T%%/jre/lib/i386/libavplugin-ffmpeg-57.so
-%%T%%/jre/lib/i386/libawt.so
-%%T%%/jre/lib/i386/libawt_headless.so
-%%T%%/jre/lib/i386/libawt_xawt.so
-%%T%%/jre/lib/i386/libbci.so
-%%T%%/jre/lib/i386/libdcpr.so
-%%T%%/jre/lib/i386/libdecora_sse.so
-%%T%%/jre/lib/i386/libdeploy.so
-%%T%%/jre/lib/i386/libdt_socket.so
-%%T%%/jre/lib/i386/libfontmanager.so
-%%T%%/jre/lib/i386/libfxplugins.so
-%%T%%/jre/lib/i386/libglass.so
-%%T%%/jre/lib/i386/libgstreamer-lite.so
-%%T%%/jre/lib/i386/libhprof.so
-%%T%%/jre/lib/i386/libinstrument.so
-%%T%%/jre/lib/i386/libj2gss.so
-%%T%%/jre/lib/i386/libj2pcsc.so
-%%T%%/jre/lib/i386/libj2pkcs11.so
-%%T%%/jre/lib/i386/libjaas_unix.so
-%%T%%/jre/lib/i386/libjava.so
-%%T%%/jre/lib/i386/libjava_crw_demo.so
-%%T%%/jre/lib/i386/libjavafx_font.so
-%%T%%/jre/lib/i386/libjavafx_font_freetype.so
-%%T%%/jre/lib/i386/libjavafx_font_pango.so
-%%T%%/jre/lib/i386/libjavafx_font_t2k.so
-%%T%%/jre/lib/i386/libjavafx_iio.so
-%%T%%/jre/lib/i386/libjawt.so
-%%T%%/jre/lib/i386/libjdwp.so
-%%T%%/jre/lib/i386/libjfr.so
-%%T%%/jre/lib/i386/libjfxmedia.so
-%%T%%/jre/lib/i386/libjfxwebkit.so
-%%T%%/jre/lib/i386/libjpeg.so
-%%T%%/jre/lib/i386/libjsdt.so
-%%T%%/jre/lib/i386/libjsig.so
-%%T%%/jre/lib/i386/libjsound.so
-%%T%%/jre/lib/i386/libjsoundalsa.so
-%%T%%/jre/lib/i386/libkcms.so
-%%T%%/jre/lib/i386/liblcms.so
-%%T%%/jre/lib/i386/libmanagement.so
-%%T%%/jre/lib/i386/libmlib_image.so
-%%T%%/jre/lib/i386/libnet.so
-%%T%%/jre/lib/i386/libnio.so
-%%T%%/jre/lib/i386/libnpjp2.so
-%%T%%/jre/lib/i386/libnpt.so
-%%T%%/jre/lib/i386/libprism_common.so
-%%T%%/jre/lib/i386/libprism_es2.so
-%%T%%/jre/lib/i386/libprism_sw.so
-%%T%%/jre/lib/i386/libresource.so
-%%T%%/jre/lib/i386/libsaproc.so
-%%T%%/jre/lib/i386/libsctp.so
-%%T%%/jre/lib/i386/libsplashscreen.so
-%%T%%/jre/lib/i386/libsunec.so
-%%T%%/jre/lib/i386/libt2k.so
-%%T%%/jre/lib/i386/libunpack.so
-%%T%%/jre/lib/i386/libverify.so
-%%T%%/jre/lib/i386/libzip.so
-%%T%%/jre/lib/i386/server/Xusage.txt
-%%T%%/jre/lib/i386/server/libjsig.so
-%%T%%/jre/lib/i386/server/libjvm.so
 %%T%%/jre/lib/images/cursors/cursors.properties
 %%T%%/jre/lib/images/cursors/invalid32x32.gif
 %%T%%/jre/lib/images/cursors/motif_CopyDrop32x32.gif
@@ -1854,11 +1854,11 @@
 %%T%%/jre/lib/tzdb.dat
 %%T%%/jre/plugin/desktop/sun_java.desktop
 %%T%%/jre/plugin/desktop/sun_java.png
+%%T%%/lib/%%JAVA_ARCHLIBDIR%%/jli/libjli.so
+%%T%%/lib/%%JAVA_ARCHLIBDIR%%/libjawt.so
 %%T%%/lib/ant-javafx.jar
 %%T%%/lib/ct.sym
 %%T%%/lib/dt.jar
-%%T%%/lib/i386/jli/libjli.so
-%%T%%/lib/i386/libjawt.so
 %%T%%/lib/ir.idl
 %%T%%/lib/javafx-mx.jar
 %%T%%/lib/jconsole.jar
@@ -2002,15 +2002,19 @@
 %%T%%/lib/missioncontrol/mc.jar
 %%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.core/cache/artifacts.xml
 %%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.core/cache/binary/com.jrockit.mc.rcp.product_root_5.5.1.172852
-%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.core/cache/binary/com.oracle.jmc.executable.gtk.linux.x86_5.5.1
+%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.core/cache/binary/com.oracle.jmc.executable.gtk.linux.%%ECLIPSE_ARCHPATH%%_5.5.1
 %%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.core/cache/binary/org.eclipse.rcp_root_4.4.0.v20141007-2301
 %%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/.settings/org.eclipse.equinox.p2.artifact.repository.prefs
-%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/.settings/org.eclipse.equinox.p2.metadata.repository.prefs
+%%I386_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/.settings/org.eclipse.equinox.p2.metadata.repository.prefs
 %%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/.lock
-%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1480011635880.profile.gz
-%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1480011636212.profile.gz
-%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1480011645368.profile.gz
-%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1480011647611.profile.gz
+%%AMD64_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1480019103515.profile.gz
+%%AMD64_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1480019103856.profile.gz
+%%AMD64_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1480019113009.profile.gz
+%%AMD64_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1480019115339.profile.gz
+%%I386_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1480011635880.profile.gz
+%%I386_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1480011636212.profile.gz
+%%I386_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1480011645368.profile.gz
+%%I386_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1480011647611.profile.gz
 %%T%%/lib/missioncontrol/plugins/com.ibm.icu_52.1.0.v201404241930.jar
 %%T%%/lib/missioncontrol/plugins/com.jrockit.mc.alert.ja_5.5.1.172852.jar
 %%T%%/lib/missioncontrol/plugins/com.jrockit.mc.alert.zh_CN_5.5.1.172852.jar
@@ -2184,8 +2188,8 @@
 %%T%%/lib/missioncontrol/plugins/org.eclipse.core.expressions_3.4.600.v20140128-0851.jar
 %%T%%/lib/missioncontrol/plugins/org.eclipse.core.filesystem_1.4.100.v20140514-1614.jar
 %%T%%/lib/missioncontrol/plugins/org.eclipse.core.jobs_3.6.0.v20140424-0053.jar
-%%T%%/lib/missioncontrol/plugins/org.eclipse.core.net.linux.x86.nl_ja_4.4.0.v20140623020002.jar
-%%T%%/lib/missioncontrol/plugins/org.eclipse.core.net.linux.x86.nl_zh_4.4.0.v20140623020002.jar
+%%T%%/lib/missioncontrol/plugins/org.eclipse.core.net.linux.%%ECLIPSE_ARCHPATH%%.nl_ja_4.4.0.v20140623020002.jar
+%%T%%/lib/missioncontrol/plugins/org.eclipse.core.net.linux.%%ECLIPSE_ARCHPATH%%.nl_zh_4.4.0.v20140623020002.jar
 %%T%%/lib/missioncontrol/plugins/org.eclipse.core.net.nl_ja_4.4.0.v20140623020002.jar
 %%T%%/lib/missioncontrol/plugins/org.eclipse.core.net.nl_zh_4.4.0.v20140623020002.jar
 %%T%%/lib/missioncontrol/plugins/org.eclipse.core.net_1.2.200.v20140124-2013.jar
@@ -2267,12 +2271,12 @@
 %%T%%/lib/missioncontrol/plugins/org.eclipse.equinox.http.servlet_1.1.500.v20140318-1755.jar
 %%T%%/lib/missioncontrol/plugins/org.eclipse.equinox.jsp.jasper.registry_1.0.300.v20130327-1442.jar
 %%T%%/lib/missioncontrol/plugins/org.eclipse.equinox.jsp.jasper_1.0.400.v20130327-1442.jar
-%%T%%/lib/missioncontrol/plugins/org.eclipse.equinox.launcher.gtk.linux.x86.nl_ja_4.4.0.v20140623020002.jar
-%%T%%/lib/missioncontrol/plugins/org.eclipse.equinox.launcher.gtk.linux.x86.nl_zh_4.4.0.v20140623020002.jar
-%%T%%/lib/missioncontrol/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.200.v20141007-2033/META-INF/MANIFEST.MF
-%%T%%/lib/missioncontrol/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.200.v20141007-2033/about.html
-%%T%%/lib/missioncontrol/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.200.v20141007-2033/eclipse_1605.so
-%%T%%/lib/missioncontrol/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.200.v20141007-2033/launcher.gtk.linux.x86.properties
+%%T%%/lib/missioncontrol/plugins/org.eclipse.equinox.launcher.gtk.linux.%%ECLIPSE_ARCHPATH%%.nl_ja_4.4.0.v20140623020002.jar
+%%T%%/lib/missioncontrol/plugins/org.eclipse.equinox.launcher.gtk.linux.%%ECLIPSE_ARCHPATH%%.nl_zh_4.4.0.v20140623020002.jar
+%%T%%/lib/missioncontrol/plugins/org.eclipse.equinox.launcher.gtk.linux.%%ECLIPSE_ARCHPATH%%_1.1.200.v20141007-2033/META-INF/MANIFEST.MF
+%%T%%/lib/missioncontrol/plugins/org.eclipse.equinox.launcher.gtk.linux.%%ECLIPSE_ARCHPATH%%_1.1.200.v20141007-2033/about.html
+%%T%%/lib/missioncontrol/plugins/org.eclipse.equinox.launcher.gtk.linux.%%ECLIPSE_ARCHPATH%%_1.1.200.v20141007-2033/eclipse_1605.so
+%%T%%/lib/missioncontrol/plugins/org.eclipse.equinox.launcher.gtk.linux.%%ECLIPSE_ARCHPATH%%_1.1.200.v20141007-2033/launcher.gtk.linux.%%ECLIPSE_ARCHPATH%%.properties
 %%T%%/lib/missioncontrol/plugins/org.eclipse.equinox.launcher.nl_ja_4.4.0.v20140623020002.jar
 %%T%%/lib/missioncontrol/plugins/org.eclipse.equinox.launcher.nl_zh_4.4.0.v20140623020002.jar
 %%T%%/lib/missioncontrol/plugins/org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar
@@ -2400,9 +2404,9 @@
 %%T%%/lib/missioncontrol/plugins/org.eclipse.osgi.services_3.4.0.v20140312-2051.jar
 %%T%%/lib/missioncontrol/plugins/org.eclipse.osgi_3.10.1.v20140909-1633.jar
 %%T%%/lib/missioncontrol/plugins/org.eclipse.rcp_4.3.100.v20141007-2301.jar
-%%T%%/lib/missioncontrol/plugins/org.eclipse.swt.gtk.linux.x86.nl_ja_4.4.0.v20140623020002.jar
-%%T%%/lib/missioncontrol/plugins/org.eclipse.swt.gtk.linux.x86.nl_zh_4.4.0.v20140623020002.jar
-%%T%%/lib/missioncontrol/plugins/org.eclipse.swt.gtk.linux.x86_3.103.1.v20140903-1947.jar
+%%T%%/lib/missioncontrol/plugins/org.eclipse.swt.gtk.linux.%%ECLIPSE_ARCHPATH%%.nl_ja_4.4.0.v20140623020002.jar
+%%T%%/lib/missioncontrol/plugins/org.eclipse.swt.gtk.linux.%%ECLIPSE_ARCHPATH%%.nl_zh_4.4.0.v20140623020002.jar
+%%T%%/lib/missioncontrol/plugins/org.eclipse.swt.gtk.linux.%%ECLIPSE_ARCHPATH%%_3.103.1.v20140903-1947.jar
 %%T%%/lib/missioncontrol/plugins/org.eclipse.swt.nl_ja_4.4.0.v20140623020002.jar
 %%T%%/lib/missioncontrol/plugins/org.eclipse.swt.nl_zh_4.4.0.v20140623020002.jar
 %%T%%/lib/missioncontrol/plugins/org.eclipse.swt_3.103.1.v20140903-1938.jar
@@ -2816,8 +2820,8 @@
 %%T%%/lib/visualvm/profiler/config/Modules/org-netbeans-modules-profiler-snaptracer.xml
 %%T%%/lib/visualvm/profiler/config/Modules/org-netbeans-modules-profiler-utilities.xml
 %%T%%/lib/visualvm/profiler/config/Modules/org-netbeans-modules-profiler.xml
-%%T%%/lib/visualvm/profiler/lib/deployed/jdk15/linux/libprofilerinterface.so
-%%T%%/lib/visualvm/profiler/lib/deployed/jdk16/linux/libprofilerinterface.so
+%%T%%/lib/visualvm/profiler/lib/deployed/jdk15/%%VISUALVM_ARCHLIBDIR%%/libprofilerinterface.so
+%%T%%/lib/visualvm/profiler/lib/deployed/jdk16/%%VISUALVM_ARCHLIBDIR%%/libprofilerinterface.so
 %%T%%/lib/visualvm/profiler/lib/jfluid-server-15.jar
 %%T%%/lib/visualvm/profiler/lib/jfluid-server.jar
 %%T%%/lib/visualvm/profiler/lib/locale/jfluid-server_ja.jar