From owner-svn-ports-head@FreeBSD.ORG Thu Apr 18 08:21:01 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 3B39F624; Thu, 18 Apr 2013 08:21:01 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1D1BB2B9; Thu, 18 Apr 2013 08:21:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3I8L0mb068361; Thu, 18 Apr 2013 08:21:01 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3I8KxuU068346; Thu, 18 Apr 2013 08:20:59 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201304180820.r3I8KxuU068346@svn.freebsd.org> From: Pietro Cerutti Date: Thu, 18 Apr 2013 08:20:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316025 - in head: lang/tcl84 lang/tcl85 lang/tcl86 x11-toolkits/tk84 x11-toolkits/tk85 x11-toolkits/tk86 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Apr 2013 08:21:01 -0000 Author: gahr Date: Thu Apr 18 08:20:59 2013 New Revision: 316025 URL: http://svnweb.freebsd.org/changeset/ports/316025 Log: - Fix a long standing problem in tclConfig.sh and tkConfig.sh, where paths were set based on WRKSRC instead of PREFIX. This mainly affected TEA-based extensions that source tclConfig.sh / tkConfig.sh to set important variables. An example is TCL_SRC_DIR, which is used to locate Tcl/Tk private header files such as tclUnixPort.h or tkUnixPort.h. This variable was previously set to WRKSRC, which caused ports to need additional tweaks to CFLAGS or CONFIGURE_ARGS. It should now be possible to build TEA-based extensions by specifying only the CONFIGURE_ARGS --with-tcl=${TCL_LIBDIR} / --with-tk=${TK_LIBDIR}. Feature safe: yes Approved by: bapt (portmgr) Modified: head/lang/tcl84/Makefile head/lang/tcl85/Makefile head/lang/tcl86/Makefile head/x11-toolkits/tk84/Makefile head/x11-toolkits/tk85/Makefile head/x11-toolkits/tk86/Makefile Modified: head/lang/tcl84/Makefile ============================================================================== --- head/lang/tcl84/Makefile Thu Apr 18 07:55:27 2013 (r316024) +++ head/lang/tcl84/Makefile Thu Apr 18 08:20:59 2013 (r316025) @@ -55,6 +55,14 @@ CONFIGURE_ARGS+= --enable-threads CONFIGURE_ARGS+= --disable-threads .endif +post-patch: + ${REINPLACE_CMD} -e \ + 's|@TCL_BUILD_LIB_SPEC@|@TCL_LIB_SPEC@|; \ + s|@TCL_BUILD_STUB_LIB_SPEC@|@TCL_STUB_LIB_SPEC@|; \ + s|@TCL_BUILD_STUB_LIB_PATH@|@TCL_STUB_LIB_PATH@|; \ + s|@TCL_SRC_DIR@|${PREFIX}/include/tcl${TCL_VER}|' \ + ${WRKSRC}/tclConfig.sh.in + post-configure: ${REINPLACE_CMD} \ -e 's,-DNO_MEMMOVE=1,,' -e 's,-DNO_STRING_H=1,,' \ Modified: head/lang/tcl85/Makefile ============================================================================== --- head/lang/tcl85/Makefile Thu Apr 18 07:55:27 2013 (r316024) +++ head/lang/tcl85/Makefile Thu Apr 18 08:20:59 2013 (r316025) @@ -70,6 +70,14 @@ PLIST_SUB+= TZDATA="@comment " CONFIGURE_ARGS+=--without-tzdata .endif +post-patch: + ${REINPLACE_CMD} -e \ + 's|@TCL_BUILD_LIB_SPEC@|@TCL_LIB_SPEC@|; \ + s|@TCL_BUILD_STUB_LIB_SPEC@|@TCL_STUB_LIB_SPEC@|; \ + s|@TCL_BUILD_STUB_LIB_PATH@|@TCL_STUB_LIB_PATH@|; \ + s|@TCL_SRC_DIR@|${PREFIX}/include/tcl${TCL_VER}|' \ + ${WRKSRC}/tclConfig.sh.in + post-configure: ${REINPLACE_CMD} \ -e 's,-DNO_MEMMOVE=1,,' -e 's,-DNO_STRING_H=1,,' \ Modified: head/lang/tcl86/Makefile ============================================================================== --- head/lang/tcl86/Makefile Thu Apr 18 07:55:27 2013 (r316024) +++ head/lang/tcl86/Makefile Thu Apr 18 08:20:59 2013 (r316025) @@ -77,6 +77,12 @@ BROKEN= Does not build on arm .endif post-patch: + ${REINPLACE_CMD} -e \ + 's|@TCL_BUILD_LIB_SPEC@|@TCL_LIB_SPEC@|; \ + s|@TCL_BUILD_STUB_LIB_SPEC@|@TCL_STUB_LIB_SPEC@|; \ + s|@TCL_BUILD_STUB_LIB_PATH@|@TCL_STUB_LIB_PATH@|; \ + s|@TCL_SRC_DIR@|${PREFIX}/include/tcl${TCL_VER}|' \ + ${WRKSRC}/tclConfig.sh.in .if !${PORT_OPTIONS:MTCLMAN} @${FIND} ${WRKSRC}/../pkgs -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \ -e '/^install:/s|install-doc||' Modified: head/x11-toolkits/tk84/Makefile ============================================================================== --- head/x11-toolkits/tk84/Makefile Thu Apr 18 07:55:27 2013 (r316024) +++ head/x11-toolkits/tk84/Makefile Thu Apr 18 08:20:59 2013 (r316025) @@ -63,6 +63,12 @@ CONFIGURE_ARGS+= --disable-threads .endif post-patch: + ${REINPLACE_CMD} -e \ + 's|@TK_BUILD_LIB_SPEC@|@TK_LIB_SPEC@|; \ + s|@TK_BUILD_STUB_LIB_SPEC@|@TK_STUB_LIB_SPEC@|; \ + s|@TK_BUILD_STUB_LIB_PATH@|@TK_STUB_LIB_PATH@|; \ + s|@TK_SRC_DIR@|${PREFIX}/include/tk${TK_VER}|' \ + ${WRKSRC}/tkConfig.sh.in @(cd ${WRKSRC}/..; ${PATCH} -p0 < ${PATCHDIR}/extra-lastevent-patch) @${REINPLACE_CMD} -e 's|X11/Intrinsic.h|X11/Xlib.h|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|@TK_SHARED_BUILD@|#@TK_SHARED_BUILD@|g' ${WRKSRC}/Makefile.in Modified: head/x11-toolkits/tk85/Makefile ============================================================================== --- head/x11-toolkits/tk85/Makefile Thu Apr 18 07:55:27 2013 (r316024) +++ head/x11-toolkits/tk85/Makefile Thu Apr 18 08:20:59 2013 (r316025) @@ -82,6 +82,12 @@ INSTALL_TARGET+=install-doc TKBASE?= ${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK} post-patch: + ${REINPLACE_CMD} -e \ + 's|@TK_BUILD_LIB_SPEC@|@TK_LIB_SPEC@|; \ + s|@TK_BUILD_STUB_LIB_SPEC@|@TK_STUB_LIB_SPEC@|; \ + s|@TK_BUILD_STUB_LIB_PATH@|@TK_STUB_LIB_PATH@|; \ + s|@TK_SRC_DIR@|${PREFIX}/include/tk${TK_VER}|' \ + ${WRKSRC}/tkConfig.sh.in @${REINPLACE_CMD} -e 's|X11/Intrinsic.h|X11/Xlib.h|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|@TK_SHARED_BUILD@|#@TK_SHARED_BUILD@|g; s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Makefile.in Modified: head/x11-toolkits/tk86/Makefile ============================================================================== --- head/x11-toolkits/tk86/Makefile Thu Apr 18 07:55:27 2013 (r316024) +++ head/x11-toolkits/tk86/Makefile Thu Apr 18 08:20:59 2013 (r316025) @@ -76,6 +76,14 @@ CONFIGURE_ARGS+=--enable-threads CONFIGURE_ARGS+=--disable-threads .endif +post-patch: + ${REINPLACE_CMD} -e \ + 's|@TK_BUILD_LIB_SPEC@|@TK_LIB_SPEC@|; \ + s|@TK_BUILD_STUB_LIB_SPEC@|@TK_STUB_LIB_SPEC@|; \ + s|@TK_BUILD_STUB_LIB_PATH@|@TK_STUB_LIB_PATH@|; \ + s|@TK_SRC_DIR@|${PREFIX}/include/tk${TK_VER}|' \ + ${WRKSRC}/tkConfig.sh.in + regression-test: build cd ${WRKSRC}; ${MAKE} test ${ECHO_CMD} "package require Tk" | tclsh${TK_VER}