svn commit: r458018 - in head/x11-toolkits: tk85 tk86

[Pietro Cerutti]

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 <lantw44 at gmail.com>

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