Date: Mon, 26 Dec 2005 05:43:19 +0100 From: Dejan Lesjak <dejan.lesjak@ijs.si> To: Ion-Mihai Tetcu <itetcu@people.tecnik93.com> Cc: liukang@cn.freebsd.org, cvs-ports@freebsd.org, Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>, cvs-all@freebsd.org, ports-committers@freebsd.org Subject: Re: cvs commit: ports/www/jakarta-tomcat55 Makefile distinfo pkg-descr pkg-plist Message-ID: <200512260543.23815.dejan.lesjak@ijs.si> In-Reply-To: <20051226041920.131a9668@it.buh.tecnik93.com> References: <200512240320.jBO3KUhs077893@repoman.freebsd.org> <20051224142013.GA50895@arabica.esil.univ-mrs.fr> <20051226041920.131a9668@it.buh.tecnik93.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <herve.quiroz@esil.univ-mrs.fr> 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 <hq@FreeBSD.org> 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 <bsd.port.pre.mk>
.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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200512260543.23815.dejan.lesjak>