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

- maintenance update to 1.2.20 from Matt Jibson <dolmant at gmail.com>

Browse Source 
- fix SEPARATE_BUILD=concurrent
- update README.OpenBSD
This commit is contained in:
kurt 2007-01-09 18:42:04 +00:00
parent 7d7bc69e67
commit a9296adfd7
6 changed files with 60 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
www/mod_jk/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2006/01/02 18:24:57 kurt Exp $
# $OpenBSD: Makefile,v 1.9 2007/01/09 18:42:04 kurt Exp $
# This port currently only works with archs supporting dynamic loading
# and has Apache that supports DSO's.
@ -6,8 +6,8 @@ SHARED_ONLY= Yes
COMMENT= "Apache-Tomcat AJP Connector"
V= 1.2.15
DISTNAME= jakarta-tomcat-connectors-${V}-src
V= 1.2.20
DISTNAME= tomcat-connectors-${V}-src
PKGNAME= mod_jk-${V}
CATEGORIES= www
@ -32,7 +32,7 @@ CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-apxs=/usr/sbin/apxs
CONFIGURE_ENV+= CFLAGS='${CFLAGS} -DCHROOTED_APACHE'
WRKSRC= ${WRKDIR}/${DISTNAME}/jk/native
WRKSRC= ${WRKDIST}/native
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/scripts/build/unix
EXAMPLES= workers.properties workers.properties.minimal
@ -41,9 +41,9 @@ SUBST_VARS= DOCDIR
do-install:
sed 's,/usr/local,${TRUEPREFIX},' \
< ${FILESDIR}/mod_jk-enable >${WRKSRC}/mod_jk-enable
${INSTALL_SCRIPT} ${WRKSRC}/mod_jk-enable ${PREFIX}/sbin/mod_jk-enable
${INSTALL_DATA} ${WRKBUILD}/apache-1.3/mod_jk.so.0.0 ${PREFIX}/lib/mod_jk.so
< ${FILESDIR}/mod_jk-enable >${WRKBUILD}/mod_jk-enable
${INSTALL_SCRIPT} ${WRKBUILD}/mod_jk-enable ${PREFIX}/sbin/mod_jk-enable
${INSTALL_DATA} ${WRKBUILD}/apache-1.3/mod_jk.so ${PREFIX}/lib/mod_jk.so
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mod_jk
${INSTALL_DATA} ${FILESDIR}/mod_jk.conf ${PREFIX}/share/examples/mod_jk
.for file in ${EXAMPLES}
@ -51,9 +51,9 @@ do-install:
.endfor
${INSTALL_DATA_DIR} ${DOCDIR}
sed 's,/usr/local,${TRUEPREFIX},' \
< ${FILESDIR}/README.OpenBSD >${WRKSRC}/README.OpenBSD
${INSTALL_DATA} ${WRKSRC}/README.OpenBSD ${DOCDIR}
${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/LICENSE ${DOCDIR}
${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/NOTICE ${DOCDIR}
< ${FILESDIR}/README.OpenBSD >${WRKBUILD}/README.OpenBSD
${INSTALL_DATA} ${WRKBUILD}/README.OpenBSD ${DOCDIR}
${INSTALL_DATA} ${WRKDIST}/LICENSE ${DOCDIR}
${INSTALL_DATA} ${WRKDIST}/NOTICE ${DOCDIR}
.include "bsd.port.mk"

8
www/mod_jk/distinfo
View File

@ -1,4 +1,4 @@
MD5 (jakarta-tomcat-connectors-1.2.15-src.tar.gz) = b815a666329f7de097775113547539e0
RMD160 (jakarta-tomcat-connectors-1.2.15-src.tar.gz) = e5bce1ad604e9461ca4684a2c7ffffe1f2a7b667
SHA1 (jakarta-tomcat-connectors-1.2.15-src.tar.gz) = c9a67de4e03d6d7780cf0b14284f62d30bb78156
SIZE (jakarta-tomcat-connectors-1.2.15-src.tar.gz) = 722463
MD5 (tomcat-connectors-1.2.20-src.tar.gz) = f10709339009b3be9398d3a838d9cabd
RMD160 (tomcat-connectors-1.2.20-src.tar.gz) = 380e6ce7d45a2c522fbb067963b7e9850ff670fc
SHA1 (tomcat-connectors-1.2.20-src.tar.gz) = 716b61ffa137067c1df9fb1b0a5d81f6969a181a
SIZE (tomcat-connectors-1.2.20-src.tar.gz) = 1316612

4
www/mod_jk/files/README.OpenBSD
View File

@ -1,4 +1,4 @@
$OpenBSD: README.OpenBSD,v 1.4 2006/01/02 18:24:57 kurt Exp $
$OpenBSD: README.OpenBSD,v 1.5 2007/01/09 18:42:05 kurt Exp $
OpenBSD mod_jk Package
Apache-Tomcat AJP Connector
@ -41,7 +41,7 @@ Tomcat 4 or http://your.apache.host/jsp-examples/ for Tomcat 5.
On-line documentation is here:
http://jakarta.apache.org/tomcat/connectors-doc/index.html
http://tomcat.apache.org/connectors-doc/index.html
The mailing list archives for tomcat-user can be found at:

6
www/mod_jk/patches/patch-jk_conf_workers_properties_minimal → www/mod_jk/patches/patch-conf_workers_properties_minimal
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-jk_conf_workers_properties_minimal,v 1.2 2006/01/02 18:24:57 kurt Exp $
--- jk/conf/workers.properties.minimal.orig Thu Apr 28 06:59:49 2005
+++ jk/conf/workers.properties.minimal Tue Dec 13 13:43:24 2005
$OpenBSD: patch-conf_workers_properties_minimal,v 1.1 2007/01/09 18:42:05 kurt Exp $
--- conf/workers.properties.minimal.orig Thu Apr 28 06:59:49 2005
+++ conf/workers.properties.minimal Sun Jan 7 14:31:34 2007
@@ -6,22 +6,15 @@
# The workers that jk should create and work with
#

28
www/mod_jk/patches/patch-native_apache-1_3_Makefile_in Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-native_apache-1_3_Makefile_in,v 1.1 2007/01/09 18:42:05 kurt Exp $
--- native/apache-1.3/Makefile.in.orig Tue Oct 3 09:18:44 2006
+++ native/apache-1.3/Makefile.in Mon Jan 8 09:04:09 2007
@@ -25,7 +25,7 @@ BUILD_DIR = ${JK_DIR}/../build/jk/apache
APACHE_FILES = Makefile.tmpl Makefile.libdir libjk.module
JK=../common/
-JK_INCL=-DUSE_APACHE_MD5 -I ${top_srcdir}/common
+JK_INCL=-DUSE_APACHE_MD5 -I ${top_srcdir}/common -I ${top_builddir}/common
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
APACHE_CFLAGS=@apache_include@ @APXSCFLAGS@ @APXSCPPFLAGS@ -I${top_srcdir}/common
@@ -85,13 +85,13 @@ mod_jk.a: mod_jk.lo $(APACHE_OBJECTS)
${MOD_LINK} -o $@ $^
mod_jk.so: mod_jk.la
- ../scripts/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_jk.la `pwd`
+ ${top_srcdir}/scripts/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_jk.la `pwd`
#
# Common part.
#
mod_jk.lo: mod_jk.c
- ${SH_COMPILE} -c mod_jk.c -o $@
+ ${SH_COMPILE} -c ${srcdir}/mod_jk.c -o $@
.c.lo:
${SH_COMPILE} -c $< -o $@

12
www/mod_jk/patches/patch-native_common_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-native_common_Makefile_in,v 1.1 2007/01/09 18:42:05 kurt Exp $
--- native/common/Makefile.in.orig Mon Jan 8 08:38:41 2007
+++ native/common/Makefile.in Mon Jan 8 08:38:25 2007
@@ -17,7 +17,7 @@ OEXT=.lo
include list.mk
JAVA_INCL=-I @JAVA_HOME@/include -I @JAVA_HOME@/include/@OS@
-CFLAGS=@apache_include@ @CFLAGS@ ${APXSCFLAGS} ${APXSCPPFLAGS} ${JAVA_INCL}
+CFLAGS=@apache_include@ -I ${top_builddir}/common @CFLAGS@ ${APXSCFLAGS} ${APXSCPPFLAGS} ${JAVA_INCL}
include @top_srcdir@/scripts/build/rules.mk