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

- provide a default MODTCL_VERSION set to MODTK_VERSION; only one

Browse Source 
place to change if you need to use a different Tcl/Tk version.

- provide MODTCL_LIB and MODTK_LIB (avoids a possible messy
construct in an individual port's Makefile when they are needed,
allows use of "LDFLAGS=-L${MODTCL_LIBDIR} -l${MODTCL_LIB}").

ok steven@, Stuart Cassoff
This commit is contained in:
sthen 2009-05-19 21:14:52 +00:00
parent 95aa4b60f9
commit b70dcb07a1
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
# $OpenBSD: tcl.port.mk,v 1.6 2009/03/13 13:46:21 sthen Exp $
# $OpenBSD: tcl.port.mk,v 1.7 2009/05/19 21:14:52 sthen Exp $
CATEGORIES += lang/tcl
@ -17,7 +17,8 @@ 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_DEPENDS ?= tcl${MODTCL_VERSION:S/.//}:${_MODTCL_SPEC}:lang/tcl/${MODTCL_VERSION}
MODTCL_LIB ?= tcl${MODTCL_VERSION:S/.//}
MODTCL_LIB_DEPENDS ?= ${MODTCL_LIB}:${_MODTCL_SPEC}:lang/tcl/${MODTCL_VERSION}
# Handle the two most commonly used methods

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

@ -1,8 +1,9 @@
# $OpenBSD: tk.port.mk,v 1.5 2009/03/13 14:07:06 sthen Exp $
# $OpenBSD: tk.port.mk,v 1.6 2009/05/19 21:14:52 sthen Exp $
CATEGORIES += x11/tk
MODTK_VERSION ?= 8.5
MODTCL_VERSION ?= ${MODTK_VERSION}
.if ${MODTK_VERSION} == 8.4
_MODTK_SPEC = tk->=${MODTK_VERSION},<8.5
@ -25,5 +26,6 @@ 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_DEPENDS ?= tk${MODTK_VERSION:S/.//}:${_MODTK_SPEC}:x11/tk/${MODTK_VERSION} \
MODTK_LIB ?= tk${MODTK_VERSION:S/.//}
MODTK_LIB_DEPENDS ?= ${MODTK_LIB}:${_MODTK_SPEC}:x11/tk/${MODTK_VERSION} \
${MODTCL_LIB_DEPENDS}