From b02283c3fe80ef21f47efce5bcfb3cc3c6cb86f3 Mon Sep 17 00:00:00 2001 From: espie Date: Tue, 19 Oct 2010 19:45:53 +0000 Subject: [PATCH] LIB_DEPENDS -> WANTLIB --- archivers/libarchive/Makefile | 8 ++++---- archivers/lzop/Makefile | 6 +++--- archivers/p5-Compress-Bzip2/Makefile | 5 +++-- archivers/p5-Compress-LZO/Makefile | 5 +++-- archivers/rzip/Makefile | 6 +++--- audio/mpd/Makefile | 20 +++++++++++--------- cad/kicad/Makefile | 8 ++++++-- 7 files changed, 33 insertions(+), 25 deletions(-) diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile index e035221dfde..0aa3a83dc6e 100644 --- a/archivers/libarchive/Makefile +++ b/archivers/libarchive/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2010/10/18 16:47:00 espie Exp $ +# $OpenBSD: Makefile,v 1.16 2010/10/19 19:45:53 espie Exp $ COMMENT= library for reading and writing streaming archives @@ -17,9 +17,9 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://libarchive.googlecode.com/files/ -WANTLIB= c expat z -LIB_DEPENDS= bz2.>=10::archivers/bzip2 \ - lzma.>=0::archivers/xz +WANTLIB= c expat z bz2.>=10 lzma.>=0 +LIB_DEPENDS= ::archivers/bzip2 \ + ::archivers/xz USE_LIBTOOL= Yes CONFIGURE_STYLE=gnu diff --git a/archivers/lzop/Makefile b/archivers/lzop/Makefile index 6c4e9d0dee2..b4f71c187f2 100644 --- a/archivers/lzop/Makefile +++ b/archivers/lzop/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2010/10/18 21:35:48 sthen Exp $ +# $OpenBSD: Makefile,v 1.26 2010/10/19 19:45:53 espie Exp $ # $FreeBSD: ports/archivers/lzop/Makefile,v 1.3 2000/06/22 05:51:49 will Exp $ COMMENT= fast file compressor similar to gzip @@ -15,8 +15,8 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE}download/ -LIB_DEPENDS= lzo2::archivers/lzo2 -WANTLIB= c +LIB_DEPENDS= ::archivers/lzo2 +WANTLIB= c lzo2 CONFIGURE_STYLE= gnu CONFIGURE_ENV= CPPFLAGS="-I${DEPBASE}/include" \ diff --git a/archivers/p5-Compress-Bzip2/Makefile b/archivers/p5-Compress-Bzip2/Makefile index 84b9f0f40db..3c89320f7df 100644 --- a/archivers/p5-Compress-Bzip2/Makefile +++ b/archivers/p5-Compress-Bzip2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2010/10/18 16:47:00 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2010/10/19 19:45:53 espie Exp $ SHARED_ONLY= Yes @@ -17,7 +17,8 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes MODULES= cpan -LIB_DEPENDS= bz2.>=10::archivers/bzip2 +LIB_DEPENDS = ::archivers/bzip2 +WANTLIB = bz2.>=10 USE_GROFF = Yes pre-configure: diff --git a/archivers/p5-Compress-LZO/Makefile b/archivers/p5-Compress-LZO/Makefile index 8117efd9553..76535362333 100644 --- a/archivers/p5-Compress-LZO/Makefile +++ b/archivers/p5-Compress-LZO/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2010/10/18 16:47:00 espie Exp $ +# $OpenBSD: Makefile,v 1.27 2010/10/19 19:45:53 espie Exp $ SHARED_ONLY= Yes @@ -11,7 +11,8 @@ MASTER_SITES= http://www.oberhumer.com/opensource/lzo/download/ HOMEPAGE= http://www.oberhumer.com/opensource/lzo/ -LIB_DEPENDS= lzo.>=1::archivers/lzo +LIB_DEPENDS = ::archivers/lzo +WANTLIB = lzo.>=1 # GPL PERMIT_PACKAGE_CDROM= Yes diff --git a/archivers/rzip/Makefile b/archivers/rzip/Makefile index 78cc1dc687e..6789fab433d 100644 --- a/archivers/rzip/Makefile +++ b/archivers/rzip/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/10/18 21:35:48 sthen Exp $ +# $OpenBSD: Makefile,v 1.9 2010/10/19 19:45:53 espie Exp $ COMMENT= file compressor with a high compression ratio @@ -13,12 +13,12 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c MASTER_SITES= ${HOMEPAGE}ftp/rzip/ \ ${HOMEPAGE}ftp/rzip/old-versions/ -LIB_DEPENDS= bz2::archivers/bzip2 +LIB_DEPENDS = ::archivers/bzip2 +WANTLIB = c bz2 FAKE=lib CONFIGURE_STYLE=gnu dest diff --git a/audio/mpd/Makefile b/audio/mpd/Makefile index c1920bffbb9..dbd823ca4df 100644 --- a/audio/mpd/Makefile +++ b/audio/mpd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2010/10/18 21:35:48 sthen Exp $ +# $OpenBSD: Makefile,v 1.27 2010/10/19 19:45:53 espie Exp $ COMMENT = Music Player Daemon DISTNAME = mpd-0.15.12 @@ -65,15 +65,17 @@ CONFIGURE_ARGS += --with-tremor \ --disable-lame-encoder \ --disable-aac \ --disable-mpc -LIB_DEPENDS += vorbisidec::audio/tremor +LIB_DEPENDS += ::audio/tremor +WANTLIB += vorbisidec .else -WANTLIB += theora -LIB_DEPENDS += vorbis,vorbisfile,vorbisenc::audio/libvorbis \ - speex::audio/speex \ - mp3lame::audio/lame \ - shout::net/libshout \ - faad,mp4ff:faad->=2.6.1p0:audio/faad \ - mpcdec::audio/libmpcdec +WANTLIB += theora vorbis vorbisfile vorbisenc speex mp3lame \ + shout faad mp4ff mpcdec +LIB_DEPENDS += ::audio/libvorbis \ + ::audio/speex \ + ::audio/lame \ + ::net/libshout \ + :faad->=2.6.1p0:audio/faad \ + ::audio/libmpcdec CONFIGURE_ARGS += --enable-aac .endif diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile index 5211124d856..dfff64aacc7 100644 --- a/cad/kicad/Makefile +++ b/cad/kicad/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2008/02/02 09:51:05 steven Exp $ +# $OpenBSD: Makefile,v 1.7 2010/10/19 19:45:54 espie Exp $ COMMENT-main= circuit drawing and schematic capture COMMENT-docs= documentation for the kicad library of components @@ -32,7 +32,11 @@ RUN_DEPENDS-docs= LIB_DEPENDS-docs= PKG_ARCH-docs= * -LIB_DEPENDS= wx_base,wx_base_net,wx_base_odbc,wx_base_xml,wx_gtk2_adv,wx_gtk2_core,wx_gtk2_dbgrid,wx_gtk2_gl,wx_gtk2_html,wx_gtk2_qa,wx_gtk2_xrc,wx_gtk2_aui,wx_gtk2_richtext::x11/wxWidgets +LIB_DEPENDS = ::x11/wxWidgets +WANTLIB-main += wx_base wx_base_net wx_base_odbc wx_base_xml +WANTLIB-main += wx_gtk2_adv wx_gtk2_core wx_gtk2_dbgrid wx_gtk2_gl +WANTLIB-main += wx_gtk2_html wx_gtk2_qa wx_gtk2_xrc wx_gtk2_aui +WANTLIB-main += wx_gtk2_richtext DOCDIST= doc_components-2006-12-08.zip PKGDIST= kicad-${V}.tgz