View | Details | Raw Unified | Return to bug 199099 | Differences between
and this patch

Collapse All | Expand All

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

Return to bug 199099