View | Details | Raw Unified | Return to bug 56657
Collapse All | Expand All

(-)mod_jk/Makefile (-8 / +24 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	mod_jk
8
PORTNAME=	mod_jk
9
PORTVERSION=	1.2.3
9
PORTVERSION=	1.2.4
10
PORTEPOCH=	1
10
PORTEPOCH=	1
11
CATEGORIES=	www
11
CATEGORIES=	www
12
MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
12
MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
Lines 14-27 Link Here
14
DISTNAME=	jakarta-tomcat-connectors-jk-${PORTVERSION}-src
14
DISTNAME=	jakarta-tomcat-connectors-jk-${PORTVERSION}-src
15
15
16
MAINTAINER=	girgen@pingpong.net
16
MAINTAINER=	girgen@pingpong.net
17
COMMENT=	Apache JK module for Tomcat
17
COMMENT=	Apache JK module for connecting to Tomcat using AJP1X
18
19
.include <bsd.port.pre.mk>
20
21
.if exists(${LOCALBASE}/include/apache2/apr.h)
22
APACHE_PORT?=	${PORTSDIR}/www/apache2
23
.else
24
APACHE_PORT?=	${PORTSDIR}/www/apache13
25
.endif
26
27
.if ${APACHE_PORT:S/${PORTSDIR}\///} == "www/apache2"
28
APACHE_VER=	2.0
29
APACHE2=	2
30
PLIST_SUB=	APACHE2=2
31
PKGNAMESUFFIX=	-apache2
32
.else
33
APACHE_VER=	1.3
34
APACHE2=
35
PLIST_SUB=	APACHE2=
36
.endif
18
37
19
PATCH_DEPENDS=	${AUTOMAKE}:${PORTSDIR}/devel/automake
20
BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
38
BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
21
RUN_DEPENDS=	${APXS}:${APACHE_PORT}
39
RUN_DEPENDS=	${APXS}:${APACHE_PORT}
22
40
23
APXS=		${LOCALBASE}/sbin/apxs
41
APXS=		${LOCALBASE}/sbin/apxs
24
APACHE_PORT?=	${PORTSDIR}/www/apache13
25
APACHE_CONF=	${LOCALBASE}/etc/apache${APACHE2}
42
APACHE_CONF=	${LOCALBASE}/etc/apache${APACHE2}
26
WRKSRC=		${WRKDIR}/jakarta-tomcat-connectors-jk-${PORTVERSION}-src/jk/native
43
WRKSRC=		${WRKDIR}/jakarta-tomcat-connectors-jk-${PORTVERSION}-src/jk/native
27
44
Lines 32-40 Link Here
32
AUTOMAKE_ARGS=	--add-missing
49
AUTOMAKE_ARGS=	--add-missing
33
GNU_CONFIGURE=	YES
50
GNU_CONFIGURE=	YES
34
CONFIGURE_ARGS+=	--with-apxs=${APXS}
51
CONFIGURE_ARGS+=	--with-apxs=${APXS}
35
APACHE2?=
52
36
APACHE_VER?=	1.3
53
pre-patch:	build-depends
37
PLIST_SUB=	APACHE2=${APACHE2}
38
54
39
post-patch:
55
post-patch:
40
	cd ${WRKSRC}; ${ACLOCAL}; ${LIBTOOLIZE}
56
	cd ${WRKSRC}; ${ACLOCAL}; ${LIBTOOLIZE}
Lines 48-51 Link Here
48
post-install:
64
post-install:
49
	${CAT} ${PKGMESSAGE} | ${SED} "s|/usr/local|${PREFIX}|g"
65
	${CAT} ${PKGMESSAGE} | ${SED} "s|/usr/local|${PREFIX}|g"
50
66
51
.include <bsd.port.mk>
67
.include <bsd.port.post.mk>
(-)mod_jk/distinfo (-1 / +1 lines)
Line 1 Link Here
1
MD5 (jakarta-tomcat-connectors-jk-1.2.3-src.tar.gz) = 4c2c2a4e6a6ad8a912afaffbff173227
1
MD5 (jakarta-tomcat-connectors-jk-1.2.4-src.tar.gz) = 9641a826b87e64692377161215cfd5e1
(-)mod_jk/files/patch-configure.in (-3 / +3 lines)
Lines 1-11 Link Here
1
--- configure.in.orig	Tue Dec 17 05:20:55 2002
1
--- configure.in.orig	Thu Jun  5 15:18:04 2003
2
+++ configure.in	Thu Apr 10 13:18:40 2003
2
+++ configure.in	Fri Sep  5 17:06:25 2003
3
@@ -102,7 +102,7 @@
3
@@ -102,7 +102,7 @@
4
                 WEBSERVER="apache-2.0"
4
                 WEBSERVER="apache-2.0"
5
               	APXSCFLAGS="`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS`"
5
               	APXSCFLAGS="`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS`"
6
               	APXSCPPFLAGS="`${APXS} -q EXTRA_CPPFLAGS`"
6
               	APXSCPPFLAGS="`${APXS} -q EXTRA_CPPFLAGS`"
7
-                APACHE_CONFIG_VARS=${apache_dir}/build/config_vars.mk
7
-                APACHE_CONFIG_VARS=${apache_dir}/build/config_vars.mk
8
+                APACHE_CONFIG_VARS=${prefix}/share/apache2/build/config_vars.mk
8
+                APACHE_CONFIG_VARS=${prefix}/share/apache2/build/config_vars.mk
9
                 LIBTOOL=`$APXS -q LIBTOOL`
9
             fi
10
             fi
10
             AC_MSG_RESULT([building connector for \"$WEBSERVER\"])
11
             AC_MSG_RESULT([building connector for \"$WEBSERVER\"])
11
     
(-)mod_jk/files/patch-common::jk_mt-h (+11 lines)
Added Link Here
1
--- common/jk_mt.h~	Thu Jun  6 03:23:25 2002
2
+++ common/jk_mt.h	Wed Sep 10 01:22:36 2003
3
@@ -70,7 +70,7 @@
4
  * All WIN32 code is MT, UNIX code that uses pthreads is marked by the POSIX 
5
  * _REENTRANT define.
6
  */
7
-#if defined (WIN32) || defined(_REENTRANT)
8
+#if defined (WIN32) || ( defined(FREEBSD_THREAD_HACK) && defined(_THREAD_SAFE) )
9
 
10
     /*
11
      * Marks execution under MT compilation

Return to bug 56657