Wed Apr 18 01:33:25 2012 UTC ()
Link chan_oss.so with libossaudio to avoid startup load failure because
Undefined PLT symbol "_oss_ioctl" (symnum = 64)


(manu)
diff -r1.29 -r1.30 pkgsrc/comms/asterisk18/Makefile
diff -r1.24 -r1.25 pkgsrc/comms/asterisk18/distinfo
diff -r0 -r1.1 pkgsrc/comms/asterisk18/patches/patch-bn
cvs diff -r1.29 -r1.30 pkgsrc/comms/asterisk18/Makefile (expand / switch to unified diff)

--- pkgsrc/comms/asterisk18/Makefile 2012/04/07 20:10:45 1.29
+++ pkgsrc/comms/asterisk18/Makefile 2012/04/18 01:33:24 1.30
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1# $NetBSD: Makefile,v 1.29 2012/04/07 20:10:45 jnemeth Exp $ 1# $NetBSD: Makefile,v 1.30 2012/04/18 01:33:24 manu Exp $
2# 2#
3# NOTE: when updating this package, there are two places that sound 3# NOTE: when updating this package, there are two places that sound
4# tarballs need to be checked 4# tarballs need to be checked
5 5
6DISTNAME= asterisk-1.8.11.0 6DISTNAME= asterisk-1.8.11.0
 7PKGREVISION= 1
7DIST_SUBDIR= ${PKGNAME_NOREV} 8DIST_SUBDIR= ${PKGNAME_NOREV}
8DISTFILES= ${DEFAULT_DISTFILES} 9DISTFILES= ${DEFAULT_DISTFILES}
9EXTRACT_ONLY= ${DISTNAME}.tar.gz 10EXTRACT_ONLY= ${DISTNAME}.tar.gz
10CATEGORIES= comms net audio 11CATEGORIES= comms net audio
11MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ 12MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
12 http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \ 13 http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
13 http://downloads.asterisk.org/pub/telephony/sounds/releases/ 14 http://downloads.asterisk.org/pub/telephony/sounds/releases/
14 15
15OWNER= jnemeth@NetBSD.org 16OWNER= jnemeth@NetBSD.org
16HOMEPAGE= http://www.asterisk.org/ 17HOMEPAGE= http://www.asterisk.org/
17COMMENT= The Asterisk Software PBX 18COMMENT= The Asterisk Software PBX
18LICENSE= gnu-gpl-v2 19LICENSE= gnu-gpl-v2
19 20
@@ -25,26 +26,27 @@ PKG_DESTDIR_SUPPORT= user-destdir @@ -25,26 +26,27 @@ PKG_DESTDIR_SUPPORT= user-destdir
25 26
26USE_TOOLS+= bison gmake perl:run pkg-config tar 27USE_TOOLS+= bison gmake perl:run pkg-config tar
27USE_LANGUAGES= c c++ 28USE_LANGUAGES= c c++
28REPLACE_PERL+= agi/DialAnMp3.agi agi/agi-test.agi 29REPLACE_PERL+= agi/DialAnMp3.agi agi/agi-test.agi
29REPLACE_PERL+= agi/fastagi-test agi/jukebox.agi agi/numeralize 30REPLACE_PERL+= agi/fastagi-test agi/jukebox.agi agi/numeralize
30REPLACE_PERL+= contrib/scripts/vmail.cgi 31REPLACE_PERL+= contrib/scripts/vmail.cgi
31 32
32GNU_CONFIGURE= yes 33GNU_CONFIGURE= yes
33CONFIGURE_ARGS+= --datarootdir=${PREFIX}/libdata 34CONFIGURE_ARGS+= --datarootdir=${PREFIX}/libdata
34CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 35CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
35CONFIGURE_ARGS+= --without-gtk2 36CONFIGURE_ARGS+= --without-gtk2
36# XXX remove when lang/lua gets builtin.mk 37# XXX remove when lang/lua gets builtin.mk
37CONFIGURE_ARGS+= --without-lua 38CONFIGURE_ARGS+= --without-lua
 39CONFIGURE_ARGS+= --with-oss=yes
