diff options
| author | rh <rh> | 2005-10-10 21:45:08 +0000 |
|---|---|---|
| committer | rh <rh> | 2005-10-10 21:45:08 +0000 |
| commit | 9dca6d1b8278a0cad0aef88b9efc561b0a514b13 (patch) | |
| tree | aac0217de669bbbabe1acb7c3e63cb9d5261658b /comms | |
| parent | 33fdacfaa914f631427309ed17d5ec5e63cab86f (diff) | |
| download | pkgsrc-9dca6d1b8278a0cad0aef88b9efc561b0a514b13.tar.gz | |
Make this compile with newer versions of Darwin that have poll(2).
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/asterisk/Makefile | 7 | ||||
| -rw-r--r-- | comms/asterisk/distinfo | 4 | ||||
| -rw-r--r-- | comms/asterisk/patches/patch-aa | 16 |
3 files changed, 21 insertions, 6 deletions
diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile index 163e82ac4ce..736113b06a0 100644 --- a/comms/asterisk/Makefile +++ b/comms/asterisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/09/02 17:23:06 riz Exp $ +# $NetBSD: Makefile,v 1.8 2005/10/10 21:45:08 rh Exp $ DISTNAME= asterisk-1.0.9 CATEGORIES= comms net audio @@ -83,6 +83,11 @@ CONF_FILES+= ${ASTEXAMPLEDIR}/${_file_} ${ASTETCDIR}/${_file_} PTHREAD_OPTS+= require native +.if (${OPSYS} == "Darwin" && exists(/usr/include/sys/poll.h)) +post-patch: + ${ECHO} "#include <sys/poll.h>" > ${WRKSRC}/include/asterisk/poll-compat.h +.endif + .include "../../devel/ncurses/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/comms/asterisk/distinfo b/comms/asterisk/distinfo index 2b20769fd19..09e50efccf8 100644 --- a/comms/asterisk/distinfo +++ b/comms/asterisk/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.4 2005/09/02 12:58:34 adam Exp $ +$NetBSD: distinfo,v 1.5 2005/10/10 21:45:08 rh Exp $ SHA1 (asterisk-1.0.9.tar.gz) = 62edb29222e4a801893d1f23b73def8555ac2c47 RMD160 (asterisk-1.0.9.tar.gz) = 2e48dc00a3c290cc6b418ab0aee42feb93d9e76a Size (asterisk-1.0.9.tar.gz) = 9604582 bytes -SHA1 (patch-aa) = 6e5c979fd905da86d17f079d84183759efcca520 +SHA1 (patch-aa) = ebe6b2ac17546fa7fac489ea1676c961ca975ca0 SHA1 (patch-ab) = 435a76cd7bad98b0809fa47b5b79530767027aa9 SHA1 (patch-ac) = e6aad8435be3c616112afec59b968c29721d98e3 SHA1 (patch-ad) = c19da2acb25c8fe68882d222d4f5dcb1be75cf63 diff --git a/comms/asterisk/patches/patch-aa b/comms/asterisk/patches/patch-aa index abc016a6855..68fedbf125b 100644 --- a/comms/asterisk/patches/patch-aa +++ b/comms/asterisk/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.3 2005/09/02 12:58:34 adam Exp $ +$NetBSD: patch-aa,v 1.4 2005/10/10 21:45:08 rh Exp $ ---- Makefile.orig 2005-04-26 14:30:23.000000000 +0000 +--- Makefile.orig 2005-04-27 00:30:23.000000000 +1000 +++ Makefile @@ -42,7 +42,7 @@ MPG123TARG=linux endif @@ -51,7 +51,17 @@ $NetBSD: patch-aa,v 1.3 2005/09/02 12:58:34 adam Exp $ endif ifeq (${OSARCH},OpenBSD) LIBS=-lcrypto -lpthread -lm -lncurses -@@ -450,29 +454,29 @@ install: all datafiles bininstall +@@ -214,7 +218,8 @@ OBJS=io.o sched.o logger.o frame.o loade + astmm.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \ + utils.o + ifeq (${OSARCH},Darwin) +-OBJS+=poll.o dlfcn.o ++OBJS+=dlfcn.o ++OBJS+=$(shell if [ -e /usr/include/sys/poll.h ]; then echo -n "" ; else echo poll.o; fi) + ASTLINK=-Wl,-dynamic + SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace + else +@@ -450,29 +455,29 @@ install: all datafiles bininstall upgrade: all bininstall adsi: all |