From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Mar 29 22:50:10 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C142216A41F for ; Wed, 29 Mar 2006 22:50:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 94A2943D46 for ; Wed, 29 Mar 2006 22:50:09 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k2TMo9IV012120 for ; Wed, 29 Mar 2006 22:50:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k2TMo9jA012116; Wed, 29 Mar 2006 22:50:09 GMT (envelope-from gnats) Resent-Date: Wed, 29 Mar 2006 22:50:09 GMT Resent-Message-Id: <200603292250.k2TMo9jA012116@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, Frank Laszlo Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4471716A424; Wed, 29 Mar 2006 22:46:22 +0000 (UTC) (envelope-from laszlof@ritamari.vonostingroup.com) Received: from ritamari.vonostingroup.com (ritamari.vonostingroup.com [216.144.193.230]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5908D43D5D; Wed, 29 Mar 2006 22:46:19 +0000 (GMT) (envelope-from laszlof@ritamari.vonostingroup.com) Received: from laszlof by ritamari.vonostingroup.com with local (Exim 4.60 (FreeBSD)) (envelope-from ) id 1FOjSr-000CHU-8U; Wed, 29 Mar 2006 17:48:33 -0500 Message-Id: Date: Wed, 29 Mar 2006 17:48:33 -0500 From: Frank Laszlo To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: portmgr@FreeBSD.org Subject: ports/95085: [PATCH]: Add knob to allow for mutually exclusive OPTIONS X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Frank Laszlo List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Mar 2006 22:50:10 -0000 >Number: 95085 >Category: ports >Synopsis: [PATCH]: Add knob to allow for mutually exclusive OPTIONS >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Mar 29 22:50:08 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Frank Laszlo >Release: FreeBSD 6.0-STABLE i386 >Organization: >Environment: System: FreeBSD ritamari.vonostingroup.com 6.0-STABLE FreeBSD 6.0-STABLE #0: Mon Nov 7 12:06:15 EST 2005 laszlof@ritamari.vonostingroup.com:/usr/obj/usr/src/sys/RITAMARI i386 >Description: This is a small patch to allow for DIALOG to use the --radiolist option. This will allow port maintainers to create mutually exclusive port options. I have added an 'OPTIONS_RADIO' knob to enable this feature. I have CC'd portmgr as I believe it falls under their territory. >How-To-Repeat: >Fix: --- bsd.port.mk.diff begins here --- --- bsd.port.mk.orig Wed Mar 29 17:30:40 2006 +++ bsd.port.mk Wed Mar 29 17:43:28 2006 @@ -685,6 +685,8 @@ # into a single variable. NOTE: To make options work, you need # to include bsd.port.pre.mk before you start testing the # WITH_xyz variables. +# OPTIONS_RADIO - Use the "--radiolist" option with DIALOG rather than the default +# "--checklist" to allow for mutually exclusive options. # # For fetch: # @@ -1166,6 +1168,11 @@ . if exists(${_OPTIONSFILE}.local) . include "${_OPTIONSFILE}.local" . endif +. if defined(OPTIONS_RADIO) +DIALOG_FLAGS+= --radiolist +. else +DIALOG_FLAGS+= --checklist +. endif .endif # check for old, crufty, makefile types, part 1: @@ -5247,7 +5254,7 @@ done; \ TMPOPTIONSFILE=$$(mktemp -t portoptions); \ trap "${RM} -f $${TMPOPTIONSFILE}; exit 1" 1 2 3 5 10 13 15; \ - ${SH} -c "${DIALOG} --checklist \"Options for ${PKGNAME:C/-([^-]+)$/ \1/}\" 21 70 15 $${DEFOPTIONS} 2> $${TMPOPTIONSFILE}"; \ + ${SH} -c "${DIALOG} ${DIALOG_FLAGS} \"Options for ${PKGNAME:C/-([^-]+)$/ \1/}\" 21 70 15 $${DEFOPTIONS} 2> $${TMPOPTIONSFILE}"; \ status=$$?; \ if [ $${status} -ne 0 ] ; then \ ${RM} -f $${TMPOPTIONSFILE}; \ --- bsd.port.mk.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: