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

Collapse All | Expand All

(-)Mk/Uses/iconv.mk (-1 / +3 lines)
Lines 37-43 ICONV_PREFIX= /usr Link Here
37
ICONV_CONFIGURE_ARG=
37
ICONV_CONFIGURE_ARG=
38
ICONV_CONFIGURE_BASE=
38
ICONV_CONFIGURE_BASE=
39
39
40
.if exists(${LOCALBASE}/include/iconv.h)
40
.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} < 1100069) \
41
 || exists(${LOCALBASE}/include/iconv.h)
42
BUILD_DEPENDS+=	libiconv>=1.14_7:${PORTSDIR}/converters/libiconv
41
CPPFLAGS+=	-DLIBICONV_PLUG
43
CPPFLAGS+=	-DLIBICONV_PLUG
42
CFLAGS+=	-DLIBICONV_PLUG
44
CFLAGS+=	-DLIBICONV_PLUG
43
CXXFLAGS+=	-DLIBICONV_PLUG
45
CXXFLAGS+=	-DLIBICONV_PLUG
(-)archivers/unalz/files/patch-UnAlz.cpp (-4 / +3 lines)
Lines 9-25 Link Here
9
 #	include <sys/param.h>	// __NetBSD_Version__
9
 #	include <sys/param.h>	// __NetBSD_Version__
10
 #	include <errno.h>		// iconv.h ¶§¹®¿¡ ÇÊ¿ä 
10
 #	include <errno.h>		// iconv.h ¶§¹®¿¡ ÇÊ¿ä 
11
 #endif
11
 #endif
12
@@ -455,7 +455,8 @@ BOOL CUnAlz::ReadLocalFileheader()
12
@@ -455,7 +455,7 @@ BOOL CUnAlz::ReadLocalFileheader()
13
 	size_t size;
13
 	size_t size;
14
 	char inbuf[ICONV_BUF_SIZE];
14
 	char inbuf[ICONV_BUF_SIZE];
15
 	char outbuf[ICONV_BUF_SIZE];
15
 	char outbuf[ICONV_BUF_SIZE];
16
-#if defined(__FreeBSD__) || defined(__CYGWIN__) ||  defined(__NetBSD__)
16
-#if defined(__FreeBSD__) || defined(__CYGWIN__) ||  defined(__NetBSD__)
17
+#if defined(__FreeBSD__) || defined(__CYGWIN__) ||  defined(__NetBSD__) \
17
+#if defined(__CYGWIN__) ||  defined(__NetBSD__)
18
+ || defined(__DragonFly__)
19
 	const char *inptr = inbuf;
18
 	const char *inptr = inbuf;
20
 #else
19
 #else
21
 	char *inptr = inbuf;
20
 	char *inptr = inbuf;
22
@@ -1907,7 +1908,11 @@ void CUnAlz::DecryptingData(int nSize, B
21
@@ -1907,7 +1907,11 @@ void CUnAlz::DecryptingData(int nSize, B
23
 ////////////////////////////////////////////////////////////////////////////////////////////////////
22
 ////////////////////////////////////////////////////////////////////////////////////////////////////
24
 UINT32 CUnAlz::CRC32(UINT32 l, BYTE c)
23
 UINT32 CUnAlz::CRC32(UINT32 l, BYTE c)
25
 {
24
 {
(-)archivers/unrar-iconv/files/patch-iconv (-2 / +2 lines)
Lines 150-157 Link Here
150
+    static size_t inbytesleft, outbytesleft;
150
+    static size_t inbytesleft, outbytesleft;
151
+    inbytesleft = strlen(Src)+1;
151
+    inbytesleft = strlen(Src)+1;
152
+    outbytesleft = NM;
152
+    outbytesleft = NM;
153
+    ret = iconv(h_I2E, &Src, &inbytesleft, &Dest, &outbytesleft);
153
+    ret = iconv(h_I2E, (char **)&Src, &inbytesleft, &Dest, &outbytesleft);
154
+    Dest[outbytesleft-inbytesleft]=NULL;
154
+    Dest[outbytesleft-inbytesleft]=0;
155
+  }
155
+  }
156
+  if (ret == (size_t)(-1))
156
+  if (ret == (size_t)(-1))
157
+    strncpyz(Dest,Src,DestSize);
157
+    strncpyz(Dest,Src,DestSize);
(-)audio/cmus/Makefile (+1 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	cmus
4
PORTNAME=	cmus
5
PORTVERSION=	2.6.0
5
PORTVERSION=	2.6.0
6
PORTREVISION=	1
6
CATEGORIES=	audio
7
CATEGORIES=	audio
7
8
8
MAINTAINER=	h.skuhra@gmail.com
9
MAINTAINER=	h.skuhra@gmail.com
(-)audio/cmus/files/patch-scripts-checks.sh (+20 lines)
Line 0 Link Here
1
--- scripts/checks.sh.orig	2014-08-11 07:48:28 UTC
2
+++ scripts/checks.sh
3
@@ -677,11 +677,15 @@ check_dl()
4
 check_iconv()
5
 {
6
 	HAVE_ICONV=n
7
-	if check_library ICONV "" "-liconv"
8
+	if check_function iconv
9
+	then
10
+		echo "libc contains iconv"
11
+		makefile_var ICONV_CFLAGS ""
12
+		makefile_var ICONV_LIBS ""
13
+	elif check_library ICONV "" "-liconv"
14
 	then
15
 		echo "taking iconv from libiconv"
16
 	else
17
-		echo "assuming libc contains iconv"
18
 		makefile_var ICONV_CFLAGS ""
19
 		makefile_var ICONV_LIBS ""
20
 	fi
(-)audio/id3mtag/files/patch-charconv.cpp (+11 lines)
Line 0 Link Here
1
--- charconv.cpp.orig	2015-01-29 23:00:00 UTC
2
+++ charconv.cpp
3
@@ -109,7 +109,7 @@ namespace charset {
4
 
5
     bool recode(char* out, size_t avail, const void* src, size_t len, const char* to, const char* from)
6
     {
7
-        const char* in = (const char*)src;
8
+        char* in = (char*)src;
9
 
10
         iconv_t cvt = iconv_open(to, from);
11
         if(cvt == (iconv_t)-1)
(-)audio/mp3unicode/files/patch-mp3unicode.cpp (-11 lines)
Lines 1-11 Link Here
1
--- ./mp3unicode.cpp.orig	2012-05-07 12:03:19.000000000 +0000
2
+++ ./mp3unicode.cpp	2014-05-13 20:16:40.053475428 +0000
3
@@ -229,7 +229,7 @@
4
 			if (
5
 				iconv (
6
 					cd,
7
-					(char **)&from,
8
+					&from,
9
 					&from_size,
10
 					&to,
11
 					&to_size
(-)audio/tagutil/Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	tagutil
3
PORTNAME=	tagutil
4
PORTVERSION=	3.0.1
4
PORTVERSION=	3.0.1
5
PORTREVISION=	1
5
PORTREVISION=	2
6
CATEGORIES=	audio
6
CATEGORIES=	audio
7
7
8
MAINTAINER=	alex@kaworu.ch
8
MAINTAINER=	alex@kaworu.ch
(-)audio/tagutil/files/patch-FindIconv.cmake (+31 lines)
Line 0 Link Here
1
--- FindIconv.cmake.orig	2014-07-23 14:37:21 UTC
2
+++ FindIconv.cmake
3
@@ -9,6 +9,7 @@
4
 #  ICONV_SECOND_ARGUMENT_IS_CONST - the second argument for iconv() is const
5
 # 
6
 include(CheckCSourceCompiles)
7
+include(CheckFunctionExists)
8
 
9
 IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
10
   # Already in cache, be silent
11
@@ -17,11 +18,15 @@ ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRA
12
 
13
 FIND_PATH(ICONV_INCLUDE_DIR iconv.h) 
14
  
15
-FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
16
- 
17
-IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
18
-   SET(ICONV_FOUND TRUE) 
19
-ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
20
+IF(ICONV_INCLUDE_DIR)
21
+  CHECK_FUNCTION_EXISTS(iconv ICONV_FOUND)
22
+  IF(NOT ICONV_FOUND)
23
+    FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2)
24
+    IF(ICONV_LIBRARIES)
25
+      SET(ICONV_FOUND TRUE)
26
+    ENDIF(ICONV_LIBRARIES)
27
+  ENDIF(NOT ICONV_FOUND)
28
+ENDIF(ICONV_INCLUDE_DIR)
29
 
30
 set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
31
 set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
(-)audio/xmms-wavpack/Makefile (-2 / +2 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	xmms-wavpack
3
PORTNAME=	xmms-wavpack
4
PORTVERSION=	1.0.3
4
PORTVERSION=	1.0.3
5
PORTREVISION=	4
5
PORTREVISION=	5
6
CATEGORIES=	audio
6
CATEGORIES=	audio
7
MASTER_SITES=	http://www.wavpack.com/
7
MASTER_SITES=	http://www.wavpack.com/
8
8
Lines 12-18 COMMENT= XMMS input plugin to play WavPa Link Here
12
LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack \
12
LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack \
13
		libxmms.so:${PORTSDIR}/multimedia/xmms
13
		libxmms.so:${PORTSDIR}/multimedia/xmms
14
14
15
USES=		libtool pkgconfig tar:bzip2
15
USES=		iconv libtool pkgconfig tar:bzip2
16
GNU_CONFIGURE=	yes
16
GNU_CONFIGURE=	yes
17
CPPFLAGS+=	-I${LOCALBASE}/include
17
CPPFLAGS+=	-I${LOCALBASE}/include
18
LDFLAGS+=	-L${LOCALBASE}/lib
18
LDFLAGS+=	-L${LOCALBASE}/lib
(-)audio/xmms-wavpack/files/patch-src_libwavpack.cpp (-9 lines)
Lines 18-29 Link Here
18
             float *fptr = (float *) input;
18
             float *fptr = (float *) input;
19
             int32_t *lptr = input;
19
             int32_t *lptr = input;
20
             int cnt = tsamples;
20
             int cnt = tsamples;
21
@@ -362,7 +362,7 @@ convertUTF8toLocale(char *utf8)
22
     size_t in_left = strlen(utf8);
23
     size_t out_left = 2 * in_left + 1;
24
     char *buf = (char *)g_malloc(out_left);
25
-#if 1
26
+#if 0
27
     char *in = utf8;
28
 #else
29
     const char *in = (const char *) utf8;   // some systems (freeBSD?) require const here
(-)chinese/cconv/Makefile (-2 / +8 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	cconv
4
PORTNAME=	cconv
5
PORTVERSION=	0.6.2
5
PORTVERSION=	0.6.2
6
PORTREVISION=	3
6
PORTREVISION=	4
7
CATEGORIES=	chinese converters
7
CATEGORIES=	chinese converters
8
MASTER_SITES=	GOOGLE_CODE
8
MASTER_SITES=	GOOGLE_CODE
9
9
Lines 21-24 post-patch: Link Here
21
	@${REINPLACE_CMD} -e 's|unicode.h||; s|libcconv_la_LDFLAGS|cconv_LDFLAGS|' ${WRKSRC}/Makefile.in
21
	@${REINPLACE_CMD} -e 's|unicode.h||; s|libcconv_la_LDFLAGS|cconv_LDFLAGS|' ${WRKSRC}/Makefile.in
22
	@${REINPLACE_CMD} -e 's|UTF-TW|UTF8-TW|g' ${WRKSRC}/main.c
22
	@${REINPLACE_CMD} -e 's|UTF-TW|UTF8-TW|g' ${WRKSRC}/main.c
23
23
24
.include <bsd.port.mk>
24
.include <bsd.port.pre.mk>
25
26
.if ! empty(ICONV_LIB)
27
CONFIGURE_ENV+=	ICONV_DIR=${ICONV_PREFIX}
28
.endif
29
30
.include <bsd.port.post.mk>
(-)chinese/cconv/files/patch-configure (+13 lines)
Line 0 Link Here
1
--- configure.orig	2010-02-08 03:55:22 UTC
2
+++ configure
3
@@ -19129,10 +19129,6 @@ fi
4
 OS_TYPE="-D"`uname -s`
5
 
6
 
7
-for i in /usr/local/iconv /usr/local /usr; do
8
-  (test -f $i/lib/libiconv.so ||\
9
-   test -f $i/lib/libiconv.a) && ICONV_DIR=$i && break
10
-done
11
 
12
 if test -z "$ICONV_DIR"; then
13
   ICONV_LIBS=""
(-)comms/scmxx/Makefile (-3 / +7 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	scmxx
4
PORTNAME=	scmxx
5
PORTVERSION=	0.9.0
5
PORTVERSION=	0.9.0
6
PORTREVISION=	2
6
PORTREVISION=	3
7
CATEGORIES=	comms
7
CATEGORIES=	comms
8
MASTER_SITES=	SF
8
MASTER_SITES=	SF
9
9
Lines 21-27 EXAMPLES= sms.txt vCalendar.vcs vCard.vc Link Here
21
21
22
OPTIONS_DEFINE=	DOCS
22
OPTIONS_DEFINE=	DOCS
23
23
24
.include <bsd.port.options.mk>
24
.include <bsd.port.pre.mk>
25
26
.if empty(ICONV_LIB)
27
CONFIGURE_ARGS+=ac_cv_lib_iconv_libiconv=no
28
.endif
25
29
26
post-patch:
30
post-patch:
27
	@${FIND} ${WRKSRC} -name 'Makefile*' | ${XARGS} \
31
	@${FIND} ${WRKSRC} -name 'Makefile*' | ${XARGS} \
Lines 35-38 post-install: Link Here
35
	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
39
	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
36
.endif
40
.endif
37
41
38
.include <bsd.port.mk>
42
.include <bsd.port.post.mk>
(-)comms/telldus-core/Makefile (-1 / +2 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	telldus-core
4
PORTNAME=	telldus-core
5
PORTVERSION=	2.1.2
5
PORTVERSION=	2.1.2
6
PORTREVISION=	1
6
CATEGORIES=	comms
7
CATEGORIES=	comms
7
MASTER_SITES=	http://download.telldus.se/TellStick/Software/telldus-core/
8
MASTER_SITES=	http://download.telldus.se/TellStick/Software/telldus-core/
8
9
Lines 16-22 LIB_DEPENDS= libftdi.so:${PORTSDIR}/deve Link Here
16
		libconfuse.so:${PORTSDIR}/devel/libconfuse \
17
		libconfuse.so:${PORTSDIR}/devel/libconfuse \
17
		libargp.so:${PORTSDIR}/devel/argp-standalone
18
		libargp.so:${PORTSDIR}/devel/argp-standalone
18
19
19
USES= 		iconv cmake compiler:c++11-lang
20
USES= 		cmake compiler:c++11-lang iconv:wchar_t
20
21
21
#CMAKE_VERBOSE=yes
22
#CMAKE_VERBOSE=yes
22
CMAKE_ARGS+=-DGENERATE_MAN=TRUE
23
CMAKE_ARGS+=-DGENERATE_MAN=TRUE
(-)comms/telldus-core/files/patch-common-CMakeLists.txt (-29 lines)
Lines 1-29 Link Here
1
--- common/CMakeLists.txt
2
+++ common/CMakeLists.txt
3
@@ -54,16 +54,22 @@ ELSEIF (WIN32)
4
 	)
5
 ELSEIF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
6
 	#### FreeBSD ####
7
-	FIND_LIBRARY(ICONV_LIBRARY iconv)
8
+	string(REGEX MATCH "(([0-9]+)\\.([0-9]+))-([A-Z0-9])+" FREEBSD "${CMAKE_SYSTEM_VERSION}")
9
+	set( FREEBSD_RELEASE "${CMAKE_MATCH_1}" )
10
 	ADD_DEFINITIONS( -D_FREEBSD )
11
 	LIST(APPEND  telldus-common_SRCS
12
 		Event_unix.cpp
13
 		EventHandler_unix.cpp
14
 		Socket_unix.cpp
15
 	)
16
-	LIST(APPEND telldus-common_LIBRARIES
17
-		${ICONV_LIBRARY}
18
-	)
19
+
20
+	# FreeBSD 10 has iconv built in to libc
21
+	IF(FREEBSD_RELEASE LESS 10)
22
+		FIND_LIBRARY(ICONV_LIBRARY iconv)
23
+		LIST(APPEND telldus-common_LIBRARIES
24
+			${ICONV_LIBRARY}
25
+		)
26
+	ENDIF ()
27
 ELSE (APPLE)
28
 	#### Linux ####
29
 	ADD_DEFINITIONS( -D_LINUX )
(-)comms/telldus-core/files/patch-common-Strings.cpp (+26 lines)
Line 0 Link Here
1
--- common/Strings.cpp.orig	2014-03-31 10:30:09 UTC
2
+++ common/Strings.cpp
3
@@ -61,11 +61,7 @@ std::wstring TelldusCore::charToWstring(
4
 	char *outString = reinterpret_cast<char*>(new wchar_t[utf8Length+1]);
5
 	memset(outString, 0, sizeof(wchar_t)*(utf8Length+1));
6
 
7
-#ifdef _FREEBSD
8
-	const char *inPointer = inString;
9
-#else
10
 	char *inPointer = inString;
11
-#endif
12
 	char *outPointer = outString;
13
 
14
 	iconv_t convDesc = iconv_open(WCHAR_T_ENCODING, "UTF-8");
15
@@ -206,11 +202,7 @@ std::string TelldusCore::wideToString(co
16
 	char *outString = new char[outbytesLeft];
17
 	memset(outString, 0, sizeof(*outString)*(outbytesLeft));
18
 
19
-#ifdef _FREEBSD
20
-	const char *inPointer = inString;
21
-#else
22
 	char *inPointer = inString;
23
-#endif
24
 	char *outPointer = outString;
25
 
26
 	iconv_t convDesc = iconv_open("UTF-8", WCHAR_T_ENCODING);
(-)converters/libiconv/Makefile (-5 / +4 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	libiconv
4
PORTNAME=	libiconv
5
PORTVERSION=	1.14
5
PORTVERSION=	1.14
6
PORTREVISION=	6
6
PORTREVISION=	8
7
CATEGORIES=	converters devel
7
CATEGORIES=	converters devel
8
MASTER_SITES=	GNU
8
MASTER_SITES=	GNU
9
9
Lines 12-21 COMMENT= Character set conversion librar Link Here
12
12
13
GNU_CONFIGURE=	yes
13
GNU_CONFIGURE=	yes
14
CONFIGURE_ARGS=	--enable-static \
14
CONFIGURE_ARGS=	--enable-static \
15
		--without-libintl-prefix \
15
		--disable-nls \
16
		--docdir=${DOCSDIR}
16
		--docdir=${DOCSDIR} \
17
CONFIGURE_ENV=	am_cv_func_iconv="yes" \
17
		am_cv_func_iconv=no
18
		am_cv_proto_iconv_arg1="const"
19
INSTALL_TARGET=	install-strip
18
INSTALL_TARGET=	install-strip
20
MAKE_JOBS_UNSAFE=	yes
19
MAKE_JOBS_UNSAFE=	yes
21
USES=		libtool
20
USES=		libtool
(-)converters/libiconv/files/patch-include-iconv.h.in (+59 lines)
Line 0 Link Here
1
--- include/iconv.h.in.orig	2011-08-07 17:48:03 UTC
2
+++ include/iconv.h.in
3
@@ -94,7 +94,6 @@ extern int iconv_close (iconv_t cd);
4
 #endif
5
 
6
 
7
-#ifndef LIBICONV_PLUG
8
 
9
 /* Nonstandard extensions. */
10
 
11
@@ -127,12 +126,16 @@ typedef struct {
12
 /* Allocates descriptor for code conversion from encoding ‘fromcode’ to
13
    encoding ‘tocode’ into preallocated memory. Returns an error indicator
14
    (0 or -1 with errno set). */
15
+#ifndef LIBICONV_PLUG
16
 #define iconv_open_into libiconv_open_into
17
+#endif
18
 extern int iconv_open_into (const char* tocode, const char* fromcode,
19
                             iconv_allocation_t* resultp);
20
 
21
 /* Control of attributes. */
22
+#ifndef LIBICONV_PLUG
23
 #define iconvctl libiconvctl
24
+#endif
25
 extern int iconvctl (iconv_t cd, int request, void* argument);
26
 
27
 /* Hook performed after every successful conversion of a Unicode character. */
28
@@ -212,7 +215,9 @@ struct iconv_fallbacks {
29
 #define ICONV_SET_FALLBACKS       6  /* const struct iconv_fallbacks *argument */
30
 
31
 /* Listing of locale independent encodings. */
32
+#ifndef LIBICONV_PLUG
33
 #define iconvlist libiconvlist
34
+#endif
35
 extern void iconvlist (int (*do_one) (unsigned int namescount,
36
                                       const char * const * names,
37
                                       void* data),
38
@@ -224,6 +229,7 @@ extern const char * iconv_canonicalize (
39
 
40
 /* Support for relocatable packages.  */
41
 
42
+#ifndef LIBICONV_PLUG
43
 /* Sets the original and the current installation prefix of the package.
44
    Relocation simply replaces a pathname starting with the original prefix
45
    by the corresponding pathname with the current prefix instead.  Both
46
@@ -231,12 +237,12 @@ extern const char * iconv_canonicalize (
47
    instead of "/").  */
48
 extern void libiconv_set_relocation_prefix (const char *orig_prefix,
49
                                             const char *curr_prefix);
50
+#endif
51
 
52
 #ifdef __cplusplus
53
 }
54
 #endif
55
 
56
-#endif
57
 
58
 
59
 #endif /* _LIBICONV_H */
(-)converters/wkhtmltopdf/Makefile (+1 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	wkhtmltopdf
4
PORTNAME=	wkhtmltopdf
5
PORTVERSION=	0.12.2.1
5
PORTVERSION=	0.12.2.1
6
PORTREVISION=	1
6
CATEGORIES=	converters
7
CATEGORIES=	converters
7
MASTER_SITES=	SF
8
MASTER_SITES=	SF
8
MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
9
MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
(-)converters/wkhtmltopdf/files/patch-config.tests_unix_compile.test (+11 lines)
Line 0 Link Here
1
--- config.tests/unix/compile.test.orig
2
+++ config.tests/unix/compile.test
3
@@ -13,7 +13,7 @@
4
 shift 7
5
 LFLAGS="$SYSROOT_FLAG"
6
 INCLUDEPATH=""
7
-CXXFLAGS="$SYSROOT_FLAG"
8
+CXXFLAGS="$CXXFLAGS $SYSROOT_FLAG"
9
 MAC_ARCH_CXXFLAGS=""
10
 MAC_ARCH_LFLAGS=""
11
 while [ "$#" -gt 0 ]; do
(-)converters/wkhtmltopdf/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp (+11 lines)
Line 0 Link Here
1
--- config.tests/unix/gnu-libiconv/gnu-libiconv.cpp.orig	2015-01-03 18:06:12 UTC
2
+++ config.tests/unix/gnu-libiconv/gnu-libiconv.cpp
3
@@ -48,7 +48,7 @@ int main(int, char **)
4
 {
5
     iconv_t x = iconv_open("", "");
6
 
7
-    const char *inp;
8
+    char *inp;
9
     char *outp;
10
     size_t inbytes, outbytes;
11
     iconv(x, &inp, &inbytes, &outp, &outbytes);
(-)converters/wkhtmltopdf/files/patch-src_corelib_codecs_qiconvcodec.cpp (+39 lines)
Line 0 Link Here
1
--- src/corelib/codecs/qiconvcodec.cpp.orig	2015-01-03 18:06:52 UTC
2
+++ src/corelib/codecs/qiconvcodec.cpp
3
@@ -219,12 +219,7 @@ QString QIconvCodec::convertToUnicode(co
4
     IconvState *state = *pstate;
5
     size_t inBytesLeft = len;
6
     // best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM
7
-#ifdef GNU_LIBICONV
8
-    // GNU doesn't disagree with POSIX :/
9
-    const char *inBytes = chars;
10
-#else
11
     char *inBytes = const_cast<char *>(chars);
12
-#endif
13
 
14
     QByteArray in;
15
     if (remainingCount) {
16
@@ -318,11 +313,7 @@ static bool setByteOrder(iconv_t cd)
17
     size_t outBytesLeft = sizeof buf;
18
     size_t inBytesLeft = sizeof bom;
19
 
20
-#if defined(GNU_LIBICONV)
21
-    const char **inBytesPtr = const_cast<const char **>(&inBytes);
22
-#else
23
     char **inBytesPtr = &inBytes;
24
-#endif
25
 
26
     if (iconv(cd, inBytesPtr, &inBytesLeft, &outBytes, &outBytesLeft) == (size_t) -1) {
27
         return false;
28
@@ -338,11 +329,7 @@ QByteArray QIconvCodec::convertFromUnico
29
     char *outBytes;
30
     size_t inBytesLeft;
31
 
32
-#if defined(GNU_LIBICONV)
33
-    const char **inBytesPtr = const_cast<const char **>(&inBytes);
34
-#else
35
     char **inBytesPtr = &inBytes;
36
-#endif
37
 
38
     IconvState *temporaryState = 0;
39
     QThreadStorage<QIconvCodec::IconvState *> *ts = fromUnicodeState();
(-)databases/kbibtex/Makefile (-2 / +2 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	kbibtex
4
PORTNAME=	kbibtex
5
DISTVERSION=	0.4.1
5
DISTVERSION=	0.4.1
6
PORTREVISION=	9
6
PORTREVISION=	10
7
CATEGORIES=	databases kde
7
CATEGORIES=	databases kde
8
MASTER_SITES=	http://download.gna.org/${PORTNAME}/${PORTVERSION:C,(^[[:digit:]]\.[[:digit:]]).*,\1,}/
8
MASTER_SITES=	http://download.gna.org/${PORTNAME}/${PORTVERSION:C,(^[[:digit:]]\.[[:digit:]]).*,\1,}/
9
9
Lines 12-18 COMMENT= Bibliography editor for KDE Link Here
12
12
13
LIB_DEPENDS=	libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
13
LIB_DEPENDS=	libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
14
14
15
USES=		cmake shared-mime-info tar:bzip2
15
USES=		cmake iconv shared-mime-info tar:bzip2
16
USE_GNOME=	libxml2 libxslt
16
USE_GNOME=	libxml2 libxslt
17
USE_KDE4=	kdelibs kdeprefix automoc4
17
USE_KDE4=	kdelibs kdeprefix automoc4
18
USE_QT4=	qmake_build moc_build uic_build rcc_build \
18
USE_QT4=	qmake_build moc_build uic_build rcc_build \
(-)databases/kbibtex/files/patch-src__libkbibtexio__iconvlatex.cpp (-11 lines)
Lines 1-11 Link Here
1
--- ./src/libkbibtexio/iconvlatex.cpp.orig	2012-05-05 10:50:42.000000000 +0000
2
+++ ./src/libkbibtexio/iconvlatex.cpp	2012-05-06 00:53:04.285249457 +0000
3
@@ -58,7 +58,7 @@
4
 QByteArray IConvLaTeX::encode(const QString &input)
5
 {
6
     QByteArray inputByteArray = input.toUtf8();
7
-#ifdef Q_WS_WIN
8
+#ifndef Q_OS_LINUX
9
     /// iconv on Windows likes to have it as const char *
10
     const char *inputBuffer = inputByteArray.data();
11
 #else
(-)databases/mysql-workbench52/files/patch-plugins__migration__copytable__copytable.cpp (-20 lines)
Lines 1-20 Link Here
1
--- plugins/migration/copytable/copytable.cpp.orig
2
+++ plugins/migration/copytable/copytable.cpp
3
@@ -555,7 +555,7 @@
4
   //log_debug3("Convert string with %i chars to buffer size %i\n", inbuf_len, outbuf_len);
5
   
6
   // convert data from UCS-2 to utf-8
7
-#ifdef _WIN32
8
+#if defined(_WIN32) || defined(__FreeBSD__)
9
   converted = iconv(_iconv, 
10
                     (const char**)&inbuf, &inbuf_len,
11
                     (char**)&outbuf, &outbuf_len);
12
@@ -617,7 +617,7 @@
13
       //log_debug3("Convert string with %i chars to buffer size %i\n", inbuf_len, outbuf_len);
14
 
15
       // convert data from UCS-2 to utf-8
16
-#ifdef _WIN32
17
+#if defined(_WIN32) || defined(__FreeBSD__)
18
       converted = iconv(_iconv, 
19
                         (const char**)&inbuf, &inbuf_len,
20
                         (char**)&outbuf, &outbuf_len);      
(-)databases/p5-qdbm/Makefile (+1 lines)
Lines 1-6 Link Here
1
# Created by: Michael Johnson <ahze@FreeBSD.org>
1
# Created by: Michael Johnson <ahze@FreeBSD.org>
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTREVISION=	2
4
PKGNAMEPREFIX=	p5-
5
PKGNAMEPREFIX=	p5-
5
6
6
COMMENT=	Perl API for QDBM
7
COMMENT=	Perl API for QDBM
(-)databases/p5-qdbm/files/patch-Makefile.in (-2 / +2 lines)
Lines 5-15 Link Here
5
 
5
 
6
 # Building binaries
6
 # Building binaries
7
-CC = gcc
7
-CC = gcc
8
+CC ?= gcc
8
+CC = @CC@
9
 INC = -I. -I../.. -I$(HOME)/include -I/usr/local/include
9
 INC = -I. -I../.. -I$(HOME)/include -I/usr/local/include
10
 OPTIMIZE = -O2
10
 OPTIMIZE = -O2
11
-LD = gcc
11
-LD = gcc
12
+LD ?= gcc
12
+LD = @CC@
13
 LIBS = -L../.. -I$(HOME)/lib -L/usr/local/lib -lqdbm @LIBS@
13
 LIBS = -L../.. -I$(HOME)/lib -L/usr/local/lib -lqdbm @LIBS@
14
 RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr/local/lib:$(HOME)/lib
14
 RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr/local/lib:$(HOME)/lib
15
 
15
 
(-)databases/qdbm/Makefile (-21 / +20 lines)
Lines 3-38 Link Here
3
3
4
PORTNAME=	qdbm
4
PORTNAME=	qdbm
5
PORTVERSION=	1.8.78
5
PORTVERSION=	1.8.78
6
PORTREVISION=	1
6
PORTREVISION?=	2
7
CATEGORIES=	databases
7
CATEGORIES=	databases
8
MASTER_SITES=	http://fallabs.com/qdbm/
8
MASTER_SITES=	http://fallabs.com/qdbm/
9
9
10
MAINTAINER=	ports@FreeBSD.org
10
MAINTAINER=	ports@FreeBSD.org
11
COMMENT?=	Quick Database Manager
11
COMMENT?=	Quick Database Manager
12
12
13
LIB_DEPENDS=	liblzo2.so:${PORTSDIR}/archivers/lzo2
14
13
GNU_CONFIGURE=	yes
15
GNU_CONFIGURE=	yes
14
USE_LDCONFIG=	yes
16
USE_LDCONFIG=	yes
15
CFLAGS+=	-fPIC
16
17
17
.if !defined(SLAVEPORT)
18
.if !defined(SLAVEPORT)
18
USES+=		iconv
19
USES+=		iconv
19
CONFIGURE_ARGS=	--enable-zlib \
20
CONFIGURE_ARGS=	--enable-bzip --enable-lzo --enable-zlib \
20
		--enable-iconv \
21
		--enable-iconv \
21
		--enable-pthread
22
		--enable-pthread
22
CPPFLAGS+=	-I${LOCALBASE}/include
23
CPPFLAGS+=	-I${LOCALBASE}/include
23
LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
24
LIBS+=		-L${LOCALBASE}/lib
24
MAKE_ARGS=	RELCFLAGS="${CFLAGS}" \
25
MAKE_ARGS=	MYDATADIR="${DOCSDIR}" MYDOCS="${PORTDOCS}" \
25
		MYDATADIR="${DOCSDIR}" MYDOCS="${PORTDOCS}"
26
		MYPCDIR="${PREFIX}/libdata/pkgconfig"
26
27
27
PORTDOCS=	ChangeLog NEWS
28
PORTDOCS=	ChangeLog NEWS
28
29
29
post-patch:
30
post-patch:
30
	@${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
31
.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
31
		${WRKSRC}/Makefile.in
32
	@${REINPLACE_CMD} 's/-DNDEBUG//' ${WRKSRC}/Makefile.in
33
.endif
34
	@${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
32
35
33
post-build:
36
post-build:
34
	(cd ${WRKSRC}/lab && ${MAKE} CC="${CC}" CFLAGS="${CFLAGS}" \
37
	(cd ${WRKSRC}/lab && ${MAKE} CC="${CC}" CFLAGS="${CFLAGS}" \
35
		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${ICONV_LIB}" \
38
		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
36
		fmtcnv031127)
39
		fmtcnv031127)
37
40
38
post-install:
41
post-install:
Lines 43-61 post-install: Link Here
43
LIB_DEPENDS+=	libqdbm.so:${PORTSDIR}/databases/qdbm
46
LIB_DEPENDS+=	libqdbm.so:${PORTSDIR}/databases/qdbm
44
47
45
post-patch:
48
post-patch:
46
	@${REINPLACE_CMD} -e 's|/usr/java|${JAVA_HOME}|' ${WRKSRC}/configure
49
.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
47
.if ${SLAVEPORT}=="ruby"
50
	@${REINPLACE_CMD} 's/-DNDEBUG//' ${WRKSRC}/Makefile.in
48
	@${FIND} ${WRKSRC} -type f | \
49
		${XARGS} -n 10 ${REINPLACE_CMD} -e \
50
		's|/usr/bin/ruby -w|${SETENV} ruby|'
51
	@${FIND} ${WRKSRC} -name '*.bak' | ${XARGS} ${RM} -f
52
.endif
51
.endif
52
	@${REINPLACE_CMD} -e 's/-liconv//' -e 's/-lstdc++//' ${WRKSRC}/configure
53
.if ${SLAVEPORT} == "ruby"
54
	@${REINPLACE_CMD} '/iconv/d' ${WRKSRC}/curia/extconf.rb \
55
		${WRKSRC}/depot/extconf.rb ${WRKSRC}/villa/extconf.rb
53
.endif
56
.endif
54
57
55
.include <bsd.port.pre.mk>
58
.endif # !defined(SLAVEPORT)
56
57
.if !defined(SLAVEPORT) && defined(WITH_DEBUG)
58
CONFIGURE_ARGS+=	--enable-debug
59
.endif
60
59
61
.include <bsd.port.post.mk>
60
.include <bsd.port.mk>
(-)databases/qdbm/files/patch-Makefile.in (-23 / +4 lines)
Lines 1-30 Link Here
1
--- Makefile.in.orig	2010-08-04 20:14:34.000000000 +0300
1
--- Makefile.in.orig	2010-08-04 17:14:34 UTC
2
+++ Makefile.in	2014-05-03 18:41:01.000000000 +0300
2
+++ Makefile.in
3
@@ -46,7 +46,7 @@
3
@@ -56,7 +56,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(MY
4
 MYMAN1DIR = @mandir@/man1
5
 MYMAN3DIR = @mandir@/man3
6
 MYDATADIR = @datadir@/$(PACKAGE)
7
-MYPCDIR = @libdir@/pkgconfig
8
+MYPCDIR = /usr/local/libdata/pkgconfig
9
 DESTDIR =
10
 
11
 # Building binaries
12
@@ -56,7 +56,6 @@
13
   -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
4
   -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
14
   -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
5
   -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
15
   -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
6
   -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
16
-CFLAGS = -Wall -pedantic -fPIC -fsigned-char -O3 -fomit-frame-pointer -fforce-addr @MYOPTS@
7
-CFLAGS = -Wall -pedantic -fPIC -fsigned-char -O3 -fomit-frame-pointer -fforce-addr @MYOPTS@
8
+CFLAGS = @CFLAGS@ -Wall -pedantic -fPIC -fsigned-char
17
 LD = @LD@
9
 LD = @LD@
18
 LIBS = -lqdbm @LIBS@
10
 LIBS = -lqdbm @LIBS@
19
 LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@
11
 LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@
20
@@ -170,8 +169,10 @@
21
 	cd $(srcdir)/man && cp -Rf $(MYMAN1S) $(DESTDIR)$(MYMAN1DIR)
22
 	mkdir -p $(DESTDIR)$(MYMAN3DIR)
23
 	cd $(srcdir)/man && cp -Rf $(MYMAN3S) $(DESTDIR)$(MYMAN3DIR)
24
+.if $(MYDOCS) != ""
25
 	mkdir -p $(DESTDIR)$(MYDATADIR)
26
 	cd $(srcdir) && cp -Rf $(MYDOCS) $(DESTDIR)$(MYDATADIR)
27
+.endif
28
 	mkdir -p $(DESTDIR)$(MYPCDIR)
29
 	cd $(srcdir) && cp -Rf $(MYPCS) $(DESTDIR)$(MYPCDIR)
30
 	@printf '\n'
(-)databases/qdbm/files/patch-java__Makefile.in (-10 lines)
Lines 1-10 Link Here
1
--- java/Makefile.in.orig	2014-05-03 18:41:15.000000000 +0300
2
+++ java/Makefile.in	2014-05-03 18:41:21.000000000 +0300
3
@@ -56,7 +56,6 @@
4
   @MYDEFS@ -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
5
   -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
6
   -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
7
-CFLAGS = -Wall -fPIC -fsigned-char -O2 @MYOPTS@
8
 LD = @LD@
9
 LIBS = -lqdbm @LIBS@
10
 LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS)
(-)databases/qdbm/files/patch-plus__Makefile.in (-10 lines)
Lines 1-10 Link Here
1
--- plus/Makefile.in.orig	2014-05-03 18:41:29.000000000 +0300
2
+++ plus/Makefile.in	2014-05-03 18:41:32.000000000 +0300
3
@@ -44,7 +44,6 @@
4
   -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
5
   -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
6
   -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
7
-CXXFLAGS = -Wall -ansi -pedantic -fsigned-char -fPIC -O2 -fno-strict-aliasing @MYOPTS@
8
 LD = @LD@
9
 LIBS = -lqdbm @LIBS@
10
 LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) \
(-)databases/qdbm-plus/Makefile (-1 / +1 lines)
Lines 1-7 Link Here
1
# Created by: Michael Johnson <ahze@FreeBSD.org>
1
# Created by: Michael Johnson <ahze@FreeBSD.org>
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTREVISION=	0
4
PORTREVISION=	2
5
PKGNAMESUFFIX=	-plus
5
PKGNAMESUFFIX=	-plus
6
6
7
COMMENT=	C++ API for QDBM
7
COMMENT=	C++ API for QDBM
(-)databases/qdbm-plus/files/patch-Makefile.in (+11 lines)
Line 0 Link Here
1
--- Makefile.in.orig	2007-03-07 02:44:50 UTC
2
+++ Makefile.in
3
@@ -44,7 +44,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(sr
4
   -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
5
   -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
6
   -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
7
-CXXFLAGS = -Wall -ansi -pedantic -fsigned-char -fPIC -O2 -fno-strict-aliasing @MYOPTS@
8
+CXXFLAGS = @CXXFLAGS@ -Wall -ansi -pedantic -fsigned-char -fPIC -fno-strict-aliasing
9
 LD = @LD@
10
 LIBS = -lqdbm @LIBS@
11
 LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) \
(-)databases/ruby-qdbm/Makefile (+4 lines)
Lines 1-13 Link Here
1
# Created by: Michael Johnson <ahze@FreeBSD.org>
1
# Created by: Michael Johnson <ahze@FreeBSD.org>
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTREVISION=	2
4
PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
5
PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
5
6
6
COMMENT=	Ruby API for QDBM
7
COMMENT=	Ruby API for QDBM
7
8
8
SLAVEPORT=	ruby
9
SLAVEPORT=	ruby
9
10
11
USES=		shebangfix
12
SHEBANG_FILES=	curia/rbcrtest depot/rbdptest myrbdoc villa/rbvltest
10
USE_RUBY=	yes
13
USE_RUBY=	yes
14
11
MASTERDIR=	${.CURDIR}/../../databases/qdbm
15
MASTERDIR=	${.CURDIR}/../../databases/qdbm
12
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/ruby
16
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/ruby
13
PLIST=		${.CURDIR}/pkg-plist
17
PLIST=		${.CURDIR}/pkg-plist
(-)deskutils/fbreader/Makefile (-1 / +1 lines)
Lines 53-59 MAKE_ENV+= TARGET_ARCH=desktop TARGET_ST Link Here
53
MAKE_ARGS+=	MAKE=${MAKE_CMD} LIBDIR=${PREFIX}/lib
53
MAKE_ARGS+=	MAKE=${MAKE_CMD} LIBDIR=${PREFIX}/lib
54
54
55
post-patch:
55
post-patch:
56
	@${REINPLACE_CMD} -e '/^CFLAGS/s,-pipe.*$$,${CFLAGS} -DDO_ICONV_CAST -DLIBICONV_PLUG,' \
56
	@${REINPLACE_CMD} -e '/^CFLAGS/s,-pipe.*$$,${CFLAGS} -DLIBICONV_PLUG,' \
57
		-e '/^CC/d;/^LD/d;/QTINCLUDE/s,-I.*$$,-I${QT_INCDIR},' \
57
		-e '/^CC/d;/^LD/d;/QTINCLUDE/s,-I.*$$,-I${QT_INCDIR},' \
58
		${WRKSRC}/makefiles/arch/desktop.mk
58
		${WRKSRC}/makefiles/arch/desktop.mk
59
	@${REINPLACE_CMD} -e 's,-O3,,;s,-ldl,${ICONV_LIB},' \
59
	@${REINPLACE_CMD} -e 's,-O3,,;s,-ldl,${ICONV_LIB},' \
(-)devel/courier-unicode/Makefile (+4 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	courier-unicode
3
PORTNAME=	courier-unicode
4
PORTVERSION=	1.1
4
PORTVERSION=	1.1
5
PORTREVISION=	1
5
CATEGORIES=	devel mail
6
CATEGORIES=	devel mail
6
MASTER_SITES=	SF/courier/${PORTNAME}/${PORTVERSION}
7
MASTER_SITES=	SF/courier/${PORTNAME}/${PORTVERSION}
7
8
Lines 20-23 INSTALL_TARGET= install-strip Link Here
20
CPPFLAGS+=	-I${LOCALBASE}/include
21
CPPFLAGS+=	-I${LOCALBASE}/include
21
LDFLAGS+=	-L${LOCALBASE}/lib
22
LDFLAGS+=	-L${LOCALBASE}/lib
22
23
24
post-patch:
25
	@${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
26
23
.include <bsd.port.mk>
27
.include <bsd.port.mk>
(-)devel/ice/files/patch-cpp-include-Ice-IconvStringConverter.h (+11 lines)
Line 0 Link Here
1
--- cpp/include/Ice/IconvStringConverter.h.orig	2013-10-04 15:48:14 UTC
2
+++ cpp/include/Ice/IconvStringConverter.h
3
@@ -20,7 +20,7 @@
4
 #include <langinfo.h>
5
 #endif
6
 
7
-#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) || defined(__FreeBSD__)
8
+#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B)
9
     //
10
     // See http://sourceware.org/bugzilla/show_bug.cgi?id=2962
11
     //
(-)devel/libisofs/Makefile (-1 / +4 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	libisofs
4
PORTNAME=	libisofs
5
PORTVERSION=	1.3.6
5
PORTVERSION=	1.3.6
6
PORTREVISION=	1
6
PORTREVISION=	2
7
CATEGORIES=	devel
7
CATEGORIES=	devel
8
MASTER_SITES=	http://files.libburnia-project.org/releases/
8
MASTER_SITES=	http://files.libburnia-project.org/releases/
9
9
Lines 19-22 GNU_CONFIGURE= yes Link Here
19
USES=		iconv libtool
19
USES=		iconv libtool
20
USE_LDCONFIG=	yes
20
USE_LDCONFIG=	yes
21
21
22
post-patch:
23
	@${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
24
22
.include <bsd.port.mk>
25
.include <bsd.port.mk>
(-)devel/qt4-corelib/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	corelib
4
PORTNAME=	corelib
5
DISTVERSION=	${QT4_VERSION}
5
DISTVERSION=	${QT4_VERSION}
6
PORTREVISION=	3
6
PORTREVISION=	4
7
CATEGORIES=	devel
7
CATEGORIES=	devel
8
PKGNAMEPREFIX=	qt4-
8
PKGNAMEPREFIX=	qt4-
9
9
(-)devel/qt4-corelib/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp (+11 lines)
Line 0 Link Here
1
--- config.tests/unix/gnu-libiconv/gnu-libiconv.cpp.orig	2014-04-10 18:37:08 UTC
2
+++ config.tests/unix/gnu-libiconv/gnu-libiconv.cpp
3
@@ -48,7 +48,7 @@ int main(int, char **)
4
 {
5
     iconv_t x = iconv_open("", "");
6
 
7
-    const char *inp;
8
+    char *inp;
9
     char *outp;
10
     size_t inbytes, outbytes;
11
     iconv(x, &inp, &inbytes, &outp, &outbytes);
(-)devel/qt4-corelib/files/patch-src_corelib_codecs_qiconvcodec.cpp (+39 lines)
Line 0 Link Here
1
--- src/corelib/codecs/qiconvcodec.cpp.orig	2014-04-10 18:37:11 UTC
2
+++ src/corelib/codecs/qiconvcodec.cpp
3
@@ -219,12 +219,7 @@ QString QIconvCodec::convertToUnicode(co
4
     IconvState *state = *pstate;
5
     size_t inBytesLeft = len;
6
     // best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM
7
-#ifdef GNU_LIBICONV
8
-    // GNU doesn't disagree with POSIX :/
9
-    const char *inBytes = chars;
10
-#else
11
     char *inBytes = const_cast<char *>(chars);
12
-#endif
13
 
14
     QByteArray in;
15
     if (remainingCount) {
16
@@ -318,11 +313,7 @@ static bool setByteOrder(iconv_t cd)
17
     size_t outBytesLeft = sizeof buf;
18
     size_t inBytesLeft = sizeof bom;
19
 
20
-#if defined(GNU_LIBICONV)
21
-    const char **inBytesPtr = const_cast<const char **>(&inBytes);
22
-#else
23
     char **inBytesPtr = &inBytes;
24
-#endif
25
 
26
     if (iconv(cd, inBytesPtr, &inBytesLeft, &outBytes, &outBytesLeft) == (size_t) -1) {
27
         return false;
28
@@ -338,11 +329,7 @@ QByteArray QIconvCodec::convertFromUnico
29
     char *outBytes;
30
     size_t inBytesLeft;
31
 
32
-#if defined(GNU_LIBICONV)
33
-    const char **inBytesPtr = const_cast<const char **>(&inBytes);
34
-#else
35
     char **inBytesPtr = &inBytes;
36
-#endif
37
 
38
     IconvState *temporaryState = 0;
39
     QThreadStorage<QIconvCodec::IconvState *> *ts = fromUnicodeState();
(-)devel/sdl20/Makefile (-2 / +3 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	sdl2
3
PORTNAME=	sdl2
4
PORTVERSION=	2.0.3
4
PORTVERSION=	2.0.3
5
PORTREVISION=	3
5
PORTREVISION=	4
6
CATEGORIES=	devel
6
CATEGORIES=	devel
7
MASTER_SITES=	http://www.libsdl.org/release/
7
MASTER_SITES=	http://www.libsdl.org/release/
8
DISTNAME=	SDL2-${PORTVERSION}
8
DISTNAME=	SDL2-${PORTVERSION}
Lines 171-176 CONFIGURE_ARGS+= --disable-video-x11 \ Link Here
171
.endif
171
.endif
172
172
173
post-patch:
173
post-patch:
174
	 @${REINPLACE_CMD} -e '/ CheckInputEvents$$/d' ${WRKSRC}/configure
174
	 @${REINPLACE_CMD} -e '/ CheckInputEvents$$/d' \
175
		-e 's/-liconv/${ICONV_LIB}/g' ${WRKSRC}/configure
175
176
176
.include <bsd.port.mk>
177
.include <bsd.port.mk>
(-)editors/ted/Makefile (-5 / +11 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	ted
4
PORTNAME=	ted
5
PORTVERSION=	2.23
5
PORTVERSION=	2.23
6
PORTREVISION=	2
6
PORTREVISION=	3
7
CATEGORIES=	editors
7
CATEGORIES=	editors
8
MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
8
MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
9
		http://fossies.org/linux/misc/
9
		http://fossies.org/linux/misc/
Lines 34-40 MAKE_ENV= DEF_AFMDIR="-DAFMDIR=\"\\\"${A Link Here
34
		DEF_DOCUMENT_DIR="-DDOCUMENT_DIR=\"\\\"${DOCSDIR}/\\\"\"" \
34
		DEF_DOCUMENT_DIR="-DDOCUMENT_DIR=\"\\\"${DOCSDIR}/\\\"\"" \
35
		DEF_PSSCRIPT_DIR="-DPSSCRIPT_DIR=\"\\\"${DATADIR}/\\\"\""
35
		DEF_PSSCRIPT_DIR="-DPSSCRIPT_DIR=\"\\\"${DATADIR}/\\\"\""
36
ALL_TARGET=	compile.shared
36
ALL_TARGET=	compile.shared
37
CONFIGURE_ARGS+=--datadir=${PREFIX}/share
37
CONFIGURE_ARGS=	--datadir=${PREFIX}/share \
38
		ac_iconv_includes=${LOCALBASE}/include
38
39
39
DATADIR=	${PREFIX}/share/Ted
40
DATADIR=	${PREFIX}/share/Ted
40
DOCSDIR=	${PREFIX}/share/doc/Ted
41
DOCSDIR=	${PREFIX}/share/doc/Ted
Lines 52-57 USES+= motif Link Here
52
CONFIGURE_ARGS+=--with-MOTIF
53
CONFIGURE_ARGS+=--with-MOTIF
53
.endif
54
.endif
54
55
56
.include <bsd.port.pre.mk>
57
55
post-extract:
58
post-extract:
56
	@cd ${WRKSRC}/tedPackage && ${TAR} xf TedDatadir.tar
59
	@cd ${WRKSRC}/tedPackage && ${TAR} xf TedDatadir.tar
57
	@${INSTALL_SCRIPT} ${FILESDIR}/configure ${WRKSRC}
60
	@${INSTALL_SCRIPT} ${FILESDIR}/configure ${WRKSRC}
Lines 62-69 post-patch: Link Here
62
		's|/usr/X11R6|${LOCALBASE}|g ; \
65
		's|/usr/X11R6|${LOCALBASE}|g ; \
63
		 s|/usr/local|${LOCALBASE}|g ; \
66
		 s|/usr/local|${LOCALBASE}|g ; \
64
		 /paper.h/s|/usr/include|${LOCALBASE}/include|g ; \
67
		 /paper.h/s|/usr/include|${LOCALBASE}/include|g ; \
65
		 /paper.h/s|/usr/lib|${LOCALBASE}/lib|g ; \
68
		 /paper.h/s|/usr/lib|${LOCALBASE}/lib|g'
66
		 s|/iconv.so|/libiconv.so|g'
69
.if ! empty(ICONV_LIB)
70
	@${REINPLACE_CMD} 's|/iconv\.so|/libiconv.so|' \
71
		${WRKSRC}/Ted/configure ${WRKSRC}/textEncoding/configure
72
.endif
67
73
68
do-install:
74
do-install:
69
	${INSTALL_PROGRAM} ${WRKSRC}/Ted/Ted ${STAGEDIR}${PREFIX}/bin
75
	${INSTALL_PROGRAM} ${WRKSRC}/Ted/Ted ${STAGEDIR}${PREFIX}/bin
Lines 81-84 do-install: Link Here
81
	${INSTALL_DATA} ${WRKSRC}/tedPackage/TedDocument-en_US.rtf ${STAGEDIR}${DOCSDIR}
87
	${INSTALL_DATA} ${WRKSRC}/tedPackage/TedDocument-en_US.rtf ${STAGEDIR}${DOCSDIR}
82
.endif
88
.endif
83
89
84
.include <bsd.port.mk>
90
.include <bsd.port.post.mk>
(-)editors/ted/files/patch-textEncoding-sioIconv.c (+14 lines)
Line 0 Link Here
1
--- textEncoding/sioIconv.c.orig	2013-02-01 12:11:08 UTC
2
+++ textEncoding/sioIconv.c
3
@@ -61,11 +61,7 @@ static int sioInIconvReadBytes(	void *		
4
     /*  1  */
5
     while( ! tooBig )
6
 	{
7
-#	if defined(__GNUC__) && ! defined(iconv)
8
 	char *		inbuf= (char *)iis->iisInBuf;
9
-#	else
10
-	const char *	inbuf= (const char *)iis->iisInBuf;
11
-#	endif
12
 	int		got;
13
 
14
 	/*  2  */
(-)emulators/dolphin-emu/files/patch-Source-Core-Common-Src-StringUtil.cpp (-11 lines)
Lines 1-11 Link Here
1
--- Source/Core/Common/Src/StringUtil.cpp.orig	2013-03-21 06:49:23.000000000 +0100
2
+++ Source/Core/Common/Src/StringUtil.cpp	2013-03-21 06:50:08.000000000 +0100
3
@@ -460,7 +460,7 @@
4
 
5
 		while (src_bytes != 0)
6
 		{
7
-			size_t const iconv_result = iconv(conv_desc, (char**)(&src_buffer), &src_bytes,
8
+			size_t const iconv_result = iconv(conv_desc, (const char**)(&src_buffer), &src_bytes,
9
 				&dst_buffer, &dst_bytes);
10
 
11
 			if ((size_t)-1 == iconv_result)
(-)emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp (+26 lines)
Line 0 Link Here
1
--- src/VBox/Runtime/r3/posix/utf8-posix.cpp.orig	2015-03-16 17:04:36 UTC
2
+++ src/VBox/Runtime/r3/posix/utf8-posix.cpp
3
@@ -194,7 +194,10 @@ static int rtstrConvertCached(const void
4
             const void *pvInputLeft = pvInput;
5
             void       *pvOutputLeft = pvOutput;
6
             size_t      cchNonRev;
7
-#if defined(RT_OS_LINUX) || defined(RT_OS_HAIKU) || defined(RT_OS_SOLARIS) || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) /* there are different opinions about the constness of the input buffer. */
8
+#if defined(RT_OS_LINUX) || defined(RT_OS_HAIKU) || defined(RT_OS_SOLARIS) \
9
+ || defined(RT_OS_FREEBSD) || defined(RT_OS_DRAGONFLY) \
10
+ || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE))
11
+/* there are different opinions about the constness of the input buffer. */
12
             cchNonRev = iconv(hIconv, (char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft);
13
 #else
14
             cchNonRev = iconv(hIconv, (const char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft);
15
@@ -324,7 +327,10 @@ static int rtStrConvertUncached(const vo
16
             const void *pvInputLeft = pvInput;
17
             void       *pvOutputLeft = pvOutput;
18
             size_t      cchNonRev;
19
-#if defined(RT_OS_LINUX) || defined(RT_OS_HAIKU) || defined(RT_OS_SOLARIS) || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) /* there are different opinions about the constness of the input buffer. */
20
+#if defined(RT_OS_LINUX) || defined(RT_OS_HAIKU) || defined(RT_OS_SOLARIS) \
21
+ || defined(RT_OS_FREEBSD) || defined(RT_OS_DRAGONFLY) \
22
+ || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE))
23
+/* there are different opinions about the constness of the input buffer. */
24
             cchNonRev = iconv(icHandle, (char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft);
25
 #else
26
             cchNonRev = iconv(icHandle, (const char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft);
(-)finance/libofx/files/patch-lib__ofx_preproc.cpp (-11 lines)
Lines 1-11 Link Here
1
--- lib/ofx_preproc.cpp.orig	2014-09-12 19:26:30 UTC
2
+++ lib/ofx_preproc.cpp
3
@@ -310,7 +310,7 @@ int ofx_proc_file(LibofxContextPtr ctx, 
4
             size_t outbytesleft = inbytesleft * 2 - 1;
5
             iconv_buffer = (char*) malloc (inbytesleft * 2);
6
             memset(iconv_buffer, 0, inbytesleft * 2);
7
-#if defined(OS_WIN32) || defined(__sun)
8
+#if defined(__FreeBSD__) || defined(__DragonFly__)
9
             const char * inchar = (const char *)s_buffer.c_str();
10
 #else
11
             char * inchar = (char *)s_buffer.c_str();
(-)ftp/pure-ftpd/Makefile (-1 / +9 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	pure-ftpd
4
PORTNAME=	pure-ftpd
5
PORTVERSION=	1.0.37
5
PORTVERSION=	1.0.37
6
PORTREVISION=	1
6
CATEGORIES=	ftp ipv6
7
CATEGORIES=	ftp ipv6
7
MASTER_SITES=	http://download.pureftpd.org/pub/pure-ftpd/releases/ \
8
MASTER_SITES=	http://download.pureftpd.org/pub/pure-ftpd/releases/ \
8
		ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/ \
9
		ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/ \
Lines 85-90 UTF8_CONFIGURE_WITH= rfc2640 Link Here
85
UTF8_USES=		iconv
86
UTF8_USES=		iconv
86
VIRTUALCHROOT_CONFIGURE_WITH=	virtualchroot
87
VIRTUALCHROOT_CONFIGURE_WITH=	virtualchroot
87
88
89
.include <bsd.port.pre.mk>
90
91
.if empty(ICONV_LIB)
92
CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no \
93
		ac_cv_lib_iconv_libiconv_open=no
94
.endif
95
88
pre-fetch:
96
pre-fetch:
89
	@${ECHO_MSG} "You can use the following additional options:"
97
	@${ECHO_MSG} "You can use the following additional options:"
90
	@${ECHO_MSG} ""
98
	@${ECHO_MSG} ""
Lines 116-119 post-install: Link Here
116
	${MKDIR} ${STAGEDIR}${PAM_DIR}/
124
	${MKDIR} ${STAGEDIR}${PAM_DIR}/
117
	${INSTALL_DATA} ${PAM_TEMPL} ${STAGEDIR}${PAM_DIR}/${PAM_TARGET}
125
	${INSTALL_DATA} ${PAM_TEMPL} ${STAGEDIR}${PAM_DIR}/${PAM_TARGET}
118
126
119
.include <bsd.port.mk>
127
.include <bsd.port.post.mk>
(-)games/allacrost/Makefile (-2 / +2 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	allacrost
4
PORTNAME=	allacrost
5
PORTVERSION=	1.0.2
5
PORTVERSION=	1.0.2
6
PORTREVISION=	11
6
PORTREVISION=	12
7
CATEGORIES=	games
7
CATEGORIES=	games
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-demo/${PORTVERSION}
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-demo/${PORTVERSION}
9
DISTNAME=	${PORTNAME}_demo_source_${PORTVERSION}
9
DISTNAME=	${PORTNAME}_demo_source_${PORTVERSION}
Lines 20-26 LIB_DEPENDS= libjpeg.so:${PORTSDIR}/grap Link Here
20
LICENSE=	GPLv2
20
LICENSE=	GPLv2
21
21
22
GNU_CONFIGURE=	yes
22
GNU_CONFIGURE=	yes
23
USES=		gettext gmake openal:al lua:51
23
USES=		gettext gmake iconv openal:al lua:51
24
USE_SDL=	sdl ttf net
24
USE_SDL=	sdl ttf net
25
USE_GL=		yes
25
USE_GL=		yes
26
USE_GCC=	any # problems in luabind
26
USE_GCC=	any # problems in luabind
(-)games/allacrost/files/patch-src-utils.cpp (-18 lines)
Lines 8-28 Link Here
8
 	#include <pwd.h>
8
 	#include <pwd.h>
9
 #endif
9
 #endif
10
 
10
 
11
@@ -337,7 +338,7 @@
12
 	}
13
 
14
 	const char *source_char = reinterpret_cast<const char *>(source);
15
-	#if (defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109)
16
+	#if 1
17
 	// We are using an iconv API that uses const char*
18
 	const char *sourceChar = source_char;
19
 	#else
20
@@ -369,7 +370,7 @@
21
 		return false;
22
 	}
23
 
24
-	#if (defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109)
25
+	#if 1
26
 		// We are using an iconv API that uses const char*
27
 		const char *sourceChar = source;
28
 	#else
(-)games/cuyo/files/patch-src__cuyointl.cpp (-11 lines)
Lines 1-11 Link Here
1
--- src/cuyointl.cpp.orig
2
+++ src/cuyointl.cpp
3
@@ -93,7 +93,7 @@
4
       return convert_error(ret,s,"Character conversion not possible.");
5
 
6
     while (*inpos) {
7
-      size_t res = iconv(handle,&inpos,&inleft,&outpos,&outleft);
8
+      size_t res = iconv(handle,(const char **)&inpos,&inleft,&outpos,&outleft);
9
       if (res == (size_t) -1)
10
 	/* An error occured */
11
 	switch (errno) {
(-)games/hex-a-hop/Makefile (-1 / +2 lines)
Lines 3-15 Link Here
3
3
4
PORTNAME=	hex-a-hop
4
PORTNAME=	hex-a-hop
5
PORTVERSION=	1.1.0
5
PORTVERSION=	1.1.0
6
PORTREVISION=	5
6
PORTREVISION=	6
7
CATEGORIES=	games
7
CATEGORIES=	games
8
MASTER_SITES=	SF/${PORTNAME:S/-//g}/${PORTVERSION}
8
MASTER_SITES=	SF/${PORTNAME:S/-//g}/${PORTVERSION}
9
9
10
MAINTAINER=	makc@FreeBSD.org
10
MAINTAINER=	makc@FreeBSD.org
11
COMMENT=	Puzzle game based on hexagonal tiles
11
COMMENT=	Puzzle game based on hexagonal tiles
12
12
13
USES=		iconv
13
USE_SDL=	sdl
14
USE_SDL=	sdl
14
GNU_CONFIGURE=	yes
15
GNU_CONFIGURE=	yes
15
16
(-)games/hex-a-hop/files/patch-src-text.cpp (-11 lines)
Lines 1-11 Link Here
1
--- src/text.cpp~
2
+++ src/text.cpp
3
@@ -439,7 +439,7 @@ void ConvertToUTF8(const std::string &te
4
 	errno = 0;
5
 	static const char *locale_enc = gettext_init.GetEncoding();
6
 	iconv_t cd = iconv_open("UTF-8", locale_enc);
7
-	char *in_buf = const_cast<char *>(&text_locally_encoded[0]);
8
+	const char *in_buf = const_cast<char *>(&text_locally_encoded[0]);
9
 	char *out_buf = &text_utf8[0];
10
 	iconv(cd, &in_buf, &text_length, &out_buf, &text_utf8_length);
11
 	iconv_close(cd);
(-)games/ldmud/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	ldmud
4
PORTNAME=	ldmud
5
PORTVERSION=	3.3.720
5
PORTVERSION=	3.3.720
6
PORTREVISION=	2
6
PORTREVISION=	3
7
PORTEPOCH=	1
7
PORTEPOCH=	1
8
CATEGORIES=	games net
8
CATEGORIES=	games net
9
MASTER_SITES=	http://www.bearnip.com/ftp/mud/ \
9
MASTER_SITES=	http://www.bearnip.com/ftp/mud/ \
(-)games/ldmud/files/patch-Makefile.in (-3 / +19 lines)
Lines 1-6 Link Here
1
--- Makefile.in.orig	2013-12-29 15:19:34.000000000 +0100
1
--- Makefile.in.orig	2011-02-26 21:05:08 UTC
2
+++ Makefile.in	2013-12-29 15:20:35.000000000 +0100
2
+++ Makefile.in
3
@@ -135,9 +135,9 @@ install: install-driver
3
@@ -1,6 +1,5 @@
4
 # TODO: Add some of the symbols in here to configure
5
 # These lines are needed on some machines.
6
-MAKE=make
7
 SHELL=@CONFIG_SHELL@
8
 INSTALL=@INSTALL@
9
 mkinstalldirs=$(SHELL) @top_srcdir@/mkinstalldirs
10
@@ -83,7 +82,7 @@ SFMT_FLAGS = -fno-strict-aliasing
11
 #
12
 MPATH=-DMUD_LIB='"$(MUD_LIB)"' -DBINDIR='"$(BINDIR)"' -DERQ_DIR='"$(ERQ_DIR)"'
13
 #
14
-CFLAGS= @EXTRA_CFLAGS@ $(OPTIMIZE) $(DEBUG) $(WARN) $(MPATH) $(PROFIL)
15
+CFLAGS= @CPPFLAGS@ @CFLAGS@ @EXTRA_CFLAGS@ $(DEBUG) $(WARN) $(MPATH) $(PROFIL)
16
 #
17
 LIBS=@LIBS@ @PKGLIBS@
18
 #
19
@@ -135,9 +134,9 @@ install: install-driver
4
 	@echo "To install everything in one go, use 'make install-all'."
20
 	@echo "To install everything in one go, use 'make install-all'."
5
 
21
 
6
 install-driver: ldmud@EXEEXT@ docs
22
 install-driver: ldmud@EXEEXT@ docs
(-)games/ldmud/files/patch-configure (+75 lines)
Line 0 Link Here
1
--- configure.orig	2011-02-26 21:05:08 UTC
2
+++ configure
3
@@ -13600,7 +13600,7 @@ for TESTFLAG in -O; do
4
       #the [e]grep option -v will not give a failure exit status on the atari
5
     else
6
       if eval $tcomp; then
7
-        CFLAGS=$TESTFLAG
8
+        LCFLAGS=$TESTFLAG
9
         break
10
       fi
11
     fi
12
@@ -13608,10 +13608,9 @@ for TESTFLAG in -O; do
13
 done
14
 for TESTFLAG in -g; do
15
   if eval $tcomp; then
16
-    CFLAGS="$CFLAGS $TESTFLAG"
17
+    LCFLAGS="$LCFLAGS $TESTFLAG"
18
   fi
19
 done
20
-LCFLAGS=$CFLAGS
21
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCFLAGS" >&5
22
 $as_echo "$LCFLAGS" >&6; }
23
 
24
@@ -13624,7 +13623,7 @@ for TESTFLAG in -O2 -O; do
25
       #the [e]grep option -v will not give a failure exit status on the atari
26
     else
27
       if eval $tcomp; then
28
-        CFLAGS=$TESTFLAG
29
+        MCFLAGS=$TESTFLAG
30
         break
31
       fi
32
     fi
33
@@ -13633,10 +13632,9 @@ done
34
 for TESTFLAG in -g; do
35
   if eval $tcomp; then
36
     OPTFLAGS="$OPTFLAGS $TESTFLAG"
37
-    CFLAGS="$CFLAGS $TESTFLAG"
38
+    MCFLAGS="$MCFLAGS $TESTFLAG"
39
   fi
40
 done
41
-MCFLAGS=$CFLAGS
42
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCFLAGS" >&5
43
 $as_echo "$MCFLAGS" >&6; }
44
 
45
@@ -13649,7 +13647,7 @@ for TESTFLAG in -O4 -O3 -O2 -O; do
46
       #the [e]grep option -v will not give a failure exit status on the atari
47
     else
48
       if eval $tcomp; then
49
-        CFLAGS=$TESTFLAG
50
+        OCFLAGS=$TESTFLAG
51
         break
52
       fi
53
     fi
54
@@ -13663,7 +13661,7 @@ if test "$ac_cv_c_compiler_gnu" = "no"; 
55
         #the [e]grep option -v will not give a failure exit status on the atari
56
       else
57
         if eval $tcomp; then
58
-          CFLAGS="$CFLAGS $TESTFLAG"
59
+          OCFLAGS="$OCFLAGS $TESTFLAG"
60
           break
61
         fi
62
       fi
63
@@ -13673,10 +13671,10 @@ fi
64
 # -funroll-all-loops causes some versions of gcc to produce buggy code
65
 for TESTFLAG in -fomit-frame-pointer; do
66
   if eval $tcomp; then
67
-    CFLAGS="$CFLAGS $TESTFLAG"
68
+    OCFLAGS="$OCFLAGS $TESTFLAG"
69
   fi
70
 done
71
-OCFLAGS="$CFLAGS $OPTFLAGS"
72
+OCFLAGS="$OCFLAGS $OPTFLAGS"
73
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCFLAGS" >&5
74
 $as_echo "$OCFLAGS" >&6; }
75
 if ${CC-cc} -g -c conftest.c ; then
(-)games/pokerth/files/patch-src-core-linux-convhelper.cpp (-16 / +7 lines)
Lines 1-20 Link Here
1
--- src/core/linux/convhelper.cpp.orig	2008-01-20 13:32:07.000000000 +0100
1
--- src/core/linux/convhelper.cpp.orig	2014-01-10 21:18:20 UTC
2
+++ src/core/linux/convhelper.cpp	2008-01-20 12:56:03.000000000 +0100
2
+++ src/core/linux/convhelper.cpp
3
@@ -39,7 +39,7 @@
3
@@ -36,7 +36,7 @@
4
 #ifdef __APPLE__
4
 #error This file is not for Windows.
5
 	const char *inbuf = inStr.data();
6
 #else
7
-	char *inbuf = const_cast<char *>(inStr.data());
8
+	const char *inbuf = const_cast<char *>(inStr.data());
9
 #endif
5
 #endif
10
 
6
 
11
 	const size_t c_outsize = insize * 6; // max size of utf-8 char is 6 per input char
7
-#if defined(__FreeBSD__) || defined(__NetBSD__)
12
@@ -74,7 +74,7 @@
8
+#if defined(__NetBSD__)
13
 #ifdef __APPLE__
9
 #define HAVE_ICONV_CONST
14
 	const char *inbuf = inStr.data();
15
 #else
16
-	char *inbuf = const_cast<char *>(inStr.data());
17
+	const char *inbuf = const_cast<char *>(inStr.data());
18
 #endif
10
 #endif
19
 
11
 
20
 	const size_t c_outsize = insize;
(-)games/valyriatear/files/patch-src-utils-ustring.cpp (+11 lines)
Line 0 Link Here
1
--- src/utils/ustring.cpp.orig	2013-09-24 11:33:12 UTC
2
+++ src/utils/ustring.cpp
3
@@ -203,7 +203,7 @@ static bool UTF8ToUTF16(const char *sour
4
         return false;
5
     }
6
 
7
-#if (defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109) || defined(__FreeBSD__)
8
+#if defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109
9
     // We are using an iconv API that uses const char*
10
     const char *sourceChar = source;
11
 #else
(-)graphics/cegui/files/patch-cegui__src__IconvStringTranscoder.cpp (-15 lines)
Lines 1-15 Link Here
1
--- cegui/src/IconvStringTranscoder.cpp.orig	2014-03-12 06:50:07.000000000 +0100
2
+++ cegui/src/IconvStringTranscoder.cpp	2014-03-12 06:51:56.000000000 +0100
3
@@ -64,12 +64,7 @@
4
     size_t iconv(const char** inbuf, size_t* inbytesleft,
5
                  char** outbuf, size_t* outbytesleft)
6
     {
7
-#ifdef CEGUI_ICONV_USES_CONST_INBUF
8
         return ::iconv(d_cd, inbuf, inbytesleft, outbuf, outbytesleft);
9
-#else
10
-        return ::iconv(d_cd, const_cast<char**>(inbuf), inbytesleft,
11
-                       outbuf, outbytesleft);
12
-#endif
13
     }
14
 
15
     //------------------------------------------------------------------------//
(-)graphics/iccexamin/files/patch-icc_gl.cpp (-11 lines)
Lines 1-11 Link Here
1
--- icc_gl.cpp.orig	2013-05-01 21:38:55.000000000 +0400
2
+++ icc_gl.cpp	2013-05-01 21:39:28.000000000 +0400
3
@@ -191,7 +191,7 @@ void drawText( FTFont * f, const char * 
4
     ttmp = txt = strdup(in_txt);
5
 
6
     iconv_t cd = iconv_open( "WCHAR_T", oy_domain_codeset );
7
-    iconv( cd, &ttmp, &in_left, (char**)&wtmp, &out_left);
8
+    iconv( cd, (const char**)&ttmp, &in_left, (char**)&wtmp, &out_left);
9
     iconv_close( cd );
10
 
11
     drawTEXT( f, wchar );
(-)graphics/inventor/Makefile (-6 / +10 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	inventor
4
PORTNAME=	inventor
5
PORTVERSION=	2.1.5.p10
5
PORTVERSION=	2.1.5.p10
6
PORTREVISION=	11
6
PORTREVISION=	12
7
CATEGORIES=	graphics
7
CATEGORIES=	graphics
8
MASTER_SITES=	ftp://oss.sgi.com/projects/inventor/download/
8
MASTER_SITES=	ftp://oss.sgi.com/projects/inventor/download/
9
DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/-/}
9
DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/-/}
Lines 19-25 LIB_DEPENDS= libfreetype.so:${PORTSDIR}/ Link Here
19
19
20
CONFLICTS=	Coin-[0-9]* SoXt-[0-9]*
20
CONFLICTS=	Coin-[0-9]* SoXt-[0-9]*
21
21
22
USE_XORG=	x11 xi
22
USE_XORG=	x11 xext xi xp xt
23
USE_GL=		glu glw
23
USE_GL=		glu glw
24
USES=		iconv gmake motif
24
USES=		iconv gmake motif
25
USE_LDCONFIG=	yes
25
USE_LDCONFIG=	yes
Lines 27-33 ONLY_FOR_ARCHS= i386 amd64 Link Here
27
MAKE_JOBS_UNSAFE=	yes
27
MAKE_JOBS_UNSAFE=	yes
28
28
29
WRKSRC=		${WRKDIR}/${PORTNAME}
29
WRKSRC=		${WRKDIR}/${PORTNAME}
30
MAKE_ARGS=	CC="${CC}" CXX="${CXX}" LD="${CXX}" \
31
		VCOPTS="${CFLAGS}" VCXXOPTS="${CXXFLAGS}" \
32
		VLDOPTS="${LDFLAGS}" VLDDSOOPTS="${LDFLAGS}" \
33
		IVPREFIX="${PREFIX}" X11DIR="${LOCALBASE}"
30
MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/lib:${WRKSRC}/libSoXt \
34
MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/lib:${WRKSRC}/libSoXt \
35
		FREETYPE=1 \
31
		INSTALL_STRIP=${STRIP} \
36
		INSTALL_STRIP=${STRIP} \
32
		IVROOT=${STAGEDIR}
37
		IVROOT=${STAGEDIR}
33
MAKEFILE=	GNUmakefile
38
MAKEFILE=	GNUmakefile
Lines 41-53 DEBUG_MAKE_ENV= LIBTYPE=debug Link Here
41
.include <bsd.port.options.mk>
46
.include <bsd.port.options.mk>
42
47
43
.if !(${OPSYS} == FreeBSD && ${OSVERSION} < 900033)
48
.if !(${OPSYS} == FreeBSD && ${OSVERSION} < 900033)
44
MAKE_ENV+=	VLDOPTS=-Wl,--add-needed
49
LDFLAGS+=	-Wl,--add-needed
45
.endif
50
.endif
46
51
47
post-patch:
52
post-patch:
48
	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ;\
53
	@${REINPLACE_CMD} 's|/usr\(/include/freetype2\)|${LOCALBASE}\1|' \
49
			      s|%%CXX%%|${CXX}|g ; \
54
		${WRKSRC}/libFL/ang/GNUmakefile
50
			      s|%%CXXFLAGS%%|${CXXFLAGS}|g'  ${WRKSRC}/make/ivcommondefs
51
	@${REINPLACE_CMD} -e 's|%%ICONV_LIB%%|${ICONV_LIB}|' \
55
	@${REINPLACE_CMD} -e 's|%%ICONV_LIB%%|${ICONV_LIB}|' \
52
	    ${WRKSRC}/lib/GNUmakefile
56
	    ${WRKSRC}/lib/GNUmakefile
53
57
(-)graphics/inventor/files/patch-SoText2.c++ (-17 lines)
Lines 1-23 Link Here
1
*** lib/database/src/so/nodes/SoText2.c++.orig	Tue Sep 25 00:45:41 2001
1
*** lib/database/src/so/nodes/SoText2.c++.orig	Tue Sep 25 00:45:41 2001
2
--- lib/database/src/so/nodes/SoText2.c++	Mon Dec 23 13:28:11 2002
2
--- lib/database/src/so/nodes/SoText2.c++	Mon Dec 23 13:28:11 2002
3
***************
3
***************
4
*** 778,784 ****
5
  	size_t outbytes = 2*inbytes+2;
6
  	char* output = (char*)UCSStrings[i];
7
      
8
! 	if ((iconv(conversionCode, &input, &inbytes, &output, &outbytes) == (size_t)-1)){
9
  #ifdef DEBUG
10
  	    SoDebugError::post("SoBitmapFontCache::convertToUCS", 
11
  		"Error converting text to UCS-2");
12
--- 778,784 ----
13
  	size_t outbytes = 2*inbytes+2;
14
  	char* output = (char*)UCSStrings[i];
15
      
16
! 	if ((iconv(conversionCode, (const char **)&input, &inbytes, &output, &outbytes) == (size_t)-1)){
17
  #ifdef DEBUG
18
  	    SoDebugError::post("SoBitmapFontCache::convertToUCS", 
19
  		"Error converting text to UCS-2");
20
***************
21
*** 1498,1503 ****
4
*** 1498,1503 ****
22
--- 1498,1504 ----
5
--- 1498,1504 ----
23
      // And some font library stuff:
6
      // And some font library stuff:
(-)graphics/inventor/files/patch-SoText3.c++ (-19 lines)
Lines 1-19 Link Here
1
*** lib/database/src/so/nodes/SoText3.c++.orig	Mon Dec 23 13:37:59 2002
2
--- lib/database/src/so/nodes/SoText3.c++	Mon Dec 23 13:38:15 2002
3
***************
4
*** 2291,2297 ****
5
  	size_t outbytes = 2*inbytes+2;
6
  	char* output = (char*)UCSStrings[i];
7
      
8
! 	if ((iconv(conversionCode, &input, &inbytes, &output, &outbytes) == (size_t)-1)){
9
  #ifdef DEBUG
10
  	    SoDebugError::post("SoOutlineFontCache::convertToUCS", 
11
  		"Error converting text to UCS-2");
12
--- 2291,2297 ----
13
  	size_t outbytes = 2*inbytes+2;
14
  	char* output = (char*)UCSStrings[i];
15
      
16
! 	if ((iconv(conversionCode, (const char **)&input, &inbytes, &output, &outbytes) == (size_t)-1)){
17
  #ifdef DEBUG
18
  	    SoDebugError::post("SoOutlineFontCache::convertToUCS", 
19
  		"Error converting text to UCS-2");
(-)graphics/inventor/files/patch-TextWrapper.c++ (-36 lines)
Lines 1-36 Link Here
1
*** apps/demos/textomatic/TextWrapper.c++.orig	Thu Jan  2 15:29:27 2003
2
--- apps/demos/textomatic/TextWrapper.c++	Thu Jan  2 15:31:00 2003
3
***************
4
*** 77,83 ****
5
      char    *output       = outbuf;
6
      //
7
      if ( global_iconvCodeL2 == (iconv_t)-1   ||
8
! 	 iconv(global_iconvCodeL2,&input,&inbytesleft,&output,&outbytesleft) == (size_t)-1 )
9
      {
10
  	 fprintf( stderr, "textomatic: iconv error.\n" );
11
  	 (*(UCS2 *)outbuf)=0;
12
--- 77,83 ----
13
      char    *output       = outbuf;
14
      //
15
      if ( global_iconvCodeL2 == (iconv_t)-1   ||
16
! 	 iconv(global_iconvCodeL2,(const char **)&input,&inbytesleft,&output,&outbytesleft) == (size_t)-1 )
17
      {
18
  	 fprintf( stderr, "textomatic: iconv error.\n" );
19
  	 (*(UCS2 *)outbuf)=0;
20
***************
21
*** 229,235 ****
22
  	char    *output       = outbuf;
23
  	//
24
  	if ( global_iconvCode28 == (iconv_t)-1   ||
25
! 	     iconv( global_iconvCode28,&input,&inbytesleft,&output,&outbytesleft ) == (size_t)-1 )
26
  	{
27
  	     fprintf( stderr, "textomatic: iconv error.\n" );
28
  	     (*(UCS2 *)outbuf)=0;
29
--- 229,235 ----
30
  	char    *output       = outbuf;
31
  	//
32
  	if ( global_iconvCode28 == (iconv_t)-1   ||
33
! 	     iconv( global_iconvCode28,(const char **)&input,&inbytesleft,&output,&outbytesleft ) == (size_t)-1 )
34
  	{
35
  	     fprintf( stderr, "textomatic: iconv error.\n" );
36
  	     (*(UCS2 *)outbuf)=0;
(-)graphics/inventor/files/patch-ivcommondefs (-70 / +18 lines)
Lines 1-82 Link Here
1
--- make/ivcommondefs.orig	Sat Jul 12 07:40:54 2003
1
--- make/ivcommondefs.orig	2003-07-11 22:40:54 UTC
2
+++ make/ivcommondefs	Sun Aug  3 15:10:28 2003
2
+++ make/ivcommondefs
3
@@ -49,9 +49,9 @@
3
@@ -131,9 +131,9 @@ endif
4
 
5
 ifeq ($(usingLinux), 1)
6
 
7
-CC  = /usr/bin/gcc
8
-C++ = /usr/bin/g++
9
-LD  = /usr/bin/g++
10
+CC  = %%CC%%
11
+C++ = %%CXX%%
12
+LD  = %%CXX%%
13
 
14
 INSTALL = /usr/bin/install
15
 
16
@@ -74,7 +74,7 @@
17
 LCXXOPTS += $(LINUXOPTS)
18
 LCOPTS += $(LINUXOPTS)
19
 
20
-X11DIR = /usr/X11R6
21
+X11DIR = ${LOCALBASE}
22
 X11INCDIR = $(X11DIR)/include
23
 X11LIBDIR = $(X11DIR)/lib
24
 
25
@@ -86,6 +86,10 @@
26
 
27
 endif
28
 
29
+ifeq ($(usingFreeBSD), 1)
30
+LCINCS += -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
31
+LCXXINCS += -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
32
+endif
33
 
34
 
35
 #
36
@@ -131,9 +135,9 @@
37
 # Determine optimization from LIBTYPE.
4
 # Determine optimization from LIBTYPE.
38
 #
5
 #
39
 
6
 
40
-OPTIMIZER = -O -DNDEBUG
7
-OPTIMIZER = -O -DNDEBUG
41
+OPTIMIZER = %%CXXFLAGS%% -DNDEBUG
8
+OPTIMIZER = -DNDEBUG
42
 ifneq (, $(findstring debug, $(LIBTYPE)))
9
 ifneq (, $(findstring debug, $(LIBTYPE)))
43
-OPTIMIZER = -g
10
-OPTIMIZER = -g
44
+OPTIMIZER = %%CXXFLAGS%% -g -DDEBUG
11
+OPTIMIZER = -DDEBUG
45
 endif
12
 endif
46
 
13
 
47
 
14
 
48
@@ -158,6 +162,10 @@
15
@@ -206,12 +206,6 @@ IVDEMODATADIR = $(IVDEMODIR)/data/Invent
49
 # Font library directories.
16
 # Locate installed Inventor libraries when linking applications.
50
 #
51
 
52
+ifeq ($(usingFreeBSD), 1)
53
+FREETYPE=1
54
+endif
55
+
56
 FLDIR = $(IVDEPTH)/libFL/src
57
 FLLIB = -lFL
58
 ifdef FREETYPE
59
@@ -183,7 +191,12 @@
60
 # Inventor install directories.
61
 #
17
 #
62
 
18
 
63
+ifeq ($(usingFreeBSD), 1)
19
-ifneq (, $(findstring debug, $(LIBTYPE)))
64
+IVPREFIX = ${PREFIX}
20
-LLDDSOOPTS += -L$(IVDLIBDIR)
65
+else
21
-LLDOPTS += -L$(IVDLIBDIR)
66
 IVPREFIX = /usr
22
-CXXDSOOPTS += -L$(IVDLIBDIR)
67
+endif
23
-else
68
+
24
-LLDDSOOPTS += -L$(IVLIBDIR)
69
 LCXXOPTS += -DIVPREFIX=\"$(IVPREFIX)\"
25
-LLDOPTS += -L$(IVLIBDIR)
70
 LCOPTS += -DIVPREFIX=\"$(IVPREFIX)\"
26
-CXXDSOOPTS += -L$(IVLIBDIR)
71
 
27
-endif
72
@@ -213,5 +226,10 @@
28
+LLDDSOOPTS += -L$(IVDEPTH)/lib -L$(IVDEPTH)/libSoXt
73
 else
74
 LLDDSOOPTS += -L$(IVLIBDIR)
75
 LLDOPTS += -L$(IVLIBDIR)
76
+endif
77
+
78
+ifeq ($(usingFreeBSD), 1)
79
+LLDOPTS += -L$(IVDEPTH)/lib -L$(IVDEPTH)/libSoXt
29
+LLDOPTS += -L$(IVDEPTH)/lib -L$(IVDEPTH)/libSoXt
80
+LLDDSOOPTS += -L$(IVDEPTH)/lib -L$(IVDEPTH)/libSoXt -L$(LOCALBASE)/lib
30
+CXXDSOOPTS += -L$(IVDEPTH)/lib -L$(IVDEPTH)/libSoXt
81
 CXXDSOOPTS += -L$(IVLIBDIR)
82
 endif
(-)graphics/inventor/files/patch-machine.h (-20 / +1 lines)
Lines 9-34 Link Here
9
 
9
 
10
 #define MACHINE_WORD_FORMAT	DGL_LITTLE_ENDIAN
10
 #define MACHINE_WORD_FORMAT	DGL_LITTLE_ENDIAN
11
 #define MACHINE_FLOAT_FORMAT	DGL_NON_IEEE
11
 #define MACHINE_FLOAT_FORMAT	DGL_NON_IEEE
12
@@ -152,6 +152,18 @@
12
@@ -321,7 +321,7 @@
13
 
14
 
15
 /*
16
+ * Alpha under FreeBSD
17
+ */
18
+
19
+#if __alpha__ && __FreeBSD__
20
+
21
+#define MACHINE_WORD_FORMAT	DGL_LITTLE_ENDIAN
22
+#define MACHINE_FLOAT_FORMAT	DGL_NON_IEEE
23
+
24
+#endif /* __alpha__ && __FreeBSD__ */
25
+
26
+
27
+/*
28
  * Apple Darwin (Mac OS X) machine dependent setup
29
  */
30
 
31
@@ -321,7 +333,7 @@
32
  */
13
  */
33
 
14
 
34
 #if MACHINE_FLOAT_FORMAT == DGL_NON_IEEE
15
 #if MACHINE_FLOAT_FORMAT == DGL_NON_IEEE
(-)graphics/inventor/files/pkg-message.in (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
Please set the environment variable FL_FONT_PATH to the directory where your
4
Please set the environment variable FL_FONT_PATH to the directory where your
5
TrueType fonts are installed. If you do not set this variable, Open Inventor(TM)
5
TrueType fonts are installed. If you do not set this variable, Open Inventor(TM)
6
will use %%PREFIX%%/lib/X11/fonts/TTF as default.
6
will use %%PREFIX%%/share/fonts/TTF as default.
7
7
8
Open Inventor (TM) needs the following TrueType fonts:
8
Open Inventor (TM) needs the following TrueType fonts:
9
9
(-)graphics/ipe/files/patch-ipelib__ipedoc.cpp (-23 lines)
Lines 1-23 Link Here
1
--- ipelib/ipedoc.cpp.orig	2013-03-15 13:37:02.000000000 +0000
2
+++ ipelib/ipedoc.cpp
3
@@ -41,6 +41,7 @@
4
 #include "ipelatex.h"
5
 
6
 #include <errno.h>
7
+#include <sys/param.h>
8
 
9
 #ifdef IPE_USE_ICONV
10
 #include <iconv.h>
11
@@ -850,7 +851,12 @@ int Document::runLatex(String &texLog)
12
     if (!file)
13
       return ErrWritingSource;
14
 
15
+#if defined(__FreeBSD__) || \
16
+   (defined(__DragonFly__) && __DragonFly_version > 300502)
17
+    const char *inbuf = utf8.data();
18
+#else
19
     char *inbuf = (char *) utf8.data();
20
+#endif
21
     size_t inbytesleft = utf8.size();
22
 
23
     FileStream fstream(file);
(-)graphics/sswf/Makefile (-7 / +7 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	sswf
4
PORTNAME=	sswf
5
PORTVERSION=	1.8.4
5
PORTVERSION=	1.8.4
6
PORTREVISION=	4
6
PORTREVISION=	5
7
CATEGORIES=	graphics
7
CATEGORIES=	graphics
8
MASTER_SITES=	SF
8
MASTER_SITES=	SF
9
DISTNAME=	${PORTNAME}-${PORTVERSION}-src
9
DISTNAME=	${PORTNAME}-${PORTVERSION}-src
Lines 29-43 LIBS+= -L${LOCALBASE}/lib Link Here
29
29
30
OPTIONS_DEFINE=	DEBUG
30
OPTIONS_DEFINE=	DEBUG
31
31
32
.include <bsd.port.options.mk>
32
.include <bsd.port.pre.mk>
33
33
34
.if ! ${PORT_OPTIONS:MDEBUG}
34
.if ! ${PORT_OPTIONS:MDEBUG}
35
CONFIGURE_ARGS+=	--disable-debug --disable-yydebug
35
CONFIGURE_ARGS+=	--disable-debug --disable-yydebug
36
.endif
36
.endif
37
37
38
post-configure:
38
.if empty(ICONV_LIB)
39
	@${REINPLACE_CMD} 's|ICONV_INPUT_CAST||' \
39
CONFIGURE_ARGS+=ac_cv_lib_iconv_libiconv_open=no \
40
		${WRKSRC}/src/lib/libsswf_tag_header.c++ \
40
		ac_cv_lib_iconv_iconv_open=no
41
		${WRKSRC}/src/sswf/sswf_lexical.c++
41
.endif
42
42
43
.include <bsd.port.mk>
43
.include <bsd.port.post.mk>
(-)graphics/sswf/files/patch-include_sswf_libsswf.h (-3 / +12 lines)
Lines 1-6 Link Here
1
--- include/sswf/libsswf.h.orig	Sat Aug 12 23:59:53 2006
1
--- include/sswf/libsswf.h.orig	2009-03-08 04:04:03 UTC
2
+++ include/sswf/libsswf.h	Sun Aug 13 00:00:44 2006
2
+++ include/sswf/libsswf.h
3
@@ -60,16 +60,6 @@
3
@@ -68,16 +68,6 @@ SOFTWARE.
4
 
4
 
5
 #include	"sswf/libsswf-config.h"
5
 #include	"sswf/libsswf-config.h"
6
 
6
 
Lines 17-19 Link Here
17
 #ifndef	M_PI
17
 #ifndef	M_PI
18
 #define	M_PI		3.14159265358979323846
18
 #define	M_PI		3.14159265358979323846
19
 #endif
19
 #endif
20
@@ -88,7 +78,7 @@ typedef unsigned int	wint_t;
21
 #define	rint(x)		((double) (long) floor(x + 0.5))
22
 #endif
23
 
24
-#ifdef _LIBICONV_H
25
+#if defined(_LIBICONV_H) && _LIBICONV_VERSION < 0x010B
26
 #define	ICONV_INPUT_CAST
27
 #else
28
 /* older versions of iconv() were broken in regard to the
(-)graphics/swfmill/Makefile (+1 lines)
Lines 18-23 LIB_DEPENDS= libpng.so:${PORTSDIR}/graph Link Here
18
USES=		dos2unix iconv gmake pkgconfig libtool
18
USES=		dos2unix iconv gmake pkgconfig libtool
19
USE_GNOME=	libxml2 libxslt
19
USE_GNOME=	libxml2 libxslt
20
GNU_CONFIGURE=	yes
20
GNU_CONFIGURE=	yes
21
CPPFLAGS+=	-I${LOCALBASE}/include
21
DOS2UNIX_FILES=	src/swft/swft_import_ttf.cpp
22
DOS2UNIX_FILES=	src/swft/swft_import_ttf.cpp
22
23
23
PLIST_FILES=	bin/swfmill
24
PLIST_FILES=	bin/swfmill
(-)irc/weechat/Makefile (+1 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	weechat
4
PORTNAME=	weechat
5
PORTVERSION=	1.1.1
5
PORTVERSION=	1.1.1
6
PORTREVISION=	1
6
CATEGORIES=	irc
7
CATEGORIES=	irc
7
MASTER_SITES=	http://weechat.org/files/src/ \
8
MASTER_SITES=	http://weechat.org/files/src/ \
8
		http://perturb.me.uk/distfiles/weechat/:mandocs \
9
		http://perturb.me.uk/distfiles/weechat/:mandocs \
(-)irc/weechat/files/patch-cmake-FindIconv.cmake (+63 lines)
Line 0 Link Here
1
--- cmake/FindIconv.cmake.orig	2015-01-25 07:40:23 UTC
2
+++ cmake/FindIconv.cmake
3
@@ -33,39 +33,24 @@ if(ICONV_FOUND)
4
    set(ICONV_FIND_QUIETLY TRUE)
5
 endif()
6
 
7
-include(CheckLibraryExists)
8
 include(CheckFunctionExists)
9
 
10
-find_path(ICONV_INCLUDE_PATH
11
-  NAMES iconv.h
12
-  PATHS /usr/include /usr/local/include /usr/pkg/include
13
-)
14
-
15
-find_library(ICONV_LIBRARY
16
-  NAMES iconv
17
-  PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
18
-)
19
+find_path(ICONV_INCLUDE_PATH iconv.h)
20
 
21
 if(ICONV_INCLUDE_PATH)
22
-  if(ICONV_LIBRARY)
23
-    string(REGEX REPLACE "/[^/]*$" "" ICONV_LIB_PATH "${ICONV_LIBRARY}")
24
-    check_library_exists(iconv libiconv_open ${ICONV_LIB_PATH} LIBICONV_OPEN_FOUND)
25
-    check_library_exists(iconv iconv_open ${ICONV_LIB_PATH} ICONV_OPEN_FOUND)
26
-    if(LIBICONV_OPEN_FOUND OR ICONV_OPEN_FOUND)
27
-       set(ICONV_FOUND TRUE)
28
-    endif()
29
-  else()
30
-    check_function_exists(iconv_open ICONV_FOUND)
31
-  endif()
32
+  check_function_exists(iconv ICONV_FOUND)
33
+  if(NOT ICONV_FOUND)
34
+    find_library(ICONV_LIBRARY NAMES iconv libiconv libiconv-2)
35
+    if(ICONV_LIBRARY)
36
+      set(ICONV_FOUND TRUE)
37
+    endif(ICONV_LIBRARY)
38
+  endif(NOT ICONV_FOUND)
39
 endif()
40
 
41
 include(CheckCSourceCompiles)
42
 
43
-if(ICONV_LIBRARY)
44
-  set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
45
-  set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_PATH})
46
-endif()
47
-
48
+set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
49
+set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_PATH})
50
 set(CMAKE_REQUIRED_FLAGS -Werror)
51
 check_c_source_compiles("
52
   #include <iconv.h>
53
@@ -80,6 +65,10 @@ check_c_source_compiles("
54
   }
55
 " ICONV_2ARG_IS_CONST)
56
 
57
+set(CMAKE_REQUIRED_LIBRARIES)
58
+set(CMAKE_REQUIRED_INCLUDES)
59
+set(CMAKE_REQUIRED_FLAGS)
60
+
61
 mark_as_advanced(
62
   ICONV_INCLUDE_PATH
63
   ICONV_LIBRARY
(-)irc/weechat-devel/Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	weechat
3
PORTNAME=	weechat
4
PORTVERSION=	20140213
4
PORTVERSION=	20140213
5
PORTREVISION=	4
5
PORTREVISION=	5
6
CATEGORIES=	irc
6
CATEGORIES=	irc
7
MASTER_SITES=	http://perturb.me.uk/distfiles/weechat-devel/ \
7
MASTER_SITES=	http://perturb.me.uk/distfiles/weechat-devel/ \
8
		${MASTER_SITE_LOCAL}
8
		${MASTER_SITE_LOCAL}
(-)irc/weechat-devel/files/patch-cmake-FindIconv.cmake (+63 lines)
Line 0 Link Here
1
--- cmake/FindIconv.cmake.orig	2014-02-13 15:09:35 UTC
2
+++ cmake/FindIconv.cmake
3
@@ -33,39 +33,24 @@ IF(ICONV_FOUND)
4
    set(ICONV_FIND_QUIETLY TRUE)
5
 ENDIF(ICONV_FOUND)
6
 
7
-INCLUDE(CheckLibraryExists)
8
 INCLUDE(CheckFunctionExists)
9
 
10
-FIND_PATH(ICONV_INCLUDE_PATH
11
-  NAMES iconv.h
12
-  PATHS /usr/include /usr/local/include /usr/pkg/include
13
-)
14
-
15
-FIND_LIBRARY(ICONV_LIBRARY
16
-  NAMES iconv
17
-  PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
18
-)
19
+FIND_PATH(ICONV_INCLUDE_PATH iconv.h)
20
 
21
 IF(ICONV_INCLUDE_PATH)
22
-  IF(ICONV_LIBRARY)
23
-    STRING(REGEX REPLACE "/[^/]*$" "" ICONV_LIB_PATH "${ICONV_LIBRARY}")
24
-    CHECK_LIBRARY_EXISTS(iconv libiconv_open ${ICONV_LIB_PATH} LIBICONV_OPEN_FOUND)
25
-    CHECK_LIBRARY_EXISTS(iconv iconv_open ${ICONV_LIB_PATH} ICONV_OPEN_FOUND)
26
-    IF(LIBICONV_OPEN_FOUND OR ICONV_OPEN_FOUND)
27
-       SET(ICONV_FOUND TRUE)
28
-    ENDIF(LIBICONV_OPEN_FOUND OR ICONV_OPEN_FOUND)
29
-  ELSE(ICONV_LIBRARY)
30
-    CHECK_FUNCTION_EXISTS(iconv_open ICONV_FOUND)
31
-  ENDIF(ICONV_LIBRARY)
32
+  CHECK_FUNCTION_EXISTS(iconv ICONV_FOUND)
33
+  IF(NOT ICONV_FOUND)
34
+    FIND_LIBRARY(ICONV_LIBRARY NAMES iconv libiconv libiconv-2)
35
+    IF(ICONV_LIBRARY)
36
+      SET(ICONV_FOUND TRUE)
37
+    ENDIF(ICONV_LIBRARY)
38
+  ENDIF(NOT ICONV_FOUND)
39
 ENDIF(ICONV_INCLUDE_PATH)
40
 
41
 include(CheckCSourceCompiles)
42
 
43
-IF(ICONV_LIBRARY)
44
-  SET(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
45
-  SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_PATH})
46
-ENDIF(ICONV_LIBRARY)
47
-
48
+SET(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
49
+SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_PATH})
50
 SET(CMAKE_REQUIRED_FLAGS -Werror)
51
 check_c_source_compiles("
52
   #include <iconv.h>
53
@@ -79,6 +64,10 @@ check_c_source_compiles("
54
     return 0;
55
   }
56
 " ICONV_2ARG_IS_CONST)
57
+SET(CMAKE_REQUIRED_LIBRARIES)
58
+SET(CMAKE_REQUIRED_INCLUDES)
59
+SET(CMAKE_REQUIRED_FLAGS)
60
+
61
 MARK_AS_ADVANCED(
62
   ICONV_INCLUDE_PATH
63
   ICONV_LIBRARY
(-)japanese/groff/files/patch-src:libs:libgroff:encoding.cc (-21 / +1 lines)
Lines 1-26 Link Here
1
--- src/libs/libgroff/encoding.cc.bak	Wed Sep 10 03:45:14 2003
1
--- src/libs/libgroff/encoding.cc.bak	Wed Sep 10 03:45:14 2003
2
+++ src/libs/libgroff/encoding.cc	Wed Sep 10 11:31:11 2003
2
+++ src/libs/libgroff/encoding.cc	Wed Sep 10 11:31:11 2003
3
@@ -179,7 +179,8 @@
3
@@ -382,6 +382,9 @@
4
   inline wchar make_wchar(unsigned char c0, encoding_istream& eis) {
5
     wchar wc = 0;
6
     char inbuf[8], outbuf[8];
7
-    char *inp, *outp;
8
+    const char *inp;
9
+    char *outp;
10
     size_t inbytesleft, outbytesleft;
11
     int i = 0;
12
     
13
@@ -214,7 +215,8 @@
14
 
15
   inline int put_wchar(wchar wc, encoding_ostream& eos) {
16
     char inbuf[4], outbuf[4];
17
-    char *inp, *outp;
18
+    const char *inp;
19
+    char *outp;
20
     size_t inbytesleft, outbytesleft;
21
 
22
     if (!is_wchar_code(wc)) {
23
@@ -382,6 +384,9 @@
24
 #if HAVE_LANGINFO_CODESET
4
 #if HAVE_LANGINFO_CODESET
25
   charset = nl_langinfo(CODESET);
5
   charset = nl_langinfo(CODESET);
26
 #else
6
 #else
(-)japanese/jd/Makefile (-2 / +2 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	jd
4
PORTNAME=	jd
5
PORTVERSION=	2.8.8
5
PORTVERSION=	2.8.8
6
PORTREVISION=	4
6
PORTREVISION=	5
7
CATEGORIES=	japanese www
7
CATEGORIES=	japanese www
8
MASTER_SITES=	SFJP
8
MASTER_SITES=	SFJP
9
MASTER_SITE_SUBDIR=	jd4linux/61281
9
MASTER_SITE_SUBDIR=	jd4linux/61281
Lines 18-24 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
18
LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
18
LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
19
		libgcrypt.so:${PORTSDIR}/security/libgcrypt
19
		libgcrypt.so:${PORTSDIR}/security/libgcrypt
20
20
21
USES=		autoreconf iconv libtool tar:tgz
21
USES=		autoreconf iconv:translit libtool tar:tgz
22
USE_GNOME=	gtk20 gtkmm24 libgnomeui
22
USE_GNOME=	gtk20 gtkmm24 libgnomeui
23
23
24
GNU_CONFIGURE=	yes
24
GNU_CONFIGURE=	yes
(-)japanese/jd/files/patch-configure.ac (+11 lines)
Line 0 Link Here
1
--- configure.ac.orig	2013-02-10 11:38:45 UTC
2
+++ configure.ac
3
@@ -30,7 +30,7 @@ dnl 
4
 case "${host_os}" in 
5
  freebsd*) 
6
    echo "os = freebsd"
7
-   AC_DEFINE(ICONV_CONST, const, "iconv_const")
8
+   AC_DEFINE(ICONV_CONST, , "iconv_const")
9
    AC_DEFINE(USE_MKTIME, , "use mktime")
10
    ;;
11
  solaris*)
(-)japanese/mozc-server/files/patch-base_iconv.cc (-14 lines)
Lines 1-14 Link Here
1
--- base/iconv.cc.orig	2013-03-29 13:33:43.000000000 +0900
2
+++ base/iconv.cc	2013-04-27 15:36:30.000000000 +0900
3
@@ -53,7 +53,11 @@
4
   size_t olen_org = olen;
5
   iconv(ic, 0, &ilen, 0, &olen);  // reset iconv state
6
   while (ilen != 0) {
7
+#ifdef OS_FREEBSD
8
+    if (iconv(ic, (const char **)(&ibuf), &ilen, &obuf, &olen)
9
+#else
10
     if (iconv(ic, reinterpret_cast<char **>(&ibuf), &ilen, &obuf, &olen)
11
+#endif
12
         == static_cast<size_t>(-1)) {
13
       return false;
14
     }
(-)java/jikes/Makefile (-1 / +2 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	jikes
4
PORTNAME=	jikes
5
PORTVERSION=	1.22
5
PORTVERSION=	1.22
6
PORTREVISION=	1
6
PORTREVISION=	3
7
CATEGORIES=	java
7
CATEGORIES=	java
8
MASTER_SITES=	SF/${PORTNAME}/Jikes/${PORTVERSION}
8
MASTER_SITES=	SF/${PORTNAME}/Jikes/${PORTVERSION}
9
9
Lines 12-17 COMMENT= Java source to byte-code compil Link Here
12
12
13
PLIST_SUB=	PORTVERSION=${PORTVERSION}
13
PLIST_SUB=	PORTVERSION=${PORTVERSION}
14
GNU_CONFIGURE=	yes
14
GNU_CONFIGURE=	yes
15
CONFIGURE_ARGS=	ac_cv_search_libiconv_open=no
15
USES=		iconv gmake tar:bzip2
16
USES=		iconv gmake tar:bzip2
16
17
17
CPPFLAGS+=	-I${LOCALBASE}/include
18
CPPFLAGS+=	-I${LOCALBASE}/include
(-)lang/gcc5-aux/Makefile (-1 / +10 lines)
Lines 27-32 BLD_TARGET= ${GARCH}-aux-${OPSYS:tl}${O Link Here
27
FULL_GNATGCC=		NOT_SET
27
FULL_GNATGCC=		NOT_SET
28
OS_LABEL4VERS=		[${OPSYS}${GARCH:M*64:S/amd_//:S/x86_//}]
28
OS_LABEL4VERS=		[${OPSYS}${GARCH:M*64:S/amd_//:S/x86_//}]
29
NO_MTREE=		yes
29
NO_MTREE=		yes
30
CPPFLAGS+=		-I${LOCALBASE}/include
31
LIBS+=			-L${LOCALBASE}/lib
30
32
31
OPTIONS_GROUP=		Standard Bootstrap
33
OPTIONS_GROUP=		Standard Bootstrap
32
OPTIONS_GROUP_Standard=	FORT OBJC NLS TESTSUITE STATIC
34
OPTIONS_GROUP_Standard=	FORT OBJC NLS TESTSUITE STATIC
Lines 135-141 APPLY_DIFFS+= gcc-testsuite Link Here
135
.endif
137
.endif
136
138
137
.if ${PORT_OPTIONS:MNLS} && !${PORT_OPTIONS:MBOOTSTRAP}
139
.if ${PORT_OPTIONS:MNLS} && !${PORT_OPTIONS:MBOOTSTRAP}
138
USES+=		gettext-tools
140
USES+=		gettext
139
EXTRA_CONFIG+=	--enable-nls
141
EXTRA_CONFIG+=	--enable-nls
140
.else
142
.else
141
EXTRA_CONFIG+=	--disable-nls
143
EXTRA_CONFIG+=	--disable-nls
Lines 156-162 EXTRA_CONFIG+= --with-boot-ldflags=-sta Link Here
156
# Establish Ada-aware compiler for use
158
# Establish Ada-aware compiler for use
157
ADA_CONFIGURE_ENV+=	CC=${FULL_GNATGCC}
159
ADA_CONFIGURE_ENV+=	CC=${FULL_GNATGCC}
158
ADA_CONFIGURE_ENV+=	CXX=${FULL_GNATGXX}
160
ADA_CONFIGURE_ENV+=	CXX=${FULL_GNATGXX}
161
ADA_CONFIGURE_ENV+=	CFLAGS="${CFLAGS}"
162
ADA_CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
163
ADA_CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS}"
164
ADA_CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
165
ADA_CONFIGURE_ENV+=	LIBS="${LIBS}"
159
ADA_CONFIGURE_ENV+=	PATH=${FULL_PATH}
166
ADA_CONFIGURE_ENV+=	PATH=${FULL_PATH}
167
ADA_CONFIGURE_ENV+=	build_configargs="CPPFLAGS=\"${CPPFLAGS}\" LIBS=\"${LIBS}\""
168
ADA_CONFIGURE_ENV+=	host_configargs="CPPFLAGS=\"${CPPFLAGS}\" LIBS=\"${LIBS}\""
160
ADA_MAKE_ENV+=		PATH=${FULL_PATH}
169
ADA_MAKE_ENV+=		PATH=${FULL_PATH}
161
ADA_MAKE_ENV+=		LD_LIBRARY_PATH=${BUILDDIR}/gcc
170
ADA_MAKE_ENV+=		LD_LIBRARY_PATH=${BUILDDIR}/gcc
162
171
(-)lang/gcc5-aux/Makefile.version (-1 / +1 lines)
Lines 5-11 GCC_POINT= 0.0 Link Here
5
GCC_VERSION=		${GCC_BRANCH}.${GCC_POINT}
5
GCC_VERSION=		${GCC_BRANCH}.${GCC_POINT}
6
SNAPSHOT=		20150405
6
SNAPSHOT=		20150405
7
BUILD_RELEASE=		no
7
BUILD_RELEASE=		no
8
MAIN_PR=		0
8
MAIN_PR=		2
9
UTIL_PR=		0
9
UTIL_PR=		0
10
ARMV7_PR=		0
10
ARMV7_PR=		0
11
11
(-)lang/pure/Makefile (-1 / +8 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	pure
4
PORTNAME=	pure
5
PORTVERSION=	0.64
5
PORTVERSION=	0.64
6
PORTREVISION=	1
6
CATEGORIES=	lang
7
CATEGORIES=	lang
7
MASTER_SITES=	https://bitbucket.org/purelang/pure-lang/downloads/
8
MASTER_SITES=	https://bitbucket.org/purelang/pure-lang/downloads/
8
EXTRACT_ONLY=	${DISTNAME}.tar.gz
9
EXTRACT_ONLY=	${DISTNAME}.tar.gz
Lines 97-102 SUB_LIST+= NOCLANG="@comment " Link Here
97
CONFIGURE_ARGS+=	--without-readline
98
CONFIGURE_ARGS+=	--without-readline
98
.endif
99
.endif
99
100
101
.include <bsd.port.pre.mk>
102
103
.if empty(ICONV_LIB)
104
CONFIGURE_ARGS+=ac_cv_lib_iconv_libiconv=no ac_cv_lib_iconv_iconv=no
105
.endif
106
100
post-install:
107
post-install:
101
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pure	\
108
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pure	\
102
		${STAGEDIR}${PREFIX}/lib/libpure.so.*.*
109
		${STAGEDIR}${PREFIX}/lib/libpure.so.*.*
Lines 119-122 post-install: Link Here
119
	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
126
	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
120
.endif
127
.endif
121
128
122
.include <bsd.port.mk>
129
.include <bsd.port.post.mk>
(-)mail/cone/files/patch-curses-cursesscreen.diff (-13 lines)
Lines 1-13 Link Here
1
--- curses/cursesscreen.C.orig	2011-04-04 11:58:28.000000000 +0000
2
+++ curses/cursesscreen.C	2011-06-27 19:41:38.000000000 +0000
3
@@ -73,7 +73,9 @@
4
 	while (input_buf.size() > 0)
5
 	{
6
 
7
-		char *inbuf=&input_buf[0], *outbuf=&winput_buf[winput_cnt];
8
+		//char *inbuf=&input_buf[0], *outbuf=&winput_buf[winput_cnt];
9
+		const char *inbuf=&input_buf[0];
10
+		char *outbuf=&winput_buf[winput_cnt];
11
 		size_t inbytesleft=input_buf.size(),
12
 			outbytesleft=winput_buf.size()-winput_cnt;
13
 
(-)mail/dovecot-managesieve/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	dovecot-managesieve
4
PORTNAME=	dovecot-managesieve
5
PORTVERSION=	0.11.13
5
PORTVERSION=	0.11.13
6
PORTREVISION=	2
6
PORTREVISION=	4
7
CATEGORIES=	mail
7
CATEGORIES=	mail
8
MASTER_SITES=	http://www.rename-it.nl/dovecot/${DOVECOTVERSION}/
8
MASTER_SITES=	http://www.rename-it.nl/dovecot/${DOVECOTVERSION}/
9
DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}
9
DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}
(-)mail/dovecot-sieve/Makefile (-1 / +1 lines)
Lines 4-10 Link Here
4
PORTNAME=	dovecot-sieve
4
PORTNAME=	dovecot-sieve
5
PORTVERSION=	${DOVECOTVERSION}+${DISTVERSION}
5
PORTVERSION=	${DOVECOTVERSION}+${DISTVERSION}
6
DISTVERSION=	0.1.19
6
DISTVERSION=	0.1.19
7
PORTREVISION=	2
7
PORTREVISION=	4
8
CATEGORIES=	mail
8
CATEGORIES=	mail
9
MASTER_SITES=	http://www.rename-it.nl/dovecot/${DOVECOTVERSION}/
9
MASTER_SITES=	http://www.rename-it.nl/dovecot/${DOVECOTVERSION}/
10
DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}
10
DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}
(-)mail/gnarwl/Makefile (-1 / +3 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	gnarwl
4
PORTNAME=	gnarwl
5
PORTVERSION=	3.6
5
PORTVERSION=	3.6
6
PORTREVISION=	4
6
PORTREVISION=	5
7
CATEGORIES=	mail
7
CATEGORIES=	mail
8
MASTER_SITES=	http://www.onyxbits.de/sites/default/files/
8
MASTER_SITES=	http://www.onyxbits.de/sites/default/files/
9
9
Lines 17-22 USES= iconv gmake tar:tgz Link Here
17
USE_OPENLDAP=	yes
17
USE_OPENLDAP=	yes
18
GNU_CONFIGURE=	yes
18
GNU_CONFIGURE=	yes
19
CONFIGURE_ARGS=	--with-docdir=${DOCSDIR}
19
CONFIGURE_ARGS=	--with-docdir=${DOCSDIR}
20
CPPFLAGS+=	-I${LOCALBASE}/include
21
LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB}
20
22
21
OPTIONS_DEFINE=	DOCS
23
OPTIONS_DEFINE=	DOCS
22
24
(-)mail/gnarwl/files/patch-Makefile.in (-1 / +1 lines)
Lines 15-21 Link Here
15
 CC=@CC@
15
 CC=@CC@
16
-CFLAGS=-DLDAP_DEPRECATED -DBLOCKDIR=\"$(BLOCKDIR)\" -DCFGFILE=\"$(CONFDIR)/gnarwl.cfg\" -DVERSION=\"$(VER)\" -g -Wall -O2 -I..
16
-CFLAGS=-DLDAP_DEPRECATED -DBLOCKDIR=\"$(BLOCKDIR)\" -DCFGFILE=\"$(CONFDIR)/gnarwl.cfg\" -DVERSION=\"$(VER)\" -g -Wall -O2 -I..
17
-LFLAGS=-lldap -lgdbm -ldl -lresolv
17
-LFLAGS=-lldap -lgdbm -ldl -lresolv
18
+CFLAGS=@CFLAGS@ -DLDAP_DEPRECATED -DBLOCKDIR=\"$(BLOCKDIR)\" -DCFGFILE=\"$(CONFDIR)/gnarwl.cfg\" -DVERSION=\"$(VER)\" -g -Wall -O2 -I.. @CPPFLAGS@
18
+CFLAGS=@CFLAGS@ -DLDAP_DEPRECATED -DBLOCKDIR=\"$(BLOCKDIR)\" -DCFGFILE=\"$(CONFDIR)/gnarwl.cfg\" -DVERSION=\"$(VER)\" -Wall -I.. @CPPFLAGS@
19
+LFLAGS=@LDFLAGS@ @LIBS@
19
+LFLAGS=@LDFLAGS@ @LIBS@
20
 
20
 
21
 ##
21
 ##
(-)mail/gnarwl/files/patch-configure (-3433 lines)
Lines 1-3433 Link Here
1
--- gnarwl-3.6.orig/configure	2009-07-27 13:58:34.000000000 +0200
2
+++ configure	2009-07-27 13:58:37.000000000 +0200
3
@@ -1,9 +1,9 @@
4
 #! /bin/sh
5
 # Guess values for system-dependent variables and create Makefiles.
6
-# Generated by GNU Autoconf 2.61.
7
+# Generated by GNU Autoconf 2.62.
8
 #
9
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
10
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
11
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
12
 # This configure script is free software; the Free Software Foundation
13
 # gives unlimited permission to copy, distribute and modify it.
14
 ## --------------------- ##
15
@@ -15,7 +15,7 @@
16
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
17
   emulate sh
18
   NULLCMD=:
19
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
20
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
21
   # is contrary to our usage.  Disable this feature.
22
   alias -g '${1+"$@"}'='"$@"'
23
   setopt NO_GLOB_SUBST
24
@@ -37,17 +37,45 @@
25
 as_cr_digits='0123456789'
26
 as_cr_alnum=$as_cr_Letters$as_cr_digits
27
 
28
-# The user is always right.
29
-if test "${PATH_SEPARATOR+set}" != set; then
30
-  echo "#! /bin/sh" >conf$$.sh
31
-  echo  "exit 0"   >>conf$$.sh
32
-  chmod +x conf$$.sh
33
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
34
-    PATH_SEPARATOR=';'
35
+as_nl='
36
+'
37
+export as_nl
38
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
39
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
40
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
41
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
42
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
43
+  as_echo='printf %s\n'
44
+  as_echo_n='printf %s'
45
+else
46
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
47
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
48
+    as_echo_n='/usr/ucb/echo -n'
49
   else
50
-    PATH_SEPARATOR=:
51
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
52
+    as_echo_n_body='eval
53
+      arg=$1;
54
+      case $arg in
55
+      *"$as_nl"*)
56
+	expr "X$arg" : "X\\(.*\\)$as_nl";
57
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
58
+      esac;
59
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
60
+    '
61
+    export as_echo_n_body
62
+    as_echo_n='sh -c $as_echo_n_body as_echo'
63
   fi
64
-  rm -f conf$$.sh
65
+  export as_echo_body
66
+  as_echo='sh -c $as_echo_body as_echo'
67
+fi
68
+
69
+# The user is always right.
70
+if test "${PATH_SEPARATOR+set}" != set; then
71
+  PATH_SEPARATOR=:
72
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
73
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
74
+      PATH_SEPARATOR=';'
75
+  }
76
 fi
77
 
78
 # Support unset when possible.
79
@@ -63,8 +91,6 @@
80
 # there to prevent editors from complaining about space-tab.
81
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
82
 # splitting by setting IFS to empty value.)
83
-as_nl='
84
-'
85
 IFS=" ""	$as_nl"
86
 
87
 # Find who we are.  Look in the path if we contain no directory separator.
88
@@ -87,7 +113,7 @@
89
   as_myself=$0
90
 fi
91
 if test ! -f "$as_myself"; then
92
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
93
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
94
   { (exit 1); exit 1; }
95
 fi
96
 
97
@@ -100,17 +126,10 @@
98
 PS4='+ '
99
 
100
 # NLS nuisances.
101
-for as_var in \
102
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
103
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
104
-  LC_TELEPHONE LC_TIME
105
-do
106
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
107
-    eval $as_var=C; export $as_var
108
-  else
109
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
110
-  fi
111
-done
112
+LC_ALL=C
113
+export LC_ALL
114
+LANGUAGE=C
115
+export LANGUAGE
116
 
117
 # Required to use basename.
118
 if expr a : '\(a\)' >/dev/null 2>&1 &&
119
@@ -132,7 +151,7 @@
120
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
121
 	 X"$0" : 'X\(//\)$' \| \
122
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
123
-echo X/"$0" |
124
+$as_echo X/"$0" |
125
     sed '/^.*\/\([^/][^/]*\)\/*$/{
126
 	    s//\1/
127
 	    q
128
@@ -158,7 +177,7 @@
129
   as_have_required=no
130
 fi
131
 
132
-  if test $as_have_required = yes && 	 (eval ":
133
+  if test $as_have_required = yes &&	 (eval ":
134
 (as_func_return () {
135
   (exit \$1)
136
 }
137
@@ -240,7 +259,7 @@
138
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
139
   emulate sh
140
   NULLCMD=:
141
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
142
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
143
   # is contrary to our usage.  Disable this feature.
144
   alias -g '${1+"$@"}'='"$@"'
145
   setopt NO_GLOB_SUBST
146
@@ -261,7 +280,7 @@
147
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
148
   emulate sh
149
   NULLCMD=:
150
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
151
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
152
   # is contrary to our usage.  Disable this feature.
153
   alias -g '${1+"$@"}'='"$@"'
154
   setopt NO_GLOB_SUBST
155
@@ -341,10 +360,10 @@
156
 
157
       if test "x$CONFIG_SHELL" != x; then
158
   for as_var in BASH_ENV ENV
159
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
160
-        done
161
-        export CONFIG_SHELL
162
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
163
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
164
+	done
165
+	export CONFIG_SHELL
166
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
167
 fi
168
 
169
 
170
@@ -413,9 +432,10 @@
171
 
172
 test \$exitcode = 0") || {
173
   echo No shell found that supports shell functions.
174
-  echo Please tell autoconf@gnu.org about your system,
175
-  echo including any error possibly output before this
176
-  echo message
177
+  echo Please tell bug-autoconf@gnu.org about your system,
178
+  echo including any error possibly output before this message.
179
+  echo This can help us improve future autoconf versions.
180
+  echo Configuration will now proceed without shell functions.
181
 }
182
 
183
 
184
@@ -451,7 +471,7 @@
185
       s/-\n.*//
186
     ' >$as_me.lineno &&
187
   chmod +x "$as_me.lineno" ||
188
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
189
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
190
    { (exit 1); exit 1; }; }
191
 
192
   # Don't try to exec as it changes $[0], causing all sort of problems
193
@@ -479,7 +499,6 @@
194
 *)
195
   ECHO_N='-n';;
196
 esac
197
-
198
 if expr a : '\(a\)' >/dev/null 2>&1 &&
199
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
200
   as_expr=expr
201
@@ -492,19 +511,22 @@
202
   rm -f conf$$.dir/conf$$.file
203
 else
204
   rm -f conf$$.dir
205
-  mkdir conf$$.dir
206
+  mkdir conf$$.dir 2>/dev/null
207
 fi
208
-echo >conf$$.file
209
-if ln -s conf$$.file conf$$ 2>/dev/null; then
210
-  as_ln_s='ln -s'
211
-  # ... but there are two gotchas:
212
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
213
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
214
-  # In both cases, we have to default to `cp -p'.
215
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
216
+if (echo >conf$$.file) 2>/dev/null; then
217
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
218
+    as_ln_s='ln -s'
219
+    # ... but there are two gotchas:
220
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
221
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
222
+    # In both cases, we have to default to `cp -p'.
223
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
224
+      as_ln_s='cp -p'
225
+  elif ln conf$$.file conf$$ 2>/dev/null; then
226
+    as_ln_s=ln
227
+  else
228
     as_ln_s='cp -p'
229
-elif ln conf$$.file conf$$ 2>/dev/null; then
230
-  as_ln_s=ln
231
+  fi
232
 else
233
   as_ln_s='cp -p'
234
 fi
235
@@ -529,10 +551,10 @@
236
   as_test_x='
237
     eval sh -c '\''
238
       if test -d "$1"; then
239
-        test -d "$1/.";
240
+	test -d "$1/.";
241
       else
242
 	case $1 in
243
-        -*)set "./$1";;
244
+	-*)set "./$1";;
245
 	esac;
246
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
247
 	???[sx]*):;;*)false;;esac;fi
248
@@ -628,6 +650,16 @@
249
 LIBOBJS
250
 LTLIBOBJS'
251
 ac_subst_files=''
252
+ac_user_opts='
253
+enable_option_checking
254
+with_homedir
255
+with_docdir
256
+with_useradd_prog
257
+with_useradd_args
258
+with_mta
259
+with_permmask
260
+with_maxline
261
+'
262
       ac_precious_vars='build_alias
263
 host_alias
264
 target_alias
265
@@ -641,6 +673,8 @@
266
 # Initialize some variables set by options.
267
 ac_init_help=
268
 ac_init_version=false
269
+ac_unrecognized_opts=
270
+ac_unrecognized_sep=
271
 # The variables have the same names as the options, with
272
 # dashes changed to underlines.
273
 cache_file=/dev/null
274
@@ -739,13 +773,21 @@
275
     datarootdir=$ac_optarg ;;
276
 
277
   -disable-* | --disable-*)
278
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
279
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
280
     # Reject names that are not valid shell variable names.
281
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
282
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
283
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
284
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
285
    { (exit 1); exit 1; }; }
286
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
287
-    eval enable_$ac_feature=no ;;
288
+    ac_useropt_orig=$ac_useropt
289
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
290
+    case $ac_user_opts in
291
+      *"
292
+"enable_$ac_useropt"
293
+"*) ;;
294
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
295
+	 ac_unrecognized_sep=', ';;
296
+    esac
297
+    eval enable_$ac_useropt=no ;;
298
 
299
   -docdir | --docdir | --docdi | --doc | --do)
300
     ac_prev=docdir ;;
301
@@ -758,13 +800,21 @@
302
     dvidir=$ac_optarg ;;
303
 
304
   -enable-* | --enable-*)
305
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
306
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
307
     # Reject names that are not valid shell variable names.
308
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
309
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
310
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
311
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
312
    { (exit 1); exit 1; }; }
313
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
314
-    eval enable_$ac_feature=\$ac_optarg ;;
315
+    ac_useropt_orig=$ac_useropt
316
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
317
+    case $ac_user_opts in
318
+      *"
319
+"enable_$ac_useropt"
320
+"*) ;;
321
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
322
+	 ac_unrecognized_sep=', ';;
323
+    esac
324
+    eval enable_$ac_useropt=\$ac_optarg ;;
325
 
326
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
327
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
328
@@ -955,22 +1005,38 @@
329
     ac_init_version=: ;;
330
 
331
   -with-* | --with-*)
332
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
333
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
334
     # Reject names that are not valid shell variable names.
335
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
336
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
337
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
338
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
339
    { (exit 1); exit 1; }; }
340
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
341
-    eval with_$ac_package=\$ac_optarg ;;
342
+    ac_useropt_orig=$ac_useropt
343
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
344
+    case $ac_user_opts in
345
+      *"
346
+"with_$ac_useropt"
347
+"*) ;;
348
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
349
+	 ac_unrecognized_sep=', ';;
350
+    esac
351
+    eval with_$ac_useropt=\$ac_optarg ;;
352
 
353
   -without-* | --without-*)
354
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
355
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
356
     # Reject names that are not valid shell variable names.
357
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
358
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
359
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
360
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
361
    { (exit 1); exit 1; }; }
362
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
363
-    eval with_$ac_package=no ;;
364
+    ac_useropt_orig=$ac_useropt
365
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
366
+    case $ac_user_opts in
367
+      *"
368
+"with_$ac_useropt"
369
+"*) ;;
370
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
371
+	 ac_unrecognized_sep=', ';;
372
+    esac
373
+    eval with_$ac_useropt=no ;;
374
 
375
   --x)
376
     # Obsolete; use --with-x.
377
@@ -990,7 +1056,7 @@
378
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
379
     x_libraries=$ac_optarg ;;
380
 
381
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
382
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
383
 Try \`$0 --help' for more information." >&2
384
    { (exit 1); exit 1; }; }
385
     ;;
386
@@ -999,16 +1065,16 @@
387
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
388
     # Reject names that are not valid shell variable names.
389
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
390
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
391
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
392
    { (exit 1); exit 1; }; }
393
     eval $ac_envvar=\$ac_optarg
394
     export $ac_envvar ;;
395
 
396
   *)
397
     # FIXME: should be removed in autoconf 3.0.
398
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
399
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
400
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
401
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
402
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
403
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
404
     ;;
405
 
406
@@ -1017,22 +1083,38 @@
407
 
408
 if test -n "$ac_prev"; then
409
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
410
-  { echo "$as_me: error: missing argument to $ac_option" >&2
411
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
412
    { (exit 1); exit 1; }; }
413
 fi
414
 
415
-# Be sure to have absolute directory names.
416
+if test -n "$ac_unrecognized_opts"; then
417
+  case $enable_option_checking in
418
+    no) ;;
419
+    fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
420
+   { (exit 1); exit 1; }; } ;;
421
+    *)     $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
422
+  esac
423
+fi
424
+
425
+# Check all directory arguments for consistency.
426
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
427
 		datadir sysconfdir sharedstatedir localstatedir includedir \
428
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
429
 		libdir localedir mandir
430
 do
431
   eval ac_val=\$$ac_var
432
+  # Remove trailing slashes.
433
+  case $ac_val in
434
+    */ )
435
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
436
+      eval $ac_var=\$ac_val;;
437
+  esac
438
+  # Be sure to have absolute directory names.
439
   case $ac_val in
440
     [\\/$]* | ?:[\\/]* )  continue;;
441
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
442
   esac
443
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
444
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
445
    { (exit 1); exit 1; }; }
446
 done
447
 
448
@@ -1047,7 +1129,7 @@
449
 if test "x$host_alias" != x; then
450
   if test "x$build_alias" = x; then
451
     cross_compiling=maybe
452
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
453
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
454
     If a cross compiler is detected then cross compile mode will be used." >&2
455
   elif test "x$build_alias" != "x$host_alias"; then
456
     cross_compiling=yes
457
@@ -1063,10 +1145,10 @@
458
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
459
 ac_ls_di=`ls -di .` &&
460
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
461
-  { echo "$as_me: error: Working directory cannot be determined" >&2
462
+  { $as_echo "$as_me: error: Working directory cannot be determined" >&2
463
    { (exit 1); exit 1; }; }
464
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
465
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
466
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
467
    { (exit 1); exit 1; }; }
468
 
469
 
470
@@ -1074,12 +1156,12 @@
471
 if test -z "$srcdir"; then
472
   ac_srcdir_defaulted=yes
473
   # Try the directory containing this script, then the parent directory.
474
-  ac_confdir=`$as_dirname -- "$0" ||
475
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
476
-	 X"$0" : 'X\(//\)[^/]' \| \
477
-	 X"$0" : 'X\(//\)$' \| \
478
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
479
-echo X"$0" |
480
+  ac_confdir=`$as_dirname -- "$as_myself" ||
481
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
482
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
483
+	 X"$as_myself" : 'X\(//\)$' \| \
484
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
485
+$as_echo X"$as_myself" |
486
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
487
 	    s//\1/
488
 	    q
489
@@ -1106,12 +1188,12 @@
490
 fi
491
 if test ! -r "$srcdir/$ac_unique_file"; then
492
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
493
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
494
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
495
    { (exit 1); exit 1; }; }
496
 fi
497
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
498
 ac_abs_confdir=`(
499
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
500
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
501
    { (exit 1); exit 1; }; }
502
 	pwd)`
503
 # When building in place, set srcdir=.
504
@@ -1160,9 +1242,9 @@
505
 
506
 Installation directories:
507
   --prefix=PREFIX         install architecture-independent files in PREFIX
508
-			  [$ac_default_prefix]
509
+                          [$ac_default_prefix]
510
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
511
-			  [PREFIX]
512
+                          [PREFIX]
513
 
514
 By default, \`make install' will install all the files in
515
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
516
@@ -1172,25 +1254,25 @@
517
 For better control, use the options below.
518
 
519
 Fine tuning of the installation directories:
520
-  --bindir=DIR           user executables [EPREFIX/bin]
521
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
522
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
523
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
524
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
525
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
526
-  --libdir=DIR           object code libraries [EPREFIX/lib]
527
-  --includedir=DIR       C header files [PREFIX/include]
528
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
529
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
530
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
531
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
532
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
533
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
534
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
535
-  --htmldir=DIR          html documentation [DOCDIR]
536
-  --dvidir=DIR           dvi documentation [DOCDIR]
537
-  --pdfdir=DIR           pdf documentation [DOCDIR]
538
-  --psdir=DIR            ps documentation [DOCDIR]
539
+  --bindir=DIR            user executables [EPREFIX/bin]
540
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
541
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
542
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
543
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
544
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
545
+  --libdir=DIR            object code libraries [EPREFIX/lib]
546
+  --includedir=DIR        C header files [PREFIX/include]
547
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
548
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
549
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
550
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
551
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
552
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
553
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
554
+  --htmldir=DIR           html documentation [DOCDIR]
555
+  --dvidir=DIR            dvi documentation [DOCDIR]
556
+  --pdfdir=DIR            pdf documentation [DOCDIR]
557
+  --psdir=DIR             ps documentation [DOCDIR]
558
 _ACEOF
559
 
560
   cat <<\_ACEOF
561
@@ -1231,15 +1313,17 @@
562
 if test "$ac_init_help" = "recursive"; then
563
   # If there are subdirs, report their specific --help.
564
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
565
-    test -d "$ac_dir" || continue
566
+    test -d "$ac_dir" ||
567
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
568
+      continue
569
     ac_builddir=.
570
 
571
 case "$ac_dir" in
572
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
573
 *)
574
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
575
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
576
   # A ".." for each directory in $ac_dir_suffix.
577
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
578
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
579
   case $ac_top_builddir_sub in
580
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
581
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
582
@@ -1275,7 +1359,7 @@
583
       echo &&
584
       $SHELL "$ac_srcdir/configure" --help=recursive
585
     else
586
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
587
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
588
     fi || ac_status=$?
589
     cd "$ac_pwd" || { ac_status=$?; break; }
590
   done
591
@@ -1285,10 +1369,10 @@
592
 if $ac_init_version; then
593
   cat <<\_ACEOF
594
 configure
595
-generated by GNU Autoconf 2.61
596
+generated by GNU Autoconf 2.62
597
 
598
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
599
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
600
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
601
 This configure script is free software; the Free Software Foundation
602
 gives unlimited permission to copy, distribute and modify it.
603
 _ACEOF
604
@@ -1299,7 +1383,7 @@
605
 running configure, to aid debugging if configure makes a mistake.
606
 
607
 It was created by $as_me, which was
608
-generated by GNU Autoconf 2.61.  Invocation command line was
609
+generated by GNU Autoconf 2.62.  Invocation command line was
610
 
611
   $ $0 $@
612
 
613
@@ -1335,7 +1419,7 @@
614
 do
615
   IFS=$as_save_IFS
616
   test -z "$as_dir" && as_dir=.
617
-  echo "PATH: $as_dir"
618
+  $as_echo "PATH: $as_dir"
619
 done
620
 IFS=$as_save_IFS
621
 
622
@@ -1370,7 +1454,7 @@
623
     | -silent | --silent | --silen | --sile | --sil)
624
       continue ;;
625
     *\'*)
626
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
627
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
628
     esac
629
     case $ac_pass in
630
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
631
@@ -1422,11 +1506,12 @@
632
     case $ac_val in #(
633
     *${as_nl}*)
634
       case $ac_var in #(
635
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
636
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
637
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
638
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
639
       esac
640
       case $ac_var in #(
641
       _ | IFS | as_nl) ;; #(
642
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
643
       *) $as_unset $ac_var ;;
644
       esac ;;
645
     esac
646
@@ -1456,9 +1541,9 @@
647
     do
648
       eval ac_val=\$$ac_var
649
       case $ac_val in
650
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
651
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
652
       esac
653
-      echo "$ac_var='\''$ac_val'\''"
654
+      $as_echo "$ac_var='\''$ac_val'\''"
655
     done | sort
656
     echo
657
 
658
@@ -1473,9 +1558,9 @@
659
       do
660
 	eval ac_val=\$$ac_var
661
 	case $ac_val in
662
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
663
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
664
 	esac
665
-	echo "$ac_var='\''$ac_val'\''"
666
+	$as_echo "$ac_var='\''$ac_val'\''"
667
       done | sort
668
       echo
669
     fi
670
@@ -1491,8 +1576,8 @@
671
       echo
672
     fi
673
     test "$ac_signal" != 0 &&
674
-      echo "$as_me: caught signal $ac_signal"
675
-    echo "$as_me: exit $exit_status"
676
+      $as_echo "$as_me: caught signal $ac_signal"
677
+    $as_echo "$as_me: exit $exit_status"
678
   } >&5
679
   rm -f core *.core core.conftest.* &&
680
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
681
@@ -1534,21 +1619,24 @@
682
 
683
 
684
 # Let the site file select an alternate cache file if it wants to.
685
-# Prefer explicitly selected file to automatically selected ones.
686
+# Prefer an explicitly selected file to automatically selected ones.
687
+ac_site_file1=NONE
688
+ac_site_file2=NONE
689
 if test -n "$CONFIG_SITE"; then
690
-  set x "$CONFIG_SITE"
691
+  ac_site_file1=$CONFIG_SITE
692
 elif test "x$prefix" != xNONE; then
693
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
694
+  ac_site_file1=$prefix/share/config.site
695
+  ac_site_file2=$prefix/etc/config.site
696
 else
697
-  set x "$ac_default_prefix/share/config.site" \
698
-	"$ac_default_prefix/etc/config.site"
699
+  ac_site_file1=$ac_default_prefix/share/config.site
700
+  ac_site_file2=$ac_default_prefix/etc/config.site
701
 fi
702
-shift
703
-for ac_site_file
704
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
705
 do
706
+  test "x$ac_site_file" = xNONE && continue
707
   if test -r "$ac_site_file"; then
708
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
709
-echo "$as_me: loading site script $ac_site_file" >&6;}
710
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
711
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
712
     sed 's/^/| /' "$ac_site_file" >&5
713
     . "$ac_site_file"
714
   fi
715
@@ -1558,16 +1646,16 @@
716
   # Some versions of bash will fail to source /dev/null (special
717
   # files actually), so we avoid doing that.
718
   if test -f "$cache_file"; then
719
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
720
-echo "$as_me: loading cache $cache_file" >&6;}
721
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
722
+$as_echo "$as_me: loading cache $cache_file" >&6;}
723
     case $cache_file in
724
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
725
       *)                      . "./$cache_file";;
726
     esac
727
   fi
728
 else
729
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
730
-echo "$as_me: creating cache $cache_file" >&6;}
731
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
732
+$as_echo "$as_me: creating cache $cache_file" >&6;}
733
   >$cache_file
734
 fi
735
 
736
@@ -1581,29 +1669,38 @@
737
   eval ac_new_val=\$ac_env_${ac_var}_value
738
   case $ac_old_set,$ac_new_set in
739
     set,)
740
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
741
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
742
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
743
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
744
       ac_cache_corrupted=: ;;
745
     ,set)
746
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
747
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
748
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
749
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
750
       ac_cache_corrupted=: ;;
751
     ,);;
752
     *)
753
       if test "x$ac_old_val" != "x$ac_new_val"; then
754
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
755
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
756
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
757
-echo "$as_me:   former value:  $ac_old_val" >&2;}
758
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
759
-echo "$as_me:   current value: $ac_new_val" >&2;}
760
-	ac_cache_corrupted=:
761
+	# differences in whitespace do not lead to failure.
762
+	ac_old_val_w=`echo x $ac_old_val`
763
+	ac_new_val_w=`echo x $ac_new_val`
764
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
765
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
766
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
767
+	  ac_cache_corrupted=:
768
+	else
769
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
770
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
771
+	  eval $ac_var=\$ac_old_val
772
+	fi
773
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
774
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
775
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
776
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
777
       fi;;
778
   esac
779
   # Pass precious variables to config.status.
780
   if test "$ac_new_set" = set; then
781
     case $ac_new_val in
782
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
783
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
784
     *) ac_arg=$ac_var=$ac_new_val ;;
785
     esac
786
     case " $ac_configure_args " in
787
@@ -1613,10 +1710,10 @@
788
   fi
789
 done
790
 if $ac_cache_corrupted; then
791
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
792
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
793
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
794
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
795
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
796
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
797
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
798
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
799
    { (exit 1); exit 1; }; }
800
 fi
801
 
802
@@ -1657,10 +1754,10 @@
803
 if test -n "$ac_tool_prefix"; then
804
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
805
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
806
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
807
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
808
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
809
+$as_echo_n "checking for $ac_word... " >&6; }
810
 if test "${ac_cv_prog_CC+set}" = set; then
811
-  echo $ECHO_N "(cached) $ECHO_C" >&6
812
+  $as_echo_n "(cached) " >&6
813
 else
814
   if test -n "$CC"; then
815
   ac_cv_prog_CC="$CC" # Let the user override the test.
816
@@ -1673,7 +1770,7 @@
817
   for ac_exec_ext in '' $ac_executable_extensions; do
818
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
819
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
820
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
821
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
822
     break 2
823
   fi
824
 done
825
@@ -1684,11 +1781,11 @@
826
 fi
827
 CC=$ac_cv_prog_CC
828
 if test -n "$CC"; then
829
-  { echo "$as_me:$LINENO: result: $CC" >&5
830
-echo "${ECHO_T}$CC" >&6; }
831
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
832
+$as_echo "$CC" >&6; }
833
 else
834
-  { echo "$as_me:$LINENO: result: no" >&5
835
-echo "${ECHO_T}no" >&6; }
836
+  { $as_echo "$as_me:$LINENO: result: no" >&5
837
+$as_echo "no" >&6; }
838
 fi
839
 
840
 
841
@@ -1697,10 +1794,10 @@
842
   ac_ct_CC=$CC
843
   # Extract the first word of "gcc", so it can be a program name with args.
844
 set dummy gcc; ac_word=$2
845
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
846
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
847
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
848
+$as_echo_n "checking for $ac_word... " >&6; }
849
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
850
-  echo $ECHO_N "(cached) $ECHO_C" >&6
851
+  $as_echo_n "(cached) " >&6
852
 else
853
   if test -n "$ac_ct_CC"; then
854
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
855
@@ -1713,7 +1810,7 @@
856
   for ac_exec_ext in '' $ac_executable_extensions; do
857
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
858
     ac_cv_prog_ac_ct_CC="gcc"
859
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
860
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
861
     break 2
862
   fi
863
 done
864
@@ -1724,11 +1821,11 @@
865
 fi
866
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
867
 if test -n "$ac_ct_CC"; then
868
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
869
-echo "${ECHO_T}$ac_ct_CC" >&6; }
870
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
871
+$as_echo "$ac_ct_CC" >&6; }
872
 else
873
-  { echo "$as_me:$LINENO: result: no" >&5
874
-echo "${ECHO_T}no" >&6; }
875
+  { $as_echo "$as_me:$LINENO: result: no" >&5
876
+$as_echo "no" >&6; }
877
 fi
878
 
879
   if test "x$ac_ct_CC" = x; then
880
@@ -1736,10 +1833,10 @@
881
   else
882
     case $cross_compiling:$ac_tool_warned in
883
 yes:)
884
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
885
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
886
 whose name does not start with the host triplet.  If you think this
887
 configuration is useful to you, please write to autoconf@gnu.org." >&5
888
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
889
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
890
 whose name does not start with the host triplet.  If you think this
891
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
892
 ac_tool_warned=yes ;;
893
@@ -1754,10 +1851,10 @@
894
           if test -n "$ac_tool_prefix"; then
895
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
896
 set dummy ${ac_tool_prefix}cc; ac_word=$2
897
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
898
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
899
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
900
+$as_echo_n "checking for $ac_word... " >&6; }
901
 if test "${ac_cv_prog_CC+set}" = set; then
902
-  echo $ECHO_N "(cached) $ECHO_C" >&6
903
+  $as_echo_n "(cached) " >&6
904
 else
905
   if test -n "$CC"; then
906
   ac_cv_prog_CC="$CC" # Let the user override the test.
907
@@ -1770,7 +1867,7 @@
908
   for ac_exec_ext in '' $ac_executable_extensions; do
909
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
910
     ac_cv_prog_CC="${ac_tool_prefix}cc"
911
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
912
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
913
     break 2
914
   fi
915
 done
916
@@ -1781,11 +1878,11 @@
917
 fi
918
 CC=$ac_cv_prog_CC
919
 if test -n "$CC"; then
920
-  { echo "$as_me:$LINENO: result: $CC" >&5
921
-echo "${ECHO_T}$CC" >&6; }
922
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
923
+$as_echo "$CC" >&6; }
924
 else
925
-  { echo "$as_me:$LINENO: result: no" >&5
926
-echo "${ECHO_T}no" >&6; }
927
+  { $as_echo "$as_me:$LINENO: result: no" >&5
928
+$as_echo "no" >&6; }
929
 fi
930
 
931
 
932
@@ -1794,10 +1891,10 @@
933
 if test -z "$CC"; then
934
   # Extract the first word of "cc", so it can be a program name with args.
935
 set dummy cc; ac_word=$2
936
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
937
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
938
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
939
+$as_echo_n "checking for $ac_word... " >&6; }
940
 if test "${ac_cv_prog_CC+set}" = set; then
941
-  echo $ECHO_N "(cached) $ECHO_C" >&6
942
+  $as_echo_n "(cached) " >&6
943
 else
944
   if test -n "$CC"; then
945
   ac_cv_prog_CC="$CC" # Let the user override the test.
946
@@ -1815,7 +1912,7 @@
947
        continue
948
      fi
949
     ac_cv_prog_CC="cc"
950
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
951
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
952
     break 2
953
   fi
954
 done
955
@@ -1838,11 +1935,11 @@
956
 fi
957
 CC=$ac_cv_prog_CC
958
 if test -n "$CC"; then
959
-  { echo "$as_me:$LINENO: result: $CC" >&5
960
-echo "${ECHO_T}$CC" >&6; }
961
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
962
+$as_echo "$CC" >&6; }
963
 else
964
-  { echo "$as_me:$LINENO: result: no" >&5
965
-echo "${ECHO_T}no" >&6; }
966
+  { $as_echo "$as_me:$LINENO: result: no" >&5
967
+$as_echo "no" >&6; }
968
 fi
969
 
970
 
971
@@ -1853,10 +1950,10 @@
972
   do
973
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
974
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
975
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
976
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
977
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
978
+$as_echo_n "checking for $ac_word... " >&6; }
979
 if test "${ac_cv_prog_CC+set}" = set; then
980
-  echo $ECHO_N "(cached) $ECHO_C" >&6
981
+  $as_echo_n "(cached) " >&6
982
 else
983
   if test -n "$CC"; then
984
   ac_cv_prog_CC="$CC" # Let the user override the test.
985
@@ -1869,7 +1966,7 @@
986
   for ac_exec_ext in '' $ac_executable_extensions; do
987
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
988
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
989
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
990
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
991
     break 2
992
   fi
993
 done
994
@@ -1880,11 +1977,11 @@
995
 fi
996
 CC=$ac_cv_prog_CC
997
 if test -n "$CC"; then
998
-  { echo "$as_me:$LINENO: result: $CC" >&5
999
-echo "${ECHO_T}$CC" >&6; }
1000
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
1001
+$as_echo "$CC" >&6; }
1002
 else
1003
-  { echo "$as_me:$LINENO: result: no" >&5
1004
-echo "${ECHO_T}no" >&6; }
1005
+  { $as_echo "$as_me:$LINENO: result: no" >&5
1006
+$as_echo "no" >&6; }
1007
 fi
1008
 
1009
 
1010
@@ -1897,10 +1994,10 @@
1011
 do
1012
   # Extract the first word of "$ac_prog", so it can be a program name with args.
1013
 set dummy $ac_prog; ac_word=$2
1014
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1015
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1016
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1017
+$as_echo_n "checking for $ac_word... " >&6; }
1018
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
1019
-  echo $ECHO_N "(cached) $ECHO_C" >&6
1020
+  $as_echo_n "(cached) " >&6
1021
 else
1022
   if test -n "$ac_ct_CC"; then
1023
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
1024
@@ -1913,7 +2010,7 @@
1025
   for ac_exec_ext in '' $ac_executable_extensions; do
1026
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1027
     ac_cv_prog_ac_ct_CC="$ac_prog"
1028
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1029
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1030
     break 2
1031
   fi
1032
 done
1033
@@ -1924,11 +2021,11 @@
1034
 fi
1035
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
1036
 if test -n "$ac_ct_CC"; then
1037
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1038
-echo "${ECHO_T}$ac_ct_CC" >&6; }
1039
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1040
+$as_echo "$ac_ct_CC" >&6; }
1041
 else
1042
-  { echo "$as_me:$LINENO: result: no" >&5
1043
-echo "${ECHO_T}no" >&6; }
1044
+  { $as_echo "$as_me:$LINENO: result: no" >&5
1045
+$as_echo "no" >&6; }
1046
 fi
1047
 
1048
 
1049
@@ -1940,10 +2037,10 @@
1050
   else
1051
     case $cross_compiling:$ac_tool_warned in
1052
 yes:)
1053
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
1054
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
1055
 whose name does not start with the host triplet.  If you think this
1056
 configuration is useful to you, please write to autoconf@gnu.org." >&5
1057
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
1058
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
1059
 whose name does not start with the host triplet.  If you think this
1060
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
1061
 ac_tool_warned=yes ;;
1062
@@ -1955,44 +2052,48 @@
1063
 fi
1064
 
1065
 
1066
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
1067
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
1068
 See \`config.log' for more details." >&5
1069
-echo "$as_me: error: no acceptable C compiler found in \$PATH
1070
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
1071
 See \`config.log' for more details." >&2;}
1072
    { (exit 1); exit 1; }; }
1073
 
1074
 # Provide some information about the compiler.
1075
-echo "$as_me:$LINENO: checking for C compiler version" >&5
1076
-ac_compiler=`set X $ac_compile; echo $2`
1077
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
1078
+set X $ac_compile
1079
+ac_compiler=$2
1080
 { (ac_try="$ac_compiler --version >&5"
1081
 case "(($ac_try" in
1082
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1083
   *) ac_try_echo=$ac_try;;
1084
 esac
1085
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1086
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1087
+$as_echo "$ac_try_echo") >&5
1088
   (eval "$ac_compiler --version >&5") 2>&5
1089
   ac_status=$?
1090
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1091
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1092
   (exit $ac_status); }
1093
 { (ac_try="$ac_compiler -v >&5"
1094
 case "(($ac_try" in
1095
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1096
   *) ac_try_echo=$ac_try;;
1097
 esac
1098
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1099
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1100
+$as_echo "$ac_try_echo") >&5
1101
   (eval "$ac_compiler -v >&5") 2>&5
1102
   ac_status=$?
1103
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1104
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1105
   (exit $ac_status); }
1106
 { (ac_try="$ac_compiler -V >&5"
1107
 case "(($ac_try" in
1108
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1109
   *) ac_try_echo=$ac_try;;
1110
 esac
1111
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1112
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1113
+$as_echo "$ac_try_echo") >&5
1114
   (eval "$ac_compiler -V >&5") 2>&5
1115
   ac_status=$?
1116
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1117
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1118
   (exit $ac_status); }
1119
 
1120
 cat >conftest.$ac_ext <<_ACEOF
1121
@@ -2011,27 +2112,22 @@
1122
 }
1123
 _ACEOF
1124
 ac_clean_files_save=$ac_clean_files
1125
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
1126
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
1127
 # Try to create an executable without -o first, disregard a.out.
1128
 # It will help us diagnose broken compilers, and finding out an intuition
1129
 # of exeext.
1130
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
1131
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
1132
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
1133
-#
1134
-# List of possible output files, starting from the most likely.
1135
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
1136
-# only as a last resort.  b.out is created by i960 compilers.
1137
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
1138
-#
1139
-# The IRIX 6 linker writes into existing files which may not be
1140
-# executable, retaining their permissions.  Remove them first so a
1141
-# subsequent execution test works.
1142
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
1143
+$as_echo_n "checking for C compiler default output file name... " >&6; }
1144
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
1145
+
1146
+# The possible output files:
1147
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
1148
+
1149
 ac_rmfiles=
1150
 for ac_file in $ac_files
1151
 do
1152
   case $ac_file in
1153
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
1154
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
1155
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
1156
   esac
1157
 done
1158
@@ -2042,10 +2138,11 @@
1159
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1160
   *) ac_try_echo=$ac_try;;
1161
 esac
1162
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1163
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1164
+$as_echo "$ac_try_echo") >&5
1165
   (eval "$ac_link_default") 2>&5
1166
   ac_status=$?
1167
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1168
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1169
   (exit $ac_status); }; then
1170
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
1171
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
1172
@@ -2056,7 +2153,7 @@
1173
 do
1174
   test -f "$ac_file" || continue
1175
   case $ac_file in
1176
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
1177
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
1178
 	;;
1179
     [ab].out )
1180
 	# We found the default executable, but exeext='' is most
1181
@@ -2083,15 +2180,15 @@
1182
   ac_file=''
1183
 fi
1184
 
1185
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
1186
-echo "${ECHO_T}$ac_file" >&6; }
1187
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
1188
+$as_echo "$ac_file" >&6; }
1189
 if test -z "$ac_file"; then
1190
-  echo "$as_me: failed program was:" >&5
1191
+  $as_echo "$as_me: failed program was:" >&5
1192
 sed 's/^/| /' conftest.$ac_ext >&5
1193
 
1194
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
1195
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
1196
 See \`config.log' for more details." >&5
1197
-echo "$as_me: error: C compiler cannot create executables
1198
+$as_echo "$as_me: error: C compiler cannot create executables
1199
 See \`config.log' for more details." >&2;}
1200
    { (exit 77); exit 77; }; }
1201
 fi
1202
@@ -2100,8 +2197,8 @@
1203
 
1204
 # Check that the compiler produces executables we can run.  If not, either
1205
 # the compiler is broken, or we cross compile.
1206
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
1207
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
1208
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
1209
+$as_echo_n "checking whether the C compiler works... " >&6; }
1210
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
1211
 # If not cross compiling, check that we can run a simple program.
1212
 if test "$cross_compiling" != yes; then
1213
@@ -2110,49 +2207,51 @@
1214
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1215
   *) ac_try_echo=$ac_try;;
1216
 esac
1217
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1218
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1219
+$as_echo "$ac_try_echo") >&5
1220
   (eval "$ac_try") 2>&5
1221
   ac_status=$?
1222
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1223
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1224
   (exit $ac_status); }; }; then
1225
     cross_compiling=no
1226
   else
1227
     if test "$cross_compiling" = maybe; then
1228
 	cross_compiling=yes
1229
     else
1230
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
1231
+	{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
1232
 If you meant to cross compile, use \`--host'.
1233
 See \`config.log' for more details." >&5
1234
-echo "$as_me: error: cannot run C compiled programs.
1235
+$as_echo "$as_me: error: cannot run C compiled programs.
1236
 If you meant to cross compile, use \`--host'.
1237
 See \`config.log' for more details." >&2;}
1238
    { (exit 1); exit 1; }; }
1239
     fi
1240
   fi
1241
 fi
1242
-{ echo "$as_me:$LINENO: result: yes" >&5
1243
-echo "${ECHO_T}yes" >&6; }
1244
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
1245
+$as_echo "yes" >&6; }
1246
 
1247
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
1248
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
1249
 ac_clean_files=$ac_clean_files_save
1250
 # Check that the compiler produces executables we can run.  If not, either
1251
 # the compiler is broken, or we cross compile.
1252
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
1253
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
1254
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
1255
-echo "${ECHO_T}$cross_compiling" >&6; }
1256
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
1257
+$as_echo_n "checking whether we are cross compiling... " >&6; }
1258
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
1259
+$as_echo "$cross_compiling" >&6; }
1260
 
1261
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
1262
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
1263
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
1264
+$as_echo_n "checking for suffix of executables... " >&6; }
1265
 if { (ac_try="$ac_link"
1266
 case "(($ac_try" in
1267
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1268
   *) ac_try_echo=$ac_try;;
1269
 esac
1270
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1271
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1272
+$as_echo "$ac_try_echo") >&5
1273
   (eval "$ac_link") 2>&5
1274
   ac_status=$?
1275
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1276
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1277
   (exit $ac_status); }; then
1278
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
1279
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
1280
@@ -2161,31 +2260,31 @@
1281
 for ac_file in conftest.exe conftest conftest.*; do
1282
   test -f "$ac_file" || continue
1283
   case $ac_file in
1284
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
1285
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
1286
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
1287
 	  break;;
1288
     * ) break;;
1289
   esac
1290
 done
1291
 else
1292
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
1293
+  { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
1294
 See \`config.log' for more details." >&5
1295
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
1296
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
1297
 See \`config.log' for more details." >&2;}
1298
    { (exit 1); exit 1; }; }
1299
 fi
1300
 
1301
 rm -f conftest$ac_cv_exeext
1302
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
1303
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
1304
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
1305
+$as_echo "$ac_cv_exeext" >&6; }
1306
 
1307
 rm -f conftest.$ac_ext
1308
 EXEEXT=$ac_cv_exeext
1309
 ac_exeext=$EXEEXT
1310
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
1311
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
1312
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
1313
+$as_echo_n "checking for suffix of object files... " >&6; }
1314
 if test "${ac_cv_objext+set}" = set; then
1315
-  echo $ECHO_N "(cached) $ECHO_C" >&6
1316
+  $as_echo_n "(cached) " >&6
1317
 else
1318
   cat >conftest.$ac_ext <<_ACEOF
1319
 /* confdefs.h.  */
1320
@@ -2208,40 +2307,41 @@
1321
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1322
   *) ac_try_echo=$ac_try;;
1323
 esac
1324
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1325
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1326
+$as_echo "$ac_try_echo") >&5
1327
   (eval "$ac_compile") 2>&5
1328
   ac_status=$?
1329
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1330
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1331
   (exit $ac_status); }; then
1332
   for ac_file in conftest.o conftest.obj conftest.*; do
1333
   test -f "$ac_file" || continue;
1334
   case $ac_file in
1335
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
1336
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
1337
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
1338
        break;;
1339
   esac
1340
 done
1341
 else
1342
-  echo "$as_me: failed program was:" >&5
1343
+  $as_echo "$as_me: failed program was:" >&5
1344
 sed 's/^/| /' conftest.$ac_ext >&5
1345
 
1346
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
1347
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
1348
 See \`config.log' for more details." >&5
1349
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
1350
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
1351
 See \`config.log' for more details." >&2;}
1352
    { (exit 1); exit 1; }; }
1353
 fi
1354
 
1355
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
1356
 fi
1357
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
1358
-echo "${ECHO_T}$ac_cv_objext" >&6; }
1359
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
1360
+$as_echo "$ac_cv_objext" >&6; }
1361
 OBJEXT=$ac_cv_objext
1362
 ac_objext=$OBJEXT
1363
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
1364
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
1365
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
1366
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
1367
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
1368
-  echo $ECHO_N "(cached) $ECHO_C" >&6
1369
+  $as_echo_n "(cached) " >&6
1370
 else
1371
   cat >conftest.$ac_ext <<_ACEOF
1372
 /* confdefs.h.  */
1373
@@ -2267,20 +2367,21 @@
1374
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1375
   *) ac_try_echo=$ac_try;;
1376
 esac
1377
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1378
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1379
+$as_echo "$ac_try_echo") >&5
1380
   (eval "$ac_compile") 2>conftest.er1
1381
   ac_status=$?
1382
   grep -v '^ *+' conftest.er1 >conftest.err
1383
   rm -f conftest.er1
1384
   cat conftest.err >&5
1385
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1386
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1387
   (exit $ac_status); } && {
1388
 	 test -z "$ac_c_werror_flag" ||
1389
 	 test ! -s conftest.err
1390
        } && test -s conftest.$ac_objext; then
1391
   ac_compiler_gnu=yes
1392
 else
1393
-  echo "$as_me: failed program was:" >&5
1394
+  $as_echo "$as_me: failed program was:" >&5
1395
 sed 's/^/| /' conftest.$ac_ext >&5
1396
 
1397
 	ac_compiler_gnu=no
1398
@@ -2290,15 +2391,19 @@
1399
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
1400
 
1401
 fi
1402
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
1403
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
1404
-GCC=`test $ac_compiler_gnu = yes && echo yes`
1405
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
1406
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
1407
+if test $ac_compiler_gnu = yes; then
1408
+  GCC=yes
1409
+else
1410
+  GCC=
1411
+fi
1412
 ac_test_CFLAGS=${CFLAGS+set}
1413
 ac_save_CFLAGS=$CFLAGS
1414
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
1415
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
1416
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
1417
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
1418
 if test "${ac_cv_prog_cc_g+set}" = set; then
1419
-  echo $ECHO_N "(cached) $ECHO_C" >&6
1420
+  $as_echo_n "(cached) " >&6
1421
 else
1422
   ac_save_c_werror_flag=$ac_c_werror_flag
1423
    ac_c_werror_flag=yes
1424
@@ -2325,20 +2430,21 @@
1425
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1426
   *) ac_try_echo=$ac_try;;
1427
 esac
1428
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1429
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1430
+$as_echo "$ac_try_echo") >&5
1431
   (eval "$ac_compile") 2>conftest.er1
1432
   ac_status=$?
1433
   grep -v '^ *+' conftest.er1 >conftest.err
1434
   rm -f conftest.er1
1435
   cat conftest.err >&5
1436
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1437
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1438
   (exit $ac_status); } && {
1439
 	 test -z "$ac_c_werror_flag" ||
1440
 	 test ! -s conftest.err
1441
        } && test -s conftest.$ac_objext; then
1442
   ac_cv_prog_cc_g=yes
1443
 else
1444
-  echo "$as_me: failed program was:" >&5
1445
+  $as_echo "$as_me: failed program was:" >&5
1446
 sed 's/^/| /' conftest.$ac_ext >&5
1447
 
1448
 	CFLAGS=""
1449
@@ -2363,20 +2469,21 @@
1450
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1451
   *) ac_try_echo=$ac_try;;
1452
 esac
1453
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1454
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1455
+$as_echo "$ac_try_echo") >&5
1456
   (eval "$ac_compile") 2>conftest.er1
1457
   ac_status=$?
1458
   grep -v '^ *+' conftest.er1 >conftest.err
1459
   rm -f conftest.er1
1460
   cat conftest.err >&5
1461
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1462
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1463
   (exit $ac_status); } && {
1464
 	 test -z "$ac_c_werror_flag" ||
1465
 	 test ! -s conftest.err
1466
        } && test -s conftest.$ac_objext; then
1467
   :
1468
 else
1469
-  echo "$as_me: failed program was:" >&5
1470
+  $as_echo "$as_me: failed program was:" >&5
1471
 sed 's/^/| /' conftest.$ac_ext >&5
1472
 
1473
 	ac_c_werror_flag=$ac_save_c_werror_flag
1474
@@ -2402,20 +2509,21 @@
1475
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1476
   *) ac_try_echo=$ac_try;;
1477
 esac
1478
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1479
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1480
+$as_echo "$ac_try_echo") >&5
1481
   (eval "$ac_compile") 2>conftest.er1
1482
   ac_status=$?
1483
   grep -v '^ *+' conftest.er1 >conftest.err
1484
   rm -f conftest.er1
1485
   cat conftest.err >&5
1486
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1487
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1488
   (exit $ac_status); } && {
1489
 	 test -z "$ac_c_werror_flag" ||
1490
 	 test ! -s conftest.err
1491
        } && test -s conftest.$ac_objext; then
1492
   ac_cv_prog_cc_g=yes
1493
 else
1494
-  echo "$as_me: failed program was:" >&5
1495
+  $as_echo "$as_me: failed program was:" >&5
1496
 sed 's/^/| /' conftest.$ac_ext >&5
1497
 
1498
 
1499
@@ -2430,8 +2538,8 @@
1500
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1501
    ac_c_werror_flag=$ac_save_c_werror_flag
1502
 fi
1503
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
1504
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
1505
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
1506
+$as_echo "$ac_cv_prog_cc_g" >&6; }
1507
 if test "$ac_test_CFLAGS" = set; then
1508
   CFLAGS=$ac_save_CFLAGS
1509
 elif test $ac_cv_prog_cc_g = yes; then
1510
@@ -2447,10 +2555,10 @@
1511
     CFLAGS=
1512
   fi
1513
 fi
1514
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
1515
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
1516
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
1517
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
1518
 if test "${ac_cv_prog_cc_c89+set}" = set; then
1519
-  echo $ECHO_N "(cached) $ECHO_C" >&6
1520
+  $as_echo_n "(cached) " >&6
1521
 else
1522
   ac_cv_prog_cc_c89=no
1523
 ac_save_CC=$CC
1524
@@ -2521,20 +2629,21 @@
1525
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1526
   *) ac_try_echo=$ac_try;;
1527
 esac
1528
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1529
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1530
+$as_echo "$ac_try_echo") >&5
1531
   (eval "$ac_compile") 2>conftest.er1
1532
   ac_status=$?
1533
   grep -v '^ *+' conftest.er1 >conftest.err
1534
   rm -f conftest.er1
1535
   cat conftest.err >&5
1536
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1537
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1538
   (exit $ac_status); } && {
1539
 	 test -z "$ac_c_werror_flag" ||
1540
 	 test ! -s conftest.err
1541
        } && test -s conftest.$ac_objext; then
1542
   ac_cv_prog_cc_c89=$ac_arg
1543
 else
1544
-  echo "$as_me: failed program was:" >&5
1545
+  $as_echo "$as_me: failed program was:" >&5
1546
 sed 's/^/| /' conftest.$ac_ext >&5
1547
 
1548
 
1549
@@ -2550,15 +2659,15 @@
1550
 # AC_CACHE_VAL
1551
 case "x$ac_cv_prog_cc_c89" in
1552
   x)
1553
-    { echo "$as_me:$LINENO: result: none needed" >&5
1554
-echo "${ECHO_T}none needed" >&6; } ;;
1555
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
1556
+$as_echo "none needed" >&6; } ;;
1557
   xno)
1558
-    { echo "$as_me:$LINENO: result: unsupported" >&5
1559
-echo "${ECHO_T}unsupported" >&6; } ;;
1560
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
1561
+$as_echo "unsupported" >&6; } ;;
1562
   *)
1563
     CC="$CC $ac_cv_prog_cc_c89"
1564
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
1565
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
1566
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
1567
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
1568
 esac
1569
 
1570
 
1571
@@ -2569,6 +2678,17 @@
1572
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
1573
 
1574
 
1575
+# Add some includes things
1576
+
1577
+if test -d /usr/local/include; then
1578
+  CPPFLAGS="$CPPFLAGS -I/usr/local/include"
1579
+fi
1580
+
1581
+if test -d /usr/local/lib; then
1582
+  LDFLAGS="$LDFLAGS -L/usr/local/lib"
1583
+fi
1584
+
1585
+
1586
 
1587
 # Check whether --with-homedir was given.
1588
 if test "${with_homedir+set}" = set; then
1589
@@ -2637,10 +2757,10 @@
1590
 
1591
 
1592
 
1593
-{ echo "$as_me:$LINENO: checking for gdbm_open in -lgdbm" >&5
1594
-echo $ECHO_N "checking for gdbm_open in -lgdbm... $ECHO_C" >&6; }
1595
+{ $as_echo "$as_me:$LINENO: checking for gdbm_open in -lgdbm" >&5
1596
+$as_echo_n "checking for gdbm_open in -lgdbm... " >&6; }
1597
 if test "${ac_cv_lib_gdbm_gdbm_open+set}" = set; then
1598
-  echo $ECHO_N "(cached) $ECHO_C" >&6
1599
+  $as_echo_n "(cached) " >&6
1600
 else
1601
   ac_check_lib_save_LIBS=$LIBS
1602
 LIBS="-lgdbm  $LIBS"
1603
@@ -2672,32 +2792,36 @@
1604
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1605
   *) ac_try_echo=$ac_try;;
1606
 esac
1607
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1608
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1609
+$as_echo "$ac_try_echo") >&5
1610
   (eval "$ac_link") 2>conftest.er1
1611
   ac_status=$?
1612
   grep -v '^ *+' conftest.er1 >conftest.err
1613
   rm -f conftest.er1
1614
   cat conftest.err >&5
1615
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1616
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1617
   (exit $ac_status); } && {
1618
 	 test -z "$ac_c_werror_flag" ||
1619
 	 test ! -s conftest.err
1620
-       } && test -s conftest$ac_exeext &&
1621
-       $as_test_x conftest$ac_exeext; then
1622
+       } && test -s conftest$ac_exeext && {
1623
+	 test "$cross_compiling" = yes ||
1624
+	 $as_test_x conftest$ac_exeext
1625
+       }; then
1626
   ac_cv_lib_gdbm_gdbm_open=yes
1627
 else
1628
-  echo "$as_me: failed program was:" >&5
1629
+  $as_echo "$as_me: failed program was:" >&5
1630
 sed 's/^/| /' conftest.$ac_ext >&5
1631
 
1632
 	ac_cv_lib_gdbm_gdbm_open=no
1633
 fi
1634
 
1635
+rm -rf conftest.dSYM
1636
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1637
       conftest$ac_exeext conftest.$ac_ext
1638
 LIBS=$ac_check_lib_save_LIBS
1639
 fi
1640
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gdbm_gdbm_open" >&5
1641
-echo "${ECHO_T}$ac_cv_lib_gdbm_gdbm_open" >&6; }
1642
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gdbm_gdbm_open" >&5
1643
+$as_echo "$ac_cv_lib_gdbm_gdbm_open" >&6; }
1644
 if test $ac_cv_lib_gdbm_gdbm_open = yes; then
1645
   cat >>confdefs.h <<_ACEOF
1646
 #define HAVE_LIBGDBM 1
1647
@@ -2709,10 +2833,10 @@
1648
 
1649
 
1650
 
1651
-{ echo "$as_me:$LINENO: checking for ldap_init in -lldap" >&5
1652
-echo $ECHO_N "checking for ldap_init in -lldap... $ECHO_C" >&6; }
1653
+{ $as_echo "$as_me:$LINENO: checking for ldap_init in -lldap" >&5
1654
+$as_echo_n "checking for ldap_init in -lldap... " >&6; }
1655
 if test "${ac_cv_lib_ldap_ldap_init+set}" = set; then
1656
-  echo $ECHO_N "(cached) $ECHO_C" >&6
1657
+  $as_echo_n "(cached) " >&6
1658
 else
1659
   ac_check_lib_save_LIBS=$LIBS
1660
 LIBS="-lldap  $LIBS"
1661
@@ -2744,32 +2868,36 @@
1662
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1663
   *) ac_try_echo=$ac_try;;
1664
 esac
1665
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1666
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1667
+$as_echo "$ac_try_echo") >&5
1668
   (eval "$ac_link") 2>conftest.er1
1669
   ac_status=$?
1670
   grep -v '^ *+' conftest.er1 >conftest.err
1671
   rm -f conftest.er1
1672
   cat conftest.err >&5
1673
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1674
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1675
   (exit $ac_status); } && {
1676
 	 test -z "$ac_c_werror_flag" ||
1677
 	 test ! -s conftest.err
1678
-       } && test -s conftest$ac_exeext &&
1679
-       $as_test_x conftest$ac_exeext; then
1680
+       } && test -s conftest$ac_exeext && {
1681
+	 test "$cross_compiling" = yes ||
1682
+	 $as_test_x conftest$ac_exeext
1683
+       }; then
1684
   ac_cv_lib_ldap_ldap_init=yes
1685
 else
1686
-  echo "$as_me: failed program was:" >&5
1687
+  $as_echo "$as_me: failed program was:" >&5
1688
 sed 's/^/| /' conftest.$ac_ext >&5
1689
 
1690
 	ac_cv_lib_ldap_ldap_init=no
1691
 fi
1692
 
1693
+rm -rf conftest.dSYM
1694
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1695
       conftest$ac_exeext conftest.$ac_ext
1696
 LIBS=$ac_check_lib_save_LIBS
1697
 fi
1698
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_init" >&5
1699
-echo "${ECHO_T}$ac_cv_lib_ldap_ldap_init" >&6; }
1700
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_init" >&5
1701
+$as_echo "$ac_cv_lib_ldap_ldap_init" >&6; }
1702
 if test $ac_cv_lib_ldap_ldap_init = yes; then
1703
   cat >>confdefs.h <<_ACEOF
1704
 #define HAVE_LIBLDAP 1
1705
@@ -2782,11 +2910,11 @@
1706
 
1707
 for ac_func in ldap_set_option
1708
 do
1709
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
1710
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
1711
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
1712
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
1713
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
1714
+$as_echo_n "checking for $ac_func... " >&6; }
1715
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
1716
-  echo $ECHO_N "(cached) $ECHO_C" >&6
1717
+  $as_echo_n "(cached) " >&6
1718
 else
1719
   cat >conftest.$ac_ext <<_ACEOF
1720
 /* confdefs.h.  */
1721
@@ -2839,35 +2967,41 @@
1722
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1723
   *) ac_try_echo=$ac_try;;
1724
 esac
1725
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1726
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1727
+$as_echo "$ac_try_echo") >&5
1728
   (eval "$ac_link") 2>conftest.er1
1729
   ac_status=$?
1730
   grep -v '^ *+' conftest.er1 >conftest.err
1731
   rm -f conftest.er1
1732
   cat conftest.err >&5
1733
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1734
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1735
   (exit $ac_status); } && {
1736
 	 test -z "$ac_c_werror_flag" ||
1737
 	 test ! -s conftest.err
1738
-       } && test -s conftest$ac_exeext &&
1739
-       $as_test_x conftest$ac_exeext; then
1740
+       } && test -s conftest$ac_exeext && {
1741
+	 test "$cross_compiling" = yes ||
1742
+	 $as_test_x conftest$ac_exeext
1743
+       }; then
1744
   eval "$as_ac_var=yes"
1745
 else
1746
-  echo "$as_me: failed program was:" >&5
1747
+  $as_echo "$as_me: failed program was:" >&5
1748
 sed 's/^/| /' conftest.$ac_ext >&5
1749
 
1750
 	eval "$as_ac_var=no"
1751
 fi
1752
 
1753
+rm -rf conftest.dSYM
1754
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1755
       conftest$ac_exeext conftest.$ac_ext
1756
 fi
1757
-ac_res=`eval echo '${'$as_ac_var'}'`
1758
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
1759
-echo "${ECHO_T}$ac_res" >&6; }
1760
-if test `eval echo '${'$as_ac_var'}'` = yes; then
1761
+ac_res=`eval 'as_val=${'$as_ac_var'}
1762
+		 $as_echo "$as_val"'`
1763
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
1764
+$as_echo "$ac_res" >&6; }
1765
+if test `eval 'as_val=${'$as_ac_var'}
1766
+		 $as_echo "$as_val"'` = yes; then
1767
   cat >>confdefs.h <<_ACEOF
1768
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
1769
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
1770
 _ACEOF
1771
 
1772
 fi
1773
@@ -2875,13 +3009,88 @@
1774
 
1775
 
1776
 
1777
+{ $as_echo "$as_me:$LINENO: checking for iconv in -liconv" >&5
1778
+$as_echo_n "checking for iconv in -liconv... " >&6; }
1779
+if test "${ac_cv_lib_iconv_iconv+set}" = set; then
1780
+  $as_echo_n "(cached) " >&6
1781
+else
1782
+  ac_check_lib_save_LIBS=$LIBS
1783
+LIBS="-liconv  $LIBS"
1784
+cat >conftest.$ac_ext <<_ACEOF
1785
+/* confdefs.h.  */
1786
+_ACEOF
1787
+cat confdefs.h >>conftest.$ac_ext
1788
+cat >>conftest.$ac_ext <<_ACEOF
1789
+/* end confdefs.h.  */
1790
+
1791
+/* Override any GCC internal prototype to avoid an error.
1792
+   Use char because int might match the return type of a GCC
1793
+   builtin and then its argument prototype would still apply.  */
1794
+#ifdef __cplusplus
1795
+extern "C"
1796
+#endif
1797
+char iconv ();
1798
+int
1799
+main ()
1800
+{
1801
+return iconv ();
1802
+  ;
1803
+  return 0;
1804
+}
1805
+_ACEOF
1806
+rm -f conftest.$ac_objext conftest$ac_exeext
1807
+if { (ac_try="$ac_link"
1808
+case "(($ac_try" in
1809
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1810
+  *) ac_try_echo=$ac_try;;
1811
+esac
1812
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1813
+$as_echo "$ac_try_echo") >&5
1814
+  (eval "$ac_link") 2>conftest.er1
1815
+  ac_status=$?
1816
+  grep -v '^ *+' conftest.er1 >conftest.err
1817
+  rm -f conftest.er1
1818
+  cat conftest.err >&5
1819
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1820
+  (exit $ac_status); } && {
1821
+	 test -z "$ac_c_werror_flag" ||
1822
+	 test ! -s conftest.err
1823
+       } && test -s conftest$ac_exeext && {
1824
+	 test "$cross_compiling" = yes ||
1825
+	 $as_test_x conftest$ac_exeext
1826
+       }; then
1827
+  ac_cv_lib_iconv_iconv=yes
1828
+else
1829
+  $as_echo "$as_me: failed program was:" >&5
1830
+sed 's/^/| /' conftest.$ac_ext >&5
1831
+
1832
+	ac_cv_lib_iconv_iconv=no
1833
+fi
1834
+
1835
+rm -rf conftest.dSYM
1836
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1837
+      conftest$ac_exeext conftest.$ac_ext
1838
+LIBS=$ac_check_lib_save_LIBS
1839
+fi
1840
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv" >&5
1841
+$as_echo "$ac_cv_lib_iconv_iconv" >&6; }
1842
+if test $ac_cv_lib_iconv_iconv = yes; then
1843
+  cat >>confdefs.h <<_ACEOF
1844
+#define HAVE_LIBICONV 1
1845
+_ACEOF
1846
+
1847
+  LIBS="-liconv $LIBS"
1848
+
1849
+fi
1850
+
1851
+
1852
 for ac_func in iconv
1853
 do
1854
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
1855
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
1856
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
1857
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
1858
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
1859
+$as_echo_n "checking for $ac_func... " >&6; }
1860
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
1861
-  echo $ECHO_N "(cached) $ECHO_C" >&6
1862
+  $as_echo_n "(cached) " >&6
1863
 else
1864
   cat >conftest.$ac_ext <<_ACEOF
1865
 /* confdefs.h.  */
1866
@@ -2934,41 +3143,455 @@
1867
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1868
   *) ac_try_echo=$ac_try;;
1869
 esac
1870
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1871
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1872
+$as_echo "$ac_try_echo") >&5
1873
   (eval "$ac_link") 2>conftest.er1
1874
   ac_status=$?
1875
   grep -v '^ *+' conftest.er1 >conftest.err
1876
   rm -f conftest.er1
1877
   cat conftest.err >&5
1878
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1879
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1880
   (exit $ac_status); } && {
1881
 	 test -z "$ac_c_werror_flag" ||
1882
 	 test ! -s conftest.err
1883
-       } && test -s conftest$ac_exeext &&
1884
-       $as_test_x conftest$ac_exeext; then
1885
+       } && test -s conftest$ac_exeext && {
1886
+	 test "$cross_compiling" = yes ||
1887
+	 $as_test_x conftest$ac_exeext
1888
+       }; then
1889
   eval "$as_ac_var=yes"
1890
 else
1891
-  echo "$as_me: failed program was:" >&5
1892
+  $as_echo "$as_me: failed program was:" >&5
1893
 sed 's/^/| /' conftest.$ac_ext >&5
1894
 
1895
 	eval "$as_ac_var=no"
1896
 fi
1897
 
1898
+rm -rf conftest.dSYM
1899
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1900
       conftest$ac_exeext conftest.$ac_ext
1901
 fi
1902
-ac_res=`eval echo '${'$as_ac_var'}'`
1903
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
1904
-echo "${ECHO_T}$ac_res" >&6; }
1905
-if test `eval echo '${'$as_ac_var'}'` = yes; then
1906
+ac_res=`eval 'as_val=${'$as_ac_var'}
1907
+		 $as_echo "$as_val"'`
1908
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
1909
+$as_echo "$ac_res" >&6; }
1910
+if test `eval 'as_val=${'$as_ac_var'}
1911
+		 $as_echo "$as_val"'` = yes; then
1912
   cat >>confdefs.h <<_ACEOF
1913
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
1914
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
1915
 _ACEOF
1916
 
1917
 fi
1918
 done
1919
 
1920
 
1921
+
1922
+{ $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
1923
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
1924
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
1925
+  $as_echo_n "(cached) " >&6
1926
+else
1927
+  ac_check_lib_save_LIBS=$LIBS
1928
+LIBS="-ldl  $LIBS"
1929
+cat >conftest.$ac_ext <<_ACEOF
1930
+/* confdefs.h.  */
1931
+_ACEOF
1932
+cat confdefs.h >>conftest.$ac_ext
1933
+cat >>conftest.$ac_ext <<_ACEOF
1934
+/* end confdefs.h.  */
1935
+
1936
+/* Override any GCC internal prototype to avoid an error.
1937
+   Use char because int might match the return type of a GCC
1938
+   builtin and then its argument prototype would still apply.  */
1939
+#ifdef __cplusplus
1940
+extern "C"
1941
+#endif
1942
+char dlopen ();
1943
+int
1944
+main ()
1945
+{
1946
+return dlopen ();
1947
+  ;
1948
+  return 0;
1949
+}
1950
+_ACEOF
1951
+rm -f conftest.$ac_objext conftest$ac_exeext
1952
+if { (ac_try="$ac_link"
1953
+case "(($ac_try" in
1954
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1955
+  *) ac_try_echo=$ac_try;;
1956
+esac
1957
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1958
+$as_echo "$ac_try_echo") >&5
1959
+  (eval "$ac_link") 2>conftest.er1
1960
+  ac_status=$?
1961
+  grep -v '^ *+' conftest.er1 >conftest.err
1962
+  rm -f conftest.er1
1963
+  cat conftest.err >&5
1964
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1965
+  (exit $ac_status); } && {
1966
+	 test -z "$ac_c_werror_flag" ||
1967
+	 test ! -s conftest.err
1968
+       } && test -s conftest$ac_exeext && {
1969
+	 test "$cross_compiling" = yes ||
1970
+	 $as_test_x conftest$ac_exeext
1971
+       }; then
1972
+  ac_cv_lib_dl_dlopen=yes
1973
+else
1974
+  $as_echo "$as_me: failed program was:" >&5
1975
+sed 's/^/| /' conftest.$ac_ext >&5
1976
+
1977
+	ac_cv_lib_dl_dlopen=no
1978
+fi
1979
+
1980
+rm -rf conftest.dSYM
1981
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1982
+      conftest$ac_exeext conftest.$ac_ext
1983
+LIBS=$ac_check_lib_save_LIBS
1984
+fi
1985
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
1986
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
1987
+if test $ac_cv_lib_dl_dlopen = yes; then
1988
+  cat >>confdefs.h <<_ACEOF
1989
+#define HAVE_LIBDL 1
1990
+_ACEOF
1991
+
1992
+  LIBS="-ldl $LIBS"
1993
+
1994
+fi
1995
+
1996
+
1997
+
1998
+{ $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
1999
+$as_echo_n "checking for gethostbyname... " >&6; }
2000
+if test "${ac_cv_func_gethostbyname+set}" = set; then
2001
+  $as_echo_n "(cached) " >&6
2002
+else
2003
+  cat >conftest.$ac_ext <<_ACEOF
2004
+/* confdefs.h.  */
2005
+_ACEOF
2006
+cat confdefs.h >>conftest.$ac_ext
2007
+cat >>conftest.$ac_ext <<_ACEOF
2008
+/* end confdefs.h.  */
2009
+/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
2010
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
2011
+#define gethostbyname innocuous_gethostbyname
2012
+
2013
+/* System header to define __stub macros and hopefully few prototypes,
2014
+    which can conflict with char gethostbyname (); below.
2015
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
2016
+    <limits.h> exists even on freestanding compilers.  */
2017
+
2018
+#ifdef __STDC__
2019
+# include <limits.h>
2020
+#else
2021
+# include <assert.h>
2022
+#endif
2023
+
2024
+#undef gethostbyname
2025
+
2026
+/* Override any GCC internal prototype to avoid an error.
2027
+   Use char because int might match the return type of a GCC
2028
+   builtin and then its argument prototype would still apply.  */
2029
+#ifdef __cplusplus
2030
+extern "C"
2031
+#endif
2032
+char gethostbyname ();
2033
+/* The GNU C library defines this for functions which it implements
2034
+    to always fail with ENOSYS.  Some functions are actually named
2035
+    something starting with __ and the normal name is an alias.  */
2036
+#if defined __stub_gethostbyname || defined __stub___gethostbyname
2037
+choke me
2038
+#endif
2039
+
2040
+int
2041
+main ()
2042
+{
2043
+return gethostbyname ();
2044
+  ;
2045
+  return 0;
2046
+}
2047
+_ACEOF
2048
+rm -f conftest.$ac_objext conftest$ac_exeext
2049
+if { (ac_try="$ac_link"
2050
+case "(($ac_try" in
2051
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2052
+  *) ac_try_echo=$ac_try;;
2053
+esac
2054
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2055
+$as_echo "$ac_try_echo") >&5
2056
+  (eval "$ac_link") 2>conftest.er1
2057
+  ac_status=$?
2058
+  grep -v '^ *+' conftest.er1 >conftest.err
2059
+  rm -f conftest.er1
2060
+  cat conftest.err >&5
2061
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2062
+  (exit $ac_status); } && {
2063
+	 test -z "$ac_c_werror_flag" ||
2064
+	 test ! -s conftest.err
2065
+       } && test -s conftest$ac_exeext && {
2066
+	 test "$cross_compiling" = yes ||
2067
+	 $as_test_x conftest$ac_exeext
2068
+       }; then
2069
+  ac_cv_func_gethostbyname=yes
2070
+else
2071
+  $as_echo "$as_me: failed program was:" >&5
2072
+sed 's/^/| /' conftest.$ac_ext >&5
2073
+
2074
+	ac_cv_func_gethostbyname=no
2075
+fi
2076
+
2077
+rm -rf conftest.dSYM
2078
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
2079
+      conftest$ac_exeext conftest.$ac_ext
2080
+fi
2081
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
2082
+$as_echo "$ac_cv_func_gethostbyname" >&6; }
2083
+if test $ac_cv_func_gethostbyname = yes; then
2084
+  :
2085
+else
2086
+
2087
+{ $as_echo "$as_me:$LINENO: checking for gethostbyname in -lresolv" >&5
2088
+$as_echo_n "checking for gethostbyname in -lresolv... " >&6; }
2089
+if test "${ac_cv_lib_resolv_gethostbyname+set}" = set; then
2090
+  $as_echo_n "(cached) " >&6
2091
+else
2092
+  ac_check_lib_save_LIBS=$LIBS
2093
+LIBS="-lresolv  $LIBS"
2094
+cat >conftest.$ac_ext <<_ACEOF
2095
+/* confdefs.h.  */
2096
+_ACEOF
2097
+cat confdefs.h >>conftest.$ac_ext
2098
+cat >>conftest.$ac_ext <<_ACEOF
2099
+/* end confdefs.h.  */
2100
+
2101
+/* Override any GCC internal prototype to avoid an error.
2102
+   Use char because int might match the return type of a GCC
2103
+   builtin and then its argument prototype would still apply.  */
2104
+#ifdef __cplusplus
2105
+extern "C"
2106
+#endif
2107
+char gethostbyname ();
2108
+int
2109
+main ()
2110
+{
2111
+return gethostbyname ();
2112
+  ;
2113
+  return 0;
2114
+}
2115
+_ACEOF
2116
+rm -f conftest.$ac_objext conftest$ac_exeext
2117
+if { (ac_try="$ac_link"
2118
+case "(($ac_try" in
2119
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2120
+  *) ac_try_echo=$ac_try;;
2121
+esac
2122
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2123
+$as_echo "$ac_try_echo") >&5
2124
+  (eval "$ac_link") 2>conftest.er1
2125
+  ac_status=$?
2126
+  grep -v '^ *+' conftest.er1 >conftest.err
2127
+  rm -f conftest.er1
2128
+  cat conftest.err >&5
2129
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2130
+  (exit $ac_status); } && {
2131
+	 test -z "$ac_c_werror_flag" ||
2132
+	 test ! -s conftest.err
2133
+       } && test -s conftest$ac_exeext && {
2134
+	 test "$cross_compiling" = yes ||
2135
+	 $as_test_x conftest$ac_exeext
2136
+       }; then
2137
+  ac_cv_lib_resolv_gethostbyname=yes
2138
+else
2139
+  $as_echo "$as_me: failed program was:" >&5
2140
+sed 's/^/| /' conftest.$ac_ext >&5
2141
+
2142
+	ac_cv_lib_resolv_gethostbyname=no
2143
+fi
2144
+
2145
+rm -rf conftest.dSYM
2146
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
2147
+      conftest$ac_exeext conftest.$ac_ext
2148
+LIBS=$ac_check_lib_save_LIBS
2149
+fi
2150
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_gethostbyname" >&5
2151
+$as_echo "$ac_cv_lib_resolv_gethostbyname" >&6; }
2152
+if test $ac_cv_lib_resolv_gethostbyname = yes; then
2153
+  cat >>confdefs.h <<_ACEOF
2154
+#define HAVE_LIBRESOLV 1
2155
+_ACEOF
2156
+
2157
+  LIBS="-lresolv $LIBS"
2158
+
2159
+fi
2160
+
2161
+fi
2162
+
2163
+{ $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
2164
+$as_echo_n "checking for gethostbyname... " >&6; }
2165
+if test "${ac_cv_func_gethostbyname+set}" = set; then
2166
+  $as_echo_n "(cached) " >&6
2167
+else
2168
+  cat >conftest.$ac_ext <<_ACEOF
2169
+/* confdefs.h.  */
2170
+_ACEOF
2171
+cat confdefs.h >>conftest.$ac_ext
2172
+cat >>conftest.$ac_ext <<_ACEOF
2173
+/* end confdefs.h.  */
2174
+/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
2175
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
2176
+#define gethostbyname innocuous_gethostbyname
2177
+
2178
+/* System header to define __stub macros and hopefully few prototypes,
2179
+    which can conflict with char gethostbyname (); below.
2180
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
2181
+    <limits.h> exists even on freestanding compilers.  */
2182
+
2183
+#ifdef __STDC__
2184
+# include <limits.h>
2185
+#else
2186
+# include <assert.h>
2187
+#endif
2188
+
2189
+#undef gethostbyname
2190
+
2191
+/* Override any GCC internal prototype to avoid an error.
2192
+   Use char because int might match the return type of a GCC
2193
+   builtin and then its argument prototype would still apply.  */
2194
+#ifdef __cplusplus
2195
+extern "C"
2196
+#endif
2197
+char gethostbyname ();
2198
+/* The GNU C library defines this for functions which it implements
2199
+    to always fail with ENOSYS.  Some functions are actually named
2200
+    something starting with __ and the normal name is an alias.  */
2201
+#if defined __stub_gethostbyname || defined __stub___gethostbyname
2202
+choke me
2203
+#endif
2204
+
2205
+int
2206
+main ()
2207
+{
2208
+return gethostbyname ();
2209
+  ;
2210
+  return 0;
2211
+}
2212
+_ACEOF
2213
+rm -f conftest.$ac_objext conftest$ac_exeext
2214
+if { (ac_try="$ac_link"
2215
+case "(($ac_try" in
2216
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2217
+  *) ac_try_echo=$ac_try;;
2218
+esac
2219
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2220
+$as_echo "$ac_try_echo") >&5
2221
+  (eval "$ac_link") 2>conftest.er1
2222
+  ac_status=$?
2223
+  grep -v '^ *+' conftest.er1 >conftest.err
2224
+  rm -f conftest.er1
2225
+  cat conftest.err >&5
2226
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2227
+  (exit $ac_status); } && {
2228
+	 test -z "$ac_c_werror_flag" ||
2229
+	 test ! -s conftest.err
2230
+       } && test -s conftest$ac_exeext && {
2231
+	 test "$cross_compiling" = yes ||
2232
+	 $as_test_x conftest$ac_exeext
2233
+       }; then
2234
+  ac_cv_func_gethostbyname=yes
2235
+else
2236
+  $as_echo "$as_me: failed program was:" >&5
2237
+sed 's/^/| /' conftest.$ac_ext >&5
2238
+
2239
+	ac_cv_func_gethostbyname=no
2240
+fi
2241
+
2242
+rm -rf conftest.dSYM
2243
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
2244
+      conftest$ac_exeext conftest.$ac_ext
2245
+fi
2246
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
2247
+$as_echo "$ac_cv_func_gethostbyname" >&6; }
2248
+if test $ac_cv_func_gethostbyname = yes; then
2249
+  :
2250
+else
2251
+
2252
+{ $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
2253
+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
2254
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
2255
+  $as_echo_n "(cached) " >&6
2256
+else
2257
+  ac_check_lib_save_LIBS=$LIBS
2258
+LIBS="-lnsl  $LIBS"
2259
+cat >conftest.$ac_ext <<_ACEOF
2260
+/* confdefs.h.  */
2261
+_ACEOF
2262
+cat confdefs.h >>conftest.$ac_ext
2263
+cat >>conftest.$ac_ext <<_ACEOF
2264
+/* end confdefs.h.  */
2265
+
2266
+/* Override any GCC internal prototype to avoid an error.
2267
+   Use char because int might match the return type of a GCC
2268
+   builtin and then its argument prototype would still apply.  */
2269
+#ifdef __cplusplus
2270
+extern "C"
2271
+#endif
2272
+char gethostbyname ();
2273
+int
2274
+main ()
2275
+{
2276
+return gethostbyname ();
2277
+  ;
2278
+  return 0;
2279
+}
2280
+_ACEOF
2281
+rm -f conftest.$ac_objext conftest$ac_exeext
2282
+if { (ac_try="$ac_link"
2283
+case "(($ac_try" in
2284
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2285
+  *) ac_try_echo=$ac_try;;
2286
+esac
2287
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2288
+$as_echo "$ac_try_echo") >&5
2289
+  (eval "$ac_link") 2>conftest.er1
2290
+  ac_status=$?
2291
+  grep -v '^ *+' conftest.er1 >conftest.err
2292
+  rm -f conftest.er1
2293
+  cat conftest.err >&5
2294
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2295
+  (exit $ac_status); } && {
2296
+	 test -z "$ac_c_werror_flag" ||
2297
+	 test ! -s conftest.err
2298
+       } && test -s conftest$ac_exeext && {
2299
+	 test "$cross_compiling" = yes ||
2300
+	 $as_test_x conftest$ac_exeext
2301
+       }; then
2302
+  ac_cv_lib_nsl_gethostbyname=yes
2303
+else
2304
+  $as_echo "$as_me: failed program was:" >&5
2305
+sed 's/^/| /' conftest.$ac_ext >&5
2306
+
2307
+	ac_cv_lib_nsl_gethostbyname=no
2308
+fi
2309
+
2310
+rm -rf conftest.dSYM
2311
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
2312
+      conftest$ac_exeext conftest.$ac_ext
2313
+LIBS=$ac_check_lib_save_LIBS
2314
+fi
2315
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
2316
+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
2317
+if test $ac_cv_lib_nsl_gethostbyname = yes; then
2318
+  cat >>confdefs.h <<_ACEOF
2319
+#define HAVE_LIBNSL 1
2320
+_ACEOF
2321
+
2322
+  LIBS="-lnsl $LIBS"
2323
+
2324
+fi
2325
+
2326
+fi
2327
+
2328
+
2329
 cat >>confdefs.h <<_ACEOF
2330
 #define UMASK $permmask
2331
 _ACEOF
2332
@@ -3009,11 +3632,12 @@
2333
     case $ac_val in #(
2334
     *${as_nl}*)
2335
       case $ac_var in #(
2336
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
2337
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
2338
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
2339
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
2340
       esac
2341
       case $ac_var in #(
2342
       _ | IFS | as_nl) ;; #(
2343
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
2344
       *) $as_unset $ac_var ;;
2345
       esac ;;
2346
     esac
2347
@@ -3046,12 +3670,12 @@
2348
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
2349
   if test -w "$cache_file"; then
2350
     test "x$cache_file" != "x/dev/null" &&
2351
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
2352
-echo "$as_me: updating cache $cache_file" >&6;}
2353
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
2354
+$as_echo "$as_me: updating cache $cache_file" >&6;}
2355
     cat confcache >$cache_file
2356
   else
2357
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
2358
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
2359
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
2360
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
2361
   fi
2362
 fi
2363
 rm -f confcache
2364
@@ -3067,7 +3691,7 @@
2365
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
2366
   # 1. Remove the extension, and $U if already installed.
2367
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
2368
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
2369
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
2370
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
2371
   #    will be set to the directory where LIBOBJS objects are built.
2372
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
2373
@@ -3080,11 +3704,12 @@
2374
 
2375
 
2376
 : ${CONFIG_STATUS=./config.status}
2377
+ac_write_fail=0
2378
 ac_clean_files_save=$ac_clean_files
2379
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
2380
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
2381
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
2382
-cat >$CONFIG_STATUS <<_ACEOF
2383
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
2384
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
2385
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2386
 #! $SHELL
2387
 # Generated by $as_me.
2388
 # Run this file to recreate the current configuration.
2389
@@ -3097,7 +3722,7 @@
2390
 SHELL=\${CONFIG_SHELL-$SHELL}
2391
 _ACEOF
2392
 
2393
-cat >>$CONFIG_STATUS <<\_ACEOF
2394
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
2395
 ## --------------------- ##
2396
 ## M4sh Initialization.  ##
2397
 ## --------------------- ##
2398
@@ -3107,7 +3732,7 @@
2399
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
2400
   emulate sh
2401
   NULLCMD=:
2402
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
2403
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
2404
   # is contrary to our usage.  Disable this feature.
2405
   alias -g '${1+"$@"}'='"$@"'
2406
   setopt NO_GLOB_SUBST
2407
@@ -3129,17 +3754,45 @@
2408
 as_cr_digits='0123456789'
2409
 as_cr_alnum=$as_cr_Letters$as_cr_digits
2410
 
2411
-# The user is always right.
2412
-if test "${PATH_SEPARATOR+set}" != set; then
2413
-  echo "#! /bin/sh" >conf$$.sh
2414
-  echo  "exit 0"   >>conf$$.sh
2415
-  chmod +x conf$$.sh
2416
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
2417
-    PATH_SEPARATOR=';'
2418
+as_nl='
2419
+'
2420
+export as_nl
2421
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
2422
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
2423
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
2424
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
2425
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
2426
+  as_echo='printf %s\n'
2427
+  as_echo_n='printf %s'
2428
+else
2429
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
2430
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
2431
+    as_echo_n='/usr/ucb/echo -n'
2432
   else
2433
-    PATH_SEPARATOR=:
2434
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
2435
+    as_echo_n_body='eval
2436
+      arg=$1;
2437
+      case $arg in
2438
+      *"$as_nl"*)
2439
+	expr "X$arg" : "X\\(.*\\)$as_nl";
2440
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
2441
+      esac;
2442
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
2443
+    '
2444
+    export as_echo_n_body
2445
+    as_echo_n='sh -c $as_echo_n_body as_echo'
2446
   fi
2447
-  rm -f conf$$.sh
2448
+  export as_echo_body
2449
+  as_echo='sh -c $as_echo_body as_echo'
2450
+fi
2451
+
2452
+# The user is always right.
2453
+if test "${PATH_SEPARATOR+set}" != set; then
2454
+  PATH_SEPARATOR=:
2455
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
2456
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
2457
+      PATH_SEPARATOR=';'
2458
+  }
2459
 fi
2460
 
2461
 # Support unset when possible.
2462
@@ -3155,8 +3808,6 @@
2463
 # there to prevent editors from complaining about space-tab.
2464
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
2465
 # splitting by setting IFS to empty value.)
2466
-as_nl='
2467
-'
2468
 IFS=" ""	$as_nl"
2469
 
2470
 # Find who we are.  Look in the path if we contain no directory separator.
2471
@@ -3179,7 +3830,7 @@
2472
   as_myself=$0
2473
 fi
2474
 if test ! -f "$as_myself"; then
2475
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
2476
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
2477
   { (exit 1); exit 1; }
2478
 fi
2479
 
2480
@@ -3192,17 +3843,10 @@
2481
 PS4='+ '
2482
 
2483
 # NLS nuisances.
2484
-for as_var in \
2485
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
2486
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
2487
-  LC_TELEPHONE LC_TIME
2488
-do
2489
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
2490
-    eval $as_var=C; export $as_var
2491
-  else
2492
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
2493
-  fi
2494
-done
2495
+LC_ALL=C
2496
+export LC_ALL
2497
+LANGUAGE=C
2498
+export LANGUAGE
2499
 
2500
 # Required to use basename.
2501
 if expr a : '\(a\)' >/dev/null 2>&1 &&
2502
@@ -3224,7 +3868,7 @@
2503
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
2504
 	 X"$0" : 'X\(//\)$' \| \
2505
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
2506
-echo X/"$0" |
2507
+$as_echo X/"$0" |
2508
     sed '/^.*\/\([^/][^/]*\)\/*$/{
2509
 	    s//\1/
2510
 	    q
2511
@@ -3275,7 +3919,7 @@
2512
       s/-\n.*//
2513
     ' >$as_me.lineno &&
2514
   chmod +x "$as_me.lineno" ||
2515
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
2516
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
2517
    { (exit 1); exit 1; }; }
2518
 
2519
   # Don't try to exec as it changes $[0], causing all sort of problems
2520
@@ -3303,7 +3947,6 @@
2521
 *)
2522
   ECHO_N='-n';;
2523
 esac
2524
-
2525
 if expr a : '\(a\)' >/dev/null 2>&1 &&
2526
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
2527
   as_expr=expr
2528
@@ -3316,19 +3959,22 @@
2529
   rm -f conf$$.dir/conf$$.file
2530
 else
2531
   rm -f conf$$.dir
2532
-  mkdir conf$$.dir
2533
+  mkdir conf$$.dir 2>/dev/null
2534
 fi
2535
-echo >conf$$.file
2536
-if ln -s conf$$.file conf$$ 2>/dev/null; then
2537
-  as_ln_s='ln -s'
2538
-  # ... but there are two gotchas:
2539
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
2540
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
2541
-  # In both cases, we have to default to `cp -p'.
2542
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
2543
+if (echo >conf$$.file) 2>/dev/null; then
2544
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
2545
+    as_ln_s='ln -s'
2546
+    # ... but there are two gotchas:
2547
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
2548
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
2549
+    # In both cases, we have to default to `cp -p'.
2550
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
2551
+      as_ln_s='cp -p'
2552
+  elif ln conf$$.file conf$$ 2>/dev/null; then
2553
+    as_ln_s=ln
2554
+  else
2555
     as_ln_s='cp -p'
2556
-elif ln conf$$.file conf$$ 2>/dev/null; then
2557
-  as_ln_s=ln
2558
+  fi
2559
 else
2560
   as_ln_s='cp -p'
2561
 fi
2562
@@ -3353,10 +3999,10 @@
2563
   as_test_x='
2564
     eval sh -c '\''
2565
       if test -d "$1"; then
2566
-        test -d "$1/.";
2567
+	test -d "$1/.";
2568
       else
2569
 	case $1 in
2570
-        -*)set "./$1";;
2571
+	-*)set "./$1";;
2572
 	esac;
2573
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
2574
 	???[sx]*):;;*)false;;esac;fi
2575
@@ -3379,7 +4025,7 @@
2576
 # values after options handling.
2577
 ac_log="
2578
 This file was extended by $as_me, which was
2579
-generated by GNU Autoconf 2.61.  Invocation command line was
2580
+generated by GNU Autoconf 2.62.  Invocation command line was
2581
 
2582
   CONFIG_FILES    = $CONFIG_FILES
2583
   CONFIG_HEADERS  = $CONFIG_HEADERS
2584
@@ -3392,14 +4038,14 @@
2585
 
2586
 _ACEOF
2587
 
2588
-cat >>$CONFIG_STATUS <<_ACEOF
2589
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2590
 # Files that config.status was made for.
2591
 config_files="$ac_config_files"
2592
 config_headers="$ac_config_headers"
2593
 
2594
 _ACEOF
2595
 
2596
-cat >>$CONFIG_STATUS <<\_ACEOF
2597
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
2598
 ac_cs_usage="\
2599
 \`$as_me' instantiates files from templates according to the
2600
 current configuration.
2601
@@ -3412,9 +4058,9 @@
2602
   -d, --debug      don't remove temporary files
2603
       --recheck    update $as_me by reconfiguring in the same conditions
2604
   --file=FILE[:TEMPLATE]
2605
-		   instantiate the configuration file FILE
2606
+                   instantiate the configuration file FILE
2607
   --header=FILE[:TEMPLATE]
2608
-		   instantiate the configuration header FILE
2609
+                   instantiate the configuration header FILE
2610
 
2611
 Configuration files:
2612
 $config_files
2613
@@ -3425,23 +4071,23 @@
2614
 Report bugs to <bug-autoconf@gnu.org>."
2615
 
2616
 _ACEOF
2617
-cat >>$CONFIG_STATUS <<_ACEOF
2618
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2619
 ac_cs_version="\\
2620
 config.status
2621
-configured by $0, generated by GNU Autoconf 2.61,
2622
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
2623
+configured by $0, generated by GNU Autoconf 2.62,
2624
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
2625
 
2626
-Copyright (C) 2006 Free Software Foundation, Inc.
2627
+Copyright (C) 2008 Free Software Foundation, Inc.
2628
 This config.status script is free software; the Free Software Foundation
2629
 gives unlimited permission to copy, distribute and modify it."
2630
 
2631
 ac_pwd='$ac_pwd'
2632
 srcdir='$srcdir'
2633
+test -n "\$AWK" || AWK=awk
2634
 _ACEOF
2635
 
2636
-cat >>$CONFIG_STATUS <<\_ACEOF
2637
-# If no file are specified by the user, then we need to provide default
2638
-# value.  By we need to know if files were specified by the user.
2639
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
2640
+# The default lists apply if the user does not specify any file.
2641
 ac_need_defaults=:
2642
 while test $# != 0
2643
 do
2644
@@ -3463,30 +4109,36 @@
2645
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
2646
     ac_cs_recheck=: ;;
2647
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
2648
-    echo "$ac_cs_version"; exit ;;
2649
+    $as_echo "$ac_cs_version"; exit ;;
2650
   --debug | --debu | --deb | --de | --d | -d )
2651
     debug=: ;;
2652
   --file | --fil | --fi | --f )
2653
     $ac_shift
2654
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
2655
+    case $ac_optarg in
2656
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
2657
+    esac
2658
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
2659
     ac_need_defaults=false;;
2660
   --header | --heade | --head | --hea )
2661
     $ac_shift
2662
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
2663
+    case $ac_optarg in
2664
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
2665
+    esac
2666
+    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
2667
     ac_need_defaults=false;;
2668
   --he | --h)
2669
     # Conflict between --help and --header
2670
-    { echo "$as_me: error: ambiguous option: $1
2671
+    { $as_echo "$as_me: error: ambiguous option: $1
2672
 Try \`$0 --help' for more information." >&2
2673
    { (exit 1); exit 1; }; };;
2674
   --help | --hel | -h )
2675
-    echo "$ac_cs_usage"; exit ;;
2676
+    $as_echo "$ac_cs_usage"; exit ;;
2677
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
2678
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
2679
     ac_cs_silent=: ;;
2680
 
2681
   # This is an error.
2682
-  -*) { echo "$as_me: error: unrecognized option: $1
2683
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
2684
 Try \`$0 --help' for more information." >&2
2685
    { (exit 1); exit 1; }; } ;;
2686
 
2687
@@ -3505,30 +4157,32 @@
2688
 fi
2689
 
2690
 _ACEOF
2691
-cat >>$CONFIG_STATUS <<_ACEOF
2692
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2693
 if \$ac_cs_recheck; then
2694
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
2695
-  CONFIG_SHELL=$SHELL
2696
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
2697
+  shift
2698
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
2699
+  CONFIG_SHELL='$SHELL'
2700
   export CONFIG_SHELL
2701
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
2702
+  exec "\$@"
2703
 fi
2704
 
2705
 _ACEOF
2706
-cat >>$CONFIG_STATUS <<\_ACEOF
2707
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
2708
 exec 5>>config.log
2709
 {
2710
   echo
2711
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
2712
 ## Running $as_me. ##
2713
 _ASBOX
2714
-  echo "$ac_log"
2715
+  $as_echo "$ac_log"
2716
 } >&5
2717
 
2718
 _ACEOF
2719
-cat >>$CONFIG_STATUS <<_ACEOF
2720
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2721
 _ACEOF
2722
 
2723
-cat >>$CONFIG_STATUS <<\_ACEOF
2724
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
2725
 
2726
 # Handling of arguments.
2727
 for ac_config_target in $ac_config_targets
2728
@@ -3537,8 +4191,8 @@
2729
     "conf.h") CONFIG_HEADERS="$CONFIG_HEADERS conf.h" ;;
2730
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
2731
 
2732
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
2733
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
2734
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
2735
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
2736
    { (exit 1); exit 1; }; };;
2737
   esac
2738
 done
2739
@@ -3578,115 +4232,142 @@
2740
   (umask 077 && mkdir "$tmp")
2741
 } ||
2742
 {
2743
-   echo "$me: cannot create a temporary directory in ." >&2
2744
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
2745
    { (exit 1); exit 1; }
2746
 }
2747
 
2748
-#
2749
-# Set up the sed scripts for CONFIG_FILES section.
2750
-#
2751
-
2752
-# No need to generate the scripts if there are no CONFIG_FILES.
2753
-# This happens for instance when ./config.status config.h
2754
+# Set up the scripts for CONFIG_FILES section.
2755
+# No need to generate them if there are no CONFIG_FILES.
2756
+# This happens for instance with `./config.status config.h'.
2757
 if test -n "$CONFIG_FILES"; then
2758
 
2759
-_ACEOF
2760
 
2761
+ac_cr=''
2762
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
2763
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
2764
+  ac_cs_awk_cr='\\r'
2765
+else
2766
+  ac_cs_awk_cr=$ac_cr
2767
+fi
2768
+
2769
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
2770
+_ACEOF
2771
 
2772
 
2773
+{
2774
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
2775
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
2776
+  echo "_ACEOF"
2777
+} >conf$$subs.sh ||
2778
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
2779
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
2780
+   { (exit 1); exit 1; }; }
2781
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
2782
 ac_delim='%!_!# '
2783
 for ac_last_try in false false false false false :; do
2784
-  cat >conf$$subs.sed <<_ACEOF
2785
-SHELL!$SHELL$ac_delim
2786
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
2787
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
2788
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
2789
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
2790
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
2791
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
2792
-exec_prefix!$exec_prefix$ac_delim
2793
-prefix!$prefix$ac_delim
2794
-program_transform_name!$program_transform_name$ac_delim
2795
-bindir!$bindir$ac_delim
2796
-sbindir!$sbindir$ac_delim
2797
-libexecdir!$libexecdir$ac_delim
2798
-datarootdir!$datarootdir$ac_delim
2799
-datadir!$datadir$ac_delim
2800
-sysconfdir!$sysconfdir$ac_delim
2801
-sharedstatedir!$sharedstatedir$ac_delim
2802
-localstatedir!$localstatedir$ac_delim
2803
-includedir!$includedir$ac_delim
2804
-oldincludedir!$oldincludedir$ac_delim
2805
-docdir!$docdir$ac_delim
2806
-infodir!$infodir$ac_delim
2807
-htmldir!$htmldir$ac_delim
2808
-dvidir!$dvidir$ac_delim
2809
-pdfdir!$pdfdir$ac_delim
2810
-psdir!$psdir$ac_delim
2811
-libdir!$libdir$ac_delim
2812
-localedir!$localedir$ac_delim
2813
-mandir!$mandir$ac_delim
2814
-DEFS!$DEFS$ac_delim
2815
-ECHO_C!$ECHO_C$ac_delim
2816
-ECHO_N!$ECHO_N$ac_delim
2817
-ECHO_T!$ECHO_T$ac_delim
2818
-LIBS!$LIBS$ac_delim
2819
-build_alias!$build_alias$ac_delim
2820
-host_alias!$host_alias$ac_delim
2821
-target_alias!$target_alias$ac_delim
2822
-CC!$CC$ac_delim
2823
-CFLAGS!$CFLAGS$ac_delim
2824
-LDFLAGS!$LDFLAGS$ac_delim
2825
-CPPFLAGS!$CPPFLAGS$ac_delim
2826
-ac_ct_CC!$ac_ct_CC$ac_delim
2827
-EXEEXT!$EXEEXT$ac_delim
2828
-OBJEXT!$OBJEXT$ac_delim
2829
-homedir!$homedir$ac_delim
2830
-useradd_prog!$useradd_prog$ac_delim
2831
-useradd_args!$useradd_args$ac_delim
2832
-permmask!$permmask$ac_delim
2833
-maxline!$maxline$ac_delim
2834
-LIBOBJS!$LIBOBJS$ac_delim
2835
-LTLIBOBJS!$LTLIBOBJS$ac_delim
2836
-_ACEOF
2837
+  . ./conf$$subs.sh ||
2838
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
2839
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
2840
+   { (exit 1); exit 1; }; }
2841
 
2842
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 51; then
2843
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
2844
     break
2845
   elif $ac_last_try; then
2846
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
2847
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
2848
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
2849
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
2850
    { (exit 1); exit 1; }; }
2851
   else
2852
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
2853
   fi
2854
 done
2855
+rm -f conf$$subs.sh
2856
 
2857
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
2858
-if test -n "$ac_eof"; then
2859
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
2860
-  ac_eof=`expr $ac_eof + 1`
2861
-fi
2862
-
2863
-cat >>$CONFIG_STATUS <<_ACEOF
2864
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
2865
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
2866
-_ACEOF
2867
-sed '
2868
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
2869
-s/^/s,@/; s/!/@,|#_!!_#|/
2870
-:n
2871
-t n
2872
-s/'"$ac_delim"'$/,g/; t
2873
-s/$/\\/; p
2874
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
2875
-' >>$CONFIG_STATUS <conf$$subs.sed
2876
-rm -f conf$$subs.sed
2877
-cat >>$CONFIG_STATUS <<_ACEOF
2878
-:end
2879
-s/|#_!!_#|//g
2880
-CEOF$ac_eof
2881
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2882
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
2883
 _ACEOF
2884
+sed -n '
2885
+h
2886
+s/^/S["/; s/!.*/"]=/
2887
+p
2888
+g
2889
+s/^[^!]*!//
2890
+:repl
2891
+t repl
2892
+s/'"$ac_delim"'$//
2893
+t delim
2894
+:nl
2895
+h
2896
+s/\(.\{148\}\).*/\1/
2897
+t more1
2898
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
2899
+p
2900
+n
2901
+b repl
2902
+:more1
2903
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
2904
+p
2905
+g
2906
+s/.\{148\}//
2907
+t nl
2908
+:delim
2909
+h
2910
+s/\(.\{148\}\).*/\1/
2911
+t more2
2912
+s/["\\]/\\&/g; s/^/"/; s/$/"/
2913
+p
2914
+b
2915
+:more2
2916
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
2917
+p
2918
+g
2919
+s/.\{148\}//
2920
+t delim
2921
+' <conf$$subs.awk | sed '
2922
+/^[^""]/{
2923
+  N
2924
+  s/\n//
2925
+}
2926
+' >>$CONFIG_STATUS || ac_write_fail=1
2927
+rm -f conf$$subs.awk
2928
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2929
+_ACAWK
2930
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
2931
+  for (key in S) S_is_set[key] = 1
2932
+  FS = ""
2933
 
2934
+}
2935
+{
2936
+  line = $ 0
2937
+  nfields = split(line, field, "@")
2938
+  substed = 0
2939
+  len = length(field[1])
2940
+  for (i = 2; i < nfields; i++) {
2941
+    key = field[i]
2942
+    keylen = length(key)
2943
+    if (S_is_set[key]) {
2944
+      value = S[key]
2945
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
2946
+      len += length(value) + length(field[++i])
2947
+      substed = 1
2948
+    } else
2949
+      len += 1 + keylen
2950
+  }
2951
+
2952
+  print line
2953
+}
2954
+
2955
+_ACAWK
2956
+_ACEOF
2957
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
2958
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
2959
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
2960
+else
2961
+  cat
2962
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
2963
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
2964
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
2965
+   { (exit 1); exit 1; }; }
2966
+_ACEOF
2967
 
2968
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
2969
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
2970
@@ -3703,19 +4384,133 @@
2971
 }'
2972
 fi
2973
 
2974
-cat >>$CONFIG_STATUS <<\_ACEOF
2975
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
2976
 fi # test -n "$CONFIG_FILES"
2977
 
2978
+# Set up the scripts for CONFIG_HEADERS section.
2979
+# No need to generate them if there are no CONFIG_HEADERS.
2980
+# This happens for instance with `./config.status Makefile'.
2981
+if test -n "$CONFIG_HEADERS"; then
2982
+cat >"$tmp/defines.awk" <<\_ACAWK ||
2983
+BEGIN {
2984
+_ACEOF
2985
+
2986
+# Transform confdefs.h into an awk script `defines.awk', embedded as
2987
+# here-document in config.status, that substitutes the proper values into
2988
+# config.h.in to produce config.h.
2989
+
2990
+# Create a delimiter string that does not exist in confdefs.h, to ease
2991
+# handling of long lines.
2992
+ac_delim='%!_!# '
2993
+for ac_last_try in false false :; do
2994
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
2995
+  if test -z "$ac_t"; then
2996
+    break
2997
+  elif $ac_last_try; then
2998
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
2999
+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
3000
+   { (exit 1); exit 1; }; }
3001
+  else
3002
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
3003
+  fi
3004
+done
3005
+
3006
+# For the awk script, D is an array of macro values keyed by name,
3007
+# likewise P contains macro parameters if any.  Preserve backslash
3008
+# newline sequences.
3009
+
3010
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
3011
+sed -n '
3012
+s/.\{148\}/&'"$ac_delim"'/g
3013
+t rset
3014
+:rset
3015
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
3016
+t def
3017
+d
3018
+:def
3019
+s/\\$//
3020
+t bsnl
3021
+s/["\\]/\\&/g
3022
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
3023
+D["\1"]=" \3"/p
3024
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
3025
+d
3026
+:bsnl
3027
+s/["\\]/\\&/g
3028
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
3029
+D["\1"]=" \3\\\\\\n"\\/p
3030
+t cont
3031
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
3032
+t cont
3033
+d
3034
+:cont
3035
+n
3036
+s/.\{148\}/&'"$ac_delim"'/g
3037
+t clear
3038
+:clear
3039
+s/\\$//
3040
+t bsnlc
3041
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
3042
+d
3043
+:bsnlc
3044
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
3045
+b cont
3046
+' <confdefs.h | sed '
3047
+s/'"$ac_delim"'/"\\\
3048
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
3049
+
3050
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3051
+  for (key in D) D_is_set[key] = 1
3052
+  FS = ""
3053
+}
3054
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
3055
+  line = \$ 0
3056
+  split(line, arg, " ")
3057
+  if (arg[1] == "#") {
3058
+    defundef = arg[2]
3059
+    mac1 = arg[3]
3060
+  } else {
3061
+    defundef = substr(arg[1], 2)
3062
+    mac1 = arg[2]
3063
+  }
3064
+  split(mac1, mac2, "(") #)
3065
+  macro = mac2[1]
3066
+  if (D_is_set[macro]) {
3067
+    # Preserve the white space surrounding the "#".
3068
+    prefix = substr(line, 1, index(line, defundef) - 1)
3069
+    print prefix "define", macro P[macro] D[macro]
3070
+    next
3071
+  } else {
3072
+    # Replace #undef with comments.  This is necessary, for example,
3073
+    # in the case of _POSIX_SOURCE, which is predefined and required
3074
+    # on some systems where configure will not decide to define it.
3075
+    if (defundef == "undef") {
3076
+      print "/*", line, "*/"
3077
+      next
3078
+    }
3079
+  }
3080
+}
3081
+{ print }
3082
+_ACAWK
3083
+_ACEOF
3084
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
3085
+  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
3086
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
3087
+   { (exit 1); exit 1; }; }
3088
+fi # test -n "$CONFIG_HEADERS"
3089
+
3090
 
3091
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS
3092
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    "
3093
+shift
3094
+for ac_tag
3095
 do
3096
   case $ac_tag in
3097
   :[FHLC]) ac_mode=$ac_tag; continue;;
3098
   esac
3099
   case $ac_mode$ac_tag in
3100
   :[FHL]*:*);;
3101
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
3102
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
3103
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
3104
+$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
3105
    { (exit 1); exit 1; }; };;
3106
   :[FH]-) ac_tag=-:-;;
3107
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
3108
@@ -3744,26 +4539,38 @@
3109
 	   [\\/$]*) false;;
3110
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
3111
 	   esac ||
3112
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
3113
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
3114
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
3115
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
3116
    { (exit 1); exit 1; }; };;
3117
       esac
3118
-      ac_file_inputs="$ac_file_inputs $ac_f"
3119
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
3120
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
3121
     done
3122
 
3123
     # Let's still pretend it is `configure' which instantiates (i.e., don't
3124
     # use $as_me), people would be surprised to read:
3125
     #    /* config.h.  Generated by config.status.  */
3126
-    configure_input="Generated from "`IFS=:
3127
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
3128
+    configure_input='Generated from '`
3129
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
3130
+	`' by configure.'
3131
     if test x"$ac_file" != x-; then
3132
       configure_input="$ac_file.  $configure_input"
3133
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
3134
-echo "$as_me: creating $ac_file" >&6;}
3135
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
3136
+$as_echo "$as_me: creating $ac_file" >&6;}
3137
     fi
3138
+    # Neutralize special characters interpreted by sed in replacement strings.
3139
+    case $configure_input in #(
3140
+    *\&* | *\|* | *\\* )
3141
+       ac_sed_conf_input=`$as_echo "$configure_input" |
3142
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
3143
+    *) ac_sed_conf_input=$configure_input;;
3144
+    esac
3145
 
3146
     case $ac_tag in
3147
-    *:-:* | *:-) cat >"$tmp/stdin";;
3148
+    *:-:* | *:-) cat >"$tmp/stdin" \
3149
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
3150
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
3151
+   { (exit 1); exit 1; }; } ;;
3152
     esac
3153
     ;;
3154
   esac
3155
@@ -3773,7 +4580,7 @@
3156
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
3157
 	 X"$ac_file" : 'X\(//\)$' \| \
3158
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
3159
-echo X"$ac_file" |
3160
+$as_echo X"$ac_file" |
3161
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
3162
 	    s//\1/
3163
 	    q
3164
@@ -3799,7 +4606,7 @@
3165
     as_dirs=
3166
     while :; do
3167
       case $as_dir in #(
3168
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
3169
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
3170
       *) as_qdir=$as_dir;;
3171
       esac
3172
       as_dirs="'$as_qdir' $as_dirs"
3173
@@ -3808,7 +4615,7 @@
3174
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
3175
 	 X"$as_dir" : 'X\(//\)$' \| \
3176
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
3177
-echo X"$as_dir" |
3178
+$as_echo X"$as_dir" |
3179
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
3180
 	    s//\1/
3181
 	    q
3182
@@ -3829,17 +4636,17 @@
3183
       test -d "$as_dir" && break
3184
     done
3185
     test -z "$as_dirs" || eval "mkdir $as_dirs"
3186
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
3187
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
3188
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
3189
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
3190
    { (exit 1); exit 1; }; }; }
3191
   ac_builddir=.
3192
 
3193
 case "$ac_dir" in
3194
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
3195
 *)
3196
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
3197
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
3198
   # A ".." for each directory in $ac_dir_suffix.
3199
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
3200
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
3201
   case $ac_top_builddir_sub in
3202
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
3203
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
3204
@@ -3875,12 +4682,13 @@
3205
 
3206
 _ACEOF
3207
 
3208
-cat >>$CONFIG_STATUS <<\_ACEOF
3209
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
3210
 # If the template does not know about datarootdir, expand it.
3211
 # FIXME: This hack should be removed a few years after 2.60.
3212
 ac_datarootdir_hack=; ac_datarootdir_seen=
3213
 
3214
-case `sed -n '/datarootdir/ {
3215
+ac_sed_dataroot='
3216
+/datarootdir/ {
3217
   p
3218
   q
3219
 }
3220
@@ -3889,13 +4697,14 @@
3221
 /@infodir@/p
3222
 /@localedir@/p
3223
 /@mandir@/p
3224
-' $ac_file_inputs` in
3225
+'
3226
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
3227
 *datarootdir*) ac_datarootdir_seen=yes;;
3228
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
3229
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
3230
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
3231
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
3232
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
3233
 _ACEOF
3234
-cat >>$CONFIG_STATUS <<_ACEOF
3235
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3236
   ac_datarootdir_hack='
3237
   s&@datadir@&$datadir&g
3238
   s&@docdir@&$docdir&g
3239
@@ -3909,15 +4718,16 @@
3240
 # Neutralize VPATH when `$srcdir' = `.'.
3241
 # Shell code in configure.ac might set extrasub.
3242
 # FIXME: do we really want to maintain this feature?
3243
-cat >>$CONFIG_STATUS <<_ACEOF
3244
-  sed "$ac_vpsub
3245
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3246
+ac_sed_extra="$ac_vpsub
3247
 $extrasub
3248
 _ACEOF
3249
-cat >>$CONFIG_STATUS <<\_ACEOF
3250
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
3251
 :t
3252
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
3253
-s&@configure_input@&$configure_input&;t t
3254
+s|@configure_input@|$ac_sed_conf_input|;t t
3255
 s&@top_builddir@&$ac_top_builddir_sub&;t t
3256
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
3257
 s&@srcdir@&$ac_srcdir&;t t
3258
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
3259
 s&@top_srcdir@&$ac_top_srcdir&;t t
3260
@@ -3926,119 +4736,58 @@
3261
 s&@abs_builddir@&$ac_abs_builddir&;t t
3262
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
3263
 $ac_datarootdir_hack
3264
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
3265
+"
3266
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
3267
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
3268
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
3269
+   { (exit 1); exit 1; }; }
3270
 
3271
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
3272
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
3273
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
3274
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
3275
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
3276
 which seems to be undefined.  Please make sure it is defined." >&5
3277
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
3278
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
3279
 which seems to be undefined.  Please make sure it is defined." >&2;}
3280
 
3281
   rm -f "$tmp/stdin"
3282
   case $ac_file in
3283
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
3284
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
3285
-  esac
3286
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
3287
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
3288
+  esac \
3289
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
3290
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
3291
+   { (exit 1); exit 1; }; }
3292
  ;;
3293
   :H)
3294
   #
3295
   # CONFIG_HEADER
3296
   #
3297
-_ACEOF
3298
-
3299
-# Transform confdefs.h into a sed script `conftest.defines', that
3300
-# substitutes the proper values into config.h.in to produce config.h.
3301
-rm -f conftest.defines conftest.tail
3302
-# First, append a space to every undef/define line, to ease matching.
3303
-echo 's/$/ /' >conftest.defines
3304
-# Then, protect against being on the right side of a sed subst, or in
3305
-# an unquoted here document, in config.status.  If some macros were
3306
-# called several times there might be several #defines for the same
3307
-# symbol, which is useless.  But do not sort them, since the last
3308
-# AC_DEFINE must be honored.
3309
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
3310
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
3311
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
3312
-# PARAMS is the parameter list in the macro definition--in most cases, it's
3313
-# just an empty string.
3314
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
3315
-ac_dB='\\)[	 (].*,\\1define\\2'
3316
-ac_dC=' '
3317
-ac_dD=' ,'
3318
-
3319
-uniq confdefs.h |
3320
-  sed -n '
3321
-	t rset
3322
-	:rset
3323
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
3324
-	t ok
3325
-	d
3326
-	:ok
3327
-	s/[\\&,]/\\&/g
3328
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
3329
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
3330
-  ' >>conftest.defines
3331
-
3332
-# Remove the space that was appended to ease matching.
3333
-# Then replace #undef with comments.  This is necessary, for
3334
-# example, in the case of _POSIX_SOURCE, which is predefined and required
3335
-# on some systems where configure will not decide to define it.
3336
-# (The regexp can be short, since the line contains either #define or #undef.)
3337
-echo 's/ $//
3338
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
3339
-
3340
-# Break up conftest.defines:
3341
-ac_max_sed_lines=50
3342
-
3343
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
3344
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
3345
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
3346
-# et cetera.
3347
-ac_in='$ac_file_inputs'
3348
-ac_out='"$tmp/out1"'
3349
-ac_nxt='"$tmp/out2"'
3350
-
3351
-while :
3352
-do
3353
-  # Write a here document:
3354
-    cat >>$CONFIG_STATUS <<_ACEOF
3355
-    # First, check the format of the line:
3356
-    cat >"\$tmp/defines.sed" <<\\CEOF
3357
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
3358
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
3359
-b
3360
-:def
3361
-_ACEOF
3362
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
3363
-  echo 'CEOF
3364
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
3365
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
3366
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
3367
-  grep . conftest.tail >/dev/null || break
3368
-  rm -f conftest.defines
3369
-  mv conftest.tail conftest.defines
3370
-done
3371
-rm -f conftest.defines conftest.tail
3372
-
3373
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
3374
-cat >>$CONFIG_STATUS <<\_ACEOF
3375
   if test x"$ac_file" != x-; then
3376
-    echo "/* $configure_input  */" >"$tmp/config.h"
3377
-    cat "$ac_result" >>"$tmp/config.h"
3378
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
3379
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
3380
-echo "$as_me: $ac_file is unchanged" >&6;}
3381
+    {
3382
+      $as_echo "/* $configure_input  */" \
3383
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
3384
+    } >"$tmp/config.h" \
3385
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
3386
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
3387
+   { (exit 1); exit 1; }; }
3388
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
3389
+      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
3390
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
3391
     else
3392
-      rm -f $ac_file
3393
-      mv "$tmp/config.h" $ac_file
3394
+      rm -f "$ac_file"
3395
+      mv "$tmp/config.h" "$ac_file" \
3396
+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
3397
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
3398
+   { (exit 1); exit 1; }; }
3399
     fi
3400
   else
3401
-    echo "/* $configure_input  */"
3402
-    cat "$ac_result"
3403
+    $as_echo "/* $configure_input  */" \
3404
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
3405
+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
3406
+$as_echo "$as_me: error: could not create -" >&2;}
3407
+   { (exit 1); exit 1; }; }
3408
   fi
3409
-  rm -f "$tmp/out12"
3410
  ;;
3411
 
3412
 
3413
@@ -4052,6 +4801,11 @@
3414
 chmod +x $CONFIG_STATUS
3415
 ac_clean_files=$ac_clean_files_save
3416
 
3417
+test $ac_write_fail = 0 ||
3418
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
3419
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
3420
+   { (exit 1); exit 1; }; }
3421
+
3422
 
3423
 # configure is writing to config.log, and then calls config.status.
3424
 # config.status does its own redirection, appending to config.log.
3425
@@ -4073,4 +4827,8 @@
3426
   # would make configure fail if this is the last instruction.
3427
   $ac_cs_success || { (exit 1); exit 1; }
3428
 fi
3429
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
3430
+  { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
3431
+$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
3432
+fi
3433
 
(-)mail/gnarwl/files/patch-configure.ac (-38 lines)
Lines 1-38 Link Here
1
diff -u --new-file --recursive ../gnarwl-3.6.orig/configure.ac ./configure.ac
2
--- ../gnarwl-3.6.orig/configure.ac	Mon Dec  9 17:49:38 2002
3
+++ ./configure.ac	Mon Mar 29 14:08:48 2004
4
@@ -6,6 +6,17 @@
5
 # Checks for programs.
6
 AC_PROG_CC
7
 
8
+# Add some includes things
9
+
10
+if test -d /usr/local/include; then
11
+  CPPFLAGS="$CPPFLAGS -I/usr/local/include"
12
+fi
13
+
14
+if test -d /usr/local/lib; then
15
+  LDFLAGS="$LDFLAGS -L/usr/local/lib"
16
+fi
17
+
18
+
19
 AC_ARG_WITH(homedir,AC_HELP_STRING([--with-homedir=DIR],[Homedir for the gnarwl user]),[homedir="$withval"],[homedir="\${prefix}/var/lib/gnarwl"])
20
 AC_ARG_WITH(docdir,AC_HELP_STRING([--with-docdir=DIR],[Where to install the docs]),docdir="$withval",docdir="\${prefix}/share/doc/packages/gnarwl")
21
 AC_ARG_WITH(useradd_prog,AC_HELP_STRING([--with-useradd_prog=DIR],[Programm for adding users]),useradd_prog="$withval",useradd_prog="/usr/sbin/useradd")
22
@@ -28,7 +39,15 @@
23
 AC_CHECK_LIB([ldap],[ldap_init])
24
 AC_CHECK_FUNCS([ldap_set_option])
25
 
26
+AC_CHECK_LIB([iconv],[iconv])
27
 AC_CHECK_FUNCS([iconv])
28
+
29
+AC_CHECK_LIB([dl],[dlopen])
30
+
31
+dnl I dunno why libresolv is needed on linux so make a klundge for that.
32
+
33
+AC_CHECK_FUNC(gethostbyname, , [AC_CHECK_LIB(resolv, gethostbyname)])
34
+AC_CHECK_FUNC(gethostbyname, , [AC_CHECK_LIB(nsl, gethostbyname)])
35
 
36
 AC_DEFINE_UNQUOTED(UMASK,$permmask)
37
 AC_DEFINE_UNQUOTED(MAXLINE,$maxline)
38
(-)mail/libvmime/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	libvmime
4
PORTNAME=	libvmime
5
PORTVERSION=	0.9.2.s20140721
5
PORTVERSION=	0.9.2.s20140721
6
PORTREVISION=	1
6
PORTREVISION=	2
7
CATEGORIES=	mail
7
CATEGORIES=	mail
8
8
9
MAINTAINER=	delphij@FreeBSD.org
9
MAINTAINER=	delphij@FreeBSD.org
(-)mail/libvmime/files/patch-cmake__FindIconv.cmake (-9 / +33 lines)
Lines 1-11 Link Here
1
--- cmake/FindIconv.cmake.orig	2014-06-30 22:48:42.000000000 +0200
1
--- cmake/FindIconv.cmake.orig	2014-06-30 20:48:42 UTC
2
+++ cmake/FindIconv.cmake	2014-07-22 12:50:55.000000000 +0200
2
+++ cmake/FindIconv.cmake
3
@@ -18,7 +18,7 @@
3
@@ -7,6 +7,7 @@
4
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
4
 #  ICONV_SECOND_ARGUMENT_IS_CONST - the second argument for iconv() is const
5
 	FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c HINTS "/opt/local/lib")
5
 #
6
 ELSE()
6
 include(CheckCXXSourceCompiles)
7
+include(CheckFunctionExists)
8
 
9
 IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
10
   # Already in cache, be silent
11
@@ -15,15 +16,15 @@ ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRA
12
 
13
 FIND_PATH(ICONV_INCLUDE_DIR iconv.h)
14
 
15
-IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
16
-	FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c HINTS "/opt/local/lib")
17
-ELSE()
7
-	FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
18
-	FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
8
+	FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv c libiconv libiconv-2)
19
-ENDIF()
9
 ENDIF()
20
-
21
-IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
22
-   SET(ICONV_FOUND TRUE)
23
-ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
24
+IF(ICONV_INCLUDE_DIR)
25
+  CHECK_FUNCTION_EXISTS(iconv ICONV_FOUND)
26
+  IF(NOT ICONV_FOUND)
27
+    FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2)
28
+    IF(ICONV_LIBRARIES)
29
+      SET(ICONV_FOUND TRUE)
30
+    ENDIF(ICONV_LIBRARIES)
31
+  ENDIF(NOT ICONV_FOUND)
32
+ENDIF(ICONV_INCLUDE_DIR)
10
 
33
 
11
 IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
34
 set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
35
 set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
(-)mail/mmr/files/patch-mime.cpp (-11 lines)
Lines 1-11 Link Here
1
--- mime.cpp.orig	Tue Jan 24 16:58:33 2006
2
+++ mime.cpp	Sun Jul  9 23:46:48 2006
3
@@ -110,7 +110,7 @@
4
 	}
5
 	size_t available = obytesleft;
6
 	while ( ibytesleft > 0 ) {
7
-		iconv(iconv_ctx, &ibuf, &ibytesleft, &obuf, &obytesleft);
8
+		iconv(iconv_ctx, (const char **)&ibuf, &ibytesleft, &obuf, &obytesleft);
9
 
10
 		if ( ibytesleft > 0 ) {
11
 			if ( errno == EILSEQ ) {
(-)mail/normalizemime/files/patch-normalizemime.cc (-9 lines)
Lines 9-23 Link Here
9
 #include <string.h>
9
 #include <string.h>
10
 #include <stdlib.h>
10
 #include <stdlib.h>
11
 #include <regex.h>
11
 #include <regex.h>
12
@@ -500,7 +502,7 @@
13
   char *obuf = buf;
14
   memcpy (icopy, message.c_str(), in_left);
15
   message.erase ();
16
-  char *ibuf = icopy;
17
+  const char *ibuf = icopy;
18
 
19
   while (in_left > 0) {
20
     if ((size_t)(-1) == iconv (ic, &ibuf, &in_left, &obuf, &out_left)) {
21
@@ -1493,6 +1495,7 @@
12
@@ -1493,6 +1495,7 @@
22
       "X-Spam-",           // Added by SpamAssasin for example
13
       "X-Spam-",           // Added by SpamAssasin for example
23
       "X-CRM114-",         // Added by CRM114
14
       "X-CRM114-",         // Added by CRM114
(-)multimedia/ffmpeg2theora/Makefile (-3 / +4 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	ffmpeg2theora
4
PORTNAME=	ffmpeg2theora
5
PORTVERSION=	0.29
5
PORTVERSION=	0.29
6
PORTREVISION=	1
6
PORTREVISION=	2
7
CATEGORIES=	multimedia
7
CATEGORIES=	multimedia
8
MASTER_SITES=	http://v2v.cc/~j/ffmpeg2theora/downloads/
8
MASTER_SITES=	http://v2v.cc/~j/ffmpeg2theora/downloads/
9
9
Lines 17-26 LIB_DEPENDS= libavcodec.so:${PORTSDIR}/m Link Here
17
		libtheora.so:${PORTSDIR}/multimedia/libtheora
17
		libtheora.so:${PORTSDIR}/multimedia/libtheora
18
18
19
USES=		iconv pkgconfig scons tar:bzip2
19
USES=		iconv pkgconfig scons tar:bzip2
20
MAKE_ENV=	APPEND_CCFLAGS="${CPPFLAGS}" APPEND_LINKFLAGS="${LDFLAGS}"
20
MAKE_ARGS=	APPEND_CCFLAGS="${CFLAGS} ${CPPFLAGS}" \
21
		APPEND_LINKFLAGS="${LDFLAGS} ${LIBS}"
21
22
22
CPPFLAGS+=	-I${LOCALBASE}/include
23
CPPFLAGS+=	-I${LOCALBASE}/include
23
LDFLAGS+=	-L${LOCALBASE}/lib
24
LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB}
24
25
25
PLIST_FILES=	bin/ffmpeg2theora man/man1/ffmpeg2theora.1.gz
26
PLIST_FILES=	bin/ffmpeg2theora man/man1/ffmpeg2theora.1.gz
26
27
(-)multimedia/ffmpeg2theora/files/patch-SConstruct (-7 / +10 lines)
Lines 1-6 Link Here
1
--- SConstruct.orig	2012-06-26 02:15:16.000000000 +0900
1
--- SConstruct.orig	2012-06-25 17:15:16 UTC
2
+++ SConstruct	2012-07-04 01:17:19.000000000 +0900
2
+++ SConstruct
3
@@ -37,7 +37,7 @@
3
@@ -37,7 +37,7 @@ opts.AddVariables(
4
   BoolVariable('libkate', 'enable libkate support', 1),
4
   BoolVariable('libkate', 'enable libkate support', 1),
5
   BoolVariable('crossmingw', 'Set to 1 for crosscompile with mingw', 0)
5
   BoolVariable('crossmingw', 'Set to 1 for crosscompile with mingw', 0)
6
 )
6
 )
Lines 9-15 Link Here
9
 Help(opts.GenerateHelpText(env))
9
 Help(opts.GenerateHelpText(env))
10
 
10
 
11
 pkg_flags="--cflags --libs"
11
 pkg_flags="--cflags --libs"
12
@@ -151,7 +151,6 @@
12
@@ -151,7 +151,6 @@ if not env.GetOption('clean'):
13
       "libavcodec >= 52.30.0",
13
       "libavcodec >= 52.30.0",
14
       "libpostproc",
14
       "libpostproc",
15
       "libswscale",
15
       "libswscale",
Lines 17-25 Link Here
17
       "libavutil",
17
       "libavutil",
18
   ]
18
   ]
19
   if os.path.exists("./ffmpeg"):
19
   if os.path.exists("./ffmpeg"):
20
@@ -203,6 +202,7 @@
20
@@ -200,9 +199,8 @@ if not env.GetOption('clean'):
21
       if conf.CheckLib('iconv'):
21
       env.Append(CCFLAGS=[
22
           env.Append(LIBS=['iconv'])
22
         '-DHAVE_ICONV'
23
       ])
24
-      if conf.CheckLib('iconv'):
25
-          env.Append(LIBS=['iconv'])
23
 
26
 
24
+  env.Append(LIBS=['m'])
27
+  env.Append(LIBS=['m'])
25
   if env['crossmingw']:
28
   if env['crossmingw']:
(-)multimedia/ffmpeg2theora/files/patch-src-subtitles.c (+11 lines)
Line 0 Link Here
1
--- src/subtitles.c.orig	2011-09-15 20:20:46 UTC
2
+++ src/subtitles.c
3
@@ -284,7 +284,7 @@ static char *convert_subtitle_to_utf8(co
4
       return NULL;
5
     }
6
     outptr=newtext;
7
-    if (iconv(cd, &inptr, &insz, &outptr, &outsz) < 0) {
8
+    if (iconv(cd, &inptr, &insz, &outptr, &outsz) == (size_t)-1) {
9
       warn(frontend, NULL, 0, "Failed to convert text to UTF-8\n");
10
       free(newtext);
11
       newtext = NULL;
(-)multimedia/naludump/files/patch-libsi-si.c (-12 lines)
Lines 10-24 Link Here
10
 #include <stdlib.h> // for broadcaster stupidity workaround
10
 #include <stdlib.h> // for broadcaster stupidity workaround
11
 #include <string.h>
11
 #include <string.h>
12
 #include "descriptor.h"
12
 #include "descriptor.h"
13
@@ -381,7 +383,11 @@ bool convertCharacterTable(const char *f
14
   if (SystemCharacterTable) {
15
      iconv_t cd = iconv_open(SystemCharacterTable, fromCode);
16
      if (cd != (iconv_t)-1) {
17
+#ifdef __FreeBSD__
18
+        const char *fromPtr = from;
19
+#else
20
         char *fromPtr = (char *)from;
21
+#endif
22
         while (fromLength > 0 && toLength > 1) {
23
            if (iconv(cd, &fromPtr, &fromLength, &to, &toLength) == size_t(-1)) {
24
               if (errno == EILSEQ) {
(-)multimedia/transcode/Makefile (-5 / +10 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	transcode
4
PORTNAME=	transcode
5
PORTVERSION=	1.1.7
5
PORTVERSION=	1.1.7
6
PORTREVISION=	21
6
PORTREVISION=	22
7
CATEGORIES=	multimedia
7
CATEGORIES=	multimedia
8
MASTER_SITES=	http://cdn.bitbucket.org/france/transcode-tcforge/downloads/
8
MASTER_SITES=	http://cdn.bitbucket.org/france/transcode-tcforge/downloads/
9
9
Lines 21-27 WANT_SDL= yes Link Here
21
WANT_GNOME=	yes
21
WANT_GNOME=	yes
22
GNU_CONFIGURE=	yes
22
GNU_CONFIGURE=	yes
23
CONFIGURE_ARGS=	--enable-oss
23
CONFIGURE_ARGS=	--enable-oss
24
CPPFLAGS+=	-isystem ${LOCALBASE}/include
24
CPPFLAGS+=	-I${LOCALBASE}/include
25
LDFLAGS+=	-L${LOCALBASE}/lib
25
LDFLAGS+=	-L${LOCALBASE}/lib
26
INSTALL_TARGET=	install-strip
26
INSTALL_TARGET=	install-strip
27
27
Lines 110-121 JPEG_CONFIGURE_ON= --with-libjpeg-prefi Link Here
110
110
111
ICONV_USES=			iconv
111
ICONV_USES=			iconv
112
ICONV_CONFIGURE_ENABLE=		iconv
112
ICONV_CONFIGURE_ENABLE=		iconv
113
ICONV_CONFIGURE_ON=		${ICONV_CONFIGURE_ARG}
113
ICONV_CONFIGURE_ON=		--with-iconv-prefix=${ICONV_PREFIX}
114
114
115
V4L_BUILD_DEPENDS=		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
115
V4L_BUILD_DEPENDS=		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
116
V4L_CONFIGURE_ENABLE=		v4l
116
V4L_CONFIGURE_ENABLE=		v4l
117
117
118
.include <bsd.port.options.mk>
118
.include <bsd.port.pre.mk>
119
120
.if empty(ICONV_LIB)
121
CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no \
122
		ac_cv_lib_iconv_libiconv_open=no
123
.endif
119
124
120
post-extract:
125
post-extract:
121
	@${RM} ${WRKSRC}/import/v4l/videodev*
126
	@${RM} ${WRKSRC}/import/v4l/videodev*
Lines 153-156 post-stage: Link Here
153
	@(cd ${STAGEDIR}${PREFIX} && \
158
	@(cd ${STAGEDIR}${PREFIX} && \
154
		${FIND} -s lib/transcode -type f -or -type l >> ${TMPPLIST})
159
		${FIND} -s lib/transcode -type f -or -type l >> ${TMPPLIST})
155
160
156
.include <bsd.port.mk>
161
.include <bsd.port.post.mk>
(-)multimedia/vdr/files/patch-vdr-1.7.28_FreeBSD (-24 lines)
Lines 711-728 diff -u -r1.1.1.5 -r1.8 Link Here
711
                LOG_ERROR_STR(*buf);
711
                LOG_ERROR_STR(*buf);
712
             close(f);
712
             close(f);
713
             remove(buf);
713
             remove(buf);
714
@@ -818,7 +846,11 @@
715
 const char *cCharSetConv::Convert(const char *From, char *To, size_t ToLength)
716
 {
717
   if (cd != (iconv_t)-1 && From && *From) {
718
+#ifdef __FreeBSD__
719
+     const char *FromPtr = (char *)From;
720
+#else
721
      char *FromPtr = (char *)From;
722
+#endif
723
      size_t FromLength = strlen(From);
724
      char *ToPtr = To;
725
      if (!ToPtr) {
726
@@ -920,7 +952,11 @@
714
@@ -920,7 +952,11 @@
727
   return cString(buffer, true);
715
   return cString(buffer, true);
728
 }
716
 }
Lines 1003-1020 diff -u -r1.1.1.4 -r1.7 Link Here
1003
 #include <stdlib.h> // for broadcaster stupidity workaround
991
 #include <stdlib.h> // for broadcaster stupidity workaround
1004
 #include <string.h>
992
 #include <string.h>
1005
 #include "descriptor.h"
993
 #include "descriptor.h"
1006
@@ -381,7 +383,11 @@
1007
   if (SystemCharacterTable) {
1008
      iconv_t cd = iconv_open(SystemCharacterTable, fromCode);
1009
      if (cd != (iconv_t)-1) {
1010
+#ifdef __FreeBSD__
1011
+        const char *fromPtr = from;
1012
+#else
1013
         char *fromPtr = (char *)from;
1014
+#endif
1015
         while (fromLength > 0 && toLength > 1) {
1016
            if (iconv(cd, &fromPtr, &fromLength, &to, &toLength) == size_t(-1)) {
1017
               if (errno == EILSEQ) {
1018
--- PLUGINS/src/dvbsddevice/Makefile.orig
994
--- PLUGINS/src/dvbsddevice/Makefile.orig
1019
+++ PLUGINS/src/dvbsddevice/Makefile
995
+++ PLUGINS/src/dvbsddevice/Makefile
1020
@@ -45,7 +45,7 @@ PACKAGE = vdr-$(ARCHIVE)
996
@@ -45,7 +45,7 @@ PACKAGE = vdr-$(ARCHIVE)
(-)net/asterisk13/Makefile (-1 / +6 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	asterisk
3
PORTNAME=	asterisk
4
PORTVERSION=	13.3.2
4
PORTVERSION=	13.3.2
5
PORTREVISION=	1
5
PORTREVISION=	2
6
CATEGORIES=	net
6
CATEGORIES=	net
7
MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
7
MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
8
		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
8
		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
Lines 131-136 LIB_DEPENDS+= libsrtp.so:${PORTSDIR}/ne Link Here
131
131
132
.include <bsd.port.pre.mk>
132
.include <bsd.port.pre.mk>
133
133
134
.if empty(ICONV_LIB)
135
CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no \
136
		ac_cv_lib_iconv_libiconv_open=no
137
.endif
138
134
.if ${PREFIX} == ${LOCALBASE}
139
.if ${PREFIX} == ${LOCALBASE}
135
VARDIR=/var
140
VARDIR=/var
136
.else
141
.else
(-)net/c3270/Makefile (-1 / +2 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	c3270
4
PORTNAME=	c3270
5
PORTVERSION=	3.3.14ga11
5
PORTVERSION=	3.3.14ga11
6
PORTREVISION=	1
6
CATEGORIES=	net
7
CATEGORIES=	net
7
MASTER_SITES=	http://x3270.bgp.nu/download/03.03.14/
8
MASTER_SITES=	http://x3270.bgp.nu/download/03.03.14/
8
MASTER_SITES_VER_PATH=	${PORTVERSION:C/(0[0-9]\.0[0-9])/}
9
MASTER_SITES_VER_PATH=	${PORTVERSION:C/(0[0-9]\.0[0-9])/}
Lines 14-24 COMMENT= Full-screen curses-based remote Link Here
14
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/([0-9]\.[0-9])(\..*)/\1/}
15
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/([0-9]\.[0-9])(\..*)/\1/}
15
16
16
GNU_CONFIGURE=	yes
17
GNU_CONFIGURE=	yes
18
CONFIGURE_ARGS=	ac_cv_search_libiconv=no
17
19
18
USES=		iconv readline gmake
20
USES=		iconv readline gmake
19
USE_OPENSSL=	yes
21
USE_OPENSSL=	yes
20
22
21
CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
22
CPPFLAGS+=	-I${LOCALBASE}/include
23
CPPFLAGS+=	-I${LOCALBASE}/include
23
LIBS+=		-L${LOCALBASE}/lib
24
LIBS+=		-L${LOCALBASE}/lib
24
25
(-)net-im/centerim-devel/Makefile (+1 lines)
Lines 21-26 USE_PERL5= run Link Here
21
USE_OPENSSL=	yes
21
USE_OPENSSL=	yes
22
GNU_CONFIGURE=	yes
22
GNU_CONFIGURE=	yes
23
CONFIGURE_ARGS=	--with-ssl --with-openssl
23
CONFIGURE_ARGS=	--with-ssl --with-openssl
24
CPPFLAGS+=	-I${LOCALBASE}/include
24
CONFLICTS=	centericq-[0-9]* centerim-[0-9]*
25
CONFLICTS=	centericq-[0-9]* centerim-[0-9]*
25
26
26
SHEBANG_FILES=	misc/cimformathistory misc/cimextracthistory.pl
27
SHEBANG_FILES=	misc/cimformathistory misc/cimextracthistory.pl
(-)net-im/gale/Makefile (-7 / +6 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	gale
4
PORTNAME=	gale
5
PORTVERSION=	0.99f
5
PORTVERSION=	0.99f
6
PORTREVISION=	5
6
PORTREVISION=	6
7
CATEGORIES=	net-im
7
CATEGORIES=	net-im
8
MASTER_SITES=	http://download.ofb.net/${PORTNAME}/
8
MASTER_SITES=	http://download.ofb.net/${PORTNAME}/
9
DISTNAME=	${PORTNAME}-${PORTVERSION}ruit
9
DISTNAME=	${PORTNAME}-${PORTVERSION}ruit
Lines 22-35 USE_OPENSSL= yes Link Here
22
USE_LDCONFIG=	yes
22
USE_LDCONFIG=	yes
23
MAKE_JOBS_UNSAFE=	yes
23
MAKE_JOBS_UNSAFE=	yes
24
24
25
CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
25
CPPFLAGS+=	-I${LOCALBASE}/include \
26
CPPFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib \
27
		-I${LOCALBASE}/include/w3c-libwww
26
		-I${LOCALBASE}/include/w3c-libwww
28
LDFLAGS+=	-L${LOCALBASE}/lib
27
LIBS+=		-L${LOCALBASE}/lib
29
28
30
# cheesy hack - test-oop doesn't build, but we don't care.
29
post-patch:
31
pre-configure:
30
	@${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
32
	${REINPLACE_CMD} -e 's/\(^noinst_PROGRAMS =.*\)test-oop/\1/' \
31
	@${REINPLACE_CMD} -e 's/\(^noinst_PROGRAMS =.*\)test-oop/\1/' \
33
		${WRKSRC}/liboop/Makefile.in
32
		${WRKSRC}/liboop/Makefile.in
34
33
35
.include <bsd.port.mk>
34
.include <bsd.port.mk>
(-)net-im/gale/files/patch-iconvtest.c (+11 lines)
Line 0 Link Here
1
--- iconvtest.c.orig	2000-11-18 06:38:47 UTC
2
+++ iconvtest.c
3
@@ -27,7 +27,7 @@ int main() {
4
     ||  utf[0] != 0x7f 
5
     ||  utf[1] != 0xdf || utf[2] != 0xbf
6
     ||  utf[3] != 0xef || utf[4] != 0xbf || utf[5] != 0xbf) exit(1);
7
-    inbuf = utf; inbytes = 6;
8
+    inbuf = (char *) utf; inbytes = 6;
9
     outbuf = (char *) wch; outbytes = sizeof(wch);
10
     if (0 != iconv(from,&inbuf,&inbytes,&outbuf,&outbytes)
11
     ||  0 != inbytes || (sizeof(wch) - 3*sizeof(wchar_t)) != outbytes
(-)net-im/imspector/files/patch-icqprotocolplugin.cpp (-9 lines)
Lines 8-22 Link Here
8
 
8
 
9
 #define PLUGIN_NAME "ICQ-AIM IMSpector protocol plugin"
9
 #define PLUGIN_NAME "ICQ-AIM IMSpector protocol plugin"
10
 #define PROTOCOL_NAME "ICQ-AIM"
10
 #define PROTOCOL_NAME "ICQ-AIM"
11
@@ -675,7 +676,7 @@
12
 					size_t inbytesleft = mylength - 4;
13
 					size_t outbytesleft = BUFFER_SIZE - 1; /* Trailing \0 */
14
 					size_t result = iconv(iconv_utf16be_utf8,
15
-						&inbuf, &inbytesleft, &outbuf, &outbytesleft);
16
+						(const char**) &inbuf, &inbytesleft, &outbuf, &outbytesleft);
17
 
18
 					if (result == (size_t) -1)
19
 					{
20
@@ -810,7 +811,7 @@
11
@@ -810,7 +811,7 @@
21
 	GET_TYPE(uint16_t)
12
 	GET_TYPE(uint16_t)
22
 
13
 
(-)net-im/licq/Makefile (-6 / +3 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	base
4
PORTNAME=	base
5
PORTVERSION=	${LICQ_VER}
5
PORTVERSION=	${LICQ_VER}
6
PORTREVISION=	1
6
CATEGORIES=	net-im
7
CATEGORIES=	net-im
7
PKGNAMESUFFIX=	${SOCKS_SUFFIX}${PKGNAMESUFFIX2}
8
PKGNAMESUFFIX=	${SOCKS_SUFFIX}${PKGNAMESUFFIX2}
8
9
Lines 17-33 USES= cmake iconv Link Here
17
WRKSRC=		${WRKDIR}/${DISTNAME}
18
WRKSRC=		${WRKDIR}/${DISTNAME}
18
LICQ_PORT?=	net-im/licq
19
LICQ_PORT?=	net-im/licq
19
20
20
# workaround for installed autoconf/automake
21
LDFLAGS+=	-lpthread -L${LOCALBASE}/lib ${ICONV_LIB} -Wl,--export-dynamic
22
CPPFLAGS+=	-I${LOCALBASE}/include
23
CFLAGS+=	-I${LOCALBASE}/include
21
CFLAGS+=	-I${LOCALBASE}/include
24
CXXFLAGS+=	-Wl,--export-dynamic -DGTEST_USE_OWN_TR1_TUPLE
22
CXXFLAGS+=	-DGTEST_USE_OWN_TR1_TUPLE
25
23
26
OPTIONS_DEFINE=	OPENSSL
24
OPTIONS_DEFINE=	NLS OPENSSL
27
OPTIONS_DEFAULT=OPENSSL
25
OPTIONS_DEFAULT=OPENSSL
28
26
29
OPENSSL_USE=	OPENSSL=yes
27
OPENSSL_USE=	OPENSSL=yes
30
OPENSSL_CONFIGURE_ON=	--with-openssl-inc=${OPENSSLINC} --with-openssl-lib=${OPENSSLLIB}
31
28
32
.include <bsd.port.options.mk>
29
.include <bsd.port.options.mk>
33
30
(-)net-im/licq/files/patch-cmake-Modules-FindIconv.cmake (+31 lines)
Line 0 Link Here
1
--- cmake/Modules/FindIconv.cmake.orig	2014-06-01 19:16:42 UTC
2
+++ cmake/Modules/FindIconv.cmake
3
@@ -10,6 +10,7 @@
4
 # 
5
 include(CheckCCompilerFlag)
6
 include(CheckCXXSourceCompiles)
7
+include(CheckFunctionExists)
8
 
9
 IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
10
   # Already in cache, be silent
11
@@ -18,11 +19,15 @@ ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRA
12
 
13
 FIND_PATH(ICONV_INCLUDE_DIR iconv.h) 
14
  
15
-FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv c)
16
- 
17
-IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
18
-   SET(ICONV_FOUND TRUE) 
19
-ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
20
+IF(ICONV_INCLUDE_DIR)
21
+  CHECK_FUNCTION_EXISTS(iconv ICONV_FOUND)
22
+  IF(NOT ICONV_FOUND)
23
+    FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2)
24
+    IF(ICONV_LIBRARIES)
25
+      SET(ICONV_FOUND TRUE)
26
+    ENDIF(ICONV_LIBRARIES)
27
+  ENDIF(NOT ICONV_FOUND)
28
+ENDIF(ICONV_INCLUDE_DIR)
29
 
30
 set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
31
 set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
(-)net-im/zephyr/Makefile (-6 / +9 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	zephyr
4
PORTNAME=	zephyr
5
DISTVERSION=	3.0.1
5
DISTVERSION=	3.0.1
6
PORTREVISION=	1
6
PORTREVISION=	2
7
CATEGORIES=	net-im
7
CATEGORIES=	net-im
8
MASTER_SITES=	http://zephyr.1ts.org/export/2642/distribution/
8
MASTER_SITES=	http://zephyr.1ts.org/export/2642/distribution/
9
9
Lines 13-18 COMMENT= Enterprise-scale distributed me Link Here
13
LICENSE=	MIT
13
LICENSE=	MIT
14
14
15
GNU_CONFIGURE=	yes
15
GNU_CONFIGURE=	yes
16
# it is an upstream bug that --with-krb5 needs a path
17
CONFIGURE_ARGS=	--with-krb5="${KRB5_DIR}"
16
USES=		iconv libtool readline
18
USES=		iconv libtool readline
17
USE_RC_SUBR=	zhm
19
USE_RC_SUBR=	zhm
18
USE_LDCONFIG=	yes
20
USE_LDCONFIG=	yes
Lines 24-30 CPPFLAGS+= -I${LOCALBASE}/include Link Here
24
OPTIONS_DEFINE=		HEIMDAL
26
OPTIONS_DEFINE=		HEIMDAL
25
HEIMDAL_DESC=		Link against libss.so from security/heimdal
27
HEIMDAL_DESC=		Link against libss.so from security/heimdal
26
28
27
.include <bsd.port.options.mk>
29
.include <bsd.port.pre.mk>
30
31
.if empty(ICONV_LIB)
32
CONFIGURE_ARGS+=ac_cv_lib_iconv_libiconv_open=no
33
.endif
28
34
29
.if ${PORT_OPTIONS:MHEIMDAL}
35
.if ${PORT_OPTIONS:MHEIMDAL}
30
BROKEN=		bad depobj
36
BROKEN=		bad depobj
Lines 39-51 LIB_DEPENDS+= libss.so.2:${PORTSDIR}/dev Link Here
39
KRB5_DIR?=	${DESTDIR}/usr
45
KRB5_DIR?=	${DESTDIR}/usr
40
.endif
46
.endif
41
47
42
# it is an upstream bug that --with-krb5 needs a path
43
CONFIGURE_ARGS=	--with-krb5="${KRB5_DIR}"
44
45
# try to fix parallel (-jX) builds: add missing inter-source dependencies
48
# try to fix parallel (-jX) builds: add missing inter-source dependencies
46
post-patch:
49
post-patch:
47
	@${REINPLACE_CMD} -e \
50
	@${REINPLACE_CMD} -e \
48
		'/^eval\.o/,$$s,port\.h,& string_stack.h new_string.h, ; \
51
		'/^eval\.o/,$$s,port\.h,& string_stack.h new_string.h, ; \
49
		s,_aux\.h,.h,' ${WRKSRC}/zwgc/Makefile.in
52
		s,_aux\.h,.h,' ${WRKSRC}/zwgc/Makefile.in
50
53
51
.include <bsd.port.mk>
54
.include <bsd.port.post.mk>
(-)net-mgmt/bandwidthd/Makefile (-2 / +3 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	bandwidthd
4
PORTNAME=	bandwidthd
5
PORTVERSION=	2.0.1
5
PORTVERSION=	2.0.1
6
PORTREVISION=	6
6
PORTREVISION=	7
7
CATEGORIES=	net-mgmt
7
CATEGORIES=	net-mgmt
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
9
9
Lines 17-23 LIB_DEPENDS+= libgd.so:${PORTSDIR}/graph Link Here
17
USE_CSTD=	gnu89
17
USE_CSTD=	gnu89
18
18
19
GNU_CONFIGURE=	YES
19
GNU_CONFIGURE=	YES
20
USES=		iconv gmake tar:tgz
20
CONFIGURE_ARGS=	ac_cv_lib_iconv_libiconv_open=no
21
USES=		gmake tar:tgz
21
22
22
post-install:
23
post-install:
23
	${INSTALL_SCRIPT} ${FILESDIR}/bandwidthd.sh \
24
	${INSTALL_SCRIPT} ${FILESDIR}/bandwidthd.sh \
(-)net-mgmt/icinga/Makefile (-2 / +4 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	icinga
4
PORTNAME=	icinga
5
PORTVERSION=	1.13.1
5
PORTVERSION=	1.13.1
6
PORTREVISION=	1
6
CATEGORIES=	net-mgmt
7
CATEGORIES=	net-mgmt
7
MASTER_SITES=	https://github.com/Icinga/${PORTNAME}-core/releases/download/v${PORTVERSION}/
8
MASTER_SITES=	https://github.com/Icinga/${PORTNAME}-core/releases/download/v${PORTVERSION}/
8
9
Lines 14-20 LICENSE= GPLv2 Link Here
14
LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
15
LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
15
		libgd.so:${PORTSDIR}/graphics/gd
16
		libgd.so:${PORTSDIR}/graphics/gd
16
17
17
USES=		iconv gmake
18
USES=		gmake
18
USE_AUTOTOOLS=	autoconf
19
USE_AUTOTOOLS=	autoconf
19
USE_RC_SUBR=	icinga
20
USE_RC_SUBR=	icinga
20
21
Lines 51-57 CONFIGURE_ARGS= --with-command-user=${IC Link Here
51
		--with-log-dir=${ICINGALOGDIR} \
52
		--with-log-dir=${ICINGALOGDIR} \
52
		--with-httpd-conf=${EXAMPLESDIR}/apache22 \
53
		--with-httpd-conf=${EXAMPLESDIR}/apache22 \
53
		--enable-event-broker \
54
		--enable-event-broker \
54
		--enable-nanosleep
55
		--enable-nanosleep \
56
		ac_cv_lib_iconv_main=no
55
57
56
CONFIGURE_ENV=	PERL=${PERL} \
58
CONFIGURE_ENV=	PERL=${PERL} \
57
		HOME=${WRKDIR} # prevent creation of .rnd file
59
		HOME=${WRKDIR} # prevent creation of .rnd file
(-)net-mgmt/nagios/Makefile (-3 / +4 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	nagios
4
PORTNAME=	nagios
5
PORTVERSION=	3.5.1
5
PORTVERSION=	3.5.1
6
PORTREVISION=	7
6
PORTREVISION=	8
7
CATEGORIES=	net-mgmt
7
CATEGORIES=	net-mgmt
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION}
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION}
9
9
Lines 17-23 LIB_DEPENDS= libltdl.so:${PORTSDIR}/deve Link Here
17
17
18
PORTSCOUT=	limit:^3.
18
PORTSCOUT=	limit:^3.
19
19
20
USES=		iconv perl5 cpe
20
USES=		cpe perl5
21
USE_PERL5=	build
21
USE_PERL5=	build
22
USE_PHP=	yes
22
USE_PHP=	yes
23
USE_RC_SUBR=	nagios
23
USE_RC_SUBR=	nagios
Lines 38-44 CONFIGURE_ARGS= --with-command-user=${NA Link Here
38
		--localstatedir=${NAGIOSDIR} \
38
		--localstatedir=${NAGIOSDIR} \
39
		--with-httpd-conf=${PREFIX}/etc \
39
		--with-httpd-conf=${PREFIX}/etc \
40
		--with-checkresult-dir=${NAGIOSDIR}/checkresults \
40
		--with-checkresult-dir=${NAGIOSDIR}/checkresults \
41
		--disable-statuswrl
41
		--disable-statuswrl \
42
		ac_cv_lib_iconv_main=no
42
CONFIGURE_ENV=	PERL=${PERL}
43
CONFIGURE_ENV=	PERL=${PERL}
43
44
44
CPPFLAGS+=	-I${LOCALBASE}/include
45
CPPFLAGS+=	-I${LOCALBASE}/include
(-)net-mgmt/nagios4/Makefile (-3 / +4 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	nagios
4
PORTNAME=	nagios
5
PORTVERSION=	4.0.8
5
PORTVERSION=	4.0.8
6
PORTREVISION=	3
6
PORTREVISION=	4
7
CATEGORIES=	net-mgmt
7
CATEGORIES=	net-mgmt
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-4.x/${PORTNAME}-${PORTVERSION}
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-4.x/${PORTNAME}-${PORTVERSION}
9
PKGNAMESUFFIX=	4
9
PKGNAMESUFFIX=	4
Lines 16-22 LICENSE= GPLv2 Link Here
16
LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
16
LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
17
		libgd.so:${PORTSDIR}/graphics/gd
17
		libgd.so:${PORTSDIR}/graphics/gd
18
18
19
USES=		gmake iconv perl5 cpe
19
USES=		cpe gmake perl5
20
USE_PERL5=	build
20
USE_PERL5=	build
21
USE_PHP=	xml
21
USE_PHP=	xml
22
USE_RC_SUBR=	nagios
22
USE_RC_SUBR=	nagios
Lines 38-44 CONFIGURE_ARGS= --with-command-user=${NA Link Here
38
		--with-httpd-conf=${PREFIX}/etc \
38
		--with-httpd-conf=${PREFIX}/etc \
39
		--with-checkresult-dir=${NAGIOSDIR}/checkresults \
39
		--with-checkresult-dir=${NAGIOSDIR}/checkresults \
40
		--disable-statuswrl \
40
		--disable-statuswrl \
41
		--enable-event-broker
41
		--enable-event-broker \
42
		ac_cv_lib_iconv_main=no
42
CONFIGURE_ENV=	PERL=${PERL}
43
CONFIGURE_ENV=	PERL=${PERL}
43
44
44
CPPFLAGS+=	-I${LOCALBASE}/include
45
CPPFLAGS+=	-I${LOCALBASE}/include
(-)net-p2p/libtorrent-rasterbar/files/patch-include-libtorrent-config.hpp (+15 lines)
Line 0 Link Here
1
--- include/libtorrent/config.hpp.orig	2014-08-15 06:51:56 UTC
2
+++ include/libtorrent/config.hpp
3
@@ -184,12 +184,6 @@ POSSIBILITY OF SUCH DAMAGE.
4
 // execinfo.h is available in the MacOS X 10.5 SDK.
5
 #define TORRENT_USE_EXECINFO MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
6
 #endif
7
-#else
8
-// FreeBSD has a reasonable iconv signature
9
-// unless we're on glibc
10
-#ifndef __GLIBC__
11
-# define TORRENT_ICONV_ARG (const char**)
12
-#endif
13
 #endif
14
 #define TORRENT_HAS_FALLOCATE 0
15
 #define TORRENT_USE_IFADDRS 1
(-)net-p2p/linuxdcpp/files/patch-SConstruct (-7 / +15 lines)
Lines 1-6 Link Here
1
--- SConstruct.orig	2011-04-18 01:57:09.000000000 +0800
1
--- SConstruct.orig	2011-04-17 17:57:09 UTC
2
+++ SConstruct	2011-10-19 23:42:24.000000000 +0800
2
+++ SConstruct
3
@@ -20,7 +20,7 @@
3
@@ -20,7 +20,7 @@ BUILD_LOCALE_PATH = BUILD_PATH + 'locale
4
 BUILD_FLAGS = {
4
 BUILD_FLAGS = {
5
 	'common'  : ['-I#', '-D_GNU_SOURCE', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_REENTRANT'],
5
 	'common'  : ['-I#', '-D_GNU_SOURCE', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_REENTRANT'],
6
 	'debug'   : ['-g', '-ggdb', '-Wall', '-D_DEBUG'], 
6
 	'debug'   : ['-g', '-ggdb', '-Wall', '-D_DEBUG'], 
Lines 9-15 Link Here
9
 }
9
 }
10
 
10
 
11
 # ----------------------------------------------------------------------
11
 # ----------------------------------------------------------------------
12
@@ -106,6 +106,7 @@
12
@@ -106,6 +106,7 @@ else:
13
 vars.AddVariables(
13
 vars.AddVariables(
14
 	BoolVariable('debug', 'Compile the program with debug information', 0),
14
 	BoolVariable('debug', 'Compile the program with debug information', 0),
15
 	BoolVariable('release', 'Compile the program with optimizations', 0),
15
 	BoolVariable('release', 'Compile the program with optimizations', 0),
Lines 17-23 Link Here
17
 	BoolVariable('profile', 'Compile the program with profiling information', 0),
17
 	BoolVariable('profile', 'Compile the program with profiling information', 0),
18
 	PathVariable('PREFIX', 'Compile the program with PREFIX as the root for installation', '/usr/local', PathVariable.PathIsDir),
18
 	PathVariable('PREFIX', 'Compile the program with PREFIX as the root for installation', '/usr/local', PathVariable.PathIsDir),
19
 	('FAKE_ROOT', 'Make scons install the program under a fake root', '')
19
 	('FAKE_ROOT', 'Make scons install the program under a fake root', '')
20
@@ -131,7 +131,10 @@
20
@@ -131,7 +132,10 @@ if os.environ.has_key('CC'):
21
 	env['CC'] = os.environ['CC']
21
 	env['CC'] = os.environ['CC']
22
 
22
 
23
 if os.environ.has_key('CXXFLAGS'):
23
 if os.environ.has_key('CXXFLAGS'):
Lines 29-35 Link Here
29
 
29
 
30
 if os.environ.has_key('LDFLAGS'):
30
 if os.environ.has_key('LDFLAGS'):
31
 	env['LINKFLAGS'] = os.environ['LDFLAGS'].split()
31
 	env['LINKFLAGS'] = os.environ['LDFLAGS'].split()
32
@@ -139,6 +140,12 @@
32
@@ -139,6 +143,12 @@ if os.environ.has_key('LDFLAGS'):
33
 if os.environ.has_key('CFLAGS'):
33
 if os.environ.has_key('CFLAGS'):
34
 	env['CFLAGS'] = os.environ['CFLAGS'].split()
34
 	env['CFLAGS'] = os.environ['CFLAGS'].split()
35
 
35
 
Lines 42-48 Link Here
42
 env['CPPDEFINES'] = [] # Initialize as a list so Append doesn't concat strings
42
 env['CPPDEFINES'] = [] # Initialize as a list so Append doesn't concat strings
43
 
43
 
44
 env.SConsignFile('build/sconf/.sconsign')
44
 env.SConsignFile('build/sconf/.sconsign')
45
@@ -263,14 +270,15 @@
45
@@ -256,21 +266,20 @@ if not 'install' in COMMAND_LINE_TARGETS
46
 
47
 	if not conf.CheckHeader('iconv.h'):
48
 		Exit(1)
49
-	elif conf.CheckLibWithHeader('iconv', 'iconv.h', 'c', 'iconv(0, (const char **)0, 0, (char**)0, 0);'):
50
-		conf.env.Append(CPPDEFINES = ('ICONV_CONST', 'const'))
51
 
52
 	if conf.CheckHeader(['sys/types.h', 'sys/socket.h', 'ifaddrs.h', 'net/if.h']):
46
 		conf.env.Append(CPPDEFINES = 'HAVE_IFADDRS_H')
53
 		conf.env.Append(CPPDEFINES = 'HAVE_IFADDRS_H')
47
 
54
 
48
 	# TODO: Implement a plugin system so libnotify doesn't have compile-time dependencies
55
 	# TODO: Implement a plugin system so libnotify doesn't have compile-time dependencies
Lines 65-67 Link Here
65
+				conf.env.Append(CPPDEFINES = 'HAVE_LIBNOTIFY_0_7')
72
+				conf.env.Append(CPPDEFINES = 'HAVE_LIBNOTIFY_0_7')
66
 
73
 
67
 	conf.CheckBZRRevision()
74
 	conf.CheckBZRRevision()
75
 
(-)net-p2p/twister/files/patch-libtorrent-include-libtorrent-config.hpp (+15 lines)
Line 0 Link Here
1
--- libtorrent/include/libtorrent/config.hpp.orig	2015-03-29 22:58:17 UTC
2
+++ libtorrent/include/libtorrent/config.hpp
3
@@ -204,12 +204,6 @@ POSSIBILITY OF SUCH DAMAGE.
4
 
5
 #endif // __APPLE__
6
 
7
-#else
8
-// FreeBSD has a reasonable iconv signature
9
-// unless we're on glibc
10
-#ifndef __GLIBC__
11
-# define TORRENT_ICONV_ARG (const char**)
12
-#endif
13
 #endif
14
 #define TORRENT_HAS_FALLOCATE 0
15
 #define TORRENT_USE_IFADDRS 1
(-)news/pan/files/patch-pan_usenet-utils_mime-utils.cc (-14 lines)
Lines 1-14 Link Here
1
--- pan/usenet-utils/mime-utils.cc.orig	2013-03-12 18:24:13.000000000 +0000
2
+++ pan/usenet-utils/mime-utils.cc	2013-03-12 18:25:19.000000000 +0000
3
@@ -77,7 +77,11 @@
4
       outbuf = out + converted;
5
       outleft = outlen - converted;
6
 
7
+#if defined(__NetBSD__) || defined(__FreeBSD__)
8
+      converted = iconv (cd, &inbuf, &inleft, &outbuf, &outleft);
9
+#else
10
       converted = iconv (cd, (char **) &inbuf, &inleft, &outbuf, &outleft);
11
+#endif
12
 
13
       if (converted != (size_t) -1 && errno == 0) {
14
         /*
(-)print/gv/Makefile (-3 / +9 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	gv
4
PORTNAME=	gv
5
PORTVERSION=	3.7.4
5
PORTVERSION=	3.7.4
6
PORTREVISION=	1
6
PORTREVISION=	2
7
CATEGORIES=	print
7
CATEGORIES=	print
8
MASTER_SITES=	GNU/${PORTNAME}
8
MASTER_SITES=	GNU/${PORTNAME}
9
9
Lines 18-24 USES= iconv gmake perl5 shebangfix Link Here
18
USE_PERL5=	build
18
USE_PERL5=	build
19
GNU_CONFIGURE=	yes
19
GNU_CONFIGURE=	yes
20
CPPFLAGS+=	-I${LOCALBASE}/include
20
CPPFLAGS+=	-I${LOCALBASE}/include
21
LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB}
21
LIBS+=		-L${LOCALBASE}/lib
22
CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/X11 \
22
CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/X11 \
23
			--enable-setenv-code \
23
			--enable-setenv-code \
24
			--enable-SIGCHLD-fallback
24
			--enable-SIGCHLD-fallback
Lines 33-36 PLIST_FILES= bin/gv \ Link Here
33
		man/man1/gv-update-userconfig.1.gz
33
		man/man1/gv-update-userconfig.1.gz
34
PLIST_DIRS=	%%DATADIR%%/safe-gs-workdir
34
PLIST_DIRS=	%%DATADIR%%/safe-gs-workdir
35
35
36
.include <bsd.port.mk>
36
.include <bsd.port.pre.mk>
37
38
.if empty(ICONV_LIB)
39
CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no
40
.endif
41
42
.include <bsd.port.post.mk>
(-)security/scanhill/Makefile (-1 / +3 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	scanhill
3
PORTNAME=	scanhill
4
DISTVERSION=	0.5-p1
4
DISTVERSION=	0.5-p1
5
PORTREVISION=	1
5
CATEGORIES=	security net-im
6
CATEGORIES=	security net-im
6
MASTER_SITES=	http://www.enderunix.org/scanhill/ \
7
MASTER_SITES=	http://www.enderunix.org/scanhill/ \
7
		http://www.sourcefiles.org/Networking/Security/Sniffers/ \
8
		http://www.sourcefiles.org/Networking/Security/Sniffers/ \
Lines 23-29 MYSQL_USE= MYSQL=yes Link Here
23
MYSQL_CONFIGURE_ENABLE=	mysql
24
MYSQL_CONFIGURE_ENABLE=	mysql
24
25
25
post-patch:
26
post-patch:
26
	@${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
27
	@${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' \
28
		-e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure
27
29
28
do-install:
30
do-install:
29
	${INSTALL_PROGRAM} ${WRKSRC}/scanhill ${STAGEDIR}${PREFIX}/bin
31
	${INSTALL_PROGRAM} ${WRKSRC}/scanhill ${STAGEDIR}${PREFIX}/bin
(-)security/scanhill/files/patch-configure (-3 / +30 lines)
Lines 1-6 Link Here
1
--- configure.orig	2013-10-30 11:38:52.000000000 -0200
1
--- configure.orig	2007-03-11 09:18:22 UTC
2
+++ configure	2013-10-30 11:39:25.000000000 -0200
2
+++ configure
3
@@ -975,7 +975,7 @@
3
@@ -537,7 +537,7 @@ fi
4
 
5
 
6
 
7
-CFLAGS="-g -I.  -I/usr/local/include"
8
+CFLAGS="${CFLAGS} -I.  -I/usr/local/include"
9
       # Extract the first word of "gcc", so it can be a program name with args.
10
 set dummy gcc; ac_word=$2
11
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
12
@@ -975,7 +975,7 @@ fi
4
 done
13
 done
5
 
14
 
6
       # Check whether --enable-mysql or --disable-mysql was given.
15
       # Check whether --enable-mysql or --disable-mysql was given.
Lines 9-11 Link Here
9
   enableval="$enable_mysql"
18
   enableval="$enable_mysql"
10
   
19
   
11
 	for ac_hdr in mysql/mysql.h
20
 	for ac_hdr in mysql/mysql.h
21
@@ -1066,15 +1066,13 @@ done
22
 #define _mysql_ 1
23
 EOF
24
 
25
-	 LDFLAGS="-L/usr/local/lib -L/usr/local/lib/mysql"
26
-	 LIBS="-lpcap -liconv -lmysqlclient"
27
+	 LIBS="${LIBS} -L/usr/local/lib -L/usr/local/lib/mysql -lpcap -liconv -lmysqlclient"
28
 	libexecdir="hash.o main.o nstrstr.o msn.o sniff.o db.o conf.o miscutil.o "
29
 
30
 else
31
   
32
 	echo "$ac_t""disabled" 1>&6
33
-	 LDFLAGS="-L/usr/local/lib"
34
-	 LIBS="-lpcap -liconv" 
35
+	 LIBS="${LIBS} -L/usr/local/lib -lpcap -liconv" 
36
 	libexecdir="hash.o main.o nstrstr.o msn.o sniff.o " 
37
 
38
 fi
(-)sysutils/xorriso/Makefile (-1 / +4 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	xorriso
4
PORTNAME=	xorriso
5
PORTVERSION=	1.3.4
5
PORTVERSION=	1.3.4
6
PORTREVISION=	1
6
PORTREVISION=	2
7
CATEGORIES=	sysutils
7
CATEGORIES=	sysutils
8
MASTER_SITES=	http://files.libburnia-project.org/releases/
8
MASTER_SITES=	http://files.libburnia-project.org/releases/
9
DISTNAME=	libisoburn-${PORTVERSION}
9
DISTNAME=	libisoburn-${PORTVERSION}
Lines 25-28 USE_LDCONFIG= yes Link Here
25
25
26
INFO=		xorrecord xorriso xorrisofs
26
INFO=		xorrecord xorriso xorrisofs
27
27
28
post-patch:
29
	@${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
30
28
.include <bsd.port.mk>
31
.include <bsd.port.mk>
(-)textproc/ctpp2/Makefile (-3 / +9 lines)
Lines 3-16 Link Here
3
3
4
PORTNAME=	ctpp2
4
PORTNAME=	ctpp2
5
PORTVERSION=	2.8.3
5
PORTVERSION=	2.8.3
6
PORTREVISION=	1
6
PORTREVISION=	3
7
CATEGORIES=	textproc devel
7
CATEGORIES=	textproc devel
8
MASTER_SITES=	http://ctpp.havoc.ru/download/
8
MASTER_SITES=	http://ctpp.havoc.ru/download/
9
9
10
MAINTAINER=	vg@FreeBSD.org
10
MAINTAINER=	vg@FreeBSD.org
11
COMMENT=	C++ library to use templates in C/C++ projects, version 2
11
COMMENT=	C++ library to use templates in C/C++ projects, version 2
12
12
13
USES=		cmake gettext iconv:build compiler:c++11-lang
13
USES=		cmake gettext iconv compiler:c++11-lang
14
USE_LDCONFIG=	yes
14
USE_LDCONFIG=	yes
15
15
16
PLIST_SUB+=	PORTVERSION=${PORTVERSION}
16
PLIST_SUB+=	PORTVERSION=${PORTVERSION}
Lines 41-44 OPTIMIZATION_CMAKE_OFF= -DENABLE_OPTIMIZ Link Here
41
41
42
PORTDOCS=	template_language.html
42
PORTDOCS=	template_language.html
43
43
44
.include <bsd.port.mk>
44
.include <bsd.port.pre.mk>
45
46
.if empty(ICONV_LIB)
47
CMAKE_ARGS+=	-DSKIP_ICONV_LIRARY:STRING=ON
48
.endif
49
50
.include <bsd.port.post.mk>
(-)textproc/ctpp2/files/patch-src-CTPP2StringIconvOutputCollector.cpp (+20 lines)
Line 0 Link Here
1
--- src/CTPP2StringIconvOutputCollector.cpp.orig	2012-08-02 07:22:44 UTC
2
+++ src/CTPP2StringIconvOutputCollector.cpp
3
@@ -56,7 +56,7 @@ StringIconvOutputCollector::StringIconvO
4
 		throw CTPPCharsetRecodeException(sSrcEnc.c_str(), sDstEnc.c_str());
5
 	}
6
 
7
-#if (_LIBICONV_VERSION >= 0x0108)
8
+#if (_LIBICONV_VERSION >= 0x0108) || defined(__FreeBSD__)
9
 	int iFlag = 1;
10
 	// Discard illegal characters
11
 	if (iFlags & C_ICONV_DISCARD_ILSEQ) { iconvctl(oIconv, ICONV_SET_DISCARD_ILSEQ, &iFlag); }
12
@@ -85,7 +85,7 @@ INT_32 StringIconvOutputCollector::Colle
13
 	size_t iDstLength     = CTPP_ESCAPE_BUFFER_LEN;
14
 
15
 	char         aDstData[CTPP_ESCAPE_BUFFER_LEN];
16
-#if defined(linux) || defined(__APPLE__)
17
+#if defined(linux) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__)
18
 	char       * aSrcData = (char *)vData;
19
 #else
20
 	const char * aSrcData = (const char *)vData;
(-)textproc/ctpp2/files/patch-src-functions-FnIconv.cpp (+20 lines)
Line 0 Link Here
1
--- src/functions/FnIconv.cpp.orig	2012-08-02 07:22:44 UTC
2
+++ src/functions/FnIconv.cpp
3
@@ -145,7 +145,7 @@ INT_32 FnIconv::Handler(CDT            *
4
 		}
5
 	}
6
 
7
-#if (_LIBICONV_VERSION >= 0x0108)
8
+#if (_LIBICONV_VERSION >= 0x0108) || defined(__FreeBSD__)
9
 	int iFlag = 1;
10
 	// Discard illegal characters
11
 	if (iFlags & C_ICONV_DISCARD_ILSEQ)
12
@@ -173,7 +173,7 @@ INT_32 FnIconv::Handler(CDT            *
13
 	size_t iDstLength     = CTPP_ESCAPE_BUFFER_LEN;
14
 
15
 	char         aDstData[CTPP_ESCAPE_BUFFER_LEN];
16
-#if defined(linux) || defined(__APPLE__)
17
+#if defined(linux) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__)
18
 	char       * aSrcData = (char *)sWhat.data();
19
 #else
20
 	const char * aSrcData = (const char *)sWhat.data();
(-)textproc/estraier/Makefile (-6 / +7 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	estraier
4
PORTNAME=	estraier
5
PORTVERSION=	1.2.30
5
PORTVERSION=	1.2.30
6
PORTREVISION=	2
6
PORTREVISION=	3
7
CATEGORIES=	textproc
7
CATEGORIES=	textproc
8
MASTER_SITES=	http://fallabs.com/estraier/
8
MASTER_SITES=	http://fallabs.com/estraier/
9
9
Lines 24-30 CONFIGURE_ARGS= --with-sysqdbm \ Link Here
24
		--enable-dlfilter \
24
		--enable-dlfilter \
25
		--enable-devel
25
		--enable-devel
26
CPPFLAGS+=	-I${LOCALBASE}/include
26
CPPFLAGS+=	-I${LOCALBASE}/include
27
LDFLAGS+=	-lpthread -L${LOCALBASE}/include
27
LIBS+=		-L${LOCALBASE}/include
28
28
29
CHASEN_LIB_DEPENDS=	libchasen.so:${PORTSDIR}/japanese/chasen-base
29
CHASEN_LIB_DEPENDS=	libchasen.so:${PORTSDIR}/japanese/chasen-base
30
CHASEN_CONFIGURE_ENABLE=	chasen
30
CHASEN_CONFIGURE_ENABLE=	chasen
Lines 40-53 CONFIGURE_ARGS+= --enable-mecab Link Here
40
.endif
40
.endif
41
41
42
post-patch:
42
post-patch:
43
	@${REINPLACE_CMD} -e 's|-lc||' -e 's|-liconv|${ICONV_LIB}|' \
44
		${WRKSRC}/configure
43
	@${REINPLACE_CMD} -e \
45
	@${REINPLACE_CMD} -e \
44
		's|-lc ||g' ${WRKSRC}/configure
46
		's|$$(RELCFLAGS)|@CFLAGS@| ; \
45
	@${REINPLACE_CMD} -e \
47
		 s|^LDFLAGS =|& @LDFLAGS@ | ; \
46
		's|-O2|@CFLAGS@|g ; \
47
		 s|HOME|LOCALBASE|g ; \
48
		 s|HOME|LOCALBASE|g ; \
48
		 s|:/usr/local/lib||g ; \
49
		 s|:/usr/local/lib||g ; \
49
		 s|-I/usr/local/include||g ; \
50
		 s|-I/usr/local/include||g ; \
50
		 s|-L/usr/local/lib|-lpthread|g' ${WRKSRC}/Makefile.in
51
		 s|-L/usr/local/lib||g' ${WRKSRC}/Makefile.in
51
52
52
post-install:
53
post-install:
53
.for file in estindex estmbtomh estserver estsiutil estxview
54
.for file in estindex estmbtomh estserver estsiutil estxview
(-)textproc/gmetadom/files/patch-GdomeSmartDOMGdomeString.cc (-11 lines)
Lines 1-11 Link Here
1
--- src/gdome_cpp_smart/basic/GdomeSmartDOMGdomeString.cc.orig	Wed Apr  2 12:36:39 2003
2
+++ src/gdome_cpp_smart/basic/GdomeSmartDOMGdomeString.cc	Wed Apr  2 12:37:21 2003
3
@@ -95,7 +95,7 @@
4
 
5
     while (inBytesLeft > 0) {
6
       //cout << "before: " << (void*) inbuf << " " << inBytesLeft << " " << (void*) outbuf << " " << outBytesLeft << endl;
7
-      size_t iconv_res = iconv(cd, &inbuf, &inBytesLeft, &outbuf, &outBytesLeft);
8
+      size_t iconv_res = iconv(cd, (const char**)&inbuf, &inBytesLeft, &outbuf, &outBytesLeft);
9
       //cout << "after: " << (void*) inbuf << " " << inBytesLeft << " " << (void*) outbuf << " " << outBytesLeft << endl;
10
 
11
       unsigned n = outbuf - outbuf0;
(-)textproc/goldendict/files/patch-bgl_babylon.cc (-14 lines)
Lines 8-24 Link Here
8
 #include<iconv.h>
8
 #include<iconv.h>
9
 #include <QTextDocument>
9
 #include <QTextDocument>
10
 
10
 
11
@@ -648,13 +648,8 @@
12
 
13
   inbufbytes = s.size();
14
   outbufbytes = s.size() * 6;
15
-#ifdef _WIN32
16
   const char *inbuf;
17
   inbuf = s.data();
18
-#else
19
-  char *inbuf;
20
-  inbuf = (char *)s.data();
21
-#endif
22
   outbuf = (char*)malloc( outbufbytes + 1 );
23
   memset( outbuf, '\0', outbufbytes + 1 );
24
   defbuf = outbuf;
(-)textproc/goldendict/files/patch-iconv.cc (-14 lines)
Lines 1-14 Link Here
1
--- ./iconv.cc.orig	2010-12-04 00:12:46.000000000 +0300
2
+++ ./iconv.cc	2010-12-28 11:46:37.208721626 +0300
3
@@ -44,11 +44,7 @@
4
   throw( exIncorrectSeq, exOther )
5
 {
6
   size_t result = iconv( state,
7
-                         #ifdef __WIN32
8
                          (char const **)&inBuf,
9
-                         #else
10
-                         (char **)&inBuf,
11
-                         #endif
12
                                            &inBytesLeft,
13
                          (char **)&outBuf, &outBytesLeft );
14
 
(-)textproc/hyperestraier/Makefile (-3 / +5 lines)
Lines 4-10 Link Here
4
4
5
PORTNAME=	hyperestraier
5
PORTNAME=	hyperestraier
6
PORTVERSION=	1.4.13
6
PORTVERSION=	1.4.13
7
PORTREVISION=	1
7
PORTREVISION=	2
8
CATEGORIES=	textproc
8
CATEGORIES=	textproc
9
MASTER_SITES=	SF
9
MASTER_SITES=	SF
10
10
Lines 23-29 USE_LDCONFIG= yes Link Here
23
GNU_CONFIGURE=	yes
23
GNU_CONFIGURE=	yes
24
CONFIGURE_ARGS=	--enable-bzip2 --disable-zlib
24
CONFIGURE_ARGS=	--enable-bzip2 --disable-zlib
25
CPPFLAGS+=	-I${LOCALBASE}/include
25
CPPFLAGS+=	-I${LOCALBASE}/include
26
LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
26
LIBS+=		-L${LOCALBASE}/lib
27
INSTALL_TARGET=	install-strip
27
INSTALL_TARGET=	install-strip
28
28
29
OPTIONS_DEFINE=	LZO MECAB
29
OPTIONS_DEFINE=	LZO MECAB
Lines 39-46 MECAB_RUN_DEPENDS= ${LOCALBASE}/lib/meca Link Here
39
39
40
post-patch:
40
post-patch:
41
	@${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
41
	@${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
42
		-e 's/@MYCFLAGS@/@CFLAGS@ -Wall -fPIC -fsigned-char/' \
42
		${WRKSRC}/Makefile.in
43
		${WRKSRC}/Makefile.in
43
	${RM} -f ${WRKSRC}/doc/intro-en.html~ ${WRKSRC}/doc/intro-ja.html~
44
	@${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
45
	@${RM} -f ${WRKSRC}/doc/intro-en.html~ ${WRKSRC}/doc/intro-ja.html~
44
46
45
post-install:
47
post-install:
46
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libestraier.so
48
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libestraier.so
(-)textproc/p5-Text-Unaccent/Makefile (-2 / +4 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	Text-Unaccent
4
PORTNAME=	Text-Unaccent
5
PORTVERSION=	1.08
5
PORTVERSION=	1.08
6
PORTREVISION=	2
6
PORTREVISION=	3
7
CATEGORIES=	textproc perl5
7
CATEGORIES=	textproc perl5
8
MASTER_SITES=	CPAN
8
MASTER_SITES=	CPAN
9
PKGNAMEPREFIX=	p5-
9
PKGNAMEPREFIX=	p5-
Lines 15-20 LICENSE= GPLv2 Link Here
15
15
16
USES=		iconv perl5
16
USES=		iconv perl5
17
USE_PERL5=	configure
17
USE_PERL5=	configure
18
CFLAGS+=	-DICONV_CONST=const
18
19
post-patch:
20
	@${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/Makefile.PL
19
21
20
.include <bsd.port.mk>
22
.include <bsd.port.mk>
(-)textproc/p5-XML-TinyXML/Makefile (-2 / +4 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	XML-TinyXML
4
PORTNAME=	XML-TinyXML
5
PORTVERSION=	0.34
5
PORTVERSION=	0.34
6
PORTREVISION=	1
6
PORTREVISION=	2
7
CATEGORIES=	textproc perl5
7
CATEGORIES=	textproc perl5
8
MASTER_SITES=	CPAN
8
MASTER_SITES=	CPAN
9
PKGNAMEPREFIX=	p5-
9
PKGNAMEPREFIX=	p5-
Lines 14-19 COMMENT= Little and efficient Perl modul Link Here
14
USES=		iconv perl5
14
USES=		iconv perl5
15
USE_PERL5=	configure
15
USE_PERL5=	configure
16
16
17
MAKE_ARGS+=	LIBS='-L${LOCALBASE}/lib' INC='-I. -I${LOCALBASE}/include'
17
CONFIGURE_ARGS=	LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" \
18
		INC="-I. -I${LOCALBASE}/include"
19
CFLAGS+=	-DUSE_ICONV
18
20
19
.include <bsd.port.mk>
21
.include <bsd.port.mk>
(-)textproc/simplexml/Makefile (-2 / +2 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	simplexml
4
PORTNAME=	simplexml
5
PORTVERSION=	1.0.1
5
PORTVERSION=	1.0.1
6
PORTREVISION=	1
6
CATEGORIES=	textproc
7
CATEGORIES=	textproc
7
MASTER_SITES=	http://bitbucket.org/klepa/simplexml/get/
8
MASTER_SITES=	http://bitbucket.org/klepa/simplexml/get/
8
DISTNAME=	${PORTVERSION}
9
DISTNAME=	${PORTVERSION}
Lines 24-30 CMAKE_ARGS+= -DDEBUG_MODE:BOOL=ON Link Here
24
25
25
post-patch:
26
post-patch:
26
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|; \
27
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|; \
27
		/set.*CMAKE_BUILD_TYPE/d' ${WRKSRC}/CMakeLists.txt \
28
		/set.*CMAKE_BUILD_TYPE/d' ${WRKSRC}/CMakeLists.txt
28
		${WRKSRC}/cmake/FindIconv.cmake
29
29
30
.include <bsd.port.mk>
30
.include <bsd.port.mk>
(-)textproc/simplexml/files/patch-cmake__FindIconv.cmake (-6 / +55 lines)
Lines 1-11 Link Here
1
--- cmake/FindIconv.cmake.orig	2014-09-03 02:19:35 UTC
1
--- cmake/FindIconv.cmake.orig	2010-08-17 10:55:45 UTC
2
+++ cmake/FindIconv.cmake
2
+++ cmake/FindIconv.cmake
3
@@ -40,7 +40,7 @@
3
@@ -30,45 +30,29 @@
4
 # also defined, but not for general use are
5
 # Iconv_LIBRARY, where to find the Iconv library.
6
 
7
+include(CheckFunctionExists)
8
+
9
 set(ICONV_H iconv.h)
10
 
11
 
12
 find_path(ICONV_INCLUDE_DIR ${ICONV_H}
13
-	PATHS  /usr/local/include
14
-	       /usr/include
15
-	       NO_DEFAULT_PATH
4
 	DOC   "Path to the ${ICONV_H} file"
16
 	DOC   "Path to the ${ICONV_H} file"
5
 )
17
 )
6
 
18
 
7
-find_library(Iconv_LIBRARY NAMES iconv
19
-find_library(Iconv_LIBRARY NAMES iconv
8
+find_library(Iconv_LIBRARY NAMES iconv c
20
-	PATHS  /usr/local/lib
9
 	PATHS  /usr/local/lib
21
-	       /usr/lib
10
 	       /usr/lib
22
-	       NO_DEFAULT_PATH
11
 	       NO_DEFAULT_PATH
23
-	DOC   "Library for character set conversion"
24
-)
25
-
26
-if(ICONV_INCLUDE_DIR AND Iconv_LIBRARY)
27
-	set(Iconv_FOUND TRUE)
28
-else(ICONV_INCLUDE_DIR AND Iconv_LIBRARY)
29
-	set(Iconv_FOUND FALSE)
30
-endif(ICONV_INCLUDE_DIR AND Iconv_LIBRARY)
31
+if(ICONV_INCLUDE_DIR)
32
+  check_function_exists(iconv Iconv_FOUND)
33
+  if(NOT Iconv_FOUND)
34
+    find_library(Iconv_LIBRARY NAMES iconv libiconv libiconv-2)
35
+    if(Iconv_LIBRARY)
36
+      set(Iconv_FOUND TRUE)
37
+    endif(Iconv_LIBRARY)
38
+  endif(NOT Iconv_FOUND)
39
+endif(ICONV_INCLUDE_DIR)
40
 
41
 if(Iconv_FOUND)
42
 	if(NOT Iconv_FIND_QUIETLY)
43
-		message(STATUS "Found Iconv: ${Iconv_LIBARY}")
44
+		message(STATUS "Found Iconv: ${Iconv_LIBRARY}")
45
 	endif(NOT Iconv_FIND_QUIETLY)
46
-else(Iconv_FOUND)
47
-	if("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
48
-		if(NOT Iconv_FIND_QUIETLY)
49
-			if(Iconv_FIND_REQUIRED)
50
-				message(FATAL_ERROR "Could not find the Iconv Library")
51
-			else(Iconv_FIND_REQUIRED)
52
-				message(STATUS "Could not find the Iconv Library")
53
-			endif(Iconv_FIND_REQUIRED)
54
-		endif(NOT Iconv_FIND_QUIETLY)
55
-	else("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
56
-		set(Iconv_LIBRARY "")
57
-	endif("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
58
 endif(Iconv_FOUND)
59
 
60
 mark_as_advanced(ICONV_INCLUDE_DIR Iconv_LIBRARY)
(-)textproc/wbxml2/Makefile (-10 / +3 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	wbxml2
4
PORTNAME=	wbxml2
5
PORTVERSION=	0.10.9
5
PORTVERSION=	0.10.9
6
PORTREVISION=	1
6
CATEGORIES=	textproc devel
7
CATEGORIES=	textproc devel
7
MASTER_SITES=	SF/libwbxml/libwbxml/${PORTVERSION}
8
MASTER_SITES=	SF/libwbxml/libwbxml/${PORTVERSION}
8
DISTNAME=	libwbxml-${PORTVERSION}
9
DISTNAME=	libwbxml-${PORTVERSION}
Lines 15-36 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
15
16
16
LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
17
LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
17
18
18
WRKSRC=			${WRKDIR}/libwbxml-${PORTVERSION}
19
USES=		cmake:outsource iconv tar:bzip2
19
CONFIGURE_WRKSRC=	${WRKDIR}/libwbxml-${PORTVERSION}/build
20
BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
21
INSTALL_WRKSRC=		${CONFIGURE_WRKSRC}
22
23
USES=		cmake iconv tar:bzip2
24
CMAKE_SOURCE_PATH=	..
25
USE_LDCONFIG=	yes
20
USE_LDCONFIG=	yes
21
WRKSRC=		${WRKDIR}/libwbxml-${PORTVERSION}
26
22
27
DOCSDIR=	${PREFIX}/share/doc/libwbxml
23
DOCSDIR=	${PREFIX}/share/doc/libwbxml
28
24
29
OPTIONS_DEFINE=	DOCS
25
OPTIONS_DEFINE=	DOCS
30
26
31
post-extract:
32
	@${MKDIR} ${CONFIGURE_WRKSRC}
33
34
post-install:
27
post-install:
35
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
28
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
36
.for file in AUTHORS BUGS ChangeLog NEWS README References THANKS TODO
29
.for file in AUTHORS BUGS ChangeLog NEWS README References THANKS TODO
(-)textproc/wbxml2/files/patch-cmake-modules-FindIconv.cmake (+32 lines)
Line 0 Link Here
1
--- cmake/modules/FindIconv.cmake.orig	2011-01-08 16:22:19 UTC
2
+++ cmake/modules/FindIconv.cmake
3
@@ -6,6 +6,8 @@
4
 #
5
 #  Copyright (c) 2010 Michael Bell <michael.bell@web.de>
6
 
7
+include(CheckFunctionExists)
8
+
9
 if (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
10
   # Already in cache, be silent
11
   set(ICONV_FIND_QUIETLY TRUE)
12
@@ -13,11 +15,15 @@ endif (ICONV_INCLUDE_DIR AND ICONV_LIBRA
13
 
14
 find_path(ICONV_INCLUDE_DIR iconv.h)
15
 
16
-find_library(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
17
-
18
-if (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
19
-   set (ICONV_FOUND TRUE)
20
-endif (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
21
+if (ICONV_INCLUDE_DIR)
22
+  check_function_exists(iconv ICONV_FOUND)
23
+  if (NOT ICONV_FOUND)
24
+    find_library(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2)
25
+    if (ICONV_LIBRARIES)
26
+      set (ICONV_FOUND TRUE)
27
+    endif (ICONV_LIBRARIES)
28
+  endif (NOT ICONV_FOUND)
29
+endif (ICONV_INCLUDE_DIR)
30
 
31
 set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
32
 set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
(-)textproc/xmlppm/files/patch-IFile.cpp (-11 lines)
Lines 1-11 Link Here
1
--- src/IFile.cpp.orig	Thu Jun 10 04:16:13 2004
2
+++ src/IFile.cpp	Tue Aug 17 23:21:02 2004
3
@@ -73,7 +73,7 @@
4
    writing the output.  Then flush the file.  */
5
 void ifflush(IFILE* ifile) {
6
   static char outbuf[BUFFSIZE];
7
-  char* inptr = ifile->buf;
8
+  const char* inptr = ifile->buf;
9
   char* outptr = outbuf;
10
   size_t insz = ifile->bufsiz;
11
   size_t outsz;
(-)www/anyterm/Makefile (-3 / +13 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	anyterm
4
PORTNAME=	anyterm
5
PORTVERSION=	1.1.29
5
PORTVERSION=	1.1.29
6
PORTREVISION=	1
6
CATEGORIES=	www
7
CATEGORIES=	www
7
MASTER_SITES=	http://anyterm.org/download/ \
8
MASTER_SITES=	http://anyterm.org/download/ \
8
		http://apt.douglasthrift.net/files/${PORTNAME}/ \
9
		http://apt.douglasthrift.net/files/${PORTNAME}/ \
Lines 23-34 ALL_TARGET= default_target Link Here
23
PLIST_FILES=	man/man1/anytermd.1.gz \
24
PLIST_FILES=	man/man1/anytermd.1.gz \
24
		sbin/anytermd
25
		sbin/anytermd
25
26
27
CPPFLAGS+=	-I${LOCALBASE}/include
28
26
post-patch:
29
post-patch:
27
	@${REINPLACE_CMD} -e 's|/private/etc/apache2|${FILESDIR}|' \
30
	@${REINPLACE_CMD} -e 's|/private/etc/apache2|${FILESDIR}|' \
28
		${WRKSRC}/scripts/mimetype.sh
31
		${WRKSRC}/scripts/mimetype.sh
29
	@${REINPLACE_CMD} -e 's|^CPP_FLAGS=|&-I${LOCALBASE}/include |' \
32
	@${REINPLACE_CMD} \
30
		-e 's|^LINK_FLAGS=|&-L${ICONV_PREFIX}/lib ${ICONV_LIB} |' ${WRKSRC}/common.mk
33
		-e 's|$$(CPP_FLAGS)|& ${CPPFLAGS} |' \
31
	@${REINPLACE_CMD} -e 's|^COMPILE_FLAGS=|&-I${LOCALBASE}/include |' \
34
		-e '/^COMPILE_FLAGS=/s|$$| ${CXXFLAGS}|' \
35
		-e 's|$${OPTIMISE_FLAGS}||' \
36
		-e 's|$$(LINK_FLAGS)|& -L${ICONV_PREFIX}/lib ${ICONV_LIB} |' \
37
		${WRKSRC}/common.mk
38
	@${REINPLACE_CMD} \
39
		-e '/^COMPILE_FLAGS=/s|$$| ${CXXFLAGS}|' \
40
		-e 's|$$(INC_FLAGS)|& ${CPPFLAGS} |' \
41
		-e 's|$$(CXXFLAGS)||' -e 's|$$(OPTIMISE_FLAGS)||' \
32
		${WRKSRC}/libpbe/common.mk
42
		${WRKSRC}/libpbe/common.mk
33
43
34
do-install:
44
do-install:
(-)www/anyterm/files/patch-libpbe-include-Iconver.hh (+11 lines)
Line 0 Link Here
1
--- libpbe/include/Iconver.hh.orig	2008-10-25 12:17:29 UTC
2
+++ libpbe/include/Iconver.hh
3
@@ -36,7 +36,7 @@
4
 #include "Exception.hh"
5
 
6
 
7
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun__)
8
+#if defined(__OpenBSD__) || defined(__sun__)
9
 // Previously __APPLE__ was included in this list; presumably they have
10
 // changed their headers.  If you have an older system you may need to put
11
 // it back.
(-)www/htmlcxx/Makefile (-1 / +4 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	htmlcxx
3
PORTNAME=	htmlcxx
4
PORTVERSION=	0.85
4
PORTVERSION=	0.85
5
PORTREVISION=	1
5
PORTREVISION=	2
6
CATEGORIES=	www textproc
6
CATEGORIES=	www textproc
7
MASTER_SITES=	SF
7
MASTER_SITES=	SF
8
8
Lines 23-26 MAKE_JOBS_UNSAFE=yes Link Here
23
23
24
MAKE_ARGS=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
24
MAKE_ARGS=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
25
25
26
post-patch:
27
	@${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
28
26
.include <bsd.port.mk>
29
.include <bsd.port.mk>
(-)www/htmlcxx/files/patch-CharsetConverter.cc (-11 lines)
Lines 1-11 Link Here
1
--- html/CharsetConverter.cc.orig	2012-09-19 14:05:35.000000000 +0800
2
+++ html/CharsetConverter.cc	2012-09-19 14:08:42.000000000 +0800
3
@@ -37,7 +37,7 @@
4
 
5
 	size_t ret;
6
 	while (1) {
7
-		ret = iconv(mIconvDescriptor, const_cast<char**>(&inbuf), &inbytesleft, &outbuf, &outbytesleft);
8
+		ret = iconv(mIconvDescriptor, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
9
 		if (ret == 0) break;
10
 		if (ret == (size_t)-1 && errno == E2BIG) return string();
11
 
(-)www/httrack/Makefile (-2 / +7 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	httrack
4
PORTNAME=	httrack
5
PORTVERSION=	3.48.21
5
PORTVERSION=	3.48.21
6
PORTREVISION=	1
6
CATEGORIES=	www
7
CATEGORIES=	www
7
MASTER_SITES=	http://download.httrack.com/ \
8
MASTER_SITES=	http://download.httrack.com/ \
8
		http://mirror.httrack.com/ \
9
		http://mirror.httrack.com/ \
Lines 32-38 PORTDOCS= * Link Here
32
33
33
SHEBANG_FILES=	src/webhttrack
34
SHEBANG_FILES=	src/webhttrack
34
35
35
.include <bsd.port.options.mk>
36
.include <bsd.port.pre.mk>
37
38
.if empty(ICONV_LIB)
39
CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv=no
40
.endif
36
41
37
.if ${PORT_OPTIONS:MICONS}
42
.if ${PORT_OPTIONS:MICONS}
38
INSTALLS_ICONS=	yes
43
INSTALLS_ICONS=	yes
Lines 46-49 post-patch: Link Here
46
post-install:
51
post-install:
47
	${INSTALL_DATA} ${WRKSRC}/html/httrack.css ${STAGEDIR}${DOCSDIR}/httrack.css
52
	${INSTALL_DATA} ${WRKSRC}/html/httrack.css ${STAGEDIR}${DOCSDIR}/httrack.css
48
53
49
.include <bsd.port.mk>
54
.include <bsd.port.post.mk>
(-)www/mod_encoding/Makefile (-2 / +9 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	mod_encoding
4
PORTNAME=	mod_encoding
5
PORTVERSION=	20021209
5
PORTVERSION=	20021209
6
PORTREVISION=	4
6
PORTREVISION=	5
7
CATEGORIES=	www
7
CATEGORIES=	www
8
MASTER_SITES=	http://webdav.todo.gr.jp/download/
8
MASTER_SITES=	http://webdav.todo.gr.jp/download/
9
PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
9
PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
Lines 39-48 EXTRA_PATCHES+= ${PATCHDIR}/iconv_hook-2 Link Here
39
EXTRA_PATCHES+=	${PATCHDIR}/queryfix-patch22
39
EXTRA_PATCHES+=	${PATCHDIR}/queryfix-patch22
40
.endif
40
.endif
41
41
42
.include <bsd.port.pre.mk>
43
44
.if empty(ICONV_LIB)
45
CONFIGURE_ENV+=	ac_cv_lib_iconv_iconv=no \
46
		ac_cv_lib_iconv_libiconv=no
47
.endif
48
42
do-install:
49
do-install:
43
	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
50
	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
44
	$(APXS) -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} \
51
	$(APXS) -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} \
45
		-i -n ${MODULENAME} ${WRKSRC}/${MODULENAME}.la
52
		-i -n ${MODULENAME} ${WRKSRC}/${MODULENAME}.la
46
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so
53
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so
47
54
48
.include <bsd.port.mk>
55
.include <bsd.port.post.mk>
(-)www/newsbeuter/files/patch-src-utils.cpp (+12 lines)
Line 0 Link Here
1
--- src/utils.cpp.orig	2015-02-19 10:56:59 UTC
2
+++ src/utils.cpp
3
@@ -274,7 +274,8 @@ std::string utils::convert_text(const st
4
 	 * of all the Unix-like systems around there, only Linux/glibc seems to
5
 	 * come with a SuSv3-conforming iconv implementation.
6
 	 */
7
-#if !(__linux) && !defined(__GLIBC__) && !defined(__APPLE__) && !defined(__OpenBSD__)
8
+#if !(__linux) && !defined(__GLIBC__) && !defined(__APPLE__) \
9
+ && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__)
10
 	const char * inbufp;
11
 #else
12
 	char * inbufp;
(-)x11/x3270/Makefile (-3 / +4 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	x3270
4
PORTNAME=	x3270
5
PORTVERSION=	3.3.15
5
PORTVERSION=	3.3.15
6
PORTREVISION=	1
6
PORTREVISION=	3
7
CATEGORIES=	x11 net
7
CATEGORIES=	x11 net
8
MASTER_SITES=	http://x3270.bgp.nu/download/current/
8
MASTER_SITES=	http://x3270.bgp.nu/download/current/
9
EXTRACT_SUFX=	ga7-src.tgz
9
EXTRACT_SUFX=	ga7-src.tgz
Lines 21-28 CONFLICTS= c3270-* Link Here
21
USES=		iconv fonts imake:env
21
USES=		iconv fonts imake:env
22
USE_XORG=	ice sm x11 xaw xext xmu xt
22
USE_XORG=	ice sm x11 xaw xext xmu xt
23
GNU_CONFIGURE=	yes
23
GNU_CONFIGURE=	yes
24
CONFIGURE_ARGS+=	--with-fontdir=${FONTSDIR} \
24
CONFIGURE_ARGS=	--with-fontdir=${FONTSDIR} \
25
			--disable-dbcs
25
		--disable-dbcs \
26
		ac_cv_search_libiconv=no
26
CPPFLAGS+=	-I${LOCALBASE}/include
27
CPPFLAGS+=	-I${LOCALBASE}/include
27
LIBS+=		-L${LOCALBASE}/lib
28
LIBS+=		-L${LOCALBASE}/lib
28
.if defined(WITHOUT_OPENSSL)
29
.if defined(WITHOUT_OPENSSL)
(-)x11-toolkits/p5-Prima/Makefile (-2 / +3 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	Prima
4
PORTNAME=	Prima
5
PORTVERSION=	1.41
5
PORTVERSION=	1.41
6
PORTREVISION=	1
6
PORTREVISION=	3
7
CATEGORIES=	x11-toolkits graphics perl5
7
CATEGORIES=	x11-toolkits graphics perl5
8
MASTER_SITES=	CPAN
8
MASTER_SITES=	CPAN
9
PKGNAMEPREFIX=	p5-
9
PKGNAMEPREFIX=	p5-
Lines 21-27 LIB_DEPENDS= libgif.so:${PORTSDIR}/graph Link Here
21
OPTIONS_DEFINE=	GTK2 ICONV XFT
21
OPTIONS_DEFINE=	GTK2 ICONV XFT
22
OPTIONS_DEFAULT=ICONV XFT
22
OPTIONS_DEFAULT=ICONV XFT
23
23
24
CONFIGURE_ARGS=	X11BASE=${LOCALBASE}
24
CONFIGURE_ARGS=	EXTRA_CCFLAGS="${CFLAGS}" EXTRA_LDFLAGS="${LDFLAGS}" \
25
		X11BASE=${LOCALBASE}
25
USES=		perl5
26
USES=		perl5
26
USE_PERL5=	configure
27
USE_PERL5=	configure
27
USE_XORG=	x11 xext xpm xrender
28
USE_XORG=	x11 xext xpm xrender
(-)x11-toolkits/p5-Prima/files/patch-Makefile.PL (+22 lines)
Line 0 Link Here
1
--- Makefile.PL.orig	2014-11-08 16:12:20 UTC
2
+++ Makefile.PL
3
@@ -1244,13 +1244,13 @@ EOF
4
 	$cmd_options{WITH_ICONV} = 0 unless $cmd_options{WITH_XFT}; # iconv is used for xft only
5
 	if ( $cmd_options{WITH_ICONV} && have_header( "iconv.h")) {
6
 		print "Checking for presence of libiconv... ";
7
-		if ( defined find_lib( 'iconv', '', '')) {
8
-			push @LIBS, 'iconv';
9
-			print "yes\n";
10
+		my $ok = compile( "#include <iconv.h>\nint main() { iconv_close(0); return 0; }\n");
11
+		if ( $ok ) {
12
+			print "no, but works as part of libc\n";
13
 		} else {
14
-			my $ok = compile( "#include <iconv.h>\nint main() { iconv_close(0); return 0; }\n");
15
-			if ( $ok ) {
16
-				print "no, but works as part of libc\n";
17
+			if ( defined find_lib( 'iconv', '', '')) {
18
+				push @LIBS, 'iconv';
19
+				print "yes\n";
20
 			} else {
21
 				$DEFINES{HAVE_ICONV_H} = undef;
22
 				$cmd_options{WITH_ICONV} = 0;
(-)x11-wm/icewm/Makefile (-2 / +2 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	icewm
4
PORTNAME=	icewm
5
PORTVERSION=	1.3.8
5
PORTVERSION=	1.3.8
6
PORTREVISION=	1
6
PORTREVISION=	2
7
CATEGORIES=	x11-wm
7
CATEGORIES=	x11-wm
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTVERSION}
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTVERSION}
9
9
Lines 12-18 COMMENT= Window Manager designed for spe Link Here
12
12
13
LICENSE=	GPLv2
13
LICENSE=	GPLv2
14
14
15
USES=		gmake iconv pkgconfig
15
USES=		gmake iconv:translit pkgconfig
16
USE_XORG=	ice sm x11 xext
16
USE_XORG=	ice sm x11 xext
17
USE_GNOME=	gdkpixbuf2
17
USE_GNOME=	gdkpixbuf2
18
GNU_CONFIGURE=	yes
18
GNU_CONFIGURE=	yes
(-)x11-wm/icewm/files/patch-src_ylocale.cc (-26 lines)
Lines 1-26 Link Here
1
--- src/ylocale.cc.orig	2013-11-03 19:58:39.180727369 -0500
2
+++ src/ylocale.cc	2013-11-03 19:58:51.540725980 -0500
3
@@ -126,8 +126,12 @@ YLocale::~YLocale() {
4
 iconv_t YLocale::getConverter (const char *from, const char **&to) {
5
     iconv_t cd = (iconv_t) -1;
6
 
7
+    char *myfrom = (char *)malloc(1 + strlen(from));
8
+    strcpy(myfrom, from);
9
+    char *modptr = strstr(myfrom, "//");
10
+    if (NULL != modptr) *modptr = '\0';
11
     while (NULL != *to)
12
-        if ((iconv_t) -1 != (cd = iconv_open(*to, from))) return cd;
13
+        if ((iconv_t) -1 != (cd = iconv_open(*to, myfrom))) return cd;
14
         else ++to;
15
 
16
     return (iconv_t) -1;
17
@@ -149,7 +153,8 @@ YUChar *YLocale::unicodeString(const YLC
18
         return NULL;
19
 
20
     YUChar * uStr(new YUChar[lLen + 1]);
21
-    char * inbuf((char *) lStr), * outbuf((char *) uStr);
22
+    const char * inbuf((char *) lStr);
23
+    char * outbuf((char *) uStr);
24
     size_t inlen(lLen), outlen(4 * lLen);
25
 
26
     if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen))
(-)x11-wm/pekwm/Makefile (-1 / +1 lines)
Lines 21-27 CONFIGURE_ARGS+=--enable-shape --enable- Link Here
21
		--enable-xft --enable-image-xpm --enable-image-jpeg \
21
		--enable-xft --enable-image-xpm --enable-image-jpeg \
22
		--enable-image-png --disable-debug \
22
		--enable-image-png --disable-debug \
23
		--disable-pedantic
23
		--disable-pedantic
24
CFLAGS+=	-DICONV_CONST -I${LOCALBASE}/include
24
CFLAGS+=	-I${LOCALBASE}/include
25
LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
25
LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
26
26
27
.include <bsd.port.mk>
27
.include <bsd.port.mk>

Return to bug 199099