From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Oct 16 02:40:01 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 65F4F7AF for ; Tue, 16 Oct 2012 02:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [8.8.178.135]) by mx1.freebsd.org (Postfix) with ESMTP id 3D2CC8FC16 for ; Tue, 16 Oct 2012 02:40:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q9G2e1p4092375 for ; Tue, 16 Oct 2012 02:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q9G2e1Si092373; Tue, 16 Oct 2012 02:40:01 GMT (envelope-from gnats) Resent-Date: Tue, 16 Oct 2012 02:40:01 GMT Resent-Message-Id: <201210160240.q9G2e1Si092373@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jason Helfman Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 745D67A9 for ; Tue, 16 Oct 2012 02:39:51 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [8.8.178.135]) by mx1.freebsd.org (Postfix) with ESMTP id 3C9FA8FC08; Tue, 16 Oct 2012 02:39:51 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q9G2dpEB092332; Tue, 16 Oct 2012 02:39:51 GMT (envelope-from jgh@freefall.freebsd.org) Received: (from jgh@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q9G2doSJ092331; Tue, 16 Oct 2012 02:39:50 GMT (envelope-from jgh) Message-Id: <201210160239.q9G2doSJ092331@freefall.freebsd.org> Date: Tue, 16 Oct 2012 02:39:50 GMT From: Jason Helfman To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/172748: [patch] www/resin3: fix rc script issue and minor cleanup, adopt optionsNG Cc: lasse@bitmand.com X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Jason Helfman List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Oct 2012 02:40:01 -0000 >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@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@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 @@ -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: