cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tk/tcl wantlib conversion

Browse Source
This commit is contained in:
espie 2010-11-06 22:06:57 +00:00
parent 258a40a300
commit 9fb7a3fc28
12 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cad/xcircuit/Makefile
View File

@ -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

4
comms/hamlib/Makefile
View File

@ -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 \

4
databases/db/v3/Makefile
View File

@ -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,7 +16,7 @@ CONFIGURE_STYLE=gnu dest
DEST_SUBDIR=
WANTLIB=c
WANTLIB-tcl= m
WANTLIB-tcl = m ${MODTCL_WANTLIB}
LIB_DEPENDS-tcl = ${MODTCL_LIB_DEPENDS}
RUN_DEPENDS-tcl = :db->=3,<4:databases/db/v${REV}

3
lang/expect/Makefile
View File

@ -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
@ -39,6 +39,7 @@ 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}
WANTLIB += ${MODTK_WANTLIB}
CONFIGURE_ARGS+=--with-tk="${MODTK_LIBDIR}" \
--with-tkinclude="${MODTK_INCDIR}"
.else

3
lang/ocaml/Makefile
View File

@ -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.
@ -43,6 +43,7 @@ USE_GROFF = Yes
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" || \

7
lang/tcl/tcl.port.mk
View File

@ -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

4
math/R/Makefile
View File

@ -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/ \

3
misc/wordnet/Makefile
View File

@ -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
@ -26,6 +26,7 @@ MASTER_SITES= http://wordnet.princeton.edu/3.0/
MODULES= x11/tk
LIB_DEPENDS += ${MODTK_LIB_DEPENDS}
WANTLIB += ${MODTK_WANTLIB}
pre-configure:
@${SUBST_CMD} ${WRKSRC}/include/wn.h ${WRKSRC}/src/wnb

3
net/quirc/Makefile
View File

@ -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
@ -22,6 +22,7 @@ MODULES= x11/tk
MASTER_SITES = ${MASTER_SITE_OPENBSD}
LIB_DEPENDS = ${MODTK_LIB_DEPENDS}
WANTLIB += ${MODTK_WANTLIB}
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-tcl-include-dir=${MODTCL_INCDIR} \

3
sysutils/findlib/Makefile
View File

@ -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
@ -18,6 +18,7 @@ WANTLIB= X11 c curses m pthread pthread-stubs tcl85 xcb
MODULES+= lang/ocaml x11/tk
LIB_DEPENDS = ${MODTK_LIB_DEPENDS}
WANTLIB += ${MODTK_WANTLIB}
NO_REGRESS= Yes
CONFIGURE_STYLE=simple

4
x11/itk/Makefile
View File

@ -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/}

7
x11/tk/tk.port.mk
View File

@ -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}