aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2010-11-30 16:32:17 +0000
committerMartin Matuska <mm@FreeBSD.org>2010-11-30 16:32:17 +0000
commitea3e6880a90343c171718b6e461e668f20be1208 (patch)
treee3c050cd754a13e7822cea4ec2d4664f957269bc
parent1dc23aad14e67fcff7c4f36716844cc6977cb40d (diff)
downloadports-ea3e6880a90343c171718b6e461e668f20be1208.tar.gz
ports-ea3e6880a90343c171718b6e461e668f20be1208.zip
- Use WITH_TK_RUN instead of explicit wish8.4
- Update distinfo PR: ports/152704 Approved by: Bob Willcox <bob@immure.com> (maintainer)
Notes
Notes: svn path=/head/; revision=265458
-rw-r--r--devel/tkmerge/Makefile12
-rw-r--r--devel/tkmerge/distinfo1
2 files changed, 9 insertions, 4 deletions
diff --git a/devel/tkmerge/Makefile b/devel/tkmerge/Makefile
index 2e19f9f703f6..af5ac101a6f9 100644
--- a/devel/tkmerge/Makefile
+++ b/devel/tkmerge/Makefile
@@ -14,15 +14,21 @@ MASTER_SITES= http://immure.com/~bob/ports/tkmerge/
MAINTAINER= bob@immure.com
COMMENT= A tk script to aid in the merging changes between two files
-RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 \
- ${LOCALBASE}/lib/bwidget/label.tcl:${PORTSDIR}/x11-toolkits/bwidget
+USE_TK_RUN= 84+
+
+RUN_DEPENDS+= ${LOCALBASE}/lib/bwidget/label.tcl:${PORTSDIR}/x11-toolkits/bwidget
NO_BUILD= yes
MAN1= tkmerge.1
PLIST_FILES= bin/tkmerge
+.include <bsd.port.pre.mk>
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|wish8.4|${WISH}|g' ${WRKSRC}/tkmerge
+
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/tkmerge ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/tkmerge.1 ${PREFIX}/man/man1
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/tkmerge/distinfo b/devel/tkmerge/distinfo
index ac3cdf062f4a..37787e7cf211 100644
--- a/devel/tkmerge/distinfo
+++ b/devel/tkmerge/distinfo
@@ -1,3 +1,2 @@
-MD5 (tkmerge-0.85.tar.gz) = 1a5308b6c6d3b24b13745ad217ce9c07
SHA256 (tkmerge-0.85.tar.gz) = eb292546b7585513971e4a55c63f28b0a4434c1c3f312f79e10bc7d32cf449a9
SIZE (tkmerge-0.85.tar.gz) = 15926