From sunpoet@sunpoet.net  Tue Mar 27 19:01:08 2007
Return-Path: <sunpoet@sunpoet.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5548A16A401
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 27 Mar 2007 19:01:08 +0000 (UTC)
	(envelope-from sunpoet@sunpoet.net)
Received: from sunpoet.net (sunpoet.net [203.204.205.212])
	by mx1.freebsd.org (Postfix) with ESMTP id 26AC513C48A
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 27 Mar 2007 19:01:07 +0000 (UTC)
	(envelope-from sunpoet@sunpoet.net)
Received: by sunpoet.net (Postfix, from userid 1000)
	id 8F0D21704F; Wed, 28 Mar 2007 03:01:06 +0800 (CST)
Message-Id: <20070327190106.8F0D21704F@sunpoet.net>
Date: Wed, 28 Mar 2007 03:01:06 +0800 (CST)
From: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
Reply-To: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [mail/dovecot] fix make package if NOPORTDOCS is defined 
X-Send-Pr-Version: 3.113
X-GNATS-Notify: robin@isometry.net

>Number:         110942
>Category:       ports
>Synopsis:       [mail/dovecot] fix make package if NOPORTDOCS is defined
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 27 19:10:05 GMT 2007
>Closed-Date:    Wed Mar 28 20:59:59 GMT 2007
>Last-Modified:  Wed Mar 28 21:00:13 GMT 2007
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
SUNPOET.net
>Environment:
System: FreeBSD IRIS.sunpoet.net 6.2-STABLE FreeBSD 6.2-STABLE #1: Mon Feb 12 03:43:56 CST 2007 sunpoet@IRIS.sunpoet.net:/usr/obj/usr/src/sys/sunpoet i386

	
>Description:
The following files are not installed if NOPORTDOCS is defined:
1. etc/dovecot-ldap-example.conf
2. etc/dovecot-sql-example.conf

	
>How-To-Repeat:
% cd /usr/ports/mail/dovecot
% make package

...

===>  Building package for dovecot-1.0.r28
Creating package /usr/ports/packages/All/dovecot-1.0.r28.tbz
Registering depends: libiconv-1.9.2_2.
Creating bzip'd tar ball in '/usr/ports/packages/All/dovecot-1.0.r28.tbz'
tar: etc/dovecot-ldap-example.conf: Cannot stat: No such file or directory
tar: etc/dovecot-sql-example.conf: Cannot stat: No such file or directory
pkg_create: make_dist: tar command failed with code 256
*** Error code 1

Stop in /usr/ports/mail/dovecot.

	
>Fix:

--- /usr/ports/mail/dovecot/Makefile.orig	Mon Mar 26 17:00:05 2007
+++ /usr/ports/mail/dovecot/Makefile	Wed Mar 28 02:35:06 2007
@@ -32,6 +32,7 @@
 		auth-protocol.txt securecoding.txt variables.txt
 .else
 CONFIGURE_ARGS+=	--without-docs
+PLIST_SUB+=		DOCS="@comment "
 .endif
 
 DOVECOT_UID?=	143
--- /usr/ports/mail/dovecot/pkg-plist.orig	Mon Mar 26 17:00:05 2007
+++ /usr/ports/mail/dovecot/pkg-plist	Wed Mar 28 02:34:41 2007
@@ -1,8 +1,8 @@
 @comment $FreeBSD: ports/mail/dovecot/pkg-plist,v 1.25 2007/03/24 14:46:31 pav Exp $
 @unexec if cmp -s %D/etc/dovecot-example.conf %D/etc/dovecot.conf; then rm -f %D/etc/dovecot.conf; fi
 etc/dovecot-example.conf
-etc/dovecot-ldap-example.conf
-etc/dovecot-sql-example.conf
+%%DOCS%%etc/dovecot-ldap-example.conf
+%%DOCS%%etc/dovecot-sql-example.conf
 @exec if [ ! -f %D/etc/dovecot.conf ] ; then cp -p %D/%F %B/dovecot.conf; fi
 @dirrmtry include/dovecot
 lib/dovecot/imap/lib01_acl_plugin.so
	


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Mar 27 19:10:16 UTC 2007 
State-Changed-Why:  
Awaiting maintainers feedback 

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

