Attachment 160867 Details for Bug 202838 – patch3

[patch] patch3

libiconv.patch (text/plain), 25.94 KB, created by Tijl Coosemans on 2015-09-09 16:39:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2015-09-09 16:39:35 UTC

Size: 25.94 KB

patch

obsolete

>Index: converters/libiconv/Makefile
>===================================================================
>--- converters/libiconv/Makefile	(revision 396354)
>+++ converters/libiconv/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	libiconv
> PORTVERSION=	1.14
>-PORTREVISION=	8
>+PORTREVISION=	9
> CATEGORIES=	converters devel
> MASTER_SITES=	GNU
> 
>Index: converters/libiconv/files/patch-lib-iconv.c
>===================================================================
>--- converters/libiconv/files/patch-lib-iconv.c	(revision 396354)
>+++ converters/libiconv/files/patch-lib-iconv.c	(working copy)
>@@ -1,11 +0,0 @@
>---- lib/iconv.c.orig
>-+++ lib/iconv.c
>-@@ -598,7 +598,7 @@
>-    It wants to define the symbols 'iconv_open', 'iconv', 'iconv_close'.  */
>- #define strong_alias(name, aliasname) _strong_alias(name, aliasname)
>- #define _strong_alias(name, aliasname) \
>--  extern __typeof (name) aliasname __attribute__ ((alias (#name)));
>-+  extern LIBICONV_DLL_EXPORTED __typeof (name) aliasname __attribute__ ((alias (#name)));
>- #undef iconv_open
>- #undef iconv
>- #undef iconv_close
>Index: Mk/Uses/iconv.mk
>===================================================================
>--- Mk/Uses/iconv.mk	(revision 396354)
>+++ Mk/Uses/iconv.mk	(working copy)
>@@ -44,7 +44,7 @@ ICONV_LIB_PATH=		/usr/lib/libc.so
> .if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && (${OSVERSION} < 1001514 \
>  || (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100069))) \
>  || exists(${LOCALBASE}/include/iconv.h)
>-BUILD_DEPENDS+=	libiconv>=1.14_8:${PORTSDIR}/converters/libiconv
>+BUILD_DEPENDS+=	libiconv>=1.14_9:${PORTSDIR}/converters/libiconv
> CPPFLAGS+=	-DLIBICONV_PLUG
> CFLAGS+=	-DLIBICONV_PLUG
> CXXFLAGS+=	-DLIBICONV_PLUG
>Index: audio/deadbeef/Makefile
>===================================================================
>--- audio/deadbeef/Makefile	(revision 396354)
>+++ audio/deadbeef/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	deadbeef
> PORTVERSION=	0.6.2
>-PORTREVISION=	6
>+PORTREVISION=	7
> CATEGORIES=	audio
> MASTER_SITES=	SF/${PORTNAME}/
> 
>Index: audio/deadbeef/files/patch-junklib.c
>===================================================================
>--- audio/deadbeef/files/patch-junklib.c	(revision 0)
>+++ audio/deadbeef/files/patch-junklib.c	(working copy)
>@@ -0,0 +1,10 @@
>+--- junklib.c.orig	2014-07-31 19:03:51 UTC
>++++ junklib.c
>+@@ -32,7 +32,6 @@
>+ #include <stdlib.h>
>+ #include <string.h>
>+ #if HAVE_ICONV
>+-  #define LIBICONV_PLUG
>+   #include <iconv.h>
>+ #elif HAVE_ICU
>+   #warning icu
>
>Property changes on: audio/deadbeef/files/patch-junklib.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: comms/hidapi/Makefile
>===================================================================
>--- comms/hidapi/Makefile	(revision 396354)
>+++ comms/hidapi/Makefile	(working copy)
>@@ -15,10 +15,16 @@ LICENSE_COMB=	dual
> USE_GITHUB=	yes
> GH_ACCOUNT=	signal11
> 
>-USES=		autoreconf iconv:wchar_t libtool
>+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>
>Index: comms/hidapi/files/patch-configure.ac
>===================================================================
>--- comms/hidapi/files/patch-configure.ac	(revision 396354)
>+++ comms/hidapi/files/patch-configure.ac	(working copy)
>@@ -1,11 +1,18 @@
>---- configure.ac.orig
>+--- configure.ac.orig	2013-10-06 22:43:37 UTC
> +++ configure.ac
>-@@ -94,6 +94,8 @@
>- 	LIBS="${LIBS}"
>+@@ -89,11 +89,11 @@ case $host in
>+ 	os="freebsd"
>+ 	threads="pthreads"
>+ 
>+-	CFLAGS="$CFLAGS -I/usr/local/include"
>+-	LDFLAGS="$LDFLAGS -L/usr/local/lib"
>+-	LIBS="${LIBS}"
>  	AC_CHECK_LIB([usb], [libusb_init], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -lusb"], [hidapi_lib_error libusb])
>- 	AC_CHECK_LIB([iconv], [iconv_open], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -liconv"], [hidapi_lib_error libiconv])
>+-	AC_CHECK_LIB([iconv], [iconv_open], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -liconv"], [hidapi_lib_error libiconv])
> +	AC_CHECK_DECLS([libusb_get_string_descriptor], [], [], [[#include <libusb.h>]])
> +	AC_CHECK_DECLS([libusb_handle_events_completed], [], [], [[#include <libusb.h>]])
>++	AM_ICONV
>++	LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} ${LTLIBICONV}"
>  	echo libs_priv: $LIBS_LIBUSB_PRIVATE
>  	;;
>  *-mingw*)
>Index: comms/hidapi/files/patch-libusb-hid.c
>===================================================================
>--- comms/hidapi/files/patch-libusb-hid.c	(revision 396354)
>+++ comms/hidapi/files/patch-libusb-hid.c	(working copy)
>@@ -1,4 +1,4 @@
>---- libusb/hid.c.orig
>+--- libusb/hid.c.orig	2013-10-06 22:43:37 UTC
> +++ libusb/hid.c
> @@ -25,6 +25,8 @@
>  
>@@ -9,7 +9,7 @@
>  /* C */
>  #include <stdio.h>
>  #include <string.h>
>-@@ -250,7 +252,7 @@
>+@@ -250,7 +252,7 @@ static int get_usage(uint8_t *report_des
>  }
>  #endif /* INVASIVE_GET_USAGE */
>  
>@@ -18,7 +18,20 @@
>  /* 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.
>-@@ -757,7 +757,11 @@
>+@@ -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)
>Index: deskutils/fbreader/Makefile
>===================================================================
>--- deskutils/fbreader/Makefile	(revision 396354)
>+++ deskutils/fbreader/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	fbreader
> PORTVERSION=	0.99.6
> DISTVERSIONSUFFIX=	-freebsdport
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	deskutils
> 
> MAINTAINER=	fluffy@FreeBSD.org
>@@ -20,12 +20,10 @@ OPTIONS_SINGLE_GUI=	GTK2 QT4
> OPTIONS_DEFAULT=	QT4
> OPTIONS_SUB=		yes
> 
>-
> USE_GITHUB=	yes
> GH_ACCOUNT=	geometer
> GH_PROJECT=	FBReader
> 
>-
> .if defined(WITH_DEBUG)
> STATUS=		debug
> .else
>@@ -53,7 +51,7 @@ MAKE_ENV+=	TARGET_ARCH=desktop TARGET_ST
> MAKE_ARGS+=	MAKE=${MAKE_CMD} LIBDIR=${PREFIX}/lib
> 
> post-patch:
>-	@${REINPLACE_CMD} -e '/^CFLAGS/s,-pipe.*$$,${CFLAGS} -DLIBICONV_PLUG,' \
>+	@${REINPLACE_CMD} -e '/^CFLAGS/s,-pipe.*$$,${CFLAGS},' \
> 		-e '/^CC/d;/^LD/d;/QTINCLUDE/s,-I.*$$,-I${QT_INCDIR},' \
> 		${WRKSRC}/makefiles/arch/desktop.mk
> 	@${REINPLACE_CMD} -e 's,-O3,,;s,-ldl,${ICONV_LIB},' \
>Index: deskutils/ljclive/Makefile
>===================================================================
>--- deskutils/ljclive/Makefile	(revision 396354)
>+++ deskutils/ljclive/Makefile	(working copy)
>@@ -13,12 +13,10 @@ COMMENT=	Command line client for posting
> 
> USES=		iconv
> GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	ac_cv_search_iconv=${ICONV_LIB}
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib
> 
> CONFLICTS=	*clive-[1-9]*
> 
>-.include <bsd.port.pre.mk>
>-
>-post-patch:
>-	@${REINPLACE_CMD} 's/iconv "iconv/"iconv/' ${WRKSRC}/configure
>-
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: deskutils/owncloudclient/Makefile
>===================================================================
>--- deskutils/owncloudclient/Makefile	(revision 396354)
>+++ deskutils/owncloudclient/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	owncloudclient
> PORTVERSION=	1.8.4
>+PORTREVISION=	1
> CATEGORIES=	deskutils
> MASTER_SITES=	http://download.owncloud.com/desktop/stable/
> 
>@@ -14,7 +15,7 @@ LICENSE=	GPLv2
> LIB_DEPENDS=	libinotify.so:${PORTSDIR}/devel/libinotify \
> 		libqt5keychain.so:${PORTSDIR}/security/qtkeychain-qt5
> 
>-USES=		cmake:outsource compiler:c++11-lib gmake pkgconfig tar:xz
>+USES=		cmake:outsource compiler:c++11-lib gmake iconv pkgconfig tar:xz
> USE_QT5=	buildtools_build concurrent core dbus gui linguist_build network \
> 		qmake_build webkit xml
> USE_OPENSSL=	yes
>Index: deskutils/owncloudclient/files/patch-cmake-modules-FindIconv.cmake
>===================================================================
>--- deskutils/owncloudclient/files/patch-cmake-modules-FindIconv.cmake	(revision 0)
>+++ deskutils/owncloudclient/files/patch-cmake-modules-FindIconv.cmake	(working copy)
>@@ -0,0 +1,13 @@
>+--- 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()
>
>Property changes on: deskutils/owncloudclient/files/patch-cmake-modules-FindIconv.cmake
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: emulators/vmw/Makefile
>===================================================================
>--- emulators/vmw/Makefile	(revision 396354)
>+++ emulators/vmw/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	vmw
> PORTVERSION=	060510
>+PORTREVISION=	1
> CATEGORIES=	emulators
> MASTER_SITES=	http://sites.google.com/site/chitchatvmback/storage/
> 
>@@ -33,7 +34,7 @@ PLIST_FILES+=	sbin/${i}
> .if !exists(/usr/lib32/libc.so)
> IGNORE=		please install lib32
> .endif
>-.if ${OSVERSION} < 1000000
>+.if !empty(ICONV_LIB)
> IGNORE=		needs 32bit libiconv
> .endif
> CFLAGS+=	-m32
>@@ -42,9 +43,11 @@ LDFLAGS+=	-m32 -B/usr/lib32 -L/usr/lib32
> LD=	${CC}
> .endif
> 
>-.if ${OSVERSION} > 1000000
>+.if empty(ICONV_LIB)
> FTPLIB=
> MAKE_ENV+=	FTPLIB="${FTPLIB}"
>+.else
>+CFLAGS+=	-I${LOCALBASE}/include
> .endif
> 
> do-install:
>Index: emulators/vmw/files/patch-vmshf.c
>===================================================================
>--- emulators/vmw/files/patch-vmshf.c	(revision 0)
>+++ emulators/vmw/files/patch-vmshf.c	(working copy)
>@@ -0,0 +1,17 @@
>+--- 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>
>
>Property changes on: emulators/vmw/files/patch-vmshf.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: irc/scrollz/Makefile
>===================================================================
>--- irc/scrollz/Makefile	(revision 396354)
>+++ irc/scrollz/Makefile	(working copy)
>@@ -31,6 +31,12 @@ GNUTLS_CONFIGURE_ON=	--with-ssl
> OPENSSL_USE=		OPENSSL=yes
> OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
> 
>+.include <bsd.port.pre.mk>
>+
>+.if !empty(ICONV_LIB)
>+CONFIGURE_ENV+=ac_cv_func_iconv_open=yes
>+.endif
>+
> post-patch:
> 	@${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
> 
>@@ -46,4 +52,4 @@ post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}
> .endfor
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: japanese/chasen-base/Makefile
>===================================================================
>--- japanese/chasen-base/Makefile	(revision 396354)
>+++ japanese/chasen-base/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	chasen
> PORTVERSION=	2.4.5
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	japanese textproc
> MASTER_SITES=	SOURCEFORGE_JP/chasen-legacy/56305
> PKGNAMESUFFIX=	-base
>@@ -21,6 +21,11 @@ INSTALL_TARGET=	install-strip
> 
> OPTIONS_DEFINE=	DOCS
> 
>+post-patch:
>+	@${REINPLACE_CMD} \
>+		-e 's/iconv ()/libiconv ()/' \
>+		-e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
>+
> post-install:
> 	${MKDIR} ${STAGEDIR}${PREFIX}/share/chasen/dic
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
>Index: net/c3270/Makefile
>===================================================================
>--- net/c3270/Makefile	(revision 396354)
>+++ net/c3270/Makefile	(working copy)
>@@ -15,7 +15,7 @@ COMMENT=	Full-screen curses-based remote
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/([0-9]\.[0-9])(\..*)/\1/}
> 
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	ac_cv_search_libiconv=no
>+CONFIGURE_ARGS=	ac_cv_search_libiconv=${ICONV_LIB}
> 
> USES=		iconv readline gmake
> USE_OPENSSL=	yes
>Index: www/htmlcxx/Makefile
>===================================================================
>--- www/htmlcxx/Makefile	(revision 396354)
>+++ www/htmlcxx/Makefile	(working copy)
>@@ -23,7 +23,10 @@ MAKE_JOBS_UNSAFE=yes
> 
> MAKE_ARGS=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
> 
>-post-patch:
>-	@${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
>+.include <bsd.port.pre.mk>
> 
>-.include <bsd.port.mk>
>+.if !empty(ICONV_LIB)
>+CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=yes
>+.endif
>+
>+.include <bsd.port.post.mk>
>Index: www/httrack/Makefile
>===================================================================
>--- www/httrack/Makefile	(revision 396354)
>+++ www/httrack/Makefile	(working copy)
>@@ -37,12 +37,11 @@ ICONS_VARS=	INSTALLS_ICONS=yes
> 
> .include <bsd.port.pre.mk>
> 
>-.if empty(ICONV_LIB)
>-CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv=no
>+.if !empty(ICONV_LIB)
>+CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv=yes
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e '/DEFAULT_CFLAGS=/ s|-O -g3 ||g' ${WRKSRC}/configure
> 	@${REINPLACE_CMD} -e '/ install-data-hook/d' ${WRKSRC}/html/Makefile.in
> 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' ${WRKSRC}/html/server/div/WebHTTrack*
> 
>Index: www/xapian-omega/Makefile
>===================================================================
>--- www/xapian-omega/Makefile	(revision 396354)
>+++ www/xapian-omega/Makefile	(working copy)
>@@ -37,8 +37,8 @@ PORTEXAMPLES=	omega.conf
> 
> SHEBANG_FILES=	dbi2omega htdig2omega mbox2omega
> 
>+ICONV_CONFIGURE_ON=	ac_cv_search_iconv=${ICONV_LIB}
> ICONV_CONFIGURE_WITH=	iconv
>-ICONV_LDFLAGS=		${ICONV_LIB}
> ICONV_USES=		iconv
> 
> post-patch:
>Index: x11/mrxvt/Makefile
>===================================================================
>--- x11/mrxvt/Makefile	(revision 396354)
>+++ x11/mrxvt/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	mrxvt
> PORTVERSION=	0.4.2
>-PORTREVISION=	9
>+PORTREVISION=	10
> CATEGORIES=	x11
> MASTER_SITES=	SF/materm/${PORTNAME}%20source/${PORTVERSION}
> 
>@@ -16,6 +16,8 @@ CONFLICTS=	mrxvt-0.5.*
> 
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-lastlog --disable-wtmp
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib
> USES=		jpeg tar:tgz
> USE_XORG=	x11
> 
>@@ -25,9 +27,6 @@ JAPANESE_CONFIGURE_ON=	--enable-xim --en
> XFT_LIB_DEPENDS=	libXft.so:${PORTSDIR}/x11-fonts/libXft
> XFT_CONFIGURE_ENABLE=	xft
> 
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LIBS+=		-L${LOCALBASE}/lib
>-
> PORTDOCS=	TIPS \
> 		README.greek \
> 		README.menu \
>@@ -37,11 +36,19 @@ PORTDOCS=	TIPS \
> 		mrxvt.vbs \
> 		mrxvtset.pl
> 
>-post-patch-DOCS-off:
>-	@${REINPLACE_CMD} -e '/^$install-data-am:$.*/ \
>-		s/install-docDATA //' ${WRKSRC}/doc/Makefile.in
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MXFT} && ${PORT_OPTIONS:MJAPANESE}
>+USES+=		iconv
>+.endif
>+
>+.include <bsd.port.pre.mk>
>+
>+.if !empty(ICONV_LIB)
>+CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=yes
>+.endif
> 
> post-install:
> 	${CHMOD} 4511 ${STAGEDIR}${PREFIX}/bin/mrxvt
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: x11/mrxvt-devel/Makefile
>===================================================================
>--- x11/mrxvt-devel/Makefile	(revision 396354)
>+++ x11/mrxvt-devel/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	mrxvt-devel
> PORTVERSION=	0.5.4
>-PORTREVISION=	10
>+PORTREVISION=	11
> CATEGORIES=	x11
> MASTER_SITES=	SF/materm/mrxvt%20source/${PORTVERSION}
> DISTNAME=	mrxvt-${PORTVERSION}
>@@ -58,6 +58,10 @@ USE_XORG+=	xft
> CONFIGURE_ARGS+=	--enable-xft
> .endif
> 
>+.if ${PORT_OPTIONS:MXFT} && ${PORT_OPTIONS:MJAPANESE}
>+USES+=		iconv
>+.endif
>+
> .if ${PORT_OPTIONS:M24BITS}
> CONFIGURE_ARGS+=	--enable-24bits
> .endif
>@@ -124,6 +128,12 @@ CONFIGURE_ARGS+=	--with-atab-extra=${EXT
> CONFIGURE_ARGS+=	--with-tab-radius=${TAB_RADIUS:M[0-9]*}
> .endif
> 
>+.include <bsd.port.pre.mk>
>+
>+.if !empty(ICONV_LIB)
>+CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=yes
>+.endif
>+
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/src/mrxvt ${STAGEDIR}${PREFIX}/bin
> 	@for pixmap in ${WRKSRC}/share/pixmaps/* ; \
>@@ -141,4 +151,4 @@ do-install:
> 	${CP} ${WRKSRC}/doc/*.bz2 ${STAGEDIR}${DOCSDIR}
> 	${BZIP2_CMD} -d ${STAGEDIR}${DOCSDIR}/*.bz2
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: x11/x3270/Makefile
>===================================================================
>--- x11/x3270/Makefile	(revision 396354)
>+++ x11/x3270/Makefile	(working copy)
>@@ -23,7 +23,7 @@ USE_XORG=	ice sm x11 xaw xext xmu xt
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-fontdir=${FONTSDIR} \
> 		--disable-dbcs \
>-		ac_cv_search_libiconv=no
>+		ac_cv_search_libiconv=${ICONV_LIB}
> CPPFLAGS+=	-I${LOCALBASE}/include
> LIBS+=		-L${LOCALBASE}/lib
> .if defined(WITHOUT_OPENSSL)
>Index: devel/libexplain/Makefile
>===================================================================
>--- devel/libexplain/Makefile	(revision 396354)
>+++ devel/libexplain/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	libexplain
> PORTVERSION=	1.3.${PATCHLEVEL}
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	devel
> MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION:R}
> DISTNAME=	${PORTNAME}-${PORTVERSION:R}
>@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
> RUN_DEPENDS=	lsof:${PORTSDIR}/sysutils/lsof
> 
>-USES=		bison gettext ghostscript:build gmake libtool:build
>+USES=		bison gettext ghostscript:build gmake iconv libtool:build
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	ac_cv_header_linux_kd_h=no
> USE_LDCONFIG=	yes
>@@ -29,6 +29,13 @@ PATCHLEVEL=	D012
> 
> OPTIONS_DEFINE=	DOCS
> 
>+.include <bsd.port.pre.mk>
>+
>+.if !empty(ICONV_LIB)
>+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 ; \
>@@ -37,4 +44,4 @@ post-patch:
> post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libexplain.so
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: devel/sdl20/Makefile
>===================================================================
>--- devel/sdl20/Makefile	(revision 396354)
>+++ devel/sdl20/Makefile	(working copy)
>@@ -186,11 +186,16 @@ CONFIGURE_ARGS+=	--disable-video-x11 \
> 			--disable-video-x11-vm
> .endif
> 
>+.include <bsd.port.pre.mk>
>+
>+.if !empty(ICONV_LIB)
>+CONFIGURE_ARGS+=	ac_cv_lib_iconv_iconv_open=yes ac_cv_func_iconv=yes
>+.endif
>+
> post-patch:
>-	 @${REINPLACE_CMD} -e '/ CheckInputEvents$$/d' \
>-		-e 's/-liconv/${ICONV_LIB}/g' ${WRKSRC}/configure
>+	 @${REINPLACE_CMD} -e '/ CheckInputEvents$$/d' ${WRKSRC}/configure
> # Clang does not provide _m_prefetch
> 	@${REINPLACE_CMD} 's/_m_prefetch/__builtin_prefetch/' \
> 		${WRKSRC}/configure ${WRKSRC}/src/video/SDL_blit_A.c
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: japanese/eb/Makefile
>===================================================================
>--- japanese/eb/Makefile	(revision 396354)
>+++ japanese/eb/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	eb
> PORTVERSION=	4.4.3
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	japanese
> MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/ \
> 		ftp://ftp.sra.co.jp/pub/misc/eb/old/eb-${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}/
>@@ -66,7 +66,9 @@ PORTDOCS=	eb-01.html eb-02.html eb-03.ht
> USES=		autoreconf iconv libtool perl5 tar:bzip2
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
>-CONFIGURE_ARGS=	--with-pkgdocdir=${DOCSDIR}
>+CONFIGURE_ARGS=	--with-pkgdocdir=${DOCSDIR} \
>+		--with-iconv-includes=${ICONV_PREFIX}/include \
>+		--with-iconv-libraries=${ICONV_PREFIX}/lib
> CONFIGURE_ENV=	ac_cv_path_PERL=${PERL}
> 
> OPTIONS_DEFINE=	DOCS NLS
>@@ -76,11 +78,8 @@ APPENDIXDIR=	${DATADIR}/appendix
> 
> NLS_USES=		gettext
> NLS_CONFIGURE_ENABLE=	nls
>-NLS_CONFIGURE_ON=	\
>-		--with-gettext-includes=${LOCALBASE}/include \
>-		--with-gettext-libraries=${LOCALBASE}/lib \
>-		--with-iconv-includes=${ICONV_PREFIX}/include \
>-		--with-iconv-libraries=${ICONV_PREFIX}/lib
>+NLS_CONFIGURE_ON=	--with-gettext-includes=${LOCALBASE}/include \
>+			--with-gettext-libraries=${LOCALBASE}/lib
> NLS_CONFIGURE_OFF=	--disable-nls
> 
> post-extract:
>Index: japanese/eb/files/patch-m4-gettext-m4
>===================================================================
>--- japanese/eb/files/patch-m4-gettext-m4	(revision 396354)
>+++ japanese/eb/files/patch-m4-gettext-m4	(working copy)
>@@ -1,9 +1,10 @@
>---- m4/gettext.m4.orig	2010-01-03 21:26:04.000000000 +0900
>-+++ m4/gettext.m4	2014-04-03 10:20:12.000000000 +0900
>-@@ -87,13 +87,19 @@
>+--- 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"
>+-  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)
>@@ -11,23 +12,21 @@
> -  if test $ac_cv_func_iconv_open != no; then
> -    ICONVINCS="$iconv_includes"
> -  fi
>-+  initial_LIBS="$LIBS"
>-+  AC_SEARCH_LIBS([iconv_open],
>-+    [iconv],
>-+    [AS_IF([test "$LIBS" = "$initial_LIBS"],
>-+      [AC_CHECK_HEADERS([iconv.h])
>-+        AC_CHECK_FUNCS([iconv_open])
>-+        ICONVLIBS="$iconv_libraries"
>-+	ICONVINCS="$iconv_includes"],
>-+      [AC_CHECK_LIB([charset], [locale_charset])
>-+        AC_CHECK_HEADERS([iconv.h libcharset.h])
>-+        AC_CHECK_FUNCS([iconv_open locale_charset])
>-+	ICONVLIBS="$iconv_libraries -lcharset -liconv"
>-+	ICONVINCS="$iconv_includes"])])
>++  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],[])
>    CPPFLAGS=$save_CPPFLAGS
>    LIBS=$save_LIBS
>    AC_SUBST(ICONVINCS)
>-@@ -113,10 +119,10 @@
>+@@ -113,10 +116,10 @@ AC_DEFUN([eb_GNU_GETTEXT], [dnl
>      save_LIBS=$LIBS
>  
>      dnl *
>@@ -41,7 +40,7 @@
>      AC_LINK_IFELSE([
>  #include <stdio.h>
>  #ifdef ENABLE_NLS
>-@@ -143,8 +149,8 @@
>+@@ -143,8 +146,8 @@ main()
>      try_nls=yes, try_nls=no)
>  
>      if test "$try_nls" = yes; then
>@@ -52,7 +51,7 @@
>      fi
>  
>      dnl *
>-@@ -222,11 +228,11 @@
>+@@ -222,11 +225,11 @@ main()
>      fi
>  
>      dnl *
>@@ -67,7 +66,7 @@
>        AC_LINK_IFELSE([
>  #include <stdio.h>
>  #ifdef ENABLE_NLS
>-@@ -253,8 +259,8 @@
>+@@ -253,8 +256,8 @@ main()
>        try_nls=yes, try_nls=no)
>  
>        if test "$try_nls" = yes; then
>Index: japanese/eblook/Makefile
>===================================================================
>--- japanese/eblook/Makefile	(revision 396354)
>+++ japanese/eblook/Makefile	(working copy)
>@@ -16,10 +16,10 @@ LICENSE=	GPLv2
> LIB_DEPENDS=	libeb.so:${PORTSDIR}/japanese/eb
> 
> USES=		iconv
>-GNU_CONFIGURE=		yes
>-CONFIGURE_ARGS=		--with-eb-conf=${PREFIX}/etc/eb.conf
>+GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--with-eb-conf=${PREFIX}/etc/eb.conf
> CPPFLAGS+=	-I${ICONV_PREFIX}/include
>-LDFLAGS+=	-L${ICONV_PREFIX}/lib ${ICONV_LIB}
>+LIBS+=		-L${ICONV_PREFIX}/lib ${ICONV_LIB}
> 
> INFO=		eblook
> PLIST_FILES=	bin/eblook
>@@ -27,10 +27,14 @@ PORTDOCS=	AUTHORS COPYING ChangeLog NEWS
> 
> OPTIONS_DEFINE=	DOCS
> 
>-.include <bsd.port.options.mk>
>+.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.mk>
>+.include <bsd.port.post.mk>
>Index: java/jikes/Makefile
>===================================================================
>--- java/jikes/Makefile	(revision 396354)
>+++ java/jikes/Makefile	(working copy)
>@@ -12,7 +12,8 @@ COMMENT=	Java source to byte-code compil
> 
> PLIST_SUB=	PORTVERSION=${PORTVERSION}
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	ac_cv_search_libiconv_open=no
>+CONFIGURE_ARGS=	ac_cv_search_iconv_open=${ICONV_LIB} \
>+		ac_cv_search_libiconv_open=no
> USES=		iconv gmake tar:bzip2
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>Index: multimedia/transcode/Makefile
>===================================================================
>--- multimedia/transcode/Makefile	(revision 396354)
>+++ multimedia/transcode/Makefile	(working copy)
>@@ -35,7 +35,7 @@ POSTPROC_DESC=		Libpostproc support
> DVDREAD_DESC=		Libdvdread support
> LZO_DESC=		LZO compression support
> 
>-X11_USE=			xorg=xv,xaw,xpm
>+X11_USE=			xorg=x11,xext,xv,xaw,xpm
> X11_CONFIGURE_WITH=		x
> 
> MPEG2_LIB_DEPENDS=		libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2
>@@ -118,8 +118,7 @@ V4L_CONFIGURE_ENABLE=		v4l
> .include <bsd.port.pre.mk>
> 
> .if empty(ICONV_LIB)
>-CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no \
>-		ac_cv_lib_iconv_libiconv_open=no
>+CONFIGURE_ARGS+=ac_cv_lib_iconv_libiconv_open=no
> .endif
> 
> post-extract:
>Index: x11-wm/jwm/Makefile
>===================================================================
>--- x11-wm/jwm/Makefile	(revision 396354)
>+++ x11-wm/jwm/Makefile	(working copy)
>@@ -67,6 +67,12 @@ IGNORE=		the XMU support requires XEXT
> IGNORE=		the XPM support requires XEXT
> .endif
> 
>+.include <bsd.port.pre.mk>
>+
>+.if !empty(ICONV_LIB)
>+CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv=yes
>+.endif
>+
> post-patch:
> 	@${REINPLACE_CMD} -e \
> 		's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/example.jwmrc
>@@ -77,4 +83,4 @@ post-patch:
> 		'/EXE/s|install|@INSTALL_PROGRAM@| ; \
> 		 /strip/s|^|#|' ${WRKSRC}/src/Makefile.in
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>

Actions: View | Diff

Attachments on bug 202838: 160640 | 160802 | 160867 | 160902 | 161728 | 161860