cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct snafu with pkg version going backwards. Clue bat

Browse Source 
beating from espie@ help and okay landry@
This commit is contained in:
kurt 2011-01-13 22:35:52 +00:00
parent a7c8096071
commit 3b1e485094
7 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
devel/jdk/1.7/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.40 2011/01/11 15:47:49 kurt Exp $
# $OpenBSD: Makefile,v 1.41 2011/01/13 22:35:52 kurt Exp $
SHARED_ONLY= Yes
ONLY_FOR_ARCHS= i386 amd64
@ -8,8 +8,9 @@ COMMENT-jre= Java2(TM) SE Runtime Environment v${V} Early Access ${B}
V= 1.7.0.00
B= b122
PKGNAME= jdk-${V}
PKGNAME-main= jdk-${V}${B}
PKGNAME-jre= jre-${V}${B}
PKGNAME-main= jdk-${V}${B:S/b/beta/}
PKGNAME-jre= jre-${V}${B:S/b/beta/}
EPOCH= 0
# see openjdk/jaxp/jaxp.properties & openjdk/jaxws/jaxws.properties
# in ${WRKDIR} for names and download locations of extra distfiles
@ -56,11 +57,11 @@ USE_GROFF = Yes
NO_REGRESS= Yes
.if ${FLAVOR:L:Mnative_bootstrap}
INSTALLED!= (pkg_info -e "jdk->=1.7,<1.8" -q && echo yes) || echo no
INSTALLED!= (pkg_info -qe "jdk->=1.7.0.00beta122v0,<1.8v0" && echo yes) || echo no
.if ${INSTALLED:L} != "yes"
ERRORS += "Fatal: This flavor requires an installed 1.7 jdk package"
ERRORS += "Fatal: This flavor requires an installed 1.7.0.00beta122v0 jdk package or greater"
.endif
BUILD_DEPENDS+= jdk->=1.7,<1.8:devel/jdk/1.7
BUILD_DEPENDS+= jdk->=1.7.0.00beta122v0,<1.8v0:devel/jdk/1.7
ALT_BOOTDIR= ${LOCALBASE}/jdk-1.7.0
.else
BUILD_DEPENDS+= jdk->=1.6,<1.7:devel/jdk/1.6

4
devel/jdk/1.7/pkg/PLIST-jre
View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST-jre,v 1.7 2011/01/11 15:47:50 kurt Exp $
@comment $OpenBSD: PLIST-jre,v 1.8 2011/01/13 22:35:52 kurt Exp $
@option no-default-conflict
@conflict jre->=1.7,<1.8
@conflict jre->=1.7,<1.8|jre->=1.7v0,<1.8v0
${JREHOME}/
${JREHOME}/ASSEMBLY_EXCEPTION
${JREHOME}/LICENSE

4
devel/jdk/1.7/pkg/PLIST-main
View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.8 2011/01/11 15:47:50 kurt Exp $
@comment $OpenBSD: PLIST-main,v 1.9 2011/01/13 22:35:52 kurt Exp $
@option no-default-conflict
@conflict jdk->=1.7,<1.8
@conflict jdk->=1.7,<1.8|jdk->=1.7v0,<1.8v0
${JDKHOME}/
${JDKHOME}/ASSEMBLY_EXCEPTION
${JDKHOME}/LICENSE

10
devel/jdk/java.port.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: java.port.mk,v 1.20 2010/11/15 19:45:59 espie Exp $
# $OpenBSD: java.port.mk,v 1.21 2011/01/13 22:35:52 kurt Exp $
# Set MODJAVA_VER to x.y or x.y+ based on the version
# of the jdk needed for the port. x.y means any x.y jdk.
@ -82,15 +82,15 @@ MODJAVA_JRERUN?=no
ONLY_FOR_ARCHS?= i386 amd64
. if ${NO_BUILD:L} != "yes"
JAVA_HOME= ${LOCALBASE}/jdk-1.7.0
BUILD_DEPENDS+= jdk->=1.7.0,<1.8:devel/jdk/1.7
BUILD_DEPENDS+= jdk->=1.7.0,<1.8v0:devel/jdk/1.7
. endif
. if ${MODJAVA_JRERUN:L} == "yes"
_MODJAVA_RUNDEP= jdk->=1.7.0,<1.8|jre->=1.7.0,<1.8
_MODJAVA_RUNDEP= jdk->=1.7.0,<1.8v0|jre->=1.7.0,<1.8v0
. else
_MODJAVA_RUNDEP= jdk->=1.7.0,<1.8
_MODJAVA_RUNDEP= jdk->=1.7.0,<1.8v0
. endif
. if ${MODJAVA_VER} == "1.7+"
MODJAVA_RUN_DEPENDS= ${_MODJAVA_RUNDEP:S/,<1.8//g}:devel/jdk/1.7
MODJAVA_RUN_DEPENDS= ${_MODJAVA_RUNDEP:S/,<1.8v0//g}:devel/jdk/1.7
. else
MODJAVA_RUN_DEPENDS= ${_MODJAVA_RUNDEP}:devel/jdk/1.7
. endif

3
games/jbrickshooter/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.4 2010/11/16 11:23:27 espie Exp $
# $OpenBSD: Makefile,v 1.5 2011/01/13 22:35:52 kurt Exp $
COMMENT = brick shooter reflexion game
V= 1.5.1
DISTNAME= JBrickShooter_v${V}
PKGNAME= jbrickshooter-${V}
REVISION= 0
CATEGORIES= games java
EXTRACT_SUFX= .zip

3
lang/jruby/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.16 2010/12/06 16:32:17 jeremy Exp $
# $OpenBSD: Makefile,v 1.17 2011/01/13 22:35:52 kurt Exp $
SHARED_ONLY = Yes
@ -7,6 +7,7 @@ COMMENT = pure-Java implementation of the Ruby language
V = 1.5.6
DISTNAME = jruby-src-${V}
PKGNAME = jruby-${V}
REVISION= 0
CATEGORIES = lang lang/ruby
DISTFILES = ${DISTNAME}.tar.gz \
wmeissner-jffi-1.0.2-0-ge0d10e9.tar.gz:0 \

4
net/openfire/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.12 2010/11/19 22:31:35 espie Exp $
# $OpenBSD: Makefile,v 1.13 2011/01/13 22:35:52 kurt Exp $
COMMENT= XMPP real time collaboration server
DISTNAME= openfire_src_3_6_4
PKGNAME= openfire-3.6.4
REVISION= 5
REVISION= 6
CATEGORIES= net
MASTER_SITES= http://www.igniterealtime.org/downloadServlet?filename=openfire/