mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-13 07:34:50 +00:00
69f43aff5e
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@)
29 lines
942 B
Plaintext
29 lines
942 B
Plaintext
--- unix/Makefile.orig 2009-01-18 22:41:18 UTC
|
|
+++ unix/Makefile
|
|
@@ -42,12 +42,12 @@
|
|
# such as -DDOSWILD).
|
|
|
|
# UnZip flags
|
|
-CC = cc# try using "gcc" target rather than changing this (CC and LD
|
|
+CC ?= cc# try using "gcc" target rather than changing this (CC and LD
|
|
LD = $(CC)# must match, else "unresolved symbol: ___main" is possible)
|
|
AS = as
|
|
LOC = $(D_USE_BZ2) $(LOCAL_UNZIP)
|
|
AF = $(LOC)
|
|
-CFLAGS = -O
|
|
+#CFLAGS = -O
|
|
CF_NOOPT = -I. -I$(IZ_BZIP2) -DUNIX $(LOC)
|
|
CF = $(CFLAGS) $(CF_NOOPT)
|
|
LFLAGS1 =
|
|
@@ -763,8 +763,8 @@ dnix: unix_make
|
|
# FreeBSD on Intel:
|
|
freebsd: unix_make
|
|
@echo 'NOTE: use bsd target for non-Intel FreeBSD compiles (if any).'
|
|
- $(MAKE) unzips CC=gcc LD=gcc AS=gcc\
|
|
- CFLAGS="-O3 -Wall -DASM_CRC -DBSD"\
|
|
+ $(MAKE) unzips CC="$(CC)" LD="$(CC)" AS="$(CC)"\
|
|
+ CF="$(CF) -Wall -DASM_CRC -DBSD"\
|
|
AF="-Di386 $(AF)" CRCA_O=crc_gcc$O
|
|
|
|
# Generic BSDish Unix gcc. ``The -O3 only works with later versions of gcc;
|