From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Apr 20 14:30:26 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0AE9116A4CE for ; Wed, 20 Apr 2005 14:30:26 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 90D9C43D5C for ; Wed, 20 Apr 2005 14:30:25 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j3KEUPT3088428 for ; Wed, 20 Apr 2005 14:30:25 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j3KEUPuk088426; Wed, 20 Apr 2005 14:30:25 GMT (envelope-from gnats) Resent-Date: Wed, 20 Apr 2005 14:30:25 GMT Resent-Message-Id: <200504201430.j3KEUPuk088426@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jean-Baptiste Quenot Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8182016A4E0 for ; Wed, 20 Apr 2005 14:20:16 +0000 (GMT) Received: from caraldi.com (195-13-58-165.oxyd.net [195.13.58.165]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7FB1843D49 for ; Wed, 20 Apr 2005 14:20:11 +0000 (GMT) (envelope-from jbq@anyware-tech.com) Received: from vision.anyware (10.21.96-84.rev.gaoland.net [84.96.21.10]) by caraldi.com (Postfix) with ESMTP id 2EE3A610E for ; Wed, 20 Apr 2005 16:20:10 +0200 (CEST) Received: by vision.anyware (Postfix, from userid 1021) id A5B2C6153; Wed, 20 Apr 2005 16:20:11 +0200 (CEST) Message-Id: <20050420142011.A5B2C6153@vision.anyware> Date: Wed, 20 Apr 2005 16:20:11 +0200 (CEST) From: Jean-Baptiste Quenot To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/80156: Maintainer update: unbreak www/resin3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Apr 2005 14:30:26 -0000 >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} "" >> ${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} "" >> ${PKGMESSAGE} + @${ECHO_CMD} "" >> ${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 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: