mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-22 08:58:47 +00:00
Code Issues Releases Activity

- Update to 5.01 (5.0.14)

Browse Source 
- Use CONFLICTS_INSTALL instead off CONFLICTS
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2014-02-28 15:15:25 +00:00
parent 37694a56b1
commit 337f9e9d28
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=346528
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chinese/unrar/Makefile
View File

@ -10,6 +10,6 @@ MASTERDIR= ${.CURDIR}/../../archivers/unrar
EXTRA_PATCHES= ${.CURDIR}/files/patch-arcread.cpp \
${.CURDIR}/files/patch-unicode.cpp
CONFLICTS= unrar-[0-9]* unrar-iconv-[0-9]*
CONFLICTS_INSTALL= unrar-[0-9]* unrar-iconv-[0-9]*
.include "${MASTERDIR}/Makefile"

26
chinese/unrar/files/patch-arcread.cpp
View File

@ -1,16 +1,16 @@
--- arcread.cpp.orig 2011-01-04 20:28:47.000000000 +0800
+++ arcread.cpp 2011-01-21 22:59:22.000000000 +0800
@@ -629,6 +629,7 @@
--- arcread.cpp.orig 2013-12-01 16:10:14.000000000 +0800
+++ arcread.cpp 2014-02-04 09:23:21.669710373 +0800
@@ -1272,6 +1272,7 @@
void Archive::ConvertUnknownHeader()
void Archive::ConvertFileHeader(FileHeader *hd)
{
+ int big5=0;
if (NewLhd.UnpVer<20 && (NewLhd.FileAttr & 0x10))
NewLhd.Flags|=LHD_DIRECTORY;
if (NewLhd.HostOS>=HOST_MAX)
@@ -640,6 +641,16 @@
}
for (char *s=NewLhd.FileName;*s!=0;s=charnext(s))
if (Format==RARFMT15 && hd->UnpVer<20 && (hd->FileAttr & 0x10))
hd->Dir=true;
if (hd->HSType==HSYS_UNKNOWN)
@@ -1282,6 +1283,16 @@
for (wchar *s=hd->FileName;*s!=0;s++)
{
+ if (big5==1) /* skip Big5 second byte */
+ {
@ -22,6 +22,6 @@
+ big5=1;
+ continue;
+ }
if (*s=='/' || *s=='\\')
*s=CPATHDIVIDER;
#if defined(_APPLE) && !defined(UNICODE_SUPPORTED)
#ifdef _UNIX
// Backslash is the invalid character for Windows file headers,
// but it can present in Unix file names extracted in Unix.