svn commit: r327420 - in head: devel/glib20 sysutils/e2fsprogs

[Guido Falsi]

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"