Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 14 Oct 2013 14:19:50 +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: r330329 - head/x11-fonts/tkfont
Message-ID:  <201310141419.r9EEJotr042079@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Mon Oct 14 14:19:49 2013
New Revision: 330329
URL: http://svnweb.freebsd.org/changeset/ports/330329

Log:
  - Convert to USES+=tk
  - Minor Makefile refactor
  - STAGE-clean

Modified:
  head/x11-fonts/tkfont/Makefile   (contents, props changed)

Modified: head/x11-fonts/tkfont/Makefile
==============================================================================
--- head/x11-fonts/tkfont/Makefile	Mon Oct 14 14:17:48 2013	(r330328)
+++ head/x11-fonts/tkfont/Makefile	Mon Oct 14 14:19:49 2013	(r330329)
@@ -11,24 +11,19 @@ MASTER_SITE_SUBDIR=	petef
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Tk based replacement for xfontsel
 
-USE_TK=		yes
-
+USES+=		tk:run
 RUN_DEPENDS+=	xlsfonts:${PORTSDIR}/x11-fonts/xlsfonts
-
 NO_BUILD=	yes
 
-NO_STAGE=	yes
 post-patch:
-	${SED} -e "s,/usr/local,${LOCALBASE}," \
-		-e "s,#!/usr/X11/bin/wish,#!${WISH}," \
-		 < ${WRKSRC}/tkfont > ${WRKSRC}/tkfont.new
-	${MV} ${WRKSRC}/tkfont.new ${WRKSRC}/tkfont
+	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|; s|#!/usr/X11/bin/wish|${WISH}|;' \
+	    ${WRKSRC}/tkfont
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/tkfont ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/lib/tkfont
-	@for file in COPYING Bugs.txt FileMenu.txt FindFont FontDirs.txt FontTypes.txt HelpText.txt README WhatsNew.txt; do \
-		${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/lib/tkfont; \
-	done
+	${INSTALL_SCRIPT} ${WRKSRC}/tkfont ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/tkfont
+.for file in COPYING Bugs.txt FileMenu.txt FindFont FontDirs.txt FontTypes.txt HelpText.txt README WhatsNew.txt
+	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${PREFIX}/lib/tkfont
+.endfor
 
 .include <bsd.port.mk>



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