Attachment #161728 for bug #202838

Lines 3-9 Link Here

(-)converters/libiconv/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= libiconv	4	PORTNAME= libiconv
5	PORTVERSION= 1.14	5	PORTVERSION= 1.14
6	PORTREVISION= 8	6	PORTREVISION= 9
7	CATEGORIES= converters devel	7	CATEGORIES= converters devel
8	MASTER_SITES= GNU	8	MASTER_SITES= GNU
9		9

Lines 1-11 Link Here

(-)converters/libiconv/files/patch-lib-iconv.c (-11 lines)
1	--- lib/iconv.c.orig
2	+++ lib/iconv.c
3	@@ -598,7 +598,7 @@
4	It wants to define the symbols 'iconv_open', 'iconv', 'iconv_close'. */
5	#define strong_alias(name, aliasname) _strong_alias(name, aliasname)
6	#define _strong_alias(name, aliasname) \
7	- extern __typeof (name) aliasname __attribute__ ((alias (#name)));
8	+ extern LIBICONV_DLL_EXPORTED __typeof (name) aliasname __attribute__ ((alias (#name)));
9	#undef iconv_open
10	#undef iconv
11	#undef iconv_close

Lines 44-50 ICONV_LIB_PATH= /usr/lib/libc.so Link Here

(-)Mk/Uses/iconv.mk (-1 / +1 lines)
44	.if ${OPSYS} == DragonFly \|\| (${OPSYS} == FreeBSD && (${OSVERSION} < 1001514 \	44	.if ${OPSYS} == DragonFly \|\| (${OPSYS} == FreeBSD && (${OSVERSION} < 1001514 \
45	\|\| (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100069))) \	45	\|\| (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100069))) \
46	\|\| exists(${LOCALBASE}/include/iconv.h)	46	\|\| exists(${LOCALBASE}/include/iconv.h)
47	BUILD_DEPENDS+= libiconv>=1.14_8:${PORTSDIR}/converters/libiconv	47	BUILD_DEPENDS+= libiconv>=1.14_9:${PORTSDIR}/converters/libiconv
48	CPPFLAGS+= -DLIBICONV_PLUG	48	CPPFLAGS+= -DLIBICONV_PLUG
49	CFLAGS+= -DLIBICONV_PLUG	49	CFLAGS+= -DLIBICONV_PLUG
50	CXXFLAGS+= -DLIBICONV_PLUG	50	CXXFLAGS+= -DLIBICONV_PLUG

Lines 3-9 Link Here

(-)audio/deadbeef/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= deadbeef	4	PORTNAME= deadbeef
5	PORTVERSION= 0.6.2	5	PORTVERSION= 0.6.2
6	PORTREVISION= 6	6	PORTREVISION= 7
7	CATEGORIES= audio	7	CATEGORIES= audio
8	MASTER_SITES= SF/${PORTNAME}/	8	MASTER_SITES= SF/${PORTNAME}/
9		9

Line 0 Link Here

(-)audio/deadbeef/files/patch-junklib.c (+10 lines)
	1	--- junklib.c.orig 2014-07-31 19:03:51 UTC
	2	+++ junklib.c
	3	@@ -32,7 +32,6 @@
	4	#include <stdlib.h>
	5	#include <string.h>
	6	#if HAVE_ICONV
	7	- #define LIBICONV_PLUG
	8	#include <iconv.h>
	9	#elif HAVE_ICU
	10	#warning icu




USE_GITHUB=	yes
GH_ACCOUNT=	signal11

USES=		autoreconf gettext-tools iconv:wchar_t libtool
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes
INSTALL_TARGET=	install-strip
PORTDOCS=	*

CPPFLAGS+=	-I${LOCALBASE}/include
LIBS+=		-L${LOCALBASE}/lib

pre-configure:
	@${CP} ${LOCALBASE}/share/gettext/config.rpath ${WRKSRC}

.include <bsd.port.mk>

Lines 1-11 Link Here

(-)comms/hidapi/files/patch-configure.ac (-4 / +11 lines)
1	--- configure.ac.orig	1	--- configure.ac.orig 2013-10-06 22:43:37 UTC
2	+++ configure.ac	2	+++ configure.ac
3	@@ -94,6 +94,8 @@	3	@@ -89,11 +89,11 @@ case $host in
4	LIBS="${LIBS}"	4	os="freebsd"
		5	threads="pthreads"
		6
		7	- CFLAGS="$CFLAGS -I/usr/local/include"
		8	- LDFLAGS="$LDFLAGS -L/usr/local/lib"
		9	- LIBS="${LIBS}"
5	AC_CHECK_LIB([usb], [libusb_init], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -lusb"], [hidapi_lib_error libusb])	10	AC_CHECK_LIB([usb], [libusb_init], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -lusb"], [hidapi_lib_error libusb])
6	AC_CHECK_LIB([iconv], [iconv_open], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -liconv"], [hidapi_lib_error libiconv])	11	- AC_CHECK_LIB([iconv], [iconv_open], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -liconv"], [hidapi_lib_error libiconv])
7	+ AC_CHECK_DECLS([libusb_get_string_descriptor], [], [], [[#include <libusb.h>]])	12	+ AC_CHECK_DECLS([libusb_get_string_descriptor], [], [], [[#include <libusb.h>]])
8	+ AC_CHECK_DECLS([libusb_handle_events_completed], [], [], [[#include <libusb.h>]])	13	+ AC_CHECK_DECLS([libusb_handle_events_completed], [], [], [[#include <libusb.h>]])
		14	+ AM_ICONV
		15	+ LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} ${LTLIBICONV}"
9	echo libs_priv: $LIBS_LIBUSB_PRIVATE	16	echo libs_priv: $LIBS_LIBUSB_PRIVATE
10	;;	17	;;
11	-mingw)	18	-mingw)




--- libusb/hid.c.orig	2013-10-06 22:43:37 UTC
+++ libusb/hid.c
@@ -25,6 +25,8 @@
 

 /* C */
 #include <stdio.h>
 #include <string.h>
@@ -250,7 +252,7 @@ static int get_usage(uint8_t *report_des
 }
 #endif /* INVASIVE_GET_USAGE */
 

 /* The FreeBSD version of libusb doesn't have this funciton. In mainline
    libusb, it's inlined in libusb.h. This function will bear a striking
    resemblence to that one, because there's about one way to code it.
@@ -333,11 +335,7 @@ static wchar_t *get_usb_string(libusb_de
 	size_t inbytes;
 	size_t outbytes;
 	size_t res;
-#ifdef __FreeBSD__
-	const char *inptr;
-#else
-	char *inptr;
-#endif
+	ICONV_CONST char *inptr;
 	char *outptr;
 
 	/* Determine which language to use. */
@@ -757,7 +755,11 @@ static void *read_thread(void *param)
 	libusb_cancel_transfer(dev->transfer);
 
 	while (!dev->cancelled)

Lines 4-10 Link Here

(-)deskutils/fbreader/Makefile (-2 / +2 lines)
4	PORTNAME= fbreader	4	PORTNAME= fbreader
5	PORTVERSION= 0.99.6	5	PORTVERSION= 0.99.6
6	DISTVERSIONSUFFIX= -freebsdport	6	DISTVERSIONSUFFIX= -freebsdport
7	PORTREVISION= 1	7	PORTREVISION= 2
8	CATEGORIES= deskutils	8	CATEGORIES= deskutils
9		9
10	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
Lines 53-59 QT4_LDFLAGS= -L${QT_LIBDIR} Link Here
53	QT4_MAKE_ENV= UI_TYPE=qt4	53	QT4_MAKE_ENV= UI_TYPE=qt4
54		54
55	post-patch:	55	post-patch:
56	@${REINPLACE_CMD} -e '/^CFLAGS/s,-pipe.*$$,${CFLAGS} -DLIBICONV_PLUG,' \	56	@${REINPLACE_CMD} -e '/^CFLAGS/s,-pipe.*$$,${CFLAGS},' \
57	-e '/^CC/d;/^LD/d;/QTINCLUDE/s,-I.*$$,-I${QT_INCDIR},' \	57	-e '/^CC/d;/^LD/d;/QTINCLUDE/s,-I.*$$,-I${QT_INCDIR},' \
58	${WRKSRC}/makefiles/arch/desktop.mk	58	${WRKSRC}/makefiles/arch/desktop.mk
59	@${REINPLACE_CMD} -e 's,-O3,,;s,-ldl,${ICONV_LIB},' \	59	@${REINPLACE_CMD} -e 's,-O3,,;s,-ldl,${ICONV_LIB},' \

Lines 13-24 COMMENT= Command line client for posting Link Here

(-)deskutils/ljclive/Makefile (-6 / +4 lines)
13		13
14	USES= iconv	14	USES= iconv
15	GNU_CONFIGURE= yes	15	GNU_CONFIGURE= yes
		16	CONFIGURE_ARGS= ac_cv_search_iconv=${ICONV_LIB}
		17	CPPFLAGS+= -I${LOCALBASE}/include
		18	LIBS+= -L${LOCALBASE}/lib
16		19
17	CONFLICTS= clive-[1-9]	20	CONFLICTS= clive-[1-9]
18		21
19	.include <bsd.port.pre.mk>	22	.include <bsd.port.mk>
20
21	post-patch:
22	@${REINPLACE_CMD} 's/iconv "iconv/"iconv/' ${WRKSRC}/configure
23
24	.include <bsd.port.post.mk>

Lines 3-8 Link Here

(-)deskutils/owncloudclient/Makefile (-1 / +2 lines)
3		3
4	PORTNAME= owncloudclient	4	PORTNAME= owncloudclient
5	PORTVERSION= 2.0.1	5	PORTVERSION= 2.0.1
		6	PORTREVISION= 1
6	CATEGORIES= deskutils	7	CATEGORIES= deskutils
7	MASTER_SITES= http://download.owncloud.com/desktop/stable/	8	MASTER_SITES= http://download.owncloud.com/desktop/stable/
8		9
Lines 14-20 LICENSE= GPLv2 Link Here
14	LIB_DEPENDS= libinotify.so:${PORTSDIR}/devel/libinotify \	15	LIB_DEPENDS= libinotify.so:${PORTSDIR}/devel/libinotify \
15	libqt5keychain.so:${PORTSDIR}/security/qtkeychain-qt5	16	libqt5keychain.so:${PORTSDIR}/security/qtkeychain-qt5
16		17
17	USES= cmake:outsource compiler:c++11-lib gmake pkgconfig tar:xz	18	USES= cmake:outsource compiler:c++11-lib gmake iconv pkgconfig tar:xz
18	USE_QT5= buildtools_build concurrent core dbus gui linguist_build network \	19	USE_QT5= buildtools_build concurrent core dbus gui linguist_build network \
19	qmake_build webkit xml	20	qmake_build webkit xml
20	USE_OPENSSL= yes	21	USE_OPENSSL= yes




--- cmake/modules/FindIconv.cmake.orig	2015-07-09 17:51:37 UTC
+++ cmake/modules/FindIconv.cmake
@@ -36,9 +36,7 @@ find_library(ICONV_LIBRARY
 )
 
 if (ICONV_LIBRARY)
-    get_filename_component(_ICONV_NAME ${ICONV_LIBRARY} NAME)
-    get_filename_component(_ICONV_PATH ${ICONV_LIBRARY} PATH)
-    check_library_exists(${_ICONV_NAME} iconv ${_ICONV_PATH} HAVE_ICONV)
+    set(HAVE_ICONV TRUE)
 else()
     check_function_exists(iconv HAVE_ICONV)
 endif()

Lines 2-7 Link Here

(-)emulators/vmw/Makefile (-2 / +5 lines)
2		2
3	PORTNAME= vmw	3	PORTNAME= vmw
4	PORTVERSION= 060510	4	PORTVERSION= 060510
		5	PORTREVISION= 1
5	CATEGORIES= emulators	6	CATEGORIES= emulators
6	MASTER_SITES= http://sites.google.com/site/chitchatvmback/storage/	7	MASTER_SITES= http://sites.google.com/site/chitchatvmback/storage/
7		8
Lines 33-39 PLIST_FILES+= sbin/${i} Link Here
33	.if !exists(/usr/lib32/libc.so)	34	.if !exists(/usr/lib32/libc.so)
34	IGNORE= please install lib32	35	IGNORE= please install lib32
35	.endif	36	.endif
36	.if ${OSVERSION} < 1000000	37	.if !empty(ICONV_LIB)
37	IGNORE= needs 32bit libiconv	38	IGNORE= needs 32bit libiconv
38	.endif	39	.endif
39	CFLAGS+= -m32	40	CFLAGS+= -m32
Lines 42-50 LDFLAGS+= -m32 -B/usr/lib32 -L/usr/lib32 Link Here
42	LD= ${CC}	43	LD= ${CC}
43	.endif	44	.endif
44		45
45	.if ${OSVERSION} > 1000000	46	.if empty(ICONV_LIB)
46	FTPLIB=	47	FTPLIB=
47	MAKE_ENV+= FTPLIB="${FTPLIB}"	48	MAKE_ENV+= FTPLIB="${FTPLIB}"
		49	.else
		50	CFLAGS+= -I${LOCALBASE}/include
48	.endif	51	.endif
49		52
50	do-install:	53	do-install:




--- vmshf.c.orig	2006-05-10 04:36:12 UTC
+++ vmshf.c
@@ -306,14 +306,7 @@ static uint32_t LocalToUtf8(char *dst, c
 	unix systems with iconv.h
 	-- use iconv() for code conversion
 */
-#ifdef __FreeBSD__
-#include <sys/types.h>
-#include <sys/iconv.h>
-typedef size_t iconv_t;
-#else	/* __FreeBSD__ */
 #include <iconv.h>
-#endif	/* __FreeBSD__ */
-
 #include <langinfo.h>
 #include <locale.h>
 #include <strings.h>

Lines 31-36 GNUTLS_CONFIGURE_ON= --with-ssl Link Here

(-)irc/scrollz/Makefile (-1 / +7 lines)
31	OPENSSL_USE= OPENSSL=yes	31	OPENSSL_USE= OPENSSL=yes
32	OPENSSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE}	32	OPENSSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE}
33		33
		34	.include <bsd.port.pre.mk>
		35
		36	.if !empty(ICONV_LIB)
		37	CONFIGURE_ENV+=ac_cv_func_iconv_open=yes
		38	.endif
		39
34	post-patch:	40	post-patch:
35	@${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure	41	@${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
36		42
Lines 46-49 post-install: Link Here
46	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}	52	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}
47	.endfor	53	.endfor
48		54
49	.include <bsd.port.mk>	55	.include <bsd.port.post.mk>

Lines 3-9 Link Here

(-)japanese/chasen-base/Makefile (-1 / +6 lines)
3		3
4	PORTNAME= chasen	4	PORTNAME= chasen
5	PORTVERSION= 2.4.5	5	PORTVERSION= 2.4.5
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= japanese textproc	7	CATEGORIES= japanese textproc
8	MASTER_SITES= SOURCEFORGE_JP/chasen-legacy/56305	8	MASTER_SITES= SOURCEFORGE_JP/chasen-legacy/56305
9	PKGNAMESUFFIX= -base	9	PKGNAMESUFFIX= -base
Lines 21-26 INSTALL_TARGET= install-strip Link Here
21		21
22	OPTIONS_DEFINE= DOCS	22	OPTIONS_DEFINE= DOCS
23		23
		24	post-patch:
		25	@${REINPLACE_CMD} \
		26	-e 's/iconv ()/libiconv ()/' \
		27	-e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
		28
24	post-install:	29	post-install:
25	${MKDIR} ${STAGEDIR}${PREFIX}/share/chasen/dic	30	${MKDIR} ${STAGEDIR}${PREFIX}/share/chasen/dic
26	${MKDIR} ${STAGEDIR}${DOCSDIR}	31	${MKDIR} ${STAGEDIR}${DOCSDIR}

Lines 15-21 COMMENT= Full-screen curses-based remote Link Here

(-)net/c3270/Makefile (-1 / +1 lines)
15	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/([0-9]\.[0-9])(\..*)/\1/}	15	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/([0-9]\.[0-9])(\..*)/\1/}
16		16
17	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
18	CONFIGURE_ARGS= ac_cv_search_libiconv=no	18	CONFIGURE_ARGS= ac_cv_search_libiconv=${ICONV_LIB}
19		19
20	USES= iconv readline gmake	20	USES= iconv readline gmake
21	USE_OPENSSL= yes	21	USE_OPENSSL= yes

Lines 23-29 MAKE_JOBS_UNSAFE=yes Link Here

(-)www/htmlcxx/Makefile (-1 / +7 lines)
23		23
24	MAKE_ARGS= pkgconfigdir="${PREFIX}/libdata/pkgconfig"	24	MAKE_ARGS= pkgconfigdir="${PREFIX}/libdata/pkgconfig"
25		25
		26	.include <bsd.port.pre.mk>
		27
		28	.if !empty(ICONV_LIB)
		29	CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=yes
		30	.endif
		31
26	post-patch:	32	post-patch:
27	@${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure	33	@${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
28		34
29	.include <bsd.port.mk>	35	.include <bsd.port.post.mk>

Lines 39-48 ICONS_VARS= INSTALLS_ICONS=yes Link Here

(-)www/httrack/Makefile (-1 / +2 lines)
39		39
40	.if empty(ICONV_LIB)	40	.if empty(ICONV_LIB)
41	CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv=no	41	CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv=no
		42	.else
		43	CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv=yes
42	.endif	44	.endif
43		45
44	post-patch:	46	post-patch:
45	@${REINPLACE_CMD} -e '/DEFAULT_CFLAGS=/ s\|-O -g3 \|\|g' ${WRKSRC}/configure
46	@${REINPLACE_CMD} -e '/ install-data-hook/d' ${WRKSRC}/html/Makefile.in	47	@${REINPLACE_CMD} -e '/ install-data-hook/d' ${WRKSRC}/html/Makefile.in
47	@${REINPLACE_CMD} -e 's\|/usr/share\|${PREFIX}/share\|' ${WRKSRC}/html/server/div/WebHTTrack*	48	@${REINPLACE_CMD} -e 's\|/usr/share\|${PREFIX}/share\|' ${WRKSRC}/html/server/div/WebHTTrack*
48		49

Lines 37-44 PORTEXAMPLES= omega.conf Link Here

(-)www/xapian-omega/Makefile (-1 / +1 lines)
37		37
38	SHEBANG_FILES= dbi2omega htdig2omega mbox2omega	38	SHEBANG_FILES= dbi2omega htdig2omega mbox2omega
39		39
		40	ICONV_CONFIGURE_ON= ac_cv_search_iconv=${ICONV_LIB}
40	ICONV_CONFIGURE_WITH= iconv	41	ICONV_CONFIGURE_WITH= iconv
41	ICONV_LDFLAGS= ${ICONV_LIB}
42	ICONV_USES= iconv	42	ICONV_USES= iconv
43		43
44	post-patch:	44	post-patch:

Lines 3-9 Link Here

(-)x11/mrxvt/Makefile (-8 / +17 lines)
3		3
4	PORTNAME= mrxvt	4	PORTNAME= mrxvt
5	PORTVERSION= 0.4.2	5	PORTVERSION= 0.4.2
6	PORTREVISION= 9	6	PORTREVISION= 10
7	CATEGORIES= x11	7	CATEGORIES= x11
8	MASTER_SITES= SF/materm/${PORTNAME}%20source/${PORTVERSION}	8	MASTER_SITES= SF/materm/${PORTNAME}%20source/${PORTVERSION}
9		9
Lines 16-21 CONFLICTS= mrxvt-0.5.* Link Here
16		16
17	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
18	CONFIGURE_ARGS= --disable-lastlog --disable-wtmp	18	CONFIGURE_ARGS= --disable-lastlog --disable-wtmp
		19	CPPFLAGS+= -I${LOCALBASE}/include
		20	LIBS+= -L${LOCALBASE}/lib
19	USES= jpeg tar:tgz	21	USES= jpeg tar:tgz
20	USE_XORG= x11	22	USE_XORG= x11
21		23
Lines 25-33 JAPANESE_CONFIGURE_ON= --enable-xim --en Link Here
25	XFT_LIB_DEPENDS= libXft.so:${PORTSDIR}/x11-fonts/libXft	27	XFT_LIB_DEPENDS= libXft.so:${PORTSDIR}/x11-fonts/libXft
26	XFT_CONFIGURE_ENABLE= xft	28	XFT_CONFIGURE_ENABLE= xft
27		29
28	CPPFLAGS+= -I${LOCALBASE}/include
29	LIBS+= -L${LOCALBASE}/lib
30
31	PORTDOCS= TIPS \	30	PORTDOCS= TIPS \
32	README.greek \	31	README.greek \
33	README.menu \	32	README.menu \
Lines 37-47 PORTDOCS= TIPS \ Link Here
37	mrxvt.vbs \	36	mrxvt.vbs \
38	mrxvtset.pl	37	mrxvtset.pl
39		38
40	post-patch-DOCS-off:	39	.include <bsd.port.options.mk>
41	@${REINPLACE_CMD} -e '/^$install-data-am:$.*/ \	40
42	s/install-docDATA //' ${WRKSRC}/doc/Makefile.in	41	.if ${PORT_OPTIONS:MXFT} && ${PORT_OPTIONS:MJAPANESE}
		42	USES+= iconv
		43	.endif
		44
		45	.include <bsd.port.pre.mk>
		46
		47	.if empty(ICONV_LIB)
		48	CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no
		49	.else
		50	CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=yes
		51	.endif
43		52
44	post-install:	53	post-install:
45	${CHMOD} 4511 ${STAGEDIR}${PREFIX}/bin/mrxvt	54	${CHMOD} 4511 ${STAGEDIR}${PREFIX}/bin/mrxvt
46		55
47	.include <bsd.port.mk>	56	.include <bsd.port.post.mk>

Lines 3-9 Link Here

(-)x11/mrxvt-devel/Makefile (-2 / +14 lines)
3		3
4	PORTNAME= mrxvt-devel	4	PORTNAME= mrxvt-devel
5	PORTVERSION= 0.5.4	5	PORTVERSION= 0.5.4
6	PORTREVISION= 10	6	PORTREVISION= 11
7	CATEGORIES= x11	7	CATEGORIES= x11
8	MASTER_SITES= SF/materm/mrxvt%20source/${PORTVERSION}	8	MASTER_SITES= SF/materm/mrxvt%20source/${PORTVERSION}
9	DISTNAME= mrxvt-${PORTVERSION}	9	DISTNAME= mrxvt-${PORTVERSION}
Lines 54-59 USE_XORG+= xft Link Here
54	CONFIGURE_ARGS+= --enable-xft	54	CONFIGURE_ARGS+= --enable-xft
55	.endif	55	.endif
56		56
		57	.if ${PORT_OPTIONS:MXFT} && ${PORT_OPTIONS:MJAPANESE}
		58	USES+= iconv
		59	.endif
		60
57	.if ${PORT_OPTIONS:M24BITS}	61	.if ${PORT_OPTIONS:M24BITS}
58	CONFIGURE_ARGS+= --enable-24bits	62	CONFIGURE_ARGS+= --enable-24bits
59	.endif	63	.endif
Lines 120-125 CONFIGURE_ARGS+= --with-atab-extra=${EXT Link Here
120	CONFIGURE_ARGS+= --with-tab-radius=${TAB_RADIUS:M[0-9]*}	124	CONFIGURE_ARGS+= --with-tab-radius=${TAB_RADIUS:M[0-9]*}
121	.endif	125	.endif
122		126
		127	.include <bsd.port.pre.mk>
		128
		129	.if empty(ICONV_LIB)
		130	CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no
		131	.else
		132	CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=yes
		133	.endif
		134
123	do-install:	135	do-install:
124	${INSTALL_PROGRAM} ${WRKSRC}/src/mrxvt ${STAGEDIR}${PREFIX}/bin	136	${INSTALL_PROGRAM} ${WRKSRC}/src/mrxvt ${STAGEDIR}${PREFIX}/bin
125	@for pixmap in ${WRKSRC}/share/pixmaps/* ; \	137	@for pixmap in ${WRKSRC}/share/pixmaps/* ; \
Lines 137-140 do-install: Link Here
137	${CP} ${WRKSRC}/doc/*.bz2 ${STAGEDIR}${DOCSDIR}	149	${CP} ${WRKSRC}/doc/*.bz2 ${STAGEDIR}${DOCSDIR}
138	${BZIP2_CMD} -d ${STAGEDIR}${DOCSDIR}/*.bz2	150	${BZIP2_CMD} -d ${STAGEDIR}${DOCSDIR}/*.bz2
139		151
140	.include <bsd.port.mk>	152	.include <bsd.port.post.mk>

Lines 23-29 USE_XORG= ice sm x11 xaw xext xmu xt Link Here

(-)x11/x3270/Makefile (-1 / +1 lines)
23	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
24	CONFIGURE_ARGS= --with-fontdir=${FONTSDIR} \	24	CONFIGURE_ARGS= --with-fontdir=${FONTSDIR} \
25	--disable-dbcs \	25	--disable-dbcs \
26	ac_cv_search_libiconv=no	26	ac_cv_search_libiconv=${ICONV_LIB}
27	CPPFLAGS+= -I${LOCALBASE}/include	27	CPPFLAGS+= -I${LOCALBASE}/include
28	LIBS+= -L${LOCALBASE}/lib	28	LIBS+= -L${LOCALBASE}/lib
29	.if defined(WITHOUT_OPENSSL)	29	.if defined(WITHOUT_OPENSSL)





PORTNAME=	libexplain
PORTVERSION=	1.3.${PATCHLEVEL}
PORTREVISION=	5
CATEGORIES=	devel
MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION:R}
DISTNAME=	${PORTNAME}-${PORTVERSION:R}

BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
RUN_DEPENDS=	lsof:${PORTSDIR}/sysutils/lsof

USES=		bison gettext ghostscript:build gmake iconv libtool:build
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	ac_cv_header_linux_kd_h=no
USE_LDCONFIG=	yes


OPTIONS_DEFINE=	DOCS

.include <bsd.port.pre.mk>

.if empty(ICONV_LIB)
CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv=no
.else
CONFIGURE_ARGS+=ac_cv_func_iconv_open=yes ac_cv_func_iconv_close=yes \
		ac_cv_lib_iconv_iconv=yes
.endif

post-patch:
	@${REINPLACE_CMD} -e \
		's|$$(libdir)/pkgconfig|$$(libdir)/../libdata/pkgconfig|g ; \

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libexplain.so

.include <bsd.port.post.mk>

Lines 186-191 CONFIGURE_ARGS+= --disable-video-x11 \ Link Here

(-)devel/sdl20/Makefile (-1 / +7 lines)
186	--disable-video-x11-vm	186	--disable-video-x11-vm
187	.endif	187	.endif
188		188
		189	.include <bsd.port.pre.mk>
		190
		191	.if !empty(ICONV_LIB)
		192	CONFIGURE_ARGS+= ac_cv_lib_iconv_iconv_open=yes ac_cv_func_iconv=yes
		193	.endif
		194
189	post-patch:	195	post-patch:
190	@${REINPLACE_CMD} -e '/ CheckInputEvents$$/d' \	196	@${REINPLACE_CMD} -e '/ CheckInputEvents$$/d' \
191	-e 's/-liconv/${ICONV_LIB}/g' ${WRKSRC}/configure	197	-e 's/-liconv/${ICONV_LIB}/g' ${WRKSRC}/configure
Lines 193-196 post-patch: Link Here
193	@${REINPLACE_CMD} 's/_m_prefetch/__builtin_prefetch/' \	199	@${REINPLACE_CMD} 's/_m_prefetch/__builtin_prefetch/' \
194	${WRKSRC}/configure ${WRKSRC}/src/video/SDL_blit_A.c	200	${WRKSRC}/configure ${WRKSRC}/src/video/SDL_blit_A.c
195		201
196	.include <bsd.port.mk>	202	.include <bsd.port.post.mk>

Lines 3-9 Link Here

(-)japanese/eb/Makefile (-7 / +6 lines)
3		3
4	PORTNAME= eb	4	PORTNAME= eb
5	PORTVERSION= 4.4.3	5	PORTVERSION= 4.4.3
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= japanese	7	CATEGORIES= japanese
8	MASTER_SITES= ftp://ftp.sra.co.jp/pub/misc/eb/ \	8	MASTER_SITES= ftp://ftp.sra.co.jp/pub/misc/eb/ \
9	ftp://ftp.sra.co.jp/pub/misc/eb/old/eb-${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}/	9	ftp://ftp.sra.co.jp/pub/misc/eb/old/eb-${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}/
Lines 66-72 PORTDOCS= eb-01.html eb-02.html eb-03.ht Link Here
66	USES= autoreconf iconv libtool perl5 tar:bzip2	66	USES= autoreconf iconv libtool perl5 tar:bzip2
67	GNU_CONFIGURE= yes	67	GNU_CONFIGURE= yes
68	USE_LDCONFIG= yes	68	USE_LDCONFIG= yes
69	CONFIGURE_ARGS= --with-pkgdocdir=${DOCSDIR}	69	CONFIGURE_ARGS= --with-pkgdocdir=${DOCSDIR} \
		70	--with-iconv-includes=${ICONV_PREFIX}/include \
		71	--with-iconv-libraries=${ICONV_PREFIX}/lib
70	CONFIGURE_ENV= ac_cv_path_PERL=${PERL}	72	CONFIGURE_ENV= ac_cv_path_PERL=${PERL}
71		73
72	OPTIONS_DEFINE= DOCS NLS	74	OPTIONS_DEFINE= DOCS NLS
Lines 76-86 APPENDIXDIR= ${DATADIR}/appendix Link Here
76		78
77	NLS_USES= gettext	79	NLS_USES= gettext
78	NLS_CONFIGURE_ENABLE= nls	80	NLS_CONFIGURE_ENABLE= nls
79	NLS_CONFIGURE_ON= \	81	NLS_CONFIGURE_ON= --with-gettext-includes=${LOCALBASE}/include \
80	--with-gettext-includes=${LOCALBASE}/include \	82	--with-gettext-libraries=${LOCALBASE}/lib
81	--with-gettext-libraries=${LOCALBASE}/lib \
82	--with-iconv-includes=${ICONV_PREFIX}/include \
83	--with-iconv-libraries=${ICONV_PREFIX}/lib
84	NLS_CONFIGURE_OFF= --disable-nls	83	NLS_CONFIGURE_OFF= --disable-nls
85		84
86	post-extract:	85	post-extract:




--- m4/gettext.m4.orig	2010-01-03 12:26:04 UTC
+++ m4/gettext.m4
@@ -86,14 +86,17 @@ AC_DEFUN([eb_GNU_GETTEXT], [dnl
   save_CPPFLAGS=$CPPFLAGS
   save_LIBS=$LIBS
   CPPFLAGS="$save_CPPFLAGS $iconv_includes"
-  LIBS="$save_LIBS $iconv_libraries"
-  AC_CHECK_LIB(iconv, iconv_open,
-    [ICONVLIBS="$iconv_libraries -liconv"; LIBS="$LIBS -liconv"])
-  AC_CHECK_FUNCS(iconv_open locale_charset)

-  if test $ac_cv_func_iconv_open != no; then
-    ICONVINCS="$iconv_includes"
-  fi
+  AC_CHECK_HEADER([iconv.h],
+    [AC_DEFINE([HAVE_ICONV_H],[1],[Have iconv.h])
+     for l in '' -liconv; do
+      LIBS="$save_LIBS $iconv_libraries $l"
+      AC_LINK_IFELSE(
+        AC_LANG_PROGRAM([#include <iconv.h>],[iconv_open("","")]),
+        [AC_DEFINE([HAVE_ICONV_OPEN],[1],[Have iconv_open(3)])
+         ICONVINCS="$iconv_includes"
+         ICONVLIBS="$iconv_libraries $l"
+         break],[])
+     done],[])
+	ICONVLIBS="$iconv_libraries -lcharset -liconv"
+	ICONVINCS="$iconv_includes"])])
   CPPFLAGS=$save_CPPFLAGS
   LIBS=$save_LIBS
   AC_SUBST(ICONVINCS)
@@ -113,10 +116,10 @@ AC_DEFUN([eb_GNU_GETTEXT], [dnl
     save_LIBS=$LIBS
 
     dnl *

     AC_LINK_IFELSE([
 #include <stdio.h>
 #ifdef ENABLE_NLS
@@ -143,8 +146,8 @@ main()
     try_nls=yes, try_nls=no)
 
     if test "$try_nls" = yes; then

     fi
 
     dnl *
@@ -222,11 +225,11 @@ main()
     fi
 
     dnl *

       AC_LINK_IFELSE([
 #include <stdio.h>
 #ifdef ENABLE_NLS
@@ -253,8 +256,8 @@ main()
       try_nls=yes, try_nls=no)
 
       if test "$try_nls" = yes; then




LIB_DEPENDS=	libeb.so:${PORTSDIR}/japanese/eb

USES=		iconv
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-eb-conf=${PREFIX}/etc/eb.conf
CPPFLAGS+=	-I${ICONV_PREFIX}/include
LIBS+=		-L${ICONV_PREFIX}/lib ${ICONV_LIB}

INFO=		eblook
PLIST_FILES=	bin/eblook


OPTIONS_DEFINE=	DOCS

.include <bsd.port.pre.mk>

.if !empty(ICONV_LIB)
CONFIGURE_ARGS+=ac_cv_func_iconv=yes
.endif

post-install:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}

.include <bsd.port.post.mk>

Lines 12-18 COMMENT= Java source to byte-code compil Link Here

(-)java/jikes/Makefile (-1 / +2 lines)
12		12
13	PLIST_SUB= PORTVERSION=${PORTVERSION}	13	PLIST_SUB= PORTVERSION=${PORTVERSION}
14	GNU_CONFIGURE= yes	14	GNU_CONFIGURE= yes
15	CONFIGURE_ARGS= ac_cv_search_libiconv_open=no	15	CONFIGURE_ARGS= ac_cv_search_iconv=${ICONV_LIB} \
		16	ac_cv_search_libiconv_open=no
16	USES= iconv gmake tar:bzip2	17	USES= iconv gmake tar:bzip2
17		18
18	CPPFLAGS+= -I${LOCALBASE}/include	19	CPPFLAGS+= -I${LOCALBASE}/include

Lines 73-78 EXTRA_PATCHES= ${PATCHDIR}/disable-web Link Here

(-)net-p2p/transmission-cli/Makefile (-1 / +7 lines)
73	DOCS= AUTHORS NEWS README	73	DOCS= AUTHORS NEWS README
74	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}	74	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
75		75
		76	.include <bsd.port.pre.mk>
		77
		78	.if !empty(ICONV_LIB)
		79	CONFIGURE_ARGS+=ac_cv_func_iconv_open=yes
		80	.endif
		81
76	general-patch:	82	general-patch:
77	@${FIND} ${WRKSRC} -name Makefile.in \| ${XARGS} ${REINPLACE_CMD} -e \	83	@${FIND} ${WRKSRC} -name Makefile.in \| ${XARGS} ${REINPLACE_CMD} -e \
78	's\|noinst_PROGRAMS = \|noinst_PROGRAMS = #\|g'	84	's\|noinst_PROGRAMS = \|noinst_PROGRAMS = #\|g'
Lines 109-112 general-install: Link Here
109		115
110	post-install: general-install	116	post-install: general-install
111		117
112	.include <bsd.port.mk>	118	.include <bsd.port.post.mk>

Lines 67-72 IGNORE= the XMU support requires XEXT Link Here

(-)x11-wm/jwm/Makefile (-1 / +7 lines)
67	IGNORE= the XPM support requires XEXT	67	IGNORE= the XPM support requires XEXT
68	.endif	68	.endif
69		69
		70	.include <bsd.port.pre.mk>
		71
		72	.if !empty(ICONV_LIB)
		73	CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv=yes
		74	.endif
		75
70	post-patch:	76	post-patch:
71	@${REINPLACE_CMD} -e \	77	@${REINPLACE_CMD} -e \
72	's\|%%PREFIX%%\|${PREFIX}\|' ${WRKSRC}/example.jwmrc	78	's\|%%PREFIX%%\|${PREFIX}\|' ${WRKSRC}/example.jwmrc
Lines 77-80 post-patch: Link Here
77	'/EXE/s\|install\|@INSTALL_PROGRAM@\| ; \	83	'/EXE/s\|install\|@INSTALL_PROGRAM@\| ; \
78	/strip/s\|^\|#\|' ${WRKSRC}/src/Makefile.in	84	/strip/s\|^\|#\|' ${WRKSRC}/src/Makefile.in
79		85
80	.include <bsd.port.mk>	86	.include <bsd.port.post.mk>

Return to bug 202838

Lines 15-24 LICENSE_COMB= dual Link Here

(-)comms/hidapi/Makefile (-1 / +7 lines)
15	USE_GITHUB= yes	15	USE_GITHUB= yes
16	GH_ACCOUNT= signal11	16	GH_ACCOUNT= signal11
17		17
18	USES= autoreconf iconv:wchar_t libtool	18	USES= autoreconf gettext-tools iconv:wchar_t libtool
19	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
20	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
21	INSTALL_TARGET= install-strip	21	INSTALL_TARGET= install-strip
22	PORTDOCS= *	22	PORTDOCS= *
23		23
		24	CPPFLAGS+= -I${LOCALBASE}/include
		25	LIBS+= -L${LOCALBASE}/lib
		26
		27	pre-configure:
		28	@${CP} ${LOCALBASE}/share/gettext/config.rpath ${WRKSRC}
		29
24	.include <bsd.port.mk>	30	.include <bsd.port.mk>

Lines 1-4 Link Here

(-)comms/hidapi/files/patch-libusb-hid.c (-3 / +16 lines)
1	--- libusb/hid.c.orig	1	--- libusb/hid.c.orig 2013-10-06 22:43:37 UTC
2	+++ libusb/hid.c	2	+++ libusb/hid.c
3	@@ -25,6 +25,8 @@	3	@@ -25,6 +25,8 @@
4		4
Lines 9-15 Link Here
9	/* C */	9	/* C */
10	#include <stdio.h>	10	#include <stdio.h>
11	#include <string.h>	11	#include <string.h>
12	@@ -250,7 +252,7 @@	12	@@ -250,7 +252,7 @@ static int get_usage(uint8_t *report_des
13	}	13	}
14	#endif /* INVASIVE_GET_USAGE */	14	#endif /* INVASIVE_GET_USAGE */
15		15
Lines 18-24 Link Here
18	/* The FreeBSD version of libusb doesn't have this funciton. In mainline	18	/* The FreeBSD version of libusb doesn't have this funciton. In mainline
19	libusb, it's inlined in libusb.h. This function will bear a striking	19	libusb, it's inlined in libusb.h. This function will bear a striking
20	resemblence to that one, because there's about one way to code it.	20	resemblence to that one, because there's about one way to code it.
21	@@ -757,7 +757,11 @@	21	@@ -333,11 +335,7 @@ static wchar_t *get_usb_string(libusb_de
		22	size_t inbytes;
		23	size_t outbytes;
		24	size_t res;
		25	-#ifdef __FreeBSD__
		26	- const char *inptr;
		27	-#else
		28	- char *inptr;
		29	-#endif
		30	+ ICONV_CONST char *inptr;
		31	char *outptr;
		32
		33	/* Determine which language to use. */
		34	@@ -757,7 +755,11 @@ static void read_thread(void param)
22	libusb_cancel_transfer(dev->transfer);	35	libusb_cancel_transfer(dev->transfer);
23		36
24	while (!dev->cancelled)	37	while (!dev->cancelled)

Line 0 Link Here

(-)deskutils/owncloudclient/files/patch-cmake-modules-FindIconv.cmake (+13 lines)
	1	--- cmake/modules/FindIconv.cmake.orig 2015-07-09 17:51:37 UTC
	2	+++ cmake/modules/FindIconv.cmake
	3	@@ -36,9 +36,7 @@ find_library(ICONV_LIBRARY
	4	)
	5
	6	if (ICONV_LIBRARY)
	7	- get_filename_component(_ICONV_NAME ${ICONV_LIBRARY} NAME)
	8	- get_filename_component(_ICONV_PATH ${ICONV_LIBRARY} PATH)
	9	- check_library_exists(${_ICONV_NAME} iconv ${_ICONV_PATH} HAVE_ICONV)
	10	+ set(HAVE_ICONV TRUE)
	11	else()
	12	check_function_exists(iconv HAVE_ICONV)
	13	endif()

Line 0 Link Here

(-)emulators/vmw/files/patch-vmshf.c (+17 lines)
	1	--- vmshf.c.orig 2006-05-10 04:36:12 UTC
	2	+++ vmshf.c
	3	@@ -306,14 +306,7 @@ static uint32_t LocalToUtf8(char *dst, c
	4	unix systems with iconv.h
	5	-- use iconv() for code conversion
	6	*/
	7	-#ifdef __FreeBSD__
	8	-#include <sys/types.h>
	9	-#include <sys/iconv.h>
	10	-typedef size_t iconv_t;
	11	-#else /* __FreeBSD__ */
	12	#include <iconv.h>
	13	-#endif /* __FreeBSD__ */
	14	-
	15	#include <langinfo.h>
	16	#include <locale.h>
	17	#include <strings.h>

Lines 3-9 Link Here

(-)devel/libexplain/Makefile (-3 / +12 lines)
3		3
4	PORTNAME= libexplain	4	PORTNAME= libexplain
5	PORTVERSION= 1.3.${PATCHLEVEL}	5	PORTVERSION= 1.3.${PATCHLEVEL}
6	PORTREVISION= 4	6	PORTREVISION= 5
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= SF/${PORTNAME}/${PORTVERSION:R}	8	MASTER_SITES= SF/${PORTNAME}/${PORTVERSION:R}
9	DISTNAME= ${PORTNAME}-${PORTVERSION:R}	9	DISTNAME= ${PORTNAME}-${PORTVERSION:R}
Lines 17-23 LICENSE_FILE= ${WRKSRC}/LICENSE Link Here
17	BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed	17	BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed
18	RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof	18	RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof
19		19
20	USES= bison gettext ghostscript:build gmake libtool:build	20	USES= bison gettext ghostscript:build gmake iconv libtool:build
21	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
22	CONFIGURE_ENV= ac_cv_header_linux_kd_h=no	22	CONFIGURE_ENV= ac_cv_header_linux_kd_h=no
23	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
Lines 29-34 PATCHLEVEL= D012 Link Here
29		29
30	OPTIONS_DEFINE= DOCS	30	OPTIONS_DEFINE= DOCS
31		31
		32	.include <bsd.port.pre.mk>
		33
		34	.if empty(ICONV_LIB)
		35	CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv=no
		36	.else
		37	CONFIGURE_ARGS+=ac_cv_func_iconv_open=yes ac_cv_func_iconv_close=yes \
		38	ac_cv_lib_iconv_iconv=yes
		39	.endif
		40
32	post-patch:	41	post-patch:
33	@${REINPLACE_CMD} -e \	42	@${REINPLACE_CMD} -e \
34	's\|$$(libdir)/pkgconfig\|$$(libdir)/../libdata/pkgconfig\|g ; \	43	's\|$$(libdir)/pkgconfig\|$$(libdir)/../libdata/pkgconfig\|g ; \
Lines 37-40 post-patch: Link Here
37	post-install:	46	post-install:
38	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libexplain.so	47	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libexplain.so
39		48
40	.include <bsd.port.mk>	49	.include <bsd.port.post.mk>

Lines 1-9 Link Here

(-)japanese/eb/files/patch-m4-gettext-m4 (-21 / +20 lines)
1	--- m4/gettext.m4.orig 2010-01-03 21:26:04.000000000 +0900	1	--- m4/gettext.m4.orig 2010-01-03 12:26:04 UTC
2	+++ m4/gettext.m4 2014-04-03 10:20:12.000000000 +0900	2	+++ m4/gettext.m4
3	@@ -87,13 +87,19 @@	3	@@ -86,14 +86,17 @@ AC_DEFUN([eb_GNU_GETTEXT], [dnl
		4	save_CPPFLAGS=$CPPFLAGS
4	save_LIBS=$LIBS	5	save_LIBS=$LIBS
5	CPPFLAGS="$save_CPPFLAGS $iconv_includes"	6	CPPFLAGS="$save_CPPFLAGS $iconv_includes"
6	LIBS="$save_LIBS $iconv_libraries"	7	- LIBS="$save_LIBS $iconv_libraries"
7	- AC_CHECK_LIB(iconv, iconv_open,	8	- AC_CHECK_LIB(iconv, iconv_open,
8	- [ICONVLIBS="$iconv_libraries -liconv"; LIBS="$LIBS -liconv"])	9	- [ICONVLIBS="$iconv_libraries -liconv"; LIBS="$LIBS -liconv"])
9	- AC_CHECK_FUNCS(iconv_open locale_charset)	10	- AC_CHECK_FUNCS(iconv_open locale_charset)
Lines 11-33 Link Here
11	- if test $ac_cv_func_iconv_open != no; then	12	- if test $ac_cv_func_iconv_open != no; then
12	- ICONVINCS="$iconv_includes"	13	- ICONVINCS="$iconv_includes"
13	- fi	14	- fi
14	+ initial_LIBS="$LIBS"	15	+ AC_CHECK_HEADER([iconv.h],
15	+ AC_SEARCH_LIBS([iconv_open],	16	+ [AC_DEFINE([HAVE_ICONV_H],[1],[Have iconv.h])
16	+ [iconv],	17	+ for l in '' -liconv; do
17	+ [AS_IF([test "$LIBS" = "$initial_LIBS"],	18	+ LIBS="$save_LIBS $iconv_libraries $l"
18	+ [AC_CHECK_HEADERS([iconv.h])	19	+ AC_LINK_IFELSE(
19	+ AC_CHECK_FUNCS([iconv_open])	20	+ AC_LANG_PROGRAM([#include <iconv.h>],[iconv_open("","")]),
20	+ ICONVLIBS="$iconv_libraries"	21	+ [AC_DEFINE([HAVE_ICONV_OPEN],[1],[Have iconv_open(3)])
21	+ ICONVINCS="$iconv_includes"],	22	+ ICONVINCS="$iconv_includes"
22	+ [AC_CHECK_LIB([charset], [locale_charset])	23	+ ICONVLIBS="$iconv_libraries $l"
23	+ AC_CHECK_HEADERS([iconv.h libcharset.h])	24	+ break],[])
24	+ AC_CHECK_FUNCS([iconv_open locale_charset])	25	+ done],[])
25	+ ICONVLIBS="$iconv_libraries -lcharset -liconv"
26	+ ICONVINCS="$iconv_includes"])])
27	CPPFLAGS=$save_CPPFLAGS	26	CPPFLAGS=$save_CPPFLAGS
28	LIBS=$save_LIBS	27	LIBS=$save_LIBS
29	AC_SUBST(ICONVINCS)	28	AC_SUBST(ICONVINCS)
30	@@ -113,10 +119,10 @@	29	@@ -113,10 +116,10 @@ AC_DEFUN([eb_GNU_GETTEXT], [dnl
31	save_LIBS=$LIBS	30	save_LIBS=$LIBS
32		31
33	dnl *	32	dnl *
Lines 41-47 Link Here
41	AC_LINK_IFELSE([	40	AC_LINK_IFELSE([
42	#include <stdio.h>	41	#include <stdio.h>
43	#ifdef ENABLE_NLS	42	#ifdef ENABLE_NLS
44	@@ -143,8 +149,8 @@	43	@@ -143,8 +146,8 @@ main()
45	try_nls=yes, try_nls=no)	44	try_nls=yes, try_nls=no)
46		45
47	if test "$try_nls" = yes; then	46	if test "$try_nls" = yes; then
Lines 52-58 Link Here
52	fi	51	fi
53		52
54	dnl *	53	dnl *
55	@@ -222,11 +228,11 @@	54	@@ -222,11 +225,11 @@ main()
56	fi	55	fi
57		56
58	dnl *	57	dnl *
Lines 67-73 Link Here
67	AC_LINK_IFELSE([	66	AC_LINK_IFELSE([
68	#include <stdio.h>	67	#include <stdio.h>
69	#ifdef ENABLE_NLS	68	#ifdef ENABLE_NLS
70	@@ -253,8 +259,8 @@	69	@@ -253,8 +256,8 @@ main()
71	try_nls=yes, try_nls=no)	70	try_nls=yes, try_nls=no)
72		71
73	if test "$try_nls" = yes; then	72	if test "$try_nls" = yes; then

Lines 16-25 LICENSE= GPLv2 Link Here

(-)japanese/eblook/Makefile (-5 / +9 lines)
16	LIB_DEPENDS= libeb.so:${PORTSDIR}/japanese/eb	16	LIB_DEPENDS= libeb.so:${PORTSDIR}/japanese/eb
17		17
18	USES= iconv	18	USES= iconv
19	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
20	CONFIGURE_ARGS= --with-eb-conf=${PREFIX}/etc/eb.conf	20	CONFIGURE_ARGS= --with-eb-conf=${PREFIX}/etc/eb.conf
21	CPPFLAGS+= -I${ICONV_PREFIX}/include	21	CPPFLAGS+= -I${ICONV_PREFIX}/include
22	LDFLAGS+= -L${ICONV_PREFIX}/lib ${ICONV_LIB}	22	LIBS+= -L${ICONV_PREFIX}/lib ${ICONV_LIB}
23		23
24	INFO= eblook	24	INFO= eblook
25	PLIST_FILES= bin/eblook	25	PLIST_FILES= bin/eblook
Lines 27-36 PORTDOCS= AUTHORS COPYING ChangeLog NEWS Link Here
27		27
28	OPTIONS_DEFINE= DOCS	28	OPTIONS_DEFINE= DOCS
29		29
30	.include <bsd.port.options.mk>	30	.include <bsd.port.pre.mk>
		31
		32	.if !empty(ICONV_LIB)
		33	CONFIGURE_ARGS+=ac_cv_func_iconv=yes
		34	.endif
31		35
32	post-install:	36	post-install:
33	@${MKDIR} ${STAGEDIR}${DOCSDIR}	37	@${MKDIR} ${STAGEDIR}${DOCSDIR}
34	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}	38	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
35		39
36	.include <bsd.port.mk>	40	.include <bsd.port.post.mk>