From pav@oook.cz  Thu May 11 12:24:50 2006
Return-Path: <pav@oook.cz>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3FFC516A407
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 11 May 2006 12:24:50 +0000 (UTC)
	(envelope-from pav@oook.cz)
Received: from e0-a11.b1.lan.prg.vol.cz (e0-a11.b1.lan.prg.vol.cz [195.122.204.152])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 685DF43D45
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 11 May 2006 12:24:49 +0000 (GMT)
	(envelope-from pav@oook.cz)
Received: from pav.hide.vol.cz (localhost [127.0.0.1])
	by e0-a11.b1.lan.prg.vol.cz (8.13.6/8.13.6) with ESMTP id k4BCOlLl037056
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 11 May 2006 14:24:47 +0200 (CEST)
	(envelope-from pav@pav.hide.vol.cz)
Received: (from pav@localhost)
	by pav.hide.vol.cz (8.13.6/8.13.6/Submit) id k4BCOkcT037055;
	Thu, 11 May 2006 14:24:46 +0200 (CEST)
	(envelope-from pav)
Message-Id: <200605111224.k4BCOkcT037055@pav.hide.vol.cz>
Date: Thu, 11 May 2006 14:24:46 +0200 (CEST)
From: Pav Lucistnik <pav@freebsd.org>
Reply-To: Pav Lucistnik <pav@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: always print options with make showconfig
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         97133
>Category:       ports
>Synopsis:       always print options with make showconfig
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 11 12:30:18 GMT 2006
>Closed-Date:    Fri Jun 16 04:57:33 GMT 2006
>Last-Modified:  Fri Jun 16 04:57:33 GMT 2006
>Originator:     Pav Lucistnik
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD pav.hide.vol.cz 6.1-STABLE FreeBSD 6.1-STABLE #0: Thu May 11 02:57:52 CEST 2006 root@pav.hide.vol.cz:/usr/obj/usr/src/sys/GENERIC i386

>Description:
I propose to change the behaviour of 'make showconfig' when user have not yet
set his settings using 'make config'.  At the moment, the user is told there is
nothing saved.  It would be much more useful to print the existing options and
their default values.

This is a first step for useful 'make showconfig-recursive'.

>How-To-Repeat:
Before --

$ make showconfig
===> No configuration options are set for this port
        Use 'make config' to set default values

After --

$ make showconfig
===> The following configuration options are available for liferea-1.0.12:
     DBUS=on (default) "Enable dbus support"
     XPI=off (default) "Firefox extension to subscribe feeds (req. dbus)"
     MOZILLA=off (default) "Use Mozilla for rendering"
     XULRUNNER=off (default) "Use Xulrunner for rendering"
===> Use 'make config' to modify these settings

>Fix:

--- options-showconfig-always begins here ---
--- bsd.port.mk.orig	Thu May 11 14:15:04 2006
+++ bsd.port.mk	Thu May 11 14:17:57 2006
@@ -5306,8 +5306,8 @@
 
 .if !target(showconfig)
 showconfig:
-.if defined(OPTIONS) && exists(${_OPTIONSFILE})
-	@${ECHO_MSG} "===> The following configuration options are set for ${PKGNAME}:"
+.if defined(OPTIONS)
+	@${ECHO_MSG} "===> The following configuration options are available for ${PKGNAME}:"
 	-@if [ -e ${_OPTIONSFILE} ]; then \
 		. ${_OPTIONSFILE}; \
 	fi; \
@@ -5328,11 +5328,7 @@
 		${ECHO_MSG} "     $$1=$${val} \"$$2\""; \
 		shift 3; \
 	done
-.else
-	@${ECHO_MSG} "===> No configuration options are set for this port"
-.if defined(OPTIONS)
-	@${ECHO_MSG} "	Use 'make config' to set default values"
-.endif
+	@${ECHO_MSG} "===> Use 'make config' to modify these settings"
 .endif
 .endif
 
--- options-showconfig-always ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: pav 
Responsible-Changed-When: Thu May 11 12:31:59 UTC 2006 
Responsible-Changed-Why:  
Assign to the inner circle 

http://www.freebsd.org/cgi/query-pr.cgi?pr=97133 
State-Changed-From-To: open->analyzed 
State-Changed-By: linimon 
State-Changed-When: Mon Jun 5 19:34:20 UTC 2006 
State-Changed-Why:  
Accepted for testing on the cluster. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=97133 
State-Changed-From-To: analyzed->closed 
State-Changed-By: linimon 
State-Changed-When: Fri Jun 16 04:57:24 UTC 2006 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=97133 
>Unformatted:
