diff options
| author | dholland <dholland@pkgsrc.org> | 2011-09-04 04:37:55 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2011-09-04 04:37:55 +0000 |
| commit | d3501901dbec45542af359b5f961989125461528 (patch) | |
| tree | c4b19331b7f772d71e8a8b0e7cfa5368a5be8e37 | |
| parent | 88d50c5a3227fba83582f8043c168e0d4d4a252e (diff) | |
| download | pkgsrc-d3501901dbec45542af359b5f961989125461528.tar.gz | |
Rearrange the getline() patch so it works on -current. (Unlike the usual
problem, here the package is trying to use the posix getline but the
compat for older systems broke.)
This should really be done with a configure test, but to regen the
configure script without creating a huge diff would require digging up
an ancient version of autoconf and for now at least it doesn't seem
worth the trouble.
| -rw-r--r-- | audio/moc-devel/distinfo | 4 | ||||
| -rw-r--r-- | audio/moc-devel/patches/patch-aa | 25 |
2 files changed, 20 insertions, 9 deletions
diff --git a/audio/moc-devel/distinfo b/audio/moc-devel/distinfo index 794b170b867..dd1eec13770 100644 --- a/audio/moc-devel/distinfo +++ b/audio/moc-devel/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.3 2009/07/07 21:18:52 joerg Exp $ +$NetBSD: distinfo,v 1.4 2011/09/04 04:37:55 dholland Exp $ SHA1 (moc-2.5.0-alpha3.tar.bz2) = 59251b6239ad38f3f5ba8a1f73d1e90246765ab7 RMD160 (moc-2.5.0-alpha3.tar.bz2) = 7a603538e2080f3e182a543bc82100a09a56c2fe Size (moc-2.5.0-alpha3.tar.bz2) = 489824 bytes -SHA1 (patch-aa) = 058c2f72e22d3a31aee6e921aa9c110326a305f3 +SHA1 (patch-aa) = bf667dadb3fb78216dcd56d5246b33d25dd5fcf0 SHA1 (patch-ab) = 750f9a75c368788cf7d6f55e2ef44d7e41d99aa4 SHA1 (patch-ac) = 6b42e7df0dc3dfeb0a7c5e5226a28b01d2fd27c7 SHA1 (patch-ad) = 4816d3a17e832ee1b8be76f342a4512fad9fc642 diff --git a/audio/moc-devel/patches/patch-aa b/audio/moc-devel/patches/patch-aa index b710db3d5c7..be90a38d6db 100644 --- a/audio/moc-devel/patches/patch-aa +++ b/audio/moc-devel/patches/patch-aa @@ -1,13 +1,24 @@ -$NetBSD: patch-aa,v 1.2 2009/06/08 07:25:20 hasso Exp $ +$NetBSD: patch-aa,v 1.3 2011/09/04 04:37:55 dholland Exp $ ---- softmixer.c.orig 2008-04-06 19:57:33.000000000 -0400 +--- softmixer.c.orig 2007-12-15 07:38:57.000000000 +0000 +++ softmixer.c -@@ -35,6 +35,12 @@ +@@ -17,6 +17,10 @@ + #include "config.h" + #endif + ++#ifdef __NetBSD__ ++#include <sys/param.h> ++#endif ++ + #define _GNU_SOURCE + #include <stdio.h> + #include <string.h> +@@ -35,6 +39,12 @@ #include "common.h" #include "log.h" -+#if !defined(getline) && !defined(__DragonFly__) -+#define NETBSD_GETLINE ++#if defined(__NetBSD__) && __NetBSD_Version__ < 599001500 ++#define OLD_GETLINE +int getline(FILE *, char *, size_t, const char **); +#include "getline.c" +#endif @@ -15,11 +26,11 @@ $NetBSD: patch-aa,v 1.2 2009/06/08 07:25:20 hasso Exp $ #define swap_32bit_endianess(i32) \ ( ((i32&0x000000FF)<<24) | ((i32&0x0000FF00)<<8)| \ ((i32&0x00FF0000)>>8) | ((i32&0xFF000000)>>24) ) -@@ -147,7 +153,11 @@ void softmixer_read_config() +@@ -147,7 +157,11 @@ void softmixer_read_config() int buffersize=-1, readbytes=-1; int tmp; -+#ifdef NETBSD_GETLINE ++#ifdef OLD_GETLINE + while((readbytes=getline(cf, linebuffer, (size_t)buffersize, (void *)NULL) > -1)) +#else while((readbytes=getline(&linebuffer, &buffersize, cf)>-1)) |