* adjust several recipes to our new naming conventions

2026-04-23 04:00:05 +02:00 · 2013-04-19 23:06:59 +00:00
parent fcb60a8b6d
commit a704dbf9a7
27 changed files with 480 additions and 311 deletions
--- a/dev-libs/apr-util/apr-util-1.3.10.recipe
+++ b/dev-libs/apr-util/apr-util-1.3.10.recipe
@@ -1,68 +0,0 @@
-SUMMARY="Apache Portable Runtime Utility Library"
-DESCRIPTION="Apache Portable Runtime Utility Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.3.10.tar.gz"
-CHECKSUM_MD5="82acd25cf3df8c72eba44eaee8b80c19"
-REVISION="2"
-ARCHITECTURES="x86_gcc2 ?x86"
-
-PROVIDES="apr-util = $portVersion compat >= 1
-	lib:libaprutil = $portVersion compat >= 1
-	lib:libaprutil-1 = $portVersion compat >= 1"
-REQUIRES="haiku >= $haikuVersion
-	apr >= 1.3.9
-	expat >= 2.0"
-BUILD_REQUIRES="cmd:aclocal
-	cmd:autoconf
-	cmd:autoheader
-	cmd:gcc
-	cmd:ld
-	cmd:libtoolize
-	cmd:make"
-BUILD_PREREQUIRES="haiku-devel >= $haikuVersion"
-
-SOURCE_DIR="$portVersionedName"
-
-# TODO: The hard-coded reference to the apr work directory isn't good at all.
-# We should declare a build dependency on the APR sources instead.
-
-BUILD()
-{
-	aprUtilPackageLinksDir=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName
-	aprInstallDir=$aprUtilPackageLinksDir/apr
-
-	# We need the APR sources to build APR-Util.
-	haikuporter -b -y apr-1.4.2
-	aprSourceDir=$(haikuporter -t)/dev-libs/apr/work/apr-1.4.2
-
-	rm -rf aclocal.m4
-	mkdir -p m4
-	haikuporter -b -y apr-1.4.2
-	libtoolize -fci
-	aclocal --install -I m4
-	autoconf -f
-	cd xml/expat
-	mkdir -p m4
-	echo 'AM_INIT_AUTOMAKE' >> configure.in
-	libtoolize -fci
-	aclocal --install -I m4
-	autoconf --force
-	autoheader
-	touch libtool.m4	
-	cd ../..
-	sed -i 's/\/usr\/bin\/env/\/bin\/env/' $aprSourceDir/build/gen-build.py
-	buildconf --with-apr=`haikuporter -t`/dev-libs/apr/work/apr-1.4.2 \
-		--prefix=$prefix
-	ln -sf $(which libtool) ./libtool 
-    ./configure $configureDirArgs \
-		--with-apr=$aprInstallDir/bin/apr-1-config
-	make
-}
-
-INSTALL()
-{
-	make install
-}
-
-LICENSE="Apache v2"
-COPYRIGHT="2010 The Apache Software Foundation."
--- a/dev-libs/apr-util/apr_util-1.3.10.recipe
+++ b/dev-libs/apr-util/apr_util-1.3.10.recipe
@@ -0,0 +1,96 @@
+SUMMARY="Apache Portable Runtime Utility Library"
+HOMEPAGE="http://apr.apache.org/"
+SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.3.10.tar.gz"
+LICENSE="Apache v2"
+COPYRIGHT="2010 The Apache Software Foundation."
+CHECKSUM_MD5="82acd25cf3df8c72eba44eaee8b80c19"
+REVISION="4"
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PROVIDES="
+	apr_util = $portVersion compat >= 1
+	lib:libaprutil = $portVersion compat >= 1
+	lib:libaprutil_1 = $portVersion compat >= 1
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	apr >= 1.3.9
+	expat >= 2.0
+	"
+BUILD_REQUIRES="
+	$REQUIRES
+	cmd:aclocal
+	cmd:autoconf
+	cmd:autoheader
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	aprUtilPackageLinksDir=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName
+	aprInstallDir=$aprUtilPackageLinksDir/apr
+	expatInstallDir=$aprUtilPackageLinksDir/expat
+
+	rm -rf aclocal.m4
+	mkdir -p m4
+	libtoolize -fci
+	aclocal --install -I m4
+	autoconf -f
+	cd xml/expat
+	mkdir -p m4
+	echo 'AM_INIT_AUTOMAKE' >> configure.in
+	libtoolize -fci
+	aclocal --install -I m4
+	autoconf --force
+	autoheader
+	touch libtool.m4	
+	cd ../..
+	
+	# TODO: fix this hack!
+	cp /boot/common/bin/libtool .
+	ln -sfn $sourceDir/libtool /libtool
+	
+    ./configure $configureDirArgs \
+		--with-apr=$aprInstallDir \
+		--with-expat=$expatInstallDir
+	make
+}
+
+INSTALL()
+{
+	make install
+}
+
+DESCRIPTION="
+	The mission of the Apache Portable Runtime (APR) project is to create 
+	and maintain software libraries that provide a predictable and consistent 
+	interface to underlying platform-specific implementations. The primary 
+	goal is to provide an API to which software developers may code and be 
+	assured of predictable if not identical behaviour regardless of the 
+	platform on which their software is built, relieving them of the need to 
+	code special-case conditions to work around or take advantage of 
+	platform-specific deficiencies or features.
+	
+	To give a brief overview, the primary core subsystems of APR 1.x include 
+	the following:
+	
+	- atomic operations
+	- dynamic Shared Object loading
+	- file I/O
+	- locks (mutexes, condition variables, etc)
+	- memory management (high performance allocators)
+	- memory-mapped files
+	- multicast Sockets
+	- network I/O
+	- shared memory
+	- thread and Process management
+	- various data structures (tables, hashes, priority queues, etc) 
+	"
--- a/dev-libs/apr/apr-1.4.2.recipe
+++ b/dev-libs/apr/apr-1.4.2.recipe
@@ -1,4 +1,64 @@
 SUMMARY="Apache Portable Runtime Library"
