From owner-svn-ports-all@FreeBSD.ORG  Tue Sep 24 07:02:21 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 3BC92162;
 Tue, 24 Sep 2013 07:02:21 +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 297942618;
 Tue, 24 Sep 2013 07:02:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8O72L8P090307;
 Tue, 24 Sep 2013 07:02:21 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8O72L3Z090306;
 Tue, 24 Sep 2013 07:02:21 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201309240702.r8O72L3Z090306@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Tue, 24 Sep 2013 07:02:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r328098 - in head/audio/etktab: . files
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: Tue, 24 Sep 2013 07:02:21 -0000

Author: gahr
Date: Tue Sep 24 07:02:20 2013
New Revision: 328098
URL: http://svnweb.freebsd.org/changeset/ports/328098

Log:
  - Convert to USES+=tk
  - Convert to new OPTIONS framework
  - Get rid of pkg-plist
  - Refactor a bit the Maekfile

Deleted:
  head/audio/etktab/files/
  head/audio/etktab/pkg-plist
Modified:
  head/audio/etktab/Makefile

Modified: head/audio/etktab/Makefile
==============================================================================
--- head/audio/etktab/Makefile	Tue Sep 24 06:51:41 2013	(r328097)
+++ head/audio/etktab/Makefile	Tue Sep 24 07:02:20 2013	(r328098)
@@ -8,23 +8,33 @@ CATEGORIES=	audio tcl tk
 MASTER_SITES=	SF/${PORTNAME}/eTktab/${PORTVERSION} \
 		SF/${PORTNAME}/keyboard%20layout%20support/${PORTVERSION}:keyboard
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:DEFAULT
-.if !defined(NOPORTDOCS)
-DISTFILES+=	canada_multi-3.2.etk:keyboard \
-		dvorak-3.2.etk:keyboard \
-		uk-3.2.etk:keyboard \
-		us-3.2.etk:keyboard
-.endif
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Guitar tablature editor
 
+OPTIONS_DEFINE=	DOCS
+
+USES+=		tk
 NO_BUILD=	yes
+NO_STAGE=	yes
 WRKSRC=		${WRKDIR}/eTktab-${PORTVERSION}
 
-USE_TK_WRAPPER=	yes
-NO_STAGE=	yes
+PLIST_FILES=	bin/${PORTNAME}
+PORTDOCS=	*
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+DISTFILES+=	canada_multi-3.2.etk:keyboard \
+		dvorak-3.2.etk:keyboard \
+		uk-3.2.etk:keyboard \
+		us-3.2.etk:keyboard
+.endif
+
+post-patch:
+	${REINPLACE_CMD} -e 's|wish8.4|${WISH}|g' ${WRKSRC}/eTktab
 
 post-extract:
 .for FILE in canada_multi-3.2.etk dvorak-3.2.etk uk-3.2.etk us-3.2.etk
@@ -33,7 +43,7 @@ post-extract:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/eTktab ${PREFIX}/bin/etktab
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for FILE in CHANGES.html LICENSE.html README.html eTktab-small.xpm eTktab.xpm \
 		canada_multi-3.2.etk dvorak-3.2.etk uk-3.2.etk us-3.2.etk