ports/172748: [patch] www/resin3: fix rc script issue and minor cleanup, adopt optionsNG

[Jason Helfman]

>Number:         172748
>Category:       ports
>Synopsis:       [patch] www/resin3: fix rc script issue and minor cleanup, adopt optionsNG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 16 02:40:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Jason Helfman
>Release:        FreeBSD 9.1-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0 r241358: Mon Oct 8 23:17:12 UTC 2012 peter at freefall.freebsd.org:/usr/src/sys/amd64/compile/FREEFALL amd64


	
>Description:
# /usr/local/etc/rc.d/resin3 start
/usr/local/etc/rc.d/resin3: 40: Syntax error: Unterminated quoted string

>How-To-Repeat:
Install port, and attempt to start daemon.
>Fix:

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 at 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)
>Release-Note:
>Audit-Trail:
>Unformatted: