diff options
| author | Herve Quiroz <hq@FreeBSD.org> | 2005-04-15 00:30:48 +0000 |
|---|---|---|
| committer | Herve Quiroz <hq@FreeBSD.org> | 2005-04-15 00:30:48 +0000 |
| commit | 3348a9eb041d099febe84ce4226f0e6b95e32bce (patch) | |
| tree | 89a62db6f095ad29f3931c09a797c9c9f13850a3 | |
| parent | 849c1121a9fa164516ace2cc49b5ff8cf4845599 (diff) | |
| download | ports-3348a9eb041d099febe84ce4226f0e6b95e32bce.tar.gz ports-3348a9eb041d099febe84ce4226f0e6b95e32bce.zip | |
Notes
| -rw-r--r-- | www/resin2/Makefile | 22 | ||||
| -rw-r--r-- | www/resin2/files/resinctl | 5 |
2 files changed, 10 insertions, 17 deletions
diff --git a/www/resin2/Makefile b/www/resin2/Makefile index 7d0dd3474493..a0d9366cc036 100644 --- a/www/resin2/Makefile +++ b/www/resin2/Makefile @@ -13,8 +13,6 @@ MASTER_SITES= http://www.caucho.com/download/ MAINTAINER= jb.quenot@caraldi.com COMMENT= Resin, a Java-based Application Server, 2.x branch -BROKEN= Does not build - USE_JAVA= yes JAVA_VERSION= 1.2+ HAS_CONFIGURE= yes @@ -43,8 +41,6 @@ APXS?= ${LOCALBASE}/sbin/apxs PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGMESSAGE= ${WRKDIR}/pkg-message -# We need WRKSRC and WRKDIR right now so define them "manually" -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} REINPLACE_FILES= ${WRKSRC}/src/c/plugin/apache/Makefile.in \ ${WRKSRC}/src/c/plugin/apache2/Makefile.in REPLACE_FILES= ${FILESDIR}/pkg-install \ @@ -110,12 +106,10 @@ SUBSTITUTIONS= -e "s|%%APP_HOME%%|${APP_HOME}|g" \ -e "s|%%WRKSRC%%|${WRKSRC}|g" post-patch: -.for FILE in ${REINPLACE_FILES} - @${REINPLACE_CMD} ${SUBSTITUTIONS} ${FILE} -.endfor -.for FILE in ${REPLACE_FILES} - @${SED} ${SUBSTITUTIONS} ${FILE} > ${WRKDIR}/`basename ${FILE}` -.endfor + @${REINPLACE_CMD} ${SUBSTITUTIONS} ${REINPLACE_FILES} + @for FILE in ${REPLACE_FILES} ; do \ + ${SED} ${SUBSTITUTIONS} $${FILE} > ${WRKDIR}/`basename $${FILE}` ; \ + done @${FMT} -w 80 < ${WRKDIR}/pkg-message.in > ${PKGMESSAGE} .if (defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES) || \ defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)) @@ -134,10 +128,10 @@ defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)) post-install: @${SETENV} RUNASUSER=${RUNASUSER} GROUP=${GROUP} ${SH} ${WRKDIR}/install.sh @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${ECHO_CMD} - @${ECHO_CMD} "********************************************************************************" + @${ECHO_MSG} + @${ECHO_MSG} "********************************************************************************" @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} "********************************************************************************" - @${ECHO_CMD} + @${ECHO_MSG} "********************************************************************************" + @${ECHO_MSG} .include <bsd.port.post.mk> diff --git a/www/resin2/files/resinctl b/www/resin2/files/resinctl index 07be5c788618..e503fe1c9041 100644 --- a/www/resin2/files/resinctl +++ b/www/resin2/files/resinctl @@ -105,10 +105,10 @@ def start(): # Wait a little time.sleep(.4) - (unused_pid, status) = os.waitpid(pid, os.WNOHANG) + (status_pid, status) = os.waitpid(pid, os.WNOHANG) # Check program exit status, if available - if unused_pid != 0 and os.WIFEXITED(status): + if status_pid != 0 and os.WIFEXITED(status): sys.stderr = os.fdopen(orig_stderr, 'w') print >> sys.stderr, 'Could not start %s. Check %s for errors.' % (APP_NAME, LOG_FILE) sys.exit(2) @@ -153,7 +153,6 @@ if __name__ == '__main__': LOG_FILE = "%%LOG_FILE%%" APP_NAME = "%%APP_NAME%%" APP_HOME = "%%APP_HOME%%" - CONTROL_PROGRAM = "%%APP_NAME%%ctl" PID_FILE = "%%PID_FILE%%" COMMAND = "%%JAVA%%" ARGS = [COMMAND] |