mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00
Code Issues Releases Activity

converters/libiconv:

Browse Source 
- 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)
This commit is contained in:
Tijl Coosemans 2015-04-15 08:20:27 +00:00
parent 522c152d1c
commit 074ea5282a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=384038
147 changed files with 1255 additions and 4303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mk/Uses/iconv.mk
View File

@ -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

7
archivers/unalz/files/patch-UnAlz.cpp
View File

@ -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)
{

4
archivers/unrar-iconv/files/patch-iconv
View File

@ -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);

1
audio/cmus/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= cmus
PORTVERSION= 2.6.0
PORTREVISION= 1
CATEGORIES= audio
MAINTAINER= h.skuhra@gmail.com

20
audio/cmus/files/patch-scripts-checks.sh Normal file
View File

@ -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

11
audio/id3mtag/files/patch-charconv.cpp Normal file
View File

@ -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)

11
audio/mp3unicode/files/patch-mp3unicode.cpp
View File

@ -1,11 +0,0 @@
--- ./mp3unicode.cpp.orig 2012-05-07 12:03:19.000000000 +0000
+++ ./mp3unicode.cpp 2014-05-13 20:16:40.053475428 +0000
@@ -229,7 +229,7 @@
if (
iconv (
cd,
- (char **)&from,
+ &from,
&from_size,
&to,
&to_size

2
audio/tagutil/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= tagutil
PORTVERSION= 3.0.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= audio
MAINTAINER= alex@kaworu.ch

31
audio/tagutil/files/patch-FindIconv.cmake Normal file
View File

@ -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})

4
audio/xmms-wavpack/Makefile
View File

@ -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 WavPack files
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

9
audio/xmms-wavpack/files/patch-src_libwavpack.cpp
View File

@ -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

10
chinese/cconv/Makefile
View File

@ -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>

13
chinese/cconv/files/patch-configure Normal file
View File

@ -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=""

10
comms/scmxx/Makefile
View File

@ -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.vcf
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>

3
comms/telldus-core/Makefile
View File

@ -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}/devel/libftdi \
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

29
comms/telldus-core/files/patch-common-CMakeLists.txt
View File

@ -1,29 +0,0 @@
--- common/CMakeLists.txt
+++ common/CMakeLists.txt
@@ -54,16 +54,22 @@ ELSEIF (WIN32)
)
ELSEIF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
#### FreeBSD ####
- FIND_LIBRARY(ICONV_LIBRARY iconv)
+ string(REGEX MATCH "(([0-9]+)\\.([0-9]+))-([A-Z0-9])+" FREEBSD "${CMAKE_SYSTEM_VERSION}")
+ set( FREEBSD_RELEASE "${CMAKE_MATCH_1}" )
ADD_DEFINITIONS( -D_FREEBSD )
LIST(APPEND telldus-common_SRCS
Event_unix.cpp
EventHandler_unix.cpp
Socket_unix.cpp
)
- LIST(APPEND telldus-common_LIBRARIES
- ${ICONV_LIBRARY}
- )
+
+ # FreeBSD 10 has iconv built in to libc
+ IF(FREEBSD_RELEASE LESS 10)
+ FIND_LIBRARY(ICONV_LIBRARY iconv)
+ LIST(APPEND telldus-common_LIBRARIES
+ ${ICONV_LIBRARY}
+ )
+ ENDIF ()
ELSE (APPLE)
#### Linux ####
ADD_DEFINITIONS( -D_LINUX )

26
comms/telldus-core/files/patch-common-Strings.cpp Normal file
View File

@ -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);

9
converters/libiconv/Makefile
View File

@ -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 library
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

59
converters/libiconv/files/patch-include-iconv.h.in Normal file
View File

@ -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 */

1
converters/wkhtmltopdf/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= wkhtmltopdf
PORTVERSION= 0.12.2.1
PORTREVISION= 1
CATEGORIES= converters
MASTER_SITES= SF
MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}

11
converters/wkhtmltopdf/files/patch-config.tests_unix_compile.test Normal file
View File

@ -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

11
converters/wkhtmltopdf/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp Normal file
View File

@ -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);

39
converters/wkhtmltopdf/files/patch-src_corelib_codecs_qiconvcodec.cpp Normal file
View File

@ -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();

4
databases/kbibtex/Makefile
View File

@ -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 \

11
databases/kbibtex/files/patch-src__libkbibtexio__iconvlatex.cpp
View File

@ -1,11 +0,0 @@
--- ./src/libkbibtexio/iconvlatex.cpp.orig 2012-05-05 10:50:42.000000000 +0000
+++ ./src/libkbibtexio/iconvlatex.cpp 2012-05-06 00:53:04.285249457 +0000
@@ -58,7 +58,7 @@
QByteArray IConvLaTeX::encode(const QString &input)
{
QByteArray inputByteArray = input.toUtf8();
-#ifdef Q_WS_WIN
+#ifndef Q_OS_LINUX
/// iconv on Windows likes to have it as const char *
const char *inputBuffer = inputByteArray.data();
#else

20
databases/mysql-workbench52/files/patch-plugins__migration__copytable__copytable.cpp
View File

@ -1,20 +0,0 @@
--- plugins/migration/copytable/copytable.cpp.orig
+++ plugins/migration/copytable/copytable.cpp
@@ -555,7 +555,7 @@
//log_debug3("Convert string with %i chars to buffer size %i\n", inbuf_len, outbuf_len);
// convert data from UCS-2 to utf-8
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__FreeBSD__)
converted = iconv(_iconv,
(const char**)&inbuf, &inbuf_len,
(char**)&outbuf, &outbuf_len);
@@ -617,7 +617,7 @@
//log_debug3("Convert string with %i chars to buffer size %i\n", inbuf_len, outbuf_len);
// convert data from UCS-2 to utf-8
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__FreeBSD__)
converted = iconv(_iconv,
(const char**)&inbuf, &inbuf_len,
(char**)&outbuf, &outbuf_len);

1
databases/p5-qdbm/Makefile
View File

@ -1,6 +1,7 @@
# Created by: Michael Johnson <ahze@FreeBSD.org>
# $FreeBSD$
PORTREVISION= 2
PKGNAMEPREFIX= p5-
COMMENT= Perl API for QDBM

4
databases/p5-qdbm/files/patch-Makefile.in
View File

@ -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

2
databases/qdbm-plus/Makefile
View File

@ -1,7 +1,7 @@
# Created by: Michael Johnson <ahze@FreeBSD.org>
# $FreeBSD$
PORTREVISION= 0
PORTREVISION= 2
PKGNAMESUFFIX= -plus
COMMENT= C++ API for QDBM

7
databases/qdbm/files/patch-plus__Makefile.in → databases/qdbm-plus/files/patch-Makefile.in
View File

@ -1,10 +1,11 @@
--- plus/Makefile.in.orig 2014-05-03 18:41:29.000000000 +0300
+++ plus/Makefile.in 2014-05-03 18:41:32.000000000 +0300
@@ -44,7 +44,6 @@
--- 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) \

41
databases/qdbm/Makefile
View File

@ -3,36 +3,39 @@
PORTNAME= qdbm
PORTVERSION= 1.8.78
PORTREVISION= 1
PORTREVISION?= 2
CATEGORIES= databases
MASTER_SITES= http://fallabs.com/qdbm/
MAINTAINER= ports@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>
.endif # !defined(SLAVEPORT)
.if !defined(SLAVEPORT) && defined(WITH_DEBUG)
CONFIGURE_ARGS+= --enable-debug
.endif
.include <bsd.port.post.mk>
.include <bsd.port.mk>

27
databases/qdbm/files/patch-Makefile.in
View File

@ -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'

10
databases/qdbm/files/patch-java__Makefile.in
View File

