reorganize/extend these modules a bit

"go ahead" deanna@
This commit is contained in:
steven 2008-07-08 04:32:06 +00:00
parent af7a436428
commit a9c49ef25a
2 changed files with 16 additions and 6 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: tcl.port.mk,v 1.1 2008/05/13 12:07:14 deanna Exp $ # $OpenBSD: tcl.port.mk,v 1.2 2008/07/08 04:32:06 steven Exp $
CATEGORIES += lang/tcl CATEGORIES += lang/tcl
@ -6,7 +6,12 @@ MODTCL_VERSION ?= 8.5
MODTCL_BIN ?= ${LOCALBASE}/bin/tclsh${MODTCL_VERSION} MODTCL_BIN ?= ${LOCALBASE}/bin/tclsh${MODTCL_VERSION}
MODTCL_INCDIR ?= ${LOCALBASE}/include/tcl${MODTCL_VERSION} MODTCL_INCDIR ?= ${LOCALBASE}/include/tcl${MODTCL_VERSION}
MODTCL_CONFIG ?= ${LOCALBASE}/lib/tcl${MODTCL_VERSION}/tclConfig.sh MODTCL_LIBDIR ?= ${LOCALBASE}/lib/tcl${MODTCL_VERSION}
MODTCL_CONFIG ?= ${MODTCL_LIBDIR}/tclConfig.sh
MODTCL_BUILD_DEPENDS ?= :tcl-${MODTCL_VERSION}.*:lang/tcl/${MODTCL_VERSION}
MODTCL_RUN_DEPENDS ?= :tcl-${MODTCL_VERSION}.*:lang/tcl/${MODTCL_VERSION}
MODTCL_LIB_DEPENDS ?= tcl${MODTCL_VERSION:S/.//}:tcl-${MODTCL_VERSION}.*:lang/tcl/${MODTCL_VERSION}
SUBST_VARS += MODTCL_VERSION MODTCL_BIN SUBST_VARS += MODTCL_VERSION MODTCL_BIN

View File

@ -1,4 +1,4 @@
# $OpenBSD: tk.port.mk,v 1.1 2008/05/13 12:07:14 deanna Exp $ # $OpenBSD: tk.port.mk,v 1.2 2008/07/08 04:32:06 steven Exp $
CATEGORIES += x11/tk CATEGORIES += x11/tk
@ -6,7 +6,8 @@ MODTK_VERSION ?= 8.5
MODTK_BIN ?= ${LOCALBASE}/bin/wish${MODTK_VERSION} MODTK_BIN ?= ${LOCALBASE}/bin/wish${MODTK_VERSION}
MODTK_INCDIR ?= ${LOCALBASE}/include/tk${MODTK_VERSION} MODTK_INCDIR ?= ${LOCALBASE}/include/tk${MODTK_VERSION}
MODTK_CONFIG ?= ${LOCALBASE}/lib/tk${MODTK_VERSION}/tkConfig.sh MODTK_LIBDIR ?= ${LOCALBASE}/lib/tk${MODTK_VERSION}
MODTK_CONFIG ?= ${MODTK_LIBDIR}/tkConfig.sh
USE_X11 = Yes USE_X11 = Yes
@ -14,5 +15,9 @@ SUBST_VARS += MODTK_VERSION MODTK_BIN
MODULES += lang/tcl MODULES += lang/tcl
MODTK_BUILD_DEPENDS = ::lang/tcl/${MODTCL_VERSION} MODTK_BUILD_DEPENDS ?= :tk-${MODTK_VERSION}.*:x11/tk/${MODTK_VERSION} \
MODTK_RUN_DEPENDS = ::lang/tcl/${MODTCL_VERSION} ${MODTCL_BUILD_DEPENDS}
MODTK_RUN_DEPENDS ?= :tk-${MODTK_VERSION}.*:x11/tk/${MODTK_VERSION} \
${MODTCL_RUN_DEPENDS}
MODTK_LIB_DEPENDS ?= tk${MODTK_VERSION:S/.//}:tk-${MODTK_VERSION}.*:x11/tk/${MODTK_VERSION} \
${MODTCL_LIB_DEPENDS}