From owner-freebsd-ports Fri Feb 23 4:40:35 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id ED84337B698 for ; Fri, 23 Feb 2001 04:40:03 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id f1NCe3h81321; Fri, 23 Feb 2001 04:40:03 -0800 (PST) (envelope-from gnats) Received: from jivago.ryazan.ru (jivago.ryazan.ru [212.26.226.45]) by hub.freebsd.org (Postfix) with ESMTP id 1EC4637B503 for ; Fri, 23 Feb 2001 04:31:44 -0800 (PST) (envelope-from root@jivago.ryazan.ru) Received: from root by jivago.ryazan.ru with local (Exim 3.16 #1) id 14WHNM-000OTp-00 for FreeBSD-gnats-submit@freebsd.org; Fri, 23 Feb 2001 15:31:08 +0300 Message-Id: Date: Fri, 23 Feb 2001 15:31:08 +0300 From: skv@protey.ru Reply-To: skv@protey.ru To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/25306: Update port: Sablotron is an XSL processor fully implemented in C++ Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 25306 >Category: ports >Synopsis: Update port: Sablotron is an XSL processor fully implemented in C++ >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Feb 23 04:40:03 PST 2001 >Closed-Date: >Last-Modified: >Originator: Sergey Skvortsov >Release: FreeBSD 4.2-STABLE i386 >Organization: >Environment: >Description: Update port: Sablotron is an XSL processor fully implemented in C++ >How-To-Repeat: >Fix: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # sablotron # sablotron/files # sablotron/files/rus-patch # sablotron/files/patch-engine-utf8.cpp # sablotron/distinfo # sablotron/pkg-descr # sablotron/pkg-plist # sablotron/pkg-comment # sablotron/Makefile # echo c - sablotron mkdir -p sablotron > /dev/null 2>&1 echo c - sablotron/files mkdir -p sablotron/files > /dev/null 2>&1 echo x - sablotron/files/rus-patch sed 's/^X//' >sablotron/files/rus-patch << 'END-of-sablotron/files/rus-patch' Xdiff -crN Sablot/engine/enc_cyr.h Sablot/engine/enc_cyr.h X*** Sablot/engine/enc_cyr.h Thu Jan 1 03:00:00 1970 X--- Sablot/engine/enc_cyr.h Thu Feb 22 16:58:56 2001 X*************** X*** 0 **** X--- 1,80 ---- X+ /** X+ X+ This file contains charset uncode conversion table for cyrillic charsets X+ windows-1251 (cp1251), cp866 and koi8-r. X+ X+ Source for mappings ftp.unicode.org/pub/mappings X+ X+ Copyright (C) by vvz (vvz@iname.com) 2000. X+ You can use it as you want (any kind of license you want). X+ X+ */ X+ X+ int EncCP1251[] = X+ { X+ X+ 0x0402, 0x0403, 0x201a, 0x0453, 0x201e, 0x2026, 0x2020, 0x2021, X+ 0x20ac, 0x2030, 0x0409, 0x2039, 0x040a, 0x040c, 0x040b, 0x040f, X+ 0x0452, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, X+ -1, 0x2122, 0x0459, 0x203a, 0x045a, 0x045c, 0x045b, 0x045f, X+ 0x00a0, 0x040e, 0x045e, 0x0408, 0x00a4, 0x0490, 0x00a6, 0x00a7, X+ 0x0401, 0x00a9, 0x0404, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x0407, X+ 0x00b0, 0x00b1, 0x0406, 0x0456, 0x0491, 0x00b5, 0x00b6, 0x00b7, X+ 0x0451, 0x2116, 0x0454, 0x00bb, 0x0458, 0x0405, 0x0455, 0x0457, X+ 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, X+ 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, 0x041f, X+ 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, X+ 0x0428, 0x0429, 0x042a, 0x042b, 0x042c, 0x042d, 0x042e, 0x042f, X+ 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, X+ 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, 0x043f, X+ 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, X+ 0x0448, 0x0449, 0x044a, 0x044b, 0x044c, 0x044d, 0x044e, 0x044f X+ }; X+ X+ X+ int EncCP866[] = X+ { X+ X+ 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, X+ 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, 0x041f, X+ 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, X+ 0x0428, 0x0429, 0x042a, 0x042b, 0x042c, 0x042d, 0x042e, 0x042f, X+ 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, X+ 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, 0x043f, X+ 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, X+ 0x2555, 0x2563, 0x2551, 0x2557, 0x255d, 0x255c, 0x255b, 0x2510, X+ 0x2514, 0x2534, 0x252c, 0x251c, 0x2500, 0x253c, 0x255e, 0x255f, X+ 0x255a, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256c, 0x2567, X+ 0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256b, X+ 0x256a, 0x2518, 0x250c, 0x2588, 0x2584, 0x258c, 0x2590, 0x2580, X+ 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, X+ 0x0448, 0x0449, 0x044a, 0x044b, 0x044c, 0x044d, 0x044e, 0x044f, X+ 0x0401, 0x0451, 0x0404, 0x0454, 0x0407, 0x0457, 0x040e, 0x045e, X+ 0x00b0, 0x2219, 0x00b7, 0x221a, 0x2116, 0x00a4, 0x25a0, 0x00a0 X+ X+ }; X+ X+ X+ int EncKOI8_R[] = X+ { X+ X+ X+ 0x2500, 0x2502, 0x250c, 0x2510, 0x2514, 0x2518, 0x251c, 0x2524, X+ 0x252c, 0x2534, 0x253c, 0x2580, 0x2584, 0x2588, 0x258c, 0x2590, X+ 0x2591, 0x2592, 0x2593, 0x2320, 0x25a0, 0x2219, 0x221a, 0x2248, X+ 0x2264, 0x2265, 0x00a0, 0x2321, 0x00b0, 0x00b2, 0x00b7, 0x00f7, X+ 0x2550, 0x2551, 0x2552, 0x0451, 0x2553, 0x2554, 0x2555, 0x2556, X+ 0x2557, 0x2558, 0x2559, 0x255a, 0x255b, 0x255c, 0x255d, 0x255e, X+ 0x255f, 0x2560, 0x2561, 0x0401, 0x2562, 0x2563, 0x2564, 0x2565, X+ 0x2566, 0x2567, 0x2568, 0x2569, 0x256a, 0x256b, 0x256c, 0x00a9, X+ 0x044e, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, X+ 0x0445, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, X+ 0x043f, 0x044f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, X+ 0x044c, 0x044b, 0x0437, 0x0448, 0x044d, 0x0449, 0x0447, 0x044a, X+ 0x042e, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, X+ 0x0425, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, X+ 0x041f, 0x042f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, X+ 0x042c, 0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a X+ }; X+ X+ Xdiff -crN Sablot/engine/output.cpp Sablot/engine/output.cpp X*** Sablot/engine/output.cpp Thu Feb 22 17:29:40 2001 X--- Sablot/engine/output.cpp Thu Feb 22 17:29:48 2001 X*************** X*** 258,263 **** X--- 258,271 ---- X return ENC_8859_1; X else if (enc_.eqNoCase((char*) "iso-8859-2")) X return ENC_8859_2; X+ else if (enc_.eqNoCase((char*) "koi8-r")) X+ return ENC_KOI8R; X+ else if (enc_.eqNoCase((char*) "windows-1251")) X+ return ENC_1251; X+ else if (enc_.eqNoCase((char*) "cp1251")) X+ return ENC_1251; X+ else if (enc_.eqNoCase((char*) "cp866" )) X+ return ENC_866; X else if (enc_.eqNoCase((char*) "euc-jp")) X return ENC_EUCJP; X else if (enc_.eqNoCase((char*) "shift-jis")) Xdiff -crN Sablot/engine/parser.cpp Sablot/engine/parser.cpp X*** Sablot/engine/parser.cpp Thu Feb 22 17:29:40 2001 X--- Sablot/engine/parser.cpp Thu Feb 22 17:29:48 2001 X*************** X*** 40,45 **** X--- 40,47 ---- X X // for the windows-1250 encoding: X #include "enc1250.h" X+ // for the cyrillic encoding X+ #include "enc_cyr.h" X // (will change to encodings.h) X X // X*************** X*** 552,557 **** X--- 554,567 ---- X theTable = Enc1250; X else if (strEqNoCase((char*) name,"iso-8859-2")) X theTable = EncLatin2; X+ else if (strEqNoCase((char*) name,"koi8-r")) X+ theTable = EncKOI8_R; X+ else if (strEqNoCase((char*) name,"windows-1251")) X+ theTable = EncCP1251; X+ else if (strEqNoCase((char*) name,"cp1251")) X+ theTable = EncCP1251; X+ else if (strEqNoCase((char*) name,"cp866")) X+ theTable = EncCP866; X else X return 0; X int i; Xdiff -crN Sablot/engine/utf8.cpp Sablot/engine/utf8.cpp X*** Sablot/engine/utf8.cpp Thu Feb 22 17:29:41 2001 X--- Sablot/engine/utf8.cpp Thu Feb 22 17:29:48 2001 X*************** X*** 63,69 **** X #endif X X /* This MUST match the Encoding enum defined in utf8.h */ X! static const char* iconv_encoding[8] = X { X "UTF8", X "UTF16", X--- 63,69 ---- X #endif X X /* This MUST match the Encoding enum defined in utf8.h */ X! static const char* iconv_encoding[11] = X { X "UTF8", X "UTF16", X*************** X*** 71,76 **** X--- 71,79 ---- X "ISO-8859-1", X "ISO-8859-2", X "CP1250", X+ "KOI8-R", X+ "CP1251", X+ "CP866", X "EUC-JP", X "SHIFT-JIS" X }; Xdiff -crN Sablot/engine/utf8.h Sablot/engine/utf8.h X*** Sablot/engine/utf8.h Thu Feb 22 17:29:40 2001 X--- Sablot/engine/utf8.h Thu Feb 22 17:29:48 2001 X*************** X*** 49,54 **** X--- 49,57 ---- X ENC_8859_1, X ENC_8859_2, X ENC_1250, X+ ENC_KOI8R, X+ ENC_1251, X+ ENC_866, X ENC_EUCJP, X ENC_SJIS X }; END-of-sablotron/files/rus-patch echo x - sablotron/files/patch-engine-utf8.cpp sed 's/^X//' >sablotron/files/patch-engine-utf8.cpp << 'END-of-sablotron/files/patch-engine-utf8.cpp' Xdiff -crN Sablot-0.51.orig/Sablot/engine/utf8.cpp Sablot-0.51/Sablot/engine/utf8.cpp X*** Sablot/engine/utf8.cpp Fri Feb 23 15:03:03 2001 X--- Sablot/engine/utf8.cpp Fri Feb 23 15:02:23 2001 X*************** X*** 55,61 **** X--- 55,63 ---- X #include "utf8.h" X X #ifdef HAVE_ICONV_H X+ extern "C" { X #include X+ } X #endif X X #if defined(HAVE_WCHAR_H) || defined(_MSC_VER) END-of-sablotron/files/patch-engine-utf8.cpp echo x - sablotron/distinfo sed 's/^X//' >sablotron/distinfo << 'END-of-sablotron/distinfo' XMD5 (Sablot-0.51.tar.gz) = 86e30805258a3f61e16796b5ef84b64a END-of-sablotron/distinfo echo x - sablotron/pkg-descr sed 's/^X//' >sablotron/pkg-descr << 'END-of-sablotron/pkg-descr' XSablotron is an XSL processor fully implemented in C++. X XOriginal creator of Sablotron is Ginger Alliance Ltd; Czech Republic. X XWWW: http://www.gingerall.com/ END-of-sablotron/pkg-descr echo x - sablotron/pkg-plist sed 's/^X//' >sablotron/pkg-plist << 'END-of-sablotron/pkg-plist' Xinclude/sablot.h Xinclude/shandler.h Xbin/sabcmd Xlib/libsablot.so.51 Xlib/libsablot.so Xlib/libsablot.a END-of-sablotron/pkg-plist echo x - sablotron/pkg-comment sed 's/^X//' >sablotron/pkg-comment << 'END-of-sablotron/pkg-comment' XSablotron is an XSL processor fully implemented in C++ END-of-sablotron/pkg-comment echo x - sablotron/Makefile sed 's/^X//' >sablotron/Makefile << 'END-of-sablotron/Makefile' X# New ports collection makefile for: sablotron X# Date created: 13 Nov 2000 X# Whom: Sergey Skvortsov X# X# $FreeBSD: ports/textproc/sablotron/Makefile,v 1.4 2001/02/23 03:06:25 vanilla Exp $ X# X XPORTNAME= Sablot XPORTVERSION= 0.51 XCATEGORIES= textproc XMASTER_SITES= http://download.gingerall.cz/sablot/ X XMAINTAINER= skv@protey.ru X XLIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv \ X expat.2:${PORTSDIR}/textproc/expat2 X XINSTALLS_SHLIB= yes XLDCONFIG_DIRS= %%PREFIX%%/lib XCONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib XUSE_GMAKE= yes XUSE_AUTOCONF= yes XUSE_LIBTOOL= yes X Xpost-patch: X.if defined(WITH_RUSSIAN) X @${ECHO_MSG} "Patching for russian support..." X @cd ${WRKDIR} ; \ X if ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/rus-patch ; then \ X ${ECHO_MSG} ">> Patch applied cleanly." ; \ X else \ X ${ECHO_MSG} ">> Patch failed to apply cleanly." ; \ X ${FALSE} ; \ X fi X.endif X X.include END-of-sablotron/Makefile exit >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message