cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.2.14.1. Thanks to Ari Suutari for providing the original

Browse Source 
patch.

Approved by: seanc, ade (implicit)
This commit is contained in:
Palle Girgensohn 2005-07-26 21:46:33 +00:00
parent 8135df5456
commit 22337ace0a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=140185
4 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
www/mod_jk/Makefile
View File

@ -6,12 +6,12 @@
#
PORTNAME= mod_jk
PORTVERSION= 1.2.6
PORTVERSION= 1.2.14.1
PORTEPOCH?= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}
MASTER_SITE_SUBDIR= tomcat-connectors/jk/source
DISTNAME= jakarta-tomcat-connectors-jk-${PORTVERSION}-src
MASTER_SITE_SUBDIR= tomcat-connectors/jk/source/jk-${PORTVERSION:S/.1$//}
DISTNAME= jakarta-tomcat-connectors-${PORTVERSION}-src
MAINTAINER?= girgen@FreeBSD.org
COMMENT?= Apache JK module for connecting to Tomcat using AJP1X
@ -36,15 +36,16 @@ PLIST_SUB= APACHE2=
.endif
APACHE_CONF= ${LOCALBASE}/etc/apache${APACHE2}
WRKSRC= ${WRKDIR}/jakarta-tomcat-connectors-jk-${PORTVERSION}-src/jk/native
WRKSRC= ${WRKDIR}/jakarta-tomcat-connectors-${PORTVERSION}-src/jk/native
USE_GMAKE= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-apxs=${APXS}
do-install:
${APXS} -i -A -n jk ${WRKSRC}/apache-${APACHE_VER}/mod_jk.so
${SED} -e "s#%%APACHE_CONF%%#${APACHE_CONF}#g" ${FILESDIR}/mod_jk.conf.sample > ${WRKDIR}/mod_jk.conf.sample
${APXS} -i -n jk ${WRKSRC}/apache-${APACHE_VER}/mod_jk.so
- ${APXS} -e -A -n jk ${WRKSRC}/apache-${APACHE_VER}/mod_jk.so
${SED} -e "s#%%APACHE_CONF%%#${APACHE_CONF}#g" ${WRKSRC}/ > ${WRKDIR}/mod_jk.conf.sample
${INSTALL_DATA} ${WRKDIR}/mod_jk.conf.sample ${APACHE_CONF}
${INSTALL_DATA} ${FILESDIR}/workers.properties.sample ${APACHE_CONF}

4
www/mod_jk/distinfo
View File

@ -1,2 +1,2 @@
MD5 (jakarta-tomcat-connectors-jk-1.2.6-src.tar.gz) = 018b91a0ce874cbc3dae7700f452838b
SIZE (jakarta-tomcat-connectors-jk-1.2.6-src.tar.gz) = 849481
MD5 (jakarta-tomcat-connectors-1.2.14.1-src.tar.gz) = 41a90c633088e0f1ba422c10546a028a
SIZE (jakarta-tomcat-connectors-1.2.14.1-src.tar.gz) = 711472

18
www/mod_jk/files/patch-common::jk_mt-h
View File

@ -1,11 +1,11 @@
--- common/jk_mt.h~ Thu Jun 6 03:23:25 2002
+++ common/jk_mt.h Wed Sep 10 01:22:36 2003
@@ -70,7 +70,7 @@
* All WIN32 code is MT, UNIX code that uses pthreads is marked by the POSIX
--- common/jk_mt.h.orig Sat Apr 16 16:33:27 2005
+++ common/jk_mt.h Sat Jul 23 02:30:22 2005
@@ -36,7 +36,7 @@
* All WIN32 code is MT, UNIX code that uses pthreads is marked by the POSIX
* _REENTRANT define.
*/
-#if defined (WIN32) || defined(_REENTRANT)
+#if defined (WIN32) || ( defined(FREEBSD_THREAD_HACK) && defined(_THREAD_SAFE) )
/*
* Marks execution under MT compilation
-#if defined (WIN32) || defined(_REENTRANT) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
+#if defined (WIN32) || ( defined(FREEBSD_THREAD_HACK) && defined(_THREAD_SAFE) ) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
#ifdef JK_PREFORK
#define _MT_CODE 0
#else

4
www/mod_jk/pkg-plist
View File

@ -1,5 +1,5 @@
etc/apache%%APACHE2%%/mod_jk.conf.sample
etc/apache%%APACHE2%%/workers.properties.sample
libexec/apache%%APACHE2%%/mod_jk.so
@exec %D/sbin/apxs -e -A -n jk %f
@unexec %D/sbin/apxs -e -A -n jk %f
@exec %D/sbin/apxs -e -A -n jk %f || true
@unexec %D/sbin/apxs -e -A -n jk %f || true