From 2314c1cc85b7d8be3b72bd3692fe5c4f163240ca Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Tue, 27 Apr 2010 01:15:54 +0000 Subject: [PATCH] Attempt to clean up the DEPEND field of some of the bep files to match the format described on the wiki. --- app-arch/p7zip/p7zip-9.04.bep | 6 +----- app-arch/xz-utils/xz-utils-4.999.9.bep | 3 ++- app-editors/nano/nano-2.2.3.bep | 2 +- dev-games/flatzebra/flatzebra-0.1.3.bep | 4 +++- dev-lang/php/php-5.3.1.bep | 2 +- dev-lang/ruby/ruby-1.9.1.bep | 2 +- dev-libs/apr-util/apr-util-1.3.9.bep | 2 +- dev-libs/libunistring/libunistring-0.9.1.1.bep | 3 ++- dev-libs/openssl/openssl-0.9.8m.bep | 2 +- dev-libs/openssl/openssl-1.0.0.bep | 9 ++------- games-action/cylindrix/cylindrix-1.0.bep | 2 +- games-puzzle/flobopuyo/flobopuyo-0.20.bep | 3 ++- haiku-apps/armyknife/armyknife-61.bep | 2 +- haiku-apps/beae/beae-20.bep | 2 +- media-libs/allegro/allegro-4.4.0.bep | 2 +- media-libs/allegro/allegro-4.4.1.1.bep | 3 ++- media-libs/devil/devil-1.7.8.bep | 7 ++++++- media-libs/dumb/dumb-0.9.3.bep | 2 +- media-libs/fontconfig/fontconfig-2.8.0.bep | 2 +- media-libs/ftgl/ftgl-2.1.3.bep | 3 ++- media-libs/libvorbis/libvorbis-1.2.3.bep | 2 +- media-libs/sdl-gfx/sdl-gfx-2.0.20.bep | 2 +- media-libs/sdl-rtf/sdl-rtf-0.1.0.bep | 2 +- media-libs/sdl-sound/sdl-sound-1.0.3.bep | 2 +- media-libs/sdl-ttf/sdl-ttf-2.0.10.bep | 3 ++- media-sound/lame/lame-398-2.bep | 2 +- media-video/gnash/gnash-0.bep | 6 +++++- net-libs/libtorrent/libtorrent-0.12.5.bep | 6 ++++-- net-misc/neon/neon-0.29.1.bep | 3 ++- net-misc/neon/neon-0.29.3.bep | 3 ++- net-misc/openssh/openssh-5.4p1.bep | 8 ++------ net-misc/openssh/openssh-5.5p1.bep | 8 ++------ net-p2p/rtorrent/rtorrent-0.8.5.bep | 7 +++++-- net-p2p/transmission/transmission-1.72.bep | 10 ++++------ net-p2p/transmission/transmission-1.73.bep | 4 +++- sys-apps/less/less-436.bep | 6 +----- sys-apps/man/man-1.6f.bep | 2 +- sys-devel/m4/m4-1.4.14.bep | 2 +- sys-libs/readline/readline-6.0.bep | 6 +----- www-client/netsurf/netsurf-10380.bep | 4 +++- www-client/netsurf/netsurf-9799.bep | 4 +++- www-client/netsurf/netsurf-9872.bep | 4 +++- 42 files changed, 82 insertions(+), 77 deletions(-) diff --git a/app-arch/p7zip/p7zip-9.04.bep b/app-arch/p7zip/p7zip-9.04.bep index 63b7ae35f..af69f4994 100644 --- a/app-arch/p7zip/p7zip-9.04.bep +++ b/app-arch/p7zip/p7zip-9.04.bep @@ -13,9 +13,5 @@ BUILD { INSTALL { cd p7zip_9.04 - if [ -n "${DESTDIR}" ];then - make install DEST_DIR="${DESTDIR}" DEST_HOME="/boot/common" - else - make install DEST_HOME=/boot/common - fi + make install DEST_DIR="${DESTDIR}" DEST_HOME="/boot/common" } diff --git a/app-arch/xz-utils/xz-utils-4.999.9.bep b/app-arch/xz-utils/xz-utils-4.999.9.bep index 5791f5009..a73183892 100644 --- a/app-arch/xz-utils/xz-utils-4.999.9.bep +++ b/app-arch/xz-utils/xz-utils-4.999.9.bep @@ -4,7 +4,8 @@ SRC_URI="http://tukaani.org/xz/xz-4.999.9beta.tar.bz2" CHECKSUM_MD5="cc4044fcc073b8bcf3164d1d0df82161" REVISION="1" STATUS_HAIKU="stable" -DEPEND="gcc4" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +DEPEND="" BUILD { cd xz-4.999.9beta cp -f /boot/common/bin/libtool . diff --git a/app-editors/nano/nano-2.2.3.bep b/app-editors/nano/nano-2.2.3.bep index 9371d4d98..449a9e30c 100644 --- a/app-editors/nano/nano-2.2.3.bep +++ b/app-editors/nano/nano-2.2.3.bep @@ -3,7 +3,7 @@ HOMEPAGE="http://www.nano-editor.org/" SRC_URI="http://www.nano-editor.org/dist/v2.2/nano-2.2.3.tar.gz" REVISION="1" STATUS_HAIKU="stable" -DEPEND="ncurses" +DEPEND="sys-libs/ncurses >= 5.6" CHECKSUM_MD5="91918a484f54f94fedaebe00dc393a50" BUILD { cd nano-2.2.3 diff --git a/dev-games/flatzebra/flatzebra-0.1.3.bep b/dev-games/flatzebra/flatzebra-0.1.3.bep index 1ef07f6cb..a4b3a810c 100644 --- a/dev-games/flatzebra/flatzebra-0.1.3.bep +++ b/dev-games/flatzebra/flatzebra-0.1.3.bep @@ -6,7 +6,9 @@ REVISION="1" STATUS_R5="untested" STATUS_BONE="untested" STATUS_HAIKU="stable" -DEPEND="media-libs/libsdl >= 1.2.4, media-libs/libsdl_image >= 1.2.2, media-libs/libsdl_mixer >= 1.2.4" +DEPEND="media-libs/libsdl >= 1.2.4 + media-libs/libsdl_image >= 1.2.2 + media-libs/libsdl_mixer >= 1.2.4" BUILD { cd flatzebra-0.1.3 libtoolize --force --copy --install diff --git a/dev-lang/php/php-5.3.1.bep b/dev-lang/php/php-5.3.1.bep index 3c4b0d69e..5dd81af3b 100644 --- a/dev-lang/php/php-5.3.1.bep +++ b/dev-lang/php/php-5.3.1.bep @@ -4,7 +4,7 @@ SRC_URI="http://php.net/distributions/php-5.3.1.tar.bz2" CHECKSUM_MD5="63e97ad450f0f7259e785100b634c797" REVISION="1" STATUS_HAIKU="broken" -DEPEND="libpcre, others TBD" +DEPEND="dev-libs/libpcre >= 8.00" BUILD { cd php-5.3.1 cat $(aclocal --print-ac-dir)/libtool.m4 > build/libtool.m4 diff --git a/dev-lang/ruby/ruby-1.9.1.bep b/dev-lang/ruby/ruby-1.9.1.bep index 9e24beb2f..ae8d89366 100644 --- a/dev-lang/ruby/ruby-1.9.1.bep +++ b/dev-lang/ruby/ruby-1.9.1.bep @@ -4,7 +4,7 @@ SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.1-p243.tar.gz" CHECKSUM_MD5="515bfd965814e718c0943abf3dde5494" REVISION="2" STATUS_HAIKU="stable" -DEPEND="dev-lang/ruby" +DEPEND="dev-lang/ruby >= 1.8.7" BUILD { cd ruby-1.9.1-p243 autoconf diff --git a/dev-libs/apr-util/apr-util-1.3.9.bep b/dev-libs/apr-util/apr-util-1.3.9.bep index 0ef45b021..33f7557c9 100644 --- a/dev-libs/apr-util/apr-util-1.3.9.bep +++ b/dev-libs/apr-util/apr-util-1.3.9.bep @@ -4,7 +4,7 @@ SRC_URI="http://apache.multihomed.net/apr/apr-util-1.3.9.tar.gz" CHECKSUM_MD5="cc2ec0ba4f01d88375f1170f762518fa" REVISION="1" STATUS_HAIKU="stable" -DEPEND="apr" +DEPEND="dev-libs/apr >= 1.3.9" BUILD { cd apr-util-1.3.9 rm -rf aclocal.m4 diff --git a/dev-libs/libunistring/libunistring-0.9.1.1.bep b/dev-libs/libunistring/libunistring-0.9.1.1.bep index 71a9c3a7d..20dd0569d 100644 --- a/dev-libs/libunistring/libunistring-0.9.1.1.bep +++ b/dev-libs/libunistring/libunistring-0.9.1.1.bep @@ -3,7 +3,8 @@ HOMEPAGE="http://www.gnu.org/software/libunistring/" SRC_URI="http://ftp.gnu.org/gnu/libunistring/libunistring-0.9.1.1.tar.gz" REVISION="1" STATUS_HAIKU="stable" -DEPEND="dev-util/git, dev-util/gperf" +DEPEND="dev-util/git >= 1.6.5.3 + dev-util/gperf >= 3.0.4" BUILD { cd libunistring-0.9.1.1 libtoolize --copy --force --install diff --git a/dev-libs/openssl/openssl-0.9.8m.bep b/dev-libs/openssl/openssl-0.9.8m.bep index 346569b00..9918a8040 100644 --- a/dev-libs/openssl/openssl-0.9.8m.bep +++ b/dev-libs/openssl/openssl-0.9.8m.bep @@ -4,7 +4,7 @@ SRC_URI="http://www.openssl.org/source/openssl-0.9.8m.tar.gz" CHECKSUM_MD5="898bf125370926d5f692a2201124f8ec" REVISION="1" STATUS_HAIKU="stable" -DEPEND="zlib" +DEPEND="sys-libs/zlib >= 1.2.3" BUILD { cd openssl-0.9.8m config --prefix=/boot/common zlib shared diff --git a/dev-libs/openssl/openssl-1.0.0.bep b/dev-libs/openssl/openssl-1.0.0.bep index 0f3345534..194fd43a2 100644 --- a/dev-libs/openssl/openssl-1.0.0.bep +++ b/dev-libs/openssl/openssl-1.0.0.bep @@ -4,7 +4,7 @@ SRC_URI="http://www.openssl.org/source/openssl-1.0.0.tar.gz" CHECKSUM_MD5="89eaa86e25b2845f920ec00ae4c864ed" REVISION="1" STATUS_HAIKU="stable" -DEPEND="zlib" +DEPEND="sys-libs/zlib >= 1.2.3" BUILD { cd openssl-1.0.0 config --prefix=/boot/common zlib shared @@ -13,10 +13,5 @@ BUILD { INSTALL { cd openssl-1.0.0 - if [ -n "${DESTDIR}" ];then - make install INSTALL_PREFIX="${DESTDIR}" - else - make install - fi - + make install INSTALL_PREFIX="${DESTDIR}" } diff --git a/games-action/cylindrix/cylindrix-1.0.bep b/games-action/cylindrix/cylindrix-1.0.bep index c66dfbf6a..5dca733d2 100644 --- a/games-action/cylindrix/cylindrix-1.0.bep +++ b/games-action/cylindrix/cylindrix-1.0.bep @@ -4,7 +4,7 @@ SRC_URI="http://www.hardgeus.com/cylindrix/cylindrix-1.0.tar.gz" REVISION="1" CHECKSUM_MD5="914cf70b0a95f4a36cfdfde7edbaa240" STATUS_HAIKU="stable" -DEPEND="allegro" +DEPEND="media-libs/allegro >= 4.4.1.1" BUILD { cd cylindrix CFLAGS='-O2' ./configure --prefix=/boot/common diff --git a/games-puzzle/flobopuyo/flobopuyo-0.20.bep b/games-puzzle/flobopuyo/flobopuyo-0.20.bep index 41a7c5db1..689ccd3b8 100644 --- a/games-puzzle/flobopuyo/flobopuyo-0.20.bep +++ b/games-puzzle/flobopuyo/flobopuyo-0.20.bep @@ -4,7 +4,8 @@ SRC_URI="http://www.ios-software.com/download.php3?what=20151&lg=AN" CHECKSUM_MD5="88961898c9dd48b60464f6f10f695b8b" REVISION="1" STATUS_HAIKU="tested" -DEPEND="media-lib/libsdl media-lib/sdl-mixer" +DEPEND="media-lib/libsdl >= 1.2.14 + media-lib/sdl-mixer >= 1.2.11" BUILD { cd flubopuyo-0.2.0 make diff --git a/haiku-apps/armyknife/armyknife-61.bep b/haiku-apps/armyknife/armyknife-61.bep index fede0fefd..8db37cd31 100644 --- a/haiku-apps/armyknife/armyknife-61.bep +++ b/haiku-apps/armyknife/armyknife-61.bep @@ -3,7 +3,7 @@ HOMEPAGE="http://dev.osdrawer.net/projects/armyknife" SRC_URI="svn+http://svn.osdrawer.net/armyknife" REVISION="1" STATUS_HAIKU="stable" -DEPEND="taglib" +DEPEND="media-libs/taglib >= 1.6.1" #CHECKSUM_MD5="" BUILD { cd armyknife-61 diff --git a/haiku-apps/beae/beae-20.bep b/haiku-apps/beae/beae-20.bep index 55de326fe..4714f85d7 100644 --- a/haiku-apps/beae/beae-20.bep +++ b/haiku-apps/beae/beae-20.bep @@ -3,7 +3,7 @@ HOMEPAGE="http://beae.berlios.de/" SRC_URI="svn+http://svn.berlios.de/svnroot/repos/beae/trunk#20" REVISION="1" STATUS_HAIKU="stable" -DEPEND="cmake" +DEPEND="dev-util/cmake >= 2.8.0" #CHECKSUM_MD5="" BUILD { cd beae-20 diff --git a/media-libs/allegro/allegro-4.4.0.bep b/media-libs/allegro/allegro-4.4.0.bep index 51de4ef94..93e198f56 100644 --- a/media-libs/allegro/allegro-4.4.0.bep +++ b/media-libs/allegro/allegro-4.4.0.bep @@ -4,7 +4,7 @@ SRC_URI="http://downloads.sourceforge.net/project/alleg/allegro/4.4.0/allegro-4. CHECKSUM_MD5="8a0bd73f5225ba8961211a5c440ff45d" REVISION="1" STATUS_HAIKU="stable" -DEPEND="libvorbis" +DEPEND="media-libs/libvorbis >= 1.2.3" BUILD { cd allegro-4.4.0 cmake . diff --git a/media-libs/allegro/allegro-4.4.1.1.bep b/media-libs/allegro/allegro-4.4.1.1.bep index 256c3eff3..8b150eca3 100644 --- a/media-libs/allegro/allegro-4.4.1.1.bep +++ b/media-libs/allegro/allegro-4.4.1.1.bep @@ -4,7 +4,8 @@ SRC_URI="http://www.bedrivers.com/allegro-4.4.1.1.tar.gz" CHECKSUM_MD5="0f1cfff8f2cf88e5c91a667d9fd386ec" REVISION="1" STATUS_HAIKU="stable" -DEPEND="libvorbis, libogg" +DEPEND="media-libs/libvorbis >= 1.2.3 + media-libs/libogg >= 1.1.4" BUILD { cd allegro-4.4.1.1 cmake . diff --git a/media-libs/devil/devil-1.7.8.bep b/media-libs/devil/devil-1.7.8.bep index 5eeca5304..b0c9b441a 100644 --- a/media-libs/devil/devil-1.7.8.bep +++ b/media-libs/devil/devil-1.7.8.bep @@ -4,7 +4,12 @@ SRC_URI="http://www.bedrivers.com/DevIL-1.7.8.tar.gz" REVISION="1" CHECKSUM_MD5="7918f215524589435e5ec2e8736d5e1d" STATUS_HAIKU="broken" -DEPEND="jasper, lcms, libmng, openexr, pkg-config, tiff" +DEPEND="media-libs/jasper >= 1.900.1 + media-libs/lcms >= 1.18a + media-libs/libmng >= 1.0.10 + openexr >= ?? + dev-util/pkg-config >= 0.23 + media-libs/tiff >= 3.8.2" BUILD { cd devil-1.7.8 libtoolize --force --copy --install diff --git a/media-libs/dumb/dumb-0.9.3.bep b/media-libs/dumb/dumb-0.9.3.bep index 728e2d0db..bb0c661aa 100644 --- a/media-libs/dumb/dumb-0.9.3.bep +++ b/media-libs/dumb/dumb-0.9.3.bep @@ -4,7 +4,7 @@ SRC_URI="http://www.bedrivers.com/dumb-0.9.3.zip" # dumb-0.9.3.zip was created by extracting dumb-0.9.3.tar.gz and dumb-0.9.3-autotools.tar.gz and then zipping up the combined directory. REVISION="1" STATUS_HAIKU="stable" -DEPEND="allegro" +DEPEND="media-libs/allegro >= 4.4.1.1" CHECKSUM_MD5="be3d9f2755b19aab805dccd4ae0bc04a" BUILD { cd dumb-0.9.3 diff --git a/media-libs/fontconfig/fontconfig-2.8.0.bep b/media-libs/fontconfig/fontconfig-2.8.0.bep index 16f0d98a1..f0eb6f226 100644 --- a/media-libs/fontconfig/fontconfig-2.8.0.bep +++ b/media-libs/fontconfig/fontconfig-2.8.0.bep @@ -4,7 +4,7 @@ SRC_URI="http://fontconfig.org/release/fontconfig-2.8.0.tar.gz" CHECKSUM_MD5="77e15a92006ddc2adbb06f840d591c0e" REVISION="1" STATUS_HAIKU="broken" -DEPEND="pkgconfig" +DEPEND="dev-util/pkgconfig >= 0.23" BUILD { cd fontconfig-2.8.0 libtoolize --force --copy --install diff --git a/media-libs/ftgl/ftgl-2.1.3.bep b/media-libs/ftgl/ftgl-2.1.3.bep index c359daa3c..e4f2ceccb 100644 --- a/media-libs/ftgl/ftgl-2.1.3.bep +++ b/media-libs/ftgl/ftgl-2.1.3.bep @@ -4,7 +4,8 @@ SRC_URI="http://downloads.sourceforge.net/project/ftgl/FTGL%20Source/2.1.3%7Erc5 CHECKSUM_MD5="fcf4d0567b7de9875d4e99a9f7423633" REVISION="2" STATUS_HAIKU="stable" -DEPEND="gcc4" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +DEPEND="" BUILD { cd ftgl-2.1.3~rc5 cp /boot/common/share/aclocal/libtool.m4 m4 diff --git a/media-libs/libvorbis/libvorbis-1.2.3.bep b/media-libs/libvorbis/libvorbis-1.2.3.bep index 110909074..fbebd9930 100644 --- a/media-libs/libvorbis/libvorbis-1.2.3.bep +++ b/media-libs/libvorbis/libvorbis-1.2.3.bep @@ -4,7 +4,7 @@ SRC_URI="http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.3.tar.gz" CHECKSUM_MD5="5aa77f55c0e0aab8eb8ed982335daac8" REVISION="1" STATUS_HAIKU="stable" -DEPEND="pkgconfig" +DEPEND="dev-util/pkgconfig >= 0.23" BUILD { cd libvorbis-1.2.3 libtoolize --force --copy --install diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.20.bep b/media-libs/sdl-gfx/sdl-gfx-2.0.20.bep index adce94478..4ac1a79c3 100644 --- a/media-libs/sdl-gfx/sdl-gfx-2.0.20.bep +++ b/media-libs/sdl-gfx/sdl-gfx-2.0.20.bep @@ -4,7 +4,7 @@ SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-2.0.20.tar.gz" CHECKSUM_MD5="8a787e538a8e4d80d4927535be5af083" REVISION="1" STATUS_HAIKU="stable" -DEPEND="libsdl >= 1.2.14" +DEPEND="media-libs/libsdl >= 1.2.14" BUILD { cd SDL_gfx-2.0.20 libtoolize --force --copy --install diff --git a/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep b/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep index eb0a0ae18..e889c06a5 100644 --- a/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep +++ b/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep @@ -4,7 +4,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_rtf/release/SDL_rtf-0.1.0.tar.gz" CHECKSUM_MD5="fe36733167b5c89f128414f32612121a" REVISION="1" STATUS_HAIKU="stable" -DEPEND="sdl-ttf >= 2.0.9" +DEPEND="media-libs/sdl-ttf >= 2.0.9" BUILD { cd SDL_rtf-0.1.0 rm aclocal.m4 diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3.bep b/media-libs/sdl-sound/sdl-sound-1.0.3.bep index 43a4d3a9a..c1361a586 100644 --- a/media-libs/sdl-sound/sdl-sound-1.0.3.bep +++ b/media-libs/sdl-sound/sdl-sound-1.0.3.bep @@ -4,7 +4,7 @@ HOMEPAGE="http://www.icculus.org/SDL_sound" SRC_URI="http://www.haiku-ports.de/packages/sources/expat-2.0.1.tar.gz" REVISION="1" STATUS_HAIKU="stable" -DEPEND="libogg >= 1.1.4" +DEPEND="media-libs/libogg >= 1.1.4" BUILD { rm -r SDL_sound hg clone http://hg.icculus.org/icculus/SDL_sound diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep b/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep index bc088e5d2..ae521f20c 100644 --- a/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep +++ b/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep @@ -4,7 +4,8 @@ SRC_URI="http://www.libsdl.org/tmp/SDL_ttf-2.0.10.tar.gz" CHECKSUM_MD5="6850ded5728711e3e95f6d997c3e59d5" REVISION="1" STATUS_HAIKU="stable" -DEPEND="libsdl >= 1.2.12, pkgconfig >= 0.9" +DEPEND="media-libs/libsdl >= 1.2.12 + dev-util/pkgconfig >= 0.9" BUILD { cd SDL_ttf-2.0.10 rm -f acinclude.m4 diff --git a/media-sound/lame/lame-398-2.bep b/media-sound/lame/lame-398-2.bep index 140b678b6..3951a9a3a 100644 --- a/media-sound/lame/lame-398-2.bep +++ b/media-sound/lame/lame-398-2.bep @@ -4,7 +4,7 @@ SRC_URI="http://downloads.sourceforge.net/project/lame/lame/3.98.2/lame-398-2.ta CHECKSUM_MD5="719dae0ee675d0c16e0e89952930ed35" REVISION="1" STATUS_HAIKU="untested" -DEPEND="nasm" +DEPEND="dev-lang/nasm >= 2.03.01" BUILD { cd lame-398-2 libtoolize --force --copy --install diff --git a/media-video/gnash/gnash-0.bep b/media-video/gnash/gnash-0.bep index 7b0697919..ed599dabf 100644 --- a/media-video/gnash/gnash-0.bep +++ b/media-video/gnash/gnash-0.bep @@ -4,7 +4,11 @@ HOMEPAGE="http://www.gnu.org/software/gnash/" SRC_URI="http://ports.haiku-files.org/export/682/haikuports/trunk/media-video/gnash/mime.zip" REVISION="1" STATUS_HAIKU="stable" -DEPEND="gcc4,media-video/ffmpeg,media-image/giflib,agg,dev-libs/boost" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +DEPEND="media-video/ffmpeg >= 0.5 + media-image/giflib >= ?? + agg >= ?? + dev-libs/boost >= ??" # Use 'install-gnash-deps --compile-time' to install deps # # notes: diff --git a/net-libs/libtorrent/libtorrent-0.12.5.bep b/net-libs/libtorrent/libtorrent-0.12.5.bep index 98205c7c6..1c5f479f5 100644 --- a/net-libs/libtorrent/libtorrent-0.12.5.bep +++ b/net-libs/libtorrent/libtorrent-0.12.5.bep @@ -4,9 +4,11 @@ SRC_URI="http://libtorrent.rakshasa.no/downloads/libtorrent-0.12.5.tar.gz" REVISION="1" CHECKSUM_MD5="fe8155d364b220713074423100d4bf29" STATUS_HAIKU="stable" - +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." # pkgconfig is only a build dependency -DEPEND="gcc4, pkgconfig, openssl, libsigc++" +DEPEND="dev-util/pkgconfig >= 0.23 + dev-libs/openssl >= 0.9.8l + libsigc++ >= ??" BUILD { cd libtorrent-0.12.5 diff --git a/net-misc/neon/neon-0.29.1.bep b/net-misc/neon/neon-0.29.1.bep index 9da6968d1..732062413 100644 --- a/net-misc/neon/neon-0.29.1.bep +++ b/net-misc/neon/neon-0.29.1.bep @@ -3,7 +3,8 @@ HOMEPAGE="http://www.webdav.org/neon/" SRC_URI="http://www.webdav.org/neon/neon-0.29.1.tar.gz" REVISION="1" STATUS_HAIKU="stable" -DEPEND="openssl, libxml2" +DEPEND="dev-libs/openssl >= 0.9.8l + dev-libs/libxml2 >= 2.7.3" CHECKSUM_MD5="eb4eac0499cb6fced6e3b11e4b720ebb" BUILD { cd neon-0.29.1 diff --git a/net-misc/neon/neon-0.29.3.bep b/net-misc/neon/neon-0.29.3.bep index 959c0b4ec..d989ccb65 100644 --- a/net-misc/neon/neon-0.29.3.bep +++ b/net-misc/neon/neon-0.29.3.bep @@ -3,7 +3,8 @@ HOMEPAGE="http://www.webdav.org/neon/" SRC_URI="http://www.webdav.org/neon/neon-0.29.3.tar.gz" REVISION="1" STATUS_HAIKU="stable" -DEPEND="openssl, libxml2" +DEPEND="dev-libs/openssl >= 1.0.0 + dev-libs/libxml2 >= 2.7.7" CHECKSUM_MD5="ba1015b59c112d44d7797b62fe7bee51" BUILD { cd neon-0.29.3 diff --git a/net-misc/openssh/openssh-5.4p1.bep b/net-misc/openssh/openssh-5.4p1.bep index c88fe4117..6454d2e40 100644 --- a/net-misc/openssh/openssh-5.4p1.bep +++ b/net-misc/openssh/openssh-5.4p1.bep @@ -3,7 +3,7 @@ HOMEPAGE="http://www.openssh.com/" SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.4p1.tar.gz" REVISION="1" STATUS_HAIKU="stable" -DEPEND="openssl" +DEPEND="dev-libs/openssl >= 0.9.8l" CHECKSUM_MD5="da10af8a789fa2e83e3635f3a1b76f5e" BUILD { cp ../patches/pathnames-haiku.h openssh-5.4p1/pathnames.h @@ -36,11 +36,7 @@ BUILD { INSTALL { cd openssh-5.4p1 - if [ -n ${DESTDIR} ];then - make install DESTDIR="${DESTDIR}" - else - make install - fi + make install DESTDIR="${DESTDIR}" mkdir -p ${DESTDIR}/boot/common/boot/post_install cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install } diff --git a/net-misc/openssh/openssh-5.5p1.bep b/net-misc/openssh/openssh-5.5p1.bep index 334031710..3a5fa970e 100644 --- a/net-misc/openssh/openssh-5.5p1.bep +++ b/net-misc/openssh/openssh-5.5p1.bep @@ -3,7 +3,7 @@ HOMEPAGE="http://www.openssh.com/" SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.5p1.tar.gz" REVISION="1" STATUS_HAIKU="stable" -DEPEND="openssl" +DEPEND="dev-libs/openssl >= 1.0.0" CHECKSUM_MD5="88633408f4cb1eb11ec7e2ec58b519eb" BUILD { cp ../patches/pathnames-haiku.h openssh-5.5p1/pathnames.h @@ -37,11 +37,7 @@ BUILD { INSTALL { cd openssh-5.5p1 - if [ -n ${DESTDIR} ];then - make install DESTDIR="${DESTDIR}" - else - make install - fi + make install DESTDIR="${DESTDIR}" mkdir -p ${DESTDIR}/boot/common/boot/post_install cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install } diff --git a/net-p2p/rtorrent/rtorrent-0.8.5.bep b/net-p2p/rtorrent/rtorrent-0.8.5.bep index 6a9221941..aaf5bf169 100644 --- a/net-p2p/rtorrent/rtorrent-0.8.5.bep +++ b/net-p2p/rtorrent/rtorrent-0.8.5.bep @@ -4,9 +4,12 @@ SRC_URI="http://libtorrent.rakshasa.no/downloads/rtorrent-0.8.5.tar.gz" REVISION="1" CHECKSUM_MD5="e701095e1824b7e512a17000f4c0a783" STATUS_HAIKU="stable" - +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." # pkgconfig is only a build dependency -DEPEND="gcc4, pkgconfig, curl, libsigc++, libtorrent" +DEPEND="pkgconfig >= 0.23 + curl >= 7.19.1 + libsigc++ >= ?? + net-libs/libtorrent >= 0.12.5" BUILD { cd rtorrent-0.8.5 diff --git a/net-p2p/transmission/transmission-1.72.bep b/net-p2p/transmission/transmission-1.72.bep index a09800a7f..fe5180569 100644 --- a/net-p2p/transmission/transmission-1.72.bep +++ b/net-p2p/transmission/transmission-1.72.bep @@ -3,14 +3,12 @@ HOMEPAGE="http://www.transmissionbt.com/" SRC_URI="http://mirrors.m0k.org/transmission/files/transmission-1.72.tar.bz2" CHECKSUM_MD5="4ebbb9d4c27a019f5aced926818be4fa" REVISION="1" - -STATUS_R5="untested" -STATUS_BONE="untested" -# gcc4 is required +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." STATUS_HAIKU="stable" - # pkgconfig is only a build dependency -DEPEND="pkgconfig, curl, libevent" +DEPEND="dev-util/pkgconfig >= 0.23 + net-misc/curl >= 7.20.1 + dev-libs/libevent >= 1.4.11" BUILD { cd transmission-1.72 diff --git a/net-p2p/transmission/transmission-1.73.bep b/net-p2p/transmission/transmission-1.73.bep index 274d90fb6..8da928c80 100644 --- a/net-p2p/transmission/transmission-1.73.bep +++ b/net-p2p/transmission/transmission-1.73.bep @@ -10,7 +10,9 @@ STATUS_BONE="untested" STATUS_HAIKU="stable" # pkgconfig is only a build dependency -DEPEND="pkgconfig, curl, libevent" +DEPEND="dev-util/pkgconfig >= 0.23 + net-misc/curl >= 7.20.1 + dev-libs/libevent >= 1.4.11" BUILD { cd transmission-1.73 diff --git a/sys-apps/less/less-436.bep b/sys-apps/less/less-436.bep index 4f82472ba..2d70e0a22 100644 --- a/sys-apps/less/less-436.bep +++ b/sys-apps/less/less-436.bep @@ -14,9 +14,5 @@ BUILD { INSTALL { cd less-436 - if [ -n "${DESTDIR}" ];then - make install DESTDIR="${DESTDIR}" - else - make install - fi + make install DESTDIR="${DESTDIR}" } diff --git a/sys-apps/man/man-1.6f.bep b/sys-apps/man/man-1.6f.bep index 7c0e8e9a3..4399368a7 100644 --- a/sys-apps/man/man-1.6f.bep +++ b/sys-apps/man/man-1.6f.bep @@ -4,7 +4,7 @@ SRC_URI="http://primates.ximian.com/~flucifredi/man/man-1.6f.tar.gz" CHECKSUM_MD5="67aaaa6df35215e812fd7d89472c44b6" REVISION="1" STATUS_HAIKU="stable" -DEPEND="groff" +DEPEND="sys-apps/groff >= 1.20.1" BUILD { cd man-1.6f ./configure -prefix=/boot/common -sbindir=/boot/common/bin -confdir=`finddir B_COMMON_SETTINGS_DIRECTORY` diff --git a/sys-devel/m4/m4-1.4.14.bep b/sys-devel/m4/m4-1.4.14.bep index 4f8d125b0..2a07d17d6 100644 --- a/sys-devel/m4/m4-1.4.14.bep +++ b/sys-devel/m4/m4-1.4.14.bep @@ -10,7 +10,7 @@ BUILD { ./configure --prefix=/boot/common --enable-changeword make } - +MESSAGE="This is crappy software. It really is." INSTALL { cd m4-1.4.14 make install diff --git a/sys-libs/readline/readline-6.0.bep b/sys-libs/readline/readline-6.0.bep index 89322e57b..9ded74a4a 100644 --- a/sys-libs/readline/readline-6.0.bep +++ b/sys-libs/readline/readline-6.0.bep @@ -16,9 +16,5 @@ BUILD { INSTALL { cd readline-6.0 - if [ -n "${DESTDIR}" ];then - make install DESTDIR="${DESTDIR}" - else - make install - fi + make install DESTDIR="${DESTDIR}" } diff --git a/www-client/netsurf/netsurf-10380.bep b/www-client/netsurf/netsurf-10380.bep index a53f3a3db..2126d9b01 100644 --- a/www-client/netsurf/netsurf-10380.bep +++ b/www-client/netsurf/netsurf-10380.bep @@ -3,7 +3,9 @@ HOMEPAGE="http://www.netsurf-browser.org/" SRC_URI="svn://svn.netsurf-browser.org/trunk#10380" REVISION="1" STATUS_HAIKU="stable" -DEPEND="pkgconfig, gperf, libpng" +DEPEND="dev-util/pkgconfig >= 0.23 + dev-util/gperf >= 3.0.4 + media-libs/libpng >= 1.4.1" #CHECKSUM_MD5="f73fdd2a9e29cf7200bdc521590d4592" BUILD { export GCCVER=2 diff --git a/www-client/netsurf/netsurf-9799.bep b/www-client/netsurf/netsurf-9799.bep index 085556cf0..d15c39ae8 100644 --- a/www-client/netsurf/netsurf-9799.bep +++ b/www-client/netsurf/netsurf-9799.bep @@ -3,7 +3,9 @@ HOMEPAGE="http://www.netsurf-browser.org/" SRC_URI="http://www.netsurf-browser.org/downloads/development/netsurf-r9799.tar.gz" REVISION="1" STATUS_HAIKU="stable" -DEPEND="pkgconfig, gperf, libpng" +DEPEND="dev-util/pkgconfig >= 0.23 + dev-util/gperf >= 3.0.4 + media-libs/libpng >= 1.4.1" CHECKSUM_MD5="f73fdd2a9e29cf7200bdc521590d4592" BUILD { cd netsurf diff --git a/www-client/netsurf/netsurf-9872.bep b/www-client/netsurf/netsurf-9872.bep index 5553bbc40..fd8f2f4ac 100644 --- a/www-client/netsurf/netsurf-9872.bep +++ b/www-client/netsurf/netsurf-9872.bep @@ -3,7 +3,9 @@ HOMEPAGE="http://www.netsurf-browser.org/" SRC_URI="svn://svn.netsurf-browser.org/trunk#9872" REVISION="1" STATUS_HAIKU="stable" -DEPEND="pkgconfig, gperf, libpng" +DEPEND="dev-util/pkgconfig >= 0.23 + dev-util/gperf >= 3.0.4 + media-libs/libpng >= 1.4.1" #CHECKSUM_MD5="f73fdd2a9e29cf7200bdc521590d4592" BUILD { export GCCVER=2