From 6b753405caf0dc28ff92de0734ac69259440dcbb Mon Sep 17 00:00:00 2001 From: Adrian Jelen Date: Mon, 9 Dec 2013 19:38:44 +0000 Subject: [PATCH 1/4] Convert jasper, enet and haproxy to working recipe --- media-libs/jasper/jasper-1.900.1.recipe | 97 ++++++++++++++++++++--- net-libs/enet/enet-1.3.0.recipe | 60 ++++++++++++-- www-servers/haproxy/haproxy-1.4.22.recipe | 48 ++++++++--- 3 files changed, 175 insertions(+), 30 deletions(-) diff --git a/media-libs/jasper/jasper-1.900.1.recipe b/media-libs/jasper/jasper-1.900.1.recipe index dee1e1aec..e2d0934e3 100644 --- a/media-libs/jasper/jasper-1.900.1.recipe +++ b/media-libs/jasper/jasper-1.900.1.recipe @@ -1,26 +1,105 @@ -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 + lib:libjasper$secondaryArchSuffix = $portVersion + cmd:imgcmp = $portVersion + cmd:imginfo = $portVersion + cmd:jasper = $portVersion + cmd:tmrdemo = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" + cmd:gcc$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 \ No newline at end of file diff --git a/net-libs/enet/enet-1.3.0.recipe b/net-libs/enet/enet-1.3.0.recipe index 4d50c2c85..cf9fad609 100644 --- a/net-libs/enet/enet-1.3.0.recipe +++ b/net-libs/enet/enet-1.3.0.recipe @@ -1,24 +1,68 @@ -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" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" + +LICENSE="MIT" +COPYRIGHT="2002-2010 Lee Salzman" + +PROVIDES=" + enet = $portVersion + lib:libenet = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoreconf + cmd:gcc + cmd:ld + 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 $configureDirArgs } 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 + " \ No newline at end of file diff --git a/www-servers/haproxy/haproxy-1.4.22.recipe b/www-servers/haproxy/haproxy-1.4.22.recipe index 854d047dc..e952cf0f8 100644 --- 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}/haproxy" + mkdir -p "${manDir}/haproxy" + mkdir -p "${docDir}" + -LICENSE="GNU GPL v2" -COPYRIGHT="2012 Willy Tarreau" \ No newline at end of file + make install DESTDIR="" \ + PREFIX="$prefix"\ + SBINDIR="${sbinDir}/haproxy" \ + MANDIR="${manDir}/haproxy" \ + DOCDIR="${docDir}" +} \ No newline at end of file From aefec3e096bb2c612fef07a138f3aa4a747bdafb Mon Sep 17 00:00:00 2001 From: Adrian Jelen Date: Mon, 9 Dec 2013 22:59:11 +0000 Subject: [PATCH 2/4] Convert enet, jasper and haproxy to working recipe --- media-libs/jasper/jasper-1.900.1.recipe | 4 ---- net-libs/enet/enet-1.3.0.recipe | 7 ++++--- www-servers/haproxy/haproxy-1.4.22.recipe | 8 ++++---- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/media-libs/jasper/jasper-1.900.1.recipe b/media-libs/jasper/jasper-1.900.1.recipe index e2d0934e3..27e99bbc9 100644 --- a/media-libs/jasper/jasper-1.900.1.recipe +++ b/media-libs/jasper/jasper-1.900.1.recipe @@ -14,10 +14,6 @@ SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" PROVIDES=" jasper$secondaryArchSuffix = $portVersion lib:libjasper$secondaryArchSuffix = $portVersion - cmd:imgcmp = $portVersion - cmd:imginfo = $portVersion - cmd:jasper = $portVersion - cmd:tmrdemo = $portVersion " REQUIRES=" diff --git a/net-libs/enet/enet-1.3.0.recipe b/net-libs/enet/enet-1.3.0.recipe index cf9fad609..9ba080e48 100644 --- a/net-libs/enet/enet-1.3.0.recipe +++ b/net-libs/enet/enet-1.3.0.recipe @@ -5,14 +5,15 @@ 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" LICENSE="MIT" COPYRIGHT="2002-2010 Lee Salzman" PROVIDES=" - enet = $portVersion - lib:libenet = $portVersion + enet = $portVersion compat >= 1.0.0 + lib:libenet = $portVersion compat >= 1.0.0 " REQUIRES=" haiku >= $haikuVersion @@ -36,7 +37,7 @@ BUILD() { libtoolize --force --copy --install autoreconf -i - runConfigure ./configure $configureDirArgs + runConfigure ./configure } INSTALL() diff --git a/www-servers/haproxy/haproxy-1.4.22.recipe b/www-servers/haproxy/haproxy-1.4.22.recipe index e952cf0f8..fbaef0b80 100644 --- a/www-servers/haproxy/haproxy-1.4.22.recipe +++ b/www-servers/haproxy/haproxy-1.4.22.recipe @@ -33,14 +33,14 @@ BUILD() INSTALL() { - mkdir -p "${sbinDir}/haproxy" - mkdir -p "${manDir}/haproxy" + mkdir -p "${sbinDir}" + mkdir -p "${manDir}" mkdir -p "${docDir}" make install DESTDIR="" \ PREFIX="$prefix"\ - SBINDIR="${sbinDir}/haproxy" \ - MANDIR="${manDir}/haproxy" \ + SBINDIR="${sbinDir}" \ + MANDIR="${manDir}" \ DOCDIR="${docDir}" } \ No newline at end of file From 76fa997485f26886ccb24ae436e3e1090e600b7d Mon Sep 17 00:00:00 2001 From: Adrian Jelen Date: Mon, 9 Dec 2013 23:07:53 +0000 Subject: [PATCH 3/4] Added compatible version --- media-libs/jasper/jasper-1.900.1.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/jasper/jasper-1.900.1.recipe b/media-libs/jasper/jasper-1.900.1.recipe index 27e99bbc9..7458a1d8e 100644 --- a/media-libs/jasper/jasper-1.900.1.recipe +++ b/media-libs/jasper/jasper-1.900.1.recipe @@ -12,8 +12,8 @@ ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" PROVIDES=" - jasper$secondaryArchSuffix = $portVersion - lib:libjasper$secondaryArchSuffix = $portVersion + jasper$secondaryArchSuffix = $portVersion compat >= 1.0.0 + lib:libjasper$secondaryArchSuffix = $portVersion compat >= 1.0.0 " REQUIRES=" From 47c972d4680b508a99c312bbcecb78af23f2a1c9 Mon Sep 17 00:00:00 2001 From: Adrian Jelen Date: Tue, 10 Dec 2013 01:58:16 +0000 Subject: [PATCH 4/4] Add support secondary arch --- media-libs/jasper/jasper-1.900.1.recipe | 1 + net-libs/enet/enet-1.3.0.recipe | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/media-libs/jasper/jasper-1.900.1.recipe b/media-libs/jasper/jasper-1.900.1.recipe index 7458a1d8e..9d521657a 100644 --- a/media-libs/jasper/jasper-1.900.1.recipe +++ b/media-libs/jasper/jasper-1.900.1.recipe @@ -26,6 +26,7 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:make cmd:mkdepend cmd:libtoolize diff --git a/net-libs/enet/enet-1.3.0.recipe b/net-libs/enet/enet-1.3.0.recipe index 9ba080e48..155753690 100644 --- a/net-libs/enet/enet-1.3.0.recipe +++ b/net-libs/enet/enet-1.3.0.recipe @@ -12,22 +12,22 @@ LICENSE="MIT" COPYRIGHT="2002-2010 Lee Salzman" PROVIDES=" - enet = $portVersion compat >= 1.0.0 - lib:libenet = $portVersion compat >= 1.0.0 + enet$secondaryArchSuffix = $portVersion compat >= 1.0.0 + lib:libenet$secondaryArchSuffix = $portVersion compat >= 1.0.0 " REQUIRES=" - haiku >= $haikuVersion + haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion " BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:aclocal cmd:autoreconf - cmd:gcc - cmd:ld cmd:libtoolize cmd:make cmd:sed