From owner-freebsd-ports@FreeBSD.ORG Fri Jul 4 10:10:46 2008 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1A4EC106564A for ; Fri, 4 Jul 2008 10:10:46 +0000 (UTC) (envelope-from athathoth@yandex.ru) Received: from smtp15.yandex.ru (smtp15.yandex.ru [77.88.32.85]) by mx1.freebsd.org (Postfix) with ESMTP id 3E76A8FC26 for ; Fri, 4 Jul 2008 10:10:44 +0000 (UTC) (envelope-from athathoth@yandex.ru) Received: from [83.234.63.254] ([83.234.63.254]:46280 "EHLO crush.dony" smtp-auth: "athathoth" TLS-CIPHER: "DHE-RSA-AES256-SHA keybits 256/256 version TLSv1/SSLv3" TLS-PEER-CN1: ) by mail.yandex.ru with ESMTP id S1377368AbYGDJun (ORCPT ); Fri, 4 Jul 2008 13:50:43 +0400 X-Yandex-Spam: 1 X-Yandex-Front: smtp15 X-Yandex-TimeMark: 1215165043 X-MsgDayCount: 1 X-Comment: RFC 2476 MSA function at smtp15.yandex.ru logged sender identity as: athathoth From: =?utf-8?b?0JPQvtC70Y/RiNC+0LIg0KHQtdGA0LPQtdC5?= To: freebsd-ports@freebsd.org Date: Fri, 4 Jul 2008 20:50:38 +1100 User-Agent: KMail/1.9.7 MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_uJfbI5UNyPHlpJK" Message-Id: <200807042050.38736.athathoth@yandex.ru> Subject: unrar-iconv-3.80.b2,5 patch error X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: athathoth@yandex.ru List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jul 2008 10:10:46 -0000 --Boundary-00=_uJfbI5UNyPHlpJK Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline ======== # cd /usr/ports/archivers/unrar-iconv # make patch ===> Vulnerability check disabled, database not found ===> Extracting for unrar-iconv-3.80.b2,5 ===> Patching for unrar-iconv-3.80.b2,5 ===> Applying extra patch /usr/ports/archivers/unrar-iconv/files/patch-iconv 1 out of 1 hunks failed--saving rejects to makefile.unix.rej *** Error code 1 Stop in /usr/ports/archivers/unrar-iconv. ======== New patch (files/patch-iconv) attached --Boundary-00=_uJfbI5UNyPHlpJK Content-Type: text/x-diff; charset="utf-8"; name="patch-iconv" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-iconv" --- cmddata.cpp Tue Oct 4 11:57:54 2005 +++ cmddata.cpp Mon Jan 16 18:06:24 2006 @@ -123,6 +123,34 @@ if (Test && Extract) Test=false; BareOutput=(CmdChar=='L' || CmdChar=='V') && Command[1]=='B'; +#ifdef WITH_ICONV + if ( (encInt[0] != '\0') || (encExt[0] != '\0') ) { + char fullEncInt[ENC_MAXLEN + OPT_MAXLEN + 1]; + char fullEncExt[ENC_MAXLEN + OPT_MAXLEN + 1]; + + strcpy(fullEncInt, encInt); + strcpy(fullEncExt, encExt); + + if (encOpt[0] == '\0') strcpy(encOpt, OPT_DEFAULT); + + if (encOpt[0] != '\0') { + strcat(fullEncInt, "//"); strcat(fullEncInt, encOpt); + strcat(fullEncExt, "//"); strcat(fullEncExt, encOpt); + } + + h_E2I = iconv_open(fullEncInt, encExt); + h_I2E = iconv_open(fullEncExt, encInt); + + if ( (h_E2I == (iconv_t)(-1)) || (h_I2E == (iconv_t)(-1)) ) { + if (h_E2I != (iconv_t)(-1)) iconv_close(h_E2I); + if (h_I2E != (iconv_t)(-1)) iconv_close(h_I2E); + mprintf(St(MIconvCannotOpen), encInt, encExt, encOpt); + } + } else { + h_E2I = (iconv_t)(-1); + h_I2E = (iconv_t)(-1); + } +#endif } @@ -746,6 +774,22 @@ break; } break; +#ifdef WITH_ICONV + case 'L': + switch(toupper(Switch[1])) + { + case 'L': + strncpy(encExt, Switch+2, sizeof(encExt)-1); + break; + case 'A': + strncpy(encInt, Switch+2, sizeof(encInt)-1); + break; + case 'O': + strncpy(encOpt, Switch+2, sizeof(encOpt)-1); + break; + } + break; +#endif #ifndef GUI case '?' : OutHelp(); @@ -938,7 +982,11 @@ MCHelpSwm,MCHelpSwAC,MCHelpSwAD,MCHelpSwAP, MCHelpSwCm,MCHelpSwCFGm,MCHelpSwCL,MCHelpSwCU, MCHelpSwDH,MCHelpSwEP,MCHelpSwEP3,MCHelpSwF,MCHelpSwIDP,MCHelpSwIERR, - MCHelpSwINUL,MCHelpSwIOFF,MCHelpSwKB,MCHelpSwN,MCHelpSwNa,MCHelpSwNal, + MCHelpSwINUL,MCHelpSwIOFF,MCHelpSwKB, +#ifdef WITH_ICONV + MCHelpSwLA,MCHelpSwLL,MCHelpSwLO, +#endif + MCHelpSwN,MCHelpSwNa,MCHelpSwNal, MCHelpSwO,MCHelpSwOC,MCHelpSwOR,MCHelpSwOW,MCHelpSwP, MCHelpSwPm,MCHelpSwR,MCHelpSwRI,MCHelpSwSL,MCHelpSwSM,MCHelpSwTA, MCHelpSwTB,MCHelpSwTN,MCHelpSwTO,MCHelpSwTS,MCHelpSwU,MCHelpSwVUnr, --- global.hpp Tue Oct 4 11:57:54 2005 +++ global.hpp Mon Jan 16 18:04:41 2006 @@ -9,6 +9,19 @@ EXTVAR ErrorHandler ErrHandler; +#ifdef WITH_ICONV +#define OPT_DEFAULT "IGNORE" /* ignore unrepresentable chars */ + +#define ENC_MAXLEN 32 /* encoding name maximum length */ +#define OPT_MAXLEN 9 /* strlen("TRANSLIT") */ + +EXTVAR iconv_t h_E2I; /* ExtToInt handler */ +EXTVAR iconv_t h_I2E; /* IntToExt handler */ +EXTVAR char encInt[ENC_MAXLEN]; /* internal (archive) encoding */ +EXTVAR char encExt[ENC_MAXLEN]; /* external (filesystem) encoding */ +EXTVAR char encOpt[OPT_MAXLEN]; /* encoding option (ignore/translit) */ + +#endif #endif --- loclang.hpp Tue Oct 4 11:57:54 2005 +++ loclang.hpp Mon Jan 16 18:04:41 2006 @@ -6,7 +6,7 @@ #define MCopyright "\nRAR %s Copyright (c) 1993-%d Alexander Roshal %d %s %d" #define MRegTo "\nRegistered to %s\n" #define MShare "\nShareware version Type RAR -? for help\n" -#define MUCopyright "\nUNRAR %s freeware Copyright (c) 1993-%d Alexander Roshal\n" +#define MUCopyright "\nUNRAR %s (iconv) freeware Copyright (c) 1993-%d Alexander Roshal\n" #define MBeta "beta" #define MMonthJan "Jan" #define MMonthFeb "Feb" @@ -310,7 +310,7 @@ #define MSyncScanError "\nFile search errors, cannot synchronize archive" #define MCorrectingName "\nWARNING: Attempting to correct the invalid file name" #define MUnpCannotMerge "\nWARNING: You need to start extraction from a previous volume to unpack %s" -#define MUnknownOption "\nERROR: Unknown option: %s" +#define MUnknownOption "\nERROR: Unknown option: %s\n" #define MSubHeadCorrupt "\nERROR: Corrupt data header found, ignored" #define MSubHeadUnknown "\nWARNING: Unknown data header format, ignored" #define MSubHeadDataCRC "\nERROR: Corrupt %s data block" @@ -338,3 +338,9 @@ #define MMaxPathLimit "\nTotal path and file name length must not exceed %d characters" #define MRecVolLimit "\nTotal number of usual and recovery volumes must not exceed 255" #define MVolumeNumber "volume %d" +#ifdef WITH_ICONV +#define MCHelpSwLA "\n la Archive internal filenames encoding" +#define MCHelpSwLL "\n ll Your locale encoding" +#define MCHelpSwLO "\n lo