diff options
author | joerg <joerg@pkgsrc.org> | 2005-11-11 17:21:11 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2005-11-11 17:21:11 +0000 |
commit | fd44dda67e1816240afe82ccade092869d6e27db (patch) | |
tree | 6da70e4920c3123c8de031f0c63bff735c650683 /audio/icecast1 | |
parent | 791ec070856a202987a74cde765895b74dd79f5e (diff) | |
download | pkgsrc-fd44dda67e1816240afe82ccade092869d6e27db.tar.gz |
Don't define weired underscore macros on DrgaonFly, they break
the system headers. Depend on errno.h to define errno, fix an instance
where errno is used without errno.h Since this is a bug for a threaded
program and icecast at the very least is linked threaded here,
bump the revision.
Diffstat (limited to 'audio/icecast1')
-rw-r--r-- | audio/icecast1/Makefile | 4 | ||||
-rw-r--r-- | audio/icecast1/distinfo | 9 | ||||
-rw-r--r-- | audio/icecast1/patches/patch-ae | 12 | ||||
-rw-r--r-- | audio/icecast1/patches/patch-af | 13 | ||||
-rw-r--r-- | audio/icecast1/patches/patch-ag | 14 | ||||
-rw-r--r-- | audio/icecast1/patches/patch-ah | 13 | ||||
-rw-r--r-- | audio/icecast1/patches/patch-ai | 13 | ||||
-rw-r--r-- | audio/icecast1/patches/patch-aj | 13 | ||||
-rw-r--r-- | audio/icecast1/patches/patch-ak | 20 |
9 files changed, 108 insertions, 3 deletions
diff --git a/audio/icecast1/Makefile b/audio/icecast1/Makefile index b2063bed1f7..928669b9cd8 100644 --- a/audio/icecast1/Makefile +++ b/audio/icecast1/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2005/05/31 21:55:53 rillig Exp $ +# $NetBSD: Makefile,v 1.14 2005/11/11 17:21:11 joerg Exp $ # DISTNAME= icecast-1.3.12 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= audio MASTER_SITES= http://www.icecast.org/releases/ diff --git a/audio/icecast1/distinfo b/audio/icecast1/distinfo index ce6e7c6fb74..a2898ec8469 100644 --- a/audio/icecast1/distinfo +++ b/audio/icecast1/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 20:39:46 agc Exp $ +$NetBSD: distinfo,v 1.4 2005/11/11 17:21:11 joerg Exp $ SHA1 (icecast-1.3.12.tar.gz) = bacb760390453718de536b85979ff3a9a73c7710 RMD160 (icecast-1.3.12.tar.gz) = 7b576dbc16103c01b5393880ab51c532662334a9 @@ -7,3 +7,10 @@ SHA1 (patch-aa) = 169202f563e4e2812d8d532264dcdb4f9ffc8df2 SHA1 (patch-ab) = de33a89e6078721a7e9c3a09515846752e76680e SHA1 (patch-ac) = 4775c84b910f9b19134f66a57f5196b572daf3cc SHA1 (patch-ad) = 787838025c33a2b84bc0dd20ac6442e5d8cc24c0 +SHA1 (patch-ae) = 43eccb3d3b71ae589dde96042ba580124f9e19e5 +SHA1 (patch-af) = 5720c8847a1885e3012f2530134da41fdc7dd6f7 +SHA1 (patch-ag) = 279acaca71b33f8d32a117b315f6277414691572 +SHA1 (patch-ah) = 740a13863302859bb35b97de95fca2a28f46c365 +SHA1 (patch-ai) = ddd79af274984ec0417db31709cbe43a80ea63ae +SHA1 (patch-aj) = 455584df6c2b90941198dea632fdb2248709e779 +SHA1 (patch-ak) = b0063a9d484e2b5e7ddaf06dcdcf6310fc968423 diff --git a/audio/icecast1/patches/patch-ae b/audio/icecast1/patches/patch-ae new file mode 100644 index 00000000000..7f5c9bd30f3 --- /dev/null +++ b/audio/icecast1/patches/patch-ae @@ -0,0 +1,12 @@ +$NetBSD: patch-ae,v 1.1 2005/11/11 17:21:11 joerg Exp $ + +--- src/timer.c.orig 2005-11-11 17:04:06.000000000 +0000 ++++ src/timer.c +@@ -79,7 +79,6 @@ + #define MSG_DONTWAIT 0 + #endif + +-extern int errno; + extern int running; + extern server_info_t info; + diff --git a/audio/icecast1/patches/patch-af b/audio/icecast1/patches/patch-af new file mode 100644 index 00000000000..3fd1d78d5fd --- /dev/null +++ b/audio/icecast1/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2005/11/11 17:21:11 joerg Exp $ + +--- src/ice_resolv.c.orig 2005-11-11 17:04:32.000000000 +0000 ++++ src/ice_resolv.c +@@ -81,7 +81,7 @@ + #ifdef _WIN32 + extern int running; + #else +-extern int h_errno, errno, running; ++extern int h_errno, running; + #endif + + extern server_info_t info; diff --git a/audio/icecast1/patches/patch-ag b/audio/icecast1/patches/patch-ag new file mode 100644 index 00000000000..18057afdd3a --- /dev/null +++ b/audio/icecast1/patches/patch-ag @@ -0,0 +1,14 @@ +$NetBSD: patch-ag,v 1.1 2005/11/11 17:21:11 joerg Exp $ + +--- src/main.c.orig 2005-11-11 16:58:48.000000000 +0000 ++++ src/main.c +@@ -96,9 +96,6 @@ + #include <signal.h> + #endif + +-/* We need this for perror and for various sanity checks */ +-extern int errno; +- + /* Importing a tree and mutex from sock.c */ + extern avl_tree *sock_sockets; + extern mutex_t sock_mutex; diff --git a/audio/icecast1/patches/patch-ah b/audio/icecast1/patches/patch-ah new file mode 100644 index 00000000000..c0676b72d40 --- /dev/null +++ b/audio/icecast1/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.1 2005/11/11 17:21:11 joerg Exp $ + +--- src/log.c.orig 2005-11-11 16:59:24.000000000 +0000 ++++ src/log.c +@@ -72,7 +72,7 @@ + #include "authenticate/basic.h" + #include "authenticate/user.h" + +-extern int errno, running; ++extern int running; + extern server_info_t info; + + void diff --git a/audio/icecast1/patches/patch-ai b/audio/icecast1/patches/patch-ai new file mode 100644 index 00000000000..39191b18cf6 --- /dev/null +++ b/audio/icecast1/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1 2005/11/11 17:21:11 joerg Exp $ + +--- src/sock.c.orig 2005-11-11 16:59:50.000000000 +0000 ++++ src/sock.c +@@ -87,7 +87,7 @@ int deny_severity = LOG_WARNING; + #define read _read + extern int running; + #else +-extern int h_errno, errno, running; ++extern int h_errno, running; + #endif + extern server_info_t info; + extern struct in_addr localaddr; diff --git a/audio/icecast1/patches/patch-aj b/audio/icecast1/patches/patch-aj new file mode 100644 index 00000000000..ff403cf9fff --- /dev/null +++ b/audio/icecast1/patches/patch-aj @@ -0,0 +1,13 @@ +$NetBSD: patch-aj,v 1.1 2005/11/11 17:21:11 joerg Exp $ + +--- src/definitions.h.orig 2005-11-11 17:03:21.000000000 +0000 ++++ src/definitions.h +@@ -31,7 +31,7 @@ + # define __USE_BSD + #endif + +-#ifndef __NetBSD__ ++#if !defined(__NetBSD__) && !defined(__DragonFly__) + #ifndef __EXTENSIONS__ + # define __EXTENSIONS__ + #endif diff --git a/audio/icecast1/patches/patch-ak b/audio/icecast1/patches/patch-ak new file mode 100644 index 00000000000..e7e41448717 --- /dev/null +++ b/audio/icecast1/patches/patch-ak @@ -0,0 +1,20 @@ +$NetBSD: patch-ak,v 1.1 2005/11/11 17:21:11 joerg Exp $ + +--- src/commands.c.orig 2005-11-11 17:11:42.000000000 +0000 ++++ src/commands.c +@@ -35,6 +35,7 @@ + #endif + + #include <ctype.h> ++#include <errno.h> + #include <stdlib.h> + #include <string.h> + #include <sys/types.h> +@@ -85,7 +86,6 @@ + + #include <time.h> + +-extern int errno; + extern int running; + extern server_info_t info; + extern mutex_t library_mutex; |