Attachment 160640 Details for Bug 202838 – patch

[patch] patch

libiconv.patch (text/plain), 17.25 KB, created by Tijl Coosemans on 2015-09-02 16:59:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2015-09-02 16:59:19 UTC

Size: 17.25 KB

patch

obsolete

>Index: converters/libiconv/Makefile
>===================================================================
>--- converters/libiconv/Makefile	(revision 395855)
>+++ 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 395855)
>+++ 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 395855)
>+++ Mk/Uses/iconv.mk	(working copy)
>@@ -40,7 +40,7 @@ ICONV_CONFIGURE_BASE=
> .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 395855)
>+++ 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 395855)
>+++ 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
>+
>+post-patch:
>+	@${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 395855)
>+++ 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 395855)
>+++ 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 395855)
>+++ 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 395855)
>+++ 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 395855)
>+++ 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 395855)
>+++ 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,7 +43,7 @@ LDFLAGS+=	-m32 -B/usr/lib32 -L/usr/lib32
> LD=	${CC}
> .endif
> 
>-.if ${OSVERSION} > 1000000
>+.if empty(ICONV_LIB)
> FTPLIB=
> MAKE_ENV+=	FTPLIB="${FTPLIB}"
> .endif
>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 395855)
>+++ irc/scrollz/Makefile	(working copy)
>@@ -18,6 +18,7 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
> USES=		gmake iconv ncurses
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--enable-ipv6 --enable-regexp --enable-utf8
>+CONFIGURE_ENV=	ac_cv_func_iconv_open=yes
> 
> PLIST_SUB=	SCROLLZ_VER="${PORTVERSION}"
> 
>Index: japanese/chasen-base/Makefile
>===================================================================
>--- japanese/chasen-base/Makefile	(revision 395855)
>+++ 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 395855)
>+++ 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 395855)
>+++ www/htmlcxx/Makefile	(working copy)
>@@ -24,6 +24,8 @@ MAKE_JOBS_UNSAFE=yes
> MAKE_ARGS=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
> 
> post-patch:
>-	@${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} \
>+		-e 's/iconv_open/libiconv_open/' \
>+		-e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
> 
> .include <bsd.port.mk>
>Index: www/httrack/Makefile
>===================================================================
>--- www/httrack/Makefile	(revision 395855)
>+++ www/httrack/Makefile	(working copy)
>@@ -35,18 +35,14 @@ SHEBANG_FILES=	src/webhttrack
> 
> ICONS_VARS=	INSTALLS_ICONS=yes
> 
>-.include <bsd.port.pre.mk>
>-
>-.if empty(ICONV_LIB)
>-CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv=no
>-.endif
>-
> post-patch:
>-	@${REINPLACE_CMD} -e '/DEFAULT_CFLAGS=/ s|-O -g3 ||g' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} \
>+		-e 's/iconv ()/libiconv ()/' \
>+		-e 's/-liconv/${ICONV_LIB}/' ${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*
> 
> post-install:
> 	${INSTALL_DATA} ${WRKSRC}/html/httrack.css ${STAGEDIR}${DOCSDIR}/httrack.css
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: www/xapian-omega/Makefile
>===================================================================
>--- www/xapian-omega/Makefile	(revision 395855)
>+++ 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 395855)
>+++ 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}
> EXTRACT_SUFX=	.tgz
>@@ -16,6 +16,9 @@ LIB_DEPENDS=	libpng.so:${PORTSDIR}/graph
> CONFLICTS=	mrxvt-0.5.*
> 
> GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--disable-lastlog --disable-wtmp
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib
> USES=		jpeg
> USE_XORG=	x11
> 
>@@ -25,15 +28,6 @@ JAPANESE_CONFIGURE_ON=	--enable-xim --en
> XFT_LIB_DEPENDS=	libXft.so:${PORTSDIR}/x11-fonts/libXft
> XFT_CONFIGURE_ENABLE=	xft
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${OSVERSION} >= 900007
>-CONFIGURE_ARGS+=	--disable-lastlog --disable-wtmp
>-.endif
>-
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LIBS+=		-L${LOCALBASE}/lib
>-
> PORTDOCS=	TIPS \
> 		README.greek \
> 		README.menu \
>@@ -43,14 +37,18 @@ PORTDOCS=	TIPS \
> 		mrxvt.vbs \
> 		mrxvtset.pl
> 
>+.include <bsd.port.options.mk>
> 
>-.if empty(PORT_OPTIONS:MDOCS)
>-post-patch:
>-	@${REINPLACE_CMD} -e '/^$install-data-am:$.*/ \
>-		s/install-docDATA //' ${WRKSRC}/doc/Makefile.in
>+.if ${PORT_OPTIONS:MXFT} && ${PORT_OPTIONS:MJAPANESE}
>+USES+=		iconv
> .endif
> 
>+post-patch:
>+	@${REINPLACE_CMD} \
>+		-e 's/iconv_open/libiconv_open/' \
>+		-e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
>+
> post-install:
> 	${CHMOD} 4511 ${STAGEDIR}${PREFIX}/bin/mrxvt
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: x11/mrxvt-devel/Makefile
>===================================================================
>--- x11/mrxvt-devel/Makefile	(revision 395855)
>+++ 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,11 @@ CONFIGURE_ARGS+=	--with-atab-extra=${EXT
> CONFIGURE_ARGS+=	--with-tab-radius=${TAB_RADIUS:M[0-9]*}
> .endif
> 
>+post-patch:
>+	@${REINPLACE_CMD} \
>+		-e 's/iconv_open/libiconv_open/' \
>+		-e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
>+
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/src/mrxvt ${STAGEDIR}${PREFIX}/bin
> 	@for pixmap in ${WRKSRC}/share/pixmaps/* ; \
>Index: x11/x3270/Makefile
>===================================================================
>--- x11/x3270/Makefile	(revision 395855)
>+++ 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)

Actions: View | Diff

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