From 9fb7a3fc28ae03b18c1438c28dba628d9af22b01 Mon Sep 17 00:00:00 2001 From: espie Date: Sat, 6 Nov 2010 22:06:57 +0000 Subject: [PATCH] tk/tcl wantlib conversion --- cad/xcircuit/Makefile | 3 ++- comms/hamlib/Makefile | 4 ++-- databases/db/v3/Makefile | 8 ++++---- lang/expect/Makefile | 5 +++-- lang/ocaml/Makefile | 9 +++++---- lang/tcl/tcl.port.mk | 7 ++++--- math/R/Makefile | 4 ++-- misc/wordnet/Makefile | 5 +++-- net/quirc/Makefile | 7 ++++--- sysutils/findlib/Makefile | 5 +++-- x11/itk/Makefile | 4 ++-- x11/tk/tk.port.mk | 7 ++++--- 12 files changed, 38 insertions(+), 30 deletions(-) diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile index c7ba0a4b686..f789dab6ddd 100644 --- a/cad/xcircuit/Makefile +++ b/cad/xcircuit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2010/10/26 15:02:55 steven Exp $ +# $OpenBSD: Makefile,v 1.16 2010/11/06 22:06:57 espie Exp $ SHARED_ONLY= Yes @@ -29,6 +29,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ MODULES= x11/tk LIB_DEPENDS+= ${MODTK_LIB_DEPENDS} +WANTLIB+= ${MODTK_WANTLIB} USE_GMAKE= Yes USE_GROFF = Yes diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile index e70a2246295..d585e69de8a 100644 --- a/comms/hamlib/Makefile +++ b/comms/hamlib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2010/10/24 15:53:55 sthen Exp $ +# $OpenBSD: Makefile,v 1.19 2010/11/06 22:06:59 espie Exp $ COMMENT-main= radio/rotator control library COMMENT-python= python bindings for hamlib @@ -32,7 +32,7 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB = m usb.>=9 WANTLIB-main = ${WANTLIB} c stdc++ z xml2 iconv WANTLIB-python = ${WANTLIB} hamlib ${MODPY_WANTLIB} -WANTLIB-tcl = ${WANTLIB} hamlib +WANTLIB-tcl = ${WANTLIB} hamlib ${MODTCL_WANTLIB} LIB_DEPENDS-main= ::textproc/libxml \ ::converters/libiconv \ diff --git a/databases/db/v3/Makefile b/databases/db/v3/Makefile index db91c8081cd..ecdbf98f3bd 100644 --- a/databases/db/v3/Makefile +++ b/databases/db/v3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2010/10/30 23:14:15 steven Exp $ +# $OpenBSD: Makefile,v 1.22 2010/11/06 22:06:59 espie Exp $ REV= 3 DBLIBDIR= lib/db @@ -16,9 +16,9 @@ CONFIGURE_STYLE=gnu dest DEST_SUBDIR= WANTLIB=c -WANTLIB-tcl= m -LIB_DEPENDS-tcl= ${MODTCL_LIB_DEPENDS} -RUN_DEPENDS-tcl= :db->=3,<4:databases/db/v${REV} +WANTLIB-tcl = m ${MODTCL_WANTLIB} +LIB_DEPENDS-tcl = ${MODTCL_LIB_DEPENDS} +RUN_DEPENDS-tcl = :db->=3,<4:databases/db/v${REV} pre-configure: @${SUBST_CMD} ${WRKSRC}/test/include.tcl diff --git a/lang/expect/Makefile b/lang/expect/Makefile index 204f2bb21fb..7af79199515 100644 --- a/lang/expect/Makefile +++ b/lang/expect/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.54 2010/10/18 19:20:41 espie Exp $ +# $OpenBSD: Makefile,v 1.55 2010/11/06 22:06:59 espie Exp $ COMMENT= sophisticated scripter based on Tcl/Tk @@ -38,7 +38,8 @@ MODULES= x11/tk WANTLIB+= X11 z pthread-stubs xcb WANTLIB+= Xau Xdmcp Xext Xft Xrender Xss expat fontconfig freetype MAKE_FLAGS+= TK=Yes -LIB_DEPENDS+= ${MODTK_LIB_DEPENDS} +LIB_DEPENDS += ${MODTK_LIB_DEPENDS} +WANTLIB += ${MODTK_WANTLIB} CONFIGURE_ARGS+=--with-tk="${MODTK_LIBDIR}" \ --with-tkinclude="${MODTK_INCDIR}" .else diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index 4090da60d40..f236a61ea7e 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.46 2010/11/04 13:45:10 sthen Exp $ +# $OpenBSD: Makefile,v 1.47 2010/11/06 22:06:59 espie Exp $ # XXX Don't even think of updating ocaml alone. # Do check that the ports that depend on it still work, or repair them. @@ -40,9 +40,10 @@ FAKE_FLAGS= PREFIX=${WRKINST}${PREFIX} USE_GMAKE= Yes USE_GROFF = Yes -BUILD_DEPENDS+= ${MODTK_BUILD_DEPENDS} -RUN_DEPENDS+= ${MODTK_RUN_DEPENDS} -LIB_DEPENDS+= ${MODTK_LIB_DEPENDS} +BUILD_DEPENDS +=${MODTK_BUILD_DEPENDS} +RUN_DEPENDS += ${MODTK_RUN_DEPENDS} +LIB_DEPENDS += ${MODTK_LIB_DEPENDS} +WANTLIB += ${MODTK_WANTLIB} .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "sparc" || \ ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || \ diff --git a/lang/tcl/tcl.port.mk b/lang/tcl/tcl.port.mk index 6c79fd79400..738e41cd102 100644 --- a/lang/tcl/tcl.port.mk +++ b/lang/tcl/tcl.port.mk @@ -1,4 +1,4 @@ -# $OpenBSD: tcl.port.mk,v 1.7 2009/05/19 21:14:52 sthen Exp $ +# $OpenBSD: tcl.port.mk,v 1.8 2010/11/06 22:06:59 espie Exp $ CATEGORIES += lang/tcl @@ -6,8 +6,10 @@ MODTCL_VERSION ?= 8.5 .if ${MODTCL_VERSION} == 8.4 _MODTCL_SPEC = tcl->=${MODTCL_VERSION},<8.5 +MODTCL_WANTLIB = tcl84 .elif ${MODTCL_VERSION} == 8.5 _MODTCL_SPEC = tcl->=${MODTCL_VERSION},<8.6 +MODTCL_WANTLIB = tcl85 .endif MODTCL_BIN ?= ${LOCALBASE}/bin/tclsh${MODTCL_VERSION} @@ -17,8 +19,7 @@ MODTCL_CONFIG ?= ${MODTCL_LIBDIR}/tclConfig.sh MODTCL_BUILD_DEPENDS ?= :${_MODTCL_SPEC}:lang/tcl/${MODTCL_VERSION} MODTCL_RUN_DEPENDS ?= :${_MODTCL_SPEC}:lang/tcl/${MODTCL_VERSION} -MODTCL_LIB ?= tcl${MODTCL_VERSION:S/.//} -MODTCL_LIB_DEPENDS ?= ${MODTCL_LIB}:${_MODTCL_SPEC}:lang/tcl/${MODTCL_VERSION} +MODTCL_LIB_DEPENDS ?= :${_MODTCL_SPEC}:lang/tcl/${MODTCL_VERSION} # Handle the two most commonly used methods diff --git a/math/R/Makefile b/math/R/Makefile index c5055f43b7f..239b9b66139 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.40 2010/10/24 21:25:50 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.41 2010/11/06 22:06:59 espie Exp $ SHARED_ONLY= Yes @@ -22,7 +22,7 @@ WANTLIB= GL ICE SM X11 Xau Xdamage Xdmcp Xext Xfixes Xmu Xrender Xss Xt \ gmodule-2.0 gobject-2.0 gthread-2.0 jpeg m ncurses pango-1.0 \ pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread-stubs \ readline tiff xcb xcb-render xcb-shm z \ - ${MODFORTRAN_WANTLIB} + ${MODFORTRAN_WANTLIB} ${MODTK_WANTLIB} MASTER_SITES= http://cran.r-project.org/src/base/R-2/ \ http://cran.uk.r-project.org/src/base/R-2/ \ diff --git a/misc/wordnet/Makefile b/misc/wordnet/Makefile index eaf546cb6a7..6158963fb0a 100644 --- a/misc/wordnet/Makefile +++ b/misc/wordnet/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2010/11/05 08:24:50 sthen Exp $ +# $OpenBSD: Makefile,v 1.10 2010/11/06 22:06:59 espie Exp $ COMMENT= browser for a large lexical database of English V= 3.0 @@ -25,7 +25,8 @@ MASTER_SITES= http://wordnet.princeton.edu/3.0/ MODULES= x11/tk -LIB_DEPENDS+= ${MODTK_LIB_DEPENDS} +LIB_DEPENDS += ${MODTK_LIB_DEPENDS} +WANTLIB += ${MODTK_WANTLIB} pre-configure: @${SUBST_CMD} ${WRKSRC}/include/wn.h ${WRKSRC}/src/wnb diff --git a/net/quirc/Makefile b/net/quirc/Makefile index c3e7d8d456e..1c89c473087 100644 --- a/net/quirc/Makefile +++ b/net/quirc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2010/10/24 21:30:01 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.21 2010/11/06 22:06:59 espie Exp $ COMMENT= irc client that uses Tcl/Tk @@ -20,8 +20,9 @@ WANTLIB= ICE SM X11 c m stdc++ ${MODTCL_LIB} MODULES= x11/tk -MASTER_SITES= ${MASTER_SITE_OPENBSD} -LIB_DEPENDS= ${MODTK_LIB_DEPENDS} +MASTER_SITES = ${MASTER_SITE_OPENBSD} +LIB_DEPENDS = ${MODTK_LIB_DEPENDS} +WANTLIB += ${MODTK_WANTLIB} CONFIGURE_STYLE= gnu CONFIGURE_ARGS= --with-tcl-include-dir=${MODTCL_INCDIR} \ diff --git a/sysutils/findlib/Makefile b/sysutils/findlib/Makefile index 7743cc55c40..c81dcd80f13 100644 --- a/sysutils/findlib/Makefile +++ b/sysutils/findlib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2010/10/24 21:36:04 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.18 2010/11/06 22:06:59 espie Exp $ COMMENT= Objective Caml package manager CATEGORIES= sysutils @@ -17,7 +17,8 @@ PERMIT_DISTFILES_CDROM= Yes WANTLIB= X11 c curses m pthread pthread-stubs tcl85 xcb MODULES+= lang/ocaml x11/tk -LIB_DEPENDS= ${MODTK_LIB_DEPENDS} +LIB_DEPENDS = ${MODTK_LIB_DEPENDS} +WANTLIB += ${MODTK_WANTLIB} NO_REGRESS= Yes CONFIGURE_STYLE=simple diff --git a/x11/itk/Makefile b/x11/itk/Makefile index a56f989b8a2..ccb593ad4ea 100644 --- a/x11/itk/Makefile +++ b/x11/itk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/10/19 08:13:58 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/06 22:06:59 espie Exp $ COMMENT= build mega-widgets using the Itcl object system @@ -21,7 +21,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes MODULES= x11/tk -WANTLIB= X11 +WANTLIB= X11 ${MODTK_WANTLIB} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=incrtcl/} diff --git a/x11/tk/tk.port.mk b/x11/tk/tk.port.mk index c86e258677d..fdd92785ca3 100644 --- a/x11/tk/tk.port.mk +++ b/x11/tk/tk.port.mk @@ -1,4 +1,4 @@ -# $OpenBSD: tk.port.mk,v 1.7 2010/10/24 21:15:34 ajacoutot Exp $ +# $OpenBSD: tk.port.mk,v 1.8 2010/11/06 22:06:59 espie Exp $ CATEGORIES += x11/tk @@ -7,8 +7,10 @@ MODTCL_VERSION ?= ${MODTK_VERSION} .if ${MODTK_VERSION} == 8.4 _MODTK_SPEC = tk->=${MODTK_VERSION},<8.5 +MODTK_WANTLIB = tk84 ${MODTCL_WANTLIB} .elif ${MODTK_VERSION} == 8.5 _MODTK_SPEC = tk->=${MODTK_VERSION},<8.6 +MODTK_WANTLIB = tk85 ${MODTCL_WANTLIB} .endif MODTK_BIN ?= ${LOCALBASE}/bin/wish${MODTK_VERSION} @@ -25,6 +27,5 @@ MODTK_BUILD_DEPENDS ?= :${_MODTK_SPEC}:x11/tk/${MODTK_VERSION} \ ${MODTCL_BUILD_DEPENDS} MODTK_RUN_DEPENDS ?= :${_MODTK_SPEC}:x11/tk/${MODTK_VERSION} \ ${MODTCL_RUN_DEPENDS} -MODTK_LIB ?= tk${MODTK_VERSION:S/.//} -MODTK_LIB_DEPENDS ?= ${MODTK_LIB}:${_MODTK_SPEC}:x11/tk/${MODTK_VERSION} \ +MODTK_LIB_DEPENDS ?= :${_MODTK_SPEC}:x11/tk/${MODTK_VERSION} \ ${MODTCL_LIB_DEPENDS}