diff options
| author | stas <stas@FreeBSD.org> | 2009-02-15 00:14:17 +0800 |
|---|---|---|
| committer | stas <stas@FreeBSD.org> | 2009-02-15 00:14:17 +0800 |
| commit | b40f601651b69a6157b33a81d1a148f08b24b845 (patch) | |
| tree | 81a43d601672bd6b93458d840cb7d6900fbae4f5 /x11-toolkits | |
| parent | 09c2fefc5f939d5ebdefb38c58d682b1e0b1063a (diff) | |
| download | freebsd-ports-gnome-b40f601651b69a6157b33a81d1a148f08b24b845.tar.gz freebsd-ports-gnome-b40f601651b69a6157b33a81d1a148f08b24b845.tar.zst freebsd-ports-gnome-b40f601651b69a6157b33a81d1a148f08b24b845.zip | |
- Switch to USE_TK.
- Support planned switch to new default tk (tk85).
- Add (user-definable) support for tk84, tk85 and tk86.
PR: ports/131671
Submitted by: Martin Matuska <mm@FreeBSD.org>
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/ruby-tk/Makefile | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/x11-toolkits/ruby-tk/Makefile b/x11-toolkits/ruby-tk/Makefile index 68e9716664f7..a66874e82b73 100644 --- a/x11-toolkits/ruby-tk/Makefile +++ b/x11-toolkits/ruby-tk/Makefile @@ -7,7 +7,6 @@ PORTNAME= tk PORTVERSION= ${RUBY_PORTVERSION} -PORTREVISION= 2 PORTREVISION= ${RUBY_PORTREVISION} PORTEPOCH= 1 CATEGORIES+= x11-toolkits ruby tcl tk @@ -26,27 +25,14 @@ USE_XORG= x11 WRKSRC= ${WRKDIR}/${PORTNAME} -TK_VERSION?= 8.4 -.if defined(WITH_TCLTK_JP) -TCLPORTDIR?= ${PORTSDIR}/japanese/tcl -TKPORTDIR?= ${PORTSDIR}/japanese/tk -.else -TCLPORTDIR?= ${PORTSDIR}/lang/tcl -TKPORTDIR?= ${PORTSDIR}/x11-toolkits/tk -.endif - -LIB_DEPENDS= tcl${TK_VERSION:S/.//}:${TCLPORTDIR}${TK_VERSION:C/[^0-9]//g} \ - tk${TK_VERSION:S/.//}:${TKPORTDIR}${TK_VERSION:C/[^0-9]//g} +USE_TK= 84+ .include <bsd.port.pre.mk> CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \ --with-X11-dir=${LOCALBASE} \ - --with-tcl-include=${LOCALBASE}/include/tcl${TK_VERSION} \ - --with-tk-include=${LOCALBASE}/include/tk${TK_VERSION} -.if defined(WITH_TCLTK_JP) -CONFIGURE_ARGS+=--with-tcllib=tcl${TK_VERSION:S/.//} --with-tklib=tk${TK_VERSION:S/.//} -.endif + --with-tcl-include=${TCL_INCLUDEDIR} \ + --with-tk-include=${TK_INCLUDEDIR} MAKE_ARGS= sitelibdir='$$(rubylibdir)' @@ -60,6 +46,10 @@ do-extract: ${MKDIR} ${WRKDIR} ${LN} -sf `cd ${PORTSDIR}/${RUBY_PORT}; ${MAKE} -V WRKDIR`/${PORTNAME} ${WRKDIR}/ +pre-configure: + @${REINPLACE_CMD} -e "s/8\.5 8\.4 8\.3 8\.2 8\.1 8\.0 .\../${TCL_VER}/g" \ + ${WRKSRC}/extconf.rb + post-build: @(cd ${BUILD_WRKSRC}/tkutil; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) |