Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Mar 2014 15:51:40 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r348259 - head/deskutils/todo
Message-ID:  <201403141551.s2EFpeBT061105@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Fri Mar 14 15:51:39 2014
New Revision: 348259
URL: http://svnweb.freebsd.org/changeset/ports/348259
QAT: https://qat.redports.org/buildarchive/r348259/

Log:
  - Convert to new options helper
  - Use USES=shebangfix
  - Support STAGEDIR
  - Simplify Makefile
  
  Approved by:	portmgr (blanket)

Modified:
  head/deskutils/todo/Makefile

Modified: head/deskutils/todo/Makefile
==============================================================================
--- head/deskutils/todo/Makefile	Fri Mar 14 15:51:35 2014	(r348258)
+++ head/deskutils/todo/Makefile	Fri Mar 14 15:51:39 2014	(r348259)
@@ -17,32 +17,20 @@ CONFLICTS=	devtodo-[0-9]*
 OPTIONS_DEFINE=	BASH
 BASH_DESC=	Install programmable completions for Bash
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 NO_BUILD=	yes
+USES=		shebangfix
 
 PLIST_FILES=	bin/todo etc/todo.cfg
 
-.if ${PORT_OPTIONS:MBASH}
-PLIST_FILES+=	etc/bash_completion.d/todo
-PLIST_DIRSTRY+=	etc/bash_completion.d
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e "s,/bin/bash,${LOCALBASE}/bin/bash," ${WRKSRC}/todo.sh
-.if ${PORT_OPTIONS:MBASH}
-	@${REINPLACE_CMD} -e "s,/bin/bash,${LOCALBASE}/bin/bash," ${WRKSRC}/todo_completion
-.endif
+SHEBANG_FILES=	todo.sh todo_completion
 
-do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/todo.sh ${PREFIX}/bin/todo
-	@${INSTALL_DATA} ${WRKSRC}/todo.cfg ${PREFIX}/etc/todo.cfg
+BASH_PLIST_FILES=	etc/bash_completion.d/todo
+BAHS_PLIST_DIRSTRY=	etc/bash_completion.d
 
-post-install:
-.if ${PORT_OPTIONS:MBASH}
-	${MKDIR} ${PREFIX}/etc/bash_completion.d
-	${INSTALL_DATA} ${WRKSRC}/todo_completion ${PREFIX}/etc/bash_completion.d/todo
-.endif
+do-install:
+	@${INSTALL_SCRIPT} ${WRKSRC}/todo.sh ${STAGEDIR}${PREFIX}/bin/todo
+	@${INSTALL_DATA} ${WRKSRC}/todo.cfg ${STAGEDIR}${PREFIX}/etc/todo.cfg
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
+	${INSTALL_DATA} ${WRKSRC}/todo_completion ${STAGEDIR}${PREFIX}/etc/bash_completion.d/todo
 
 .include <bsd.port.mk>



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