From jdc@koitsu.dyndns.org  Sun Nov 20 12:30:54 2011
Return-Path: <jdc@koitsu.dyndns.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D67841065672
	for <freebsd-gnats-submit@freebsd.org>; Sun, 20 Nov 2011 12:30:54 +0000 (UTC)
	(envelope-from jdc@koitsu.dyndns.org)
Received: from qmta13.emeryville.ca.mail.comcast.net (qmta13.emeryville.ca.mail.comcast.net [76.96.27.243])
	by mx1.freebsd.org (Postfix) with ESMTP id C090D8FC13
	for <freebsd-gnats-submit@freebsd.org>; Sun, 20 Nov 2011 12:30:53 +0000 (UTC)
Received: from omta13.emeryville.ca.mail.comcast.net ([76.96.30.52])
	by qmta13.emeryville.ca.mail.comcast.net with comcast
	id zQVy1h00A17UAYkADQWmWW; Sun, 20 Nov 2011 12:30:46 +0000
Received: from koitsu.dyndns.org ([67.180.84.87])
	by omta13.emeryville.ca.mail.comcast.net with comcast
	id zQUy1h0051t3BNj8ZQUyTa; Sun, 20 Nov 2011 12:28:59 +0000
Received: by icarus.home.lan (Postfix, from userid 1000)
	id 326CC102C1D; Sun, 20 Nov 2011 04:30:52 -0800 (PST)
Message-Id: <20111120123052.326CC102C1D@icarus.home.lan>
Date: Sun, 20 Nov 2011 04:30:52 -0800 (PST)
From: Jeremy Chadwick <freebsd@jdc.parodius.com>
Reply-To: Jeremy Chadwick <freebsd@jdc.parodius.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: postfix: fix OPTIONS descriptions to honour dialog(1) limits
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         162688
>Category:       ports
>Synopsis:       mail/postfix: fix OPTIONS descriptions to honour dialog(1) limits
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sahil
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 20 12:40:10 UTC 2011
>Closed-Date:    Mon Nov 21 01:15:50 UTC 2011
>Last-Modified:  Mon Nov 21 01:20:09 UTC 2011
>Originator:     Jeremy Chadwick
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD icarus.home.lan 8.2-STABLE FreeBSD 8.2-STABLE #0: Mon Nov 7 03:39:13 PST 2011 root@icarus.home.lan:/usr/obj/usr/src/sys/X7SBA_RELENG_8_amd64 amd64
>Description:
	postfix/Makefile and postfix2[567]/Makefile all have OPTIONS
	descriptions that exceed the region width defined when dialog(1)
	is called by the ports infrastructure.  The result is that some
	lines when selected "wrap" their text to the next item and mess
	up the dialog formatting.

	Example when doing "make config":

