From owner-svn-ports-all@FreeBSD.ORG  Wed Sep 25 09:55:39 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 ESMTP id 0EFDA481;
 Wed, 25 Sep 2013 09:55:39 +0000 (UTC)
 (envelope-from gahr@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 EF80027D5;
 Wed, 25 Sep 2013 09:55:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8P9tcSG070955;
 Wed, 25 Sep 2013 09:55:38 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8P9tcp2070954;
 Wed, 25 Sep 2013 09:55:38 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201309250955.r8P9tcp2070954@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Wed, 25 Sep 2013 09:55:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r328259 - head/deskutils/zorro
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: Wed, 25 Sep 2013 09:55:39 -0000

Author: gahr
Date: Wed Sep 25 09:55:38 2013
New Revision: 328259
URL: http://svnweb.freebsd.org/changeset/ports/328259

Log:
  - Convert to USES+=tk
  - Convert to OPTIONSng
  - Stage-safe

Modified:
  head/deskutils/zorro/Makefile   (contents, props changed)

Modified: head/deskutils/zorro/Makefile
==============================================================================
--- head/deskutils/zorro/Makefile	Wed Sep 25 09:32:09 2013	(r328258)
+++ head/deskutils/zorro/Makefile	Wed Sep 25 09:55:38 2013	(r328259)
@@ -13,24 +13,29 @@ DISTNAME=	${PORTNAME}-1.1p8
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simple to-do list manager
 
-USE_TK_RUN=	yes
+USES+=		tk:run
 NO_BUILD=	yes
 PLIST_FILES=	bin/zorro
-PORTDOCS=	DOTzorrorc
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local/bin/wish|${WISH}|' \
 		${WRKSRC}/zorro
 	@${REINPLACE_CMD} -e 's|oof|of|' ${WRKSRC}/DOTzorrorc
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/zorro ${PREFIX}/bin/zorro
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/DOTzorrorc ${DOCSDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/zorro ${STAGEDIR}${PREFIX}/bin/zorro
+
+.if ${PORT_OPTIONS:MDOCS}
+post-install:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/DOTzorrorc ${STAGEDIR}${DOCSDIR}/
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Take a look at ${DOCSDIR}/DOTzorrorc"
+	@${ECHO_MSG} "Take a look at ${STAGEDIR}${DOCSDIR}/DOTzorrorc"
 	@${ECHO_MSG} ""
 .endif