Merged haikuports/haikuports into master

2026-04-23 04:00:05 +02:00 · 2014-12-07 07:44:56 -08:00
parent fd3d82d8f6 22be0c52aa
commit 56695045e9
13 changed files with 214 additions and 149 deletions
--- a/dev-libs/libtommath/libtommath-0.42.0.recipe
+++ b/dev-libs/libtommath/libtommath-0.42.0.recipe
@@ -0,0 +1,54 @@
+SUMMARY="LibTomMath is a theoretic integer library written entirely in C."
+DESCRIPTION="LibTomMath is a free open source portable number theoretic \
+multiple-precision integer library written entirely in C."
+HOMEPAGE="http://libtommath.org"
+SRC_URI="https://github.com/libtom/libtommath/archive/v0.42.0.tar.gz"
+CHECKSUM_SHA256="5246356ba18c1b6edf4a7bc836a3d223842b86914cdba6dd8c112bfc59e227c8"
+REVISION="1"
+LICENSE="Public Domain"
+COPYRIGHT="2010 Tom St. Denis"
+PATCHES="libtommath-0.42.0.patchset"
+
+ARCHITECTURES="x86_gcc2 ?x86"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+        libtommath$secondaryArchSuffix = $portVersion
+        "
+
+PROVIDES_devel="
+              libtommath${secondaryArchSuffix}_devel = $portVersion
+              devel:libtommath$secondaryArchSuffix = $portVersion
+              "
+
+REQUIRES="
+        haiku$secondaryArchSuffix >= $haikuVersion
+        "
+        
+REQUIRES_devel="
+              haiku${secondaryArchSuffix}_devel >= $haikuVersion
+              libtommath$secondaryArchSuffix == $portVersion base
+              "
+
+BUILD_REQUIRES="
+              haiku${secondaryArchSuffix}_devel >= $haikuVersion
+              cmd:make
+              cmd:cc
+              cmd:ar
+              cmd:ranlib
+              cmd:install
+              "
+              
+BUILD()
+{
+	make $jobArgs
+}
+
+INSTALL()
+{
+	export LIBPATH=$libDir
+	export INCPATH=$includeDir
+	make install $jobArgs
+	prepareInstalledDevelLibs libtommath
+	packageEntries devel $developDir
+}
--- a/dev-libs/libtommath/patches/libtommath-0.42.0.patchset
+++ b/dev-libs/libtommath/patches/libtommath-0.42.0.patchset
@@ -0,0 +1,50 @@
+From f2b4b4b4aa83b658ae9a23d5195e04487a102d88 Mon Sep 17 00:00:00 2001
+From: Nolan Clark <tweakdeveloper@gmail.com>
+Date: Sat, 6 Dec 2014 16:01:50 -0600
+Subject: applying patch makefile.patch
+
+
+diff --git a/makefile b/makefile
+index 70de306..e3a0a04 100644
+--- a/makefile
+++ b/makefile
+@@ -27,18 +27,9 @@ CFLAGS  += -fomit-frame-pointer
+ 
+ endif
+ 
+-#install as this user
+-ifndef INSTALL_GROUP
+-   GROUP=wheel
+-else
+-   GROUP=$(INSTALL_GROUP)
+-endif
+-
+-ifndef INSTALL_USER
+-   USER=root
+-else
+-   USER=$(INSTALL_USER)
+-endif
+#install as this user and group
+USER=user
+GROUP=root
+ 
+ #default files to install
+ ifndef LIBNAME
+@@ -49,14 +40,6 @@ default: ${LIBNAME}
+ 
+ HEADERS=tommath.h tommath_class.h tommath_superclass.h
+ 
+-#LIBPATH-The directory for libtommath to be installed to.
+-#INCPATH-The directory to install the header files for libtommath.
+-#DATAPATH-The directory to install the pdf docs.
+-DESTDIR=
+-LIBPATH=/usr/lib
+-INCPATH=/usr/include
+-DATAPATH=/usr/share/doc/libtommath/pdf
+-
+ OBJECTS=bncore.o bn_mp_init.o bn_mp_clear.o bn_mp_exch.o bn_mp_grow.o bn_mp_shrink.o \
+ bn_mp_clamp.o bn_mp_zero.o  bn_mp_set.o bn_mp_set_int.o bn_mp_init_size.o bn_mp_copy.o \
+ bn_mp_init_copy.o bn_mp_abs.o bn_mp_neg.o bn_mp_cmp_mag.o bn_mp_cmp.o bn_mp_cmp_d.o \
+-- 
+1.8.3.4
+
--- a/media-fonts/lohit/lohit-2.3.8.recipe
+++ b/media-fonts/lohit/lohit-2.3.8.recipe
@@ -21,7 +21,9 @@ DISABLE_SOURCE_PACKAGE=yes
 PROVIDES="lohit = $portVersion"
 REQUIRES=""
 BUILD_REQUIRES=""
