1. Fix bad DISTFILES in Makefile, we should also change the DISTFILES for jdk1.4 2. bump PORTREVISION This problem is noticed by YAMAMOTO Takao takao at oakat.org How-To-Repeat: build www/jakarta-tomcat55 with jdk14
Class Changed From-To: maintainer-update->change-request Fix category (submitter is not maintainer)
State Changed From-To: open->feedback Awaiting maintainers feedback
Hi, Because DISTFILES will be set then passed to bsd.port.mk in this case, filling DISTFILES as ${DISTNAME}${EXTRACT_SUFX} rule won't be applied. As result "apache-tomcat-5.5.12.tar.gz" will no longer be fetched. It needs that this variable to set explicitly. An additional patch for Makefile may be like as follows: --- Makefile.org Mon Dec 26 18:11:00 2005 +++ Makefile Mon Dec 26 18:04:28 2005 @@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} MASTER_SITE_SUBDIR= tomcat-5/v${PORTVERSION}/bin DISTNAME= apache-tomcat-${PORTVERSION} +DISTFILES= ${DISTNAME}.tar.gz MAINTAINER= liukang@cn.freebsd.org COMMENT= Open-source Java web server by Apache, 5.5.x branch thanks, -- Takao
Yes, we should also add "DISTFILES= ${DISTNAME}.tar.gz" Kang
State Changed From-To: feedback->open Feedback received.
Class Changed From-To: change-request->maintainer-update Submitter is indeed maintainer: # $FreeBSD: /repoman/r/pcvs/ports/www/jakarta-tomcat55/Makefile,v 1.31 2005/12/24 03:43:37 hq Exp $ [...] MAINTAINER= liukang@cn.freebsd.org
Responsible Changed From-To: freebsd-ports-bugs->hq I'll handle this.
On Tue, Dec 27, 2005 at 01:42:30PM +0800, Kang Liu wrote: > Yes, we should also add "DISTFILES= ${DISTNAME}.tar.gz" Or we can get rid of DISTNAME (see the attached patch). BTW, I don't think bumping PORTREVISION is needed, given this fix does not change anything for people who already built the port succesfully. Index: Makefile =================================================================== RCS file: /home/ncvs/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 27 Dec 2005 11:37:25 -0000 @@ -7,10 +7,11 @@ PORTNAME= jakarta-tomcat PORTVERSION= 5.5.12 +PORTREVISION= 1 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 +75,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 "
> -----Original Message----- > From: Herve Quiroz [mailto:herve.quiroz@esil.univ-mrs.fr] > Or we can get rid of DISTNAME (see the attached patch). Yes, we can get rid of this. > > BTW, I don't think bumping PORTREVISION is needed, given this fix does > not change anything for people who already built the port succesfully. You are right, according to Porter's Handbook, 5.2.2.1 PORTREVISION: Examples of changes which do not require a PORTREVISION bump: ... Build fixes which cause a package to become compilable where it was previously failing (as long as the changes do not introduce any functional change on any other platforms on which the port did previously build). Since PORTREVISION reflects the content of the package, if the package was not previously buildable then there is no need to increase PORTREVISION to mark a change. ... So we don't need bump PORTREVISION. Kang
State Changed From-To: open->closed Patch commited. Thanks for your contribution!