Fusionado haikuports/haikuports con master

dev-java/ant_core/ant_core-1.9.2.recipe

@@ -0,0 +1,66 @@
+SUMMARY="Java-based build tool similar to 'make' that uses XML configuration files"
+DESCRIPTION="Apache Ant is a Java library and command-line tool whose mission is to drive processes described in build files as targets and extension points dependent upon each other. The main known usage of Ant is the build of Java applications. Ant supplies a number of built-in tasks allowing to compile, assemble, test and run Java applications. Ant can also be used effectively to build non Java applications, for instance C or C++ applications. More generally, Ant can be used to pilot any type of process which can be described in terms of targets and tasks.
+
+Ant is written in Java. Users of Ant can develop their own "antlibs" containing Ant tasks and types, and are offered a large number of ready-made commercial or open-source "antlibs".
+
+Ant is extremely flexible and does not impose coding conventions or directory layouts to the Java projects which adopt it as a build tool.
+
+Software development projects looking for a solution combining build tool and dependency management can use Ant in combination with Apache Ivy.
+
+The Apache Ant project is part of the Apache Software Foundation."
+HOMEPAGE="http://ant.apache.org/"
+COPYRIGHT="1999-2013 The Apache Software Foundation"
+LICENSE="Apache v2"
+
+REVISION="1"
+ARCHITECTURES="any"
+
+SRC_URI="http://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2"
+CHECKSUM_MD5="8f610c1a0183507c2beebbf230f456af"
+SOURCE_DIR="apache-ant-$portVersion"
+
+PROVIDES="
+	ant_core = $portVersion compat >= 1
+	cmd:ant = $portVersion compat >= 1
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	cmd:java
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	cmd:java
+	cmd:java_config
+	cmd:javac
+	"
+
+PATCH()
+{
+	sed -i 's/depends=\"jars,test-jar\"/depends=\"jars\"/' build.xml
+}
+
+BUILD()
+{
+	export JAVA_HOME=$(java-config -H)
+	ANT_HOME= ./build.sh
+}
+
+INSTALL()
+{
+	export JAVA_HOME=$(java-config -H)
+	export ANT_HOME=$libDir/ant
+	./build.sh install-lite
+
+	# symlink the executable to binDir
+	mkdir -p $binDir
+	symlinkRelative -s $ANT_HOME/bin/ant $binDir
+
+	# create a profile.d file that sets up ANT_HOME
+	mkdir -p $dataDir/profile.d
+	echo ANT_HOME=$ANT_HOME > $dataDir/profile.d/ant.sh
+	echo "export ANT_HOME" >> $dataDir/profile.d/ant.sh
+}

dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe

@@ -54,6 +54,7 @@ PROVIDES="
 	cmd:jar = $portVersion compat >= 1
 	cmd:jarsigner = $portVersion compat >= 1
 	cmd:java = $portVersion compat >= 1
+	cmd:java_config = $portVersion compat >= 1
 	cmd:javac = $portVersion compat >= 1
 	cmd:javadoc = $portVersion compat >= 1
 	cmd:javah = $portVersion compat >= 1