@ -1,10 +0,0 @@
--- java/Makefile.in.orig 2014-05-03 18:41:15.000000000 +0300
+++ java/Makefile.in 2014-05-03 18:41:21.000000000 +0300
@@ -56,7 +56,6 @@
@MYDEFS@ -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 -fPIC -fsigned-char -O2 @MYOPTS@
LD = @LD@
LIBS = -lqdbm @LIBS@
LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS)

4
databases/ruby-qdbm/Makefile
View File

@ -1,13 +1,17 @@
# Created by: Michael Johnson <ahze@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

2
deskutils/fbreader/Makefile
View File

@ -53,7 +53,7 @@ MAKE_ENV+= TARGET_ARCH=desktop TARGET_STATUS=${STATUS} \
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},' \

4
devel/courier-unicode/Makefile
View File

@ -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>

11
devel/ice/files/patch-cpp-include-Ice-IconvStringConverter.h Normal file
View File

@ -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
//

5
devel/libisofs/Makefile
View File

@ -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>

2
devel/qt4-corelib/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= corelib
DISTVERSION= ${QT4_VERSION}
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= devel
PKGNAMEPREFIX= qt4-

11
devel/qt4-corelib/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp Normal file
View File

@ -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);

39
devel/qt4-corelib/files/patch-src_corelib_codecs_qiconvcodec.cpp Normal file
View File

@ -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();

5
devel/sdl20/Makefile
View File

@ -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>

16
editors/ted/Makefile
View File

@ -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=\"\\\"${AFMDIR}/\\\"\"" \
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>

14
editors/ted/files/patch-textEncoding-sioIconv.c Normal file
View File

@ -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 */

11
emulators/dolphin-emu/files/patch-Source-Core-Common-Src-StringUtil.cpp
View File

@ -1,11 +0,0 @@
--- Source/Core/Common/Src/StringUtil.cpp.orig 2013-03-21 06:49:23.000000000 +0100
+++ Source/Core/Common/Src/StringUtil.cpp 2013-03-21 06:50:08.000000000 +0100
@@ -460,7 +460,7 @@
while (src_bytes != 0)
{
- size_t const iconv_result = iconv(conv_desc, (char**)(&src_buffer), &src_bytes,
+ size_t const iconv_result = iconv(conv_desc, (const char**)(&src_buffer), &src_bytes,
&dst_buffer, &dst_bytes);
if ((size_t)-1 == iconv_result)

26
emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp Normal file
View File

@ -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);

11
finance/libofx/files/patch-lib__ofx_preproc.cpp
View File

@ -1,11 +0,0 @@
--- lib/ofx_preproc.cpp.orig 2014-09-12 19:26:30 UTC
+++ lib/ofx_preproc.cpp
@@ -310,7 +310,7 @@ int ofx_proc_file(LibofxContextPtr ctx,
size_t outbytesleft = inbytesleft * 2 - 1;
iconv_buffer = (char*) malloc (inbytesleft * 2);
memset(iconv_buffer, 0, inbytesleft * 2);
-#if defined(OS_WIN32) || defined(__sun)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
const char * inchar = (const char *)s_buffer.c_str();
#else
char * inchar = (char *)s_buffer.c_str();

10
ftp/pure-ftpd/Makefile
View File

@ -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>

4
games/allacrost/Makefile
View File

@ -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}/graphics/jpeg \
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

18
games/allacrost/files/patch-src-utils.cpp
View File

@ -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

11
games/cuyo/files/patch-src__cuyointl.cpp
View File

@ -1,11 +0,0 @@
--- src/cuyointl.cpp.orig
+++ src/cuyointl.cpp
@@ -93,7 +93,7 @@
return convert_error(ret,s,"Character conversion not possible.");
while (*inpos) {
- size_t res = iconv(handle,&inpos,&inleft,&outpos,&outleft);
+ size_t res = iconv(handle,(const char **)&inpos,&inleft,&outpos,&outleft);
if (res == (size_t) -1)
/* An error occured */
switch (errno) {

3
games/hex-a-hop/Makefile
View File

@ -3,13 +3,14 @@
PORTNAME= hex-a-hop
PORTVERSION= 1.1.0
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME:S/-//g}/${PORTVERSION}
MAINTAINER= makc@FreeBSD.org
COMMENT= Puzzle game based on hexagonal tiles
USES= iconv
USE_SDL= sdl
GNU_CONFIGURE= yes

11
games/hex-a-hop/files/patch-src-text.cpp
View File

@ -1,11 +0,0 @@
--- src/text.cpp~
+++ src/text.cpp
@@ -439,7 +439,7 @@ void ConvertToUTF8(const std::string &te
errno = 0;
static const char *locale_enc = gettext_init.GetEncoding();
iconv_t cd = iconv_open("UTF-8", locale_enc);
- char *in_buf = const_cast<char *>(&text_locally_encoded[0]);
+ const char *in_buf = const_cast<char *>(&text_locally_encoded[0]);
char *out_buf = &text_utf8[0];
iconv(cd, &in_buf, &text_length, &out_buf, &text_utf8_length);
iconv_close(cd);

2
games/ldmud/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= ldmud
PORTVERSION= 3.3.720
PORTREVISION= 2
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= games net
MASTER_SITES= http://www.bearnip.com/ftp/mud/ \

22
games/ldmud/files/patch-Makefile.in
View File

@ -1,6 +1,22 @@
--- Makefile.in.orig 2013-12-29 15:19:34.000000000 +0100
+++ Makefile.in 2013-12-29 15:20:35.000000000 +0100
@@ -135,9 +135,9 @@ install: install-driver
--- Makefile.in.orig 2011-02-26 21:05:08 UTC
+++ Makefile.in
@@ -1,6 +1,5 @@
# TODO: Add some of the symbols in here to configure
# These lines are needed on some machines.
-MAKE=make
SHELL=@CONFIG_SHELL@
INSTALL=@INSTALL@
mkinstalldirs=$(SHELL) @top_srcdir@/mkinstalldirs
@@ -83,7 +82,7 @@ SFMT_FLAGS = -fno-strict-aliasing
#
MPATH=-DMUD_LIB='"$(MUD_LIB)"' -DBINDIR='"$(BINDIR)"' -DERQ_DIR='"$(ERQ_DIR)"'
#
-CFLAGS= @EXTRA_CFLAGS@ $(OPTIMIZE) $(DEBUG) $(WARN) $(MPATH) $(PROFIL)
+CFLAGS= @CPPFLAGS@ @CFLAGS@ @EXTRA_CFLAGS@ $(DEBUG) $(WARN) $(MPATH) $(PROFIL)
#
LIBS=@LIBS@ @PKGLIBS@
#
@@ -135,9 +134,9 @@ install: install-driver
@echo "To install everything in one go, use 'make install-all'."
install-driver: ldmud@EXEEXT@ docs

75
games/ldmud/files/patch-configure Normal file
View File

@ -0,0 +1,75 @@
--- configure.orig 2011-02-26 21:05:08 UTC
+++ configure
@@ -13600,7 +13600,7 @@ for TESTFLAG in -O; do
#the [e]grep option -v will not give a failure exit status on the atari
else
if eval $tcomp; then
- CFLAGS=$TESTFLAG
+ LCFLAGS=$TESTFLAG
break
fi
fi
@@ -13608,10 +13608,9 @@ for TESTFLAG in -O; do
done
for TESTFLAG in -g; do
if eval $tcomp; then
- CFLAGS="$CFLAGS $TESTFLAG"
+ LCFLAGS="$LCFLAGS $TESTFLAG"
fi
done
-LCFLAGS=$CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCFLAGS" >&5
$as_echo "$LCFLAGS" >&6; }
@@ -13624,7 +13623,7 @@ for TESTFLAG in -O2 -O; do
#the [e]grep option -v will not give a failure exit status on the atari
else
if eval $tcomp; then
- CFLAGS=$TESTFLAG
+ MCFLAGS=$TESTFLAG
break
fi
fi
@@ -13633,10 +13632,9 @@ done
for TESTFLAG in -g; do
if eval $tcomp; then
OPTFLAGS="$OPTFLAGS $TESTFLAG"
- CFLAGS="$CFLAGS $TESTFLAG"
+ MCFLAGS="$MCFLAGS $TESTFLAG"
fi
done
-MCFLAGS=$CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCFLAGS" >&5
$as_echo "$MCFLAGS" >&6; }
@@ -13649,7 +13647,7 @@ for TESTFLAG in -O4 -O3 -O2 -O; do
#the [e]grep option -v will not give a failure exit status on the atari
else
if eval $tcomp; then
- CFLAGS=$TESTFLAG
+ OCFLAGS=$TESTFLAG
break
fi
fi
@@ -13663,7 +13661,7 @@ if test "$ac_cv_c_compiler_gnu" = "no";
#the [e]grep option -v will not give a failure exit status on the atari
else
if eval $tcomp; then
- CFLAGS="$CFLAGS $TESTFLAG"
+ OCFLAGS="$OCFLAGS $TESTFLAG"
break
fi
fi
@@ -13673,10 +13671,10 @@ fi
# -funroll-all-loops causes some versions of gcc to produce buggy code
for TESTFLAG in -fomit-frame-pointer; do
if eval $tcomp; then
- CFLAGS="$CFLAGS $TESTFLAG"
+ OCFLAGS="$OCFLAGS $TESTFLAG"
fi
done
-OCFLAGS="$CFLAGS $OPTFLAGS"
+OCFLAGS="$OCFLAGS $OPTFLAGS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCFLAGS" >&5
$as_echo "$OCFLAGS" >&6; }
if ${CC-cc} -g -c conftest.c ; then

23
games/pokerth/files/patch-src-core-linux-convhelper.cpp
View File

@ -1,20 +1,11 @@
--- src/core/linux/convhelper.cpp.orig 2008-01-20 13:32:07.000000000 +0100
+++ src/core/linux/convhelper.cpp 2008-01-20 12:56:03.000000000 +0100
@@ -39,7 +39,7 @@
#ifdef __APPLE__
const char *inbuf = inStr.data();
#else
- char *inbuf = const_cast<char *>(inStr.data());
+ const char *inbuf = const_cast<char *>(inStr.data());
--- src/core/linux/convhelper.cpp.orig 2014-01-10 21:18:20 UTC
+++ src/core/linux/convhelper.cpp
@@ -36,7 +36,7 @@
#error This file is not for Windows.
#endif
const size_t c_outsize = insize * 6; // max size of utf-8 char is 6 per input char
@@ -74,7 +74,7 @@
#ifdef __APPLE__
const char *inbuf = inStr.data();
#else
- char *inbuf = const_cast<char *>(inStr.data());
+ const char *inbuf = const_cast<char *>(inStr.data());
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__NetBSD__)
#define HAVE_ICONV_CONST
#endif
const size_t c_outsize = insize;

