cvs commit: ports/www/jakarta-tomcat55 Makefile distinfo pkg-descr pkg-plist

[Dejan Lesjak]

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 at 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 at 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
-------------- next part --------------
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 at 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 "