View | Details | Raw Unified | Return to bug 172748
Collapse All | Expand All

(-)Makefile (-5 / +6 lines)
Lines 7-20 Link Here
7
7
8
PORTNAME=		resin
8
PORTNAME=		resin
9
PORTVERSION=		3.1.12
9
PORTVERSION=		3.1.12
10
PORTREVISION=	2
10
PORTREVISION=	3
11
CATEGORIES=		www java
11
CATEGORIES=		www java
12
MASTER_SITES=		http://www.caucho.com/download/
12
MASTER_SITES=		http://www.caucho.com/download/
13
13
14
MAINTAINER=		5u623l20@gmail.com
14
MAINTAINER=		5u623l20@gmail.com
15
COMMENT=		Resin, a Java-based Application Server, 3.x branch
15
COMMENT=		Java-based Application Server, 3.x branch
16
16
17
OPTIONS=	APACHE22	"Use Apache 2.2" off
17
OPTIONS_DEFINE=	APACHE22
18
APACHE22_DESC=	Use Apache 2.2
18
19
19
.include <bsd.port.options.mk>
20
.include <bsd.port.options.mk>
20
21
Lines 59-65 Link Here
59
CONFIGURE_ENV=		LD=${CC} PTHREAD_LIBS="${PTHREAD_LIBS}" LIBTOOL=${LIBTOOL}
60
CONFIGURE_ENV=		LD=${CC} PTHREAD_LIBS="${PTHREAD_LIBS}" LIBTOOL=${LIBTOOL}
60
61
61
# Install the Apache plugin if needed
62
# Install the Apache plugin if needed
62
.if defined(WITH_APACHE22)
63
.if ${PORT_OPTIONS:MAPACHE22}
63
BUILD_DEPENDS+=		${APXS}:${PORTSDIR}/www/apache22
64
BUILD_DEPENDS+=		${APXS}:${PORTSDIR}/www/apache22
64
CONFIGURE_ARGS+=	--with-apxs=${APXS}
65
CONFIGURE_ARGS+=	--with-apxs=${APXS}
65
PLIST_SUB+=		MOD_DIR=libexec/apache22
66
PLIST_SUB+=		MOD_DIR=libexec/apache22
Lines 115-121 Link Here
115
	cd ${WRKSRC}/webapps && ${COPYTREE_SHARE} \* ${APP_HOME}/webapps
116
	cd ${WRKSRC}/webapps && ${COPYTREE_SHARE} \* ${APP_HOME}/webapps
116
	cd ${WRKSRC}/lib  && ${COPYTREE_SHARE} \* ${APP_HOME}/lib
117
	cd ${WRKSRC}/lib  && ${COPYTREE_SHARE} \* ${APP_HOME}/lib
117
118
118
.if defined(WITH_APACHE22)
119
.if ${PORT_OPTIONS:MAPACHE22}
119
	${APXS} -i -n caucho -a ${WRKSRC}/modules/c/src/apache2/.libs/mod_caucho.so
120
	${APXS} -i -n caucho -a ${WRKSRC}/modules/c/src/apache2/.libs/mod_caucho.so
120
.endif
121
.endif
121
	@${ECHO_MSG}
122
	@${ECHO_MSG}
(-)files/resin3.in (-6 / +6 lines)
Lines 14-33 Link Here
14
#
14
#
15
15
16
16
17
%%APP_NAME%%_enable=${%%APP_NAME%%_enable:-"NO"}
17
%%APP_NAME%%_enable="${%%APP_NAME%%_enable:-"NO"}"
18
%%APP_NAME%%_user=${%%APP_NAME%%_user:"www"}
18
%%APP_NAME%%_user="${%%APP_NAME%%_user:-"www"}"
19
%%APP_NAME%%_group=${%%APP_NAME%%_group:"www"}
19
%%APP_NAME%%_group="${%%APP_NAME%%_group:-"www"}"
20
20
21
. /etc/rc.subr
21
. /etc/rc.subr
22
22
23
name=%%APP_NAME%%
23
name="%%APP_NAME%%"
24
rcvar=%%APP_NAME%%_enable
24
rcvar="%%APP_NAME%%"_enable
25
25
26
load_rc_config ${name}
26
load_rc_config ${name}
27
27
28
command="%%PREFIX%%/sbin/%%APP_NAME%%ctl"
28
command="%%PREFIX%%/sbin/%%APP_NAME%%ctl"
29
command_args="start"
29
command_args="start"
30
pidfile=%%PID_FILE%%
30
pidfile="%%PID_FILE%%"
31
31
32
if test -n "${%%APP_NAME%%_java_version}" ; then
32
if test -n "${%%APP_NAME%%_java_version}" ; then
33
    JAVA_HOME=$(JAVA_VERSION="${%%APP_NAME%%_java_version}" JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVA_HOME | cut -d= -f2)
33
    JAVA_HOME=$(JAVA_VERSION="${%%APP_NAME%%_java_version}" JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVA_HOME | cut -d= -f2)

Return to bug 172748