diff options
| author | fhajny <fhajny@pkgsrc.org> | 2014-10-29 13:49:02 +0000 |
|---|---|---|
| committer | fhajny <fhajny@pkgsrc.org> | 2014-10-29 13:49:02 +0000 |
| commit | 419e020f0381d0f032442c7e6825860c7966edb8 (patch) | |
| tree | 9f179ca0ec2c21b7a21a844b28955716372cbf41 /textproc | |
| parent | 29d03dc3d399713a31fd47a2e2be7534c46f1dd4 (diff) | |
| download | pkgsrc-419e020f0381d0f032442c7e6825860c7966edb8.tar.gz | |
Fix build on NetBSD. Fix mistake in patch file. Bump PKGREVISION.
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/sphinxsearch/Makefile | 3 | ||||
| -rw-r--r-- | textproc/sphinxsearch/distinfo | 6 | ||||
| -rw-r--r-- | textproc/sphinxsearch/patches/patch-src_searchd.cpp | 4 | ||||
| -rw-r--r-- | textproc/sphinxsearch/patches/patch-src_sphinxstd.h | 5 |
4 files changed, 10 insertions, 8 deletions
diff --git a/textproc/sphinxsearch/Makefile b/textproc/sphinxsearch/Makefile index 07e6acc1656..ff0f9186aae 100644 --- a/textproc/sphinxsearch/Makefile +++ b/textproc/sphinxsearch/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2014/10/17 17:28:15 fhajny Exp $ +# $NetBSD: Makefile,v 1.5 2014/10/29 13:49:02 fhajny Exp $ # DISTNAME= sphinx-2.2.5-release PKGNAME= ${DISTNAME:S/-/search-/:S/-release//} +PKGREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://sphinxsearch.com/files/ diff --git a/textproc/sphinxsearch/distinfo b/textproc/sphinxsearch/distinfo index 8a938a8119b..52743623839 100644 --- a/textproc/sphinxsearch/distinfo +++ b/textproc/sphinxsearch/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4 2014/10/17 17:28:15 fhajny Exp $ +$NetBSD: distinfo,v 1.5 2014/10/29 13:49:02 fhajny Exp $ SHA1 (sphinx-2.2.5-release.tar.gz) = 27e1a37fdeff12b866b33d3bb5602894af10bb5e RMD160 (sphinx-2.2.5-release.tar.gz) = d37cf615dae556307dbad2bbe00144f59afe7530 Size (sphinx-2.2.5-release.tar.gz) = 2953899 bytes SHA1 (patch-configure) = bf9d86e90a22399ffbfe617e0af75b3158cddd01 -SHA1 (patch-src_searchd.cpp) = d896ba689bb9a0fa36d6c3f530a009fbafe1c3ba -SHA1 (patch-src_sphinxstd.h) = 131ae00c0a21686357a5b7ce7d41734aebb34de5 +SHA1 (patch-src_searchd.cpp) = 3296b155503e4bbbac1ba2174824fdb36cd2578c +SHA1 (patch-src_sphinxstd.h) = 1838881a57cdcea330e8f07914e574b29de18c89 diff --git a/textproc/sphinxsearch/patches/patch-src_searchd.cpp b/textproc/sphinxsearch/patches/patch-src_searchd.cpp index 6bae72ffe0f..347cb2c5da4 100644 --- a/textproc/sphinxsearch/patches/patch-src_searchd.cpp +++ b/textproc/sphinxsearch/patches/patch-src_searchd.cpp @@ -1,4 +1,4 @@ -$NetBSD: patch-src_searchd.cpp,v 1.2 2014/10/17 17:28:15 fhajny Exp $ +$NetBSD: patch-src_searchd.cpp,v 1.3 2014/10/29 13:49:02 fhajny Exp $ Avoid hard-coded paths. @@ -9,7 +9,7 @@ Avoid hard-coded paths. "\n" "Examples:\n" - "searchd --config /usr/local/sphinx/etc/sphinx.conf\n" -+ "searchd --config /opt/local/etc/sphinx.conf\n" ++ "searchd --config @PKG_SYSCONFDIR@/sphinx.conf\n" #if USE_WINDOWS "searchd --install --config c:\\sphinx\\sphinx.conf\n" #endif diff --git a/textproc/sphinxsearch/patches/patch-src_sphinxstd.h b/textproc/sphinxsearch/patches/patch-src_sphinxstd.h index 595f38b4fa9..068a693b386 100644 --- a/textproc/sphinxsearch/patches/patch-src_sphinxstd.h +++ b/textproc/sphinxsearch/patches/patch-src_sphinxstd.h @@ -1,16 +1,17 @@ -$NetBSD: patch-src_sphinxstd.h,v 1.2 2014/10/17 17:28:15 fhajny Exp $ +$NetBSD: patch-src_sphinxstd.h,v 1.3 2014/10/29 13:49:02 fhajny Exp $ Portability fixes. --- src/sphinxstd.h.orig 2014-09-26 17:21:01.000000000 +0000 +++ src/sphinxstd.h -@@ -75,6 +75,13 @@ typedef int __declspec("SAL_nokernel") _ +@@ -75,6 +75,14 @@ typedef int __declspec("SAL_nokernel") _ #endif #endif +#ifdef __NetBSD__ +#define pthread_mutexattr_setpshared(m,a) (0) +#define pthread_condattr_setpshared(m,a) (0) ++#define pthread_rwlockattr_setpshared(m,a) (0) +#include "sys/signal.h" +#define PTHREAD_STACK_MIN MINSIGSTKSZ +#endif |