Date: Thu, 14 Jan 2010 14:23:02 GMT From: Sevan Janiyan <venture37@geeklan.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Cc: osa@FreeBSD.org Subject: ports/142831: [PATCH] www/nginx: move .include <bsd.port.pre.mk> further down to allow the use of USE_OPENSSL Message-ID: <201001141423.o0EEN2bl035563@newbie.thingamajig-systems.co.uk> Resent-Message-ID: <201001141430.o0EEU198077972@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 142831
>Category: ports
>Synopsis: [PATCH] www/nginx: move .include <bsd.port.pre.mk> further down to allow the use of USE_OPENSSL
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Jan 14 14:30:00 UTC 2010
>Closed-Date:
>Last-Modified:
>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:
Port maintainer (osa@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- nginx-0.7.64.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/nginx/Makefile,v
retrieving revision 1.187
diff -u -r1.187 Makefile
--- Makefile 11 Jan 2010 07:43:38 -0000 1.187
+++ Makefile 14 Jan 2010 14:21:35 -0000
@@ -75,8 +75,6 @@
USE_RAKE= yes
.endif
-.include <bsd.port.pre.mk>
-
NGINX_VARDIR?= /var
NGINX_LOGDIR?= ${NGINX_VARDIR}/log
NGINX_RUNDIR?= ${NGINX_VARDIR}/run
@@ -390,11 +388,13 @@
.endif # WITH_MAIL_MODULE
.if defined(NGINX_OPENSSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
.endif
PLIST_SUB+= NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
+.include <bsd.port.pre.mk>
+
pre-everything::
@${ECHO_MSG}
.if defined(WITH_HTTP_UPSTREAM_FAIR)
--- nginx-0.7.64.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001141423.o0EEN2bl035563>