From alan@p-o.co.uk  Tue Sep  3 11:32:22 2013
Return-Path: <alan@p-o.co.uk>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 86E6A123
	for <freebsd-gnats-submit@freebsd.org>; Tue,  3 Sep 2013 11:32:22 +0000 (UTC)
	(envelope-from alan@p-o.co.uk)
Received: from avasout06.plus.net (avasout06.plus.net [212.159.14.18])
	by mx1.freebsd.org (Postfix) with ESMTP id EE7AF2C46
	for <freebsd-gnats-submit@freebsd.org>; Tue,  3 Sep 2013 11:32:21 +0000 (UTC)
Received: from mail.p-o.co.uk ([80.229.143.200])
	by avasout06 with smtp
	id LbYK1m0034Ke75s01bYLas; Tue, 03 Sep 2013 12:32:20 +0100
Received: from alan by p-o.co.uk with local (Exim 4.80.1 (FreeBSD))
	(envelope-from <alan@p-o.co.uk>)
	id 1VGoiJ-000GZR-VP
	for FreeBSD-gnats-submit@freebsd.org; Tue, 03 Sep 2013 12:24:03 +0100
Message-Id: <E1VGoiJ-000GZR-VP@p-o.co.uk>
Date: Tue, 03 Sep 2013 12:24:03 +0100
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: Use PORT_OPTIONS:MDOCS instead of NOPORTDOCS in gmime2 and gmime24
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         181778
>Category:       ports
>Synopsis:       Use PORT_OPTIONS:MDOCS instead of NOPORTDOCS in gmime2 and gmime24
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 03 11:40:00 UTC 2013
>Closed-Date:    Tue Sep 03 16:03:46 UTC 2013
>Last-Modified:  Tue Sep  3 16:10:00 UTC 2013
>Originator:     Alan Hicks
>Release:        FreeBSD 9.1-RELEASE-p5 i386
>Organization:
>Environment:
System: FreeBSD schnittke.p-o.co.uk 9.1-RELEASE-p5 FreeBSD 9.1-RELEASE-p5 #0: Sat Jul 27 01:01:40 UTC 2013 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
Use PORT_OPTIONS:MDOCS instead of NOPORTDOCS in gmime2 and gmime24
	
>How-To-Repeat:
	
>Fix:
Apply patch, no version changes or functionally changes so no revision bump needed

	

--- gmime2.diff begins here ---
diff -ur gmime2.orig/Makefile gmime2/Makefile
--- gmime2.orig/Makefile	2013-07-31 12:57:45.000000000 +0100
+++ gmime2/Makefile	2013-09-03 12:06:18.000000000 +0100
@@ -34,13 +34,15 @@
 
 PORTDOCS=	*
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|stdint.h|inttypes.h|" ${WRKSRC}/zentimer.h
 	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \
 		${WRKSRC}/gmime/Makefile.in
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if  ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for i in docs/reference/html/*
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
--- gmime2.diff ends here ---

--- gmime24.diff begins here ---
diff -ur gmime24.orig/Makefile gmime24/Makefile
--- gmime24.orig/Makefile	2013-05-08 23:23:36.000000000 +0100
+++ gmime24/Makefile	2013-09-03 12:01:53.000000000 +0100
@@ -37,12 +37,14 @@
 
 PORTDOCS=	*
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \
 		${WRKSRC}/*/Makefile.in
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for i in docs/reference/html/*
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
--- gmime24.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->wg 
Responsible-Changed-By: wg 
Responsible-Changed-When: Tue Sep 3 12:31:29 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=181778 
State-Changed-From-To: open->closed 
State-Changed-By: wg 
State-Changed-When: Tue Sep 3 16:03:45 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/181778: commit references a PR
Date: Tue,  3 Sep 2013 16:03:49 +0000 (UTC)

 Author: wg
 Date: Tue Sep  3 16:03:41 2013
 New Revision: 326164
 URL: http://svnweb.freebsd.org/changeset/ports/326164
 
 Log:
   mail/{gmime2,gmime24}: convert docs to options ng
   
   - NOPORTDOCS -> PORT_OPTIONS:MDOCS [1]
   - Convert to USES gmake
   - Define DOCS option
   
   PR:		ports/181778 [1]
   Submitted by:	Alan Hicks <ahicks p-o.co.uk> (maintainer)
 
 Modified:
   head/mail/gmime2/Makefile
   head/mail/gmime24/Makefile
 
 Modified: head/mail/gmime2/Makefile
 ==============================================================================
 --- head/mail/gmime2/Makefile	Tue Sep  3 15:59:59 2013	(r326163)
 +++ head/mail/gmime2/Makefile	Tue Sep  3 16:03:41 2013	(r326164)
 @@ -16,9 +16,8 @@ CONFLICTS=	gmime-1.0.* gmime-2.4.*
  
  SLAVEDIRS=	mail/gmime2-sharp
  
 -USE_GMAKE=	yes
  USE_GNOME?=	glib20
 -USES=		pathfix pkgconfig iconv
 +USES=		gmake pathfix pkgconfig iconv
  USE_LDCONFIG=	yes
  GNU_CONFIGURE=	yes
  # www.freebsd.org/cgi/query-pr.cgi?pr=118092
 @@ -32,15 +31,19 @@ CPPFLAGS+=	-I${LOCALBASE}/include ${PTHR
  
  LATEST_LINK?=	${PORTNAME}2
  
 +OPTIONS_DEFINE=	DOCS
 +
  PORTDOCS=	*
  
 +.include <bsd.port.options.mk>
 +
  post-patch:
  	@${REINPLACE_CMD} -e "s|stdint.h|inttypes.h|" ${WRKSRC}/zentimer.h
  	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \
  		${WRKSRC}/gmime/Makefile.in
  
  post-install:
 -.if !defined(NOPORTDOCS)
 +.if  ${PORT_OPTIONS:MDOCS}
  	@${MKDIR} ${DOCSDIR}
  .for i in docs/reference/html/*
  	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 
 Modified: head/mail/gmime24/Makefile
 ==============================================================================
 --- head/mail/gmime24/Makefile	Tue Sep  3 15:59:59 2013	(r326163)
 +++ head/mail/gmime24/Makefile	Tue Sep  3 16:03:41 2013	(r326164)
 @@ -18,9 +18,8 @@ CONFLICTS=	gmime-1.0.*
  SLAVEDIRS=	mail/gmime2-sharp
  
  DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}24
 -USE_GMAKE=	yes
  USE_GNOME?=	glib20
 -USES=		pathfix pkgconfig iconv
 +USES=		gmake pathfix pkgconfig iconv
  USE_LDCONFIG=	yes
  USE_XZ=		yes
  GNU_CONFIGURE=	yes
 @@ -35,14 +34,18 @@ CPPFLAGS+=	-I${LOCALBASE}/include ${PTHR
  
  LATEST_LINK?=	${PORTNAME}24
  
 +OPTIONS_DEFINE=	DOCS
 +
  PORTDOCS=	*
  
 +.include <bsd.port.options.mk>
 +
  post-patch:
  	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \
  		${WRKSRC}/*/Makefile.in
  
  post-install:
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	@${MKDIR} ${DOCSDIR}
  .for i in docs/reference/html/*
  	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 _______________________________________________
 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"
 
>Unformatted:
