Attachment 62412 Details for Bug 93289 – patch-resin2

patch-resin2

patch-resin2 (text/plain; charset=us-ascii), 3.02 KB, created by Jean-Baptiste Quenot on 2006-04-04 14:33:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jean-Baptiste Quenot

Created: 2006-04-04 14:33:30 UTC

Size: 3.02 KB

patch

obsolete

>diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin2/Makefile ./Makefile
>--- /usr/ports/www/resin2/Makefile	Sat Mar  4 00:14:52 2006
>+++ ./Makefile	Tue Apr  4 15:32:44 2006
>@@ -7,6 +7,7 @@
> 
> PORTNAME=		resin
> PORTVERSION=		2.1.17
>+PORTREVISION=		1
> CATEGORIES=		www java
> MASTER_SITES=		http://www.caucho.com/download/
> 
>@@ -20,8 +21,6 @@
> USE_REINPLACE=		yes
> USE_OPENSSL=		yes
> 
>-BROKEN=			Hard-codes libc_r linkage
>-
> # Customizable settings
> RUNASUSER?=		www
> RUNASUID?=		80
>@@ -62,6 +61,9 @@
> 			--with-openssl-lib=${OPENSSLLIB} \
> 			--with-openssl-include=${OPENSSLINC}
> LDFLAGS+=		-L${OPENSSLLIB} -lcrypto -lssl
>+# We need to link with cc instead of ld for the FreeBSD specific options used
>+# by threading libraries
>+CONFIGURE_ENV=		LD=${CC} PTHREAD_LIBS=${PTHREAD_LIBS} LDFLAGS="${LDFLAGS}"
> 
> # Install the Apache plugin if needed
> .if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)
>@@ -96,16 +98,16 @@
> 			-e "s|%%APXS%%|${APXS}|g" \
> 			-e "s|%%COPYDIRS%%|${COPYDIRS}|g" \
> 			-e "s|%%FILESDIR%%|${FILESDIR}|g" \
>-			-e "s|%%GROUP%%|${GROUP}|g" \
> 			-e "s|%%GID%%|${GID}|g" \
>-			-e "s|%%JAVA_HOME%%|${JAVA_HOME}|g" \
>+			-e "s|%%GROUP%%|${GROUP}|g" \
> 			-e "s|%%JAVA%%|${JAVA}|g" \
>+			-e "s|%%JAVA_HOME%%|${JAVA_HOME}|g" \
> 			-e "s|%%LOG_FILE%%|${LOG_FILE}|g" \
>-			-e "s|%%PYTHON_CMD%%|${PYTHON_CMD}|g" \
> 			-e "s|%%PID_FILE%%|${PID_FILE}|g" \
> 			-e "s|%%PORT%%|${PORT}|g" \
> 			-e "s|%%PORTNAME%%|${PORTNAME}|g" \
> 			-e "s|%%PREFIX%%|${PREFIX}|g" \
>+			-e "s|%%PYTHON_CMD%%|${PYTHON_CMD}|g" \
> 			-e "s|%%RUNASUID%%|${RUNASUID}|g" \
> 			-e "s|%%RUNASUSER%%|${RUNASUSER}|g" \
> 			-e "s|%%WRKDIR%%|${WRKDIR}|g" \
>diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin2/files/patch-configure ./files/patch-configure
>--- /usr/ports/www/resin2/files/patch-configure	Thu Jan  1 01:00:00 1970
>+++ ./files/patch-configure	Tue Apr  4 15:18:44 2006
>@@ -0,0 +1,11 @@
>+--- configure.orig	Fri Dec  9 00:09:15 2005
>++++ configure	Mon Apr  3 11:06:18 2006
>+@@ -3671,7 +3671,7 @@
>+ 	;;
>+ 
>+   *freebsd*)
>+-	PROXY_LIBS='-lc_r'
>++	PROXY_LIBS="${PTHREAD_LIBS}"
>+         jni_os=freebsd
>+ 	;;
>+ 
>diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin2/files/patch-src_c_plugin_common_Makefile.in ./files/patch-src_c_plugin_common_Makefile.in
>--- /usr/ports/www/resin2/files/patch-src_c_plugin_common_Makefile.in	Thu Jan  1 01:00:00 1970
>+++ ./files/patch-src_c_plugin_common_Makefile.in	Tue Apr  4 15:17:45 2006
>@@ -0,0 +1,15 @@
>+--- src/c/plugin/common/Makefile.in.orig	Fri Dec  9 10:09:13 2005
>++++ src/c/plugin/common/Makefile.in	Tue Apr  4 23:01:30 2006
>+@@ -14,10 +14,10 @@
>+ all	: common.o common.lo
>+ 
>+ common.o	: $(OBJ)
>+-	$(LD) -r -o $@ $(OBJ)
>++	$(LD) $(LDFLAGS_SHLIB) -o $@ $(OBJ)
>+ 
>+ common.lo	: $(OBJ_PICS)
>+-	$(LD) -r -o $@ $(OBJ_PICS)
>++	$(LD) $(LDFLAGS_SHLIB) -o $@ $(OBJ_PICS)
>+ 
>+ .c.lo	:
>+ 	$(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $< && mv $*.o $*.lo

Actions: View

Attachments on bug 93289: 62411 | 62412 | 62413