From alan@p-o.co.uk  Thu Nov 14 18:12:39 2013
Return-Path: <alan@p-o.co.uk>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id E07561B0
	for <freebsd-gnats-submit@freebsd.org>; Thu, 14 Nov 2013 18:12:29 +0000 (UTC)
Received: from avasout05.plus.net (avasout05.plus.net [84.93.230.250])
	by mx1.freebsd.org (Postfix) with ESMTP id 542D421CE
	for <freebsd-gnats-submit@freebsd.org>; Thu, 14 Nov 2013 18:12:29 +0000 (UTC)
Received: from mail.p-o.co.uk ([80.229.143.200])
	by avasout05 with smtp
	id pWCT1m0044Ke75s01WCU4B; Thu, 14 Nov 2013 18:12:28 +0000
Received: from alan by p-o.co.uk with local (Exim 4.80.1 (FreeBSD))
	(envelope-from <alan@p-o.co.uk>)
	id 1Vh1FZ-000DHP-Nw
	for FreeBSD-gnats-submit@freebsd.org; Thu, 14 Nov 2013 18:02:41 +0000
Message-Id: <E1Vh1FZ-000DHP-Nw@p-o.co.uk>
Date: Thu, 14 Nov 2013 18:02:41 +0000
From: Alan Hicks <ahicks@p-o.co.uk>
Reply-To: Alan Hicks <ahicks@p-o.co.uk>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Fix portlint warnings for mail/dbmail
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         183964
>Category:       ports
>Synopsis:       Fix portlint warnings for mail/dbmail
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sunpoet
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 14 18:20:00 UTC 2013
>Closed-Date:    Fri Nov 15 11:00:49 UTC 2013
>Last-Modified:  Fri Nov 15 11:00:49 UTC 2013
>Originator:     Alan Hicks
>Release:        FreeBSD 9.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD schnittke.p-o.co.uk 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Fri Sep 27 03:52:52 UTC 2013 root@bake.isc.freebsd.org:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
Fix portlint warnings for missing PORT_OPTIONS:MDOCS and Conflict too broad
DOCS should install as per setting, currently installed regardless
Conflict warning appears too broad

	
>How-To-Repeat:
	
>Fix:
Apply patch
	

--- dbmail.diff begins here ---
diff -ur dbmail/Makefile dbmail/Makefile
--- dbmail/Makefile	2013-11-06 17:52:42.000000000 +0000
+++ dbmail/Makefile	2013-11-14 17:44:27.000000000 +0000
@@ -20,7 +20,7 @@
 		xmlto:${PORTSDIR}/textproc/xmlto \
 		${LOCALBASE}/share/sgml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-450
 
-CONFLICTS=	dbmail-2.* dbmail22-*
+CONFLICTS=	dbmail-2.* dbmail22-[0-9]*
 
 OPTIONS_DEFINE=	DOCS LDAP SIEVE THREADS
 OPTIONS_DEFAULT=	THREADS
@@ -83,8 +83,10 @@
 		${INSTALL_DATA} ${WRKSRC}/sql/$$f/* ${STAGEDIR}${DATADIR}/$$f; \
 	done
 	@${MKDIR} ${STAGEDIR}${PIDDIR}
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+.endif
 
 .include <bsd.port.mk>
--- dbmail.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sunpoet 
Responsible-Changed-By: sunpoet 
Responsible-Changed-When: Thu Nov 14 23:26:34 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183964: commit references a PR
Date: Fri, 15 Nov 2013 10:44:30 +0000 (UTC)

 Author: sunpoet
 Date: Fri Nov 15 10:44:19 2013
 New Revision: 333848
 URL: http://svnweb.freebsd.org/changeset/ports/333848
 
 Log:
   - Pet portlint
   
   PR:		ports/183964
   Submitted by:	Alan Hicks <ahicks@p-o.co.uk> (maintainer)
 
 Modified:
   head/mail/dbmail/Makefile
 
 Modified: head/mail/dbmail/Makefile
 ==============================================================================
 --- head/mail/dbmail/Makefile	Fri Nov 15 10:44:15 2013	(r333847)
 +++ head/mail/dbmail/Makefile	Fri Nov 15 10:44:19 2013	(r333848)
 @@ -20,7 +20,7 @@ BUILD_DEPENDS+=	asciidoc:${PORTSDIR}/tex
  		xmlto:${PORTSDIR}/textproc/xmlto \
  		${LOCALBASE}/share/sgml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-450
  
 -CONFLICTS=	dbmail-2.* dbmail22-*
 +CONFLICTS=	dbmail-2.* dbmail22-[0-9]*
  
  OPTIONS_DEFINE=	DOCS LDAP SIEVE THREADS
  OPTIONS_DEFAULT=	THREADS
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: sunpoet 
State-Changed-When: Fri Nov 15 11:00:49 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

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