Attachment 64034 Details for Bug 95334 – 20060405-freebsd-resin3

20060405-freebsd-resin3

20060405-freebsd-resin3 (text/plain; charset=us-ascii), 3.14 KB, created by Jean-Baptiste Quenot on 2006-04-05 10:16:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jean-Baptiste Quenot

Created: 2006-04-05 10:16:48 UTC

Size: 3.14 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 Apr  5 00:10:08 2006
>+++ ./Makefile	Wed Apr  5 11:13:48 2006
>@@ -18,6 +18,7 @@
> HAS_CONFIGURE=		yes
> USE_PYTHON=		yes
> USE_OPENSSL=		yes
>+USE_AUTOTOOLS=		libtool:15
> 
> # Customizable settings
> RUNASUSER?=		www
>@@ -61,7 +62,7 @@
> 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}"
>+CONFIGURE_ENV=		LD=${CC} PTHREAD_LIBS=${PTHREAD_LIBS} LDFLAGS="${LDFLAGS}" LIBTOOL=${LIBTOOL}
> 
> # Install the Apache plugin if needed
> .if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)
>@@ -131,7 +132,7 @@
> .endif
> 
> post-build:
>-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} install
>+	cd ${WRKSRC}/modules/c/src/resin_os && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} install
> 
> # Resin does not handle installation, so proceed now
> do-install:
>diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/files/patch-configure ./files/patch-configure
>--- /usr/ports/www/resin3/files/patch-configure	Mon Apr  3 17:07:49 2006
>+++ ./files/patch-configure	Wed Apr  5 11:03:36 2006
>@@ -1,6 +1,47 @@
> --- configure.orig	Thu Feb 23 00:59:58 2006
>-+++ configure	Mon Apr  3 10:55:28 2006
>-@@ -9026,33 +9026,8 @@
>++++ configure	Wed Apr  5 11:03:16 2006
>+@@ -8193,37 +8193,12 @@
>+ 
>+ 
>+ 
>+-# This can be used to rebuild libtool when needed
>+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
>+-
>+-# Always use our own libtool.
>+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
>+-
>+-# Prevent multiple expansion
>+-
>+-
>+ #
>+ # libtool stuff
>+ #
>+-if test -z "${LTFLAGS}"; then
>+-  LTFLAGS="--silent"
>+-fi
>+-
>+-LIBTOOL_SCRIPT="`pwd`/libtool"
>+-LIBTOOL="${LIBTOOL_SCRIPT} ${LTFLAGS}"
>+-libtoolversion=`${SHELL} ${LIBTOOL_SCRIPT} --version`
>+-case $libtoolversion in
>+-     *1.4*)
>+-       SH_LIBTOOL="${LIBTOOL_SCRIPT}"
>+-       SHLTCFLAGS="-prefer-pic"
>+-       LTCFLAGS="-prefer-non-pic -static"
>+-       ;;
>+-     *)
>+-       SH_LIBTOOL="${SHELL} ${LIBTOOL_SCRIPT} ${LTFLAGS}"
>+-       SHLTCFLAGS=""
>+-       LTCFLAGS=""
>+-       ;;
>+-esac
>++SH_LIBTOOL="${SHELL} ${LIBTOOL}"
>++SHLTCFLAGS=""
>++LTCFLAGS=""
>+ 
>+ 
>+ 
>+@@ -9026,33 +9001,8 @@
>  	PROXY_LIBS='-lnsl -lsocket -lthread'
>  	;;
>  
>diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/files/pkg-message.in ./files/pkg-message.in
>--- /usr/ports/www/resin3/files/pkg-message.in	Sun Jan  8 00:12:46 2006
>+++ ./files/pkg-message.in	Tue Apr  4 18:55:00 2006
>@@ -38,10 +38,13 @@
> %%APP_NAME%%_flags option in /etc/rc.conf, see examples below:
> 
>   # Prevent Java from opening an X11 display
>+
>   %%APP_NAME%%_flags="-Djava.awt.headless=true"
> 
>   # Increase memory limit of the Java virtual machine
>+
>   %%APP_NAME%%_flags="-Xms32m -Xmx256m"
> 
>   # Run Java with remote debugging turned on on port 8000
>+
>   %%APP_NAME%%_flags="-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"

Actions: View

Attachments on bug 95334: 64033 | 64034