From: Robin Breathe <robin@isometry.net>
To: bug-followup@FreeBSD.org,
 sunpoet@sunpoet.net
Cc:  
Subject: Re: ports/110942: [mail/dovecot] fix make package if NOPORTDOCS is defined
Date: Tue, 27 Mar 2007 23:30:02 +0100

 --Apple-Mail-3--841092798
 Content-Transfer-Encoding: 7bit
 Content-Type: text/plain;
 	charset=US-ASCII;
 	delsp=yes;
 	format=flowed
 
 Thanks for the notification of breakage.
 
 Please apply the attached patch in preference to that originally  
 submitted with this PR.
 
 Regards, Robin (maintainer)
 
 
 --Apple-Mail-3--841092798
 Content-Type: multipart/appledouble;
 	boundary=Apple-Mail-4--841092798
 Content-Disposition: attachment
 
 
 --Apple-Mail-4--841092798
 Content-Transfer-Encoding: base64
 Content-Type: application/applefile;
 	name=dovecot-1.0.r28_1.diff
 Content-Disposition: attachment;
 	filename=dovecot-1.0.r28_1.diff
 
 AAUWBwACAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAJAAAAMgAAAAoAAAADAAAAPAAAABYAAAAAAAAA
 AAAIZG92ZWNvdC0xLjAucjI4XzEuZGlmZg==
 
 --Apple-Mail-4--841092798
 Content-Transfer-Encoding: 7bit
 Content-Id: <FA4D47EF-3C7D-4DC0-BCDB-F63001ACCD21@internal>
 Content-Type: application/octet-stream;
 	x-mac-type=0;
 	x-unix-mode=0644;
 	x-mac-creator=0;
 	name=dovecot-1.0.r28_1.diff
 Content-Disposition: attachment;
 	filename=dovecot-1.0.r28_1.diff
 
 diff -ruN dovecot.orig/Makefile dovecot/Makefile
 --- dovecot.orig/Makefile	Sat Mar 24 14:46:31 2007
 +++ dovecot/Makefile	Tue Mar 27 22:05:21 2007
 @@ -8,6 +8,7 @@
  
  PORTNAME=	dovecot
  DISTVERSION=	1.0.rc28
 +PORTREVISION=	1
  CATEGORIES=	mail ipv6
  MASTER_SITES=	http://www.dovecot.org/releases/
  
 diff -ruN dovecot.orig/pkg-plist dovecot/pkg-plist
 --- dovecot.orig/pkg-plist	Sat Mar 24 14:46:31 2007
 +++ dovecot/pkg-plist	Tue Mar 27 21:52:12 2007
 @@ -1,9 +1,9 @@
  @comment $FreeBSD: ports/mail/dovecot/pkg-plist,v 1.25 2007/03/24 14:46:31 pav Exp $
  @unexec if cmp -s %D/etc/dovecot-example.conf %D/etc/dovecot.conf; then rm -f %D/etc/dovecot.conf; fi
  etc/dovecot-example.conf
 -etc/dovecot-ldap-example.conf
 -etc/dovecot-sql-example.conf
  @exec if [ ! -f %D/etc/dovecot.conf ] ; then cp -p %D/%F %B/dovecot.conf; fi
 +%%PORTDOCS%%etc/dovecot-ldap-example.conf
 +%%PORTDOCS%%etc/dovecot-sql-example.conf
  @dirrmtry include/dovecot
  lib/dovecot/imap/lib01_acl_plugin.so
  lib/dovecot/imap/lib02_lazy_expunge_plugin.so
 
 --Apple-Mail-4--841092798--
 
 --Apple-Mail-3--841092798--
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Wed Mar 28 20:59:57 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/110942: commit references a PR
Date: Wed, 28 Mar 2007 20:59:44 +0000 (UTC)

 miwi        2007-03-28 20:59:38 UTC
 
   FreeBSD ports repository
 
   Modified files:
     mail/dovecot         Makefile pkg-plist 
   Log:
   - Set NOPORTDOCS
   
   PR:             110942
   Submitted by:   Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
   Approved by:    maintainer
   
   Revision  Changes    Path
   1.68      +1 -0      ports/mail/dovecot/Makefile
   1.26      +3 -3      ports/mail/dovecot/pkg-plist
 _______________________________________________
 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:
