[Midnightbsd-cvs] mports [16053] trunk/Mk/extensions: drop 4.4.

[laffer1 at midnightbsd.org]

Revision: 16053
          http://svnweb.midnightbsd.org/mports/?rev=16053
Author:   laffer1
Date:     2014-03-08 21:36:22 -0500 (Sat, 08 Mar 2014)
Log Message:
-----------
drop 4.4.

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

Modified: trunk/Mk/extensions/gcc.mk
===================================================================
--- trunk/Mk/extensions/gcc.mk	2014-03-09 02:35:52 UTC (rev 16052)
+++ trunk/Mk/extensions/gcc.mk	2014-03-09 02:36:22 UTC (rev 16053)
@@ -44,7 +44,7 @@
 
 # All GCC versions supported by the ports framework.  Keep them in
 # ascending order and in sync with the table below. 
-GCCVERSIONS=	030402 040200 040400 040600 040700 040800
+GCCVERSIONS=	030402 040200 040600 040700 040800
 
 # The first field if the OSVERSION in which it appeared in the base.
 # The second field is the OSVERSION in which it disappeared from the base.
@@ -51,7 +51,6 @@
 # The third field is the version as USE_GCC would use.
 GCCVERSION_030402=	2000  3004 3.4
 GCCVERSION_040200=	3004 9999999 4.2
-GCCVERSION_040400=	     0       0 4.4
 GCCVERSION_040600=	     0       0 4.6
 GCCVERSION_040700=	     0       0 4.7
 GCCVERSION_040800=	     0       0 4.8

Modified: trunk/Mk/extensions/iconv.mk
===================================================================
--- trunk/Mk/extensions/iconv.mk	2014-03-09 02:35:52 UTC (rev 16052)
+++ trunk/Mk/extensions/iconv.mk	2014-03-09 02:36:22 UTC (rev 16053)
@@ -4,17 +4,16 @@
 #
 # Feature:	iconv
 # Usage:	USES=iconv or USES=iconv:ARGS
-# Valid ARGS:	lib (default, implicit), build, patch
-#
-#
+# Valid ARGS:	lib (default, implicit), build, patch,
+#		wchar_t (port uses "WCHAR_T" extension),
+#		translit (port uses "//TRANSLIT" extension)
+
 .if !defined(_INCLUDE_USES_ICONV_MK)
 _INCLUDE_USES_ICONV_MK=	yes
 
-.if !defined(iconv_ARGS)
-iconv_ARGS=     lib
-.endif
+iconv_ARGS:=	${iconv_ARGS:S/,/ /g}
 
-.if !exists(/usr/include/iconv.h) || ${OSVERSION} < 6000
+.if !exists(/usr/include/iconv.h) || ${iconv_ARGS:Mwchar_t} || ${iconv_ARGS:Mtranslit}
 
 ICONV_CMD=	${LOCALBASE}/bin/iconv
 ICONV_LIB=	-liconv
@@ -22,12 +21,12 @@
 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"
+.if ${iconv_ARGS:Mbuild}
 BUILD_DEPENDS+=	${ICONV_CMD}:${PORTSDIR}/converters/libiconv
-.elif ${iconv_ARGS} == "patch"
+.elif ${iconv_ARGS:Mpatch}
 PATCH_DEPENDS+=	${ICONV_CMD}:${PORTSDIR}/converters/libiconv
+.else
+LIB_DEPENDS+=	libiconv.so.3:${PORTSDIR}/converters/libiconv
 .endif
 
 .else
@@ -38,6 +37,12 @@
 ICONV_CONFIGURE_ARG=
 ICONV_CONFIGURE_BASE=
 
+.if exists(${LOCALBASE}/include/iconv.h)
+CPPFLAGS+=	-DLIBICONV_PLUG
+CFLAGS+=	-DLIBICONV_PLUG
+CXXFLAGS+=	-DLIBICONV_PLUG
 .endif
 
 .endif
+
+.endif