aboutsummaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/courier-unicode/Makefile4
-rw-r--r--devel/ice/files/patch-cpp-include-Ice-IconvStringConverter.h11
-rw-r--r--devel/libisofs/Makefile5
-rw-r--r--devel/qt4-corelib/Makefile2
-rw-r--r--devel/qt4-corelib/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp11
-rw-r--r--devel/qt4-corelib/files/patch-src_corelib_codecs_qiconvcodec.cpp39
-rw-r--r--devel/sdl20/Makefile5
7 files changed, 73 insertions, 4 deletions
diff --git a/devel/courier-unicode/Makefile b/devel/courier-unicode/Makefile
index d299c210089b..4c3893178f90 100644
--- a/devel/courier-unicode/Makefile
+++ b/devel/courier-unicode/Makefile
@@ -2,6 +2,7 @@
PORTNAME= courier-unicode
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= devel mail
MASTER_SITES= SF/courier/${PORTNAME}/${PORTVERSION}
@@ -20,4 +21,7 @@ INSTALL_TARGET= install-strip
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+post-patch:
+ @${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
+
.include <bsd.port.mk>
diff --git a/devel/ice/files/patch-cpp-include-Ice-IconvStringConverter.h b/devel/ice/files/patch-cpp-include-Ice-IconvStringConverter.h
new file mode 100644
index 000000000000..24c48afad880
--- /dev/null
+++ b/devel/ice/files/patch-cpp-include-Ice-IconvStringConverter.h
@@ -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 <langinfo.h>
+ #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
+ //
diff --git a/devel/libisofs/Makefile b/devel/libisofs/Makefile
index 2efb528a1c8d..1b1ba7d48211 100644
--- a/devel/libisofs/Makefile
+++ b/devel/libisofs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libisofs
PORTVERSION= 1.3.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://files.libburnia-project.org/releases/
@@ -19,4 +19,7 @@ GNU_CONFIGURE= yes
USES= iconv libtool
USE_LDCONFIG= yes
+post-patch:
+ @${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
+
.include <bsd.port.mk>
diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile
index c3b1d1ebe920..d086ff5aec16 100644
--- a/devel/qt4-corelib/Makefile
+++ b/devel/qt4-corelib/Makefile
@@ -3,7 +3,7 @@
PORTNAME= corelib
DISTVERSION= ${QT4_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
PKGNAMEPREFIX= qt4-
diff --git a/devel/qt4-corelib/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp b/devel/qt4-corelib/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp
new file mode 100644
index 000000000000..8cffda435ef0
--- /dev/null
+++ b/devel/qt4-corelib/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp
@@ -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);
diff --git a/devel/qt4-corelib/files/patch-src_corelib_codecs_qiconvcodec.cpp b/devel/qt4-corelib/files/patch-src_corelib_codecs_qiconvcodec.cpp
new file mode 100644
index 000000000000..6a7c231eef99
--- /dev/null
+++ b/devel/qt4-corelib/files/patch-src_corelib_codecs_qiconvcodec.cpp
@@ -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<char *>(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<const char **>(&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<const char **>(&inBytes);
+-#else
+ char **inBytesPtr = &inBytes;
+-#endif
+
+ IconvState *temporaryState = 0;
+ QThreadStorage<QIconvCodec::IconvState *> *ts = fromUnicodeState();
diff --git a/devel/sdl20/Makefile b/devel/sdl20/Makefile
index fc6286184b09..a4f0c317d938 100644
--- a/devel/sdl20/Makefile
+++ b/devel/sdl20/Makefile
@@ -2,7 +2,7 @@
PORTNAME= sdl2
PORTVERSION= 2.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= http://www.libsdl.org/release/
DISTNAME= SDL2-${PORTVERSION}
@@ -171,6 +171,7 @@ CONFIGURE_ARGS+= --disable-video-x11 \
.endif
post-patch:
- @${REINPLACE_CMD} -e '/ CheckInputEvents$$/d' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e '/ CheckInputEvents$$/d' \
+ -e 's/-liconv/${ICONV_LIB}/g' ${WRKSRC}/configure
.include <bsd.port.mk>