Use code long floating around the Internet to add support for KOI8-U

encoding. It is even easier to do the same thing to jdk14 and jdk13,
where only one charset-interface exists (jdk15 has two with the old one
considered obsolete).

Approved by:  Alexey Zelkin	(maintainer)

4 files changed, 22 insertions, 6 deletions

diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index 4e42219..9fecbd3 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -7,14 +7,16 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
-MASTER_SITES=	# http://www.sun.com/software/java2/download.html
+MASTER_SITES=	http://www.kde.org.ua/data/java/:koi8u
+#		http://www.sun.com/software/java2/download.html
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk15.html
 SCSL_SRCFILE=	jdk-${JDK_VERSION:S/./_/g}-src-scsl.zip
 SCSL_BINFILE=	jdk-${JDK_VERSION:S/./_/g}-bin-scsl.zip
 PATCHSETFILE=	bsd-jdk15-patches-${JDK_PATCHSET_VERSION}.tar.bz2
-DISTFILES=	${SCSL_SRCFILE} ${SCSL_BINFILE} ${PATCHSETFILE}
+ENCODINGS=	java_koi8u.tgz:koi8u
+DISTFILES=	${SCSL_SRCFILE} ${SCSL_BINFILE} ${PATCHSETFILE} ${ENCODINGS}
 
 MAINTAINER=	phantom@FreeBSD.org
 COMMENT=	Java Development Kit 1.5.0
@@ -189,6 +191,10 @@ pre-everything::
 	@${ECHO_MSG} "WARNING: "
 	@${ECHO_MSG}
 
+post-extract:
+	${TAR} -C ${WRKSRC:H:H}/j2se/src/share/classes/sun/io/ -xzvpf ${DISTDIR}/java_koi8u.tgz '*.java'
+	${LN} -s ${FILESDIR}/KOI8_U.java ${WRKSRC:H:H}/j2se/src/share/classes/sun/nio/cs/
+
 pre-patch:
 	@cd ${WRKDIR} &&  \
 		${BZIP2_CMD} -dc ${DISTDIR}/${PATCHSETFILE} | ${TAR} -xf - && \
diff --git a/java/jdk15/distinfo b/java/jdk15/distinfo
index 80a968e..4815567 100644
--- a/java/jdk15/distinfo
+++ b/java/jdk15/distinfo
@@ -4,3 +4,5 @@ MD5 (jdk-1_5_0-bin-scsl.zip) = 3c3b2c079628141fa28f5f0f1cde5bf0
 SIZE (jdk-1_5_0-bin-scsl.zip) = 2219433
 MD5 (bsd-jdk15-patches-1.tar.bz2) = 13f8027f86106f2cee68aa702afd63f5
 SIZE (bsd-jdk15-patches-1.tar.bz2) = 618044
+MD5 (java_koi8u.tgz) = a483f4ceaad6dff3614ff37135bd35cf
+SIZE (java_koi8u.tgz) = 7296
diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile
index 4e42219..9fecbd3 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -7,14 +7,16 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
-MASTER_SITES=	# http://www.sun.com/software/java2/download.html
+MASTER_SITES=	http://www.kde.org.ua/data/java/:koi8u
+#		http://www.sun.com/software/java2/download.html
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk15.html
 SCSL_SRCFILE=	jdk-${JDK_VERSION:S/./_/g}-src-scsl.zip
 SCSL_BINFILE=	jdk-${JDK_VERSION:S/./_/g}-bin-scsl.zip
 PATCHSETFILE=	bsd-jdk15-patches-${JDK_PATCHSET_VERSION}.tar.bz2
-DISTFILES=	${SCSL_SRCFILE} ${SCSL_BINFILE} ${PATCHSETFILE}
+ENCODINGS=	java_koi8u.tgz:koi8u
+DISTFILES=	${SCSL_SRCFILE} ${SCSL_BINFILE} ${PATCHSETFILE} ${ENCODINGS}
 
 MAINTAINER=	phantom@FreeBSD.org
 COMMENT=	Java Development Kit 1.5.0
@@ -189,6 +191,10 @@ pre-everything::
 	@${ECHO_MSG} "WARNING: "
 	@${ECHO_MSG}
 
+post-extract:
+	${TAR} -C ${WRKSRC:H:H}/j2se/src/share/classes/sun/io/ -xzvpf ${DISTDIR}/java_koi8u.tgz '*.java'
+	${LN} -s ${FILESDIR}/KOI8_U.java ${WRKSRC:H:H}/j2se/src/share/classes/sun/nio/cs/
+
 pre-patch:
 	@cd ${WRKDIR} &&  \
 		${BZIP2_CMD} -dc ${DISTDIR}/${PATCHSETFILE} | ${TAR} -xf - && \
diff --git a/java/jdk16/distinfo b/java/jdk16/distinfo
index 80a968e..4815567 100644
--- a/java/jdk16/distinfo
+++ b/java/jdk16/distinfo
@@ -4,3 +4,5 @@ MD5 (jdk-1_5_0-bin-scsl.zip) = 3c3b2c079628141fa28f5f0f1cde5bf0
 SIZE (jdk-1_5_0-bin-scsl.zip) = 2219433
 MD5 (bsd-jdk15-patches-1.tar.bz2) = 13f8027f86106f2cee68aa702afd63f5
 SIZE (bsd-jdk15-patches-1.tar.bz2) = 618044
+MD5 (java_koi8u.tgz) = a483f4ceaad6dff3614ff37135bd35cf
+SIZE (java_koi8u.tgz) = 7296