Date: Mon, 16 Sep 2013 17:22:30 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327420 - in head: devel/glib20 sysutils/e2fsprogs Message-ID: <201309161722.r8GHMUlf098416@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Mon Sep 16 17:22:30 2013 New Revision: 327420 URL: http://svnweb.freebsd.org/changeset/ports/327420 Log: - Make conditionals check for head iconv take advantage of iconv.mk populated variables. Submitted by: marino Approved by: portmgr (bapt, implicit) Modified: head/devel/glib20/Makefile head/sysutils/e2fsprogs/Makefile Modified: head/devel/glib20/Makefile ============================================================================== --- head/devel/glib20/Makefile Mon Sep 16 17:07:26 2013 (r327419) +++ head/devel/glib20/Makefile Mon Sep 16 17:22:30 2013 (r327420) @@ -53,7 +53,7 @@ CONFIGURE_ARGS+=--disable-dtrace #CONFIGURE_ARGS+=--enable-dtrace #.endif -.if exists(/usr/include/iconv.h) && ${OSVERSION} >= 1000043 +.if empty(ICONV_LIB) CONFIGURE_ARGS+= --with-libiconv=native .else CONFIGURE_ARGS+= --with-libiconv=gnu Modified: head/sysutils/e2fsprogs/Makefile ============================================================================== --- head/sysutils/e2fsprogs/Makefile Mon Sep 16 17:07:26 2013 (r327419) +++ head/sysutils/e2fsprogs/Makefile Mon Sep 16 17:22:30 2013 (r327420) @@ -54,7 +54,7 @@ MAKE_ARGS+= V=1 .if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB= NLS="" -. if ${OSVERSION} >= 1000043 +. if empty(ICONV_LIB) libintl= "${LOCALBASE}/lib/libintl.a" . else libintl= "${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309161722.r8GHMUlf098416>