+HOMEPAGE="http://apr.apache.org/"
+SRC_URI="http://archive.apache.org/dist/apr/apr-1.4.2.tar.gz"
+CHECKSUM_MD5="fc80cb54f158c2674f9eeb47a1f672cd"
+LICENSE="Apache v2"
+COPYRIGHT="2010 The Apache Software Foundation."
+REVISION="5"
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PROVIDES="
+	apr = $portVersion compat >= 1
+	lib:libapr = $portVersion compat >= 1
+	lib:libapr_1 = $portVersion compat >= 1
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	touch libtool.m4
+	aclocal -I build
+	autoconf
+	./configure $configureDirArgs
+	
+	# TODO: fix this hack (by finding out why top_builddir seems to be unset)!
+	ln -sfn $sourceDir/libtool /libtool
+	
+	make
+}
+
+INSTALL()
+{
+	make install
+}
+
+TEST()
+{
+	make test
+}
+
+
+# ----- source package -------------------------------------------------------
+
+PROVIDES_source="apr_source = $portVersion compat = $portVersion"
+
+
 DESCRIPTION="
 	The mission of the Apache Portable Runtime (APR) project is to create 
 	and maintain software libraries that provide a predictable and consistent 
@@ -24,55 +84,3 @@ DESCRIPTION="
 	- thread and Process management
 	- various data structures (tables, hashes, priority queues, etc) 
 	"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="http://archive.apache.org/dist/apr/apr-1.4.2.tar.gz"
-CHECKSUM_MD5="fc80cb54f158c2674f9eeb47a1f672cd"
-REVISION="3"
-ARCHITECTURES="x86_gcc2 ?x86"
-
-PROVIDES="
-	apr = $portVersion compat >= 1
-	lib:libapr = $portVersion compat >= 1
-	lib:libapr-1 = $portVersion compat >= 1
-	"
-REQUIRES="
-	haiku >= $haikuVersion
-	"
-BUILD_REQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:gcc
-	cmd:ld
-	cmd:libtoolize
-	cmd:make
-	"
-BUILD_PREREQUIRES="
-	haiku-devel >= $haikuVersion
-	"
-
-SOURCE_DIR="$portVersionedName"
-
-BUILD()
-{
-	libtoolize --force --copy --install
-	touch libtool.m4
-	aclocal -I build
-	autoconf
-	./configure $configureDirArgs
-	# TODO: fix this hack (by finding out why top_builddir seems to be unset)!
-	ln -sfn $sourceDir/libtool /libtool
-	make
-}
-
-INSTALL()
-{
-	make install
-}
-
-TEST()
-{
-	make test
-}
-
-LICENSE="Apache v2"
-COPYRIGHT="2010 The Apache Software Foundation."
--- a/dev-libs/expat/expat-2.0.1.recipe
+++ b/dev-libs/expat/expat-2.0.1.recipe
@@ -5,7 +5,7 @@ DESCRIPTION="
 HOMEPAGE="http://expat.sourceforge.net/" 
 SRC_URI="http://iweb.dl.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz"
 CHECKSUM_MD5="ee8b492592568805593f81f8cdf2a04c"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 ?x86"

 PROVIDES="