38 40
39INSTALL_TARGET= install samples 41INSTALL_TARGET= install samples
40INSTALLATION_DIRS+= lib/pkgconfig share/doc/${PKGBASE} 42INSTALLATION_DIRS+= lib/pkgconfig share/doc/${PKGBASE}
41INSTALLATION_DIRS+= share/examples/asterisk share/examples/rc.d 43INSTALLATION_DIRS+= share/examples/asterisk share/examples/rc.d
42INSTALLATION_DIRS+= ${ASTDATADIR}/sounds/en ${ASTDATADIR}/moh 44INSTALLATION_DIRS+= ${ASTDATADIR}/sounds/en ${ASTDATADIR}/moh
43 45
44BUILD_DEFS+= VARBASE 46BUILD_DEFS+= VARBASE
45 47
46ASTERISK_USER?= asterisk 48ASTERISK_USER?= asterisk
47ASTERISK_GROUP?= asterisk 49ASTERISK_GROUP?= asterisk
48PKG_GROUPS= ${ASTERISK_GROUP} 50PKG_GROUPS= ${ASTERISK_GROUP}
49PKG_USERS= ${ASTERISK_USER}:${ASTERISK_GROUP} 51PKG_USERS= ${ASTERISK_USER}:${ASTERISK_GROUP}
50PKG_GECOS.${ASTERISK_USER}= Asterisk PBX 52PKG_GECOS.${ASTERISK_USER}= Asterisk PBX
@@ -206,16 +208,17 @@ post-install: @@ -206,16 +208,17 @@ post-install:
206 ${INSTALL_DATA} ${WRKSRC}/UPGRADE.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} 208 ${INSTALL_DATA} ${WRKSRC}/UPGRADE.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
207 ${INSTALL_DATA} ${WRKSRC}/Zaptel-to-DAHDI.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} 209 ${INSTALL_DATA} ${WRKSRC}/Zaptel-to-DAHDI.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
208 ${INSTALL_DATA} ${WRKSRC}/doc/IAX2-security.pdf ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} 210 ${INSTALL_DATA} ${WRKSRC}/doc/IAX2-security.pdf ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
209 ${INSTALL_DATA} ${WRKSRC}/doc/IAX2-security.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} 211 ${INSTALL_DATA} ${WRKSRC}/doc/IAX2-security.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
210 ${INSTALL_DATA} ${WRKSRC}/doc/README.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} 212 ${INSTALL_DATA} ${WRKSRC}/doc/README.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
211 ${INSTALL_DATA} ${WRKSRC}/doc/api-1.6.2-changes.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} 213 ${INSTALL_DATA} ${WRKSRC}/doc/api-1.6.2-changes.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
212 cp -r ${WRKSRC}/doc/Asterisk-Admin-Guide ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/Asterisk-Admin-Guide 214 cp -r ${WRKSRC}/doc/Asterisk-Admin-Guide ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/Asterisk-Admin-Guide
213 215
214.include "../../databases/sqlite3/buildlink3.mk" 216.include "../../databases/sqlite3/buildlink3.mk"
215.include "../../devel/zlib/buildlink3.mk" 217.include "../../devel/zlib/buildlink3.mk"
216.include "../../security/openssl/buildlink3.mk" 218.include "../../security/openssl/buildlink3.mk"
217.include "../../textproc/libxml2/buildlink3.mk" 219.include "../../textproc/libxml2/buildlink3.mk"
218.include "../../www/curl/buildlink3.mk" 220.include "../../www/curl/buildlink3.mk"
 221.include "../../mk/oss.buildlink3.mk"
219.include "../../mk/curses.buildlink3.mk" 222.include "../../mk/curses.buildlink3.mk"
220.include "../../mk/pthread.buildlink3.mk" 223.include "../../mk/pthread.buildlink3.mk"
221.include "../../mk/bsd.pkg.mk" 224.include "../../mk/bsd.pkg.mk"
cvs diff -r1.24 -r1.25 pkgsrc/comms/asterisk18/distinfo (expand / switch to unified diff)

