mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-20 20:09:11 +00:00
- mod_jk2 is now mod_jk 2.x branch.
People who wants to use mod_jk with apache2 must use mod_jk-apache2 commit monthes ago. PR: 56661 Submitted by: Palle Girgensohn <girgen@pingpong.net> Approved by: previous maintainer Reviewed/updated by: clement
This commit is contained in:
parent
1004432606
commit
396e6c634d
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=107407
1
MOVED
1
MOVED
@ -1035,3 +1035,4 @@ x11-servers/XttXF86srv-W32||2004-04-10|removed broken port
|
||||
x11-servers/XttXF86srv-common||2004-04-10|removed broken port
|
||||
x11-servers/XttXF86srv-xfs||2004-04-10|removed broken port
|
||||
emulators/scummvm|games/scummvm|2004-04-13|new category
|
||||
www/mod_jk2|www/mod_jk-apache2|2004-04-18|prefer mod_jk2 for mod_jk 2.x branch
|
||||
|
@ -1,38 +1,59 @@
|
||||
# New ports collection makefile for: mod_jk
|
||||
# Date created: Thu Apr 10 15:14:37 EDT 2003
|
||||
# Whom: Larry Lansing <lansil@fuzzynerd.com>
|
||||
# New ports collection makefile for: mod_jk2
|
||||
# Date created: Thu May 29 01:24:15 CEST 2003
|
||||
# Whom: Palle Girgensohn <girgen@pingpong.net>
|
||||
#
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
PORTNAME= mod_jk
|
||||
PORTVERSION= 1.2.2
|
||||
PORTREVISION= 1
|
||||
PORTNAME= mod_jk2
|
||||
PORTVERSION= 2.0.2
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}
|
||||
MASTER_SITE_SUBDIR= jakarta-tomcat-connectors/jk/release/v${PORTVERSION}/src
|
||||
PKGNAMESUFFIX= -apache2
|
||||
DISTNAME= jakarta-tomcat-connectors-jk-${PORTVERSION}-src
|
||||
MASTER_SITE_SUBDIR= tomcat-connectors/jk2/source
|
||||
DISTNAME= jakarta-tomcat-connectors-jk2-${PORTVERSION}-src
|
||||
|
||||
MAINTAINER= lansil@fuzzynerd.com
|
||||
COMMENT= Apache 2.0 module for Tomcat
|
||||
MAINTAINER= girgen@pingpong.net
|
||||
COMMENT= Apache JK2 module for connecting to Tomcat using AJP1X
|
||||
|
||||
USE_APACHE= yes
|
||||
WITH_APACHE2= yes
|
||||
APACHE_CONF= ${PREFIX}/etc/apache2
|
||||
WRKSRC= ${WRKDIR}/jakarta-tomcat-connectors-jk-${PORTVERSION}-src/jk/native
|
||||
|
||||
USE_GMAKE= YES
|
||||
USE_LIBTOOL_VER=13
|
||||
USE_AUTOCONF_VER= 213
|
||||
USE_AUTOMAKE_VER= 14
|
||||
HAS_CONFIGURE= YES
|
||||
CONFIGURE_ARGS+= --with-apxs=${APXS}
|
||||
USE_LIBTOOL_VER= 13
|
||||
USE_AUTOCONF_VER= 253
|
||||
USE_AUTOMAKE_VER= 15
|
||||
AUTOMAKE_ARGS= --add-missing
|
||||
GNU_CONFIGURE= YES
|
||||
CONFIGURE_ARGS+= --with-apxs${APACHE2}=${APXS}
|
||||
ALL_TARGET= jk2-build-apxs
|
||||
|
||||
WRKSRC= ${WRKDIR}/jakarta-tomcat-connectors-jk2-${PORTVERSION}-src/jk/native2
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if exists(${LOCALBASE}/include/apache2/apr.h)
|
||||
WITH_APACHE2= yes
|
||||
.endif
|
||||
|
||||
.if defined(WITH_APACHE2)
|
||||
APACHE2= 2
|
||||
PLIST_SUB= APACHE2=2
|
||||
PKGNAMESUFFIX= -apache2
|
||||
APACHE= apache2
|
||||
AP_EXT= la
|
||||
.else
|
||||
APACHE2=
|
||||
PLIST_SUB= APACHE2=
|
||||
AP_EXT= so
|
||||
APACHE= apache13
|
||||
.endif
|
||||
|
||||
pre-patch: build-depends
|
||||
|
||||
post-patch:
|
||||
cd ${WRKSRC}; ${ACLOCAL}; ${LIBTOOLIZE}
|
||||
|
||||
do-install:
|
||||
${APXS} -i -A -n jk ${WRKSRC}/apache-2.0/mod_jk.so
|
||||
${SED} -e "s#%%APACHE_CONF%%#${APACHE_CONF}#g" ${FILESDIR}/mod_jk.conf.sample > ${WRKDIR}/mod_jk.conf.sample
|
||||
${INSTALL_DATA} ${WRKDIR}/mod_jk.conf.sample ${APACHE_CONF}
|
||||
${INSTALL_DATA} ${FILESDIR}/workers.properties.sample ${APACHE_CONF}
|
||||
cd ${WRKSRC}/server/${APACHE} ;\
|
||||
${GMAKE} -f Makefile.apxs install ;\
|
||||
${APXS} -e -A -n jk2 mod_jk2.${AP_EXT}
|
||||
|
||||
.include <bsd.port.mk>
|
||||
.include <bsd.port.post.mk>
|
||||
|
@ -1,2 +1,2 @@
|
||||
MD5 (jakarta-tomcat-connectors-jk-1.2.2-src.tar.gz) = 5e9e76f538d2dbd28d4e1d4f42145ab9
|
||||
SIZE (jakarta-tomcat-connectors-jk-1.2.2-src.tar.gz) = 572269
|
||||
MD5 (jakarta-tomcat-connectors-jk2-2.0.2-src.tar.gz) = c75bd11d96324356b0ffaed2b5bf7fc4
|
||||
SIZE (jakarta-tomcat-connectors-jk2-2.0.2-src.tar.gz) = 598529
|
||||
|
@ -1,14 +0,0 @@
|
||||
# Replace jsp-hostname with the hostname of your JSP server, as
|
||||
# specified in workers.properties.
|
||||
#
|
||||
<IfModule mod_jk.c>
|
||||
JkWorkersFile %%APACHE_CONF%%/workers.properties
|
||||
JkLogFile logs/jk.log
|
||||
JkLogLevel warn
|
||||
|
||||
# Sample JkMounts. Replace these with the paths you would
|
||||
# like to mount from your JSP server.
|
||||
JkMount /*.jsp jsp-hostname
|
||||
JkMount /servlet/* jsp-hostname
|
||||
JkMount /examples/* jsp-hostname
|
||||
</IfModule>
|
14
www/mod_jk2/files/patch-apache13-makefile-apxs-in
Normal file
14
www/mod_jk2/files/patch-apache13-makefile-apxs-in
Normal file
@ -0,0 +1,14 @@
|
||||
--- server/apache13/Makefile.apxs.in.orig Wed Mar 19 10:21:04 2003
|
||||
+++ server/apache13/Makefile.apxs.in Wed Jun 18 03:10:02 2003
|
||||
@@ -18,7 +18,10 @@
|
||||
all: mod_jk2.so
|
||||
|
||||
mod_jk2.so:
|
||||
- $(APXS) -c -o $@ -Wc,"${JK_INCL} ${APR_CFLAGS} ${APR_LDFLAGS}" "${JAVA_INCL}" mod_jk2.c ${COMMON_C_FILES}
|
||||
+ $(APXS) -c -o $@ -Wc,"${JK_INCL} ${APR_CFLAGS} ${APR_LDFLAGS}" "${JAVA_INCL}" jk_service_apache13.c mod_jk2.c ${COMMON_C_FILES}
|
||||
+
|
||||
+install:
|
||||
+ $(APXS) -i mod_jk2.so
|
||||
|
||||
clean:
|
||||
rm -f *.o *.so
|
11
www/mod_jk2/files/patch-common::jk_mutex_thread_c
Normal file
11
www/mod_jk2/files/patch-common::jk_mutex_thread_c
Normal file
@ -0,0 +1,11 @@
|
||||
--- common/jk_mutex_thread.c~ Thu Jul 31 19:30:38 2003
|
||||
+++ common/jk_mutex_thread.c Wed Sep 10 01:37:29 2003
|
||||
@@ -159,7 +159,7 @@
|
||||
}
|
||||
|
||||
|
||||
-#elif defined( _REENTRANT )
|
||||
+#elif defined( _THREAD_SAFE ) && defined( FREEBSD_THREAD_HACK )
|
||||
/*-------------------- PThread - @deprecated, use APR if possible -------------------- */
|
||||
|
||||
#include <pthread.h>
|
@ -1,12 +1,23 @@
|
||||
--- configure.in.orig Thu Sep 4 05:05:30 2003
|
||||
+++ configure.in Thu Sep 4 05:06:25 2003
|
||||
@@ -102,7 +102,8 @@
|
||||
WEBSERVER="apache-2.0"
|
||||
APXSCFLAGS="`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS`"
|
||||
APXSCPPFLAGS="`${APXS} -q EXTRA_CPPFLAGS`"
|
||||
- APACHE_CONFIG_VARS=${apache_dir}/build/config_vars.mk
|
||||
+ APACHE_CONFIG_VARS=${prefix}/share/apache2/build/config_vars.mk
|
||||
+ LIBTOOL=`$APXS -q LIBTOOL`
|
||||
fi
|
||||
AC_MSG_RESULT([building connector for \"$WEBSERVER\"])
|
||||
|
||||
The apache mod_jk modules *communicate* with Java using an internet
|
||||
protocol, AJP13, but they are written in C. I can't come up with any
|
||||
reason to look for a JDK here, it's plain stupid! Since apache and
|
||||
tomcat can be run on separate machines, there is no dependency
|
||||
whatsoever... /Palle
|
||||
|
||||
--- configure.in.orig Tue Oct 22 00:00:00 2002
|
||||
+++ configure.in Thu Feb 26 00:19:35 2004
|
||||
@@ -184,10 +184,10 @@
|
||||
|
||||
dnl Java settings
|
||||
|
||||
-JK_JDK()
|
||||
-JK_JDK_OS()
|
||||
-JK_JNI()
|
||||
-JK_PCRE()
|
||||
+dnl JK_JDK()
|
||||
+dnl JK_JDK_OS()
|
||||
+dnl JK_JNI()
|
||||
+dnl JK_PCRE()
|
||||
|
||||
AC_SUBST(JAVA_HOME)
|
||||
AC_SUBST(JAVA_PLATFORM)
|
||||
|
20
www/mod_jk2/files/patch-include::jk_mutex_h
Normal file
20
www/mod_jk2/files/patch-include::jk_mutex_h
Normal file
@ -0,0 +1,20 @@
|
||||
--- include/jk_mutex.h~ Thu Jul 31 19:30:40 2003
|
||||
+++ include/jk_mutex.h Wed Sep 10 01:33:27 2003
|
||||
@@ -76,7 +76,7 @@
|
||||
#include "apr_thread_mutex.h"
|
||||
#elif defined( WIN32 )
|
||||
#include <windows.h>
|
||||
-#elif defined( _REENTRANT )
|
||||
+#elif defined( _THREAD_SAFE ) && defined ( FREEBSD_THREAD_HACK )
|
||||
#include <pthread.h>
|
||||
#endif
|
||||
|
||||
@@ -122,7 +122,7 @@
|
||||
apr_thread_mutex_t *threadMutex;
|
||||
#elif defined( WIN32 )
|
||||
CRITICAL_SECTION threadMutex;
|
||||
-#elif defined( _REENTRANT )
|
||||
+#elif defined( _THREAD_SAFE ) && defined ( FREEBSD_THREAD_HACK )
|
||||
pthread_mutex_t threadMutex;
|
||||
#else
|
||||
void *threadMutex;
|
@ -1,12 +0,0 @@
|
||||
# Incredibly simple workers.properties file, intended for connecting
|
||||
# to one host, via AJP13. See the tomcat documentation for
|
||||
# information on more exotic configuration options.
|
||||
#
|
||||
# Change jsp-hostname to the hostname of your JSP server.
|
||||
#
|
||||
worker.list=jsp-hostname
|
||||
|
||||
worker.jsp-hostname.port=8009
|
||||
worker.jsp-hostname.host=jsp-hostname
|
||||
worker.jsp-hostname.type=ajp13
|
||||
worker.jsp-hostname.lbfactor=1
|
@ -1,5 +1,4 @@
|
||||
mod_jk is a replacement to the elderly mod_jserv. It is a completely
|
||||
new Tomcat-Apache plugin that handles the communication between
|
||||
Tomcat and Apache.
|
||||
mod_jk2 handles the communication between Tomcat and Apache.
|
||||
JK2 is a refactoring of JK and is much more powerful.
|
||||
|
||||
WWW: http://jakarta.apache.org/tomcat/tomcat-4.1-doc/jk2/jk/aphowto.html
|
||||
|
@ -1,5 +1,3 @@
|
||||
etc/apache2/mod_jk.conf.sample
|
||||
etc/apache2/workers.properties.sample
|
||||
libexec/apache2/mod_jk.so
|
||||
@exec %D/sbin/apxs -e -A -n jk %f
|
||||
@unexec %D/sbin/apxs -e -A -n jk %f
|
||||
libexec/apache%%APACHE2%%/mod_jk2.so
|
||||
@exec %D/sbin/apxs -e -A -n jk2 %f
|
||||
@unexec %D/sbin/apxs -e -A -n jk2 %f
|
||||
|
Loading…
Reference in New Issue
Block a user