svn commit: r504026 - in head: Mk/Uses databases/metakit misc/tkcron

[Pietro Cerutti]

Author: gahr
Date: Wed Jun 12 16:22:05 2019
New Revision: 504026
URL: https://svnweb.freebsd.org/changeset/ports/504026

Log:
  IGNORE USES=t(cl|k):85+ and DEPRECATE USES=t(cl|k):85

Modified:
  head/Mk/Uses/tcl.mk
  head/databases/metakit/Makefile
  head/misc/tkcron/Makefile

Modified: head/Mk/Uses/tcl.mk
==============================================================================
--- head/Mk/Uses/tcl.mk	Wed Jun 12 16:18:17 2019	(r504025)
+++ head/Mk/Uses/tcl.mk	Wed Jun 12 16:22:05 2019	(r504026)
@@ -95,7 +95,10 @@ _TCLTK_PORT?=	tcl
 .if ${tcl_ARGS:M*+}
 _TCLTK_MIN_VERSION:=	${tcl_ARGS:M*+:S/+//}
 _TCLTK_WANTED_VERSIONS:=${_TCLTK_DEFAULT_VERSION}
+.if ${_TCLTK_MIN_VERSION} == "85"
+IGNORE=	Minimum tcltk version 85+ is meaningless
 .endif
+.endif
 
 #
 # Parse one or more ver arguments.
@@ -151,6 +154,12 @@ _TCLTK_WANTED_VERSION:=	${_TCLTK_DEFAULT_VERSION}
 .  else
 _TCLTK_WANTED_VERSION:= ${_TCLTK_HIGHEST_VERSION}
 .  endif
+.endif
+
+#
+# Deprecate by default all ports depending on 8.5
+.if ${_TCLTK_WANTED_VERSION} == "85"
+DEPRECATED=	Tcl/Tk 8.5 is nearing EOL, please consider porting to Tcl/Tk 8.6
 .endif
 
 #

Modified: head/databases/metakit/Makefile
==============================================================================
--- head/databases/metakit/Makefile	Wed Jun 12 16:18:17 2019	(r504025)
+++ head/databases/metakit/Makefile	Wed Jun 12 16:22:05 2019	(r504026)
@@ -13,8 +13,6 @@ COMMENT=	C++ embedded database engine with Python and 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../license.terms
 
-DEPRECATED=	Tcl/Tk 8.5 is nearing EOL, please consider porting to Tcl/Tk 8.6
-
 USE_CXXSTD=	c++98
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	../unix/configure
@@ -33,7 +31,7 @@ PYTHON_USES=		python:2.7
 PYTHON_CONFIGURE_ON=	--with-python=${LOCALBASE}
 PYTHON_CATEGORIES=	python
 
-TCL_USES=		tcl:85
+TCL_USES=		tcl:85+
 TCL_CATEGORIES=		tcl
 TCL_CONFIGURE_ON=	--with-tcl=${TCL_INCLUDEDIR}
 TCL_CONFIGURE_ENV=	TCL_LIBDIR=${TCL_LIBDIR}

Modified: head/misc/tkcron/Makefile
==============================================================================
--- head/misc/tkcron/Makefile	Wed Jun 12 16:18:17 2019	(r504025)
+++ head/misc/tkcron/Makefile	Wed Jun 12 16:22:05 2019	(r504026)
@@ -15,8 +15,6 @@ EXTRACT_SUFX=	.tcl.gz
 MAINTAINER=	cy at FreeBSD.org
 COMMENT=	Frontend to crontab
 
-DEPRECATED=	Tcl/Tk 8.5 is nearing EOL, please consider porting to Tcl/Tk 8.6
-
 USES=		tk:85,run
 
 EXTRACT_CMD=	${GZIP_CMD}