svn commit: r452512 - in head: . Mk Mk/Uses lang lang/fpc-tcl lang/smalltalk lang/tcl84 x11-toolkits x11-toolkits/ocaml-labltk x11-toolkits/tk84

Pietro Cerutti gahr at FreeBSD.org
Fri Oct 20 11:12:58 UTC 2017 

Author: gahr
Date: Fri Oct 20 11:12:56 2017
New Revision: 452512
URL: https://svnweb.freebsd.org/changeset/ports/452512

Log:
  Revert 452511, I missed some ports
  
  I missed some ports that depend on lang/tcl84 or x11-toolkits/tk84 by
  explicitly mentioning the port origin instead of using USES.

Added:
  head/lang/fpc-tcl/
     - copied from r452510, head/lang/fpc-tcl/
  head/lang/tcl84/
     - copied from r452510, head/lang/tcl84/
  head/x11-toolkits/tk84/
     - copied from r452510, head/x11-toolkits/tk84/
Modified:
  head/MOVED
  head/Mk/Uses/tcl.mk
  head/Mk/bsd.default-versions.mk
  head/lang/Makefile
  head/lang/smalltalk/Makefile
  head/lang/smalltalk/pkg-plist
  head/x11-toolkits/Makefile
  head/x11-toolkits/ocaml-labltk/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Fri Oct 20 10:38:57 2017	(r452511)
+++ head/MOVED	Fri Oct 20 11:12:56 2017	(r452512)
@@ -9596,4 +9596,3 @@ net/xpvm||2017-10-16|Has expired: This port depends on
 x11/tkXwin||2017-10-16|Has expired: This port depends on Tcl/Tk 8.4 , which is no longer maintained. Please port it to 8.5+
 games/crafty-tablebase-pawn||2017-10-17|Waste of resources
 devel/p5-Log-Any-Adapter-Syslog|devel/p5-Log-Any|2017-10-19|Has expired: Merged with devel/p5-Log-Any
-lang/fpc-tcl||2017-10-20|Has expired: This port depends on Tcl/Tk 8.4 , which is no longer maintained. Please port it to 8.5+

Modified: head/Mk/Uses/tcl.mk
==============================================================================
--- head/Mk/Uses/tcl.mk	Fri Oct 20 10:38:57 2017	(r452511)
+++ head/Mk/Uses/tcl.mk	Fri Oct 20 11:12:56 2017	(r452512)
@@ -40,11 +40,11 @@
 #   			  is installed, bring in the default version. See
 #   			  ${_TCLTK_DEFAULT_VERSION} below.
 #
-# - 85, 86, 87		- Depend on a specific version series of PORT. Multiple
+# - 84, 85, 86, 87	- Depend on a specific version series of PORT. Multiple
 #   			  values are OK. The highest version available is
 #   			  picked.
 #
-# - 85+, 86+, 87+	- Depend on any installed version greater or equal to
+# - 84+, 85+, 86+, 87+	- Depend on any installed version greater or equal to
 #   			  the specified version.
 #
 # If wrapper is specified, an additional dependency on tcl-wrapper or
@@ -72,7 +72,7 @@ _INCLUDE_USES_TCL_MK=	yes
 #
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
-_TCLTK_VALID_VERSIONS=	85 86 87
+_TCLTK_VALID_VERSIONS=	84 85 86 87
 
 #
 # Bring in the default and check that the specified version is in the list of
@@ -100,8 +100,8 @@ _TCLTK_WANTED_VERSIONS:=${_TCLTK_DEFAULT_VERSION}
 #
 # Parse one or more ver arguments.
 #
-.if ${tcl_ARGS:M8[5-7]}
-_TCLTK_WANTED_VERSIONS:=${tcl_ARGS:M8[5-7]}
+.if ${tcl_ARGS:M8[4-7]}
+_TCLTK_WANTED_VERSIONS:=${tcl_ARGS:M8[4-7]}
 .endif
 
 #

Modified: head/Mk/bsd.default-versions.mk
==============================================================================
--- head/Mk/bsd.default-versions.mk	Fri Oct 20 10:38:57 2017	(r452511)
+++ head/Mk/bsd.default-versions.mk	Fri Oct 20 11:12:56 2017	(r452512)
@@ -134,7 +134,7 @@ check-makevars::
 # Make sure we have a default in the end
 SSL_DEFAULT?=	base
 .endif
-# Possible values: 8.5, 8.6, 8.7
+# Possible values: 8.4, 8.5, 8.6, 8.7
 TCLTK_DEFAULT?=		8.6
 
 # Possible values: 4, 5

