Attachment 65042 Details for Bug 96508 – file.diff

[patch] file.diff

file.diff (text/plain), 1.58 KB, created by Šimun Mikecin on 2006-04-29 12:20:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Šimun Mikecin

Created: 2006-04-29 12:20:19 UTC

Size: 1.58 KB

patch

obsolete

>diff -u mod_jk.old/Makefile mod_jk/Makefile
>--- mod_jk.old/Makefile	Thu Dec 22 23:05:38 2005
>+++ mod_jk/Makefile	Sat Apr 29 13:01:08 2006
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	mod_jk
> PORTVERSION=	1.2.15
>-PORTREVISION=	0
>+PORTREVISION=	1
> PORTEPOCH?=	1
> CATEGORIES=	www
> MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
>@@ -17,19 +17,19 @@
> MAINTAINER?=	girgen@FreeBSD.org
> COMMENT?=	Apache JK module for connecting to Tomcat using AJP1X
> 
>-USE_APACHE=	YES
>+USE_APACHE=	1.3+
> 
> .include <bsd.port.pre.mk>
> 
>-.if exists(${LOCALBASE}/include/apache2/apr.h)
>-WITH_APACHE2=	YES
>-.endif
>-
>-.if defined(WITH_APACHE2)
>-APACHE_VER=	2.0
>+.if ${APACHE_VERSION} >= 20
>+.if ${APACHE_VERSION} >= 21
>+APACHE2=	${APACHE_VERSION}
>+PLIST_SUB=	APACHE2=${APACHE_VERSION}
>+.else
> APACHE2=	2
> PLIST_SUB=	APACHE2=2
>-PKGNAMESUFFIX=	-apache2
>+.endif
>+APACHE_VER=	2.0
> .else
> APACHE_VER=	1.3
> APACHE2=
>@@ -52,6 +52,6 @@
> 	${INSTALL_DATA} ${FILESDIR}/workers.properties.sample ${APACHE_CONF}
> 
> post-install:
>-	${CAT} ${PKGMESSAGE} | ${SED} "s|/usr/local|${PREFIX}|g"
>+	${CAT} ${PKGMESSAGE} | ${SED} "s|/usr/local|${PREFIX}|g" | ${SED} "s|etc/apache|etc/apache${APACHE2}|g"
> 
> .include <bsd.port.post.mk>
>Common subdirectories: mod_jk.old/files and mod_jk/files
>diff -u mod_jk.old/pkg-plist mod_jk/pkg-plist
>--- mod_jk.old/pkg-plist	Tue Jul 26 23:46:33 2005
>+++ mod_jk/pkg-plist	Sat Apr 29 12:35:57 2006
>@@ -1,5 +1,5 @@
> etc/apache%%APACHE2%%/mod_jk.conf.sample
> etc/apache%%APACHE2%%/workers.properties.sample
>-libexec/apache%%APACHE2%%/mod_jk.so
>+%%APACHEMODDIR%%/mod_jk.so
> @exec %D/sbin/apxs -e -A -n jk %f || true
> @unexec %D/sbin/apxs -e -A -n jk %f || true

Actions: View | Diff

Attachments on bug 96508: 65042