mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-28 05:29:48 +00:00
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>
This commit is contained in:
parent
b3e78110f0
commit
8189bccc87
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=152207
@ -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 "
|
||||
|
@ -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 "
|
||||
|
@ -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 "
|
||||
|
@ -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 "
|
||||
|
Loading…
Reference in New Issue
Block a user