Fusionado haikuports/haikuports con master

2026-04-23 12:10:06 +02:00 · 2013-12-10 20:56:29 +01:00
parent 06b5c5fa6b e3ca579531
commit ff6262046a
12 changed files with 412 additions and 63 deletions
--- a/app-shells/fish/fish-1.23.1_git.recipe
+++ b/app-shells/fish/fish-1.23.1_git.recipe
@@ -1,32 +1,63 @@
+SUMMARY="The friendly interactive shell" 
 DESCRIPTION="The friendly interactive shell" 
 HOMEPAGE="http://ridiculousfish.com/shell/" 
 SRC_URI="git://git.gitorious.org/fish-shell/fish-shell.git"
 #CHECKSUM_MD5=""
 REVISION="1"
-STATUS_HAIKU="untested"
-DEPEND="app-doc/doxygen >= 1.7.4
-	sys-libs/ncurses >= 5.9"
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
+LICENSE="GNU GPL v2"
+COPYRIGHT="2005-2009 Axel Liljencrantz"
+
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	fish$secondaryArchSuffix = $portVersion
+	cmd:fish = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
+	lib:libgettextlib_0.18.1$secondaryArchSuffix >= 0.18.1.1
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libiconv$secondaryArchSuffix
+	devel:libncurses$secondaryArchSuffix >= 5.9
+	devel:libgettextlib$secondaryArchSuffix
+	doxygen >= 1.6.3
+	"
+BUILD_PREREQUIRES="
+	cmd:autoconf
+	cmd:libtoolize
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:which
+	"
+
+
 BUILD()
 {
-    cd fish-1.23.1-git
 	libtoolize --force --copy --install
    autoconf
-    ./configure --without-xsel --prefix=`finddir B_COMMON_DIRECTORY`
+    ./configure --without-xsel --prefix=$prefix
    make
 }

 INSTALL()
 {
-    cd fish-1.23.1-git
    make install DESTDIR=${DESTDIR}
 }

 TEST()
 {
-	cd fish-1.23.1-git
 	make test
 }

