From a8600b3f7a6e20180335b0d69fcd91e9884cf4c1 Mon Sep 17 00:00:00 2001 From: Yourself Date: Thu, 4 Dec 2014 21:55:24 +0000 Subject: [PATCH 01/13] added missing cmd:find and cmd:xargs to binutils 2.17 recipe --- sys-devel/binutils/binutils-2.17_2013_04_21.recipe | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe index 9869f3fd2..301bf5b90 100644 --- 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" From d115b0375850f126d50230da0f0317c28e70d46f Mon Sep 17 00:00:00 2001 From: Cian Duffy Date: Thu, 4 Dec 2014 21:58:39 +0000 Subject: [PATCH 02/13] added SHA256 checksum missing from GCC 2.9.5 recipe --- sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe | 1 + 1 file changed, 1 insertion(+) diff --git a/sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe b/sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe index c7c31b985..0d873ad8e 100644 --- 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" From b53f729d2feb0cae1f59e24273f203b038a388c2 Mon Sep 17 00:00:00 2001 From: Yourself Date: Sat, 6 Dec 2014 17:01:55 +0000 Subject: [PATCH 03/13] Added recipe an patch for privoxy-3.0.21 --- .../privoxy/patches/privoxy-3.0.19.patch | 72 ------------------- .../privoxy/patches/privoxy-3.0.21.patch | 34 +++++++++ net-proxy/privoxy/privoxy-3.0.19.recipe | 34 --------- net-proxy/privoxy/privoxy-3.0.21.recipe | 56 +++++++++++++++ 4 files changed, 90 insertions(+), 106 deletions(-) delete mode 100644 net-proxy/privoxy/patches/privoxy-3.0.19.patch create mode 100644 net-proxy/privoxy/patches/privoxy-3.0.21.patch delete mode 100644 net-proxy/privoxy/privoxy-3.0.19.recipe create mode 100644 net-proxy/privoxy/privoxy-3.0.21.recipe diff --git a/net-proxy/privoxy/patches/privoxy-3.0.19.patch b/net-proxy/privoxy/patches/privoxy-3.0.19.patch deleted file mode 100644 index 1be72de1c..000000000 --- a/net-proxy/privoxy/patches/privoxy-3.0.19.patch +++ /dev/null @@ -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) - { diff --git a/net-proxy/privoxy/patches/privoxy-3.0.21.patch b/net-proxy/privoxy/patches/privoxy-3.0.21.patch new file mode 100644 index 000000000..f13a9129f --- /dev/null +++ b/net-proxy/privoxy/patches/privoxy-3.0.21.patch @@ -0,0 +1,34 @@ +--- /boot/home/Desktop/GNUmakefile.in 2014-12-06 15:06:33.557580288 +0000 ++++ privoxy-3.0.21-stable/GNUmakefile.in 2013-02-05 14:04:11.051642368 +0000 +@@ -219,10 +219,10 @@ + PROJECT_H_DEPS = project.h $(REGEX_HDRS) $(PCRS_HDRS) @STATIC_PCRE_ONLY@pcre/pcre.h + + # Socket libraries for platforms that need them explicitly defined +-SOCKET_LIB = @SOCKET_LIB@ ++SOCKET_LIB = -lnetwork + + # PThreads library, if needed. +-PTHREAD_LIB = @PTHREAD_ONLY@@PTHREAD_LIB@ ++PTHREAD_LIB = + + SRCS = $(C_SRC) $(W32_SRC) $(PCRS_SRC) $(PCRE_SRC) $(REGEX_SRC) + OBJS = $(C_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS) +@@ -239,7 +239,7 @@ + # Win32 GUI build. + # The flag "-pthread" is required if using Pthreads under Linux (and + # possibly other OSs). +-SPECIAL_CFLAGS = @SPECIAL_CFLAGS@ ++SPECIAL_CFLAGS = + + # Add your flags here + OTHER_CFLAGS = +@@ -889,7 +889,7 @@ + @# FIXME: group/user validation is overly convoluted. + @# If superuser install ... we require a minimum of group ownership + @# of those files the daemon writes to, to be non-root owned. +- @if [ "`$(ID) |sed 's/(.*//' |sed 's/.*=//'`" = "0" ] ;then\ ++ @if [ "`$(ID) |sed 's/(.*//' |sed 's/.*=//'`" = "0" ] && [$host_os != haiku] ;then\ + if [ x$(USER) = x ] || [ $(USER) = root ]; then \ + if [ x$(GROUP) = x ] || [ $(GROUP) = root ]; then \ + if [ "`$(ID) privoxy`" ] && \ + diff --git a/net-proxy/privoxy/privoxy-3.0.19.recipe b/net-proxy/privoxy/privoxy-3.0.19.recipe deleted file mode 100644 index 5696770bb..000000000 --- a/net-proxy/privoxy/privoxy-3.0.19.recipe +++ /dev/null @@ -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" diff --git a/net-proxy/privoxy/privoxy-3.0.21.recipe b/net-proxy/privoxy/privoxy-3.0.21.recipe new file mode 100644 index 000000000..604603734 --- /dev/null +++ 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" +PATCHES="privoxy-3.0.21.patch" + +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() +{ + autoheader + autoconf + runConfigure ./configure + make +} + +INSTALL() +{ + host_os=haiku + make install +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2001-2011 Privoxy Developers" From 203761a3dca5ed0028ec8517318abe30871c7695 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Fri, 5 Dec 2014 18:23:38 +0000 Subject: [PATCH 04/13] lohit: fix build --- media-fonts/lohit/lohit-2.3.8.recipe | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/media-fonts/lohit/lohit-2.3.8.recipe b/media-fonts/lohit/lohit-2.3.8.recipe index f1da927e3..2ebdbdbfe 100644 --- 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" From 64cc5d9e60f5b5048418d9fb861ff755c69949dc Mon Sep 17 00:00:00 2001 From: Yourself Date: Sat, 6 Dec 2014 19:48:43 +0000 Subject: [PATCH 05/13] Changed provixy patch --- net-proxy/privoxy/patches/privoxy-3.0.21.patch | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/net-proxy/privoxy/patches/privoxy-3.0.21.patch b/net-proxy/privoxy/patches/privoxy-3.0.21.patch index f13a9129f..157bdf6d1 100644 --- a/net-proxy/privoxy/patches/privoxy-3.0.21.patch +++ b/net-proxy/privoxy/patches/privoxy-3.0.21.patch @@ -5,23 +5,14 @@ # Socket libraries for platforms that need them explicitly defined -SOCKET_LIB = @SOCKET_LIB@ -+SOCKET_LIB = -lnetwork ++SOCKET_LIB = @SOCKET_LIB@ -lnetwork # PThreads library, if needed. -PTHREAD_LIB = @PTHREAD_ONLY@@PTHREAD_LIB@ -+PTHREAD_LIB = ++PTHREAD_LIB = SRCS = $(C_SRC) $(W32_SRC) $(PCRS_SRC) $(PCRE_SRC) $(REGEX_SRC) OBJS = $(C_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS) -@@ -239,7 +239,7 @@ - # Win32 GUI build. - # The flag "-pthread" is required if using Pthreads under Linux (and - # possibly other OSs). --SPECIAL_CFLAGS = @SPECIAL_CFLAGS@ -+SPECIAL_CFLAGS = - - # Add your flags here - OTHER_CFLAGS = @@ -889,7 +889,7 @@ @# FIXME: group/user validation is overly convoluted. @# If superuser install ... we require a minimum of group ownership From af45939e50cdf84e6ef77d070dfe40a7a1ace9f6 Mon Sep 17 00:00:00 2001 From: Kacper Kasper Date: Sat, 6 Dec 2014 23:43:35 +0000 Subject: [PATCH 06/13] Change PROVIDES and REQUIRES entries for ilmbase and openexr to lowercase. Did not bump revisions since this does not change resulting packages. --- media-libs/ilmbase/ilmbase-2.2.0.recipe | 28 +++++++++---------- media-libs/openexr/openexr-2.2.0.recipe | 36 ++++++++++++------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/media-libs/ilmbase/ilmbase-2.2.0.recipe b/media-libs/ilmbase/ilmbase-2.2.0.recipe index 340a7a2c9..eadf7f232 100644 --- 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 diff --git a/media-libs/openexr/openexr-2.2.0.recipe b/media-libs/openexr/openexr-2.2.0.recipe index af325ff8b..4a91bf9e2 100644 --- 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 From cc00d6e2d569cff84febcc21ac70da996da9dcc2 Mon Sep 17 00:00:00 2001 From: Kacper Kasper Date: Sat, 6 Dec 2014 23:44:59 +0000 Subject: [PATCH 07/13] vigra: change PROVIDES and REQUIRES entries to lowercase. Minor fixes to vigra-config. --- media-libs/vigra/vigra-1.10.0.recipe | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/media-libs/vigra/vigra-1.10.0.recipe b/media-libs/vigra/vigra-1.10.0.recipe index a2605f235..e977acd7c 100644 --- 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 From fd9c94c7bbb223276a6dc53c46895237ea341695 Mon Sep 17 00:00:00 2001 From: Nolan Clark Date: Sat, 6 Dec 2014 19:00:44 -0600 Subject: [PATCH 08/13] Created libtommath recipe --- dev-libs/libtommath/libtommath-0.42.0.recipe | 54 +++++++++++++++++++ .../patches/libtommath-0.42.0.patchset | 50 +++++++++++++++++ 2 files changed, 104 insertions(+) create mode 100644 dev-libs/libtommath/libtommath-0.42.0.recipe create mode 100644 dev-libs/libtommath/patches/libtommath-0.42.0.patchset diff --git a/dev-libs/libtommath/libtommath-0.42.0.recipe b/dev-libs/libtommath/libtommath-0.42.0.recipe new file mode 100644 index 000000000..d1fcad3a9 --- /dev/null +++ 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 +} diff --git a/dev-libs/libtommath/patches/libtommath-0.42.0.patchset b/dev-libs/libtommath/patches/libtommath-0.42.0.patchset new file mode 100644 index 000000000..bc86a4b3b --- /dev/null +++ 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 +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 + From db327e86649537bc99a3fa7931bef3e8a156cb06 Mon Sep 17 00:00:00 2001 From: Yourself Date: Sun, 7 Dec 2014 06:24:40 +0000 Subject: [PATCH 09/13] Changed prov0.2patch --- net-proxy/privoxy/patches/privoxy-3.0.21.patch | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/net-proxy/privoxy/patches/privoxy-3.0.21.patch b/net-proxy/privoxy/patches/privoxy-3.0.21.patch index 157bdf6d1..30f07938e 100644 --- a/net-proxy/privoxy/patches/privoxy-3.0.21.patch +++ b/net-proxy/privoxy/patches/privoxy-3.0.21.patch @@ -1,18 +1,5 @@ --- /boot/home/Desktop/GNUmakefile.in 2014-12-06 15:06:33.557580288 +0000 +++ privoxy-3.0.21-stable/GNUmakefile.in 2013-02-05 14:04:11.051642368 +0000 -@@ -219,10 +219,10 @@ - PROJECT_H_DEPS = project.h $(REGEX_HDRS) $(PCRS_HDRS) @STATIC_PCRE_ONLY@pcre/pcre.h - - # Socket libraries for platforms that need them explicitly defined --SOCKET_LIB = @SOCKET_LIB@ -+SOCKET_LIB = @SOCKET_LIB@ -lnetwork - - # PThreads library, if needed. --PTHREAD_LIB = @PTHREAD_ONLY@@PTHREAD_LIB@ -+PTHREAD_LIB = - - SRCS = $(C_SRC) $(W32_SRC) $(PCRS_SRC) $(PCRE_SRC) $(REGEX_SRC) - OBJS = $(C_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS) @@ -889,7 +889,7 @@ @# FIXME: group/user validation is overly convoluted. @# If superuser install ... we require a minimum of group ownership From f5aab6fb7caeb0bb41aec9ef6f2b0d532b20bc76 Mon Sep 17 00:00:00 2001 From: Yourself Date: Sun, 7 Dec 2014 06:28:47 +0000 Subject: [PATCH 10/13] Changed privoxy recipe --- net-proxy/privoxy/privoxy-3.0.21.recipe | 1 + 1 file changed, 1 insertion(+) diff --git a/net-proxy/privoxy/privoxy-3.0.21.recipe b/net-proxy/privoxy/privoxy-3.0.21.recipe index 604603734..4c460cddd 100644 --- a/net-proxy/privoxy/privoxy-3.0.21.recipe +++ b/net-proxy/privoxy/privoxy-3.0.21.recipe @@ -40,6 +40,7 @@ PROVIDES=" BUILD() { + host_os=haiku autoheader autoconf runConfigure ./configure From c89bb03c867e545798296b3e19cd6c73a76042d5 Mon Sep 17 00:00:00 2001 From: Yourself Date: Sun, 7 Dec 2014 08:31:59 +0000 Subject: [PATCH 11/13] Removed patch --- net-proxy/privoxy/patches/privoxy-3.0.21.patch | 12 ------------ net-proxy/privoxy/privoxy-3.0.21.recipe | 3 +-- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 net-proxy/privoxy/patches/privoxy-3.0.21.patch diff --git a/net-proxy/privoxy/patches/privoxy-3.0.21.patch b/net-proxy/privoxy/patches/privoxy-3.0.21.patch deleted file mode 100644 index 30f07938e..000000000 --- a/net-proxy/privoxy/patches/privoxy-3.0.21.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- /boot/home/Desktop/GNUmakefile.in 2014-12-06 15:06:33.557580288 +0000 -+++ privoxy-3.0.21-stable/GNUmakefile.in 2013-02-05 14:04:11.051642368 +0000 -@@ -889,7 +889,7 @@ - @# FIXME: group/user validation is overly convoluted. - @# If superuser install ... we require a minimum of group ownership - @# of those files the daemon writes to, to be non-root owned. -- @if [ "`$(ID) |sed 's/(.*//' |sed 's/.*=//'`" = "0" ] ;then\ -+ @if [ "`$(ID) |sed 's/(.*//' |sed 's/.*=//'`" = "0" ] && [$host_os != haiku] ;then\ - if [ x$(USER) = x ] || [ $(USER) = root ]; then \ - if [ x$(GROUP) = x ] || [ $(GROUP) = root ]; then \ - if [ "`$(ID) privoxy`" ] && \ - diff --git a/net-proxy/privoxy/privoxy-3.0.21.recipe b/net-proxy/privoxy/privoxy-3.0.21.recipe index 4c460cddd..9021345ae 100644 --- a/net-proxy/privoxy/privoxy-3.0.21.recipe +++ b/net-proxy/privoxy/privoxy-3.0.21.recipe @@ -14,7 +14,6 @@ SOURCE_DIR="privoxy-3.0.21-stable" REVISION="1" ARCHITECTURES="x86_gcc2 x86 !ppc" CHECKSUM_SHA256="5ec7e601948d2bd0ebf0ebe90eed7d49e7663c395ce16d0403e91ea2d459ddb8" -PATCHES="privoxy-3.0.21.patch" REQUIRES=" haiku >= $haikuVersion @@ -50,7 +49,7 @@ BUILD() INSTALL() { host_os=haiku - make install + make install USER=privoxy } LICENSE="GNU GPL v2" From de6aed092a71217e02779023ed9319edc70a59bd Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Sun, 7 Dec 2014 14:46:59 +0000 Subject: [PATCH 12/13] m4: Add missing cmd:awk build dep --- sys-devel/m4/m4-1.4.16.recipe | 1 + 1 file changed, 1 insertion(+) diff --git a/sys-devel/m4/m4-1.4.16.recipe b/sys-devel/m4/m4-1.4.16.recipe index aaaeb554e..fc3888bd4 100644 --- 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 " From 22be0c52aa6ade942f681b5fcc12f2a75ef01c6d Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Sun, 7 Dec 2014 14:47:47 +0000 Subject: [PATCH 13/13] texinfo: Add missing cmd:grep build dep --- sys-apps/texinfo/texinfo-4.13a.recipe | 1 + 1 file changed, 1 insertion(+) diff --git a/sys-apps/texinfo/texinfo-4.13a.recipe b/sys-apps/texinfo/texinfo-4.13a.recipe index eabd45d6b..bed916683 100644 --- 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 "