svn commit: r384038 - in head: Mk/Uses archivers/unalz/files archivers/unrar-iconv/files audio/cmus audio/cmus/files audio/id3mtag/files audio/mp3unicode/files audio/tagutil audio/tagutil/files aud...
Tijl Coosemans
tijl at FreeBSD.org
Wed Apr 15 08:20:46 UTC 2015
Author: tijl
Date: Wed Apr 15 08:20:27 2015
New Revision: 384038
URL: https://svnweb.freebsd.org/changeset/ports/384038
Log:
converters/libiconv:
- Remove const qualifier from iconv(3) to match POSIX:
http://pubs.opengroup.org/onlinepubs/9699919799/functions/iconv.html
- Patch iconv.h to expose more GNU extensions when LIBICONV_PLUG is
defined because the base system iconv supports these extensions too.
Add/remove patches to/from ports to call iconv with non-const arguments.
This breaks some ports on FreeBSD 10 because base system iconv.h still has
the const qualifier. Fix this by letting USES=iconv add a build dependency
on converters/libiconv so ports can use its iconv.h (with LIBICONV_PLUG
defined) instead of the base system iconv.h.
This exposed some ports that link with libiconv when it is available instead
of using libc iconv. In these cases one of the following changes has been
made:
- patch configure scripts to test for libc iconv first
- add ac_cv_lib_iconv_libiconv=no or similar to CONFIGURE_ARGS to disable
some configure tests
- converters/wkhtmltopdf: this includes Qt4 so add a patch from devel/qt4
- lang/gcc5-aux: respect CFLAGS and friends during configure such that
LIBICONV_PLUG is defined in the iconv test, also switch to external
gettext
- mail/gnarwl: replace patches with CPPFLAGS/LIBS
- multimedia/ffmpeg2theora: remove iconv test from SConstruct and use
ICONV_LIB in port Makefile instead, also fix a bug in subtitles.c
- net-im/licq: finish conversion to cmake
- net-mgmt/bandwidthd, net-mgmt/icinga, net-mgmt/nagios, net-mgmt/nagios4:
don't need iconv
- textproc/p5-XML-TinyXML: finish conversion to USES=perl5
Other changes:
- databases/qdbm and slaves: respect CFLAGS and friends, also enable bzip2
and lzo support
- games/ldmud: respect CFLAGS and friends
- graphics/inventor: replace some patches with MAKE_ARGS/MAKE_ENV to respect
CFLAGS and friends, also remove FreeBSD/alpha patch and add missing xorg
dependencies
PR: 199099
Exp-run by: antoine
Approved by: portmgr (antoine)
Added:
head/audio/cmus/files/patch-scripts-checks.sh (contents, props changed)
head/audio/id3mtag/files/
head/audio/id3mtag/files/patch-charconv.cpp (contents, props changed)
head/audio/tagutil/files/
head/audio/tagutil/files/patch-FindIconv.cmake (contents, props changed)
head/chinese/cconv/files/
head/chinese/cconv/files/patch-configure (contents, props changed)
head/comms/telldus-core/files/patch-common-Strings.cpp (contents, props changed)
head/converters/libiconv/files/patch-include-iconv.h.in (contents, props changed)
head/converters/wkhtmltopdf/files/patch-config.tests_unix_compile.test (contents, props changed)
head/converters/wkhtmltopdf/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp (contents, props changed)
head/converters/wkhtmltopdf/files/patch-src_corelib_codecs_qiconvcodec.cpp (contents, props changed)
head/databases/qdbm-plus/files/patch-Makefile.in (contents, props changed)
head/devel/ice/files/patch-cpp-include-Ice-IconvStringConverter.h (contents, props changed)
head/devel/qt4-corelib/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp (contents, props changed)
head/devel/qt4-corelib/files/patch-src_corelib_codecs_qiconvcodec.cpp (contents, props changed)
head/editors/ted/files/patch-textEncoding-sioIconv.c (contents, props changed)
head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp (contents, props changed)
head/games/ldmud/files/patch-configure (contents, props changed)
head/games/valyriatear/files/patch-src-utils-ustring.cpp (contents, props changed)
head/irc/weechat-devel/files/patch-cmake-FindIconv.cmake (contents, props changed)
head/irc/weechat/files/patch-cmake-FindIconv.cmake (contents, props changed)
head/japanese/jd/files/
head/japanese/jd/files/patch-configure.ac (contents, props changed)
head/multimedia/ffmpeg2theora/files/patch-src-subtitles.c (contents, props changed)
head/net-im/gale/files/patch-iconvtest.c (contents, props changed)
head/net-im/licq/files/patch-cmake-Modules-FindIconv.cmake (contents, props changed)
head/net-p2p/libtorrent-rasterbar/files/patch-include-libtorrent-config.hpp (contents, props changed)
head/net-p2p/twister/files/patch-libtorrent-include-libtorrent-config.hpp (contents, props changed)
head/textproc/ctpp2/files/patch-src-CTPP2StringIconvOutputCollector.cpp (contents, props changed)
head/textproc/ctpp2/files/patch-src-functions-FnIconv.cpp (contents, props changed)
head/textproc/wbxml2/files/patch-cmake-modules-FindIconv.cmake (contents, props changed)
head/www/anyterm/files/patch-libpbe-include-Iconver.hh (contents, props changed)
head/www/newsbeuter/files/patch-src-utils.cpp (contents, props changed)
head/x11-toolkits/p5-Prima/files/patch-Makefile.PL (contents, props changed)
Deleted:
head/audio/mp3unicode/files/
head/comms/telldus-core/files/patch-common-CMakeLists.txt
head/databases/kbibtex/files/patch-src__libkbibtexio__iconvlatex.cpp
head/databases/mysql-workbench52/files/patch-plugins__migration__copytable__copytable.cpp
head/databases/qdbm/files/patch-java__Makefile.in
head/databases/qdbm/files/patch-plus__Makefile.in
head/emulators/dolphin-emu/files/patch-Source-Core-Common-Src-StringUtil.cpp
head/finance/libofx/files/patch-lib__ofx_preproc.cpp
head/games/cuyo/files/patch-src__cuyointl.cpp
head/games/hex-a-hop/files/patch-src-text.cpp
head/graphics/cegui/files/patch-cegui__src__IconvStringTranscoder.cpp
head/graphics/iccexamin/files/patch-icc_gl.cpp
head/graphics/inventor/files/patch-SoText3.c++
head/graphics/inventor/files/patch-TextWrapper.c++
head/graphics/ipe/files/patch-ipelib__ipedoc.cpp
head/japanese/mozc-server/files/patch-base_iconv.cc
head/mail/cone/files/patch-curses-cursesscreen.diff
head/mail/gnarwl/files/patch-configure
head/mail/gnarwl/files/patch-configure.ac
head/mail/mmr/files/patch-mime.cpp
head/news/pan/files/
head/textproc/gmetadom/files/patch-GdomeSmartDOMGdomeString.cc
head/textproc/goldendict/files/patch-iconv.cc
head/textproc/xmlppm/files/patch-IFile.cpp
head/www/htmlcxx/files/patch-CharsetConverter.cc
head/x11-wm/icewm/files/patch-src_ylocale.cc
Modified:
head/Mk/Uses/iconv.mk
head/archivers/unalz/files/patch-UnAlz.cpp
head/archivers/unrar-iconv/files/patch-iconv
head/audio/cmus/Makefile
head/audio/tagutil/Makefile
head/audio/xmms-wavpack/Makefile
head/audio/xmms-wavpack/files/patch-src_libwavpack.cpp
head/chinese/cconv/Makefile
head/comms/scmxx/Makefile
head/comms/telldus-core/Makefile
head/converters/libiconv/Makefile
head/converters/wkhtmltopdf/Makefile
head/databases/kbibtex/Makefile
head/databases/p5-qdbm/Makefile
head/databases/p5-qdbm/files/patch-Makefile.in
head/databases/qdbm-plus/Makefile
head/databases/qdbm/Makefile
head/databases/qdbm/files/patch-Makefile.in
head/databases/ruby-qdbm/Makefile
head/deskutils/fbreader/Makefile
head/devel/courier-unicode/Makefile
head/devel/libisofs/Makefile
head/devel/qt4-corelib/Makefile
head/devel/sdl20/Makefile
head/editors/ted/Makefile
head/ftp/pure-ftpd/Makefile
head/games/allacrost/Makefile
head/games/allacrost/files/patch-src-utils.cpp
head/games/hex-a-hop/Makefile
head/games/ldmud/Makefile
head/games/ldmud/files/patch-Makefile.in
head/games/pokerth/files/patch-src-core-linux-convhelper.cpp
head/graphics/inventor/Makefile
head/graphics/inventor/files/patch-SoText2.c++
head/graphics/inventor/files/patch-ivcommondefs
head/graphics/inventor/files/patch-machine.h
head/graphics/inventor/files/pkg-message.in
head/graphics/sswf/Makefile
head/graphics/sswf/files/patch-include_sswf_libsswf.h
head/graphics/swfmill/Makefile
head/irc/weechat-devel/Makefile
head/irc/weechat/Makefile
head/japanese/groff/files/patch-src:libs:libgroff:encoding.cc
head/japanese/jd/Makefile
head/java/jikes/Makefile
head/lang/gcc5-aux/Makefile
head/lang/gcc5-aux/Makefile.version
head/lang/pure/Makefile
head/mail/gnarwl/Makefile
head/mail/gnarwl/files/patch-Makefile.in
head/mail/libvmime/Makefile
head/mail/libvmime/files/patch-cmake__FindIconv.cmake
head/mail/normalizemime/files/patch-normalizemime.cc
head/multimedia/ffmpeg2theora/Makefile
head/multimedia/ffmpeg2theora/files/patch-SConstruct
head/multimedia/naludump/files/patch-libsi-si.c
head/multimedia/transcode/Makefile
head/multimedia/vdr/files/patch-vdr-1.7.28_FreeBSD
head/net-im/centerim-devel/Makefile
head/net-im/gale/Makefile
head/net-im/imspector/files/patch-icqprotocolplugin.cpp
head/net-im/licq/Makefile
head/net-im/zephyr/Makefile
head/net-mgmt/bandwidthd/Makefile
head/net-mgmt/icinga/Makefile
head/net-mgmt/nagios/Makefile
head/net-mgmt/nagios4/Makefile
head/net-p2p/linuxdcpp/files/patch-SConstruct
head/net/asterisk13/Makefile
head/net/c3270/Makefile
head/print/gv/Makefile
head/security/scanhill/Makefile
head/security/scanhill/files/patch-configure
head/sysutils/xorriso/Makefile
head/textproc/ctpp2/Makefile
head/textproc/estraier/Makefile
head/textproc/goldendict/files/patch-bgl_babylon.cc
head/textproc/hyperestraier/Makefile
head/textproc/p5-Text-Unaccent/Makefile
head/textproc/p5-XML-TinyXML/Makefile
head/textproc/simplexml/Makefile
head/textproc/simplexml/files/patch-cmake__FindIconv.cmake
head/textproc/wbxml2/Makefile
head/www/anyterm/Makefile
head/www/htmlcxx/Makefile
head/www/httrack/Makefile
head/www/mod_encoding/Makefile
head/x11-toolkits/p5-Prima/Makefile
head/x11-wm/icewm/Makefile
head/x11-wm/pekwm/Makefile
head/x11/x3270/Makefile
Modified: head/Mk/Uses/iconv.mk
==============================================================================
--- head/Mk/Uses/iconv.mk Wed Apr 15 03:57:08 2015 (r384037)
+++ head/Mk/Uses/iconv.mk Wed Apr 15 08:20:27 2015 (r384038)
@@ -37,7 +37,9 @@ ICONV_PREFIX= /usr
ICONV_CONFIGURE_ARG=
ICONV_CONFIGURE_BASE=
-.if exists(${LOCALBASE}/include/iconv.h)
+.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} < 1100069) \
+ || exists(${LOCALBASE}/include/iconv.h)
+BUILD_DEPENDS+= libiconv>=1.14_7:${PORTSDIR}/converters/libiconv
CPPFLAGS+= -DLIBICONV_PLUG
CFLAGS+= -DLIBICONV_PLUG
CXXFLAGS+= -DLIBICONV_PLUG
Modified: head/archivers/unalz/files/patch-UnAlz.cpp
==============================================================================
--- head/archivers/unalz/files/patch-UnAlz.cpp Wed Apr 15 03:57:08 2015 (r384037)
+++ head/archivers/unalz/files/patch-UnAlz.cpp Wed Apr 15 08:20:27 2015 (r384038)
@@ -9,17 +9,16 @@
# include <sys/param.h> // __NetBSD_Version__
# include <errno.h> // 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)
{
Modified: head/archivers/unrar-iconv/files/patch-iconv
==============================================================================
--- head/archivers/unrar-iconv/files/patch-iconv Wed Apr 15 03:57:08 2015 (r384037)
+++ head/archivers/unrar-iconv/files/patch-iconv Wed Apr 15 08:20:27 2015 (r384038)
@@ -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);
Modified: head/audio/cmus/Makefile
==============================================================================
--- head/audio/cmus/Makefile Wed Apr 15 03:57:08 2015 (r384037)
+++ head/audio/cmus/Makefile Wed Apr 15 08:20:27 2015 (r384038)
@@ -3,6 +3,7 @@
PORTNAME= cmus
PORTVERSION= 2.6.0
+PORTREVISION= 1
CATEGORIES= audio
MAINTAINER= h.skuhra at gmail.com
Added: head/audio/cmus/files/patch-scripts-checks.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/cmus/files/patch-scripts-checks.sh Wed Apr 15 08:20:27 2015 (r384038)
@@ -0,0 +1,20 @@
+--- scripts/checks.sh.orig 2014-08-11 07:48:28 UTC
++++ scripts/checks.sh
+@@ -677,11 +677,15 @@ check_dl()
+ check_iconv()
+ {
+ HAVE_ICONV=n
+- if check_library ICONV "" "-liconv"
++ if check_function iconv
++ then
++ echo "libc contains iconv"
++ makefile_var ICONV_CFLAGS ""
++ makefile_var ICONV_LIBS ""
++ elif check_library ICONV "" "-liconv"
+ then
+ echo "taking iconv from libiconv"
+ else
+- echo "assuming libc contains iconv"
+ makefile_var ICONV_CFLAGS ""
+ makefile_var ICONV_LIBS ""
+ fi
Added: head/audio/id3mtag/files/patch-charconv.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/id3mtag/files/patch-charconv.cpp Wed Apr 15 08:20:27 2015 (r384038)
@@ -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)
Modified: head/audio/tagutil/Makefile
==============================================================================
--- head/audio/tagutil/Makefile Wed Apr 15 03:57:08 2015 (r384037)
+++ head/audio/tagutil/Makefile Wed Apr 15 08:20:27 2015 (r384038)
@@ -2,7 +2,7 @@
PORTNAME= tagutil
PORTVERSION= 3.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MAINTAINER= alex at kaworu.ch
Added: head/audio/tagutil/files/patch-FindIconv.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/tagutil/files/patch-FindIconv.cmake Wed Apr 15 08:20:27 2015 (r384038)
@@ -0,0 +1,31 @@
+--- FindIconv.cmake.orig 2014-07-23 14:37:21 UTC
++++ FindIconv.cmake
+@@ -9,6 +9,7 @@
+ # ICONV_SECOND_ARGUMENT_IS_CONST - the second argument for iconv() is const
+ #
+ include(CheckCSourceCompiles)
++include(CheckFunctionExists)
+
+ IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
+ # Already in cache, be silent
+@@ -17,11 +18,15 @@ ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRA
+
+ FIND_PATH(ICONV_INCLUDE_DIR iconv.h)
+
+-FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
+-
+-IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
+- SET(ICONV_FOUND TRUE)
+-ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
++IF(ICONV_INCLUDE_DIR)
++ CHECK_FUNCTION_EXISTS(iconv ICONV_FOUND)
++ IF(NOT ICONV_FOUND)
++ FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2)
++ IF(ICONV_LIBRARIES)
++ SET(ICONV_FOUND TRUE)
++ ENDIF(ICONV_LIBRARIES)
++ ENDIF(NOT ICONV_FOUND)
++ENDIF(ICONV_INCLUDE_DIR)
+
+ set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
+ set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
Modified: head/audio/xmms-wavpack/Makefile
==============================================================================
--- head/audio/xmms-wavpack/Makefile Wed Apr 15 03:57:08 2015 (r384037)
+++ head/audio/xmms-wavpack/Makefile Wed Apr 15 08:20:27 2015 (r384038)
@@ -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
Modified: head/audio/xmms-wavpack/files/patch-src_libwavpack.cpp
==============================================================================
--- head/audio/xmms-wavpack/files/patch-src_libwavpack.cpp Wed Apr 15 03:57:08 2015 (r384037)
+++ head/audio/xmms-wavpack/files/patch-src_libwavpack.cpp Wed Apr 15 08:20:27 2015 (r384038)
@@ -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
Modified: head/chinese/cconv/Makefile
==============================================================================
--- head/chinese/cconv/Makefile Wed Apr 15 03:57:08 2015 (r384037)
+++ head/chinese/cconv/Makefile Wed Apr 15 08:20:27 2015 (r384038)
@@ -3,7 +3,7 @@
PORTNAME= cconv
PORTVERSION= 0.6.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= chinese converters
MASTER_SITES= GOOGLE_CODE
@@ -21,4 +21,10 @@ post-patch:
@${REINPLACE_CMD} -e 's|unicode.h||; s|libcconv_la_LDFLAGS|cconv_LDFLAGS|' ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e 's|UTF-TW|UTF8-TW|g' ${WRKSRC}/main.c
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ! empty(ICONV_LIB)
+CONFIGURE_ENV+= ICONV_DIR=${ICONV_PREFIX}
+.endif
+
+.include <bsd.port.post.mk>
Added: head/chinese/cconv/files/patch-configure
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/chinese/cconv/files/patch-configure Wed Apr 15 08:20:27 2015 (r384038)
@@ -0,0 +1,13 @@
+--- configure.orig 2010-02-08 03:55:22 UTC
++++ configure
+@@ -19129,10 +19129,6 @@ fi
+ OS_TYPE="-D"`uname -s`
+
+
+-for i in /usr/local/iconv /usr/local /usr; do
+- (test -f $i/lib/libiconv.so ||\
+- test -f $i/lib/libiconv.a) && ICONV_DIR=$i && break
+-done
+
+ if test -z "$ICONV_DIR"; then
+ ICONV_LIBS=""
Modified: head/comms/scmxx/Makefile
==============================================================================
--- head/comms/scmxx/Makefile Wed Apr 15 03:57:08 2015 (r384037)
+++ head/comms/scmxx/Makefile Wed Apr 15 08:20:27 2015 (r384038)
@@ -3,7 +3,7 @@
PORTNAME= scmxx
PORTVERSION= 0.9.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= comms
MASTER_SITES= SF
@@ -21,7 +21,11 @@ EXAMPLES= sms.txt vCalendar.vcs vCard.vc
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
+
+.if empty(ICONV_LIB)
+CONFIGURE_ARGS+=ac_cv_lib_iconv_libiconv=no
+.endif
post-patch:
@${FIND} ${WRKSRC} -name 'Makefile*' | ${XARGS} \
@@ -35,4 +39,4 @@ post-install:
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Modified: head/comms/telldus-core/Makefile
==============================================================================
--- head/comms/telldus-core/Makefile Wed Apr 15 03:57:08 2015 (r384037)
+++ head/comms/telldus-core/Makefile Wed Apr 15 08:20:27 2015 (r384038)
@@ -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
Added: head/comms/telldus-core/files/patch-common-Strings.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/telldus-core/files/patch-common-Strings.cpp Wed Apr 15 08:20:27 2015 (r384038)
@@ -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<char*>(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);
Modified: head/converters/libiconv/Makefile
==============================================================================
--- head/converters/libiconv/Makefile Wed Apr 15 03:57:08 2015 (r384037)
+++ head/converters/libiconv/Makefile Wed Apr 15 08:20:27 2015 (r384038)
@@ -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
Added: head/converters/libiconv/files/patch-include-iconv.h.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/converters/libiconv/files/patch-include-iconv.h.in Wed Apr 15 08:20:27 2015 (r384038)
@@ -0,0 +1,59 @@
+--- include/iconv.h.in.orig 2011-08-07 17:48:03 UTC
++++ include/iconv.h.in
+@@ -94,7 +94,6 @@ extern int iconv_close (iconv_t cd);
+ #endif
+
+
+-#ifndef LIBICONV_PLUG
+
+ /* Nonstandard extensions. */
+
+@@ -127,12 +126,16 @@ typedef struct {
+ /* Allocates descriptor for code conversion from encoding âfromcodeâ to
+ encoding âtocodeâ into preallocated memory. Returns an error indicator
+ (0 or -1 with errno set). */
++#ifndef LIBICONV_PLUG
+ #define iconv_open_into libiconv_open_into
++#endif
+ extern int iconv_open_into (const char* tocode, const char* fromcode,
+ iconv_allocation_t* resultp);
+
+ /* Control of attributes. */
++#ifndef LIBICONV_PLUG
+ #define iconvctl libiconvctl
++#endif
+ extern int iconvctl (iconv_t cd, int request, void* argument);
+
+ /* Hook performed after every successful conversion of a Unicode character. */
+@@ -212,7 +215,9 @@ struct iconv_fallbacks {
+ #define ICONV_SET_FALLBACKS 6 /* const struct iconv_fallbacks *argument */
+
+ /* Listing of locale independent encodings. */
++#ifndef LIBICONV_PLUG
+ #define iconvlist libiconvlist
++#endif
+ extern void iconvlist (int (*do_one) (unsigned int namescount,
+ const char * const * names,
+ void* data),
+@@ -224,6 +229,7 @@ extern const char * iconv_canonicalize (
+
+ /* Support for relocatable packages. */
+
++#ifndef LIBICONV_PLUG
+ /* Sets the original and the current installation prefix of the package.
+ Relocation simply replaces a pathname starting with the original prefix
+ by the corresponding pathname with the current prefix instead. Both
+@@ -231,12 +237,12 @@ extern const char * iconv_canonicalize (
+ instead of "/"). */
+ extern void libiconv_set_relocation_prefix (const char *orig_prefix,
+ const char *curr_prefix);
++#endif
+
+ #ifdef __cplusplus
+ }
+ #endif
+
+-#endif
+
+
+ #endif /* _LIBICONV_H */
Modified: head/converters/wkhtmltopdf/Makefile
==============================================================================
--- head/converters/wkhtmltopdf/Makefile Wed Apr 15 03:57:08 2015 (r384037)
+++ head/converters/wkhtmltopdf/Makefile Wed Apr 15 08:20:27 2015 (r384038)
@@ -3,6 +3,7 @@
PORTNAME= wkhtmltopdf
PORTVERSION= 0.12.2.1
+PORTREVISION= 1
CATEGORIES= converters
MASTER_SITES= SF
MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}
Added: head/converters/wkhtmltopdf/files/patch-config.tests_unix_compile.test
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/converters/wkhtmltopdf/files/patch-config.tests_unix_compile.test Wed Apr 15 08:20:27 2015 (r384038)
@@ -0,0 +1,11 @@
+--- config.tests/unix/compile.test.orig
++++ config.tests/unix/compile.test
+@@ -13,7 +13,7 @@
+ shift 7
+ LFLAGS="$SYSROOT_FLAG"
+ INCLUDEPATH=""
+-CXXFLAGS="$SYSROOT_FLAG"
++CXXFLAGS="$CXXFLAGS $SYSROOT_FLAG"
+ MAC_ARCH_CXXFLAGS=""
+ MAC_ARCH_LFLAGS=""
+ while [ "$#" -gt 0 ]; do
Added: head/converters/wkhtmltopdf/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/converters/wkhtmltopdf/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp Wed Apr 15 08:20:27 2015 (r384038)
@@ -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);
Added: head/converters/wkhtmltopdf/files/patch-src_corelib_codecs_qiconvcodec.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/converters/wkhtmltopdf/files/patch-src_corelib_codecs_qiconvcodec.cpp Wed Apr 15 08:20:27 2015 (r384038)
@@ -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<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();
Modified: head/databases/kbibtex/Makefile
==============================================================================
--- head/databases/kbibtex/Makefile Wed Apr 15 03:57:08 2015 (r384037)
+++ head/databases/kbibtex/Makefile Wed Apr 15 08:20:27 2015 (r384038)
@@ -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 \
Modified: head/databases/p5-qdbm/Makefile
==============================================================================
--- head/databases/p5-qdbm/Makefile Wed Apr 15 03:57:08 2015 (r384037)
+++ head/databases/p5-qdbm/Makefile Wed Apr 15 08:20:27 2015 (r384038)
@@ -1,6 +1,7 @@
# Created by: Michael Johnson <ahze at FreeBSD.org>
# $FreeBSD$
+PORTREVISION= 2
PKGNAMEPREFIX= p5-
COMMENT= Perl API for QDBM
Modified: head/databases/p5-qdbm/files/patch-Makefile.in
==============================================================================
--- head/databases/p5-qdbm/files/patch-Makefile.in Wed Apr 15 03:57:08 2015 (r384037)
+++ head/databases/p5-qdbm/files/patch-Makefile.in Wed Apr 15 08:20:27 2015 (r384038)
@@ -5,11 +5,11 @@
# Building binaries
-CC = gcc
-+CC ?= gcc
++CC = @CC@
INC = -I. -I../.. -I$(HOME)/include -I/usr/local/include
OPTIMIZE = -O2
-LD = gcc
-+LD ?= gcc
++LD = @CC@
LIBS = -L../.. -I$(HOME)/lib -L/usr/local/lib -lqdbm @LIBS@
RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr/local/lib:$(HOME)/lib
Modified: head/databases/qdbm-plus/Makefile
==============================================================================
--- head/databases/qdbm-plus/Makefile Wed Apr 15 03:57:08 2015 (r384037)
+++ head/databases/qdbm-plus/Makefile Wed Apr 15 08:20:27 2015 (r384038)
@@ -1,7 +1,7 @@
# Created by: Michael Johnson <ahze at FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 2
PKGNAMESUFFIX= -plus
COMMENT= C++ API for QDBM
Added: head/databases/qdbm-plus/files/patch-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/qdbm-plus/files/patch-Makefile.in Wed Apr 15 08:20:27 2015 (r384038)
@@ -0,0 +1,11 @@
+--- Makefile.in.orig 2007-03-07 02:44:50 UTC
++++ Makefile.in
+@@ -44,7 +44,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(sr
+ -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
+ -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
+ -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
+-CXXFLAGS = -Wall -ansi -pedantic -fsigned-char -fPIC -O2 -fno-strict-aliasing @MYOPTS@
++CXXFLAGS = @CXXFLAGS@ -Wall -ansi -pedantic -fsigned-char -fPIC -fno-strict-aliasing
+ LD = @LD@
+ LIBS = -lqdbm @LIBS@
+ LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) \
Modified: head/databases/qdbm/Makefile
==============================================================================
--- head/databases/qdbm/Makefile Wed Apr 15 03:57:08 2015 (r384037)
+++ head/databases/qdbm/Makefile Wed Apr 15 08:20:27 2015 (r384038)
@@ -3,36 +3,39 @@
PORTNAME= qdbm
PORTVERSION= 1.8.78
-PORTREVISION= 1
+PORTREVISION?= 2
CATEGORIES= databases
MASTER_SITES= http://fallabs.com/qdbm/
MAINTAINER= ports at FreeBSD.org
COMMENT?= Quick Database Manager
+LIB_DEPENDS= liblzo2.so:${PORTSDIR}/archivers/lzo2
+
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CFLAGS+= -fPIC
.if !defined(SLAVEPORT)
USES+= iconv
-CONFIGURE_ARGS= --enable-zlib \
+CONFIGURE_ARGS= --enable-bzip --enable-lzo --enable-zlib \
--enable-iconv \
--enable-pthread
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -lpthread -L${LOCALBASE}/lib
-MAKE_ARGS= RELCFLAGS="${CFLAGS}" \
- MYDATADIR="${DOCSDIR}" MYDOCS="${PORTDOCS}"
+LIBS+= -L${LOCALBASE}/lib
+MAKE_ARGS= MYDATADIR="${DOCSDIR}" MYDOCS="${PORTDOCS}" \
+ MYPCDIR="${PREFIX}/libdata/pkgconfig"
PORTDOCS= ChangeLog NEWS
post-patch:
- @${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
- ${WRKSRC}/Makefile.in
+.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
+ @${REINPLACE_CMD} 's/-DNDEBUG//' ${WRKSRC}/Makefile.in
+.endif
+ @${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
post-build:
(cd ${WRKSRC}/lab && ${MAKE} CC="${CC}" CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${ICONV_LIB}" \
+ CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
fmtcnv031127)
post-install:
@@ -43,19 +46,15 @@ post-install:
LIB_DEPENDS+= libqdbm.so:${PORTSDIR}/databases/qdbm
post-patch:
- @${REINPLACE_CMD} -e 's|/usr/java|${JAVA_HOME}|' ${WRKSRC}/configure
-.if ${SLAVEPORT}=="ruby"
- @${FIND} ${WRKSRC} -type f | \
- ${XARGS} -n 10 ${REINPLACE_CMD} -e \
- 's|/usr/bin/ruby -w|${SETENV} ruby|'
- @${FIND} ${WRKSRC} -name '*.bak' | ${XARGS} ${RM} -f
+.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
+ @${REINPLACE_CMD} 's/-DNDEBUG//' ${WRKSRC}/Makefile.in
.endif
+ @${REINPLACE_CMD} -e 's/-liconv//' -e 's/-lstdc++//' ${WRKSRC}/configure
+.if ${SLAVEPORT} == "ruby"
+ @${REINPLACE_CMD} '/iconv/d' ${WRKSRC}/curia/extconf.rb \
+ ${WRKSRC}/depot/extconf.rb ${WRKSRC}/villa/extconf.rb
.endif
-.include <bsd.port.pre.mk>
-
-.if !defined(SLAVEPORT) && defined(WITH_DEBUG)
-CONFIGURE_ARGS+= --enable-debug
-.endif
+.endif # !defined(SLAVEPORT)
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/databases/qdbm/files/patch-Makefile.in
==============================================================================
--- head/databases/qdbm/files/patch-Makefile.in Wed Apr 15 03:57:08 2015 (r384037)
+++ head/databases/qdbm/files/patch-Makefile.in Wed Apr 15 08:20:27 2015 (r384038)
@@ -1,30 +1,11 @@
---- Makefile.in.orig 2010-08-04 20:14:34.000000000 +0300
-+++ Makefile.in 2014-05-03 18:41:01.000000000 +0300
-@@ -46,7 +46,7 @@
- MYMAN1DIR = @mandir@/man1
- MYMAN3DIR = @mandir@/man3
- MYDATADIR = @datadir@/$(PACKAGE)
--MYPCDIR = @libdir@/pkgconfig
-+MYPCDIR = /usr/local/libdata/pkgconfig
- DESTDIR =
-
- # Building binaries
-@@ -56,7 +56,6 @@
+--- Makefile.in.orig 2010-08-04 17:14:34 UTC
++++ Makefile.in
+@@ -56,7 +56,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(MY
-D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
-D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
-DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
-CFLAGS = -Wall -pedantic -fPIC -fsigned-char -O3 -fomit-frame-pointer -fforce-addr @MYOPTS@
++CFLAGS = @CFLAGS@ -Wall -pedantic -fPIC -fsigned-char
LD = @LD@
LIBS = -lqdbm @LIBS@
LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@
-@@ -170,8 +169,10 @@
- cd $(srcdir)/man && cp -Rf $(MYMAN1S) $(DESTDIR)$(MYMAN1DIR)
- mkdir -p $(DESTDIR)$(MYMAN3DIR)
- cd $(srcdir)/man && cp -Rf $(MYMAN3S) $(DESTDIR)$(MYMAN3DIR)
-+.if $(MYDOCS) != ""
- mkdir -p $(DESTDIR)$(MYDATADIR)
- cd $(srcdir) && cp -Rf $(MYDOCS) $(DESTDIR)$(MYDATADIR)
-+.endif
- mkdir -p $(DESTDIR)$(MYPCDIR)
- cd $(srcdir) && cp -Rf $(MYPCS) $(DESTDIR)$(MYPCDIR)
- @printf '\n'
Modified: head/databases/ruby-qdbm/Makefile
==============================================================================
--- head/databases/ruby-qdbm/Makefile Wed Apr 15 03:57:08 2015 (r384037)
+++ head/databases/ruby-qdbm/Makefile Wed Apr 15 08:20:27 2015 (r384038)
@@ -1,13 +1,17 @@
# Created by: Michael Johnson <ahze at FreeBSD.org>
# $FreeBSD$
+PORTREVISION= 2
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
COMMENT= Ruby API for QDBM
SLAVEPORT= ruby
+USES= shebangfix
+SHEBANG_FILES= curia/rbcrtest depot/rbdptest myrbdoc villa/rbvltest
USE_RUBY= yes
+
MASTERDIR= ${.CURDIR}/../../databases/qdbm
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/ruby
PLIST= ${.CURDIR}/pkg-plist
Modified: head/deskutils/fbreader/Makefile
==============================================================================
--- head/deskutils/fbreader/Makefile Wed Apr 15 03:57:08 2015 (r384037)
+++ head/deskutils/fbreader/Makefile Wed Apr 15 08:20:27 2015 (r384038)
@@ -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},' \
Modified: head/devel/courier-unicode/Makefile
==============================================================================
--- head/devel/courier-unicode/Makefile Wed Apr 15 03:57:08 2015 (r384037)
+++ head/devel/courier-unicode/Makefile Wed Apr 15 08:20:27 2015 (r384038)
@@ -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>
Added: head/devel/ice/files/patch-cpp-include-Ice-IconvStringConverter.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/ice/files/patch-cpp-include-Ice-IconvStringConverter.h Wed Apr 15 08:20:27 2015 (r384038)
@@ -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
+ //
Modified: head/devel/libisofs/Makefile
==============================================================================
--- head/devel/libisofs/Makefile Wed Apr 15 03:57:08 2015 (r384037)
+++ head/devel/libisofs/Makefile Wed Apr 15 08:20:27 2015 (r384038)
@@ -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>
Modified: head/devel/qt4-corelib/Makefile
==============================================================================
--- head/devel/qt4-corelib/Makefile Wed Apr 15 03:57:08 2015 (r384037)
+++ head/devel/qt4-corelib/Makefile Wed Apr 15 08:20:27 2015 (r384038)
@@ -3,7 +3,7 @@
PORTNAME= corelib
DISTVERSION= ${QT4_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
PKGNAMEPREFIX= qt4-
Added: head/devel/qt4-corelib/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/qt4-corelib/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp Wed Apr 15 08:20:27 2015 (r384038)
@@ -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);
Added: head/devel/qt4-corelib/files/patch-src_corelib_codecs_qiconvcodec.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/qt4-corelib/files/patch-src_corelib_codecs_qiconvcodec.cpp Wed Apr 15 08:20:27 2015 (r384038)
@@ -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();
Modified: head/devel/sdl20/Makefile
==============================================================================
--- head/devel/sdl20/Makefile Wed Apr 15 03:57:08 2015 (r384037)
+++ head/devel/sdl20/Makefile Wed Apr 15 08:20:27 2015 (r384038)
@@ -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>
Modified: head/editors/ted/Makefile
==============================================================================
--- head/editors/ted/Makefile Wed Apr 15 03:57:08 2015 (r384037)
+++ head/editors/ted/Makefile Wed Apr 15 08:20:27 2015 (r384038)
@@ -3,7 +3,7 @@
PORTNAME= ted
PORTVERSION= 2.23
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= editors
MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/ \
http://fossies.org/linux/misc/
@@ -34,7 +34,8 @@ MAKE_ENV= DEF_AFMDIR="-DAFMDIR=\"\\\"${A
DEF_DOCUMENT_DIR="-DDOCUMENT_DIR=\"\\\"${DOCSDIR}/\\\"\"" \
DEF_PSSCRIPT_DIR="-DPSSCRIPT_DIR=\"\\\"${DATADIR}/\\\"\""
ALL_TARGET= compile.shared
-CONFIGURE_ARGS+=--datadir=${PREFIX}/share
+CONFIGURE_ARGS= --datadir=${PREFIX}/share \
+ ac_iconv_includes=${LOCALBASE}/include
DATADIR= ${PREFIX}/share/Ted
DOCSDIR= ${PREFIX}/share/doc/Ted
@@ -52,6 +53,8 @@ USES+= motif
CONFIGURE_ARGS+=--with-MOTIF
.endif
+.include <bsd.port.pre.mk>
+
post-extract:
@cd ${WRKSRC}/tedPackage && ${TAR} xf TedDatadir.tar
@${INSTALL_SCRIPT} ${FILESDIR}/configure ${WRKSRC}
@@ -62,8 +65,11 @@ post-patch:
's|/usr/X11R6|${LOCALBASE}|g ; \
s|/usr/local|${LOCALBASE}|g ; \
/paper.h/s|/usr/include|${LOCALBASE}/include|g ; \
- /paper.h/s|/usr/lib|${LOCALBASE}/lib|g ; \
- s|/iconv.so|/libiconv.so|g'
+ /paper.h/s|/usr/lib|${LOCALBASE}/lib|g'
+.if ! empty(ICONV_LIB)
+ @${REINPLACE_CMD} 's|/iconv\.so|/libiconv.so|' \
+ ${WRKSRC}/Ted/configure ${WRKSRC}/textEncoding/configure
+.endif
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/Ted/Ted ${STAGEDIR}${PREFIX}/bin
@@ -81,4 +87,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/tedPackage/TedDocument-en_US.rtf ${STAGEDIR}${DOCSDIR}
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Added: head/editors/ted/files/patch-textEncoding-sioIconv.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/ted/files/patch-textEncoding-sioIconv.c Wed Apr 15 08:20:27 2015 (r384038)
@@ -0,0 +1,14 @@
+--- textEncoding/sioIconv.c.orig 2013-02-01 12:11:08 UTC
++++ textEncoding/sioIconv.c
+@@ -61,11 +61,7 @@ static int sioInIconvReadBytes( void *
+ /* 1 */
+ while( ! tooBig )
+ {
+-# if defined(__GNUC__) && ! defined(iconv)
+ char * inbuf= (char *)iis->iisInBuf;
+-# else
+- const char * inbuf= (const char *)iis->iisInBuf;
+-# endif
+ int got;
+
+ /* 2 */
Added: head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp Wed Apr 15 08:20:27 2015 (r384038)
@@ -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);
Modified: head/ftp/pure-ftpd/Makefile
==============================================================================
--- head/ftp/pure-ftpd/Makefile Wed Apr 15 03:57:08 2015 (r384037)
+++ head/ftp/pure-ftpd/Makefile Wed Apr 15 08:20:27 2015 (r384038)
@@ -3,6 +3,7 @@
PORTNAME= pure-ftpd
PORTVERSION= 1.0.37
+PORTREVISION= 1
CATEGORIES= ftp ipv6
MASTER_SITES= http://download.pureftpd.org/pub/pure-ftpd/releases/ \
ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/ \
@@ -87,6 +88,13 @@ UTF8_CONFIGURE_WITH= rfc2640
UTF8_USES= iconv
VIRTUALCHROOT_CONFIGURE_WITH= virtualchroot
+.include <bsd.port.pre.mk>
+
+.if empty(ICONV_LIB)
+CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no \
+ ac_cv_lib_iconv_libiconv_open=no
+.endif
+
pre-fetch:
@${ECHO_MSG} "You can use the following additional options:"
@${ECHO_MSG} ""
@@ -118,4 +126,4 @@ post-install:
${MKDIR} ${STAGEDIR}${PAM_DIR}/
${INSTALL_DATA} ${PAM_TEMPL} ${STAGEDIR}${PAM_DIR}/${PAM_TARGET}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Modified: head/games/allacrost/Makefile
==============================================================================
--- head/games/allacrost/Makefile Wed Apr 15 03:57:08 2015 (r384037)
+++ head/games/allacrost/Makefile Wed Apr 15 08:20:27 2015 (r384038)
@@ -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
Modified: head/games/allacrost/files/patch-src-utils.cpp
==============================================================================
--- head/games/allacrost/files/patch-src-utils.cpp Wed Apr 15 03:57:08 2015 (r384037)
+++ head/games/allacrost/files/patch-src-utils.cpp Wed Apr 15 08:20:27 2015 (r384038)
@@ -8,21 +8,3 @@
#include <pwd.h>
#endif
-@@ -337,7 +338,7 @@
- }
-
- const char *source_char = reinterpret_cast<const char *>(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
Modified: head/games/hex-a-hop/Makefile
==============================================================================
--- head/games/hex-a-hop/Makefile Wed Apr 15 03:57:08 2015 (r384037)
+++ head/games/hex-a-hop/Makefile Wed Apr 15 08:20:27 2015 (r384038)
@@ -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 at FreeBSD.org
COMMENT= Puzzle game based on hexagonal tiles
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list