Date: Wed, 27 Jul 2016 16:07:51 +0000 (UTC) From: Jonathan Anderson <jonathan@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419183 - head/lang/tcl86 Message-ID: <201607271607.u6RG7pEO088233@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jonathan (src committer) Date: Wed Jul 27 16:07:51 2016 New Revision: 419183 URL: https://svnweb.freebsd.org/changeset/ports/419183 Log: Remove `Requires.private: zlib` on FreeBSD <10. On FreeBSD 9, the 'Requires.private: zlib' line in tcl.pc causes breakage in ports that use pkg-config tcl to build their cflags, libraries, etc. This commit fixes at least the devel/libdistance build on 9; it may fix others, too. Approved by: gahr Differential Revision: https://reviews.freebsd.org/D4359 Modified: head/lang/tcl86/Makefile Modified: head/lang/tcl86/Makefile ============================================================================== --- head/lang/tcl86/Makefile Wed Jul 27 15:43:11 2016 (r419182) +++ head/lang/tcl86/Makefile Wed Jul 27 16:07:51 2016 (r419183) @@ -56,6 +56,8 @@ MODULES_INSTALL_TARGET= install-modules THREADS_CONFIGURE_ENABLE= threads DEBUG_CONFIGURE_ENABLE= symbols +.include <bsd.port.options.mk> + post-patch: ${REINPLACE_CMD} -e \ 's|@TCL_BUILD_LIB_SPEC@|@TCL_LIB_SPEC@|; \ @@ -63,6 +65,12 @@ post-patch: s|@TCL_BUILD_STUB_LIB_PATH@|@TCL_STUB_LIB_PATH@|; \ s|@TCL_SRC_DIR@|${PREFIX}/include/tcl${TCL_VER}|' \ ${PATCH_WRKSRC}/unix/tclConfig.sh.in +# On FreeBSD 9, pkg-config --cflags tcl can't find zlib. +.if ${OSVERSION} < 1000000 + ${REINPLACE_CMD} -e \ + 's|Requires.private: zlib >= 1.2.3||' \ + ${PATCH_WRKSRC}/unix/tcl.pc.in +.endif post-patch-TCLMAN-off: @${FIND} ${PATCH_WRKSRC}/pkgs -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607271607.u6RG7pEO088233>