Sun Jan 31 07:49:23 2016 UTC ()
Detect pkgsrc lua. Fix PR pkg/50724


(ryoon)
diff -r1.11 -r1.12 pkgsrc/www/apache24/options.mk
cvs diff -r1.11 -r1.12 pkgsrc/www/apache24/options.mk (expand / switch to unified diff)

--- pkgsrc/www/apache24/options.mk 2015/10/17 10:16:35 1.11
+++ pkgsrc/www/apache24/options.mk 2016/01/31 07:49:23 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.11 2015/10/17 10:16:35 adam Exp $ 1# $NetBSD: options.mk,v 1.12 2016/01/31 07:49:23 ryoon Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.apache 3PKG_OPTIONS_VAR= PKG_OPTIONS.apache
4PKG_SUPPORTED_OPTIONS= apache-mpm-event apache-mpm-prefork apache-mpm-worker \ 4PKG_SUPPORTED_OPTIONS= apache-mpm-event apache-mpm-prefork apache-mpm-worker \
5 lua http2 suexec 5 lua http2 suexec
6PKG_SUGGESTED_OPTIONS= apache-mpm-event apache-mpm-prefork \ 6PKG_SUGGESTED_OPTIONS= apache-mpm-event apache-mpm-prefork \
7 apache-mpm-worker 7 apache-mpm-worker
8 8
9.if ${OPSYS} == "SunOS" && !empty(OS_VERSION:M5.1[0-9]) 9.if ${OPSYS} == "SunOS" && !empty(OS_VERSION:M5.1[0-9])
10PKG_SUPPORTED_OPTIONS+= privileges 10PKG_SUPPORTED_OPTIONS+= privileges
11# Disabled until DTrace support is fully implemented/fixed 11# Disabled until DTrace support is fully implemented/fixed
12#PKG_SUPPORTED_OPTIONS+= dtrace 12#PKG_SUPPORTED_OPTIONS+= dtrace
13.endif 13.endif
14 14
@@ -81,26 +81,30 @@ SPECIAL_PERMS+= sbin/suexec ${REAL_ROOT @@ -81,26 +81,30 @@ SPECIAL_PERMS+= sbin/suexec ${REAL_ROOT
81.endif 81.endif
82 82
83.if !empty(PKG_OPTIONS:Mhttp2) 83.if !empty(PKG_OPTIONS:Mhttp2)
84.include "../../www/nghttp2/buildlink3.mk" 84.include "../../www/nghttp2/buildlink3.mk"
85CONFIGURE_ARGS+= --with-nghttp2 85CONFIGURE_ARGS+= --with-nghttp2
86PLIST.http2= yes 86PLIST.http2= yes
87.else 87.else
88CONFIGURE_ARGS+= --without-nghttp2 88CONFIGURE_ARGS+= --without-nghttp2
89.endif 89.endif
90 90
91.if !empty(PKG_OPTIONS:Mlua) 91.if !empty(PKG_OPTIONS:Mlua)
92.include "../../lang/lua/buildlink3.mk" 92.include "../../lang/lua/buildlink3.mk"
93CONFIGURE_ARGS+= --enable-lua 93CONFIGURE_ARGS+= --enable-lua
 94CONFIGURE_ARGS+= --with-lua=${PREFIX}
 95BUILDLINK_TRANSFORM+= l:lua-5.1:lua5.1
 96BUILDLINK_TRANSFORM+= l:lua-5.2:lua5.2
 97BUILDLINK_TRANSFORM+= l:lua-5.3:lua5.3
94PLIST.lua= yes 98PLIST.lua= yes
95.else 99.else
96CONFIGURE_ARGS+= --disable-lua 100CONFIGURE_ARGS+= --disable-lua
97.endif 101.endif
98 102
99.if !empty(PKG_OPTIONS:Mprivileges) 103.if !empty(PKG_OPTIONS:Mprivileges)
100CONFIGURE_ARGS+= --enable-privileges 104CONFIGURE_ARGS+= --enable-privileges
101PLIST.privileges= yes 105PLIST.privileges= yes
102.endif 106.endif
103 107
104# DTrace support is manifest, but actually not implemented at all 108# DTrace support is manifest, but actually not implemented at all
105#.if !empty(PKG_OPTIONS:Mdtrace) 109#.if !empty(PKG_OPTIONS:Mdtrace)
106#CONFIGURE_ARGS+= --enable-dtrace 110#CONFIGURE_ARGS+= --enable-dtrace