diff options
author | erh <erh@pkgsrc.org> | 2005-03-30 16:41:47 +0000 |
---|---|---|
committer | erh <erh@pkgsrc.org> | 2005-03-30 16:41:47 +0000 |
commit | f5d11200cc273c6feac013634cbf72b037c9cf2d (patch) | |
tree | a31784bfa686554eb9d4393a6b6054d2d718fe72 /www | |
parent | 6cb49eb15079c7cf9c24cf4c81d004e7927734c1 (diff) | |
download | pkgsrc-f5d11200cc273c6feac013634cbf72b037c9cf2d.tar.gz |
Update www/ap_jk to 1.2.8.
Diffstat (limited to 'www')
-rw-r--r-- | www/ap-jk/Makefile | 49 | ||||
-rw-r--r-- | www/ap-jk/distinfo | 11 | ||||
-rw-r--r-- | www/ap-jk/patches/patch-aa | 13 | ||||
-rw-r--r-- | www/ap-jk/patches/patch-ab | 13 | ||||
-rw-r--r-- | www/ap-jk/patches/patch-ac | 12 |
5 files changed, 75 insertions, 23 deletions
diff --git a/www/ap-jk/Makefile b/www/ap-jk/Makefile index 446a92d099f..68c21603e06 100644 --- a/www/ap-jk/Makefile +++ b/www/ap-jk/Makefile @@ -1,30 +1,41 @@ -# $NetBSD: Makefile,v 1.24 2004/11/13 21:28:29 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/03/30 16:41:47 erh Exp $ -DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}-src -PKGNAME= ap-jk-${TOMCAT_VERSION} -TOMCAT_VERSION= 3.2.4 +DISTNAME= jakarta-tomcat-connectors-${JK_VERSION}-src +PKGNAME= ap-jk-${JK_VERSION} +JK_VERSION= 1.2.8 CATEGORIES= www java -MASTER_SITES= http://jakarta.apache.org/builds/tomcat/release/v${TOMCAT_VERSION}/src/ +MASTER_SITES= http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-${JK_VERSION}/ MAINTAINER= jwise@NetBSD.org -HOMEPAGE= http://jakarta.apache.org/ -COMMENT= Apache connector for accessing Jakarta Tomcat or Apache JServ +HOMEPAGE= http://jakarta.apache.org/tomcat/connectors-doc/ +COMMENT= Apache connector for accessing Jakarta Tomcat -# XXX workaround for pax-as-tar problem in -current: -# tar: Invalid header, starting valid header search. -# -BUILD_DEPENDS+= gtar-base-[0-9]*:../../archivers/gtar-base -GTAR= ${LOCALBASE}/bin/gtar - -WRKSRC= ${WRKDIR}/${DISTNAME}/src/native/apache1.3 +WRKSRC= ${WRKDIR}/${DISTNAME}/jk/native USE_BUILDLINK3= yes +APACHE_MODULE= YES +BUILD_DEFS+= JK_ENABLE_JNI + +GNU_CONFIGURE= yes +USE_GNU_TOOLS+= make + +SUBST_CLASSES+= jk-lt +SUBST_STAGE.jk-lt= post-configure +SUBST_FILES.jk-lt= Makefile common/Makefile apache-2.0/Makefile +SUBST_SED.jk-lt= -e "s|^\(LIBTOOL =\) [^ ]*|\1 \$$(SHELL) \$$(top_builddir)/libtool|g" +SUBST_MESSAGE.jk-lt= "Fixing libtool references." -EXTRACT_ELEMENTS= ${DISTNAME}/src/native +# XXX The standard --with-apxs2 when using apache2 doesn't work +CONFIGURE_ARGS+= --with-apxs="${APXS}" -APACHE_MODULE_NAME= mod_jk.so -APACHE_MODULE_SRC= *.c ../jk/*.c -CPPFLAGS+= -I../jk ${BUILDLINK_CPPFLAGS.${PKG_JVM}} +.if defined(JK_ENABLE_JNI) +USE_JAVA= yes +CONFIGURE_ARGS+= --enable-jni +CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME} +SUBST_FILES.jk-lt+= jni/Makefile +.endif -.include "../../www/apache/module.mk" +.include "../../mk/apache.mk" +.if defined(JK_ENABLE_JNI) .include "../../mk/java-vm.mk" +.endif .include "../../mk/bsd.pkg.mk" diff --git a/www/ap-jk/distinfo b/www/ap-jk/distinfo index 24f2e08d9c3..f19b9807007 100644 --- a/www/ap-jk/distinfo +++ b/www/ap-jk/distinfo @@ -1,5 +1,8 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 14:08:27 wiz Exp $ +$NetBSD: distinfo,v 1.4 2005/03/30 16:41:47 erh Exp $ -SHA1 (jakarta-tomcat-3.2.4-src.tar.gz) = 15592fa13356fc35eea97e59196ea99884613399 -RMD160 (jakarta-tomcat-3.2.4-src.tar.gz) = f63761c24978c938a06416452d747f873238b55d -Size (jakarta-tomcat-3.2.4-src.tar.gz) = 982282 bytes +SHA1 (jakarta-tomcat-connectors-1.2.8-src.tar.gz) = 3add398066c667cc8cbce05bf277e06550cf7f35 +RMD160 (jakarta-tomcat-connectors-1.2.8-src.tar.gz) = a4d12a11094125f2d7c78a6c679dec43a454d6ad +Size (jakarta-tomcat-connectors-1.2.8-src.tar.gz) = 798199 bytes +SHA1 (patch-aa) = dd1405e6f7ecdfebf3bfc7e71cf27d33423f48d4 +SHA1 (patch-ab) = 57e4ead1a73d9a47fb634d5c7fb18d49d0393a08 +SHA1 (patch-ac) = 14fdec1c921f369ee51a5d73a3bee3ec9056f07a diff --git a/www/ap-jk/patches/patch-aa b/www/ap-jk/patches/patch-aa new file mode 100644 index 00000000000..dbba0af9ed6 --- /dev/null +++ b/www/ap-jk/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.3 2005/03/30 16:41:47 erh Exp $ + +--- common/jk_util.c.orig 2005-03-29 15:00:30.000000000 -0600 ++++ common/jk_util.c 2005-03-29 15:00:33.000000000 -0600 +@@ -1071,7 +1071,7 @@ + pthread_getunique_np(&t, &tid); + return ((int)(tid.intId.lo & 0xFFFFFFFF)); + #else +- int tid = (int)(t & 0xFFFF); ++ int tid = (int)t; + return tid; + #endif /* AS400 */ + } diff --git a/www/ap-jk/patches/patch-ab b/www/ap-jk/patches/patch-ab new file mode 100644 index 00000000000..618a693abbd --- /dev/null +++ b/www/ap-jk/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2005/03/30 16:41:47 erh Exp $ + +--- apache-2.0/Makefile.in.orig 2004-12-24 05:18:10.000000000 -0600 ++++ apache-2.0/Makefile.in 2005-03-29 15:05:10.000000000 -0600 +@@ -20,6 +20,8 @@ + # Apache2 settings, values guessed by Apache config and used to build it + # Will define libexecdir, LIBTOOL, etc + include @APACHE_CONFIG_VARS@ ++top_builddir = .. ++LIBTOOL = + + # Local settings ( overriding/appending to Apache's ) + COMMON=../common diff --git a/www/ap-jk/patches/patch-ac b/www/ap-jk/patches/patch-ac new file mode 100644 index 00000000000..658050a7e2f --- /dev/null +++ b/www/ap-jk/patches/patch-ac @@ -0,0 +1,12 @@ +$NetBSD: patch-ac,v 1.1 2005/03/30 16:41:47 erh Exp $ + +--- jni/Makefile.in.orig 2005-03-29 15:59:54.000000000 -0600 ++++ jni/Makefile.in 2005-03-29 16:00:04.000000000 -0600 +@@ -1,5 +1,7 @@ + OEXT=.lo + include @APACHE_CONFIG_VARS@ ++top_builddir = .. ++LIBTOOL = + + JK=../common/ + COMMON_OBJECTS=${JK}jk_map${OEXT} ${JK}jk_util${OEXT} ${JK}jk_pool${OEXT} |