Modified: head/lang/Makefile
==============================================================================
--- head/lang/Makefile	Fri Oct 20 10:38:57 2017	(r452511)
+++ head/lang/Makefile	Fri Oct 20 11:12:56 2017	(r452512)
@@ -85,6 +85,7 @@
     SUBDIR += fpc-rtl-extra
     SUBDIR += fpc-rtl-objpas
     SUBDIR += fpc-rtl-unicode
+    SUBDIR += fpc-tcl
     SUBDIR += fpc-units
     SUBDIR += fpc-utils
     SUBDIR += fsharp
@@ -344,6 +345,7 @@
     SUBDIR += tcc
     SUBDIR += tcl-manual
     SUBDIR += tcl-wrapper
+    SUBDIR += tcl84
     SUBDIR += tcl85
     SUBDIR += tcl86
     SUBDIR += tcl87

Modified: head/lang/smalltalk/Makefile
==============================================================================
--- head/lang/smalltalk/Makefile	Fri Oct 20 10:38:57 2017	(r452511)
+++ head/lang/smalltalk/Makefile	Fri Oct 20 11:12:56 2017	(r452512)
@@ -3,7 +3,7 @@
 
 PORTNAME=	smalltalk
 PORTVERSION=	3.2.5
-PORTREVISION=	10
+PORTREVISION=	9
 CATEGORIES=	lang
 MASTER_SITES=	GNU
 
@@ -15,9 +15,11 @@ BUILD_DEPENDS=	zip:archivers/zip \
 LIB_DEPENDS=	libgdbm.so:databases/gdbm \
 		libcairo.so:graphics/cairo
 
-OPTIONS_DEFINE=	PGSQL SDL
-OPTIONS_DEFAULT=PGSQL SDL
+OPTIONS_DEFINE=	TK PGSQL SDL
+OPTIONS_DEFAULT=TK PGSQL SDL
 OPTIONS_SUB=	yes
+TK_USES=	tk:84
+TK_CONFIGURE_WITH=tcl=${LOCALBASE}/lib/tcl8.4 tk=${LOCALBASE}/lib/tk8.4
 PGSQL_USES=	pgsql
 SDL_USE=	SDL=image,mixer,sdl,sound,ttf
 

Modified: head/lang/smalltalk/pkg-plist
==============================================================================
--- head/lang/smalltalk/pkg-plist	Fri Oct 20 10:38:57 2017	(r452511)
+++ head/lang/smalltalk/pkg-plist	Fri Oct 20 11:12:56 2017	(r452512)
@@ -16,6 +16,9 @@ lib/libgst.a
 lib/libgst.so
 lib/libgst.so.7
 lib/libgst.so.7.1.3
+%%TK%%lib/smalltalk/blox-tk-%%VERSION%%.so
+%%TK%%lib/smalltalk/blox-tk.a
+%%TK%%lib/smalltalk/blox-tk.so
 lib/smalltalk/dbd-sqlite3-%%VERSION%%.so
 lib/smalltalk/dbd-sqlite3.a
 lib/smalltalk/dbd-sqlite3.so

Modified: head/x11-toolkits/Makefile
==============================================================================
--- head/x11-toolkits/Makefile	Fri Oct 20 10:38:57 2017	(r452511)
+++ head/x11-toolkits/Makefile	Fri Oct 20 11:12:56 2017	(r452512)
@@ -266,6 +266,7 @@
     SUBDIR += tile
     SUBDIR += tix
     SUBDIR += tk-wrapper
+    SUBDIR += tk84
     SUBDIR += tk85
     SUBDIR += tk86
     SUBDIR += tk87

Modified: head/x11-toolkits/ocaml-labltk/Makefile
==============================================================================
--- head/x11-toolkits/ocaml-labltk/Makefile	Fri Oct 20 10:38:57 2017	(r452511)
+++ head/x11-toolkits/ocaml-labltk/Makefile	Fri Oct 20 11:12:56 2017	(r452512)
@@ -3,7 +3,6 @@
 
 PORTNAME=	labltk
 PORTVERSION=	8.06.0
-PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1455/
 PKGNAMEPREFIX=	ocaml-
@@ -13,7 +12,7 @@ COMMENT=	Objective Caml interface to Tk
 
 LICENSE=	LGPL20
 
-USES=		gmake tk:85
+USES=		gmake tk:84,85
 HAS_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=yes
 MAKE_ENV+=	STAGEDIR="${STAGEDIR}"

More information about the svn-ports-head mailing list