-LICENSE="GNU GPL v2"
-COPYRIGHT="2005-2009 Axel Liljencrantz"
--- a/dev-libs/libcss/libcss-0.2.0_HEAD.recipe
+++ b/dev-libs/libcss/libcss-0.2.0_HEAD.recipe
@@ -1,21 +0,0 @@
-DESCRIPTION="LibCSS is a CSS (Cascading Style Sheet) parser and selection engine" 
-HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/" 
-SRC_URI="git://git.netsurf-browser.org/libcss.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-libs/libparserutils >= 0.1.1"
-
-BUILD()
-{
-	cd libcss-0.2.0-HEAD
-	make PREFIX=/boot/common
-}
-
-INSTALL()
-{
-	cd libcss-0.2.0-HEAD
-	make install PREFIX=/boot/common
-}
-
-LICENSE="MIT"
-COPYRIGHT="2007 - 2013 J-M Bell"
--- a/dev-libs/libcss/libcss-0.2.0_git.recipe
+++ b/dev-libs/libcss/libcss-0.2.0_git.recipe
@@ -0,0 +1,54 @@
+#TODO:split out _devel
+SUMMARY="LibCSS is a CSS parser and selection engine" 
+DESCRIPTION="LibCSS is a CSS (Cascading Style Sheet) parser and selection engine" 
+HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/" 
+SRC_URI="git://git.netsurf-browser.org/libcss.git"
+REVISION="1"
+LICENSE="MIT"
+COPYRIGHT="2007 - 2013 J-M Bell"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	libcss$secondaryArchSuffix = $portVersion
+	lib:libcss$secondaryArchSuffix = $portVersion
+	devel:libcss$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libparserutils${secondaryArchSuffix}
+	lib:libwapcaplet${secondaryArchSuffix}
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libparserutils${secondaryArchSuffix} >= 0.1.1
+	devel:libwapcaplet${secondaryArchSuffix} >= 0.1.1
+	netsurf_buildsystem >= 0
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:perl
+	cmd:pkg_config
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
+}
+
+INSTALL()
+{
+	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		I=/develop/headers/libcss
+	mkdir -p $prefix/develop/lib
+	mv -f $prefix/lib/*.a $prefix/develop/lib/
+	mv -f $prefix/lib/pkgconfig $prefix/develop/lib/
+}
--- a/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe
+++ b/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe
@@ -1,3 +1,4 @@
+#TODO:split out _devel
 SUMMARY="LibParserUtils is a library for building efficient parsers" 
 DESCRIPTION="LibParserUtils is a library for building efficient parsers" 
 HOMEPAGE="http://www.netsurf-browser.org/projects/libparserutils/" 
@@ -11,6 +12,8 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"

 PROVIDES="
 	libparserutils$secondaryArchSuffix = $portVersion
+	lib:libparserutils$secondaryArchSuffix = $portVersion
+	devel:libparserutils$secondaryArchSuffix = $portVersion
 	"

 REQUIRES="
@@ -42,5 +45,7 @@ INSTALL()
 {
 	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
 		I=/develop/headers/libparserutils
+	mkdir -p $prefix/develop/lib
+	mv -f $prefix/lib/*.a $prefix/develop/lib/
+	mv -f $prefix/lib/pkgconfig $prefix/develop/lib/
 }
-
--- a/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe
@@ -1,3 +1,4 @@
+#TODO:split out _devel
 SUMMARY="LibWapcaplet is a string internment library" 
 DESCRIPTION="LibWapcaplet is a string internment library" 
 HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/" 
@@ -11,6 +12,8 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"

 PROVIDES="
 	libwapcaplet$secondaryArchSuffix = $portVersion
+	lib:libwapcaplet$secondaryArchSuffix = $portVersion
+	devel:libwapcaplet$secondaryArchSuffix = $portVersion
 	"

 REQUIRES="
@@ -39,5 +42,7 @@ INSTALL()
 {
 	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
 		I=/develop/headers/libwapcaplet
+	mkdir -p $prefix/develop/lib
+	mv -f $prefix/lib/*.a $prefix/develop/lib/
+	mv -f $prefix/lib/pkgconfig $prefix/develop/lib/
 }
-
--- a/dev-vcs/fossil/fossil-1.27.recipe
+++ b/dev-vcs/fossil/fossil-1.27.recipe
@@ -0,0 +1,48 @@
+SUMMARY="Simple, high-reliability, distributed software configuration management" 
+DESCRIPTION="Simple, high-reliability, distributed software configuration management" 
+HOMEPAGE="http://www.fossil-scm.org/" 
+SRC_URI="http://www.fossil-scm.org/download/fossil-src-20130911114349.tar.gz"
+CHECKSUM_MD5="fa4ea3eb25d2a8cfb0edbd0c30c268b9"
+REVISION="1"
+LICENSE="BSD (2-clause)"
+COPYRIGHT="2007 D. Richard Hipp"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	fossil = $portVersion
+	cms:fossil = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libz
+	openssl >= 1.0.0
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libz >= 1.2.3
+	openssl_devel >= 1.0.0
+	"
+# tests require cmd:tclsh
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+	"
+
+SOURCE_DIR="fossil-src-20130911114349"
+
+BUILD()
+{
+	./configure --prefix=$prefix
+	make
+}
+
+INSTALL()
+{
+	make install
+}
+
+TEST()
+{
+	make test
+}
--- a/haiku-apps/behappy/behappy-1.06e_git.recipe
+++ b/haiku-apps/behappy/behappy-1.06e_git.recipe
@@ -0,0 +1,44 @@
+SUMMARY="HTML documentation viewer" 
+DESCRIPTION="HTML documentation viewer" 
+HOMEPAGE="http://www.becoz.org/beos-en/behappy" 
+SRC_URI="git+https://github.com/HaikuArchives/BeHappy.git"
+REVISION="1"
+#CHECKSUM_MD5=""
+LICENSE="MIT"
+COPYRIGHT="2006 Sylvain Tertois
+	2008-2009 François Revol"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	behappy = $portVersion
+	app:behappy = $portVersion
+"
+REQUIRES="
+	haiku >= $haikuVersion
+#	app:netsurf >= 2.6
+"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+"
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:gcc
+	cmd:make
+	cmd:mkdepend
+	cmd:ld
+"
+
+
+BUILD()
+{
+	cd trunk
+	make BUILDHOME=/system/develop
+}
+
+INSTALL()
+{
+	cd trunk
+	make install BUILDHOME=/system/develop
+}
+
--- a/media-libs/jasper/jasper-1.900.1.recipe
+++ b/media-libs/jasper/jasper-1.900.1.recipe
@@ -1,26 +1,102 @@
-DESCRIPTION="jasper - software-based implementation of the codec specified in the JPEG-2000 Part-1 standard" 
-HOMEPAGE="http://www.ece.uvic.ca/~mdadams/jasper/" 
+DESCRIPTION="The JasPer Project is an open-source initiative to provide a free software-based reference implementation of the codec specified in the JPEG-2000 Part-1 standard. More details about this software can be found in the JasPer Software Reference Manual."
+SUMMARY="Implementation of the codec specified in the JPEG-2000 Part-1 standard."
+HOMEPAGE="http://www.ece.uvic.ca/~mdadams/jasper/"
 SRC_URI="http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.900.1.zip"
 REVISION="1"
-STATUS_HAIKU="stable"
 CHECKSUM_MD5="a342b2b4495b3e1394e161eb5d85d754"
-DEPEND=""
+
+LICENSE="JasPer v2"
+COPYRIGHT="1999-2007 Michael D. Adams"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
+
+PROVIDES="
+	jasper$secondaryArchSuffix = $portVersion compat >= 1.0.0
+	lib:libjasper$secondaryArchSuffix = $portVersion compat >= 1.0.0
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:mkdepend
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:chmod
+	"
+
+
+
 BUILD()
 {
-	cd jasper-1.900.1
 	libtoolize --force --copy --install
 	aclocal -I acaux
 	autoconf
 	automake
 	chmod 777 configure
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared
+	runConfigure ./configure --enable-shared
 	make
 }

 INSTALL()
 {
-	cd  jasper-1.900.1
 	make install
+	
+	prepareInstalledDevelLibs libjasper
+
+	# devel package
+	packageEntries devel \
+		$developDir
+
+	# tools package
+	if [ -z "$secondaryArchSuffix" ]; then
+		packageEntries tools \
+			$binDir \
+			$documentationDir
+	fi
+
+	# Remove stuff we don't need in the secondary architecture base package.
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $binDir
+		rm -rf $documentationDir
+	fi
 }
-LICENSE="JasPer v2"
-COPYRIGHT="1999-2007 Michael D. Adams"
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	jasper${secondaryArchSuffix}_devel = $portVersion
+	devel:libjasper$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_devel="
+	jasper$secondaryArchSuffix == $portVersion base
+	"
+
+# ----- tools package -------------------------------------------------------
+
+if [ -z "$secondaryArchSuffix" ]; then
+	SUMMARY_tools="The jasper tools"
+	PROVIDES_tools="
+		jasper_tools = $portVersion
+		cmd:imgcmp = $portVersion
+		cmd:imginfo = $portVersion
+		cmd:jasper = $portVersion
+		cmd:tmrdemo = $portVersion
+		"
+	REQUIRES_tools="
+		haiku >= $haikuVersion
+		jasper == $portVersion base
+		"
+fi
--- a/media-sound/ocp/ocp-0.1.21_git.recipe
+++ b/media-sound/ocp/ocp-0.1.21_git.recipe
@@ -30,6 +30,7 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	libsdl$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix >= 0.8.0
 	lib:libvorbis$secondaryArchSuffix >= 0.4.5
--- a/net-libs/enet/enet-1.3.0.recipe
+++ b/net-libs/enet/enet-1.3.0.recipe
@@ -1,24 +1,69 @@
-DESCRIPTION="enet" 
+DESCRIPTION="ENet's purpose is to provide a relatively thin, simple and robust network communication layer on top of UDP (User Datagram Protocol). The primary feature it provides is optional reliable, in-order delivery of packets.
+ENet omits certain higher level networking features such as authentication, lobbying, server discovery, encryption, or other similar tasks that are particularly application specific so that the library remains flexible, portable, and easily embeddable."
+SUMMARY="ENet is simple and robust network communication layer."
 HOMEPAGE="http://enet.bespin.org" 
 SRC_URI="http://enet.bespin.org/download/enet-1.3.0.tar.gz"
 CHECKSUM_MD5="3ea50cc5f2f4bbea32abae0d50b64e3c"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+
+LICENSE="MIT"
+COPYRIGHT="2002-2010 Lee Salzman"
+
+PROVIDES="
+	enet$secondaryArchSuffix = $portVersion compat >= 1.0.0
+	lib:libenet$secondaryArchSuffix = $portVersion compat >= 1.0.0
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:aclocal
+	cmd:autoreconf
+	cmd:libtoolize
+	cmd:make
+	cmd:sed
+	"

 BUILD()
 {
-	cd enet-1.3.0
 	libtoolize --force --copy --install
 	autoreconf -i
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 }

 INSTALL()
 {
-	cd enet-1.3.0
 	make install
+	prepareInstalledDevelLibs libenet
+
+	# devel package
+	packageEntries devel \
+		$developDir
+
+	# Remove stuff we don't need in the secondary architecture base package.
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $binDir
+		rm -rf $documentationDir
+	fi
 }

-LICENSE="MIT"
-COPYRIGHT="2002-2010 Lee Salzman"
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	enet${secondaryArchSuffix}_devel = $portVersion
+	devel:libenet$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_devel="
+	enet$secondaryArchSuffix == $portVersion base
+	"
--- a/sys-apps/dmidecode/dmidecode-2.12.recipe
+++ b/sys-apps/dmidecode/dmidecode-2.12.recipe
@@ -0,0 +1,39 @@
+SUMMARY="Decodes BIOS SMBIOS/DMI tables"
+DESCRIPTION="Reports information about your system's hardware as described in your system BIOS according to the SMBIOS/DMI standard"
+HOMEPAGE="http://www.nongnu.org/dmidecode/"
+SRC_URI="http://download.savannah.gnu.org/releases/dmidecode/dmidecode-2.12.tar.gz"
+CHECKSUM_MD5="02ee243e1ecac7fe0d04428aec85f63a"
+REVISION="2"
+LICENSE="GNU GPL v2"
+COPYRIGHT="2000-2002 Alan Cox, 2002-2010 Jean Delvare"
+
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PROVIDES="
+	dmidecode = $portVersion
+	cmd:dmidecode = $portVersion
+	"
+REQUIRES="
+	haiku
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+	"
+
+BUILD()
+{
+	make
+}
+
+INSTALL()
+{
+	make install prefix=$prefix \
+		sbindir=$prefix/bin \
+		mandir=$prefix/documentation/man \
+		docdir=$prefix/documentation/dmidecode
+}
+
--- a/www-servers/haproxy/haproxy-1.4.22.recipe
+++ b/www-servers/haproxy/haproxy-1.4.22.recipe
@@ -1,24 +1,46 @@
-DESCRIPTION="Reliable, high performace TCP/HTTP load balancer"
+DESCRIPTION="HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications. It is particularly suited for web sites crawling under very high loads while needing persistence or Layer7 processing."
+SUMMARY="Reliable, high performace TCP/HTTP load balancer"
 HOMEPAGE="http://haproxy.1wt.eu/"
 SRC_URI="http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.22.tar.gz"
 CHECKSUM_MD5="a0b007c76f6a78524f3b3dd5e704979c"
-STATUS_HAIKU="stable"
 REVISION="1"
+
+LICENSE="GNU GPL v2"
+COPYRIGHT="2012 Willy Tarreau"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	haproxy = $portVersion
+	cmd:haproxy = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:make
+	cmd:gcc
+	"
+PATCHES="haproxy-1.4.22.patch"
+
+
 BUILD()
 {
-	cd haproxy-1.4.22
-	make TARGET=haiku PREFIX= SBINDIR=`finddir B_COMMON_BIN_DIRECTORY` \
-		MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
-		DOCDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
+	make TARGET=haiku PREFIX="$prefix"
 }

 INSTALL()
 {
-	cd haproxy-1.4.22
-	make install DESTDIR=$DESTDIR PREFIX= SBINDIR=`finddir B_COMMON_BIN_DIRECTORY` \
-		MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
-		DOCDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-}
+	mkdir -p "${sbinDir}"
+	mkdir -p "${manDir}"
+	mkdir -p "${docDir}"
+	

-LICENSE="GNU GPL v2"
-COPYRIGHT="2012 Willy Tarreau"
+	make install DESTDIR="" \
+		PREFIX="$prefix"\
+		SBINDIR="${sbinDir}" \
+		MANDIR="${manDir}" \
+		DOCDIR="${docDir}"
+}