diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-09-06 17:42:20 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-09-06 17:42:20 +0800 |
| commit | 16a6969facf4dd87b8026c641b78aa7cd90d1bbf (patch) | |
| tree | 26ff708855fb04b99b2287ac19ad9dde7c7bff83 | |
| parent | 5c4f626a9876372e2b5990bc79bdaa2869992772 (diff) | |
| download | marcuscom-ports-16a6969facf4dd87b8026c641b78aa7cd90d1bbf.tar marcuscom-ports-16a6969facf4dd87b8026c641b78aa7cd90d1bbf.tar.gz marcuscom-ports-16a6969facf4dd87b8026c641b78aa7cd90d1bbf.tar.bz2 marcuscom-ports-16a6969facf4dd87b8026c641b78aa7cd90d1bbf.tar.lz marcuscom-ports-16a6969facf4dd87b8026c641b78aa7cd90d1bbf.tar.xz marcuscom-ports-16a6969facf4dd87b8026c641b78aa7cd90d1bbf.tar.zst marcuscom-ports-16a6969facf4dd87b8026c641b78aa7cd90d1bbf.zip | |
Sync with ports, catch up with recent iconv changes.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18672 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | devel/glib20/Makefile | 12 | ||||
| -rw-r--r-- | devel/glib20/files/patch-ae | 34 |
2 files changed, 38 insertions, 8 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 176d6c4bb..be0e2b4e0 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -1,5 +1,5 @@ # Created by: Vanilla I. Shu <vanilla@FreeBSD.org> -# $FreeBSD: head/devel/glib20/Makefile 313633 2013-03-08 10:51:34Z kwm $ +# $FreeBSD: head/devel/glib20/Makefile 326307 2013-09-04 18:06:07Z madpilot $ # $MCom$ PORTNAME= glib @@ -23,13 +23,13 @@ PORTSCOUT= limitw:1,even LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre \ ffi:${PORTSDIR}/devel/libffi -USES= gettext gmake iconv pathfix pkgconfig shebangfix USE_AUTOTOOLS= libtool USE_LDCONFIG= yes +USES= gettext gmake iconv pathfix pkgconfig shebangfix USE_GNOME= ltverhack USE_PYTHON= 2.5+ USE_PERL5= yes -CONFIGURE_ARGS= --enable-static --with-libiconv=gnu \ +CONFIGURE_ARGS= --enable-static \ --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \ --disable-man --without-xml-catalog \ --with-pcre=system \ @@ -54,6 +54,12 @@ CONFIGURE_ARGS+=--disable-dtrace #CONFIGURE_ARGS+=--enable-dtrace #.endif +.if exists(/usr/include/iconv.h) && ${OSVERSION} >= 1000043 +CONFIGURE_ARGS+= --with-libiconv=native +.else +CONFIGURE_ARGS+= --with-libiconv=gnu +.endif + .if ${ARCH} == powerpc64 EXTRA_PATCHES= ${FILESDIR}/extra-arch-powerpc64 .endif diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae index e62156bf5..9396ef32a 100644 --- a/devel/glib20/files/patch-ae +++ b/devel/glib20/files/patch-ae @@ -1,5 +1,5 @@ ---- configure.orig 2013-03-28 02:59:16.000000000 +0000 -+++ configure 2013-03-28 03:00:20.000000000 +0000 +--- configure.orig 2013-08-29 23:29:13.255661322 +0200 ++++ configure 2013-08-29 23:48:08.845647995 +0200 @@ -603,6 +603,9 @@ #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> @@ -10,7 +10,7 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif -@@ -5699,7 +5702,7 @@ +@@ -5778,7 +5781,7 @@ fi GLIB_RUNTIME_LIBDIR="$with_runtime_libdir" @@ -19,7 +19,31 @@ if test "x$with_runtime_libdir" != "x"; then -@@ -23089,7 +23092,7 @@ +@@ -7444,13 +7447,12 @@ + + ;; + native) +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open in -liconv" >&5 +-$as_echo_n "checking for iconv_open in -liconv... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open" >&5 ++$as_echo_n "checking for iconv_open... " >&6; } + if ${ac_cv_lib_iconv_iconv_open+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-liconv $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -8648,6 +8650,7 @@ + ;; + native) + ++ICONV_LIBS="" + $as_echo "#define USE_LIBICONV_NATIVE 1" >>confdefs.h + + ;; +@@ -23201,7 +23204,7 @@ fi done @@ -28,7 +52,7 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -@@ -26629,10 +26632,10 @@ +@@ -26741,10 +26744,10 @@ # b) FreeBSD doesn't do this either. # case $host in |