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

(-)./Makefile (-20 / +9 lines)
Lines 13-20 Link Here
13
MAINTAINER=		jb.quenot@caraldi.com
13
MAINTAINER=		jb.quenot@caraldi.com
14
COMMENT=		Resin, a Java-based Application Server, 3.x branch
14
COMMENT=		Resin, a Java-based Application Server, 3.x branch
15
15
16
BROKEN=			Does not build
17
18
USE_JAVA=		yes
16
USE_JAVA=		yes
19
JAVA_VERSION=		1.2+
17
JAVA_VERSION=		1.2+
20
HAS_CONFIGURE=		yes
18
HAS_CONFIGURE=		yes
Lines 43-50 Link Here
43
PKGINSTALL=		${WRKDIR}/pkg-install
41
PKGINSTALL=		${WRKDIR}/pkg-install
44
PKGDEINSTALL=		${WRKDIR}/pkg-deinstall
42
PKGDEINSTALL=		${WRKDIR}/pkg-deinstall
45
PKGMESSAGE=		${WRKDIR}/pkg-message
43
PKGMESSAGE=		${WRKDIR}/pkg-message
46
# We need WRKSRC and WRKDIR right now so define them "manually"
47
WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
48
REINPLACE_FILES=	${WRKSRC}/src/c/apache1/Makefile.in \
44
REINPLACE_FILES=	${WRKSRC}/src/c/apache1/Makefile.in \
49
			${WRKSRC}/src/c/apache2/Makefile.in
45
			${WRKSRC}/src/c/apache2/Makefile.in
50
REPLACE_FILES=		${FILESDIR}/pkg-install \
46
REPLACE_FILES=		${FILESDIR}/pkg-install \
Lines 110-121 Link Here
110
			-e "s|%%WRKSRC%%|${WRKSRC}|g"
106
			-e "s|%%WRKSRC%%|${WRKSRC}|g"
111
107
112
post-patch:
108
post-patch:
113
.for FILE in ${REINPLACE_FILES}
109
	@${REINPLACE_CMD} ${SUBSTITUTIONS} ${REINPLACE_FILES}
114
	@${REINPLACE_CMD} ${SUBSTITUTIONS} ${FILE}
110
	@for FILE in ${REPLACE_FILES} ; do \
115
.endfor
111
	    ${SED} ${SUBSTITUTIONS} $${FILE} > ${WRKDIR}/`basename $${FILE}` ; \
116
.for FILE in ${REPLACE_FILES}
112
	    done
117
	@${SED} ${SUBSTITUTIONS} ${FILE} > ${WRKDIR}/`basename ${FILE}`
118
.endfor
119
	@${FMT} -w 80 < ${WRKDIR}/pkg-message.in > ${PKGMESSAGE}
113
	@${FMT} -w 80 < ${WRKDIR}/pkg-message.in > ${PKGMESSAGE}
120
.if (defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES) || \
114
.if (defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES) || \
121
defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES))
115
defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES))
Lines 126-148 Link Here
126
	    server, for example: | ${FMT} -w 80 >> ${PKGMESSAGE}
120
	    server, for example: | ${FMT} -w 80 >> ${PKGMESSAGE}
127
	@${ECHO_CMD} >> ${PKGMESSAGE}
121
	@${ECHO_CMD} >> ${PKGMESSAGE}
128
	@${ECHO_CMD} "<IfModule mod_caucho.c>" >> ${PKGMESSAGE}
122
	@${ECHO_CMD} "<IfModule mod_caucho.c>" >> ${PKGMESSAGE}
129
.if (defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES))
130
	@${ECHO_CMD} "    ResinConfigServer localhost 6802" >> ${PKGMESSAGE}
123
	@${ECHO_CMD} "    ResinConfigServer localhost 6802" >> ${PKGMESSAGE}
131
.endif
124
	@${ECHO_CMD} "</IfModule>" >> ${PKGMESSAGE}
132
.if (defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES))
133
			@${ECHO_CMD} "    CauchoConfigFile ${PREFIX}/etc/${APP_NAME}/resin.xml" >> ${PKGMESSAGE}
