diff options
| author | tijl <tijl@FreeBSD.org> | 2015-04-15 08:20:27 +0000 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2015-04-15 08:20:27 +0000 |
| commit | ff176a3eb176ed56a19a9ec55117606d2c0c34a4 (patch) | |
| tree | eec3d608e84e79f0187985e5a1e29cd4f04f13eb | |
| parent | f04a4518f0a5a0ff6bd706dc17a0016965d1ee39 (diff) | |
| download | FreeBSD-ports-ff176a3eb176ed56a19a9ec55117606d2c0c34a4.zip FreeBSD-ports-ff176a3eb176ed56a19a9ec55117606d2c0c34a4.tar.gz | |
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)
147 files changed, 1254 insertions, 4302 deletions
diff --git a/Mk/Uses/iconv.mk b/Mk/Uses/iconv.mk index 2595bf0..d574f74 100644 --- a/Mk/Uses/iconv.mk +++ b/Mk/Uses/iconv.mk @@ -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 diff --git a/archivers/unalz/files/patch-UnAlz.cpp b/archivers/unalz/files/patch-UnAlz.cpp index f0cd87c..d440e91 100644 --- a/archivers/unalz/files/patch-UnAlz.cpp +++ b/archivers/unalz/files/patch-UnAlz.cpp @@ -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) { diff --git a/archivers/unrar-iconv/files/patch-iconv b/archivers/unrar-iconv/files/patch-iconv index 39285ab..5c51296e 100644 --- a/archivers/unrar-iconv/files/patch-iconv +++ b/archivers/unrar-iconv/files/patch-iconv @@ -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); diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile index fc8b84a..0f8c43b 100644 --- a/audio/cmus/Makefile +++ b/audio/cmus/Makefile @@ -3,6 +3,7 @@ PORTNAME= cmus PORTVERSION= 2.6.0 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= h.skuhra@gmail.com diff --git a/audio/cmus/files/patch-scripts-checks.sh b/audio/cmus/files/patch-scripts-checks.sh new file mode 100644 index 0000000..15b27cb --- /dev/null +++ b/audio/cmus/files/patch-scripts-checks.sh @@ -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 diff --git a/audio/id3mtag/files/patch-charconv.cpp b/audio/id3mtag/files/patch-charconv.cpp new file mode 100644 index 0000000..828a500 --- /dev/null +++ b/audio/id3mtag/files/patch-charconv.cpp @@ -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) diff --git a/audio/mp3unicode/files/patch-mp3unicode.cpp b/audio/mp3unicode/files/patch-mp3unicode.cpp deleted file mode 100644 index 164200b..0000000 --- a/audio/mp3unicode/files/patch-mp3unicode.cpp +++ /dev/null @@ -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 diff --git a/audio/tagutil/Makefile b/audio/tagutil/Makefile index 7449c9e..0fa64c6 100644 --- a/audio/tagutil/Makefile +++ b/audio/tagutil/Makefile @@ -2,7 +2,7 @@ PORTNAME= tagutil PORTVERSION= 3.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MAINTAINER= alex@kaworu.ch diff --git a/audio/tagutil/files/patch-FindIconv.cmake b/audio/tagutil/files/patch-FindIconv.cmake new file mode 100644 index 0000000..2cbf4f8 --- /dev/null +++ b/audio/tagutil/files/patch-FindIconv.cmake @@ -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}) diff --git a/audio/xmms-wavpack/Makefile b/audio/xmms-wavpack/Makefile index c95b6b4..20e3acc 100644 --- a/audio/xmms-wavpack/Makefile +++ b/audio/xmms-wavpack/Makefile @@ -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 diff --git a/audio/xmms-wavpack/files/patch-src_libwavpack.cpp b/audio/xmms-wavpack/files/patch-src_libwavpack.cpp index 276ada4..1987783 100644 --- a/audio/xmms-wavpack/files/patch-src_libwavpack.cpp +++ b/audio/xmms-wavpack/files/patch-src_libwavpack.cpp @@ -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 diff --git a/chinese/cconv/Makefile b/chinese/cconv/Makefile index 8ffa2ac..1da095d 100644 --- a/chinese/cconv/Makefile +++ b/chinese/cconv/Makefile @@ -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> diff --git a/chinese/cconv/files/patch-configure b/chinese/cconv/files/patch-configure new file mode 100644 index 0000000..1af92b8 --- /dev/null +++ b/chinese/cconv/files/patch-configure @@ -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="" diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile index 0687099..f164eb4 100644 --- a/comms/scmxx/Makefile +++ b/comms/scmxx/Makefile @@ -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> diff --git a/comms/telldus-core/Makefile b/comms/telldus-core/Makefile index 6cb336b..3efde17 100644 --- a/comms/telldus-core/Makefile +++ b/comms/telldus-core/Makefile @@ -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 diff --git a/comms/telldus-core/files/patch-common-CMakeLists.txt b/comms/telldus-core/files/patch-common-CMakeLists.txt deleted file mode 100644 index d8ee699..0000000 --- a/comms/telldus-core/files/patch-common-CMakeLists.txt +++ /dev/null @@ -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 ) diff --git a/comms/telldus-core/files/patch-common-Strings.cpp b/comms/telldus-core/files/patch-common-Strings.cpp new file mode 100644 index 0000000..2f3c686 --- /dev/null +++ b/comms/telldus-core/files/patch-common-Strings.cpp @@ -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); diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index db0824d..be7d261 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -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 diff --git a/converters/libiconv/files/patch-include-iconv.h.in b/converters/libiconv/files/patch-include-iconv.h.in new file mode 100644 index 0000000..5f5b86c --- /dev/null +++ b/converters/libiconv/files/patch-include-iconv.h.in @@ -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 */ diff --git a/converters/wkhtmltopdf/Makefile b/converters/wkhtmltopdf/Makefile index 1ca2144..a32636c 100644 --- a/converters/wkhtmltopdf/Makefile +++ b/converters/wkhtmltopdf/Makefile @@ -3,6 +3,7 @@ PORTNAME= wkhtmltopdf PORTVERSION= 0.12.2.1 +PORTREVISION= 1 CATEGORIES= converters MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION} diff --git a/converters/wkhtmltopdf/files/patch-config.tests_unix_compile.test b/converters/wkhtmltopdf/files/patch-config.tests_unix_compile.test new file mode 100644 index 0000000..2046425 --- /dev/null +++ b/converters/wkhtmltopdf/files/patch-config.tests_unix_compile.test @@ -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 diff --git a/converters/wkhtmltopdf/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp b/converters/wkhtmltopdf/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp new file mode 100644 index 0000000..5f5c16e --- /dev/null +++ b/converters/wkhtmltopdf/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp @@ -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); diff --git a/converters/wkhtmltopdf/files/patch-src_corelib_codecs_qiconvcodec.cpp b/converters/wkhtmltopdf/files/patch-src_corelib_codecs_qiconvcodec.cpp new file mode 100644 index 0000000..99bfac1 --- /dev/null +++ b/converters/wkhtmltopdf/files/patch-src_corelib_codecs_qiconvcodec.cpp @@ -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(); diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile index c5821a7..8ed1593 100644 --- a/databases/kbibtex/Makefile +++ b/databases/kbibtex/Makefile @@ -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 \ diff --git a/databases/kbibtex/files/patch-src__libkbibtexio__iconvlatex.cpp b/databases/kbibtex/files/patch-src__libkbibtexio__iconvlatex.cpp deleted file mode 100644 index 1769cd6..0000000 --- a/databases/kbibtex/files/patch-src__libkbibtexio__iconvlatex.cpp +++ /dev/null @@ -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 diff --git a/databases/mysql-workbench52/files/patch-plugins__migration__copytable__copytable.cpp b/databases/mysql-workbench52/files/patch-plugins__migration__copytable__copytable.cpp deleted file mode 100644 index f8e0d2f..0000000 --- a/databases/mysql-workbench52/files/patch-plugins__migration__copytable__copytable.cpp +++ /dev/null @@ -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); diff --git a/databases/p5-qdbm/Makefile b/databases/p5-qdbm/Makefile index 6fb2cd6..43237ab 100644 --- a/databases/p5-qdbm/Makefile +++ b/databases/p5-qdbm/Makefile @@ -1,6 +1,7 @@ # Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ +PORTREVISION= 2 PKGNAMEPREFIX= p5- COMMENT= Perl API for QDBM diff --git a/databases/p5-qdbm/files/patch-Makefile.in b/databases/p5-qdbm/files/patch-Makefile.in index c416682..7e2154a 100644 --- a/databases/p5-qdbm/files/patch-Makefile.in +++ b/databases/p5-qdbm/files/patch-Makefile.in @@ -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 diff --git a/databases/qdbm-plus/Makefile b/databases/qdbm-plus/Makefile index 057d5d8..b9bd81b 100644 --- a/databases/qdbm-plus/Makefile +++ b/databases/qdbm-plus/Makefile @@ -1,7 +1,7 @@ # Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 2 PKGNAMESUFFIX= -plus COMMENT= C++ API for QDBM diff --git a/databases/qdbm/files/patch-plus__Makefile.in b/databases/qdbm-plus/files/patch-Makefile.in index 35e31fe..17d294b 100644 --- a/databases/qdbm/files/patch-plus__Makefile.in +++ b/databases/qdbm-plus/files/patch-Makefile.in @@ -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) \ diff --git a/databases/qdbm/Makefile b/databases/qdbm/Makefile index d13a66e..e7b94b2 100644 --- a/databases/qdbm/Makefile +++ b/databases/qdbm/Makefile @@ -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> - -.if !defined(SLAVEPORT) && defined(WITH_DEBUG) -CONFIGURE_ARGS+= --enable-debug -.endif +.endif # !defined(SLAVEPORT) -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/qdbm/files/patch-Makefile.in b/databases/qdbm/files/patch-Makefile.in index e6322eb..1eeb64f 100644 --- a/databases/qdbm/files/patch-Makefile.in +++ b/databases/qdbm/files/patch-Makefile.in @@ -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' diff --git a/databases/qdbm/files/patch-java__Makefile.in b/databases/qdbm/files/patch-java__Makefile.in deleted file mode 100644 index 82ec102..0000000 --- a/databases/qdbm/files/patch-java__Makefile.in +++ /dev/null @@ -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) diff --git a/databases/ruby-qdbm/Makefile b/databases/ruby-qdbm/Makefile index 9e7685a..9e8a6e8 100644 --- a/databases/ruby-qdbm/Makefile +++ b/databases/ruby-qdbm/Makefile @@ -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 diff --git a/deskutils/fbreader/Makefile b/deskutils/fbreader/Makefile index 84c6970..96db229 100644 --- a/deskutils/fbreader/Makefile +++ b/deskutils/fbreader/Makefile @@ -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},' \ diff --git a/devel/courier-unicode/Makefile b/devel/courier-unicode/Makefile index d299c21..4c38931 100644 --- a/devel/courier-unicode/Makefile +++ b/devel/courier-unicode/Makefile @@ -2,6 +2,7 @@ PORTNAME= courier-unicode PORTVERSION= 1.1 +PORTREVISION= 1 CATEGORIES= devel mail MASTER_SITES= SF/courier/${PORTNAME}/${PORTVERSION} @@ -20,4 +21,7 @@ INSTALL_TARGET= install-strip CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +post-patch: + @${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure + .include <bsd.port.mk> diff --git a/devel/ice/files/patch-cpp-include-Ice-IconvStringConverter.h b/devel/ice/files/patch-cpp-include-Ice-IconvStringConverter.h new file mode 100644 index 0000000..24c48af --- /dev/null +++ b/devel/ice/files/patch-cpp-include-Ice-IconvStringConverter.h @@ -0,0 +1,11 @@ +--- cpp/include/Ice/IconvStringConverter.h.orig 2013-10-04 15:48:14 UTC ++++ cpp/include/Ice/IconvStringConverter.h +@@ -20,7 +20,7 @@ + #include <langinfo.h> + #endif + +-#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) || defined(__FreeBSD__) ++#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) + // + // See http://sourceware.org/bugzilla/show_bug.cgi?id=2962 + // diff --git a/devel/libisofs/Makefile b/devel/libisofs/Makefile index 2efb528..1b1ba7d 100644 --- a/devel/libisofs/Makefile +++ b/devel/libisofs/Makefile @@ -3,7 +3,7 @@ PORTNAME= libisofs PORTVERSION= 1.3.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://files.libburnia-project.org/releases/ @@ -19,4 +19,7 @@ GNU_CONFIGURE= yes USES= iconv libtool USE_LDCONFIG= yes +post-patch: + @${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure + .include <bsd.port.mk> diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile index c3b1d1e..d086ff5 100644 --- a/devel/qt4-corelib/Makefile +++ b/devel/qt4-corelib/Makefile @@ -3,7 +3,7 @@ PORTNAME= corelib DISTVERSION= ${QT4_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-corelib/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp b/devel/qt4-corelib/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp new file mode 100644 index 0000000..8cffda4 --- /dev/null +++ b/devel/qt4-corelib/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp @@ -0,0 +1,11 @@ +--- config.tests/unix/gnu-libiconv/gnu-libiconv.cpp.orig 2014-04-10 18:37:08 UTC ++++ config.tests/unix/gnu-libiconv/gnu-libiconv.cpp +@@ -48,7 +48,7 @@ int main(int, char **) + { + iconv_t x = iconv_open("", ""); + +- const char *inp; ++ char *inp; + char *outp; + size_t inbytes, outbytes; + iconv(x, &inp, &inbytes, &outp, &outbytes); diff --git a/devel/qt4-corelib/files/patch-src_corelib_codecs_qiconvcodec.cpp b/devel/qt4-corelib/files/patch-src_corelib_codecs_qiconvcodec.cpp new file mode 100644 index 0000000..6a7c231 --- /dev/null +++ b/devel/qt4-corelib/files/patch-src_corelib_codecs_qiconvcodec.cpp @@ -0,0 +1,39 @@ +--- src/corelib/codecs/qiconvcodec.cpp.orig 2014-04-10 18:37:11 UTC ++++ src/corelib/codecs/qiconvcodec.cpp +@@ -219,12 +219,7 @@ QString QIconvCodec::convertToUnicode(co + IconvState *state = *pstate; + size_t inBytesLeft = len; + // best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM +-#ifdef GNU_LIBICONV +- // GNU doesn't disagree with POSIX :/ +- const char *inBytes = chars; +-#else + char *inBytes = const_cast<char *>(chars); +-#endif + + QByteArray in; + if (remainingCount) { +@@ -318,11 +313,7 @@ static bool setByteOrder(iconv_t cd) + size_t outBytesLeft = sizeof buf; + size_t inBytesLeft = sizeof bom; + +-#if defined(GNU_LIBICONV) +- const char **inBytesPtr = const_cast<const char **>(&inBytes); +-#else + char **inBytesPtr = &inBytes; +-#endif + + if (iconv(cd, inBytesPtr, &inBytesLeft, &outBytes, &outBytesLeft) == (size_t) -1) { + return false; +@@ -338,11 +329,7 @@ QByteArray QIconvCodec::convertFromUnico + char *outBytes; + size_t inBytesLeft; + +-#if defined(GNU_LIBICONV) +- const char **inBytesPtr = const_cast<const char **>(&inBytes); +-#else + char **inBytesPtr = &inBytes; +-#endif + + IconvState *temporaryState = 0; + QThreadStorage<QIconvCodec::IconvState *> *ts = fromUnicodeState(); diff --git a/devel/sdl20/Makefile b/devel/sdl20/Makefile index fc62861..a4f0c31 100644 --- a/devel/sdl20/Makefile +++ b/devel/sdl20/Makefile @@ -2,7 +2,7 @@ PORTNAME= sdl2 PORTVERSION= 2.0.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= http://www.libsdl.org/release/ DISTNAME= SDL2-${PORTVERSION} @@ -171,6 +171,7 @@ CONFIGURE_ARGS+= --disable-video-x11 \ .endif post-patch: - @${REINPLACE_CMD} -e '/ CheckInputEvents$$/d' ${WRKSRC}/configure + @${REINPLACE_CMD} -e '/ CheckInputEvents$$/d' \ + -e 's/-liconv/${ICONV_LIB}/g' ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/editors/ted/Makefile b/editors/ted/Makefile index b9e71d6..8c3f3dc 100644 --- a/editors/ted/Makefile +++ b/editors/ted/Makefile @@ -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> diff --git a/editors/ted/files/patch-textEncoding-sioIconv.c b/editors/ted/files/patch-textEncoding-sioIconv.c new file mode 100644 index 0000000..aeeea7b --- /dev/null +++ b/editors/ted/files/patch-textEncoding-sioIconv.c @@ -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 */ diff --git a/emulators/dolphin-emu/files/patch-Source-Core-Common-Src-StringUtil.cpp b/emulators/dolphin-emu/files/patch-Source-Core-Common-Src-StringUtil.cpp deleted file mode 100644 index 4616b2c..0000000 --- a/emulators/dolphin-emu/files/patch-Source-Core-Common-Src-StringUtil.cpp +++ /dev/null @@ -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) diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp new file mode 100644 index 0000000..5e2439b --- /dev/null +++ b/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp @@ -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); diff --git a/finance/libofx/files/patch-lib__ofx_preproc.cpp b/finance/libofx/files/patch-lib__ofx_preproc.cpp deleted file mode 100644 index 18a35c2..0000000 --- a/finance/libofx/files/patch-lib__ofx_preproc.cpp +++ /dev/null @@ -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(); diff --git a/ftp/pure-ftpd/Makefile b/ftp/pure-ftpd/Makefile index 78e19bd..6adad29 100644 --- a/ftp/pure-ftpd/Makefile +++ b/ftp/pure-ftpd/Makefile @@ -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> diff --git a/games/allacrost/Makefile b/games/allacrost/Makefile index 07de47e..dd5d3d1 100644 --- a/games/allacrost/Makefile +++ b/games/allacrost/Makefile @@ -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 diff --git a/games/allacrost/files/patch-src-utils.cpp b/games/allacrost/files/patch-src-utils.cpp index 3a19664..7c076fa 100644 --- a/games/allacrost/files/patch-src-utils.cpp +++ b/games/allacrost/files/patch-src-utils.cpp @@ -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 diff --git a/games/cuyo/files/patch-src__cuyointl.cpp b/games/cuyo/files/patch-src__cuyointl.cpp deleted file mode 100644 index 9302f90..0000000 --- a/games/cuyo/files/patch-src__cuyointl.cpp +++ /dev/null @@ -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) { diff --git a/games/hex-a-hop/Makefile b/games/hex-a-hop/Makefile index 2ec960f..512d351 100644 --- a/games/hex-a-hop/Makefile +++ b/games/hex-a-hop/Makefile @@ -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 diff --git a/games/hex-a-hop/files/patch-src-text.cpp b/games/hex-a-hop/files/patch-src-text.cpp deleted file mode 100644 index 8bfce50..0000000 --- a/games/hex-a-hop/files/patch-src-text.cpp +++ /dev/null @@ -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); diff --git a/games/ldmud/Makefile b/games/ldmud/Makefile index 5cb716d..bee0b0c 100644 --- a/games/ldmud/Makefile +++ b/games/ldmud/Makefile @@ -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/ \ diff --git a/games/ldmud/files/patch-Makefile.in b/games/ldmud/files/patch-Makefile.in index 5c043c2..a79cd66 100644 --- a/games/ldmud/files/patch-Makefile.in +++ b/games/ldmud/files/patch-Makefile.in @@ -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 diff --git a/games/ldmud/files/patch-configure b/games/ldmud/files/patch-configure new file mode 100644 index 0000000..d54d1cf --- /dev/null +++ b/games/ldmud/files/patch-configure @@ -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 diff --git a/games/pokerth/files/patch-src-core-linux-convhelper.cpp b/games/pokerth/files/patch-src-core-linux-convhelper.cpp index d5e9c57..8b29584 100644 --- a/games/pokerth/files/patch-src-core-linux-convhelper.cpp +++ b/games/pokerth/files/patch-src-core-linux-convhelper.cpp @@ -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; diff --git a/games/valyriatear/files/patch-src-utils-ustring.cpp b/games/valyriatear/files/patch-src-utils-ustring.cpp new file mode 100644 index 0000000..b88fe70 --- /dev/null +++ b/games/valyriatear/files/patch-src-utils-ustring.cpp @@ -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 diff --git a/graphics/cegui/files/patch-cegui__src__IconvStringTranscoder.cpp b/graphics/cegui/files/patch-cegui__src__IconvStringTranscoder.cpp deleted file mode 100644 index 3b7653f..0000000 --- a/graphics/cegui/files/patch-cegui__src__IconvStringTranscoder.cpp +++ /dev/null @@ -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 - } - - //------------------------------------------------------------------------// diff --git a/graphics/iccexamin/files/patch-icc_gl.cpp b/graphics/iccexamin/files/patch-icc_gl.cpp deleted file mode 100644 index 0a028fb..0000000 --- a/graphics/iccexamin/files/patch-icc_gl.cpp +++ /dev/null @@ -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 ); diff --git a/graphics/inventor/Makefile b/graphics/inventor/Makefile index 3940065..0c029d4 100644 --- a/graphics/inventor/Makefile +++ b/graphics/inventor/Makefile @@ -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 diff --git a/graphics/inventor/files/patch-SoText2.c++ b/graphics/inventor/files/patch-SoText2.c++ index bd890bf..4258bdd 100644 --- a/graphics/inventor/files/patch-SoText2.c++ +++ b/graphics/inventor/files/patch-SoText2.c++ @@ -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: diff --git a/graphics/inventor/files/patch-SoText3.c++ b/graphics/inventor/files/patch-SoText3.c++ deleted file mode 100644 index e5be93d..0000000 --- a/graphics/inventor/files/patch-SoText3.c++ +++ /dev/null @@ -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"); diff --git a/graphics/inventor/files/patch-TextWrapper.c++ b/graphics/inventor/files/patch-TextWrapper.c++ deleted file mode 100644 index 29a30fc..0000000 --- a/graphics/inventor/files/patch-TextWrapper.c++ +++ /dev/null @@ -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; diff --git a/graphics/inventor/files/patch-ivcommondefs b/graphics/inventor/files/patch-ivcommondefs index c894661..52404fc 100644 --- a/graphics/inventor/files/patch-ivcommondefs +++ b/graphics/inventor/files/patch-ivcommondefs @@ -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 diff --git a/graphics/inventor/files/patch-machine.h b/graphics/inventor/files/patch-machine.h index a18f79e..1279ab8 100644 --- a/graphics/inventor/files/patch-machine.h +++ b/graphics/inventor/files/patch-machine.h @@ -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 diff --git a/graphics/inventor/files/pkg-message.in b/graphics/inventor/files/pkg-message.in index c3dbe6b..0eb31ad 100644 --- a/graphics/inventor/files/pkg-message.in +++ b/graphics/inventor/files/pkg-message.in @@ -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: diff --git a/graphics/ipe/files/patch-ipelib__ipedoc.cpp b/graphics/ipe/files/patch-ipelib__ipedoc.cpp deleted file mode 100644 index a0317b4..0000000 --- a/graphics/ipe/files/patch-ipelib__ipedoc.cpp +++ /dev/null @@ -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); diff --git a/graphics/sswf/Makefile b/graphics/sswf/Makefile index 347d7e8..ed7c8f8 100644 --- a/graphics/sswf/Makefile +++ b/graphics/sswf/Makefile @@ -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> diff --git a/graphics/sswf/files/patch-include_sswf_libsswf.h b/graphics/sswf/files/patch-include_sswf_libsswf.h index 5c590d7..818cff7 100644 --- a/graphics/sswf/files/patch-include_sswf_libsswf.h +++ b/graphics/sswf/files/patch-include_sswf_libsswf.h @@ -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 diff --git a/graphics/swfmill/Makefile b/graphics/swfmill/Makefile index 9158c2d..12fde2c 100644 --- a/graphics/swfmill/Makefile +++ b/graphics/swfmill/Makefile @@ -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 diff --git a/irc/weechat-devel/Makefile b/irc/weechat-devel/Makefile index a7ffe89..274399b 100644 --- a/irc/weechat-devel/Makefile +++ b/irc/weechat-devel/Makefile @@ -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} diff --git a/irc/weechat-devel/files/patch-cmake-FindIconv.cmake b/irc/weechat-devel/files/patch-cmake-FindIconv.cmake new file mode 100644 index 0000000..a40e3d9 --- /dev/null +++ b/irc/weechat-devel/files/patch-cmake-FindIconv.cmake @@ -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 diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile index b27ee09..0371cc0 100644 --- a/irc/weechat/Makefile +++ b/irc/weechat/Makefile @@ -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 \ diff --git a/irc/weechat/files/patch-cmake-FindIconv.cmake b/irc/weechat/files/patch-cmake-FindIconv.cmake new file mode 100644 index 0000000..ae48f76 --- /dev/null +++ b/irc/weechat/files/patch-cmake-FindIconv.cmake @@ -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 diff --git a/japanese/groff/files/patch-src:libs:libgroff:encoding.cc b/japanese/groff/files/patch-src:libs:libgroff:encoding.cc index 9c9bc2c..4318fd0 100644 --- a/japanese/groff/files/patch-src:libs:libgroff:encoding.cc +++ b/japanese/groff/files/patch-src:libs:libgroff:encoding.cc @@ -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 diff --git a/japanese/jd/Makefile b/japanese/jd/Makefile index 8a75986..eba692a 100644 --- a/japanese/jd/Makefile +++ b/japanese/jd/Makefile @@ -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 diff --git a/japanese/jd/files/patch-configure.ac b/japanese/jd/files/patch-configure.ac new file mode 100644 index 0000000..ba33e83 --- /dev/null +++ b/japanese/jd/files/patch-configure.ac @@ -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*) diff --git a/japanese/mozc-server/files/patch-base_iconv.cc b/japanese/mozc-server/files/patch-base_iconv.cc deleted file mode 100644 index 4ac94c3..0000000 --- a/japanese/mozc-server/files/patch-base_iconv.cc +++ /dev/null @@ -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; - } diff --git a/java/jikes/Makefile b/java/jikes/Makefile index bba5ba3..569ec45 100644 --- a/java/jikes/Makefile +++ b/java/jikes/Makefile @@ -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 diff --git a/lang/gcc5-aux/Makefile b/lang/gcc5-aux/Makefile index 8dabf63..82fe944 100644 --- a/lang/gcc5-aux/Makefile +++ b/lang/gcc5-aux/Makefile @@ -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 diff --git a/lang/gcc5-aux/Makefile.version b/lang/gcc5-aux/Makefile.version index 7b770df..2b55fca 100644 --- a/lang/gcc5-aux/Makefile.version +++ b/lang/gcc5-aux/Makefile.version @@ -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 diff --git a/lang/pure/Makefile b/lang/pure/Makefile index cedf158..dde7765 100644 --- a/lang/pure/Makefile +++ b/lang/pure/Makefile @@ -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> diff --git a/mail/cone/files/patch-curses-cursesscreen.diff b/mail/cone/files/patch-curses-cursesscreen.diff deleted file mode 100644 index a85fc2c..0000000 --- a/mail/cone/files/patch-curses-cursesscreen.diff +++ /dev/null @@ -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; - diff --git a/mail/gnarwl/Makefile b/mail/gnarwl/Makefile index 7372a23..a6eec21 100644 --- a/mail/gnarwl/Makefile +++ b/mail/gnarwl/Makefile @@ -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 diff --git a/mail/gnarwl/files/patch-Makefile.in b/mail/gnarwl/files/patch-Makefile.in index 68ccf49..4e0f27d 100644 --- a/mail/gnarwl/files/patch-Makefile.in +++ b/mail/gnarwl/files/patch-Makefile.in @@ -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@ ## diff --git a/mail/gnarwl/files/patch-configure b/mail/gnarwl/files/patch-configure deleted file mode 100644 index f28abef..0000000 --- a/mail/gnarwl/files/patch-configure +++ /dev/null @@ -1,3433 +0,0 @@ ---- gnarwl-3.6.orig/configure 2009-07-27 13:58:34.000000000 +0200 -+++ configure 2009-07-27 13:58:37.000000000 +0200 -@@ -1,9 +1,9 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.61. -+# Generated by GNU Autoconf 2.62. - # - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, --# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. - ## --------------------- ## -@@ -15,7 +15,7 @@ - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -@@ -37,17 +37,45 @@ - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' -+else -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' - else -- PATH_SEPARATOR=: -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' - fi -- rm -f conf$$.sh -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } - fi - - # Support unset when possible. -@@ -63,8 +91,6 @@ - # there to prevent editors from complaining about space-tab. - # (If _AS_PATH_WALK were called with IFS unset, it would disable word - # splitting by setting IFS to empty value.) --as_nl=' --' - IFS=" "" $as_nl" - - # Find who we are. Look in the path if we contain no directory separator. -@@ -87,7 +113,7 @@ - as_myself=$0 - fi - if test ! -f "$as_myself"; then -- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } - fi - -@@ -100,17 +126,10 @@ - PS4='+ ' - - # NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME --do -- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -- else -- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -- fi --done -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE - - # Required to use basename. - if expr a : '\(a\)' >/dev/null 2>&1 && -@@ -132,7 +151,7 @@ - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || --echo X/"$0" | -+$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q -@@ -158,7 +177,7 @@ - as_have_required=no - fi - -- if test $as_have_required = yes && (eval ": -+ if test $as_have_required = yes && (eval ": - (as_func_return () { - (exit \$1) - } -@@ -240,7 +259,7 @@ - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -@@ -261,7 +280,7 @@ - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -@@ -341,10 +360,10 @@ - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV -- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -- done -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+ done -+ export CONFIG_SHELL -+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} - fi - - -@@ -413,9 +432,10 @@ - - test \$exitcode = 0") || { - echo No shell found that supports shell functions. -- echo Please tell autoconf@gnu.org about your system, -- echo including any error possibly output before this -- echo message -+ echo Please tell bug-autoconf@gnu.org about your system, -+ echo including any error possibly output before this message. -+ echo This can help us improve future autoconf versions. -+ echo Configuration will now proceed without shell functions. - } - - -@@ -451,7 +471,7 @@ - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || -- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems -@@ -479,7 +499,6 @@ - *) - ECHO_N='-n';; - esac -- - if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -@@ -492,19 +511,22 @@ - rm -f conf$$.dir/conf$$.file - else - rm -f conf$$.dir -- mkdir conf$$.dir -+ mkdir conf$$.dir 2>/dev/null - fi --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- as_ln_s='ln -s' -- # ... but there are two gotchas: -- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -p'. -- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -p' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else - as_ln_s='cp -p' --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln -+ fi - else - as_ln_s='cp -p' - fi -@@ -529,10 +551,10 @@ - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then -- test -d "$1/."; -+ test -d "$1/."; - else - case $1 in -- -*)set "./$1";; -+ -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi -@@ -628,6 +650,16 @@ - LIBOBJS - LTLIBOBJS' - ac_subst_files='' -+ac_user_opts=' -+enable_option_checking -+with_homedir -+with_docdir -+with_useradd_prog -+with_useradd_args -+with_mta -+with_permmask -+with_maxline -+' - ac_precious_vars='build_alias - host_alias - target_alias -@@ -641,6 +673,8 @@ - # Initialize some variables set by options. - ac_init_help= - ac_init_version=false -+ac_unrecognized_opts= -+ac_unrecognized_sep= - # The variables have the same names as the options, with - # dashes changed to underlines. - cache_file=/dev/null -@@ -739,13 +773,21 @@ - datarootdir=$ac_optarg ;; - - -disable-* | --disable-*) -- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` -- eval enable_$ac_feature=no ;; -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval enable_$ac_useropt=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; -@@ -758,13 +800,21 @@ - dvidir=$ac_optarg ;; - - -enable-* | --enable-*) -- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` -- eval enable_$ac_feature=\$ac_optarg ;; -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval enable_$ac_useropt=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -955,22 +1005,38 @@ - ac_init_version=: ;; - - -with-* | --with-*) -- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package | sed 's/[-.]/_/g'` -- eval with_$ac_package=\$ac_optarg ;; -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval with_$ac_useropt=\$ac_optarg ;; - - -without-* | --without-*) -- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package | sed 's/[-.]/_/g'` -- eval with_$ac_package=no ;; -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval with_$ac_useropt=no ;; - - --x) - # Obsolete; use --with-x. -@@ -990,7 +1056,7 @@ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - -- -*) { echo "$as_me: error: unrecognized option: $ac_option -+ -*) { $as_echo "$as_me: error: unrecognized option: $ac_option - Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } - ;; -@@ -999,16 +1065,16 @@ - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -+ { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. -- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 -+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && -- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} - ;; - -@@ -1017,22 +1083,38 @@ - - if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` -- { echo "$as_me: error: missing argument to $ac_option" >&2 -+ { $as_echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } - fi - --# Be sure to have absolute directory names. -+if test -n "$ac_unrecognized_opts"; then -+ case $enable_option_checking in -+ no) ;; -+ fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2 -+ { (exit 1); exit 1; }; } ;; -+ *) $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;; -+ esac -+fi -+ -+# Check all directory arguments for consistency. - for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir - do - eval ac_val=\$$ac_var -+ # Remove trailing slashes. -+ case $ac_val in -+ */ ) -+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` -+ eval $ac_var=\$ac_val;; -+ esac -+ # Be sure to have absolute directory names. - case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac -- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -+ { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } - done - -@@ -1047,7 +1129,7 @@ - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe -- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes -@@ -1063,10 +1145,10 @@ - ac_pwd=`pwd` && test -n "$ac_pwd" && - ac_ls_di=`ls -di .` && - ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -- { echo "$as_me: error: Working directory cannot be determined" >&2 -+ { $as_echo "$as_me: error: Working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } - test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -- { echo "$as_me: error: pwd does not report name of working directory" >&2 -+ { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } - - -@@ -1074,12 +1156,12 @@ - if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. -- ac_confdir=`$as_dirname -- "$0" || --$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$0" : 'X\(//\)[^/]' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| . 2>/dev/null || --echo X"$0" | -+ ac_confdir=`$as_dirname -- "$as_myself" || -+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_myself" : 'X\(//\)[^/]' \| \ -+ X"$as_myself" : 'X\(//\)$' \| \ -+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_myself" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -1106,12 +1188,12 @@ - fi - if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -+ { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } - fi - ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" - ac_abs_confdir=`( -- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 -+ cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } - pwd)` - # When building in place, set srcdir=. -@@ -1160,9 +1242,9 @@ - - Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX -- [$ac_default_prefix] -+ [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -- [PREFIX] -+ [PREFIX] - - By default, \`make install' will install all the files in - \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -@@ -1172,25 +1254,25 @@ - For better control, use the options below. - - Fine tuning of the installation directories: -- --bindir=DIR user executables [EPREFIX/bin] -- --sbindir=DIR system admin executables [EPREFIX/sbin] -- --libexecdir=DIR program executables [EPREFIX/libexec] -- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -- --localstatedir=DIR modifiable single-machine data [PREFIX/var] -- --libdir=DIR object code libraries [EPREFIX/lib] -- --includedir=DIR C header files [PREFIX/include] -- --oldincludedir=DIR C header files for non-gcc [/usr/include] -- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -- --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -- --infodir=DIR info documentation [DATAROOTDIR/info] -- --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -- --mandir=DIR man documentation [DATAROOTDIR/man] -- --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] -- --htmldir=DIR html documentation [DOCDIR] -- --dvidir=DIR dvi documentation [DOCDIR] -- --pdfdir=DIR pdf documentation [DOCDIR] -- --psdir=DIR ps documentation [DOCDIR] -+ --bindir=DIR user executables [EPREFIX/bin] -+ --sbindir=DIR system admin executables [EPREFIX/sbin] -+ --libexecdir=DIR program executables [EPREFIX/libexec] -+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data [PREFIX/var] -+ --libdir=DIR object code libraries [EPREFIX/lib] -+ --includedir=DIR C header files [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc [/usr/include] -+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -+ --infodir=DIR info documentation [DATAROOTDIR/info] -+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -+ --mandir=DIR man documentation [DATAROOTDIR/man] -+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] -+ --htmldir=DIR html documentation [DOCDIR] -+ --dvidir=DIR dvi documentation [DOCDIR] -+ --pdfdir=DIR pdf documentation [DOCDIR] -+ --psdir=DIR ps documentation [DOCDIR] - _ACEOF - - cat <<\_ACEOF -@@ -1231,15 +1313,17 @@ - if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -- test -d "$ac_dir" || continue -+ test -d "$ac_dir" || -+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || -+ continue - ac_builddir=. - - case "$ac_dir" in - .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. -- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -@@ -1275,7 +1359,7 @@ - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else -- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done -@@ -1285,10 +1369,10 @@ - if $ac_init_version; then - cat <<\_ACEOF - configure --generated by GNU Autoconf 2.61 -+generated by GNU Autoconf 2.62 - - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, --2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -@@ -1299,7 +1383,7 @@ - running configure, to aid debugging if configure makes a mistake. - - It was created by $as_me, which was --generated by GNU Autoconf 2.61. Invocation command line was -+generated by GNU Autoconf 2.62. Invocation command line was - - $ $0 $@ - -@@ -1335,7 +1419,7 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- echo "PATH: $as_dir" -+ $as_echo "PATH: $as_dir" - done - IFS=$as_save_IFS - -@@ -1370,7 +1454,7 @@ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) -- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -@@ -1422,11 +1506,12 @@ - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( -- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 --echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; -+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac -@@ -1456,9 +1541,9 @@ - do - eval ac_val=\$$ac_var - case $ac_val in -- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac -- echo "$ac_var='\''$ac_val'\''" -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - -@@ -1473,9 +1558,9 @@ - do - eval ac_val=\$$ac_var - case $ac_val in -- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac -- echo "$ac_var='\''$ac_val'\''" -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi -@@ -1491,8 +1576,8 @@ - echo - fi - test "$ac_signal" != 0 && -- echo "$as_me: caught signal $ac_signal" -- echo "$as_me: exit $exit_status" -+ $as_echo "$as_me: caught signal $ac_signal" -+ $as_echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && -@@ -1534,21 +1619,24 @@ - - - # Let the site file select an alternate cache file if it wants to. --# Prefer explicitly selected file to automatically selected ones. -+# Prefer an explicitly selected file to automatically selected ones. -+ac_site_file1=NONE -+ac_site_file2=NONE - if test -n "$CONFIG_SITE"; then -- set x "$CONFIG_SITE" -+ ac_site_file1=$CONFIG_SITE - elif test "x$prefix" != xNONE; then -- set x "$prefix/share/config.site" "$prefix/etc/config.site" -+ ac_site_file1=$prefix/share/config.site -+ ac_site_file2=$prefix/etc/config.site - else -- set x "$ac_default_prefix/share/config.site" \ -- "$ac_default_prefix/etc/config.site" -+ ac_site_file1=$ac_default_prefix/share/config.site -+ ac_site_file2=$ac_default_prefix/etc/config.site - fi --shift --for ac_site_file -+for ac_site_file in "$ac_site_file1" "$ac_site_file2" - do -+ test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then -- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 --echo "$as_me: loading site script $ac_site_file" >&6;} -+ { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -+$as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi -@@ -1558,16 +1646,16 @@ - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then -- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 --echo "$as_me: loading cache $cache_file" >&6;} -+ { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 -+$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi - else -- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 --echo "$as_me: creating cache $cache_file" >&6;} -+ { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 -+$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file - fi - -@@ -1581,29 +1669,38 @@ - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) -- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) -- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then -- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 --echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 --echo "$as_me: former value: $ac_old_val" >&2;} -- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 --echo "$as_me: current value: $ac_new_val" >&2;} -- ac_cache_corrupted=: -+ # differences in whitespace do not lead to failure. -+ ac_old_val_w=`echo x $ac_old_val` -+ ac_new_val_w=`echo x $ac_new_val` -+ if test "$ac_old_val_w" != "$ac_new_val_w"; then -+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -+ ac_cache_corrupted=: -+ else -+ { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} -+ eval $ac_var=\$ac_old_val -+ fi -+ { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 -+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} -+ { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 -+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in -- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in -@@ -1613,10 +1710,10 @@ - fi - done - if $ac_cache_corrupted; then -- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 --echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 --echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -+ { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } - fi - -@@ -1657,10 +1754,10 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. - set dummy ${ac_tool_prefix}gcc; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1673,7 +1770,7 @@ - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -1684,11 +1781,11 @@ - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -1697,10 +1794,10 @@ - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -1713,7 +1810,7 @@ - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -1724,11 +1821,11 @@ - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - if test "x$ac_ct_CC" = x; then -@@ -1736,10 +1833,10 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; -@@ -1754,10 +1851,10 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. - set dummy ${ac_tool_prefix}cc; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1770,7 +1867,7 @@ - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -1781,11 +1878,11 @@ - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -1794,10 +1891,10 @@ - if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1815,7 +1912,7 @@ - continue - fi - ac_cv_prog_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -1838,11 +1935,11 @@ - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -1853,10 +1950,10 @@ - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1869,7 +1966,7 @@ - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -1880,11 +1977,11 @@ - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -1897,10 +1994,10 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -1913,7 +2010,7 @@ - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -1924,11 +2021,11 @@ - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -1940,10 +2037,10 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; -@@ -1955,44 +2052,48 @@ - fi - - --test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH - See \`config.log' for more details." >&5 --echo "$as_me: error: no acceptable C compiler found in \$PATH -+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - - # Provide some information about the compiler. --echo "$as_me:$LINENO: checking for C compiler version" >&5 --ac_compiler=`set X $ac_compile; echo $2` -+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 -+set X $ac_compile -+ac_compiler=$2 - { (ac_try="$ac_compiler --version >&5" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - { (ac_try="$ac_compiler -v >&5" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - { (ac_try="$ac_compiler -V >&5" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - - cat >conftest.$ac_ext <<_ACEOF -@@ -2011,27 +2112,22 @@ - } - _ACEOF - ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.exe b.out" -+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" - # Try to create an executable without -o first, disregard a.out. - # It will help us diagnose broken compilers, and finding out an intuition - # of exeext. --{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 --echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } --ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` --# --# List of possible output files, starting from the most likely. --# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) --# only as a last resort. b.out is created by i960 compilers. --ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' --# --# The IRIX 6 linker writes into existing files which may not be --# executable, retaining their permissions. Remove them first so a --# subsequent execution test works. -+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -+$as_echo_n "checking for C compiler default output file name... " >&6; } -+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -+ -+# The possible output files: -+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" -+ - ac_rmfiles= - for ac_file in $ac_files - do - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac - done -@@ -2042,10 +2138,11 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. - # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -@@ -2056,7 +2153,7 @@ - do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most -@@ -2083,15 +2180,15 @@ - ac_file='' - fi - --{ echo "$as_me:$LINENO: result: $ac_file" >&5 --echo "${ECHO_T}$ac_file" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 -+$as_echo "$ac_file" >&6; } - if test -z "$ac_file"; then -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables - See \`config.log' for more details." >&5 --echo "$as_me: error: C compiler cannot create executables -+$as_echo "$as_me: error: C compiler cannot create executables - See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - fi -@@ -2100,8 +2197,8 @@ - - # Check that the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. --{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 --echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -+$as_echo_n "checking whether the C compiler works... " >&6; } - # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 - # If not cross compiling, check that we can run a simple program. - if test "$cross_compiling" != yes; then -@@ -2110,49 +2207,51 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else -- { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -+ { { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. - If you meant to cross compile, use \`--host'. - See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run C compiled programs. -+$as_echo "$as_me: error: cannot run C compiled programs. - If you meant to cross compile, use \`--host'. - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - fi - fi --{ echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -+{ $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - --rm -f a.out a.exe conftest$ac_cv_exeext b.out -+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out - ac_clean_files=$ac_clean_files_save - # Check that the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. --{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 --echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } --{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 --echo "${ECHO_T}$cross_compiling" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -+$as_echo_n "checking whether we are cross compiling... " >&6; } -+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 -+$as_echo "$cross_compiling" >&6; } - --{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 --echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 -+$as_echo_n "checking for suffix of executables... " >&6; } - if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) - # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -@@ -2161,31 +2260,31 @@ - for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac - done - else -- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -+ { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link - See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - - rm -f conftest$ac_cv_exeext --{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 --echo "${ECHO_T}$ac_cv_exeext" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -+$as_echo "$ac_cv_exeext" >&6; } - - rm -f conftest.$ac_ext - EXEEXT=$ac_cv_exeext - ac_exeext=$EXEEXT --{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 --echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 -+$as_echo_n "checking for suffix of object files... " >&6; } - if test "${ac_cv_objext+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -2208,40 +2307,41 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac - done - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile - See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of object files: cannot compile -+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - - rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi --{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 --echo "${ECHO_T}$ac_cv_objext" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -+$as_echo "$ac_cv_objext" >&6; } - OBJEXT=$ac_cv_objext - ac_objext=$OBJEXT --{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } - if test "${ac_cv_c_compiler_gnu+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -2267,20 +2367,21 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -@@ -2290,15 +2391,19 @@ - ac_cv_c_compiler_gnu=$ac_compiler_gnu - - fi --{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } --GCC=`test $ac_compiler_gnu = yes && echo yes` -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -+$as_echo "$ac_cv_c_compiler_gnu" >&6; } -+if test $ac_compiler_gnu = yes; then -+ GCC=yes -+else -+ GCC= -+fi - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 --echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -+$as_echo_n "checking whether $CC accepts -g... " >&6; } - if test "${ac_cv_prog_cc_g+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes -@@ -2325,20 +2430,21 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" -@@ -2363,20 +2469,21 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_c_werror_flag=$ac_save_c_werror_flag -@@ -2402,20 +2509,21 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -2430,8 +2538,8 @@ - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag - fi --{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -+$as_echo "$ac_cv_prog_cc_g" >&6; } - if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then -@@ -2447,10 +2555,10 @@ - CFLAGS= - fi - fi --{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 --echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } - if test "${ac_cv_prog_cc_c89+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_cv_prog_cc_c89=no - ac_save_CC=$CC -@@ -2521,20 +2629,21 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_c89=$ac_arg - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -2550,15 +2659,15 @@ - # AC_CACHE_VAL - case "x$ac_cv_prog_cc_c89" in - x) -- { echo "$as_me:$LINENO: result: none needed" >&5 --echo "${ECHO_T}none needed" >&6; } ;; -+ { $as_echo "$as_me:$LINENO: result: none needed" >&5 -+$as_echo "none needed" >&6; } ;; - xno) -- { echo "$as_me:$LINENO: result: unsupported" >&5 --echo "${ECHO_T}unsupported" >&6; } ;; -+ { $as_echo "$as_me:$LINENO: result: unsupported" >&5 -+$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" -- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; -+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; - esac - - -@@ -2569,6 +2678,17 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -+# 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 -+ -+ - - # Check whether --with-homedir was given. - if test "${with_homedir+set}" = set; then -@@ -2637,10 +2757,10 @@ - - - --{ echo "$as_me:$LINENO: checking for gdbm_open in -lgdbm" >&5 --echo $ECHO_N "checking for gdbm_open in -lgdbm... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for gdbm_open in -lgdbm" >&5 -+$as_echo_n "checking for gdbm_open in -lgdbm... " >&6; } - if test "${ac_cv_lib_gdbm_gdbm_open+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lgdbm $LIBS" -@@ -2672,32 +2792,36 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_gdbm_gdbm_open=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_gdbm_gdbm_open=no - fi - -+rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ echo "$as_me:$LINENO: result: $ac_cv_lib_gdbm_gdbm_open" >&5 --echo "${ECHO_T}$ac_cv_lib_gdbm_gdbm_open" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gdbm_gdbm_open" >&5 -+$as_echo "$ac_cv_lib_gdbm_gdbm_open" >&6; } - if test $ac_cv_lib_gdbm_gdbm_open = yes; then - cat >>confdefs.h <<_ACEOF - #define HAVE_LIBGDBM 1 -@@ -2709,10 +2833,10 @@ - - - --{ echo "$as_me:$LINENO: checking for ldap_init in -lldap" >&5 --echo $ECHO_N "checking for ldap_init in -lldap... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for ldap_init in -lldap" >&5 -+$as_echo_n "checking for ldap_init in -lldap... " >&6; } - if test "${ac_cv_lib_ldap_ldap_init+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lldap $LIBS" -@@ -2744,32 +2868,36 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_ldap_ldap_init=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ldap_ldap_init=no - fi - -+rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_init" >&5 --echo "${ECHO_T}$ac_cv_lib_ldap_ldap_init" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_init" >&5 -+$as_echo "$ac_cv_lib_ldap_ldap_init" >&6; } - if test $ac_cv_lib_ldap_ldap_init = yes; then - cat >>confdefs.h <<_ACEOF - #define HAVE_LIBLDAP 1 -@@ -2782,11 +2910,11 @@ - - for ac_func in ldap_set_option - do --as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -2839,35 +2967,41 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - eval "$as_ac_var=yes" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" - fi - -+rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval echo '${'$as_ac_var'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } --if test `eval echo '${'$as_ac_var'}'` = yes; then -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+if test `eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -2875,13 +3009,88 @@ - - - -+{ $as_echo "$as_me:$LINENO: checking for iconv in -liconv" >&5 -+$as_echo_n "checking for iconv in -liconv... " >&6; } -+if test "${ac_cv_lib_iconv_iconv+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-liconv $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char iconv (); -+int -+main () -+{ -+return iconv (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_iconv_iconv=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_iconv_iconv=no -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv" >&5 -+$as_echo "$ac_cv_lib_iconv_iconv" >&6; } -+if test $ac_cv_lib_iconv_iconv = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LIBICONV 1 -+_ACEOF -+ -+ LIBS="-liconv $LIBS" -+ -+fi -+ -+ - for ac_func in iconv - do --as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -2934,41 +3143,455 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - eval "$as_ac_var=yes" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" - fi - -+rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval echo '${'$as_ac_var'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } --if test `eval echo '${'$as_ac_var'}'` = yes; then -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+if test `eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi - done - - -+ -+{ $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -+$as_echo_n "checking for dlopen in -ldl... " >&6; } -+if test "${ac_cv_lib_dl_dlopen+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldl $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dlopen (); -+int -+main () -+{ -+return dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_dl_dlopen=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_dl_dlopen=no -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -+$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -+if test $ac_cv_lib_dl_dlopen = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LIBDL 1 -+_ACEOF -+ -+ LIBS="-ldl $LIBS" -+ -+fi -+ -+ -+ -+{ $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5 -+$as_echo_n "checking for gethostbyname... " >&6; } -+if test "${ac_cv_func_gethostbyname+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define gethostbyname innocuous_gethostbyname -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char gethostbyname (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef gethostbyname -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char gethostbyname (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_gethostbyname || defined __stub___gethostbyname -+choke me -+#endif -+ -+int -+main () -+{ -+return gethostbyname (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_func_gethostbyname=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_func_gethostbyname=no -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -+$as_echo "$ac_cv_func_gethostbyname" >&6; } -+if test $ac_cv_func_gethostbyname = yes; then -+ : -+else -+ -+{ $as_echo "$as_me:$LINENO: checking for gethostbyname in -lresolv" >&5 -+$as_echo_n "checking for gethostbyname in -lresolv... " >&6; } -+if test "${ac_cv_lib_resolv_gethostbyname+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lresolv $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char gethostbyname (); -+int -+main () -+{ -+return gethostbyname (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_resolv_gethostbyname=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_resolv_gethostbyname=no -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_gethostbyname" >&5 -+$as_echo "$ac_cv_lib_resolv_gethostbyname" >&6; } -+if test $ac_cv_lib_resolv_gethostbyname = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LIBRESOLV 1 -+_ACEOF -+ -+ LIBS="-lresolv $LIBS" -+ -+fi -+ -+fi -+ -+{ $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5 -+$as_echo_n "checking for gethostbyname... " >&6; } -+if test "${ac_cv_func_gethostbyname+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define gethostbyname innocuous_gethostbyname -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char gethostbyname (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef gethostbyname -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char gethostbyname (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_gethostbyname || defined __stub___gethostbyname -+choke me -+#endif -+ -+int -+main () -+{ -+return gethostbyname (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_func_gethostbyname=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_func_gethostbyname=no -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -+$as_echo "$ac_cv_func_gethostbyname" >&6; } -+if test $ac_cv_func_gethostbyname = yes; then -+ : -+else -+ -+{ $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 -+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } -+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lnsl $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char gethostbyname (); -+int -+main () -+{ -+return gethostbyname (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_nsl_gethostbyname=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_nsl_gethostbyname=no -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 -+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } -+if test $ac_cv_lib_nsl_gethostbyname = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LIBNSL 1 -+_ACEOF -+ -+ LIBS="-lnsl $LIBS" -+ -+fi -+ -+fi -+ -+ - cat >>confdefs.h <<_ACEOF - #define UMASK $permmask - _ACEOF -@@ -3009,11 +3632,12 @@ - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( -- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 --echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; -+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac -@@ -3046,12 +3670,12 @@ - if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && -- { echo "$as_me:$LINENO: updating cache $cache_file" >&5 --echo "$as_me: updating cache $cache_file" >&6;} -+ { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 -+$as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file - else -- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 --echo "$as_me: not updating unwritable cache $cache_file" >&6;} -+ { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi - fi - rm -f confcache -@@ -3067,7 +3691,7 @@ - for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' -- ac_i=`echo "$ac_i" | sed "$ac_script"` -+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" -@@ -3080,11 +3704,12 @@ - - - : ${CONFIG_STATUS=./config.status} -+ac_write_fail=0 - ac_clean_files_save=$ac_clean_files - ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 --echo "$as_me: creating $CONFIG_STATUS" >&6;} --cat >$CONFIG_STATUS <<_ACEOF -+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - #! $SHELL - # Generated by $as_me. - # Run this file to recreate the current configuration. -@@ -3097,7 +3722,7 @@ - SHELL=\${CONFIG_SHELL-$SHELL} - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - ## --------------------- ## - ## M4sh Initialization. ## - ## --------------------- ## -@@ -3107,7 +3732,7 @@ - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -@@ -3129,17 +3754,45 @@ - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' -+else -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' - else -- PATH_SEPARATOR=: -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' - fi -- rm -f conf$$.sh -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } - fi - - # Support unset when possible. -@@ -3155,8 +3808,6 @@ - # there to prevent editors from complaining about space-tab. - # (If _AS_PATH_WALK were called with IFS unset, it would disable word - # splitting by setting IFS to empty value.) --as_nl=' --' - IFS=" "" $as_nl" - - # Find who we are. Look in the path if we contain no directory separator. -@@ -3179,7 +3830,7 @@ - as_myself=$0 - fi - if test ! -f "$as_myself"; then -- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } - fi - -@@ -3192,17 +3843,10 @@ - PS4='+ ' - - # NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME --do -- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -- else -- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -- fi --done -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE - - # Required to use basename. - if expr a : '\(a\)' >/dev/null 2>&1 && -@@ -3224,7 +3868,7 @@ - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || --echo X/"$0" | -+$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q -@@ -3275,7 +3919,7 @@ - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || -- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems -@@ -3303,7 +3947,6 @@ - *) - ECHO_N='-n';; - esac -- - if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -@@ -3316,19 +3959,22 @@ - rm -f conf$$.dir/conf$$.file - else - rm -f conf$$.dir -- mkdir conf$$.dir -+ mkdir conf$$.dir 2>/dev/null - fi --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- as_ln_s='ln -s' -- # ... but there are two gotchas: -- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -p'. -- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -p' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else - as_ln_s='cp -p' --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln -+ fi - else - as_ln_s='cp -p' - fi -@@ -3353,10 +3999,10 @@ - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then -- test -d "$1/."; -+ test -d "$1/."; - else - case $1 in -- -*)set "./$1";; -+ -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi -@@ -3379,7 +4025,7 @@ - # values after options handling. - ac_log=" - This file was extended by $as_me, which was --generated by GNU Autoconf 2.61. Invocation command line was -+generated by GNU Autoconf 2.62. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -3392,14 +4038,14 @@ - - _ACEOF - --cat >>$CONFIG_STATUS <<_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - # Files that config.status was made for. - config_files="$ac_config_files" - config_headers="$ac_config_headers" - - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - ac_cs_usage="\ - \`$as_me' instantiates files from templates according to the - current configuration. -@@ -3412,9 +4058,9 @@ - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] -- instantiate the configuration file FILE -+ instantiate the configuration file FILE - --header=FILE[:TEMPLATE] -- instantiate the configuration header FILE -+ instantiate the configuration header FILE - - Configuration files: - $config_files -@@ -3425,23 +4071,23 @@ - Report bugs to <bug-autoconf@gnu.org>." - - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_cs_version="\\ - config.status --configured by $0, generated by GNU Autoconf 2.61, -- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -+configured by $0, generated by GNU Autoconf 2.62, -+ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - --Copyright (C) 2006 Free Software Foundation, Inc. -+Copyright (C) 2008 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." - - ac_pwd='$ac_pwd' - srcdir='$srcdir' -+test -n "\$AWK" || AWK=awk - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF --# If no file are specified by the user, then we need to provide default --# value. By we need to know if files were specified by the user. -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# The default lists apply if the user does not specify any file. - ac_need_defaults=: - while test $# != 0 - do -@@ -3463,30 +4109,36 @@ - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) -- echo "$ac_cs_version"; exit ;; -+ $as_echo "$ac_cs_version"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift -- CONFIG_FILES="$CONFIG_FILES $ac_optarg" -+ case $ac_optarg in -+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift -- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" -+ case $ac_optarg in -+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" - ac_need_defaults=false;; - --he | --h) - # Conflict between --help and --header -- { echo "$as_me: error: ambiguous option: $1 -+ { $as_echo "$as_me: error: ambiguous option: $1 - Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; - --help | --hel | -h ) -- echo "$ac_cs_usage"; exit ;; -+ $as_echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. -- -*) { echo "$as_me: error: unrecognized option: $1 -+ -*) { $as_echo "$as_me: error: unrecognized option: $1 - Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; - -@@ -3505,30 +4157,32 @@ - fi - - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - if \$ac_cs_recheck; then -- echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -- CONFIG_SHELL=$SHELL -+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ shift -+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 -+ CONFIG_SHELL='$SHELL' - export CONFIG_SHELL -- exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ exec "\$@" - fi - - _ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - exec 5>>config.log - { - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX - ## Running $as_me. ## - _ASBOX -- echo "$ac_log" -+ $as_echo "$ac_log" - } >&5 - - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - - # Handling of arguments. - for ac_config_target in $ac_config_targets -@@ -3537,8 +4191,8 @@ - "conf.h") CONFIG_HEADERS="$CONFIG_HEADERS conf.h" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - -- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 --echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -+ *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac - done -@@ -3578,115 +4232,142 @@ - (umask 077 && mkdir "$tmp") - } || - { -- echo "$me: cannot create a temporary directory in ." >&2 -+ $as_echo "$as_me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } - } - --# --# Set up the sed scripts for CONFIG_FILES section. --# -- --# No need to generate the scripts if there are no CONFIG_FILES. --# This happens for instance when ./config.status config.h -+# Set up the scripts for CONFIG_FILES section. -+# No need to generate them if there are no CONFIG_FILES. -+# This happens for instance with `./config.status config.h'. - if test -n "$CONFIG_FILES"; then - --_ACEOF - -+ac_cr='' -+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` -+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then -+ ac_cs_awk_cr='\\r' -+else -+ ac_cs_awk_cr=$ac_cr -+fi -+ -+echo 'BEGIN {' >"$tmp/subs1.awk" && -+_ACEOF - - -+{ -+ echo "cat >conf$$subs.awk <<_ACEOF" && -+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && -+ echo "_ACEOF" -+} >conf$$subs.sh || -+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } -+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` - ac_delim='%!_!# ' - for ac_last_try in false false false false false :; do -- cat >conf$$subs.sed <<_ACEOF --SHELL!$SHELL$ac_delim --PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim --PACKAGE_NAME!$PACKAGE_NAME$ac_delim --PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim --PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim --PACKAGE_STRING!$PACKAGE_STRING$ac_delim --PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim --exec_prefix!$exec_prefix$ac_delim --prefix!$prefix$ac_delim --program_transform_name!$program_transform_name$ac_delim --bindir!$bindir$ac_delim --sbindir!$sbindir$ac_delim --libexecdir!$libexecdir$ac_delim --datarootdir!$datarootdir$ac_delim --datadir!$datadir$ac_delim --sysconfdir!$sysconfdir$ac_delim --sharedstatedir!$sharedstatedir$ac_delim --localstatedir!$localstatedir$ac_delim --includedir!$includedir$ac_delim --oldincludedir!$oldincludedir$ac_delim --docdir!$docdir$ac_delim --infodir!$infodir$ac_delim --htmldir!$htmldir$ac_delim --dvidir!$dvidir$ac_delim --pdfdir!$pdfdir$ac_delim --psdir!$psdir$ac_delim --libdir!$libdir$ac_delim --localedir!$localedir$ac_delim --mandir!$mandir$ac_delim --DEFS!$DEFS$ac_delim --ECHO_C!$ECHO_C$ac_delim --ECHO_N!$ECHO_N$ac_delim --ECHO_T!$ECHO_T$ac_delim --LIBS!$LIBS$ac_delim --build_alias!$build_alias$ac_delim --host_alias!$host_alias$ac_delim --target_alias!$target_alias$ac_delim --CC!$CC$ac_delim --CFLAGS!$CFLAGS$ac_delim --LDFLAGS!$LDFLAGS$ac_delim --CPPFLAGS!$CPPFLAGS$ac_delim --ac_ct_CC!$ac_ct_CC$ac_delim --EXEEXT!$EXEEXT$ac_delim --OBJEXT!$OBJEXT$ac_delim --homedir!$homedir$ac_delim --useradd_prog!$useradd_prog$ac_delim --useradd_args!$useradd_args$ac_delim --permmask!$permmask$ac_delim --maxline!$maxline$ac_delim --LIBOBJS!$LIBOBJS$ac_delim --LTLIBOBJS!$LTLIBOBJS$ac_delim --_ACEOF -+ . ./conf$$subs.sh || -+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } - -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 51; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then - break - elif $ac_last_try; then -- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi - done -+rm -f conf$$subs.sh - --ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` --if test -n "$ac_eof"; then -- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` -- ac_eof=`expr $ac_eof + 1` --fi -- --cat >>$CONFIG_STATUS <<_ACEOF --cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof --/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end --_ACEOF --sed ' --s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g --s/^/s,@/; s/!/@,|#_!!_#|/ --:n --t n --s/'"$ac_delim"'$/,g/; t --s/$/\\/; p --N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n --' >>$CONFIG_STATUS <conf$$subs.sed --rm -f conf$$subs.sed --cat >>$CONFIG_STATUS <<_ACEOF --:end --s/|#_!!_#|//g --CEOF$ac_eof -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+cat >>"\$tmp/subs1.awk" <<\\_ACAWK && - _ACEOF -+sed -n ' -+h -+s/^/S["/; s/!.*/"]=/ -+p -+g -+s/^[^!]*!// -+:repl -+t repl -+s/'"$ac_delim"'$// -+t delim -+:nl -+h -+s/\(.\{148\}\).*/\1/ -+t more1 -+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -+p -+n -+b repl -+:more1 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t nl -+:delim -+h -+s/\(.\{148\}\).*/\1/ -+t more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"/ -+p -+b -+:more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t delim -+' <conf$$subs.awk | sed ' -+/^[^""]/{ -+ N -+ s/\n// -+} -+' >>$CONFIG_STATUS || ac_write_fail=1 -+rm -f conf$$subs.awk -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+_ACAWK -+cat >>"\$tmp/subs1.awk" <<_ACAWK && -+ for (key in S) S_is_set[key] = 1 -+ FS = "" - -+} -+{ -+ line = $ 0 -+ nfields = split(line, field, "@") -+ substed = 0 -+ len = length(field[1]) -+ for (i = 2; i < nfields; i++) { -+ key = field[i] -+ keylen = length(key) -+ if (S_is_set[key]) { -+ value = S[key] -+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) -+ len += length(value) + length(field[++i]) -+ substed = 1 -+ } else -+ len += 1 + keylen -+ } -+ -+ print line -+} -+ -+_ACAWK -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then -+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -+else -+ cat -+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ -+ || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -+$as_echo "$as_me: error: could not setup config files machinery" >&2;} -+ { (exit 1); exit 1; }; } -+_ACEOF - - # VPATH may cause trouble with some makes, so we remove $(srcdir), - # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -@@ -3703,19 +4384,133 @@ - }' - fi - --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - fi # test -n "$CONFIG_FILES" - -+# Set up the scripts for CONFIG_HEADERS section. -+# No need to generate them if there are no CONFIG_HEADERS. -+# This happens for instance with `./config.status Makefile'. -+if test -n "$CONFIG_HEADERS"; then -+cat >"$tmp/defines.awk" <<\_ACAWK || -+BEGIN { -+_ACEOF -+ -+# Transform confdefs.h into an awk script `defines.awk', embedded as -+# here-document in config.status, that substitutes the proper values into -+# config.h.in to produce config.h. -+ -+# Create a delimiter string that does not exist in confdefs.h, to ease -+# handling of long lines. -+ac_delim='%!_!# ' -+for ac_last_try in false false :; do -+ ac_t=`sed -n "/$ac_delim/p" confdefs.h` -+ if test -z "$ac_t"; then -+ break -+ elif $ac_last_try; then -+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 -+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} -+ { (exit 1); exit 1; }; } -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " -+ fi -+done -+ -+# For the awk script, D is an array of macro values keyed by name, -+# likewise P contains macro parameters if any. Preserve backslash -+# newline sequences. -+ -+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -+sed -n ' -+s/.\{148\}/&'"$ac_delim"'/g -+t rset -+:rset -+s/^[ ]*#[ ]*define[ ][ ]*/ / -+t def -+d -+:def -+s/\\$// -+t bsnl -+s/["\\]/\\&/g -+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -+D["\1"]=" \3"/p -+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p -+d -+:bsnl -+s/["\\]/\\&/g -+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -+D["\1"]=" \3\\\\\\n"\\/p -+t cont -+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p -+t cont -+d -+:cont -+n -+s/.\{148\}/&'"$ac_delim"'/g -+t clear -+:clear -+s/\\$// -+t bsnlc -+s/["\\]/\\&/g; s/^/"/; s/$/"/p -+d -+:bsnlc -+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p -+b cont -+' <confdefs.h | sed ' -+s/'"$ac_delim"'/"\\\ -+"/g' >>$CONFIG_STATUS || ac_write_fail=1 -+ -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ for (key in D) D_is_set[key] = 1 -+ FS = "" -+} -+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { -+ line = \$ 0 -+ split(line, arg, " ") -+ if (arg[1] == "#") { -+ defundef = arg[2] -+ mac1 = arg[3] -+ } else { -+ defundef = substr(arg[1], 2) -+ mac1 = arg[2] -+ } -+ split(mac1, mac2, "(") #) -+ macro = mac2[1] -+ if (D_is_set[macro]) { -+ # Preserve the white space surrounding the "#". -+ prefix = substr(line, 1, index(line, defundef) - 1) -+ print prefix "define", macro P[macro] D[macro] -+ next -+ } else { -+ # Replace #undef with comments. This is necessary, for example, -+ # in the case of _POSIX_SOURCE, which is predefined and required -+ # on some systems where configure will not decide to define it. -+ if (defundef == "undef") { -+ print "/*", line, "*/" -+ next -+ } -+ } -+} -+{ print } -+_ACAWK -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+ { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 -+$as_echo "$as_me: error: could not setup config headers machinery" >&2;} -+ { (exit 1); exit 1; }; } -+fi # test -n "$CONFIG_HEADERS" -+ - --for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS -+eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS " -+shift -+for ac_tag - do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; -- :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 --echo "$as_me: error: Invalid tag $ac_tag." >&2;} -+ :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -+$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;} - { (exit 1); exit 1; }; };; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -@@ -3744,26 +4539,38 @@ - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || -- { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 --echo "$as_me: error: cannot find input file: $ac_f" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; - esac -- ac_file_inputs="$ac_file_inputs $ac_f" -+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac -+ ac_file_inputs="$ac_file_inputs '$ac_f'" - done - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ -- configure_input="Generated from "`IFS=: -- echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." -+ configure_input='Generated from '` -+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' -+ `' by configure.' - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" -- { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -+ { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 -+$as_echo "$as_me: creating $ac_file" >&6;} - fi -+ # Neutralize special characters interpreted by sed in replacement strings. -+ case $configure_input in #( -+ *\&* | *\|* | *\\* ) -+ ac_sed_conf_input=`$as_echo "$configure_input" | -+ sed 's/[\\\\&|]/\\\\&/g'`;; #( -+ *) ac_sed_conf_input=$configure_input;; -+ esac - - case $ac_tag in -- *:-:* | *:-) cat >"$tmp/stdin";; -+ *:-:* | *:-) cat >"$tmp/stdin" \ -+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -+$as_echo "$as_me: error: could not create $ac_file" >&2;} -+ { (exit 1); exit 1; }; } ;; - esac - ;; - esac -@@ -3773,7 +4580,7 @@ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || --echo X"$ac_file" | -+$as_echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -3799,7 +4606,7 @@ - as_dirs= - while :; do - case $as_dir in #( -- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" -@@ -3808,7 +4615,7 @@ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || --echo X"$as_dir" | -+$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -3829,17 +4636,17 @@ - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" -- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 --echo "$as_me: error: cannot create directory $as_dir" >&2;} -+ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } - ac_builddir=. - - case "$ac_dir" in - .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. -- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -@@ -3875,12 +4682,13 @@ - - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - # If the template does not know about datarootdir, expand it. - # FIXME: This hack should be removed a few years after 2.60. - ac_datarootdir_hack=; ac_datarootdir_seen= - --case `sed -n '/datarootdir/ { -+ac_sed_dataroot=' -+/datarootdir/ { - p - q - } -@@ -3889,13 +4697,14 @@ - /@infodir@/p - /@localedir@/p - /@mandir@/p --' $ac_file_inputs` in -+' -+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in - *datarootdir*) ac_datarootdir_seen=yes;; - *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -- { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 --echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_datarootdir_hack=' - s&@datadir@&$datadir&g - s&@docdir@&$docdir&g -@@ -3909,15 +4718,16 @@ - # Neutralize VPATH when `$srcdir' = `.'. - # Shell code in configure.ac might set extrasub. - # FIXME: do we really want to maintain this feature? --cat >>$CONFIG_STATUS <<_ACEOF -- sed "$ac_vpsub -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_sed_extra="$ac_vpsub - $extrasub - _ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - :t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b --s&@configure_input@&$configure_input&;t t -+s|@configure_input@|$ac_sed_conf_input|;t t - s&@top_builddir@&$ac_top_builddir_sub&;t t -+s&@top_build_prefix@&$ac_top_build_prefix&;t t - s&@srcdir@&$ac_srcdir&;t t - s&@abs_srcdir@&$ac_abs_srcdir&;t t - s&@top_srcdir@&$ac_top_srcdir&;t t -@@ -3926,119 +4736,58 @@ - s&@abs_builddir@&$ac_abs_builddir&;t t - s&@abs_top_builddir@&$ac_abs_top_builddir&;t t - $ac_datarootdir_hack --" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out -+" -+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ -+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -+$as_echo "$as_me: error: could not create $ac_file" >&2;} -+ { (exit 1); exit 1; }; } - - test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && -- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' - which seems to be undefined. Please make sure it is defined." >&5 --echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' - which seems to be undefined. Please make sure it is defined." >&2;} - - rm -f "$tmp/stdin" - case $ac_file in -- -) cat "$tmp/out"; rm -f "$tmp/out";; -- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; -- esac -+ -) cat "$tmp/out" && rm -f "$tmp/out";; -+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; -+ esac \ -+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -+$as_echo "$as_me: error: could not create $ac_file" >&2;} -+ { (exit 1); exit 1; }; } - ;; - :H) - # - # CONFIG_HEADER - # --_ACEOF -- --# Transform confdefs.h into a sed script `conftest.defines', that --# substitutes the proper values into config.h.in to produce config.h. --rm -f conftest.defines conftest.tail --# First, append a space to every undef/define line, to ease matching. --echo 's/$/ /' >conftest.defines --# Then, protect against being on the right side of a sed subst, or in --# an unquoted here document, in config.status. If some macros were --# called several times there might be several #defines for the same --# symbol, which is useless. But do not sort them, since the last --# AC_DEFINE must be honored. --ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* --# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where --# NAME is the cpp macro being defined, VALUE is the value it is being given. --# PARAMS is the parameter list in the macro definition--in most cases, it's --# just an empty string. --ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' --ac_dB='\\)[ (].*,\\1define\\2' --ac_dC=' ' --ac_dD=' ,' -- --uniq confdefs.h | -- sed -n ' -- t rset -- :rset -- s/^[ ]*#[ ]*define[ ][ ]*// -- t ok -- d -- :ok -- s/[\\&,]/\\&/g -- s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p -- s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p -- ' >>conftest.defines -- --# Remove the space that was appended to ease matching. --# Then replace #undef with comments. This is necessary, for --# example, in the case of _POSIX_SOURCE, which is predefined and required --# on some systems where configure will not decide to define it. --# (The regexp can be short, since the line contains either #define or #undef.) --echo 's/ $// --s,^[ #]*u.*,/* & */,' >>conftest.defines -- --# Break up conftest.defines: --ac_max_sed_lines=50 -- --# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" --# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" --# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" --# et cetera. --ac_in='$ac_file_inputs' --ac_out='"$tmp/out1"' --ac_nxt='"$tmp/out2"' -- --while : --do -- # Write a here document: -- cat >>$CONFIG_STATUS <<_ACEOF -- # First, check the format of the line: -- cat >"\$tmp/defines.sed" <<\\CEOF --/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def --/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def --b --:def --_ACEOF -- sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS -- echo 'CEOF -- sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS -- ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in -- sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail -- grep . conftest.tail >/dev/null || break -- rm -f conftest.defines -- mv conftest.tail conftest.defines --done --rm -f conftest.defines conftest.tail -- --echo "ac_result=$ac_in" >>$CONFIG_STATUS --cat >>$CONFIG_STATUS <<\_ACEOF - if test x"$ac_file" != x-; then -- echo "/* $configure_input */" >"$tmp/config.h" -- cat "$ac_result" >>"$tmp/config.h" -- if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then -- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 --echo "$as_me: $ac_file is unchanged" >&6;} -+ { -+ $as_echo "/* $configure_input */" \ -+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" -+ } >"$tmp/config.h" \ -+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -+$as_echo "$as_me: error: could not create $ac_file" >&2;} -+ { (exit 1); exit 1; }; } -+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then -+ { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -+$as_echo "$as_me: $ac_file is unchanged" >&6;} - else -- rm -f $ac_file -- mv "$tmp/config.h" $ac_file -+ rm -f "$ac_file" -+ mv "$tmp/config.h" "$ac_file" \ -+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -+$as_echo "$as_me: error: could not create $ac_file" >&2;} -+ { (exit 1); exit 1; }; } - fi - else -- echo "/* $configure_input */" -- cat "$ac_result" -+ $as_echo "/* $configure_input */" \ -+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ -+ || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 -+$as_echo "$as_me: error: could not create -" >&2;} -+ { (exit 1); exit 1; }; } - fi -- rm -f "$tmp/out12" - ;; - - -@@ -4052,6 +4801,11 @@ - chmod +x $CONFIG_STATUS - ac_clean_files=$ac_clean_files_save - -+test $ac_write_fail = 0 || -+ { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 -+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } -+ - - # configure is writing to config.log, and then calls config.status. - # config.status does its own redirection, appending to config.log. -@@ -4073,4 +4827,8 @@ - # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } - fi -+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then -+ { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5 -+$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;} -+fi - diff --git a/mail/gnarwl/files/patch-configure.ac b/mail/gnarwl/files/patch-configure.ac deleted file mode 100644 index c68555c..0000000 --- a/mail/gnarwl/files/patch-configure.ac +++ /dev/null @@ -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) - diff --git a/mail/libvmime/Makefile b/mail/libvmime/Makefile index 20beedc..af0410e 100644 --- a/mail/libvmime/Makefile +++ b/mail/libvmime/Makefile @@ -3,7 +3,7 @@ PORTNAME= libvmime PORTVERSION= 0.9.2.s20140721 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MAINTAINER= delphij@FreeBSD.org diff --git a/mail/libvmime/files/patch-cmake__FindIconv.cmake b/mail/libvmime/files/patch-cmake__FindIconv.cmake index 280eb3a..9b35d3f 100644 --- a/mail/libvmime/files/patch-cmake__FindIconv.cmake +++ b/mail/libvmime/files/patch-cmake__FindIconv.cmake @@ -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() +--- 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) + # 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) -+ FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv c libiconv libiconv-2) - ENDIF() +-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) - IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) + set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR}) + set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES}) diff --git a/mail/mmr/files/patch-mime.cpp b/mail/mmr/files/patch-mime.cpp deleted file mode 100644 index 0ca9315..0000000 --- a/mail/mmr/files/patch-mime.cpp +++ /dev/null @@ -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 ) { diff --git a/mail/normalizemime/files/patch-normalizemime.cc b/mail/normalizemime/files/patch-normalizemime.cc index 9d65bf4..98f0e39 100644 --- a/mail/normalizemime/files/patch-normalizemime.cc +++ b/mail/normalizemime/files/patch-normalizemime.cc @@ -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 diff --git a/multimedia/ffmpeg2theora/Makefile b/multimedia/ffmpeg2theora/Makefile index 5e123d9..3baa015 100644 --- a/multimedia/ffmpeg2theora/Makefile +++ b/multimedia/ffmpeg2theora/Makefile @@ -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 diff --git a/multimedia/ffmpeg2theora/files/patch-SConstruct b/multimedia/ffmpeg2theora/files/patch-SConstruct index 3ea6836..461b92b 100644 --- a/multimedia/ffmpeg2theora/files/patch-SConstruct +++ b/multimedia/ffmpeg2theora/files/patch-SConstruct @@ -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']: diff --git a/multimedia/ffmpeg2theora/files/patch-src-subtitles.c b/multimedia/ffmpeg2theora/files/patch-src-subtitles.c new file mode 100644 index 0000000..e00b2e5 --- /dev/null +++ b/multimedia/ffmpeg2theora/files/patch-src-subtitles.c @@ -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; diff --git a/multimedia/naludump/files/patch-libsi-si.c b/multimedia/naludump/files/patch-libsi-si.c index 770e8c7..d5595ba 100644 --- a/multimedia/naludump/files/patch-libsi-si.c +++ b/multimedia/naludump/files/patch-libsi-si.c @@ -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) { diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index b07c072..9b699e1 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -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> diff --git a/multimedia/vdr/files/patch-vdr-1.7.28_FreeBSD b/multimedia/vdr/files/patch-vdr-1.7.28_FreeBSD index 09806d5..583db5a 100644 --- a/multimedia/vdr/files/patch-vdr-1.7.28_FreeBSD +++ b/multimedia/vdr/files/patch-vdr-1.7.28_FreeBSD @@ -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) diff --git a/net-im/centerim-devel/Makefile b/net-im/centerim-devel/Makefile index 2a8a77a..034d162 100644 --- a/net-im/centerim-devel/Makefile +++ b/net-im/centerim-devel/Makefile @@ -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 diff --git a/net-im/gale/Makefile b/net-im/gale/Makefile index cb39a8a..ce4e991 100644 --- a/net-im/gale/Makefile +++ b/net-im/gale/Makefile @@ -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> diff --git a/net-im/gale/files/patch-iconvtest.c b/net-im/gale/files/patch-iconvtest.c new file mode 100644 index 0000000..7135ac2 --- /dev/null +++ b/net-im/gale/files/patch-iconvtest.c @@ -0,0 +1,11 @@ +--- iconvtest.c.orig 2000-11-18 06:38:47 UTC ++++ iconvtest.c +@@ -27,7 +27,7 @@ int main() { + || utf[0] != 0x7f + || utf[1] != 0xdf || utf[2] != 0xbf + || utf[3] != 0xef || utf[4] != 0xbf || utf[5] != 0xbf) exit(1); +- inbuf = utf; inbytes = 6; ++ inbuf = (char *) utf; inbytes = 6; + outbuf = (char *) wch; outbytes = sizeof(wch); + if (0 != iconv(from,&inbuf,&inbytes,&outbuf,&outbytes) + || 0 != inbytes || (sizeof(wch) - 3*sizeof(wchar_t)) != outbytes diff --git a/net-im/imspector/files/patch-icqprotocolplugin.cpp b/net-im/imspector/files/patch-icqprotocolplugin.cpp index 02e0d38..79143f2 100644 --- a/net-im/imspector/files/patch-icqprotocolplugin.cpp +++ b/net-im/imspector/files/patch-icqprotocolplugin.cpp @@ -8,15 +8,6 @@ #define PLUGIN_NAME "ICQ-AIM IMSpector protocol plugin" #define PROTOCOL_NAME "ICQ-AIM" -@@ -675,7 +676,7 @@ - size_t inbytesleft = mylength - 4; - size_t outbytesleft = BUFFER_SIZE - 1; /* Trailing \0 */ - size_t result = iconv(iconv_utf16be_utf8, -- &inbuf, &inbytesleft, &outbuf, &outbytesleft); -+ (const char**) &inbuf, &inbytesleft, &outbuf, &outbytesleft); - - if (result == (size_t) -1) - { @@ -810,7 +811,7 @@ GET_TYPE(uint16_t) diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile index 4dba02d..c09a537 100644 --- a/net-im/licq/Makefile +++ b/net-im/licq/Makefile @@ -3,6 +3,7 @@ PORTNAME= base PORTVERSION= ${LICQ_VER} +PORTREVISION= 1 CATEGORIES= net-im PKGNAMESUFFIX= ${SOCKS_SUFFIX}${PKGNAMESUFFIX2} @@ -17,17 +18,13 @@ USES= cmake iconv WRKSRC= ${WRKDIR}/${DISTNAME} LICQ_PORT?= net-im/licq -# workaround for installed autoconf/automake -LDFLAGS+= -lpthread -L${LOCALBASE}/lib ${ICONV_LIB} -Wl,--export-dynamic -CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include -CXXFLAGS+= -Wl,--export-dynamic -DGTEST_USE_OWN_TR1_TUPLE +CXXFLAGS+= -DGTEST_USE_OWN_TR1_TUPLE -OPTIONS_DEFINE= OPENSSL +OPTIONS_DEFINE= NLS OPENSSL OPTIONS_DEFAULT=OPENSSL OPENSSL_USE= OPENSSL=yes -OPENSSL_CONFIGURE_ON= --with-openssl-inc=${OPENSSLINC} --with-openssl-lib=${OPENSSLLIB} .include <bsd.port.options.mk> diff --git a/net-im/licq/files/patch-cmake-Modules-FindIconv.cmake b/net-im/licq/files/patch-cmake-Modules-FindIconv.cmake new file mode 100644 index 0000000..caa0375 --- /dev/null +++ b/net-im/licq/files/patch-cmake-Modules-FindIconv.cmake @@ -0,0 +1,31 @@ +--- cmake/Modules/FindIconv.cmake.orig 2014-06-01 19:16:42 UTC ++++ cmake/Modules/FindIconv.cmake +@@ -10,6 +10,7 @@ + # + include(CheckCCompilerFlag) + include(CheckCXXSourceCompiles) ++include(CheckFunctionExists) + + IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) + # Already in cache, be silent +@@ -18,11 +19,15 @@ ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRA + + FIND_PATH(ICONV_INCLUDE_DIR iconv.h) + +-FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv 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}) diff --git a/net-im/zephyr/Makefile b/net-im/zephyr/Makefile index 948d8b2..20231fd 100644 --- a/net-im/zephyr/Makefile +++ b/net-im/zephyr/Makefile @@ -3,7 +3,7 @@ PORTNAME= zephyr DISTVERSION= 3.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MASTER_SITES= http://zephyr.1ts.org/export/2642/distribution/ @@ -13,6 +13,8 @@ COMMENT= Enterprise-scale distributed messaging system LICENSE= MIT GNU_CONFIGURE= yes +# it is an upstream bug that --with-krb5 needs a path +CONFIGURE_ARGS= --with-krb5="${KRB5_DIR}" USES= iconv libtool readline USE_RC_SUBR= zhm USE_LDCONFIG= yes @@ -24,7 +26,11 @@ CPPFLAGS+= -I${LOCALBASE}/include OPTIONS_DEFINE= HEIMDAL HEIMDAL_DESC= Link against libss.so from security/heimdal -.include <bsd.port.options.mk> +.include <bsd.port.pre.mk> + +.if empty(ICONV_LIB) +CONFIGURE_ARGS+=ac_cv_lib_iconv_libiconv_open=no +.endif .if ${PORT_OPTIONS:MHEIMDAL} BROKEN= bad depobj @@ -39,13 +45,10 @@ LIB_DEPENDS+= libss.so.2:${PORTSDIR}/devel/e2fsprogs-libss KRB5_DIR?= ${DESTDIR}/usr .endif -# it is an upstream bug that --with-krb5 needs a path -CONFIGURE_ARGS= --with-krb5="${KRB5_DIR}" - # try to fix parallel (-jX) builds: add missing inter-source dependencies post-patch: @${REINPLACE_CMD} -e \ '/^eval\.o/,$$s,port\.h,& string_stack.h new_string.h, ; \ s,_aux\.h,.h,' ${WRKSRC}/zwgc/Makefile.in -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/net-mgmt/bandwidthd/Makefile b/net-mgmt/bandwidthd/Makefile index 30bd169..39f69e9 100644 --- a/net-mgmt/bandwidthd/Makefile +++ b/net-mgmt/bandwidthd/Makefile @@ -3,7 +3,7 @@ PORTNAME= bandwidthd PORTVERSION= 2.0.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION} @@ -17,7 +17,8 @@ LIB_DEPENDS+= libgd.so:${PORTSDIR}/graphics/gd USE_CSTD= gnu89 GNU_CONFIGURE= YES -USES= iconv gmake tar:tgz +CONFIGURE_ARGS= ac_cv_lib_iconv_libiconv_open=no +USES= gmake tar:tgz post-install: ${INSTALL_SCRIPT} ${FILESDIR}/bandwidthd.sh \ diff --git a/net-mgmt/icinga/Makefile b/net-mgmt/icinga/Makefile index 553d855..064f32b 100644 --- a/net-mgmt/icinga/Makefile +++ b/net-mgmt/icinga/Makefile @@ -3,6 +3,7 @@ PORTNAME= icinga PORTVERSION= 1.13.1 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= https://github.com/Icinga/${PORTNAME}-core/releases/download/v${PORTVERSION}/ @@ -14,7 +15,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl \ libgd.so:${PORTSDIR}/graphics/gd -USES= iconv gmake +USES= gmake USE_AUTOTOOLS= autoconf USE_RC_SUBR= icinga @@ -51,7 +52,8 @@ CONFIGURE_ARGS= --with-command-user=${ICINGAUSER} \ --with-log-dir=${ICINGALOGDIR} \ --with-httpd-conf=${EXAMPLESDIR}/apache22 \ --enable-event-broker \ - --enable-nanosleep + --enable-nanosleep \ + ac_cv_lib_iconv_main=no CONFIGURE_ENV= PERL=${PERL} \ HOME=${WRKDIR} # prevent creation of .rnd file diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile index d456ecd..6f6d615 100644 --- a/net-mgmt/nagios/Makefile +++ b/net-mgmt/nagios/Makefile @@ -3,7 +3,7 @@ PORTNAME= nagios PORTVERSION= 3.5.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION} @@ -17,7 +17,7 @@ LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl \ PORTSCOUT= limit:^3. -USES= iconv perl5 cpe +USES= cpe perl5 USE_PERL5= build USE_PHP= yes USE_RC_SUBR= nagios @@ -38,7 +38,8 @@ CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \ --localstatedir=${NAGIOSDIR} \ --with-httpd-conf=${PREFIX}/etc \ --with-checkresult-dir=${NAGIOSDIR}/checkresults \ - --disable-statuswrl + --disable-statuswrl \ + ac_cv_lib_iconv_main=no CONFIGURE_ENV= PERL=${PERL} CPPFLAGS+= -I${LOCALBASE}/include diff --git a/net-mgmt/nagios4/Makefile b/net-mgmt/nagios4/Makefile index 2b256b3..c547d68 100644 --- a/net-mgmt/nagios4/Makefile +++ b/net-mgmt/nagios4/Makefile @@ -3,7 +3,7 @@ PORTNAME= nagios PORTVERSION= 4.0.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-4.x/${PORTNAME}-${PORTVERSION} PKGNAMESUFFIX= 4 @@ -16,7 +16,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl \ libgd.so:${PORTSDIR}/graphics/gd -USES= gmake iconv perl5 cpe +USES= cpe gmake perl5 USE_PERL5= build USE_PHP= xml USE_RC_SUBR= nagios @@ -38,7 +38,8 @@ CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \ --with-httpd-conf=${PREFIX}/etc \ --with-checkresult-dir=${NAGIOSDIR}/checkresults \ --disable-statuswrl \ - --enable-event-broker + --enable-event-broker \ + ac_cv_lib_iconv_main=no CONFIGURE_ENV= PERL=${PERL} CPPFLAGS+= -I${LOCALBASE}/include diff --git a/net-p2p/libtorrent-rasterbar/files/patch-include-libtorrent-config.hpp b/net-p2p/libtorrent-rasterbar/files/patch-include-libtorrent-config.hpp new file mode 100644 index 0000000..26c2220 --- /dev/null +++ b/net-p2p/libtorrent-rasterbar/files/patch-include-libtorrent-config.hpp @@ -0,0 +1,15 @@ +--- include/libtorrent/config.hpp.orig 2014-08-15 06:51:56 UTC ++++ include/libtorrent/config.hpp +@@ -184,12 +184,6 @@ POSSIBILITY OF SUCH DAMAGE. + // execinfo.h is available in the MacOS X 10.5 SDK. + #define TORRENT_USE_EXECINFO MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 + #endif +-#else +-// FreeBSD has a reasonable iconv signature +-// unless we're on glibc +-#ifndef __GLIBC__ +-# define TORRENT_ICONV_ARG (const char**) +-#endif + #endif + #define TORRENT_HAS_FALLOCATE 0 + #define TORRENT_USE_IFADDRS 1 diff --git a/net-p2p/linuxdcpp/files/patch-SConstruct b/net-p2p/linuxdcpp/files/patch-SConstruct index 20fa13e..14160dc 100644 --- a/net-p2p/linuxdcpp/files/patch-SConstruct +++ b/net-p2p/linuxdcpp/files/patch-SConstruct @@ -1,6 +1,6 @@ ---- SConstruct.orig 2011-04-18 01:57:09.000000000 +0800 -+++ SConstruct 2011-10-19 23:42:24.000000000 +0800 -@@ -20,7 +20,7 @@ +--- SConstruct.orig 2011-04-17 17:57:09 UTC ++++ SConstruct +@@ -20,7 +20,7 @@ BUILD_LOCALE_PATH = BUILD_PATH + 'locale BUILD_FLAGS = { 'common' : ['-I#', '-D_GNU_SOURCE', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_REENTRANT'], 'debug' : ['-g', '-ggdb', '-Wall', '-D_DEBUG'], @@ -9,7 +9,7 @@ } # ---------------------------------------------------------------------- -@@ -106,6 +106,7 @@ +@@ -106,6 +106,7 @@ else: vars.AddVariables( BoolVariable('debug', 'Compile the program with debug information', 0), BoolVariable('release', 'Compile the program with optimizations', 0), @@ -17,7 +17,7 @@ BoolVariable('profile', 'Compile the program with profiling information', 0), PathVariable('PREFIX', 'Compile the program with PREFIX as the root for installation', '/usr/local', PathVariable.PathIsDir), ('FAKE_ROOT', 'Make scons install the program under a fake root', '') -@@ -131,7 +131,10 @@ +@@ -131,7 +132,10 @@ if os.environ.has_key('CC'): env['CC'] = os.environ['CC'] if os.environ.has_key('CXXFLAGS'): @@ -29,7 +29,7 @@ if os.environ.has_key('LDFLAGS'): env['LINKFLAGS'] = os.environ['LDFLAGS'].split() -@@ -139,6 +140,12 @@ +@@ -139,6 +143,12 @@ if os.environ.has_key('LDFLAGS'): if os.environ.has_key('CFLAGS'): env['CFLAGS'] = os.environ['CFLAGS'].split() @@ -42,7 +42,14 @@ env['CPPDEFINES'] = [] # Initialize as a list so Append doesn't concat strings env.SConsignFile('build/sconf/.sconsign') -@@ -263,14 +270,15 @@ +@@ -256,21 +266,20 @@ if not 'install' in COMMAND_LINE_TARGETS + + if not conf.CheckHeader('iconv.h'): + Exit(1) +- elif conf.CheckLibWithHeader('iconv', 'iconv.h', 'c', 'iconv(0, (const char **)0, 0, (char**)0, 0);'): +- conf.env.Append(CPPDEFINES = ('ICONV_CONST', 'const')) + + if conf.CheckHeader(['sys/types.h', 'sys/socket.h', 'ifaddrs.h', 'net/if.h']): conf.env.Append(CPPDEFINES = 'HAVE_IFADDRS_H') # TODO: Implement a plugin system so libnotify doesn't have compile-time dependencies @@ -65,3 +72,4 @@ + conf.env.Append(CPPDEFINES = 'HAVE_LIBNOTIFY_0_7') conf.CheckBZRRevision() + diff --git a/net-p2p/twister/files/patch-libtorrent-include-libtorrent-config.hpp b/net-p2p/twister/files/patch-libtorrent-include-libtorrent-config.hpp new file mode 100644 index 0000000..38f4e98 --- /dev/null +++ b/net-p2p/twister/files/patch-libtorrent-include-libtorrent-config.hpp @@ -0,0 +1,15 @@ +--- libtorrent/include/libtorrent/config.hpp.orig 2015-03-29 22:58:17 UTC ++++ libtorrent/include/libtorrent/config.hpp +@@ -204,12 +204,6 @@ POSSIBILITY OF SUCH DAMAGE. + + #endif // __APPLE__ + +-#else +-// FreeBSD has a reasonable iconv signature +-// unless we're on glibc +-#ifndef __GLIBC__ +-# define TORRENT_ICONV_ARG (const char**) +-#endif + #endif + #define TORRENT_HAS_FALLOCATE 0 + #define TORRENT_USE_IFADDRS 1 diff --git a/net/asterisk13/Makefile b/net/asterisk13/Makefile index 492d8a1..fd869e3 100644 --- a/net/asterisk13/Makefile +++ b/net/asterisk13/Makefile @@ -2,7 +2,7 @@ PORTNAME= asterisk PORTVERSION= 13.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -131,6 +131,11 @@ LIB_DEPENDS+= libsrtp.so:${PORTSDIR}/net/libsrtp .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 + .if ${PREFIX} == ${LOCALBASE} VARDIR=/var .else diff --git a/net/c3270/Makefile b/net/c3270/Makefile index 1543a82..2a670bf 100644 --- a/net/c3270/Makefile +++ b/net/c3270/Makefile @@ -3,6 +3,7 @@ PORTNAME= c3270 PORTVERSION= 3.3.14ga11 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://x3270.bgp.nu/download/03.03.14/ MASTER_SITES_VER_PATH= ${PORTVERSION:C/(0[0-9]\.0[0-9])/} @@ -14,11 +15,11 @@ COMMENT= Full-screen curses-based remote login to IBM mainframes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/([0-9]\.[0-9])(\..*)/\1/} GNU_CONFIGURE= yes +CONFIGURE_ARGS= ac_cv_search_libiconv=no USES= iconv readline gmake USE_OPENSSL= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib diff --git a/news/pan/files/patch-pan_usenet-utils_mime-utils.cc b/news/pan/files/patch-pan_usenet-utils_mime-utils.cc deleted file mode 100644 index f71bfc1..0000000 --- a/news/pan/files/patch-pan_usenet-utils_mime-utils.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- pan/usenet-utils/mime-utils.cc.orig 2013-03-12 18:24:13.000000000 +0000 -+++ pan/usenet-utils/mime-utils.cc 2013-03-12 18:25:19.000000000 +0000 -@@ -77,7 +77,11 @@ - outbuf = out + converted; - outleft = outlen - converted; - -+#if defined(__NetBSD__) || defined(__FreeBSD__) -+ converted = iconv (cd, &inbuf, &inleft, &outbuf, &outleft); -+#else - converted = iconv (cd, (char **) &inbuf, &inleft, &outbuf, &outleft); -+#endif - - if (converted != (size_t) -1 && errno == 0) { - /* diff --git a/print/gv/Makefile b/print/gv/Makefile index a29403b..81882b0 100644 --- a/print/gv/Makefile +++ b/print/gv/Makefile @@ -3,7 +3,7 @@ PORTNAME= gv PORTVERSION= 3.7.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MASTER_SITES= GNU/${PORTNAME} @@ -18,7 +18,7 @@ USES= cpe iconv gmake perl5 shebangfix USE_PERL5= build GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} +LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/X11 \ --enable-setenv-code \ --enable-SIGCHLD-fallback @@ -34,4 +34,10 @@ PLIST_FILES= bin/gv \ man/man1/gv-update-userconfig.1.gz PLIST_DIRS= %%DATADIR%%/safe-gs-workdir -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if empty(ICONV_LIB) +CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no +.endif + +.include <bsd.port.post.mk> diff --git a/security/scanhill/Makefile b/security/scanhill/Makefile index 42602d2..70e45b9 100644 --- a/security/scanhill/Makefile +++ b/security/scanhill/Makefile @@ -2,6 +2,7 @@ PORTNAME= scanhill DISTVERSION= 0.5-p1 +PORTREVISION= 1 CATEGORIES= security net-im MASTER_SITES= http://www.enderunix.org/scanhill/ \ http://www.sourcefiles.org/Networking/Security/Sniffers/ \ @@ -23,7 +24,8 @@ MYSQL_USE= MYSQL=yes MYSQL_CONFIGURE_ENABLE= mysql post-patch: - @${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' \ + -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure do-install: ${INSTALL_PROGRAM} ${WRKSRC}/scanhill ${STAGEDIR}${PREFIX}/bin diff --git a/security/scanhill/files/patch-configure b/security/scanhill/files/patch-configure index b27329c..b12d59a 100644 --- a/security/scanhill/files/patch-configure +++ b/security/scanhill/files/patch-configure @@ -1,6 +1,15 @@ ---- configure.orig 2013-10-30 11:38:52.000000000 -0200 -+++ configure 2013-10-30 11:39:25.000000000 -0200 -@@ -975,7 +975,7 @@ +--- configure.orig 2007-03-11 09:18:22 UTC ++++ configure +@@ -537,7 +537,7 @@ fi + + + +-CFLAGS="-g -I. -I/usr/local/include" ++CFLAGS="${CFLAGS} -I. -I/usr/local/include" + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +@@ -975,7 +975,7 @@ fi done # Check whether --enable-mysql or --disable-mysql was given. @@ -9,3 +18,21 @@ enableval="$enable_mysql" for ac_hdr in mysql/mysql.h +@@ -1066,15 +1066,13 @@ done + #define _mysql_ 1 + EOF + +- LDFLAGS="-L/usr/local/lib -L/usr/local/lib/mysql" +- LIBS="-lpcap -liconv -lmysqlclient" ++ LIBS="${LIBS} -L/usr/local/lib -L/usr/local/lib/mysql -lpcap -liconv -lmysqlclient" + libexecdir="hash.o main.o nstrstr.o msn.o sniff.o db.o conf.o miscutil.o " + + else + + echo "$ac_t""disabled" 1>&6 +- LDFLAGS="-L/usr/local/lib" +- LIBS="-lpcap -liconv" ++ LIBS="${LIBS} -L/usr/local/lib -lpcap -liconv" + libexecdir="hash.o main.o nstrstr.o msn.o sniff.o " + + fi diff --git a/sysutils/xorriso/Makefile b/sysutils/xorriso/Makefile index 6a4e095..acaacfd 100644 --- a/sysutils/xorriso/Makefile +++ b/sysutils/xorriso/Makefile @@ -3,7 +3,7 @@ PORTNAME= xorriso PORTVERSION= 1.3.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://files.libburnia-project.org/releases/ DISTNAME= libisoburn-${PORTVERSION} @@ -25,4 +25,7 @@ USE_LDCONFIG= yes INFO= xorrecord xorriso xorrisofs +post-patch: + @${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure + .include <bsd.port.mk> diff --git a/textproc/ctpp2/Makefile b/textproc/ctpp2/Makefile index f226da7..54bb662 100644 --- a/textproc/ctpp2/Makefile +++ b/textproc/ctpp2/Makefile @@ -3,14 +3,14 @@ PORTNAME= ctpp2 PORTVERSION= 2.8.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc devel MASTER_SITES= http://ctpp.havoc.ru/download/ MAINTAINER= vg@FreeBSD.org COMMENT= C++ library to use templates in C/C++ projects, version 2 -USES= cmake gettext iconv:build compiler:c++11-lang +USES= cmake gettext iconv compiler:c++11-lang USE_LDCONFIG= yes PLIST_SUB+= PORTVERSION=${PORTVERSION} @@ -41,4 +41,10 @@ OPTIMIZATION_CMAKE_OFF= -DENABLE_OPTIMIZATION=OFF PORTDOCS= template_language.html -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if empty(ICONV_LIB) +CMAKE_ARGS+= -DSKIP_ICONV_LIRARY:STRING=ON +.endif + +.include <bsd.port.post.mk> diff --git a/textproc/ctpp2/files/patch-src-CTPP2StringIconvOutputCollector.cpp b/textproc/ctpp2/files/patch-src-CTPP2StringIconvOutputCollector.cpp new file mode 100644 index 0000000..8fa6c07 --- /dev/null +++ b/textproc/ctpp2/files/patch-src-CTPP2StringIconvOutputCollector.cpp @@ -0,0 +1,20 @@ +--- src/CTPP2StringIconvOutputCollector.cpp.orig 2012-08-02 07:22:44 UTC ++++ src/CTPP2StringIconvOutputCollector.cpp +@@ -56,7 +56,7 @@ StringIconvOutputCollector::StringIconvO + throw CTPPCharsetRecodeException(sSrcEnc.c_str(), sDstEnc.c_str()); + } + +-#if (_LIBICONV_VERSION >= 0x0108) ++#if (_LIBICONV_VERSION >= 0x0108) || defined(__FreeBSD__) + int iFlag = 1; + // Discard illegal characters + if (iFlags & C_ICONV_DISCARD_ILSEQ) { iconvctl(oIconv, ICONV_SET_DISCARD_ILSEQ, &iFlag); } +@@ -85,7 +85,7 @@ INT_32 StringIconvOutputCollector::Colle + size_t iDstLength = CTPP_ESCAPE_BUFFER_LEN; + + char aDstData[CTPP_ESCAPE_BUFFER_LEN]; +-#if defined(linux) || defined(__APPLE__) ++#if defined(linux) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) + char * aSrcData = (char *)vData; + #else + const char * aSrcData = (const char *)vData; diff --git a/textproc/ctpp2/files/patch-src-functions-FnIconv.cpp b/textproc/ctpp2/files/patch-src-functions-FnIconv.cpp new file mode 100644 index 0000000..6c30f7c --- /dev/null +++ b/textproc/ctpp2/files/patch-src-functions-FnIconv.cpp @@ -0,0 +1,20 @@ +--- src/functions/FnIconv.cpp.orig 2012-08-02 07:22:44 UTC ++++ src/functions/FnIconv.cpp +@@ -145,7 +145,7 @@ INT_32 FnIconv::Handler(CDT * + } + } + +-#if (_LIBICONV_VERSION >= 0x0108) ++#if (_LIBICONV_VERSION >= 0x0108) || defined(__FreeBSD__) + int iFlag = 1; + // Discard illegal characters + if (iFlags & C_ICONV_DISCARD_ILSEQ) +@@ -173,7 +173,7 @@ INT_32 FnIconv::Handler(CDT * + size_t iDstLength = CTPP_ESCAPE_BUFFER_LEN; + + char aDstData[CTPP_ESCAPE_BUFFER_LEN]; +-#if defined(linux) || defined(__APPLE__) ++#if defined(linux) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) + char * aSrcData = (char *)sWhat.data(); + #else + const char * aSrcData = (const char *)sWhat.data(); diff --git a/textproc/estraier/Makefile b/textproc/estraier/Makefile index 518995f..6ae5798 100644 --- a/textproc/estraier/Makefile +++ b/textproc/estraier/Makefile @@ -3,7 +3,7 @@ PORTNAME= estraier PORTVERSION= 1.2.30 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc MASTER_SITES= http://fallabs.com/estraier/ @@ -24,7 +24,7 @@ CONFIGURE_ARGS= --with-sysqdbm \ --enable-dlfilter \ --enable-devel CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -lpthread -L${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/include CHASEN_LIB_DEPENDS= libchasen.so:${PORTSDIR}/japanese/chasen-base CHASEN_CONFIGURE_ENABLE= chasen @@ -40,14 +40,15 @@ CONFIGURE_ARGS+= --enable-mecab .endif post-patch: + @${REINPLACE_CMD} -e 's|-lc||' -e 's|-liconv|${ICONV_LIB}|' \ + ${WRKSRC}/configure @${REINPLACE_CMD} -e \ - 's|-lc ||g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e \ - 's|-O2|@CFLAGS@|g ; \ + 's|$$(RELCFLAGS)|@CFLAGS@| ; \ + s|^LDFLAGS =|& @LDFLAGS@ | ; \ s|HOME|LOCALBASE|g ; \ s|:/usr/local/lib||g ; \ s|-I/usr/local/include||g ; \ - s|-L/usr/local/lib|-lpthread|g' ${WRKSRC}/Makefile.in + s|-L/usr/local/lib||g' ${WRKSRC}/Makefile.in post-install: .for file in estindex estmbtomh estserver estsiutil estxview diff --git a/textproc/gmetadom/files/patch-GdomeSmartDOMGdomeString.cc b/textproc/gmetadom/files/patch-GdomeSmartDOMGdomeString.cc deleted file mode 100644 index ea4e3b5..0000000 --- a/textproc/gmetadom/files/patch-GdomeSmartDOMGdomeString.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gdome_cpp_smart/basic/GdomeSmartDOMGdomeString.cc.orig Wed Apr 2 12:36:39 2003 -+++ src/gdome_cpp_smart/basic/GdomeSmartDOMGdomeString.cc Wed Apr 2 12:37:21 2003 -@@ -95,7 +95,7 @@ - - while (inBytesLeft > 0) { - //cout << "before: " << (void*) inbuf << " " << inBytesLeft << " " << (void*) outbuf << " " << outBytesLeft << endl; -- size_t iconv_res = iconv(cd, &inbuf, &inBytesLeft, &outbuf, &outBytesLeft); -+ size_t iconv_res = iconv(cd, (const char**)&inbuf, &inBytesLeft, &outbuf, &outBytesLeft); - //cout << "after: " << (void*) inbuf << " " << inBytesLeft << " " << (void*) outbuf << " " << outBytesLeft << endl; - - unsigned n = outbuf - outbuf0; diff --git a/textproc/goldendict/files/patch-bgl_babylon.cc b/textproc/goldendict/files/patch-bgl_babylon.cc index fc170af..7c18593 100644 --- a/textproc/goldendict/files/patch-bgl_babylon.cc +++ b/textproc/goldendict/files/patch-bgl_babylon.cc @@ -8,17 +8,3 @@ #include<iconv.h> #include <QTextDocument> -@@ -648,13 +648,8 @@ - - inbufbytes = s.size(); - outbufbytes = s.size() * 6; --#ifdef _WIN32 - const char *inbuf; - inbuf = s.data(); --#else -- char *inbuf; -- inbuf = (char *)s.data(); --#endif - outbuf = (char*)malloc( outbufbytes + 1 ); - memset( outbuf, '\0', outbufbytes + 1 ); - defbuf = outbuf; diff --git a/textproc/goldendict/files/patch-iconv.cc b/textproc/goldendict/files/patch-iconv.cc deleted file mode 100644 index d32904b..0000000 --- a/textproc/goldendict/files/patch-iconv.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- ./iconv.cc.orig 2010-12-04 00:12:46.000000000 +0300 -+++ ./iconv.cc 2010-12-28 11:46:37.208721626 +0300 -@@ -44,11 +44,7 @@ - throw( exIncorrectSeq, exOther ) - { - size_t result = iconv( state, -- #ifdef __WIN32 - (char const **)&inBuf, -- #else -- (char **)&inBuf, -- #endif - &inBytesLeft, - (char **)&outBuf, &outBytesLeft ); - diff --git a/textproc/hyperestraier/Makefile b/textproc/hyperestraier/Makefile index e06feea..70cca9d 100644 --- a/textproc/hyperestraier/Makefile +++ b/textproc/hyperestraier/Makefile @@ -4,7 +4,7 @@ PORTNAME= hyperestraier PORTVERSION= 1.4.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= SF @@ -23,7 +23,7 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-bzip2 --disable-zlib CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -lpthread -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip OPTIONS_DEFINE= LZO MECAB @@ -39,8 +39,10 @@ MECAB_RUN_DEPENDS= ${LOCALBASE}/lib/mecab/dic/ipadic/matrix.bin:${PORTSDIR}/japa post-patch: @${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ + -e 's/@MYCFLAGS@/@CFLAGS@ -Wall -fPIC -fsigned-char/' \ ${WRKSRC}/Makefile.in - ${RM} -f ${WRKSRC}/doc/intro-en.html~ ${WRKSRC}/doc/intro-ja.html~ + @${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure + @${RM} -f ${WRKSRC}/doc/intro-en.html~ ${WRKSRC}/doc/intro-ja.html~ post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libestraier.so diff --git a/textproc/p5-Text-Unaccent/Makefile b/textproc/p5-Text-Unaccent/Makefile index 4c14eb2..d203942 100644 --- a/textproc/p5-Text-Unaccent/Makefile +++ b/textproc/p5-Text-Unaccent/Makefile @@ -3,7 +3,7 @@ PORTNAME= Text-Unaccent PORTVERSION= 1.08 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -15,6 +15,8 @@ LICENSE= GPLv2 USES= iconv perl5 USE_PERL5= configure -CFLAGS+= -DICONV_CONST=const + +post-patch: + @${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/Makefile.PL .include <bsd.port.mk> diff --git a/textproc/p5-XML-TinyXML/Makefile b/textproc/p5-XML-TinyXML/Makefile index 5a8c40f..7290591 100644 --- a/textproc/p5-XML-TinyXML/Makefile +++ b/textproc/p5-XML-TinyXML/Makefile @@ -3,7 +3,7 @@ PORTNAME= XML-TinyXML PORTVERSION= 0.34 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,6 +14,8 @@ COMMENT= Little and efficient Perl module to manage xml data USES= iconv perl5 USE_PERL5= configure -MAKE_ARGS+= LIBS='-L${LOCALBASE}/lib' INC='-I. -I${LOCALBASE}/include' +CONFIGURE_ARGS= LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" \ + INC="-I. -I${LOCALBASE}/include" +CFLAGS+= -DUSE_ICONV .include <bsd.port.mk> diff --git a/textproc/simplexml/Makefile b/textproc/simplexml/Makefile index 2a7eb66..dba2926 100644 --- a/textproc/simplexml/Makefile +++ b/textproc/simplexml/Makefile @@ -3,6 +3,7 @@ PORTNAME= simplexml PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://bitbucket.org/klepa/simplexml/get/ DISTNAME= ${PORTVERSION} @@ -24,7 +25,6 @@ CMAKE_ARGS+= -DDEBUG_MODE:BOOL=ON post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|; \ - /set.*CMAKE_BUILD_TYPE/d' ${WRKSRC}/CMakeLists.txt \ - ${WRKSRC}/cmake/FindIconv.cmake + /set.*CMAKE_BUILD_TYPE/d' ${WRKSRC}/CMakeLists.txt .include <bsd.port.mk> diff --git a/textproc/simplexml/files/patch-cmake__FindIconv.cmake b/textproc/simplexml/files/patch-cmake__FindIconv.cmake index a7d1db0..b52dadb 100644 --- a/textproc/simplexml/files/patch-cmake__FindIconv.cmake +++ b/textproc/simplexml/files/patch-cmake__FindIconv.cmake @@ -1,11 +1,60 @@ ---- cmake/FindIconv.cmake.orig 2014-09-03 02:19:35 UTC +--- cmake/FindIconv.cmake.orig 2010-08-17 10:55:45 UTC +++ cmake/FindIconv.cmake -@@ -40,7 +40,7 @@ +@@ -30,45 +30,29 @@ + # also defined, but not for general use are + # Iconv_LIBRARY, where to find the Iconv library. + ++include(CheckFunctionExists) ++ + set(ICONV_H iconv.h) + + + find_path(ICONV_INCLUDE_DIR ${ICONV_H} +- PATHS /usr/local/include +- /usr/include +- NO_DEFAULT_PATH DOC "Path to the ${ICONV_H} file" ) -find_library(Iconv_LIBRARY NAMES iconv -+find_library(Iconv_LIBRARY NAMES iconv c - PATHS /usr/local/lib - /usr/lib - NO_DEFAULT_PATH +- PATHS /usr/local/lib +- /usr/lib +- NO_DEFAULT_PATH +- DOC "Library for character set conversion" +-) +- +-if(ICONV_INCLUDE_DIR AND Iconv_LIBRARY) +- set(Iconv_FOUND TRUE) +-else(ICONV_INCLUDE_DIR AND Iconv_LIBRARY) +- set(Iconv_FOUND FALSE) +-endif(ICONV_INCLUDE_DIR AND Iconv_LIBRARY) ++if(ICONV_INCLUDE_DIR) ++ 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_DIR) + + if(Iconv_FOUND) + if(NOT Iconv_FIND_QUIETLY) +- message(STATUS "Found Iconv: ${Iconv_LIBARY}") ++ message(STATUS "Found Iconv: ${Iconv_LIBRARY}") + endif(NOT Iconv_FIND_QUIETLY) +-else(Iconv_FOUND) +- if("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD") +- if(NOT Iconv_FIND_QUIETLY) +- if(Iconv_FIND_REQUIRED) +- message(FATAL_ERROR "Could not find the Iconv Library") +- else(Iconv_FIND_REQUIRED) +- message(STATUS "Could not find the Iconv Library") +- endif(Iconv_FIND_REQUIRED) +- endif(NOT Iconv_FIND_QUIETLY) +- else("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD") +- set(Iconv_LIBRARY "") +- endif("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD") + endif(Iconv_FOUND) + + mark_as_advanced(ICONV_INCLUDE_DIR Iconv_LIBRARY) diff --git a/textproc/wbxml2/Makefile b/textproc/wbxml2/Makefile index 3713431..0f280ba 100644 --- a/textproc/wbxml2/Makefile +++ b/textproc/wbxml2/Makefile @@ -3,6 +3,7 @@ PORTNAME= wbxml2 PORTVERSION= 0.10.9 +PORTREVISION= 1 CATEGORIES= textproc devel MASTER_SITES= SF/libwbxml/libwbxml/${PORTVERSION} DISTNAME= libwbxml-${PORTVERSION} @@ -15,22 +16,14 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 -WRKSRC= ${WRKDIR}/libwbxml-${PORTVERSION} -CONFIGURE_WRKSRC= ${WRKDIR}/libwbxml-${PORTVERSION}/build -BUILD_WRKSRC= ${CONFIGURE_WRKSRC} -INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} - -USES= cmake iconv tar:bzip2 -CMAKE_SOURCE_PATH= .. +USES= cmake:outsource iconv tar:bzip2 USE_LDCONFIG= yes +WRKSRC= ${WRKDIR}/libwbxml-${PORTVERSION} DOCSDIR= ${PREFIX}/share/doc/libwbxml OPTIONS_DEFINE= DOCS -post-extract: - @${MKDIR} ${CONFIGURE_WRKSRC} - post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in AUTHORS BUGS ChangeLog NEWS README References THANKS TODO diff --git a/textproc/wbxml2/files/patch-cmake-modules-FindIconv.cmake b/textproc/wbxml2/files/patch-cmake-modules-FindIconv.cmake new file mode 100644 index 0000000..1b8a363 --- /dev/null +++ b/textproc/wbxml2/files/patch-cmake-modules-FindIconv.cmake @@ -0,0 +1,32 @@ +--- cmake/modules/FindIconv.cmake.orig 2011-01-08 16:22:19 UTC ++++ cmake/modules/FindIconv.cmake +@@ -6,6 +6,8 @@ + # + # Copyright (c) 2010 Michael Bell <michael.bell@web.de> + ++include(CheckFunctionExists) ++ + if (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) + # Already in cache, be silent + set(ICONV_FIND_QUIETLY TRUE) +@@ -13,11 +15,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}) diff --git a/textproc/xmlppm/files/patch-IFile.cpp b/textproc/xmlppm/files/patch-IFile.cpp deleted file mode 100644 index 110f313..0000000 --- a/textproc/xmlppm/files/patch-IFile.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/IFile.cpp.orig Thu Jun 10 04:16:13 2004 -+++ src/IFile.cpp Tue Aug 17 23:21:02 2004 -@@ -73,7 +73,7 @@ - writing the output. Then flush the file. */ - void ifflush(IFILE* ifile) { - static char outbuf[BUFFSIZE]; -- char* inptr = ifile->buf; -+ const char* inptr = ifile->buf; - char* outptr = outbuf; - size_t insz = ifile->bufsiz; - size_t outsz; diff --git a/www/anyterm/Makefile b/www/anyterm/Makefile index feec025..8166412 100644 --- a/www/anyterm/Makefile +++ b/www/anyterm/Makefile @@ -3,6 +3,7 @@ PORTNAME= anyterm PORTVERSION= 1.1.29 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://anyterm.org/download/ \ http://apt.douglasthrift.net/files/${PORTNAME}/ \ @@ -23,12 +24,21 @@ ALL_TARGET= default_target PLIST_FILES= man/man1/anytermd.1.gz \ sbin/anytermd +CPPFLAGS+= -I${LOCALBASE}/include + post-patch: @${REINPLACE_CMD} -e 's|/private/etc/apache2|${FILESDIR}|' \ ${WRKSRC}/scripts/mimetype.sh - @${REINPLACE_CMD} -e 's|^CPP_FLAGS=|&-I${LOCALBASE}/include |' \ - -e 's|^LINK_FLAGS=|&-L${ICONV_PREFIX}/lib ${ICONV_LIB} |' ${WRKSRC}/common.mk - @${REINPLACE_CMD} -e 's|^COMPILE_FLAGS=|&-I${LOCALBASE}/include |' \ + @${REINPLACE_CMD} \ + -e 's|$$(CPP_FLAGS)|& ${CPPFLAGS} |' \ + -e '/^COMPILE_FLAGS=/s|$$| ${CXXFLAGS}|' \ + -e 's|$${OPTIMISE_FLAGS}||' \ + -e 's|$$(LINK_FLAGS)|& -L${ICONV_PREFIX}/lib ${ICONV_LIB} |' \ + ${WRKSRC}/common.mk + @${REINPLACE_CMD} \ + -e '/^COMPILE_FLAGS=/s|$$| ${CXXFLAGS}|' \ + -e 's|$$(INC_FLAGS)|& ${CPPFLAGS} |' \ + -e 's|$$(CXXFLAGS)||' -e 's|$$(OPTIMISE_FLAGS)||' \ ${WRKSRC}/libpbe/common.mk do-install: diff --git a/www/anyterm/files/patch-libpbe-include-Iconver.hh b/www/anyterm/files/patch-libpbe-include-Iconver.hh new file mode 100644 index 0000000..432458b --- /dev/null +++ b/www/anyterm/files/patch-libpbe-include-Iconver.hh @@ -0,0 +1,11 @@ +--- libpbe/include/Iconver.hh.orig 2008-10-25 12:17:29 UTC ++++ libpbe/include/Iconver.hh +@@ -36,7 +36,7 @@ + #include "Exception.hh" + + +-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun__) ++#if defined(__OpenBSD__) || defined(__sun__) + // Previously __APPLE__ was included in this list; presumably they have + // changed their headers. If you have an older system you may need to put + // it back. diff --git a/www/htmlcxx/Makefile b/www/htmlcxx/Makefile index 7ee8eb6..adbec6a 100644 --- a/www/htmlcxx/Makefile +++ b/www/htmlcxx/Makefile @@ -2,7 +2,7 @@ PORTNAME= htmlcxx PORTVERSION= 0.85 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www textproc MASTER_SITES= SF @@ -23,4 +23,7 @@ MAKE_JOBS_UNSAFE=yes MAKE_ARGS= pkgconfigdir="${PREFIX}/libdata/pkgconfig" +post-patch: + @${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure + .include <bsd.port.mk> diff --git a/www/htmlcxx/files/patch-CharsetConverter.cc b/www/htmlcxx/files/patch-CharsetConverter.cc deleted file mode 100644 index 47560c0..0000000 --- a/www/htmlcxx/files/patch-CharsetConverter.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- html/CharsetConverter.cc.orig 2012-09-19 14:05:35.000000000 +0800 -+++ html/CharsetConverter.cc 2012-09-19 14:08:42.000000000 +0800 -@@ -37,7 +37,7 @@ - - size_t ret; - while (1) { -- ret = iconv(mIconvDescriptor, const_cast<char**>(&inbuf), &inbytesleft, &outbuf, &outbytesleft); -+ ret = iconv(mIconvDescriptor, &inbuf, &inbytesleft, &outbuf, &outbytesleft); - if (ret == 0) break; - if (ret == (size_t)-1 && errno == E2BIG) return string(); - diff --git a/www/httrack/Makefile b/www/httrack/Makefile index b8387f1..8260972 100644 --- a/www/httrack/Makefile +++ b/www/httrack/Makefile @@ -3,6 +3,7 @@ PORTNAME= httrack PORTVERSION= 3.48.21 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://download.httrack.com/ \ http://mirror.httrack.com/ \ @@ -32,7 +33,11 @@ PORTDOCS= * SHEBANG_FILES= src/webhttrack -.include <bsd.port.options.mk> +.include <bsd.port.pre.mk> + +.if empty(ICONV_LIB) +CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv=no +.endif .if ${PORT_OPTIONS:MICONS} INSTALLS_ICONS= yes @@ -46,4 +51,4 @@ post-patch: post-install: ${INSTALL_DATA} ${WRKSRC}/html/httrack.css ${STAGEDIR}${DOCSDIR}/httrack.css -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/www/mod_encoding/Makefile b/www/mod_encoding/Makefile index 727696c..7f332f9 100644 --- a/www/mod_encoding/Makefile +++ b/www/mod_encoding/Makefile @@ -3,7 +3,7 @@ PORTNAME= mod_encoding PORTVERSION= 20021209 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www MASTER_SITES= http://webdav.todo.gr.jp/download/ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} @@ -39,10 +39,17 @@ EXTRA_PATCHES+= ${PATCHDIR}/iconv_hook-20040430.patch EXTRA_PATCHES+= ${PATCHDIR}/queryfix-patch22 .endif +.include <bsd.port.pre.mk> + +.if empty(ICONV_LIB) +CONFIGURE_ENV+= ac_cv_lib_iconv_iconv=no \ + ac_cv_lib_iconv_libiconv=no +.endif + do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} $(APXS) -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} \ -i -n ${MODULENAME} ${WRKSRC}/${MODULENAME}.la ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/www/newsbeuter/files/patch-src-utils.cpp b/www/newsbeuter/files/patch-src-utils.cpp new file mode 100644 index 0000000..26982fb --- /dev/null +++ b/www/newsbeuter/files/patch-src-utils.cpp @@ -0,0 +1,12 @@ +--- src/utils.cpp.orig 2015-02-19 10:56:59 UTC ++++ src/utils.cpp +@@ -274,7 +274,8 @@ std::string utils::convert_text(const st + * of all the Unix-like systems around there, only Linux/glibc seems to + * come with a SuSv3-conforming iconv implementation. + */ +-#if !(__linux) && !defined(__GLIBC__) && !defined(__APPLE__) && !defined(__OpenBSD__) ++#if !(__linux) && !defined(__GLIBC__) && !defined(__APPLE__) \ ++ && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) + const char * inbufp; + #else + char * inbufp; diff --git a/x11-toolkits/p5-Prima/Makefile b/x11-toolkits/p5-Prima/Makefile index 9b56027..6037309 100644 --- a/x11-toolkits/p5-Prima/Makefile +++ b/x11-toolkits/p5-Prima/Makefile @@ -3,7 +3,7 @@ PORTNAME= Prima PORTVERSION= 1.41 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -21,7 +21,8 @@ LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib \ OPTIONS_DEFINE= GTK2 ICONV XFT OPTIONS_DEFAULT=ICONV XFT -CONFIGURE_ARGS= X11BASE=${LOCALBASE} +CONFIGURE_ARGS= EXTRA_CCFLAGS="${CFLAGS}" EXTRA_LDFLAGS="${LDFLAGS}" \ + X11BASE=${LOCALBASE} USES= perl5 USE_PERL5= configure USE_XORG= x11 xext xpm xrender diff --git a/x11-toolkits/p5-Prima/files/patch-Makefile.PL b/x11-toolkits/p5-Prima/files/patch-Makefile.PL new file mode 100644 index 0000000..7e7fe65 --- /dev/null +++ b/x11-toolkits/p5-Prima/files/patch-Makefile.PL @@ -0,0 +1,22 @@ +--- Makefile.PL.orig 2014-11-08 16:12:20 UTC ++++ Makefile.PL +@@ -1244,13 +1244,13 @@ EOF + $cmd_options{WITH_ICONV} = 0 unless $cmd_options{WITH_XFT}; # iconv is used for xft only + if ( $cmd_options{WITH_ICONV} && have_header( "iconv.h")) { + print "Checking for presence of libiconv... "; +- if ( defined find_lib( 'iconv', '', '')) { +- push @LIBS, 'iconv'; +- print "yes\n"; ++ my $ok = compile( "#include <iconv.h>\nint main() { iconv_close(0); return 0; }\n"); ++ if ( $ok ) { ++ print "no, but works as part of libc\n"; + } else { +- my $ok = compile( "#include <iconv.h>\nint main() { iconv_close(0); return 0; }\n"); +- if ( $ok ) { +- print "no, but works as part of libc\n"; ++ if ( defined find_lib( 'iconv', '', '')) { ++ push @LIBS, 'iconv'; ++ print "yes\n"; + } else { + $DEFINES{HAVE_ICONV_H} = undef; + $cmd_options{WITH_ICONV} = 0; diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile index 2de4367..7f915c3 100644 --- a/x11-wm/icewm/Makefile +++ b/x11-wm/icewm/Makefile @@ -3,7 +3,7 @@ PORTNAME= icewm PORTVERSION= 1.3.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTVERSION} @@ -12,7 +12,7 @@ COMMENT= Window Manager designed for speed, usability and consistency LICENSE= GPLv2 -USES= gmake iconv pkgconfig +USES= gmake iconv:translit pkgconfig USE_XORG= ice sm x11 xext USE_GNOME= gdkpixbuf2 GNU_CONFIGURE= yes diff --git a/x11-wm/icewm/files/patch-src_ylocale.cc b/x11-wm/icewm/files/patch-src_ylocale.cc deleted file mode 100644 index d76d2f4..0000000 --- a/x11-wm/icewm/files/patch-src_ylocale.cc +++ /dev/null @@ -1,26 +0,0 @@ ---- src/ylocale.cc.orig 2013-11-03 19:58:39.180727369 -0500 -+++ src/ylocale.cc 2013-11-03 19:58:51.540725980 -0500 -@@ -126,8 +126,12 @@ YLocale::~YLocale() { - iconv_t YLocale::getConverter (const char *from, const char **&to) { - iconv_t cd = (iconv_t) -1; - -+ char *myfrom = (char *)malloc(1 + strlen(from)); -+ strcpy(myfrom, from); -+ char *modptr = strstr(myfrom, "//"); -+ if (NULL != modptr) *modptr = '\0'; - while (NULL != *to) -- if ((iconv_t) -1 != (cd = iconv_open(*to, from))) return cd; -+ if ((iconv_t) -1 != (cd = iconv_open(*to, myfrom))) return cd; - else ++to; - - return (iconv_t) -1; -@@ -149,7 +153,8 @@ YUChar *YLocale::unicodeString(const YLC - return NULL; - - YUChar * uStr(new YUChar[lLen + 1]); -- char * inbuf((char *) lStr), * outbuf((char *) uStr); -+ const char * inbuf((char *) lStr); -+ char * outbuf((char *) uStr); - size_t inlen(lLen), outlen(4 * lLen); - - if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen)) diff --git a/x11-wm/pekwm/Makefile b/x11-wm/pekwm/Makefile index 5df718d..970fc43 100644 --- a/x11-wm/pekwm/Makefile +++ b/x11-wm/pekwm/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ARGS+=--enable-shape --enable-xinerama --enable-xrandr \ --enable-xft --enable-image-xpm --enable-image-jpeg \ --enable-image-png --disable-debug \ --disable-pedantic -CFLAGS+= -DICONV_CONST -I${LOCALBASE}/include +CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} .include <bsd.port.mk> diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile index a539fc7..01cbd5b 100644 --- a/x11/x3270/Makefile +++ b/x11/x3270/Makefile @@ -3,7 +3,7 @@ PORTNAME= x3270 PORTVERSION= 3.3.15 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 net MASTER_SITES= http://x3270.bgp.nu/download/current/ EXTRACT_SUFX= ga7-src.tgz @@ -21,8 +21,9 @@ CONFLICTS= c3270-* USES= iconv fonts imake:env USE_XORG= ice sm x11 xaw xext xmu xt GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-fontdir=${FONTSDIR} \ - --disable-dbcs +CONFIGURE_ARGS= --with-fontdir=${FONTSDIR} \ + --disable-dbcs \ + ac_cv_search_libiconv=no CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib .if defined(WITHOUT_OPENSSL) |
