svn commit: r346360 - head/Mk

[Pietro Cerutti]

Author: gahr
Date: Thu Feb 27 15:00:24 2014
New Revision: 346360
URL: http://svnweb.freebsd.org/changeset/ports/346360
QAT: https://qat.redports.org/buildarchive/r346360/

Log:
  - Get rid of bsd.tcl.mk. See my CHANGES entry from 20130919.
  
  Approved by:	portmgr (antoine)

Deleted:
  head/Mk/bsd.tcl.mk
Modified:
  head/Mk/bsd.port.mk
  head/Mk/bsd.sanity.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Thu Feb 27 14:59:46 2014	(r346359)
+++ head/Mk/bsd.port.mk	Thu Feb 27 15:00:24 2014	(r346360)
@@ -1436,10 +1436,6 @@ PKGCOMPATDIR?=		${LOCALBASE}/lib/compat/
 .include "${PORTSDIR}/Mk/bsd.ocaml.mk"
 .endif
 
-.if defined(USE_TCL) || defined(USE_TCL_BUILD) || defined(USE_TCL_RUN) || defined(USE_TCL_WRAPPER) || defined(USE_TK) || defined(USE_TK_BUILD) || defined(USE_TK_RUN) || defined(USE_TK_WRAPPER)
-.include "${PORTSDIR}/Mk/bsd.tcl.mk"
-.endif
-
 .if defined(USE_APACHE) || defined(USE_APACHE_BUILD) || defined(USE_APACHE_RUN)
 .include "${PORTSDIR}/Mk/bsd.apache.mk"
 .endif
@@ -1895,10 +1891,6 @@ IGNORE=	Do not define STAGEDIR in comman
 .include "${PORTSDIR}/Mk/bsd.python.mk"
 .endif
 
-.if defined(USE_TCL) || defined(USE_TCL_BUILD) || defined(USE_TK) || defined(USE_TK_BUILD)
-.include "${PORTSDIR}/Mk/bsd.tcl.mk"
-.endif
-
 .if defined(USE_LUA) || defined(USE_LUA_NOT)
 .include "${PORTSDIR}/Mk/bsd.lua.mk"
 .endif

Modified: head/Mk/bsd.sanity.mk
==============================================================================
--- head/Mk/bsd.sanity.mk	Thu Feb 27 14:59:46 2014	(r346359)
+++ head/Mk/bsd.sanity.mk	Thu Feb 27 15:00:24 2014	(r346360)
@@ -109,7 +109,7 @@ DEV_WARNING+=	"Please use the new format
 
 .if defined(USE_TCL) || defined(USE_TCL_BUILD) || defined(USE_TCL_RUN) || defined(USE_TCL_WRAPPER) || \
    defined(USE_TK)  || defined(USE_TK_BUILD)  || defined(USE_TK_RUN)  || defined(USE_TK_WRAPPER)
-DEV_WARNING+=	"USE_TCL and USE_TK are deprecated, please use USES=tcl or USES=tk"
+DEV_ERROR+=	"USE_TCL and USE_TK are no longer supported, please use USES=tcl or USES=tk"
 .endif
 
 .if defined(USE_SCONS)