@@ -24,7 +24,7 @@ BUILD_REQUIRES="
 	cmd:make
 	"
 BUILD_PREREQUIRES="
-	haiku-devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
 	"

 SOURCE_DIR="$portVersionedName"
--- a/dev-libs/libxml2/libxml2-2.7.8.recipe
+++ b/dev-libs/libxml2/libxml2-2.7.8.recipe
@@ -1,4 +1,56 @@
 SUMMARY="The XML C parser and toolkit of Gnome"
+HOMEPAGE="http://www.xmlsoft.org/" 
+LICENSE="MIT"
+COPYRIGHT="1998-2003 Daniel Veillard.  All Rights Reserved."
+SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz"
+CHECKSUM_MD5="8127a65e8c3b08856093099b52599c86"
+REVISION="4"
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PROVIDES="
+	libxml2 = $portVersion compat >= 2.7
+	lib:libxml2 = $portVersion compat >= 2.7
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	zlib
+	"
+BUILD_REQUIRES="
+	$REQUIRES
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	automake
+	./configure $configureDirArgs --enable-ipv6=no LDFLAGS="-lnetwork"
+	make
+}
+
+INSTALL()
+{
+	make install
+}
+
+TEST()
+{
+	make tests
+}
+
 DESCRIPTION="
 	Libxml2 is the XML C parser and toolkit developed for the Gnome project 
 	(but usable outside of the Gnome platform), it is free software available 
@@ -52,55 +104,3 @@ DESCRIPTION="
 	on but it would be far too early to make any conformance statement about 
 	it at the moment.
 	"
-HOMEPAGE="http://www.xmlsoft.org/" 
-SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz"
-CHECKSUM_MD5="8127a65e8c3b08856093099b52599c86"
-REVISION="3"
-ARCHITECTURES="x86_gcc2 ?x86"
-
-PROVIDES="
-	libxml2 = $portVersion compat >= 2.7
-	lib:libxml2 = $portVersion compat >= 2.7
-	"
-REQUIRES="
-	haiku >= $haikuVersion
-	zlib
-	"
-BUILD_REQUIRES="
-	$REQUIRES
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:gcc
-	cmd:ld
-	cmd:libtoolize
-	cmd:make
-	"
-BUILD_PREREQUIRES="
-	haiku-devel >= $haikuVersion
-	"
-
-SOURCE_DIR="$portVersionedName"
-
-BUILD()
-{
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	automake
-	./configure $configureDirArgs --enable-ipv6=no LDFLAGS="-lnetwork"
-	make
-}
-
-INSTALL()
-{
-	make install
-}
-
-TEST()
-{
-	make tests
-}
-
-LICENSE="MIT"
-COPYRIGHT="1998-2003 Daniel Veillard.  All Rights Reserved."
--- a/dev-libs/openssl/openssl-1.0.0d.recipe
+++ b/dev-libs/openssl/openssl-1.0.0d.recipe
@@ -17,7 +17,7 @@ DESCRIPTION="
 HOMEPAGE="http://www.openssl.org/"
 SRC_URI="http://www.openssl.org/source/openssl-1.0.0d.tar.gz"
 CHECKSUM_MD5="40b6ea380cc8a5bf9734c2f8bf7e701e"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 ?x86"

 PROVIDES="
@@ -40,7 +40,7 @@ BUILD_REQUIRES="
 	cmd:sed
 	"
 BUILD_PREREQUIRES="
-	haiku-devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
 	"

 SOURCE_DIR="$portVersionedName"