From sevan@newbie.thingamajig-systems.co.uk  Thu Jan 14 14:45:20 2010
Return-Path: <sevan@newbie.thingamajig-systems.co.uk>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 48ECF106566B;
	Thu, 14 Jan 2010 14:45:20 +0000 (UTC)
	(envelope-from sevan@newbie.thingamajig-systems.co.uk)
Received: from newbie.thingamajig-systems.co.uk (newbie.thingamajig-systems.co.uk [93.97.185.103])
	by mx1.freebsd.org (Postfix) with ESMTP id C431C8FC0C;
	Thu, 14 Jan 2010 14:45:19 +0000 (UTC)
Received: from newbie.thingamajig-systems.co.uk (localhost [127.0.0.1])
	by newbie.thingamajig-systems.co.uk (8.14.3/8.14.3) with ESMTP id o0EEfMpM041243;
	Thu, 14 Jan 2010 14:41:22 GMT
	(envelope-from sevan@newbie.thingamajig-systems.co.uk)
Received: (from root@localhost)
	by newbie.thingamajig-systems.co.uk (8.14.3/8.14.3/Submit) id o0EEfM5L041242;
	Thu, 14 Jan 2010 14:41:22 GMT
	(envelope-from sevan)
Message-Id: <201001141441.o0EEfM5L041242@newbie.thingamajig-systems.co.uk>
Date: Thu, 14 Jan 2010 14:41:22 GMT
From: Sevan Janiyan <venture37@geeklan.co.uk>
To: FreeBSD-gnats-submit@freebsd.org
Cc: osa@freebsd.org
Subject: [PATCH] www/nginx-devel: move .include <bsd.port.pre.mk> further down to allow the use of USE_OPENSSL
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         142833
>Category:       ports
>Synopsis:       [PATCH] www/nginx-devel: move .include <bsd.port.pre.mk> further down to allow the use of USE_OPENSSL
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    osa
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 14 14:50:02 UTC 2010
>Closed-Date:    Thu Jan 14 18:57:14 UTC 2010
>Last-Modified:  Thu Jan 14 19:30:01 UTC 2010
>Originator:     Sevan Janiyan
>Release:        FreeBSD 8.0-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD newbie.thingamajig-systems.co.uk 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan  5 21:11:58 UTC
>Description:
No need to declare DISTFILES as it defaults to ${DISTNAME}${EXTRACT_SUFX} anyway

