head 1.7; access; symbols pkgsrc-2017Q3:1.6.0.46 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.42 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.40 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.38 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.36 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.34 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.32 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.30 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.28 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.26 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.24 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.22 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.20 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.18 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.16 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.14 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.12 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.10 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.6.0.8 pkgsrc-2013Q1-base:1.6 pkgsrc-2012Q4:1.6.0.6 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q3:1.6.0.4 pkgsrc-2012Q3-base:1.6 pkgsrc-2012Q2:1.6.0.2 pkgsrc-2012Q2-base:1.6 pkgsrc-2012Q1:1.5.0.70 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.68 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.66 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.5.0.64 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.62 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.5.0.60 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.5.0.58 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.56 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.54 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.52 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.50 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.5.0.48 pkgsrc-2009Q2-base:1.5 pkgsrc-2009Q1:1.5.0.46 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.5.0.44 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.42 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.40 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.38 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.36 pkgsrc-2008Q1:1.5.0.34 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.32 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.30 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.28 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.26 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.24 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.22 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.20 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.18 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.16 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.14 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.12 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.10 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.5.0.8 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.5.0.6 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.4 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.5.0.2 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.4.0.4 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.4.0.2 netbsd-1-6-1-base:1.4 netbsd-1-6:1.2.0.6 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.2 pkgviews-base:1.2 buildlink2-base:1.2 buildlink2:1.1.1.1.0.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.7 date 2017.09.26.10.26.54; author wiz; state dead; branches; next 1.6; commitid 9ARpkXTuh9Wg2H8A; 1.6 date 2012.05.15.13.18.43; author abs; state Exp; branches; next 1.5; 1.5 date 2004.02.04.13.35.52; author markd; state Exp; branches 1.5.70.1; next 1.4; 1.4 date 2002.10.03.10.22.35; author jlam; state Exp; branches; next 1.3; 1.3 date 2002.08.25.19.21.45; author jlam; state Exp; branches; next 1.2; 1.2 date 2002.07.17.07.54.04; author skrll; state Exp; branches; next 1.1; 1.1 date 2002.05.31.15.02.58; author skrll; state Exp; branches 1.1.1.1; next ; 1.5.70.1 date 2012.05.28.22.46.40; author tron; state Exp; branches; next ; 1.1.1.1 date 2002.05.31.15.02.58; author skrll; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.05.31.15.02.58; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.18.37.33; author jlam; state Exp; branches; next 1.1.1.1.2.3; 1.1.1.1.2.3 date 2002.08.22.11.09.39; author jlam; state Exp; branches; next ; desc @@ 1.7 log @*: remove qt3 and the packages using it, including KDE3 Announced in https://mail-index.netbsd.org/pkgsrc-users/2017/09/10/msg025556.html @ text @$NetBSD: patch-ab,v 1.6 2012/05/15 13:18:43 abs Exp $ --- artsc/artsdsp.c.orig 2007-10-08 09:47:09.000000000 +0000 +++ artsc/artsdsp.c @@@@ -133,6 +133,17 @@@@ int munmap(void *start, size_t length); static void artsdsp_doinit() { +# if defined(__NetBSD__) && !defined(OPEN_SOUND_SYSTEM) +# define OPEN_GLOBAL() handle = dlopen(NULL, DL_LAZY) +# define CLOSE_GLOBAL() (void)dlclose(handle) +# elif defined(RTLD_NEXT) +# define OPEN_GLOBAL() handle = RTLD_NEXT; +# define CLOSE_GLOBAL() ; +# else +# define OPEN_GLOBAL() handle = dlopen(NULL, DL_LAZY); +# define CLOSE_GLOBAL() dlclose(handle); +# endif + void *handle; const char *env; artsdsp_init = 1; @@@@ -145,15 +156,17 @@@@ static void artsdsp_doinit() mmapemu = env && !strcmp(env,"1"); /* resolve original symbols */ - orig_open = (orig_open_ptr)dlsym(RTLD_NEXT,"open"); - orig_close = (orig_close_ptr)dlsym(RTLD_NEXT,"close"); - orig_write = (orig_write_ptr)dlsym(RTLD_NEXT,"write"); - orig_read = (orig_read_ptr)dlsym(RTLD_NEXT,"read"); - orig_ioctl = (orig_ioctl_ptr)dlsym(RTLD_NEXT,"ioctl"); - orig_mmap = (orig_mmap_ptr)dlsym(RTLD_NEXT,"mmap"); - orig_munmap = (orig_munmap_ptr)dlsym(RTLD_NEXT,"munmap"); - orig_fopen = (orig_fopen_ptr)dlsym(RTLD_NEXT,"fopen"); - orig_access = (orig_access_ptr)dlsym(RTLD_NEXT,"access"); + OPEN_GLOBAL(); + orig_open = (orig_open_ptr)dlsym(handle,"open"); + orig_close = (orig_close_ptr)dlsym(handle,"close"); + orig_write = (orig_write_ptr)dlsym(handle,"write"); + orig_read = (orig_read_ptr)dlsym(handle,"read"); + orig_ioctl = (orig_ioctl_ptr)dlsym(handle,"ioctl"); + orig_mmap = (orig_mmap_ptr)dlsym(handle,"mmap"); + orig_munmap = (orig_munmap_ptr)dlsym(handle,"munmap"); + orig_fopen = (orig_fopen_ptr)dlsym(handle,"fopen"); + orig_access = (orig_access_ptr)dlsym(handle,"access"); + CLOSE_GLOBAL(); } static void @@@@ -258,10 +271,24 @@@@ int open (const char *pathname, int flag return sndfd; } +/* NetBSD < 6 and 6.99.0 - 6.99.6 used a different ioctl() definition */ +#if defined(__NetBSD__) +# include +# if __NetBSD_Version__ < 600000000 || \ + (__NetBSD_Version__ > 699000000 && __NetBSD_Version__ < 699000700) +# define OLD_NETBSD_IOCTL_CALL +# endif +#endif + +#if defined(OLD_NETBSD_IOCTL_CALL) && !defined(OPEN_SOUND_SYSTEM) +int _oss_ioctl (int fd, unsigned long request, void *argp) +#else int ioctl (int fd, ioctl_request_t request, ...) +#endif { int space, size, latency, odelay; +#if !defined(OLD_NETBSD_IOCTL_CALL) || defined(OPEN_SOUND_SYSTEM) /* * FreeBSD needs ioctl with varargs. However I have no idea how to "forward" * the variable args ioctl to the orig_ioctl routine. So I expect the ioctl @@@@ -273,6 +300,7 @@@@ int ioctl (int fd, ioctl_request_t reque va_start(args,request); argp = va_arg(args, void *); va_end(args); +#endif CHECK_INIT(); @ 1.6 log @Conditionalise old ioctl() usage on __NetBSD_Version__ < 600000000 or __NetBSD_Version__ > 699000000 && __NetBSD_Version__ < 699000700 @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Update arts to 1.2.0. Part of KDE 3.2. Arts specific changes unspecified. @ text @d3 1 a3 1 --- artsc/artsdsp.c.orig 2003-07-17 07:18:09.000000000 +1200 d5 1 a5 1 @@@@ -133,6 +133,14 @@@@ int munmap(void *start, size_t length); d9 4 a12 1 +# ifdef RTLD_NEXT d23 1 a23 1 @@@@ -145,15 +153,31 @@@@ static void artsdsp_doinit() a35 13 +#if defined(__NetBSD__) && !defined(OPEN_SOUND_SYSTEM) + handle = dlopen(NULL, DL_LAZY); + orig_open = (orig_open_ptr)dlsym(handle,"open"); + orig_close = (orig_close_ptr)dlsym(handle,"close"); + orig_write = (orig_write_ptr)dlsym(handle,"write"); + orig_read = (orig_read_ptr)dlsym(handle,"read"); + orig_ioctl = (orig_ioctl_ptr)dlsym(handle,"ioctl"); + orig_mmap = (orig_mmap_ptr)dlsym(handle,"mmap"); + orig_munmap = (orig_munmap_ptr)dlsym(handle,"munmap"); + orig_fopen = (orig_fopen_ptr)dlsym(handle,"fopen"); + orig_access = (orig_access_ptr)dlsym(handle,"access"); + (void) dlclose(handle); +#else a46 1 +#endif d50 1 a50 1 @@@@ -258,10 +282,15 @@@@ int open (const char *pathname, int flag d54 10 a63 1 +#if defined(__NetBSD__) && !defined(OPEN_SOUND_SYSTEM) d71 1 a71 1 +#if !defined(__NetBSD__) || defined(OPEN_SOUND_SYSTEM) d75 1 a75 1 @@@@ -273,6 +302,7 @@@@ int ioctl (int fd, ioctl_request_t reque @ 1.5.70.1 log @Pullup ticket #3811 - requested by abs audio/arts: build fix Revisions pulled up: - audio/arts/distinfo 1.55 - audio/arts/patches/patch-ab 1.6 --- Module Name: pkgsrc Committed By: abs Date: Tue May 15 13:18:43 UTC 2012 Modified Files: pkgsrc/audio/arts: distinfo pkgsrc/audio/arts/patches: patch-ab Log Message: Conditionalise old ioctl() usage on __NetBSD_Version__ < 600000000 or __NetBSD_Version__ > 699000000 && __NetBSD_Version__ < 699000700 @ text @d3 1 a3 1 --- artsc/artsdsp.c.orig 2007-10-08 09:47:09.000000000 +0000 d5 1 a5 1 @@@@ -133,6 +133,17 @@@@ int munmap(void *start, size_t length); d9 1 a9 4 +# if defined(__NetBSD__) && !defined(OPEN_SOUND_SYSTEM) +# define OPEN_GLOBAL() handle = dlopen(NULL, DL_LAZY) +# define CLOSE_GLOBAL() (void)dlclose(handle) +# elif defined(RTLD_NEXT) d20 1 a20 1 @@@@ -145,15 +156,17 @@@@ static void artsdsp_doinit() d33 13 d57 1 d61 1 a61 1 @@@@ -258,10 +271,24 @@@@ int open (const char *pathname, int flag d65 1 a65 10 +/* NetBSD < 6 and 6.99.0 - 6.99.6 used a different ioctl() definition */ +#if defined(__NetBSD__) +# include +# if __NetBSD_Version__ < 600000000 || \ + (__NetBSD_Version__ > 699000000 && __NetBSD_Version__ < 699000700) +# define OLD_NETBSD_IOCTL_CALL +# endif +#endif + +#if defined(OLD_NETBSD_IOCTL_CALL) && !defined(OPEN_SOUND_SYSTEM) d73 1 a73 1 +#if !defined(OLD_NETBSD_IOCTL_CALL) || defined(OPEN_SOUND_SYSTEM) d77 1 a77 1 @@@@ -273,6 +300,7 @@@@ int ioctl (int fd, ioctl_request_t reque @ 1.4 log @buildlink1 -> buildlink2, and modify the arts configure script to use "${LIBOSSAUDIO}" instead of "-lossaudio". arts now works properly with audio/oss. @ text @d3 1 a3 1 --- artsc/artsdsp.c.orig Mon Jun 24 09:55:50 2002 d5 1 a5 1 @@@@ -127,6 +127,14 @@@@ int munmap(void *start, size_t length); d20 1 a20 1 @@@@ -139,14 +147,29 @@@@ static void artsdsp_doinit() d27 1 d34 1 a34 1 + handle = dlopen(NULL, DL_LAZY); d38 2 a39 1 + orig_ioctl = (orig_ioctl_ptr)dlsym(handle,"_oss_ioctl"); d44 1 a44 1 + (void) dlclose(handle); d46 1 a46 1 + OPEN_GLOBAL(); d50 1 d56 1 a56 1 + CLOSE_GLOBAL(); d60 2 a61 2 static void artsdspdebug(const char *fmt,...) @@@@ -231,13 +254,18 @@@@ int open (const char *pathname, int flag a70 3 static int channels; static int bits; static int speed; d77 1 a77 1 @@@@ -249,6 +277,7 @@@@ int ioctl (int fd, ioctl_request_t reque @ 1.3 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1.2.2 2002/08/22 11:09:39 jlam Exp $ d3 1 a3 1 --- artsc/artsdsp.c.orig Mon Jun 24 17:55:50 2002 d5 1 a5 1 @@@@ -127,6 +127,9 @@@@ d9 7 a15 1 +#if defined(__NetBSD__) a16 1 +#endif d20 1 a20 1 @@@@ -139,6 +142,18 @@@@ d24 9 a32 1 +#if defined(__NetBSD__) d44 10 a53 7 orig_open = (orig_open_ptr)dlsym(RTLD_NEXT,"open"); orig_close = (orig_close_ptr)dlsym(RTLD_NEXT,"close"); orig_write = (orig_write_ptr)dlsym(RTLD_NEXT,"write"); @@@@ -147,6 +162,7 @@@@ orig_munmap = (orig_munmap_ptr)dlsym(RTLD_NEXT,"munmap"); orig_fopen = (orig_fopen_ptr)dlsym(RTLD_NEXT,"fopen"); orig_access = (orig_access_ptr)dlsym(RTLD_NEXT,"access"); d58 1 a58 1 @@@@ -231,13 +247,18 @@@@ d62 1 a62 1 +#if defined(__NetBSD__) d73 1 a73 1 +#if !defined(__NetBSD__) d77 1 a77 1 @@@@ -249,6 +270,7 @@@@ @ 1.2 log @Update to KDE 3.0.2 Also, allow the arts SSE detection code to run on modern NetBSD systems. Changes are: arts Again Build fixes. Realtime priority configuration fix kdelibs dcop: Make it possible to disable the Qt bridge. make sure tooltip effects can be configured. kbuildsycoca: avoid crash on unreadable directories. kdockwidget: fixing reading of configuration. kedittoolbar: fix leak. khtml: many fixes. kded: signal handling fixes. kio-http slave: fixes related to form posts and cache handling. kjs: added max recursion limit. kjs: leak and compatibility fixes. kdebase kicker: &-escaping fix audiocd: fix cddb computation thumbnail previewer: calculate the number of bytes to read instead of hardcoding it. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- artsc/artsdsp.c.orig Fri Jul 27 11:49:53 2001 d42 1 a42 1 @@@@ -230,13 +246,18 @@@@ d61 1 a61 1 @@@@ -248,6 +269,7 @@@@ @ 1.1.1.1 log @Initial import of an arts-1.0.1 package. (Nearly forgot) @ text @@ 1.1.1.1.2.1 log @file patch-ab was added on branch buildlink2 on 2002-06-23 18:37:33 +0000 @ text @d1 68 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 68 $NetBSD: patch-ab,v 1.1.1.1.2.1 2002/06/23 18:37:33 jlam Exp $ --- artsc/artsdsp.c.orig Fri Jul 27 11:49:53 2001 +++ artsc/artsdsp.c @@@@ -127,6 +127,9 @@@@ static void artsdsp_doinit() { +#if defined(__NetBSD__) + void *handle; +#endif const char *env; artsdsp_init = 1; @@@@ -139,6 +142,18 @@@@ mmapemu = env && !strcmp(env,"1"); /* resolve original symbols */ +#if defined(__NetBSD__) + handle = dlopen(NULL, DL_LAZY); + orig_open = (orig_open_ptr)dlsym(handle,"open"); + orig_close = (orig_close_ptr)dlsym(handle,"close"); + orig_write = (orig_write_ptr)dlsym(handle,"write"); + orig_ioctl = (orig_ioctl_ptr)dlsym(handle,"_oss_ioctl"); + orig_mmap = (orig_mmap_ptr)dlsym(handle,"mmap"); + orig_munmap = (orig_munmap_ptr)dlsym(handle,"munmap"); + orig_fopen = (orig_fopen_ptr)dlsym(handle,"fopen"); + orig_access = (orig_access_ptr)dlsym(handle,"access"); + (void) dlclose(handle); +#else orig_open = (orig_open_ptr)dlsym(RTLD_NEXT,"open"); orig_close = (orig_close_ptr)dlsym(RTLD_NEXT,"close"); orig_write = (orig_write_ptr)dlsym(RTLD_NEXT,"write"); @@@@ -147,6 +162,7 @@@@ orig_munmap = (orig_munmap_ptr)dlsym(RTLD_NEXT,"munmap"); orig_fopen = (orig_fopen_ptr)dlsym(RTLD_NEXT,"fopen"); orig_access = (orig_access_ptr)dlsym(RTLD_NEXT,"access"); +#endif } static void artsdspdebug(const char *fmt,...) @@@@ -230,13 +246,18 @@@@ return sndfd; } +#if defined(__NetBSD__) +int _oss_ioctl (int fd, unsigned long request, void *argp) +#else int ioctl (int fd, ioctl_request_t request, ...) +#endif { static int channels; static int bits; static int speed; int space, size, latency, odelay; +#if !defined(__NetBSD__) /* * FreeBSD needs ioctl with varargs. However I have no idea how to "forward" * the variable args ioctl to the orig_ioctl routine. So I expect the ioctl @@@@ -248,6 +269,7 @@@@ va_start(args,request); argp = va_arg(args, void *); va_end(args); +#endif CHECK_INIT(); @ 1.1.1.1.2.3 log @Merge changes from pkgsrc-current into the buildlink2 branch for the packages that have buildlink2.mk files. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1.1.1.2.2 2002/08/22 11:09:39 jlam Exp $ d3 1 a3 1 --- artsc/artsdsp.c.orig Mon Jun 24 17:55:50 2002 d42 1 a42 1 @@@@ -231,13 +247,18 @@@@ d61 1 a61 1 @@@@ -249,6 +270,7 @@@@ @