diff options
| author | girgen <girgen@FreeBSD.org> | 2005-07-27 05:46:33 +0800 |
|---|---|---|
| committer | girgen <girgen@FreeBSD.org> | 2005-07-27 05:46:33 +0800 |
| commit | 4ad22867723de5dbf98fb96d5b3fc2e69fbb5e1d (patch) | |
| tree | 7db9bb49037d25c13ec7d6ffd6e1386e22e630f7 /www | |
| parent | 9eaee5c72c742412278a1b7a4939d4fb3c2e5640 (diff) | |
| download | freebsd-ports-gnome-4ad22867723de5dbf98fb96d5b3fc2e69fbb5e1d.tar.gz freebsd-ports-gnome-4ad22867723de5dbf98fb96d5b3fc2e69fbb5e1d.tar.zst freebsd-ports-gnome-4ad22867723de5dbf98fb96d5b3fc2e69fbb5e1d.zip | |
Update to 1.2.14.1. Thanks to Ari Suutari for providing the original
patch.
Approved by: seanc, ade (implicit)
Diffstat (limited to 'www')
| -rw-r--r-- | www/mod_jk/Makefile | 13 | ||||
| -rw-r--r-- | www/mod_jk/distinfo | 4 | ||||
| -rw-r--r-- | www/mod_jk/files/patch-common::jk_mt-h | 18 | ||||
| -rw-r--r-- | www/mod_jk/pkg-plist | 4 |
4 files changed, 20 insertions, 19 deletions
diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile index fb06087dbffc..28234b893094 100644 --- a/www/mod_jk/Makefile +++ b/www/mod_jk/Makefile @@ -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} diff --git a/www/mod_jk/distinfo b/www/mod_jk/distinfo index 34108dd8389f..a2af320b5020 100644 --- a/www/mod_jk/distinfo +++ b/www/mod_jk/distinfo @@ -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 diff --git a/www/mod_jk/files/patch-common::jk_mt-h b/www/mod_jk/files/patch-common::jk_mt-h index 16fa29736d8a..97e3e17d6174 100644 --- a/www/mod_jk/files/patch-common::jk_mt-h +++ b/www/mod_jk/files/patch-common::jk_mt-h @@ -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 diff --git a/www/mod_jk/pkg-plist b/www/mod_jk/pkg-plist index c157a4e124de..afb948c7a038 100644 --- a/www/mod_jk/pkg-plist +++ b/www/mod_jk/pkg-plist @@ -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 |