-BUILD_PREREQUIRES="coreutils"
+BUILD_PREREQUIRES="
+	cmd:find
+"

 SOURCE_DIR="lohit-fonts-2.3.8"

--- a/media-libs/ilmbase/ilmbase-2.2.0.recipe
+++ b/media-libs/ilmbase/ilmbase-2.2.0.recipe
@@ -26,11 +26,11 @@ SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
 	ilmbase$secondaryArchSuffix = $portVersion
-	lib:libHalf$secondaryArchSuffix = 12.0.0 compat >= 12
-	lib:libIex_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
-	lib:libIexMath_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
-	lib:libIlmThread_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
-	lib:libImath_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
+	lib:libhalf$secondaryArchSuffix = 12.0.0 compat >= 12
+	lib:libiex_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
+	lib:libiexmath_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
+	lib:libilmthread_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
+	lib:libimath_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
 	"

 REQUIRES="
@@ -80,15 +80,15 @@ TEST()

 PROVIDES_devel="
 	ilmbase${secondaryArchSuffix}_devel = $portVersion
-	devel:libHalf$secondaryArchSuffix = 12.0.0 compat >= 12
-	devel:libIex_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
-	devel:libIexMath_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
-	devel:libIlmThread_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
-	devel:libImath_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
-	devel:libIex$secondaryArchSuffix = 12.0.0 compat >= 12
-	devel:libIexMath$secondaryArchSuffix = 12.0.0 compat >= 12
-	devel:libIlmThread$secondaryArchSuffix = 12.0.0 compat >= 12
-	devel:libImath$secondaryArchSuffix = 12.0.0 compat >= 12
+	devel:libhalf$secondaryArchSuffix = 12.0.0 compat >= 12
+	devel:libiex_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
+	devel:libiexmath_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
+	devel:libilmthread_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
+	devel:libimath_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
+	devel:libiex$secondaryArchSuffix = 12.0.0 compat >= 12
+	devel:libiexMath$secondaryArchSuffix = 12.0.0 compat >= 12
+	devel:libilmthread$secondaryArchSuffix = 12.0.0 compat >= 12
+	devel:libimath$secondaryArchSuffix = 12.0.0 compat >= 12
 	"
 REQUIRES_devel="
 	ilmbase$secondaryArchSuffix == $portVersion base
--- a/media-libs/openexr/openexr-2.2.0.recipe
+++ b/media-libs/openexr/openexr-2.2.0.recipe
@@ -27,10 +27,10 @@ SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
 	openexr$secondaryArchSuffix = $portVersion
-	lib:libIlmImf$secondaryArchSuffix = 22.0.0 compat >= 22 
-	lib:libIlmImf_2_2$secondaryArchSuffix = 22.0.0 compat >= 22
-	lib:libIlmImfUtil$secondaryArchSuffix = 22.0.0 compat >= 22
-	lib:libIlmImfUtil_2_2$secondaryArchSuffix = 22.0.0 compat >= 22
+	lib:libilmimf$secondaryArchSuffix = 22.0.0 compat >= 22 
+	lib:libilmimf_2_2$secondaryArchSuffix = 22.0.0 compat >= 22
+	lib:libilmimfutil$secondaryArchSuffix = 22.0.0 compat >= 22
+	lib:libilmimfutil_2_2$secondaryArchSuffix = 22.0.0 compat >= 22
 	cmd:exrenvmap$secondaryArchSuffix = $portVersion
 	cmd:exrheader$secondaryArchSuffix = $portVersion
 	cmd:exrmakepreview$secondaryArchSuffix = $portVersion