......................................................................
.                   Options for postfix 2.8.7,1                      .
. .................................................................. .
. .[X] PCRE       Perl Compatible Regular Expressions              . .
. .[X] SASL2      Cyrus SASLv2 (Simple Auth. and Sec. Layer)       . .
. .[ ] DOVECOT    Dovecot 1.x SASL authentication method           . .
. .[ ] DOVECOT2   Dovecot 2.x SASL authentication method           . .
. .[ ] SASLKRB5   If your SASL req. Kerberos5 select this option   . .
. .[ ] SASLKMIT   If your SASL req. MIT Kerberos5 select this optio. .
. .[X] TLS        Enable SSL and TLS support                       . .
. .[ ] BDB        Berkeley DB (choose version with WITH_BDB_VER)   . .
. .[ ] MYSQL      MySQL maps (choose version with WITH_MYSQL_VER)  . .
. .[ ] PGSQL      PostgreSQL maps (pick ver. with DEFAULT_PGSQL_VER. .
. .[ ] SQLITE     SQLite maps                                      . .
. .[ ] OPENLDAP   OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER. .
. .[ ] LDAP_SASL  Enable OpenLDAP client-to-server auth via SASL   . .
. .[ ] CDB        CDB maps lookups                                 . .
. .[ ] NIS        NIS maps lookups                                 . .
.......v(+)...........................................................
.                       [  OK  ]       Cancel                        .
......................................................................

	If you move the selection to SASLKMIT, PGSQL, or OPENLDAP,
	you end up with this (example has SASLKMIT selected):

......................................................................
.                   Options for postfix 2.8.7,1                      .
. .................................................................. .
. .[X] PCRE       Perl Compatible Regular Expressions              . .
. .[X] SASL2      Cyrus SASLv2 (Simple Auth. and Sec. Layer)       . .
. .[ ] DOVECOT    Dovecot 1.x SASL authentication method           . .
. .[ ] DOVECOT2   Dovecot 2.x SASL authentication method           . .
. .[ ] SASLKRB5   If your SASL req. Kerberos5 select this option   . .
. .[ ] SASLKMIT   If your SASL req. MIT Kerberos5 select this optio. .
. .nX] TLS        Enable SSL and TLS support                       . .
. .[ ] BDB        Berkeley DB (choose version with WITH_BDB_VER)   . .
. .[ ] MYSQL      MySQL maps (choose version with WITH_MYSQL_VER)  . .
. .[ ] PGSQL      PostgreSQL maps (pick ver. with DEFAULT_PGSQL_VER. .
. .[ ] SQLITE     SQLite maps                                      . .
. .[ ] OPENLDAP   OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER. .
. .[ ] LDAP_SASL  Enable OpenLDAP client-to-server auth via SASL   . .
. .[ ] CDB        CDB maps lookups                                 . .
. .[ ] NIS        NIS maps lookups                                 . .
.......v(+)...........................................................
.                       [  OK  ]       Cancel                        .
......................................................................

	Note the "n" in the word "option" wraps to the brackets on
	the item for TLS.
>How-To-Repeat:
	See above.
>Fix:
	The attached patches fix this by shortening the OPTIONS
	descriptions to something that fits within the width of
	the dialog(1) region.

	Patches will also be available for download, once I get a PR
	number from GNATS, at:

	http://jdc.parodius.com/freebsd/{prnum}

diff -ruN ports/mail/postfix/Makefile.orig ports/mail/postfix/Makefile
--- ports/mail/postfix/Makefile.orig	2011-11-20 00:52:09.000000000 -0800
+++ ports/mail/postfix/Makefile	2011-11-20 04:15:48.475392385 -0800
@@ -51,15 +51,15 @@
 		SASL2		"Cyrus SASLv2 (Simple Auth. and Sec. Layer)"		${STATUS_SASL2} \
 		DOVECOT		"Dovecot 1.x SASL authentication method"		off \
 		DOVECOT2	"Dovecot 2.x SASL authentication method"		off \
-		SASLKRB5	"If your SASL req. Kerberos5 select this option"	${STATUS_SASLKRB5} \
-		SASLKMIT	"If your SASL req. MIT Kerberos5 select this option"	${STATUS_SASLKRB5MIT} \
+		SASLKRB5	"If your SASL req. Kerberos5, select this"		${STATUS_SASLKRB5} \
+		SASLKMIT	"If your SASL req. MIT Kerberos5, select this"		${STATUS_SASLKRB5MIT} \
 		TLS		"Enable SSL and TLS support"				${STATUS_TLS} \
-		BDB		"Berkeley DB (choose version with WITH_BDB_VER)"	${STATUS_BDB} \
-		MYSQL		"MySQL maps (choose version with WITH_MYSQL_VER)"	${STATUS_MySQL} \
-		PGSQL		"PostgreSQL maps (pick ver. with DEFAULT_PGSQL_VER)"	${STATUS_PgSQL} \
+		BDB		"Berkeley DB (uses WITH_BDB_VER)"			${STATUS_BDB} \
+		MYSQL		"MySQL maps (uses WITH_MYSQL_VER)"			${STATUS_MySQL} \
+		PGSQL		"PostgreSQL maps (uses DEFAULT_PGSQL_VER)"		${STATUS_PgSQL} \
 		SQLITE		"SQLite maps"						off \
-		OPENLDAP	"OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER)"	${STATUS_OpenLDAP} \
-		LDAP_SASL	"Enable OpenLDAP client-to-server auth via SASL"	off \
+		OPENLDAP	"OpenLDAP maps (uses WITH_OPENLDAP_VER)"		${STATUS_OpenLDAP} \
+		LDAP_SASL	"Enable OpenLDAP client-to-server SASL auth"		off \
 		CDB		"CDB maps lookups"					${STATUS_CDB} \
 		NIS		"NIS maps lookups"					${STATUS_NIS} \
 		VDA		"VDA (Virtual Delivery Agent 32Bit)"			${STATUS_VDA} \

diff -ruN ports/mail/postfix25/Makefile.orig ports/mail/postfix25/Makefile
--- ports/mail/postfix25/Makefile.orig	2011-11-20 00:52:09.000000000 -0800
+++ ports/mail/postfix25/Makefile	2011-11-20 04:16:24.567005823 -0800
@@ -44,14 +44,14 @@
 OPTIONS=	PCRE		"Perl Compatible Regular Expressions"			on \
 		SASL2		"Cyrus SASLv2 (Simple Auth. and Sec. Layer)"		${STATUS_SASL2} \
 		DOVECOT		"Dovecot SASL authentication method"			off \
-		SASLKRB		"If your SASL req. Kerberos select this option"		${STATUS_SASLKRB} \
-		SASLKRB5	"If your SASL req. Kerberos5 select this option"	${STATUS_SASLKRB5} \
-		SASLKMIT	"If your SASL req. MIT Kerberos5 select this option"	${STATUS_SASLKRB5MIT} \
+		SASLKRB		"If your SASL req. Kerberos, select this"		${STATUS_SASLKRB} \
+		SASLKRB5	"If your SASL req. Kerberos5, select this"		${STATUS_SASLKRB5} \
+		SASLKMIT	"If your SASL req. MIT Kerberos5, select this"		${STATUS_SASLKRB5MIT} \
 		TLS		"Enable SSL and TLS support"				${STATUS_TLS} \
-		BDB		"Berkeley DB (choose version with WITH_BDB_VER)"	${STATUS_BDB} \
-		MYSQL		"MySQL maps (choose version with WITH_MYSQL_VER)"	${STATUS_MySQL} \
-		PGSQL		"PostgreSQL maps (choose with DEFAULT_PGSQL_VER)"	${STATUS_PgSQL} \
-		OPENLDAP	"OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER)"	${STATUS_OpenLDAP} \
+		BDB		"Berkeley DB (uses WITH_BDB_VER)"			${STATUS_BDB} \
+		MYSQL		"MySQL maps (uses WITH_MYSQL_VER)"			${STATUS_MySQL} \
+		PGSQL		"PostgreSQL maps (uses DEFAULT_PGSQL_VER)"		${STATUS_PgSQL} \
+		OPENLDAP	"OpenLDAP maps (uses WITH_OPENLDAP_VER)"		${STATUS_OpenLDAP} \
 		CDB		"CDB maps lookups"					${STATUS_CDB} \
 		NIS		"NIS maps lookups"					${STATUS_NIS} \
 		VDA		"VDA (Virtual Delivery Agent)"				${STATUS_VDA} \

diff -ruN ports/mail/postfix26/Makefile.orig ports/mail/postfix26/Makefile
--- ports/mail/postfix26/Makefile.orig	2011-11-20 00:52:09.000000000 -0800
+++ ports/mail/postfix26/Makefile	2011-11-20 04:17:09.260027788 -0800
@@ -47,14 +47,14 @@
 OPTIONS=	PCRE		"Perl Compatible Regular Expressions"			on \
 		SASL2		"Cyrus SASLv2 (Simple Auth. and Sec. Layer)"		${STATUS_SASL2} \
 		DOVECOT		"Dovecot SASL authentication method"			off \
-		SASLKRB		"If your SASL req. Kerberos select this option"		${STATUS_SASLKRB} \
-		SASLKRB5	"If your SASL req. Kerberos5 select this option"	${STATUS_SASLKRB5} \
-		SASLKMIT	"If your SASL req. MIT Kerberos5 select this option"	${STATUS_SASLKRB5MIT} \
+		SASLKRB		"If your SASL req. Kerberos, select this"		${STATUS_SASLKRB} \
+		SASLKRB5	"If your SASL req. Kerberos5, select this"		${STATUS_SASLKRB5} \
+		SASLKMIT	"If your SASL req. MIT Kerberos5, select this"		${STATUS_SASLKRB5MIT} \
 		TLS		"Enable SSL and TLS support"				${STATUS_TLS} \
-		BDB		"Berkeley DB (choose version with WITH_BDB_VER)"	${STATUS_BDB} \
-		MYSQL		"MySQL maps (choose version with WITH_MYSQL_VER)"	${STATUS_MySQL} \
-		PGSQL		"PostgreSQL maps (choose with DEFAULT_PGSQL_VER)"	${STATUS_PgSQL} \
-		OPENLDAP	"OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER)"	${STATUS_OpenLDAP} \
+		BDB		"Berkeley DB (uses WITH_BDB_VER)"			${STATUS_BDB} \
+		MYSQL		"MySQL maps (uses WITH_MYSQL_VER)"			${STATUS_MySQL} \
+		PGSQL		"PostgreSQL maps (uses DEFAULT_PGSQL_VER)"		${STATUS_PgSQL} \
+		OPENLDAP	"OpenLDAP maps (uses WITH_OPENLDAP_VER)"		${STATUS_OpenLDAP} \
 		CDB		"CDB maps lookups"					${STATUS_CDB} \
 		NIS		"NIS maps lookups"					${STATUS_NIS} \
 		VDA		"VDA (Virtual Delivery Agent 32Bit)"			${STATUS_VDA} \

diff -ruN ports/mail/postfix27/Makefile.orig ports/mail/postfix27/Makefile
--- ports/mail/postfix27/Makefile.orig	2011-11-20 00:52:09.000000000 -0800
+++ ports/mail/postfix27/Makefile	2011-11-20 04:17:45.634640035 -0800
@@ -47,13 +47,13 @@
 		SASL2		"Cyrus SASLv2 (Simple Auth. and Sec. Layer)"		${STATUS_SASL2} \
 		DOVECOT		"Dovecot 1.x SASL authentication method"		off \
 		DOVECOT2	"Dovecot 2.x SASL authentication method"		off \
-		SASLKRB5	"If your SASL req. Kerberos5 select this option"	${STATUS_SASLKRB5} \
-		SASLKMIT	"If your SASL req. MIT Kerberos5 select this option"	${STATUS_SASLKRB5MIT} \
+		SASLKRB5	"If your SASL req. Kerberos5, select this"		${STATUS_SASLKRB5} \
+		SASLKMIT	"If your SASL req. MIT Kerberos5, select this"		${STATUS_SASLKRB5MIT} \
 		TLS		"Enable SSL and TLS support"				${STATUS_TLS} \
-		BDB		"Berkeley DB (choose version with WITH_BDB_VER)"	${STATUS_BDB} \
-		MYSQL		"MySQL maps (choose version with WITH_MYSQL_VER)"	${STATUS_MySQL} \
-		PGSQL		"PostgreSQL maps (choose with DEFAULT_PGSQL_VER)"	${STATUS_PgSQL} \
-		OPENLDAP	"OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER)"	${STATUS_OpenLDAP} \
+		BDB		"Berkeley DB (uses WITH_BDB_VER)"			${STATUS_BDB} \
+		MYSQL		"MySQL maps (uses WITH_MYSQL_VER)"			${STATUS_MySQL} \
+		PGSQL		"PostgreSQL maps (uses DEFAULT_PGSQL_VER)"		${STATUS_PgSQL} \
+		OPENLDAP	"OpenLDAP maps (uses WITH_OPENLDAP_VER)"		${STATUS_OpenLDAP} \
 		CDB		"CDB maps lookups"					${STATUS_CDB} \
 		NIS		"NIS maps lookups"					${STATUS_NIS} \
 		VDA		"VDA (Virtual Delivery Agent 32Bit)"			${STATUS_VDA} \
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sahil 
Responsible-Changed-By: crees 
Responsible-Changed-When: Sun Nov 20 12:47:04 UTC 2011 
Responsible-Changed-Why:  
Fix synopsis and assign 

http://www.freebsd.org/cgi/query-pr.cgi?pr=162688 
State-Changed-From-To: open->closed 
State-Changed-By: sahil 
State-Changed-When: Mon Nov 21 01:15:49 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=162688 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/162688: commit references a PR
Date: Mon, 21 Nov 2011 01:14:13 +0000 (UTC)

 sahil       2011-11-21 01:13:58 UTC
 
   FreeBSD ports repository
 
   Modified files:
     mail/postfix         Makefile 
     mail/postfix-current Makefile 
     mail/postfix25       Makefile 
     mail/postfix26       Makefile 
     mail/postfix27       Makefile 
   Log:
   Shorten some OPTION descriptions such that they
   fit neatly within the dialog(1) box.
   
   PR:             ports/162688
   Submitted by:   Jeremy Chadwick <freebsd@jdc.parodius.com>
   Feature safe:   yes
   
   Revision  Changes    Path
   1.266     +7 -7      ports/mail/postfix-current/Makefile
   1.175     +7 -7      ports/mail/postfix/Makefile
   1.166     +7 -7      ports/mail/postfix25/Makefile
   1.165     +7 -7      ports/mail/postfix26/Makefile
   1.173     +6 -6      ports/mail/postfix27/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
