From 7d082aa31ff6fced61dfb97325a8b5d341a5a83d Mon Sep 17 00:00:00 2001 From: Yen-Ming Lee Date: Wed, 7 Sep 2005 14:13:55 +0000 Subject: [PATCH] - update patch, fix build, and unbreak this port --- chinese/unrar/Makefile | 2 -- chinese/unrar/files/patch-unicode.cpp | 16 ++++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/chinese/unrar/Makefile b/chinese/unrar/Makefile index c611b48ab470..d9ef056b47d8 100644 --- a/chinese/unrar/Makefile +++ b/chinese/unrar/Makefile @@ -9,8 +9,6 @@ CATEGORIES= chinese MAINTAINER= ports@FreeBSD.org -BROKEN= "Patch fails" - MASTERDIR= ${.CURDIR}/../../archivers/unrar EXTRA_PATCHES= ${.CURDIR}/files/patch-arcread.cpp \ diff --git a/chinese/unrar/files/patch-unicode.cpp b/chinese/unrar/files/patch-unicode.cpp index 052669a6bd34..14bfc0dac269 100644 --- a/chinese/unrar/files/patch-unicode.cpp +++ b/chinese/unrar/files/patch-unicode.cpp @@ -1,10 +1,10 @@ ---- unicode.cpp.orig Wed Sep 8 21:57:20 2004 -+++ unicode.cpp Tue Oct 26 01:49:46 2004 -@@ -6,6 +6,7 @@ - - void WideToChar(const wchar *Src,char *Dest,int DestSize) +--- unicode.cpp.orig Thu Aug 4 00:34:30 2005 ++++ unicode.cpp Wed Sep 7 22:01:58 2005 +@@ -7,6 +7,7 @@ + bool WideToChar(const wchar *Src,char *Dest,int DestSize) { -+ return; /* patch for chinese filename */ + bool RetCode=true; ++ return(RetCode); /* patch for chinese filename */ #ifdef _WIN_32 - WideCharToMultiByte(CP_ACP,0,Src,-1,Dest,DestSize,NULL,NULL); - #else + if (WideCharToMultiByte(CP_ACP,0,Src,-1,Dest,DestSize,NULL,NULL)==0) + RetCode=false;