Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 13 Nov 2015 12:09:59 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r401501 - head/net/haproxy
Message-ID:  <201511131209.tADC9xia057565@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Fri Nov 13 12:09:59 2015
New Revision: 401501
URL: https://svnweb.freebsd.org/changeset/ports/401501

Log:
  net/haproxy: Move MAKE_ARGS above <bsd.port.options.mk>
  
  If it comes after the inclusion, MAKE_ARGS can't be modified by
  local Makefiles, e.g. Makefile.local or Makefile.${OPSYS}
  
  Approved by:	just fix it

Modified:
  head/net/haproxy/Makefile

Modified: head/net/haproxy/Makefile
==============================================================================
--- head/net/haproxy/Makefile	Fri Nov 13 11:47:34 2015	(r401500)
+++ head/net/haproxy/Makefile	Fri Nov 13 12:09:59 2015	(r401501)
@@ -23,6 +23,9 @@ DEVICEATLAS_VERSION=	2.1
 DEVICEATLAS_DISTFILE=	deviceatlas-enterprise-c-${DEVICEATLAS_VERSION}
 DEVICEATLAS_REGISTRATION_URL=	https://deviceatlas.com/deviceatlas-haproxy-module
 
+MAKE_ARGS=	TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \
+		USE_ZLIB=1 USE_CPU_AFFINITY=1 CC="${CC}" CFLAGS="${CFLAGS}"
+
 OPTIONS_DEFINE=		DOCS EXAMPLES LUA OPENSSL DEVICEATLAS
 OPTIONS_RADIO=		PCRE
 OPTIONS_RADIO_PCRE=	DPCRE SPCRE
@@ -33,9 +36,6 @@ OPTIONS_DEFAULT=	SPCRE OPENSSL
 
 .include <bsd.port.options.mk>
 
-MAKE_ARGS=	TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \
-		USE_ZLIB=1 USE_CPU_AFFINITY=1 CC="${CC}" CFLAGS="${CFLAGS}"
-
 .if ${PORT_OPTIONS:MDPCRE}
 LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
 MAKE_ARGS+=	USE_PCRE=1 USE_PCRE_JIT=1



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511131209.tADC9xia057565>