11
games/valyriatear/files/patch-src-utils-ustring.cpp Normal file
View File

@ -0,0 +1,11 @@
--- src/utils/ustring.cpp.orig 2013-09-24 11:33:12 UTC
+++ src/utils/ustring.cpp
@@ -203,7 +203,7 @@ static bool UTF8ToUTF16(const char *sour
return false;
}
-#if (defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109) || defined(__FreeBSD__)
+#if defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109
// We are using an iconv API that uses const char*
const char *sourceChar = source;
#else

15
graphics/cegui/files/patch-cegui__src__IconvStringTranscoder.cpp
View File

@ -1,15 +0,0 @@
--- cegui/src/IconvStringTranscoder.cpp.orig 2014-03-12 06:50:07.000000000 +0100
+++ cegui/src/IconvStringTranscoder.cpp 2014-03-12 06:51:56.000000000 +0100
@@ -64,12 +64,7 @@
size_t iconv(const char** inbuf, size_t* inbytesleft,
char** outbuf, size_t* outbytesleft)
{
-#ifdef CEGUI_ICONV_USES_CONST_INBUF
return ::iconv(d_cd, inbuf, inbytesleft, outbuf, outbytesleft);
-#else
- return ::iconv(d_cd, const_cast<char**>(inbuf), inbytesleft,
- outbuf, outbytesleft);
-#endif
}
//------------------------------------------------------------------------//

11
graphics/iccexamin/files/patch-icc_gl.cpp
View File

