Attachment 56602 Details for Bug 85460 – resin3.patch

[patch] resin3.patch

resin3.patch (text/plain; charset=us-ascii), 3.40 KB, created by Jean-Baptiste Quenot on 2005-09-01 11:52:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jean-Baptiste Quenot

Created: 2005-09-01 11:52:50 UTC

Size: 3.40 KB

patch

obsolete

>diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/Makefile ./Makefile
>--- /usr/ports/www/resin3/Makefile	Wed Aug 31 00:40:52 2005
>+++ ./Makefile	Thu Sep  1 12:51:50 2005
>@@ -132,6 +132,12 @@
> 
> do-install:
> 	@${SETENV} RUNASUSER=${RUNASUSER} GROUP=${GROUP} ${SH} ${WRKDIR}/install.sh
>+.if (defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES))
>+	${APXS} -i -n caucho -a ${WRKSRC}/modules/c/src/apache2/.libs/mod_caucho.so
>+.endif
>+.if (defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES))
>+	${APXS} -i -n caucho -a ${WRKSRC}/modules/c/src/apache1/.libs/mod_caucho.so
>+.endif
> 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
> 	@${ECHO_MSG}
> 	@${ECHO_MSG} "********************************************************************************"
>diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/files/patch-apache1-Makefile.in ./files/patch-apache1-Makefile.in
>--- /usr/ports/www/resin3/files/patch-apache1-Makefile.in	Tue May 17 00:06:25 2005
>+++ ./files/patch-apache1-Makefile.in	Thu Sep  1 12:47:50 2005
>@@ -1,14 +1,14 @@
>-$FreeBSD: ports/www/resin3/files/patch-apache1-Makefile.in,v 1.3 2005/05/16 20:33:47 hq Exp $
>-
>---- modules/c/src/apache1/Makefile.in.orig	Mon Oct 11 11:34:53 2004
>-+++ modules/c/src/apache1/Makefile.in	Mon Oct 11 12:44:59 2004
>-@@ -38,8 +38,7 @@
>- 	$(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec)
>- 	- rm -f $(apache_libexec)/mod_caucho.la
>- 	- rm -f $(apache_libexec)/mod_caucho.a
>+--- modules/c/src/apache1/Makefile.in.orig	Sat Mar  5 22:18:38 2005
>++++ modules/c/src/apache1/Makefile.in	Thu Sep  1 12:44:50 2005
>+@@ -35,11 +35,6 @@
>+ 	$(CC) -c $(INCLUDES) $(CFLAGS) $<
>+ 
>+ install	: mod_caucho.la
>+-	$(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec)
>+-	- rm -f $(apache_libexec)/mod_caucho.la
>+-	- rm -f $(apache_libexec)/mod_caucho.a
> -	sh install.sh -conf $(apache_conf) -libexec $(apache_libexec) \
> -	   -resin_home $(resin_home)
>-+	%%APXS%% -e -a -n caucho mod_caucho.so
>  
>  clean	:
>  	- rm *.o *.lo *.la *.so .libs
>diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/files/patch-apache2-Makefile.in ./files/patch-apache2-Makefile.in
>--- /usr/ports/www/resin3/files/patch-apache2-Makefile.in	Tue May 17 00:06:25 2005
>+++ ./files/patch-apache2-Makefile.in	Thu Sep  1 12:33:08 2005
>@@ -1,14 +1,14 @@
>-$FreeBSD: ports/www/resin3/files/patch-apache2-Makefile.in,v 1.6 2005/05/16 20:33:47 hq Exp $
>-
>---- modules/c/src/apache2/Makefile.in.orig	Mon Oct 11 11:34:53 2004
>-+++ modules/c/src/apache2/Makefile.in	Mon Oct 11 12:44:59 2004
>-@@ -38,8 +38,7 @@
>- 	$(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec)
>- 	- rm -f $(apache_libexec)/mod_caucho.la
>- 	- rm -f $(apache_libexec)/mod_caucho.a
>+--- modules/c/src/apache2/Makefile.in.orig	Thu Sep  1 12:32:43 2005
>++++ modules/c/src/apache2/Makefile.in	Thu Sep  1 12:32:49 2005
>+@@ -35,11 +35,6 @@
>+ 	$(CC) -c $(INCLUDES) $(CFLAGS) $<
>+ 
>+ install	: mod_caucho.la
>+-	$(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec)
>+-	- rm -f $(apache_libexec)/mod_caucho.la
>+-	- rm -f $(apache_libexec)/mod_caucho.a
> -	sh install.sh -conf $(apache_conf) -libexec $(apache_libexec) \
> -	   -resin_home $(resin_home)
>-+	%%APXS%% -e -a -n caucho mod_caucho.so
>  
>  clean	:
>  	- rm *.o *.lo *.la *.so .libs

Actions: View | Diff

Attachments on bug 85460: 56602