From 7cbf6142ed39b3b5305ebb3158a4ff6e539eac93 Mon Sep 17 00:00:00 2001 From: joerg Date: Mon, 2 Jan 2006 16:02:10 +0000 Subject: DragonFly support. Override config.guess and config.sub. --- comms/asterisk/Makefile | 6 +++++- comms/asterisk/PLIST.DragonFly | 3 +++ comms/asterisk/distinfo | 10 ++++++++-- comms/asterisk/patches/patch-aa | 23 +++++++++++++++-------- comms/asterisk/patches/patch-ah | 13 +++++++++++++ comms/asterisk/patches/patch-ai | 13 +++++++++++++ comms/asterisk/patches/patch-aj | 13 +++++++++++++ comms/asterisk/patches/patch-ak | 22 ++++++++++++++++++++++ comms/asterisk/patches/patch-al | 13 +++++++++++++ comms/asterisk/patches/patch-am | 13 +++++++++++++ 10 files changed, 118 insertions(+), 11 deletions(-) create mode 100644 comms/asterisk/PLIST.DragonFly create mode 100644 comms/asterisk/patches/patch-ah create mode 100644 comms/asterisk/patches/patch-ai create mode 100644 comms/asterisk/patches/patch-aj create mode 100644 comms/asterisk/patches/patch-ak create mode 100644 comms/asterisk/patches/patch-al create mode 100644 comms/asterisk/patches/patch-am (limited to 'comms') diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile index 1f2f8264251..82fb14b4d53 100644 --- a/comms/asterisk/Makefile +++ b/comms/asterisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/12/29 06:21:33 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2006/01/02 16:02:10 joerg Exp $ DISTNAME= asterisk-1.0.9 CATEGORIES= comms net audio @@ -86,6 +86,10 @@ post-patch: ${ECHO} "#include " > ${WRKSRC}/include/asterisk/poll-compat.h .endif +pre-configure: + @${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/editline + @${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/editline + .include "../../devel/ncurses/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/comms/asterisk/PLIST.DragonFly b/comms/asterisk/PLIST.DragonFly new file mode 100644 index 00000000000..ddb9c403ba4 --- /dev/null +++ b/comms/asterisk/PLIST.DragonFly @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST.DragonFly,v 1.1 2006/01/02 16:02:10 joerg Exp $ +lib/asterisk/modules/app_intercom.so +lib/asterisk/modules/chan_oss.so diff --git a/comms/asterisk/distinfo b/comms/asterisk/distinfo index 09e50efccf8..a92aebed08d 100644 --- a/comms/asterisk/distinfo +++ b/comms/asterisk/distinfo @@ -1,12 +1,18 @@ -$NetBSD: distinfo,v 1.5 2005/10/10 21:45:08 rh Exp $ +$NetBSD: distinfo,v 1.6 2006/01/02 16:02:10 joerg 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) = ebe6b2ac17546fa7fac489ea1676c961ca975ca0 +SHA1 (patch-aa) = 5f43557b028b97780889512bba6bba66b88a4b6d SHA1 (patch-ab) = 435a76cd7bad98b0809fa47b5b79530767027aa9 SHA1 (patch-ac) = e6aad8435be3c616112afec59b968c29721d98e3 SHA1 (patch-ad) = c19da2acb25c8fe68882d222d4f5dcb1be75cf63 SHA1 (patch-ae) = 9069d535ac150b1715694e45658540624d512583 SHA1 (patch-af) = 658aba06be8869403f37e5cb41b44934be585c7d SHA1 (patch-ag) = 3e6ce8f463df94fe9cba8fa8dbe03eda408aa581 +SHA1 (patch-ah) = 42f82093a325ae8127c47b2a9506ea0f8f8b8fae +SHA1 (patch-ai) = dc5ed7e20d63e08d80a2cd0b630491c594d5fa33 +SHA1 (patch-aj) = 354578b1499f2ebbd87ef765c7d30e79d383a54a +SHA1 (patch-ak) = c8d6bb6d14098fec81d5cffd70fc443ff1449925 +SHA1 (patch-al) = 67d14e73a36c77c48031f0e86105a4d965afb755 +SHA1 (patch-am) = e03fb0c7aec476136dfcaa41cdd4d7e5517b7644 diff --git a/comms/asterisk/patches/patch-aa b/comms/asterisk/patches/patch-aa index 68fedbf125b..d866b1872f7 100644 --- a/comms/asterisk/patches/patch-aa +++ b/comms/asterisk/patches/patch-aa @@ -1,12 +1,16 @@ -$NetBSD: patch-aa,v 1.4 2005/10/10 21:45:08 rh Exp $ +$NetBSD: patch-aa,v 1.5 2006/01/02 16:02:10 joerg Exp $ ---- Makefile.orig 2005-04-27 00:30:23.000000000 +1000 +--- Makefile.orig 2005-04-26 14:30:23.000000000 +0000 +++ Makefile -@@ -42,7 +42,7 @@ MPG123TARG=linux +@@ -42,7 +42,11 @@ MPG123TARG=linux endif ifeq ($(findstring BSD,${OSARCH}),BSD) -PROC=$(shell uname -m) ++PROC=$(shell uname -p) ++endif ++ ++ifeq (${OSARCH},DragonFly) +PROC=$(shell uname -p) endif @@ -19,7 +23,7 @@ $NetBSD: patch-aa,v 1.4 2005/10/10 21:45:08 rh Exp $ MODULES_DIR=$(ASTLIBDIR)/modules AGI_DIR=$(ASTVARLIBDIR)/agi-bin -@@ -148,7 +149,7 @@ endif # FreeBSD +@@ -148,7 +153,7 @@ endif # FreeBSD ifeq (${OSARCH},NetBSD) CFLAGS+=-pthread @@ -28,7 +32,7 @@ $NetBSD: patch-aa,v 1.4 2005/10/10 21:45:08 rh Exp $ MPG123TARG=netbsd endif -@@ -159,8 +160,11 @@ endif +@@ -159,8 +164,11 @@ endif #Uncomment this to use the older DSP routines #CFLAGS+=-DOLD_DSP_ROUTINES @@ -42,16 +46,19 @@ $NetBSD: patch-aa,v 1.4 2005/10/10 21:45:08 rh Exp $ LIBEDIT=editline/libedit.a -@@ -200,7 +204,7 @@ ifeq (${OSARCH},FreeBSD) +@@ -200,7 +208,10 @@ ifeq (${OSARCH},FreeBSD) LIBS+=-lcrypto endif ifeq (${OSARCH},NetBSD) -LIBS+=-lpthread -lcrypto -lm -L/usr/local/lib -L/usr/pkg/lib -lncurses +LIBS+=-lpthread -lcrypto -lm -L${PREFIX}/lib -R${PREFIX}/lib -lncurses ++endif ++ifeq (${OSARCH},DragonFly) ++LIBS+=-pthread -lcrypto -lm -L${PREFIX}/lib -R${PREFIX}/lib -lncurses endif ifeq (${OSARCH},OpenBSD) LIBS=-lcrypto -lpthread -lm -lncurses -@@ -214,7 +218,8 @@ OBJS=io.o sched.o logger.o frame.o loade +@@ -214,7 +225,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) @@ -61,7 +68,7 @@ $NetBSD: patch-aa,v 1.4 2005/10/10 21:45:08 rh Exp $ ASTLINK=-Wl,-dynamic SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace else -@@ -450,29 +455,29 @@ install: all datafiles bininstall +@@ -450,29 +462,29 @@ install: all datafiles bininstall upgrade: all bininstall adsi: all diff --git a/comms/asterisk/patches/patch-ah b/comms/asterisk/patches/patch-ah new file mode 100644 index 00000000000..350ed2f2dd4 --- /dev/null +++ b/comms/asterisk/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.1 2006/01/02 16:02:10 joerg Exp $ + +--- md5.c.orig 2006-01-02 15:26:06.000000000 +0000 ++++ md5.c +@@ -3,7 +3,7 @@ + #if defined( __OpenBSD__ ) + # include + # include +-#elif defined( __FreeBSD__ ) || defined( __NetBSD__ ) ++#elif defined( __FreeBSD__ ) || defined( __NetBSD__ ) || defined(__DragonFly__) + # include + # include + #elif defined( BSD ) && ( BSD >= 199103 ) || defined(__APPLE__) diff --git a/comms/asterisk/patches/patch-ai b/comms/asterisk/patches/patch-ai new file mode 100644 index 00000000000..06fabde00d1 --- /dev/null +++ b/comms/asterisk/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1 2006/01/02 16:02:10 joerg Exp $ + +--- aesopt.h.orig 2006-01-02 15:28:16.000000000 +0000 ++++ aesopt.h +@@ -151,7 +151,7 @@ + #if defined( __OpenBSD__ ) + # include + # include +-#elif defined( __FreeBSD__ ) || defined( __NetBSD__ ) ++#elif defined( __FreeBSD__ ) || defined( __NetBSD__ ) || defined(__DragonFly__) + # include + # include + #elif defined( BSD ) && ( BSD >= 199103 ) || defined(__APPLE__) diff --git a/comms/asterisk/patches/patch-aj b/comms/asterisk/patches/patch-aj new file mode 100644 index 00000000000..ba3498b9087 --- /dev/null +++ b/comms/asterisk/patches/patch-aj @@ -0,0 +1,13 @@ +$NetBSD: patch-aj,v 1.1 2006/01/02 16:02:10 joerg Exp $ + +--- utils.c.orig 2006-01-02 15:32:32.000000000 +0000 ++++ utils.c +@@ -28,7 +28,7 @@ + static char base64[64]; + static char b2a[256]; + +-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__DragonFly__) + + /* duh? ERANGE value copied from web... */ + #define ERANGE 34 diff --git a/comms/asterisk/patches/patch-ak b/comms/asterisk/patches/patch-ak new file mode 100644 index 00000000000..650ca078c5e --- /dev/null +++ b/comms/asterisk/patches/patch-ak @@ -0,0 +1,22 @@ +$NetBSD: patch-ak,v 1.1 2006/01/02 16:02:10 joerg Exp $ + +--- channels/chan_oss.c.orig 2006-01-02 15:34:15.000000000 +0000 ++++ channels/chan_oss.c +@@ -37,7 +37,7 @@ + + #if defined( __OpenBSD__ ) + # include +-#elif defined( __FreeBSD__ ) || defined( __NetBSD__ ) ++#elif defined( __FreeBSD__ ) || defined( __NetBSD__ ) || defined(__DragonFly__) + # include + #elif defined( BSD ) && ( BSD >= 199103 ) || defined(__APPLE__) + # include +@@ -54,7 +54,7 @@ + + #ifdef __linux + #include +-#elif defined(__FreeBSD__) ++#elif defined(__FreeBSD__) || defined(__DragonFly__) + #include + #else + #include diff --git a/comms/asterisk/patches/patch-al b/comms/asterisk/patches/patch-al new file mode 100644 index 00000000000..d3d11a4d341 --- /dev/null +++ b/comms/asterisk/patches/patch-al @@ -0,0 +1,13 @@ +$NetBSD: patch-al,v 1.1 2006/01/02 16:02:10 joerg Exp $ + +--- apps/app_sms.c.orig 2006-01-02 15:36:41.000000000 +0000 ++++ apps/app_sms.c +@@ -208,7 +208,7 @@ static void + packdate (unsigned char *o, time_t w) + { + struct tm *t = localtime (&w); +-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__DragonFly__) + int z = - t->tm_gmtoff / 3600 / 15; + #else + int z = timezone / 3600 / 15; diff --git a/comms/asterisk/patches/patch-am b/comms/asterisk/patches/patch-am new file mode 100644 index 00000000000..e63f4a4cbb6 --- /dev/null +++ b/comms/asterisk/patches/patch-am @@ -0,0 +1,13 @@ +$NetBSD: patch-am,v 1.1 2006/01/02 16:02:10 joerg Exp $ + +--- apps/app_intercom.c.orig 2006-01-02 15:39:06.000000000 +0000 ++++ apps/app_intercom.c +@@ -29,7 +29,7 @@ + + #if defined(__linux__) + #include +-#elif defined(__FreeBSD__) ++#elif defined(__FreeBSD__) || defined(__DragonFly__) + #include + #else + #include -- cgit v1.2.3