Port maintainer (osa@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- nginx-devel-0.8.32.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/nginx-devel/Makefile,v
retrieving revision 1.282
diff -u -r1.282 Makefile
--- Makefile	11 Jan 2010 17:23:35 -0000	1.282
+++ Makefile	14 Jan 2010 14:39:43 -0000
@@ -11,7 +11,6 @@
 MASTER_SITES=	http://sysoev.ru/nginx/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	osa
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	osa@FreeBSD.org
@@ -78,8 +77,6 @@
 USE_RAKE=	yes
 .endif
 
-.include <bsd.port.pre.mk>
-
 NGINX_VARDIR?=	/var
 NGINX_LOGDIR?=	${NGINX_VARDIR}/log
 NGINX_RUNDIR?=	${NGINX_VARDIR}/run
@@ -402,9 +399,11 @@
 .endif		# WITH_MAIL_MODULE
 
 .if defined(NGINX_OPENSSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL=	yes
 .endif
 
+.include <bsd.port.pre.mk>
+
 PLIST_SUB+=	NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 pre-everything::
--- nginx-devel-0.8.32.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->osa 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Jan 14 14:50:16 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: Venture37 <venture37@geeklan.co.uk>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/142833: [PATCH] www/nginx-devel: move .include <bsd.port.pre.mk>
 further down to allow the use of USE_OPENSSL
Date: Thu, 14 Jan 2010 16:35:35 +0000

 This is a multi-part message in MIME format.
 --------------040700050200000009030900
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Doh, as pointed out by maintainer, removing DISTFILES breaks the port 
 when 3rd party modules are selected, attached diff includes DISTFILES in 
 the correct sequence, after PKGNAMESUFFIX
 
 --------------040700050200000009030900
 Content-Type: text/plain;
  name="nginx-devel.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="nginx-devel.txt"
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/www/nginx-devel/Makefile,v
 retrieving revision 1.282
 diff -u -r1.282 Makefile
 --- Makefile	11 Jan 2010 17:23:35 -0000	1.282
 +++ Makefile	14 Jan 2010 16:29:18 -0000
 @@ -11,8 +11,8 @@
  MASTER_SITES=	http://sysoev.ru/nginx/
  MASTER_SITES+=	${MASTER_SITE_LOCAL}
  MASTER_SITE_SUBDIR=	osa
 -DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
  PKGNAMESUFFIX=	-devel
 +DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
  
  MAINTAINER=	osa@FreeBSD.org
  COMMENT=	Robust and small WWW server
 @@ -78,8 +78,6 @@
  USE_RAKE=	yes
  .endif
  
 -.include <bsd.port.pre.mk>
 -
  NGINX_VARDIR?=	/var
  NGINX_LOGDIR?=	${NGINX_VARDIR}/log
  NGINX_RUNDIR?=	${NGINX_VARDIR}/run
 @@ -402,9 +400,11 @@
  .endif		# WITH_MAIL_MODULE
  
  .if defined(NGINX_OPENSSL)
 -.include "${PORTSDIR}/Mk/bsd.openssl.mk"
 +USE_OPENSSL=	yes
  .endif
  
 +.include <bsd.port.pre.mk>
 +
  PLIST_SUB+=	NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
  
  pre-everything::
 
 --------------040700050200000009030900--
State-Changed-From-To: open->closed 
State-Changed-By: osa 
State-Changed-When: Thu Jan 14 18:57:01 UTC 2010 
State-Changed-Why:  
Committed with modifications, thank you for report! 

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

From: "Sergey A. Osokin" <osa@FreeBSD.org>
To: bug-followup@FreeBSD.org
Cc: Sevan Janiyan <venture37@geeklan.co.uk>
Subject: Re: ports/142833: [PATCH] www/nginx-devel: move .include <bsd.port.pre.mk> further down to allow the use of USE_OPENSSL
Date: Thu, 14 Jan 2010 16:09:12 +0000

 On Thu, Jan 14, 2010 at 02:41:22PM +0000, Sevan Janiyan wrote:
 > 
 > >Submitter-Id:	current-users
 > >Originator:	Sevan Janiyan
 > >Organization:	
 > >Confidential:	no 
 > >Synopsis:	[PATCH] www/nginx-devel: move .include <bsd.port.pre.mk> further down to allow the use of USE_OPENSSL
 > >Severity:	non-critical
 > >Priority:	low
 > >Category:	ports 
 > >Class:		change-request
 > >Release:	FreeBSD 8.0-RELEASE-p2 amd64
 > >Environment:
 > System: FreeBSD newbie.thingamajig-systems.co.uk 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan  5 21:11:58 UTC
 > >Description:
 > No need to declare DISTFILES as it defaults to ${DISTNAME}${EXTRACT_SUFX} anyway
 > 
 > Port maintainer (osa@FreeBSD.org) is cc'd.
 > 
 > Generated with FreeBSD Port Tools 0.99
 > >How-To-Repeat:
 > >Fix:
 > 
 > --- nginx-devel-0.8.32.patch begins here ---
 > Index: Makefile
 > ===================================================================
 > RCS file: /home/ncvs/ports/www/nginx-devel/Makefile,v
 > retrieving revision 1.282
 > diff -u -r1.282 Makefile
 > --- Makefile	11 Jan 2010 17:23:35 -0000	1.282
 > +++ Makefile	14 Jan 2010 14:39:43 -0000
 > @@ -11,7 +11,6 @@
 >  MASTER_SITES=	http://sysoev.ru/nginx/
 >  MASTER_SITES+=	${MASTER_SITE_LOCAL}
 >  MASTER_SITE_SUBDIR=	osa
 > -DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 >  PKGNAMESUFFIX=	-devel
 >  
 >  MAINTAINER=	osa@FreeBSD.org
 > @@ -78,8 +77,6 @@
 
 Could you test this changes one more time with define of any 3rd party
 module.
 
>Unformatted:
