From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 9 22:40:09 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 32646106564A for ; Mon, 9 Jul 2012 22:40:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 08C2C8FC19 for ; Mon, 9 Jul 2012 22:40:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q69Me8m0071640 for ; Mon, 9 Jul 2012 22:40:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q69Me8wP071639; Mon, 9 Jul 2012 22:40:08 GMT (envelope-from gnats) Resent-Date: Mon, 9 Jul 2012 22:40:08 GMT Resent-Message-Id: <201207092240.q69Me8wP071639@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jason Helfman Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 107251065672; Mon, 9 Jul 2012 22:31:59 +0000 (UTC) (envelope-from jhelfman@experts-exchange.com) Received: from mail.dw.redsrci.com (mail.pub.dw.redsrci.com [72.29.183.251]) by mx1.freebsd.org (Postfix) with ESMTP id E33B38FC16; Mon, 9 Jul 2012 22:31:58 +0000 (UTC) Received: from mail.dw.redsrci.com (localhost [127.0.0.1]) by mail.dw.redsrci.com (Postfix) with ESMTP id A05657187DB; Mon, 9 Jul 2012 15:31:58 -0700 (PDT) Received: from mail.dw.redsrci.com ([127.0.0.1]) by mail.dw.redsrci.com (mail.dw.redsrci.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UGtFhjoapJYL; Mon, 9 Jul 2012 15:31:58 -0700 (PDT) Received: from experts-exchange.com (unknown [192.168.103.120]) by mail.dw.redsrci.com (Postfix) with SMTP id 717836ECAB5; Mon, 9 Jul 2012 15:31:58 -0700 (PDT) Received: (nullmailer pid 26113 invoked by uid 1001); Mon, 09 Jul 2012 22:30:12 -0000 Message-Id: <1341873012.628662.26112.nullmailer@experts-exchange.com> Date: Mon, 09 Jul 2012 15:30:12 -0700 From: Jason Helfman To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: dougb@FreeBSD.org Subject: ports/169753: [PATCH] ports-mgmt/portmaster: adopt new Options Framework X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jul 2012 22:40:09 -0000 >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@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@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 -.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: