From owner-svn-ports-all@freebsd.org Thu Jan 4 08:54:47 2018 Return-Path: Delivered-To: svn-ports-all@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 3F8ABEA775E; Thu, 4 Jan 2018 08:54:47 +0000 (UTC) (envelope-from gahr@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 0702580797; Thu, 4 Jan 2018 08:54:46 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w048skgl066894; Thu, 4 Jan 2018 08:54:46 GMT (envelope-from gahr@FreeBSD.org) Received: (from gahr@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w048skZe066892; Thu, 4 Jan 2018 08:54:46 GMT (envelope-from gahr@FreeBSD.org) Message-Id: <201801040854.w048skZe066892@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gahr set sender to gahr@FreeBSD.org using -f From: Pietro Cerutti Date: Thu, 4 Jan 2018 08:54:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458018 - in head/x11-toolkits: tk85 tk86 X-SVN-Group: ports-head X-SVN-Commit-Author: gahr X-SVN-Commit-Paths: in head/x11-toolkits: tk85 tk86 X-SVN-Commit-Revision: 458018 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jan 2018 08:54:47 -0000 Author: gahr Date: Thu Jan 4 08:54:45 2018 New Revision: 458018 URL: https://svnweb.freebsd.org/changeset/ports/458018 Log: x11-toolkits/tk8[56]: adjust pkgconf files to reflect their tcl equivalents PR: 224819 Reported by: Ting-Wei Lan Modified: head/x11-toolkits/tk85/Makefile head/x11-toolkits/tk86/Makefile Modified: head/x11-toolkits/tk85/Makefile ============================================================================== --- head/x11-toolkits/tk85/Makefile Thu Jan 4 08:42:55 2018 (r458017) +++ head/x11-toolkits/tk85/Makefile Thu Jan 4 08:54:45 2018 (r458018) @@ -3,6 +3,7 @@ PORTNAME= tk PORTVERSION= 8.5.19 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= TCLTK/tcl8_5 SF/tcl/Tcl/${PORTVERSION} PKGNAMESUFFIX= ${SHORT_TK_VER} @@ -63,6 +64,8 @@ post-patch: 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 '/^Requires/s|tcl|tcl${SHORT_TK_VER}|' \ + ${WRKSRC}/tk.pc.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 Jan 4 08:42:55 2018 (r458017) +++ head/x11-toolkits/tk86/Makefile Thu Jan 4 08:54:45 2018 (r458018) @@ -3,6 +3,7 @@ PORTNAME= tk PORTVERSION= 8.6.8 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} TCLTK/tcl8_6 PKGNAMESUFFIX= ${PORTVERSION:R:S/.//} @@ -64,6 +65,8 @@ post-patch: 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 '/^Requires/s|tcl|tcl${SHORT_TK_VER}|' \ + ${WRKSRC}/tk.pc.in regression-test: build cd ${WRKSRC}; ${MAKE} test