From 8ef737ea8a3d880bc94db0a432544e490e3cc386 Mon Sep 17 00:00:00 2001 From: Dareus Date: Tue, 3 Dec 2013 04:46:41 +0000 Subject: [PATCH 01/11] aalib recipe fixed. --- media-libs/aalib/aalib-1.4rc4.recipe | 72 ++++++++++++++------- media-libs/aalib/patches/aalib-1.4rc4.patch | 10 +++ 2 files changed, 60 insertions(+), 22 deletions(-) create mode 100644 media-libs/aalib/patches/aalib-1.4rc4.patch diff --git a/media-libs/aalib/aalib-1.4rc4.recipe b/media-libs/aalib/aalib-1.4rc4.recipe index 29a13d8cb..fd00fd71c 100644 --- a/media-libs/aalib/aalib-1.4rc4.recipe +++ b/media-libs/aalib/aalib-1.4rc4.recipe @@ -1,31 +1,59 @@ -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" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +SOURCE_DIR="aalib-1.4.0" +CHECKSUM_MD5="d5aa8e9eae07b7441298b5c30490f6a6" +REVISION="2" +LICENSE="Public Domain" +COPYRIGHT="Copyright (C) 1997 by Jam Hubicka" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + aalib = $portVersion + cmd:aafire + cmd:aainfo + cmd:aalib_config + cmd:aasavefont + cmd:aatest + lib:libaa + devel:libaa +" + +REQUIRES=" + haiku >= $haikuVersion +" + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + 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 -# autoconf -# automake - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR \ - --enable-static - make + libtoolize --force --copy --install + aclocal + autoconf + automake --add-missing + runConfigure ./configure + make } INSTALL() { - cd aalib-1.4.0 - make install + make install + prepareInstalledDevelLibs libaa } - -LICENSE="Public Domain" -#COPYRIGHT="" diff --git a/media-libs/aalib/patches/aalib-1.4rc4.patch b/media-libs/aalib/patches/aalib-1.4rc4.patch new file mode 100644 index 000000000..52cf48b45 --- /dev/null +++ b/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 From 3b787f6624463045c16c893d317959c44a74e28f Mon Sep 17 00:00:00 2001 From: Dareus Date: Tue, 3 Dec 2013 04:47:45 +0000 Subject: [PATCH 02/11] bc recipe fixed. --- sys-devel/bc/bc-1.06.recipe | 61 +++++++++++++++++++++++++++---------- 1 file changed, 45 insertions(+), 16 deletions(-) diff --git a/sys-devel/bc/bc-1.06.recipe b/sys-devel/bc/bc-1.06.recipe index cf88b843d..2ba8de9ef 100644 --- a/sys-devel/bc/bc-1.06.recipe +++ b/sys-devel/bc/bc-1.06.recipe @@ -1,31 +1,60 @@ -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=" + bison + flex +" + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:make + cmd:flex + cmd:bison +" + +PATCHES=" + bc-1.06.patch +" + BUILD() { - cd bc-1.06 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make + ./configure --prefix=$prefix \ + --infodir=$infoDir \ + --mandir=$manDir + make } INSTALL() { - cd bc-1.06 - make install DESTDIR=${DESTDIR} + make install DESTDIR=${installDestDir} } TEST() { - cd bc-1.06/Test timetest } - -LICENSE="GNU GPL v2 - GNU LGPL v2.1" -COPYRIGHT="1991-2000 Free Software Foundation, Inc." From 0ac210d53d654e721bcb2afba0602d786a7974a2 Mon Sep 17 00:00:00 2001 From: Dareus Date: Tue, 3 Dec 2013 04:48:44 +0000 Subject: [PATCH 03/11] bladeenc recipe fixed. --- media-sound/bladeenc/bladeenc-0.94.2.recipe | 47 +++++++++++++++---- .../bladeenc/patches/bladeenc-0.94.2.patch | 12 +++++ 2 files changed, 50 insertions(+), 9 deletions(-) diff --git a/media-sound/bladeenc/bladeenc-0.94.2.recipe b/media-sound/bladeenc/bladeenc-0.94.2.recipe index 24e084884..ef4b4ca14 100644 --- a/media-sound/bladeenc/bladeenc-0.94.2.recipe +++ b/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" -STATUS_HAIKU="stable" -DEPEND="" +REVISION="2" +LICENSE="GNU LGPL v2.1" +COPYRIGHT="1998-2000 Tord Jansson" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + bladeenc = $portVersion + cmd:bladeenc +" + +REQUIRES=" + haiku >= $haikuVersion +" + +BUILD_REQUIRES=" +" + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + 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" diff --git a/media-sound/bladeenc/patches/bladeenc-0.94.2.patch b/media-sound/bladeenc/patches/bladeenc-0.94.2.patch index 48ed25fb9..db7f02391 100644 --- a/media-sound/bladeenc/patches/bladeenc-0.94.2.patch +++ b/media-sound/bladeenc/patches/bladeenc-0.94.2.patch @@ -19,4 +19,16 @@ diff -urN bladeenc-0.94.2/bladeenc/system.h bladeenc-0.94.2-haiku/bladeenc/syste +# if defined __BEOS__ || defined __HAIKU__ # 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) From 92630bc8bab9d2d0f1d0c085ce8bab738bec9023 Mon Sep 17 00:00:00 2001 From: Dareus Date: Wed, 4 Dec 2013 05:39:02 +0000 Subject: [PATCH 04/11] Added devel package configuration to the aalib recipe. --- media-libs/aalib/aalib-1.4rc4.recipe | 37 +++++++++++++++++++++------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/media-libs/aalib/aalib-1.4rc4.recipe b/media-libs/aalib/aalib-1.4rc4.recipe index fd00fd71c..8491ef1b2 100644 --- a/media-libs/aalib/aalib-1.4rc4.recipe +++ b/media-libs/aalib/aalib-1.4rc4.recipe @@ -11,16 +11,11 @@ LICENSE="Public Domain" COPYRIGHT="Copyright (C) 1997 by Jam Hubicka" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - aalib = $portVersion - cmd:aafire - cmd:aainfo - cmd:aalib_config - cmd:aasavefont - cmd:aatest - lib:libaa - devel:libaa + aalib$secondaryArchSuffix = $portVersion compat >= 1.0.4 + lib:libaa$secondaryArchSuffix " REQUIRES=" @@ -49,11 +44,35 @@ BUILD() autoconf automake --add-missing runConfigure ./configure - make + make $jobArgs } INSTALL() { make install prepareInstalledDevelLibs libaa + fixPkgconfig + + # devel package + packageEntries devel \ + $binDir \ + $developDir \ + $manDir/man3 } + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libaa${secondaryArchSuffix}_devel = $portVersion compat >= 1.0.4 + cmd:aafire${secondaryArchSuffix} = $portVersion compat >= 1.0.4 + cmd:aainfo${secondaryArchSuffix} = $portVersion compat >= 1.0.4 + cmd:aalib_config${secondaryArchSuffix} = $portVersion compat >= 1.0.4 + cmd:aasavefont${secondaryArchSuffix} = $portVersion compat >= 1.0.4 + cmd:aatest${secondaryArchSuffix} = $portVersion compat >= 1.0.4 + devel:libaa$secondaryArchSuffix = $portVersion compat >= 1.0.4 +" +REQUIRES_devel=" + libaa$secondaryArchSuffix == $portVersion base + lib:libaa$secondaryArchSuffix + lib:libroot$secondaryArchSuffix +" From beec0c4c7b5ebc6fb3a876cc5e0e6d42a3453f5e Mon Sep 17 00:00:00 2001 From: Dareus Date: Wed, 4 Dec 2013 05:39:38 +0000 Subject: [PATCH 05/11] bladeenc recipe file updated. --- media-sound/bladeenc/bladeenc-0.94.2.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/bladeenc/bladeenc-0.94.2.recipe b/media-sound/bladeenc/bladeenc-0.94.2.recipe index ef4b4ca14..e35ea82eb 100644 --- a/media-sound/bladeenc/bladeenc-0.94.2.recipe +++ b/media-sound/bladeenc/bladeenc-0.94.2.recipe @@ -22,10 +22,10 @@ REQUIRES=" " BUILD_REQUIRES=" + haiku_devel >= $haikuVersion " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion cmd:gcc cmd:make cmd:libtoolize From 1dc2150abef5b62cb9b887f4b22d21a8e53d1216 Mon Sep 17 00:00:00 2001 From: Dareus Date: Thu, 5 Dec 2013 04:27:47 +0000 Subject: [PATCH 06/11] aalib recipe updated. --- media-libs/aalib/aalib-1.4rc4.recipe | 79 +++++++++++++++------------- 1 file changed, 42 insertions(+), 37 deletions(-) diff --git a/media-libs/aalib/aalib-1.4rc4.recipe b/media-libs/aalib/aalib-1.4rc4.recipe index 8491ef1b2..42f872401 100644 --- a/media-libs/aalib/aalib-1.4rc4.recipe +++ b/media-libs/aalib/aalib-1.4rc4.recipe @@ -1,6 +1,6 @@ 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. + 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" @@ -8,71 +8,76 @@ SOURCE_DIR="aalib-1.4.0" CHECKSUM_MD5="d5aa8e9eae07b7441298b5c30490f6a6" REVISION="2" LICENSE="Public Domain" -COPYRIGHT="Copyright (C) 1997 by Jam Hubicka" +COPYRIGHT="1997 by Jam Hubicka" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - aalib$secondaryArchSuffix = $portVersion compat >= 1.0.4 - lib:libaa$secondaryArchSuffix + aalib$secondaryArchSuffix = $portVersion compat >= 1.0.4 + lib:libaa$secondaryArchSuffix " REQUIRES=" haiku >= $haikuVersion " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion +" + BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - cmd:gcc - cmd:make - cmd:libtoolize - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:makeinfo + cmd:gcc + cmd:make + cmd:libtoolize + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:makeinfo " PATCHES=" - aalib-1.4rc4.patch + aalib-1.4rc4.patch " BUILD() { - libtoolize --force --copy --install - aclocal - autoconf - automake --add-missing - runConfigure ./configure - make $jobArgs + libtoolize --force --copy --install + aclocal + autoconf + automake --add-missing + runConfigure ./configure + make $jobArgs } INSTALL() { - make install - prepareInstalledDevelLibs libaa - fixPkgconfig + make install + prepareInstalledDevelLibs libaa + fixPkgconfig - # devel package - packageEntries devel \ - $binDir \ - $developDir \ - $manDir/man3 + # devel package + packageEntries devel \ + $binDir \ + $developDir \ + $manDir/man3 } # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - libaa${secondaryArchSuffix}_devel = $portVersion compat >= 1.0.4 - cmd:aafire${secondaryArchSuffix} = $portVersion compat >= 1.0.4 - cmd:aainfo${secondaryArchSuffix} = $portVersion compat >= 1.0.4 - cmd:aalib_config${secondaryArchSuffix} = $portVersion compat >= 1.0.4 - cmd:aasavefont${secondaryArchSuffix} = $portVersion compat >= 1.0.4 - cmd:aatest${secondaryArchSuffix} = $portVersion compat >= 1.0.4 - devel:libaa$secondaryArchSuffix = $portVersion compat >= 1.0.4 + libaa${secondaryArchSuffix}_devel = $portVersion compat >= 1.0.4 + cmd:aafire${secondaryArchSuffix} = $portVersion compat >= 1.0.4 + cmd:aainfo${secondaryArchSuffix} = $portVersion compat >= 1.0.4 + cmd:aalib_config${secondaryArchSuffix} = $portVersion compat >= 1.0.4 + cmd:aasavefont${secondaryArchSuffix} = $portVersion compat >= 1.0.4 + cmd:aatest${secondaryArchSuffix} = $portVersion compat >= 1.0.4 + devel:libaa$secondaryArchSuffix = $portVersion compat >= 1.0.4 " + REQUIRES_devel=" - libaa$secondaryArchSuffix == $portVersion base - lib:libaa$secondaryArchSuffix - lib:libroot$secondaryArchSuffix + libaa$secondaryArchSuffix == $portVersion base + lib:libaa$secondaryArchSuffix + lib:libroot$secondaryArchSuffix " + From ff6f0e1d75d0c427645309d409d30286a646316d Mon Sep 17 00:00:00 2001 From: Dareus Date: Thu, 5 Dec 2013 04:33:33 +0000 Subject: [PATCH 07/11] bc recipe updated. --- sys-devel/bc/bc-1.06.recipe | 40 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/sys-devel/bc/bc-1.06.recipe b/sys-devel/bc/bc-1.06.recipe index 2ba8de9ef..3ef625c6b 100644 --- a/sys-devel/bc/bc-1.06.recipe +++ b/sys-devel/bc/bc-1.06.recipe @@ -1,57 +1,55 @@ 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. + 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" CHECKSUM_MD5="d44b5dddebd8a7a7309aea6c36fda117" REVISION="2" LICENSE="GNU GPL v2 - GNU LGPL v2.1" + GNU LGPL v2.1" COPYRIGHT="1991-2000 Free Software Foundation, Inc." ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" PROVIDES=" - bc = $portVersion - cmd:bc - cmd:dc + bc = $portVersion + cmd:bc + cmd:dc " REQUIRES=" - haiku >= $haikuVersion + haiku >= $haikuVersion " BUILD_REQUIRES=" - bison - flex + haiku_devel >= $haikuVersion " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - cmd:gcc - cmd:make - cmd:flex - cmd:bison + cmd:gcc + cmd:make + cmd:flex + cmd:bison " PATCHES=" - bc-1.06.patch + bc-1.06.patch " BUILD() { - ./configure --prefix=$prefix \ - --infodir=$infoDir \ - --mandir=$manDir - make + ./configure --prefix=$prefix \ + --infodir=$infoDir \ + --mandir=$manDir + make $jobArgs } INSTALL() { - make install DESTDIR=${installDestDir} + make install } TEST() From cffe13f951a8aa7b797ac329ebd9d5b819d2f234 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 5 Dec 2013 12:58:30 -0800 Subject: [PATCH 08/11] Marked BDHCalc's LICENSE as undetermined, yes this breaks it for now, but the license issue needs to be sorted out --- haiku-apps/bdhcalc/bdhcalc-1.1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe index 85e34b1f8..74dc8f769 100644 --- a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe +++ b/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" From 4de4abc4070886c065a38bc933de0a57c0d454dd Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 6 Dec 2013 02:35:34 +0100 Subject: [PATCH 09/11] openjdk: Add some packaging treats Add to the package: * bin/java-config: When invoked with option -H it prints the java home directory. * data/profile.d/openjdk.sh: It is automatically sourced by /etc/profile and sets JAVA_HOME. --- .../openjdk/openjdk-1.7_2013_11_08.recipe | 13 +++++++ dev-lang/openjdk/sources/java-config.in | 37 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 dev-lang/openjdk/sources/java-config.in diff --git a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe b/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe index d32ff7eb5..39f1085dd 100644 --- a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe +++ b/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 } diff --git a/dev-lang/openjdk/sources/java-config.in b/dev-lang/openjdk/sources/java-config.in new file mode 100644 index 000000000..cd2f1b4c9 --- /dev/null +++ b/dev-lang/openjdk/sources/java-config.in @@ -0,0 +1,37 @@ +#!/bin/sh + + +javaHome="%JAVA_HOME%" + + +printUsage() +{ + cat < +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 From 2885b07e1bc641efe7024ce8d7f3af53a4c3e7f9 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 6 Dec 2013 02:40:00 +0100 Subject: [PATCH 10/11] Add recipe for Apache Ant 1.9.2 --- dev-java/ant_core/ant_core-1.9.2.recipe | 66 +++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 dev-java/ant_core/ant_core-1.9.2.recipe diff --git a/dev-java/ant_core/ant_core-1.9.2.recipe b/dev-java/ant_core/ant_core-1.9.2.recipe new file mode 100644 index 000000000..02040e7ae --- /dev/null +++ b/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 +} From d7f1b0d1cf93e3bc1846ab27cd61f74cefb5edd2 Mon Sep 17 00:00:00 2001 From: Dareus Date: Fri, 6 Dec 2013 05:53:37 +0000 Subject: [PATCH 11/11] aalib and bc recipe files updated --- media-libs/aalib/aalib-1.4rc4.recipe | 28 +++++++++++++++------------- sys-devel/bc/bc-1.06.recipe | 4 +--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/media-libs/aalib/aalib-1.4rc4.recipe b/media-libs/aalib/aalib-1.4rc4.recipe index 42f872401..aade064cd 100644 --- a/media-libs/aalib/aalib-1.4rc4.recipe +++ b/media-libs/aalib/aalib-1.4rc4.recipe @@ -14,20 +14,22 @@ ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - aalib$secondaryArchSuffix = $portVersion compat >= 1.0.4 - lib:libaa$secondaryArchSuffix + aalib$secondaryArchSuffix = $portVersion compat >= 1 + lib:libaa$secondaryArchSuffix = 1.0.4 compat >= 1 " + REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion " BUILD_PREREQUIRES=" - cmd:gcc + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:make cmd:libtoolize cmd:aclocal @@ -66,18 +68,18 @@ INSTALL() # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - libaa${secondaryArchSuffix}_devel = $portVersion compat >= 1.0.4 - cmd:aafire${secondaryArchSuffix} = $portVersion compat >= 1.0.4 - cmd:aainfo${secondaryArchSuffix} = $portVersion compat >= 1.0.4 - cmd:aalib_config${secondaryArchSuffix} = $portVersion compat >= 1.0.4 - cmd:aasavefont${secondaryArchSuffix} = $portVersion compat >= 1.0.4 - cmd:aatest${secondaryArchSuffix} = $portVersion compat >= 1.0.4 - devel:libaa$secondaryArchSuffix = $portVersion compat >= 1.0.4 + 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 - lib:libroot$secondaryArchSuffix + lib:libaa$secondaryArchSuffix >= 1.0.4 compat >= 1 + lib:libroot$secondaryArchSuffix >= $haikuVersion " diff --git a/sys-devel/bc/bc-1.06.recipe b/sys-devel/bc/bc-1.06.recipe index 3ef625c6b..be5c4fb85 100644 --- a/sys-devel/bc/bc-1.06.recipe +++ b/sys-devel/bc/bc-1.06.recipe @@ -41,9 +41,7 @@ PATCHES=" BUILD() { - ./configure --prefix=$prefix \ - --infodir=$infoDir \ - --mandir=$manDir + runConfigure --omit-dirs "docDir dataRootDir" ./configure make $jobArgs }