--- pkgsrc/comms/asterisk18/distinfo 2012/04/07 20:10:45 1.24
+++ pkgsrc/comms/asterisk18/distinfo 2012/04/18 01:33:24 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.24 2012/04/07 20:10:45 jnemeth Exp $ 1$NetBSD: distinfo,v 1.25 2012/04/18 01:33:24 manu Exp $
2 2
3SHA1 (asterisk-1.8.11.0/asterisk-1.8.11.0.tar.gz) = cacabf8a3f8d710a26d53ae3fa041892354ac98d 3SHA1 (asterisk-1.8.11.0/asterisk-1.8.11.0.tar.gz) = cacabf8a3f8d710a26d53ae3fa041892354ac98d
4RMD160 (asterisk-1.8.11.0/asterisk-1.8.11.0.tar.gz) = 51b5a9dced4642011b475d8718f404ae5be26018 4RMD160 (asterisk-1.8.11.0/asterisk-1.8.11.0.tar.gz) = 51b5a9dced4642011b475d8718f404ae5be26018
5Size (asterisk-1.8.11.0/asterisk-1.8.11.0.tar.gz) = 25250286 bytes 5Size (asterisk-1.8.11.0/asterisk-1.8.11.0.tar.gz) = 25250286 bytes
6SHA1 (asterisk-1.8.11.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9 6SHA1 (asterisk-1.8.11.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
7RMD160 (asterisk-1.8.11.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6 7RMD160 (asterisk-1.8.11.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
8Size (asterisk-1.8.11.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes 8Size (asterisk-1.8.11.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
9SHA1 (patch-aa) = 496565e1e567c42ab6ba8f996c506f52cb9c8cfe 9SHA1 (patch-aa) = 496565e1e567c42ab6ba8f996c506f52cb9c8cfe
10SHA1 (patch-af) = 19786616bb606c38f769ec85f2e4d118573659ab 10SHA1 (patch-af) = 19786616bb606c38f769ec85f2e4d118573659ab
11SHA1 (patch-ag) = c71c61350cefbbe53eefa99245ca7712753f22d5 11SHA1 (patch-ag) = c71c61350cefbbe53eefa99245ca7712753f22d5
12SHA1 (patch-ai) = e92edab5c1ff323478f41d0b0783102ed527fe39 12SHA1 (patch-ai) = e92edab5c1ff323478f41d0b0783102ed527fe39
13SHA1 (patch-ak) = f8d5de733807bc6c0701886a3095901d6815a8bd 13SHA1 (patch-ak) = f8d5de733807bc6c0701886a3095901d6815a8bd
14SHA1 (patch-al) = b2a1134786d7c3b118ee8c47892f91dd2a4c783a 14SHA1 (patch-al) = b2a1134786d7c3b118ee8c47892f91dd2a4c783a
@@ -28,13 +28,14 @@ SHA1 (patch-ay) = b2e2203037c0d5434f22de @@ -28,13 +28,14 @@ SHA1 (patch-ay) = b2e2203037c0d5434f22de
28SHA1 (patch-az) = 64365b12cb47ec0fba358e4326eda172f96068cf 28SHA1 (patch-az) = 64365b12cb47ec0fba358e4326eda172f96068cf
29SHA1 (patch-ba) = ffb20f4788f2f253e822fb48c68fec04c31b0619 29SHA1 (patch-ba) = ffb20f4788f2f253e822fb48c68fec04c31b0619
30SHA1 (patch-bb) = bf1a2bb2ba1eb2ba44a9b26fa9ae0468510a1575 30SHA1 (patch-bb) = bf1a2bb2ba1eb2ba44a9b26fa9ae0468510a1575
31SHA1 (patch-bc) = 0efc99595d1ef82a879361e8bf3b2ef7fd84af62 31SHA1 (patch-bc) = 0efc99595d1ef82a879361e8bf3b2ef7fd84af62
32SHA1 (patch-be) = a3d416c097c6aeb0e49dec67a9fc22027d936773 32SHA1 (patch-be) = a3d416c097c6aeb0e49dec67a9fc22027d936773
33SHA1 (patch-bf) = 67b506d235fabaa73f492d08858407dd9a85fd6e 33SHA1 (patch-bf) = 67b506d235fabaa73f492d08858407dd9a85fd6e
34SHA1 (patch-bg) = e6dc4b3affdf634efc2b3ee83e81f7ec51ee2e86 34SHA1 (patch-bg) = e6dc4b3affdf634efc2b3ee83e81f7ec51ee2e86
35SHA1 (patch-bh) = 9203ea97daab8c64ea47f236b4961763e76eafe6 35SHA1 (patch-bh) = 9203ea97daab8c64ea47f236b4961763e76eafe6
36SHA1 (patch-bi) = d71662f618a10c3ca4277feb7ad0d659935dee1e 36SHA1 (patch-bi) = d71662f618a10c3ca4277feb7ad0d659935dee1e
37SHA1 (patch-bj) = a184452adf2c883695e3819c13c584a3db9608d7 37SHA1 (patch-bj) = a184452adf2c883695e3819c13c584a3db9608d7
38SHA1 (patch-bk) = 93679dfb04d26c99ac9c2822e0d74d869d16369f 38SHA1 (patch-bk) = 93679dfb04d26c99ac9c2822e0d74d869d16369f
39SHA1 (patch-bl) = 35cede8f5c253baed3d3983f58986c7c662e35e2 39SHA1 (patch-bl) = 35cede8f5c253baed3d3983f58986c7c662e35e2
40SHA1 (patch-bm) = 284b34e20091b3427cd67b835fc7aa62c9d92a6c 40SHA1 (patch-bm) = 284b34e20091b3427cd67b835fc7aa62c9d92a6c
 41SHA1 (patch-bn) = bffb5cbefc75b8296ce1967bc7ad4882ddabc9e0
File Added: pkgsrc/comms/asterisk18/patches/Attic/patch-bn
$NetBSD: patch-bn,v 1.1 2012/04/18 01:33:25 manu Exp $

Link chan_oss.so with libossaudio to avoid startup load failure because
Undefined PLT symbol "_oss_ioctl" (symnum = 64)

--- channels/Makefile.orig	2012-04-17 11:04:33.000000000 +0200
+++ channels/Makefile	2012-04-17 11:06:44.000000000 +0200
@@ -98,8 +98,9 @@
 
 $(if $(filter chan_misdn,$(EMBEDDED_MODS)),modules.link,chan_misdn.so): misdn_config.o misdn/isdn_lib.o misdn/isdn_msg_parser.o
 misdn_config.o misdn/isdn_lib.o misdn/isdn_msg_parser.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,chan_misdn)
 
+$(if $(filter chan_oss,$(EMBEDDED_MODS)),modules.link,chan_oss.so): LIBS+=-lossaudio
 $(if $(filter chan_oss,$(EMBEDDED_MODS)),modules.link,chan_oss.so): console_video.o vgrabbers.o console_board.o
 console_video.o vgrabbers.o console_board.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,chan_oss)
 
 chan_usbradio.o: ./xpmr/xpmr.c ./xpmr/xpmr.h ./xpmr/xpmr_coef.h