Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Jul 2005 23:02:34 -0400 (EDT)
From:      "Mikhail T." <mi@aldan.algebra.com>
To:        phantom@FreeBSD.org, java@FreeBSD.org
Cc:        mike@LITech.lviv.ua, kunia@istc.kiev.ua
Subject:   Adding KOI8-U support to JDK-1.5
Message-ID:  <200507220302.j6M32YoG022709@blue.virtual-estates.net>

next in thread | raw e-mail | index | archive | help

--ELM1122001354-22616-0_
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII

Hello!

Below is code to add the support for the KOI8-U charset to JDK.

Please, let me know if I can commit it. It is even simpler to add this
support to earlier JDKs (no need for the additional KOI8_U.java, just
follow the patch author's instructions), but let's start with the
"experimental" JDK-1.5 first.

Thank you!

	-mi

--ELM1122001354-22616-0_
Content-Transfer-Encoding: 7bit
Content-Type: text/x-patch
Content-Disposition: attachment; filename=jdk15-koi8-u.patch
Content-Description: Patch for the port itself

? files/KOI8_U.java
? files/patch-koi8u
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/java/jdk15/Makefile,v
retrieving revision 1.90
diff -U2 -r1.90 Makefile
--- Makefile	12 May 2005 04:14:52 -0000	1.90
+++ Makefile	22 Jul 2005 02:52:38 -0000
@@ -8,12 +8,14 @@
 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
@@ -190,4 +192,8 @@
 	@${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} &&  \
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/java/jdk15/distinfo,v
retrieving revision 1.14
diff -U2 -r1.14 distinfo
--- distinfo	20 Jan 2005 08:41:13 -0000	1.14
+++ distinfo	22 Jul 2005 02:52:38 -0000
@@ -5,2 +5,4 @@
 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

--ELM1122001354-22616-0_
Content-Transfer-Encoding: 7bit
Content-Type: text/plain
Content-Disposition: attachment; filename=patch-koi8u
Content-Description: drop into the port's files/ subdirectory

--- ../../j2se/src/share/classes/sun/nio/cs/standard-charsets	Tue Oct 19 14:57:57 2004
+++ ../../j2se/src/share/classes/sun/nio/cs/standard-charsets	Wed Jul 20 00:02:11 2005
@@ -172,6 +172,11 @@
 charset KOI8-R KOI8_R
     alias koi8_r			# JDK historical
-    alias koi8
     alias cskoi8r
+
+charset KOI8-U KOI8_U		# Superset of KOI8-R covering other
+    alias koi8_u		# Cyrillics-using alphabets
+    alias koi8
+    alias cskoi8u
+    alias koi8u
 
 charset windows-1250 MS1250
--- ../../j2se/src/share/classes/sun/io/CharacterEncoding.java	Tue Oct 19 14:57:28 2004
+++ ../../j2se/src/share/classes/sun/io/CharacterEncoding.java	Wed Jul 20 01:10:16 2005
@@ -75,4 +75,5 @@
         aliasTable.put("gbk",                   "GBK");
         aliasTable.put("koi8-r",                "KOI8_R");
+        aliasTable.put("koi8-u",                "KOI8_U");
         aliasTable.put("tis620.2533",           "TIS620");
         
@@ -763,6 +764,11 @@
             // Russian KOI8-R
             aliasTable.put("koi8-r",                "KOI8_R");
-            aliasTable.put("koi8",                  "KOI8_R");
             aliasTable.put("cskoi8r",               "KOI8_R");
+
+            // Ukrainian and Bielorussian KOI8-U (includes KOI8-R)
+            aliasTable.put("koi8-u",                "KOI8_U");
+            aliasTable.put("koi8",                  "KOI8_U");
+            aliasTable.put("koi8u",                 "KOI8_U");
+            aliasTable.put("cskoi8u",               "KOI8_U");
 
             // Simplified Chinese
--- ../../j2se/make/java/sun_io/FILES_java.gmk	Tue Oct 19 14:44:54 2004
+++ ../../j2se/make/java/sun_io/FILES_java.gmk	Wed Jul 20 01:20:35 2005
@@ -65,4 +65,6 @@
     $(TARGDIR)sun/io/ByteToCharKOI8_R.java \
     $(TARGDIR)sun/io/CharToByteKOI8_R.java \
+    $(TARGDIR)sun/io/ByteToCharKOI8_U.java \
+    $(TARGDIR)sun/io/CharToByteKOI8_U.java \
     $(TARGDIR)sun/io/ByteToCharSingleByte.java \
     $(TARGDIR)sun/io/CharToByteSingleByte.java \

--ELM1122001354-22616-0_--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200507220302.j6M32YoG022709>