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

bad me, fix modules

Browse Source
This commit is contained in:
espie 2010-11-08 09:04:52 +00:00
parent fcc2623401
commit 313bfd362c
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,15 +1,15 @@
# $OpenBSD: tcl.port.mk,v 1.8 2010/11/06 22:06:59 espie Exp $
# $OpenBSD: tcl.port.mk,v 1.9 2010/11/08 09:04:52 espie Exp $
CATEGORIES += lang/tcl
MODTCL_VERSION ?= 8.5
.if ${MODTCL_VERSION} == 8.4
_MODTCL_SPEC = tcl->=${MODTCL_VERSION},<8.5
MODTCL_WANTLIB = tcl84
_MODTCL_SPEC = tcl->=${MODTCL_VERSION},<8.5
MODTCL_LIB ?= tcl84
.elif ${MODTCL_VERSION} == 8.5
_MODTCL_SPEC = tcl->=${MODTCL_VERSION},<8.6
MODTCL_WANTLIB = tcl85
_MODTCL_SPEC = tcl->=${MODTCL_VERSION},<8.6
MODTCL_LIB ?= tcl85
.endif
MODTCL_BIN ?= ${LOCALBASE}/bin/tclsh${MODTCL_VERSION}
@ -20,6 +20,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_DEPENDS ?= :${_MODTCL_SPEC}:lang/tcl/${MODTCL_VERSION}
MODTCL_WANTLIB ?= ${MODTCL_LIB}
# Handle the two most commonly used methods

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

@ -1,4 +1,4 @@
# $OpenBSD: tk.port.mk,v 1.8 2010/11/06 22:06:59 espie Exp $
# $OpenBSD: tk.port.mk,v 1.9 2010/11/08 09:04:52 espie Exp $
CATEGORIES += x11/tk
@ -6,11 +6,11 @@ MODTK_VERSION ?= 8.5
MODTCL_VERSION ?= ${MODTK_VERSION}
.if ${MODTK_VERSION} == 8.4
_MODTK_SPEC = tk->=${MODTK_VERSION},<8.5
MODTK_WANTLIB = tk84 ${MODTCL_WANTLIB}
_MODTK_SPEC = tk->=${MODTK_VERSION},<8.5
MODTK_LIB ?= tk84
.elif ${MODTK_VERSION} == 8.5
_MODTK_SPEC = tk->=${MODTK_VERSION},<8.6
MODTK_WANTLIB = tk85 ${MODTCL_WANTLIB}
_MODTK_SPEC = tk->=${MODTK_VERSION},<8.6
MODTK_LIB ?= tk85
.endif
MODTK_BIN ?= ${LOCALBASE}/bin/wish${MODTK_VERSION}
@ -29,3 +29,4 @@ MODTK_RUN_DEPENDS ?= :${_MODTK_SPEC}:x11/tk/${MODTK_VERSION} \
${MODTCL_RUN_DEPENDS}
MODTK_LIB_DEPENDS ?= :${_MODTK_SPEC}:x11/tk/${MODTK_VERSION} \
${MODTCL_LIB_DEPENDS}
MODTK_WANTLIB ?= ${MODTK_LIB} ${MODTCL_WANTLIB}