@ -1,11 +0,0 @@
--- icc_gl.cpp.orig 2013-05-01 21:38:55.000000000 +0400
+++ icc_gl.cpp 2013-05-01 21:39:28.000000000 +0400
@@ -191,7 +191,7 @@ void drawText( FTFont * f, const char *
ttmp = txt = strdup(in_txt);
iconv_t cd = iconv_open( "WCHAR_T", oy_domain_codeset );
- iconv( cd, &ttmp, &in_left, (char**)&wtmp, &out_left);
+ iconv( cd, (const char**)&ttmp, &in_left, (char**)&wtmp, &out_left);
iconv_close( cd );
drawTEXT( f, wchar );

16
graphics/inventor/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= inventor
PORTVERSION= 2.1.5.p10
PORTREVISION= 11
PORTREVISION= 12
CATEGORIES= graphics
MASTER_SITES= ftp://oss.sgi.com/projects/inventor/download/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/-/}
@ -19,7 +19,7 @@ LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \
CONFLICTS= Coin-[0-9]* SoXt-[0-9]*
USE_XORG= x11 xi
USE_XORG= x11 xext xi xp xt
USE_GL= glu glw
USES= iconv gmake motif
USE_LDCONFIG= yes
@ -27,7 +27,12 @@ ONLY_FOR_ARCHS= i386 amd64
MAKE_JOBS_UNSAFE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
MAKE_ARGS= CC="${CC}" CXX="${CXX}" LD="${CXX}" \
VCOPTS="${CFLAGS}" VCXXOPTS="${CXXFLAGS}" \
VLDOPTS="${LDFLAGS}" VLDDSOOPTS="${LDFLAGS}" \
IVPREFIX="${PREFIX}" X11DIR="${LOCALBASE}"
MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/lib:${WRKSRC}/libSoXt \
FREETYPE=1 \
INSTALL_STRIP=${STRIP} \
IVROOT=${STAGEDIR}
MAKEFILE= GNUmakefile
@ -41,13 +46,12 @@ DEBUG_MAKE_ENV= LIBTYPE=debug
.include <bsd.port.options.mk>
.if !(${OPSYS} == FreeBSD && ${OSVERSION} < 900033)
MAKE_ENV+= VLDOPTS=-Wl,--add-needed
LDFLAGS+= -Wl,--add-needed
.endif
post-patch:
@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ;\
s|%%CXX%%|${CXX}|g ; \
s|%%CXXFLAGS%%|${CXXFLAGS}|g' ${WRKSRC}/make/ivcommondefs
@${REINPLACE_CMD} 's|/usr\(/include/freetype2\)|${LOCALBASE}\1|' \
${WRKSRC}/libFL/ang/GNUmakefile
@${REINPLACE_CMD} -e 's|%%ICONV_LIB%%|${ICONV_LIB}|' \
${WRKSRC}/lib/GNUmakefile

17
graphics/inventor/files/patch-SoText2.c++
View File

@ -1,23 +1,6 @@
*** lib/database/src/so/nodes/SoText2.c++.orig Tue Sep 25 00:45:41 2001
--- lib/database/src/so/nodes/SoText2.c++ Mon Dec 23 13:28:11 2002
***************
*** 778,784 ****
size_t outbytes = 2*inbytes+2;
char* output = (char*)UCSStrings[i];
! if ((iconv(conversionCode, &input, &inbytes, &output, &outbytes) == (size_t)-1)){
#ifdef DEBUG
SoDebugError::post("SoBitmapFontCache::convertToUCS",
"Error converting text to UCS-2");
--- 778,784 ----
size_t outbytes = 2*inbytes+2;
char* output = (char*)UCSStrings[i];
! if ((iconv(conversionCode, (const char **)&input, &inbytes, &output, &outbytes) == (size_t)-1)){
#ifdef DEBUG
SoDebugError::post("SoBitmapFontCache::convertToUCS",
"Error converting text to UCS-2");
***************
*** 1498,1503 ****
--- 1498,1504 ----
// And some font library stuff:

19
graphics/inventor/files/patch-SoText3.c++
View File

@ -1,19 +0,0 @@
*** lib/database/src/so/nodes/SoText3.c++.orig Mon Dec 23 13:37:59 2002
--- lib/database/src/so/nodes/SoText3.c++ Mon Dec 23 13:38:15 2002
***************
*** 2291,2297 ****
size_t outbytes = 2*inbytes+2;
char* output = (char*)UCSStrings[i];
! if ((iconv(conversionCode, &input, &inbytes, &output, &outbytes) == (size_t)-1)){
#ifdef DEBUG
SoDebugError::post("SoOutlineFontCache::convertToUCS",
"Error converting text to UCS-2");
--- 2291,2297 ----
size_t outbytes = 2*inbytes+2;
char* output = (char*)UCSStrings[i];
! if ((iconv(conversionCode, (const char **)&input, &inbytes, &output, &outbytes) == (size_t)-1)){
#ifdef DEBUG
SoDebugError::post("SoOutlineFontCache::convertToUCS",
"Error converting text to UCS-2");

36
graphics/inventor/files/patch-TextWrapper.c++
View File

@ -1,36 +0,0 @@
*** apps/demos/textomatic/TextWrapper.c++.orig Thu Jan 2 15:29:27 2003
--- apps/demos/textomatic/TextWrapper.c++ Thu Jan 2 15:31:00 2003
***************
*** 77,83 ****
char *output = outbuf;
//
if ( global_iconvCodeL2 == (iconv_t)-1 ||
! iconv(global_iconvCodeL2,&input,&inbytesleft,&output,&outbytesleft) == (size_t)-1 )
{
fprintf( stderr, "textomatic: iconv error.\n" );
(*(UCS2 *)outbuf)=0;
--- 77,83 ----
char *output = outbuf;
//
if ( global_iconvCodeL2 == (iconv_t)-1 ||
! iconv(global_iconvCodeL2,(const char **)&input,&inbytesleft,&output,&outbytesleft) == (size_t)-1 )
{
fprintf( stderr, "textomatic: iconv error.\n" );
(*(UCS2 *)outbuf)=0;
***************
*** 229,235 ****
char *output = outbuf;
//
if ( global_iconvCode28 == (iconv_t)-1 ||
! iconv( global_iconvCode28,&input,&inbytesleft,&output,&outbytesleft ) == (size_t)-1 )
{
fprintf( stderr, "textomatic: iconv error.\n" );
(*(UCS2 *)outbuf)=0;
--- 229,235 ----
char *output = outbuf;
//
if ( global_iconvCode28 == (iconv_t)-1 ||
! iconv( global_iconvCode28,(const char **)&input,&inbytesleft,&output,&outbytesleft ) == (size_t)-1 )
{
fprintf( stderr, "textomatic: iconv error.\n" );
(*(UCS2 *)outbuf)=0;

88
graphics/inventor/files/patch-ivcommondefs
View File

@ -1,82 +1,30 @@
--- make/ivcommondefs.orig Sat Jul 12 07:40:54 2003
+++ make/ivcommondefs Sun Aug 3 15:10:28 2003
@@ -49,9 +49,9 @@
ifeq ($(usingLinux), 1)
-CC = /usr/bin/gcc
-C++ = /usr/bin/g++
-LD = /usr/bin/g++
+CC = %%CC%%
+C++ = %%CXX%%
+LD = %%CXX%%
INSTALL = /usr/bin/install
@@ -74,7 +74,7 @@
LCXXOPTS += $(LINUXOPTS)
LCOPTS += $(LINUXOPTS)
-X11DIR = /usr/X11R6
+X11DIR = ${LOCALBASE}
X11INCDIR = $(X11DIR)/include
X11LIBDIR = $(X11DIR)/lib
@@ -86,6 +86,10 @@
endif
+ifeq ($(usingFreeBSD), 1)
+LCINCS += -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
+LCXXINCS += -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
+endif
#
@@ -131,9 +135,9 @@
--- make/ivcommondefs.orig 2003-07-11 22:40:54 UTC
+++ make/ivcommondefs
@@ -131,9 +131,9 @@ endif
# Determine optimization from LIBTYPE.
#
-OPTIMIZER = -O -DNDEBUG
+OPTIMIZER = %%CXXFLAGS%% -DNDEBUG
+OPTIMIZER = -DNDEBUG
ifneq (, $(findstring debug, $(LIBTYPE)))
-OPTIMIZER = -g
+OPTIMIZER = %%CXXFLAGS%% -g -DDEBUG
+OPTIMIZER = -DDEBUG
endif
@@ -158,6 +162,10 @@
# Font library directories.
@@ -206,12 +206,6 @@ IVDEMODATADIR = $(IVDEMODIR)/data/Invent
# Locate installed Inventor libraries when linking applications.
#
+ifeq ($(usingFreeBSD), 1)
+FREETYPE=1
+endif
+
FLDIR = $(IVDEPTH)/libFL/src
FLLIB = -lFL
ifdef FREETYPE
@@ -183,7 +191,12 @@
# Inventor install directories.
#
+ifeq ($(usingFreeBSD), 1)
+IVPREFIX = ${PREFIX}
+else
IVPREFIX = /usr
+endif
+
LCXXOPTS += -DIVPREFIX=\"$(IVPREFIX)\"
LCOPTS += -DIVPREFIX=\"$(IVPREFIX)\"
@@ -213,5 +226,10 @@
else
LLDDSOOPTS += -L$(IVLIBDIR)
LLDOPTS += -L$(IVLIBDIR)
+endif
+
+ifeq ($(usingFreeBSD), 1)
-ifneq (, $(findstring debug, $(LIBTYPE)))
-LLDDSOOPTS += -L$(IVDLIBDIR)
-LLDOPTS += -L$(IVDLIBDIR)
-CXXDSOOPTS += -L$(IVDLIBDIR)
-else
-LLDDSOOPTS += -L$(IVLIBDIR)
-LLDOPTS += -L$(IVLIBDIR)
-CXXDSOOPTS += -L$(IVLIBDIR)
-endif
+LLDDSOOPTS += -L$(IVDEPTH)/lib -L$(IVDEPTH)/libSoXt
+LLDOPTS += -L$(IVDEPTH)/lib -L$(IVDEPTH)/libSoXt
+LLDDSOOPTS += -L$(IVDEPTH)/lib -L$(IVDEPTH)/libSoXt -L$(LOCALBASE)/lib
CXXDSOOPTS += -L$(IVLIBDIR)
endif
+CXXDSOOPTS += -L$(IVDEPTH)/lib -L$(IVDEPTH)/libSoXt

21
graphics/inventor/files/patch-machine.h
View File

@ -9,26 +9,7 @@
#define MACHINE_WORD_FORMAT DGL_LITTLE_ENDIAN
#define MACHINE_FLOAT_FORMAT DGL_NON_IEEE
@@ -152,6 +152,18 @@
/*
+ * Alpha under FreeBSD
+ */
+
+#if __alpha__ && __FreeBSD__
+
+#define MACHINE_WORD_FORMAT DGL_LITTLE_ENDIAN
+#define MACHINE_FLOAT_FORMAT DGL_NON_IEEE
+
+#endif /* __alpha__ && __FreeBSD__ */
+
+
+/*
* Apple Darwin (Mac OS X) machine dependent setup
*/
@@ -321,7 +333,7 @@
@@ -321,7 +321,7 @@
*/
#if MACHINE_FLOAT_FORMAT == DGL_NON_IEEE

2
graphics/inventor/files/pkg-message.in
View File

@ -3,7 +3,7 @@
Please set the environment variable FL_FONT_PATH to the directory where your
TrueType fonts are installed. If you do not set this variable, Open Inventor(TM)
will use %%PREFIX%%/lib/X11/fonts/TTF as default.
will use %%PREFIX%%/share/fonts/TTF as default.
Open Inventor (TM) needs the following TrueType fonts:

23
graphics/ipe/files/patch-ipelib__ipedoc.cpp
View File

@ -1,23 +0,0 @@
--- ipelib/ipedoc.cpp.orig 2013-03-15 13:37:02.000000000 +0000
+++ ipelib/ipedoc.cpp
@@ -41,6 +41,7 @@
#include "ipelatex.h"
#include <errno.h>
+#include <sys/param.h>
#ifdef IPE_USE_ICONV
#include <iconv.h>
@@ -850,7 +851,12 @@ int Document::runLatex(String &texLog)
if (!file)
return ErrWritingSource;
+#if defined(__FreeBSD__) || \
+ (defined(__DragonFly__) && __DragonFly_version > 300502)
+ const char *inbuf = utf8.data();
+#else
char *inbuf = (char *) utf8.data();
+#endif
size_t inbytesleft = utf8.size();
FileStream fstream(file);

14
graphics/sswf/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= sswf
PORTVERSION= 1.8.4
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@ -29,15 +29,15 @@ LIBS+= -L${LOCALBASE}/lib
OPTIONS_DEFINE= DEBUG
.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>
.if ! ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+= --disable-debug --disable-yydebug
.endif
post-configure:
@${REINPLACE_CMD} 's|ICONV_INPUT_CAST||' \
${WRKSRC}/src/lib/libsswf_tag_header.c++ \
${WRKSRC}/src/sswf/sswf_lexical.c++
.if empty(ICONV_LIB)
CONFIGURE_ARGS+=ac_cv_lib_iconv_libiconv_open=no \
ac_cv_lib_iconv_iconv_open=no
.endif
.include <bsd.port.mk>
.include <bsd.port.post.mk>

15
graphics/sswf/files/patch-include_sswf_libsswf.h
View File

@ -1,6 +1,6 @@
--- include/sswf/libsswf.h.orig Sat Aug 12 23:59:53 2006
+++ include/sswf/libsswf.h Sun Aug 13 00:00:44 2006
@@ -60,16 +60,6 @@
--- include/sswf/libsswf.h.orig 2009-03-08 04:04:03 UTC
+++ include/sswf/libsswf.h
@@ -68,16 +68,6 @@ SOFTWARE.
#include "sswf/libsswf-config.h"
@ -17,3 +17,12 @@
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
@@ -88,7 +78,7 @@ typedef unsigned int wint_t;
#define rint(x) ((double) (long) floor(x + 0.5))
#endif
-#ifdef _LIBICONV_H
+#if defined(_LIBICONV_H) && _LIBICONV_VERSION < 0x010B
#define ICONV_INPUT_CAST
#else
/* older versions of iconv() were broken in regard to the

1
graphics/swfmill/Makefile
View File

@ -18,6 +18,7 @@ LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \
USES= dos2unix iconv gmake pkgconfig libtool
USE_GNOME= libxml2 libxslt
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
DOS2UNIX_FILES= src/swft/swft_import_ttf.cpp
PLIST_FILES= bin/swfmill

2
irc/weechat-devel/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= weechat
PORTVERSION= 20140213
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= irc
MASTER_SITES= http://perturb.me.uk/distfiles/weechat-devel/ \
${MASTER_SITE_LOCAL}

63
irc/weechat-devel/files/patch-cmake-FindIconv.cmake Normal file
View File

@ -0,0 +1,63 @@
--- cmake/FindIconv.cmake.orig 2014-02-13 15:09:35 UTC
+++ cmake/FindIconv.cmake
@@ -33,39 +33,24 @@ IF(ICONV_FOUND)
set(ICONV_FIND_QUIETLY TRUE)
ENDIF(ICONV_FOUND)
-INCLUDE(CheckLibraryExists)
INCLUDE(CheckFunctionExists)
-FIND_PATH(ICONV_INCLUDE_PATH
- NAMES iconv.h
- PATHS /usr/include /usr/local/include /usr/pkg/include
-)
-
-FIND_LIBRARY(ICONV_LIBRARY
- NAMES iconv
- PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
-)
+FIND_PATH(ICONV_INCLUDE_PATH iconv.h)
IF(ICONV_INCLUDE_PATH)
- IF(ICONV_LIBRARY)
- STRING(REGEX REPLACE "/[^/]*$" "" ICONV_LIB_PATH "${ICONV_LIBRARY}")
- CHECK_LIBRARY_EXISTS(iconv libiconv_open ${ICONV_LIB_PATH} LIBICONV_OPEN_FOUND)
- CHECK_LIBRARY_EXISTS(iconv iconv_open ${ICONV_LIB_PATH} ICONV_OPEN_FOUND)
- IF(LIBICONV_OPEN_FOUND OR ICONV_OPEN_FOUND)
- SET(ICONV_FOUND TRUE)
- ENDIF(LIBICONV_OPEN_FOUND OR ICONV_OPEN_FOUND)
- ELSE(ICONV_LIBRARY)
- CHECK_FUNCTION_EXISTS(iconv_open ICONV_FOUND)
- ENDIF(ICONV_LIBRARY)
+ CHECK_FUNCTION_EXISTS(iconv ICONV_FOUND)
+ IF(NOT ICONV_FOUND)
+ FIND_LIBRARY(ICONV_LIBRARY NAMES iconv libiconv libiconv-2)
+ IF(ICONV_LIBRARY)
+ SET(ICONV_FOUND TRUE)
+ ENDIF(ICONV_LIBRARY)
+ ENDIF(NOT ICONV_FOUND)
ENDIF(ICONV_INCLUDE_PATH)
include(CheckCSourceCompiles)
-IF(ICONV_LIBRARY)
- SET(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
- SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_PATH})
-ENDIF(ICONV_LIBRARY)
-
+SET(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
+SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_PATH})
SET(CMAKE_REQUIRED_FLAGS -Werror)
check_c_source_compiles("
#include <iconv.h>
@@ -79,6 +64,10 @@ check_c_source_compiles("
return 0;
}
" ICONV_2ARG_IS_CONST)
+SET(CMAKE_REQUIRED_LIBRARIES)
+SET(CMAKE_REQUIRED_INCLUDES)
+SET(CMAKE_REQUIRED_FLAGS)
+
MARK_AS_ADVANCED(
ICONV_INCLUDE_PATH
ICONV_LIBRARY

1
irc/weechat/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= weechat
PORTVERSION= 1.1.1
PORTREVISION= 1
CATEGORIES= irc
MASTER_SITES= http://weechat.org/files/src/ \
http://perturb.me.uk/distfiles/weechat/:mandocs \

63
irc/weechat/files/patch-cmake-FindIconv.cmake Normal file
View File

@ -0,0 +1,63 @@
--- cmake/FindIconv.cmake.orig 2015-01-25 07:40:23 UTC
+++ cmake/FindIconv.cmake
@@ -33,39 +33,24 @@ if(ICONV_FOUND)
set(ICONV_FIND_QUIETLY TRUE)
endif()
-include(CheckLibraryExists)
include(CheckFunctionExists)
-find_path(ICONV_INCLUDE_PATH
- NAMES iconv.h
- PATHS /usr/include /usr/local/include /usr/pkg/include
-)
-
-find_library(ICONV_LIBRARY
- NAMES iconv
- PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
-)
+find_path(ICONV_INCLUDE_PATH iconv.h)
if(ICONV_INCLUDE_PATH)
- if(ICONV_LIBRARY)
- string(REGEX REPLACE "/[^/]*$" "" ICONV_LIB_PATH "${ICONV_LIBRARY}")
- check_library_exists(iconv libiconv_open ${ICONV_LIB_PATH} LIBICONV_OPEN_FOUND)
- check_library_exists(iconv iconv_open ${ICONV_LIB_PATH} ICONV_OPEN_FOUND)
- if(LIBICONV_OPEN_FOUND OR ICONV_OPEN_FOUND)
- set(ICONV_FOUND TRUE)
- endif()
- else()
- check_function_exists(iconv_open ICONV_FOUND)
- endif()
+ check_function_exists(iconv ICONV_FOUND)
+ if(NOT ICONV_FOUND)
+ find_library(ICONV_LIBRARY NAMES iconv libiconv libiconv-2)
+ if(ICONV_LIBRARY)
+ set(ICONV_FOUND TRUE)
+ endif(ICONV_LIBRARY)
+ endif(NOT ICONV_FOUND)
endif()
include(CheckCSourceCompiles)
-if(ICONV_LIBRARY)
- set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
- set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_PATH})
-endif()
-
+set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
+set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_PATH})
set(CMAKE_REQUIRED_FLAGS -Werror)
check_c_source_compiles("
#include <iconv.h>
@@ -80,6 +65,10 @@ check_c_source_compiles("
}
" ICONV_2ARG_IS_CONST)
+set(CMAKE_REQUIRED_LIBRARIES)
+set(CMAKE_REQUIRED_INCLUDES)
+set(CMAKE_REQUIRED_FLAGS)
+
mark_as_advanced(
ICONV_INCLUDE_PATH
ICONV_LIBRARY

22
japanese/groff/files/patch-src:libs:libgroff:encoding.cc
View File

@ -1,26 +1,6 @@
--- src/libs/libgroff/encoding.cc.bak Wed Sep 10 03:45:14 2003
+++ src/libs/libgroff/encoding.cc Wed Sep 10 11:31:11 2003
@@ -179,7 +179,8 @@
inline wchar make_wchar(unsigned char c0, encoding_istream& eis) {
wchar wc = 0;
char inbuf[8], outbuf[8];
- char *inp, *outp;
+ const char *inp;
+ char *outp;
size_t inbytesleft, outbytesleft;
int i = 0;
@@ -214,7 +215,8 @@
inline int put_wchar(wchar wc, encoding_ostream& eos) {
char inbuf[4], outbuf[4];
- char *inp, *outp;
+ const char *inp;
+ char *outp;
size_t inbytesleft, outbytesleft;
if (!is_wchar_code(wc)) {
@@ -382,6 +384,9 @@
@@ -382,6 +382,9 @@
#if HAVE_LANGINFO_CODESET
charset = nl_langinfo(CODESET);
#else

4
japanese/jd/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= jd
PORTVERSION= 2.8.8
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= japanese www
MASTER_SITES= SFJP
MASTER_SITE_SUBDIR= jd4linux/61281
@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \
libgcrypt.so:${PORTSDIR}/security/libgcrypt
USES= autoreconf iconv libtool tar:tgz
USES= autoreconf iconv:translit libtool tar:tgz
USE_GNOME= gtk20 gtkmm24 libgnomeui
GNU_CONFIGURE= yes

11
japanese/jd/files/patch-configure.ac Normal file
View File

@ -0,0 +1,11 @@
--- configure.ac.orig 2013-02-10 11:38:45 UTC
+++ configure.ac
@@ -30,7 +30,7 @@ dnl
case "${host_os}" in
freebsd*)
echo "os = freebsd"
- AC_DEFINE(ICONV_CONST, const, "iconv_const")
+ AC_DEFINE(ICONV_CONST, , "iconv_const")
AC_DEFINE(USE_MKTIME, , "use mktime")
;;
solaris*)

14
japanese/mozc-server/files/patch-base_iconv.cc
View File

@ -1,14 +0,0 @@
--- base/iconv.cc.orig 2013-03-29 13:33:43.000000000 +0900
+++ base/iconv.cc 2013-04-27 15:36:30.000000000 +0900
@@ -53,7 +53,11 @@
size_t olen_org = olen;
iconv(ic, 0, &ilen, 0, &olen); // reset iconv state
while (ilen != 0) {
+#ifdef OS_FREEBSD
+ if (iconv(ic, (const char **)(&ibuf), &ilen, &obuf, &olen)
+#else
if (iconv(ic, reinterpret_cast<char **>(&ibuf), &ilen, &obuf, &olen)
+#endif
== static_cast<size_t>(-1)) {
return false;
}

3
java/jikes/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= jikes
PORTVERSION= 1.22
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= java
MASTER_SITES= SF/${PORTNAME}/Jikes/${PORTVERSION}
@ -12,6 +12,7 @@ COMMENT= Java source to byte-code compiler made available by IBM
PLIST_SUB= PORTVERSION=${PORTVERSION}
GNU_CONFIGURE= yes
CONFIGURE_ARGS= ac_cv_search_libiconv_open=no
USES= iconv gmake tar:bzip2
CPPFLAGS+= -I${LOCALBASE}/include

11
lang/gcc5-aux/Makefile
View File

@ -27,6 +27,8 @@ BLD_TARGET= ${GARCH}-aux-${OPSYS:tl}${OSREL}
FULL_GNATGCC= NOT_SET
OS_LABEL4VERS= [${OPSYS}${GARCH:M*64:S/amd_//:S/x86_//}]
NO_MTREE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
OPTIONS_GROUP= Standard Bootstrap
OPTIONS_GROUP_Standard= FORT OBJC NLS TESTSUITE STATIC
@ -135,7 +137,7 @@ APPLY_DIFFS+= gcc-testsuite
.endif
.if ${PORT_OPTIONS:MNLS} && !${PORT_OPTIONS:MBOOTSTRAP}
USES+= gettext-tools
USES+= gettext
EXTRA_CONFIG+= --enable-nls
.else
EXTRA_CONFIG+= --disable-nls
@ -156,7 +158,14 @@ EXTRA_CONFIG+= --with-boot-ldflags=-static
# Establish Ada-aware compiler for use
ADA_CONFIGURE_ENV+= CC=${FULL_GNATGCC}
ADA_CONFIGURE_ENV+= CXX=${FULL_GNATGXX}
ADA_CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
ADA_CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
ADA_CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}"
ADA_CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
ADA_CONFIGURE_ENV+= LIBS="${LIBS}"
ADA_CONFIGURE_ENV+= PATH=${FULL_PATH}
ADA_CONFIGURE_ENV+= build_configargs="CPPFLAGS=\"${CPPFLAGS}\" LIBS=\"${LIBS}\""
ADA_CONFIGURE_ENV+= host_configargs="CPPFLAGS=\"${CPPFLAGS}\" LIBS=\"${LIBS}\""
ADA_MAKE_ENV+= PATH=${FULL_PATH}
ADA_MAKE_ENV+= LD_LIBRARY_PATH=${BUILDDIR}/gcc

2
lang/gcc5-aux/Makefile.version
View File

@ -5,7 +5,7 @@ GCC_POINT= 0.0
GCC_VERSION= ${GCC_BRANCH}.${GCC_POINT}
SNAPSHOT= 20150405
BUILD_RELEASE= no
MAIN_PR= 0
MAIN_PR= 1
UTIL_PR= 0
ARMV7_PR= 0

9
lang/pure/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= pure
PORTVERSION= 0.64
PORTREVISION= 1
CATEGORIES= lang
MASTER_SITES= https://bitbucket.org/purelang/pure-lang/downloads/
EXTRACT_ONLY= ${DISTNAME}.tar.gz
@ -97,6 +98,12 @@ SUB_LIST+= NOCLANG="@comment "
CONFIGURE_ARGS+= --without-readline
.endif
.include <bsd.port.pre.mk>
.if empty(ICONV_LIB)
CONFIGURE_ARGS+=ac_cv_lib_iconv_libiconv=no ac_cv_lib_iconv_iconv=no
.endif
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pure \
${STAGEDIR}${PREFIX}/lib/libpure.so.*.*
@ -119,4 +126,4 @@ post-install:
@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
.endif
.include <bsd.port.mk>
.include <bsd.port.post.mk>

13
mail/cone/files/patch-curses-cursesscreen.diff
View File

@ -1,13 +0,0 @@
--- curses/cursesscreen.C.orig 2011-04-04 11:58:28.000000000 +0000
+++ curses/cursesscreen.C 2011-06-27 19:41:38.000000000 +0000
@@ -73,7 +73,9 @@
while (input_buf.size() > 0)
{
- char *inbuf=&input_buf[0], *outbuf=&winput_buf[winput_cnt];
+ //char *inbuf=&input_buf[0], *outbuf=&winput_buf[winput_cnt];
+ const char *inbuf=&input_buf[0];
+ char *outbuf=&winput_buf[winput_cnt];
size_t inbytesleft=input_buf.size(),
outbytesleft=winput_buf.size()-winput_cnt;

4
mail/gnarwl/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= gnarwl
PORTVERSION= 3.6
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= mail
MASTER_SITES= http://www.onyxbits.de/sites/default/files/
@ -17,6 +17,8 @@ USES= iconv gmake tar:tgz
USE_OPENLDAP= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-docdir=${DOCSDIR}
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB}
OPTIONS_DEFINE= DOCS

2
mail/gnarwl/files/patch-Makefile.in
View File

@ -15,7 +15,7 @@
CC=@CC@
-CFLAGS=-DLDAP_DEPRECATED -DBLOCKDIR=\"$(BLOCKDIR)\" -DCFGFILE=\"$(CONFDIR)/gnarwl.cfg\" -DVERSION=\"$(VER)\" -g -Wall -O2 -I..
-LFLAGS=-lldap -lgdbm -ldl -lresolv
+CFLAGS=@CFLAGS@ -DLDAP_DEPRECATED -DBLOCKDIR=\"$(BLOCKDIR)\" -DCFGFILE=\"$(CONFDIR)/gnarwl.cfg\" -DVERSION=\"$(VER)\" -g -Wall -O2 -I.. @CPPFLAGS@
+CFLAGS=@CFLAGS@ -DLDAP_DEPRECATED -DBLOCKDIR=\"$(BLOCKDIR)\" -DCFGFILE=\"$(CONFDIR)/gnarwl.cfg\" -DVERSION=\"$(VER)\" -Wall -I.. @CPPFLAGS@
+LFLAGS=@LDFLAGS@ @LIBS@
##

3433
mail/gnarwl/files/patch-configure
View File

File diff suppressed because it is too large Load Diff

38
mail/gnarwl/files/patch-configure.ac
View File

@ -1,38 +0,0 @@
diff -u --new-file --recursive ../gnarwl-3.6.orig/configure.ac ./configure.ac
--- ../gnarwl-3.6.orig/configure.ac Mon Dec 9 17:49:38 2002
+++ ./configure.ac Mon Mar 29 14:08:48 2004
@@ -6,6 +6,17 @@
# Checks for programs.
AC_PROG_CC
+# Add some includes things
+
+if test -d /usr/local/include; then
+ CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+fi
+
+if test -d /usr/local/lib; then
+ LDFLAGS="$LDFLAGS -L/usr/local/lib"
+fi
+
+
AC_ARG_WITH(homedir,AC_HELP_STRING([--with-homedir=DIR],[Homedir for the gnarwl user]),[homedir="$withval"],[homedir="\${prefix}/var/lib/gnarwl"])
AC_ARG_WITH(docdir,AC_HELP_STRING([--with-docdir=DIR],[Where to install the docs]),docdir="$withval",docdir="\${prefix}/share/doc/packages/gnarwl")
AC_ARG_WITH(useradd_prog,AC_HELP_STRING([--with-useradd_prog=DIR],[Programm for adding users]),useradd_prog="$withval",useradd_prog="/usr/sbin/useradd")
@@ -28,7 +39,15 @@
AC_CHECK_LIB([ldap],[ldap_init])
AC_CHECK_FUNCS([ldap_set_option])
+AC_CHECK_LIB([iconv],[iconv])
AC_CHECK_FUNCS([iconv])
+
+AC_CHECK_LIB([dl],[dlopen])
+
+dnl I dunno why libresolv is needed on linux so make a klundge for that.
+
+AC_CHECK_FUNC(gethostbyname, , [AC_CHECK_LIB(resolv, gethostbyname)])
+AC_CHECK_FUNC(gethostbyname, , [AC_CHECK_LIB(nsl, gethostbyname)])
AC_DEFINE_UNQUOTED(UMASK,$permmask)
AC_DEFINE_UNQUOTED(MAXLINE,$maxline)

2
mail/libvmime/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= libvmime
PORTVERSION= 0.9.2.s20140721
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= mail
MAINTAINER= delphij@FreeBSD.org

44
mail/libvmime/files/patch-cmake__FindIconv.cmake
View File

@ -1,11 +1,35 @@
--- cmake/FindIconv.cmake.orig 2014-06-30 22:48:42.000000000 +0200
+++ cmake/FindIconv.cmake 2014-07-22 12:50:55.000000000 +0200
@@ -18,7 +18,7 @@
IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c HINTS "/opt/local/lib")
ELSE()
- FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
+ FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv c libiconv libiconv-2)
ENDIF()
--- cmake/FindIconv.cmake.orig 2014-06-30 20:48:42 UTC
+++ cmake/FindIconv.cmake
@@ -7,6 +7,7 @@
# ICONV_SECOND_ARGUMENT_IS_CONST - the second argument for iconv() is const
#
include(CheckCXXSourceCompiles)
+include(CheckFunctionExists)
IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
# Already in cache, be silent
@@ -15,15 +16,15 @@ ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRA
FIND_PATH(ICONV_INCLUDE_DIR iconv.h)
-IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c HINTS "/opt/local/lib")
-ELSE()
- FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
-ENDIF()
-
-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})

11
mail/mmr/files/patch-mime.cpp
View File

@ -1,11 +0,0 @@
--- mime.cpp.orig Tue Jan 24 16:58:33 2006
+++ mime.cpp Sun Jul 9 23:46:48 2006
@@ -110,7 +110,7 @@
}
size_t available = obytesleft;
while ( ibytesleft > 0 ) {
- iconv(iconv_ctx, &ibuf, &ibytesleft, &obuf, &obytesleft);
+ iconv(iconv_ctx, (const char **)&ibuf, &ibytesleft, &obuf, &obytesleft);
if ( ibytesleft > 0 ) {
if ( errno == EILSEQ ) {

9
mail/normalizemime/files/patch-normalizemime.cc
View File

@ -9,15 +9,6 @@
#include <string.h>
#include <stdlib.h>
#include <regex.h>
@@ -500,7 +502,7 @@
char *obuf = buf;
memcpy (icopy, message.c_str(), in_left);
message.erase ();
- char *ibuf = icopy;
+ const char *ibuf = icopy;
while (in_left > 0) {
if ((size_t)(-1) == iconv (ic, &ibuf, &in_left, &obuf, &out_left)) {
@@ -1493,6 +1495,7 @@
"X-Spam-", // Added by SpamAssasin for example
"X-CRM114-", // Added by CRM114

7
multimedia/ffmpeg2theora/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= ffmpeg2theora
PORTVERSION= 0.29
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= http://v2v.cc/~j/ffmpeg2theora/downloads/
@ -17,10 +17,11 @@ LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
libtheora.so:${PORTSDIR}/multimedia/libtheora
USES= iconv pkgconfig scons tar:bzip2
MAKE_ENV= APPEND_CCFLAGS="${CPPFLAGS}" APPEND_LINKFLAGS="${LDFLAGS}"
MAKE_ARGS= APPEND_CCFLAGS="${CFLAGS} ${CPPFLAGS}" \
APPEND_LINKFLAGS="${LDFLAGS} ${LIBS}"
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB}
PLIST_FILES= bin/ffmpeg2theora man/man1/ffmpeg2theora.1.gz

17
multimedia/ffmpeg2theora/files/patch-SConstruct
View File

@ -1,6 +1,6 @@
--- SConstruct.orig 2012-06-26 02:15:16.000000000 +0900
+++ SConstruct 2012-07-04 01:17:19.000000000 +0900
@@ -37,7 +37,7 @@
--- SConstruct.orig 2012-06-25 17:15:16 UTC
+++ SConstruct
@@ -37,7 +37,7 @@ opts.AddVariables(
BoolVariable('libkate', 'enable libkate support', 1),
BoolVariable('crossmingw', 'Set to 1 for crosscompile with mingw', 0)
)
@ -9,7 +9,7 @@
Help(opts.GenerateHelpText(env))
pkg_flags="--cflags --libs"
@@ -151,7 +151,6 @@
@@ -151,7 +151,6 @@ if not env.GetOption('clean'):
"libavcodec >= 52.30.0",
"libpostproc",
"libswscale",
@ -17,9 +17,12 @@
"libavutil",
]
if os.path.exists("./ffmpeg"):
@@ -203,6 +202,7 @@
if conf.CheckLib('iconv'):
env.Append(LIBS=['iconv'])
@@ -200,9 +199,8 @@ if not env.GetOption('clean'):
env.Append(CCFLAGS=[
'-DHAVE_ICONV'
])
- if conf.CheckLib('iconv'):
- env.Append(LIBS=['iconv'])
+ env.Append(LIBS=['m'])
if env['crossmingw']:

11
multimedia/ffmpeg2theora/files/patch-src-subtitles.c Normal file
View File

@ -0,0 +1,11 @@
--- src/subtitles.c.orig 2011-09-15 20:20:46 UTC
+++ src/subtitles.c
@@ -284,7 +284,7 @@ static char *convert_subtitle_to_utf8(co
return NULL;
}
outptr=newtext;
- if (iconv(cd, &inptr, &insz, &outptr, &outsz) < 0) {
+ if (iconv(cd, &inptr, &insz, &outptr, &outsz) == (size_t)-1) {
warn(frontend, NULL, 0, "Failed to convert text to UTF-8\n");
free(newtext);
newtext = NULL;

12
multimedia/naludump/files/patch-libsi-si.c
View File

@ -10,15 +10,3 @@
#include <stdlib.h> // for broadcaster stupidity workaround
#include <string.h>
#include "descriptor.h"
@@ -381,7 +383,11 @@ bool convertCharacterTable(const char *f
if (SystemCharacterTable) {
iconv_t cd = iconv_open(SystemCharacterTable, fromCode);
if (cd != (iconv_t)-1) {
+#ifdef __FreeBSD__
+ const char *fromPtr = from;
+#else
char *fromPtr = (char *)from;
+#endif
while (fromLength > 0 && toLength > 1) {
if (iconv(cd, &fromPtr, &fromLength, &to, &toLength) == size_t(-1)) {
if (errno == EILSEQ) {

15
multimedia/transcode/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= transcode
PORTVERSION= 1.1.7
PORTREVISION= 21
PORTREVISION= 22
CATEGORIES= multimedia
MASTER_SITES= http://cdn.bitbucket.org/france/transcode-tcforge/downloads/
@ -21,7 +21,7 @@ WANT_SDL= yes
WANT_GNOME= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-oss
CPPFLAGS+= -isystem ${LOCALBASE}/include
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
@ -110,12 +110,17 @@ JPEG_CONFIGURE_ON= --with-libjpeg-prefix=${LOCALBASE}
ICONV_USES= iconv
ICONV_CONFIGURE_ENABLE= iconv
ICONV_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG}
ICONV_CONFIGURE_ON= --with-iconv-prefix=${ICONV_PREFIX}
V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
V4L_CONFIGURE_ENABLE= v4l
.include <bsd.port.options.mk>
.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
post-extract:
@${RM} ${WRKSRC}/import/v4l/videodev*
@ -153,4 +158,4 @@ post-stage:
@(cd ${STAGEDIR}${PREFIX} && \
${FIND} -s lib/transcode -type f -or -type l >> ${TMPPLIST})
.include <bsd.port.mk>
.include <bsd.port.post.mk>

24
multimedia/vdr/files/patch-vdr-1.7.28_FreeBSD
View File

@ -711,18 +711,6 @@ diff -u -r1.1.1.5 -r1.8
LOG_ERROR_STR(*buf);
close(f);
remove(buf);
@@ -818,7 +846,11 @@
const char *cCharSetConv::Convert(const char *From, char *To, size_t ToLength)
{
if (cd != (iconv_t)-1 && From && *From) {
+#ifdef __FreeBSD__
+ const char *FromPtr = (char *)From;
+#else
char *FromPtr = (char *)From;
+#endif
size_t FromLength = strlen(From);
char *ToPtr = To;
if (!ToPtr) {
@@ -920,7 +952,11 @@
return cString(buffer, true);
}
@ -1003,18 +991,6 @@ diff -u -r1.1.1.4 -r1.7
#include <stdlib.h> // for broadcaster stupidity workaround
#include <string.h>
#include "descriptor.h"
@@ -381,7 +383,11 @@
if (SystemCharacterTable) {
iconv_t cd = iconv_open(SystemCharacterTable, fromCode);
if (cd != (iconv_t)-1) {
+#ifdef __FreeBSD__
+ const char *fromPtr = from;
+#else
char *fromPtr = (char *)from;
+#endif
while (fromLength > 0 && toLength > 1) {
if (iconv(cd, &fromPtr, &fromLength, &to, &toLength) == size_t(-1)) {
if (errno == EILSEQ) {
--- PLUGINS/src/dvbsddevice/Makefile.orig
+++ PLUGINS/src/dvbsddevice/Makefile
@@ -45,7 +45,7 @@ PACKAGE = vdr-$(ARCHIVE)

1
net-im/centerim-devel/Makefile
View File

@ -21,6 +21,7 @@ USE_PERL5= run
USE_OPENSSL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-ssl --with-openssl
CPPFLAGS+= -I${LOCALBASE}/include
CONFLICTS= centericq-[0-9]* centerim-[0-9]*
SHEBANG_FILES= misc/cimformathistory misc/cimextracthistory.pl

13
net-im/gale/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= gale
PORTVERSION= 0.99f
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= net-im
MASTER_SITES= http://download.ofb.net/${PORTNAME}/
DISTNAME= ${PORTNAME}-${PORTVERSION}ruit
@ -22,14 +22,13 @@ USE_OPENSSL= yes
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE= yes
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib \
CPPFLAGS+= -I${LOCALBASE}/include \
-I${LOCALBASE}/include/w3c-libwww
LDFLAGS+= -L${LOCALBASE}/lib
LIBS+= -L${LOCALBASE}/lib
# cheesy hack - test-oop doesn't build, but we don't care.
pre-configure:
${REINPLACE_CMD} -e 's/\(^noinst_PROGRAMS =.*\)test-oop/\1/' \
post-patch:
@${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's/\(^noinst_PROGRAMS =.*\)test-oop/\1/' \
${WRKSRC}/liboop/Makefile.in
.include <bsd.port.mk>

Some files were not shown because too many files have changed in this diff Show More