Date: Wed, 20 Apr 2005 16:20:11 +0200 (CEST) From: Jean-Baptiste Quenot <jb.quenot@caraldi.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/80156: Maintainer update: unbreak www/resin3 Message-ID: <20050420142011.A5B2C6153@vision.anyware> Resent-Message-ID: <200504201430.j3KEUPuk088426@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 80156
>Category: ports
>Synopsis: Maintainer update: unbreak www/resin3
>Confidential: no
>Severity: serious
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Apr 20 14:30:24 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Jean-Baptiste Quenot
>Release: FreeBSD 5.3-RELEASE i386
>Organization:
>Environment:
System: FreeBSD vision.anyware 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Fri Nov 5 04:19:18 UTC 2004 root@harlow.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Please find below a patch to unbreak the www/resin3 port based on a patch by
Hervé Quiroz initially for www/resin2. This update also addresses the move to
the GPL license.
>How-To-Repeat:
>Fix:
diff --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/Makefile ./Makefile
--- /usr/ports/www/resin3/Makefile Mon Mar 28 00:05:24 2005
+++ ./Makefile Wed Apr 20 16:15:20 2005
@@ -13,8 +13,6 @@
MAINTAINER= jb.quenot@caraldi.com
COMMENT= Resin, a Java-based Application Server, 3.x branch
-BROKEN= Does not build
-
USE_JAVA= yes
JAVA_VERSION= 1.2+
HAS_CONFIGURE= yes
@@ -43,8 +41,6 @@
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/apache1/Makefile.in \
${WRKSRC}/src/c/apache2/Makefile.in
REPLACE_FILES= ${FILESDIR}/pkg-install \
@@ -110,12 +106,10 @@
-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))
@@ -126,23 +120,18 @@
server, for example: | ${FMT} -w 80 >> ${PKGMESSAGE}
@${ECHO_CMD} >> ${PKGMESSAGE}
@${ECHO_CMD} "<IfModule mod_caucho.c>" >> ${PKGMESSAGE}
-.if (defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES))
@${ECHO_CMD} " ResinConfigServer localhost 6802" >> ${PKGMESSAGE}
-.endif
-.if (defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES))
- @${ECHO_CMD} " CauchoConfigFile ${PREFIX}/etc/${APP_NAME}/resin.xml" >> ${PKGMESSAGE}
-.endif
- @${ECHO_CMD} "</IfModule>" >> ${PKGMESSAGE}
+ @${ECHO_CMD} "</IfModule>" >> ${PKGMESSAGE}
.endif
# Resin does not handle installation, so proceed now
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 --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/files/resinctl ./files/resinctl
--- /usr/ports/www/resin3/files/resinctl Thu Feb 24 23:50:29 2005
+++ ./files/resinctl Wed Apr 20 16:11:23 2005
@@ -105,10 +105,10 @@
# 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 @@
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]
diff --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/pkg-descr ./pkg-descr
--- /usr/ports/www/resin3/pkg-descr Fri Feb 25 09:54:44 2005
+++ ./pkg-descr Wed Mar 23 17:55:17 2005
@@ -6,18 +6,8 @@
for Apache, and supports the latest Servlet 2.3 and JSP 1.2 specifications from
Sun.
-o You may use Resin for development, evaluation, and demos.
-o You must contact us to purchase a deployment license if either:
- * You are paid to use Resin.
- * You are paying someone else to use Resin.
-
-o If no one is paid to use Resin, you may use Resin for deployment:
- * students
- * private use
- * tiny startups with neither funding nor income.
-
-o Anyone falling in between should contact us for a waiver.
-o Distributors must contact us.
-o If you are allowed to use Resin, you may modify the source for that use.
+Resin 3.0 Open Source is available under the GNU Public License (GPL). It
+contains all functional components of Resin, including EJB, but excludes
+performance and clustering capabilities.
WWW: http://www.caucho.com/
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050420142011.A5B2C6153>