From 4efba361e649a33052f3704a63a93b5d12dfbc0a Mon Sep 17 00:00:00 2001
From: Palle Girgensohn <girgen@FreeBSD.org>
Date: Wed, 27 Jul 2005 01:59:42 +0000
Subject: JK2 is officially deprecated due to lack of developer interest. See
 http://jakarta.apache.org/tomcat/connectors-doc/news/20041100.html#20041115.1

Upgrading to last released version, 2.0.4.

ports/67839 is fixed, probably also ports/71479.

ports/74622 handles configuration problems; I will not address this PR
fully since the software is deprecated, although I did add some
helping notes, and the port now installs the sample config file.

PR: ports/67839, ports/71479, ports/74622
Approved by: seanc, ade (implicit)
---
 www/mod_jk2/files/patch-configure | 55 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 www/mod_jk2/files/patch-configure

(limited to 'www/mod_jk2/files/patch-configure')

diff --git a/www/mod_jk2/files/patch-configure b/www/mod_jk2/files/patch-configure
new file mode 100644
index 000000000000..d0c98e7d9ba2
--- /dev/null
+++ b/www/mod_jk2/files/patch-configure
@@ -0,0 +1,55 @@
+--- configure.orig	Wed Mar 24 14:46:12 2004
++++ configure	Wed Jul 27 03:36:21 2005
+@@ -20237,15 +20231,15 @@
+ 
+     echo "$as_me:$LINENO: checking for apr APR_LIBNAME" >&5
+ echo $ECHO_N "checking for apr APR_LIBNAME... $ECHO_C" >&6
+-    if ${TEST} ! -f "${APR_DIR}/apr-config" ; then
+-      { { echo "$as_me:$LINENO: error: cannot find apr-config file in ${APR_DIR}" >&5
+-echo "$as_me: error: cannot find apr-config file in ${APR_DIR}" >&2;}
++    if ${TEST} ! -f "${APR_DIR}/apr-1-config" ; then
++      { { echo "$as_me:$LINENO: error: cannot find apr-1-config file in ${APR_DIR}" >&5
++echo "$as_me: error: cannot find apr-1-config file in ${APR_DIR}" >&2;}
+    { (exit 1); exit 1; }; }
+     fi
+-    jk_apr_get_tempval=`${APR_DIR}/apr-config --link-libtool 2> /dev/null`
++    jk_apr_get_tempval=`${APR_DIR}/apr-1-config --link-libtool 2> /dev/null`
+     if ${TEST} -z "${jk_apr_get_tempval}" ; then
+-      { { echo "$as_me:$LINENO: error: ${APR_DIR}/apr-config --link-libtool failed" >&5
+-echo "$as_me: error: ${APR_DIR}/apr-config --link-libtool failed" >&2;}
++      { { echo "$as_me:$LINENO: error: ${APR_DIR}/apr-1-config --link-libtool failed" >&5
++echo "$as_me: error: ${APR_DIR}/apr-1-config --link-libtool failed" >&2;}
+    { (exit 1); exit 1; }; }
+     fi
+     jk_apr_get_tempval=`basename ${jk_apr_get_tempval}`
+@@ -20384,15 +20378,15 @@
+ 
+     echo "$as_me:$LINENO: checking for apr-util APR_UTIL_LIBNAME" >&5
+ echo $ECHO_N "checking for apr-util APR_UTIL_LIBNAME... $ECHO_C" >&6
+-    if ${TEST} ! -f "${APR_UTIL_DIR}/apu-config" ; then
+-      { { echo "$as_me:$LINENO: error: cannot find apu-config file in ${APR_UTIL_DIR}" >&5
+-echo "$as_me: error: cannot find apu-config file in ${APR_UTIL_DIR}" >&2;}
++    if ${TEST} ! -f "${APR_UTIL_DIR}/apu-1-config" ; then
++      { { echo "$as_me:$LINENO: error: cannot find apu-1-config file in ${APR_UTIL_DIR}" >&5
++echo "$as_me: error: cannot find apu-1-config file in ${APR_UTIL_DIR}" >&2;}
+    { (exit 1); exit 1; }; }
+     fi
+-    jk_apu_get_tempval=`${APR_UTIL_DIR}/apu-config --link-libtool 2> /dev/null`
++    jk_apu_get_tempval=`${APR_UTIL_DIR}/apu-1-config --link-libtool 2> /dev/null`
+     if ${TEST} -z "${jk_apu_get_tempval}" ; then
+-      { { echo "$as_me:$LINENO: error: ${APR_UTIL_DIR}/apu-config --link-libtool failed" >&5
+-echo "$as_me: error: ${APR_UTIL_DIR}/apu-config --link-libtool failed" >&2;}
++      { { echo "$as_me:$LINENO: error: ${APR_UTIL_DIR}/apu-1-config --link-libtool failed" >&5
++echo "$as_me: error: ${APR_UTIL_DIR}/apu-1-config --link-libtool failed" >&2;}
+    { (exit 1); exit 1; }; }
+     fi
+     jk_apu_get_tempval=`basename ${jk_apu_get_tempval}`
+@@ -20490,7 +20484,7 @@
+               APR_CLEAN=""
+               APR_DIR=""
+               APR_LIBDIR=${tempval}
+-              APR_LDFLAGS="`apr-config --link-ld` -L${tempval}"
++              APR_LDFLAGS="`apr-1-config --link-ld` -L${tempval}"
+               COMMON_APR_OBJECTS="\${COMMON_APR_OBJECTS}"
+ 			  use_apr=true
+             fi
-- 
cgit v1.2.3