ports/181489: [ports/graphics/djvulibre] Fix build error on 10-current

[Norikatsu Shigemura]

>Number:         181489
>Category:       ports
>Synopsis:       [ports/graphics/djvulibre] Fix build error on 10-current
>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 Aug 23 16:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Norikatsu Shigemura
>Release:        FreeBSD/amd64 on 10-current
>Organization:
Personal
>Environment:
FreeBSD pelsia.ninth-nine.com 10.0-CURRENT FreeBSD 10.0-CURRENT #5 r254598M: Thu Aug 22 05:18:15 JST 2013     nork at pelsia.ninth-nine.com:/usr/obj/usr/src/sys/PELSIA  amd64

>Description:
djvulibre is depends on converters/iconv, but no use.
In 10-current, unfortunatly, djvulibre can find iconv functions.
As a result, djvulibre has build error like following.

--- bzz ---
libtool: link: clang++ -o .libs/bzz -DHAVE_CONFIG_H -I.. -I.. -I../libdjvu -I. -DNDEBUG -Wall -Wno-non-virtual-dtor -I/usr/local/include -I/usr/local/include -D_THREAD_SAFE -DTHREADMODEL=POSIXTHREADS -O2 -pipe -fvectorize -march=corei7 -fno-strict-aliasing bzz.o -pthread  ../libdjvu/.libs/libdjvulibre.so -L/usr/local/lib /usr/local/lib/libjpeg.so -lm -pthread -Wl,-rpath -Wl,/usr/local/lib
./libdjvu/.libs/libdjvulibre.so: undefined reference to `libiconv'
./libdjvu/.libs/libdjvulibre.so: undefined reference to `libiconv_close'
./libdjvu/.libs/libdjvulibre.so: undefined reference to `libiconv_open'
clang++: error: linker command failed with exit code 1 (use -v to see invocation)
*** [bzz] Error code 1

>How-To-Repeat:
On 10-current, /usr/include/iconv.h is exists, and undef __LIBICONV_COMPAT on /usr/include/_libiconv_compat.h.

$ cd /usr/ports/graphics/djvulibre/
$ make
 :
checking iconv.h usability... yes
checking iconv.h presence... yes
 :
checking for iconv... yes
 :
>Fix:
At least, in this time, no longer use iconv.  So disable dependency on iconv.
And preserve effect of stock iconv.


Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 325271)
+++ Makefile	(working copy)
@@ -15,7 +15,7 @@
 LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 		tiff:${PORTSDIR}/graphics/tiff
 
-USES=		pathfix iconv
+USES=		pathfix
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	JPEG_CFLAGS="-I${LOCALBASE}/include" \
 		JPEG_LIBS="-L${LOCALBASE}/lib -ljpeg" \
@@ -22,7 +22,8 @@
 		TIFF_CFLAGS="-I${LOCALBASE}/include" \
 		TIFF_LIBS="-L${LOCALBASE}/lib -ltiff" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--enable-threads=pthread --enable-shared
 USE_LDCONFIG=	yes
 CONFLICTS=	djvulibre-nox11-3*


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