mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
Merge branch 'package-management'
Conflicts: app-arch/p7zip/p7zip-9.04.bep app-arch/p7zip/p7zip-9.13.bep app-arch/tar/tar-1.22.bep app-arch/tar/tar-1.23.bep app-arch/tar/tar-1.25.bep app-arch/xz-utils/xz-utils-4.999.9.bep app-cdr/bchunk/bchunk-1.2.0.bep app-cdr/cdrtools/cdrtools-2.01.01a66.bep app-cdr/cdrtools/cdrtools-3.01a01.bep app-crypt/gnupg/gnupg-1.4.11.bep app-doc/doxygen/doxygen-1.6.3.bep app-editors/nano/nano-2.2.6.bep app-editors/vim/vim-7.3.bep app-text/antiword/antiword-0.37.bep app-text/libpaper/libpaper-1.1.23.bep app-text/libpaper/libpaper-1.1.24.bep app-text/rman/rman-3.2.bep dev-db/sqlite/sqlite-3.6.22.bep dev-db/sqlite/sqlite-3.6.23.bep dev-db/sqlite/sqlite-3.7.2.bep dev-db/sqlite/sqlite-3.7.3.bep dev-db/sqlite/sqlite-3.7.4.bep dev-db/sqlite/sqlite-3.7.5.bep dev-lang/lua/lua-5.1.4.bep dev-lang/nasm/nasm-2.08.01.bep dev-lang/perl/patches/perl-5.10.0.patch dev-lang/python/python-2.5.4.bep dev-lang/python/python-2.6.4.bep dev-lang/python/python-2.6.5.bep dev-lang/python/python-2.6.6.bep dev-lang/python/python-2.6.7.bep dev-lang/python/python-2.6.8.bep dev-lang/python/python-3.2.bep dev-lang/python/python-3.2.recipe dev-lang/python/python-3.2a4.bep dev-lang/yasm/yasm-1.1.0.bep dev-libs/apr-util/apr-util-1.3.10.bep dev-libs/apr-util/apr-util-1.3.9.bep dev-libs/apr/apr-1.3.8.bep dev-libs/apr/apr-1.3.9.bep dev-libs/apr/apr-1.4.2.bep dev-libs/apr/patches/apr-1.4.2.patch dev-libs/expat/expat-2.0.1.bep dev-libs/fribidi/fribidi-0.19.2.bep dev-libs/icu/icu-4.4.1.bep dev-libs/libedit/libedit-20090923.bep dev-libs/libedit/libedit-20100424.bep dev-libs/libevent/libevent-1.4.11.bep dev-libs/libevent/libevent-1.4.13.bep dev-libs/libevent/libevent-1.4.14b.bep dev-libs/libevent/libevent-2.0.10.bep dev-libs/libiconv/libiconv-1.12.bep dev-libs/libiconv/libiconv-1.13.1.bep dev-libs/libpcre/libpcre-8.00.bep dev-libs/libpcre/libpcre-8.02.bep dev-libs/libpcre/libpcre-8.12.bep dev-libs/libxml2/libxml2-2.7.3.bep dev-libs/libxml2/libxml2-2.7.6.bep dev-libs/libxml2/libxml2-2.7.7.bep dev-libs/libxml2/libxml2-2.7.8.bep dev-libs/openssl/openssl-0.9.8l.bep dev-libs/openssl/openssl-0.9.8m.bep dev-libs/openssl/openssl-1.0.0.bep dev-libs/openssl/openssl-1.0.0a.bep dev-libs/openssl/openssl-1.0.0c.bep dev-qt/qtcore/qtcore-4.8.x-git.bep dev-qt/qtcore/qtcore-4.8.x.recipe dev-util/ccache/ccache-3.0.1.bep dev-util/cmake/cmake-2.6.4.bep dev-util/cmake/cmake-2.8.0.bep dev-util/cmake/cmake-2.8.1.bep dev-util/cmake/cmake-2.8.2.bep dev-util/cmake/cmake-2.8.3.bep dev-util/cmake/cmake-2.8.4.bep dev-util/ctags/ctags-5.8.bep dev-util/fastdep/fastdep-0.16.bep dev-util/gperf/gperf-3.0.4.bep dev-util/pkgconfig/pkgconfig-0.23.bep dev-util/pkgconfig/pkgconfig-0.25.bep dev-vcs/cvs/cvs-1.12.13.1.bep dev-vcs/cvs/cvs-1.12.13.bep dev-vcs/subversion/subversion-1.6.11.bep dev-vcs/subversion/subversion-1.6.12.bep dev-vcs/subversion/subversion-1.6.13.bep dev-vcs/subversion/subversion-1.6.15.bep dev-vcs/subversion/subversion-1.6.6.bep dev-vcs/subversion/subversion-1.6.9.bep dev-vcs/subversion/subversion-1.7.xx-svn.bep haiku-apps/bepdf/bepdf-1.1.1b4.bep haiku-apps/libwalter/libwalter-97.bep haiku-apps/paladin/paladin-1.3-hg.bep haiku-apps/pe/pe-2.4.3-600.bep haiku-apps/vision/patches/vision-908-gcc4.patch haiku-apps/vision/vision-0.9.7.bep haiku-libs/libwalter/libwalter-97.bep haiku-libs/libwalter/libwalter-97.recipe media-gfx/graphviz/graphviz-2.24.bep media-gfx/graphviz/graphviz-2.26.3.bep media-libs/flac/flac-1.2.1.bep media-libs/freetype/freetype-2.3.11.bep media-libs/freetype/freetype-2.4.2.bep media-libs/freetype/freetype-2.4.4.bep media-libs/ftgl/ftgl-2.1-svn.bep media-libs/guilib/guilib-1.2.1.bep media-libs/jpeg/jpeg-7.bep media-libs/jpeg/jpeg-8b.bep media-libs/jpeg/jpeg-8c.bep media-libs/libao/libao-1.0.0.bep media-libs/libmad/libmad-0.15.1b.bep media-libs/libmng/libmng-1.0.10.bep media-libs/libogg/libogg-1.1.4.bep media-libs/libogg/libogg-1.2.0.bep media-libs/libogg/libogg-1.2.2.bep media-libs/libpng/libpng-1.2.29.bep media-libs/libpng/libpng-1.2.30.bep media-libs/libpng/libpng-1.2.40.bep media-libs/libpng/libpng-1.2.41.bep media-libs/libpng/libpng-1.2.43.bep media-libs/libpng/libpng-1.2.44.bep media-libs/libpng/libpng-1.4.1.bep media-libs/libpng/libpng-1.4.2.bep media-libs/libpng/libpng-1.4.3.bep media-libs/libpng/libpng-1.4.4.bep media-libs/libpng/libpng-1.5.0.bep media-libs/libsdl/patches/libsdl-1.2-hg.patch media-libs/libtheora/libtheora-1.1.1.bep media-libs/libvorbis/libvorbis-1.2.3.bep media-libs/libvorbis/libvorbis-1.3.1.bep media-libs/libvorbis/libvorbis-1.3.2.bep media-libs/libvpx/libvpx-0.9.2-git.bep media-libs/smpeg/smpeg-0.4.5.bep media-libs/speex/speex-1.2-git.bep media-libs/speex/speex-1.2rc1.bep media-sound/lame/lame-3.98.4.bep media-sound/lame/lame-398-2.bep media-sound/vorbis-tools/vorbis-tools-1.2.0.bep media-sound/vorbis-tools/vorbis-tools-1.4.0.bep media-video/ffmpeg/ffmpeg-0.5.bep media-video/ffmpeg/ffmpeg-0.6.bep net-misc/curl/curl-7.18.2.bep net-misc/curl/curl-7.19.1.bep net-misc/curl/curl-7.19.2.bep net-misc/curl/curl-7.19.5.bep net-misc/curl/curl-7.19.7.bep net-misc/curl/curl-7.20.0.bep net-misc/curl/curl-7.20.1.bep net-misc/curl/curl-7.21.1.bep net-misc/curl/curl-7.21.2.bep net-misc/curl/curl-7.21.3.bep net-misc/openssh/openssh-5.4p1.bep net-misc/openssh/openssh-5.5p1.bep net-misc/openssh/openssh-5.6p1.bep net-misc/openssh/openssh-5.7p1.bep net-misc/openssh/openssh-5.8p1.bep net-wireless/b43-fwcutter/b43-fwcutter-012.bep sci-libs/gsl/gsl-1.14.bep sys-apps/ed/ed-1.4.bep sys-apps/gawk/gawk-3.1.8.bep sys-apps/grep/grep-2.5.4.bep sys-apps/grep/grep-2.7.bep sys-apps/groff/groff-1.20.1.bep sys-apps/man/man-1.6f.bep sys-apps/sed/sed-4.2.1.bep sys-apps/texinfo/texinfo-4.13a.bep sys-devel/autoconf/autoconf-2.68.bep sys-devel/automake/automake-1.11.1.bep sys-devel/bison/bison-2.4.1.bep sys-devel/bison/bison-2.4.bep sys-devel/flex/flex-2.5.35.bep sys-devel/gettext/gettext-0.18.1.1-dev.bep sys-devel/gettext/gettext-0.18.1.1.bep sys-devel/jam/jam-2.5.bep sys-devel/m4/m4-1.4.14.bep sys-libs/ncurses/ncurses-5.6.bep sys-libs/ncurses/ncurses-5.7.bep sys-libs/readline/readline-5.2.bep sys-libs/readline/readline-6.0.bep sys-libs/readline/readline-6.1.bep sys-libs/zlib/zlib-1.2.3.bep sys-libs/zlib/zlib-1.2.5.bep x11-libs/qt/qt-4.8.x-git.bep
This commit is contained in:
@@ -5,7 +5,8 @@ CHECKSUM_MD5="69eadf67b459f313a8d6b37aaabef96c"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
BUILD {
|
||||
BUILD()
|
||||
{
|
||||
cd b43-fwcutter-012
|
||||
wget http://cgit.haiku-os.org/haiku/plain/src/system/libroot/posix/glibc/string/byteswap.h
|
||||
mkdir bits
|
||||
@@ -13,7 +14,8 @@ BUILD {
|
||||
make PREFIX=`finddir B_COMMON_DIRECTORY` CFLAGS="-I. -Wall -D_BSD_SOURCE"
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
INSTALL()
|
||||
{
|
||||
cd b43-fwcutter-012
|
||||
make PREFIX=$DESTDIR/`finddir B_COMMON_DIRECTORY` install
|
||||
}
|
||||
14
net-wireless/b43_fwcutter/patches/b43_fwcutter-012.patch
Normal file
14
net-wireless/b43_fwcutter/patches/b43_fwcutter-012.patch
Normal file
@@ -0,0 +1,14 @@
|
||||
diff -up b43-fwcutter-012/Makefile.orig b43-fwcutter-012/Makefile
|
||||
--- b43-fwcutter-012/Makefile.orig 2009-06-02 09:52:55.058982400 -0600
|
||||
+++ b43-fwcutter-012/Makefile 2012-06-16 16:13:04.182452224 -0600
|
||||
@@ -24,8 +24,8 @@ $(BIN): $(OBJECTS)
|
||||
install: all
|
||||
-install -d -o 0 -g 0 -m 755 $(PREFIX)/bin/
|
||||
-install -o 0 -g 0 -m 755 $(BIN) $(PREFIX)/bin/
|
||||
- -install -d -o 0 -g 0 -m 755 $(PREFIX)/man/man1/
|
||||
- -install -o 0 -g 0 -m 644 $(BIN).1 $(PREFIX)/man/man1/
|
||||
+ -install -d -o 0 -g 0 -m 755 $(PREFIX)/documentation/man/man1/
|
||||
+ -install -o 0 -g 0 -m 644 $(BIN).1 $(PREFIX)/documentation/man/man1/
|
||||
|
||||
clean:
|
||||
-rm -f *.o $(BIN)
|
||||
@@ -777,9 +777,9 @@ diff -urN wpa_supplicant-0.7.3/wpa_supplicant/.config wpa_supplicant-0.7.3-haiku
|
||||
+LIBS += -L/boot/common/lib
|
||||
+
|
||||
+# for private Haiku headers
|
||||
+CFLAGS += -I/Source/Haiku/trunk/src/libs/compat/freebsd_network/compat
|
||||
+CFLAGS += -I/Source/Haiku/trunk/src/libs/compat/freebsd_wlan
|
||||
+CFLAGS += -I/Source/Haiku/trunk/headers/private/net
|
||||
+CFLAGS += -I/system/develop/headers/private/libs/compat/freebsd_network/compat
|
||||
+CFLAGS += -I/system/develop/headers/private/libs/compat/freebsd_wlan
|
||||
+CFLAGS += -I/system/develop/headers/private/net
|
||||
+CFLAGS += -Wno-multichar
|
||||
+
|
||||
+# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
|
||||
|
||||
@@ -829,9 +829,9 @@ index 0000000..7d73f13
|
||||
+LIBS += -L/boot/common/lib
|
||||
+
|
||||
+# for private Haiku headers
|
||||
+CFLAGS += -I/Source/haiku/git/haiku/src/libs/compat/freebsd_network/compat
|
||||
+CFLAGS += -I/Source/haiku/git/haiku/src/libs/compat/freebsd_wlan
|
||||
+CFLAGS += -I/Source/haiku/git/haiku/headers/private/net
|
||||
+CFLAGS += -I/system/develop/headers/private/libs/compat/freebsd_network/compat
|
||||
+CFLAGS += -I/system/develop/headers/private/libs/compat/freebsd_wlan
|
||||
+CFLAGS += -I/system/develop/headers/private/net
|
||||
+CFLAGS += -Wno-multichar
|
||||
+
|
||||
+# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
DESCRIPTION="A WPA Supplicant with support for WPA and WPA2."
|
||||
HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
|
||||
SRC_URI="http://hostap.epitest.fi/releases/wpa_supplicant-0.7.3.tar.gz"
|
||||
CHECKSUM_MD5="f516f191384a9a546e3f5145c08addda"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
BUILD {
|
||||
cd wpa_supplicant-0.7.3/wpa_supplicant
|
||||
CFLAGS="-MMD -O2 -Wall" make wpa_supplicant
|
||||
}
|
||||
INSTALL {
|
||||
cd wpa_supplicant-0.7.3/wpa_supplicant
|
||||
mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`
|
||||
cp -v wpa_supplicant ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/
|
||||
}
|
||||
LICENSE="BSD (2-clause)
|
||||
GNU GPL v2"
|
||||
COPYRIGHT="2003-2010 Jouni Malinen"
|
||||
44
net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe
Normal file
44
net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe
Normal file
@@ -0,0 +1,44 @@
|
||||
SUMMARY="A WPA Supplicant with support for WPA and WPA2"
|
||||
DESCRIPTION="wpa_supplicant is a WPA Supplicant for Linux, BSD, Mac OS X, and Windows with support for WPA and WPA2 (IEEE 802.11i / RSN). It is suitable for both desktop/laptop computers and embedded systems. Supplicant is the IEEE 802.1X/WPA component that is used in the client stations. It implements key negotiation with a WPA Authenticator and it controls the roaming and IEEE 802.11 authentication/association of the wlan driver."
|
||||
HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
|
||||
SRC_URI="http://hostap.epitest.fi/releases/wpa_supplicant-0.7.3.tar.gz"
|
||||
CHECKSUM_MD5="f516f191384a9a546e3f5145c08addda"
|
||||
LICENSE="
|
||||
BSD (2-clause)
|
||||
GNU GPL v2
|
||||
"
|
||||
COPYRIGHT="2003-2010 Jouni Malinen"
|
||||
REVISION="2"
|
||||
ARCHITECTURES="x86_gcc2 ?x86"
|
||||
|
||||
PATCHES="wpa_supplicant-0.7.3.patch"
|
||||
|
||||
PROVIDES="
|
||||
wpa_supplicant = $portVersion compat >= 0.7
|
||||
"
|
||||
REQUIRES="
|
||||
haiku >= $haikuVersion
|
||||
openssl >= 1.0.0
|
||||
"
|
||||
BUILD_REQUIRES="
|
||||
openssl >= 1.0.0
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
haiku_devel >= $haikuVersion
|
||||
cmd:gcc
|
||||
cmd:ld
|
||||
cmd:make
|
||||
"
|
||||
|
||||
SOURCE_DIR="$portVersionedName/wpa_supplicant"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
CFLAGS="-MMD -O2 -Wall" make wpa_supplicant
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
mkdir -p $binDir
|
||||
cp -v wpa_supplicant $binDir
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
DESCRIPTION="A WPA Supplicant with support for WPA and WPA2."
|
||||
HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
|
||||
SRC_URI="http://hostap.epitest.fi/releases/wpa_supplicant-2.0.tar.gz"
|
||||
CHECKSUM_MD5="3be2ebfdcced52e00eda0afe2889839d"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
BUILD {
|
||||
cd wpa_supplicant-2.0/wpa_supplicant
|
||||
CFLAGS="-MMD -O2 -Wall" make wpa_supplicant
|
||||
}
|
||||
INSTALL {
|
||||
cd wpa_supplicant-2.0/wpa_supplicant
|
||||
mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`
|
||||
cp -v wpa_supplicant ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/
|
||||
}
|
||||
LICENSE="BSD (2-clause)
|
||||
GNU GPL v2"
|
||||
COPYRIGHT="2003-2012 Jouni Malinen"
|
||||
47
net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe
Normal file
47
net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe
Normal file
@@ -0,0 +1,47 @@
|
||||
SUMMARY="A WPA Supplicant with support for WPA and WPA2"
|
||||
DESCRIPTION="wpa_supplicant is a WPA Supplicant for Linux, BSD, Mac OS X, and Windows with support for WPA and WPA2 (IEEE 802.11i / RSN). It is suitable for both desktop/laptop computers and embedded systems. Supplicant is the IEEE 802.1X/WPA component that is used in the client stations. It implements key negotiation with a WPA Authenticator and it controls the roaming and IEEE 802.11 authentication/association of the wlan driver."
|
||||
HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
|
||||
SRC_URI="http://hostap.epitest.fi/releases/wpa_supplicant-2.0.tar.gz"
|
||||
CHECKSUM_MD5="3be2ebfdcced52e00eda0afe2889839d"
|
||||
LICENSE="
|
||||
BSD (2-clause)
|
||||
GNU GPL v2
|
||||
"
|
||||
COPYRIGHT="2003-2012 Jouni Malinen"
|
||||
REVISION="3"
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
|
||||
PATCHES="wpa_supplicant-2.0.patch"
|
||||
|
||||
PROVIDES="
|
||||
wpa_supplicant = $portVersion compat >= 2
|
||||
cmd:wpa_supplicant = $portVersion compat >= 2
|
||||
"
|
||||
REQUIRES="
|
||||
haiku >= $haikuVersion
|
||||
lib:libssl
|
||||
"
|
||||
BUILD_REQUIRES="
|
||||
devel:libssl >= 1.0.0
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
haiku_devel >= $haikuVersion
|
||||
cmd:gcc
|
||||
cmd:ld
|
||||
cmd:make
|
||||
"
|
||||
|
||||
SOURCE_DIR="$portVersionedName"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
cd wpa_supplicant
|
||||
CFLAGS="-MMD -O2 -Wall" make wpa_supplicant
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
cd wpa_supplicant
|
||||
mkdir -p $binDir
|
||||
cp -v wpa_supplicant $binDir
|
||||
}
|
||||
Reference in New Issue
Block a user