4 files changed, 2 insertions, 7 deletions
diff --git a/java/netty/Makefile b/java/netty/Makefile
index 0f6fc251856a..354c6ffe5ecc 100644
--- a/java/netty/Makefile
+++ b/java/netty/Makefile
@@ -17,8 +17,8 @@ USES=		cpe tar:bzip2
 CPE_VENDOR=	netty_project
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
-DATADIR=	${PREFIX}/share/${UNIQUENAME}
-DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
+DATADIR=	${PREFIX}/share/${PKGBASE}
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.Final
 
 PLIST_FILES=	%%JAVAJARDIR%%/netty-${PORTVERSION}.jar \
diff --git a/java/openjdk6-jre/Makefile b/java/openjdk6-jre/Makefile
index 65624f4bb35c..5bc91065cad7 100644
--- a/java/openjdk6-jre/Makefile
+++ b/java/openjdk6-jre/Makefile
@@ -7,6 +7,5 @@ COMMENT=	Oracle's Java 6 Runtime Environment under the GPL v2
 
 BUILD_JRE=	yes
 MASTERDIR=	${.CURDIR}/../openjdk6
-UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/java/openjdk7-jre/Makefile b/java/openjdk7-jre/Makefile
index 52c032962a83..e52fd2626ccb 100644
--- a/java/openjdk7-jre/Makefile
+++ b/java/openjdk7-jre/Makefile
@@ -5,8 +5,6 @@ PKGNAMESUFFIX=	-jre
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Java Runtime Environment ${JDK_MAJOR_VERSION}
 
-LATEST_LINK=	openjdk7${PKGNAMESUFFIX}
-
 BUILD_JRE=	yes
 MASTERDIR=	${.CURDIR}/../openjdk7
 
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index 8958bbec6e24..9d9cde9f5c50 100644
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@@ -58,8 +58,6 @@ JDK_SRC_DISTFILE=	${PORTNAME}-${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}-fcs-src-
 ANT_VERSION=		1.9.4
 ANT_DISTFILE=		apache-ant-${ANT_VERSION}-bin
 
-LATEST_LINK?=		openjdk7
-
 LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
 		libfreetype.so:${PORTSDIR}/print/freetype2