Date: Wed, 17 Oct 2012 21:34:35 +0000 (UTC) From: Jason Helfman <jgh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306038 - in head/www/resin3: . files Message-ID: <201210172134.q9HLYZB8069191@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jgh Date: Wed Oct 17 21:34:35 2012 New Revision: 306038 URL: http://svn.freebsd.org/changeset/ports/306038 Log: - unbreak rc script and cleanup, convert to optionsNG PR: 172748 Submitted by: jgh@ Spotted by: lasse@bitmand.com (private mail) Approved by: maintainer, 5u623l20@gmail.com Feature safe: yes Modified: head/www/resin3/Makefile head/www/resin3/files/resin3.in Modified: head/www/resin3/Makefile ============================================================================== --- head/www/resin3/Makefile Wed Oct 17 19:46:38 2012 (r306037) +++ head/www/resin3/Makefile Wed Oct 17 21:34:35 2012 (r306038) @@ -1,20 +1,18 @@ -# New ports collection makefile for: resin3 -# Whom: Jean-Baptiste Quenot <jb.quenot@caraldi.com> -# Date Created: 2003-09-29 14:17:14 +# Created by: Jean-Baptiste Quenot <jb.quenot@caraldi.com> # # $FreeBSD$ -# 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 +57,7 @@ LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lss 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 +113,7 @@ do-install: 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} Modified: head/www/resin3/files/resin3.in ============================================================================== --- head/www/resin3/files/resin3.in Wed Oct 17 19:46:38 2012 (r306037) +++ head/www/resin3/files/resin3.in Wed Oct 17 21:34:35 2012 (r306038) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210172134.q9HLYZB8069191>