pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/apache24 Add lua option for mod_lua.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d34da98cadba
branches:  trunk
changeset: 602475:d34da98cadba
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Sat Apr 14 20:44:44 2012 +0000

description:
Add lua option for mod_lua.
The lua option is disabled by default.

diffstat:

 www/apache24/Makefile   |   3 +--
 www/apache24/PLIST      |   3 ++-
 www/apache24/options.mk |  12 ++++++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diffs (61 lines):

diff -r dc41cf6073a7 -r d34da98cadba www/apache24/Makefile
--- a/www/apache24/Makefile     Sat Apr 14 16:25:11 2012 +0000
+++ b/www/apache24/Makefile     Sat Apr 14 20:44:44 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/04/14 12:46:46 adam Exp $
+# $NetBSD: Makefile,v 1.3 2012/04/14 20:44:44 ryoon Exp $
 
 DISTNAME=      httpd-2.4.1
 PKGNAME=       ${DISTNAME:S/httpd/apache/}
@@ -50,7 +50,6 @@
 CONFIGURE_ARGS+=       --disable-env
 CONFIGURE_ARGS+=       --disable-include
 CONFIGURE_ARGS+=       --disable-log-config
-CONFIGURE_ARGS+=       --disable-lua
 CONFIGURE_ARGS+=       --disable-mime
 CONFIGURE_ARGS+=       --disable-negotiation
 CONFIGURE_ARGS+=       --disable-proxy-html
diff -r dc41cf6073a7 -r d34da98cadba www/apache24/PLIST
--- a/www/apache24/PLIST        Sat Apr 14 16:25:11 2012 +0000
+++ b/www/apache24/PLIST        Sat Apr 14 20:44:44 2012 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/04/14 12:46:46 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/04/14 20:44:44 ryoon Exp $
 bin/ab
 bin/apxs
 bin/dbmmanage
@@ -117,6 +117,7 @@
 lib/httpd/mod_log_debug.so
 lib/httpd/mod_log_forensic.so
 lib/httpd/mod_logio.so
+${PLIST.lua}lib/httpd/mod_lua.so
 lib/httpd/mod_mime_magic.so
 lib/httpd/mod_proxy.so
 lib/httpd/mod_proxy_ajp.so
diff -r dc41cf6073a7 -r d34da98cadba www/apache24/options.mk
--- a/www/apache24/options.mk   Sat Apr 14 16:25:11 2012 +0000
+++ b/www/apache24/options.mk   Sat Apr 14 20:44:44 2012 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.1.1.1 2012/04/13 18:50:49 ryoon Exp $
+# $NetBSD: options.mk,v 1.2 2012/04/14 20:44:44 ryoon Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.apache
 PKG_OPTIONS_REQUIRED_GROUPS=   mpm
 PKG_OPTIONS_GROUP.mpm=         apache-mpm-event apache-mpm-prefork apache-mpm-worker
-PKG_SUPPORTED_OPTIONS=         suexec
+PKG_SUPPORTED_OPTIONS=         lua suexec
 PKG_SUGGESTED_OPTIONS=         apache-mpm-prefork
 
 .include "../../mk/bsd.options.mk"
@@ -57,3 +57,11 @@
 PLIST.suexec=          yes
 SPECIAL_PERMS+=                sbin/suexec ${REAL_ROOT_USER} ${APACHE_GROUP} 4510
 .endif
+
+PLIST_VARS+=           lua
+.if !empty(PKG_OPTIONS:Mlua)
+CONFIGURE_ARGS+=       --enable-lua
+.include "../../lang/lua/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-lua
+.endif



Home | Main Index | Thread Index | Old Index