@@ -191,4 +192,16 @@ INSTALL()
 	mkdir -p $binDir
 	symlinkRelative -s $jdkDir/bin/* $binDir
 		# TODO: We should probably link only a subset.
+
+	# create a java-config script in binDir
+	javaConfig=$binDir/java-config
+	sed -e "s,%JAVA_HOME%,$jdkDir," $portDir/sources/java-config.in \
+		> $javaConfig
+	chmod a+x $javaConfig
+
+	# create a profile.d file that sets up JAVA_HOME
+	jdkProfile=$dataDir/profile.d/openjdk.sh
+	mkdir -p $(dirname $jdkProfile)
+	echo JAVA_HOME=`java-config -H` > $jdkProfile
+	echo "export JAVA_HOME" >> $jdkProfile
 }

dev-lang/openjdk/sources/java-config.in

@@ -0,0 +1,37 @@
+#!/bin/sh
+
+
+javaHome="%JAVA_HOME%"
+
+
+printUsage()
+{
+	cat <<EOF
+Usage: java-config <option>
+Print java configuration values.
+
+Options:
+  -h, --help  - Print this help text.
+  -H          - Print Java home path.
+EOF
+}
+
+
+if [ $# -ne 1 ]; then
+	printUsage >&2
+	exit 1
+fi
+
+case "$1" in
+	-H)
+		echo $javaHome
+		;;
+	-h|--help)
+		printUsage
+		exit 0
+		;;
+	*)
+		printUsage >&2
+		exit 1
+		;;
+esac

haiku-apps/bdhcalc/bdhcalc-1.1.recipe

@@ -9,7 +9,7 @@ DESCRIPTION="BDH Calc is a fully functional 64bit calculator, supporting
 HOMEPAGE="http://haikuware.com/directory/view-details/science-math/calculators/bdh-calc-for-haiku"
 SRC_URI="git://github.com/ThomasCompix/BDH-Calc.git#4a6865932ae0e95244ed0149b6e8c4f437ea742a"
 REVISION="1"
-LICENSE="MIT"
+LICENSE="Undetermined"
 COPYRIGHT="1999 Scott Hammond"
 
 ARCHITECTURES="x86 x86_gcc2 !ppc"

media-libs/aalib/aalib-1.4rc4.recipe

@@ -1,31 +1,85 @@
-DESCRIPTION="aalib is an ASCII rendering 2D library" 
+SUMMARY="aalib is an ASCII rendering 2D library"
+DESCRIPTION="aalib is a software library which allows applications to
+	automatically convert still and moving images into ASCII art.
+"
 HOMEPAGE="http://aa-project.sourceforge.net/aalib/" 
 SRC_URI="http://prdownloads.sourceforge.net/aa-project/aalib-1.4rc4.tar.gz"
-#CHECKSUM_MD5="fddc3c704c5489de2a3cf0fedfec59db"
+SOURCE_DIR="aalib-1.4.0"
-REVISION="1"
+CHECKSUM_MD5="d5aa8e9eae07b7441298b5c30490f6a6"
-STATUS_HAIKU="stable"
+REVISION="2"
-DEPEND=""
+LICENSE="Public Domain"
+COPYRIGHT="1997 by Jam Hubicka"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	aalib$secondaryArchSuffix = $portVersion  compat >= 1
+	lib:libaa$secondaryArchSuffix = 1.0.4 compat >= 1
+"
+
+
+REQUIRES="
+	haiku >= $haikuVersion
+"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:makeinfo
+"
+
+PATCHES="
+	aalib-1.4rc4.patch
+"
+
 BUILD()
 {
-	cd aalib-1.4.0
 	libtoolize --force --copy --install
-#	aclocal
+	aclocal
-#	autoconf
+	autoconf
-#	automake
+	automake --add-missing
-	MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
+	runConfigure ./configure
-	LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
+	make $jobArgs
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--libdir=$LIBDIR \
-		--mandir=$MANDIR \
-		--enable-static
-	make
 }
 
 INSTALL()
 {
-	cd aalib-1.4.0
 	make install
+	prepareInstalledDevelLibs libaa
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+				$binDir \
+				$developDir \
+				$manDir/man3
 }
 
-LICENSE="Public Domain"
+# ----- devel package -------------------------------------------------------
-#COPYRIGHT=""
+
+PROVIDES_devel="
+	libaa${secondaryArchSuffix}_devel = $portVersion compat >= 1
+	cmd:aafire${secondaryArchSuffix} = $portVersion compat >= 1
+	cmd:aainfo${secondaryArchSuffix} = $portVersion compat >= 1
+	cmd:aalib_config${secondaryArchSuffix} = $portVersion compat >= 1
+	cmd:aasavefont${secondaryArchSuffix} = $portVersion compat >= 1
+	cmd:aatest${secondaryArchSuffix} = $portVersion compat >= 1
+	devel:libaa$secondaryArchSuffix = $portVersion compat >= 1
+"
+
+REQUIRES_devel="
+	libaa$secondaryArchSuffix == $portVersion base
+	lib:libaa$secondaryArchSuffix >= 1.0.4 compat >= 1
+	lib:libroot$secondaryArchSuffix >= $haikuVersion
+"
+

media-libs/aalib/patches/aalib-1.4rc4.patch

@@ -0,0 +1,10 @@
+--- aalib-1.4.0/configure.in	2001-04-24 14:00:02.060293120 +0000
++++ aalib-1.4.0-haiku/configure.in	2013-11-29 18:22:31.000000000 +0000
+@@ -4,6 +4,6 @@
+ AC_CANONICAL_HOST
+ AC_CANONICAL_TARGET
+
+-AM_CONFIG_HEADER(src/config.h)
++AC_CONFIG_HEADERS(src/config.h)
+
+ dnl Initialize the compiler and linker flags for AALIB applications

media-sound/bladeenc/bladeenc-0.94.2.recipe

@@ -1,25 +1,54 @@
-DESCRIPTION="BladeEnc is a free cross-platform MP3 encoder released under the LGPL." 
+SUMMARY="BladeEnc is a free cross-platform MP3 encoder"
+DESCRIPTION="BladeEnc is a free, cross-platform, console-based MP3 encoder,
+		based on the ISO reference code. It is mostly intended for high quality
+		encoding in high bitrates.
+"
 HOMEPAGE="http://bladeenc.mp3.no/" 
 SRC_URI="ftp://ftp.free.fr/.mirrors1/ftp.gentoo.org/distfiles/bladeenc-0.94.2-src-stable.tar.gz"
 CHECKSUM_MD5="9b9f6eafe1637a48a67f0a0f8f6e71ad"
-REVISION="1"
+REVISION="2"
-STATUS_HAIKU="stable"
+LICENSE="GNU LGPL v2.1"
-DEPEND=""
+COPYRIGHT="1998-2000 Tord Jansson"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	bladeenc = $portVersion
+	cmd:bladeenc
+"
+
+REQUIRES="
+	haiku >= $haikuVersion
+"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+"
+
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:make
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:automake
+	cmd:autoconf
+"
+
+PATCHES="
+	bladeenc-0.94.2.patch
+"
+
 BUILD()
 {
-	cd bladeenc-0.94.2
 	libtoolize --force --copy --install
 	aclocal
 	automake --add-missing
 	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 	make
 }
 
 INSTALL()
 {
-	cd bladeenc-0.94.2
 	make install
 }
-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="1998-2000 Tord Jansson"

media-sound/bladeenc/patches/bladeenc-0.94.2.patch

@@ -20,3 +20,15 @@ diff -urN bladeenc-0.94.2/bladeenc/system.h bladeenc-0.94.2-haiku/bladeenc/syste
  #		define		SYSTEM		BEOS
  #	endif
 
+diff -aurN bladeenc-0.94.2/configure.in bladeenc-0.94.2-haiku/configure.in
+--- bladeenc-0.94.2/configure.in	2001-05-03 10:32:44.040894464 +0000
++++ bladeenc-0.94.2-haiku/configure.in	2013-11-30 16:49:17.864026624 +0000
+@@ -1,7 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(Makefile.am)
+
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ AM_INIT_AUTOMAKE(bladeenc,0.94.2)
+ 

sys-devel/bc/bc-1.06.recipe

@@ -1,31 +1,56 @@
-DESCRIPTION="Handy console-based calculator utility" 
+SUMMARY="Handy console-based calculator utility"
+DESCRIPTION="bc is an arbitrary precision numeric processing language.
+	Syntax is similar to C, but differs in many substantial areas. It
+	supports interactive execution of statements. bc is a utility included
+	in the POSIX P1003.2/D11 draft standard.
+"
 HOMEPAGE="http://www.gnu.org/software/bc/bc.html" 
 SRC_URI="http://ftp.gnu.org/gnu/bc/bc-1.06.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
 CHECKSUM_MD5="d44b5dddebd8a7a7309aea6c36fda117"
+REVISION="2"
+LICENSE="GNU GPL v2
+	GNU LGPL v2.1"
+COPYRIGHT="1991-2000 Free Software Foundation, Inc."
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	bc = $portVersion
+	cmd:bc
+	cmd:dc
+"
+
+REQUIRES="
+	haiku >= $haikuVersion
+"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+"
+
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:make
+	cmd:flex
+	cmd:bison
+"
+
+PATCHES="
+	bc-1.06.patch
+"
+
 BUILD()
 {
-	cd bc-1.06
+	runConfigure --omit-dirs "docDir dataRootDir" ./configure
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
+	make $jobArgs
-		--infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man 
-	make
 }
 
 INSTALL()
 {
-	cd bc-1.06
+	make install 
-	make install DESTDIR=${DESTDIR}
 }
 
 TEST()
 {
-	cd bc-1.06/Test
 	timetest
 }
-
-LICENSE="GNU GPL v2
-	GNU LGPL v2.1"
-COPYRIGHT="1991-2000 Free Software Foundation, Inc."