From owner-svn-ports-all@FreeBSD.ORG  Thu Oct 17 09:36:36 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 99FFEEB4;
 Thu, 17 Oct 2013 09:36:36 +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 859C42FCF;
 Thu, 17 Oct 2013 09:36:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9H9aaaQ075946;
 Thu, 17 Oct 2013 09:36:36 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9H9aaXi075945;
 Thu, 17 Oct 2013 09:36:36 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201310170936.r9H9aaXi075945@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Thu, 17 Oct 2013 09:36:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r330620 - head/editors/impress
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: Thu, 17 Oct 2013 09:36:36 -0000

Author: gahr
Date: Thu Oct 17 09:36:36 2013
New Revision: 330620
URL: http://svnweb.freebsd.org/changeset/ports/330620

Log:
  - Convert to USES+=tk
  - Fix MASTER_SITES
  - Convert to OPTIONSng (DOCS)
  - STAGE-clean

Modified:
  head/editors/impress/Makefile   (contents, props changed)

Modified: head/editors/impress/Makefile
==============================================================================
--- head/editors/impress/Makefile	Thu Oct 17 09:28:55 2013	(r330619)
+++ head/editors/impress/Makefile	Thu Oct 17 09:36:36 2013	(r330620)
@@ -5,8 +5,7 @@ PORTNAME=	impress
 PORTVERSION=	1.1b9
 PORTREVISION=	3
 CATEGORIES=	editors tk
-MASTER_SITES=	TUCOWS \
-		http://www.ntlug.org/~ccox/impress/
+MASTER_SITES=	http://www.ntlug.org/~ccox/impress/
 DISTNAME=	imp${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -15,20 +14,26 @@ COMMENT=	Publishing and presentation too
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
+OPTIONS_DEFINE=	DOCS
+
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-USE_TK_WRAPPER=	yes
+USES+=		tk
 
 PORTDOCS=	*
 PLIST_FILES=	bin/impress
 
-NO_STAGE=	yes
+.include <bsd.port.options.mk>
+
+post-patch:
+	${REINPLACE_CMD} -e 's|exec wish|exec ${WISH}|g' \
+	    ${WRKSRC}/src/impress.tcl
+
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/src/impress.tcl ${PREFIX}/bin/impress
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC}/src/doc && ${COPYTREE_SHARE} . ${DOCSDIR})
+	${INSTALL_SCRIPT} ${WRKSRC}/src/impress.tcl ${STAGEDIR}${PREFIX}/bin/impress
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/src/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>