From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Feb 14 15:10:02 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D464106564A for ; Sat, 14 Feb 2009 15:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 274B38FC21 for ; Sat, 14 Feb 2009 15:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n1EFA1Vq085917 for ; Sat, 14 Feb 2009 15:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n1EFA1KH085916; Sat, 14 Feb 2009 15:10:01 GMT (envelope-from gnats) Resent-Date: Sat, 14 Feb 2009 15:10:01 GMT Resent-Message-Id: <200902141510.n1EFA1KH085916@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Martin Matuska Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 00605106566B for ; Sat, 14 Feb 2009 15:06:44 +0000 (UTC) (envelope-from mm@mail.vx.sk) Received: from mail.vx.sk (neo.vx.sk [194.160.65.240]) by mx1.freebsd.org (Postfix) with ESMTP id A81228FC15 for ; Sat, 14 Feb 2009 15:06:44 +0000 (UTC) (envelope-from mm@mail.vx.sk) Received: from localhost (localhost [127.0.0.1]) by mail.vx.sk (Postfix) with ESMTP id BA9FA4ADB0; Sat, 14 Feb 2009 16:06:43 +0100 (CET) Received: from mail.vx.sk ([127.0.0.1]) by localhost (mail.vx.sk [127.0.0.1]) (amavisd-new, port 10024) with LMTP id gDLSdpjCqri5; Sat, 14 Feb 2009 16:06:33 +0100 (CET) Received: by mail.vx.sk (Postfix, from userid 1001) id B38274AED9; Sat, 14 Feb 2009 16:06:33 +0100 (CET) Message-Id: <20090214150633.B38274AED9@mail.vx.sk> Date: Sat, 14 Feb 2009 16:06:33 +0100 (CET) From: Martin Matuska To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: stas@FreeBSD.org Subject: ports/131671: [PATCH] x11-toolkits/ruby18-tk USE_TCL X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Feb 2009 15:10:04 -0000 >Number: 131671 >Category: ports >Synopsis: [PATCH] x11-toolkits/ruby18-tk USE_TCL >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Feb 14 15:10:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Martin Matuska >Release: FreeBSD 7.1-RELEASE-p2 i386/amd64 >Organization: >Environment: >Description: - Switch to USE_TK - Support planned switch to new default tk (tk85) - Add (user-definable) support for tk84, tk85 and tk86. Port maintainer (stas@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- ruby18-tk-1.8.7.72,1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/x11-toolkits/ruby-tk/Makefile,v retrieving revision 1.44 diff -u -r1.44 Makefile --- Makefile 19 Apr 2008 17:55:36 -0000 1.44 +++ Makefile 14 Feb 2009 15:04:37 -0000 @@ -7,7 +7,7 @@ PORTNAME= tk PORTVERSION= ${RUBY_PORTVERSION} -PORTREVISION= 2 +PORTREVISION= 3 PORTREVISION= ${RUBY_PORTREVISION} PORTEPOCH= 1 CATEGORIES+= x11-toolkits ruby tcl tk @@ -26,27 +26,14 @@ 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 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 +47,10 @@ ${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}) --- ruby18-tk-1.8.7.72,1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: