diff options
| author | Herve Quiroz <hq@FreeBSD.org> | 2005-12-27 16:12:35 +0000 |
|---|---|---|
| committer | Herve Quiroz <hq@FreeBSD.org> | 2005-12-27 16:12:35 +0000 |
| commit | 8189bccc87988664e5b66bc27b6bc1c464171658 (patch) | |
| tree | 03afaa698784ca719554e6175195f3013c06a03b | |
| parent | The substitution command s|2\.3|${PYTHON_VERSION:S/^python//}|g in (diff) | |
Fix build when using Java 1.4: the compatibility distfile was wrong
PR: 90913
Submitted by: maintainer, lesi
Reported by: Yamamoto Takao <takao@oakat.org>,
Ion-Mihai Tetcu <itetcu@people.tecnik93.com>
Notes
Notes:
svn path=/head/; revision=152207
| -rw-r--r-- | www/jakarta-tomcat55/Makefile | 4 | ||||
| -rw-r--r-- | www/tomcat55/Makefile | 4 | ||||
| -rw-r--r-- | www/tomcat6/Makefile | 4 | ||||
| -rw-r--r-- | www/tomcat7/Makefile | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/www/jakarta-tomcat55/Makefile b/www/jakarta-tomcat55/Makefile index 82d47b2d0ba0..0f57d1a27cd3 100644 --- a/www/jakarta-tomcat55/Makefile +++ b/www/jakarta-tomcat55/Makefile @@ -10,7 +10,7 @@ PORTVERSION= 5.5.12 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 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall .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 " diff --git a/www/tomcat55/Makefile b/www/tomcat55/Makefile index 82d47b2d0ba0..0f57d1a27cd3 100644 --- a/www/tomcat55/Makefile +++ b/www/tomcat55/Makefile @@ -10,7 +10,7 @@ PORTVERSION= 5.5.12 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 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall .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 " diff --git a/www/tomcat6/Makefile b/www/tomcat6/Makefile index 82d47b2d0ba0..0f57d1a27cd3 100644 --- a/www/tomcat6/Makefile +++ b/www/tomcat6/Makefile @@ -10,7 +10,7 @@ PORTVERSION= 5.5.12 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 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall .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 " diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile index 82d47b2d0ba0..0f57d1a27cd3 100644 --- a/www/tomcat7/Makefile +++ b/www/tomcat7/Makefile @@ -10,7 +10,7 @@ PORTVERSION= 5.5.12 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 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall .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 " |