From owner-svn-ports-head@freebsd.org  Wed Jul 27 16:07:53 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 00A9ABA684E;
 Wed, 27 Jul 2016 16:07:53 +0000 (UTC)
 (envelope-from jonathan@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C56DB198A;
 Wed, 27 Jul 2016 16:07:52 +0000 (UTC)
 (envelope-from jonathan@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6RG7q3B088234;
 Wed, 27 Jul 2016 16:07:52 GMT (envelope-from jonathan@FreeBSD.org)
Received: (from jonathan@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6RG7pEO088233;
 Wed, 27 Jul 2016 16:07:51 GMT (envelope-from jonathan@FreeBSD.org)
Message-Id: <201607271607.u6RG7pEO088233@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jonathan set sender to
 jonathan@FreeBSD.org using -f
From: Jonathan Anderson <jonathan@FreeBSD.org>
Date: Wed, 27 Jul 2016 16:07:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r419183 - head/lang/tcl86
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.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jul 2016 16:07:53 -0000

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} \