[Midnightbsd-cvs] mports [15581] trunk/Mk/extensions: update iconv handling

[laffer1 at midnightbsd.org]

Revision: 15581
          http://svnweb.midnightbsd.org/mports/?rev=15581
Author:   laffer1
Date:     2013-11-14 19:20:24 -0500 (Thu, 14 Nov 2013)
Log Message:
-----------
update iconv handling

Modified Paths:
--------------
    trunk/Mk/extensions/gmake.mk
    trunk/Mk/extensions/iconv.mk

Modified: trunk/Mk/extensions/gmake.mk
===================================================================
--- trunk/Mk/extensions/gmake.mk	2013-11-14 13:45:31 UTC (rev 15580)
+++ trunk/Mk/extensions/gmake.mk	2013-11-15 00:20:24 UTC (rev 15581)
@@ -15,6 +15,6 @@
 
 BUILD_DEPENDS+=		gmake:${PORTSDIR}/devel/gmake
 CONFIGURE_ENV+=		MAKE=${GMAKE}
-_MAKE_CMD=		${GMAKE}
+_MAKE_CMD?=		${GMAKE}
 
 .endif

Modified: trunk/Mk/extensions/iconv.mk
===================================================================
--- trunk/Mk/extensions/iconv.mk	2013-11-14 13:45:31 UTC (rev 15580)
+++ trunk/Mk/extensions/iconv.mk	2013-11-15 00:20:24 UTC (rev 15581)
@@ -3,17 +3,41 @@
 # handle dependency on the iconv port
 #
 # Feature:	iconv
-# Usage:	USES=iconv
-# Valid ARGS:	does not require args
+# Usage:	USES=iconv or USES=iconv:ARGS
+# Valid ARGS:	lib (default, implicit), build, patch
 #
 #
 .if !defined(_INCLUDE_USES_ICONV_MK)
 _INCLUDE_USES_ICONV_MK=	yes
 
-.if defined(iconv_ARGS)
-IGNORE=	USES=iconv does not require args
+.if !defined(iconv_ARGS)
+iconv_ARGS=     lib
 .endif
 
+.if !exists(/usr/include/iconv.h)
+
+ICONV_CMD=	${LOCALBASE}/bin/iconv
+ICONV_LIB=	-liconv
+ICONV_PREFIX=	${LOCALBASE}
+ICONV_CONFIGURE_ARG=	--with-libiconv-prefix=${LOCALBASE}
+ICONV_CONFIGURE_BASE=	--with-libiconv=${LOCALBASE}
+
+.if ${iconv_ARGS} == "lib"
 LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
+.elif ${iconv_ARGS} == "build"
+BUILD_DEPENDS+=	${ICONV_CMD}:${PORTSDIR}/converters/libiconv
+.elif ${iconv_ARGS} == "patch"
+PATCH_DEPENDS+=	${ICONV_CMD}:${PORTSDIR}/converters/libiconv
+.endif
 
+.else
+
+ICONV_CMD=	/usr/bin/iconv
+ICONV_LIB=
+ICONV_PREFIX=	/usr
+ICONV_CONFIGURE_ARG=
+ICONV_CONFIGURE_BASE=
+
 .endif
+
+.endif