ports/151960: archivers/unzip: Fix build when both WITH_UNZIP_UNREDUCE and WITH_ICONV are set.

[KOMATSU Shinichiro]

>Number:         151960
>Category:       ports
>Synopsis:       archivers/unzip: Fix build when both WITH_UNZIP_UNREDUCE and WITH_ICONV are set.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 05 10:30:10 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     KOMATSU Shinichiro
>Release:        FreeBSD 7.3-RELEASE-p2 amd64
>Organization:
>Environment:
FreeBSD 7.3-RELEASE-p2 amd64
>Description:
When archivers/unzip is built with both WITH_UNZIP_UNREDUCE and WITH_ICONV are set,
it fails with the following error.

  cc -c -O2 -fno-strict-aliasing -pipe  -I. -Ibzip2 -DUNIX   unix/unix.c
  unix/unix.c:33:19: error: iconv.h: No such file or directory
  unix/unix.c: In function 'charset_to_intern':
  unix/unix.c:1926: error: 'iconv_t' undeclared (first use in this function)
  unix/unix.c:1926: error: (Each undeclared identifier is reported only once
  unix/unix.c:1926: error: for each function it appears in.)
  unix/unix.c:1926: error: expected ';' before 'cd'
  unix/unix.c:1937: error: 'cd' undeclared (first use in this function)  *** Error code 1

To fix this, CFLAGS is passed to make at pre-build stage.

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/archivers/unzip/Makefile,v
retrieving revision 1.68
diff -u -r1.68 Makefile
--- Makefile	20 Sep 2010 06:14:24 -0000	1.68
+++ Makefile	4 Nov 2010 11:40:55 -0000
@@ -43,7 +43,7 @@
 PATCH_DIST_STRIP=	-p1
 USE_ICONV=		yes
 CFLAGS+=		-I${LOCALBASE}/include -DNATIVE
-MAKE_ARGS+=		LFLAGS1="-L${LOCALBASE}/lib -liconv"
+MAKE_ARGS+=		LFLAGS1="-L${LOCALBASE}/lib -liconv" CFLAGS="${CFLAGS}"
 .endif
 
 MAKE_ENV=	LOCAL_UNZIP="${LOCAL_UNZIP}" \


>Release-Note:
>Audit-Trail:
>Unformatted: