From owner-svn-ports-all@FreeBSD.ORG  Fri Mar 14 15:51:40 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3EE97751;
 Fri, 14 Mar 2014 15:51:40 +0000 (UTC)
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 2BC15B8E;
 Fri, 14 Mar 2014 15:51:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2EFpeVe061106;
 Fri, 14 Mar 2014 15:51:40 GMT (envelope-from sunpoet@svn.freebsd.org)
Received: (from sunpoet@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2EFpeBT061105;
 Fri, 14 Mar 2014 15:51:40 GMT (envelope-from sunpoet@svn.freebsd.org)
Message-Id: <201403141551.s2EFpeBT061105@svn.freebsd.org>
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Fri, 14 Mar 2014 15:51:40 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r348259 - head/deskutils/todo
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.17
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: Fri, 14 Mar 2014 15:51:40 -0000

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>