Attachment 128852 Details for Bug 172748 – file.diff

[patch] file.diff

file.diff (text/plain), 2.10 KB, created by Jason Helfman on 2012-10-16 03:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Helfman

Created: 2012-10-16 03:40:01 UTC

Size: 2.10 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 305786)
>+++ Makefile	(working copy)
>@@ -7,14 +7,15 @@
> 
> PORTNAME=		resin
> PORTVERSION=		3.1.12
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=		www java
> MASTER_SITES=		http://www.caucho.com/download/
> 
> MAINTAINER=		5u623l20@gmail.com
>-COMMENT=		Resin, a Java-based Application Server, 3.x branch
>+COMMENT=		Java-based Application Server, 3.x branch
> 
>-OPTIONS=	APACHE22	"Use Apache 2.2" off
>+OPTIONS_DEFINE=	APACHE22
>+APACHE22_DESC=	Use Apache 2.2
> 
> .include <bsd.port.options.mk>
> 
>@@ -59,7 +60,7 @@
> CONFIGURE_ENV=		LD=${CC} PTHREAD_LIBS="${PTHREAD_LIBS}" LIBTOOL=${LIBTOOL}
> 
> # Install the Apache plugin if needed
>-.if defined(WITH_APACHE22)
>+.if ${PORT_OPTIONS:MAPACHE22}
> BUILD_DEPENDS+=		${APXS}:${PORTSDIR}/www/apache22
> CONFIGURE_ARGS+=	--with-apxs=${APXS}
> PLIST_SUB+=		MOD_DIR=libexec/apache22
>@@ -115,7 +116,7 @@
> 	cd ${WRKSRC}/webapps && ${COPYTREE_SHARE} \* ${APP_HOME}/webapps
> 	cd ${WRKSRC}/lib  && ${COPYTREE_SHARE} \* ${APP_HOME}/lib
> 
>-.if defined(WITH_APACHE22)
>+.if ${PORT_OPTIONS:MAPACHE22}
> 	${APXS} -i -n caucho -a ${WRKSRC}/modules/c/src/apache2/.libs/mod_caucho.so
> .endif
> 	@${ECHO_MSG}
>Index: files/resin3.in
>===================================================================
>--- files/resin3.in	(revision 305786)
>+++ files/resin3.in	(working copy)
>@@ -14,20 +14,20 @@
> #
> 
> 
>-%%APP_NAME%%_enable=${%%APP_NAME%%_enable:-"NO"}
>-%%APP_NAME%%_user=${%%APP_NAME%%_user:"www"}
>-%%APP_NAME%%_group=${%%APP_NAME%%_group:"www"}
>+%%APP_NAME%%_enable="${%%APP_NAME%%_enable:-"NO"}"
>+%%APP_NAME%%_user="${%%APP_NAME%%_user:-"www"}"
>+%%APP_NAME%%_group="${%%APP_NAME%%_group:-"www"}"
> 
> . /etc/rc.subr
> 
>-name=%%APP_NAME%%
>-rcvar=%%APP_NAME%%_enable
>+name="%%APP_NAME%%"
>+rcvar="%%APP_NAME%%"_enable
> 
> load_rc_config ${name}
> 
> command="%%PREFIX%%/sbin/%%APP_NAME%%ctl"
> command_args="start"
>-pidfile=%%PID_FILE%%
>+pidfile="%%PID_FILE%%"
> 
> if test -n "${%%APP_NAME%%_java_version}" ; then
>     JAVA_HOME=$(JAVA_VERSION="${%%APP_NAME%%_java_version}" JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVA_HOME | cut -d= -f2)

Actions: View | Diff

Attachments on bug 172748: 128852