Attachment #56602 for bug #85460

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

Lines 132-137 Link Here

(-)./Makefile (+6 lines)
132		132
133	do-install:	133	do-install:
134	@${SETENV} RUNASUSER=${RUNASUSER} GROUP=${GROUP} ${SH} ${WRKDIR}/install.sh	134	@${SETENV} RUNASUSER=${RUNASUSER} GROUP=${GROUP} ${SH} ${WRKDIR}/install.sh
		135	.if (defined(WITH_APACHE2) && (${WITH_APACHE2} == yes \|\| ${WITH_APACHE2} == YES))
		136	${APXS} -i -n caucho -a ${WRKSRC}/modules/c/src/apache2/.libs/mod_caucho.so
		137	.endif
		138	.if (defined(WITH_APACHE) && (${WITH_APACHE} == yes \|\| ${WITH_APACHE} == YES))
		139	${APXS} -i -n caucho -a ${WRKSRC}/modules/c/src/apache1/.libs/mod_caucho.so
		140	.endif
135	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL	141	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
136	@${ECHO_MSG}	142	@${ECHO_MSG}
137	@${ECHO_MSG} "********************************************************************************"	143	@${ECHO_MSG} "********************************************************************************"




--- 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




--- 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

Return to bug 85460

Lines 1-14 Link Here

(-)./files/patch-apache1-Makefile.in (-9 / +9 lines)
1	$FreeBSD: ports/www/resin3/files/patch-apache1-Makefile.in,v 1.3 2005/05/16 20:33:47 hq Exp $	1	--- modules/c/src/apache1/Makefile.in.orig Sat Mar 5 22:18:38 2005
2		2	+++ modules/c/src/apache1/Makefile.in Thu Sep 1 12:44:50 2005
3	--- modules/c/src/apache1/Makefile.in.orig Mon Oct 11 11:34:53 2004	3	@@ -35,11 +35,6 @@
4	+++ modules/c/src/apache1/Makefile.in Mon Oct 11 12:44:59 2004	4	$(CC) -c $(INCLUDES) $(CFLAGS) $<
5	@@ -38,8 +38,7 @@	5
6	$(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec)	6	install : mod_caucho.la
7	- rm -f $(apache_libexec)/mod_caucho.la	7	- $(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec)
8	- rm -f $(apache_libexec)/mod_caucho.a	8	- - rm -f $(apache_libexec)/mod_caucho.la
		9	- - rm -f $(apache_libexec)/mod_caucho.a
9	- sh install.sh -conf $(apache_conf) -libexec $(apache_libexec) \	10	- sh install.sh -conf $(apache_conf) -libexec $(apache_libexec) \
10	- -resin_home $(resin_home)	11	- -resin_home $(resin_home)
11	+ %%APXS%% -e -a -n caucho mod_caucho.so
12		12
13	clean :	13	clean :
14	- rm .o .lo .la .so .libs	14	- rm .o .lo .la .so .libs

Lines 1-14 Link Here

(-)./files/patch-apache2-Makefile.in (-9 / +9 lines)
1	$FreeBSD: ports/www/resin3/files/patch-apache2-Makefile.in,v 1.6 2005/05/16 20:33:47 hq Exp $	1	--- modules/c/src/apache2/Makefile.in.orig Thu Sep 1 12:32:43 2005
2		2	+++ modules/c/src/apache2/Makefile.in Thu Sep 1 12:32:49 2005
3	--- modules/c/src/apache2/Makefile.in.orig Mon Oct 11 11:34:53 2004	3	@@ -35,11 +35,6 @@
4	+++ modules/c/src/apache2/Makefile.in Mon Oct 11 12:44:59 2004	4	$(CC) -c $(INCLUDES) $(CFLAGS) $<
5	@@ -38,8 +38,7 @@	5
6	$(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec)	6	install : mod_caucho.la
7	- rm -f $(apache_libexec)/mod_caucho.la	7	- $(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec)
8	- rm -f $(apache_libexec)/mod_caucho.a	8	- - rm -f $(apache_libexec)/mod_caucho.la
		9	- - rm -f $(apache_libexec)/mod_caucho.a
9	- sh install.sh -conf $(apache_conf) -libexec $(apache_libexec) \	10	- sh install.sh -conf $(apache_conf) -libexec $(apache_libexec) \
10	- -resin_home $(resin_home)	11	- -resin_home $(resin_home)
11	+ %%APXS%% -e -a -n caucho mod_caucho.so
12		12
13	clean :	13	clean :
14	- rm .o .lo .la .so .libs	14	- rm .o .lo .la .so .libs