diff options
| author | John Marino <marino@FreeBSD.org> | 2014-08-15 10:11:10 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2014-08-15 10:11:10 +0000 |
| commit | 69f43aff5e21059c6dca6cc38c07d8c5fe89d5da (patch) | |
| tree | 8c9c10338f3c4becfa5b12ec66245fa9bdb2eb5b /chinese | |
| parent | 9332906e4d20fe558a9dcec89672b6aa4a969e1f (diff) | |
| download | freebsd-ports-69f43aff5e21059c6dca6cc38c07d8c5fe89d5da.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 'chinese')
| -rw-r--r-- | chinese/unzip/Makefile | 14 | ||||
| -rw-r--r-- | chinese/unzip/files/patch-fileio.c | 14 |
2 files changed, 0 insertions, 28 deletions
diff --git a/chinese/unzip/Makefile b/chinese/unzip/Makefile deleted file mode 100644 index c90183ea407f..000000000000 --- a/chinese/unzip/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# Created by: Shen Chuan-Hsing <statue@freebsd.sinica.edu.tw> -# $FreeBSD$ - -CATEGORIES= chinese - -MAINTAINER= ports@FreeBSD.org - -CONFLICTS= unzip-[0-9]* unzip-iconv-[0-9]* ko-unzip-[0-9]* ru-unzip-[0-9]* - -MASTERDIR= ${.CURDIR}/../../archivers/unzip - -EXTRA_PATCHES= ${.CURDIR}/files/patch-fileio.c - -.include "${MASTERDIR}/Makefile" diff --git a/chinese/unzip/files/patch-fileio.c b/chinese/unzip/files/patch-fileio.c deleted file mode 100644 index dd0116b90295..000000000000 --- a/chinese/unzip/files/patch-fileio.c +++ /dev/null @@ -1,14 +0,0 @@ ---- fileio.c.orig Wed Jun 5 03:41:04 2002 -+++ fileio.c Wed Jun 5 03:44:33 2002 -@@ -2135,8 +2135,11 @@ - - /* translate the Zip entry filename coded in host-dependent "extended - ASCII" into the compiler's (system's) internal text code page */ -+#if 0 -+/* cnoize is lazy to read it carefully */ - Ext_ASCII_TO_Native(G.filename, G.pInfo->hostnum, G.pInfo->hostver, - G.pInfo->HasUxAtt, (option == DS_FN_L)); -+#endif - - if (G.pInfo->lcflag) /* replace with lowercase filename */ - STRLOWER(G.filename, G.filename); |