diff options
author | marino <marino@FreeBSD.org> | 2014-08-15 18:11:10 +0800 |
---|---|---|
committer | marino <marino@FreeBSD.org> | 2014-08-15 18:11:10 +0800 |
commit | af2cdfc7dd4d2d68d0c85f4071b6759a27afd0b5 (patch) | |
tree | 8c9c10338f3c4becfa5b12ec66245fa9bdb2eb5b /korean | |
parent | f90385ceafb77f4d747fbfaed409a1aa2a0ebab4 (diff) | |
download | freebsd-ports-gnome-af2cdfc7dd4d2d68d0c85f4071b6759a27afd0b5.tar.gz freebsd-ports-gnome-af2cdfc7dd4d2d68d0c85f4071b6759a27afd0b5.tar.zst freebsd-ports-gnome-af2cdfc7dd4d2d68d0c85f4071b6759a27afd0b5.zip |
Merge 4 unzip slave ports into archivers/unzip as non-default options
It is practically impossible to use any of the unzip slave ports. This
is because archivers/unzip is used by the ports infrastruction (via
USES=zip, USES=zip:infozip) and each slave port conflicts with it.
If you install the slave port first, then the port infrastructure can't
install archivers/unzip (although if attempted, the extracts dependency
might be satisfied by the slave port so it might actually work).
In any case, this change:
* Adds "iconv" support as an non-default option
* Add a localization group that can have zero or one selection
* That group contains Chinese, Korean, or Russian support
* WITH_UNZIP_UNREDUCE support was removed (I'm not sure it even worked)
* Makefile was simplified (several loops removed)
* Removes unzip-iconv, Chinese, Korean, Russian slave ports
PR: 190349
Reported by: Mikhail Rokhin
Unzip overhaul: marino
Approved by: maintainer (ehaupt@)
Diffstat (limited to 'korean')
-rw-r--r-- | korean/unzip/Makefile | 14 | ||||
-rw-r--r-- | korean/unzip/files/patch-fileio.c | 14 | ||||
-rw-r--r-- | korean/unzip/files/patch-unzip.c | 25 | ||||
-rw-r--r-- | korean/unzip/files/patch-unzip.h | 10 |
4 files changed, 0 insertions, 63 deletions
diff --git a/korean/unzip/Makefile b/korean/unzip/Makefile deleted file mode 100644 index 41a1ce431e43..000000000000 --- a/korean/unzip/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# Created by: Hye-Shik Chang -# $FreeBSD$ - -CATEGORIES= korean archivers - -MAINTAINER= ports@FreeBSD.org -COMMENT= ZIP archive extractor with localized patches - -CONFLICTS= unzip-[0-9]* unzip-iconv-[0-9]* ru-unzip-[0-9]* zh-unzip-[0-9]* - -EXTRA_PATCHES= ${.CURDIR}/files/patch-* -MASTERDIR= ${.CURDIR}/../../archivers/unzip - -.include "${MASTERDIR}/Makefile" diff --git a/korean/unzip/files/patch-fileio.c b/korean/unzip/files/patch-fileio.c deleted file mode 100644 index 876846075a76..000000000000 --- a/korean/unzip/files/patch-fileio.c +++ /dev/null @@ -1,14 +0,0 @@ ---- fileio.c.orig Sun Feb 17 14:43:28 2002 -+++ fileio.c Wed May 21 03:40:24 2003 -@@ -2135,8 +2135,9 @@ - - /* translate the Zip entry filename coded in host-dependent "extended - ASCII" into the compiler's (system's) internal text code page */ -- Ext_ASCII_TO_Native(G.filename, G.pInfo->hostnum, G.pInfo->hostver, -- G.pInfo->HasUxAtt, (option == DS_FN_L)); -+ if (!uO.dotflag) -+ Ext_ASCII_TO_Native(G.filename, G.pInfo->hostnum, G.pInfo->hostver, -+ G.pInfo->HasUxAtt, (option == DS_FN_L)); - - if (G.pInfo->lcflag) /* replace with lowercase filename */ - STRLOWER(G.filename, G.filename); diff --git a/korean/unzip/files/patch-unzip.c b/korean/unzip/files/patch-unzip.c deleted file mode 100644 index 7e8b3245074c..000000000000 --- a/korean/unzip/files/patch-unzip.c +++ /dev/null @@ -1,25 +0,0 @@ ---- unzip.c.orig 2009-04-17 03:26:52.000000000 +0900 -+++ unzip.c 2011-02-15 11:25:36.000000000 +0900 -@@ -664,7 +664,8 @@ - -j junk paths (do not make directories) -aa treat ALL files as text\n\ - -U use escapes for all non-ASCII Unicode -UU ignore any Unicode fields\n\ - -C match filenames case-insensitively -L make (some) names \ --lowercase\n %-42s -V retain VMS version numbers\n%s"; -+lowercase\n %-42s -V retain VMS version numbers\n\ -+ -. don't translate filenames\n%s"; - #else /* !VMS */ - static ZCONST char Far UnzipUsageLine4[] = "\ - modifiers:\n\ -@@ -1829,6 +1830,12 @@ - ++uO.cflxflag; - break; - #endif /* UNIX */ -+ case ('.'): -+ if (negative) -+ uO.dotflag = FALSE, negative = 0; -+ else -+ uO.dotflag = TRUE; -+ break; - default: - error = TRUE; - break; diff --git a/korean/unzip/files/patch-unzip.h b/korean/unzip/files/patch-unzip.h deleted file mode 100644 index a79d047470df..000000000000 --- a/korean/unzip/files/patch-unzip.h +++ /dev/null @@ -1,10 +0,0 @@ ---- unzip.h.orig Sun Jan 27 11:29:40 2002 -+++ unzip.h Wed May 21 03:43:56 2003 -@@ -459,6 +459,7 @@ - #if (!defined(RISCOS) && !defined(CMS_MVS) && !defined(TANDEM)) - int ddotflag; /* -:: don't skip over "../" path elements */ - #endif -+ int dotflag; /* -.: don't translate filenames to local charset */ - #endif /* !FUNZIP */ - } UzpOpts; - |