[66242] trunk/dports/www/mod_jk/Portfile

jmr at macports.org jmr at macports.org
Wed Apr 7 19:01:21 PDT 2010


Revision: 66242
          http://trac.macports.org/changeset/66242
Author:   jmr at macports.org
Date:     2010-04-07 19:01:16 -0700 (Wed, 07 Apr 2010)
Log Message:
-----------
mod_jk: add variant for apache20

Modified Paths:
--------------
    trunk/dports/www/mod_jk/Portfile

Modified: trunk/dports/www/mod_jk/Portfile
===================================================================
--- trunk/dports/www/mod_jk/Portfile	2010-04-07 22:54:35 UTC (rev 66241)
+++ trunk/dports/www/mod_jk/Portfile	2010-04-08 02:01:16 UTC (rev 66242)
@@ -32,6 +32,8 @@
 
 configure.args		--with-apxs=${prefix}/apache2/bin/apxs
 
+set apachedir       apache2
+
 # Determine a valid value for javahome
 if { [llength [array get env "JAVA_HOME"]] > 0 } {
 	set javahome $env(JAVA_HOME)
@@ -58,7 +60,7 @@
 	# warn the user if it hasn't been.
 	# In port versions prior to 2.0.52_1, apxs didn't know where libdir was.
 	# That information is needed by the jk configure script.
-	set apxs ${prefix}/apache2/bin/apxs
+	set apxs ${prefix}/${apachedir}/bin/apxs
 	if { [file executable ${apxs}] } {
 		set libdir [exec ${apxs} -q LIBDIR]
 		if { 0 == [string length ${libdir}] || ![file isdirectory ${libdir}] } {
@@ -70,27 +72,27 @@
 destroot {
 	# Install the connector for apache2
 	xinstall -m 755 -d \
-		${destroot}${prefix}/apache2/modules \
-		${destroot}${prefix}/apache2/conf
+		${destroot}${prefix}/${apachedir}/modules \
+		${destroot}${prefix}/${apachedir}/conf
 		
 	xinstall -m 644 \
 		${worksrcpath}/apache-2.0/mod_jk.so \
-		${destroot}${prefix}/apache2/modules
+		${destroot}${prefix}/${apachedir}/modules
 		
 	if {[variant_isset jni]} {
 		xinstall -m 644 \
 			${worksrcpath}/jni/jk_jnicb.so \
-			${destroot}${prefix}/apache2/modules
+			${destroot}${prefix}/${apachedir}/modules
 	}
 		
 	xinstall -m 644 ${worksrcpath}/../conf/workers.properties.minimal \
-		${destroot}${prefix}/apache2/conf/workers.properties.sample
+		${destroot}${prefix}/${apachedir}/conf/workers.properties.sample
 }
 
 
 post-install {
 	ui_msg "#"
-	ui_msg "# Example file ${prefix}/apache2/conf/workers.properties.sample has"
+	ui_msg "# Example file ${prefix}/${apachedir}/conf/workers.properties.sample has"
 	ui_msg "# been installed to illustrate use of the jk connector between "
 	ui_msg "# apache2 and tomcat."
 	ui_msg "#"
@@ -103,6 +105,14 @@
 	ui_msg "#"
 }
 
+variant apache20 description "install for apache 2.0.x" {
+    global apachedir
+    set apachedir apache20
+    depends_build-delete	path:apache2/bin/httpd:apache2
+    depends_build-append	path:apache20/bin/httpd:apache20
+    configure.args-delete	--with-apxs=${prefix}/apache2/bin/apxs
+    configure.args-append	--with-apxs=${prefix}/apache20/bin/apxs
+}
 
 livecheck.type  regex
 livecheck.regex "tomcat-connectors-(\\d+\\.\\d+(\\.\\d+)?)-src.tar.gz"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100407/4d126ba7/attachment.html>


More information about the macports-changes mailing list