- Unbreak: variable evaluation (WRKSRC) could not postponed due to some .for

  loops. The loops are now either unrolled or implemented as shell loops. [1]
- ECHO_CMD -> ECHO_MSG when displaying information to the user
- Improve resinctl [2]

PR:		79707
Submitted by:	Boris Kovalenko <boris@tagnet.ru> [1], maintainer [2]
Approved by:	maintainer

2 files changed, 10 insertions, 17 deletions

diff --git a/www/resin2/Makefile b/www/resin2/Makefile
index 7d0dd347449..a0d9366cc03 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 07be5c78861..e503fe1c904 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]