Attachment 35010 Details for Bug 56657 – file.diff

[patch] file.diff

file.diff (text/plain), 3.72 KB, created by Palle Girgensohn on 2003-09-10 01:40:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Palle Girgensohn

Created: 2003-09-10 01:40:17 UTC

Size: 3.72 KB

patch

obsolete

>Index: mod_jk/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/www/mod_jk/Makefile,v
>retrieving revision 1.17
>diff -u -u -r1.17 Makefile
>--- mod_jk/Makefile	26 Jun 2003 22:58:31 -0000	1.17
>+++ mod_jk/Makefile	7 Sep 2003 23:33:18 -0000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	mod_jk
>-PORTVERSION=	1.2.3
>+PORTVERSION=	1.2.4
> PORTEPOCH=	1
> CATEGORIES=	www
> MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
>@@ -14,14 +14,31 @@
> DISTNAME=	jakarta-tomcat-connectors-jk-${PORTVERSION}-src
> 
> MAINTAINER=	girgen@pingpong.net
>-COMMENT=	Apache JK module for Tomcat
>+COMMENT=	Apache JK module for connecting to Tomcat using AJP1X
>+
>+.include <bsd.port.pre.mk>
>+
>+.if exists(${LOCALBASE}/include/apache2/apr.h)
>+APACHE_PORT?=	${PORTSDIR}/www/apache2
>+.else
>+APACHE_PORT?=	${PORTSDIR}/www/apache13
>+.endif
>+
>+.if ${APACHE_PORT:S/${PORTSDIR}\///} == "www/apache2"
>+APACHE_VER=	2.0
>+APACHE2=	2
>+PLIST_SUB=	APACHE2=2
>+PKGNAMESUFFIX=	-apache2
>+.else
>+APACHE_VER=	1.3
>+APACHE2=
>+PLIST_SUB=	APACHE2=
>+.endif
> 
>-PATCH_DEPENDS=	${AUTOMAKE}:${PORTSDIR}/devel/automake
> BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
> RUN_DEPENDS=	${APXS}:${APACHE_PORT}
> 
> APXS=		${LOCALBASE}/sbin/apxs
>-APACHE_PORT?=	${PORTSDIR}/www/apache13
> APACHE_CONF=	${LOCALBASE}/etc/apache${APACHE2}
> WRKSRC=		${WRKDIR}/jakarta-tomcat-connectors-jk-${PORTVERSION}-src/jk/native
> 
>@@ -32,9 +49,8 @@
> AUTOMAKE_ARGS=	--add-missing
> GNU_CONFIGURE=	YES
> CONFIGURE_ARGS+=	--with-apxs=${APXS}
>-APACHE2?=
>-APACHE_VER?=	1.3
>-PLIST_SUB=	APACHE2=${APACHE2}
>+
>+pre-patch:	build-depends
> 
> post-patch:
> 	cd ${WRKSRC}; ${ACLOCAL}; ${LIBTOOLIZE}
>@@ -48,4 +64,4 @@
> post-install:
> 	${CAT} ${PKGMESSAGE} | ${SED} "s|/usr/local|${PREFIX}|g"
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: mod_jk/distinfo
>===================================================================
>RCS file: /home/ncvs/ports/www/mod_jk/distinfo,v
>retrieving revision 1.5
>diff -u -u -r1.5 distinfo
>--- mod_jk/distinfo	11 Jun 2003 10:30:58 -0000	1.5
>+++ mod_jk/distinfo	5 Sep 2003 12:46:24 -0000
>@@ -1 +1 @@
>-MD5 (jakarta-tomcat-connectors-jk-1.2.3-src.tar.gz) = 4c2c2a4e6a6ad8a912afaffbff173227
>+MD5 (jakarta-tomcat-connectors-jk-1.2.4-src.tar.gz) = 9641a826b87e64692377161215cfd5e1
>Index: mod_jk/files/patch-configure.in
>===================================================================
>RCS file: /home/ncvs/ports/www/mod_jk/files/patch-configure.in,v
>retrieving revision 1.1
>diff -u -u -r1.1 patch-configure.in
>--- mod_jk/files/patch-configure.in	11 Jun 2003 10:30:58 -0000	1.1
>+++ mod_jk/files/patch-configure.in	7 Sep 2003 23:32:18 -0000
>@@ -1,11 +1,11 @@
>---- configure.in.orig	Tue Dec 17 05:20:55 2002
>-+++ configure.in	Thu Apr 10 13:18:40 2003
>+--- configure.in.orig	Thu Jun  5 15:18:04 2003
>++++ configure.in	Fri Sep  5 17:06:25 2003
> @@ -102,7 +102,7 @@
>                  WEBSERVER="apache-2.0"
>                	APXSCFLAGS="`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS`"
>                	APXSCPPFLAGS="`${APXS} -q EXTRA_CPPFLAGS`"
> -                APACHE_CONFIG_VARS=${apache_dir}/build/config_vars.mk
> +                APACHE_CONFIG_VARS=${prefix}/share/apache2/build/config_vars.mk
>+                 LIBTOOL=`$APXS -q LIBTOOL`
>              fi
>              AC_MSG_RESULT([building connector for \"$WEBSERVER\"])
>-     
>--- /dev/null	Wed Sep 10 02:35:45 2003
>+++ mod_jk/files/patch-common::jk_mt-h	Wed Sep 10 01:24:18 2003
>@@ -0,0 +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 
>+  * _REENTRANT define.
>+  */
>+-#if defined (WIN32) || defined(_REENTRANT)
>++#if defined (WIN32) || ( defined(FREEBSD_THREAD_HACK) && defined(_THREAD_SAFE) )
>+ 
>+     /*
>+      * Marks execution under MT compilation

Actions: View | Diff

Attachments on bug 56657: 35010