Index: Mk/Uses/iconv.mk =================================================================== --- Mk/Uses/iconv.mk (revision 383424) +++ Mk/Uses/iconv.mk (working copy) @@ -37,6 +37,10 @@ ICONV_PREFIX= /usr ICONV_CONFIGURE_ARG= ICONV_CONFIGURE_BASE= +.if ${OPSYS} != FreeBSD || ${OSVERSION} < 1100068 +BUILD_DEPENDS+= libiconv>=1.14_7:${PORTSDIR}/converters/libiconv +.endif + .if exists(${LOCALBASE}/include/iconv.h) CPPFLAGS+= -DLIBICONV_PLUG CFLAGS+= -DLIBICONV_PLUG Index: archivers/unalz/files/patch-UnAlz.cpp =================================================================== --- archivers/unalz/files/patch-UnAlz.cpp (revision 383424) +++ archivers/unalz/files/patch-UnAlz.cpp (working copy) @@ -9,17 +9,16 @@ # include // __NetBSD_Version__ # include // iconv.h 때문에 필요 #endif -@@ -455,7 +455,8 @@ BOOL CUnAlz::ReadLocalFileheader() +@@ -455,7 +455,7 @@ BOOL CUnAlz::ReadLocalFileheader() size_t size; char inbuf[ICONV_BUF_SIZE]; char outbuf[ICONV_BUF_SIZE]; -#if defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__NetBSD__) -+#if defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__NetBSD__) \ -+ || defined(__DragonFly__) ++#if defined(__CYGWIN__) || defined(__NetBSD__) const char *inptr = inbuf; #else char *inptr = inbuf; -@@ -1907,7 +1908,11 @@ void CUnAlz::DecryptingData(int nSize, B +@@ -1907,7 +1907,11 @@ void CUnAlz::DecryptingData(int nSize, B //////////////////////////////////////////////////////////////////////////////////////////////////// UINT32 CUnAlz::CRC32(UINT32 l, BYTE c) { Index: archivers/unrar-iconv/files/patch-iconv =================================================================== --- archivers/unrar-iconv/files/patch-iconv (revision 383424) +++ archivers/unrar-iconv/files/patch-iconv (working copy) @@ -150,8 +150,8 @@ + static size_t inbytesleft, outbytesleft; + inbytesleft = strlen(Src)+1; + outbytesleft = NM; -+ ret = iconv(h_I2E, &Src, &inbytesleft, &Dest, &outbytesleft); -+ Dest[outbytesleft-inbytesleft]=NULL; ++ ret = iconv(h_I2E, (char **)&Src, &inbytesleft, &Dest, &outbytesleft); ++ Dest[outbytesleft-inbytesleft]=0; + } + if (ret == (size_t)(-1)) + strncpyz(Dest,Src,DestSize); Index: audio/id3mtag/files/patch-charconv.cpp =================================================================== --- audio/id3mtag/files/patch-charconv.cpp (revision 0) +++ audio/id3mtag/files/patch-charconv.cpp (working copy) @@ -0,0 +1,11 @@ +--- charconv.cpp.orig 2015-01-29 23:00:00 UTC ++++ charconv.cpp +@@ -109,7 +109,7 @@ namespace charset { + + bool recode(char* out, size_t avail, const void* src, size_t len, const char* to, const char* from) + { +- const char* in = (const char*)src; ++ char* in = (char*)src; + + iconv_t cvt = iconv_open(to, from); + if(cvt == (iconv_t)-1) Property changes on: audio/id3mtag/files/patch-charconv.cpp ___________________________________________________________________ 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: audio/mp3unicode/files/patch-mp3unicode.cpp =================================================================== --- audio/mp3unicode/files/patch-mp3unicode.cpp (revision 383424) +++ audio/mp3unicode/files/patch-mp3unicode.cpp (working copy) @@ -1,11 +0,0 @@ ---- ./mp3unicode.cpp.orig 2012-05-07 12:03:19.000000000 +0000 -+++ ./mp3unicode.cpp 2014-05-13 20:16:40.053475428 +0000 -@@ -229,7 +229,7 @@ - if ( - iconv ( - cd, -- (char **)&from, -+ &from, - &from_size, - &to, - &to_size Index: audio/xmms-wavpack/Makefile =================================================================== --- audio/xmms-wavpack/Makefile (revision 383424) +++ audio/xmms-wavpack/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= xmms-wavpack PORTVERSION= 1.0.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio MASTER_SITES= http://www.wavpack.com/ @@ -12,7 +12,7 @@ COMMENT= XMMS input plugin to play WavPa LIB_DEPENDS= libwavpack.so:${PORTSDIR}/audio/wavpack \ libxmms.so:${PORTSDIR}/multimedia/xmms -USES= libtool pkgconfig tar:bzip2 +USES= iconv libtool pkgconfig tar:bzip2 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Index: audio/xmms-wavpack/files/patch-src_libwavpack.cpp =================================================================== --- audio/xmms-wavpack/files/patch-src_libwavpack.cpp (revision 383424) +++ audio/xmms-wavpack/files/patch-src_libwavpack.cpp (working copy) @@ -18,12 +18,3 @@ float *fptr = (float *) input; int32_t *lptr = input; int cnt = tsamples; -@@ -362,7 +362,7 @@ convertUTF8toLocale(char *utf8) - size_t in_left = strlen(utf8); - size_t out_left = 2 * in_left + 1; - char *buf = (char *)g_malloc(out_left); --#if 1 -+#if 0 - char *in = utf8; - #else - const char *in = (const char *) utf8; // some systems (freeBSD?) require const here Index: comms/telldus-core/Makefile =================================================================== --- comms/telldus-core/Makefile (revision 383424) +++ comms/telldus-core/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= telldus-core PORTVERSION= 2.1.2 +PORTREVISION= 1 CATEGORIES= comms MASTER_SITES= http://download.telldus.se/TellStick/Software/telldus-core/ @@ -16,7 +17,7 @@ LIB_DEPENDS= libftdi.so:${PORTSDIR}/deve libconfuse.so:${PORTSDIR}/devel/libconfuse \ libargp.so:${PORTSDIR}/devel/argp-standalone -USES= iconv cmake compiler:c++11-lang +USES= cmake compiler:c++11-lang iconv:wchar_t #CMAKE_VERBOSE=yes CMAKE_ARGS+=-DGENERATE_MAN=TRUE Index: comms/telldus-core/files/patch-common-CMakeLists.txt =================================================================== --- comms/telldus-core/files/patch-common-CMakeLists.txt (revision 383424) +++ comms/telldus-core/files/patch-common-CMakeLists.txt (working copy) @@ -1,29 +0,0 @@ ---- common/CMakeLists.txt -+++ common/CMakeLists.txt -@@ -54,16 +54,22 @@ ELSEIF (WIN32) - ) - ELSEIF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") - #### FreeBSD #### -- FIND_LIBRARY(ICONV_LIBRARY iconv) -+ string(REGEX MATCH "(([0-9]+)\\.([0-9]+))-([A-Z0-9])+" FREEBSD "${CMAKE_SYSTEM_VERSION}") -+ set( FREEBSD_RELEASE "${CMAKE_MATCH_1}" ) - ADD_DEFINITIONS( -D_FREEBSD ) - LIST(APPEND telldus-common_SRCS - Event_unix.cpp - EventHandler_unix.cpp - Socket_unix.cpp - ) -- LIST(APPEND telldus-common_LIBRARIES -- ${ICONV_LIBRARY} -- ) -+ -+ # FreeBSD 10 has iconv built in to libc -+ IF(FREEBSD_RELEASE LESS 10) -+ FIND_LIBRARY(ICONV_LIBRARY iconv) -+ LIST(APPEND telldus-common_LIBRARIES -+ ${ICONV_LIBRARY} -+ ) -+ ENDIF () - ELSE (APPLE) - #### Linux #### - ADD_DEFINITIONS( -D_LINUX ) Index: comms/telldus-core/files/patch-common-Strings.cpp =================================================================== --- comms/telldus-core/files/patch-common-Strings.cpp (revision 0) +++ comms/telldus-core/files/patch-common-Strings.cpp (working copy) @@ -0,0 +1,26 @@ +--- common/Strings.cpp.orig 2014-03-31 10:30:09 UTC ++++ common/Strings.cpp +@@ -61,11 +61,7 @@ std::wstring TelldusCore::charToWstring( + char *outString = reinterpret_cast(new wchar_t[utf8Length+1]); + memset(outString, 0, sizeof(wchar_t)*(utf8Length+1)); + +-#ifdef _FREEBSD +- const char *inPointer = inString; +-#else + char *inPointer = inString; +-#endif + char *outPointer = outString; + + iconv_t convDesc = iconv_open(WCHAR_T_ENCODING, "UTF-8"); +@@ -206,11 +202,7 @@ std::string TelldusCore::wideToString(co + char *outString = new char[outbytesLeft]; + memset(outString, 0, sizeof(*outString)*(outbytesLeft)); + +-#ifdef _FREEBSD +- const char *inPointer = inString; +-#else + char *inPointer = inString; +-#endif + char *outPointer = outString; + + iconv_t convDesc = iconv_open("UTF-8", WCHAR_T_ENCODING); Property changes on: comms/telldus-core/files/patch-common-Strings.cpp ___________________________________________________________________ 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: converters/libiconv/Makefile =================================================================== --- converters/libiconv/Makefile (revision 383424) +++ converters/libiconv/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= libiconv PORTVERSION= 1.14 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= converters devel MASTER_SITES= GNU @@ -12,10 +12,9 @@ COMMENT= Character set conversion librar GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static \ - --without-libintl-prefix \ - --docdir=${DOCSDIR} -CONFIGURE_ENV= am_cv_func_iconv="yes" \ - am_cv_proto_iconv_arg1="const" + --disable-nls \ + --docdir=${DOCSDIR} \ + am_cv_func_iconv=no INSTALL_TARGET= install-strip MAKE_JOBS_UNSAFE= yes USES= libtool Index: converters/wkhtmltopdf/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp =================================================================== --- converters/wkhtmltopdf/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp (revision 0) +++ converters/wkhtmltopdf/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp (working copy) @@ -0,0 +1,11 @@ +--- config.tests/unix/gnu-libiconv/gnu-libiconv.cpp.orig 2015-01-03 18:06:12 UTC ++++ config.tests/unix/gnu-libiconv/gnu-libiconv.cpp +@@ -48,7 +48,7 @@ int main(int, char **) + { + iconv_t x = iconv_open("", ""); + +- const char *inp; ++ char *inp; + char *outp; + size_t inbytes, outbytes; + iconv(x, &inp, &inbytes, &outp, &outbytes); Property changes on: converters/wkhtmltopdf/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp ___________________________________________________________________ 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: converters/wkhtmltopdf/files/patch-src_corelib_codecs_qiconvcodec.cpp =================================================================== --- converters/wkhtmltopdf/files/patch-src_corelib_codecs_qiconvcodec.cpp (revision 0) +++ converters/wkhtmltopdf/files/patch-src_corelib_codecs_qiconvcodec.cpp (working copy) @@ -0,0 +1,39 @@ +--- src/corelib/codecs/qiconvcodec.cpp.orig 2015-01-03 18:06:52 UTC ++++ src/corelib/codecs/qiconvcodec.cpp +@@ -219,12 +219,7 @@ QString QIconvCodec::convertToUnicode(co + IconvState *state = *pstate; + size_t inBytesLeft = len; + // best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM +-#ifdef GNU_LIBICONV +- // GNU doesn't disagree with POSIX :/ +- const char *inBytes = chars; +-#else + char *inBytes = const_cast(chars); +-#endif + + QByteArray in; + if (remainingCount) { +@@ -318,11 +313,7 @@ static bool setByteOrder(iconv_t cd) + size_t outBytesLeft = sizeof buf; + size_t inBytesLeft = sizeof bom; + +-#if defined(GNU_LIBICONV) +- const char **inBytesPtr = const_cast(&inBytes); +-#else + char **inBytesPtr = &inBytes; +-#endif + + if (iconv(cd, inBytesPtr, &inBytesLeft, &outBytes, &outBytesLeft) == (size_t) -1) { + return false; +@@ -338,11 +329,7 @@ QByteArray QIconvCodec::convertFromUnico + char *outBytes; + size_t inBytesLeft; + +-#if defined(GNU_LIBICONV) +- const char **inBytesPtr = const_cast(&inBytes); +-#else + char **inBytesPtr = &inBytes; +-#endif + + IconvState *temporaryState = 0; + QThreadStorage *ts = fromUnicodeState(); Property changes on: converters/wkhtmltopdf/files/patch-src_corelib_codecs_qiconvcodec.cpp ___________________________________________________________________ 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: databases/kbibtex/Makefile =================================================================== --- databases/kbibtex/Makefile (revision 383424) +++ databases/kbibtex/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= kbibtex DISTVERSION= 0.4.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= databases kde MASTER_SITES= http://download.gna.org/${PORTNAME}/${PORTVERSION:C,(^[[:digit:]]\.[[:digit:]]).*,\1,}/ @@ -12,7 +12,7 @@ COMMENT= Bibliography editor for KDE LIB_DEPENDS= libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 -USES= cmake shared-mime-info tar:bzip2 +USES= cmake iconv shared-mime-info tar:bzip2 USE_GNOME= libxml2 libxslt USE_KDE4= kdelibs kdeprefix automoc4 USE_QT4= qmake_build moc_build uic_build rcc_build \ Index: databases/kbibtex/files/patch-src__libkbibtexio__iconvlatex.cpp =================================================================== --- databases/kbibtex/files/patch-src__libkbibtexio__iconvlatex.cpp (revision 383424) +++ databases/kbibtex/files/patch-src__libkbibtexio__iconvlatex.cpp (working copy) @@ -1,11 +0,0 @@ ---- ./src/libkbibtexio/iconvlatex.cpp.orig 2012-05-05 10:50:42.000000000 +0000 -+++ ./src/libkbibtexio/iconvlatex.cpp 2012-05-06 00:53:04.285249457 +0000 -@@ -58,7 +58,7 @@ - QByteArray IConvLaTeX::encode(const QString &input) - { - QByteArray inputByteArray = input.toUtf8(); --#ifdef Q_WS_WIN -+#ifndef Q_OS_LINUX - /// iconv on Windows likes to have it as const char * - const char *inputBuffer = inputByteArray.data(); - #else Index: databases/mysql-workbench52/files/patch-plugins__migration__copytable__copytable.cpp =================================================================== --- databases/mysql-workbench52/files/patch-plugins__migration__copytable__copytable.cpp (revision 383424) +++ databases/mysql-workbench52/files/patch-plugins__migration__copytable__copytable.cpp (working copy) @@ -1,20 +0,0 @@ ---- plugins/migration/copytable/copytable.cpp.orig -+++ plugins/migration/copytable/copytable.cpp -@@ -555,7 +555,7 @@ - //log_debug3("Convert string with %i chars to buffer size %i\n", inbuf_len, outbuf_len); - - // convert data from UCS-2 to utf-8 --#ifdef _WIN32 -+#if defined(_WIN32) || defined(__FreeBSD__) - converted = iconv(_iconv, - (const char**)&inbuf, &inbuf_len, - (char**)&outbuf, &outbuf_len); -@@ -617,7 +617,7 @@ - //log_debug3("Convert string with %i chars to buffer size %i\n", inbuf_len, outbuf_len); - - // convert data from UCS-2 to utf-8 --#ifdef _WIN32 -+#if defined(_WIN32) || defined(__FreeBSD__) - converted = iconv(_iconv, - (const char**)&inbuf, &inbuf_len, - (char**)&outbuf, &outbuf_len); Index: deskutils/fbreader/Makefile =================================================================== --- deskutils/fbreader/Makefile (revision 383424) +++ deskutils/fbreader/Makefile (working copy) @@ -53,7 +53,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} -DDO_ICONV_CAST -DLIBICONV_PLUG,' \ + @${REINPLACE_CMD} -e '/^CFLAGS/s,-pipe.*$$,${CFLAGS} -DLIBICONV_PLUG,' \ -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: devel/ice/files/patch-cpp-include-Ice-IconvStringConverter.h =================================================================== --- devel/ice/files/patch-cpp-include-Ice-IconvStringConverter.h (revision 0) +++ devel/ice/files/patch-cpp-include-Ice-IconvStringConverter.h (working copy) @@ -0,0 +1,11 @@ +--- cpp/include/Ice/IconvStringConverter.h.orig 2013-10-04 15:48:14 UTC ++++ cpp/include/Ice/IconvStringConverter.h +@@ -20,7 +20,7 @@ + #include + #endif + +-#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) || defined(__FreeBSD__) ++#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) + // + // See http://sourceware.org/bugzilla/show_bug.cgi?id=2962 + // Property changes on: devel/ice/files/patch-cpp-include-Ice-IconvStringConverter.h ___________________________________________________________________ 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: devel/qt4-corelib/Makefile =================================================================== --- devel/qt4-corelib/Makefile (revision 383424) +++ devel/qt4-corelib/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= corelib DISTVERSION= ${QT4_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel PKGNAMEPREFIX= qt4- Index: devel/qt4-corelib/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp =================================================================== --- devel/qt4-corelib/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp (revision 0) +++ devel/qt4-corelib/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp (working copy) @@ -0,0 +1,11 @@ +--- config.tests/unix/gnu-libiconv/gnu-libiconv.cpp.orig 2014-04-10 18:37:08 UTC ++++ config.tests/unix/gnu-libiconv/gnu-libiconv.cpp +@@ -48,7 +48,7 @@ int main(int, char **) + { + iconv_t x = iconv_open("", ""); + +- const char *inp; ++ char *inp; + char *outp; + size_t inbytes, outbytes; + iconv(x, &inp, &inbytes, &outp, &outbytes); Property changes on: devel/qt4-corelib/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp ___________________________________________________________________ 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: devel/qt4-corelib/files/patch-src_corelib_codecs_qiconvcodec.cpp =================================================================== --- devel/qt4-corelib/files/patch-src_corelib_codecs_qiconvcodec.cpp (revision 0) +++ devel/qt4-corelib/files/patch-src_corelib_codecs_qiconvcodec.cpp (working copy) @@ -0,0 +1,39 @@ +--- src/corelib/codecs/qiconvcodec.cpp.orig 2014-04-10 18:37:11 UTC ++++ src/corelib/codecs/qiconvcodec.cpp +@@ -219,12 +219,7 @@ QString QIconvCodec::convertToUnicode(co + IconvState *state = *pstate; + size_t inBytesLeft = len; + // best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM +-#ifdef GNU_LIBICONV +- // GNU doesn't disagree with POSIX :/ +- const char *inBytes = chars; +-#else + char *inBytes = const_cast(chars); +-#endif + + QByteArray in; + if (remainingCount) { +@@ -318,11 +313,7 @@ static bool setByteOrder(iconv_t cd) + size_t outBytesLeft = sizeof buf; + size_t inBytesLeft = sizeof bom; + +-#if defined(GNU_LIBICONV) +- const char **inBytesPtr = const_cast(&inBytes); +-#else + char **inBytesPtr = &inBytes; +-#endif + + if (iconv(cd, inBytesPtr, &inBytesLeft, &outBytes, &outBytesLeft) == (size_t) -1) { + return false; +@@ -338,11 +329,7 @@ QByteArray QIconvCodec::convertFromUnico + char *outBytes; + size_t inBytesLeft; + +-#if defined(GNU_LIBICONV) +- const char **inBytesPtr = const_cast(&inBytes); +-#else + char **inBytesPtr = &inBytes; +-#endif + + IconvState *temporaryState = 0; + QThreadStorage *ts = fromUnicodeState(); Property changes on: devel/qt4-corelib/files/patch-src_corelib_codecs_qiconvcodec.cpp ___________________________________________________________________ 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/dolphin-emu/files/patch-Source-Core-Common-Src-StringUtil.cpp =================================================================== --- emulators/dolphin-emu/files/patch-Source-Core-Common-Src-StringUtil.cpp (revision 383424) +++ emulators/dolphin-emu/files/patch-Source-Core-Common-Src-StringUtil.cpp (working copy) @@ -1,11 +0,0 @@ ---- Source/Core/Common/Src/StringUtil.cpp.orig 2013-03-21 06:49:23.000000000 +0100 -+++ Source/Core/Common/Src/StringUtil.cpp 2013-03-21 06:50:08.000000000 +0100 -@@ -460,7 +460,7 @@ - - while (src_bytes != 0) - { -- size_t const iconv_result = iconv(conv_desc, (char**)(&src_buffer), &src_bytes, -+ size_t const iconv_result = iconv(conv_desc, (const char**)(&src_buffer), &src_bytes, - &dst_buffer, &dst_bytes); - - if ((size_t)-1 == iconv_result) Index: emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp (revision 0) +++ emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp (working copy) @@ -0,0 +1,26 @@ +--- src/VBox/Runtime/r3/posix/utf8-posix.cpp.orig 2015-03-16 17:04:36 UTC ++++ src/VBox/Runtime/r3/posix/utf8-posix.cpp +@@ -194,7 +194,10 @@ static int rtstrConvertCached(const void + const void *pvInputLeft = pvInput; + void *pvOutputLeft = pvOutput; + size_t cchNonRev; +-#if defined(RT_OS_LINUX) || defined(RT_OS_HAIKU) || defined(RT_OS_SOLARIS) || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) /* there are different opinions about the constness of the input buffer. */ ++#if defined(RT_OS_LINUX) || defined(RT_OS_HAIKU) || defined(RT_OS_SOLARIS) \ ++ || defined(RT_OS_FREEBSD) || defined(RT_OS_DRAGONFLY) \ ++ || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) ++/* there are different opinions about the constness of the input buffer. */ + cchNonRev = iconv(hIconv, (char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft); + #else + cchNonRev = iconv(hIconv, (const char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft); +@@ -324,7 +327,10 @@ static int rtStrConvertUncached(const vo + const void *pvInputLeft = pvInput; + void *pvOutputLeft = pvOutput; + size_t cchNonRev; +-#if defined(RT_OS_LINUX) || defined(RT_OS_HAIKU) || defined(RT_OS_SOLARIS) || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) /* there are different opinions about the constness of the input buffer. */ ++#if defined(RT_OS_LINUX) || defined(RT_OS_HAIKU) || defined(RT_OS_SOLARIS) \ ++ || defined(RT_OS_FREEBSD) || defined(RT_OS_DRAGONFLY) \ ++ || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) ++/* there are different opinions about the constness of the input buffer. */ + cchNonRev = iconv(icHandle, (char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft); + #else + cchNonRev = iconv(icHandle, (const char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft); Property changes on: emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp ___________________________________________________________________ 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: finance/libofx/files/patch-lib__ofx_preproc.cpp =================================================================== --- finance/libofx/files/patch-lib__ofx_preproc.cpp (revision 383424) +++ finance/libofx/files/patch-lib__ofx_preproc.cpp (working copy) @@ -1,11 +0,0 @@ ---- lib/ofx_preproc.cpp.orig 2014-09-12 19:26:30 UTC -+++ lib/ofx_preproc.cpp -@@ -310,7 +310,7 @@ int ofx_proc_file(LibofxContextPtr ctx, - size_t outbytesleft = inbytesleft * 2 - 1; - iconv_buffer = (char*) malloc (inbytesleft * 2); - memset(iconv_buffer, 0, inbytesleft * 2); --#if defined(OS_WIN32) || defined(__sun) -+#if defined(__FreeBSD__) || defined(__DragonFly__) - const char * inchar = (const char *)s_buffer.c_str(); - #else - char * inchar = (char *)s_buffer.c_str(); Index: games/allacrost/Makefile =================================================================== --- games/allacrost/Makefile (revision 383424) +++ games/allacrost/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= allacrost PORTVERSION= 1.0.2 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-demo/${PORTVERSION} DISTNAME= ${PORTNAME}_demo_source_${PORTVERSION} @@ -20,7 +20,7 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/grap LICENSE= GPLv2 GNU_CONFIGURE= yes -USES= gettext gmake openal:al lua:51 +USES= gettext gmake iconv openal:al lua:51 USE_SDL= sdl ttf net USE_GL= yes USE_GCC= any # problems in luabind Index: games/allacrost/files/patch-src-utils.cpp =================================================================== --- games/allacrost/files/patch-src-utils.cpp (revision 383424) +++ games/allacrost/files/patch-src-utils.cpp (working copy) @@ -8,21 +8,3 @@ #include #endif -@@ -337,7 +338,7 @@ - } - - const char *source_char = reinterpret_cast(source); -- #if (defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109) -+ #if 1 - // We are using an iconv API that uses const char* - const char *sourceChar = source_char; - #else -@@ -369,7 +370,7 @@ - return false; - } - -- #if (defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109) -+ #if 1 - // We are using an iconv API that uses const char* - const char *sourceChar = source; - #else Index: games/cuyo/files/patch-src__cuyointl.cpp =================================================================== --- games/cuyo/files/patch-src__cuyointl.cpp (revision 383424) +++ games/cuyo/files/patch-src__cuyointl.cpp (working copy) @@ -1,11 +0,0 @@ ---- src/cuyointl.cpp.orig -+++ src/cuyointl.cpp -@@ -93,7 +93,7 @@ - return convert_error(ret,s,"Character conversion not possible."); - - while (*inpos) { -- size_t res = iconv(handle,&inpos,&inleft,&outpos,&outleft); -+ size_t res = iconv(handle,(const char **)&inpos,&inleft,&outpos,&outleft); - if (res == (size_t) -1) - /* An error occured */ - switch (errno) { Index: games/hex-a-hop/Makefile =================================================================== --- games/hex-a-hop/Makefile (revision 383424) +++ games/hex-a-hop/Makefile (working copy) @@ -3,13 +3,14 @@ PORTNAME= hex-a-hop PORTVERSION= 1.1.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= SF/${PORTNAME:S/-//g}/${PORTVERSION} MAINTAINER= makc@FreeBSD.org COMMENT= Puzzle game based on hexagonal tiles +USES= iconv USE_SDL= sdl GNU_CONFIGURE= yes Index: games/hex-a-hop/files/patch-src-text.cpp =================================================================== --- games/hex-a-hop/files/patch-src-text.cpp (revision 383424) +++ games/hex-a-hop/files/patch-src-text.cpp (working copy) @@ -1,11 +0,0 @@ ---- src/text.cpp~ -+++ src/text.cpp -@@ -439,7 +439,7 @@ void ConvertToUTF8(const std::string &te - errno = 0; - static const char *locale_enc = gettext_init.GetEncoding(); - iconv_t cd = iconv_open("UTF-8", locale_enc); -- char *in_buf = const_cast(&text_locally_encoded[0]); -+ const char *in_buf = const_cast(&text_locally_encoded[0]); - char *out_buf = &text_utf8[0]; - iconv(cd, &in_buf, &text_length, &out_buf, &text_utf8_length); - iconv_close(cd); Index: games/pokerth/files/patch-src-core-linux-convhelper.cpp =================================================================== --- games/pokerth/files/patch-src-core-linux-convhelper.cpp (revision 383424) +++ games/pokerth/files/patch-src-core-linux-convhelper.cpp (working copy) @@ -1,20 +1,11 @@ ---- src/core/linux/convhelper.cpp.orig 2008-01-20 13:32:07.000000000 +0100 -+++ src/core/linux/convhelper.cpp 2008-01-20 12:56:03.000000000 +0100 -@@ -39,7 +39,7 @@ - #ifdef __APPLE__ - const char *inbuf = inStr.data(); - #else -- char *inbuf = const_cast(inStr.data()); -+ const char *inbuf = const_cast(inStr.data()); +--- src/core/linux/convhelper.cpp.orig 2014-01-10 21:18:20 UTC ++++ src/core/linux/convhelper.cpp +@@ -36,7 +36,7 @@ + #error This file is not for Windows. #endif - const size_t c_outsize = insize * 6; // max size of utf-8 char is 6 per input char -@@ -74,7 +74,7 @@ - #ifdef __APPLE__ - const char *inbuf = inStr.data(); - #else -- char *inbuf = const_cast(inStr.data()); -+ const char *inbuf = const_cast(inStr.data()); +-#if defined(__FreeBSD__) || defined(__NetBSD__) ++#if defined(__NetBSD__) + #define HAVE_ICONV_CONST #endif - const size_t c_outsize = insize; Index: games/valyriatear/files/patch-src-utils-ustring.cpp =================================================================== --- games/valyriatear/files/patch-src-utils-ustring.cpp (revision 0) +++ games/valyriatear/files/patch-src-utils-ustring.cpp (working copy) @@ -0,0 +1,11 @@ +--- src/utils/ustring.cpp.orig 2013-09-24 11:33:12 UTC ++++ src/utils/ustring.cpp +@@ -203,7 +203,7 @@ static bool UTF8ToUTF16(const char *sour + return false; + } + +-#if (defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109) || defined(__FreeBSD__) ++#if defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109 + // We are using an iconv API that uses const char* + const char *sourceChar = source; + #else Property changes on: games/valyriatear/files/patch-src-utils-ustring.cpp ___________________________________________________________________ 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: graphics/cegui/files/patch-cegui__src__IconvStringTranscoder.cpp =================================================================== --- graphics/cegui/files/patch-cegui__src__IconvStringTranscoder.cpp (revision 383424) +++ graphics/cegui/files/patch-cegui__src__IconvStringTranscoder.cpp (working copy) @@ -1,15 +0,0 @@ ---- cegui/src/IconvStringTranscoder.cpp.orig 2014-03-12 06:50:07.000000000 +0100 -+++ cegui/src/IconvStringTranscoder.cpp 2014-03-12 06:51:56.000000000 +0100 -@@ -64,12 +64,7 @@ - size_t iconv(const char** inbuf, size_t* inbytesleft, - char** outbuf, size_t* outbytesleft) - { --#ifdef CEGUI_ICONV_USES_CONST_INBUF - return ::iconv(d_cd, inbuf, inbytesleft, outbuf, outbytesleft); --#else -- return ::iconv(d_cd, const_cast(inbuf), inbytesleft, -- outbuf, outbytesleft); --#endif - } - - //------------------------------------------------------------------------// Index: graphics/iccexamin/files/patch-icc_gl.cpp =================================================================== --- graphics/iccexamin/files/patch-icc_gl.cpp (revision 383424) +++ graphics/iccexamin/files/patch-icc_gl.cpp (working copy) @@ -1,11 +0,0 @@ ---- icc_gl.cpp.orig 2013-05-01 21:38:55.000000000 +0400 -+++ icc_gl.cpp 2013-05-01 21:39:28.000000000 +0400 -@@ -191,7 +191,7 @@ void drawText( FTFont * f, const char * - ttmp = txt = strdup(in_txt); - - iconv_t cd = iconv_open( "WCHAR_T", oy_domain_codeset ); -- iconv( cd, &ttmp, &in_left, (char**)&wtmp, &out_left); -+ iconv( cd, (const char**)&ttmp, &in_left, (char**)&wtmp, &out_left); - iconv_close( cd ); - - drawTEXT( f, wchar ); Index: graphics/inventor/files/patch-SoText2.c++ =================================================================== --- graphics/inventor/files/patch-SoText2.c++ (revision 383424) +++ graphics/inventor/files/patch-SoText2.c++ (working copy) @@ -1,23 +1,6 @@ *** lib/database/src/so/nodes/SoText2.c++.orig Tue Sep 25 00:45:41 2001 --- lib/database/src/so/nodes/SoText2.c++ Mon Dec 23 13:28:11 2002 *************** -*** 778,784 **** - size_t outbytes = 2*inbytes+2; - char* output = (char*)UCSStrings[i]; - -! if ((iconv(conversionCode, &input, &inbytes, &output, &outbytes) == (size_t)-1)){ - #ifdef DEBUG - SoDebugError::post("SoBitmapFontCache::convertToUCS", - "Error converting text to UCS-2"); ---- 778,784 ---- - size_t outbytes = 2*inbytes+2; - char* output = (char*)UCSStrings[i]; - -! if ((iconv(conversionCode, (const char **)&input, &inbytes, &output, &outbytes) == (size_t)-1)){ - #ifdef DEBUG - SoDebugError::post("SoBitmapFontCache::convertToUCS", - "Error converting text to UCS-2"); -*************** *** 1498,1503 **** --- 1498,1504 ---- // And some font library stuff: Index: graphics/inventor/files/patch-SoText3.c++ =================================================================== --- graphics/inventor/files/patch-SoText3.c++ (revision 383424) +++ graphics/inventor/files/patch-SoText3.c++ (working copy) @@ -1,19 +0,0 @@ -*** lib/database/src/so/nodes/SoText3.c++.orig Mon Dec 23 13:37:59 2002 ---- lib/database/src/so/nodes/SoText3.c++ Mon Dec 23 13:38:15 2002 -*************** -*** 2291,2297 **** - size_t outbytes = 2*inbytes+2; - char* output = (char*)UCSStrings[i]; - -! if ((iconv(conversionCode, &input, &inbytes, &output, &outbytes) == (size_t)-1)){ - #ifdef DEBUG - SoDebugError::post("SoOutlineFontCache::convertToUCS", - "Error converting text to UCS-2"); ---- 2291,2297 ---- - size_t outbytes = 2*inbytes+2; - char* output = (char*)UCSStrings[i]; - -! if ((iconv(conversionCode, (const char **)&input, &inbytes, &output, &outbytes) == (size_t)-1)){ - #ifdef DEBUG - SoDebugError::post("SoOutlineFontCache::convertToUCS", - "Error converting text to UCS-2"); Index: graphics/inventor/files/patch-TextWrapper.c++ =================================================================== --- graphics/inventor/files/patch-TextWrapper.c++ (revision 383424) +++ graphics/inventor/files/patch-TextWrapper.c++ (working copy) @@ -1,36 +0,0 @@ -*** apps/demos/textomatic/TextWrapper.c++.orig Thu Jan 2 15:29:27 2003 ---- apps/demos/textomatic/TextWrapper.c++ Thu Jan 2 15:31:00 2003 -*************** -*** 77,83 **** - char *output = outbuf; - // - if ( global_iconvCodeL2 == (iconv_t)-1 || -! iconv(global_iconvCodeL2,&input,&inbytesleft,&output,&outbytesleft) == (size_t)-1 ) - { - fprintf( stderr, "textomatic: iconv error.\n" ); - (*(UCS2 *)outbuf)=0; ---- 77,83 ---- - char *output = outbuf; - // - if ( global_iconvCodeL2 == (iconv_t)-1 || -! iconv(global_iconvCodeL2,(const char **)&input,&inbytesleft,&output,&outbytesleft) == (size_t)-1 ) - { - fprintf( stderr, "textomatic: iconv error.\n" ); - (*(UCS2 *)outbuf)=0; -*************** -*** 229,235 **** - char *output = outbuf; - // - if ( global_iconvCode28 == (iconv_t)-1 || -! iconv( global_iconvCode28,&input,&inbytesleft,&output,&outbytesleft ) == (size_t)-1 ) - { - fprintf( stderr, "textomatic: iconv error.\n" ); - (*(UCS2 *)outbuf)=0; ---- 229,235 ---- - char *output = outbuf; - // - if ( global_iconvCode28 == (iconv_t)-1 || -! iconv( global_iconvCode28,(const char **)&input,&inbytesleft,&output,&outbytesleft ) == (size_t)-1 ) - { - fprintf( stderr, "textomatic: iconv error.\n" ); - (*(UCS2 *)outbuf)=0; Index: graphics/ipe/files/patch-ipelib__ipedoc.cpp =================================================================== --- graphics/ipe/files/patch-ipelib__ipedoc.cpp (revision 383424) +++ graphics/ipe/files/patch-ipelib__ipedoc.cpp (working copy) @@ -1,23 +0,0 @@ ---- ipelib/ipedoc.cpp.orig 2013-03-15 13:37:02.000000000 +0000 -+++ ipelib/ipedoc.cpp -@@ -41,6 +41,7 @@ - #include "ipelatex.h" - - #include -+#include - - #ifdef IPE_USE_ICONV - #include -@@ -850,7 +851,12 @@ int Document::runLatex(String &texLog) - if (!file) - return ErrWritingSource; - -+#if defined(__FreeBSD__) || \ -+ (defined(__DragonFly__) && __DragonFly_version > 300502) -+ const char *inbuf = utf8.data(); -+#else - char *inbuf = (char *) utf8.data(); -+#endif - size_t inbytesleft = utf8.size(); - - FileStream fstream(file); Index: graphics/sswf/Makefile =================================================================== --- graphics/sswf/Makefile (revision 383424) +++ graphics/sswf/Makefile (working copy) @@ -35,9 +35,4 @@ OPTIONS_DEFINE= DEBUG CONFIGURE_ARGS+= --disable-debug --disable-yydebug .endif -post-configure: - @${REINPLACE_CMD} 's|ICONV_INPUT_CAST||' \ - ${WRKSRC}/src/lib/libsswf_tag_header.c++ \ - ${WRKSRC}/src/sswf/sswf_lexical.c++ - .include Index: graphics/sswf/files/patch-include_sswf_libsswf.h =================================================================== --- graphics/sswf/files/patch-include_sswf_libsswf.h (revision 383424) +++ graphics/sswf/files/patch-include_sswf_libsswf.h (working copy) @@ -1,6 +1,6 @@ ---- include/sswf/libsswf.h.orig Sat Aug 12 23:59:53 2006 -+++ include/sswf/libsswf.h Sun Aug 13 00:00:44 2006 -@@ -60,16 +60,6 @@ +--- include/sswf/libsswf.h.orig 2009-03-08 04:04:03 UTC ++++ include/sswf/libsswf.h +@@ -68,16 +68,6 @@ SOFTWARE. #include "sswf/libsswf-config.h" @@ -17,3 +17,12 @@ #ifndef M_PI #define M_PI 3.14159265358979323846 #endif +@@ -88,7 +78,7 @@ typedef unsigned int wint_t; + #define rint(x) ((double) (long) floor(x + 0.5)) + #endif + +-#ifdef _LIBICONV_H ++#if defined(_LIBICONV_H) && _LIBICONV_VERSION < 0x010B + #define ICONV_INPUT_CAST + #else + /* older versions of iconv() were broken in regard to the Index: japanese/groff/files/patch-src:libs:libgroff:encoding.cc =================================================================== --- japanese/groff/files/patch-src:libs:libgroff:encoding.cc (revision 383424) +++ japanese/groff/files/patch-src:libs:libgroff:encoding.cc (working copy) @@ -1,26 +1,6 @@ --- src/libs/libgroff/encoding.cc.bak Wed Sep 10 03:45:14 2003 +++ src/libs/libgroff/encoding.cc Wed Sep 10 11:31:11 2003 -@@ -179,7 +179,8 @@ - inline wchar make_wchar(unsigned char c0, encoding_istream& eis) { - wchar wc = 0; - char inbuf[8], outbuf[8]; -- char *inp, *outp; -+ const char *inp; -+ char *outp; - size_t inbytesleft, outbytesleft; - int i = 0; - -@@ -214,7 +215,8 @@ - - inline int put_wchar(wchar wc, encoding_ostream& eos) { - char inbuf[4], outbuf[4]; -- char *inp, *outp; -+ const char *inp; -+ char *outp; - size_t inbytesleft, outbytesleft; - - if (!is_wchar_code(wc)) { -@@ -382,6 +384,9 @@ +@@ -382,6 +382,9 @@ #if HAVE_LANGINFO_CODESET charset = nl_langinfo(CODESET); #else Index: japanese/jd/Makefile =================================================================== --- japanese/jd/Makefile (revision 383424) +++ japanese/jd/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= jd PORTVERSION= 2.8.8 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= japanese www MASTER_SITES= SFJP MASTER_SITE_SUBDIR= jd4linux/61281 @@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ libgcrypt.so:${PORTSDIR}/security/libgcrypt -USES= autoreconf iconv libtool tar:tgz +USES= autoreconf iconv:translit libtool tar:tgz USE_GNOME= gtk20 gtkmm24 libgnomeui GNU_CONFIGURE= yes Index: japanese/jd/files/patch-configure.ac =================================================================== --- japanese/jd/files/patch-configure.ac (revision 0) +++ japanese/jd/files/patch-configure.ac (working copy) @@ -0,0 +1,11 @@ +--- configure.ac.orig 2013-02-10 11:38:45 UTC ++++ configure.ac +@@ -30,7 +30,7 @@ dnl + case "${host_os}" in + freebsd*) + echo "os = freebsd" +- AC_DEFINE(ICONV_CONST, const, "iconv_const") ++ AC_DEFINE(ICONV_CONST, , "iconv_const") + AC_DEFINE(USE_MKTIME, , "use mktime") + ;; + solaris*) Property changes on: japanese/jd/files/patch-configure.ac ___________________________________________________________________ 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: japanese/mozc-server/files/patch-base_iconv.cc =================================================================== --- japanese/mozc-server/files/patch-base_iconv.cc (revision 383424) +++ japanese/mozc-server/files/patch-base_iconv.cc (working copy) @@ -1,14 +0,0 @@ ---- base/iconv.cc.orig 2013-03-29 13:33:43.000000000 +0900 -+++ base/iconv.cc 2013-04-27 15:36:30.000000000 +0900 -@@ -53,7 +53,11 @@ - size_t olen_org = olen; - iconv(ic, 0, &ilen, 0, &olen); // reset iconv state - while (ilen != 0) { -+#ifdef OS_FREEBSD -+ if (iconv(ic, (const char **)(&ibuf), &ilen, &obuf, &olen) -+#else - if (iconv(ic, reinterpret_cast(&ibuf), &ilen, &obuf, &olen) -+#endif - == static_cast(-1)) { - return false; - } Index: mail/cone/files/patch-curses-cursesscreen.diff =================================================================== --- mail/cone/files/patch-curses-cursesscreen.diff (revision 383424) +++ mail/cone/files/patch-curses-cursesscreen.diff (working copy) @@ -1,13 +0,0 @@ ---- curses/cursesscreen.C.orig 2011-04-04 11:58:28.000000000 +0000 -+++ curses/cursesscreen.C 2011-06-27 19:41:38.000000000 +0000 -@@ -73,7 +73,9 @@ - while (input_buf.size() > 0) - { - -- char *inbuf=&input_buf[0], *outbuf=&winput_buf[winput_cnt]; -+ //char *inbuf=&input_buf[0], *outbuf=&winput_buf[winput_cnt]; -+ const char *inbuf=&input_buf[0]; -+ char *outbuf=&winput_buf[winput_cnt]; - size_t inbytesleft=input_buf.size(), - outbytesleft=winput_buf.size()-winput_cnt; - Index: mail/mmr/files/patch-mime.cpp =================================================================== --- mail/mmr/files/patch-mime.cpp (revision 383424) +++ mail/mmr/files/patch-mime.cpp (working copy) @@ -1,11 +0,0 @@ ---- mime.cpp.orig Tue Jan 24 16:58:33 2006 -+++ mime.cpp Sun Jul 9 23:46:48 2006 -@@ -110,7 +110,7 @@ - } - size_t available = obytesleft; - while ( ibytesleft > 0 ) { -- iconv(iconv_ctx, &ibuf, &ibytesleft, &obuf, &obytesleft); -+ iconv(iconv_ctx, (const char **)&ibuf, &ibytesleft, &obuf, &obytesleft); - - if ( ibytesleft > 0 ) { - if ( errno == EILSEQ ) { Index: mail/normalizemime/files/patch-normalizemime.cc =================================================================== --- mail/normalizemime/files/patch-normalizemime.cc (revision 383424) +++ mail/normalizemime/files/patch-normalizemime.cc (working copy) @@ -9,15 +9,6 @@ #include #include #include -@@ -500,7 +502,7 @@ - char *obuf = buf; - memcpy (icopy, message.c_str(), in_left); - message.erase (); -- char *ibuf = icopy; -+ const char *ibuf = icopy; - - while (in_left > 0) { - if ((size_t)(-1) == iconv (ic, &ibuf, &in_left, &obuf, &out_left)) { @@ -1493,6 +1495,7 @@ "X-Spam-", // Added by SpamAssasin for example "X-CRM114-", // Added by CRM114 Index: multimedia/naludump/files/patch-libsi-si.c =================================================================== --- multimedia/naludump/files/patch-libsi-si.c (revision 383424) +++ multimedia/naludump/files/patch-libsi-si.c (working copy) @@ -10,15 +10,3 @@ #include // for broadcaster stupidity workaround #include #include "descriptor.h" -@@ -381,7 +383,11 @@ bool convertCharacterTable(const char *f - if (SystemCharacterTable) { - iconv_t cd = iconv_open(SystemCharacterTable, fromCode); - if (cd != (iconv_t)-1) { -+#ifdef __FreeBSD__ -+ const char *fromPtr = from; -+#else - char *fromPtr = (char *)from; -+#endif - while (fromLength > 0 && toLength > 1) { - if (iconv(cd, &fromPtr, &fromLength, &to, &toLength) == size_t(-1)) { - if (errno == EILSEQ) { Index: multimedia/vdr/files/patch-vdr-1.7.28_FreeBSD =================================================================== --- multimedia/vdr/files/patch-vdr-1.7.28_FreeBSD (revision 383424) +++ multimedia/vdr/files/patch-vdr-1.7.28_FreeBSD (working copy) @@ -711,18 +711,6 @@ diff -u -r1.1.1.5 -r1.8 LOG_ERROR_STR(*buf); close(f); remove(buf); -@@ -818,7 +846,11 @@ - const char *cCharSetConv::Convert(const char *From, char *To, size_t ToLength) - { - if (cd != (iconv_t)-1 && From && *From) { -+#ifdef __FreeBSD__ -+ const char *FromPtr = (char *)From; -+#else - char *FromPtr = (char *)From; -+#endif - size_t FromLength = strlen(From); - char *ToPtr = To; - if (!ToPtr) { @@ -920,7 +952,11 @@ return cString(buffer, true); } @@ -1003,18 +991,6 @@ diff -u -r1.1.1.4 -r1.7 #include // for broadcaster stupidity workaround #include #include "descriptor.h" -@@ -381,7 +383,11 @@ - if (SystemCharacterTable) { - iconv_t cd = iconv_open(SystemCharacterTable, fromCode); - if (cd != (iconv_t)-1) { -+#ifdef __FreeBSD__ -+ const char *fromPtr = from; -+#else - char *fromPtr = (char *)from; -+#endif - while (fromLength > 0 && toLength > 1) { - if (iconv(cd, &fromPtr, &fromLength, &to, &toLength) == size_t(-1)) { - if (errno == EILSEQ) { --- PLUGINS/src/dvbsddevice/Makefile.orig +++ PLUGINS/src/dvbsddevice/Makefile @@ -45,7 +45,7 @@ PACKAGE = vdr-$(ARCHIVE) Index: net-im/imspector/files/patch-icqprotocolplugin.cpp =================================================================== --- net-im/imspector/files/patch-icqprotocolplugin.cpp (revision 383424) +++ net-im/imspector/files/patch-icqprotocolplugin.cpp (working copy) @@ -8,15 +8,6 @@ #define PLUGIN_NAME "ICQ-AIM IMSpector protocol plugin" #define PROTOCOL_NAME "ICQ-AIM" -@@ -675,7 +676,7 @@ - size_t inbytesleft = mylength - 4; - size_t outbytesleft = BUFFER_SIZE - 1; /* Trailing \0 */ - size_t result = iconv(iconv_utf16be_utf8, -- &inbuf, &inbytesleft, &outbuf, &outbytesleft); -+ (const char**) &inbuf, &inbytesleft, &outbuf, &outbytesleft); - - if (result == (size_t) -1) - { @@ -810,7 +811,7 @@ GET_TYPE(uint16_t) Index: net-p2p/libtorrent-rasterbar/files/patch-include-libtorrent-config.hpp =================================================================== --- net-p2p/libtorrent-rasterbar/files/patch-include-libtorrent-config.hpp (revision 0) +++ net-p2p/libtorrent-rasterbar/files/patch-include-libtorrent-config.hpp (working copy) @@ -0,0 +1,15 @@ +--- include/libtorrent/config.hpp.orig 2014-08-15 06:51:56 UTC ++++ include/libtorrent/config.hpp +@@ -184,12 +184,6 @@ POSSIBILITY OF SUCH DAMAGE. + // execinfo.h is available in the MacOS X 10.5 SDK. + #define TORRENT_USE_EXECINFO MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 + #endif +-#else +-// FreeBSD has a reasonable iconv signature +-// unless we're on glibc +-#ifndef __GLIBC__ +-# define TORRENT_ICONV_ARG (const char**) +-#endif + #endif + #define TORRENT_HAS_FALLOCATE 0 + #define TORRENT_USE_IFADDRS 1 Property changes on: net-p2p/libtorrent-rasterbar/files/patch-include-libtorrent-config.hpp ___________________________________________________________________ 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: net-p2p/linuxdcpp/files/patch-SConstruct =================================================================== --- net-p2p/linuxdcpp/files/patch-SConstruct (revision 383424) +++ net-p2p/linuxdcpp/files/patch-SConstruct (working copy) @@ -1,6 +1,6 @@ ---- SConstruct.orig 2011-04-18 01:57:09.000000000 +0800 -+++ SConstruct 2011-10-19 23:42:24.000000000 +0800 -@@ -20,7 +20,7 @@ +--- SConstruct.orig 2011-04-17 17:57:09 UTC ++++ SConstruct +@@ -20,7 +20,7 @@ BUILD_LOCALE_PATH = BUILD_PATH + 'locale BUILD_FLAGS = { 'common' : ['-I#', '-D_GNU_SOURCE', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_REENTRANT'], 'debug' : ['-g', '-ggdb', '-Wall', '-D_DEBUG'], @@ -9,7 +9,7 @@ } # ---------------------------------------------------------------------- -@@ -106,6 +106,7 @@ +@@ -106,6 +106,7 @@ else: vars.AddVariables( BoolVariable('debug', 'Compile the program with debug information', 0), BoolVariable('release', 'Compile the program with optimizations', 0), @@ -17,7 +17,7 @@ BoolVariable('profile', 'Compile the program with profiling information', 0), PathVariable('PREFIX', 'Compile the program with PREFIX as the root for installation', '/usr/local', PathVariable.PathIsDir), ('FAKE_ROOT', 'Make scons install the program under a fake root', '') -@@ -131,7 +131,10 @@ +@@ -131,7 +132,10 @@ if os.environ.has_key('CC'): env['CC'] = os.environ['CC'] if os.environ.has_key('CXXFLAGS'): @@ -29,7 +29,7 @@ if os.environ.has_key('LDFLAGS'): env['LINKFLAGS'] = os.environ['LDFLAGS'].split() -@@ -139,6 +140,12 @@ +@@ -139,6 +143,12 @@ if os.environ.has_key('LDFLAGS'): if os.environ.has_key('CFLAGS'): env['CFLAGS'] = os.environ['CFLAGS'].split() @@ -42,7 +42,14 @@ env['CPPDEFINES'] = [] # Initialize as a list so Append doesn't concat strings env.SConsignFile('build/sconf/.sconsign') -@@ -263,14 +270,15 @@ +@@ -256,21 +266,20 @@ if not 'install' in COMMAND_LINE_TARGETS + + if not conf.CheckHeader('iconv.h'): + Exit(1) +- elif conf.CheckLibWithHeader('iconv', 'iconv.h', 'c', 'iconv(0, (const char **)0, 0, (char**)0, 0);'): +- conf.env.Append(CPPDEFINES = ('ICONV_CONST', 'const')) + + if conf.CheckHeader(['sys/types.h', 'sys/socket.h', 'ifaddrs.h', 'net/if.h']): conf.env.Append(CPPDEFINES = 'HAVE_IFADDRS_H') # TODO: Implement a plugin system so libnotify doesn't have compile-time dependencies @@ -65,3 +72,4 @@ + conf.env.Append(CPPDEFINES = 'HAVE_LIBNOTIFY_0_7') conf.CheckBZRRevision() + Index: net-p2p/twister/files/patch-libtorrent-include-libtorrent-config.hpp =================================================================== --- net-p2p/twister/files/patch-libtorrent-include-libtorrent-config.hpp (revision 0) +++ net-p2p/twister/files/patch-libtorrent-include-libtorrent-config.hpp (working copy) @@ -0,0 +1,15 @@ +--- libtorrent/include/libtorrent/config.hpp.orig 2015-03-29 22:58:17 UTC ++++ libtorrent/include/libtorrent/config.hpp +@@ -204,12 +204,6 @@ POSSIBILITY OF SUCH DAMAGE. + + #endif // __APPLE__ + +-#else +-// FreeBSD has a reasonable iconv signature +-// unless we're on glibc +-#ifndef __GLIBC__ +-# define TORRENT_ICONV_ARG (const char**) +-#endif + #endif + #define TORRENT_HAS_FALLOCATE 0 + #define TORRENT_USE_IFADDRS 1 Property changes on: net-p2p/twister/files/patch-libtorrent-include-libtorrent-config.hpp ___________________________________________________________________ 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: news/pan/files/patch-pan_usenet-utils_mime-utils.cc =================================================================== --- news/pan/files/patch-pan_usenet-utils_mime-utils.cc (revision 383424) +++ news/pan/files/patch-pan_usenet-utils_mime-utils.cc (working copy) @@ -1,14 +0,0 @@ ---- pan/usenet-utils/mime-utils.cc.orig 2013-03-12 18:24:13.000000000 +0000 -+++ pan/usenet-utils/mime-utils.cc 2013-03-12 18:25:19.000000000 +0000 -@@ -77,7 +77,11 @@ - outbuf = out + converted; - outleft = outlen - converted; - -+#if defined(__NetBSD__) || defined(__FreeBSD__) -+ converted = iconv (cd, &inbuf, &inleft, &outbuf, &outleft); -+#else - converted = iconv (cd, (char **) &inbuf, &inleft, &outbuf, &outleft); -+#endif - - if (converted != (size_t) -1 && errno == 0) { - /* Index: textproc/ctpp2/Makefile =================================================================== --- textproc/ctpp2/Makefile (revision 383424) +++ textproc/ctpp2/Makefile (working copy) @@ -3,14 +3,14 @@ PORTNAME= ctpp2 PORTVERSION= 2.8.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc devel MASTER_SITES= http://ctpp.havoc.ru/download/ MAINTAINER= vg@FreeBSD.org COMMENT= C++ library to use templates in C/C++ projects, version 2 -USES= cmake gettext iconv:build compiler:c++11-lang +USES= cmake gettext iconv compiler:c++11-lang USE_LDCONFIG= yes PLIST_SUB+= PORTVERSION=${PORTVERSION} Index: textproc/ctpp2/files/patch-src-CTPP2StringIconvOutputCollector.cpp =================================================================== --- textproc/ctpp2/files/patch-src-CTPP2StringIconvOutputCollector.cpp (revision 0) +++ textproc/ctpp2/files/patch-src-CTPP2StringIconvOutputCollector.cpp (working copy) @@ -0,0 +1,20 @@ +--- src/CTPP2StringIconvOutputCollector.cpp.orig 2012-08-02 07:22:44 UTC ++++ src/CTPP2StringIconvOutputCollector.cpp +@@ -56,7 +56,7 @@ StringIconvOutputCollector::StringIconvO + throw CTPPCharsetRecodeException(sSrcEnc.c_str(), sDstEnc.c_str()); + } + +-#if (_LIBICONV_VERSION >= 0x0108) ++#if (_LIBICONV_VERSION >= 0x0108) || defined(__FreeBSD__) + int iFlag = 1; + // Discard illegal characters + if (iFlags & C_ICONV_DISCARD_ILSEQ) { iconvctl(oIconv, ICONV_SET_DISCARD_ILSEQ, &iFlag); } +@@ -85,7 +85,7 @@ INT_32 StringIconvOutputCollector::Colle + size_t iDstLength = CTPP_ESCAPE_BUFFER_LEN; + + char aDstData[CTPP_ESCAPE_BUFFER_LEN]; +-#if defined(linux) || defined(__APPLE__) ++#if defined(linux) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) + char * aSrcData = (char *)vData; + #else + const char * aSrcData = (const char *)vData; Property changes on: textproc/ctpp2/files/patch-src-CTPP2StringIconvOutputCollector.cpp ___________________________________________________________________ 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: textproc/ctpp2/files/patch-src-functions-FnIconv.cpp =================================================================== --- textproc/ctpp2/files/patch-src-functions-FnIconv.cpp (revision 0) +++ textproc/ctpp2/files/patch-src-functions-FnIconv.cpp (working copy) @@ -0,0 +1,20 @@ +--- src/functions/FnIconv.cpp.orig 2012-08-02 07:22:44 UTC ++++ src/functions/FnIconv.cpp +@@ -145,7 +145,7 @@ INT_32 FnIconv::Handler(CDT * + } + } + +-#if (_LIBICONV_VERSION >= 0x0108) ++#if (_LIBICONV_VERSION >= 0x0108) || defined(__FreeBSD__) + int iFlag = 1; + // Discard illegal characters + if (iFlags & C_ICONV_DISCARD_ILSEQ) +@@ -173,7 +173,7 @@ INT_32 FnIconv::Handler(CDT * + size_t iDstLength = CTPP_ESCAPE_BUFFER_LEN; + + char aDstData[CTPP_ESCAPE_BUFFER_LEN]; +-#if defined(linux) || defined(__APPLE__) ++#if defined(linux) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) + char * aSrcData = (char *)sWhat.data(); + #else + const char * aSrcData = (const char *)sWhat.data(); Property changes on: textproc/ctpp2/files/patch-src-functions-FnIconv.cpp ___________________________________________________________________ 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: textproc/gmetadom/files/patch-GdomeSmartDOMGdomeString.cc =================================================================== --- textproc/gmetadom/files/patch-GdomeSmartDOMGdomeString.cc (revision 383424) +++ textproc/gmetadom/files/patch-GdomeSmartDOMGdomeString.cc (working copy) @@ -1,11 +0,0 @@ ---- src/gdome_cpp_smart/basic/GdomeSmartDOMGdomeString.cc.orig Wed Apr 2 12:36:39 2003 -+++ src/gdome_cpp_smart/basic/GdomeSmartDOMGdomeString.cc Wed Apr 2 12:37:21 2003 -@@ -95,7 +95,7 @@ - - while (inBytesLeft > 0) { - //cout << "before: " << (void*) inbuf << " " << inBytesLeft << " " << (void*) outbuf << " " << outBytesLeft << endl; -- size_t iconv_res = iconv(cd, &inbuf, &inBytesLeft, &outbuf, &outBytesLeft); -+ size_t iconv_res = iconv(cd, (const char**)&inbuf, &inBytesLeft, &outbuf, &outBytesLeft); - //cout << "after: " << (void*) inbuf << " " << inBytesLeft << " " << (void*) outbuf << " " << outBytesLeft << endl; - - unsigned n = outbuf - outbuf0; Index: textproc/goldendict/files/patch-bgl_babylon.cc =================================================================== --- textproc/goldendict/files/patch-bgl_babylon.cc (revision 383424) +++ textproc/goldendict/files/patch-bgl_babylon.cc (working copy) @@ -8,17 +8,3 @@ #include #include -@@ -648,13 +648,8 @@ - - inbufbytes = s.size(); - outbufbytes = s.size() * 6; --#ifdef _WIN32 - const char *inbuf; - inbuf = s.data(); --#else -- char *inbuf; -- inbuf = (char *)s.data(); --#endif - outbuf = (char*)malloc( outbufbytes + 1 ); - memset( outbuf, '\0', outbufbytes + 1 ); - defbuf = outbuf; Index: textproc/goldendict/files/patch-iconv.cc =================================================================== --- textproc/goldendict/files/patch-iconv.cc (revision 383424) +++ textproc/goldendict/files/patch-iconv.cc (working copy) @@ -1,14 +0,0 @@ ---- ./iconv.cc.orig 2010-12-04 00:12:46.000000000 +0300 -+++ ./iconv.cc 2010-12-28 11:46:37.208721626 +0300 -@@ -44,11 +44,7 @@ - throw( exIncorrectSeq, exOther ) - { - size_t result = iconv( state, -- #ifdef __WIN32 - (char const **)&inBuf, -- #else -- (char **)&inBuf, -- #endif - &inBytesLeft, - (char **)&outBuf, &outBytesLeft ); - Index: textproc/xmlppm/files/patch-IFile.cpp =================================================================== --- textproc/xmlppm/files/patch-IFile.cpp (revision 383424) +++ textproc/xmlppm/files/patch-IFile.cpp (working copy) @@ -1,11 +0,0 @@ ---- src/IFile.cpp.orig Thu Jun 10 04:16:13 2004 -+++ src/IFile.cpp Tue Aug 17 23:21:02 2004 -@@ -73,7 +73,7 @@ - writing the output. Then flush the file. */ - void ifflush(IFILE* ifile) { - static char outbuf[BUFFSIZE]; -- char* inptr = ifile->buf; -+ const char* inptr = ifile->buf; - char* outptr = outbuf; - size_t insz = ifile->bufsiz; - size_t outsz; Index: www/anyterm/files/patch-libpbe-include-Iconver.hh =================================================================== --- www/anyterm/files/patch-libpbe-include-Iconver.hh (revision 0) +++ www/anyterm/files/patch-libpbe-include-Iconver.hh (working copy) @@ -0,0 +1,11 @@ +--- libpbe/include/Iconver.hh.orig 2008-10-25 12:17:29 UTC ++++ libpbe/include/Iconver.hh +@@ -36,7 +36,7 @@ + #include "Exception.hh" + + +-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun__) ++#if defined(__OpenBSD__) || defined(__sun__) + // Previously __APPLE__ was included in this list; presumably they have + // changed their headers. If you have an older system you may need to put + // it back. Property changes on: www/anyterm/files/patch-libpbe-include-Iconver.hh ___________________________________________________________________ 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: www/htmlcxx/files/patch-CharsetConverter.cc =================================================================== --- www/htmlcxx/files/patch-CharsetConverter.cc (revision 383424) +++ www/htmlcxx/files/patch-CharsetConverter.cc (working copy) @@ -1,11 +0,0 @@ ---- html/CharsetConverter.cc.orig 2012-09-19 14:05:35.000000000 +0800 -+++ html/CharsetConverter.cc 2012-09-19 14:08:42.000000000 +0800 -@@ -37,7 +37,7 @@ - - size_t ret; - while (1) { -- ret = iconv(mIconvDescriptor, const_cast(&inbuf), &inbytesleft, &outbuf, &outbytesleft); -+ ret = iconv(mIconvDescriptor, &inbuf, &inbytesleft, &outbuf, &outbytesleft); - if (ret == 0) break; - if (ret == (size_t)-1 && errno == E2BIG) return string(); - Index: www/newsbeuter/files/patch-src-utils.cpp =================================================================== --- www/newsbeuter/files/patch-src-utils.cpp (revision 0) +++ www/newsbeuter/files/patch-src-utils.cpp (working copy) @@ -0,0 +1,12 @@ +--- src/utils.cpp.orig 2015-02-19 10:56:59 UTC ++++ src/utils.cpp +@@ -274,7 +274,8 @@ std::string utils::convert_text(const st + * of all the Unix-like systems around there, only Linux/glibc seems to + * come with a SuSv3-conforming iconv implementation. + */ +-#if !(__linux) && !defined(__GLIBC__) && !defined(__APPLE__) && !defined(__OpenBSD__) ++#if !(__linux) && !defined(__GLIBC__) && !defined(__APPLE__) \ ++ && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) + const char * inbufp; + #else + char * inbufp; Property changes on: www/newsbeuter/files/patch-src-utils.cpp ___________________________________________________________________ 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: x11-wm/icewm/Makefile =================================================================== --- x11-wm/icewm/Makefile (revision 383424) +++ x11-wm/icewm/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= icewm PORTVERSION= 1.3.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTVERSION} @@ -12,7 +12,7 @@ COMMENT= Window Manager designed for spe LICENSE= GPLv2 -USES= gmake iconv pkgconfig +USES= gmake iconv:translit pkgconfig USE_XORG= ice sm x11 xext USE_GNOME= gdkpixbuf2 GNU_CONFIGURE= yes Index: x11-wm/icewm/files/patch-src_ylocale.cc =================================================================== --- x11-wm/icewm/files/patch-src_ylocale.cc (revision 383424) +++ x11-wm/icewm/files/patch-src_ylocale.cc (working copy) @@ -1,26 +0,0 @@ ---- src/ylocale.cc.orig 2013-11-03 19:58:39.180727369 -0500 -+++ src/ylocale.cc 2013-11-03 19:58:51.540725980 -0500 -@@ -126,8 +126,12 @@ YLocale::~YLocale() { - iconv_t YLocale::getConverter (const char *from, const char **&to) { - iconv_t cd = (iconv_t) -1; - -+ char *myfrom = (char *)malloc(1 + strlen(from)); -+ strcpy(myfrom, from); -+ char *modptr = strstr(myfrom, "//"); -+ if (NULL != modptr) *modptr = '\0'; - while (NULL != *to) -- if ((iconv_t) -1 != (cd = iconv_open(*to, from))) return cd; -+ if ((iconv_t) -1 != (cd = iconv_open(*to, myfrom))) return cd; - else ++to; - - return (iconv_t) -1; -@@ -149,7 +153,8 @@ YUChar *YLocale::unicodeString(const YLC - return NULL; - - YUChar * uStr(new YUChar[lLen + 1]); -- char * inbuf((char *) lStr), * outbuf((char *) uStr); -+ const char * inbuf((char *) lStr); -+ char * outbuf((char *) uStr); - size_t inlen(lLen), outlen(4 * lLen); - - if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen)) Index: x11-wm/pekwm/Makefile =================================================================== --- x11-wm/pekwm/Makefile (revision 383424) +++ x11-wm/pekwm/Makefile (working copy) @@ -21,7 +21,7 @@ CONFIGURE_ARGS+=--enable-shape --enable- --enable-xft --enable-image-xpm --enable-image-jpeg \ --enable-image-png --disable-debug \ --disable-pedantic -CFLAGS+= -DICONV_CONST -I${LOCALBASE}/include +CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} .include