From owner-svn-ports-all@FreeBSD.ORG  Mon Nov 11 03:19:38 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 0A0E8635;
 Mon, 11 Nov 2013 03:19:38 +0000 (UTC)
 (envelope-from danilo@FreeBSD.org)
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 D39DD2495;
 Mon, 11 Nov 2013 03:19:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAB3Jbbg052357;
 Mon, 11 Nov 2013 03:19:37 GMT (envelope-from danilo@svn.freebsd.org)
Received: (from danilo@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAB3JbuE052355;
 Mon, 11 Nov 2013 03:19:37 GMT (envelope-from danilo@svn.freebsd.org)
Message-Id: <201311110319.rAB3JbuE052355@svn.freebsd.org>
From: Danilo Egea Gondolfo <danilo@FreeBSD.org>
Date: Mon, 11 Nov 2013 03:19:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r333477 - head/games/tksol
X-SVN-Group: ports-head
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Nov 2013 03:19:38 -0000

Author: danilo
Date: Mon Nov 11 03:19:37 2013
New Revision: 333477
URL: http://svnweb.freebsd.org/changeset/ports/333477

Log:
  - Remove the indefinite article from COMMENT
  - Add wish8.4 as RUN_DEPENDS
  - Add stage support

Modified:
  head/games/tksol/Makefile
  head/games/tksol/pkg-plist

Modified: head/games/tksol/Makefile
==============================================================================
--- head/games/tksol/Makefile	Mon Nov 11 03:10:27 2013	(r333476)
+++ head/games/tksol/Makefile	Mon Nov 11 03:19:37 2013	(r333477)
@@ -9,32 +9,29 @@ MASTER_SITES=	SUNSITE/games/solitaires
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A version of the card game solitaire
+COMMENT=	Version of the card game solitaire
 
 LICENSE=	GPLv2
 
+RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
+
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 
-USE_TK_WRAPPER=	yes
-
-MAN6=		tksol.6
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|^#/bin/sh|#!/bin/sh| ; \
-		 s|/usr/local/lib/tksol|${DATADIR}|' ${WRKSRC}/tksol
+		 s|/usr/local/lib/tksol|${DATADIR}| ; \
+		 s|wish|wish8.4|' ${WRKSRC}/tksol
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/tksol ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${MAN6} ${MANPREFIX}/man/man6
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/*.xbm ${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/tksol ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/tksol.6 ${STAGEDIR}${MANPREFIX}/man/man6
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*.xbm ${STAGEDIR}${DATADIR}
 .for dir in cardbacks cards pictures
 	${TAR} -C ${WRKSRC} --exclude ".xvpics" -cf - ${dir} | \
-		${TAR} -C ${DATADIR} --unlink -xf -
+		${TAR} -C ${STAGEDIR}${DATADIR} --unlink -xf -
 .endfor
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
 
 .include <bsd.port.mk>

Modified: head/games/tksol/pkg-plist
==============================================================================
--- head/games/tksol/pkg-plist	Mon Nov 11 03:10:27 2013	(r333476)
+++ head/games/tksol/pkg-plist	Mon Nov 11 03:19:37 2013	(r333477)
@@ -1,4 +1,5 @@
 bin/tksol
+man/man6/tksol.6.gz
 %%DATADIR%%/cardbacks/bucky.xbm
 %%DATADIR%%/cardbacks/circles.xbm
 %%DATADIR%%/cardbacks/darts.xbm
@@ -101,4 +102,4 @@ bin/tksol
 @dirrm %%DATADIR%%/pictures
 @dirrm %%DATADIR%%/cards
 @dirrm %%DATADIR%%/cardbacks
-@dirrm %%DATADIR%%/
+@dirrm %%DATADIR%%