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

more depends fixes

Browse Source
This commit is contained in:
espie 2009-03-15 09:25:04 +00:00
parent dee74dde7d
commit a909e7c635
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/jdk/1.5/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.55 2009/03/01 20:43:09 naddy Exp $ # $OpenBSD: Makefile,v 1.56 2009/03/15 09:25:04 espie Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS= amd64 i386
@ -10,7 +10,7 @@ PKGNAME= jdk-${V}
PKGNAME-main= jdk-${V}p3 PKGNAME-main= jdk-${V}p3
PKGNAME-jre= jre-${V}p3 PKGNAME-jre= jre-${V}p3
CATEGORIES= devel/jdk java CATEGORIES= devel devel/jdk java
MULTI_PACKAGES= -main -jre MULTI_PACKAGES= -main -jre

6
devel/jdk/1.6/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2009/03/01 20:43:09 naddy Exp $ # $OpenBSD: Makefile,v 1.12 2009/03/15 09:25:04 espie Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS= amd64 i386
@ -92,10 +92,10 @@ MAKE_ENV+= DONT_ENABLE_IPV6=YES
EXTRACT_CASES+= *.jar) true ;; EXTRACT_CASES+= *.jar) true ;;
.if ${FLAVOR:L:Mnative_bootstrap} .if ${FLAVOR:L:Mnative_bootstrap}
BUILD_DEPENDS+= :jdk-1.6*:devel/jdk/1.6 BUILD_DEPENDS+= :jdk->=1.6,<1.7:devel/jdk/1.6
MAKE_ENV+= ALT_BOOTDIR="${LOCALBASE}/${JDKHOME}" MAKE_ENV+= ALT_BOOTDIR="${LOCALBASE}/${JDKHOME}"
.else .else
BUILD_DEPENDS+= :jdk-1.5*:devel/jdk/1.5 BUILD_DEPENDS+= :jdk->=1.5,<1.6:devel/jdk/1.5
MAKE_ENV+= ALT_BOOTDIR="${LOCALBASE}/jdk-1.5.0" MAKE_ENV+= ALT_BOOTDIR="${LOCALBASE}/jdk-1.5.0"
.endif .endif

6
devel/jdk/1.7/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.27 2009/03/01 20:43:09 naddy Exp $ # $OpenBSD: Makefile,v 1.28 2009/03/15 09:25:04 espie Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS= i386 amd64
@ -37,10 +37,10 @@ PERMIT_DISTFILES_FTP= Yes
NO_REGRESS= Yes NO_REGRESS= Yes
.if ${FLAVOR:L:Mnative_bootstrap} .if ${FLAVOR:L:Mnative_bootstrap}
BUILD_DEPENDS+= :jdk-1.7.0.*:devel/jdk/1.7 BUILD_DEPENDS+= :jdk->=1.7,<1.8:devel/jdk/1.7
ALT_BOOTDIR= ${LOCALBASE}/jdk-1.7.0 ALT_BOOTDIR= ${LOCALBASE}/jdk-1.7.0
.else .else
BUILD_DEPENDS+= :jdk-1.6.0.*:devel/jdk/1.6 BUILD_DEPENDS+= :jdk->=1.6,<1.7:devel/jdk/1.6
ALT_BOOTDIR= ${LOCALBASE}/jdk-1.6.0 ALT_BOOTDIR= ${LOCALBASE}/jdk-1.6.0
.endif .endif

6
devel/libuta/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.26 2008/11/19 17:26:20 sthen Exp $ # $OpenBSD: Makefile,v 1.27 2009/03/15 09:25:04 espie Exp $
COMMENT= graphical user interface library for C++ COMMENT= graphical user interface library for C++
DISTNAME= libuta-0.4.4 DISTNAME= libuta-0.4.4
PKGNAME= ${DISTNAME}p6 PKGNAME= ${DISTNAME}p7
SHARED_LIBS= uta 42.0 SHARED_LIBS= uta 42.0
MODGNU_SHARED_LIBS= uta '' MODGNU_SHARED_LIBS= uta ''
@ -26,7 +26,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libuta/}
LIB_DEPENDS= smpeg.>=1.3::devel/smpeg \ LIB_DEPENDS= smpeg.>=1.3::devel/smpeg \
SDL_mixer::devel/sdl-mixer \ SDL_mixer::devel/sdl-mixer \
png.>=2::graphics/png \ png.>=2::graphics/png \
sigc:libsigc++-1.*:devel/libsigc++ \ sigc:libsigc++->=1,<2:devel/libsigc++ \
ttf.>=1.3::print/freetype ttf.>=1.3::print/freetype
USE_LIBTOOL= Yes USE_LIBTOOL= Yes

10
math/graphviz/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.30 2009/01/20 23:15:39 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.31 2009/03/15 09:25:04 espie Exp $
COMMENT-main= graph drawing software COMMENT-main= graph drawing software
DISTNAME= graphviz-2.12 DISTNAME= graphviz-2.12
PKGNAME-main= ${DISTNAME}p5 PKGNAME-main= ${DISTNAME}p6
CATEGORIES= math devel graphics CATEGORIES= math devel graphics
MULTI_PACKAGES= -main MULTI_PACKAGES= -main
@ -66,7 +66,7 @@ MODULES= devel/gettext
LIB_DEPENDS= jpeg.>=62::graphics/jpeg \ LIB_DEPENDS= jpeg.>=62::graphics/jpeg \
png.>=2::graphics/png \ png.>=2::graphics/png \
ltdl::devel/libtool,-ltdl \ ltdl::devel/libtool,-ltdl \
tk84::x11/tk/8.4 \ tk84:tk->=8.4,<8.5:x11/tk/8.4 \
gd.>=20.34:gd->=2.0.34:graphics/gd gd.>=20.34:gd->=2.0.34:graphics/gd
# cairo stuff # cairo stuff
@ -83,8 +83,8 @@ WANTLIB+= atk-1.0 crypto gthread-2.0 ssl gio-2.0 \
bonobo-activation bonoboui-2 gconf-2 gnome-2 \ bonobo-activation bonoboui-2 gconf-2 gnome-2 \
gnome-keyring gnomecanvas-2 gnomevfs-2 popt xml2 gailutil gnome-keyring gnomecanvas-2 gnomevfs-2 popt xml2 gailutil
RUN_DEPENDS= :tk-8.4.*:x11/tk/8.4 \ RUN_DEPENDS= :tk->=8.4,<8.5:x11/tk/8.4 \
:tcl->=8.4.7p5:lang/tcl/8.4 \ :tcl->=8.4.7p5,<8.5:lang/tcl/8.4 \
::lang/guile ::lang/guile
BUILD_DEPENDS= ${RUN_DEPENDS} \ BUILD_DEPENDS= ${RUN_DEPENDS} \
::devel/swig ::devel/swig