134
.endif
135
			@${ECHO_CMD} "</IfModule>" >> ${PKGMESSAGE}
136
.endif
125
.endif
137
126
138
# Resin does not handle installation, so proceed now
127
# Resin does not handle installation, so proceed now
139
post-install:
128
post-install:
140
	@${SETENV} RUNASUSER=${RUNASUSER} GROUP=${GROUP} ${SH} ${WRKDIR}/install.sh
129
	@${SETENV} RUNASUSER=${RUNASUSER} GROUP=${GROUP} ${SH} ${WRKDIR}/install.sh
141
	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
130
	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
142
	@${ECHO_CMD}
131
	@${ECHO_MSG}
143
	@${ECHO_CMD} "********************************************************************************"
132
	@${ECHO_MSG} "********************************************************************************"
144
	@${CAT} ${PKGMESSAGE}
133
	@${CAT} ${PKGMESSAGE}
145
	@${ECHO_CMD} "********************************************************************************"
134
	@${ECHO_MSG} "********************************************************************************"
146
	@${ECHO_CMD}
135
	@${ECHO_MSG}
147
136
148
.include <bsd.port.post.mk>
137
.include <bsd.port.post.mk>
(-)./files/resinctl (-3 / +2 lines)
Lines 105-114 Link Here
105
105
106
    # Wait a little
106
    # Wait a little
107
    time.sleep(.4)
107
    time.sleep(.4)
108
    (unused_pid, status) = os.waitpid(pid, os.WNOHANG)
108
    (status_pid, status) = os.waitpid(pid, os.WNOHANG)
109
109
110
    # Check program exit status, if available
110
    # Check program exit status, if available
111
    if unused_pid != 0 and os.WIFEXITED(status):
111
    if status_pid != 0 and os.WIFEXITED(status):
112
        sys.stderr = os.fdopen(orig_stderr, 'w')
112
        sys.stderr = os.fdopen(orig_stderr, 'w')
113
        print >> sys.stderr, 'Could not start %s.  Check %s for errors.' % (APP_NAME, LOG_FILE)
113
        print >> sys.stderr, 'Could not start %s.  Check %s for errors.' % (APP_NAME, LOG_FILE)
114
        sys.exit(2)
114
        sys.exit(2)
Lines 153-159 Link Here
153
    LOG_FILE = "%%LOG_FILE%%"
153
    LOG_FILE = "%%LOG_FILE%%"
154
    APP_NAME = "%%APP_NAME%%"
154
    APP_NAME = "%%APP_NAME%%"
155
    APP_HOME = "%%APP_HOME%%"
155
    APP_HOME = "%%APP_HOME%%"
156
    CONTROL_PROGRAM = "%%APP_NAME%%ctl"
157
    PID_FILE = "%%PID_FILE%%"
156
    PID_FILE = "%%PID_FILE%%"
158
    COMMAND = "%%JAVA%%"
157
    COMMAND = "%%JAVA%%"
159
    ARGS = [COMMAND]
158
    ARGS = [COMMAND]
(-)./pkg-descr (-13 / +3 lines)
Lines 6-23 Link Here
6
for Apache, and supports the latest Servlet 2.3 and JSP 1.2 specifications from
6
for Apache, and supports the latest Servlet 2.3 and JSP 1.2 specifications from
7
Sun.
7
Sun.
8
8
9
o You may use Resin for development, evaluation, and demos.
9
Resin 3.0 Open Source is available under the GNU Public License (GPL).  It
10
o You must contact us to purchase a deployment license if either:
10
contains all functional components of Resin, including EJB, but excludes
11
    * You are paid to use Resin.
11
performance and clustering capabilities.
12
    * You are paying someone else to use Resin. 
13
14
o If no one is paid to use Resin, you may use Resin for deployment:
15
    * students
16
    * private use
17
    * tiny startups with neither funding nor income. 
18
19
o Anyone falling in between should contact us for a waiver.
20
o Distributors must contact us.
21
o If you are allowed to use Resin, you may modify the source for that use.
22
12
23
WWW: http://www.caucho.com/
13
WWW: http://www.caucho.com/

Return to bug 80156