openoffice-java uses jamvm (or kaffe)?
|
View:
New views
3 Messages
—
Rating Filter:
Alert me
|
 |
openoffice-java uses jamvm (or kaffe)?
by Matthew Szudzik
::
Rate this Message:
I recently installed the OpenBSD 4.6 release, and was surprised that
when I typed "pkg_add -i openoffice-java", I received the following message. Ambiguous: choose dependency for openoffice-java-3.1.0p1: 0: jamvm-1.5.1 1: kaffe-1.1.7p7 I had both openoffice-3.1.0p6 and jdk1.7.0.00b59p0 packages installed, so it isn't clear to me why jamvm or kaffe would be needed. Can't OpenOffice just use the jdk? |
|
|
Re: openoffice-java uses jamvm (or kaffe)?
by Stuart Henderson
::
Rate this Message:
On 2009/11/08 23:08, Matthew Szudzik wrote:
> I recently installed the OpenBSD 4.6 release, and was surprised that > when I typed "pkg_add -i openoffice-java", I received the following > message. > > Ambiguous: choose dependency for openoffice-java-3.1.0p1: > 0: jamvm-1.5.1 > 1: kaffe-1.1.7p7 > > I had both openoffice-3.1.0p6 and jdk1.7.0.00b59p0 packages installed, > so it isn't clear to me why jamvm or kaffe would be needed. Can't > OpenOffice just use the jdk? > Looks like java.port.mk is still not quite correct. OOo is set to MODJAVA_VER=1.4+ but the way things are now, it actually sets the allowed dependencies as jdk-1.5, jre-1.5, jamvm or kaffe. (We can't provide jdk 1.5 packages and presumably you don't have a 1.5 version installed, so pkg_add can only offer you whichever packages are available in PKG_PATH to satisfy the requirements). I think this diff is correct but I'd be grateful if someone could please carefully check the java.port.mk section. Thanks. Index: devel/jdk/java.port.mk =================================================================== RCS file: /cvs/ports/devel/jdk/java.port.mk,v retrieving revision 1.18 diff -u -p -u -9 -r1.18 java.port.mk --- devel/jdk/java.port.mk 16 Mar 2009 16:38:25 -0000 1.18 +++ devel/jdk/java.port.mk 8 Nov 2009 23:36:28 -0000 @@ -36,21 +36,21 @@ MODJAVA_JRERUN?=no .if ${MODJAVA_VER} == "1.3" || ${MODJAVA_VER} == "1.4" BROKEN=MODJAVA_VER=${MODJAVA_VER} only ports are not supported .elif ${MODJAVA_VER} == "1.3+" || ${MODJAVA_VER} == "1.4+" ONLY_FOR_ARCHS?= i386 amd64 . if ${NO_BUILD:L} != "yes" JAVA_HOME= ${LOCALBASE}/jdk-1.5.0 BUILD_DEPENDS+= :jdk->=1.5.0,<1.6:devel/jdk/1.5 . endif . if ${MODJAVA_JRERUN:L} == "yes" - MODJAVA_RUN_DEPENDS= :jdk->=1.5.0,<1.6|jre->=1.5.0,<1.6|kaffe-*|jamvm-*:devel/jdk/1.5 + MODJAVA_RUN_DEPENDS= :jdk->=1.5.0|jre->=1.5.0|kaffe-*|jamvm-*:devel/jdk/1.5 . else - MODJAVA_RUN_DEPENDS= :jdk->=1.5.0,<1.6|kaffe-*:devel/jdk/1.5 + MODJAVA_RUN_DEPENDS= :jdk->=1.5.0|kaffe-*:devel/jdk/1.5 . endif .elif ${MODJAVA_VER:S/+//} == "1.5" ONLY_FOR_ARCHS?= i386 amd64 . if ${NO_BUILD:L} != "yes" JAVA_HOME= ${LOCALBASE}/jdk-1.5.0 BUILD_DEPENDS+= :jdk->=1.5.0,<1.6:devel/jdk/1.5 . endif . if ${MODJAVA_JRERUN:L} == "yes" _MODJAVA_RUNDEP= jdk->=1.5.0,<1.6|jre->=1.5.0,<1.6 Index: databases/db/v4/Makefile =================================================================== RCS file: /cvs/ports/databases/db/v4/Makefile,v retrieving revision 1.37 diff -u -p -r1.37 Makefile --- databases/db/v4/Makefile 26 Apr 2009 09:38:25 -0000 1.37 +++ databases/db/v4/Makefile 8 Nov 2009 23:32:38 -0000 @@ -5,7 +5,7 @@ COMMENT-java= Java bindings for Berkeley REVISION= 4 VERSION= ${REVISION}.6.21 PKGNAME-main= ${DISTNAME}p0 -PKGNAME-java= db-java-${VERSION}p4 +PKGNAME-java= db-java-${VERSION}p5 PKGNAME-tcl= db-tcl-${VERSION}p6 DBLIBDIR= lib/db4 SHARED_LIBS += db 5.0 # .0.0 Index: devel/apache-ant/Makefile =================================================================== RCS file: /cvs/ports/devel/apache-ant/Makefile,v retrieving revision 1.21 diff -u -p -r1.21 Makefile --- devel/apache-ant/Makefile 26 Apr 2009 09:38:25 -0000 1.21 +++ devel/apache-ant/Makefile 8 Nov 2009 23:32:38 -0000 @@ -3,7 +3,7 @@ COMMENT= java replacement for make DISTNAME= apache-ant-1.7.1 -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 CATEGORIES= devel HOMEPAGE= http://ant.apache.org/ Index: devel/jakarta-servletapi/Makefile =================================================================== RCS file: /cvs/ports/devel/jakarta-servletapi/Makefile,v retrieving revision 1.18 diff -u -p -r1.18 Makefile --- devel/jakarta-servletapi/Makefile 26 Apr 2009 09:38:25 -0000 1.18 +++ devel/jakarta-servletapi/Makefile 8 Nov 2009 23:32:38 -0000 @@ -4,7 +4,7 @@ COMMENT= implementation of the JSP and J V= 3.2.4 DISTNAME= jakarta-servletapi-${V} -PKGNAME= ${DISTNAME}p8 +PKGNAME= ${DISTNAME}p9 CATEGORIES= www devel MASTER_SITES= http://archive.apache.org/dist/jakarta/tomcat-3/archive/v${V}/bin/ EXTRACT_SUFX= .zip Index: editors/openoffice3/Makefile =================================================================== RCS file: /cvs/ports/editors/openoffice3/Makefile,v retrieving revision 1.27 diff -u -p -r1.27 Makefile --- editors/openoffice3/Makefile 22 Sep 2009 17:53:42 -0000 1.27 +++ editors/openoffice3/Makefile 8 Nov 2009 23:32:38 -0000 @@ -12,7 +12,7 @@ WRKDIST= ${WRKDIR}/OOO310_m19 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 MAINTAINER= Robert Nagy <robert@...> Index: java/junit/Makefile =================================================================== RCS file: /cvs/ports/java/junit/Makefile,v retrieving revision 1.19 diff -u -p -r1.19 Makefile --- java/junit/Makefile 26 Apr 2009 09:38:25 -0000 1.19 +++ java/junit/Makefile 8 Nov 2009 23:32:38 -0000 @@ -4,7 +4,7 @@ COMMENT= regression testing utility for VERSION= 3.8.2 DISTNAME= junit${VERSION} -PKGNAME= junit-${VERSION}p4 +PKGNAME= junit-${VERSION}p5 INSTALLDIR= ${PKGNAME} SUBST_VARS+= INSTALLDIR CATEGORIES= java devel Index: textproc/xerces/Makefile =================================================================== RCS file: /cvs/ports/textproc/xerces/Makefile,v retrieving revision 1.31 diff -u -p -r1.31 Makefile --- textproc/xerces/Makefile 26 Apr 2009 09:38:25 -0000 1.31 +++ textproc/xerces/Makefile 8 Nov 2009 23:32:38 -0000 @@ -4,7 +4,7 @@ COMMENT= xml parser for Java V= 2.9.1 DISTNAME= Xerces-J-bin.${V} -PKGNAME= xerces-${V}p4 +PKGNAME= xerces-${V}p5 CATEGORIES= textproc HOMEPAGE= http://xml.apache.org/xerces2-j/index.html Index: www/tomcat/v4/Makefile =================================================================== RCS file: /cvs/ports/www/tomcat/v4/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- www/tomcat/v4/Makefile 20 Jul 2009 14:24:15 -0000 1.14 +++ www/tomcat/v4/Makefile 8 Nov 2009 23:32:38 -0000 @@ -6,7 +6,7 @@ COMMENT-examples=example applications an V= 4.1.40 DISTNAME= apache-tomcat-${V}-LE-jdk14 -PKGNAME-main= tomcat-${V} +PKGNAME-main= tomcat-${V}p0 PKGNAME-admin= tomcat-admin-${V}p0 PKGNAME-examples=tomcat-examples-${V}p0 CATEGORIES= www |
|
|
Re: openoffice-java uses jamvm (or kaffe)?
by Kurt Miller-3
::
Rate this Message:
Yes, your change to java.port.mk is correct.
Stuart Henderson wrote: > On 2009/11/08 23:08, Matthew Szudzik wrote: >> I recently installed the OpenBSD 4.6 release, and was surprised that >> when I typed "pkg_add -i openoffice-java", I received the following >> message. >> >> Ambiguous: choose dependency for openoffice-java-3.1.0p1: >> 0: jamvm-1.5.1 >> 1: kaffe-1.1.7p7 >> >> I had both openoffice-3.1.0p6 and jdk1.7.0.00b59p0 packages installed, >> so it isn't clear to me why jamvm or kaffe would be needed. Can't >> OpenOffice just use the jdk? >> > > Looks like java.port.mk is still not quite correct. OOo is set to > MODJAVA_VER=1.4+ but the way things are now, it actually sets the > allowed dependencies as jdk-1.5, jre-1.5, jamvm or kaffe. (We can't > provide jdk 1.5 packages and presumably you don't have a 1.5 version > installed, so pkg_add can only offer you whichever packages are > available in PKG_PATH to satisfy the requirements). > > I think this diff is correct but I'd be grateful if someone could > please carefully check the java.port.mk section. Thanks. > > Index: devel/jdk/java.port.mk > =================================================================== > RCS file: /cvs/ports/devel/jdk/java.port.mk,v > retrieving revision 1.18 > diff -u -p -u -9 -r1.18 java.port.mk > --- devel/jdk/java.port.mk 16 Mar 2009 16:38:25 -0000 1.18 > +++ devel/jdk/java.port.mk 8 Nov 2009 23:36:28 -0000 > @@ -36,21 +36,21 @@ MODJAVA_JRERUN?=no > .if ${MODJAVA_VER} == "1.3" || ${MODJAVA_VER} == "1.4" > BROKEN=MODJAVA_VER=${MODJAVA_VER} only ports are not supported > .elif ${MODJAVA_VER} == "1.3+" || ${MODJAVA_VER} == "1.4+" > ONLY_FOR_ARCHS?= i386 amd64 > . if ${NO_BUILD:L} != "yes" > JAVA_HOME= ${LOCALBASE}/jdk-1.5.0 > BUILD_DEPENDS+= :jdk->=1.5.0,<1.6:devel/jdk/1.5 > . endif > . if ${MODJAVA_JRERUN:L} == "yes" > - MODJAVA_RUN_DEPENDS= :jdk->=1.5.0,<1.6|jre->=1.5.0,<1.6|kaffe-*|jamvm-*:devel/jdk/1.5 > + MODJAVA_RUN_DEPENDS= :jdk->=1.5.0|jre->=1.5.0|kaffe-*|jamvm-*:devel/jdk/1.5 > . else > - MODJAVA_RUN_DEPENDS= :jdk->=1.5.0,<1.6|kaffe-*:devel/jdk/1.5 > + MODJAVA_RUN_DEPENDS= :jdk->=1.5.0|kaffe-*:devel/jdk/1.5 > . endif > .elif ${MODJAVA_VER:S/+//} == "1.5" > ONLY_FOR_ARCHS?= i386 amd64 > . if ${NO_BUILD:L} != "yes" > JAVA_HOME= ${LOCALBASE}/jdk-1.5.0 > BUILD_DEPENDS+= :jdk->=1.5.0,<1.6:devel/jdk/1.5 > . endif > . if ${MODJAVA_JRERUN:L} == "yes" > _MODJAVA_RUNDEP= jdk->=1.5.0,<1.6|jre->=1.5.0,<1.6 > Index: databases/db/v4/Makefile > =================================================================== > RCS file: /cvs/ports/databases/db/v4/Makefile,v > retrieving revision 1.37 > diff -u -p -r1.37 Makefile > --- databases/db/v4/Makefile 26 Apr 2009 09:38:25 -0000 1.37 > +++ databases/db/v4/Makefile 8 Nov 2009 23:32:38 -0000 > @@ -5,7 +5,7 @@ COMMENT-java= Java bindings for Berkeley > REVISION= 4 > VERSION= ${REVISION}.6.21 > PKGNAME-main= ${DISTNAME}p0 > -PKGNAME-java= db-java-${VERSION}p4 > +PKGNAME-java= db-java-${VERSION}p5 > PKGNAME-tcl= db-tcl-${VERSION}p6 > DBLIBDIR= lib/db4 > SHARED_LIBS += db 5.0 # .0.0 > Index: devel/apache-ant/Makefile > =================================================================== > RCS file: /cvs/ports/devel/apache-ant/Makefile,v > retrieving revision 1.21 > diff -u -p -r1.21 Makefile > --- devel/apache-ant/Makefile 26 Apr 2009 09:38:25 -0000 1.21 > +++ devel/apache-ant/Makefile 8 Nov 2009 23:32:38 -0000 > @@ -3,7 +3,7 @@ > COMMENT= java replacement for make > > DISTNAME= apache-ant-1.7.1 > -PKGNAME= ${DISTNAME}p0 > +PKGNAME= ${DISTNAME}p1 > CATEGORIES= devel > > HOMEPAGE= http://ant.apache.org/ > Index: devel/jakarta-servletapi/Makefile > =================================================================== > RCS file: /cvs/ports/devel/jakarta-servletapi/Makefile,v > retrieving revision 1.18 > diff -u -p -r1.18 Makefile > --- devel/jakarta-servletapi/Makefile 26 Apr 2009 09:38:25 -0000 1.18 > +++ devel/jakarta-servletapi/Makefile 8 Nov 2009 23:32:38 -0000 > @@ -4,7 +4,7 @@ COMMENT= implementation of the JSP and J > > V= 3.2.4 > DISTNAME= jakarta-servletapi-${V} > -PKGNAME= ${DISTNAME}p8 > +PKGNAME= ${DISTNAME}p9 > CATEGORIES= www devel > MASTER_SITES= http://archive.apache.org/dist/jakarta/tomcat-3/archive/v${V}/bin/ > EXTRACT_SUFX= .zip > Index: editors/openoffice3/Makefile > =================================================================== > RCS file: /cvs/ports/editors/openoffice3/Makefile,v > retrieving revision 1.27 > diff -u -p -r1.27 Makefile > --- editors/openoffice3/Makefile 22 Sep 2009 17:53:42 -0000 1.27 > +++ editors/openoffice3/Makefile 8 Nov 2009 23:32:38 -0000 > @@ -12,7 +12,7 @@ WRKDIST= ${WRKDIR}/OOO310_m19 > 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 > > MAINTAINER= Robert Nagy <robert@...> > Index: java/junit/Makefile > =================================================================== > RCS file: /cvs/ports/java/junit/Makefile,v > retrieving revision 1.19 > diff -u -p -r1.19 Makefile > --- java/junit/Makefile 26 Apr 2009 09:38:25 -0000 1.19 > +++ java/junit/Makefile 8 Nov 2009 23:32:38 -0000 > @@ -4,7 +4,7 @@ COMMENT= regression testing utility for > > VERSION= 3.8.2 > DISTNAME= junit${VERSION} > -PKGNAME= junit-${VERSION}p4 > +PKGNAME= junit-${VERSION}p5 > INSTALLDIR= ${PKGNAME} > SUBST_VARS+= INSTALLDIR > CATEGORIES= java devel > Index: textproc/xerces/Makefile > =================================================================== > RCS file: /cvs/ports/textproc/xerces/Makefile,v > retrieving revision 1.31 > diff -u -p -r1.31 Makefile > --- textproc/xerces/Makefile 26 Apr 2009 09:38:25 -0000 1.31 > +++ textproc/xerces/Makefile 8 Nov 2009 23:32:38 -0000 > @@ -4,7 +4,7 @@ COMMENT= xml parser for Java > > V= 2.9.1 > DISTNAME= Xerces-J-bin.${V} > -PKGNAME= xerces-${V}p4 > +PKGNAME= xerces-${V}p5 > CATEGORIES= textproc > > HOMEPAGE= http://xml.apache.org/xerces2-j/index.html > Index: www/tomcat/v4/Makefile > =================================================================== > RCS file: /cvs/ports/www/tomcat/v4/Makefile,v > retrieving revision 1.14 > diff -u -p -r1.14 Makefile > --- www/tomcat/v4/Makefile 20 Jul 2009 14:24:15 -0000 1.14 > +++ www/tomcat/v4/Makefile 8 Nov 2009 23:32:38 -0000 > @@ -6,7 +6,7 @@ COMMENT-examples=example applications an > > V= 4.1.40 > DISTNAME= apache-tomcat-${V}-LE-jdk14 > -PKGNAME-main= tomcat-${V} > +PKGNAME-main= tomcat-${V}p0 > PKGNAME-admin= tomcat-admin-${V}p0 > PKGNAME-examples=tomcat-examples-${V}p0 > CATEGORIES= www |
| Free embeddable forum powered by Nabble | Forum Help |
