From owner-svn-ports-head@FreeBSD.ORG  Mon Feb 17 15:11:16 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E3BDF273;
 Mon, 17 Feb 2014 15:11:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id CD6221C48;
 Mon, 17 Feb 2014 15:11:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1HFBG8G005200;
 Mon, 17 Feb 2014 15:11:16 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1HFBGdU005199;
 Mon, 17 Feb 2014 15:11:16 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201402171511.s1HFBGdU005199@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Mon, 17 Feb 2014 15:11:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r344778 - head/devel/tkmerge
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Feb 2014 15:11:17 -0000

Author: gahr
Date: Mon Feb 17 15:11:16 2014
New Revision: 344778
URL: http://svnweb.freebsd.org/changeset/ports/344778
QAT: https://qat.redports.org/buildarchive/r344778/

Log:
  - Convert to USES=tk
  - STAGE-clean
  - Fix COMMENT line

Modified:
  head/devel/tkmerge/Makefile

Modified: head/devel/tkmerge/Makefile
==============================================================================
--- head/devel/tkmerge/Makefile	Mon Feb 17 15:09:18 2014	(r344777)
+++ head/devel/tkmerge/Makefile	Mon Feb 17 15:11:16 2014	(r344778)
@@ -8,24 +8,23 @@ CATEGORIES=	devel tk
 MASTER_SITES=	http://immure.com/ports/tkmerge/
 
 MAINTAINER=	bob@immure.com
-COMMENT=	A tk script to aid in the merging changes between two files
-
-USE_TK_RUN=	84+
+COMMENT=	Tk script to aid in merging changes between two files
 
 RUN_DEPENDS+=	${LOCALBASE}/lib/bwidget/label.tcl:${PORTSDIR}/x11-toolkits/bwidget
 
+USES=		tk:run
+
 NO_BUILD=	yes
-MAN1=		tkmerge.1
-PLIST_FILES=	bin/tkmerge
+PLIST_FILES=	bin/tkmerge \
+		man/man1/tkmerge.1.gz
 
-NO_STAGE=	yes
 .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
+	${INSTALL_SCRIPT} ${WRKSRC}/tkmerge ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/tkmerge.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.post.mk>