Date: Sat, 14 Feb 2009 16:06:33 +0100 (CET) From: Martin Matuska <mm@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: stas@FreeBSD.org Subject: ports/131671: [PATCH] x11-toolkits/ruby18-tk USE_TCL Message-ID: <20090214150633.B38274AED9@mail.vx.sk> Resent-Message-ID: <200902141510.n1EFA1KH085916@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <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 +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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090214150633.B38274AED9>