From owner-cvs-all@FreeBSD.ORG Mon Dec 26 04:43:35 2005 Return-Path: X-Original-To: cvs-all@freebsd.org Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 17EA716A41F; Mon, 26 Dec 2005 04:43:35 +0000 (GMT) (envelope-from dejan.lesjak@ijs.si) Received: from mail.ijs.si (mailman.ijs.si [193.2.4.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED2A043D5F; Mon, 26 Dec 2005 04:43:33 +0000 (GMT) (envelope-from dejan.lesjak@ijs.si) Received: from localhost (mail.ijs.si [193.2.4.66]) by patsy.ijs.si (Postfix) with ESMTP id 40DFC17B821; Mon, 26 Dec 2005 05:43:32 +0100 (CET) Received: from mail.ijs.si ([193.2.4.66]) by localhost (patsy.ijs.si [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 05137-14; Mon, 26 Dec 2005 05:43:29 +0100 (CET) Received: from radagast.ijs.si (radagast.ijs.si [193.2.4.168]) by patsy.ijs.si (Postfix) with ESMTP id 2B4B317B872; Mon, 26 Dec 2005 05:43:26 +0100 (CET) Received: from localhost.ijs.si (localhost.ijs.si [127.0.0.1]) by radagast.ijs.si (Postfix) with ESMTP id E63CF17055; Mon, 26 Dec 2005 05:43:25 +0100 (CET) From: Dejan Lesjak To: Ion-Mihai Tetcu Date: Mon, 26 Dec 2005 05:43:19 +0100 User-Agent: KMail/1.8.3 References: <200512240320.jBO3KUhs077893@repoman.freebsd.org> <20051224142013.GA50895@arabica.esil.univ-mrs.fr> <20051226041920.131a9668@it.buh.tecnik93.com> In-Reply-To: <20051226041920.131a9668@it.buh.tecnik93.com> MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_rT3rDjgkIVryfr9" Message-Id: <200512260543.23815.dejan.lesjak@ijs.si> X-Virus-Scanned: amavisd-new at ijs.si Cc: liukang@cn.freebsd.org, cvs-ports@freebsd.org, Herve Quiroz , cvs-all@freebsd.org, ports-committers@freebsd.org Subject: Re: cvs commit: ports/www/jakarta-tomcat55 Makefile distinfo pkg-descr pkg-plist X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Dec 2005 04:43:35 -0000 --Boundary-00=_rT3rDjgkIVryfr9 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline On Monday 26 of December 2005 03:19, Ion-Mihai Tetcu wrote: > On Sat, 24 Dec 2005 15:20:13 +0100 > > Herve Quiroz wrote: > > On Sat, Dec 24, 2005 at 02:57:52PM +0200, Ion-Mihai Tetcu wrote: > > > On Sat, 24 Dec 2005 03:20:30 +0000 (UTC) > > > > > > Herve Quiroz wrote: > > > > hq 2005-12-24 03:20:30 UTC > > > > > > > > FreeBSD ports repository > > > > > > > > Modified files: > > > > www/jakarta-tomcat55 Makefile distinfo pkg-descr pkg-plist > > > > Log: > > > > - Update to 5.5.12 > > > > - Add SHA256 info > > > > - Update WWW > > > > > > wrong distinfo (s/apache/jakarta) > > > and seems not to fetch also. > > > > No, Tomcat is now a top-level project at Apache, so it's indeed > > "Apache Tomcat" from now and no longer "Jakarta Tomcat". Maintainer > > has even asked for a repocopy www/jakarta-tomcat* -> > > www/apache-tomcat* (but we have to clean the ports before we do such > > thing). > > > > FYI, everything is explained in the PR. > > =====> /usr/ports/www/jakarta-tomcat55/ > => jakarta-tomcat-5.5.12-compat.tar.gz is not in > /usr/ports/www/jakarta-tomcat55/distinfo. => Either > /usr/ports/www/jakarta-tomcat55/distinfo is out of date, or => > jakarta-tomcat-5.5.12-compat.tar.gz is spelled incorrectly. > *** Error code 1 > > Both on 6-STABLE and 5-STABLE; on both apache 1.x is installed; I'll > schedule a run on my TinderFoxy (tinderbox) to see what happens. Try attached patch. Dejan --Boundary-00=_rT3rDjgkIVryfr9 Content-Type: text/plain; charset="us-ascii"; name="tcfix.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="tcfix.patch" Index: Makefile =================================================================== RCS file: /epruveta/repos/freebsd/ports/www/jakarta-tomcat55/Makefile,v retrieving revision 1.31 diff -u -r1.31 Makefile --- Makefile 24 Dec 2005 03:43:37 -0000 1.31 +++ Makefile 26 Dec 2005 04:36:57 -0000 @@ -10,7 +10,7 @@ CATEGORIES= www java MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} MASTER_SITE_SUBDIR= tomcat-5/v${PORTVERSION}/bin -DISTNAME= apache-tomcat-${PORTVERSION} +DISTFILES= apache-tomcat-${PORTVERSION}.tar.gz MAINTAINER= liukang@cn.freebsd.org COMMENT= Open-source Java web server by Apache, 5.5.x branch @@ -74,7 +74,7 @@ .include .if ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.4" -DISTFILES+= ${PORTNAME}-${PORTVERSION}-compat.tar.gz +DISTFILES+= apache-tomcat-${PORTVERSION}-compat.tar.gz PLIST_SUB+= JAVA14="" .else PLIST_SUB+= JAVA14="@comment " --Boundary-00=_rT3rDjgkIVryfr9--