Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 24 Sep 2013 07:02:21 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r328098 - in head/audio/etktab: . files
Message-ID:  <201309240702.r8O72L3Z090306@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309240702.r8O72L3Z090306>