Attachment 60935 Details for Bug 91390 – file.diff

[patch] file.diff

file.diff (text/plain), 3.00 KB, created by Jean-Baptiste Quenot on 2006-01-06 11:50:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jean-Baptiste Quenot

Created: 2006-01-06 11:50:04 UTC

Size: 3.00 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	Thu Dec 22 00:11:33 2005
>+++ ./Makefile	Fri Jan  6 12:19:24 2006
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=		resin
>-PORTVERSION=		3.0.16
>+PORTVERSION=		3.0.17
> CATEGORIES=		www java
> MASTER_SITES=		http://www.caucho.com/download/
> 
>@@ -59,6 +59,7 @@
> CONFIGURE_ARGS+=	--with-java-home=${JAVA_HOME} \
> 			--with-openssl-lib=${OPENSSLLIB} \
> 			--with-openssl-include=${OPENSSLINC}
>+LDFLAGS+=		-L${OPENSSLLIB} -lcrypto -lssl
> 
> # Install the Apache plugin if needed
> .if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)
>@@ -128,8 +129,9 @@
> .endif
> 
> post-build:
>-	cd ${WRKSRC}/modules/c/src && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} install
>+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} install
> 
>+# Resin does not handle installation, so proceed now
> do-install:
> 	@${SETENV} RUNASUSER=${RUNASUSER} GROUP=${GROUP} ${SH} ${WRKDIR}/install.sh
> .if (defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES))
>diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/distinfo ./distinfo
>--- /usr/ports/www/resin3/distinfo	Thu Dec 22 00:11:34 2005
>+++ ./distinfo	Fri Jan  6 12:21:51 2006
>@@ -1,3 +1,3 @@
>-MD5 (resin-3.0.16.tar.gz) = 8f5a88fa14190bc768b083c17f864ea3
>-SHA256 (resin-3.0.16.tar.gz) = 17326fc79ec941cd18b9c25d251aa595a9b9bcaa5ff653cb44b9f129c7b948a2
>-SIZE (resin-3.0.16.tar.gz) = 7667120
>+MD5 (resin-3.0.17.tar.gz) = 19a2afd5c5fd8a8439bd55ef58922478
>+SHA256 (resin-3.0.17.tar.gz) = 2a3218fc50e16fa73609e6b36855ae25e36f746a1b583139126c066e78d6af80
>+SIZE (resin-3.0.17.tar.gz) = 7656477
>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	Thu Dec 22 00:11:34 2005
>+++ ./files/pkg-message.in	Fri Dec 16 13:11:27 2005
>@@ -41,7 +41,7 @@
>   %%APP_NAME%%_flags="-Djava.awt.headless=true"
> 
>   # Increase memory limit of the Java virtual machine
>-  %%APP_NAME%%_flags="-Xms32mÂ -Xmx256m"
>+  %%APP_NAME%%_flags="-Xms32m -Xmx256m"
> 
>-  # Run Java with remote debugging turned on
>-  %%APP_NAME%%_flags="-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n"
>+  # 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"
>diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/pkg-plist ./pkg-plist
>--- /usr/ports/www/resin3/pkg-plist	Thu Dec 22 00:11:34 2005
>+++ ./pkg-plist	Fri Jan  6 12:45:25 2006
>@@ -1,6 +1,5 @@
> @comment $FreeBSD: ports/www/resin3/pkg-plist,v 1.11 2005/12/20 22:38:35 edwin Exp $
> %%APP_NAME%%/lib/aopalliance.jar
>-%%APP_NAME%%/lib/default.xsl
> %%APP_NAME%%/lib/eclipse-compiler.jar
> %%APP_NAME%%/lib/ejb-20.jar
> %%APP_NAME%%/lib/ejb-30.jar

Actions: View | Diff

Attachments on bug 91390: 60935