From 5476403976d87348e74efc0fecd20ad18ac8de3c Mon Sep 17 00:00:00 2001 From: kurt Date: Tue, 24 Jun 2008 02:46:21 +0000 Subject: [PATCH] Bump PKGNAME due to RUN_DEPENDS change caused by 1.3 and 1.4 jdk depreciations. --- databases/db/v4/Makefile | 6 +++--- devel/apache-ant/Makefile | 4 ++-- devel/ivy/Makefile | 4 ++-- devel/jakarta-servletapi/Makefile | 4 ++-- devel/maven/Makefile | 4 ++-- editors/openoffice/Makefile | 4 ++-- java/junit/Makefile | 4 ++-- textproc/xerces/Makefile | 4 ++-- www/tomcat/v4/Makefile | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/databases/db/v4/Makefile b/databases/db/v4/Makefile index 0374304a2ae..e945c669d87 100644 --- a/databases/db/v4/Makefile +++ b/databases/db/v4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.32 2008/02/14 21:51:31 kurt Exp $ +# $OpenBSD: Makefile,v 1.33 2008/06/24 02:46:21 kurt Exp $ COMMENT-java= Java bindings for Berkeley DB, revision ${REVISION} @@ -6,7 +6,7 @@ REVISION= 4 VERSION= ${REVISION}.6.21 PKGNAME= ${DISTNAME} PKGNAME-main= ${DISTNAME} -PKGNAME-java= db-java-${VERSION}p0 +PKGNAME-java= db-java-${VERSION}p1 DBLIBDIR= lib/db4 SHARED_LIBS += db 5.0 # .0.0 SHARED_LIBS += db_cxx 6.0 # .0.0 @@ -31,7 +31,7 @@ WANTLIB-java= MULTI_PACKAGES+=-java CONFIGURE_ARGS+=--enable-java MODULES+= java -MODJAVA_VER= 1.3+ +MODJAVA_VER= 1.4+ MODJAVA_JRERUN= Yes CONFIGURE_ENV+= JAVAC=${JAVA_HOME}/bin/javac \ JAR=${JAVA_HOME}/bin/jar \ diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile index 7c935b77ff4..318382a63d2 100644 --- a/devel/apache-ant/Makefile +++ b/devel/apache-ant/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.16 2008/03/26 13:07:04 sturm Exp $ +# $OpenBSD: Makefile,v 1.17 2008/06/24 02:46:21 kurt Exp $ COMMENT= java replacement for make DISTNAME= apache-ant-1.7.0 -PKGNAME= ${DISTNAME}p2 +PKGNAME= ${DISTNAME}p3 CATEGORIES= devel HOMEPAGE= http://ant.apache.org/ diff --git a/devel/ivy/Makefile b/devel/ivy/Makefile index 78f792a19f9..5e63446fe10 100644 --- a/devel/ivy/Makefile +++ b/devel/ivy/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.7 2008/03/26 13:07:04 sturm Exp $ +# $OpenBSD: Makefile,v 1.8 2008/06/24 02:46:21 kurt Exp $ COMMENT= dependency manager for Java VERSION= 1.4.1 DISTNAME= ivy-${VERSION}-bin -PKGNAME= ivy-${VERSION}p0 +PKGNAME= ivy-${VERSION}p1 CATEGORIES= devel java WRKDIST= ${WRKDIR}/ivy-${VERSION} diff --git a/devel/jakarta-servletapi/Makefile b/devel/jakarta-servletapi/Makefile index 6ce07ef9a4a..2e697083ee8 100644 --- a/devel/jakarta-servletapi/Makefile +++ b/devel/jakarta-servletapi/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.15 2008/03/26 13:07:04 sturm Exp $ +# $OpenBSD: Makefile,v 1.16 2008/06/24 02:46:21 kurt Exp $ COMMENT= implementation of the JSP and Java Servlet APIs V= 3.2.4 DISTNAME= jakarta-servletapi-${V} -PKGNAME= ${DISTNAME}p5 +PKGNAME= ${DISTNAME}p6 CATEGORIES= www devel MASTER_SITES= http://archive.apache.org/dist/jakarta/tomcat-3/archive/v${V}/bin/ EXTRACT_SUFX= .zip diff --git a/devel/maven/Makefile b/devel/maven/Makefile index 73ee6982a4a..4b6a2d66077 100644 --- a/devel/maven/Makefile +++ b/devel/maven/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.6 2008/03/26 13:07:04 sturm Exp $ +# $OpenBSD: Makefile,v 1.7 2008/06/24 02:46:21 kurt Exp $ COMMENT= software project management and comprehension tool DISTNAME= maven-2.0 -PKGNAME= ${DISTNAME}p3 +PKGNAME= ${DISTNAME}p4 CATEGORIES= devel HOMEPAGE= http://maven.apache.org/ diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile index 9dc8485c891..cd48de67e2b 100644 --- a/editors/openoffice/Makefile +++ b/editors/openoffice/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.76 2008/06/13 17:04:57 robert Exp $ +# $OpenBSD: Makefile,v 1.77 2008/06/24 02:46:21 kurt Exp $ ONLY_FOR_ARCHS= amd64 i386 @@ -12,7 +12,7 @@ WRKDIST= ${WRKDIR}/OOH680_m17 PKGNAME= openoffice-${VERSION} PKGNAME-main= openoffice-${VERSION} PKGNAME-kde= openoffice-kde-${VERSION} -PKGNAME-java= openoffice-java-${VERSION} +PKGNAME-java= openoffice-java-${VERSION}p0 CATEGORIES= editors productivity SHARED_LIBS= stlport_gcc 4.5 diff --git a/java/junit/Makefile b/java/junit/Makefile index 94eaa3bcc3a..99d9c7a52ab 100644 --- a/java/junit/Makefile +++ b/java/junit/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.16 2008/03/26 13:07:04 sturm Exp $ +# $OpenBSD: Makefile,v 1.17 2008/06/24 02:46:21 kurt Exp $ COMMENT= regression testing utility for use with the Java language VERSION= 3.8.2 DISTNAME= junit${VERSION} -PKGNAME= junit-${VERSION}p1 +PKGNAME= junit-${VERSION}p2 INSTALLDIR= ${PKGNAME} SUBST_VARS+= INSTALLDIR CATEGORIES= java devel diff --git a/textproc/xerces/Makefile b/textproc/xerces/Makefile index c0e82bc436c..a066d46429e 100644 --- a/textproc/xerces/Makefile +++ b/textproc/xerces/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.28 2008/03/26 13:07:04 sturm Exp $ +# $OpenBSD: Makefile,v 1.29 2008/06/24 02:46:21 kurt Exp $ COMMENT= xml parser for Java V= 2.9.1 DISTNAME= Xerces-J-bin.${V} -PKGNAME= xerces-${V}p1 +PKGNAME= xerces-${V}p2 CATEGORIES= textproc HOMEPAGE= http://xml.apache.org/xerces2-j/index.html diff --git a/www/tomcat/v4/Makefile b/www/tomcat/v4/Makefile index 37adf17d069..0d3f362721d 100644 --- a/www/tomcat/v4/Makefile +++ b/www/tomcat/v4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2008/03/26 13:07:04 sturm Exp $ +# $OpenBSD: Makefile,v 1.9 2008/06/24 02:46:21 kurt Exp $ COMMENT-main= Java servlet 2.3 and Java server pages 1.2 server COMMENT-admin= administration web application @@ -6,7 +6,7 @@ COMMENT-examples=example applications and documentation V= 4.1.36 DISTNAME= apache-tomcat-${V} -PKGNAME-main= tomcat-${V}p1 +PKGNAME-main= tomcat-${V}p2 PKGNAME-admin= tomcat-admin-${V}p0 PKGNAME-examples=tomcat-examples-${V}p0 CATEGORIES= www