ports/169753: [PATCH] ports-mgmt/portmaster: adopt new Options Framework

[Jason Helfman]

>Number:         169753
>Category:       ports
>Synopsis:       [PATCH] ports-mgmt/portmaster: adopt new Options Framework
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 09 22:40:08 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Jason Helfman
>Release:        FreeBSD 8.3-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD dormouse.experts-exchange.com 8.3-RELEASE FreeBSD 8.3-RELEASE #0: Mon Apr  9 21:23:18 UTC
>Description:
adopt new Options Framework

Port maintainer (dougb at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: CVS)
>How-To-Repeat:
>Fix:

--- portmaster-3.13.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/ports-mgmt/portmaster/Makefile,v
retrieving revision 2.54
diff -u -r2.54 Makefile
--- Makefile	7 Jul 2012 12:16:20 -0000	2.54
+++ Makefile	9 Jul 2012 22:31:15 -0000
@@ -14,8 +14,9 @@
 MAINTAINER=	dougb at FreeBSD.org
 COMMENT=	Manage your ports without external databases or languages
 
-OPTIONS=	BASH "Install programmable completions for Bash" off \
-		ZSH "Install programmable completions for zsh" off
+OPTIONS_DEFINE=	BASH ZSH
+BASH_DESC=	Install programmable completions for Bash
+ZSH_DESC=	Install programmable completions for zsh
 
 PLIST_FILES=	sbin/portmaster etc/portmaster.rc.sample
 
@@ -23,12 +24,12 @@
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_BASH)
+.if ${PORT_OPTIONS:MBASH}
 PLIST_FILES+=	etc/bash_completion.d/portmaster.sh
 PLIST_DIRSTRY+=	etc/bash_completion.d
 .endif
 
-.if defined(WITH_ZSH)
+.if ${PORT_OPTIONS:MZSH}
 PLIST_FILES+=	share/zsh/site-functions/_portmaster
 PLIST_DIRSTRY+=	share/zsh/site-functions share/zsh
 .endif
@@ -47,12 +48,12 @@
 	${INSTALL_MAN} ${WRKSRC}/portmaster.8 ${MAN8PREFIX}/man/man8
 
 post-install:
-.if defined(WITH_BASH)
+.if ${PORT_OPTIONS:MBASH}
 	${MKDIR} ${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/bash-completions \
 		${PREFIX}/etc/bash_completion.d/portmaster.sh
 .endif
-.if defined(WITH_ZSH)
+.if ${PORT_OPTIONS:MZSH}
 	${MKDIR} ${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/zsh-completions \
 		${PREFIX}/share/zsh/site-functions/_portmaster
--- portmaster-3.13.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: