Index: head/java/linux-oracle-jdk18/Makefile
===================================================================
--- head/java/linux-oracle-jdk18/Makefile	(revision 351571)
+++ head/java/linux-oracle-jdk18/Makefile	(revision 351572)
@@ -1,93 +1,90 @@
 # $FreeBSD$
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}.${JDK_UPDATE_VERSION}
 CATEGORIES=	java devel
 MASTER_SITES=	#
-PKGNAMEPREFIX=	linux-oracle-
+PKGNAMEPREFIX=	linux-${JDK_VENDOR}-
 DISTNAME=	jdk-${JDK_VERSION}u${JDK_UPDATE_VERSION}-linux-i586
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Oracle Java ${JDK_VERSION} Development Kit for Linux
 
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 
 OPTIONS_DEFINE=	DEMO
 DEMO_DESC=	Install demos and samples
 
 NO_CDROM=	License does not allow distribution with fee
 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
 USE_LINUX=	yes
 USE_LINUX_APPS=	xorglibs
 USES=		shebangfix
 ONLY_FOR_ARCHS=	i386 amd64
 
+JDK_VENDOR=		oracle
 JDK_VERSION=		8
 JDK_INTERNAL_VERSION=	1.${JDK_VERSION}.0
 JDK_UPDATE_VERSION=	5
 .if ${JDK_UPDATE_VERSION} == 0
 DL_JDK_VERSION=		${JDK_INTERNAL_VERSION}
 .elif ${JDK_UPDATE_VERSION} <= 9
 DL_JDK_VERSION=		${JDK_INTERNAL_VERSION}_0${JDK_UPDATE_VERSION}
 .else
 DL_JDK_VERSION=		${JDK_INTERNAL_VERSION}_${JDK_UPDATE_VERSION}
 .endif
 DOWNLOAD_URL=		http://www.oracle.com/technetwork/java/javase/downloads/index.html
 
 APP_HOME=	${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${JDK_INTERNAL_VERSION}
 BIN_DIRS=	bin jre/bin
-SHEBANG_FILES=	bin/jcontrol jre/bin/jcontrol
+LIB_DIRS=	${BIN_DIRS:S|bin$|lib|}
+SHEBANG_FILES=	${BIN_DIRS:S|$|/jcontrol|}
 bash_CMD=	${SH}
 
 .include <bsd.port.pre.mk>
 
 .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
 
 .include <bsd.port.options.mk>
 
 .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_WRKSRC=	${WRKDIR}/jdk${JDK_INTERNAL_VERSION}_${DEMO_UPDATE_VERSION}
 .else
 DEMO_DISTNAME=	${DISTNAME}-demos
 DEMO_WRKSRC=	${WRKSRC}
 .endif
 .if !exists(${DISTDIR}/${DEMO_DISTNAME}${EXTRACT_SUFX})
 IGNORE?=You must manually fetch the J2SE demos and samples for the Linux platform (${DEMO_DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
 .endif
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DEMO_DISTNAME}${EXTRACT_SUFX}
 PLIST_SUB+=	DEMO=""
 .else
 PLIST_SUB+=	DEMO="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDEMO} && ${DEMO_WRKSRC} != ${WRKSRC}
 post-extract:
-	@${MV} ${DEMO_WRKSRC}/demo ${WRKSRC}/
-	@${MV} ${DEMO_WRKSRC}/sample ${WRKSRC}/
+	@cd ${DEMO_WRKSRC} && ${MV} demo sample ${WRKSRC}
 .endif
 
 post-patch:
 	@cd ${WRKSRC}/include && ${LN} -s linux freebsd
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${APP_HOME}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${APP_HOME}
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${APP_HOME} \
-	    "-not ( -type d -name bin -prune )"
-	@cd ${WRKSRC} && ${COPYTREE_BIN} "${BIN_DIRS}" ${STAGEDIR}${APP_HOME}
-	@${INSTALL_SCRIPT} ${WRKSRC}/jre/lib/jexec \
-	    ${STAGEDIR}${APP_HOME}/jre/lib
-	@${INSTALL_SCRIPT} ${WRKSRC}/lib/jexec ${STAGEDIR}${APP_HOME}/lib
+	@cd ${STAGEDIR}${APP_HOME} && \
+	    ${CHMOD} ${BINMODE} ${BIN_DIRS:S|$|/*|} ${LIB_DIRS:S|$|/jexec|}
 
 .include <bsd.port.post.mk>
Index: head/java/linux-oracle-jre18/Makefile
===================================================================
--- head/java/linux-oracle-jre18/Makefile	(revision 351571)
+++ head/java/linux-oracle-jre18/Makefile	(revision 351572)
@@ -1,59 +1,59 @@
 # $FreeBSD$
 
 PORTNAME=	jre
 PORTVERSION=	${JRE_VERSION}.${JRE_UPDATE_VERSION}
 CATEGORIES=	java
 MASTER_SITES=	#
-PKGNAMEPREFIX=	linux-oracle-
+PKGNAMEPREFIX=	linux-${JRE_VENDOR}-
 DISTNAME=	jre-${JRE_VERSION}u${JRE_UPDATE_VERSION}-linux-i586
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Oracle Java ${JRE_VERSION} Runtime Environment for Linux
 
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 
 NO_CDROM=	License does not allow distribution with fee
 RESTRICTED=	Redistribution of repackaged binaries not permitted
 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
 USE_LINUX=	yes
 USE_LINUX_APPS=	xorglibs
 USES=		shebangfix
 ONLY_FOR_ARCHS=	i386 amd64
 
+JRE_VENDOR=		oracle
 JRE_VERSION=		8
 JRE_INTERNAL_VERSION=	1.${JRE_VERSION}.0
 JRE_UPDATE_VERSION=	5
 .if ${JRE_UPDATE_VERSION} == 0
 DL_JRE_VERSION=		${JRE_INTERNAL_VERSION}
 .elif ${JRE_UPDATE_VERSION} <= 9
 DL_JRE_VERSION=		${JRE_INTERNAL_VERSION}_0${JRE_UPDATE_VERSION}
 .else
 DL_JRE_VERSION=		${JRE_INTERNAL_VERSION}_${JRE_UPDATE_VERSION}
 .endif
 DOWNLOAD_URL=		http://www.oracle.com/technetwork/java/javase/downloads/index.html
 
 APP_HOME=	${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${JRE_INTERNAL_VERSION}
 BIN_DIRS=	bin
-SHEBANG_FILES=	bin/jcontrol
+LIB_DIRS=	${BIN_DIRS:S|bin$|lib|}
+SHEBANG_FILES=	${BIN_DIRS:S|$|/jcontrol|}
 bash_CMD=	${SH}
 
 .include <bsd.port.pre.mk>
 
 .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
 .endif
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${APP_HOME}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${APP_HOME}
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${APP_HOME} \
-	    "-not ( -type d -name bin -prune )"
-	@cd ${WRKSRC} && ${COPYTREE_BIN} "${BIN_DIRS}" ${STAGEDIR}${APP_HOME}
-	@${INSTALL_SCRIPT} ${WRKSRC}/lib/jexec ${STAGEDIR}${APP_HOME}/lib
+	@cd ${STAGEDIR}${APP_HOME} && \
+	    ${CHMOD} ${BINMODE} ${BIN_DIRS:S|$|/*|} ${LIB_DIRS:S|$|/jexec|}
 
 .include <bsd.port.post.mk>
Index: head/java/linux-sun-jdk17/Makefile
===================================================================
--- head/java/linux-sun-jdk17/Makefile	(revision 351571)
+++ head/java/linux-sun-jdk17/Makefile	(revision 351572)
@@ -1,95 +1,92 @@
 # Created by: Greg Lewis <glewis@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}.${JDK_UPDATE_VERSION}
 CATEGORIES=	java devel
 MASTER_SITES=	#
-PKGNAMEPREFIX=	linux-sun-
-DISTNAME=	jdk-7u${JDK_UPDATE_VERSION}-linux-i586
+PKGNAMEPREFIX=	linux-${JDK_VENDOR}-
+DISTNAME=	jdk-${JDK_VERSION}u${JDK_UPDATE_VERSION}-linux-i586
 
 MAINTAINER=	java@FreeBSD.org
-COMMENT=	Oracle Java 7 Development Kit for Linux
+COMMENT=	Oracle Java ${JDK_VERSION} Development Kit for Linux
 
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 
 OPTIONS_DEFINE=	DEMO
 DEMO_DESC=	Install demos and samples
 
 NO_CDROM=	License does not allow distribution with fee
 RESTRICTED=	Redistribution of repackaged binaries not permitted
-PKGNAMESUFFIX=	17
+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
 USE_LINUX=	yes
 USE_LINUX_APPS=	xorglibs
 USES=		shebangfix
 ONLY_FOR_ARCHS=	i386 amd64
 
+JDK_VENDOR=		sun
 JDK_VERSION=		7
-JDK_INTERNAL_VERSION=	1.7.0
+JDK_INTERNAL_VERSION=	1.${JDK_VERSION}.0
 JDK_UPDATE_VERSION=	55
 DL_JDK_VERSION=		${JDK_INTERNAL_VERSION}_${JDK_UPDATE_VERSION}
 DOWNLOAD_URL=		http://www.oracle.com/technetwork/java/javase/downloads/index.html
 
 APP_HOME=	${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${JDK_INTERNAL_VERSION}
 BIN_DIRS=	bin jre/bin
 LIB_DIRS=	${BIN_DIRS:S|bin$|lib|}
 SHEBANG_FILES=	${BIN_DIRS:S|$|/jcontrol|}
 bash_CMD=	${SH}
 
 .include <bsd.port.pre.mk>
 
 .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
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEMO}
 DEMO_UPDATE_VERSION=	${JDK_UPDATE_VERSION}
 .if ${DEMO_UPDATE_VERSION} != ${JDK_UPDATE_VERSION}
-DEMO_DISTNAME=	jdk-7u${DEMO_UPDATE_VERSION}-linux-i586-demos
+DEMO_DISTNAME=	jdk-${JDK_VERSION}u${DEMO_UPDATE_VERSION}-linux-i586-demos
 DEMO_WRKSRC=	${WRKDIR}/jdk${JDK_INTERNAL_VERSION}_${DEMO_UPDATE_VERSION}
 .else
 DEMO_DISTNAME=	${DISTNAME}-demos
 DEMO_WRKSRC=	${WRKSRC}
 .endif
 .if !exists(${DISTDIR}/${DEMO_DISTNAME}${EXTRACT_SUFX})
 IGNORE?=You must manually fetch the J2SE demos and samples for the Linux platform (${DEMO_DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
 .endif
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DEMO_DISTNAME}${EXTRACT_SUFX}
 PLIST_SUB+=	DEMO=""
 .else
 PLIST_SUB+=	DEMO="@comment "
 .endif
 
-pre-everything::
-	@${CAT} ${PKGMESSAGE}
-
 .if ${PORT_OPTIONS:MDEMO} && ${DEMO_WRKSRC} != ${WRKSRC}
 post-extract:
-	@${MV} ${DEMO_WRKSRC}/demo ${WRKSRC}/
-	@${MV} ${DEMO_WRKSRC}/sample ${WRKSRC}/
+	@cd ${DEMO_WRKSRC} && ${MV} demo sample ${WRKSRC}
 .endif
 
 post-patch:
-	@(cd ${WRKSRC}/include; ${LN} -s linux freebsd)
+	@cd ${WRKSRC}/include && ${LN} -s linux freebsd
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${APP_HOME}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${APP_HOME}
 	@cd ${STAGEDIR}${APP_HOME} && \
 	    ${CHMOD} ${BINMODE} ${BIN_DIRS:S|$|/*|} ${LIB_DIRS:S|$|/jexec|}
 
 post-install:
 	${MKDIR} ${STAGEDIR}${APP_HOME}/jre/.systemPrefs
 	${TOUCH} ${STAGEDIR}${APP_HOME}/jre/.systemPrefs/.system.lock
 	${TOUCH} ${STAGEDIR}${APP_HOME}/jre/.systemPrefs/.systemRootModFile
 	${CHMOD} 644 ${STAGEDIR}${APP_HOME}/jre/.systemPrefs/.system.lock
 	${CHMOD} 644 ${STAGEDIR}${APP_HOME}/jre/.systemPrefs/.systemRootModFile
 
 .include <bsd.port.post.mk>
Index: head/java/linux-sun-jre17/Makefile
===================================================================
--- head/java/linux-sun-jre17/Makefile	(revision 351571)
+++ head/java/linux-sun-jre17/Makefile	(revision 351572)
@@ -1,62 +1,60 @@
 # $FreeBSD$
 
 PORTNAME=	jre
 PORTVERSION=	${JRE_VERSION}.${JRE_UPDATE_VERSION}
 CATEGORIES=	java
 MASTER_SITES=	#
-PKGNAMEPREFIX=	linux-sun-
-DISTNAME=	jre-7u${JRE_UPDATE_VERSION}-linux-i586
+PKGNAMEPREFIX=	linux-${JRE_VENDOR}-
+DISTNAME=	jre-${JRE_VERSION}u${JRE_UPDATE_VERSION}-linux-i586
 
 MAINTAINER=	java@FreeBSD.org
-COMMENT=	Oracle Java 7 Runtime Environment for Linux
+COMMENT=	Oracle Java ${JRE_VERSION} Runtime Environment for Linux
 
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 
 NO_CDROM=	License does not allow distribution with fee
 RESTRICTED=	Redistribution of repackaged binaries not permitted
-PKGNAMESUFFIX=	17
+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
 USE_LINUX=	yes
 USE_LINUX_APPS=	xorglibs
 USES=		shebangfix
 ONLY_FOR_ARCHS=	i386 amd64
 
+JRE_VENDOR=		sun
 JRE_VERSION=		7
-JRE_INTERNAL_VERSION=	1.7.0
+JRE_INTERNAL_VERSION=	1.${JRE_VERSION}.0
 JRE_UPDATE_VERSION=	55
 DL_JRE_VERSION=		${JRE_INTERNAL_VERSION}_${JRE_UPDATE_VERSION}
 DOWNLOAD_URL=		http://www.oracle.com/technetwork/java/javase/downloads/index.html
 
 APP_HOME=	${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${JRE_INTERNAL_VERSION}
 BIN_DIRS=	bin
 LIB_DIRS=	${BIN_DIRS:S|bin$|lib|}
 SHEBANG_FILES=	${BIN_DIRS:S|$|/jcontrol|}
 bash_CMD=	${SH}
 
 .include <bsd.port.pre.mk>
 
 .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
 .endif
-
-pre-everything::
-	@${CAT} ${PKGMESSAGE}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${APP_HOME}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${APP_HOME}
 	@cd ${STAGEDIR}${APP_HOME} && \
 	    ${CHMOD} ${BINMODE} ${BIN_DIRS:S|$|/*|} ${LIB_DIRS:S|$|/jexec|}
 
 post-install:
 	${MKDIR} ${STAGEDIR}${APP_HOME}/.systemPrefs
 	${TOUCH} ${STAGEDIR}${APP_HOME}/.systemPrefs/.system.lock
 	${TOUCH} ${STAGEDIR}${APP_HOME}/.systemPrefs/.systemRootModFile
 	${CHMOD} 644 ${STAGEDIR}${APP_HOME}/.systemPrefs/.system.lock
 	${CHMOD} 644 ${STAGEDIR}${APP_HOME}/.systemPrefs/.systemRootModFile
 
 .include <bsd.port.post.mk>