@@ -42,22 +42,22 @@ PROVIDES="

 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	lib:libHalf$secondaryArchSuffix == 12.0.0
-	lib:libIex_2_2$secondaryArchSuffix == 12.0.0
-	lib:libIexMath_2_2$secondaryArchSuffix == 12.0.0
-	lib:libIlmThread_2_2$secondaryArchSuffix == 12.0.0
-	lib:libImath_2_2$secondaryArchSuffix == 12.0.0
+	lib:libhalf$secondaryArchSuffix == 12.0.0
+	lib:libiex_2_2$secondaryArchSuffix == 12.0.0
+	lib:libiexmath_2_2$secondaryArchSuffix == 12.0.0
+	lib:libilmthread_2_2$secondaryArchSuffix == 12.0.0
+	lib:libimath_2_2$secondaryArchSuffix == 12.0.0
 	lib:libz$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	ilmbase${secondaryArchSuffix}_devel == $portVersion
-	devel:libHalf$secondaryArchSuffix == 12.0.0
-	devel:libIex$secondaryArchSuffix == 12.0.0
-	devel:libIexMath$secondaryArchSuffix == 12.0.0
-	devel:libIlmThread$secondaryArchSuffix == 12.0.0
-	devel:libImath$secondaryArchSuffix == 12.0.0
+	devel:libhalf$secondaryArchSuffix == 12.0.0
+	devel:libiex$secondaryArchSuffix == 12.0.0
+	devel:libiexMath$secondaryArchSuffix == 12.0.0
+	devel:libilmthread$secondaryArchSuffix == 12.0.0
+	devel:libimath$secondaryArchSuffix == 12.0.0
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
@@ -119,10 +119,10 @@ TEST()

 PROVIDES_devel="
 	openexr${secondaryArchSuffix}_devel = $portVersion
-	devel:libIlmImf$secondaryArchSuffix = $portVersion
-	devel:libIlmImf_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
-	devel:libIlmImfUtil$secondaryArchSuffix = $portVersion
-	devel:libIlmImfUtil_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
+	devel:libilmimf$secondaryArchSuffix = $portVersion
+	devel:libilmimf_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
+	devel:libilmimfutil$secondaryArchSuffix = $portVersion
+	devel:libilmimfutil_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
 	"
 REQUIRES_devel="
 	openexr$secondaryArchSuffix == $portVersion base
--- a/media-libs/vigra/vigra-1.10.0.recipe
+++ b/media-libs/vigra/vigra-1.10.0.recipe
@@ -9,7 +9,7 @@ HOMEPAGE="http://ukoethe.github.io/vigra/"
 SRC_URI="https://github.com/ukoethe/vigra/archive/Version-1-10-0.tar.gz"
 SRC_FILENAME="$portName-$portVersion.tar.gz"
 CHECKSUM_SHA256="406f6fcbcea2e92f681a7b844487c29049d338f5b2b25f8145e67bcb518c7ef8"
-REVISION="5"
+REVISION="6"

 ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
 SECONDARY_ARCHITECTURES="?x86 ?x86_gcc2"
@@ -25,11 +25,11 @@ REQUIRES="
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
 	lib:libtiff$secondaryArchSuffix
-	lib:libHalf$secondaryArchSuffix
-	lib:libIex_2_2$secondaryArchSuffix
-	lib:libImath_2_2$secondaryArchSuffix
-	lib:libIlmThread_2_2$secondaryArchSuffix
-	lib:libIlmImf_2_2$secondaryArchSuffix
+	lib:libhalf$secondaryArchSuffix
+	lib:libiex_2_2$secondaryArchSuffix
+	lib:libimath_2_2$secondaryArchSuffix
+	lib:libilmthread_2_2$secondaryArchSuffix
+	lib:libilmimf_2_2$secondaryArchSuffix
 	lib:libfftw$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
@@ -38,10 +38,10 @@ BUILD_REQUIRES="
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
 	devel:libtiff$secondaryArchSuffix
