fix package specs in depends; ok kurt@, sthen@
This commit is contained in:
parent
cf3af26b70
commit
3a2687e463
@ -1,4 +1,4 @@
|
|||||||
# $OpenBSD: Makefile,v 1.13 2009/07/17 13:38:56 kurt Exp $
|
# $OpenBSD: Makefile,v 1.14 2009/07/20 14:24:15 naddy Exp $
|
||||||
|
|
||||||
COMMENT-main= Java servlet 2.3 and Java server pages 1.2 server
|
COMMENT-main= Java servlet 2.3 and Java server pages 1.2 server
|
||||||
COMMENT-admin= administration web application
|
COMMENT-admin= administration web application
|
||||||
@ -7,8 +7,8 @@ COMMENT-examples=example applications and documentation
|
|||||||
V= 4.1.40
|
V= 4.1.40
|
||||||
DISTNAME= apache-tomcat-${V}-LE-jdk14
|
DISTNAME= apache-tomcat-${V}-LE-jdk14
|
||||||
PKGNAME-main= tomcat-${V}
|
PKGNAME-main= tomcat-${V}
|
||||||
PKGNAME-admin= tomcat-admin-${V}
|
PKGNAME-admin= tomcat-admin-${V}p0
|
||||||
PKGNAME-examples=tomcat-examples-${V}
|
PKGNAME-examples=tomcat-examples-${V}p0
|
||||||
CATEGORIES= www
|
CATEGORIES= www
|
||||||
|
|
||||||
MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-4/v$V/bin/} \
|
MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-4/v$V/bin/} \
|
||||||
@ -27,9 +27,9 @@ BUILD_DEPENDS= ::archivers/gtar
|
|||||||
|
|
||||||
RUN_DEPENDS= ::java/javaPathHelper
|
RUN_DEPENDS= ::java/javaPathHelper
|
||||||
|
|
||||||
RUN_DEPENDS-admin= :tomcat-4.*:www/tomcat/v4,-main
|
RUN_DEPENDS-admin= :tomcat->=4,<5:www/tomcat/v4,-main
|
||||||
PREFIX-examples= ${CATALINA_BASE}
|
PREFIX-examples= ${CATALINA_BASE}
|
||||||
RUN_DEPENDS-examples= :tomcat-admin-4.*:www/tomcat/v4,-admin
|
RUN_DEPENDS-examples= :tomcat-admin->=4,<5:www/tomcat/v4,-admin
|
||||||
|
|
||||||
# Apache Software License 2.0
|
# Apache Software License 2.0
|
||||||
PERMIT_PACKAGE_CDROM= Yes
|
PERMIT_PACKAGE_CDROM= Yes
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# $OpenBSD: Makefile,v 1.10 2009/04/26 09:38:25 sthen Exp $
|
# $OpenBSD: Makefile,v 1.11 2009/07/20 14:24:15 naddy Exp $
|
||||||
|
|
||||||
COMMENT-main= Java servlet 2.4 and Java server pages 2.0 server
|
COMMENT-main= Java servlet 2.4 and Java server pages 2.0 server
|
||||||
COMMENT-admin= administration web application
|
COMMENT-admin= administration web application
|
||||||
@ -8,8 +8,8 @@ V= 5.5.27
|
|||||||
DISTNAME= apache-tomcat-${V}
|
DISTNAME= apache-tomcat-${V}
|
||||||
PKGNAME= tomcat-${V}
|
PKGNAME= tomcat-${V}
|
||||||
PKGNAME-main= tomcat-${V}p1
|
PKGNAME-main= tomcat-${V}p1
|
||||||
PKGNAME-admin= tomcat-admin-${V}
|
PKGNAME-admin= tomcat-admin-${V}p0
|
||||||
PKGNAME-examples=tomcat-examples-${V}
|
PKGNAME-examples=tomcat-examples-${V}p0
|
||||||
CATEGORIES= www
|
CATEGORIES= www
|
||||||
|
|
||||||
DISTFILES= ${DISTNAME}.tar.gz \
|
DISTFILES= ${DISTNAME}.tar.gz \
|
||||||
@ -33,9 +33,9 @@ BUILD_DEPENDS= ::archivers/gtar
|
|||||||
|
|
||||||
RUN_DEPENDS= ::java/javaPathHelper
|
RUN_DEPENDS= ::java/javaPathHelper
|
||||||
|
|
||||||
RUN_DEPENDS-admin= :tomcat-5.*:www/tomcat/v5,-main
|
RUN_DEPENDS-admin= :tomcat->=5,<6:www/tomcat/v5,-main
|
||||||
PREFIX-examples= ${CATALINA_BASE}
|
PREFIX-examples= ${CATALINA_BASE}
|
||||||
RUN_DEPENDS-examples= :tomcat-admin-5.*:www/tomcat/v5,-admin
|
RUN_DEPENDS-examples= :tomcat-admin->=5,<6:www/tomcat/v5,-admin
|
||||||
|
|
||||||
# Apache Software License 2.0
|
# Apache Software License 2.0
|
||||||
PERMIT_PACKAGE_CDROM= Yes
|
PERMIT_PACKAGE_CDROM= Yes
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# $OpenBSD: Makefile,v 1.4 2009/06/12 17:46:56 kurt Exp $
|
# $OpenBSD: Makefile,v 1.5 2009/07/20 14:24:15 naddy Exp $
|
||||||
|
|
||||||
COMMENT-main= Java servlet 2.5 and Java server pages 2.1 server
|
COMMENT-main= Java servlet 2.5 and Java server pages 2.1 server
|
||||||
COMMENT-examples=example applications and full documentation
|
COMMENT-examples=example applications and full documentation
|
||||||
@ -7,7 +7,7 @@ V= 6.0.20
|
|||||||
DISTNAME= apache-tomcat-${V}
|
DISTNAME= apache-tomcat-${V}
|
||||||
PKGNAME= tomcat-${V}
|
PKGNAME= tomcat-${V}
|
||||||
PKGNAME-main= tomcat-${V}
|
PKGNAME-main= tomcat-${V}
|
||||||
PKGNAME-examples=tomcat-examples-${V}
|
PKGNAME-examples=tomcat-examples-${V}p0
|
||||||
CATEGORIES= www
|
CATEGORIES= www
|
||||||
|
|
||||||
DISTFILES= ${DISTNAME}.tar.gz \
|
DISTFILES= ${DISTNAME}.tar.gz \
|
||||||
@ -30,7 +30,7 @@ BUILD_DEPENDS= ::archivers/gtar
|
|||||||
|
|
||||||
RUN_DEPENDS= ::java/javaPathHelper
|
RUN_DEPENDS= ::java/javaPathHelper
|
||||||
|
|
||||||
RUN_DEPENDS-examples= :tomcat-6.*:www/tomcat/v6,-main
|
RUN_DEPENDS-examples= :tomcat->=6,<7:www/tomcat/v6,-main
|
||||||
PREFIX-examples= ${CATALINA_BASE}
|
PREFIX-examples= ${CATALINA_BASE}
|
||||||
|
|
||||||
# Apache Software License 2.0
|
# Apache Software License 2.0
|
||||||
|
Loading…
Reference in New Issue
Block a user