Module Name: pkgsrc
Committed By: morr
Date: Sun Nov 13 19:37:18 UTC 2016
Modified Files:
pkgsrc/net/haproxy: Makefile options.mk
Log Message:
Add lua option.
Fixes PR pkg/51608.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/net/haproxy/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/haproxy/options.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/net/haproxy/Makefile
diff -u pkgsrc/net/haproxy/Makefile:1.29 pkgsrc/net/haproxy/Makefile:1.30
--- pkgsrc/net/haproxy/Makefile:1.29 Thu Oct 13 19:08:34 2016
+++ pkgsrc/net/haproxy/Makefile Sun Nov 13 19:37:18 2016
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2016/10/13 19:08:34 morr Exp $
+# $NetBSD: Makefile,v 1.30 2016/11/13 19:37:18 morr Exp $
DISTNAME= haproxy-1.6.9
+PKGREVISION= 1
CATEGORIES= net www
MASTER_SITES= http://www.haproxy.org/download/1.6/src/
@@ -10,7 +11,10 @@ COMMENT= Reliable, high performance TCP/
LICENSE= gnu-gpl-v2
USE_TOOLS+= gmake
-BUILD_MAKE_FLAGS+= TARGET=${TARGET} ADDLIB=${COMPILER_RPATH_FLAG}${PREFIX}/lib USE_ZLIB=1
+BUILD_MAKE_FLAGS+= TARGET=${TARGET} ADDLIB=${COMPILER_RPATH_FLAG}${PREFIX}/lib \
+ USE_ZLIB=1 \
+ USE_REGPARM=1
+
INSTALL_MAKE_FLAGS+= TARGET=${TARGET}
INSTALL_MAKE_FLAGS+= PREFIX=${PREFIX}
INSTALL_MAKE_FLAGS+= DOCDIR=${PREFIX}/share/doc/${PKGBASE}
Index: pkgsrc/net/haproxy/options.mk
diff -u pkgsrc/net/haproxy/options.mk:1.4 pkgsrc/net/haproxy/options.mk:1.5
--- pkgsrc/net/haproxy/options.mk:1.4 Sun Jan 3 17:13:40 2016
+++ pkgsrc/net/haproxy/options.mk Sun Nov 13 19:37:18 2016
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.4 2016/01/03 17:13:40 morr Exp $
+# $NetBSD: options.mk,v 1.5 2016/11/13 19:37:18 morr Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.haproxy
-PKG_SUPPORTED_OPTIONS= pcre ssl deviceatlas
+PKG_SUPPORTED_OPTIONS= pcre ssl deviceatlas lua
PKG_SUGGESTED_OPTIONS= pcre ssl
.include "../../mk/bsd.options.mk"
@@ -15,6 +15,17 @@ BUILD_MAKE_FLAGS+= USE_PCRE=1
.endif
###
+### Use LUA
+###
+.if !empty(PKG_OPTIONS:Mlua)
+. include "../../lang/lua/luaversion.mk"
+BUILD_MAKE_FLAGS+= USE_LUA=1
+BUILD_MAKE_FLAGS+= LUA_VERSION_ACCEPTED=53
+BUILD_MAKE_FLAGS+= LUA_INC=${PREFIX}/${LUA_INCDIR}
+. include "../../lang/lua/buildlink3.mk"
+.endif
+
+###
### Support DeviceAtlas detection.
###
.if !empty(PKG_OPTIONS:Mpcre) && !empty(PKG_OPTIONS:Mdeviceatlas)