-	devel:libHalf$secondaryArchSuffix
-	devel:libIex$secondaryArchSuffix
-	devel:libImath$secondaryArchSuffix
-	devel:libIlmImf$secondaryArchSuffix
+	devel:libhalf$secondaryArchSuffix
+	devel:libiex$secondaryArchSuffix
+	devel:libimath$secondaryArchSuffix
+	devel:libilmimf$secondaryArchSuffix
 	devel:libfftw$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 "
@@ -78,6 +78,10 @@ INSTALL()

 	prepareInstalledDevelLib libvigraimpex

+	fixDevelopLibDirReferences bin/vigra-config
+	sed -i "s#/include/#/$relativeIncludeDir/#g" \
+		bin/vigra-config
+
 	# move CMake scripts...
 	# FIXME: ...which probably won't work
 	mv $libDir/$portName $developLibDir
--- a/net-proxy/privoxy/patches/privoxy-3.0.19.patch
+++ b/net-proxy/privoxy/patches/privoxy-3.0.19.patch
@@ -1,72 +0,0 @@
-diff -Naur privoxy-3.0.19-stable/configure.in privoxy-3.0.19-stable-haiku/configure.in
--- privoxy-3.0.19-stable/configure.in	2012-09-12 20:00:37.292814848 -0400
-+++ privoxy-3.0.19-stable-haiku/configure.in	2012-09-12 22:21:25.287309824 -0400
-@@ -160,7 +160,7 @@
- dnl =================================================================
- 
- 
-if test "$EMXOS2" = yes; then
-+if test "$EMXOS2" = yes || test "$host_os" = haiku; then
-   echo "Skipping user and group validity stuff.";
- 
- else
-@@ -677,6 +677,26 @@
- AC_SUBST(AMIGAOS_ONLY)
- 
- dnl =================================================================
-+dnl Haiku specific
-+dnl =================================================================
-+
-+if test "$host_os" = haiku; then
-+  # Omit the "-pthread" flag to gcc, even when building with gcc 2.95
-+  SPECIAL_CFLAGS=
-+
-+  # Haiku's pthreads implementation exists in its system library,
-+  # libroot, not in a separate pthreads library
-+  PTHREAD_LIB=
-+
-+  # Networking code exists in libnetwork
-+  SOCKET_LIB=-lnetwork
-+
-+  # Search Haiku's common-library folder to find its pcre and
-+  # pcreposix libraries
-+  LIBS="-L/boot/common/lib $LIBS"
-+fi
-+
-+dnl =================================================================
- dnl Check for standard compiler stuff
- dnl =================================================================
- 
-diff -Naur privoxy-3.0.19-stable/filters.c privoxy-3.0.19-stable-haiku/filters.c
--- privoxy-3.0.19-stable/filters.c	2012-09-12 20:00:37.720371712 -0400
-+++ privoxy-3.0.19-stable-haiku/filters.c	2012-09-12 22:21:28.150470656 -0400
-@@ -1095,6 +1095,11 @@
-    char *new_url = NULL;
-    char *tmp;
- 
-+   char *url_segment = NULL;
-+   char **url_segments;
-+   size_t max_segments;
-+   int segments;
-+
-    assert(subject);
-    assert(redirect_mode);
- 
-@@ -1117,14 +1122,13 @@
-        * and look for a URL in the decoded result.
-        * Stop the search after the first match.
-        */
-      char *url_segment = NULL;
-+
-       /*
-        * XXX: This estimate is guaranteed to be high enough as we
-        *      let ssplit() ignore empty fields, but also a bit wasteful.
-        */
-      size_t max_segments = strlen(subject) / 2;
-      char **url_segments = malloc(max_segments * sizeof(char *));
-      int segments;
-+      max_segments = strlen(subject) / 2;
-+      url_segments = malloc(max_segments * sizeof(char *));
- 
-       if (NULL == url_segments)
-       {
--- a/net-proxy/privoxy/privoxy-3.0.19.recipe
+++ b/net-proxy/privoxy/privoxy-3.0.19.recipe
@@ -1,34 +0,0 @@
-DESCRIPTION="
-A web proxy with advanced filtering capabilities for protecting privacy \
-against Internet junk.
-"
-HOMEPAGE="http://www.privoxy.org/"
-SRC_URI="http://sourceforge.net/projects/ijbswa/files/Sources/3.0.19%20%28stable%29/privoxy-3.0.19-stable-src.tar.gz/download"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="57acc79059565cc42eda67982842785d"
-
-BUILD()
-{
-	cd privoxy-3.0.19-stable
-	autoheader
-	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
-		--sysconfdir=`finddir B_COMMON_ETC_DIRECTORY`/privoxy \
-		--localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \
-		--datarootdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \
-		--infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
-	make
-}
-
-INSTALL()
-{
-	cd privoxy-3.0.19-stable
-	make install
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2001-2011 Privoxy Developers"
--- a/net-proxy/privoxy/privoxy-3.0.21.recipe
+++ b/net-proxy/privoxy/privoxy-3.0.21.recipe
@@ -0,0 +1,56 @@
+SUMMARY="A web proxy with advanced filtering capabilities for protecting privacy against Internet junk."
+DESCRIPTION="
+	Privoxy is a non-caching web proxy with advanced filtering
+	capabilities for enhancing privacy, modifying web page data and
+	HTTP headers, controlling access, and removing ads and other
+	obnoxious Internet junk. Privoxy has a flexible configuration and
+	can be customized to suit individual needs and tastes. It has
+	application for both stand-alone systems and multi-user
+	networks.
+    "
+HOMEPAGE="http://www.privoxy.org/"
+SRC_URI="http://sourceforge.net/projects/ijbswa/files/Sources/3.0.21%20%28stable%29/privoxy-3.0.21-stable-src.tar.gz"
+SOURCE_DIR="privoxy-3.0.21-stable"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 !ppc"
+CHECKSUM_SHA256="5ec7e601948d2bd0ebf0ebe90eed7d49e7663c395ce16d0403e91ea2d459ddb8"
+
+REQUIRES="
+	haiku >= $haikuVersion 
+"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+"
+
+BUILD_PREREQUIRES="
+	cmd:autoheader
+	cmd:autoconf
+	cmd:make
+	cmd:grep
+	cmd:sed
+	cmd:g++
+	cmd:find
+"
+
+PROVIDES="
+	cmd:privoxy = $portVersion
+	"
+
+BUILD()
+{
+	host_os=haiku
+	autoheader
+	autoconf
+	runConfigure ./configure
+	make
+}
+
+INSTALL()
+{
+	host_os=haiku
+	make install USER=privoxy
+}
+
+LICENSE="GNU GPL v2"
+COPYRIGHT="2001-2011 Privoxy Developers"
--- a/sys-apps/texinfo/texinfo-4.13a.recipe
+++ b/sys-apps/texinfo/texinfo-4.13a.recipe
@@ -35,6 +35,7 @@ BUILD_PREREQUIRES="
 	cmd:ld
 	cmd:libtoolize
 	cmd:make
+	cmd:grep
 	cmd:sed
 	"

--- a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe
+++ b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe
@@ -41,6 +41,7 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:autoconf
+	cmd:find
 	cmd:flex
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
@@ -48,6 +49,7 @@ BUILD_PREREQUIRES="
 	cmd:makeinfo
 	cmd:sed
 	cmd:tar
+	cmd:xargs
 	"

 SOURCE_DIR="binutils-$portVersion/legacy/binutils"
--- a/sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe
+++ b/sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe
@@ -8,6 +8,7 @@ LICENSE="
 	GNU LGPL v2
 	"
 COPYRIGHT="1988-2000 Free Software Foundation, Inc."
+CHECKSUM_SHA256="9eef41dcd1582b84e677f3dcb14faa2dd42707352556d05860470e2a99b7e505"
 srcGitRev="d86116d57a09505802ed6a38adc43ef294f7f364"
 SRC_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz"
 SRC_FILENAME="gcc-$portVersion.tar.gz"
--- a/sys-devel/m4/m4-1.4.16.recipe
+++ b/sys-devel/m4/m4-1.4.16.recipe
@@ -36,6 +36,7 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:ld
 	cmd:make
+	cmd:awk
 	cmd:sed
 	cmd:grep
 	"