summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorcvs <cvs@pkgsrc.org>2007-03-23 19:00:19 +0000
committercvs <cvs@pkgsrc.org>2007-03-23 19:00:19 +0000
commitda1b24d6fdfe442753c8272da5432c8fcaa1f43c (patch)
tree8c7c348db30abadfdc6b77822405d9ffe7b79103 /audio
parentda5bb3f20f33565c1db65018aabd8cf59023cfef (diff)
downloadpkgsrc-da1b24d6fdfe442753c8272da5432c8fcaa1f43c.tar.gz
Creating branch jlam-pkgviewsjlam-pkgviews
Diffstat (limited to 'audio')
-rw-r--r--audio/Makefile363
-rw-r--r--audio/SDL_mixer/DESCR4
-rw-r--r--audio/SDL_mixer/MESSAGE11
-rw-r--r--audio/SDL_mixer/Makefile38
-rw-r--r--audio/SDL_mixer/PLIST5
-rw-r--r--audio/SDL_mixer/buildlink3.mk25
-rw-r--r--audio/SDL_mixer/distinfo7
-rw-r--r--audio/SDL_mixer/patches/patch-aa13
-rw-r--r--audio/SDL_mixer/patches/patch-ab17
-rw-r--r--audio/SDL_sound/DESCR12
-rw-r--r--audio/SDL_sound/Makefile21
-rw-r--r--audio/SDL_sound/PLIST4
-rw-r--r--audio/SDL_sound/buildlink3.mk25
-rw-r--r--audio/SDL_sound/distinfo7
-rw-r--r--audio/SDL_sound/patches/patch-aa33
-rw-r--r--audio/SDL_sound/patches/patch-ac101
-rw-r--r--audio/abcde/DESCR3
-rw-r--r--audio/abcde/MESSAGE19
-rw-r--r--audio/abcde/Makefile43
-rw-r--r--audio/abcde/PLIST7
-rw-r--r--audio/abcde/distinfo7
-rw-r--r--audio/abcde/patches/patch-ab13
-rw-r--r--audio/abcde/patches/patch-ac81
-rw-r--r--audio/abcmidi/DESCR3
-rw-r--r--audio/abcmidi/Makefile38
-rw-r--r--audio/abcmidi/PLIST30
-rw-r--r--audio/abcmidi/distinfo8
-rw-r--r--audio/abcmidi/patches/patch-aa16
-rw-r--r--audio/abcmidi/patches/patch-ab31
-rw-r--r--audio/abcmidi/patches/patch-ac13
-rw-r--r--audio/amaroc/DESCR4
-rw-r--r--audio/amaroc/Makefile23
-rw-r--r--audio/amaroc/PLIST4
-rw-r--r--audio/amaroc/distinfo5
-rw-r--r--audio/amarok/DESCR6
-rw-r--r--audio/amarok/Makefile75
-rw-r--r--audio/amarok/PLIST1102
-rw-r--r--audio/amarok/distinfo7
-rw-r--r--audio/amarok/options.mk25
-rw-r--r--audio/amarok/patches/patch-aa16
-rw-r--r--audio/amarok/patches/patch-ab22
-rw-r--r--audio/amp/DESCR7
-rw-r--r--audio/amp/Makefile28
-rw-r--r--audio/amp/PLIST3
-rw-r--r--audio/amp/distinfo14
-rw-r--r--audio/amp/patches/patch-aa13
-rw-r--r--audio/amp/patches/patch-ab31
-rw-r--r--audio/amp/patches/patch-ac59
-rw-r--r--audio/amp/patches/patch-ad45
-rw-r--r--audio/amp/patches/patch-ae13
-rw-r--r--audio/amp/patches/patch-af23
-rw-r--r--audio/amp/patches/patch-ag18
-rw-r--r--audio/amp/patches/patch-ah16
-rw-r--r--audio/amp/patches/patch-ai12
-rw-r--r--audio/applerecords/DESCR5
-rw-r--r--audio/applerecords/Makefile31
-rw-r--r--audio/applerecords/PLIST4
-rw-r--r--audio/applerecords/distinfo5
-rwxr-xr-xaudio/applerecords/files/applerecords5
-rw-r--r--audio/arts/DESCR5
-rw-r--r--audio/arts/Makefile34
-rw-r--r--audio/arts/PLIST140
-rw-r--r--audio/arts/buildlink3.mk32
-rw-r--r--audio/arts/distinfo12
-rw-r--r--audio/arts/hacks.mk9
-rw-r--r--audio/arts/patches/patch-aa12
-rw-r--r--audio/arts/patches/patch-ab84
-rw-r--r--audio/arts/patches/patch-ac31
-rw-r--r--audio/arts/patches/patch-af14
-rw-r--r--audio/arts/patches/patch-ag13
-rw-r--r--audio/arts/patches/patch-ah169
-rw-r--r--audio/arts/patches/patch-ai13
-rw-r--r--audio/audacity/DESCR5
-rw-r--r--audio/audacity/Makefile50
-rw-r--r--audio/audacity/PLIST71
-rw-r--r--audio/audacity/distinfo17
-rw-r--r--audio/audacity/patches/patch-aa13
-rw-r--r--audio/audacity/patches/patch-ab13
-rw-r--r--audio/audacity/patches/patch-ac13
-rw-r--r--audio/audacity/patches/patch-ad13
-rw-r--r--audio/audacity/patches/patch-ae97
-rw-r--r--audio/audacity/patches/patch-af105
-rw-r--r--audio/audacity/patches/patch-ag13
-rw-r--r--audio/audacity/patches/patch-ah17
-rw-r--r--audio/audacity/patches/patch-ai20
-rw-r--r--audio/audacity/patches/patch-aj13
-rw-r--r--audio/audacity/patches/patch-ak13
-rw-r--r--audio/audacity/patches/patch-al13
-rw-r--r--audio/aumix-gtk/DESCR5
-rw-r--r--audio/aumix-gtk/Makefile17
-rw-r--r--audio/aumix/DESCR4
-rw-r--r--audio/aumix/Makefile11
-rw-r--r--audio/aumix/Makefile.common30
-rw-r--r--audio/aumix/PLIST26
-rw-r--r--audio/aumix/distinfo6
-rw-r--r--audio/aumix/patches/patch-ad16
-rw-r--r--audio/bladeenc/DESCR8
-rw-r--r--audio/bladeenc/Makefile22
-rw-r--r--audio/bladeenc/PLIST5
-rw-r--r--audio/bladeenc/distinfo6
-rw-r--r--audio/bladeenc/patches/patch-aa279
-rw-r--r--audio/bmp-esound/DESCR3
-rw-r--r--audio/bmp-esound/Makefile18
-rw-r--r--audio/bmp-esound/PLIST3
-rw-r--r--audio/bmp-mac/DESCR1
-rw-r--r--audio/bmp-mac/Makefile19
-rw-r--r--audio/bmp-mac/PLIST3
-rw-r--r--audio/bmp-mac/distinfo5
-rw-r--r--audio/bmp-musepack/DESCR1
-rw-r--r--audio/bmp-musepack/Makefile21
-rw-r--r--audio/bmp-musepack/PLIST3
-rw-r--r--audio/bmp-musepack/distinfo5
-rw-r--r--audio/bmp/DESCR3
-rw-r--r--audio/bmp/Makefile31
-rw-r--r--audio/bmp/Makefile.common99
-rw-r--r--audio/bmp/PLIST87
-rw-r--r--audio/bmp/buildlink3.mk31
-rw-r--r--audio/bmp/distinfo15
-rw-r--r--audio/bmp/hacks.mk10
-rw-r--r--audio/bmp/patches/patch-aa22
-rw-r--r--audio/bmp/patches/patch-an13
-rw-r--r--audio/bmp/patches/patch-ao14
-rw-r--r--audio/bmp/patches/patch-ap16
-rw-r--r--audio/bmp/patches/patch-aq13
-rw-r--r--audio/bmp/patches/patch-ar13
-rw-r--r--audio/bmp/patches/patch-as12
-rw-r--r--audio/bmpx/DESCR4
-rw-r--r--audio/bmpx/Makefile73
-rw-r--r--audio/bmpx/PLIST298
-rw-r--r--audio/bmpx/distinfo9
-rw-r--r--audio/bmpx/patches/patch-aa12
-rw-r--r--audio/bmpx/patches/patch-ab13
-rw-r--r--audio/bmpx/patches/patch-ac13
-rw-r--r--audio/bmpx/patches/patch-ad32
-rw-r--r--audio/cam/DESCR5
-rw-r--r--audio/cam/Makefile32
-rw-r--r--audio/cam/PLIST3
-rw-r--r--audio/cam/distinfo10
-rw-r--r--audio/cam/patches/patch-aa31
-rw-r--r--audio/cam/patches/patch-ab14
-rw-r--r--audio/cam/patches/patch-ac46
-rw-r--r--audio/cam/patches/patch-ad124
-rw-r--r--audio/cam/patches/patch-ae16
-rw-r--r--audio/cd-discid/DESCR3
-rw-r--r--audio/cd-discid/Makefile24
-rw-r--r--audio/cd-discid/PLIST3
-rw-r--r--audio/cd-discid/distinfo6
-rw-r--r--audio/cd-discid/patches/patch-aa28
-rw-r--r--audio/cdd/DESCR6
-rw-r--r--audio/cdd/Makefile23
-rw-r--r--audio/cdd/PLIST3
-rw-r--r--audio/cdd/distinfo10
-rw-r--r--audio/cdd/patches/patch-aa13
-rw-r--r--audio/cdd/patches/patch-ab15
-rw-r--r--audio/cdd/patches/patch-ac13
-rw-r--r--audio/cdd/patches/patch-ad13
-rw-r--r--audio/cdd/patches/patch-ae13
-rw-r--r--audio/cddb-bundle/DESCR2
-rw-r--r--audio/cddb-bundle/Makefile21
-rw-r--r--audio/cddb-bundle/PLIST10
-rw-r--r--audio/cddb-bundle/buildlink3.mk22
-rw-r--r--audio/cddb-bundle/distinfo5
-rw-r--r--audio/cddbd/DESCR10
-rw-r--r--audio/cddbd/Makefile30
-rw-r--r--audio/cddbd/PLIST7
-rw-r--r--audio/cddbd/distinfo11
-rw-r--r--audio/cddbd/patches/patch-aa71
-rw-r--r--audio/cddbd/patches/patch-ab30
-rw-r--r--audio/cddbd/patches/patch-ac9
-rw-r--r--audio/cdparanoia/DESCR9
-rw-r--r--audio/cdparanoia/Makefile31
-rw-r--r--audio/cdparanoia/PLIST9
-rw-r--r--audio/cdparanoia/buildlink3.mk20
-rw-r--r--audio/cdparanoia/distinfo25
-rw-r--r--audio/cdparanoia/patches/patch-aa75
-rw-r--r--audio/cdparanoia/patches/patch-ab108
-rw-r--r--audio/cdparanoia/patches/patch-ac208
-rw-r--r--audio/cdparanoia/patches/patch-ad60
-rw-r--r--audio/cdparanoia/patches/patch-ae200
-rw-r--r--audio/cdparanoia/patches/patch-ba50
-rw-r--r--audio/cdparanoia/patches/patch-ca58
-rw-r--r--audio/cdparanoia/patches/patch-cb55
-rw-r--r--audio/cdparanoia/patches/patch-cc88
-rw-r--r--audio/cdparanoia/patches/patch-cd112
-rw-r--r--audio/cdparanoia/patches/patch-ce264
-rw-r--r--audio/cdparanoia/patches/patch-cf425
-rw-r--r--audio/cdparanoia/patches/patch-cg506
-rw-r--r--audio/cdparanoia/patches/patch-ch76
-rw-r--r--audio/cdparanoia/patches/patch-ci56
-rw-r--r--audio/cdparanoia/patches/patch-cj15
-rw-r--r--audio/cdparanoia/patches/patch-ck36
-rw-r--r--audio/cdparanoia/patches/patch-cl13
-rw-r--r--audio/cdparanoia/patches/patch-cm14
-rw-r--r--audio/cdparanoia/patches/patch-cn272
-rw-r--r--audio/cdplayer/DESCR3
-rw-r--r--audio/cdplayer/Makefile32
-rw-r--r--audio/cdplayer/PLIST106
-rw-r--r--audio/cdplayer/buildlink3.mk23
-rw-r--r--audio/cdplayer/distinfo5
-rw-r--r--audio/cmp3/DESCR2
-rw-r--r--audio/cmp3/Makefile32
-rw-r--r--audio/cmp3/PLIST6
-rw-r--r--audio/cmp3/distinfo11
-rw-r--r--audio/cmp3/patches/patch-aa67
-rw-r--r--audio/cmp3/patches/patch-ab23
-rw-r--r--audio/cmp3/patches/patch-ac149
-rw-r--r--audio/cmp3/patches/patch-ad24
-rw-r--r--audio/cmp3/patches/patch-ae49
-rw-r--r--audio/cmp3/patches/patch-af36
-rw-r--r--audio/cmus/DESCR20
-rw-r--r--audio/cmus/Makefile42
-rw-r--r--audio/cmus/PLIST26
-rw-r--r--audio/cmus/distinfo5
-rw-r--r--audio/cplay/DESCR14
-rw-r--r--audio/cplay/MESSAGE14
-rw-r--r--audio/cplay/Makefile45
-rw-r--r--audio/cplay/PLIST9
-rw-r--r--audio/cplay/distinfo6
-rw-r--r--audio/cplay/patches/patch-aa23
-rw-r--r--audio/cripple/DESCR8
-rw-r--r--audio/cripple/MESSAGE16
-rw-r--r--audio/cripple/Makefile15
-rw-r--r--audio/cripple/PLIST3
-rw-r--r--audio/cripple/distinfo6
-rw-r--r--audio/cripple/patches/patch-aa13
-rw-r--r--audio/cs4235/DESCR6
-rw-r--r--audio/cs4235/Makefile17
-rw-r--r--audio/cs4235/PLIST2
-rw-r--r--audio/cs4235/distinfo5
-rw-r--r--audio/csound4-manual/DESCR3
-rw-r--r--audio/csound4-manual/Makefile27
-rw-r--r--audio/csound4-manual/PLIST1802
-rw-r--r--audio/csound4-manual/distinfo5
-rw-r--r--audio/csound4-manual/files/rt-midi-input.orc23
-rw-r--r--audio/csound4-manual/files/rt-midi-input.sco4
-rw-r--r--audio/csound4/DESCR8
-rw-r--r--audio/csound4/Makefile33
-rw-r--r--audio/csound4/PLIST55
-rw-r--r--audio/csound4/distinfo15
-rw-r--r--audio/csound4/patches/patch-aa13
-rw-r--r--audio/csound4/patches/patch-ab40
-rw-r--r--audio/csound4/patches/patch-ac13
-rw-r--r--audio/csound4/patches/patch-ad13
-rw-r--r--audio/csound4/patches/patch-ae31
-rw-r--r--audio/csound4/patches/patch-af22
-rw-r--r--audio/csound4/patches/patch-ag13
-rw-r--r--audio/csound4/patches/patch-ah17
-rw-r--r--audio/csound4/patches/patch-ai129
-rw-r--r--audio/csound4/patches/patch-aj13
-rw-r--r--audio/csound5-manual/DESCR1
-rw-r--r--audio/csound5-manual/Makefile26
-rw-r--r--audio/csound5-manual/PLIST2084
-rw-r--r--audio/csound5-manual/distinfo5
-rw-r--r--audio/csound5/DESCR8
-rw-r--r--audio/csound5/Makefile44
-rw-r--r--audio/csound5/PLIST69
-rw-r--r--audio/csound5/distinfo19
-rw-r--r--audio/csound5/patches/patch-ac247
-rw-r--r--audio/csound5/patches/patch-ad13
-rw-r--r--audio/csound5/patches/patch-ae13
-rw-r--r--audio/csound5/patches/patch-af31
-rw-r--r--audio/csound5/patches/patch-ag13
-rw-r--r--audio/csound5/patches/patch-ah13
-rw-r--r--audio/csound5/patches/patch-ai22
-rw-r--r--audio/csound5/patches/patch-aj13
-rw-r--r--audio/csound5/patches/patch-ak13
-rw-r--r--audio/csound5/patches/patch-al22
-rw-r--r--audio/csound5/patches/patch-am52
-rw-r--r--audio/csound5/patches/patch-an40
-rw-r--r--audio/csound5/patches/patch-ao13
-rw-r--r--audio/csound5/patches/patch-ap14
-rw-r--r--audio/daapd/DESCR6
-rw-r--r--audio/daapd/Makefile48
-rw-r--r--audio/daapd/PLIST6
-rw-r--r--audio/daapd/distinfo10
-rw-r--r--audio/daapd/files/daapd.sh18
-rw-r--r--audio/daapd/options.mk13
-rw-r--r--audio/daapd/patches/patch-aa63
-rw-r--r--audio/daapd/patches/patch-ac111
-rw-r--r--audio/daapd/patches/patch-ad24
-rw-r--r--audio/daapd/patches/patch-ae54
-rw-r--r--audio/daapd/patches/patch-af13
-rw-r--r--audio/dap/DESCR16
-rw-r--r--audio/dap/Makefile31
-rw-r--r--audio/dap/PLIST7
-rw-r--r--audio/dap/distinfo11
-rw-r--r--audio/dap/patches/patch-aa23
-rw-r--r--audio/dap/patches/patch-ab16
-rw-r--r--audio/dap/patches/patch-ad13
-rw-r--r--audio/dap/patches/patch-af13
-rw-r--r--audio/dap/patches/patch-ao16
-rw-r--r--audio/dap/patches/patch-ap36
-rw-r--r--audio/darkice/DESCR5
-rw-r--r--audio/darkice/Makefile48
-rw-r--r--audio/darkice/PLIST223
-rw-r--r--audio/darkice/distinfo6
-rw-r--r--audio/darkice/patches/patch-aa13
-rw-r--r--audio/disc-cover/DESCR3
-rw-r--r--audio/disc-cover/Makefile32
-rw-r--r--audio/disc-cover/PLIST16
-rw-r--r--audio/disc-cover/distinfo6
-rw-r--r--audio/disc-cover/patches/patch-aa13
-rw-r--r--audio/distmp3/DESCR5
-rw-r--r--audio/distmp3/MESSAGE11
-rw-r--r--audio/distmp3/Makefile43
-rw-r--r--audio/distmp3/PLIST7
-rw-r--r--audio/distmp3/distinfo5
-rw-r--r--audio/easyh10/DESCR8
-rw-r--r--audio/easyh10/MESSAGE7
-rw-r--r--audio/easyh10/Makefile22
-rw-r--r--audio/easyh10/PLIST28
-rw-r--r--audio/easyh10/distinfo5
-rw-r--r--audio/easytag/DESCR24
-rw-r--r--audio/easytag/Makefile28
-rw-r--r--audio/easytag/PLIST28
-rw-r--r--audio/easytag/distinfo5
-rw-r--r--audio/easytag/options.mk28
-rw-r--r--audio/eawpatches/DESCR1
-rw-r--r--audio/eawpatches/MESSAGE14
-rw-r--r--audio/eawpatches/Makefile35
-rw-r--r--audio/eawpatches/PLIST384
-rw-r--r--audio/eawpatches/distinfo5
-rw-r--r--audio/emixer/DESCR8
-rw-r--r--audio/emixer/Makefile23
-rw-r--r--audio/emixer/PLIST3
-rw-r--r--audio/emixer/distinfo10
-rw-r--r--audio/emixer/files/Makefile9
-rw-r--r--audio/emixer/patches/patch-aa16
-rw-r--r--audio/emixer/patches/patch-ab12
-rw-r--r--audio/emixer/patches/patch-ac184
-rw-r--r--audio/emixer/patches/patch-ad390
-rw-r--r--audio/emixer/patches/patch-ae16
-rw-r--r--audio/esound/DESCR5
-rw-r--r--audio/esound/MESSAGE.Interix10
-rw-r--r--audio/esound/Makefile44
-rw-r--r--audio/esound/PLIST.FreeBSD3
-rw-r--r--audio/esound/PLIST.Linux3
-rw-r--r--audio/esound/PLIST.common28
-rw-r--r--audio/esound/buildlink3.mk22
-rw-r--r--audio/esound/distinfo8
-rw-r--r--audio/esound/options.mk12
-rw-r--r--audio/esound/patches/patch-aa13
-rw-r--r--audio/esound/patches/patch-ab22
-rw-r--r--audio/esound/patches/patch-ac16
-rw-r--r--audio/exaile/DESCR5
-rw-r--r--audio/exaile/Makefile27
-rw-r--r--audio/exaile/PLIST82
-rw-r--r--audio/exaile/distinfo6
-rw-r--r--audio/exaile/patches/patch-aa10
-rw-r--r--audio/faac/DESCR3
-rw-r--r--audio/faac/Makefile26
-rw-r--r--audio/faac/PLIST5
-rw-r--r--audio/faac/buildlink3.mk20
-rw-r--r--audio/faac/distinfo8
-rw-r--r--audio/faac/options.mk15
-rw-r--r--audio/faac/patches/patch-aa12
-rw-r--r--audio/faac/patches/patch-ab30
-rw-r--r--audio/faac/patches/patch-ac16
-rw-r--r--audio/faad2/DESCR9
-rw-r--r--audio/faad2/Makefile44
-rw-r--r--audio/faad2/PLIST8
-rw-r--r--audio/faad2/buildlink3.mk21
-rw-r--r--audio/faad2/distinfo23
-rw-r--r--audio/faad2/patches/patch-aa22
-rw-r--r--audio/faad2/patches/patch-ab14
-rw-r--r--audio/faad2/patches/patch-ac19
-rw-r--r--audio/faad2/patches/patch-ad22
-rw-r--r--audio/faad2/patches/patch-ae15
-rw-r--r--audio/faad2/patches/patch-af31
-rw-r--r--audio/faad2/patches/patch-ag36
-rw-r--r--audio/faad2/patches/patch-ah15
-rw-r--r--audio/faad2/patches/patch-ai13
-rw-r--r--audio/faad2/patches/patch-aj6
-rw-r--r--audio/faad2/patches/patch-ak34
-rw-r--r--audio/faad2/patches/patch-al25
-rw-r--r--audio/faad2/patches/patch-am13
-rw-r--r--audio/faad2/patches/patch-an22
-rw-r--r--audio/faad2/patches/patch-ao13
-rw-r--r--audio/faad2/patches/patch-aq74
-rw-r--r--audio/faad2/patches/patch-ar17
-rw-r--r--audio/faad2/patches/patch-as15
-rw-r--r--audio/festival-doc/DESCR1
-rw-r--r--audio/festival-doc/Makefile43
-rw-r--r--audio/festival-doc/PLIST189
-rw-r--r--audio/festival-doc/distinfo6
-rw-r--r--audio/festival-doc/patches/patch-aa16
-rw-r--r--audio/festival/DESCR11
-rw-r--r--audio/festival/MESSAGE10
-rw-r--r--audio/festival/Makefile103
-rw-r--r--audio/festival/PLIST146
-rw-r--r--audio/festival/distinfo13
-rw-r--r--audio/festival/files/NetBSD.mak12
-rw-r--r--audio/festival/files/festival.sh5
-rw-r--r--audio/festival/files/festival_client.sh4
-rw-r--r--audio/festival/files/sitevars.scm2
-rw-r--r--audio/festival/files/top-Makefile3
-rw-r--r--audio/festival/files/unknown_DragonFly.mak27
-rw-r--r--audio/festival/files/unknown_NetBSD.mak27
-rw-r--r--audio/festival/patches/patch-aa22
-rw-r--r--audio/festival/patches/patch-ab22
-rw-r--r--audio/festival/patches/patch-ac13
-rw-r--r--audio/festival/patches/patch-ad12
-rw-r--r--audio/festival/patches/patch-ae16
-rw-r--r--audio/festlex-cmu/DESCR2
-rw-r--r--audio/festlex-cmu/Makefile29
-rw-r--r--audio/festlex-cmu/PLIST11
-rw-r--r--audio/festlex-cmu/distinfo5
-rw-r--r--audio/festlex-oald/DESCR3
-rw-r--r--audio/festlex-oald/Makefile31
-rw-r--r--audio/festlex-oald/PLIST11
-rw-r--r--audio/festlex-oald/distinfo5
-rw-r--r--audio/festlex-ogi/DESCR2
-rw-r--r--audio/festlex-ogi/Makefile31
-rw-r--r--audio/festlex-ogi/PLIST3
-rw-r--r--audio/festlex-ogi/distinfo5
-rw-r--r--audio/festlex-poslex/DESCR1
-rw-r--r--audio/festlex-poslex/Makefile29
-rw-r--r--audio/festlex-poslex/PLIST4
-rw-r--r--audio/festlex-poslex/distinfo5
-rw-r--r--audio/festogi-spanish/DESCR8
-rw-r--r--audio/festogi-spanish/Makefile31
-rw-r--r--audio/festogi-spanish/PLIST10
-rw-r--r--audio/festogi-spanish/distinfo5
-rw-r--r--audio/festvox-abc/DESCR8
-rw-r--r--audio/festvox-abc/Makefile34
-rw-r--r--audio/festvox-abc/PLIST7
-rw-r--r--audio/festvox-abc/distinfo5
-rw-r--r--audio/festvox-aec/DESCR8
-rw-r--r--audio/festvox-aec/Makefile34
-rw-r--r--audio/festvox-aec/PLIST8
-rw-r--r--audio/festvox-aec/distinfo5
-rw-r--r--audio/festvox-don/DESCR8
-rw-r--r--audio/festvox-don/Makefile31
-rw-r--r--audio/festvox-don/PLIST7
-rw-r--r--audio/festvox-don/distinfo5
-rw-r--r--audio/festvox-el11/DESCR9
-rw-r--r--audio/festvox-el11/Makefile31
-rw-r--r--audio/festvox-el11/PLIST10
-rw-r--r--audio/festvox-el11/distinfo5
-rw-r--r--audio/festvox-en1/DESCR13
-rw-r--r--audio/festvox-en1/Makefile38
-rw-r--r--audio/festvox-en1/PLIST7
-rw-r--r--audio/festvox-en1/distinfo5
-rw-r--r--audio/festvox-hvs/DESCR8
-rw-r--r--audio/festvox-hvs/Makefile33
-rw-r--r--audio/festvox-hvs/PLIST7
-rw-r--r--audio/festvox-hvs/distinfo5
-rw-r--r--audio/festvox-jph/DESCR8
-rw-r--r--audio/festvox-jph/Makefile32
-rw-r--r--audio/festvox-jph/PLIST8
-rw-r--r--audio/festvox-jph/distinfo5
-rw-r--r--audio/festvox-kal16/DESCR11
-rw-r--r--audio/festvox-kal16/Makefile33
-rw-r--r--audio/festvox-kal16/PLIST8
-rw-r--r--audio/festvox-kal16/distinfo5
-rw-r--r--audio/festvox-kal8/DESCR11
-rw-r--r--audio/festvox-kal8/Makefile33
-rw-r--r--audio/festvox-kal8/PLIST8
-rw-r--r--audio/festvox-kal8/distinfo5
-rw-r--r--audio/festvox-ked16/DESCR11
-rw-r--r--audio/festvox-ked16/Makefile33
-rw-r--r--audio/festvox-ked16/PLIST8
-rw-r--r--audio/festvox-ked16/distinfo5
-rw-r--r--audio/festvox-ked8/DESCR11
-rw-r--r--audio/festvox-ked8/Makefile33
-rw-r--r--audio/festvox-ked8/PLIST8
-rw-r--r--audio/festvox-ked8/distinfo5
-rw-r--r--audio/festvox-mwm/DESCR8
-rw-r--r--audio/festvox-mwm/Makefile32
-rw-r--r--audio/festvox-mwm/PLIST13
-rw-r--r--audio/festvox-mwm/distinfo5
-rw-r--r--audio/festvox-ogirab/DESCR8
-rw-r--r--audio/festvox-ogirab/Makefile32
-rw-r--r--audio/festvox-ogirab/PLIST8
-rw-r--r--audio/festvox-ogirab/distinfo5
-rw-r--r--audio/festvox-rab16/DESCR11
-rw-r--r--audio/festvox-rab16/Makefile33
-rw-r--r--audio/festvox-rab16/PLIST7
-rw-r--r--audio/festvox-rab16/distinfo5
-rw-r--r--audio/festvox-rab8/DESCR11
-rw-r--r--audio/festvox-rab8/Makefile33
-rw-r--r--audio/festvox-rab8/PLIST7
-rw-r--r--audio/festvox-rab8/distinfo5
-rw-r--r--audio/festvox-tll/DESCR8
-rw-r--r--audio/festvox-tll/Makefile32
-rw-r--r--audio/festvox-tll/PLIST8
-rw-r--r--audio/festvox-tll/distinfo5
-rw-r--r--audio/festvox-us1/DESCR12
-rw-r--r--audio/festvox-us1/Makefile38
-rw-r--r--audio/festvox-us1/PLIST9
-rw-r--r--audio/festvox-us1/distinfo5
-rw-r--r--audio/festvox-us2/DESCR12
-rw-r--r--audio/festvox-us2/Makefile38
-rw-r--r--audio/festvox-us2/PLIST9
-rw-r--r--audio/festvox-us2/distinfo5
-rw-r--r--audio/festvox-us3/DESCR14
-rw-r--r--audio/festvox-us3/Makefile38
-rw-r--r--audio/festvox-us3/PLIST9
-rw-r--r--audio/festvox-us3/distinfo5
-rw-r--r--audio/flac/DESCR15
-rw-r--r--audio/flac/Makefile57
-rw-r--r--audio/flac/PLIST244
-rw-r--r--audio/flac/buildlink3.mk22
-rw-r--r--audio/flac/distinfo13
-rw-r--r--audio/flac/patches/patch-aa13
-rw-r--r--audio/flac/patches/patch-ab13
-rw-r--r--audio/flac/patches/patch-ac13
-rw-r--r--audio/flac/patches/patch-ad26
-rw-r--r--audio/flac/patches/patch-ae13
-rw-r--r--audio/flac/patches/patch-af27
-rw-r--r--audio/flac/patches/patch-ag16
-rw-r--r--audio/flac/patches/patch-ah15
-rw-r--r--audio/flac123/DESCR1
-rw-r--r--audio/flac123/Makefile18
-rw-r--r--audio/flac123/PLIST2
-rw-r--r--audio/flac123/distinfo10
-rw-r--r--audio/flac123/patches/patch-aa16
-rw-r--r--audio/flac123/patches/patch-ab69
-rw-r--r--audio/flac123/patches/patch-ac184
-rw-r--r--audio/flac123/patches/patch-ad29
-rw-r--r--audio/flac123/patches/patch-ae30
-rw-r--r--audio/flac2mp3/DESCR18
-rw-r--r--audio/flac2mp3/Makefile30
-rw-r--r--audio/flac2mp3/PLIST2
-rw-r--r--audio/flac2mp3/distinfo5
-rw-r--r--audio/flite/DESCR4
-rw-r--r--audio/flite/Makefile19
-rw-r--r--audio/flite/PLIST50
-rw-r--r--audio/flite/distinfo9
-rw-r--r--audio/flite/patches/patch-aa35
-rw-r--r--audio/flite/patches/patch-ab13
-rw-r--r--audio/flite/patches/patch-ac58
-rw-r--r--audio/flite/patches/patch-ad18
-rw-r--r--audio/fluidsynth/DESCR9
-rw-r--r--audio/fluidsynth/Makefile27
-rw-r--r--audio/fluidsynth/PLIST24
-rw-r--r--audio/fluidsynth/buildlink3.mk21
-rw-r--r--audio/fluidsynth/distinfo10
-rw-r--r--audio/fluidsynth/hacks.mk10
-rw-r--r--audio/fluidsynth/patches/patch-aa162
-rw-r--r--audio/fluidsynth/patches/patch-ab31
-rw-r--r--audio/fluidsynth/patches/patch-ac22
-rw-r--r--audio/fluidsynth/patches/patch-ad13
-rw-r--r--audio/fluidsynth/patches/patch-ae53
-rw-r--r--audio/freepats/DESCR2
-rw-r--r--audio/freepats/MESSAGE14
-rw-r--r--audio/freepats/Makefile28
-rw-r--r--audio/freepats/PLIST153
-rw-r--r--audio/freepats/distinfo5
-rw-r--r--audio/freezetag/DESCR5
-rw-r--r--audio/freezetag/Makefile16
-rw-r--r--audio/freezetag/PLIST2
-rw-r--r--audio/freezetag/distinfo10
-rw-r--r--audio/freezetag/patches/patch-aa13
-rw-r--r--audio/freezetag/patches/patch-ab13
-rw-r--r--audio/freezetag/patches/patch-ac22
-rw-r--r--audio/freezetag/patches/patch-ad13
-rw-r--r--audio/freezetag/patches/patch-ae15
-rw-r--r--audio/gkrellm-volume/DESCR2
-rw-r--r--audio/gkrellm-volume/Makefile22
-rw-r--r--audio/gkrellm-volume/PLIST8
-rw-r--r--audio/gkrellm-volume/distinfo7
-rw-r--r--audio/gkrellm-volume/patches/patch-aa21
-rw-r--r--audio/gkrellm-volume/patches/patch-ab16
-rw-r--r--audio/gkrellm-xmms/DESCR12
-rw-r--r--audio/gkrellm-xmms/Makefile26
-rw-r--r--audio/gkrellm-xmms/PLIST6
-rw-r--r--audio/gkrellm-xmms/distinfo6
-rw-r--r--audio/gkrellm-xmms/patches/patch-aa18
-rw-r--r--audio/gkrellm1-volume/DESCR2
-rw-r--r--audio/gkrellm1-volume/Makefile20
-rw-r--r--audio/gkrellm1-volume/PLIST2
-rw-r--r--audio/gkrellm1-volume/distinfo7
-rw-r--r--audio/gkrellm1-volume/patches/patch-aa57
-rw-r--r--audio/gkrellm1-volume/patches/patch-ab13
-rw-r--r--audio/gkrellm1-xmms/DESCR12
-rw-r--r--audio/gkrellm1-xmms/Makefile20
-rw-r--r--audio/gkrellm1-xmms/PLIST2
-rw-r--r--audio/gkrellm1-xmms/distinfo6
-rw-r--r--audio/gkrellm1-xmms/patches/patch-aa32
-rw-r--r--audio/glurp/DESCR10
-rw-r--r--audio/glurp/Makefile20
-rw-r--r--audio/glurp/PLIST21
-rw-r--r--audio/glurp/distinfo6
-rw-r--r--audio/glurp/patches/patch-aa12
-rw-r--r--audio/gmp3info/DESCR4
-rw-r--r--audio/gmp3info/Makefile23
-rw-r--r--audio/gmp3info/PLIST4
-rw-r--r--audio/gmp3info/distinfo7
-rw-r--r--audio/gmp3info/patches/patch-aa44
-rw-r--r--audio/gmp3info/patches/patch-ab23
-rw-r--r--audio/gmpc/DESCR3
-rw-r--r--audio/gmpc/Makefile26
-rw-r--r--audio/gmpc/PLIST34
-rw-r--r--audio/gmpc/distinfo12
-rw-r--r--audio/gmpc/patches/patch-aa12
-rw-r--r--audio/gmpc/patches/patch-ab47
-rw-r--r--audio/gmpc/patches/patch-ac22
-rw-r--r--audio/gmpc/patches/patch-ad22
-rw-r--r--audio/gmpc/patches/patch-ae12
-rw-r--r--audio/gmpc/patches/patch-af19
-rw-r--r--audio/gmpc/patches/patch-ag9
-rw-r--r--audio/gnome-audio/DESCR11
-rw-r--r--audio/gnome-audio/Makefile29
-rw-r--r--audio/gnome-audio/PLIST19
-rw-r--r--audio/gnome-audio/distinfo5
-rw-r--r--audio/gnome-speech/DESCR1
-rw-r--r--audio/gnome-speech/Makefile28
-rw-r--r--audio/gnome-speech/PLIST20
-rw-r--r--audio/gnome-speech/buildlink3.mk24
-rw-r--r--audio/gnome-speech/distinfo7
-rw-r--r--audio/gnome-speech/patches/patch-aa18
-rw-r--r--audio/gnome-speech/patches/patch-ab13
-rw-r--r--audio/gnome-vfs2-cdda/DESCR6
-rw-r--r--audio/gnome-vfs2-cdda/Makefile17
-rw-r--r--audio/gnome-vfs2-cdda/PLIST5
-rw-r--r--audio/gogo/DESCR2
-rw-r--r--audio/gogo/Makefile41
-rw-r--r--audio/gogo/PLIST4
-rw-r--r--audio/gogo/distinfo6
-rw-r--r--audio/gogo/patches/patch-aa13
-rw-r--r--audio/goom/DESCR2
-rw-r--r--audio/goom/Makefile22
-rw-r--r--audio/goom/PLIST16
-rw-r--r--audio/goom/buildlink3.mk19
-rw-r--r--audio/goom/distinfo8
-rw-r--r--audio/goom/patches/patch-aa14
-rw-r--r--audio/goom/patches/patch-ab16
-rw-r--r--audio/goom/patches/patch-ac15
-rw-r--r--audio/gqmpeg-devel/DEINSTALL12
-rw-r--r--audio/gqmpeg-devel/DESCR16
-rw-r--r--audio/gqmpeg-devel/MESSAGE15
-rw-r--r--audio/gqmpeg-devel/Makefile30
-rw-r--r--audio/gqmpeg-devel/PLIST82
-rw-r--r--audio/gqmpeg-devel/distinfo9
-rw-r--r--audio/gqmpeg-devel/options.mk15
-rw-r--r--audio/gqmpeg-devel/patches/patch-aa13
-rw-r--r--audio/gqmpeg-devel/patches/patch-ab14
-rw-r--r--audio/gqmpeg-devel/patches/patch-ac13
-rw-r--r--audio/gqmpeg-devel/patches/patch-ad26
-rw-r--r--audio/gqmpeg-skins/DESCR1
-rw-r--r--audio/gqmpeg-skins/Makefile104
-rw-r--r--audio/gqmpeg-skins/PLIST1955
-rw-r--r--audio/gqmpeg-skins/distinfo206
-rw-r--r--audio/gqmpeg/DEINSTALL12
-rw-r--r--audio/gqmpeg/DESCR16
-rw-r--r--audio/gqmpeg/MESSAGE15
-rw-r--r--audio/gqmpeg/Makefile30
-rw-r--r--audio/gqmpeg/PLIST83
-rw-r--r--audio/gqmpeg/distinfo7
-rw-r--r--audio/gqmpeg/options.mk15
-rw-r--r--audio/gqmpeg/patches/patch-aa20
-rw-r--r--audio/gqmpeg/patches/patch-ab16
-rw-r--r--audio/gramofile/DESCR21
-rw-r--r--audio/gramofile/Makefile34
-rw-r--r--audio/gramofile/PLIST4
-rw-r--r--audio/gramofile/distinfo8
-rw-r--r--audio/gramofile/patches/patch-aa44
-rw-r--r--audio/gramofile/patches/patch-ab39
-rw-r--r--audio/gramofile/patches/patch-ac83
-rw-r--r--audio/gsm/DESCR2
-rw-r--r--audio/gsm/Makefile25
-rw-r--r--audio/gsm/PLIST15
-rw-r--r--audio/gsm/buildlink3.mk20
-rw-r--r--audio/gsm/distinfo8
-rw-r--r--audio/gsm/patches/patch-aa46
-rw-r--r--audio/gsm/patches/patch-ab215
-rw-r--r--audio/gsm/patches/patch-ac11
-rw-r--r--audio/gst-plugins0.10-a52/DESCR12
-rw-r--r--audio/gst-plugins0.10-a52/Makefile10
-rw-r--r--audio/gst-plugins0.10-a52/PLIST3
-rw-r--r--audio/gst-plugins0.10-cdparanoia/DESCR10
-rw-r--r--audio/gst-plugins0.10-cdparanoia/Makefile13
-rw-r--r--audio/gst-plugins0.10-cdparanoia/PLIST2
-rw-r--r--audio/gst-plugins0.10-dts/DESCR12
-rw-r--r--audio/gst-plugins0.10-dts/Makefile10
-rw-r--r--audio/gst-plugins0.10-dts/PLIST3
-rw-r--r--audio/gst-plugins0.10-esound/DESCR13
-rw-r--r--audio/gst-plugins0.10-esound/Makefile11
-rw-r--r--audio/gst-plugins0.10-esound/PLIST3
-rw-r--r--audio/gst-plugins0.10-faad/DESCR10
-rw-r--r--audio/gst-plugins0.10-faad/Makefile10
-rw-r--r--audio/gst-plugins0.10-faad/PLIST2
-rw-r--r--audio/gst-plugins0.10-flac/DESCR9
-rw-r--r--audio/gst-plugins0.10-flac/Makefile13
-rw-r--r--audio/gst-plugins0.10-flac/PLIST2
-rw-r--r--audio/gst-plugins0.10-fluendo-mp3/DESCR4
-rw-r--r--audio/gst-plugins0.10-fluendo-mp3/Makefile18
-rw-r--r--audio/gst-plugins0.10-fluendo-mp3/PLIST2
-rw-r--r--audio/gst-plugins0.10-fluendo-mp3/distinfo5
-rw-r--r--audio/gst-plugins0.10-libvisual/DESCR16
-rw-r--r--audio/gst-plugins0.10-libvisual/Makefile11
-rw-r--r--audio/gst-plugins0.10-libvisual/PLIST2
-rw-r--r--audio/gst-plugins0.10-mad/DESCR12
-rw-r--r--audio/gst-plugins0.10-mad/Makefile14
-rw-r--r--audio/gst-plugins0.10-mad/PLIST3
-rw-r--r--audio/gst-plugins0.10-musepack/DESCR12
-rw-r--r--audio/gst-plugins0.10-musepack/Makefile10
-rw-r--r--audio/gst-plugins0.10-musepack/PLIST3
-rw-r--r--audio/gst-plugins0.10-oss/DESCR13
-rw-r--r--audio/gst-plugins0.10-oss/Makefile18
-rw-r--r--audio/gst-plugins0.10-oss/PLIST3
-rw-r--r--audio/gst-plugins0.10-sid/DESCR12
-rw-r--r--audio/gst-plugins0.10-sid/Makefile13
-rw-r--r--audio/gst-plugins0.10-sid/PLIST3
-rw-r--r--audio/gst-plugins0.10-spc/DESCR12
-rw-r--r--audio/gst-plugins0.10-spc/Makefile10
-rw-r--r--audio/gst-plugins0.10-spc/PLIST3
-rw-r--r--audio/gst-plugins0.10-speex/DESCR7
-rw-r--r--audio/gst-plugins0.10-speex/Makefile11
-rw-r--r--audio/gst-plugins0.10-speex/PLIST2
-rw-r--r--audio/gst-plugins0.10-vorbis/DESCR10
-rw-r--r--audio/gst-plugins0.10-vorbis/Makefile11
-rw-r--r--audio/gst-plugins0.10-vorbis/PLIST2
-rw-r--r--audio/gst-plugins0.10-wavpack/DESCR12
-rw-r--r--audio/gst-plugins0.10-wavpack/Makefile10
-rw-r--r--audio/gst-plugins0.10-wavpack/PLIST3
-rw-r--r--audio/gst-plugins0.8-artsd/DESCR9
-rw-r--r--audio/gst-plugins0.8-artsd/Makefile13
-rw-r--r--audio/gst-plugins0.8-artsd/PLIST3
-rw-r--r--audio/gst-plugins0.8-artsd/buildlink3.mk27
-rw-r--r--audio/gst-plugins0.8-cdparanoia/DESCR10
-rw-r--r--audio/gst-plugins0.8-cdparanoia/Makefile13
-rw-r--r--audio/gst-plugins0.8-cdparanoia/PLIST3
-rw-r--r--audio/gst-plugins0.8-esound/DESCR10
-rw-r--r--audio/gst-plugins0.8-esound/Makefile12
-rw-r--r--audio/gst-plugins0.8-esound/PLIST3
-rw-r--r--audio/gst-plugins0.8-esound/buildlink3.mk26
-rw-r--r--audio/gst-plugins0.8-faad/DESCR10
-rw-r--r--audio/gst-plugins0.8-faad/Makefile11
-rw-r--r--audio/gst-plugins0.8-faad/PLIST3
-rw-r--r--audio/gst-plugins0.8-lame/DESCR10
-rw-r--r--audio/gst-plugins0.8-lame/Makefile11
-rw-r--r--audio/gst-plugins0.8-lame/PLIST3
-rw-r--r--audio/gst-plugins0.8-mad/DESCR10
-rw-r--r--audio/gst-plugins0.8-mad/Makefile12
-rw-r--r--audio/gst-plugins0.8-mad/PLIST3
-rw-r--r--audio/gst-plugins0.8-mad/buildlink3.mk27
-rw-r--r--audio/gst-plugins0.8-oss/DESCR10
-rw-r--r--audio/gst-plugins0.8-oss/Makefile19
-rw-r--r--audio/gst-plugins0.8-oss/PLIST3
-rw-r--r--audio/gst-plugins0.8-vorbis/DESCR10
-rw-r--r--audio/gst-plugins0.8-vorbis/Makefile13
-rw-r--r--audio/gst-plugins0.8-vorbis/PLIST3
-rw-r--r--audio/gtick/DESCR3
-rw-r--r--audio/gtick/Makefile35
-rw-r--r--audio/gtick/PLIST22
-rw-r--r--audio/gtick/distinfo6
-rw-r--r--audio/gtick/patches/patch-aa13
-rw-r--r--audio/gtkmserv/DESCR2
-rw-r--r--audio/gtkmserv/Makefile22
-rw-r--r--audio/gtkmserv/PLIST2
-rw-r--r--audio/gtkmserv/distinfo6
-rw-r--r--audio/gtkmserv/patches/patch-aa26
-rw-r--r--audio/gtkpod/DESCR13
-rw-r--r--audio/gtkpod/MESSAGE.NetBSD14
-rw-r--r--audio/gtkpod/Makefile34
-rw-r--r--audio/gtkpod/PLIST37
-rw-r--r--audio/gtkpod/distinfo15
-rw-r--r--audio/gtkpod/options.mk12
-rw-r--r--audio/gtkpod/patches/patch-aa12
-rw-r--r--audio/gtkpod/patches/patch-ab12
-rw-r--r--audio/gtkpod/patches/patch-ac13
-rw-r--r--audio/gtkpod/patches/patch-ba29
-rw-r--r--audio/gtkpod/patches/patch-bb22
-rw-r--r--audio/gtkpod/patches/patch-bc18
-rw-r--r--audio/gtkpod/patches/patch-bd31
-rw-r--r--audio/gtkpod/patches/patch-be18
-rw-r--r--audio/gtkpod/patches/patch-bf19
-rw-r--r--audio/gtkpod/patches/patch-bg13
-rw-r--r--audio/guspatches/DESCR1
-rw-r--r--audio/guspatches/MESSAGE14
-rw-r--r--audio/guspatches/Makefile36
-rw-r--r--audio/guspatches/PLIST204
-rw-r--r--audio/guspatches/distinfo5
-rw-r--r--audio/guspatches/files/gravis.cfg205
-rw-r--r--audio/guspatches/files/midia.cfg15
-rw-r--r--audio/guspatches/files/timidity.cfg75
-rw-r--r--audio/hydrogen/DESCR2
-rw-r--r--audio/hydrogen/Makefile36
-rw-r--r--audio/hydrogen/PLIST110
-rw-r--r--audio/hydrogen/distinfo5
-rw-r--r--audio/icecast/DESCR6
-rw-r--r--audio/icecast/Makefile62
-rw-r--r--audio/icecast/PLIST51
-rw-r--r--audio/icecast/distinfo7
-rw-r--r--audio/icecast/files/icecast.sh18
-rw-r--r--audio/icecast/patches/patch-aa13
-rw-r--r--audio/icecast/patches/patch-ab45
-rw-r--r--audio/icecast1/DESCR4
-rw-r--r--audio/icecast1/Makefile55
-rw-r--r--audio/icecast1/PLIST32
-rw-r--r--audio/icecast1/distinfo16
-rw-r--r--audio/icecast1/files/icecast.sh29
-rw-r--r--audio/icecast1/patches/patch-aa20
-rw-r--r--audio/icecast1/patches/patch-ab36
-rw-r--r--audio/icecast1/patches/patch-ac16
-rw-r--r--audio/icecast1/patches/patch-ad13
-rw-r--r--audio/icecast1/patches/patch-ae12
-rw-r--r--audio/icecast1/patches/patch-af13
-rw-r--r--audio/icecast1/patches/patch-ag14
-rw-r--r--audio/icecast1/patches/patch-ah13
-rw-r--r--audio/icecast1/patches/patch-ai13
-rw-r--r--audio/icecast1/patches/patch-aj13
-rw-r--r--audio/icecast1/patches/patch-ak20
-rw-r--r--audio/ices-mp3/DESCR3
-rw-r--r--audio/ices-mp3/Makefile72
-rw-r--r--audio/ices-mp3/PLIST18
-rw-r--r--audio/ices-mp3/distinfo6
-rw-r--r--audio/ices-mp3/patches/patch-aa13
-rw-r--r--audio/id3/DESCR5
-rw-r--r--audio/id3/Makefile15
-rw-r--r--audio/id3/PLIST3
-rw-r--r--audio/id3/distinfo7
-rw-r--r--audio/id3/patches/patch-aa38
-rw-r--r--audio/id3/patches/patch-ab12
-rw-r--r--audio/id3ed/DESCR6
-rw-r--r--audio/id3ed/Makefile23
-rw-r--r--audio/id3ed/PLIST3
-rw-r--r--audio/id3ed/distinfo7
-rw-r--r--audio/id3ed/patches/patch-aa22
-rw-r--r--audio/id3ed/patches/patch-ab13
-rw-r--r--audio/id3lib/DESCR5
-rw-r--r--audio/id3lib/Makefile22
-rw-r--r--audio/id3lib/PLIST21
-rw-r--r--audio/id3lib/buildlink3.mk22
-rw-r--r--audio/id3lib/distinfo11
-rw-r--r--audio/id3lib/patches/patch-aa27
-rw-r--r--audio/id3lib/patches/patch-af13
-rw-r--r--audio/id3lib/patches/patch-ag13
-rw-r--r--audio/id3lib/patches/patch-ah13
-rw-r--r--audio/id3lib/patches/patch-ai28
-rw-r--r--audio/id3lib/patches/patch-aj15
-rw-r--r--audio/id3v2/DESCR4
-rw-r--r--audio/id3v2/Makefile27
-rw-r--r--audio/id3v2/PLIST5
-rw-r--r--audio/id3v2/distinfo6
-rw-r--r--audio/id3v2/patches/patch-aa19
-rw-r--r--audio/ifp-line/DESCR5
-rw-r--r--audio/ifp-line/Makefile13
-rw-r--r--audio/ifp-line/PLIST3
-rw-r--r--audio/ifp-line/distinfo6
-rw-r--r--audio/ifp-line/patches/patch-aa15
-rw-r--r--audio/jack/DESCR6
-rw-r--r--audio/jack/Makefile28
-rw-r--r--audio/jack/PLIST33
-rw-r--r--audio/jack/buildlink3.mk20
-rw-r--r--audio/jack/distinfo7
-rw-r--r--audio/jack/patches/patch-aa47
-rw-r--r--audio/jack/patches/patch-ab15
-rw-r--r--audio/juke/DESCR3
-rw-r--r--audio/juke/MESSAGE21
-rw-r--r--audio/juke/Makefile34
-rw-r--r--audio/juke/PLIST7
-rw-r--r--audio/juke/distinfo11
-rw-r--r--audio/juke/patches/patch-aa18
-rw-r--r--audio/juke/patches/patch-ab13
-rw-r--r--audio/juke/patches/patch-ac15
-rw-r--r--audio/juke/patches/patch-ad23
-rw-r--r--audio/juke/patches/patch-ae23
-rw-r--r--audio/juke/patches/patch-af27
-rw-r--r--audio/kid3/DESCR13
-rw-r--r--audio/kid3/Makefile31
-rw-r--r--audio/kid3/PLIST29
-rw-r--r--audio/kid3/distinfo7
-rw-r--r--audio/kid3/patches/patch-ab22
-rw-r--r--audio/kid3/patches/patch-ac23
-rw-r--r--audio/kmp/DESCR7
-rw-r--r--audio/kmp/Makefile24
-rw-r--r--audio/kmp/PLIST2
-rw-r--r--audio/kmp/distinfo7
-rw-r--r--audio/kmp/patches/patch-aa12
-rw-r--r--audio/kmp/patches/patch-ab13
-rw-r--r--audio/ladspa/DESCR8
-rw-r--r--audio/ladspa/Makefile26
-rw-r--r--audio/ladspa/PLIST11
-rw-r--r--audio/ladspa/buildlink3.mk20
-rw-r--r--audio/ladspa/distinfo8
-rw-r--r--audio/ladspa/patches/patch-aa88
-rw-r--r--audio/ladspa/patches/patch-ab17
-rw-r--r--audio/ladspa/patches/patch-ac20
-rw-r--r--audio/lame/DESCR14
-rw-r--r--audio/lame/Makefile49
-rw-r--r--audio/lame/PLIST18
-rw-r--r--audio/lame/buildlink3.mk20
-rw-r--r--audio/lame/distinfo10
-rw-r--r--audio/lame/options.mk13
-rw-r--r--audio/lame/patches/patch-aa31
-rw-r--r--audio/lame/patches/patch-ab13
-rw-r--r--audio/lame/patches/patch-ac13
-rw-r--r--audio/lame/patches/patch-ad12
-rw-r--r--audio/lame/patches/patch-ae13
-rw-r--r--audio/liba52/DESCR4
-rw-r--r--audio/liba52/Makefile26
-rw-r--r--audio/liba52/PLIST11
-rw-r--r--audio/liba52/buildlink3.mk20
-rw-r--r--audio/liba52/distinfo9
-rw-r--r--audio/liba52/patches/patch-aa13
-rw-r--r--audio/liba52/patches/patch-ab27
-rw-r--r--audio/liba52/patches/patch-ac9
-rw-r--r--audio/liba52/patches/patch-ad13
-rw-r--r--audio/libao-arts/DESCR4
-rw-r--r--audio/libao-arts/Makefile19
-rw-r--r--audio/libao-arts/PLIST3
-rw-r--r--audio/libao-esound/DESCR4
-rw-r--r--audio/libao-esound/Makefile18
-rw-r--r--audio/libao-esound/PLIST3
-rw-r--r--audio/libao-macosx/DESCR4
-rw-r--r--audio/libao-macosx/Makefile21
-rw-r--r--audio/libao-macosx/PLIST3
-rw-r--r--audio/libao-oss/DESCR4
-rw-r--r--audio/libao-oss/Makefile29
-rw-r--r--audio/libao-oss/PLIST3
-rw-r--r--audio/libao-sun/DESCR6
-rw-r--r--audio/libao-sun/Makefile21
-rw-r--r--audio/libao-sun/PLIST3
-rw-r--r--audio/libao/DESCR9
-rw-r--r--audio/libao/MESSAGE.common16
-rw-r--r--audio/libao/Makefile12
-rw-r--r--audio/libao/Makefile.common40
-rw-r--r--audio/libao/PLIST49
-rw-r--r--audio/libao/buildlink3.mk38
-rw-r--r--audio/libao/distinfo9
-rw-r--r--audio/libao/patches/patch-ab13
-rw-r--r--audio/libao/patches/patch-ac13
-rw-r--r--audio/libao/patches/patch-ad13
-rw-r--r--audio/libao/patches/patch-ae95
-rw-r--r--audio/libaudiofile/DESCR11
-rw-r--r--audio/libaudiofile/Makefile29
-rw-r--r--audio/libaudiofile/PLIST26
-rw-r--r--audio/libaudiofile/buildlink3.mk20
-rw-r--r--audio/libaudiofile/distinfo7
-rw-r--r--audio/libaudiofile/patches/patch-aa13
-rw-r--r--audio/libaudiofile/patches/patch-ab13
-rw-r--r--audio/libcdaudio/DESCR23
-rw-r--r--audio/libcdaudio/Makefile21
-rw-r--r--audio/libcdaudio/PLIST6
-rw-r--r--audio/libcdaudio/buildlink3.mk20
-rw-r--r--audio/libcdaudio/distinfo8
-rw-r--r--audio/libcdaudio/patches/patch-aa17
-rw-r--r--audio/libcdaudio/patches/patch-ab25
-rw-r--r--audio/libcdaudio/patches/patch-ac13
-rw-r--r--audio/libcddb/DESCR4
-rw-r--r--audio/libcddb/Makefile25
-rw-r--r--audio/libcddb/PLIST15
-rw-r--r--audio/libcddb/buildlink3.mk23
-rw-r--r--audio/libcddb/distinfo5
-rw-r--r--audio/libdca/DESCR3
-rw-r--r--audio/libdca/Makefile23
-rw-r--r--audio/libdca/PLIST9
-rw-r--r--audio/libdca/buildlink3.mk20
-rw-r--r--audio/libdca/distinfo5
-rw-r--r--audio/libdiscid/DESCR9
-rw-r--r--audio/libdiscid/Makefile23
-rw-r--r--audio/libdiscid/PLIST5
-rw-r--r--audio/libdiscid/buildlink3.mk19
-rw-r--r--audio/libdiscid/distinfo5
-rw-r--r--audio/libgpod/DESCR1
-rw-r--r--audio/libgpod/Makefile20
-rw-r--r--audio/libgpod/PLIST36
-rw-r--r--audio/libgpod/buildlink3.mk22
-rw-r--r--audio/libgpod/distinfo6
-rw-r--r--audio/libgpod/patches/patch-aa31
-rw-r--r--audio/libhydrogen/DESCR2
-rw-r--r--audio/libhydrogen/Makefile27
-rw-r--r--audio/libhydrogen/PLIST45
-rw-r--r--audio/libhydrogen/buildlink3.mk23
-rw-r--r--audio/libhydrogen/distinfo6
-rw-r--r--audio/libhydrogen/patches/patch-aa17
-rw-r--r--audio/libid3tag/DESCR2
-rw-r--r--audio/libid3tag/Makefile36
-rw-r--r--audio/libid3tag/PLIST4
-rw-r--r--audio/libid3tag/buildlink3.mk22
-rw-r--r--audio/libid3tag/distinfo6
-rw-r--r--audio/libid3tag/files/id3tag.pc.in11
-rw-r--r--audio/libid3tag/patches/patch-aa38
-rw-r--r--audio/libmad/DESCR21
-rw-r--r--audio/libmad/Makefile36
-rw-r--r--audio/libmad/PLIST4
-rw-r--r--audio/libmad/buildlink3.mk20
-rw-r--r--audio/libmad/distinfo6
-rw-r--r--audio/libmad/files/mad.pc.in11
-rw-r--r--audio/libmad/patches/patch-aa42
-rw-r--r--audio/libmikmod/DESCR15
-rw-r--r--audio/libmikmod/Makefile27
-rw-r--r--audio/libmikmod/PLIST7
-rw-r--r--audio/libmikmod/buildlink3.mk35
-rw-r--r--audio/libmikmod/distinfo11
-rw-r--r--audio/libmikmod/options.mk16
-rw-r--r--audio/libmikmod/patches/patch-ab35
-rw-r--r--audio/libmikmod/patches/patch-ac20
-rw-r--r--audio/libmikmod/patches/patch-ad25
-rw-r--r--audio/libmodplug/DESCR7
-rw-r--r--audio/libmodplug/Makefile19
-rw-r--r--audio/libmodplug/PLIST8
-rw-r--r--audio/libmodplug/buildlink3.mk20
-rw-r--r--audio/libmodplug/distinfo5
-rw-r--r--audio/libmpcdec/DESCR1
-rw-r--r--audio/libmpcdec/Makefile20
-rw-r--r--audio/libmpcdec/PLIST11
-rw-r--r--audio/libmpcdec/buildlink3.mk19
-rw-r--r--audio/libmpcdec/distinfo5
-rw-r--r--audio/libmpd/DESCR5
-rw-r--r--audio/libmpd/Makefile17
-rw-r--r--audio/libmpd/PLIST14
-rw-r--r--audio/libmpd/buildlink3.mk19
-rw-r--r--audio/libmpd/distinfo6
-rw-r--r--audio/libmpd/patches/patch-aa14
-rw-r--r--audio/libmusepack/DESCR8
-rw-r--r--audio/libmusepack/Makefile17
-rw-r--r--audio/libmusepack/PLIST9
-rw-r--r--audio/libmusepack/buildlink3.mk19
-rw-r--r--audio/libmusepack/distinfo6
-rw-r--r--audio/libmusepack/patches/patch-aa13
-rw-r--r--audio/libofa/DESCR22
-rw-r--r--audio/libofa/Makefile25
-rw-r--r--audio/libofa/PLIST5
-rw-r--r--audio/libofa/buildlink3.mk21
-rw-r--r--audio/libofa/distinfo8
-rw-r--r--audio/libofa/patches/patch-aa13
-rw-r--r--audio/libofa/patches/patch-ab12
-rw-r--r--audio/libofa/patches/patch-ac13
-rw-r--r--audio/libopendaap/DESCR6
-rw-r--r--audio/libopendaap/Makefile22
-rw-r--r--audio/libopendaap/PLIST7
-rw-r--r--audio/libopendaap/buildlink3.mk20
-rw-r--r--audio/libopendaap/distinfo11
-rw-r--r--audio/libopendaap/patches/patch-aa17
-rw-r--r--audio/libopendaap/patches/patch-ac12
-rw-r--r--audio/libopendaap/patches/patch-ad16
-rw-r--r--audio/libopendaap/patches/patch-ae13
-rw-r--r--audio/libopendaap/patches/patch-af31
-rw-r--r--audio/libopendaap/patches/patch-ag10
-rw-r--r--audio/libopenspc/DESCR4
-rw-r--r--audio/libopenspc/Makefile19
-rw-r--r--audio/libopenspc/PLIST4
-rw-r--r--audio/libopenspc/buildlink3.mk19
-rw-r--r--audio/libopenspc/distinfo5
-rw-r--r--audio/libsamplerate/DESCR15
-rw-r--r--audio/libsamplerate/Makefile24
-rw-r--r--audio/libsamplerate/PLIST5
-rw-r--r--audio/libsamplerate/buildlink3.mk22
-rw-r--r--audio/libsamplerate/distinfo5
-rw-r--r--audio/libshout/DESCR5
-rw-r--r--audio/libshout/Makefile21
-rw-r--r--audio/libshout/PLIST11
-rw-r--r--audio/libshout/buildlink3.mk24
-rw-r--r--audio/libshout/distinfo5
-rw-r--r--audio/libsidplay/DESCR2
-rw-r--r--audio/libsidplay/Makefile21
-rw-r--r--audio/libsidplay/PLIST13
-rw-r--r--audio/libsidplay/buildlink3.mk20
-rw-r--r--audio/libsidplay/distinfo5
-rw-r--r--audio/libsidplay2/DESCR2
-rw-r--r--audio/libsidplay2/Makefile22
-rw-r--r--audio/libsidplay2/PLIST34
-rw-r--r--audio/libsidplay2/PLIST.Linux3
-rw-r--r--audio/libsidplay2/buildlink3.mk19
-rw-r--r--audio/libsidplay2/distinfo6
-rw-r--r--audio/libsidplay2/patches/patch-aa28
-rw-r--r--audio/libsndfile/DESCR3
-rw-r--r--audio/libsndfile/Makefile35
-rw-r--r--audio/libsndfile/PLIST35
-rw-r--r--audio/libsndfile/buildlink3.mk22
-rw-r--r--audio/libsndfile/distinfo16
-rw-r--r--audio/libsndfile/options.mk12
-rw-r--r--audio/libsndfile/patches/patch-aa13
-rw-r--r--audio/libsndfile/patches/patch-ab13
-rw-r--r--audio/libsndfile/patches/patch-ac75
-rw-r--r--audio/libsndfile/patches/patch-ad13
-rw-r--r--audio/libsndfile/patches/patch-ae13
-rw-r--r--audio/libsndfile/patches/patch-af13
-rw-r--r--audio/libsndfile/patches/patch-ag13
-rw-r--r--audio/libsndfile/patches/patch-ah13
-rw-r--r--audio/libtunepimp/DESCR14
-rw-r--r--audio/libtunepimp/Makefile37
-rw-r--r--audio/libtunepimp/PLIST25
-rw-r--r--audio/libtunepimp/buildlink3.mk25
-rw-r--r--audio/libtunepimp/distinfo8
-rw-r--r--audio/libtunepimp/patches/patch-ab14
-rw-r--r--audio/libtunepimp/patches/patch-ac13
-rw-r--r--audio/libtunepimp/patches/patch-ad13
-rw-r--r--audio/libvisual-bmp/DESCR1
-rw-r--r--audio/libvisual-bmp/Makefile30
-rw-r--r--audio/libvisual-bmp/PLIST12
-rw-r--r--audio/libvisual-bmp/distinfo7
-rw-r--r--audio/libvisual-bmp/patches/patch-aa13
-rw-r--r--audio/libvisual-bmp/patches/patch-ab21
-rw-r--r--audio/libvisual-plugins/DESCR1
-rw-r--r--audio/libvisual-plugins/Makefile26
-rw-r--r--audio/libvisual-plugins/PLIST281
-rw-r--r--audio/libvisual-plugins/distinfo8
-rw-r--r--audio/libvisual-plugins/patches/patch-aa114
-rw-r--r--audio/libvisual-plugins/patches/patch-ab19
-rw-r--r--audio/libvisual-plugins/patches/patch-ac31
-rw-r--r--audio/libvisual-xmms/DESCR2
-rw-r--r--audio/libvisual-xmms/Makefile25
-rw-r--r--audio/libvisual-xmms/PLIST11
-rw-r--r--audio/libvisual-xmms/distinfo7
-rw-r--r--audio/libvisual-xmms/patches/patch-aa13
-rw-r--r--audio/libvisual-xmms/patches/patch-ab21
-rw-r--r--audio/libvisual/DESCR16
-rw-r--r--audio/libvisual/Makefile28
-rw-r--r--audio/libvisual/PLIST50
-rw-r--r--audio/libvisual/buildlink3.mk19
-rw-r--r--audio/libvisual/distinfo7
-rw-r--r--audio/libvisual/hacks.mk12
-rw-r--r--audio/libvisual/patches/patch-ab54
-rw-r--r--audio/libvisual/patches/patch-ac13
-rw-r--r--audio/libvisual0.2-plugins/DESCR1
-rw-r--r--audio/libvisual0.2-plugins/Makefile37
-rw-r--r--audio/libvisual0.2-plugins/PLIST547
-rw-r--r--audio/libvisual0.2-plugins/distinfo7
-rw-r--r--audio/libvisual0.2-plugins/patches/patch-aa22
-rw-r--r--audio/libvisual0.2-plugins/patches/patch-ab19
-rw-r--r--audio/libvisual0.2/DESCR18
-rw-r--r--audio/libvisual0.2/Makefile28
-rw-r--r--audio/libvisual0.2/PLIST36
-rw-r--r--audio/libvisual0.2/buildlink3.mk19
-rw-r--r--audio/libvisual0.2/distinfo7
-rw-r--r--audio/libvisual0.2/hacks.mk12
-rw-r--r--audio/libvisual0.2/patches/patch-aa22
-rw-r--r--audio/libvisual0.2/patches/patch-ab45
-rw-r--r--audio/libvorbis/DESCR16
-rw-r--r--audio/libvorbis/Makefile28
-rw-r--r--audio/libvorbis/PLIST117
-rw-r--r--audio/libvorbis/buildlink3.mk22
-rw-r--r--audio/libvorbis/distinfo5
-rw-r--r--audio/liteamp/DESCR2
-rw-r--r--audio/liteamp/Makefile28
-rw-r--r--audio/liteamp/PLIST27
-rw-r--r--audio/liteamp/distinfo6
-rw-r--r--audio/liteamp/patches/patch-ab11
-rw-r--r--audio/liveice/DESCR10
-rw-r--r--audio/liveice/Makefile39
-rw-r--r--audio/liveice/PLIST9
-rw-r--r--audio/liveice/distinfo16
-rw-r--r--audio/liveice/patches/patch-aa43
-rw-r--r--audio/liveice/patches/patch-ab144
-rw-r--r--audio/liveice/patches/patch-ac35
-rw-r--r--audio/liveice/patches/patch-ad17
-rw-r--r--audio/liveice/patches/patch-ae54
-rw-r--r--audio/liveice/patches/patch-af13
-rw-r--r--audio/liveice/patches/patch-ag28
-rw-r--r--audio/liveice/patches/patch-ah15
-rw-r--r--audio/liveice/patches/patch-ai13
-rw-r--r--audio/liveice/patches/patch-aj13
-rw-r--r--audio/liveice/patches/patch-ak13
-rw-r--r--audio/lmms/DESCR10
-rw-r--r--audio/lmms/Makefile37
-rw-r--r--audio/lmms/PLIST813
-rw-r--r--audio/lmms/distinfo11
-rw-r--r--audio/lmms/patches/patch-aa30
-rw-r--r--audio/lmms/patches/patch-ab23
-rw-r--r--audio/lmms/patches/patch-ac15
-rw-r--r--audio/lmms/patches/patch-ad13
-rw-r--r--audio/lmms/patches/patch-ae13
-rw-r--r--audio/lmms/patches/patch-af31
-rw-r--r--audio/mac/DESCR5
-rw-r--r--audio/mac/Makefile23
-rw-r--r--audio/mac/PLIST25
-rw-r--r--audio/mac/buildlink3.mk19
-rw-r--r--audio/mac/distinfo6
-rw-r--r--audio/mac/patches/patch-aa22
-rw-r--r--audio/mad/DESCR21
-rw-r--r--audio/mad/Makefile25
-rw-r--r--audio/mad/PLIST2
-rw-r--r--audio/mad123/DESCR23
-rw-r--r--audio/mad123/Makefile49
-rw-r--r--audio/mad123/PLIST3
-rw-r--r--audio/mad123/distinfo8
-rw-r--r--audio/mad123/patches/patch-aa12
-rw-r--r--audio/mad123/patches/patch-ab28
-rw-r--r--audio/mad123/patches/patch-ac40
-rw-r--r--audio/madman/DESCR3
-rw-r--r--audio/madman/MESSAGE7
-rw-r--r--audio/madman/Makefile48
-rw-r--r--audio/madman/PLIST8
-rw-r--r--audio/madman/distinfo11
-rw-r--r--audio/madman/patches/patch-aa25
-rw-r--r--audio/madman/patches/patch-ab10
-rw-r--r--audio/madman/patches/patch-ac10
-rw-r--r--audio/madman/patches/patch-ad22
-rw-r--r--audio/madman/patches/patch-ae14
-rw-r--r--audio/madman/patches/patch-af13
-rw-r--r--audio/madplay/DESCR24
-rw-r--r--audio/madplay/Makefile29
-rw-r--r--audio/madplay/PLIST10
-rw-r--r--audio/madplay/distinfo7
-rw-r--r--audio/madplay/options.mk16
-rw-r--r--audio/madplay/patches/patch-aa38
-rw-r--r--audio/madplay/patches/patch-ab22
-rw-r--r--audio/malint/DESCR7
-rw-r--r--audio/malint/Makefile15
-rw-r--r--audio/malint/PLIST2
-rw-r--r--audio/malint/distinfo5
-rw-r--r--audio/maplay/DESCR16
-rw-r--r--audio/maplay/Makefile21
-rw-r--r--audio/maplay/PLIST2
-rw-r--r--audio/maplay/distinfo20
-rw-r--r--audio/maplay/patches/patch-aa23
-rw-r--r--audio/maplay/patches/patch-ab13
-rw-r--r--audio/maplay/patches/patch-ac23
-rw-r--r--audio/maplay/patches/patch-ad33
-rw-r--r--audio/maplay/patches/patch-ae38
-rw-r--r--audio/maplay/patches/patch-af35
-rw-r--r--audio/maplay/patches/patch-ag17
-rw-r--r--audio/maplay/patches/patch-ah99
-rw-r--r--audio/maplay/patches/patch-ai177
-rw-r--r--audio/maplay/patches/patch-aj58
-rw-r--r--audio/maplay/patches/patch-ak24
-rw-r--r--audio/maplay/patches/patch-al70
-rw-r--r--audio/maplay/patches/patch-am40
-rw-r--r--audio/maplay/patches/patch-an76
-rw-r--r--audio/maplay/patches/patch-ao49
-rw-r--r--audio/mbrola/DESCR24
-rw-r--r--audio/mbrola/Makefile36
-rw-r--r--audio/mbrola/PLIST5
-rw-r--r--audio/mbrola/distinfo5
-rw-r--r--audio/mbrolavox-en1/DESCR1
-rw-r--r--audio/mbrolavox-en1/Makefile32
-rw-r--r--audio/mbrolavox-en1/PLIST12
-rw-r--r--audio/mbrolavox-en1/distinfo5
-rw-r--r--audio/mbrolavox-us1/DESCR1
-rw-r--r--audio/mbrolavox-us1/Makefile32
-rw-r--r--audio/mbrolavox-us1/PLIST12
-rw-r--r--audio/mbrolavox-us1/distinfo5
-rw-r--r--audio/mbrolavox-us2/DESCR1
-rw-r--r--audio/mbrolavox-us2/Makefile32
-rw-r--r--audio/mbrolavox-us2/PLIST10
-rw-r--r--audio/mbrolavox-us2/distinfo5
-rw-r--r--audio/mbrolavox-us3/DESCR1
-rw-r--r--audio/mbrolavox-us3/Makefile32
-rw-r--r--audio/mbrolavox-us3/PLIST10
-rw-r--r--audio/mbrolavox-us3/distinfo5
-rw-r--r--audio/mikmod/DESCR5
-rw-r--r--audio/mikmod/Makefile19
-rw-r--r--audio/mikmod/PLIST3
-rw-r--r--audio/mikmod/distinfo6
-rw-r--r--audio/mikmod/patches/patch-aa13
-rw-r--r--audio/mixer.app/DESCR4
-rw-r--r--audio/mixer.app/Makefile32
-rw-r--r--audio/mixer.app/PLIST4
-rw-r--r--audio/mixer.app/distinfo7
-rw-r--r--audio/mixer.app/patches/patch-aa17
-rw-r--r--audio/mixer.app/patches/patch-ab13
-rw-r--r--audio/mkcdtoc/DESCR9
-rw-r--r--audio/mkcdtoc/Makefile16
-rw-r--r--audio/mkcdtoc/PLIST20
-rw-r--r--audio/mkcdtoc/distinfo6
-rw-r--r--audio/mkcdtoc/patches/patch-aa19
-rw-r--r--audio/moc/DESCR17
-rw-r--r--audio/moc/Makefile36
-rw-r--r--audio/moc/PLIST26
-rw-r--r--audio/moc/distinfo6
-rw-r--r--audio/moc/options.mk57
-rw-r--r--audio/moc/patches/patch-aa307
-rw-r--r--audio/moss/DESCR3
-rw-r--r--audio/moss/Makefile35
-rw-r--r--audio/moss/PLIST39
-rw-r--r--audio/moss/distinfo6
-rw-r--r--audio/moss/files/moss.sh28
-rw-r--r--audio/moss/patches/patch-aa99
-rw-r--r--audio/mp32ogg/DESCR6
-rw-r--r--audio/mp32ogg/Makefile33
-rw-r--r--audio/mp32ogg/PLIST2
-rw-r--r--audio/mp32ogg/distinfo5
-rw-r--r--audio/mp3_check/DESCR3
-rw-r--r--audio/mp3_check/Makefile17
-rw-r--r--audio/mp3_check/PLIST2
-rw-r--r--audio/mp3_check/distinfo8
-rw-r--r--audio/mp3_check/patches/patch-aa12
-rw-r--r--audio/mp3_check/patches/patch-ab13
-rw-r--r--audio/mp3_check/patches/patch-ac13
-rw-r--r--audio/mp3asm/DESCR4
-rw-r--r--audio/mp3asm/Makefile27
-rw-r--r--audio/mp3asm/PLIST4
-rw-r--r--audio/mp3asm/distinfo7
-rw-r--r--audio/mp3asm/patches/patch-aa12
-rw-r--r--audio/mp3asm/patches/patch-ab12
-rw-r--r--audio/mp3blaster/DESCR4
-rw-r--r--audio/mp3blaster/Makefile37
-rw-r--r--audio/mp3blaster/PLIST17
-rw-r--r--audio/mp3blaster/distinfo22
-rw-r--r--audio/mp3blaster/patches/patch-aa321
-rw-r--r--audio/mp3blaster/patches/patch-ab264
-rw-r--r--audio/mp3blaster/patches/patch-ac56
-rw-r--r--audio/mp3blaster/patches/patch-ad99
-rw-r--r--audio/mp3blaster/patches/patch-ae199
-rw-r--r--audio/mp3blaster/patches/patch-af17
-rw-r--r--audio/mp3blaster/patches/patch-ag26
-rw-r--r--audio/mp3blaster/patches/patch-ah7
-rw-r--r--audio/mp3blaster/patches/patch-ai24
-rw-r--r--audio/mp3blaster/patches/patch-aj31
-rw-r--r--audio/mp3blaster/patches/patch-ak11
-rw-r--r--audio/mp3blaster/patches/patch-al43
-rw-r--r--audio/mp3blaster/patches/patch-am17
-rw-r--r--audio/mp3blaster/patches/patch-an37
-rw-r--r--audio/mp3blaster/patches/patch-ao27
-rw-r--r--audio/mp3blaster/patches/patch-ap16
-rw-r--r--audio/mp3blaster/patches/patch-aq13
-rw-r--r--audio/mp3check/DESCR6
-rw-r--r--audio/mp3check/Makefile22
-rw-r--r--audio/mp3check/PLIST3
-rw-r--r--audio/mp3check/distinfo12
-rw-r--r--audio/mp3check/patches/patch-aa17
-rw-r--r--audio/mp3check/patches/patch-ab12
-rw-r--r--audio/mp3check/patches/patch-ac13
-rw-r--r--audio/mp3check/patches/patch-ad12
-rw-r--r--audio/mp3check/patches/patch-ae31
-rw-r--r--audio/mp3check/patches/patch-af13
-rw-r--r--audio/mp3check/patches/patch-ag22
-rw-r--r--audio/mp3cut/DESCR5
-rw-r--r--audio/mp3cut/Makefile22
-rw-r--r--audio/mp3cut/PLIST1
-rw-r--r--audio/mp3cut/distinfo5
-rw-r--r--audio/mp3info/DESCR10
-rw-r--r--audio/mp3info/Makefile18
-rw-r--r--audio/mp3info/PLIST3
-rw-r--r--audio/mp3info/distinfo6
-rw-r--r--audio/mp3info/patches/patch-aa12
-rw-r--r--audio/mp3splt/DESCR10
-rw-r--r--audio/mp3splt/Makefile21
-rw-r--r--audio/mp3splt/PLIST4
-rw-r--r--audio/mp3splt/distinfo7
-rw-r--r--audio/mp3splt/patches/patch-aa13
-rw-r--r--audio/mp3splt/patches/patch-ab13
-rw-r--r--audio/mp3to/DESCR3
-rw-r--r--audio/mp3to/Makefile30
-rw-r--r--audio/mp3to/PLIST2
-rw-r--r--audio/mp3to/distinfo6
-rw-r--r--audio/mp3to/patches/patch-aa14
-rw-r--r--audio/mpc/DESCR1
-rw-r--r--audio/mpc/Makefile15
-rw-r--r--audio/mpc/PLIST10
-rw-r--r--audio/mpc/distinfo7
-rw-r--r--audio/mpc/patches/patch-aa12
-rw-r--r--audio/mpc/patches/patch-ab17
-rw-r--r--audio/mpegaudio/DESCR1
-rw-r--r--audio/mpegaudio/Makefile16
-rw-r--r--audio/mpegaudio/PLIST28
-rw-r--r--audio/mpegaudio/distinfo11
-rw-r--r--audio/mpegaudio/files/mpeg_musicin.1122
-rw-r--r--audio/mpegaudio/files/mpeg_musicout.194
-rw-r--r--audio/mpegaudio/patches/patch-aa30
-rw-r--r--audio/mpegaudio/patches/patch-ab13
-rw-r--r--audio/mpegaudio/patches/patch-ac21
-rw-r--r--audio/mpegaudio/patches/patch-ad15
-rw-r--r--audio/mpegaudio/patches/patch-ae12
-rw-r--r--audio/mpegaudio/patches/patch-af19
-rw-r--r--audio/mpg123-esound/DESCR6
-rw-r--r--audio/mpg123-esound/Makefile21
-rw-r--r--audio/mpg123-esound/PLIST3
-rw-r--r--audio/mpg123-nas/DESCR6
-rw-r--r--audio/mpg123-nas/Makefile23
-rw-r--r--audio/mpg123-nas/PLIST3
-rw-r--r--audio/mpg123/DESCR4
-rw-r--r--audio/mpg123/Makefile11
-rw-r--r--audio/mpg123/Makefile.common93
-rw-r--r--audio/mpg123/PLIST3
-rw-r--r--audio/mpg123/distinfo31
-rw-r--r--audio/mpg123/files/decode_i586_.s320
-rw-r--r--audio/mpg123/patches/patch-aa288
-rw-r--r--audio/mpg123/patches/patch-ab23
-rw-r--r--audio/mpg123/patches/patch-ac31
-rw-r--r--audio/mpg123/patches/patch-ad75
-rw-r--r--audio/mpg123/patches/patch-ae16
-rw-r--r--audio/mpg123/patches/patch-af19
-rw-r--r--audio/mpg123/patches/patch-ag123
-rw-r--r--audio/mpg123/patches/patch-ah22
-rw-r--r--audio/mpg123/patches/patch-ai824
-rw-r--r--audio/mpg123/patches/patch-aj120
-rw-r--r--audio/mpg123/patches/patch-ak40
-rw-r--r--audio/mpg123/patches/patch-al40
-rw-r--r--audio/mpg123/patches/patch-am13
-rw-r--r--audio/mpg123/patches/patch-an19
-rw-r--r--audio/mpg123/patches/patch-ao24
-rw-r--r--audio/mpg123/patches/patch-ap13
-rw-r--r--audio/mpg123/patches/patch-aq91
-rw-r--r--audio/mpg123/patches/patch-ar26
-rw-r--r--audio/mpg123/patches/patch-as13
-rw-r--r--audio/mpg123/patches/patch-at17
-rw-r--r--audio/mpg123/patches/patch-au157
-rw-r--r--audio/mpg123/patches/patch-av13
-rw-r--r--audio/mpg123/patches/patch-aw13
-rw-r--r--audio/mpg321/DESCR10
-rw-r--r--audio/mpg321/Makefile18
-rw-r--r--audio/mpg321/PLIST3
-rw-r--r--audio/mpg321/distinfo6
-rw-r--r--audio/mpg321/patches/patch-aa22
-rw-r--r--audio/mppenc/DESCR2
-rw-r--r--audio/mppenc/Makefile19
-rw-r--r--audio/mppenc/PLIST2
-rw-r--r--audio/mppenc/distinfo7
-rw-r--r--audio/mppenc/patches/patch-aa13
-rw-r--r--audio/mppenc/patches/patch-ab13
-rw-r--r--audio/mserv-devel/DESCR7
-rw-r--r--audio/mserv-devel/Makefile38
-rw-r--r--audio/mserv-devel/PLIST21
-rw-r--r--audio/mserv-devel/distinfo8
-rw-r--r--audio/mserv-devel/patches/patch-aa13
-rw-r--r--audio/mserv-devel/patches/patch-ab13
-rw-r--r--audio/mserv-devel/patches/patch-ac107
-rw-r--r--audio/mserv/DESCR7
-rw-r--r--audio/mserv/Makefile44
-rw-r--r--audio/mserv/PLIST20
-rw-r--r--audio/mserv/distinfo15
-rw-r--r--audio/mserv/patches/patch-aa13
-rw-r--r--audio/mserv/patches/patch-ab13
-rw-r--r--audio/mserv/patches/patch-ac108
-rw-r--r--audio/mserv/patches/patch-ad21
-rw-r--r--audio/mserv/patches/patch-ae88
-rw-r--r--audio/mserv/patches/patch-af257
-rw-r--r--audio/mserv/patches/patch-ag24
-rw-r--r--audio/mserv/patches/patch-ah13
-rw-r--r--audio/mserv/patches/patch-ai13
-rw-r--r--audio/mserv/patches/patch-aj14
-rw-r--r--audio/mserv_irman/DESCR7
-rw-r--r--audio/mserv_irman/Makefile23
-rw-r--r--audio/mserv_irman/PLIST3
-rw-r--r--audio/mserv_irman/distinfo5
-rw-r--r--audio/mstream/DESCR5
-rw-r--r--audio/mstream/Makefile24
-rw-r--r--audio/mstream/PLIST4
-rw-r--r--audio/mstream/distinfo5
-rw-r--r--audio/mt-daapd/DESCR16
-rw-r--r--audio/mt-daapd/Makefile56
-rw-r--r--audio/mt-daapd/PLIST26
-rw-r--r--audio/mt-daapd/distinfo9
-rw-r--r--audio/mt-daapd/files/mtdaapd.sh18
-rw-r--r--audio/mt-daapd/patches/patch-aa49
-rw-r--r--audio/mt-daapd/patches/patch-ab13
-rw-r--r--audio/mt-daapd/patches/patch-ac30
-rw-r--r--audio/mt-daapd/patches/patch-ad13
-rw-r--r--audio/muse/DESCR6
-rw-r--r--audio/muse/Makefile40
-rw-r--r--audio/muse/PLIST14
-rw-r--r--audio/muse/distinfo12
-rw-r--r--audio/muse/patches/patch-aa13
-rw-r--r--audio/muse/patches/patch-ab25
-rw-r--r--audio/muse/patches/patch-ac136
-rw-r--r--audio/muse/patches/patch-ad12
-rw-r--r--audio/muse/patches/patch-ae11
-rw-r--r--audio/muse/patches/patch-af13
-rw-r--r--audio/muse/patches/patch-ag14
-rw-r--r--audio/musicbox/DESCR4
-rw-r--r--audio/musicbox/Makefile29
-rw-r--r--audio/musicbox/PLIST4
-rw-r--r--audio/musicbox/distinfo14
-rw-r--r--audio/musicbox/patches/patch-aa115
-rw-r--r--audio/musicbox/patches/patch-ab22
-rw-r--r--audio/musicbox/patches/patch-ac148
-rw-r--r--audio/musicbox/patches/patch-ad46
-rw-r--r--audio/musicbox/patches/patch-ae22
-rw-r--r--audio/musicbox/patches/patch-af13
-rw-r--r--audio/musicbox/patches/patch-ag28
-rw-r--r--audio/musicbox/patches/patch-ah13
-rw-r--r--audio/musicbox/patches/patch-ai22
-rw-r--r--audio/musicbrainz/DESCR5
-rw-r--r--audio/musicbrainz/Makefile29
-rw-r--r--audio/musicbrainz/PLIST9
-rw-r--r--audio/musicbrainz/buildlink3.mk22
-rw-r--r--audio/musicbrainz/distinfo6
-rw-r--r--audio/musicbrainz/patches/patch-ac13
-rw-r--r--audio/musicpd/DESCR6
-rw-r--r--audio/musicpd/Makefile45
-rw-r--r--audio/musicpd/PLIST12
-rw-r--r--audio/musicpd/distinfo9
-rw-r--r--audio/musicpd/files/mpd.conf40
-rw-r--r--audio/musicpd/files/mpd.sh18
-rw-r--r--audio/musicpd/options.mk72
-rw-r--r--audio/musicpd/patches/patch-aa24
-rw-r--r--audio/musicpd/patches/patch-ab120
-rw-r--r--audio/musicpd/patches/patch-ac581
-rw-r--r--audio/musicpd/patches/patch-ad26
-rw-r--r--audio/nas/DESCR15
-rw-r--r--audio/nas/Makefile98
-rw-r--r--audio/nas/PLIST.clients195
-rw-r--r--audio/nas/PLIST.server6
-rw-r--r--audio/nas/PLIST.voxware2
-rw-r--r--audio/nas/buildlink3.mk20
-rw-r--r--audio/nas/distinfo12
-rw-r--r--audio/nas/patches/patch-aa15
-rw-r--r--audio/nas/patches/patch-ab43
-rw-r--r--audio/nas/patches/patch-ac33
-rw-r--r--audio/nas/patches/patch-ad30
-rw-r--r--audio/nas/patches/patch-ae12
-rw-r--r--audio/nas/patches/patch-af13
-rw-r--r--audio/nas/patches/patch-ag13
-rw-r--r--audio/ncmpc/DESCR2
-rw-r--r--audio/ncmpc/Makefile23
-rw-r--r--audio/ncmpc/PLIST16
-rw-r--r--audio/ncmpc/distinfo7
-rw-r--r--audio/ncmpc/patches/patch-aa14
-rw-r--r--audio/ncmpc/patches/patch-ab13
-rw-r--r--audio/normalize/DESCR4
-rw-r--r--audio/normalize/Makefile28
-rw-r--r--audio/normalize/PLIST9
-rw-r--r--audio/normalize/distinfo6
-rw-r--r--audio/normalize/options.mk13
-rw-r--r--audio/normalize/patches/patch-aa12
-rw-r--r--audio/nosefart/DESCR1
-rw-r--r--audio/nosefart/Makefile31
-rw-r--r--audio/nosefart/PLIST2
-rw-r--r--audio/nosefart/distinfo7
-rw-r--r--audio/nosefart/patches/patch-aa17
-rw-r--r--audio/nosefart/patches/patch-ab89
-rw-r--r--audio/nspmod/DESCR10
-rw-r--r--audio/nspmod/Makefile22
-rw-r--r--audio/nspmod/PLIST3
-rw-r--r--audio/nspmod/distinfo10
-rw-r--r--audio/nspmod/patches/patch-ac59
-rw-r--r--audio/nspmod/patches/patch-ad14
-rw-r--r--audio/nspmod/patches/patch-ae14
-rw-r--r--audio/nspmod/patches/patch-ba46
-rw-r--r--audio/nspmod/patches/patch-bb285
-rw-r--r--audio/oggasm/DESCR5
-rw-r--r--audio/oggasm/Makefile31
-rw-r--r--audio/oggasm/PLIST3
-rw-r--r--audio/oggasm/distinfo5
-rw-r--r--audio/openal/DESCR6
-rw-r--r--audio/openal/Makefile22
-rw-r--r--audio/openal/PLIST8
-rw-r--r--audio/openal/buildlink3.mk19
-rw-r--r--audio/openal/distinfo7
-rw-r--r--audio/openal/patches/patch-aa39
-rw-r--r--audio/openal/patches/patch-ab13
-rw-r--r--audio/p5-Audio-CD/DESCR1
-rw-r--r--audio/p5-Audio-CD/Makefile19
-rw-r--r--audio/p5-Audio-CD/PLIST1
-rw-r--r--audio/p5-Audio-CD/distinfo5
-rw-r--r--audio/p5-Audio-Wav/DESCR1
-rw-r--r--audio/p5-Audio-Wav/Makefile16
-rw-r--r--audio/p5-Audio-Wav/PLIST1
-rw-r--r--audio/p5-Audio-Wav/distinfo5
-rw-r--r--audio/p5-CDDB-File/DESCR3
-rw-r--r--audio/p5-CDDB-File/Makefile17
-rw-r--r--audio/p5-CDDB-File/PLIST1
-rw-r--r--audio/p5-CDDB-File/distinfo5
-rw-r--r--audio/p5-CDDB/DESCR9
-rw-r--r--audio/p5-CDDB/Makefile17
-rw-r--r--audio/p5-CDDB/PLIST1
-rw-r--r--audio/p5-CDDB/distinfo5
-rw-r--r--audio/p5-CDDB_get/DESCR1
-rw-r--r--audio/p5-CDDB_get/Makefile21
-rw-r--r--audio/p5-CDDB_get/PLIST1
-rw-r--r--audio/p5-CDDB_get/distinfo5
-rw-r--r--audio/p5-MP3-Info/DESCR7
-rw-r--r--audio/p5-MP3-Info/Makefile15
-rw-r--r--audio/p5-MP3-Info/PLIST1
-rw-r--r--audio/p5-MP3-Info/distinfo5
-rw-r--r--audio/p5-MP3-Tag/DESCR16
-rw-r--r--audio/p5-MP3-Tag/Makefile19
-rw-r--r--audio/p5-MP3-Tag/PLIST1
-rw-r--r--audio/p5-MP3-Tag/distinfo5
-rw-r--r--audio/p5-MPEG-Audio-Frame/DESCR6
-rw-r--r--audio/p5-MPEG-Audio-Frame/Makefile17
-rw-r--r--audio/p5-MPEG-Audio-Frame/PLIST1
-rw-r--r--audio/p5-MPEG-Audio-Frame/distinfo5
-rw-r--r--audio/p5-MusicBrainz-Client/DESCR5
-rw-r--r--audio/p5-MusicBrainz-Client/Makefile21
-rw-r--r--audio/p5-MusicBrainz-Client/PLIST1
-rw-r--r--audio/p5-MusicBrainz-Client/distinfo5
-rw-r--r--audio/p5-MusicBrainz-Queries/DESCR5
-rw-r--r--audio/p5-MusicBrainz-Queries/Makefile19
-rw-r--r--audio/p5-MusicBrainz-Queries/PLIST1
-rw-r--r--audio/p5-MusicBrainz-Queries/distinfo5
-rw-r--r--audio/portaudio-devel/DESCR12
-rw-r--r--audio/portaudio-devel/Makefile31
-rw-r--r--audio/portaudio-devel/PLIST6
-rw-r--r--audio/portaudio-devel/buildlink3.mk22
-rw-r--r--audio/portaudio-devel/distinfo7
-rw-r--r--audio/portaudio-devel/patches/patch-aa75
-rw-r--r--audio/portaudio-devel/patches/patch-ac42
-rw-r--r--audio/portaudio/DESCR12
-rw-r--r--audio/portaudio/Makefile29
-rw-r--r--audio/portaudio/PLIST3
-rw-r--r--audio/portaudio/buildlink3.mk20
-rw-r--r--audio/portaudio/distinfo11
-rw-r--r--audio/portaudio/patches/patch-aa99
-rw-r--r--audio/portaudio/patches/patch-ac44
-rw-r--r--audio/portaudio/patches/patch-ad20
-rw-r--r--audio/portaudio/patches/patch-ae15
-rw-r--r--audio/portaudio/patches/patch-af27
-rw-r--r--audio/portaudio/patches/patch-ag48
-rw-r--r--audio/py-ao/DESCR1
-rw-r--r--audio/py-ao/Makefile24
-rw-r--r--audio/py-ao/PLIST2
-rw-r--r--audio/py-ao/distinfo5
-rw-r--r--audio/py-cddb/DESCR10
-rw-r--r--audio/py-cddb/Makefile18
-rw-r--r--audio/py-cddb/PLIST8
-rw-r--r--audio/py-cddb/distinfo6
-rw-r--r--audio/py-cddb/patches/patch-aa67
-rw-r--r--audio/py-karaoke/DESCR19
-rw-r--r--audio/py-karaoke/Makefile27
-rw-r--r--audio/py-karaoke/PLIST57
-rw-r--r--audio/py-karaoke/distinfo5
-rw-r--r--audio/py-mad/DESCR1
-rw-r--r--audio/py-mad/Makefile23
-rw-r--r--audio/py-mad/PLIST2
-rw-r--r--audio/py-mad/distinfo6
-rw-r--r--audio/py-mad/patches/patch-aa14
-rw-r--r--audio/py-musicbrainz/DESCR7
-rw-r--r--audio/py-musicbrainz/Makefile20
-rw-r--r--audio/py-musicbrainz/PLIST37
-rw-r--r--audio/py-musicbrainz/distinfo5
-rw-r--r--audio/py-musique/DESCR7
-rw-r--r--audio/py-musique/Makefile33
-rw-r--r--audio/py-musique/PLIST18
-rw-r--r--audio/py-musique/distinfo6
-rw-r--r--audio/py-musique/patches/patch-aa18
-rw-r--r--audio/py-mutagen/DESCR7
-rw-r--r--audio/py-mutagen/Makefile18
-rw-r--r--audio/py-mutagen/PLIST68
-rw-r--r--audio/py-mutagen/buildlink3.mk20
-rw-r--r--audio/py-mutagen/distinfo6
-rw-r--r--audio/py-mutagen/patches/patch-aa15
-rw-r--r--audio/py-ogg/DESCR1
-rw-r--r--audio/py-ogg/Makefile25
-rw-r--r--audio/py-ogg/PLIST8
-rw-r--r--audio/py-ogg/buildlink3.mk23
-rw-r--r--audio/py-ogg/distinfo5
-rw-r--r--audio/py-vorbis/DESCR1
-rw-r--r--audio/py-vorbis/Makefile27
-rw-r--r--audio/py-vorbis/PLIST2
-rw-r--r--audio/py-vorbis/distinfo6
-rw-r--r--audio/py-vorbis/patches/patch-aa34
-rw-r--r--audio/py-xmms/DESCR3
-rw-r--r--audio/py-xmms/Makefile25
-rw-r--r--audio/py-xmms/PLIST16
-rw-r--r--audio/py-xmms/distinfo5
-rw-r--r--audio/qsynth/DESCR4
-rw-r--r--audio/qsynth/Makefile35
-rw-r--r--audio/qsynth/PLIST3
-rw-r--r--audio/qsynth/distinfo5
-rw-r--r--audio/rexima/DESCR4
-rw-r--r--audio/rexima/Makefile14
-rw-r--r--audio/rexima/PLIST3
-rw-r--r--audio/rexima/distinfo6
-rw-r--r--audio/rexima/patches/patch-aa39
-rw-r--r--audio/rhythmbox/DESCR10
-rw-r--r--audio/rhythmbox/Makefile52
-rw-r--r--audio/rhythmbox/PLIST300
-rw-r--r--audio/rhythmbox/distinfo11
-rw-r--r--audio/rhythmbox/patches/patch-aa14
-rw-r--r--audio/rhythmbox/patches/patch-ab15
-rw-r--r--audio/rhythmbox/patches/patch-ac13
-rw-r--r--audio/rhythmbox/patches/patch-ae14
-rw-r--r--audio/rhythmbox/patches/patch-af33
-rw-r--r--audio/rhythmbox/patches/patch-ag26
-rw-r--r--audio/rio/DESCR7
-rw-r--r--audio/rio/Makefile34
-rw-r--r--audio/rio/PLIST5
-rw-r--r--audio/rio/distinfo8
-rw-r--r--audio/rio/files/find-lpt-port12
-rw-r--r--audio/rio/patches/patch-aa42
-rw-r--r--audio/rio/patches/patch-ab98
-rw-r--r--audio/rio/patches/patch-ac13
-rw-r--r--audio/rio500/DESCR2
-rw-r--r--audio/rio500/Makefile22
-rw-r--r--audio/rio500/PLIST49
-rw-r--r--audio/rio500/distinfo11
-rw-r--r--audio/rio500/patches/patch-aa13
-rw-r--r--audio/rio500/patches/patch-ab10
-rw-r--r--audio/rio500/patches/patch-ac114
-rw-r--r--audio/rio500/patches/patch-ad85
-rw-r--r--audio/rio500/patches/patch-ae35
-rw-r--r--audio/rio500/patches/patch-af12
-rw-r--r--audio/rioutil/DESCR3
-rw-r--r--audio/rioutil/Makefile23
-rw-r--r--audio/rioutil/PLIST5
-rw-r--r--audio/rioutil/distinfo9
-rw-r--r--audio/rioutil/patches/patch-aa18
-rw-r--r--audio/rioutil/patches/patch-ab13
-rw-r--r--audio/rioutil/patches/patch-ac22
-rw-r--r--audio/rioutil/patches/patch-ae14
-rw-r--r--audio/rip/DESCR4
-rw-r--r--audio/rip/MESSAGE17
-rw-r--r--audio/rip/Makefile31
-rw-r--r--audio/rip/PLIST9
-rw-r--r--audio/rip/distinfo6
-rw-r--r--audio/rip/patches/patch-aa22
-rw-r--r--audio/rosegarden/DESCR4
-rw-r--r--audio/rosegarden/Makefile26
-rw-r--r--audio/rosegarden/PLIST23
-rw-r--r--audio/rosegarden/distinfo12
-rw-r--r--audio/rosegarden/patches/patch-aa23
-rw-r--r--audio/rosegarden/patches/patch-ab13
-rw-r--r--audio/rosegarden/patches/patch-ac13
-rw-r--r--audio/rosegarden/patches/patch-ad13
-rw-r--r--audio/rosegarden/patches/patch-ae31
-rw-r--r--audio/rosegarden/patches/patch-af13
-rw-r--r--audio/rosegarden/patches/patch-ag18
-rw-r--r--audio/rplay/DESCR11
-rw-r--r--audio/rplay/Makefile43
-rw-r--r--audio/rplay/PLIST23
-rw-r--r--audio/rplay/buildlink3.mk24
-rw-r--r--audio/rplay/distinfo31
-rw-r--r--audio/rplay/files/rplayd.sh25
-rw-r--r--audio/rplay/patches/patch-aa34
-rw-r--r--audio/rplay/patches/patch-ab58
-rw-r--r--audio/rplay/patches/patch-ac13
-rw-r--r--audio/rplay/patches/patch-ad15
-rw-r--r--audio/rplay/patches/patch-ae15
-rw-r--r--audio/rplay/patches/patch-af15
-rw-r--r--audio/rplay/patches/patch-ag15
-rw-r--r--audio/rplay/patches/patch-ai13
-rw-r--r--audio/rplay/patches/patch-aj58
-rw-r--r--audio/rplay/patches/patch-ak39
-rw-r--r--audio/rplay/patches/patch-al42
-rw-r--r--audio/rplay/patches/patch-am16
-rw-r--r--audio/rplay/patches/patch-an14
-rw-r--r--audio/rplay/patches/patch-ao12
-rw-r--r--audio/rplay/patches/patch-ap39
-rw-r--r--audio/rplay/patches/patch-aq50
-rw-r--r--audio/rplay/patches/patch-ar9413
-rw-r--r--audio/rplay/patches/patch-as6
-rw-r--r--audio/rplay/patches/patch-at21
-rw-r--r--audio/rplay/patches/patch-au12
-rw-r--r--audio/rplay/patches/patch-av12
-rw-r--r--audio/rplay/patches/patch-aw12
-rw-r--r--audio/rplay/patches/patch-ax13
-rw-r--r--audio/rplay/patches/patch-ca44
-rw-r--r--audio/rplay/patches/patch-cb602
-rw-r--r--audio/rplay/patches/patch-cc22
-rw-r--r--audio/rsynth/DESCR14
-rw-r--r--audio/rsynth/Makefile36
-rw-r--r--audio/rsynth/PLIST11
-rw-r--r--audio/rsynth/distinfo19
-rw-r--r--audio/rsynth/patches/patch-aa22
-rw-r--r--audio/rsynth/patches/patch-ab28
-rw-r--r--audio/shntool/DESCR9
-rw-r--r--audio/shntool/Makefile22
-rw-r--r--audio/shntool/PLIST15
-rw-r--r--audio/shntool/distinfo5
-rw-r--r--audio/shorten/DESCR2
-rw-r--r--audio/shorten/Makefile21
-rw-r--r--audio/shorten/PLIST6
-rw-r--r--audio/shorten/distinfo5
-rw-r--r--audio/sidplay/DESCR9
-rw-r--r--audio/sidplay/Makefile22
-rw-r--r--audio/sidplay/PLIST4
-rw-r--r--audio/sidplay/distinfo6
-rw-r--r--audio/sidplay/patches/patch-aa13
-rw-r--r--audio/sidplay2/DESCR3
-rw-r--r--audio/sidplay2/Makefile24
-rw-r--r--audio/sidplay2/PLIST3
-rw-r--r--audio/sidplay2/distinfo6
-rw-r--r--audio/sidplay2/patches/patch-aa13
-rw-r--r--audio/snd/DESCR4
-rw-r--r--audio/snd/Makefile35
-rw-r--r--audio/snd/PLIST171
-rw-r--r--audio/snd/distinfo6
-rw-r--r--audio/snd/options.mk38
-rw-r--r--audio/snd/patches/patch-aa13
-rw-r--r--audio/solfege/DESCR12
-rw-r--r--audio/solfege/Makefile33
-rw-r--r--audio/solfege/PLIST520
-rw-r--r--audio/solfege/distinfo6
-rw-r--r--audio/solfege/patches/patch-aa20
-rw-r--r--audio/sound-juicer/DESCR5
-rw-r--r--audio/sound-juicer/Makefile34
-rw-r--r--audio/sound-juicer/PLIST107
-rw-r--r--audio/sound-juicer/distinfo7
-rw-r--r--audio/sound-juicer/patches/patch-aa49
-rw-r--r--audio/sound-juicer/patches/patch-ab13
-rw-r--r--audio/sox/DESCR15
-rw-r--r--audio/sox/Makefile45
-rw-r--r--audio/sox/PLIST13
-rw-r--r--audio/sox/distinfo9
-rw-r--r--audio/sox/patches/patch-aa12
-rw-r--r--audio/sox/patches/patch-ab12
-rw-r--r--audio/sox/patches/patch-ac12
-rw-r--r--audio/sox/patches/patch-ad16
-rw-r--r--audio/speex/DESCR7
-rw-r--r--audio/speex/Makefile33
-rw-r--r--audio/speex/PLIST21
-rw-r--r--audio/speex/buildlink3.mk22
-rw-r--r--audio/speex/distinfo7
-rw-r--r--audio/speex/patches/patch-aa13
-rw-r--r--audio/speex/patches/patch-ab25
-rw-r--r--audio/spiralloops/DESCR10
-rw-r--r--audio/spiralloops/Makefile33
-rw-r--r--audio/spiralloops/PLIST2
-rw-r--r--audio/spiralloops/distinfo22
-rw-r--r--audio/spiralloops/patches/patch-aa22
-rw-r--r--audio/spiralloops/patches/patch-ab13
-rw-r--r--audio/spiralloops/patches/patch-ac13
-rw-r--r--audio/spiralloops/patches/patch-ad25
-rw-r--r--audio/spiralloops/patches/patch-ae12
-rw-r--r--audio/spiralloops/patches/patch-af13
-rw-r--r--audio/spiralloops/patches/patch-ag13
-rw-r--r--audio/spiralloops/patches/patch-ah13
-rw-r--r--audio/spiralloops/patches/patch-ai13
-rw-r--r--audio/spiralloops/patches/patch-aj13
-rw-r--r--audio/spiralloops/patches/patch-ak22
-rw-r--r--audio/spiralloops/patches/patch-al13
-rw-r--r--audio/spiralloops/patches/patch-am22
-rw-r--r--audio/spiralloops/patches/patch-an13
-rw-r--r--audio/spiralloops/patches/patch-ao22
-rw-r--r--audio/spiralloops/patches/patch-ap13
-rw-r--r--audio/spiralloops/patches/patch-aq13
-rw-r--r--audio/spiralsynth/DESCR6
-rw-r--r--audio/spiralsynth/Makefile36
-rw-r--r--audio/spiralsynth/PLIST5
-rw-r--r--audio/spiralsynth/distinfo19
-rw-r--r--audio/spiralsynth/patches/patch-aa22
-rw-r--r--audio/spiralsynth/patches/patch-ab22
-rw-r--r--audio/spiralsynth/patches/patch-ad25
-rw-r--r--audio/spiralsynth/patches/patch-ae13
-rw-r--r--audio/spiralsynth/patches/patch-af22
-rw-r--r--audio/spiralsynth/patches/patch-ag13
-rw-r--r--audio/spiralsynth/patches/patch-ah13
-rw-r--r--audio/spiralsynth/patches/patch-ai13
-rw-r--r--audio/spiralsynth/patches/patch-aj13
-rw-r--r--audio/spiralsynth/patches/patch-ak14
-rw-r--r--audio/spiralsynth/patches/patch-al12
-rw-r--r--audio/spiralsynth/patches/patch-am14
-rw-r--r--audio/spiralsynth/patches/patch-an62
-rw-r--r--audio/spiralsynth/patches/patch-ao12
-rw-r--r--audio/splay/DESCR12
-rw-r--r--audio/splay/Makefile21
-rw-r--r--audio/splay/PLIST4
-rw-r--r--audio/splay/distinfo11
-rw-r--r--audio/splay/patches/patch-aa28
-rw-r--r--audio/splay/patches/patch-ab47
-rw-r--r--audio/splay/patches/patch-ac68
-rw-r--r--audio/splay/patches/patch-ad42
-rw-r--r--audio/splay/patches/patch-ae21
-rw-r--r--audio/splay/patches/patch-ai12
-rw-r--r--audio/streamripper/DESCR5
-rw-r--r--audio/streamripper/Makefile21
-rw-r--r--audio/streamripper/PLIST3
-rw-r--r--audio/streamripper/distinfo6
-rw-r--r--audio/streamripper/options.mk14
-rw-r--r--audio/streamripper/patches/patch-aa13
-rw-r--r--audio/streamtuner/DESCR4
-rw-r--r--audio/streamtuner/MESSAGE14
-rw-r--r--audio/streamtuner/Makefile32
-rw-r--r--audio/streamtuner/PLIST110
-rw-r--r--audio/streamtuner/buildlink3.mk23
-rw-r--r--audio/streamtuner/distinfo6
-rw-r--r--audio/streamtuner/options.mk35
-rw-r--r--audio/streamtuner/patches/patch-aa110
-rw-r--r--audio/sweep/DESCR3
-rw-r--r--audio/sweep/Makefile37
-rw-r--r--audio/sweep/PLIST36
-rw-r--r--audio/sweep/buildlink3.mk29
-rw-r--r--audio/sweep/distinfo7
-rw-r--r--audio/sweep/patches/patch-aa28
-rw-r--r--audio/sweep/patches/patch-ab13
-rw-r--r--audio/taglib/DESCR3
-rw-r--r--audio/taglib/Makefile27
-rw-r--r--audio/taglib/PLIST54
-rw-r--r--audio/taglib/buildlink3.mk20
-rw-r--r--audio/taglib/distinfo6
-rw-r--r--audio/taglib/files/id3lib_strings.h204
-rw-r--r--audio/taglib/patches/patch-aa18
-rw-r--r--audio/tcd/DESCR2
-rw-r--r--audio/tcd/Makefile20
-rw-r--r--audio/tcd/PLIST3
-rw-r--r--audio/tcd/distinfo5
-rw-r--r--audio/tcl-snack/DESCR8
-rw-r--r--audio/tcl-snack/Makefile27
-rw-r--r--audio/tcl-snack/PLIST7
-rw-r--r--audio/tcl-snack/distinfo9
-rw-r--r--audio/tcl-snack/patches/patch-aa28
-rw-r--r--audio/tcl-snack/patches/patch-ab17
-rw-r--r--audio/tcl-snack/patches/patch-ac17
-rw-r--r--audio/tcl-snack/patches/patch-ad33
-rw-r--r--audio/terminatorx/DESCR5
-rw-r--r--audio/terminatorx/Makefile44
-rw-r--r--audio/terminatorx/PLIST13
-rw-r--r--audio/terminatorx/distinfo6
-rw-r--r--audio/terminatorx/patches/patch-aa16
-rw-r--r--audio/tfmxplay/DESCR13
-rw-r--r--audio/tfmxplay/Makefile25
-rw-r--r--audio/tfmxplay/PLIST4
-rw-r--r--audio/tfmxplay/distinfo9
-rw-r--r--audio/tfmxplay/patches/patch-aa24
-rw-r--r--audio/tfmxplay/patches/patch-ab12
-rw-r--r--audio/tfmxplay/patches/patch-ac45
-rw-r--r--audio/tfmxplay/patches/patch-ad16
-rw-r--r--audio/timidity/DESCR4
-rw-r--r--audio/timidity/MESSAGE9
-rw-r--r--audio/timidity/Makefile55
-rw-r--r--audio/timidity/PLIST17
-rw-r--r--audio/timidity/distinfo9
-rw-r--r--audio/timidity/patches/patch-aa16
-rw-r--r--audio/timidity/patches/patch-ab31
-rw-r--r--audio/timidity/patches/patch-ac15
-rw-r--r--audio/timidity/patches/patch-ae12
-rw-r--r--audio/toolame/DESCR4
-rw-r--r--audio/toolame/Makefile30
-rw-r--r--audio/toolame/PLIST8
-rw-r--r--audio/toolame/distinfo9
-rw-r--r--audio/toolame/patches/patch-aa40
-rw-r--r--audio/toolame/patches/patch-ab33
-rw-r--r--audio/toolame/patches/patch-ac40
-rw-r--r--audio/toolame/patches/patch-ad13
-rw-r--r--audio/tosha/DESCR7
-rw-r--r--audio/tosha/Makefile20
-rw-r--r--audio/tosha/PLIST7
-rw-r--r--audio/tosha/distinfo9
-rw-r--r--audio/tosha/patches/patch-aa48
-rw-r--r--audio/tosha/patches/patch-ab78
-rw-r--r--audio/tosha/patches/patch-ac15
-rw-r--r--audio/tosha/patches/patch-af13
-rw-r--r--audio/tracker/DESCR5
-rw-r--r--audio/tracker/Makefile47
-rw-r--r--audio/tracker/PLIST92
-rw-r--r--audio/tracker/distinfo9
-rw-r--r--audio/tracker/patches/patch-aa80
-rw-r--r--audio/tracker/patches/patch-ab33
-rw-r--r--audio/tracker/patches/patch-ac39
-rw-r--r--audio/tracker/patches/patch-ae24
-rw-r--r--audio/tremor-tools/DESCR5
-rw-r--r--audio/tremor-tools/MESSAGE14
-rw-r--r--audio/tremor-tools/Makefile39
-rw-r--r--audio/tremor-tools/PLIST2
-rw-r--r--audio/tremor-tools/distinfo13
-rw-r--r--audio/tremor-tools/patches/patch-aa15
-rw-r--r--audio/tremor-tools/patches/patch-ab46
-rw-r--r--audio/tremor-tools/patches/patch-ac48
-rw-r--r--audio/tremor-tools/patches/patch-ad21
-rw-r--r--audio/tremor-tools/patches/patch-ae36
-rw-r--r--audio/tremor-tools/patches/patch-af14
-rw-r--r--audio/tremor-tools/patches/patch-ag12
-rw-r--r--audio/tremor-tools/patches/patch-ah12
-rw-r--r--audio/tremor/DESCR5
-rw-r--r--audio/tremor/Makefile28
-rw-r--r--audio/tremor/PLIST8
-rw-r--r--audio/tremor/buildlink3.mk20
-rw-r--r--audio/tremor/distinfo5
-rw-r--r--audio/trm/DESCR5
-rw-r--r--audio/trm/Makefile27
-rw-r--r--audio/trm/PLIST2
-rw-r--r--audio/trm/distinfo6
-rw-r--r--audio/trm/patches/patch-aa13
-rw-r--r--audio/tunesbrowser/DESCR11
-rw-r--r--audio/tunesbrowser/Makefile31
-rw-r--r--audio/tunesbrowser/PLIST11
-rw-r--r--audio/tunesbrowser/distinfo7
-rw-r--r--audio/tunesbrowser/patches/patch-ab27
-rw-r--r--audio/tunesbrowser/patches/patch-ad15
-rw-r--r--audio/twolame/DESCR12
-rw-r--r--audio/twolame/Makefile21
-rw-r--r--audio/twolame/PLIST27
-rw-r--r--audio/twolame/buildlink3.mk22
-rw-r--r--audio/twolame/distinfo5
-rw-r--r--audio/ubs/DESCR9
-rw-r--r--audio/ubs/Makefile58
-rw-r--r--audio/ubs/PLIST16
-rw-r--r--audio/ubs/distinfo8
-rwxr-xr-xaudio/ubs/files/ubs.sh19
-rw-r--r--audio/ubs/patches/patch-aa22
-rw-r--r--audio/ubs/patches/patch-ab25
-rw-r--r--audio/ubs/patches/patch-ac17
-rw-r--r--audio/vorbis-tools/DESCR8
-rw-r--r--audio/vorbis-tools/MESSAGE14
-rw-r--r--audio/vorbis-tools/Makefile39
-rw-r--r--audio/vorbis-tools/PLIST25
-rw-r--r--audio/vorbis-tools/distinfo20
-rw-r--r--audio/vorbis-tools/patches/patch-aa14
-rw-r--r--audio/vorbis-tools/patches/patch-ab18
-rw-r--r--audio/vorbis-tools/patches/patch-ac46
-rw-r--r--audio/vorbis-tools/patches/patch-ad12
-rw-r--r--audio/vorbis-tools/patches/patch-ae23
-rw-r--r--audio/vorbis-tools/patches/patch-af12
-rw-r--r--audio/vorbis-tools/patches/patch-ag19
-rw-r--r--audio/vorbis-tools/patches/patch-ah12
-rw-r--r--audio/vorbis-tools/patches/patch-ai208
-rw-r--r--audio/vorbis-tools/patches/patch-aj171
-rw-r--r--audio/vorbis-tools/patches/patch-ak26
-rw-r--r--audio/vorbis-tools/patches/patch-an83
-rw-r--r--audio/vorbis-tools/patches/patch-ao15
-rw-r--r--audio/vorbis-tools/patches/patch-ap12
-rw-r--r--audio/vorbis-tools/patches/patch-aq13
-rw-r--r--audio/vorbisgain/DESCR4
-rw-r--r--audio/vorbisgain/Makefile16
-rw-r--r--audio/vorbisgain/PLIST3
-rw-r--r--audio/vorbisgain/distinfo5
-rw-r--r--audio/wavesurfer/DESCR11
-rw-r--r--audio/wavesurfer/Makefile31
-rw-r--r--audio/wavesurfer/PLIST38
-rw-r--r--audio/wavesurfer/distinfo5
-rw-r--r--audio/wavpack/DESCR11
-rw-r--r--audio/wavpack/Makefile17
-rw-r--r--audio/wavpack/PLIST8
-rw-r--r--audio/wavpack/buildlink3.mk19
-rw-r--r--audio/wavpack/distinfo5
-rw-r--r--audio/wmmixer/DESCR10
-rw-r--r--audio/wmmixer/Makefile29
-rw-r--r--audio/wmmixer/PLIST2
-rw-r--r--audio/wmmixer/distinfo8
-rw-r--r--audio/wmmixer/patches/patch-aa13
-rw-r--r--audio/wmmixer/patches/patch-ab12
-rw-r--r--audio/wmmixer/patches/patch-ac13
-rw-r--r--audio/wmmp/DESCR2
-rw-r--r--audio/wmmp/Makefile17
-rw-r--r--audio/wmmp/PLIST3
-rw-r--r--audio/wmmp/distinfo7
-rw-r--r--audio/wmmp/patches/patch-aa27
-rw-r--r--audio/wmmp/patches/patch-ab12
-rw-r--r--audio/wmmp3/DESCR6
-rw-r--r--audio/wmmp3/Makefile28
-rw-r--r--audio/wmmp3/PLIST3
-rw-r--r--audio/wmmp3/distinfo5
-rw-r--r--audio/wmsmixer/DESCR3
-rw-r--r--audio/wmsmixer/Makefile34
-rw-r--r--audio/wmsmixer/PLIST6
-rw-r--r--audio/wmsmixer/distinfo7
-rw-r--r--audio/wmsmixer/patches/patch-aa14
-rw-r--r--audio/wmsmixer/patches/patch-ab13
-rw-r--r--audio/wmusic/DESCR3
-rw-r--r--audio/wmusic/Makefile27
-rw-r--r--audio/wmusic/PLIST5
-rw-r--r--audio/wmusic/distinfo6
-rw-r--r--audio/wmusic/patches/patch-aa14
-rw-r--r--audio/wsoundprefs/DESCR2
-rw-r--r--audio/wsoundprefs/Makefile19
-rw-r--r--audio/wsoundprefs/PLIST11
-rw-r--r--audio/wsoundprefs/distinfo12
-rw-r--r--audio/wsoundprefs/patches/patch-aa24
-rw-r--r--audio/wsoundprefs/patches/patch-ab13
-rw-r--r--audio/wsoundprefs/patches/patch-ac22
-rw-r--r--audio/wsoundprefs/patches/patch-ad15
-rw-r--r--audio/wsoundprefs/patches/patch-ae15
-rw-r--r--audio/wsoundprefs/patches/patch-af13
-rw-r--r--audio/wsoundprefs/patches/patch-ag13
-rw-r--r--audio/wsoundserver/DESCR7
-rw-r--r--audio/wsoundserver/Makefile62
-rw-r--r--audio/wsoundserver/PLIST15
-rw-r--r--audio/wsoundserver/buildlink3.mk25
-rw-r--r--audio/wsoundserver/distinfo9
-rw-r--r--audio/wsoundserver/files/WMSound27
-rw-r--r--audio/wsoundserver/patches/patch-ac13
-rw-r--r--audio/wsoundserver/patches/patch-ad13
-rw-r--r--audio/wsoundserver/patches/patch-ae13
-rw-r--r--audio/wsoundserver/patches/patch-af36
-rw-r--r--audio/xamp/DESCR11
-rw-r--r--audio/xamp/Makefile50
-rw-r--r--audio/xamp/PLIST70
-rw-r--r--audio/xamp/distinfo39
-rw-r--r--audio/xamp/patches/patch-aa23
-rw-r--r--audio/xamp/patches/patch-ab37
-rw-r--r--audio/xamp/patches/patch-ac81
-rw-r--r--audio/xamp/patches/patch-ad13
-rw-r--r--audio/xamp/patches/patch-ae33
-rw-r--r--audio/xamp/patches/patch-af13
-rw-r--r--audio/xamp/patches/patch-ag245
-rw-r--r--audio/xamp/patches/patch-ah16
-rw-r--r--audio/xamp/patches/patch-ai34
-rw-r--r--audio/xamp/patches/patch-aj23
-rw-r--r--audio/xamp/patches/patch-ak23
-rw-r--r--audio/xamp/patches/patch-al16
-rw-r--r--audio/xamp/patches/patch-am25
-rw-r--r--audio/xamp/patches/patch-an15
-rw-r--r--audio/xamp/patches/patch-ao14
-rw-r--r--audio/xamp/patches/patch-ap14
-rw-r--r--audio/xamp/patches/patch-aq14
-rw-r--r--audio/xamp/patches/patch-ar14
-rw-r--r--audio/xamp/patches/patch-as10
-rw-r--r--audio/xamp/patches/patch-at21
-rw-r--r--audio/xamp/patches/patch-au21
-rw-r--r--audio/xamp/patches/patch-av13
-rw-r--r--audio/xamp/patches/patch-aw13
-rw-r--r--audio/xamp/patches/patch-ax270
-rw-r--r--audio/xamp/patches/patch-ay284
-rw-r--r--audio/xanalyser/DESCR7
-rw-r--r--audio/xanalyser/Makefile21
-rw-r--r--audio/xanalyser/PLIST4
-rw-r--r--audio/xanalyser/distinfo8
-rw-r--r--audio/xanalyser/patches/patch-aa31
-rw-r--r--audio/xanalyser/patches/patch-ab13
-rw-r--r--audio/xanalyser/patches/patch-ad35
-rw-r--r--audio/xcdplayer/DESCR6
-rw-r--r--audio/xcdplayer/Makefile26
-rw-r--r--audio/xcdplayer/PLIST4
-rw-r--r--audio/xcdplayer/distinfo18
-rw-r--r--audio/xcdplayer/files/cdrom_freebsd.c611
-rw-r--r--audio/xcdplayer/files/cdrom_freebsd.h96
-rw-r--r--audio/xcdplayer/patches/patch-aa16
-rw-r--r--audio/xcdplayer/patches/patch-ab91
-rw-r--r--audio/xcdplayer/patches/patch-ac34
-rw-r--r--audio/xcdplayer/patches/patch-ad64
-rw-r--r--audio/xcdplayer/patches/patch-ae32
-rw-r--r--audio/xcdplayer/patches/patch-af29
-rw-r--r--audio/xcdplayer/patches/patch-ag46
-rw-r--r--audio/xcdplayer/patches/patch-ah514
-rw-r--r--audio/xcdplayer/patches/patch-ai103
-rw-r--r--audio/xcdplayer/patches/patch-aj70
-rw-r--r--audio/xcdplayer/patches/patch-ak51
-rw-r--r--audio/xcdplayer/patches/patch-al32
-rw-r--r--audio/xcdplayer/patches/patch-am118
-rw-r--r--audio/xfce4-mixer/DESCR1
-rw-r--r--audio/xfce4-mixer/Makefile14
-rw-r--r--audio/xfce4-mixer/PLIST56
-rw-r--r--audio/xfce4-mixer/buildlink3.mk24
-rw-r--r--audio/xfce4-mixer/distinfo7
-rw-r--r--audio/xfce4-mixer/patches/patch-aa19
-rw-r--r--audio/xfce4-mixer/patches/patch-ab20
-rw-r--r--audio/xfce4-xmms-plugin/DESCR1
-rw-r--r--audio/xfce4-xmms-plugin/Makefile17
-rw-r--r--audio/xfce4-xmms-plugin/PLIST18
-rw-r--r--audio/xfce4-xmms-plugin/buildlink3.mk23
-rw-r--r--audio/xfce4-xmms-plugin/distinfo7
-rw-r--r--audio/xfce4-xmms-plugin/patches/patch-aa22
-rw-r--r--audio/xfce4-xmms-plugin/patches/patch-ab22
-rw-r--r--audio/xhippo/DESCR9
-rw-r--r--audio/xhippo/Makefile37
-rw-r--r--audio/xhippo/PLIST14
-rw-r--r--audio/xhippo/distinfo6
-rw-r--r--audio/xhippo/patches/patch-aa13
-rw-r--r--audio/xine-arts/DESCR7
-rw-r--r--audio/xine-arts/Makefile24
-rw-r--r--audio/xine-arts/PLIST2
-rw-r--r--audio/xine-esound/DESCR7
-rw-r--r--audio/xine-esound/Makefile24
-rw-r--r--audio/xine-esound/PLIST2
-rw-r--r--audio/xmcd/DEINSTALL30
-rw-r--r--audio/xmcd/DESCR6
-rw-r--r--audio/xmcd/INSTALL15
-rw-r--r--audio/xmcd/MESSAGE10
-rw-r--r--audio/xmcd/Makefile69
-rw-r--r--audio/xmcd/PLIST275
-rw-r--r--audio/xmcd/distinfo18
-rw-r--r--audio/xmcd/patches/patch-aa13
-rw-r--r--audio/xmcd/patches/patch-ab37
-rw-r--r--audio/xmcd/patches/patch-ac12
-rw-r--r--audio/xmcd/patches/patch-ad55
-rw-r--r--audio/xmcd/patches/patch-ae13
-rw-r--r--audio/xmcd/patches/patch-af27
-rw-r--r--audio/xmcd/patches/patch-ag13
-rw-r--r--audio/xmcd/patches/patch-ah13
-rw-r--r--audio/xmcd/patches/patch-ai123
-rw-r--r--audio/xmcd/patches/patch-aj13
-rw-r--r--audio/xmix/DESCR2
-rw-r--r--audio/xmix/Makefile28
-rw-r--r--audio/xmix/PLIST4
-rw-r--r--audio/xmix/distinfo10
-rw-r--r--audio/xmix/patches/patch-aa24
-rw-r--r--audio/xmix/patches/patch-ab28
-rw-r--r--audio/xmmix/DESCR14
-rw-r--r--audio/xmmix/Makefile24
-rw-r--r--audio/xmmix/PLIST5
-rw-r--r--audio/xmmix/distinfo12
-rw-r--r--audio/xmmix/patches/patch-aa13
-rw-r--r--audio/xmmix/patches/patch-ab116
-rw-r--r--audio/xmmix/patches/patch-ac58
-rw-r--r--audio/xmmix/patches/patch-ba18
-rw-r--r--audio/xmmix/patches/patch-bb30
-rw-r--r--audio/xmmix/patches/patch-bc12
-rw-r--r--audio/xmmix/patches/patch-bd13
-rw-r--r--audio/xmms-alarm/DESCR2
-rw-r--r--audio/xmms-alarm/Makefile18
-rw-r--r--audio/xmms-alarm/PLIST2
-rw-r--r--audio/xmms-alarm/distinfo6
-rw-r--r--audio/xmms-alarm/patches/patch-aa13
-rw-r--r--audio/xmms-arts/DESCR2
-rw-r--r--audio/xmms-arts/Makefile26
-rw-r--r--audio/xmms-arts/PLIST4
-rw-r--r--audio/xmms-arts/distinfo6
-rw-r--r--audio/xmms-arts/patches/patch-ab28
-rw-r--r--audio/xmms-bezier/DESCR16
-rw-r--r--audio/xmms-bezier/Makefile23
-rw-r--r--audio/xmms-bezier/PLIST2
-rw-r--r--audio/xmms-bezier/distinfo6
-rw-r--r--audio/xmms-bezier/patches/patch-aa40
-rw-r--r--audio/xmms-blursk/DESCR4
-rw-r--r--audio/xmms-blursk/MESSAGE8
-rw-r--r--audio/xmms-blursk/Makefile27
-rw-r--r--audio/xmms-blursk/PLIST3
-rw-r--r--audio/xmms-blursk/distinfo9
-rw-r--r--audio/xmms-blursk/patches/patch-aa13
-rw-r--r--audio/xmms-bump-scope/DESCR1
-rw-r--r--audio/xmms-bump-scope/Makefile20
-rw-r--r--audio/xmms-bump-scope/PLIST2
-rw-r--r--audio/xmms-bump-scope/distinfo6
-rw-r--r--audio/xmms-bump-scope/patches/patch-aa12
-rw-r--r--audio/xmms-crossfade/DESCR17
-rw-r--r--audio/xmms-crossfade/Makefile24
-rw-r--r--audio/xmms-crossfade/PLIST2
-rw-r--r--audio/xmms-crossfade/distinfo11
-rw-r--r--audio/xmms-crossfade/patches/patch-aa22
-rw-r--r--audio/xmms-crossfade/patches/patch-ab18
-rw-r--r--audio/xmms-crossfade/patches/patch-ac57
-rw-r--r--audio/xmms-crossfade/patches/patch-ad14
-rw-r--r--audio/xmms-crossfade/patches/patch-ae15
-rw-r--r--audio/xmms-crossfade/patches/patch-af13
-rw-r--r--audio/xmms-dflowers/DESCR1
-rw-r--r--audio/xmms-dflowers/Makefile18
-rw-r--r--audio/xmms-dflowers/PLIST5
-rw-r--r--audio/xmms-dflowers/distinfo6
-rw-r--r--audio/xmms-dflowers/patches/patch-aa56
-rw-r--r--audio/xmms-dscope/DESCR1
-rw-r--r--audio/xmms-dscope/Makefile20
-rw-r--r--audio/xmms-dscope/PLIST5
-rw-r--r--audio/xmms-dscope/distinfo6
-rw-r--r--audio/xmms-dscope/patches/patch-aa56
-rw-r--r--audio/xmms-dspectogram/DESCR1
-rw-r--r--audio/xmms-dspectogram/Makefile20
-rw-r--r--audio/xmms-dspectogram/PLIST7
-rw-r--r--audio/xmms-dspectogram/distinfo6
-rw-r--r--audio/xmms-dspectogram/patches/patch-aa56
-rw-r--r--audio/xmms-dspectral/DESCR1
-rw-r--r--audio/xmms-dspectral/Makefile20
-rw-r--r--audio/xmms-dspectral/PLIST7
-rw-r--r--audio/xmms-dspectral/distinfo6
-rw-r--r--audio/xmms-dspectral/patches/patch-aa56
-rw-r--r--audio/xmms-esound/DESCR2
-rw-r--r--audio/xmms-esound/Makefile21
-rw-r--r--audio/xmms-esound/PLIST3
-rw-r--r--audio/xmms-faad/DESCR1
-rw-r--r--audio/xmms-faad/Makefile49
-rw-r--r--audio/xmms-faad/PLIST3
-rw-r--r--audio/xmms-flac/DESCR1
-rw-r--r--audio/xmms-flac/Makefile46
-rw-r--r--audio/xmms-flac/PLIST2
-rw-r--r--audio/xmms-flac/distinfo5
-rw-r--r--audio/xmms-fmradio/DESCR1
-rw-r--r--audio/xmms-fmradio/Makefile21
-rw-r--r--audio/xmms-fmradio/PLIST2
-rw-r--r--audio/xmms-fmradio/distinfo9
-rw-r--r--audio/xmms-fmradio/patches/patch-aa24
-rw-r--r--audio/xmms-fmradio/patches/patch-ab209
-rw-r--r--audio/xmms-fmradio/patches/patch-ac66
-rw-r--r--audio/xmms-fmradio/patches/patch-ad78
-rw-r--r--audio/xmms-funtimedancer/DESCR2
-rw-r--r--audio/xmms-funtimedancer/Makefile21
-rw-r--r--audio/xmms-funtimedancer/PLIST84
-rw-r--r--audio/xmms-funtimedancer/distinfo10
-rw-r--r--audio/xmms-funtimedancer/patches/patch-aa13
-rw-r--r--audio/xmms-funtimedancer/patches/patch-ab25
-rw-r--r--audio/xmms-gdancer/DESCR3
-rw-r--r--audio/xmms-gdancer/Makefile18
-rw-r--r--audio/xmms-gdancer/PLIST2
-rw-r--r--audio/xmms-gdancer/distinfo5
-rw-r--r--audio/xmms-infinity/DESCR9
-rw-r--r--audio/xmms-infinity/Makefile20
-rw-r--r--audio/xmms-infinity/PLIST3
-rw-r--r--audio/xmms-infinity/distinfo5
-rw-r--r--audio/xmms-iris/DESCR5
-rw-r--r--audio/xmms-iris/Makefile19
-rw-r--r--audio/xmms-iris/PLIST2
-rw-r--r--audio/xmms-iris/distinfo5
-rw-r--r--audio/xmms-jakdaw/DESCR2
-rw-r--r--audio/xmms-jakdaw/Makefile18
-rw-r--r--audio/xmms-jakdaw/PLIST2
-rw-r--r--audio/xmms-jakdaw/distinfo5
-rw-r--r--audio/xmms-jess/DESCR2
-rw-r--r--audio/xmms-jess/Makefile19
-rw-r--r--audio/xmms-jess/PLIST2
-rw-r--r--audio/xmms-jess/distinfo8
-rw-r--r--audio/xmms-jess/patches/patch-aa20
-rw-r--r--audio/xmms-jess/patches/patch-ab16
-rw-r--r--audio/xmms-jess/patches/patch-ac12
-rw-r--r--audio/xmms-liveice/DESCR3
-rw-r--r--audio/xmms-liveice/Makefile23
-rw-r--r--audio/xmms-liveice/PLIST3
-rw-r--r--audio/xmms-liveice/distinfo8
-rw-r--r--audio/xmms-liveice/patches/patch-aa31
-rw-r--r--audio/xmms-liveice/patches/patch-ab13
-rw-r--r--audio/xmms-liveice/patches/patch-ac13
-rw-r--r--audio/xmms-mac/DESCR1
-rw-r--r--audio/xmms-mac/Makefile21
-rw-r--r--audio/xmms-mac/PLIST2
-rw-r--r--audio/xmms-mac/distinfo5
-rw-r--r--audio/xmms-mad/DESCR7
-rw-r--r--audio/xmms-mad/Makefile23
-rw-r--r--audio/xmms-mad/PLIST2
-rw-r--r--audio/xmms-mad/distinfo8
-rw-r--r--audio/xmms-mad/patches/patch-aa23
-rw-r--r--audio/xmms-mad/patches/patch-ab24
-rw-r--r--audio/xmms-mad/patches/patch-ac25
-rw-r--r--audio/xmms-madspin/DESCR1
-rw-r--r--audio/xmms-madspin/Makefile26
-rw-r--r--audio/xmms-madspin/PLIST5
-rw-r--r--audio/xmms-madspin/distinfo6
-rw-r--r--audio/xmms-madspin/patches/patch-aa18
-rw-r--r--audio/xmms-meta-input/DEINSTALL19
-rw-r--r--audio/xmms-meta-input/DESCR8
-rw-r--r--audio/xmms-meta-input/MESSAGE8
-rw-r--r--audio/xmms-meta-input/Makefile29
-rw-r--r--audio/xmms-meta-input/PLIST13
-rw-r--r--audio/xmms-meta-input/buildlink3.mk22
-rw-r--r--audio/xmms-meta-input/distinfo7
-rw-r--r--audio/xmms-meta-input/patches/patch-aa32
-rw-r--r--audio/xmms-meta-input/patches/patch-ab53
-rw-r--r--audio/xmms-meta-timidity/DESCR2
-rw-r--r--audio/xmms-meta-timidity/Makefile31
-rw-r--r--audio/xmms-meta-timidity/PLIST2
-rwxr-xr-xaudio/xmms-meta-timidity/files/timidity.sh24
-rw-r--r--audio/xmms-modplug/DESCR8
-rw-r--r--audio/xmms-modplug/Makefile44
-rw-r--r--audio/xmms-modplug/PLIST3
-rw-r--r--audio/xmms-modplug/distinfo10
-rw-r--r--audio/xmms-modplug/patches/patch-aa13
-rw-r--r--audio/xmms-modplug/patches/patch-ab13
-rw-r--r--audio/xmms-modplug/patches/patch-ac31
-rw-r--r--audio/xmms-modplug/patches/patch-ad13
-rw-r--r--audio/xmms-modplug/patches/patch-ae12
-rw-r--r--audio/xmms-musepack/DESCR4
-rw-r--r--audio/xmms-musepack/Makefile22
-rw-r--r--audio/xmms-musepack/PLIST3
-rw-r--r--audio/xmms-musepack/distinfo5
-rw-r--r--audio/xmms-neato/DESCR1
-rw-r--r--audio/xmms-neato/Makefile33
-rw-r--r--audio/xmms-neato/PLIST2
-rw-r--r--audio/xmms-neato/distinfo6
-rw-r--r--audio/xmms-neato/patches/patch-aa13
-rw-r--r--audio/xmms-nebulus/DESCR12
-rw-r--r--audio/xmms-nebulus/Makefile19
-rw-r--r--audio/xmms-nebulus/PLIST2
-rw-r--r--audio/xmms-nebulus/distinfo5
-rw-r--r--audio/xmms-osx/DESCR1
-rw-r--r--audio/xmms-osx/Makefile24
-rw-r--r--audio/xmms-osx/PLIST2
-rw-r--r--audio/xmms-osx/distinfo6
-rw-r--r--audio/xmms-osx/patches/patch-aa20
-rw-r--r--audio/xmms-paranormal/DESCR8
-rw-r--r--audio/xmms-paranormal/Makefile25
-rw-r--r--audio/xmms-paranormal/PLIST4
-rw-r--r--audio/xmms-paranormal/distinfo7
-rw-r--r--audio/xmms-paranormal/patches/patch-aa20
-rw-r--r--audio/xmms-paranormal/patches/patch-ab20
-rw-r--r--audio/xmms-sid/DESCR1
-rw-r--r--audio/xmms-sid/Makefile19
-rw-r--r--audio/xmms-sid/PLIST2
-rw-r--r--audio/xmms-sid/distinfo10
-rw-r--r--audio/xmms-sid/patches/patch-aa15
-rw-r--r--audio/xmms-sid/patches/patch-ab12
-rw-r--r--audio/xmms-sid/patches/patch-ac22
-rw-r--r--audio/xmms-sid/patches/patch-ad41
-rw-r--r--audio/xmms-sid/patches/patch-ae225
-rw-r--r--audio/xmms-synaesthesia/DESCR1
-rw-r--r--audio/xmms-synaesthesia/Makefile20
-rw-r--r--audio/xmms-synaesthesia/PLIST2
-rw-r--r--audio/xmms-synaesthesia/distinfo6
-rw-r--r--audio/xmms-synaesthesia/patches/patch-aa20
-rw-r--r--audio/xmms-tv-scope/DESCR1
-rw-r--r--audio/xmms-tv-scope/Makefile23
-rw-r--r--audio/xmms-tv-scope/PLIST2
-rw-r--r--audio/xmms-tv-scope/distinfo5
-rw-r--r--audio/xmms-vismsa/DESCR1
-rw-r--r--audio/xmms-vismsa/Makefile20
-rw-r--r--audio/xmms-vismsa/PLIST2
-rw-r--r--audio/xmms-vismsa/distinfo6
-rw-r--r--audio/xmms-vismsa/patches/patch-aa51
-rw-r--r--audio/xmms-wma/DESCR1
-rw-r--r--audio/xmms-wma/Makefile28
-rw-r--r--audio/xmms-wma/PLIST2
-rw-r--r--audio/xmms-wma/distinfo9
-rw-r--r--audio/xmms-wma/patches/patch-aa18
-rw-r--r--audio/xmms-wma/patches/patch-ab17
-rw-r--r--audio/xmms-wma/patches/patch-ac59
-rw-r--r--audio/xmms-wma/patches/patch-ad26
-rw-r--r--audio/xmms/DESCR4
-rw-r--r--audio/xmms/MESSAGE16
-rw-r--r--audio/xmms/Makefile21
-rw-r--r--audio/xmms/Makefile.common80
-rw-r--r--audio/xmms/PLIST.Linux2
-rw-r--r--audio/xmms/PLIST.NetBSD2
-rw-r--r--audio/xmms/PLIST.OpenBSD2
-rw-r--r--audio/xmms/PLIST.SunOS2
-rw-r--r--audio/xmms/PLIST.common92
-rw-r--r--audio/xmms/PLIST.common_end4
-rw-r--r--audio/xmms/buildlink3.mk30
-rw-r--r--audio/xmms/distinfo21
-rw-r--r--audio/xmms/files/decode_i586_.s320
-rw-r--r--audio/xmms/hacks.mk10
-rw-r--r--audio/xmms/patches/patch-aa16
-rw-r--r--audio/xmms/patches/patch-ab13
-rw-r--r--audio/xmms/patches/patch-ac13
-rw-r--r--audio/xmms/patches/patch-ad13
-rw-r--r--audio/xmms/patches/patch-ae13
-rw-r--r--audio/xmms/patches/patch-af19
-rw-r--r--audio/xmms/patches/patch-ag13
-rw-r--r--audio/xmms/patches/patch-ah27
-rw-r--r--audio/xmms/patches/patch-ai14
-rw-r--r--audio/xmms/patches/patch-aj55
-rw-r--r--audio/xmms/patches/patch-ak22
-rw-r--r--audio/xmms/patches/patch-al13
-rw-r--r--audio/xmms/patches/patch-am27
-rw-r--r--audio/xmms/patches/patch-an47
-rw-r--r--audio/xmms/patches/patch-ao13
-rw-r--r--audio/xmms/patches/patch-ap17
-rw-r--r--audio/xmmsctrl/DESCR5
-rw-r--r--audio/xmmsctrl/Makefile21
-rw-r--r--audio/xmmsctrl/PLIST2
-rw-r--r--audio/xmmsctrl/distinfo7
-rw-r--r--audio/xmmsctrl/patches/patch-aa22
-rw-r--r--audio/xmmsctrl/patches/patch-ab18
-rw-r--r--audio/xmp/DESCR12
-rw-r--r--audio/xmp/Makefile41
-rw-r--r--audio/xmp/PLIST8
-rw-r--r--audio/xmp/distinfo19
-rw-r--r--audio/xmp/patches/patch-aa15
-rw-r--r--audio/xmp/patches/patch-ab22
-rw-r--r--audio/xmp/patches/patch-ac19
-rw-r--r--audio/xmp/patches/patch-ad13
-rw-r--r--audio/xmp/patches/patch-ae23
-rw-r--r--audio/xmp/patches/patch-af27
-rw-r--r--audio/xmp/patches/patch-ag12
-rw-r--r--audio/xmp/patches/patch-ah13
-rw-r--r--audio/xmp/patches/patch-ai12
-rw-r--r--audio/xmp/patches/patch-aj12
-rw-r--r--audio/xmp/patches/patch-ak13
-rw-r--r--audio/xmp/patches/patch-al13
-rw-r--r--audio/xmp/patches/patch-am155
-rw-r--r--audio/xmp/patches/patch-an159
-rw-r--r--audio/xmradio/DESCR2
-rw-r--r--audio/xmradio/Makefile27
-rw-r--r--audio/xmradio/PLIST5
-rw-r--r--audio/xmradio/distinfo5
-rw-r--r--audio/xsidplay/DESCR2
-rw-r--r--audio/xsidplay/Makefile39
-rw-r--r--audio/xsidplay/PLIST2
-rw-r--r--audio/xsidplay/distinfo7
-rw-r--r--audio/xsidplay/patches/patch-aa84
-rw-r--r--audio/xsidplay/patches/patch-ab13
-rw-r--r--audio/xwave/DESCR20
-rw-r--r--audio/xwave/Makefile31
-rw-r--r--audio/xwave/PLIST9
-rw-r--r--audio/xwave/distinfo25
-rw-r--r--audio/xwave/patches/patch-aa13
-rw-r--r--audio/xwave/patches/patch-ab81
-rw-r--r--audio/xwave/patches/patch-ac37
-rw-r--r--audio/xwave/patches/patch-ad189
-rw-r--r--audio/xwave/patches/patch-ae13
-rw-r--r--audio/xwave/patches/patch-af22
-rw-r--r--audio/xwave/patches/patch-ag24
-rw-r--r--audio/xwave/patches/patch-ah32
-rw-r--r--audio/xwave/patches/patch-ai13
-rw-r--r--audio/xwave/patches/patch-aj90
-rw-r--r--audio/xwave/patches/patch-ak72
-rw-r--r--audio/xwave/patches/patch-al14
-rw-r--r--audio/xwave/patches/patch-am13
-rw-r--r--audio/xwave/patches/patch-an24
-rw-r--r--audio/xwave/patches/patch-ao11
-rw-r--r--audio/xwave/patches/patch-ap33
-rw-r--r--audio/xwave/patches/patch-aq36
-rw-r--r--audio/xwave/patches/patch-ar12
-rw-r--r--audio/xwave/patches/patch-as13
-rw-r--r--audio/xwave/patches/patch-at21
2446 files changed, 0 insertions, 80292 deletions
diff --git a/audio/Makefile b/audio/Makefile
deleted file mode 100644
index 42b7c803e80..00000000000
--- a/audio/Makefile
+++ /dev/null
@@ -1,363 +0,0 @@
-# $NetBSD: Makefile,v 1.352 2007/02/27 10:00:10 wiz Exp $
-#
-
-COMMENT= Audio tools
-
-SUBDIR+= SDL_mixer
-SUBDIR+= SDL_sound
-SUBDIR+= abcde
-SUBDIR+= abcmidi
-SUBDIR+= amaroc
-SUBDIR+= amarok
-SUBDIR+= amp
-SUBDIR+= applerecords
-SUBDIR+= arts
-SUBDIR+= audacity
-SUBDIR+= aumix
-SUBDIR+= aumix-gtk
-SUBDIR+= bladeenc
-SUBDIR+= bmp
-SUBDIR+= bmp-esound
-SUBDIR+= bmp-mac
-SUBDIR+= bmp-musepack
-SUBDIR+= bmpx
-SUBDIR+= cam
-SUBDIR+= cd-discid
-SUBDIR+= cdd
-SUBDIR+= cddb-bundle
-SUBDIR+= cddbd
-SUBDIR+= cdparanoia
-SUBDIR+= cdplayer
-SUBDIR+= cmp3
-SUBDIR+= cmus
-SUBDIR+= cplay
-SUBDIR+= cripple
-SUBDIR+= cs4235
-SUBDIR+= csound4
-SUBDIR+= csound4-manual
-SUBDIR+= csound5
-SUBDIR+= csound5-manual
-SUBDIR+= daapd
-SUBDIR+= dap
-SUBDIR+= darkice
-SUBDIR+= disc-cover
-SUBDIR+= distmp3
-SUBDIR+= easyh10
-SUBDIR+= easytag
-SUBDIR+= eawpatches
-SUBDIR+= emixer
-SUBDIR+= esound
-SUBDIR+= exaile
-SUBDIR+= faac
-SUBDIR+= faad2
-SUBDIR+= festival
-SUBDIR+= festival-doc
-SUBDIR+= festlex-cmu
-SUBDIR+= festlex-oald
-SUBDIR+= festlex-ogi
-SUBDIR+= festlex-poslex
-SUBDIR+= festogi-spanish
-SUBDIR+= festvox-abc
-SUBDIR+= festvox-aec
-SUBDIR+= festvox-don
-SUBDIR+= festvox-el11
-SUBDIR+= festvox-en1
-SUBDIR+= festvox-hvs
-SUBDIR+= festvox-jph
-SUBDIR+= festvox-kal16
-SUBDIR+= festvox-kal8
-SUBDIR+= festvox-ked16
-SUBDIR+= festvox-ked8
-SUBDIR+= festvox-mwm
-SUBDIR+= festvox-ogirab
-SUBDIR+= festvox-rab16
-SUBDIR+= festvox-rab8
-SUBDIR+= festvox-tll
-SUBDIR+= festvox-us1
-SUBDIR+= festvox-us2
-SUBDIR+= festvox-us3
-SUBDIR+= flac
-SUBDIR+= flac123
-SUBDIR+= flac2mp3
-SUBDIR+= flite
-SUBDIR+= fluidsynth
-SUBDIR+= freepats
-SUBDIR+= freezetag
-SUBDIR+= gkrellm-volume
-SUBDIR+= gkrellm-xmms
-SUBDIR+= gkrellm1-volume
-SUBDIR+= gkrellm1-xmms
-SUBDIR+= glurp
-SUBDIR+= gmp3info
-SUBDIR+= gmpc
-SUBDIR+= gnome-audio
-SUBDIR+= gnome-speech
-SUBDIR+= gnome-vfs2-cdda
-SUBDIR+= gogo
-SUBDIR+= goom
-SUBDIR+= gqmpeg
-SUBDIR+= gqmpeg-devel
-SUBDIR+= gqmpeg-skins
-SUBDIR+= gramofile
-SUBDIR+= gsm
-SUBDIR+= gst-plugins0.10-a52
-SUBDIR+= gst-plugins0.10-cdparanoia
-SUBDIR+= gst-plugins0.10-dts
-SUBDIR+= gst-plugins0.10-esound
-SUBDIR+= gst-plugins0.10-faad
-SUBDIR+= gst-plugins0.10-flac
-SUBDIR+= gst-plugins0.10-fluendo-mp3
-SUBDIR+= gst-plugins0.10-libvisual
-SUBDIR+= gst-plugins0.10-mad
-SUBDIR+= gst-plugins0.10-musepack
-SUBDIR+= gst-plugins0.10-oss
-SUBDIR+= gst-plugins0.10-sid
-SUBDIR+= gst-plugins0.10-spc
-SUBDIR+= gst-plugins0.10-speex
-SUBDIR+= gst-plugins0.10-vorbis
-SUBDIR+= gst-plugins0.10-wavpack
-SUBDIR+= gst-plugins0.8-artsd
-SUBDIR+= gst-plugins0.8-cdparanoia
-SUBDIR+= gst-plugins0.8-esound
-SUBDIR+= gst-plugins0.8-faad
-SUBDIR+= gst-plugins0.8-lame
-SUBDIR+= gst-plugins0.8-mad
-SUBDIR+= gst-plugins0.8-oss
-SUBDIR+= gst-plugins0.8-vorbis
-SUBDIR+= gtick
-SUBDIR+= gtkmserv
-SUBDIR+= gtkpod
-SUBDIR+= guspatches
-SUBDIR+= hydrogen
-SUBDIR+= icecast
-SUBDIR+= icecast1
-SUBDIR+= ices-mp3
-SUBDIR+= id3
-SUBDIR+= id3ed
-SUBDIR+= id3lib
-SUBDIR+= id3v2
-SUBDIR+= ifp-line
-SUBDIR+= jack
-SUBDIR+= juke
-SUBDIR+= kid3
-SUBDIR+= kmp
-SUBDIR+= ladspa
-SUBDIR+= lame
-SUBDIR+= liba52
-SUBDIR+= libao
-SUBDIR+= libao-arts
-SUBDIR+= libao-esound
-SUBDIR+= libao-macosx
-SUBDIR+= libao-oss
-SUBDIR+= libao-sun
-SUBDIR+= libaudiofile
-SUBDIR+= libcdaudio
-SUBDIR+= libcddb
-SUBDIR+= libdca
-SUBDIR+= libdiscid
-SUBDIR+= libgpod
-SUBDIR+= libhydrogen
-SUBDIR+= libid3tag
-SUBDIR+= libmad
-SUBDIR+= libmikmod
-SUBDIR+= libmodplug
-SUBDIR+= libmpcdec
-SUBDIR+= libmpd
-SUBDIR+= libmusepack
-SUBDIR+= libofa
-SUBDIR+= libopendaap
-SUBDIR+= libopenspc
-SUBDIR+= libsamplerate
-SUBDIR+= libshout
-SUBDIR+= libsidplay
-SUBDIR+= libsidplay2
-SUBDIR+= libsndfile
-SUBDIR+= libtunepimp
-SUBDIR+= libvisual
-SUBDIR+= libvisual-bmp
-SUBDIR+= libvisual-plugins
-SUBDIR+= libvisual-xmms
-SUBDIR+= libvisual0.2
-SUBDIR+= libvisual0.2-plugins
-SUBDIR+= libvorbis
-SUBDIR+= liteamp
-SUBDIR+= liveice
-SUBDIR+= lmms
-SUBDIR+= mac
-SUBDIR+= mad
-SUBDIR+= mad123
-SUBDIR+= madman
-SUBDIR+= madplay
-SUBDIR+= malint
-SUBDIR+= maplay
-SUBDIR+= mbrola
-SUBDIR+= mbrolavox-en1
-SUBDIR+= mbrolavox-us1
-SUBDIR+= mbrolavox-us2
-SUBDIR+= mbrolavox-us3
-SUBDIR+= mikmod
-SUBDIR+= mixer.app
-SUBDIR+= mkcdtoc
-SUBDIR+= moc
-SUBDIR+= moss
-SUBDIR+= mp32ogg
-SUBDIR+= mp3_check
-SUBDIR+= mp3asm
-SUBDIR+= mp3blaster
-SUBDIR+= mp3check
-SUBDIR+= mp3cut
-SUBDIR+= mp3info
-SUBDIR+= mp3splt
-SUBDIR+= mp3to
-SUBDIR+= mpc
-SUBDIR+= mpegaudio
-SUBDIR+= mpg123
-SUBDIR+= mpg123-esound
-SUBDIR+= mpg123-nas
-SUBDIR+= mpg321
-SUBDIR+= mppenc
-SUBDIR+= mserv
-SUBDIR+= mserv-devel
-SUBDIR+= mserv_irman
-SUBDIR+= mstream
-SUBDIR+= mt-daapd
-SUBDIR+= muse
-SUBDIR+= musicbox
-SUBDIR+= musicbrainz
-SUBDIR+= musicpd
-SUBDIR+= nas
-SUBDIR+= ncmpc
-SUBDIR+= normalize
-SUBDIR+= nosefart
-SUBDIR+= nspmod
-SUBDIR+= oggasm
-SUBDIR+= openal
-SUBDIR+= p5-Audio-CD
-SUBDIR+= p5-Audio-Wav
-SUBDIR+= p5-CDDB
-SUBDIR+= p5-CDDB-File
-SUBDIR+= p5-CDDB_get
-SUBDIR+= p5-MP3-Info
-SUBDIR+= p5-MP3-Tag
-SUBDIR+= p5-MPEG-Audio-Frame
-SUBDIR+= p5-MusicBrainz-Client
-SUBDIR+= p5-MusicBrainz-Queries
-SUBDIR+= portaudio
-SUBDIR+= portaudio-devel
-SUBDIR+= py-ao
-SUBDIR+= py-cddb
-SUBDIR+= py-karaoke
-SUBDIR+= py-mad
-SUBDIR+= py-musicbrainz
-SUBDIR+= py-musique
-SUBDIR+= py-mutagen
-SUBDIR+= py-ogg
-SUBDIR+= py-vorbis
-SUBDIR+= py-xmms
-SUBDIR+= qsynth
-SUBDIR+= rexima
-SUBDIR+= rhythmbox
-SUBDIR+= rio
-SUBDIR+= rio500
-SUBDIR+= rioutil
-SUBDIR+= rip
-SUBDIR+= rosegarden
-SUBDIR+= rplay
-SUBDIR+= rsynth
-SUBDIR+= shntool
-SUBDIR+= shorten
-SUBDIR+= sidplay
-SUBDIR+= sidplay2
-SUBDIR+= snd
-SUBDIR+= solfege
-SUBDIR+= sound-juicer
-SUBDIR+= sox
-SUBDIR+= speex
-SUBDIR+= spiralloops
-SUBDIR+= spiralsynth
-SUBDIR+= splay
-SUBDIR+= streamripper
-SUBDIR+= streamtuner
-SUBDIR+= sweep
-SUBDIR+= taglib
-SUBDIR+= tcd
-SUBDIR+= tcl-snack
-SUBDIR+= terminatorx
-SUBDIR+= tfmxplay
-SUBDIR+= timidity
-SUBDIR+= toolame
-SUBDIR+= tosha
-SUBDIR+= tracker
-SUBDIR+= tremor
-SUBDIR+= tremor-tools
-SUBDIR+= trm
-SUBDIR+= tunesbrowser
-SUBDIR+= twolame
-SUBDIR+= ubs
-SUBDIR+= vorbis-tools
-SUBDIR+= vorbisgain
-SUBDIR+= wavesurfer
-SUBDIR+= wavpack
-SUBDIR+= wmmixer
-SUBDIR+= wmmp
-SUBDIR+= wmmp3
-SUBDIR+= wmsmixer
-SUBDIR+= wmusic
-SUBDIR+= wsoundprefs
-SUBDIR+= wsoundserver
-SUBDIR+= xamp
-SUBDIR+= xanalyser
-SUBDIR+= xcdplayer
-SUBDIR+= xfce4-mixer
-SUBDIR+= xfce4-xmms-plugin
-SUBDIR+= xhippo
-SUBDIR+= xine-arts
-SUBDIR+= xine-esound
-SUBDIR+= xmcd
-SUBDIR+= xmix
-SUBDIR+= xmmix
-SUBDIR+= xmms
-SUBDIR+= xmms-alarm
-SUBDIR+= xmms-arts
-SUBDIR+= xmms-bezier
-SUBDIR+= xmms-blursk
-SUBDIR+= xmms-bump-scope
-SUBDIR+= xmms-crossfade
-SUBDIR+= xmms-dflowers
-SUBDIR+= xmms-dscope
-SUBDIR+= xmms-dspectogram
-SUBDIR+= xmms-dspectral
-SUBDIR+= xmms-esound
-SUBDIR+= xmms-faad
-SUBDIR+= xmms-flac
-SUBDIR+= xmms-fmradio
-SUBDIR+= xmms-funtimedancer
-SUBDIR+= xmms-gdancer
-SUBDIR+= xmms-infinity
-SUBDIR+= xmms-iris
-SUBDIR+= xmms-jakdaw
-SUBDIR+= xmms-jess
-SUBDIR+= xmms-liveice
-SUBDIR+= xmms-mac
-SUBDIR+= xmms-mad
-SUBDIR+= xmms-madspin
-SUBDIR+= xmms-meta-input
-SUBDIR+= xmms-meta-timidity
-SUBDIR+= xmms-modplug
-SUBDIR+= xmms-musepack
-SUBDIR+= xmms-neato
-SUBDIR+= xmms-nebulus
-SUBDIR+= xmms-osx
-SUBDIR+= xmms-paranormal
-SUBDIR+= xmms-sid
-SUBDIR+= xmms-synaesthesia
-SUBDIR+= xmms-tv-scope
-SUBDIR+= xmms-vismsa
-SUBDIR+= xmms-wma
-SUBDIR+= xmmsctrl
-SUBDIR+= xmp
-SUBDIR+= xmradio
-SUBDIR+= xsidplay
-SUBDIR+= xwave
-
-.include "../mk/bsd.pkg.subdir.mk"
diff --git a/audio/SDL_mixer/DESCR b/audio/SDL_mixer/DESCR
deleted file mode 100644
index cda3c9d2cde..00000000000
--- a/audio/SDL_mixer/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-SDL_mixer is a sample multi-channel audio mixer library. It supports any
-number of simultaneously playing channels of 16 bit stereo audio, plus
-a single channel of music, mixed by the popular MikMod MOD, Timidity MIDI,
-Ogg Vorbis, and SMPEG MP3 libraries.
diff --git a/audio/SDL_mixer/MESSAGE b/audio/SDL_mixer/MESSAGE
deleted file mode 100644
index 73906816a0f..00000000000
--- a/audio/SDL_mixer/MESSAGE
+++ /dev/null
@@ -1,11 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.5 2006/10/27 17:20:52 wiz Exp $
-
-To make use of the MIDI capabilities in the SDL_mixer package, you
-must install any of these packages:
-
- audio/freepats
- audio/eawpatches
- audio/guspatches
-
-===========================================================================
diff --git a/audio/SDL_mixer/Makefile b/audio/SDL_mixer/Makefile
deleted file mode 100644
index 1ca7c0a1f1e..00000000000
--- a/audio/SDL_mixer/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.33 2007/01/26 00:03:24 abs Exp $
-
-DISTNAME= SDL_mixer-1.2.7
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= http://www.libsdl.org/projects/SDL_mixer/release/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.libsdl.org/projects/SDL_mixer/
-COMMENT= Multi-channel audio mixer library
-
-CONFLICTS= SDL-mixer-[0-9]*
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-
-.include "../../mk/bsd.prefs.mk"
-
-CPPFLAGS+= -Dunix=1
-CFLAGS+= -DSYSCONFDIR="\"${PKG_SYSCONFDIR}\""
-
-INSTALLATION_DIRS= bin
-
-post-install:
- ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
- ${WRKSRC}/build/playmus ${PREFIX}/bin
- ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
- ${WRKSRC}/build/playwave ${PREFIX}/bin
-
-BUILDLINK_API_DEPENDS.SDL+= SDL>=1.2.10
-
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-.include "../../multimedia/smpeg/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/SDL_mixer/PLIST b/audio/SDL_mixer/PLIST
deleted file mode 100644
index a3dfdff1fb8..00000000000
--- a/audio/SDL_mixer/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:14 jlam Exp $
-bin/playmus
-bin/playwave
-include/SDL/SDL_mixer.h
-lib/libSDL_mixer.la
diff --git a/audio/SDL_mixer/buildlink3.mk b/audio/SDL_mixer/buildlink3.mk
deleted file mode 100644
index a9856301a4d..00000000000
--- a/audio/SDL_mixer/buildlink3.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:10:35 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-SDL_MIXER_BUILDLINK3_MK:= ${SDL_MIXER_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= SDL_mixer
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDL_mixer}
-BUILDLINK_PACKAGES+= SDL_mixer
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDL_mixer
-
-.if !empty(SDL_MIXER_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.5nb2
-BUILDLINK_ABI_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.6nb5
-BUILDLINK_PKGSRCDIR.SDL_mixer?= ../../audio/SDL_mixer
-BUILDLINK_INCDIRS.SDL_mixer?= include/SDL
-.endif # SDL_MIXER_BUILDLINK3_MK
-
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-.include "../../multimedia/smpeg/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/SDL_mixer/distinfo b/audio/SDL_mixer/distinfo
deleted file mode 100644
index 24bbe1f2a42..00000000000
--- a/audio/SDL_mixer/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.9 2006/09/18 12:13:35 joerg Exp $
-
-SHA1 (SDL_mixer-1.2.7.tar.gz) = 42b351360ea9debb2bec23e7e67ba355ec3762a9
-RMD160 (SDL_mixer-1.2.7.tar.gz) = cacb218f966d35cc66c663c0ce65b148869c08c3
-Size (SDL_mixer-1.2.7.tar.gz) = 1960614 bytes
-SHA1 (patch-aa) = fb2d442a918936fabf427abf883df4605e219f37
-SHA1 (patch-ab) = 309c5879cad60e8975f2c4e36669a8708b5f996a
diff --git a/audio/SDL_mixer/patches/patch-aa b/audio/SDL_mixer/patches/patch-aa
deleted file mode 100644
index 4c21f2fcace..00000000000
--- a/audio/SDL_mixer/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2006/07/07 06:52:46 adam Exp $
-
---- timidity/config.h.orig 2006-05-01 09:25:52.000000000 +0200
-+++ timidity/config.h
-@@ -169,7 +169,7 @@ typedef char int8;
-
- /* You could specify a complete path, e.g. "/etc/timidity.cfg", and
- then specify the library directory in the configuration file. */
--#define CONFIG_FILE "timidity.cfg"
-+#define CONFIG_FILE SYSCONFDIR"/timidity.cfg"
- #define CONFIG_FILE_ETC "/etc/timidity.cfg"
- #define CONFIG_FILE_ETC_TIMIDITY "/etc/timidity/timidity.cfg"
-
diff --git a/audio/SDL_mixer/patches/patch-ab b/audio/SDL_mixer/patches/patch-ab
deleted file mode 100644
index 5e07ed507ae..00000000000
--- a/audio/SDL_mixer/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/09/17 15:59:44 joerg Exp $
-
---- Makefile.in.orig 2006-09-17 17:53:06.000000000 +0000
-+++ Makefile.in
-@@ -57,10 +57,10 @@ $(objects):
- $(SHELL) $(auxdir)/mkinstalldirs $@
-
- $(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET)
-- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
-+ $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
-
- $(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET)
-- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
-+ $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
-
- .PHONY: all depend install install-hdrs install-lib install-bin uninstall uninstall-hdrs uninstall-lib uninstall-bin clean distclean dist
- depend:
diff --git a/audio/SDL_sound/DESCR b/audio/SDL_sound/DESCR
deleted file mode 100644
index 138d90a28c5..00000000000
--- a/audio/SDL_sound/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-SDL_sound is a library that handles the decoding of several popular sound file
-formats, such as .WAV and .MP3. It is meant to make the programmer's sound
-playback tasks simpler.
-
-The programmer gives SDL_sound a filename, or feeds it data directly from one
-of many sources, and then reads the decoded waveform data back at her leisure.
-
-If resource constraints are a concern, SDL_sound can process sound data in
-programmer-specified blocks. Alternately, SDL_sound can decode a whole sound
-file and hand back a single pointer to the whole waveform. SDL_sound can also
-handle sample rate, audio format, and channel conversion on-the-fly and
-behind-the-scenes, if the programmer desires.
diff --git a/audio/SDL_sound/Makefile b/audio/SDL_sound/Makefile
deleted file mode 100644
index b80959c0380..00000000000
--- a/audio/SDL_sound/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2007/01/26 18:10:49 joerg Exp $
-#
-
-DISTNAME= SDL_sound-1.0.1
-PKGREVISION= 6
-CATEGORIES= audio
-MASTER_SITES= http://icculus.org/SDL_sound/downloads/
-
-MAINTAINER= cube@NetBSD.org
-HOMEPAGE= http://icculus.org/SDL_sound/
-COMMENT= SDL library to handle the decoding of different file formats
-
-GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
-
-.include "../../audio/flac/buildlink3.mk"
-.include "../../audio/libmikmod/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../multimedia/smpeg/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/SDL_sound/PLIST b/audio/SDL_sound/PLIST
deleted file mode 100644
index 9afce801e58..00000000000
--- a/audio/SDL_sound/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:14 jlam Exp $
-bin/playsound
-include/SDL/SDL_sound.h
-lib/libSDL_sound.la
diff --git a/audio/SDL_sound/buildlink3.mk b/audio/SDL_sound/buildlink3.mk
deleted file mode 100644
index 4c665cb003b..00000000000
--- a/audio/SDL_sound/buildlink3.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:35 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-SDL_SOUND_BUILDLINK3_MK:= ${SDL_SOUND_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= SDL_sound
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDL_sound}
-BUILDLINK_PACKAGES+= SDL_sound
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDL_sound
-
-.if !empty(SDL_SOUND_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.SDL_sound+= SDL_sound>=1.0.1
-BUILDLINK_ABI_DEPENDS.SDL_sound+= SDL_sound>=1.0.1nb5
-BUILDLINK_PKGSRCDIR.SDL_sound?= ../../audio/SDL_sound
-.endif # SDL_SOUND_BUILDLINK3_MK
-
-.include "../../audio/libmikmod/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../multimedia/smpeg/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/SDL_sound/distinfo b/audio/SDL_sound/distinfo
deleted file mode 100644
index 98f13232dc9..00000000000
--- a/audio/SDL_sound/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.4 2007/01/13 23:36:28 wiz Exp $
-
-SHA1 (SDL_sound-1.0.1.tar.gz) = 9cb8550facf64f941179ba5767f763d1d52ddd6b
-RMD160 (SDL_sound-1.0.1.tar.gz) = 28d934d604e5db9b3b0b681785406587323ea765
-Size (SDL_sound-1.0.1.tar.gz) = 1019056 bytes
-SHA1 (patch-aa) = 466578457c3c38012f5ef63632ad58a0d70675f1
-SHA1 (patch-ac) = 7c5151593785538390abc27a3ef6322fc9e5e5b1
diff --git a/audio/SDL_sound/patches/patch-aa b/audio/SDL_sound/patches/patch-aa
deleted file mode 100644
index 996f613ae88..00000000000
--- a/audio/SDL_sound/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2007/01/13 23:36:28 wiz Exp $
-
---- configure.orig 2003-10-12 18:54:57.000000000 +0000
-+++ configure
-@@ -7089,7 +7089,7 @@ EOF
-
- fi
-
--x="C__seekable_stream_decoder_process_single"
-+x="C__stream_decoder_process_single"
- flcsym="FLA$x"
- # Check whether --enable-flac or --disable-flac was given.
- if test "${enable_flac+set}" = set; then
-@@ -7363,15 +7363,15 @@ int main (int argc, char *argv[])
- }
- else
- {
-- printf("\n*** 'smpeg-config --version' returned %d.%d.%d, but the
-+ printf("\n*** 'smpeg-config --version' returned %d.%d.%d, but the \
- minimum version\n", $smpeg_major_version, $smpeg_minor_version,
- $smpeg_micro_version);
-- printf("*** of SMPEG required is %d.%d.%d. If smpeg-config is
-+ printf("*** of SMPEG required is %d.%d.%d. If smpeg-config is \
- correct, then it is\n", major, minor, micro);
- printf("*** best to upgrade to the required version.\n");
-- printf("*** If smpeg-config was wrong, set the environment variable
-+ printf("*** If smpeg-config was wrong, set the environment variable \
- SMPEG_CONFIG\n");
-- printf("*** to point to the correct copy of smpeg-config, and remove
-+ printf("*** to point to the correct copy of smpeg-config, and remove \
- the file\n");
- printf("*** config.cache before re-running configure\n");
- return 1;
diff --git a/audio/SDL_sound/patches/patch-ac b/audio/SDL_sound/patches/patch-ac
deleted file mode 100644
index cece50c1f25..00000000000
--- a/audio/SDL_sound/patches/patch-ac
+++ /dev/null
@@ -1,101 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/01/13 23:36:28 wiz Exp $
-
---- decoders/flac.c.orig 2003-03-10 22:44:14.000000000 +0000
-+++ decoders/flac.c
-@@ -44,6 +44,16 @@
- #define __SDL_SOUND_INTERNAL__
- #include "SDL_sound_internal.h"
-
-+#include <FLAC/export.h>
-+
-+/* FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+
-+#ifdef LEGACY_FLAC
- #include <FLAC/seekable_stream_decoder.h>
-
- #define D_END_OF_STREAM FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM
-@@ -80,6 +90,34 @@ typedef FLAC__SeekableStreamDecoderReadS
- typedef FLAC__SeekableStreamDecoderSeekStatus d_seek_status_t;
- typedef FLAC__SeekableStreamDecoderTellStatus d_tell_status_t;
- typedef FLAC__SeekableStreamDecoderLengthStatus d_length_status_t;
-+#else
-+#include <FLAC/stream_decoder.h>
-+
-+#define D_END_OF_STREAM FLAC__STREAM_DECODER_END_OF_STREAM
-+
-+#define d_new() FLAC__stream_decoder_new()
-+#define d_process_metadata(x) FLAC__stream_decoder_process_until_end_of_metadata(x)
-+#define d_process_one_frame(x) FLAC__stream_decoder_process_single(x)
-+#define d_get_state(x) FLAC__stream_decoder_get_state(x)
-+#define d_finish(x) FLAC__stream_decoder_finish(x)
-+#define d_delete(x) FLAC__stream_decoder_delete(x)
-+
-+typedef FLAC__StreamDecoder decoder_t;
-+typedef FLAC__StreamDecoderReadStatus d_read_status_t;
-+
-+#define D_SEEK_STATUS_OK FLAC__STREAM_DECODER_SEEK_STATUS_OK
-+#define D_SEEK_STATUS_ERROR FLAC__STREAM_DECODER_SEEK_STATUS_ERROR
-+#define D_TELL_STATUS_OK FLAC__STREAM_DECODER_TELL_STATUS_OK
-+#define D_TELL_STATUS_ERROR FLAC__STREAM_DECODER_TELL_STATUS_ERROR
-+#define D_LENGTH_STATUS_OK FLAC__STREAM_DECODER_LENGTH_STATUS_OK
-+#define D_LENGTH_STATUS_ERROR FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR
-+
-+#define d_seek_absolute(x, y) FLAC__stream_decoder_seek_absolute(x, y)
-+
-+typedef FLAC__StreamDecoderSeekStatus d_seek_status_t;
-+typedef FLAC__StreamDecoderTellStatus d_tell_status_t;
-+typedef FLAC__StreamDecoderLengthStatus d_length_status_t;
-+#endif
-
- #define D_WRITE_CONTINUE FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE
- #define D_READ_END_OF_STREAM FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM
-@@ -141,9 +179,15 @@ static void free_flac(flac_t *f)
- } /* free_flac */
-
-
-+#ifdef LEGACY_FLAC
- static d_read_status_t read_callback(
- const decoder_t *decoder, FLAC__byte buffer[],
- unsigned int *bytes, void *client_data)
-+#else
-+static d_read_status_t read_callback(
-+ const decoder_t *decoder, FLAC__byte buffer[],
-+ size_t *bytes, void *client_data)
-+#endif
- {
- flac_t *f = (flac_t *) client_data;
- Uint32 retval;
-@@ -400,6 +444,7 @@ static int FLAC_open(Sound_Sample *sampl
- BAIL_MACRO(ERR_OUT_OF_MEMORY, 0);
- } /* if */
-
-+#ifdef LEGACY_FLAC
- d_set_read_callback(decoder, read_callback);
- d_set_write_callback(decoder, write_callback);
- d_set_metadata_callback(decoder, metadata_callback);
-@@ -410,6 +455,7 @@ static int FLAC_open(Sound_Sample *sampl
- d_set_eof_callback(decoder, eof_callback);
-
- d_set_client_data(decoder, f);
-+#endif
-
- f->rw = internal->rw;
- f->sample = sample;
-@@ -418,7 +464,12 @@ static int FLAC_open(Sound_Sample *sampl
- f->is_flac = 0 /* !!! FIXME: should be "has_extension", not "0". */;
-
- internal->decoder_private = f;
-+ /* really should check the init return value here: */
-+#ifdef LEGACY_FLAC
- d_init(decoder);
-+#else
-+ FLAC__stream_decoder_init_stream(decoder, read_callback, seek_callback, tell_callback, length_callback, eof_callback, write_callback, metadata_callback, error_callback, f);
-+#endif
-
- sample->flags = SOUND_SAMPLEFLAG_NONE;
-
diff --git a/audio/abcde/DESCR b/audio/abcde/DESCR
deleted file mode 100644
index e2a50bb5d91..00000000000
--- a/audio/abcde/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-abcde is a frontend command-line utility (actually, a shell script) that
-grabs tracks off a CD, encodes them to ogg, mp3 or flac formats, and tags them,
-all in one go.
diff --git a/audio/abcde/MESSAGE b/audio/abcde/MESSAGE
deleted file mode 100644
index 23084dfb640..00000000000
--- a/audio/abcde/MESSAGE
+++ /dev/null
@@ -1,19 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/12/16 05:14:28 lukem Exp $
-
-You need to install at least one encoder to use with abcde. It has support
-for the following encoders in pkgsrc:
-
- audio/bladeenc
- audio/flac
- audio/gogo
- audio/lame
- audio/vorbis-tools
-
-Preferences can be set in ~/.abcde.conf for each user, and for all users in
-${PKG_SYSCONFDIR}/abcde.conf system-wide.
-
-See the man page and ${EGDIR}/abcde.conf for
-configuration options.
-
-===========================================================================
diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
deleted file mode 100644
index 66660fa1c8a..00000000000
--- a/audio/abcde/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# $NetBSD: Makefile,v 1.39 2006/10/14 13:20:46 rillig Exp $
-
-DISTNAME= abcde_2.3.3.orig
-PKGNAME= ${DISTNAME:S/_/-/:S/.orig//}
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= http://www.hispalinux.es/~data/files/
-
-MAINTAINER= sketch@NetBSD.org
-HOMEPAGE= http://www.hispalinux.es/~data/abcde.php
-COMMENT= Command-line utility to rip and encode an audio CD
-
-DEPENDS+= cd-discid>=0.7:../../audio/cd-discid
-DEPENDS+= id3-[0-9]*:../../audio/id3
-DEPENDS+= id3v2-[0-9]*:../../audio/id3v2
-DEPENDS+= cdparanoia>=3.0.9.7:../../audio/cdparanoia
-DEPENDS+= wget>=1.7:../../net/wget
-
-NO_BUILD= yes
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-
-EGDIR= ${PREFIX}/share/examples/abcde
-
-MESSAGE_SUBST+= EGDIR=${EGDIR}
-MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-SUBST_CLASSES+= abcde
-SUBST_STAGE.abcde= pre-configure
-SUBST_MESSAGE.abcde= Adjusting the directory for configuration files
-SUBST_FILES.abcde= abcde abcde.1
-SUBST_SED.abcde= -e "s,/etc/,${PKG_SYSCONFDIR}/,g"
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/abcde ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/cddb-tool ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/abcde.conf ${EGDIR}
- ${INSTALL_MAN} ${WRKSRC}/abcde.1 ${PREFIX}/${PKGMANDIR}/man1
- ${INSTALL_MAN} ${WRKSRC}/cddb-tool.1 ${PREFIX}/${PKGMANDIR}/man1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/abcde/PLIST b/audio/abcde/PLIST
deleted file mode 100644
index 04c0658eefb..00000000000
--- a/audio/abcde/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/04/10 06:25:38 snj Exp $
-bin/abcde
-bin/cddb-tool
-man/man1/abcde.1
-man/man1/cddb-tool.1
-share/examples/abcde/abcde.conf
-@dirrm share/examples/abcde
diff --git a/audio/abcde/distinfo b/audio/abcde/distinfo
deleted file mode 100644
index 0b7f5bd8171..00000000000
--- a/audio/abcde/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.30 2006/10/14 13:20:46 rillig Exp $
-
-SHA1 (abcde_2.3.3.orig.tar.gz) = 76486a0bcb4ac85d052e0d244da3abbeab3c5db0
-RMD160 (abcde_2.3.3.orig.tar.gz) = a96030891e263e765cd86151ec227b1d3babbcea
-Size (abcde_2.3.3.orig.tar.gz) = 73458 bytes
-SHA1 (patch-ab) = 9fe36ee69e628a4c460dd8ee30b4e9bca29d7081
-SHA1 (patch-ac) = 7aa2adc9cc9eb34eff1e12a1093d25e81ec3fa31
diff --git a/audio/abcde/patches/patch-ab b/audio/abcde/patches/patch-ab
deleted file mode 100644
index 961ff80229a..00000000000
--- a/audio/abcde/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.9 2005/10/04 20:58:43 sketch Exp $
-
---- abcde.conf.orig 2005-10-04 21:45:58.000000000 +0100
-+++ abcde.conf 2005-10-04 21:46:09.000000000 +0100
-@@ -184,7 +184,7 @@
- #ACTIONS=cddb,read,encode,tag,move,clean
-
- # CD device you want to read from
--#CDROM=/dev/cdrom
-+#CDROM=/dev/rcd0d
- # If we are using the IDE bus, we need CDPARANOIACDROMBUS defined as "d"
- # If we are using the ide-scsi emulation layer, we need to define a "g"
- #CDPARANOIACDROMBUS="d"
diff --git a/audio/abcde/patches/patch-ac b/audio/abcde/patches/patch-ac
deleted file mode 100644
index cf736c10432..00000000000
--- a/audio/abcde/patches/patch-ac
+++ /dev/null
@@ -1,81 +0,0 @@
-$NetBSD: patch-ac,v 1.22 2006/10/14 13:20:47 rillig Exp $
-
---- abcde.orig 2005-10-04 21:39:38.000000000 +0100
-+++ abcde 2005-10-04 21:44:53.000000000 +0100
-@@ -1559,7 +1559,11 @@
- do_cddbedit ()
- {
- if checkstatus cddb-edit >/dev/null; then
-+ # Strip out ^M
- CDDBDATA="$ABCDETEMPDIR/cddbread.$(checkstatus cddb-choice)"
-+ CDDBDATATMP="$ABCDETEMPDIR/cddbread.tmp"
-+ tr -d '\r' < $CDDBDATA > $CDDBDATATMP
-+ mv $CDDBDATATMP $CDDBDATA
- VARIOUSARTISTS="$(checkstatus variousartists)"
- VARIOUSARTISTSTYLE="$(checkstatus variousartiststyle)"
- return 0
-@@ -1824,7 +1828,7 @@
- echo "variousartiststyle=$VARIOUSARTISTSTYLE" >> "$ABCDETEMPDIR/status"
-
- if [ "$EDITCDDB" = "y" ] && [ "$UNINTENTIONALLY_ANGER_THE_FREEDB_PEOPLE" = "y" ]; then
-- if [ $CDDBDATAMD5SUM != "" ] && [ $CDDBDATAMD5SUM != $($MD5SUM "$CDDBDATA" | cut -d " " -f 1) ]; then
-+ if [ "$CDDBDATAMD5SUM" != "" ] && [ "$CDDBDATAMD5SUM" != "$($MD5SUM '$CDDBDATA' | cut -d' ' -f1)" ]; then
- # This works but does not have the necessary error checking
- # yet. If you are familiar with the CDDB spec
- # (see http://www.freedb.org/src/latest/DBFORMAT)
-@@ -2114,7 +2118,7 @@
- DISTMP3=distmp3
- VORBISCOMMENT=vorbiscomment
- METAFLAC=metaflac
--NORMALIZE=normalize-audio
-+NORMALIZE=normalize
- CDSPEED=eject
- VORBISGAIN=vorbisgain
- MKCUE=mkcue
-@@ -2169,6 +2173,7 @@
- HTTPGET=fetch
- NEEDCDROMID=y
- OSFLAVOUR=FBSD
-+ MD5SUM=md5
- elif [ X$(uname) = "XDarwin" ] ; then
- HTTPGET=curl
- OSFLAVOUR=OSX
-@@ -2178,6 +2183,9 @@
- elif [ X$(uname) = "XOpenBSD" ] ; then
- HTTPGET=wget
- MD5SUM=md5
-+elif [ X$(uname) = "XNetBSD" ] ; then
-+ HTTPGET=wget
-+ MD5SUM=md5
- else
- HTTPGET=wget
- fi
-@@ -2231,6 +2239,9 @@
- CDROM=/dev/acd0c
- elif [ -e /dev/disk1 ]; then
- CDROM=/dev/disk1
-+ else
-+ RAWPART=`sysctl -n kern.rawpartition | awk '{printf "%c",97+$0}'`
-+ CDROM=/dev/rcd0$RAWPART
- fi
- fi
-
-@@ -2427,7 +2438,7 @@
- case "$CDROMREADERSYNTAX" in
- cdparanoia|debug)
- CDROMREADER="$CDPARANOIA"
-- CDROMREADEROPTS="$CDPARANOIAOPTS"
-+ CDROMREADEROPTS="$CDPARANOIAOPTS -g ${CDROM}"
- ;;
- cdda2wav)
- CDROMREADER="$CDDA2WAV"
-@@ -2681,7 +2692,8 @@
- do
- # Cut off the command-line options we just added in
- X=$(echo $X | cut -d' ' -f2)
-- if [ "$(which $X)" = "" ]; then
-+ Y="$(which $X | cut -d' ' -f1,2)"
-+ if [ "$Y" = "" -o "$Y" = "no $X" ]; then
- echo "abcde error: $X is not in your path." >&2
- exit 1
- elif [ ! -x $(which $X) ]; then
diff --git a/audio/abcmidi/DESCR b/audio/abcmidi/DESCR
deleted file mode 100644
index 0b9e6cd8361..00000000000
--- a/audio/abcmidi/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-abcMIDI is a package of programs developed by James Allwright for
-processing ABC music notation files. It consists of several programs:
-abc2midi, abc2abc, yaps, and midi2abc.
diff --git a/audio/abcmidi/Makefile b/audio/abcmidi/Makefile
deleted file mode 100644
index a52ebe8a25f..00000000000
--- a/audio/abcmidi/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2006/12/19 13:48:20 rillig Exp $
-#
-
-DISTNAME= abcMIDI-${ABCMIDIVER}
-PKGNAME= abcmidi-${ABCMIDIVER}
-CATEGORIES= audio
-MASTER_SITES= http://ifdo.pugmarks.com/~seymour/runabc/
-EXTRACT_SUFX= .zip
-WRKSRC= ${WRKDIR}/abcmidi
-MAKE_FILE= makefile
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://abc.sourceforge.net/abcMIDI/
-COMMENT= Music utilities for abc
-
-ABCMIDIVER= 2006-04-22
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 \
- share/doc/abcmidi/programming share/examples/abcmidi
-
-do-install:
- cd ${WRKSRC} && ${INSTALL_PROGRAM} abc2abc abc2midi mftext \
- midi2abc midicopy yaps ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/demo.abc ${PREFIX}/share/examples/abcmidi/
- cd ${WRKSRC}/doc && ${INSTALL_DATA} AUTHORS CHANGES \
- abcguide.txt abcmatch.txt gpl.txt history.txt readme.txt \
- yapshelp.txt ${PREFIX}/share/doc/abcmidi/
- cd ${WRKSRC}/doc/programming && ${INSTALL_DATA} abc2midi.txt \
- coding.txt midi2abc.txt split.abc yaps.txt \
- ${PREFIX}/share/doc/abcmidi/programming/
- ${INSTALL_MAN} ${WRKSRC}/doc/abc2abc.1 ${PREFIX}/${PKGMANDIR}/man1/
- ${INSTALL_MAN} ${WRKSRC}/doc/abc2midi.1 ${PREFIX}/${PKGMANDIR}/man1/
- ${INSTALL_MAN} ${WRKSRC}/doc/mftext.1 ${PREFIX}/${PKGMANDIR}/man1/
- ${INSTALL_MAN} ${WRKSRC}/doc/midi2abc.1 ${PREFIX}/${PKGMANDIR}/man1/
- ${INSTALL_MAN} ${WRKSRC}/doc/midicopy.1 ${PREFIX}/${PKGMANDIR}/man1/
- ${INSTALL_MAN} ${WRKSRC}/doc/yaps.1 ${PREFIX}/${PKGMANDIR}/man1/
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/abcmidi/PLIST b/audio/abcmidi/PLIST
deleted file mode 100644
index 8883b98a7d3..00000000000
--- a/audio/abcmidi/PLIST
+++ /dev/null
@@ -1,30 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/04/01 14:35:17 ben Exp $
-bin/abc2abc
-bin/abc2midi
-bin/mftext
-bin/midi2abc
-bin/midicopy
-bin/yaps
-share/doc/abcmidi/AUTHORS
-share/doc/abcmidi/CHANGES
-share/doc/abcmidi/abcguide.txt
-share/doc/abcmidi/abcmatch.txt
-share/doc/abcmidi/gpl.txt
-share/doc/abcmidi/history.txt
-share/doc/abcmidi/readme.txt
-share/doc/abcmidi/yapshelp.txt
-share/doc/abcmidi/programming/abc2midi.txt
-share/doc/abcmidi/programming/coding.txt
-share/doc/abcmidi/programming/midi2abc.txt
-share/doc/abcmidi/programming/split.abc
-share/doc/abcmidi/programming/yaps.txt
-share/examples/abcmidi/demo.abc
-man/man1/abc2abc.1
-man/man1/abc2midi.1
-man/man1/mftext.1
-man/man1/midi2abc.1
-man/man1/midicopy.1
-man/man1/yaps.1
-@dirrm share/doc/abcmidi/programming
-@dirrm share/doc/abcmidi
-@dirrm share/examples/abcmidi
diff --git a/audio/abcmidi/distinfo b/audio/abcmidi/distinfo
deleted file mode 100644
index abf3a034677..00000000000
--- a/audio/abcmidi/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/05/16 13:41:57 ben Exp $
-
-SHA1 (abcMIDI-2006-04-22.zip) = f7c3000d9a32199ff2d563fe2bafb7d6e2cafc42
-RMD160 (abcMIDI-2006-04-22.zip) = b7c65235a8a0b3b3a480d6b7ffdd9601c3bb4d02
-Size (abcMIDI-2006-04-22.zip) = 357665 bytes
-SHA1 (patch-aa) = ddbae8f04421ffb927669c702cc8cf380274fff7
-SHA1 (patch-ab) = c65bf9c2565bca5b5d168cc30ec5267153673b99
-SHA1 (patch-ac) = dc8c8814dbb7018250eb511c5ab6e6f6388f9ec9
diff --git a/audio/abcmidi/patches/patch-aa b/audio/abcmidi/patches/patch-aa
deleted file mode 100644
index 738dddc4c06..00000000000
--- a/audio/abcmidi/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/05/16 13:41:57 ben Exp $
-
---- makefile.orig 2006-04-01 11:02:46.000000000 -0800
-+++ makefile
-@@ -31,9 +31,8 @@
- # cure the problem, change this file from using PC-style end-of-line (carriage
- # return and line feed) to unix style end-of-line (line feed).
-
--CC=gcc
--CFLAGS=-DANSILIBS -O2
--LNK=gcc
-+CFLAGS+=-DANSILIBS
-+LNK=${CC}
- INSTALL=install
-
- prefix=/usr/local
diff --git a/audio/abcmidi/patches/patch-ab b/audio/abcmidi/patches/patch-ab
deleted file mode 100644
index 02e7442b1e1..00000000000
--- a/audio/abcmidi/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/05/16 13:42:29 ben Exp $
-
---- drawtune.c.orig 2006-01-17 05:07:34.000000000 -0800
-+++ drawtune.c
-@@ -492,7 +492,7 @@ char* s;
- double x;
- char units[40];
-
-- count = sscanf(s, "%lf%s", &x, units);
-+ count = sscanf(s, "%lf%39s", &x, units);
- if (count > 0) {
- if ((count >= 2) && (strncmp(units, "cm", 2) == 0)) {
- x = x*28.3;
-@@ -1950,7 +1950,7 @@ static void define_font(struct font* the
- char fontname[80];
- int fontsize, params;
-
-- params = sscanf(s, "%s %d", fontname, &fontsize);
-+ params = sscanf(s, "%79s %d", fontname, &fontsize);
- if (params >= 1) {
- if (strcmp(fontname, "-") != 0) {
- if (thefont->name != NULL) {
-@@ -1974,7 +1974,7 @@ char *s;
- int result;
-
- p[0] = '\0';
-- sscanf(s, " %10s", p);
-+ sscanf(s, " %9s", p);
- result = 1;
- if ((strcmp(p, "0") == 0) || (strcmp(p, "no") == 0) ||
- (strcmp(p, "false") == 0)) {
diff --git a/audio/abcmidi/patches/patch-ac b/audio/abcmidi/patches/patch-ac
deleted file mode 100644
index 31545a370b4..00000000000
--- a/audio/abcmidi/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/05/16 13:42:29 ben Exp $
-
---- yapstree.c.orig 2006-04-22 11:05:06.000000000 -0700
-+++ yapstree.c
-@@ -1483,7 +1483,7 @@ char *str; /* string following first wor
- };
- };
- if (strcmp(p, "vskip") == 0) {
-- count = sscanf(s, "%lf%s", &vspace, units);
-+ count = sscanf(s, "%lf%79s", &vspace, units);
- if (count > 0) {
- if ((count >= 2) && (strncmp(units, "cm", 2) == 0)) {
- vspace = vspace*28.3;
diff --git a/audio/amaroc/DESCR b/audio/amaroc/DESCR
deleted file mode 100644
index 6983a847fc4..00000000000
--- a/audio/amaroc/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Amaroc - an ncurses "frontend" for Amarok
-
-You need shell access to a machine on which Amarok
-is running. SSH is just fine.
diff --git a/audio/amaroc/Makefile b/audio/amaroc/Makefile
deleted file mode 100644
index 4dadb517bd7..00000000000
--- a/audio/amaroc/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2007/02/20 19:08:45 wiz Exp $
-#
-
-DISTNAME= amaroc-0.3
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=amaroc/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://sourceforge.net/projects/amaroc/
-COMMENT= Command line interface to amarok
-
-DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses
-
-do-build:
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/amaroc.py ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/amaroc
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/amaroc
-
-.include "../../lang/python/application.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/amaroc/PLIST b/audio/amaroc/PLIST
deleted file mode 100644
index 301bf271fa2..00000000000
--- a/audio/amaroc/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/08/24 17:39:13 wiz Exp $
-bin/amaroc.py
-share/doc/amaroc/README
-@dirrm share/doc/amaroc
diff --git a/audio/amaroc/distinfo b/audio/amaroc/distinfo
deleted file mode 100644
index fcec5f0ec05..00000000000
--- a/audio/amaroc/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/08/24 17:39:13 wiz Exp $
-
-SHA1 (amaroc-0.3.tar.bz2) = 54e9504871cc4db4596a5c867e64e5c41154656a
-RMD160 (amaroc-0.3.tar.bz2) = 6b8b49296d1c20b78c70caf765672fb36ccf6a4c
-Size (amaroc-0.3.tar.bz2) = 9295 bytes
diff --git a/audio/amarok/DESCR b/audio/amarok/DESCR
deleted file mode 100644
index 39ebf407d2f..00000000000
--- a/audio/amarok/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-AmaroK is a media player for KDE. There are many media players
-around these days, true. What's missing from most players is a user
-interface, that doesn't get in the way of the user. How many buttons
-do you have to press for simply adding some new tracks to the
-playlist? amaroK tries to be a little different, providing a simple
-drag and drop interface, that really makes playlist handling easy.
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
deleted file mode 100644
index ce5dd9c8a56..00000000000
--- a/audio/amarok/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-# $NetBSD: Makefile,v 1.57 2007/02/18 12:09:31 wiz Exp $
-
-DISTNAME= amarok-1.4.5
-PKGREVISION= 3
-CATEGORIES= audio kde
-MASTER_SITES= ${MASTER_SITE_KDE:=amarok/1.4.5/src/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= wiz@NetBSD.org
-HOMEPAGE= http://amarok.kde.org/
-COMMENT= KDE audio player
-
-DEPENDS+= unzip-[0-9]*:../../archivers/unzip
-
-USE_DIRS+= xdg-1.1
-USE_TOOLS+= gmake pkg-config msgfmt
-USE_LANGUAGES= c c++
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-
-CONFIGURE_ARGS+= --without-nmm
-CONFIGURE_ARGS+= --without-mas
-CONFIGURE_ARGS+= --without-helix
-CONFIGURE_ARGS+= --with-mp4v2
-CONFIGURE_ARGS+= --with-mp4v2-dir=${LOCALBASE}
-
-LIBS+= ${LIBOSSAUDIO}
-
-PYTHON_PATCH_SCRIPTS= \
- amarok/src/scripts/common/Publisher.py \
- amarok/src/scripts/common/Zeroconf.py \
- amarok/src/scripts/playlist2html/Playlist.py \
- amarok/src/scripts/webcontrol/Playlist.py \
- amarok/src/scripts/playlist2html/PlaylistServer.py \
- amarok/src/scripts/playlist2html/playlist2html.py \
- amarok/src/scripts/templates/python_qt_template.py \
- amarok/src/scripts/webcontrol/Globals.py \
- amarok/src/scripts/playlist2html/Playlist.py \
- amarok/src/scripts/webcontrol/Playlist.py \
- amarok/src/scripts/webcontrol/RequestHandler.py \
- amarok/src/scripts/webcontrol/WebControl.py \
- amarok/src/scripts/webcontrol/WebPublisher.py
-REPLACE_RUBY= \
- amarok/src/amarok_proxy.rb \
- amarok/src/mediadevice/daap/amarok_daapserver.rb \
- amarok/src/scripts/lyrics_astraweb/lyrics_astraweb.rb \
- amarok/src/scripts/lyrics_lyrc/lyrics_lyrc.rb \
- amarok/src/scripts/ruby_debug/debug.rb \
- amarok/src/scripts/score_default/score_default.rb \
- amarok/src/scripts/score_impulsive/score_impulsive.rb \
- amarok/src/scripts/templates/amarok.rb \
- amarok/src/scripts/templates/ruby_qt_template.rb
-
-BUILDLINK_API_DEPENDS.kdebase+= kdebase>=3.3.0
-BUILDLINK_API_DEPENDS.kdelibs+= kdelibs>=3.3.0
-BUILDLINK_API_DEPENDS.taglib+= taglib>=1.4
-
-.include "options.mk"
-
-.include "../../audio/libtunepimp/buildlink3.mk"
-.include "../../audio/libvisual/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../audio/taglib/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../lang/python/application.mk"
-.include "../../lang/ruby/buildlink3.mk"
-.include "../../lang/ruby/replace.mk"
-.include "../../meta-pkgs/kde3/kde3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../multimedia/kdemultimedia3/buildlink3.mk"
-.include "../../multimedia/libmp4v2/buildlink3.mk"
-.include "../../multimedia/xine-lib/buildlink3.mk"
-.include "../../x11/kdebase3/buildlink3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/amarok/PLIST b/audio/amarok/PLIST
deleted file mode 100644
index 2c08a148624..00000000000
--- a/audio/amarok/PLIST
+++ /dev/null
@@ -1,1102 +0,0 @@
-@comment $NetBSD: PLIST,v 1.24 2007/02/08 18:04:29 drochner Exp $
-bin/amarok
-bin/amarok_daapserver.rb
-bin/amarok_libvisual
-bin/amarok_proxy.rb
-bin/amarokapp
-bin/amarokcollectionscanner
-lib/kde3/konqsidebar_universalamarok.la
-lib/kde3/libamarok_daap-mediadevice.la
-lib/kde3/libamarok_generic-mediadevice.la
-${IPOD}lib/kde3/libamarok_ipod-mediadevice.la
-lib/kde3/libamarok_massstorage-device.la
-lib/kde3/libamarok_nfs-device.la
-lib/kde3/libamarok_smb-device.la
-lib/kde3/libamarok_void-engine_plugin.la
-lib/kde3/libamarok_xine-engine.la
-lib/libamarok.la
-lib/ruby_lib/http11.rb
-lib/ruby_lib/libhttp11.la
-share/applications/kde/amarok.desktop
-share/doc/kde/HTML/da/amarok/advanced.docbook
-share/doc/kde/HTML/da/amarok/common
-share/doc/kde/HTML/da/amarok/config.docbook
-share/doc/kde/HTML/da/amarok/faq.docbook
-share/doc/kde/HTML/da/amarok/index.cache.bz2
-share/doc/kde/HTML/da/amarok/index.docbook
-share/doc/kde/HTML/da/amarok/quick.docbook
-share/doc/kde/HTML/da/amarok/requirements.docbook
-share/doc/kde/HTML/da/amarok/using.docbook
-share/doc/kde/HTML/de/amarok/add_dynamic.png
-share/doc/kde/HTML/de/amarok/advanced.docbook
-share/doc/kde/HTML/de/amarok/amarok_playlist.png
-share/doc/kde/HTML/de/amarok/analyzer.png
-share/doc/kde/HTML/de/amarok/buttons.png
-share/doc/kde/HTML/de/amarok/collection.png
-share/doc/kde/HTML/de/amarok/common
-share/doc/kde/HTML/de/amarok/config.docbook
-share/doc/kde/HTML/de/amarok/config_appearance.png
-share/doc/kde/HTML/de/amarok/config_collection.png
-share/doc/kde/HTML/de/amarok/config_engine.png
-share/doc/kde/HTML/de/amarok/config_general.png
-share/doc/kde/HTML/de/amarok/config_osd.png
-share/doc/kde/HTML/de/amarok/config_playback.png
-share/doc/kde/HTML/de/amarok/config_scrobbler.png
-share/doc/kde/HTML/de/amarok/context.png
-share/doc/kde/HTML/de/amarok/coverman.png
-share/doc/kde/HTML/de/amarok/develop.docbook
-share/doc/kde/HTML/de/amarok/dynamic_bar.png
-share/doc/kde/HTML/de/amarok/dynamic_settings.png
-share/doc/kde/HTML/de/amarok/equalizer.png
-share/doc/kde/HTML/de/amarok/faq.docbook
-share/doc/kde/HTML/de/amarok/file_browser.png
-share/doc/kde/HTML/de/amarok/hidden.docbook
-share/doc/kde/HTML/de/amarok/index.cache.bz2
-share/doc/kde/HTML/de/amarok/index.docbook
-share/doc/kde/HTML/de/amarok/logo.png
-share/doc/kde/HTML/de/amarok/media_device.png
-share/doc/kde/HTML/de/amarok/menubar.png
-share/doc/kde/HTML/de/amarok/musicbrainz.png
-share/doc/kde/HTML/de/amarok/pl_browser.png
-share/doc/kde/HTML/de/amarok/pl_tip1.png
-share/doc/kde/HTML/de/amarok/play_list.png
-share/doc/kde/HTML/de/amarok/player_window.png
-share/doc/kde/HTML/de/amarok/playlist_browser.png
-share/doc/kde/HTML/de/amarok/playlist_window.png
-share/doc/kde/HTML/de/amarok/queue_manager.png
-share/doc/kde/HTML/de/amarok/quick.docbook
-share/doc/kde/HTML/de/amarok/requirements.docbook
-share/doc/kde/HTML/de/amarok/rmb_menu.png
-share/doc/kde/HTML/de/amarok/script_manager.png
-share/doc/kde/HTML/de/amarok/status_bar.png
-share/doc/kde/HTML/de/amarok/using.docbook
-share/doc/kde/HTML/de/amarok/vis_window.png
-share/doc/kde/HTML/en/amarok/add_dynamic.png
-share/doc/kde/HTML/en/amarok/advanced.docbook
-share/doc/kde/HTML/en/amarok/amarok_playlist.png
-share/doc/kde/HTML/en/amarok/analyzer.png
-share/doc/kde/HTML/en/amarok/buttons.png
-share/doc/kde/HTML/en/amarok/collection.png
-share/doc/kde/HTML/en/amarok/common
-share/doc/kde/HTML/en/amarok/config.docbook
-share/doc/kde/HTML/en/amarok/config_appearance.png
-share/doc/kde/HTML/en/amarok/config_collection.png
-share/doc/kde/HTML/en/amarok/config_engine.png
-share/doc/kde/HTML/en/amarok/config_general.png
-share/doc/kde/HTML/en/amarok/config_osd.png
-share/doc/kde/HTML/en/amarok/config_playback.png
-share/doc/kde/HTML/en/amarok/config_scrobbler.png
-share/doc/kde/HTML/en/amarok/coverman.png
-share/doc/kde/HTML/en/amarok/dynamic_bar.png
-share/doc/kde/HTML/en/amarok/dynamic_settings.png
-share/doc/kde/HTML/en/amarok/equalizer.png
-share/doc/kde/HTML/en/amarok/faq.docbook
-share/doc/kde/HTML/en/amarok/file_browser.png
-share/doc/kde/HTML/en/amarok/index.cache.bz2
-share/doc/kde/HTML/en/amarok/index.docbook
-share/doc/kde/HTML/en/amarok/logo.png
-share/doc/kde/HTML/en/amarok/media_device.png
-share/doc/kde/HTML/en/amarok/menubar.png
-share/doc/kde/HTML/en/amarok/musicbrainz.png
-share/doc/kde/HTML/en/amarok/pl_tip1.png
-share/doc/kde/HTML/en/amarok/play_list.png
-share/doc/kde/HTML/en/amarok/player_window.png
-share/doc/kde/HTML/en/amarok/playlist_browser.png
-share/doc/kde/HTML/en/amarok/playlist_window.png
-share/doc/kde/HTML/en/amarok/queue_manager.png
-share/doc/kde/HTML/en/amarok/quick.docbook
-share/doc/kde/HTML/en/amarok/requirements.docbook
-share/doc/kde/HTML/en/amarok/rmb_menu.png
-share/doc/kde/HTML/en/amarok/script_manager.png
-share/doc/kde/HTML/en/amarok/status_bar.png
-share/doc/kde/HTML/en/amarok/tab_lyrics.png
-share/doc/kde/HTML/en/amarok/tab_music.png
-share/doc/kde/HTML/en/amarok/tab_wiki.png
-share/doc/kde/HTML/en/amarok/using.docbook
-share/doc/kde/HTML/en/amarok/vis_window.png
-share/doc/kde/HTML/es/amarok/add_dynamic.png
-share/doc/kde/HTML/es/amarok/advanced.docbook
-share/doc/kde/HTML/es/amarok/amarok_playlist.png
-share/doc/kde/HTML/es/amarok/analyzer.png
-share/doc/kde/HTML/es/amarok/browser_choice.png
-share/doc/kde/HTML/es/amarok/buttons.png
-share/doc/kde/HTML/es/amarok/collection.png
-share/doc/kde/HTML/es/amarok/config.docbook
-share/doc/kde/HTML/es/amarok/config_appearance.png
-share/doc/kde/HTML/es/amarok/config_collection.png
-share/doc/kde/HTML/es/amarok/config_engine.png
-share/doc/kde/HTML/es/amarok/config_general.png
-share/doc/kde/HTML/es/amarok/config_osd.png
-share/doc/kde/HTML/es/amarok/config_playback.png
-share/doc/kde/HTML/es/amarok/config_scrobbler.png
-share/doc/kde/HTML/es/amarok/context.png
-share/doc/kde/HTML/es/amarok/coverman.png
-share/doc/kde/HTML/es/amarok/dynamic_bar.png
-share/doc/kde/HTML/es/amarok/dynamic_mode1.png
-share/doc/kde/HTML/es/amarok/dynamic_mode2.png
-share/doc/kde/HTML/es/amarok/dynamic_settings.png
-share/doc/kde/HTML/es/amarok/equalizer.png
-share/doc/kde/HTML/es/amarok/faq.docbook
-share/doc/kde/HTML/es/amarok/file_browser.png
-share/doc/kde/HTML/es/amarok/logo.png
-share/doc/kde/HTML/es/amarok/media_device.png
-share/doc/kde/HTML/es/amarok/menubar.png
-share/doc/kde/HTML/es/amarok/musicbrainz.png
-share/doc/kde/HTML/es/amarok/pl_browser.png
-share/doc/kde/HTML/es/amarok/pl_tip1.png
-share/doc/kde/HTML/es/amarok/play_list.png
-share/doc/kde/HTML/es/amarok/player_window.png
-share/doc/kde/HTML/es/amarok/playlist_browser.png
-share/doc/kde/HTML/es/amarok/playlist_window.png
-share/doc/kde/HTML/es/amarok/queue_manager.png
-share/doc/kde/HTML/es/amarok/quick.docbook
-share/doc/kde/HTML/es/amarok/requirements.docbook
-share/doc/kde/HTML/es/amarok/rmb_menu.png
-share/doc/kde/HTML/es/amarok/script_manager.png
-share/doc/kde/HTML/es/amarok/status_bar.png
-share/doc/kde/HTML/es/amarok/tab_lyrics.png
-share/doc/kde/HTML/es/amarok/tab_music.png
-share/doc/kde/HTML/es/amarok/tab_wiki.png
-share/doc/kde/HTML/es/amarok/using.docbook
-share/doc/kde/HTML/es/amarok/vis_window.png
-share/doc/kde/HTML/et/amarok/advanced.docbook
-share/doc/kde/HTML/et/amarok/common
-share/doc/kde/HTML/et/amarok/config.docbook
-share/doc/kde/HTML/et/amarok/develop.docbook
-share/doc/kde/HTML/et/amarok/faq.docbook
-share/doc/kde/HTML/et/amarok/feature_guide.docbook
-share/doc/kde/HTML/et/amarok/hidden.docbook
-share/doc/kde/HTML/et/amarok/howto.docbook
-share/doc/kde/HTML/et/amarok/index.cache.bz2
-share/doc/kde/HTML/et/amarok/index.docbook
-share/doc/kde/HTML/et/amarok/plugin.docbook
-share/doc/kde/HTML/et/amarok/quick.docbook
-share/doc/kde/HTML/et/amarok/requirements.docbook
-share/doc/kde/HTML/et/amarok/using.docbook
-share/doc/kde/HTML/fr/amarok/advanced.docbook
-share/doc/kde/HTML/fr/amarok/common
-share/doc/kde/HTML/fr/amarok/config.docbook
-share/doc/kde/HTML/fr/amarok/faq.docbook
-share/doc/kde/HTML/fr/amarok/feature_guide.docbook
-share/doc/kde/HTML/fr/amarok/index.cache.bz2
-share/doc/kde/HTML/fr/amarok/index.docbook
-share/doc/kde/HTML/fr/amarok/quick.docbook
-share/doc/kde/HTML/fr/amarok/requirements.docbook
-share/doc/kde/HTML/fr/amarok/using.docbook
-share/doc/kde/HTML/it/amarok/add_dynamic.png
-share/doc/kde/HTML/it/amarok/advanced.docbook
-share/doc/kde/HTML/it/amarok/amarok_playlist.png
-share/doc/kde/HTML/it/amarok/analyzer.png
-share/doc/kde/HTML/it/amarok/buttons.png
-share/doc/kde/HTML/it/amarok/collection.png
-share/doc/kde/HTML/it/amarok/common
-share/doc/kde/HTML/it/amarok/completo.png
-share/doc/kde/HTML/it/amarok/config.docbook
-share/doc/kde/HTML/it/amarok/config_appearance.png
-share/doc/kde/HTML/it/amarok/config_collection.png
-share/doc/kde/HTML/it/amarok/config_engine.png
-share/doc/kde/HTML/it/amarok/config_general.png
-share/doc/kde/HTML/it/amarok/config_osd.png
-share/doc/kde/HTML/it/amarok/config_playback.png
-share/doc/kde/HTML/it/amarok/config_scrobbler.png
-share/doc/kde/HTML/it/amarok/context.png
-share/doc/kde/HTML/it/amarok/coverman.png
-share/doc/kde/HTML/it/amarok/develop.docbook
-share/doc/kde/HTML/it/amarok/dynamic_bar.png
-share/doc/kde/HTML/it/amarok/dynamic_settings.png
-share/doc/kde/HTML/it/amarok/equalizer.png
-share/doc/kde/HTML/it/amarok/faq.docbook
-share/doc/kde/HTML/it/amarok/feature_guide.docbook
-share/doc/kde/HTML/it/amarok/file_browser.png
-share/doc/kde/HTML/it/amarok/hidden.docbook
-share/doc/kde/HTML/it/amarok/index.cache.bz2
-share/doc/kde/HTML/it/amarok/index.docbook
-share/doc/kde/HTML/it/amarok/media_device.png
-share/doc/kde/HTML/it/amarok/menubar.png
-share/doc/kde/HTML/it/amarok/pl_browser.png
-share/doc/kde/HTML/it/amarok/pl_tip1.png
-share/doc/kde/HTML/it/amarok/play_list.png
-share/doc/kde/HTML/it/amarok/player_window.png
-share/doc/kde/HTML/it/amarok/playlist_browser.png
-share/doc/kde/HTML/it/amarok/playlist_window.png
-share/doc/kde/HTML/it/amarok/plugin.docbook
-share/doc/kde/HTML/it/amarok/queue_manager.png
-share/doc/kde/HTML/it/amarok/quick.docbook
-share/doc/kde/HTML/it/amarok/requirements.docbook
-share/doc/kde/HTML/it/amarok/rmb_menu.png
-share/doc/kde/HTML/it/amarok/script_manager.png
-share/doc/kde/HTML/it/amarok/status_bar.png
-share/doc/kde/HTML/it/amarok/tab_lyrics.png
-share/doc/kde/HTML/it/amarok/tab_music.png
-share/doc/kde/HTML/it/amarok/tab_wiki.png
-share/doc/kde/HTML/it/amarok/using.docbook
-share/doc/kde/HTML/it/amarok/vis_window.png
-share/doc/kde/HTML/nl/amarok/add_dynamic.png
-share/doc/kde/HTML/nl/amarok/advanced.docbook
-share/doc/kde/HTML/nl/amarok/amarok_playlist.png
-share/doc/kde/HTML/nl/amarok/analyzer.png
-share/doc/kde/HTML/nl/amarok/buttons.png
-share/doc/kde/HTML/nl/amarok/collection.png
-share/doc/kde/HTML/nl/amarok/common
-share/doc/kde/HTML/nl/amarok/config.docbook
-share/doc/kde/HTML/nl/amarok/config_appearance.png
-share/doc/kde/HTML/nl/amarok/config_collection.png
-share/doc/kde/HTML/nl/amarok/config_engine.png
-share/doc/kde/HTML/nl/amarok/config_general.png
-share/doc/kde/HTML/nl/amarok/config_osd.png
-share/doc/kde/HTML/nl/amarok/config_playback.png
-share/doc/kde/HTML/nl/amarok/config_scrobbler.png
-share/doc/kde/HTML/nl/amarok/context.png
-share/doc/kde/HTML/nl/amarok/coverman.png
-share/doc/kde/HTML/nl/amarok/develop.docbook
-share/doc/kde/HTML/nl/amarok/dynamic_bar.png
-share/doc/kde/HTML/nl/amarok/equalizer.png
-share/doc/kde/HTML/nl/amarok/faq.docbook
-share/doc/kde/HTML/nl/amarok/feature_guide.docbook
-share/doc/kde/HTML/nl/amarok/file_browser.png
-share/doc/kde/HTML/nl/amarok/hidden.docbook
-share/doc/kde/HTML/nl/amarok/index.cache.bz2
-share/doc/kde/HTML/nl/amarok/index.docbook
-share/doc/kde/HTML/nl/amarok/media_device.png
-share/doc/kde/HTML/nl/amarok/menubar.png
-share/doc/kde/HTML/nl/amarok/pl_browser.png
-share/doc/kde/HTML/nl/amarok/pl_tip1.png
-share/doc/kde/HTML/nl/amarok/play_list.png
-share/doc/kde/HTML/nl/amarok/player_window.png
-share/doc/kde/HTML/nl/amarok/playlist_browser.png
-share/doc/kde/HTML/nl/amarok/playlist_window.png
-share/doc/kde/HTML/nl/amarok/plugin.docbook
-share/doc/kde/HTML/nl/amarok/queue_manager.png
-share/doc/kde/HTML/nl/amarok/quick.docbook
-share/doc/kde/HTML/nl/amarok/requirements.docbook
-share/doc/kde/HTML/nl/amarok/rmb_menu.png
-share/doc/kde/HTML/nl/amarok/script_manager.png
-share/doc/kde/HTML/nl/amarok/status_bar.png
-share/doc/kde/HTML/nl/amarok/tab_lyrics.png
-share/doc/kde/HTML/nl/amarok/tab_lyrics1.png
-share/doc/kde/HTML/nl/amarok/tab_music.png
-share/doc/kde/HTML/nl/amarok/tab_wiki.png
-share/doc/kde/HTML/nl/amarok/using.docbook
-share/doc/kde/HTML/nl/amarok/vis_window.png
-share/doc/kde/HTML/pl/amarok/advanced.docbook
-share/doc/kde/HTML/pl/amarok/common
-share/doc/kde/HTML/pl/amarok/config.docbook
-share/doc/kde/HTML/pl/amarok/faq.docbook
-share/doc/kde/HTML/pl/amarok/index.cache.bz2
-share/doc/kde/HTML/pl/amarok/index.docbook
-share/doc/kde/HTML/pl/amarok/quick.docbook
-share/doc/kde/HTML/pl/amarok/requirements.docbook
-share/doc/kde/HTML/pl/amarok/using.docbook
-share/doc/kde/HTML/pt/amarok/add_dynamic.png
-share/doc/kde/HTML/pt/amarok/advanced.docbook
-share/doc/kde/HTML/pt/amarok/amarok_playlist.png
-share/doc/kde/HTML/pt/amarok/analyzer.png
-share/doc/kde/HTML/pt/amarok/buttons.png
-share/doc/kde/HTML/pt/amarok/collection.png
-share/doc/kde/HTML/pt/amarok/common
-share/doc/kde/HTML/pt/amarok/config.docbook
-share/doc/kde/HTML/pt/amarok/config_appearance.png
-share/doc/kde/HTML/pt/amarok/config_collection.png
-share/doc/kde/HTML/pt/amarok/config_engine.png
-share/doc/kde/HTML/pt/amarok/config_general.png
-share/doc/kde/HTML/pt/amarok/config_osd.png
-share/doc/kde/HTML/pt/amarok/config_playback.png
-share/doc/kde/HTML/pt/amarok/config_scrobbler.png
-share/doc/kde/HTML/pt/amarok/coverman.png
-share/doc/kde/HTML/pt/amarok/develop.docbook
-share/doc/kde/HTML/pt/amarok/dynamic_bar.png
-share/doc/kde/HTML/pt/amarok/dynamic_settings.png
-share/doc/kde/HTML/pt/amarok/equalizer.png
-share/doc/kde/HTML/pt/amarok/faq.docbook
-share/doc/kde/HTML/pt/amarok/feature_guide.docbook
-share/doc/kde/HTML/pt/amarok/file_browser.png
-share/doc/kde/HTML/pt/amarok/hidden.docbook
-share/doc/kde/HTML/pt/amarok/index.cache.bz2
-share/doc/kde/HTML/pt/amarok/index.docbook
-share/doc/kde/HTML/pt/amarok/logo.png
-share/doc/kde/HTML/pt/amarok/media_device.png
-share/doc/kde/HTML/pt/amarok/menubar.png
-share/doc/kde/HTML/pt/amarok/musicbrainz.png
-share/doc/kde/HTML/pt/amarok/pl_tip1.png
-share/doc/kde/HTML/pt/amarok/play_list.png
-share/doc/kde/HTML/pt/amarok/player_window.png
-share/doc/kde/HTML/pt/amarok/playlist_browser.png
-share/doc/kde/HTML/pt/amarok/playlist_window.png
-share/doc/kde/HTML/pt/amarok/plugin.docbook
-share/doc/kde/HTML/pt/amarok/queue_manager.png
-share/doc/kde/HTML/pt/amarok/quick.docbook
-share/doc/kde/HTML/pt/amarok/requirements.docbook
-share/doc/kde/HTML/pt/amarok/rmb_menu.png
-share/doc/kde/HTML/pt/amarok/script_manager.png
-share/doc/kde/HTML/pt/amarok/status_bar.png
-share/doc/kde/HTML/pt/amarok/using.docbook
-share/doc/kde/HTML/pt/amarok/vis_window.png
-share/doc/kde/HTML/pt_BR/amarok/advanced.docbook
-share/doc/kde/HTML/pt_BR/amarok/common
-share/doc/kde/HTML/pt_BR/amarok/config.docbook
-share/doc/kde/HTML/pt_BR/amarok/faq.docbook
-share/doc/kde/HTML/pt_BR/amarok/feature_guide.docbook
-share/doc/kde/HTML/pt_BR/amarok/index.cache.bz2
-share/doc/kde/HTML/pt_BR/amarok/index.docbook
-share/doc/kde/HTML/pt_BR/amarok/quick.docbook
-share/doc/kde/HTML/pt_BR/amarok/requirements.docbook
-share/doc/kde/HTML/pt_BR/amarok/using.docbook
-share/doc/kde/HTML/ru/amarok/advanced.docbook
-share/doc/kde/HTML/ru/amarok/collection.png
-share/doc/kde/HTML/ru/amarok/common
-share/doc/kde/HTML/ru/amarok/config.docbook
-share/doc/kde/HTML/ru/amarok/config_appearance.png
-share/doc/kde/HTML/ru/amarok/config_collection.png
-share/doc/kde/HTML/ru/amarok/config_engine.png
-share/doc/kde/HTML/ru/amarok/config_general.png
-share/doc/kde/HTML/ru/amarok/config_osd.png
-share/doc/kde/HTML/ru/amarok/config_playback.png
-share/doc/kde/HTML/ru/amarok/config_scrobbler.png
-share/doc/kde/HTML/ru/amarok/context.png
-share/doc/kde/HTML/ru/amarok/coverman.png
-share/doc/kde/HTML/ru/amarok/dynamic_mode1.png
-share/doc/kde/HTML/ru/amarok/equalizer.png
-share/doc/kde/HTML/ru/amarok/faq.docbook
-share/doc/kde/HTML/ru/amarok/feature_guide.docbook
-share/doc/kde/HTML/ru/amarok/file_browser.png
-share/doc/kde/HTML/ru/amarok/index.cache.bz2
-share/doc/kde/HTML/ru/amarok/index.docbook
-share/doc/kde/HTML/ru/amarok/menubar.png
-share/doc/kde/HTML/ru/amarok/pl_browser.png
-share/doc/kde/HTML/ru/amarok/pl_tip1.png
-share/doc/kde/HTML/ru/amarok/play_list.png
-share/doc/kde/HTML/ru/amarok/playlist_window.png
-share/doc/kde/HTML/ru/amarok/queue_manager.png
-share/doc/kde/HTML/ru/amarok/quick.docbook
-share/doc/kde/HTML/ru/amarok/requirements.docbook
-share/doc/kde/HTML/ru/amarok/rmb_menu.png
-share/doc/kde/HTML/ru/amarok/status_bar.png
-share/doc/kde/HTML/ru/amarok/using.docbook
-share/doc/kde/HTML/sv/amarok/add_dynamic.png
-share/doc/kde/HTML/sv/amarok/advanced.docbook
-share/doc/kde/HTML/sv/amarok/amarok_playlist.png
-share/doc/kde/HTML/sv/amarok/analyzer.png
-share/doc/kde/HTML/sv/amarok/browser_choice.png
-share/doc/kde/HTML/sv/amarok/buttons.png
-share/doc/kde/HTML/sv/amarok/collection.png
-share/doc/kde/HTML/sv/amarok/common
-share/doc/kde/HTML/sv/amarok/config.docbook
-share/doc/kde/HTML/sv/amarok/config_appearance.png
-share/doc/kde/HTML/sv/amarok/config_collection.png
-share/doc/kde/HTML/sv/amarok/config_colors.png
-share/doc/kde/HTML/sv/amarok/config_engine.png
-share/doc/kde/HTML/sv/amarok/config_fonts.png
-share/doc/kde/HTML/sv/amarok/config_general.png
-share/doc/kde/HTML/sv/amarok/config_mysql.png
-share/doc/kde/HTML/sv/amarok/config_osd.png
-share/doc/kde/HTML/sv/amarok/config_playback.png
-share/doc/kde/HTML/sv/amarok/config_scrobbler.png
-share/doc/kde/HTML/sv/amarok/context.png
-share/doc/kde/HTML/sv/amarok/coverman.png
-share/doc/kde/HTML/sv/amarok/develop.docbook
-share/doc/kde/HTML/sv/amarok/dynamic_bar.png
-share/doc/kde/HTML/sv/amarok/dynamic_settings.png
-share/doc/kde/HTML/sv/amarok/equalizer.png
-share/doc/kde/HTML/sv/amarok/faq.docbook
-share/doc/kde/HTML/sv/amarok/feature_guide.docbook
-share/doc/kde/HTML/sv/amarok/file_browser.png
-share/doc/kde/HTML/sv/amarok/hidden.docbook
-share/doc/kde/HTML/sv/amarok/index.cache.bz2
-share/doc/kde/HTML/sv/amarok/index.docbook
-share/doc/kde/HTML/sv/amarok/media_device.png
-share/doc/kde/HTML/sv/amarok/menubar.png
-share/doc/kde/HTML/sv/amarok/pl_browser.png
-share/doc/kde/HTML/sv/amarok/pl_tip1.png
-share/doc/kde/HTML/sv/amarok/play_list.png
-share/doc/kde/HTML/sv/amarok/player_window.png
-share/doc/kde/HTML/sv/amarok/playlist_browser.png
-share/doc/kde/HTML/sv/amarok/playlist_window.png
-share/doc/kde/HTML/sv/amarok/plugin.docbook
-share/doc/kde/HTML/sv/amarok/queue_manager.png
-share/doc/kde/HTML/sv/amarok/quick.docbook
-share/doc/kde/HTML/sv/amarok/requirements.docbook
-share/doc/kde/HTML/sv/amarok/rmb_menu.png
-share/doc/kde/HTML/sv/amarok/script_manager.png
-share/doc/kde/HTML/sv/amarok/scripts_window.png
-share/doc/kde/HTML/sv/amarok/search.png
-share/doc/kde/HTML/sv/amarok/status_bar.png
-share/doc/kde/HTML/sv/amarok/streams.png
-share/doc/kde/HTML/sv/amarok/using.docbook
-share/doc/kde/HTML/sv/amarok/vis_window.png
-share/doc/kde/HTML/sv/amarok/welcome.png
-share/icons/hicolor/128x128/apps/amarok.png
-share/icons/hicolor/16x16/apps/amarok.png
-share/icons/hicolor/22x22/apps/amarok.png
-share/icons/hicolor/32x32/apps/amarok.png
-share/icons/hicolor/48x48/apps/amarok.png
-share/icons/hicolor/64x64/apps/amarok.png
-share/kde/apps/amarok/amarokui.rc
-share/kde/apps/amarok/data/Amarok_1.4_Welcome.ogg
-share/kde/apps/amarok/data/Cool-Streams.xml
-share/kde/apps/amarok/data/ball.png
-share/kde/apps/amarok/data/dot.png
-share/kde/apps/amarok/data/equalizer_presets.xml
-share/kde/apps/amarok/data/firstrun.m3u
-share/kde/apps/amarok/data/grid.png
-share/kde/apps/amarok/data/magnatune_logo.png
-share/kde/apps/amarok/data/wirl1.png
-share/kde/apps/amarok/data/wirl2.png
-share/kde/apps/amarok/icons/crystalsvg/16x16/actions/covermanager.png
-share/kde/apps/amarok/icons/crystalsvg/16x16/actions/dynamic.png
-share/kde/apps/amarok/icons/crystalsvg/16x16/actions/equalizer.png
-share/kde/apps/amarok/icons/crystalsvg/16x16/actions/mini_dock.png
-share/kde/apps/amarok/icons/crystalsvg/16x16/actions/player_playlist_2.png
-share/kde/apps/amarok/icons/crystalsvg/16x16/actions/podcast.png
-share/kde/apps/amarok/icons/crystalsvg/16x16/actions/podcast_new.png
-share/kde/apps/amarok/icons/crystalsvg/16x16/actions/random.png
-share/kde/apps/amarok/icons/crystalsvg/16x16/actions/repeat_playlist.png
-share/kde/apps/amarok/icons/crystalsvg/16x16/actions/repeat_track.png
-share/kde/apps/amarok/icons/crystalsvg/16x16/actions/visualizations.png
-share/kde/apps/amarok/icons/crystalsvg/16x16/actions/wiki.png
-share/kde/apps/amarok/icons/crystalsvg/22x22/actions/amarok_podcast.png
-share/kde/apps/amarok/icons/crystalsvg/22x22/actions/amarok_podcast_new.png
-share/kde/apps/amarok/icons/crystalsvg/22x22/actions/babelfish.png
-share/kde/apps/amarok/icons/crystalsvg/22x22/actions/dynamic.png
-share/kde/apps/amarok/icons/crystalsvg/22x22/actions/player_playlist_2.png
-share/kde/apps/amarok/icons/crystalsvg/22x22/actions/random.png
-share/kde/apps/amarok/icons/crystalsvg/22x22/actions/repeat_playlist.png
-share/kde/apps/amarok/icons/crystalsvg/64x64/actions/dynamic.png
-share/kde/apps/amarok/icons/crystalsvg/64x64/actions/podcast.png
-share/kde/apps/amarok/icons/crystalsvg/64x64/actions/podcast_new.png
-share/kde/apps/amarok/icons/crystalsvg/64x64/actions/random.png
-share/kde/apps/amarok/icons/crystalsvg/64x64/actions/repeat_playlist.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_add_lyrics.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_add_playlist.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_album.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_artist.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_audioscrobbler.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_back.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_burn.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_change_language.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_circle.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_clock.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_collection.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_configure.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_covermanager.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_device.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_download.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_dynamic.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_edit.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_editcopy.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_equalizer.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_external.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_fastforward.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_favourite_genres.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_files.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_files2.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_info.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_love.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_lyrics.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_magnatune.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_mostplayed.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_music.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_next.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_pause.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_play.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_playlist.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_playlist_clear.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_playlist_refresh.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_podcast.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_podcast2.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_queue.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_random.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_random_album.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_random_no.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_random_track.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_redo.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_refresh.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_remove.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_remove_from_playlist.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_repeat_album.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_repeat_no.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_repeat_playlist.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_repeat_track.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_rescan.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_rewind.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_save.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_scripts.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_search.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_settings_engine.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_settings_general.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_settings_indicator.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_settings_playback.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_settings_view.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_stop.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_track.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_undo.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_visualizations.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_zoom.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/collection.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_add_lyrics.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_add_playlist.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_album.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_artist.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_audioscrobbler.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_back.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_burn.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_change_language.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_circle.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_clock.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_collection.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_configure.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_covermanager.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_device.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_download.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_dynamic.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_edit.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_editcopy.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_equalizer.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_external.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_fastforward.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_favourite_genres.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_files.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_files2.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_info.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_love.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_lyrics.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_magnatune.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_mostplayed.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_music.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_next.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_pause.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_play.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_playlist.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_playlist_clear.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_playlist_refresh.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_podcast.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_podcast2.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_queue.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_random.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_random_album.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_random_no.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_random_track.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_redo.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_refresh.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_remove.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_remove_from_playlist.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_repeat_album.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_repeat_no.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_repeat_playlist.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_repeat_track.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_rescan.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_rewind.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_save.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_scripts.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_search.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_settings_engine.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_settings_general.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_settings_indicator.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_settings_playback.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_settings_view.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_stop.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_track.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_undo.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_visualizations.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_zoom.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/collection.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_add_lyrics.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_add_playlist.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_album.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_artist.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_audioscrobbler.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_back.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_burn.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_change_language.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_circle.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_clock.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_collection.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_configure.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_covermanager.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_device.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_download.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_dynamic.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_edit.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_editcopy.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_equalizer.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_external.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_fastforward.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_favourite_genres.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_files.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_files2.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_info.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_love.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_lyrics.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_magnatune.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_mostplayed.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_music.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_next.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_pause.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_play.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_playlist.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_playlist_clear.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_playlist_refresh.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_podcast.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_podcast2.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_queue.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_random.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_random_album.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_random_no.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_random_track.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_redo.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_refresh.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_remove.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_remove_from_playlist.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_repeat_album.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_repeat_no.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_repeat_playlist.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_repeat_track.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_rescan.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_rewind.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_save.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_scripts.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_search.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_settings_engine.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_settings_general.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_settings_indicator.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_settings_playback.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_settings_view.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_stop.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_track.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_undo.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_visualizations.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_zoom.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/audioscrobbler.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/collection.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_add_lyrics.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_add_playlist.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_album.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_artist.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_audioscrobbler.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_back.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_burn.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_change_language.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_circle.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_clock.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_collection.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_configure.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_covermanager.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_device.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_download.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_dynamic.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_edit.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_editcopy.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_equalizer.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_external.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_fastforward.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_favourite_genres.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_files.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_files2.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_info.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_love.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_lyrics.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_magnatune.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_mostplayed.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_music.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_next.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_pause.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_play.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_playlist.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_playlist_clear.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_playlist_refresh.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_podcast.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_podcast2.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_queue.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_random.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_random_album.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_random_no.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_random_track.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_redo.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_refresh.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_remove.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_remove_from_playlist.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_repeat_album.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_repeat_no.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_repeat_playlist.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_repeat_track.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_rescan.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_rewind.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_save.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_scripts.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_search.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_settings_engine.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_settings_general.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_settings_indicator.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_settings_playback.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_settings_view.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_stop.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_track.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_undo.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_visualizations.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_zoom.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/collection.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_add_lyrics.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_add_playlist.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_album.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_artist.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_audioscrobbler.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_back.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_burn.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_change_language.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_circle.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_clock.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_collection.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_configure.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_covermanager.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_device.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_download.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_dynamic.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_edit.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_editcopy.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_equalizer.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_external.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_fastforward.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_favourite_genres.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_files.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_files2.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_info.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_love.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_lyrics.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_magnatune.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_mostplayed.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_music.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_next.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_pause.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_play.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_playlist.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_playlist_clear.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_playlist_refresh.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_podcast.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_podcast2.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_queue.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_random.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_random_album.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_random_no.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_random_track.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_redo.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_refresh.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_remove.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_remove_from_playlist.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_repeat_album.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_repeat_no.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_repeat_playlist.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_repeat_track.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_rescan.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_rewind.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_save.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_scripts.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_search.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_settings_engine.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_settings_general.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_settings_indicator.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_settings_playback.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_settings_view.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_stop.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_track.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_undo.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_visualizations.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_zoom.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/collection.png
-share/kde/apps/amarok/images/amarok_cut.png
-share/kde/apps/amarok/images/amarok_rocks.jpg
-share/kde/apps/amarok/images/b_next.png
-share/kde/apps/amarok/images/b_pause.png
-share/kde/apps/amarok/images/b_play.png
-share/kde/apps/amarok/images/b_prev.png
-share/kde/apps/amarok/images/b_stop.png
-share/kde/apps/amarok/images/back_stars_grey.png
-share/kde/apps/amarok/images/currenttrack_bar_left.png
-share/kde/apps/amarok/images/currenttrack_bar_mid.png
-share/kde/apps/amarok/images/currenttrack_bar_right.png
-share/kde/apps/amarok/images/currenttrack_pause.png
-share/kde/apps/amarok/images/currenttrack_play.png
-share/kde/apps/amarok/images/currenttrack_repeat.png
-share/kde/apps/amarok/images/currenttrack_repeat_small.png
-share/kde/apps/amarok/images/currenttrack_stop.png
-share/kde/apps/amarok/images/currenttrack_stop_small.png
-share/kde/apps/amarok/images/eq_active2.png
-share/kde/apps/amarok/images/eq_inactive2.png
-share/kde/apps/amarok/images/lastfm.png
-share/kde/apps/amarok/images/loading1.png
-share/kde/apps/amarok/images/loading2.png
-share/kde/apps/amarok/images/menu_sidepixmap.png
-share/kde/apps/amarok/images/more_albums.png
-share/kde/apps/amarok/images/musicbrainz.png
-share/kde/apps/amarok/images/nocover.png
-share/kde/apps/amarok/images/pl_active2.png
-share/kde/apps/amarok/images/pl_inactive2.png
-share/kde/apps/amarok/images/sbinner_stars.png
-share/kde/apps/amarok/images/shadow_albumcover.png
-share/kde/apps/amarok/images/smallstar.png
-share/kde/apps/amarok/images/splash_screen.jpg
-share/kde/apps/amarok/images/star.png
-share/kde/apps/amarok/images/time_minus.png
-share/kde/apps/amarok/images/time_plus.png
-share/kde/apps/amarok/images/vol_speaker.png
-share/kde/apps/amarok/images/volumeslider-gradient.png
-share/kde/apps/amarok/images/volumeslider-handle.png
-share/kde/apps/amarok/images/volumeslider-handle_glow.png
-share/kde/apps/amarok/images/volumeslider-inset.png
-share/kde/apps/amarok/images/wizard_compact.png
-share/kde/apps/amarok/images/wizard_xmms.png
-share/kde/apps/amarok/images/xine_logo.png
-share/kde/apps/amarok/ruby_lib/codes.rb
-share/kde/apps/amarok/ruby_lib/gem_plugin.rb
-share/kde/apps/amarok/ruby_lib/gemconfigure.rb
-share/kde/apps/amarok/ruby_lib/mongrel.rb
-share/kde/apps/amarok/ruby_lib/mongrel/cgi.rb
-share/kde/apps/amarok/ruby_lib/mongrel/command.rb
-share/kde/apps/amarok/ruby_lib/mongrel/configurator.rb
-share/kde/apps/amarok/ruby_lib/mongrel/debug.rb
-share/kde/apps/amarok/ruby_lib/mongrel/handlers.rb
-share/kde/apps/amarok/ruby_lib/mongrel/init.rb
-share/kde/apps/amarok/ruby_lib/mongrel/mime_types.yml
-share/kde/apps/amarok/ruby_lib/mongrel/stats.rb
-share/kde/apps/amarok/ruby_lib/mongrel/tcphack.rb
-share/kde/apps/amarok/ruby_lib/rbconfig/datadir.rb
-share/kde/apps/amarok/ruby_lib/rubygems.rb
-share/kde/apps/amarok/ruby_lib/rubygems/._gem_commands.rb
-share/kde/apps/amarok/ruby_lib/rubygems/builder.rb
-share/kde/apps/amarok/ruby_lib/rubygems/cmd_manager.rb
-share/kde/apps/amarok/ruby_lib/rubygems/command.rb
-share/kde/apps/amarok/ruby_lib/rubygems/config_file.rb
-share/kde/apps/amarok/ruby_lib/rubygems/custom_require.rb
-share/kde/apps/amarok/ruby_lib/rubygems/dependency_list.rb
-share/kde/apps/amarok/ruby_lib/rubygems/doc_manager.rb
-share/kde/apps/amarok/ruby_lib/rubygems/format.rb
-share/kde/apps/amarok/ruby_lib/rubygems/gem_commands.rb
-share/kde/apps/amarok/ruby_lib/rubygems/gem_openssl.rb
-share/kde/apps/amarok/ruby_lib/rubygems/gem_runner.rb
-share/kde/apps/amarok/ruby_lib/rubygems/incremental_fetcher.rb
-share/kde/apps/amarok/ruby_lib/rubygems/installer.rb
-share/kde/apps/amarok/ruby_lib/rubygems/loadpath_manager.rb
-share/kde/apps/amarok/ruby_lib/rubygems/old_format.rb
-share/kde/apps/amarok/ruby_lib/rubygems/open-uri.rb
-share/kde/apps/amarok/ruby_lib/rubygems/package.rb
-share/kde/apps/amarok/ruby_lib/rubygems/remote_installer.rb
-share/kde/apps/amarok/ruby_lib/rubygems/rubygems_version.rb
-share/kde/apps/amarok/ruby_lib/rubygems/security.rb
-share/kde/apps/amarok/ruby_lib/rubygems/source_index.rb
-share/kde/apps/amarok/ruby_lib/rubygems/specification.rb
-share/kde/apps/amarok/ruby_lib/rubygems/timer.rb
-share/kde/apps/amarok/ruby_lib/rubygems/user_interaction.rb
-share/kde/apps/amarok/ruby_lib/rubygems/validator.rb
-share/kde/apps/amarok/ruby_lib/rubygems/version.rb
-share/kde/apps/amarok/scripts/common/Publisher.py
-share/kde/apps/amarok/scripts/common/Zeroconf.py
-share/kde/apps/amarok/scripts/lyrics_astraweb/COPYING
-share/kde/apps/amarok/scripts/lyrics_astraweb/README
-share/kde/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.rb
-share/kde/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.spec
-share/kde/apps/amarok/scripts/lyrics_lyrc/COPYING
-share/kde/apps/amarok/scripts/lyrics_lyrc/README
-share/kde/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.rb
-share/kde/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.spec
-share/kde/apps/amarok/scripts/playlist2html/Playlist.py
-share/kde/apps/amarok/scripts/playlist2html/PlaylistServer.py
-share/kde/apps/amarok/scripts/playlist2html/README
-share/kde/apps/amarok/scripts/playlist2html/playlist2html.py
-share/kde/apps/amarok/scripts/ruby_debug/debug.rb
-share/kde/apps/amarok/scripts/score_default/COPYING
-share/kde/apps/amarok/scripts/score_default/README
-share/kde/apps/amarok/scripts/score_default/score_default.rb
-share/kde/apps/amarok/scripts/score_default/score_default.spec
-share/kde/apps/amarok/scripts/score_impulsive/COPYING
-share/kde/apps/amarok/scripts/score_impulsive/README
-share/kde/apps/amarok/scripts/score_impulsive/score_impulsive.rb
-share/kde/apps/amarok/scripts/score_impulsive/score_impulsive.spec
-share/kde/apps/amarok/scripts/templates/amarok.rb
-share/kde/apps/amarok/scripts/templates/python_qt_template.py
-share/kde/apps/amarok/scripts/templates/ruby_qt_template.rb
-share/kde/apps/amarok/scripts/webcontrol/Globals.py
-share/kde/apps/amarok/scripts/webcontrol/Playlist.py
-share/kde/apps/amarok/scripts/webcontrol/README
-share/kde/apps/amarok/scripts/webcontrol/RequestHandler.py
-share/kde/apps/amarok/scripts/webcontrol/WebControl.py
-share/kde/apps/amarok/scripts/webcontrol/WebControl.spec
-share/kde/apps/amarok/scripts/webcontrol/WebPublisher.py
-share/kde/apps/amarok/scripts/webcontrol/amarok_cut.png
-share/kde/apps/amarok/scripts/webcontrol/controlbackground.png
-share/kde/apps/amarok/scripts/webcontrol/main.css
-share/kde/apps/amarok/scripts/webcontrol/main.js
-share/kde/apps/amarok/scripts/webcontrol/player_end.png
-share/kde/apps/amarok/scripts/webcontrol/player_pause.png
-share/kde/apps/amarok/scripts/webcontrol/player_play.png
-share/kde/apps/amarok/scripts/webcontrol/player_start.png
-share/kde/apps/amarok/scripts/webcontrol/player_stop.png
-share/kde/apps/amarok/scripts/webcontrol/smallstar.png
-share/kde/apps/amarok/scripts/webcontrol/star.png
-share/kde/apps/amarok/scripts/webcontrol/template.thtml
-share/kde/apps/amarok/scripts/webcontrol/vol_speaker.png
-share/kde/apps/amarok/themes/example/stylesheet.css
-share/kde/apps/amarok/themes/reinhardt/images/background.png
-share/kde/apps/amarok/themes/reinhardt/images/transparency.png
-share/kde/apps/amarok/themes/reinhardt/stylesheet.css
-share/kde/apps/konqsidebartng/add/amarok.desktop
-share/kde/apps/konqsidebartng/entries/amarok.desktop
-share/kde/apps/konqsidebartng/kicker_entries/amarok.desktop
-share/kde/apps/konqueror/servicemenus/amarok_addaspodcast.desktop
-share/kde/apps/konqueror/servicemenus/amarok_append.desktop
-share/kde/apps/konqueror/servicemenus/amarok_play_audiocd.desktop
-share/kde/apps/profiles/amarok.profile.xml
-share/kde/config.kcfg/amarok.kcfg
-share/kde/config.kcfg/xinecfg.kcfg
-share/kde/config/amarokrc
-share/kde/services/amarok_daap-mediadevice.desktop
-share/kde/services/amarok_generic-mediadevice.desktop
-${IPOD}share/kde/services/amarok_ipod-mediadevice.desktop
-share/kde/services/amarok_massstorage-device.desktop
-share/kde/services/amarok_nfs-device.desktop
-share/kde/services/amarok_smb-device.desktop
-share/kde/services/amarok_void-engine_plugin.desktop
-share/kde/services/amarok_xine-engine.desktop
-share/kde/services/amarokitpc.protocol
-share/kde/services/amaroklastfm.protocol
-share/kde/services/amarokpcast.protocol
-share/kde/servicetypes/amarok_codecinstall.desktop
-share/kde/servicetypes/amarok_plugin.desktop
-share/locale/af/LC_MESSAGES/amarok.mo
-share/locale/ar/LC_MESSAGES/amarok.mo
-share/locale/az/LC_MESSAGES/amarok.mo
-share/locale/bg/LC_MESSAGES/amarok.mo
-share/locale/br/LC_MESSAGES/amarok.mo
-share/locale/ca/LC_MESSAGES/amarok.mo
-share/locale/cs/LC_MESSAGES/amarok.mo
-share/locale/cy/LC_MESSAGES/amarok.mo
-share/locale/da/LC_MESSAGES/amarok.mo
-share/locale/de/LC_MESSAGES/amarok.mo
-share/locale/el/LC_MESSAGES/amarok.mo
-share/locale/en_GB/LC_MESSAGES/amarok.mo
-share/locale/es/LC_MESSAGES/amarok.mo
-share/locale/et/LC_MESSAGES/amarok.mo
-share/locale/fa/LC_MESSAGES/amarok.mo
-share/locale/fi/LC_MESSAGES/amarok.mo
-share/locale/fr/LC_MESSAGES/amarok.mo
-share/locale/ga/LC_MESSAGES/amarok.mo
-share/locale/gl/LC_MESSAGES/amarok.mo
-share/locale/he/LC_MESSAGES/amarok.mo
-share/locale/hi/LC_MESSAGES/amarok.mo
-share/locale/hu/LC_MESSAGES/amarok.mo
-share/locale/is/LC_MESSAGES/amarok.mo
-share/locale/it/LC_MESSAGES/amarok.mo
-share/locale/ja/LC_MESSAGES/amarok.mo
-share/locale/ka/LC_MESSAGES/amarok.mo
-share/locale/km/LC_MESSAGES/amarok.mo
-share/locale/ko/LC_MESSAGES/amarok.mo
-share/locale/lt/LC_MESSAGES/amarok.mo
-share/locale/ms/LC_MESSAGES/amarok.mo
-share/locale/nb/LC_MESSAGES/amarok.mo
-share/locale/nl/LC_MESSAGES/amarok.mo
-share/locale/nn/LC_MESSAGES/amarok.mo
-share/locale/pa/LC_MESSAGES/amarok.mo
-share/locale/pl/LC_MESSAGES/amarok.mo
-share/locale/pt/LC_MESSAGES/amarok.mo
-share/locale/pt_BR/LC_MESSAGES/amarok.mo
-share/locale/ro/LC_MESSAGES/amarok.mo
-share/locale/ru/LC_MESSAGES/amarok.mo
-share/locale/rw/LC_MESSAGES/amarok.mo
-share/locale/se/LC_MESSAGES/amarok.mo
-share/locale/sk/LC_MESSAGES/amarok.mo
-share/locale/sl/LC_MESSAGES/amarok.mo
-share/locale/sq/LC_MESSAGES/amarok.mo
-share/locale/sr/LC_MESSAGES/amarok.mo
-share/locale/sr@Latn/LC_MESSAGES/amarok.mo
-share/locale/sv/LC_MESSAGES/amarok.mo
-share/locale/ta/LC_MESSAGES/amarok.mo
-share/locale/tg/LC_MESSAGES/amarok.mo
-share/locale/th/LC_MESSAGES/amarok.mo
-share/locale/tr/LC_MESSAGES/amarok.mo
-share/locale/uk/LC_MESSAGES/amarok.mo
-share/locale/uz/LC_MESSAGES/amarok.mo
-share/locale/zh_CN/LC_MESSAGES/amarok.mo
-share/locale/zh_TW/LC_MESSAGES/amarok.mo
-@comment in kde: @dirrm share/kde/servicetypes
-@comment in kde: @dirrm share/kde/services
-@comment in kde: @dirrm share/kde/config.kcfg
-@comment in kde: @dirrm share/kde/config
-@comment in kde: @dirrm share/kde/apps/zeroconf
-@comment in kde: @dirrm share/kde/apps/profiles
-@comment in kde: @dirrm share/kde/apps/konqueror/servicemenus
-@comment in kdebase: @dirrm share/kde/apps/konqsidebartng/kicker_entries
-@comment in kdebase: @dirrm share/kde/apps/konqsidebartng/entries
-@comment in kdebase: @dirrm share/kde/apps/konqsidebartng/add
-@dirrm share/kde/apps/amarok/themes/reinhardt/images
-@dirrm share/kde/apps/amarok/themes/reinhardt
-@dirrm share/kde/apps/amarok/themes/example
-@dirrm share/kde/apps/amarok/themes
-@dirrm share/kde/apps/amarok/scripts/webcontrol
-@dirrm share/kde/apps/amarok/scripts/templates
-@dirrm share/kde/apps/amarok/scripts/score_impulsive
-@dirrm share/kde/apps/amarok/scripts/score_default
-@dirrm share/kde/apps/amarok/scripts/ruby_debug
-@dirrm share/kde/apps/amarok/scripts/playlist2html
-@dirrm share/kde/apps/amarok/scripts/lyrics_lyrc
-@dirrm share/kde/apps/amarok/scripts/lyrics_astraweb
-@dirrm share/kde/apps/amarok/scripts/common
-@dirrm share/kde/apps/amarok/scripts
-@dirrm share/kde/apps/amarok/ruby_lib/rubygems
-@dirrm share/kde/apps/amarok/ruby_lib/rbconfig
-@dirrm share/kde/apps/amarok/ruby_lib/mongrel
-@dirrm share/kde/apps/amarok/ruby_lib
-@dirrm share/kde/apps/amarok/images
-@dirrm share/kde/apps/amarok/icons/hicolor/64x64/actions
-@dirrm share/kde/apps/amarok/icons/hicolor/64x64
-@dirrm share/kde/apps/amarok/icons/hicolor/48x48/actions
-@dirrm share/kde/apps/amarok/icons/hicolor/48x48
-@dirrm share/kde/apps/amarok/icons/hicolor/32x32/actions
-@dirrm share/kde/apps/amarok/icons/hicolor/32x32
-@dirrm share/kde/apps/amarok/icons/hicolor/22x22/actions
-@dirrm share/kde/apps/amarok/icons/hicolor/22x22
-@dirrm share/kde/apps/amarok/icons/hicolor/16x16/actions
-@dirrm share/kde/apps/amarok/icons/hicolor/16x16
-@dirrm share/kde/apps/amarok/icons/hicolor
-@dirrm share/kde/apps/amarok/icons/crystalsvg/64x64/actions
-@dirrm share/kde/apps/amarok/icons/crystalsvg/64x64
-@dirrm share/kde/apps/amarok/icons/crystalsvg/22x22/actions
-@dirrm share/kde/apps/amarok/icons/crystalsvg/22x22
-@dirrm share/kde/apps/amarok/icons/crystalsvg/16x16/actions
-@dirrm share/kde/apps/amarok/icons/crystalsvg/16x16
-@dirrm share/kde/apps/amarok/icons/crystalsvg
-@dirrm share/kde/apps/amarok/icons
-@dirrm share/kde/apps/amarok/data
-@dirrm share/kde/apps/amarok
-@comment in hicolor-icon-theme: @dirrm share/kde/apps
-@comment in hicolor-icon-theme: @dirrm share/kde/icons/hicolor/64x64/apps
-@comment in hicolor-icon-theme: @dirrm share/kde/icons/hicolor/48x48/apps
-@comment in hicolor-icon-theme: @dirrm share/kde/icons/hicolor/32x32/apps
-@comment in hicolor-icon-theme: @dirrm share/kde/icons/hicolor/22x22/apps
-@comment in hicolor-icon-theme: @dirrm share/kde/icons/hicolor/16x16/apps
-@comment in hicolor-icon-theme: @dirrm share/kde/icons/hicolor/128x128/apps
-@dirrm share/doc/kde/HTML/sv/amarok
-@comment in kde: @dirrm share/doc/kde/HTML/sv
-@dirrm share/doc/kde/HTML/ru/amarok
-@comment in kde: @dirrm share/doc/kde/HTML/ru
-@dirrm share/doc/kde/HTML/pt_BR/amarok
-@comment in kde: @dirrm share/doc/kde/HTML/pt_BR
-@dirrm share/doc/kde/HTML/pt/amarok
-@comment in kde: @dirrm share/doc/kde/HTML/pt
-@dirrm share/doc/kde/HTML/pl/amarok
-@comment in kde: @dirrm share/doc/kde/HTML/pl
-@dirrm share/doc/kde/HTML/nl/amarok
-@comment in kde: @dirrm share/doc/kde/HTML/nl
-@dirrm share/doc/kde/HTML/it/amarok
-@comment in kde: @dirrm share/doc/kde/HTML/it
-@dirrm share/doc/kde/HTML/fr/amarok
-@comment in kde: @dirrm share/doc/kde/HTML/fr
-@dirrm share/doc/kde/HTML/et/amarok
-@comment in kde: @dirrm share/doc/kde/HTML/et
-@dirrm share/doc/kde/HTML/es/amarok
-@comment in kde: @dirrm share/doc/kde/HTML/es
-@dirrm share/doc/kde/HTML/en/amarok
-@comment in kde: @dirrm share/doc/kde/HTML/en
-@dirrm share/doc/kde/HTML/de/amarok
-@comment in kde: @dirrm share/doc/kde/HTML/de
-@dirrm share/doc/kde/HTML/da/amarok
-@comment in kde: @dirrm share/doc/kde/HTML/da
-@comment in kde: @dirrm share/applications/kde
-@dirrm lib/ruby_lib
-@comment in kde: @dirrm lib/kde3
diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
deleted file mode 100644
index 4de9cf34291..00000000000
--- a/audio/amarok/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.28 2007/02/18 00:55:06 wiz Exp $
-
-SHA1 (amarok-1.4.5.tar.bz2) = 882dec8d30c10f609a1f5e21d2e91342e78304c5
-RMD160 (amarok-1.4.5.tar.bz2) = c2bbfe06f3e613dfc7d3926d086024073390c712
-Size (amarok-1.4.5.tar.bz2) = 18034110 bytes
-SHA1 (patch-aa) = 0b63ca0e118581b820db1c6e5aaeecabe554495b
-SHA1 (patch-ab) = a36c9ca68810c71a95857249b63ff19d4b3f3fbb
diff --git a/audio/amarok/options.mk b/audio/amarok/options.mk
deleted file mode 100644
index cd0cff72899..00000000000
--- a/audio/amarok/options.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: options.mk,v 1.3 2007/02/08 18:04:29 drochner Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.amarok
-PKG_SUPPORTED_OPTIONS= libgpod mysql pgsql
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mlibgpod)
-CONFIGURE_ARGS+= --enable-libgpod
-BUILDLINK_API_DEPENDS.libgpod+= libgpod>=0.4.2
-.include "../../audio/libgpod/buildlink3.mk"
-PLIST_SUBST+= IPOD=""
-.else
-PLIST_SUBST+= IPOD="@comment "
-.endif
-
-.if !empty(PKG_OPTIONS:Mmysql)
-CONFIGURE_ARGS+= --enable-mysql
-.include "../../mk/mysql.buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mpgsql)
-CONFIGURE_ARGS+= --enable-postgresql
-.include "../../mk/pgsql.buildlink3.mk"
-.endif
diff --git a/audio/amarok/patches/patch-aa b/audio/amarok/patches/patch-aa
deleted file mode 100644
index b8133a42c29..00000000000
--- a/audio/amarok/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2007/02/18 00:55:06 wiz Exp $
-
-Fix for CVE-2006-6979 based on http://bugs.kde.org/show_bug.cgi?id=138499
-(without the whitespace changes).
-
---- amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp.orig 2007-02-01 18:14:17.000000000 +0000
-+++ amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp
-@@ -89,7 +89,7 @@ void MagnatuneAlbumDownloader::albumDown
-
- //ok, now we have the .zip file downloaded. All we need is to unpack it to the desired location and add it to the collection.
-
-- QString unzipString = "unzip \""+m_tempDir.name() + m_currentAlbumFileName + "\" -d \"" + m_currentAlbumUnpackLocation + "\" &";
-+ QString unzipString = "unzip " + KProcess::quote( m_tempDir.name() + m_currentAlbumFileName ) + " -d " + KProcess::quote( m_currentAlbumUnpackLocation ) + " &";
-
- debug() << "unpacking: " << unzipString << endl;
-
diff --git a/audio/amarok/patches/patch-ab b/audio/amarok/patches/patch-ab
deleted file mode 100644
index 87139c1fd4d..00000000000
--- a/audio/amarok/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/07/24 13:58:11 joerg Exp $
-
---- configure.orig 2006-07-02 20:29:34.000000000 +0000
-+++ configure
-@@ -36047,7 +36047,7 @@ if test "${ac_cv_lib_tunepimp_tp_SetFile
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ltunepimp $LIBS"
-+LIBS="-ltunepimp $PTHREAD_LDFLAGS $PTHREAD_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -36519,7 +36519,7 @@ if test "${ac_cv_lib_konqsidebarplugin__
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lkonqsidebarplugin $LIBS"
-+LIBS="-lkonqsidebarplugin ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS} $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
diff --git a/audio/amp/DESCR b/audio/amp/DESCR
deleted file mode 100644
index 41e713c44b2..00000000000
--- a/audio/amp/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
------------------------- From the README file ------------------------
-amp (Audio Mpeg Player) is an MPEG audio decoder which I originally started
-putting together as a side project of the MPEG hardware design project at
-FER/Zagreb - just to confirm my knowledge of the standard. It works with
-both MPEG1 and MPEG2 audio streams (except for the multichannel extensions
-defined in MPEG2), layer3 only for now.
----------------------------- End of quote ----------------------------
diff --git a/audio/amp/Makefile b/audio/amp/Makefile
deleted file mode 100644
index a5773933ae7..00000000000
--- a/audio/amp/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:46 rillig Exp $
-#
-
-DISTNAME= amp-0.7.6
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-# was ftp://ftp.rasip.fer.hr/pub/mpeg/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= Another mp3 player
-
-NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
-
-NOT_FOR_PLATFORM= Interix-*-*
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-GNU_CONFIGURE= yes
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/amp ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/amp.1 ${PREFIX}/${PKGMANDIR}/man1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/amp/PLIST b/audio/amp/PLIST
deleted file mode 100644
index 9243443a904..00000000000
--- a/audio/amp/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2007/01/21 04:02:01 rillig Exp $
-bin/amp
-man/man1/amp.1
diff --git a/audio/amp/distinfo b/audio/amp/distinfo
deleted file mode 100644
index 569523b6711..00000000000
--- a/audio/amp/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.8 2007/02/01 23:22:44 wiz Exp $
-
-SHA1 (amp-0.7.6.tgz) = 6c49d027754615677ad398c1eea858536ec804c2
-RMD160 (amp-0.7.6.tgz) = 34053f8a050ff3aafb2e723c283ac2aa0f4e2a67
-Size (amp-0.7.6.tgz) = 100337 bytes
-SHA1 (patch-aa) = 56696e88276b770d24b20076e780bc28798d5f8c
-SHA1 (patch-ab) = ebc50cdbad38f3099c633659ecb47d5b99924bc7
-SHA1 (patch-ac) = 67b9b1e200e901ef7ee98f0e384b062c7a99886b
-SHA1 (patch-ad) = 2ef2d0b7c5357309c462261e2c669cc39a774add
-SHA1 (patch-ae) = c084fa45bc144c29ed7548ffc609fb964d375ac8
-SHA1 (patch-af) = bba8fafa25e516df77905865a677667a9d48a152
-SHA1 (patch-ag) = 30198a34d1998630c9bea4d7d1242d3e46d099db
-SHA1 (patch-ah) = c0e41494ad4c71be2f8dd63e9fef4d9b1038310f
-SHA1 (patch-ai) = 4146720b6cbff1699b8023dd6955f3e8244ffab4
diff --git a/audio/amp/patches/patch-aa b/audio/amp/patches/patch-aa
deleted file mode 100644
index 6597b4acd57..00000000000
--- a/audio/amp/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/05/31 21:44:42 rillig Exp $
-
---- audioIO.c.orig Sat May 31 19:47:58 1997
-+++ audioIO.c Tue May 31 23:42:01 2005
-@@ -18,7 +18,7 @@
- #include "audioIO_HPUX.c"
- #endif
-
--#ifdef OS_SunOS
-+#if defined(OS_SunOS) || defined(OS_NetBSD)
- #include "audioIO_SunOS.c"
- #endif
-
diff --git a/audio/amp/patches/patch-ab b/audio/amp/patches/patch-ab
deleted file mode 100644
index 37c29a1152f..00000000000
--- a/audio/amp/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2005/11/18 14:52:44 joerg Exp $
-
---- audioIO.h.orig 1997-05-31 19:47:58.000000000 +0200
-+++ audioIO.h
-@@ -7,12 +7,16 @@
- #define AUSIZ 32768
- #endif
-
--#ifdef OS_Linux
-+#if defined(OS_Linux) || defined(OS_BSD)
- extern int AUSIZ;
- #endif
-
-+#ifdef OS_Linux
-+#define DEFAULT_AUSIZ 0
-+#endif
-+
- #ifdef OS_BSD
-- #define AUSIZ 32768
-+ #define DEFAULT_AUSIZ 32768
- #endif
-
- #if defined(OS_IRIX) || defined(OS_IRIX64)
-@@ -26,3 +30,7 @@ extern int AUSIZ;
- #ifdef OS_SunOS
- #define AUSIZ 4096
- #endif
-+
-+#ifdef OS_NetBSD
-+ #define AUSIZ 32768
-+#endif
diff --git a/audio/amp/patches/patch-ac b/audio/amp/patches/patch-ac
deleted file mode 100644
index 2841f9d733c..00000000000
--- a/audio/amp/patches/patch-ac
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2007/01/21 04:02:01 rillig Exp $
-
---- audioIO_SunOS.c.orig 1997-05-31 19:47:58.000000000 +0200
-+++ audioIO_SunOS.c 2007-01-21 04:50:43.135430140 +0100
-@@ -8,7 +8,11 @@
-
- #include "amp.h"
- #include <sys/types.h>
-+#ifndef OS_NetBSD
- #include <sys/stropts.h>
-+#else
-+#include <sys/ioctl.h>
-+#endif
- #include <fcntl.h>
- #include <unistd.h>
- #include <stdio.h>
-@@ -18,7 +22,7 @@
-
- /* declare these static to effectively isolate the audio device */
-
--static audio_fd;
-+static int audio_fd;
- static audio_info_t auinfo;
-
- /* audioOpen() */
-@@ -31,13 +35,12 @@ audioOpen(int frequency, int stereo, int
- {
- int res;
-
-- if ((audio_fd = open("/dev/audio",O_RDWR))==-1) {
-+ if ((audio_fd = open("/dev/audio",O_WRONLY))==-1) {
- die(" unable to open the audio device\n");
- }
- DB(audio, msg("Audio device opened on %d\n",audio_fd) );
-
-- if (ioctl(audio_fd,AUDIO_GETINFO,&auinfo)<0)
-- die("Unable to get audio info\n");
-+ AUDIO_INITINFO(&auinfo);
-
- auinfo.play.precision=16;
- auinfo.play.encoding=AUDIO_ENCODING_LINEAR;
-@@ -70,7 +73,7 @@ audioSetVolume(int volume)
- /* audioFlush() */
- /* should flush the audio device */
-
--inline void
-+void
- audioFlush()
- {
- DB(audio, msg("audio: flush %d\n",audio_fd) );
-@@ -91,7 +94,7 @@ audioClose()
- /* writes count bytes from buffer to the audio device */
- /* returns the number of bytes actually written */
-
--int inline
-+int
- audioWrite(char *buffer, int count)
- {
- return(write(audio_fd,buffer,count));
diff --git a/audio/amp/patches/patch-ad b/audio/amp/patches/patch-ad
deleted file mode 100644
index e38021e78c6..00000000000
--- a/audio/amp/patches/patch-ad
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2005/11/18 14:52:44 joerg Exp $
-
---- guicontrol.c.orig 1997-08-23 11:30:51.000000000 +0000
-+++ guicontrol.c
-@@ -312,6 +312,14 @@ void gui_control(void)
- if (quit_flag)
- {
- /* fprintf(stderr, "quit_flag is true\n"); */
-+
-+ if((flags = fcntl(STDOUT_FILENO, F_GETFL, 0)) < 0)
-+ perror("fcntl");
-+ flags &= ~O_NONBLOCK;
-+
-+ if(fcntl(STDOUT_FILENO, F_SETFL, flags) < 0)
-+ perror("fcntl");
-+
- exit(0);
- }
- while(GUI_FD_TO_PLAY != -1)
-@@ -334,7 +342,7 @@ void gui_control(void)
-
- if((flags = fcntl(STDIN_FILENO, F_GETFL, 0)) < 0)
- perror("fcntl");
-- flags ^= O_NONBLOCK;
-+ flags &= ~O_NONBLOCK;
-
- if(fcntl(STDIN_FILENO, F_SETFL, flags) < 0)
- perror("fcntl");
-@@ -376,6 +384,7 @@ int decodeMPEG_2(int inFilefd)
- case GETHDR_SYN: warn("oops, we're out of sync.\n");
- break;
- default:
-+ break;
- }
- break;
- }
-@@ -394,7 +403,7 @@ int decodeMPEG_2(int inFilefd)
- /* Set stdin to blocking */
- if((flags = fcntl(STDIN_FILENO, F_GETFL, 0)) < 0)
- perror("fcntl");
-- flags ^= O_NONBLOCK;
-+ flags &= ~O_NONBLOCK;
- if(fcntl(STDIN_FILENO, F_SETFL, flags) < 0)
- perror("fcntl");
- }
diff --git a/audio/amp/patches/patch-ae b/audio/amp/patches/patch-ae
deleted file mode 100644
index df070e4a1c0..00000000000
--- a/audio/amp/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2003/03/22 05:44:38 dillo Exp $
-
---- configure.in.old Sun Oct 26 10:53:03 1997
-+++ configure.in Sun Oct 26 10:54:32 1997
-@@ -58,7 +58,7 @@
- DEFINES="-DOS_$OS_TYPE -DARCH_$ARCH_TYPE"
- ;;
-
-- Linux|FreeBSD)
-+ Linux|FreeBSD|NetBSD)
- CC="gcc"
- if test "$ARCH_TYPE" = "i486" ; then
- CFLAGS_ARCH="-m486"
diff --git a/audio/amp/patches/patch-af b/audio/amp/patches/patch-af
deleted file mode 100644
index ac4fdfaea0e..00000000000
--- a/audio/amp/patches/patch-af
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-af,v 1.2 2005/11/18 14:52:44 joerg Exp $
-
---- configure.orig 1997-08-23 11:11:24.000000000 +0000
-+++ configure
-@@ -1398,7 +1398,7 @@ case "$OS_TYPE" in
- DEFINES="-DOS_$OS_TYPE -DARCH_$ARCH_TYPE"
- ;;
-
-- Linux|FreeBSD)
-+ Linux|FreeBSD|NetBSD|DragonFly)
- CC="gcc"
- if test "$ARCH_TYPE" = "i486" ; then
- CFLAGS_ARCH="-m486"
-@@ -1409,6 +1409,9 @@ case "$OS_TYPE" in
- if test "$OS_TYPE" = "FreeBSD" ; then
- OS_TYPE="BSD"
- fi
-+ if test "$OS_TYPE" = "DragonFly" ; then
-+ OS_TYPE="BSD"
-+ fi
- CFLAGS="-O6 -ffast-math -fomit-frame-pointer ${CFLAGS_ARCH}"
- DEFINES="-DNO_BYTE_SWAPPING -DOS_$OS_TYPE -DARCH_$ARCH_TYPE"
- ;;
diff --git a/audio/amp/patches/patch-ag b/audio/amp/patches/patch-ag
deleted file mode 100644
index 850dcc6b4dc..00000000000
--- a/audio/amp/patches/patch-ag
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/11/18 14:52:44 joerg Exp $
-
---- audioIO_Linux.c.orig 1997-05-31 19:47:58.000000000 +0200
-+++ audioIO_Linux.c
-@@ -78,7 +78,12 @@ audioOpen(int frequency, int stereo, int
- if (volume != -1)
- audioSetVolume(volume);
-
-- if (ioctl(audio_fd, SNDCTL_DSP_GETBLKSIZE, &AUSIZ) == -1)
-+#ifdef SNDCTl_DSP_GETBLKSIZE
-+ if (ioctl(audio_fd, SNDCTL_DSP_GETBLKSIZE, &AUSIZ) != -1)
-+ return;
-+#endif
-+ AUSIZ = DEFAULT_AUSIZ;
-+ if (AUSIZ == 0)
- die("Unable to get fragment size\n");
- }
-
diff --git a/audio/amp/patches/patch-ah b/audio/amp/patches/patch-ah
deleted file mode 100644
index b2e6064ecb6..00000000000
--- a/audio/amp/patches/patch-ah
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2007/01/21 04:02:01 rillig Exp $
-
-sunpro does not like non-static inline functions that refer to static
-variables.
-
---- buffer.c.orig 1997-08-18 17:54:20.000000000 +0200
-+++ buffer.c 2007-01-21 04:44:48.242585932 +0100
-@@ -46,7 +46,7 @@ static int control_fd;
- /* This is a separate (but inlined) function to make it easier to implement */
- /* a threaded buffer */
-
--inline void
-+static inline void
- audioBufferWrite(char *buf,int bytes)
- {
- write(buffer_fd, buf, bytes);
diff --git a/audio/amp/patches/patch-ai b/audio/amp/patches/patch-ai
deleted file mode 100644
index dd2cfed7733..00000000000
--- a/audio/amp/patches/patch-ai
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2007/02/01 23:22:44 wiz Exp $
-
---- proto.h.orig 1997-05-31 17:47:58.000000000 +0000
-+++ proto.h
-@@ -19,7 +19,6 @@ void audioBufferOn(int);
- void printout(void);
- int audioBufferOpen(int, int, int);
- void audioBufferClose();
--void audioBufferWrite(char *, int);
- void audioBufferFlush();
-
- /* From: audio.c */
diff --git a/audio/applerecords/DESCR b/audio/applerecords/DESCR
deleted file mode 100644
index 4a02d66694d..00000000000
--- a/audio/applerecords/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-AppleRecords is a pure Java DAAP client, meaning it can stream songs
-from DAAP servers, including Apple iTunes 4 and 4.5 for Windows and
-Mac OS X. It should run on most operating systems that have a modern
-Java Runtime Environment, including Linux, Solaris, Mac OS X, and
-Windows.
diff --git a/audio/applerecords/Makefile b/audio/applerecords/Makefile
deleted file mode 100644
index e2b82421cd9..00000000000
--- a/audio/applerecords/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2007/03/04 11:29:57 wiz Exp $
-#
-
-DISTNAME= applerecords-0.5
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= #
-EXTRACT_SUFX= .jar
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://web.archive.org/web/20060501054520/http://www.cdavies.org/applerecords.html
-COMMENT= Java DAAP client
-
-NO_BUILD= yes
-WRKSRC= ${WRKDIR}
-USE_JAVA= run
-
-INSTALLATION_DIRS= bin
-
-.include "../../mk/java-vm.mk"
-
-do-extract:
- ${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}.jar ${WRKSRC}
- ${SED} -e 's|@SH@|${SH}|g' -e 's|@PREFIX@|${PREFIX}|g' ${FILESDIR}/applerecords > ${WRKSRC}/applerecords
-
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/applerecords
- ${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.jar ${PREFIX}/lib/applerecords/applerecords.jar
- ${INSTALL_SCRIPT} ${WRKSRC}/applerecords ${PREFIX}/bin
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/applerecords/PLIST b/audio/applerecords/PLIST
deleted file mode 100644
index bb89a7961b7..00000000000
--- a/audio/applerecords/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/06/06 07:20:12 agc Exp $
-bin/applerecords
-lib/applerecords/applerecords.jar
-@dirrm lib/applerecords
diff --git a/audio/applerecords/distinfo b/audio/applerecords/distinfo
deleted file mode 100644
index 7947fb67daf..00000000000
--- a/audio/applerecords/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:43 agc Exp $
-
-SHA1 (applerecords-0.5.jar) = 3347aa92512ecc41952d9cb291d193a4b098ab90
-RMD160 (applerecords-0.5.jar) = 1101748e1bdef54dbd554d0110294d7c2afb8933
-Size (applerecords-0.5.jar) = 541553 bytes
diff --git a/audio/applerecords/files/applerecords b/audio/applerecords/files/applerecords
deleted file mode 100755
index 9abc66667e0..00000000000
--- a/audio/applerecords/files/applerecords
+++ /dev/null
@@ -1,5 +0,0 @@
-#! @SH@
-
-ulimit -d 524288
-
-exec java -jar @PREFIX@/lib/applerecords/applerecords.jar
diff --git a/audio/arts/DESCR b/audio/arts/DESCR
deleted file mode 100644
index bbe8e1016a9..00000000000
--- a/audio/arts/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-The Analog Real-Time Synthesizer, or aRts, is a modular system for synthesizing
-sound and music on a digital computer. Using small building blocks called
-modules, the user can easily build complex audio processing tools. Modules
-typically provide functions such as sound waveform generators, filters, audio
-effects, mixing, and playback of digital audio in different file formats.
diff --git a/audio/arts/Makefile b/audio/arts/Makefile
deleted file mode 100644
index c03758f1348..00000000000
--- a/audio/arts/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.61 2007/01/26 03:04:01 markd Exp $
-
-DISTNAME= arts-1.5.6
-CATEGORIES= audio
-HOMEPAGE= http://multimedia.kde.org/
-COMMENT= Analog Real-Time Synthesizer
-
-.include "../../meta-pkgs/kde3/Makefile.kde3"
-
-CONFLICTS+= kdelibs-2*
-
-USE_TOOLS+= perl pkg-config
-
-# Ensure we export symbols in the linked shared object.
-LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
-
-_IN_ARTS_BUILD= yes
-.include "../../meta-pkgs/kde3/kde3.mk"
-
-.include "../../audio/esound/buildlink3.mk"
-.include "../../audio/libaudiofile/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-
-.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
-CONFIGURE_ARGS+= --disable-threading
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/arts/PLIST b/audio/arts/PLIST
deleted file mode 100644
index 73c1dae757d..00000000000
--- a/audio/arts/PLIST
+++ /dev/null
@@ -1,140 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2005/04/05 21:18:07 reed Exp $
-bin/artsc-config
-bin/artscat
-bin/artsd
-bin/artsdsp
-bin/artsplay
-bin/artsrec
-bin/artsshell
-bin/artswrapper
-bin/mcopidl
-include/arts/anyref.h
-include/arts/arts_export.h
-include/arts/artsflow.h
-include/arts/artsflow.idl
-include/arts/artsversion.h
-include/arts/asyncstream.h
-include/arts/audioio.h
-include/arts/audiosubsys.h
-include/arts/buffer.h
-include/arts/bufferqueue.h
-include/arts/cache.h
-include/arts/cachedwav.h
-include/arts/common.h
-include/arts/connect.h
-include/arts/connection.h
-include/arts/convert.h
-include/arts/core.h
-include/arts/core.idl
-include/arts/cpuinfo.h
-include/arts/datapacket.h
-include/arts/debug.h
-include/arts/delayedreturn.h
-include/arts/dispatcher.h
-include/arts/dynamicrequest.h
-include/arts/dynamicskeleton.h
-include/arts/extensionloader.h
-include/arts/factory.h
-include/arts/fft.h
-include/arts/flowsystem.h
-include/arts/giomanager.h
-include/arts/gsl/gslcommon.h
-include/arts/gsl/gslconfig.h
-include/arts/gsl/gslconvert.h
-include/arts/gsl/gsldatacache.h
-include/arts/gsl/gsldatahandle-mad.h
-include/arts/gsl/gsldatahandle-vorbis.h
-include/arts/gsl/gsldatahandle.h
-include/arts/gsl/gsldatautils.h
-include/arts/gsl/gsldefs.h
-include/arts/gsl/gslengine.h
-include/arts/gsl/gslfft.h
-include/arts/gsl/gslfilter.h
-include/arts/gsl/gslieee754.h
-include/arts/gsl/gslloader.h
-include/arts/gsl/gslmagic.h
-include/arts/gsl/gslmath.h
-include/arts/gsl/gsloscillator.h
-include/arts/gsl/gslosctable.h
-include/arts/gsl/gslsignal.h
-include/arts/gsl/gslwavechunk.h
-include/arts/gsl/gslwaveosc.h
-include/arts/gslschedule.h
-include/arts/idlfilereg.h
-include/arts/ifacerepo_impl.h
-include/arts/iomanager.h
-include/arts/kmedia2.h
-include/arts/kmedia2.idl
-include/arts/mcopconfig.h
-include/arts/mcoputils.h
-include/arts/notification.h
-include/arts/object.h
-include/arts/objectmanager.h
-include/arts/pipebuffer.h
-include/arts/pool.h
-include/arts/qiomanager.h
-include/arts/reference.h
-include/arts/referenceclean.h
-include/arts/resample.h
-include/arts/socketconnection.h
-include/arts/soundserver.h
-include/arts/soundserver.idl
-include/arts/startupmanager.h
-include/arts/stdsynthmodule.h
-include/arts/synthschedule.h
-include/arts/tcpconnection.h
-include/arts/tcpserver.h
-include/arts/thread.h
-include/arts/type.h
-include/arts/unixconnection.h
-include/arts/unixserver.h
-include/arts/weakreference.h
-include/artsc/artsc.h
-include/artsc/artsc_export.h
-lib/libartsc.la
-lib/libartscbackend.la
-lib/libartsdsp.la
-lib/libartsdsp_st.la
-lib/libartsflow.la
-lib/libartsflow_idl.la
-lib/libartsgslplayobject.la
-lib/libartswavplayobject.la
-lib/libgmcop.la
-lib/libkmedia2.la
-lib/libkmedia2_idl.la
-lib/libmcop.la
-lib/libmcop_mt.la
-lib/libqtmcop.la
-lib/libsoundserver_idl.la
-lib/libx11globalcomm.la
-lib/mcop/Arts/DataHandlePlay.mcopclass
-lib/mcop/Arts/FileInputStream.mcopclass
-lib/mcop/Arts/GSLPlayObject.mcopclass
-lib/mcop/Arts/Synth_ADD.mcopclass
-lib/mcop/Arts/Synth_AMAN_PLAY.mcopclass
-lib/mcop/Arts/Synth_AMAN_RECORD.mcopclass
-lib/mcop/Arts/Synth_BUS_DOWNLINK.mcopclass
-lib/mcop/Arts/Synth_BUS_UPLINK.mcopclass
-lib/mcop/Arts/Synth_FREQUENCY.mcopclass
-lib/mcop/Arts/Synth_MUL.mcopclass
-lib/mcop/Arts/Synth_MULTI_ADD.mcopclass
-lib/mcop/Arts/Synth_PLAY.mcopclass
-lib/mcop/Arts/Synth_PLAY_WAV.mcopclass
-lib/mcop/Arts/Synth_RECORD.mcopclass
-lib/mcop/Arts/Synth_WAVE_SIN.mcopclass
-lib/mcop/Arts/WavPlayObject.mcopclass
-lib/mcop/Arts/WaveDataHandle.mcopclass
-lib/mcop/Arts/X11GlobalComm.mcopclass
-lib/mcop/artsflow.mcopclass
-lib/mcop/artsflow.mcoptype
-lib/mcop/kmedia2.mcopclass
-lib/mcop/kmedia2.mcoptype
-lib/mcop/soundserver.mcopclass
-lib/mcop/soundserver.mcoptype
-lib/mcop/x11globalcomm.mcopclass
-lib/mcop/x11globalcomm.mcoptype
-@dirrm lib/mcop/Arts
-@dirrm lib/mcop
-@dirrm include/artsc
-@dirrm include/arts/gsl
-@unexec ${RMDIR} %D/include/arts 2>/dev/null || ${TRUE}
diff --git a/audio/arts/buildlink3.mk b/audio/arts/buildlink3.mk
deleted file mode 100644
index 27810e0571e..00000000000
--- a/audio/arts/buildlink3.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/07/08 23:10:35 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-ARTS_BUILDLINK3_MK:= ${ARTS_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= arts
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Narts}
-BUILDLINK_PACKAGES+= arts
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}arts
-
-.if !empty(ARTS_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.arts+= arts>=1.1.4nb1
-BUILDLINK_ABI_DEPENDS.arts+= arts>=1.5.1nb1
-BUILDLINK_PKGSRCDIR.arts?= ../../audio/arts
-
-PRINT_PLIST_AWK+= /^@dirrm include\/arts$$/ \
- { print "@comment in arts: " $$0; next; }
-.endif # ARTS_BUILDLINK3_MK
-
-.include "../../audio/esound/buildlink3.mk"
-.include "../../audio/libaudiofile/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-
-.include "../../mk/oss.buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/arts/distinfo b/audio/arts/distinfo
deleted file mode 100644
index 7aee94cebb6..00000000000
--- a/audio/arts/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.41 2007/01/26 03:04:01 markd Exp $
-
-SHA1 (arts-1.5.6.tar.bz2) = aa0b89ed6cf944b737c362164a820e231b358724
-RMD160 (arts-1.5.6.tar.bz2) = 42074889e415dca534b1cf2700dd6e983319a28d
-Size (arts-1.5.6.tar.bz2) = 966746 bytes
-SHA1 (patch-aa) = ff582ade3d9913440cd20d92b342a5357991f555
-SHA1 (patch-ab) = 73c4ec5360ce671f69b6de4e226cda9478d098ee
-SHA1 (patch-ac) = de22843493a184f4aa8c20e011aa2a73ad794728
-SHA1 (patch-af) = 9a130ccd7f56656bb55e2c5edf223c38c69be591
-SHA1 (patch-ag) = 30177e80960a2877fb69cb5ffaadc4aa0d0783fc
-SHA1 (patch-ah) = fa4380c6e0049e9ce8851d485c354e07145d9fe9
-SHA1 (patch-ai) = 2e2e2fd26cec537bd420af10b50a267f504645c9
diff --git a/audio/arts/hacks.mk b/audio/arts/hacks.mk
deleted file mode 100644
index d54fb3784aa..00000000000
--- a/audio/arts/hacks.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: hacks.mk,v 1.2 2005/09/14 04:15:55 schmonz Exp $
-
-.include "../../mk/bsd.prefs.mk"
-
-# Work round an ICE with GCC 3.3 on sparc
-.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "sparc"
-PKG_HACKS+= sparc-gcc33-ice
-GCC_REQD+= 3.4
-.endif
diff --git a/audio/arts/patches/patch-aa b/audio/arts/patches/patch-aa
deleted file mode 100644
index 8bb73bfe907..00000000000
--- a/audio/arts/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2004/04/04 06:45:00 mrg Exp $
-
---- mcop/debug.cc.orig 2003-10-14 05:59:41.000000000 +1000
-+++ mcop/debug.cc 2004-04-04 16:22:41.000000000 +1000
-@@ -24,6 +24,7 @@
- */
-
- #include "debug.h"
-+#include "config.h"
- #include <stdlib.h>
- #include <stdarg.h>
- #include <stdio.h>
diff --git a/audio/arts/patches/patch-ab b/audio/arts/patches/patch-ab
deleted file mode 100644
index f87a560ee5c..00000000000
--- a/audio/arts/patches/patch-ab
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2004/02/04 13:35:52 markd Exp $
-
---- artsc/artsdsp.c.orig 2003-07-17 07:18:09.000000000 +1200
-+++ artsc/artsdsp.c
-@@ -133,6 +133,14 @@ int munmap(void *start, size_t length);
-
- static void artsdsp_doinit()
- {
-+# ifdef 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 +153,31 @@ 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");
-+#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
-+ 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();
-+#endif
- }
-
- static void
-@@ -258,10 +282,15 @@ int open (const char *pathname, int flag
- return sndfd;
- }
-
-+#if defined(__NetBSD__) && !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(__NetBSD__) || 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 +302,7 @@ int ioctl (int fd, ioctl_request_t reque
- va_start(args,request);
- argp = va_arg(args, void *);
- va_end(args);
-+#endif
-
- CHECK_INIT();
-
diff --git a/audio/arts/patches/patch-ac b/audio/arts/patches/patch-ac
deleted file mode 100644
index 6cb71258b4d..00000000000
--- a/audio/arts/patches/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2003/11/03 12:07:28 mrg Exp $
-
---- flow/cpuinfo.cc.orig 2003-07-14 05:33:37.000000000 +1000
-+++ flow/cpuinfo.cc 2003-11-03 22:51:44.000000000 +1100
-@@ -27,6 +27,10 @@
- #include <setjmp.h>
- #include <signal.h>
-
-+#if defined(__NetBSD__)
-+#include <sys/param.h>
-+#endif
-+
- using namespace Arts;
-
- int CpuInfo::s_flags = 0;
-@@ -204,6 +208,7 @@
- : /* no input */
- : "memory"
- );
-+#if defined(__NetBSD__) && __NetBSD_Version__ >= 105260000
- // SSE must be supported by the OS, if it's not, any SSE insn will
- // trigger an invalid opcode exception, to check for this, a SIGILL
- // handler is installed and a SSE insn run. If the handler is called,
-@@ -226,6 +231,7 @@
- }
- signal(SIGILL, oldHandler);
- }
-+#endif
- #endif /* HAVE_X86_SSE */
- }
-
diff --git a/audio/arts/patches/patch-af b/audio/arts/patches/patch-af
deleted file mode 100644
index cba426b41f2..00000000000
--- a/audio/arts/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.2 2002/08/25 19:21:45 jlam Exp $
-
---- flow/gsl/gslcommon.c.orig Thu May 30 13:24:35 2002
-+++ flow/gsl/gslcommon.c
-@@ -23,7 +23,9 @@
- #include <fcntl.h>
- #include <sys/utsname.h>
- #include <string.h>
-+#if !defined(__NetBSD__)
- #include <sched.h>
-+#endif
- #include <errno.h>
- #include <sys/poll.h>
- #include <sys/stat.h>
diff --git a/audio/arts/patches/patch-ag b/audio/arts/patches/patch-ag
deleted file mode 100644
index 4876bd3e2de..00000000000
--- a/audio/arts/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2003/07/07 20:51:55 skrll Exp $
-
---- configure.orig Sat Jan 4 06:07:20 2003
-+++ configure
-@@ -30085,7 +30085,7 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
- echo "${ECHO_T}$ac_cv_lib_ossaudio__oss_ioctl" >&6
- if test $ac_cv_lib_ossaudio__oss_ioctl = yes; then
-- LIBOSSAUDIO="-lossaudio"
-+ LIBOSSAUDIO="${LIBOSSAUDIO}"
- fi
-
-
diff --git a/audio/arts/patches/patch-ah b/audio/arts/patches/patch-ah
deleted file mode 100644
index 6be2f80fb35..00000000000
--- a/audio/arts/patches/patch-ah
+++ /dev/null
@@ -1,169 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2004/04/20 12:15:51 markd Exp $
-
---- mcop_mt/threads_posix.cc.orig 2004-04-04 19:37:55.000000000 +1200
-+++ mcop_mt/threads_posix.cc
-@@ -33,7 +33,151 @@
- #include <stddef.h>
- #include <stdarg.h>
- #include <pthread.h>
-+#include <unistd.h>
-+#ifdef _POSIX_SEMAPHORES
- #include <semaphore.h>
-+#else
-+
-+#include <errno.h>
-+#include <limits.h>
-+
-+struct sem_t {
-+ pthread_mutex_t lock;
-+ pthread_cond_t gtzero;
-+ unsigned int count;
-+ unsigned int nwaiters;
-+};
-+
-+static int sem_init(sem_t *, int, unsigned int);
-+static int sem_destroy(sem_t *);
-+static int sem_wait(sem_t *);
-+static int sem_trywait(sem_t *);
-+static int sem_post(sem_t *);
-+static int sem_getvalue(sem_t *, int *);
-+
-+static int
-+sem_init(sem_t *sem, int pshared, unsigned int value)
-+{
-+
-+ /*
-+ * Range check the arguments.
-+ */
-+ if (pshared != 0) {
-+ errno = EPERM;
-+ return -1;
-+ }
-+
-+ if (value > INT_MAX) {
-+ errno = EINVAL;
-+ return -1;
-+ }
-+
-+ /*
-+ * Initialize the semaphore.
-+ */
-+ if (pthread_mutex_init(&sem->lock, NULL) != 0) {
-+ errno = ENOMEM;
-+ return -1;
-+ }
-+
-+ if (pthread_cond_init(&sem->gtzero, NULL) != 0) {
-+ pthread_mutex_destroy(&sem->lock);
-+ errno = ENOMEM;
-+ return -1;
-+ }
-+
-+ sem->count = value;
-+ sem->nwaiters = 0;
-+
-+ return 0;
-+}
-+
-+static int
-+sem_destroy(sem_t *sem)
-+{
-+
-+ /* Make sure there are no waiters. */
-+ pthread_mutex_lock(&sem->lock);
-+ if (sem->nwaiters > 0) {
-+ pthread_mutex_unlock(&sem->lock);
-+ errno = EBUSY;
-+ return -1;
-+ }
-+ pthread_mutex_unlock(&sem->lock);
-+
-+ pthread_mutex_destroy(&sem->lock);
-+ pthread_cond_destroy(&sem->gtzero);
-+
-+ return 0;
-+}
-+
-+static int
-+sem_wait(sem_t *sem)
-+{
-+ pthread_testcancel();
-+
-+ pthread_mutex_lock(&sem->lock);
-+
-+ while (sem->count == 0) {
-+ sem->nwaiters++;
-+ pthread_cond_wait(&sem->gtzero, &sem->lock);
-+ }
-+ sem->count--;
-+
-+ pthread_mutex_unlock(&sem->lock);
-+
-+ pthread_testcancel();
-+ return 0;
-+}
-+
-+static int
-+sem_trywait(sem_t *sem)
-+{
-+ int retval;
-+
-+ pthread_mutex_lock(&sem->lock);
-+
-+ if (sem->count > 0) {
-+ sem->count--;
-+ retval = 0;
-+ } else {
-+ errno = EAGAIN;
-+ retval = -1;
-+ }
-+
-+ pthread_mutex_unlock(&sem->lock);
-+
-+ return retval;
-+}
-+
-+static int
-+sem_post(sem_t *sem)
-+{
-+ pthread_mutex_lock(&sem->lock);
-+
-+ sem->count++;
-+ if (sem->nwaiters > 0) {
-+ pthread_cond_broadcast(&sem->gtzero);
-+ }
-+
-+ pthread_mutex_unlock(&sem->lock);
-+
-+ return 0;
-+}
-+
-+static int
-+sem_getvalue(sem_t *sem, int *sval)
-+{
-+
-+ pthread_mutex_lock(&sem->lock);
-+ *sval = sem->count;
-+ pthread_mutex_unlock(&sem->lock);
-+
-+ return 0;
-+}
-+#endif
-+
-+
- #include <debug.h>
- #include <string.h>
-
-@@ -186,10 +330,12 @@ public:
- Thread_impl(Thread *thread) : thread(thread) {
- }
- void setPriority(int priority) {
-+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
- struct sched_param sp;
- sp.sched_priority = priority;
- if (pthread_setschedparam(pthread, SCHED_FIFO, &sp))
- arts_debug("Thread::setPriority: sched_setscheduler failed");
-+#endif
- }
- static pthread_key_t privateDataKey;
- static void *threadStartInternal(void *impl)
diff --git a/audio/arts/patches/patch-ai b/audio/arts/patches/patch-ai
deleted file mode 100644
index 7c1ebc90f76..00000000000
--- a/audio/arts/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.7 2005/05/31 14:04:13 markd Exp $
-
---- flow/gsl/Makefile.in.orig 2005-05-24 03:36:50.000000000 +1200
-+++ flow/gsl/Makefile.in
-@@ -98,7 +98,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=c
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CXXLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
diff --git a/audio/audacity/DESCR b/audio/audacity/DESCR
deleted file mode 100644
index b54ae64812b..00000000000
--- a/audio/audacity/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Audacity is a program that manipulates digital audio waveforms. It supports all
-common editing operations such as Cut, Copy, and Paste, plus it will mix tracks
-and apply plug-in effects to any part of a sound. It also has a built-in
-amplitude envelope editor, a customizable spectrogram mode and a frequency
-analysis window for audio analysis applications.
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
deleted file mode 100644
index f1c009acd07..00000000000
--- a/audio/audacity/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: Makefile,v 1.56 2007/02/23 14:23:13 wiz Exp $
-
-DISTNAME= audacity-src-1.2.6
-PKGNAME= ${DISTNAME:S/-src-/-/}
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=audacity/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://audacity.sourceforge.net/
-COMMENT= Audio editor
-
-DEPENDS+= zip>=0.0:../../archivers/zip
-
-USE_LIBTOOL= yes
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= autoconf gmake msgfmt pkg-config
-USE_LANGUAGES= c c++
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --without-xaudio
-CONFIGURE_ARGS+= --with-id3=system
-CONFIGURE_ARGS+= --with-libmad=system
-CONFIGURE_ARGS+= --with-libsndfile=system
-CONFIGURE_ARGS+= --with-portaudio=system
-CONFIGURE_ARGS+= --with-vorbis=system
-CONFIGURE_ENV+= WX_CONFIG=${LOCALBASE}/bin/wx24-config
-
-CONFIG_GUESS_OVERRIDE= \
- config.guess */config.guess */*/config.guess */*/*/config.guess
-CONFIG_SUB_OVERRIDE= \
- config.sub */config.sub */*/config.sub */*/*/config.sub
-
-PTHREAD_AUTO_VARS= yes
-
-.include "../../audio/lame/buildlink3.mk"
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/libsndfile/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/portaudio/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../x11/wxGTK24/buildlink3.mk"
-
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
-
-# XXX Internal compiler error with -O2
-.if ${MACHINE_ARCH} == "alpha"
-CFLAGS+= -O
-.endif
diff --git a/audio/audacity/PLIST b/audio/audacity/PLIST
deleted file mode 100644
index 03aca332953..00000000000
--- a/audio/audacity/PLIST
+++ /dev/null
@@ -1,71 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2007/02/23 03:27:40 rillig Exp $
-bin/audacity
-man/man1/audacity.1
-share/audacity/audacity-1.2-help.htb
-share/audacity/nyquist/bug.lsp
-share/audacity/nyquist/dspprims.lsp
-share/audacity/nyquist/evalenv.lsp
-share/audacity/nyquist/follow.lsp
-share/audacity/nyquist/init.lsp
-share/audacity/nyquist/misc.lsp
-share/audacity/nyquist/nyinit.lsp
-share/audacity/nyquist/nyqmisc.lsp
-share/audacity/nyquist/nyquist.lsp
-share/audacity/nyquist/printrec.lsp
-share/audacity/nyquist/profile.lsp
-share/audacity/nyquist/seq.lsp
-share/audacity/nyquist/seqfnint.lsp
-share/audacity/nyquist/seqmidi.lsp
-share/audacity/nyquist/sndfnint.lsp
-share/audacity/nyquist/system.lsp
-share/audacity/nyquist/test.lsp
-share/audacity/nyquist/xlinit.lsp
-share/audacity/plug-ins/SilenceMarker.ny
-share/audacity/plug-ins/clicktrack.ny
-share/audacity/plug-ins/crossfadein.ny
-share/audacity/plug-ins/crossfadeout.ny
-share/audacity/plug-ins/delay.ny
-share/audacity/plug-ins/highpass.ny
-share/audacity/plug-ins/lowpass.ny
-share/audacity/plug-ins/pluck.ny
-share/audacity/plug-ins/tremolo.ny
-share/doc/audacity/LICENSE.txt
-share/doc/audacity/README.txt
-share/locale/af/LC_MESSAGES/audacity.mo
-share/locale/ar/LC_MESSAGES/audacity.mo
-share/locale/bg/LC_MESSAGES/audacity.mo
-share/locale/bn/LC_MESSAGES/audacity.mo
-share/locale/ca/LC_MESSAGES/audacity.mo
-share/locale/cs/LC_MESSAGES/audacity.mo
-share/locale/cy/LC_MESSAGES/audacity.mo
-share/locale/da/LC_MESSAGES/audacity.mo
-share/locale/de/LC_MESSAGES/audacity.mo
-share/locale/el/LC_MESSAGES/audacity.mo
-share/locale/es/LC_MESSAGES/audacity.mo
-share/locale/eu/LC_MESSAGES/audacity.mo
-share/locale/fi/LC_MESSAGES/audacity.mo
-share/locale/fr/LC_MESSAGES/audacity.mo
-share/locale/ga/LC_MESSAGES/audacity.mo
-share/locale/gl/LC_MESSAGES/audacity.mo
-share/locale/hu/LC_MESSAGES/audacity.mo
-share/locale/it/LC_MESSAGES/audacity.mo
-share/locale/ja/LC_MESSAGES/audacity.mo
-share/locale/lt/LC_MESSAGES/audacity.mo
-share/locale/mk/LC_MESSAGES/audacity.mo
-share/locale/nb/LC_MESSAGES/audacity.mo
-share/locale/nl/LC_MESSAGES/audacity.mo
-share/locale/pl/LC_MESSAGES/audacity.mo
-share/locale/pt/LC_MESSAGES/audacity.mo
-share/locale/ro/LC_MESSAGES/audacity.mo
-share/locale/ru/LC_MESSAGES/audacity.mo
-share/locale/sk/LC_MESSAGES/audacity.mo
-share/locale/sl/LC_MESSAGES/audacity.mo
-share/locale/sv/LC_MESSAGES/audacity.mo
-share/locale/tr/LC_MESSAGES/audacity.mo
-share/locale/uk/LC_MESSAGES/audacity.mo
-share/locale/zh/LC_MESSAGES/audacity.mo
-share/locale/zh_TW/LC_MESSAGES/audacity.mo
-@dirrm share/audacity/nyquist
-@dirrm share/audacity/plug-ins
-@dirrm share/audacity
-@dirrm share/doc/audacity
diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo
deleted file mode 100644
index 87b6dfed4f1..00000000000
--- a/audio/audacity/distinfo
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: distinfo,v 1.16 2007/02/23 03:37:55 rillig Exp $
-
-SHA1 (audacity-src-1.2.6.tar.gz) = 1bfdd119fdc09d1aa334aee21d4831ef6e939fce
-RMD160 (audacity-src-1.2.6.tar.gz) = f59ca075ae430a518b77ce2ed08441abe2b67a0c
-Size (audacity-src-1.2.6.tar.gz) = 4882379 bytes
-SHA1 (patch-aa) = 5494f3fb6035f15a4447556f8cf4a0a2404a2259
-SHA1 (patch-ab) = 8630488f5a89b1542ac2a9f01080c36f1eac7c7d
-SHA1 (patch-ac) = 00698c284e513e20f28ac536b206139ad87ab6d2
-SHA1 (patch-ad) = 820e5321a6558063d04ee8da11fc606d59e33046
-SHA1 (patch-ae) = 628a6353b37418d182f3edd9f26bcea7b5f779d4
-SHA1 (patch-af) = 05c1c345ef9b92410fbe4d8b4b46ab4b7ba7a226
-SHA1 (patch-ag) = 68bcbd932cd4440bc9090c6afc369cfcae54a16b
-SHA1 (patch-ah) = fa0c240f7e20299a6ed26692d443dfb95c0b7eb9
-SHA1 (patch-ai) = 625cd6337d8a246d1a9c388279efa0ade34a2093
-SHA1 (patch-aj) = 34b4cdd266345f04954983cc14e4b762f09f4df8
-SHA1 (patch-ak) = 5f012eb47c832a8f11bcfbdcaf0ab2e876abd04e
-SHA1 (patch-al) = 224437cc76e1f25d600e859d278ad73bbf261efa
diff --git a/audio/audacity/patches/patch-aa b/audio/audacity/patches/patch-aa
deleted file mode 100644
index a12e4c47dbf..00000000000
--- a/audio/audacity/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2004/04/20 18:02:16 ben Exp $
-
---- lib-src/libnyquist/cmt/cext.h.orig Sat Mar 6 16:02:24 2004
-+++ lib-src/libnyquist/cmt/cext.h
-@@ -52,6 +52,8 @@ EXIT(n) -- calls exit(n) after shutting
-
- #if HAS_SYS_TYPES_H
- #include <sys/types.h>
-+#define ulong u_long
-+#undef NEED_ULONG
- #endif
-
- #if HAS_MALLOC_H
diff --git a/audio/audacity/patches/patch-ab b/audio/audacity/patches/patch-ab
deleted file mode 100644
index fce800c6bc2..00000000000
--- a/audio/audacity/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2004/04/20 18:02:16 ben Exp $
-
---- lib-src/libnyquist/sys/term.c.orig Sat Mar 6 16:02:50 2004
-+++ lib-src/libnyquist/sys/term.c
-@@ -40,7 +40,7 @@ int term_testchar()
- #else
-
- #include <termios.h>
--#ifndef __APPLE__
-+#ifdef __LINUX__
- #include <asm/ioctls.h>
- #endif
- #include <signal.h>
diff --git a/audio/audacity/patches/patch-ac b/audio/audacity/patches/patch-ac
deleted file mode 100644
index 8ebfd73827d..00000000000
--- a/audio/audacity/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/10/03 20:42:59 joerg Exp $
-
---- lib-src/libnyquist/snd/sndconfig.h.orig Sat Feb 28 11:19:39 2004
-+++ lib-src/libnyquist/snd/sndconfig.h
-@@ -60,7 +60,7 @@ void snd_free(void *a);
- #elif defined(IRIX)
- #include "sndirix.h"
-
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
- #include "sndfreebsd.h"
-
- #elif defined(_WIN32)
diff --git a/audio/audacity/patches/patch-ad b/audio/audacity/patches/patch-ad
deleted file mode 100644
index e6219d63365..00000000000
--- a/audio/audacity/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2005/10/03 20:42:59 joerg Exp $
-
---- lib-src/libnyquist/snd/sndio.c.orig Sat Feb 28 11:19:39 2004
-+++ lib-src/libnyquist/snd/sndio.c
-@@ -20,7 +20,7 @@
- #ifdef WIN32
- #include <sys/stat.h>
- #include "io.h"
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
- #include <sys/stat.h>
- #else
- #endif
diff --git a/audio/audacity/patches/patch-ae b/audio/audacity/patches/patch-ae
deleted file mode 100644
index 111e85122ba..00000000000
--- a/audio/audacity/patches/patch-ae
+++ /dev/null
@@ -1,97 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2007/02/23 03:27:41 rillig Exp $
-
---- configure.in.orig 2005-11-27 03:33:31.000000000 +0100
-+++ configure.in 2007-02-23 02:06:19.000000000 +0100
-@@ -556,8 +556,8 @@ if [[ "$use_portaudio" = "v19" ]] ; then
-
- AC_CONFIG_SUBDIRS([[lib-src/portaudio-v19]])
-
--else
--
-+fi
-+if [[ "$use_portaudio" = "v18" ]] ; then
- CXXFLAGS="-I../lib-src/portaudio/pa_common $CXXFLAGS"
-
- case "${host_os}" in
-@@ -639,6 +639,81 @@ else
-
- esac
- fi
-+if [[ "$use_portaudio" = "system" ]] ; then
-+
-+ LIBS="$LIBS -lportaudio"
-+
-+ case "${host_os}" in
-+ darwin* | rhapsody*)
-+ dnl Mac OS X configuration
-+
-+ CONFIGHEADER="configunix.h"
-+
-+ dnl CoreAudio
-+
-+ CXXFLAGS="-I../mac $CXXFLAGS"
-+
-+ if [[ "$use_portmixer" = "yes" ]] ; then
-+ BUILDLIBS="$BUILDLIBS portmixer/px_mac_core/portmixer.a"
-+ EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_mac_core/portmixer.a"
-+ fi
-+
-+ LIBS="-framework AudioUnit -framework AudioToolbox $LIBS"
-+ LIBS="-framework CoreAudio $LIBS -lz"
-+
-+ EXTRATARGETS="../Audacity.app"
-+
-+ if [[ "$use_ladspa" = "default" ]] ; then
-+ use_ladspa="yes";
-+ fi
-+
-+ dnl VST
-+
-+ OPTOBJS="$OPTOBJS \$(OBJDIR)/effects/VST/LoadVSTMac.o"
-+ OPTOBJS="$OPTOBJS \$(OBJDIR)/effects/VST/VSTEffect.o"
-+
-+ ;;
-+
-+ cygwin*)
-+ dnl Windows/CygWin configuration
-+
-+ LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 -lwsock32 -lwinmm"
-+ LIBS="$LIBS -Wl,--subsystem,windows"
-+ CONFIGHEADER="configwin.h"
-+
-+ if [[ "$use_portmixer" = "yes" ]] ; then
-+ BUILDLIBS="$BUILDLIBS portmixer/px_win_wmme/portmixer.a"
-+ EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_win_wmme/portmixer.a Audacity.coff"
-+ fi
-+
-+ if [[ "$use_ladspa" = "default" ]] ; then
-+ use_ladspa="yes";
-+ fi
-+
-+ AC_DEFINE(__CYGWIN__,1,[We're using cygwin])
-+ AC_DEFINE(_FILE_OFFSET_BITS,32,[Placeholder for large file support])
-+
-+ AFTERBUILD=""
-+ ;;
-+
-+ *)
-+ dnl Unix OSS configuration
-+
-+ CONFIGHEADER="configunix.h"
-+
-+ if [[ "$use_portmixer" = "yes" ]] ; then
-+ BUILDLIBS="$BUILDLIBS portmixer/px_unix_oss/portmixer.a"
-+ EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_unix_oss/portmixer.a"
-+ fi
-+
-+ if [[ "$use_ladspa" = "default" ]] ; then
-+ use_ladspa="yes";
-+ fi
-+
-+ AFTERBUILD=""
-+
-+ esac
-+fi
-
- use_precomp="no"
-
diff --git a/audio/audacity/patches/patch-af b/audio/audacity/patches/patch-af
deleted file mode 100644
index 43ce849bb92..00000000000
--- a/audio/audacity/patches/patch-af
+++ /dev/null
@@ -1,105 +0,0 @@
-$NetBSD: patch-af,v 1.6 2007/02/23 03:37:55 rillig Exp $
-
-The CPPFLAGS and LIBS from wx-config had been set too early in the
-configure file, so that they were taken into the AC_CONFIG_SUBDIRS
-directories. Some of these directories only use a C compiler for
-linking, which of course caused problems with the wx* libraries, which
-are C++.
-
---- configure.orig 2006-11-15 05:12:13.000000000 +0100
-+++ configure 2007-02-23 04:17:41.000000000 +0100
-@@ -6586,7 +6586,8 @@ fi
- subdirs="$subdirs lib-src/portaudio-v19"
-
-
--else
-+fi
-+if [ "$use_portaudio" = "v18" ] ; then
-
- CXXFLAGS="-I../lib-src/portaudio/pa_common $CXXFLAGS"
-
-@@ -6672,6 +6673,84 @@ _ACEOF
-
- esac
- fi
-+if [ "$use_portaudio" = "system" ] ; then
-+
-+ LIBS="$LIBS -lportaudio"
-+
-+ case "${host_os}" in
-+ darwin* | rhapsody*)
-+
-+ CONFIGHEADER="configunix.h"
-+
-+
-+ CXXFLAGS="-I../mac $CXXFLAGS"
-+
-+ if [ "$use_portmixer" = "yes" ] ; then
-+ BUILDLIBS="$BUILDLIBS portmixer/px_mac_core/portmixer.a"
-+ EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_mac_core/portmixer.a"
-+ fi
-+
-+ LIBS="-framework AudioUnit -framework AudioToolbox $LIBS"
-+ LIBS="-framework CoreAudio $LIBS -lz"
-+
-+ EXTRATARGETS="../Audacity.app"
-+
-+ if [ "$use_ladspa" = "default" ] ; then
-+ use_ladspa="yes";
-+ fi
-+
-+
-+ OPTOBJS="$OPTOBJS \$(OBJDIR)/effects/VST/LoadVSTMac.o"
-+ OPTOBJS="$OPTOBJS \$(OBJDIR)/effects/VST/VSTEffect.o"
-+
-+ ;;
-+
-+ cygwin*)
-+
-+ LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 -lwsock32 -lwinmm"
-+ LIBS="$LIBS -Wl,--subsystem,windows"
-+ CONFIGHEADER="configwin.h"
-+
-+ if [ "$use_portmixer" = "yes" ] ; then
-+ BUILDLIBS="$BUILDLIBS portmixer/px_win_wmme/portmixer.a"
-+ EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_win_wmme/portmixer.a Audacity.coff"
-+ fi
-+
-+ if [ "$use_ladspa" = "default" ] ; then
-+ use_ladspa="yes";
-+ fi
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define __CYGWIN__ 1
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define _FILE_OFFSET_BITS 32
-+_ACEOF
-+
-+
-+ AFTERBUILD=""
-+ ;;
-+
-+ *)
-+
-+ CONFIGHEADER="configunix.h"
-+
-+ if [ "$use_portmixer" = "yes" ] ; then
-+ BUILDLIBS="$BUILDLIBS portmixer/px_unix_oss/portmixer.a"
-+ EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_unix_oss/portmixer.a"
-+ fi
-+
-+ if [ "$use_ladspa" = "default" ] ; then
-+ use_ladspa="yes";
-+ fi
-+
-+ AFTERBUILD=""
-+
-+ esac
-+fi
-
- use_precomp="no"
-
diff --git a/audio/audacity/patches/patch-ag b/audio/audacity/patches/patch-ag
deleted file mode 100644
index 99cfdd3548c..00000000000
--- a/audio/audacity/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.5 2006/01/17 21:50:23 adam Exp $
-
---- lib-src/libnyquist/Makefile.in.orig 2006-01-17 22:33:39.000000000 +0100
-+++ lib-src/libnyquist/Makefile.in
-@@ -6,7 +6,7 @@
- INCL = -Inyqsrc -Itran -Ixlisp -Icmt -Isys -Isnd -Ifft
-
- CC = @CC@
--override CFLAGS += -g -DCMTSTUFF -O2 -DEXT $(INCL)
-+override CFLAGS += -DCMTSTUFF -DEXT $(INCL)
- LN = $(CC)
- LFLAGS = -lm
-
diff --git a/audio/audacity/patches/patch-ah b/audio/audacity/patches/patch-ah
deleted file mode 100644
index e6016862c06..00000000000
--- a/audio/audacity/patches/patch-ah
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2004/11/22 16:36:31 adam Exp $
-
---- Makefile.in.orig 2004-11-18 06:17:29.000000000 +0000
-+++ Makefile.in
-@@ -37,9 +37,9 @@ install: audacity
-
- # install manpage
- $(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
-- -test -f help/audacity.1.gz && \
-- $(INSTALL) -m 644 help/audacity.1.gz \
-- $(DESTDIR)$(MANDIR)/man1/$(AUDACITY_NAME).1.gz
-+ -test -f help/audacity.1 && \
-+ $(INSTALL) -m 644 help/audacity.1 \
-+ $(DESTDIR)$(MANDIR)/man1/$(AUDACITY_NAME).1
-
- # install nyquist
- $(INSTALL) -d $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist
diff --git a/audio/audacity/patches/patch-ai b/audio/audacity/patches/patch-ai
deleted file mode 100644
index 2760e1834f8..00000000000
--- a/audio/audacity/patches/patch-ai
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ai,v 1.5 2007/02/23 03:27:41 rillig Exp $
-
---- lib-src/soundtouch/source/SoundTouch/cpu_detect_x86_gcc.cpp.orig 2006-11-15 05:12:11.000000000 +0100
-+++ lib-src/soundtouch/source/SoundTouch/cpu_detect_x86_gcc.cpp 2007-02-23 03:25:18.000000000 +0100
-@@ -80,6 +80,7 @@ uint detectCPUextensions(void)
- if (_dwDisabledISA == 0xffffffff) return 0;
-
- asm volatile(
-+ "\n\tpushl %%ebx"
- "\n\txor %%esi, %%esi" // clear %%esi = result register
- // check if 'cpuid' instructions is available by toggling eflags bit 21
-
-@@ -128,6 +129,7 @@ uint detectCPUextensions(void)
- "\n\tend:"
-
- "\n\tmov %%esi, %0"
-+ "\n\tpopl %%ebx"
-
- : "=r" (res)
- : /* no inputs */
diff --git a/audio/audacity/patches/patch-aj b/audio/audacity/patches/patch-aj
deleted file mode 100644
index e373cae068a..00000000000
--- a/audio/audacity/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2005/10/03 20:42:59 joerg Exp $
-
---- lib-src/libnyquist/snd/sndcvt.c.orig 2005-07-22 17:15:57.000000000 +0000
-+++ lib-src/libnyquist/snd/sndcvt.c
-@@ -16,7 +16,7 @@
- #ifdef WIN32
- #include <sys/stat.h>
- #include "io.h"
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
- #include <sys/stat.h>
- #endif /* WIN32 */
- #define L_SET SEEK_SET
diff --git a/audio/audacity/patches/patch-ak b/audio/audacity/patches/patch-ak
deleted file mode 100644
index 94ebeb83a16..00000000000
--- a/audio/audacity/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.5 2007/02/23 03:37:55 rillig Exp $
-
---- lib-src/soundtouch/include/STTypes.h.orig 2006-11-15 05:12:11.000000000 +0100
-+++ lib-src/soundtouch/include/STTypes.h 2007-02-23 04:23:58.000000000 +0100
-@@ -132,7 +132,7 @@ namespace soundtouch
- #define ALLOW_3DNOW 1
- #endif
-
-- #if (WIN32 || __i386__ || __x86_64__)
-+ #if (WIN32 || __i386__ || __x86_64__) && (!defined(__GNUC__) || defined(__SSE__))
- #define ALLOW_SSE 1
- #endif
- #endif
diff --git a/audio/audacity/patches/patch-al b/audio/audacity/patches/patch-al
deleted file mode 100644
index 10a72045868..00000000000
--- a/audio/audacity/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.5 2007/02/23 03:37:55 rillig Exp $
-
---- lib-src/soundtouch/soundtouch/STTypes.h.orig 2006-11-15 05:12:11.000000000 +0100
-+++ lib-src/soundtouch/soundtouch/STTypes.h 2007-02-23 04:23:13.000000000 +0100
-@@ -132,7 +132,7 @@ namespace soundtouch
- #define ALLOW_3DNOW 1
- #endif
-
-- #if (WIN32 || __i386__ || __x86_64__)
-+ #if (WIN32 || __i386__ || __x86_64__) && (!defined(__GNUC__) || defined(__SSE__))
- #define ALLOW_SSE 1
- #endif
- #endif
diff --git a/audio/aumix-gtk/DESCR b/audio/aumix-gtk/DESCR
deleted file mode 100644
index 5af2f29ce0c..00000000000
--- a/audio/aumix-gtk/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Aumix lets you adjust all the values from your audio mixer from an easy to
-use interface.
-
-This package is built with ncurses and GTK+ 2.0 support, to be used from the
-console or from within a graphical environment.
diff --git a/audio/aumix-gtk/Makefile b/audio/aumix-gtk/Makefile
deleted file mode 100644
index 67280669543..00000000000
--- a/audio/aumix-gtk/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2006/04/17 13:46:15 wiz Exp $
-
-.include "../../audio/aumix/Makefile.common"
-
-PKGNAME= ${DISTNAME:S/aumix/aumix-gtk/}
-PKGREVISION= 3
-
-COMMENT+= (ncurses and GTK+ 2.0 interfaces)
-
-CONFLICTS= aumix-[0-9]*
-
-USE_TOOLS+= pkg-config
-
-CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/^--without-gtk$//}
-
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/aumix/DESCR b/audio/aumix/DESCR
deleted file mode 100644
index 89464b0eccb..00000000000
--- a/audio/aumix/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Aumix lets you adjust all the values from your audio mixer from an easy to
-use interface.
-
-This package is built with ncurses support only.
diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
deleted file mode 100644
index 476370f7755..00000000000
--- a/audio/aumix/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2006/02/05 23:08:05 joerg Exp $
-
-.include "Makefile.common"
-
-PKGREVISION= 7
-
-COMMENT+= (ncurses interface only)
-
-CONFLICTS= aumix-gtk-[0-9]*
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/aumix/Makefile.common b/audio/aumix/Makefile.common
deleted file mode 100644
index ae98d91250f..00000000000
--- a/audio/aumix/Makefile.common
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile.common,v 1.3 2006/04/13 18:23:29 jlam Exp $
-
-DISTNAME= aumix-2.8
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aumix/} \
- http://jpj.net/~trevor/aumix/ \
- ${MASTER_SITE_SUNSITE:=apps/sound/mixers/} \
- ftp://aumix.sourceforge.net/pub/aumix/stable/ \
- http://jpj.net/~trevor/aumix/old/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= trevor@jpj.net
-HOMEPAGE= http://jpj.net/~trevor/aumix.html
-COMMENT= Set mix levels
-
-DISTINFO_FILE= ${.CURDIR}/../../audio/aumix/distinfo
-PATCHDIR= ${.CURDIR}/../../audio/aumix/patches
-PLIST_SRC= ${.CURDIR}/../../audio/aumix/PLIST
-
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= msgfmt
-GNU_CONFIGURE= yes
-
-CONFIGURE_ARGS+= --enable-own-labels
-CONFIGURE_ARGS+= --enable-nls
-CONFIGURE_ARGS+= --without-gtk1
-CONFIGURE_ARGS+= --without-gtk
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
diff --git a/audio/aumix/PLIST b/audio/aumix/PLIST
deleted file mode 100644
index 59ae55eaef3..00000000000
--- a/audio/aumix/PLIST
+++ /dev/null
@@ -1,26 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2006/04/17 07:07:11 jlam Exp $
-bin/aumix
-bin/mute
-bin/xaumix
-man/man1/aumix.1
-man/man1/xaumix.1
-share/aumix/ansi
-share/aumix/aumix.xpm
-share/aumix/fadein.set
-share/aumix/fadeout.set
-share/aumix/vt100
-share/aumix/xterm
-share/locale/de/LC_MESSAGES/aumix.mo
-share/locale/el/LC_MESSAGES/aumix.mo
-share/locale/es/LC_MESSAGES/aumix.mo
-share/locale/fr/LC_MESSAGES/aumix.mo
-share/locale/gl/LC_MESSAGES/aumix.mo
-share/locale/ja/LC_MESSAGES/aumix.mo
-share/locale/nl/LC_MESSAGES/aumix.mo
-share/locale/pl/LC_MESSAGES/aumix.mo
-share/locale/pt_BR/LC_MESSAGES/aumix.mo
-share/locale/ru/LC_MESSAGES/aumix.mo
-share/locale/sv/LC_MESSAGES/aumix.mo
-share/locale/uk/LC_MESSAGES/aumix.mo
-share/locale/zh_CN/LC_MESSAGES/aumix.mo
-@dirrm share/aumix
diff --git a/audio/aumix/distinfo b/audio/aumix/distinfo
deleted file mode 100644
index b6531f30fd2..00000000000
--- a/audio/aumix/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 20:39:43 agc Exp $
-
-SHA1 (aumix-2.8.tar.bz2) = 5cea563ae91f628433a1950a36efd23681da4bf4
-RMD160 (aumix-2.8.tar.bz2) = f7ab3737af772b97359dfc5d9852d06fda05aaa5
-Size (aumix-2.8.tar.bz2) = 157503 bytes
-SHA1 (patch-ad) = fc610f71143b892b68f798e3556bc756875dd26c
diff --git a/audio/aumix/patches/patch-ad b/audio/aumix/patches/patch-ad
deleted file mode 100644
index 5d368f7fef6..00000000000
--- a/audio/aumix/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2001/06/19 15:55:09 jlam Exp $
-
---- src/Makefile.in.orig Tue Jun 19 06:09:52 2001
-+++ src/Makefile.in
-@@ -88,9 +88,9 @@
- aumix_SOURCES = common.c curses.c dummy.c gpm-xterm.c gtk.c interactive.c mouse.c common.h curses.h gpm-xterm.h gtk.h interactive.h mouse.h play.xpm record.xpm
-
- localedir = $(datadir)/locale
--INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\" -I@includedir@
-+INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\"
- CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ @GTK_CFLAGS@
--LDADD = -L@libdir@
-+LDADD =
- LIBS = @LIBS@ @GTK_LIBS@ @INTLLIBS@
- DEFS = @DEFS@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/audio/bladeenc/DESCR b/audio/bladeenc/DESCR
deleted file mode 100644
index fc986d527a7..00000000000
--- a/audio/bladeenc/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-BladeEnc is a program to generate MP3 files from WAV or AIFF sound files.
-
-Any number of WAV/AIFF-files can be specified on the command-line and you
-can even use wildcards to specify more than one file at the same time. For
-example will the command "BladeEnc *.wav" compress all WAV-files in the
-current directory. Long filenames are supported when entering them on the
-command line, but if they include space-characters you will have to enclose
-them with quotation-marks ( " ).
diff --git a/audio/bladeenc/Makefile b/audio/bladeenc/Makefile
deleted file mode 100644
index b8a1754b4d3..00000000000
--- a/audio/bladeenc/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2007/01/07 09:13:46 rillig Exp $
-#
-
-DISTNAME= bladeenc-0.94.2-src-stable
-PKGNAME= bladeenc-0.94.2
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= http://bladeenc.mp3.no/source/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://bladeenc.mp3.no/
-COMMENT= Free MPEG Audio Layer 3 encoder (not decoder)
-
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-GNU_CONFIGURE= yes
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/bladeenc
- ${INSTALL_DATA} ${WRKSRC}/bladeenc.html ${PREFIX}/share/doc/html/bladeenc
- ${INSTALL_MAN} ${WRKSRC}/bladeenc.1 ${PREFIX}/${PKGMANDIR}/man1/
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/bladeenc/PLIST b/audio/bladeenc/PLIST
deleted file mode 100644
index 995016e62a0..00000000000
--- a/audio/bladeenc/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/14 00:39:58 jschauma Exp $
-bin/bladeenc
-man/man1/bladeenc.1
-share/doc/html/bladeenc/bladeenc.html
-@dirrm share/doc/html/bladeenc
diff --git a/audio/bladeenc/distinfo b/audio/bladeenc/distinfo
deleted file mode 100644
index cde89880547..00000000000
--- a/audio/bladeenc/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 20:39:43 agc Exp $
-
-SHA1 (bladeenc-0.94.2-src-stable.tar.gz) = 72f9b0600cbd2a19175ccb0cd8aa8e9c194bc87c
-RMD160 (bladeenc-0.94.2-src-stable.tar.gz) = 4e1e0c2e56abb2e6d87543c9569ecfde720fcf67
-Size (bladeenc-0.94.2-src-stable.tar.gz) = 142949 bytes
-SHA1 (patch-aa) = 6560446ae63234ad136ee869f25d0317c88d3e2d
diff --git a/audio/bladeenc/patches/patch-aa b/audio/bladeenc/patches/patch-aa
deleted file mode 100644
index ae5dd98d379..00000000000
--- a/audio/bladeenc/patches/patch-aa
+++ /dev/null
@@ -1,279 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2002/12/14 00:39:58 jschauma Exp $
-
---- /dev/null Fri Dec 13 19:19:07 2002
-+++ bladeenc.1 Fri Dec 13 19:31:00 2002
-@@ -0,0 +1,274 @@
-+.TH BLADEENC 1 "November 25th, 2001" "" "MP3 User's Manual"
-+
-+.SH NAME
-+bladeenc \- LGPL'd MP3 encoder
-+
-+.SH SYNOPSIS
-+\fBbladeenc\fR
-+[ \fIOPTION\fR... ] [ \fIWAV\-FILE\fR... ]
-+
-+.SH "DESCRIPTION"
-+.PP
-+\fBbladeenc\fR is a free, cross\-platform,
-+console\-based MP3 encoder, based on the ISO reference code. It is mostly
-+intended for high quality encoding in high bitrates.
-+
-+.SH "USAGE"
-+.PP
-+\fBbladeenc\fR is a console application that takes
-+its parameters from the commandline. Any number of WAV/AIFF\-files
-+can be specified on the commandline and you can even use wildcards
-+to specify more than one file at the same time.
-+Long filenames are
-+supported when entering them on the commandline, but if they include
-+space\-characters you will have to enclose the with quotation\-marks
-+( " ).
-+
-+.SH "OPTIONS"
-+.PP
-+Switches can be entered on the commandline together with the filenames.
-+In earlier versions of \fBBladeEnc\fR it didn't matter
-+where you put the switches since they always affected all files anyway,
-+but from \fBBladeEnc\fR 0.80 this has changed in order
-+to give you more flexibility.
-+.PP
-+You can get a list of all valid arguments by running \fBBladeEnc\fR
-+without any commandline arguments.
-+A summary of the options
-+supported by \fBbladeenc\fR
-+is included below.
-+.\" Begin List
-+.TP
-+\fB\-[\fR\fIbitrate\fR], \fB\-br [\fR\fIbitrate\fR]
-+Defines the bitrate for the MP3\-file. Higher bitrates gives better quality,
-+but also bigger files. Most people prefer to generate 128 kBit MP3s. Please
-+note that it's the total bitrate that is specified, so if you're generating a
-+stereo MP3\-file at 128 kBit you get 64 kBit for left channel and 64 kBit for
-+the right channel. The default setting is 128 kBit for stereo files and 64
-+kBit for mono files.
-+
-+Allowed bitrates are: 32, 40, 48, 56, 64, 80, 96, 112,
-+128, 160, 192, 224, 256 and 320.
-+.TP
-+\fB\-concat\fR
-+Concatenates the output generated from this file to the last mp3
-+generated, thus making one mp3 file from two or more sample
-+files. This option also automatically enables
-+\fI\-nogap\fR.
-+.TP
-+\fB\-crc\fR
-+Adds checksum data to each frame in the MP3 file. The checksum
-+data is useful for error\-correction when streaming the MP3 in
-+realtime over internet (as done by internet radio stations). It
-+lowers the quality of the sound slightly since the checksum data
-+also needs to fit in the specified bitrate and is not needed for
-+normal use.
-+.TP
-+\fB\-del, \-delete\fR
-+The WAV\-file is automatically deleted after having been encoded.
-+Be careful with this switch because the WAV\-file is deleted even
-+if the encoding process failed (for example due to insufficient
-+drive space).
-+.TP
-+\fB\-dm, \-mono\fR
-+Downmixes stereo input files to mono before they are compressed,
-+thus generating mono MP3 files. This switch does nothing if the
-+input file already is mono.
-+.TP
-+\fB\-lm, \-leftmono\fR
-+Takes only the left channel of the input file and encodes it
-+into a mono MP3. If the input file is mono it will be compressed
-+as it is.
-+.TP
-+\fB\-rm, \-rightmono\fR
-+Takes only the right channel of the input file and encodes it
-+into a mono MP3. If the input file is mono it will be compressed
-+as it is.
-+.TP
-+\fB\-swap\fR
-+Swaps the left and right channels of stereo input files before
-+encoding them.
-+.TP
-+\fB\-p, \-private\fR
-+Sets the private\-flag in the MP3\-file, specifying that this is a
-+private MP3. As far as I know there is no program that treats
-+private MP3's differently from normal ones so it is practically
-+useless.
-+
-+Setting this flag doesn't affect the encoding time, file size or
-+quality in any way, so set it if it makes you happy.
-+.TP
-+\fB\-c, \-copyright\fR
-+Sets the copyright\-flag in the MP3\-file, specifying that this is
-+a copyrighted MP3. As far as I know there is no program that
-+treats copyrighted MP3's differently from normal ones so it is
-+practically useless.
-+
-+Setting this flag doesn't affect the encoding time, file size or
-+quality in any way, so set it if it makes you happy.
-+.TP
-+\fB\-copy\fR
-+This switch clears the MP3 file's original\-flag that is set by
-+default from version 0.50 of \fBbladeenc\fR.
-+
-+Setting this flag doesn't affect the encoding time, file size or
-+quality in any way, so set it if it makes you happy.
-+.TP
-+\fB\-quiet\fR
-+Prevents \fBbladeenc\fR from doing any screen output, except for error
-+messages. This is mostly useful if you want to run bladeenc as a
-+background process on UNIX systems. The screen output takes
-+nearly no time at all, so you won't even save 1% by disabling
-+screen output. This switch is global only.
-+.TP
-+\fB\-q, \-quit\fR
-+Makes \fBbladeenc\fR quit automatically when all files have been
-+encoded. Normally \fBbladeenc\fR waits for someone to press RETURN
-+before quitting. This switch is global only.
-+.TP
-+\fB\-outdir=\fR\fIPATH\fR
-+Specifies an output path for the encoded files. Normally the MP3
-+files ends up in the same directory as their corresponding
-+WAV\-files resides in, but using this switch you can get them to
-+end up wherever you like. This switch is global only.
-+.TP
-+\fB\-prio=\fR\fISETTING\fR
-+Changes the task priority of \fBbladeenc\fR. Valid settings are
-+HIGHEST, HIGHER, NORMAL, LOWER, LOWEST and IDLE. \fBbladeenc\fR is by
-+default set to LOWEST priority which basically means that
-+BladeEnc functions fine in the background without disturbing or
-+slowing down any other program. Linux/Unix users can also
-+specify prio in the normal unix range of \-20 to +20.This switch
-+is global only. This setting is not available in all ports.
-+.TP
-+\fB\-rawfreq=\fR\fIFREQUENCY\fR
-+Specifies the frequency for raw samples in hertz. Default is 44100.
-+.TP
-+\fB\-rawbits=\fR\fISAMPLEBITS\fR
-+Specifies the number of bits for each sample in a raw sample
-+file. Allowed values are 8 and 16. Default is 16.
-+.TP
-+\fB\-rawmono\fR
-+Specifies that raw samples are mono, not stereo.
-+.TP
-+\fB\-rawstereo\fR
-+Specifies that raw samples are stereo, not mono. This
-+is default, so you won't have to use this switch unless you want to override a
-+global \-rawmono switch.
-+.TP
-+\fB\-rawsigned\fR
-+Specifies that raw samples are signed, i.e. contains values in
-+the range \-32768 to +32767 (16\-bit samples) or \-128 to +127
-+(8\-bit samples). This is default, so you won't have to use this
-+switch unless you want to override a global \-rawunsigned switch.
-+.TP
-+\fB\-rawunsigned\fR
-+Specifies that raw samples are unsigned, i.e. contains values in
-+the range 0 to 65535 (16\-bit samples) or 0 to 255 (8\-bit samples).
-+.TP
-+\fB\-rawbyteorder=\fR\fILITTLE|BIG\fR
-+Specifies the byteorder of raw samples. LITTLE gives
-+LITTLE_ENDIAN (Intel x86 style) and BIG gives BIG_ENDIAN
-+(Motorola style). Default is whatever is the native byteorder
-+for your system, so hopefully you won't have to use this switch.
-+.TP
-+\fB\-rawchannels=\fR\fI1|2\fR
-+Specifies the number of channels in a raw sample. \-rawchannels=1
-+gives the same result as \-rawmono and \-rawchannels=2 give the
-+same result as \-rawstereo. Default is 2.
-+.TP
-+\fB\-nocfg\fR
-+Ignore whatever is specified in the config file. This switch is global only.
-+.TP
-+\fB\-refresh=\fR\fI1+\fR
-+This switch is not supported anymore. It became superfluous due
-+to internal changes. \fBbladeenc\fR still understands (but ignores) it
-+for compatibility reasons.
-+.TP
-+\fB\-progress=\fR\fI0\-8\fR
-+Specifies which of the 7 available progress indicators to use or
-+turns the progress indicator off if set to 0. The default
-+progress indicator is number 1. Changing the progress indicator
-+doesn't affect the encoding in any way it just lets you
-+configure the look of \fBbladeenc\fR a little bit according to your
-+own taste:
-+.IP 0 3
-+Percentage and ETA shown for file and batch
-+(default).
-+.IP 1 3
-+Long bar for file progress.
-+.IP 2 3
-+Long bar for batch progress.
-+.IP 3 3
-+Short bars for file and batch progress.
-+.IP 4 3
-+Samples done/total for file and batch.
-+.IP 5 3
-+ETA shown for file and batch.
-+.IP 6 3
-+Seconds of MP3 generated from file (default for
-+RAW samples).
-+.IP 7 3
-+Alternative long bar for file progress. Doesn't rewind
-+the
-+cursor so it produces less output and works well when
-+redirecting program output to a file.
-+
-+If a RAW sample is included in the batch you automatically gets
-+progress indicator 7 for technical reasons. This switch is
-+global only.
-+.TP
-+\fB\-nogap\fR
-+Specifies that there should be no audiable gap between this and
-+the next sample if they are played after each other. Useful when
-+encoding records where the tracks blend into each other, but can
-+cause unwanted side effects otherwise. Please see the section
-+"Gapless encoding" below for more information.
-+.TP
-+\fB\-sort\fR
-+Sorts the specified input files according to filename before
-+encoding them. Useful when using the \-nogap switch combined with
-+wildcards since it's critical that the tracks are encoded in the
-+right order when doing gapless encoding. This switch is global
-+only.
-+.\" End List
-+
-+.SH "FILES"
-+.\" Begin List
-+.TP
-+\fI~/.bladeencrc\fR
-+The default settings of \fBbladeenc\fR can be changed in the configuration file.
-+The config file contains the same kind of switches as you enter on the commandline, separated by
-+one or more spaces, tabs or newlines.
-+
-+Anything placed after a '#' until the end of the line is believed to be a comment and is ignored.
-+
-+The switches in the configuration file are simply appended to the beginning of the commandline
-+before it is parsed.
-+
-+Anything typed on the commandline has higher priority than what is in the configuration file, so
-+the default settings can easily be overriden from the commandline.
-+
-+If the \-nocfg switch is entered on the commandline the configuration file will be ignored. The
-+\-nocfg switch is not allowed in the configuration file.
-+.\" End List
-+
-+.SH "BUGS"
-+.PP
-+Please report bugs to the author.
-+
-+.SH "SEE ALSO"
-+.PP
-+\fB
-+lame(1), grip(1), l3enc(1)
-+\fR
-+.PP
-+This program is documented in greater detail on the projects
-+homepage:
-+http://bladeenc.mp3.no/ (Link to \fIhttp://bladeenc.mp3.no/\fR)
-+
-+.SH "AUTHOR"
-+.PP
-+Tord Jansson <tord.jansson@swipnet.se>
-+.PP
-+This man\-page was written by Jan Schaumann <jschauma@netmeister.org>.
diff --git a/audio/bmp-esound/DESCR b/audio/bmp-esound/DESCR
deleted file mode 100644
index dd6108e4a79..00000000000
--- a/audio/bmp-esound/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-bmp-esound is an output plugin for the Beep Media Player program that
-allows it to output sound using the enlightened sound daemon (mainly
-used by the GNOME desktop).
diff --git a/audio/bmp-esound/Makefile b/audio/bmp-esound/Makefile
deleted file mode 100644
index bcede484916..00000000000
--- a/audio/bmp-esound/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2006/09/16 15:36:12 jmmv Exp $
-#
-
-BMP_USE_ESD:= yes
-.include "../../audio/bmp/Makefile.common"
-
-PKGNAME= ${DISTNAME:S/bmp/bmp-esound/}
-PKGREVISION= 1
-CATEGORIES+= gnome
-
-COMMENT= BMP plugin to output sound through the esound daemon
-
-DEPENDS+= bmp>=0.9.7.1:../../audio/bmp
-
-BUILD_DIRS= Output/esd
-
-.include "../../audio/esound/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/bmp-esound/PLIST b/audio/bmp-esound/PLIST
deleted file mode 100644
index 3c7cc3368ef..00000000000
--- a/audio/bmp-esound/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:14 jlam Exp $
-lib/bmp/Output/libesdout.la
-@comment in bmp: @dirrm lib/bmp/Output
diff --git a/audio/bmp-mac/DESCR b/audio/bmp-mac/DESCR
deleted file mode 100644
index 5167a296ff5..00000000000
--- a/audio/bmp-mac/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-bmp-mac: Monkey's Audio Codec plugin for beep media player!
diff --git a/audio/bmp-mac/Makefile b/audio/bmp-mac/Makefile
deleted file mode 100644
index bc521ea2aca..00000000000
--- a/audio/bmp-mac/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2007/02/23 15:36:28 joerg Exp $
-#
-
-DISTNAME= bmp-mac-0.1.1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mac-port/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://sourceforge.net/projects/mac-port/
-COMMENT= BMP plugin for Monkey's Audio files
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_LANGUAGES= c c++
-USE_TOOLS+= pkg-config
-
-.include "../../audio/bmp/buildlink3.mk"
-.include "../../audio/mac/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/bmp-mac/PLIST b/audio/bmp-mac/PLIST
deleted file mode 100644
index 6a63a82fe0e..00000000000
--- a/audio/bmp-mac/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/02/09 21:20:51 drochner Exp $
-lib/bmp/Input/libbmp-mac.la
-@comment in bmp: @dirrm lib/bmp/Input
diff --git a/audio/bmp-mac/distinfo b/audio/bmp-mac/distinfo
deleted file mode 100644
index af13dd3cf62..00000000000
--- a/audio/bmp-mac/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/02/09 21:20:51 drochner Exp $
-
-SHA1 (bmp-mac-0.1.1.tar.gz) = ca4130cf7c6ca0b3984d5209be8d757210ea1b2a
-RMD160 (bmp-mac-0.1.1.tar.gz) = 06bb646030a43b60c2d533cc7e80abbbbe2e31d0
-Size (bmp-mac-0.1.1.tar.gz) = 293918 bytes
diff --git a/audio/bmp-musepack/DESCR b/audio/bmp-musepack/DESCR
deleted file mode 100644
index 430824a3e0c..00000000000
--- a/audio/bmp-musepack/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-BMP plugin for Musepack (mpc) files.
diff --git a/audio/bmp-musepack/Makefile b/audio/bmp-musepack/Makefile
deleted file mode 100644
index 7385e662786..00000000000
--- a/audio/bmp-musepack/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2007/02/22 19:01:13 wiz Exp $
-#
-
-DISTNAME= bmp-musepack-1.1
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= http://www.saunalahti.fi/grimmel/musepack.net/linux/plugins/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.musepack.net/
-COMMENT= BMP plugin for Musepack (mpc) files
-
-USE_LANGUAGES= c c++
-USE_TOOLS+= pkg-config
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-
-.include "../../audio/bmp/buildlink3.mk"
-.include "../../audio/libmusepack/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/bmp-musepack/PLIST b/audio/bmp-musepack/PLIST
deleted file mode 100644
index 5a375ab0f9a..00000000000
--- a/audio/bmp-musepack/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/12/04 20:44:35 wiz Exp $
-lib/bmp/Input/libmpc.la
-@comment in bmp: @dirrm lib/bmp/Input
diff --git a/audio/bmp-musepack/distinfo b/audio/bmp-musepack/distinfo
deleted file mode 100644
index 080120b03e7..00000000000
--- a/audio/bmp-musepack/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:43 agc Exp $
-
-SHA1 (bmp-musepack-1.1.tar.bz2) = f1229f3f772986c541d71a3deb8292cec9565943
-RMD160 (bmp-musepack-1.1.tar.bz2) = 7bb347c0193d93d6aea8850175ef441ec57056b6
-Size (bmp-musepack-1.1.tar.bz2) = 205382 bytes
diff --git a/audio/bmp/DESCR b/audio/bmp/DESCR
deleted file mode 100644
index 8d53b84d6e0..00000000000
--- a/audio/bmp/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Beep Media Player is a fork of XMMS. Its primary goals are interface
-and usability, all based on the technology provided by GTK2+, while
-maintaining the skinned user interface.
diff --git a/audio/bmp/Makefile b/audio/bmp/Makefile
deleted file mode 100644
index ac512959158..00000000000
--- a/audio/bmp/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2006/09/16 15:36:12 jmmv Exp $
-#
-
-BMP_ENABLE_ENCODERS= yes
-
-.include "Makefile.common"
-
-PKGREVISION= 1
-
-DEPENDS+= unzip-[0-9]*:../../archivers/unzip
-
-.if ${OPSYS} == "Darwin"
-PLIST_SUBST+= CDAUDIO="@comment "
-.else
-PLIST_SUBST+= CDAUDIO=""
-.endif
-PRINT_PLIST_AWK+= /cdaudio/ { print "$${CDAUDIO}" $$0; next }
-
-# XXX Workaround a crash during shutdown that happens when dlclose(3)ing
-# any open plugin. libstdc++ gets dynamically linked in when the id3lib
-# library is loaded, and is the one causing problems. See PR pkg/26846
-# for more information.
-USE_LANGUAGES= c c++
-LDFLAGS.NetBSD+= -lstdc++ -lm
-
-.include "../../audio/id3lib/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/bmp/Makefile.common b/audio/bmp/Makefile.common
deleted file mode 100644
index 29dfd96ca4d..00000000000
--- a/audio/bmp/Makefile.common
+++ /dev/null
@@ -1,99 +0,0 @@
-# $NetBSD: Makefile.common,v 1.22 2006/12/27 13:37:35 joerg Exp $
-#
-
-DISTNAME= bmp-0.9.7.1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=beepmp/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://beepmp.sourceforge.net/
-COMMENT= Beep Media Player (fork of XMMS to work with GTK+ 2.x)
-
-DISTINFO_FILE= ${.CURDIR}/../../audio/bmp/distinfo
-FILESDIR= ${.CURDIR}/../../audio/xmms/files
-PATCHDIR= ${.CURDIR}/../../audio/bmp/patches
-PATCH_SITES= http://izb.knu.ac.kr/~bh/diffs/
-PATCHFILES= bmp-0.9.7-ipv6-simple.diff
-PATCH_DIST_STRIP+= -p1
-
-GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.1
-USE_LIBTOOL= yes
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= pkg-config
-
-BMP_USE_ESD?= no
-
-CONFIGURE_ARGS+= --disable-alsa
-.if !empty(BMP_USE_ESD:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+= --enable-esd
-.else
-CONFIGURE_ARGS+= --disable-esd
-.endif
-CONFIGURE_ARGS+= --disable-opengl
-.if defined(BMP_ENABLE_ENCODERS) && !empty(BMP_ENABLE_ENCODERS:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+= --enable-mp3
-CONFIGURE_ARGS+= --enable-ogg
-CONFIGURE_ARGS+= --enable-vorbis
-.else
-CONFIGURE_ARGS+= --disable-mp3
-CONFIGURE_ARGS+= --disable-oss
-CONFIGURE_ARGS+= --disable-vorbis
-.endif
-
-PKGCONFIG_OVERRIDE+= bmp.pc
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.bmp
-PKG_SUPPORTED_OPTIONS= gnome inet6 xmms-eq
-
-.include "../../mk/bsd.options.mk"
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(PKG_OPTIONS:Mgnome)
-CONFIGURE_ARGS+= --enable-gconf
-CONFIGURE_ARGS+= --enable-gnome-vfs
-. include "../../devel/GConf2/buildlink3.mk"
-. include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --enable-ipv6
-.endif
-
-.if !empty(PKG_OPTIONS:Mxmms-eq)
-CONFIGURE_ARGS+= --with-xmms-eq
-.endif
-
-.if ${OPSYS} == "NetBSD"
-RAWPART_cmd= /sbin/sysctl -n kern.rawpartition | ${TR} 0-9 a-j
-CONFIGURE_ARGS+= --with-dev-dsp=${DEVOSSSOUND:Q} \
- --with-cdda-device=/dev/rcd0${RAWPART_cmd:sh} \
- --with-cdda-dir=/cdrom/
-
-post-extract:
- ${RM} ${WRKSRC}/Output/OSS/soundcard.h
- ${LN} -s /usr/include/soundcard.h ${WRKSRC}/Output/OSS/soundcard.h
-
-. if ${MACHINE_ARCH} == "i386"
-post-patch:
-. if ${OBJECT_FMT} == "a.out"
- ${CP} ${FILESDIR}/decode_i586_.s ${WRKSRC}/Input/mpg123/decode_i586.s
-. endif
- cd ${WRKSRC}/Input/mpg123 && \
- ${MV} decode_i586.s decode_i586.s.orig && \
- ${SED} -e 's@^/@#/@g' <decode_i586.s.orig >decode_i586.s
-. endif
-.endif
-
-BUILDLINK_DEPMETHOD.libXt?= build
-
-.include "../../audio/libmikmod/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-
-.include "../../mk/oss.buildlink3.mk"
diff --git a/audio/bmp/PLIST b/audio/bmp/PLIST
deleted file mode 100644
index 6ef47bed50e..00000000000
--- a/audio/bmp/PLIST
+++ /dev/null
@@ -1,87 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2006/07/31 21:43:55 jmmv Exp $
-bin/beep-media-player
-include/bmp/beepctrl.h
-include/bmp/configdb.h
-include/bmp/configfile.h
-include/bmp/dirbrowser.h
-include/bmp/formatter.h
-include/bmp/fullscreen.h
-include/bmp/plugin.h
-include/bmp/rcfile.h
-include/bmp/titlestring.h
-include/bmp/util.h
-include/bmp/vfs.h
-${CDAUDIO}lib/bmp/Input/libcdaudio.la
-lib/bmp/Input/libmpg123.la
-lib/bmp/Input/libvorbis.la
-lib/bmp/Input/libwav.la
-lib/bmp/Output/libOSS.la
-lib/bmp/Visualization/libbscope.la
-lib/libbeep.la
-lib/pkgconfig/bmp.pc
-man/man1/beep-media-player.1
-share/applications/bmp.desktop
-share/bmp/Skins/Default/README
-share/bmp/Skins/Default/balance.bmp
-share/bmp/Skins/Default/cbuttons.bmp
-share/bmp/Skins/Default/eq_ex.bmp
-share/bmp/Skins/Default/eqmain.bmp
-share/bmp/Skins/Default/main.bmp
-share/bmp/Skins/Default/monoster.bmp
-share/bmp/Skins/Default/nums_ex.bmp
-share/bmp/Skins/Default/playpaus.bmp
-share/bmp/Skins/Default/pledit.bmp
-share/bmp/Skins/Default/pledit.txt
-share/bmp/Skins/Default/posbar.bmp
-share/bmp/Skins/Default/shufrep.bmp
-share/bmp/Skins/Default/text.bmp
-share/bmp/Skins/Default/titlebar.bmp
-share/bmp/Skins/Default/viscolor.txt
-share/bmp/Skins/Default/volume.bmp
-share/bmp/glade/addfiles.glade
-share/bmp/glade/prefswin.glade
-share/bmp/images/appearance.png
-share/bmp/images/eq.png
-share/bmp/images/mouse.png
-share/bmp/images/playlist.png
-share/bmp/images/plugins.png
-share/locale/br/LC_MESSAGES/bmp.mo
-share/locale/cs/LC_MESSAGES/bmp.mo
-share/locale/cy/LC_MESSAGES/bmp.mo
-share/locale/de/LC_MESSAGES/bmp.mo
-share/locale/el/LC_MESSAGES/bmp.mo
-share/locale/es/LC_MESSAGES/bmp.mo
-share/locale/fi/LC_MESSAGES/bmp.mo
-share/locale/fr/LC_MESSAGES/bmp.mo
-share/locale/hi/LC_MESSAGES/bmp.mo
-share/locale/hu/LC_MESSAGES/bmp.mo
-share/locale/it/LC_MESSAGES/bmp.mo
-share/locale/ja/LC_MESSAGES/bmp.mo
-share/locale/ka/LC_MESSAGES/bmp.mo
-share/locale/ko/LC_MESSAGES/bmp.mo
-share/locale/lt/LC_MESSAGES/bmp.mo
-share/locale/mk/LC_MESSAGES/bmp.mo
-share/locale/nl/LC_MESSAGES/bmp.mo
-share/locale/pl/LC_MESSAGES/bmp.mo
-share/locale/pt_BR/LC_MESSAGES/bmp.mo
-share/locale/ro/LC_MESSAGES/bmp.mo
-share/locale/ru/LC_MESSAGES/bmp.mo
-share/locale/sk/LC_MESSAGES/bmp.mo
-share/locale/sv/LC_MESSAGES/bmp.mo
-share/locale/uk/LC_MESSAGES/bmp.mo
-share/locale/zh_CN/LC_MESSAGES/bmp.mo
-share/locale/zh_TW/LC_MESSAGES/bmp.mo
-share/pixmaps/bmp.png
-@comment in xdg-dirs: @dirrm share/pixmaps
-@comment in xdg-dirs: @dirrm share/icons
-@dirrm share/bmp/images
-@dirrm share/bmp/glade
-@dirrm share/bmp/Skins/Default
-@dirrm share/bmp/Skins
-@dirrm share/bmp
-@comment in xdg-dirs: @dirrm share/applications
-@dirrm lib/bmp/Visualization
-@dirrm lib/bmp/Output
-@dirrm lib/bmp/Input
-@dirrm lib/bmp
-@dirrm include/bmp
diff --git a/audio/bmp/buildlink3.mk b/audio/bmp/buildlink3.mk
deleted file mode 100644
index 447eaf317be..00000000000
--- a/audio/bmp/buildlink3.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:35 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-BMP_BUILDLINK3_MK:= ${BMP_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= bmp
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbmp}
-BUILDLINK_PACKAGES+= bmp
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bmp
-
-.if !empty(BMP_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.bmp+= bmp>=0.9.7rc2nb3
-BUILDLINK_ABI_DEPENDS.bmp?= bmp>=0.9.7nb5
-BUILDLINK_PKGSRCDIR.bmp?= ../../audio/bmp
-
-PRINT_PLIST_AWK+= /^@dirrm lib\/bmp\/Input$$/ \
- { print "@comment in bmp: " $$0; next; }
-PRINT_PLIST_AWK+= /^@dirrm lib\/bmp\/Output$$/ \
- { print "@comment in bmp: " $$0; next; }
-PRINT_PLIST_AWK+= /^@dirrm lib\/bmp\/Visualization$$/ \
- { print "@comment in bmp: " $$0; next; }
-.endif # BMP_BUILDLINK3_MK
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/bmp/distinfo b/audio/bmp/distinfo
deleted file mode 100644
index f13007a0585..00000000000
--- a/audio/bmp/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: distinfo,v 1.12 2006/07/31 21:43:55 jmmv Exp $
-
-SHA1 (bmp-0.9.7-ipv6-simple.diff) = d80943d504eeb06d96c2ca73ecc80a89b77e7c77
-RMD160 (bmp-0.9.7-ipv6-simple.diff) = 96072b98f774ed8614818664d0fe173ea5a3e4e5
-Size (bmp-0.9.7-ipv6-simple.diff) = 8660 bytes
-SHA1 (bmp-0.9.7.1.tar.gz) = ab6444b9a35a8bb8e920a781e72d963a3fb60547
-RMD160 (bmp-0.9.7.1.tar.gz) = 9288083918913ca97ab8883d616159055931ade7
-Size (bmp-0.9.7.1.tar.gz) = 2056564 bytes
-SHA1 (patch-aa) = fbaa61ef68857c12b4506180a9d8d290dbf6615f
-SHA1 (patch-an) = da55750c5ee50acfd25e695813bfc025c4fc7b5f
-SHA1 (patch-ao) = c24712090587ff622d7b9df68757c984a057c6c2
-SHA1 (patch-ap) = 76d750aa820e9710d2520d3cec067d91346dc5aa
-SHA1 (patch-aq) = 56f42dbd772304f9205b519b2654487b9a45091b
-SHA1 (patch-ar) = 037d02b72cee6b2fdd24f9d41c28ec1220dcdf67
-SHA1 (patch-as) = dc1d9dc2100664c1ab4448234239d45741907604
diff --git a/audio/bmp/hacks.mk b/audio/bmp/hacks.mk
deleted file mode 100644
index e5b9cce34ef..00000000000
--- a/audio/bmp/hacks.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2006/08/07 11:21:45 wiz Exp $
-
-.include "../../mk/compiler.mk"
-
-# gcc 4.x generates code that produces background noise during playback.
-# Disabling optimizations when using this compiler solves the problem.
-.if !empty(CC_VERSION:Mgcc-4*)
-CFLAGS+= -O0
-CXXFLAGS+= -O0
-.endif
diff --git a/audio/bmp/patches/patch-aa b/audio/bmp/patches/patch-aa
deleted file mode 100644
index ec61dbb7aca..00000000000
--- a/audio/bmp/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/07/31 21:43:55 jmmv Exp $
-
---- beep/softvolume.c.orig 2004-06-20 20:48:54.000000000 +0200
-+++ beep/softvolume.c
-@@ -117,7 +117,7 @@ soft_volume_set(SoftVolumeConfig * c, gi
- *
- **************************************************************************/
-
--G_INLINE_FUNC void
-+inline void
- effect_16bit(gint max, gint min, guint length, gint16 * sdata,
- SoftVolumeConfig * c)
- {
-@@ -139,7 +139,7 @@ effect_16bit(gint max, gint min, guint l
- *
- **************************************************************************/
-
--G_INLINE_FUNC void
-+inline void
- effect_8bit(gint max, gint min, guint length, gint8 * sdata,
- SoftVolumeConfig * c)
- {
diff --git a/audio/bmp/patches/patch-an b/audio/bmp/patches/patch-an
deleted file mode 100644
index 9ff8775b3c5..00000000000
--- a/audio/bmp/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1 2004/05/15 09:34:53 jmmv Exp $
-
---- configure.orig 2003-12-24 20:16:01.000000000 +0100
-+++ configure
-@@ -30074,7 +30074,7 @@ fi
- done
-
-
--for ac_func in getmntinfo
-+for ac_func in statvfs getmntinfo
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_func" >&5
diff --git a/audio/bmp/patches/patch-ao b/audio/bmp/patches/patch-ao
deleted file mode 100644
index 8101101932c..00000000000
--- a/audio/bmp/patches/patch-ao
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2004/08/31 15:47:56 jmmv Exp $
-
---- config.h.in.orig 2004-08-22 15:50:43.000000000 +0200
-+++ config.h.in
-@@ -180,6 +180,9 @@
- /* Define to 1 if you have the `setlocale' function. */
- #undef HAVE_SETLOCALE
-
-+/* Define to 1 if you have the `statvfs' function. */
-+#undef HAVE_STATVFS
-+
- /* Define to 1 if you have the <stddef.h> header file. */
- #undef HAVE_STDDEF_H
-
diff --git a/audio/bmp/patches/patch-ap b/audio/bmp/patches/patch-ap
deleted file mode 100644
index caa667f9495..00000000000
--- a/audio/bmp/patches/patch-ap
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ap,v 1.2 2004/05/28 19:20:39 jmmv Exp $
-
---- Input/cdaudio/cdaudio.c.orig 2003-12-24 14:27:54.000000000 +0100
-+++ Input/cdaudio/cdaudio.c
-@@ -553,7 +553,11 @@ extern gboolean is_mounted(const char *d
- FILE *mounts;
- struct mntent *mnt;
- #elif defined(HAVE_GETMNTINFO)
-+#if defined(__NetBSD__) && defined(HAVE_STATVFS)
-+ struct statvfs *fsp;
-+#else
- struct statfs *fsp;
-+#endif
- int entries;
- #endif
-
diff --git a/audio/bmp/patches/patch-aq b/audio/bmp/patches/patch-aq
deleted file mode 100644
index e2902ffe48e..00000000000
--- a/audio/bmp/patches/patch-aq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aq,v 1.4 2006/07/31 21:43:55 jmmv Exp $
-
---- Output/OSS/Makefile.in.orig 2005-10-22 12:45:02.000000000 +0200
-+++ Output/OSS/Makefile.in
-@@ -295,7 +295,7 @@ soundcard.h
- EXTRA_DIST = $(osssources)
- lib_LTLIBRARIES = $(ossltlibs)
- libOSS_la_LDFLAGS = @PLUGIN_LDFLAGS@
--libOSS_la_LIBADD = @GTK_LIBS@
-+libOSS_la_LIBADD = @GTK_LIBS@ $(LIBOSSAUDIO)
- libOSS_la_SOURCES = $(ossbuildsources)
- INCLUDES = $(GTK_CFLAGS) -I$(top_builddir)/intl -I$(top_srcdir)
- all: all-am
diff --git a/audio/bmp/patches/patch-ar b/audio/bmp/patches/patch-ar
deleted file mode 100644
index 49eaf92aada..00000000000
--- a/audio/bmp/patches/patch-ar
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ar,v 1.3 2004/12/25 15:22:37 jmmv Exp $
-
---- Input/cdaudio/Makefile.in.orig 2004-12-11 21:22:34.000000000 +0100
-+++ Input/cdaudio/Makefile.in
-@@ -306,7 +306,7 @@ EXTRA_DIST = $(cdaudiosources)
- lib_LTLIBRARIES = $(cdaudioltlibs)
- INCLUDES = @GTK_CFLAGS@ @GCONF_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir)
- libcdaudio_la_LDFLAGS = @PLUGIN_LDFLAGS@
--libcdaudio_la_LIBADD = @GTK_LIBS@
-+libcdaudio_la_LIBADD = @GTK_LIBS@ $(LIBOSSAUDIO)
- libcdaudio_la_SOURCES = $(cdaudiobuildsources)
- all: all-am
-
diff --git a/audio/bmp/patches/patch-as b/audio/bmp/patches/patch-as
deleted file mode 100644
index 7292649f6ea..00000000000
--- a/audio/bmp/patches/patch-as
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-as,v 1.2 2004/12/25 15:22:37 jmmv Exp $
-
---- beep/controlsocket.c.orig 2004-12-04 13:05:16.000000000 +0100
-+++ beep/controlsocket.c
-@@ -31,6 +31,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/un.h>
-+#include <time.h>
-
- #include "main.h"
- #include "equalizer.h"
diff --git a/audio/bmpx/DESCR b/audio/bmpx/DESCR
deleted file mode 100644
index 338b0c4eb51..00000000000
--- a/audio/bmpx/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-BMPx is a media player that features support for specifications
-like XDS DnD, XSPF and DBus. BMPx is highly interoperable and
-integrates well with other applications and a variety of desktop
-environments.
diff --git a/audio/bmpx/Makefile b/audio/bmpx/Makefile
deleted file mode 100644
index 6a46b7d11b6..00000000000
--- a/audio/bmpx/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2007/03/21 12:05:41 wiz Exp $
-#
-
-DISTNAME= bmpx-0.36.1
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= http://files.beep-media-player.org/releases/0.36/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://beep-media-player.org/site/BMPx_Homepage
-COMMENT= Audio player to be used with a frontend or as a daemon
-
-DEPENDS+= zip-[0-9]*:../../archivers/zip
-
-GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.2 kde3-1.0
-USE_LANGUAGES= c c++
-USE_TOOLS+= bison gmake intltool msgfmt pkg-config
-USE_LIBTOOL= yes
-USE_PKGLOCALEDIR= yes
-CONFIGURE_ARGS+= --enable-mp4v2
-CONFIGURE_ARGS+= --with-mp4v2-dir=${LOCALBASE}
-CONFIGURE_ENV+= BOOST_REGEX_LIBS=-lboost_regex-mt
-CPPFLAGS+= -I${LOCALBASE}/include/cdparanoia
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
-CPPFLAGS+= -DSQLITE_THREAD_OVERRIDE_LOCK=0
-.endif
-
-.if ${OPSYS} != "DragonFly"
-SQLITE_PTHREAD= ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS}
-MAKE_ENV+= SQLITE_PTHREAD=${SQLITE_PTHREAD:Q}
-.endif
-
-BUILDLINK_API_DEPENDS.cairomm+= cairomm>=0.6.0
-BUILDLINK_API_DEPENDS.glib2+= glib2>=2.10.0
-BUILDLINK_API_DEPENDS.glibmm+= glibmm>=2.8.3
-BUILDLINK_API_DEPENDS.gst-plugins0.10-base+= gst-plugins0.10-base>=0.10.1
-BUILDLINK_API_DEPENDS.gstreamer0.10+= gstreamer0.10>=0.10.9
-BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.4.0
-BUILDLINK_API_DEPENDS.gtkmm+= gtkmm>=2.8.0
-BUILDLINK_API_DEPENDS.libglademm+= libglademm>=2.6.0
-BUILDLINK_API_DEPENDS.librsvg2+= librsvg2>=2.12.6nb1
-BUILDLINK_API_DEPENDS.musicbrainz+= musicbrainz>=2.1.1
-BUILDLINK_API_DEPENDS.startup-notification+= startup-notification>=0.8
-BUILDLINK_API_DEPENDS.taglib+= taglib>=1.4
-
-.include "../../audio/cdparanoia/buildlink3.mk"
-.include "../../audio/libofa/buildlink3.mk"
-.include "../../audio/taglib/buildlink3.mk"
-.include "../../audio/musicbrainz/buildlink3.mk"
-.include "../../devel/boost-libs/buildlink3.mk"
-.include "../../devel/glibmm/buildlink3.mk"
-.include "../../devel/libglademm/buildlink3.mk"
-.include "../../graphics/cairomm/buildlink3.mk"
-.include "../../graphics/librsvg2/buildlink3.mk"
-.include "../../multimedia/libmp4v2/buildlink3.mk"
-.include "../../sysutils/dbus/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../www/neon/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/gtkmm/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
-.include "../../mk/fam.buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
-.include "../../multimedia/gstreamer0.10/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/bmpx/PLIST b/audio/bmpx/PLIST
deleted file mode 100644
index 8c4b45b9ad2..00000000000
--- a/audio/bmpx/PLIST
+++ /dev/null
@@ -1,298 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/02/09 21:04:00 drochner Exp $
-bin/beep-media-player-2
-bin/bmp-enqueue-files-2.0
-bin/bmp-enqueue-uris-2.0
-bin/bmp-play-files-2.0
-bin/bmp-play-lastfm-2.0
-bin/bmp2
-include/bmp-2.0/bmp/base_types.hh
-include/bmp-2.0/bmp/bmp.hh
-include/bmp-2.0/bmp/database_types.hh
-include/bmp-2.0/bmp/dbus.hh
-include/bmp-2.0/bmp/library_types.hh
-lib/bmpx/plugins/taglib/libtaglib_plugin_audible.la
-lib/bmpx/plugins/taglib/libtaglib_plugin_flac.la
-lib/bmpx/plugins/taglib/libtaglib_plugin_mp3.la
-lib/bmpx/plugins/taglib/libtaglib_plugin_mp4.la
-lib/bmpx/plugins/taglib/libtaglib_plugin_mpc.la
-lib/bmpx/plugins/taglib/libtaglib_plugin_ogg.la
-lib/bmpx/plugins/taglib/libtaglib_plugin_rmff.la
-lib/bmpx/plugins/taglib/libtaglib_plugin_wma.la
-lib/bmpx/plugins/vfs/container/libcontainer_folder.la
-lib/bmpx/plugins/vfs/container/libcontainer_m3u.la
-lib/bmpx/plugins/vfs/container/libcontainer_mlq.la
-lib/bmpx/plugins/vfs/container/libcontainer_pls.la
-lib/bmpx/plugins/vfs/container/libcontainer_query.la
-lib/bmpx/plugins/vfs/container/libcontainer_xspf.la
-lib/bmpx/plugins/vfs/transport/libtransport_file.la
-lib/bmpx/plugins/vfs/transport/libtransport_http.la
-lib/pkgconfig/bmp-2.0.pc
-libexec/beep-media-player-2-bin
-libexec/beep-media-player-2-sentinel
-man/man1/beep-media-player-2.1
-share/applications/bmp-2.0-offline.desktop
-share/applications/bmp-2.0.desktop
-share/applications/bmp-enqueue-2.0.desktop
-share/applications/bmp-play-2.0.desktop
-share/bmpx/data/GPL.txt
-share/bmpx/glade/dialog-add-podcast.glade
-share/bmpx/glade/dialog-export.glade
-share/bmpx/glade/dialog-filebrowser.glade
-share/bmpx/glade/dialog-filelist.glade
-share/bmpx/glade/dialog-gaim-send-file.glade
-share/bmpx/glade/dialog-gsterror.glade
-share/bmpx/glade/dialog-lastfm-recommend.glade
-share/bmpx/glade/dialog-lyrics.glade
-share/bmpx/glade/dialog-progress.glade
-share/bmpx/glade/library-ui-create-collection.glade
-share/bmpx/glade/library-ui-modify-import.glade
-share/bmpx/glade/library-ui-relocate-album.glade
-share/bmpx/glade/main-ui.glade
-share/bmpx/glade/preferences-ui.glade
-share/bmpx/icons/themes/darksphere/icon_player_128.png
-share/bmpx/icons/themes/darksphere/icon_player_16.png
-share/bmpx/icons/themes/darksphere/icon_player_32.png
-share/bmpx/icons/themes/darksphere/icon_player_48.png
-share/bmpx/icons/themes/darksphere/icon_player_64.png
-share/bmpx/icons/themes/darksphere/icon_playlist_128.png
-share/bmpx/icons/themes/darksphere/icon_playlist_16.png
-share/bmpx/icons/themes/darksphere/icon_playlist_32.png
-share/bmpx/icons/themes/darksphere/icon_playlist_48.png
-share/bmpx/icons/themes/darksphere/icon_playlist_64.png
-share/bmpx/icons/themes/display/icon_player_128.png
-share/bmpx/icons/themes/display/icon_player_16.png
-share/bmpx/icons/themes/display/icon_player_32.png
-share/bmpx/icons/themes/display/icon_player_48.png
-share/bmpx/icons/themes/display/icon_player_64.png
-share/bmpx/icons/themes/display/icon_playlist_128.png
-share/bmpx/icons/themes/display/icon_playlist_16.png
-share/bmpx/icons/themes/display/icon_playlist_32.png
-share/bmpx/icons/themes/display/icon_playlist_48.png
-share/bmpx/icons/themes/display/icon_playlist_64.png
-share/bmpx/icons/themes/plastic/icon_player_128.png
-share/bmpx/icons/themes/plastic/icon_player_16.png
-share/bmpx/icons/themes/plastic/icon_player_32.png
-share/bmpx/icons/themes/plastic/icon_player_48.png
-share/bmpx/icons/themes/plastic/icon_player_64.png
-share/bmpx/icons/themes/plastic/icon_playlist_128.png
-share/bmpx/icons/themes/plastic/icon_playlist_16.png
-share/bmpx/icons/themes/plastic/icon_playlist_32.png
-share/bmpx/icons/themes/plastic/icon_playlist_48.png
-share/bmpx/icons/themes/plastic/icon_playlist_64.png
-share/bmpx/icons/themes/red/icon_library_128.png
-share/bmpx/icons/themes/red/icon_library_16.png
-share/bmpx/icons/themes/red/icon_library_32.png
-share/bmpx/icons/themes/red/icon_library_48.png
-share/bmpx/icons/themes/red/icon_library_64.png
-share/bmpx/icons/themes/red/icon_player_128.png
-share/bmpx/icons/themes/red/icon_player_16.png
-share/bmpx/icons/themes/red/icon_player_32.png
-share/bmpx/icons/themes/red/icon_player_48.png
-share/bmpx/icons/themes/red/icon_player_64.png
-share/bmpx/icons/themes/red/icon_playlist_128.png
-share/bmpx/icons/themes/red/icon_playlist_16.png
-share/bmpx/icons/themes/red/icon_playlist_32.png
-share/bmpx/icons/themes/red/icon_playlist_48.png
-share/bmpx/icons/themes/red/icon_playlist_64.png
-share/bmpx/icons/themes/red/icon_streams_128.png
-share/bmpx/icons/themes/red/icon_streams_16.png
-share/bmpx/icons/themes/red/icon_streams_32.png
-share/bmpx/icons/themes/red/icon_streams_48.png
-share/bmpx/icons/themes/red/icon_streams_64.png
-share/bmpx/icons/themes/tango/icon_library_128.png
-share/bmpx/icons/themes/tango/icon_library_16.png
-share/bmpx/icons/themes/tango/icon_library_32.png
-share/bmpx/icons/themes/tango/icon_library_48.png
-share/bmpx/icons/themes/tango/icon_library_64.png
-share/bmpx/icons/themes/tango/icon_player_128.png
-share/bmpx/icons/themes/tango/icon_player_16.png
-share/bmpx/icons/themes/tango/icon_player_32.png
-share/bmpx/icons/themes/tango/icon_player_48.png
-share/bmpx/icons/themes/tango/icon_player_64.png
-share/bmpx/icons/themes/tango/icon_playlist_128.png
-share/bmpx/icons/themes/tango/icon_playlist_16.png
-share/bmpx/icons/themes/tango/icon_playlist_32.png
-share/bmpx/icons/themes/tango/icon_playlist_48.png
-share/bmpx/icons/themes/tango/icon_playlist_64.png
-share/bmpx/icons/themes/tango/icon_streams_128.png
-share/bmpx/icons/themes/tango/icon_streams_16.png
-share/bmpx/icons/themes/tango/icon_streams_32.png
-share/bmpx/icons/themes/tango/icon_streams_48.png
-share/bmpx/icons/themes/tango/icon_streams_64.png
-share/bmpx/icons/tray-icons/tray-icon-default.png
-share/bmpx/icons/tray-icons/tray-icon-exit.png
-share/bmpx/icons/tray-icons/tray-icon-paused.png
-share/bmpx/icons/tray-icons/tray-icon-playing.png
-share/bmpx/images/audio-default.png
-share/bmpx/images/audio-empty.png
-share/bmpx/images/audio-multiple.png
-share/bmpx/images/blue-speaker.png
-share/bmpx/images/cdda/audiocd-big.png
-share/bmpx/images/cdda/audiocd-unplayable.png
-share/bmpx/images/collections/collection.png
-share/bmpx/images/hal/dev-cdrom.png
-share/bmpx/images/hal/dev-volume-1394.png
-share/bmpx/images/hal/dev-volume-ide.png
-share/bmpx/images/hal/dev-volume-usb.png
-share/bmpx/images/hal/device-camera.png
-share/bmpx/images/hal/device-cdrom.png
-share/bmpx/images/hal/device-cf-card.png
-share/bmpx/images/hal/device-floppy.png
-share/bmpx/images/hal/device-harddrive-1394.png
-share/bmpx/images/hal/device-harddrive-usb.png
-share/bmpx/images/hal/device-harddrive.png
-share/bmpx/images/hal/device-ipod.png
-share/bmpx/images/hal/device-ms.png
-share/bmpx/images/hal/device-removable-1394.png
-share/bmpx/images/hal/device-removable-usb.png
-share/bmpx/images/hal/device-removable.png
-share/bmpx/images/hal/device-sdmmc-card.png
-share/bmpx/images/hal/device-sm-card.png
-share/bmpx/images/lastfm/audioscrobbler.png
-share/bmpx/images/lastfm/header-logo-left.png
-share/bmpx/images/lastfm/header-logo-right.png
-share/bmpx/images/lastfm/header-logo-slice.png
-share/bmpx/images/lastfm/lastfm-album.png
-share/bmpx/images/lastfm/lastfm-artist.png
-share/bmpx/images/lastfm/lastfm-friend.png
-share/bmpx/images/lastfm/lastfm-mainuser.png
-share/bmpx/images/lastfm/lastfm-neighbour.png
-share/bmpx/images/lastfm/lastfm-net-idle.png
-share/bmpx/images/lastfm/lastfm-net-rx.png
-share/bmpx/images/lastfm/lastfm-net-tx.png
-share/bmpx/images/lastfm/lastfm-station-small.png
-share/bmpx/images/lastfm/lastfm-station.png
-share/bmpx/images/lastfm/lastfm-tag.png
-share/bmpx/images/lastfm/lastfm-track.png
-share/bmpx/images/lastfm/lastfm-user.png
-share/bmpx/images/library/new.png
-share/bmpx/images/logo-about.png
-share/bmpx/images/logo-splash.png
-share/bmpx/images/main/add.png
-share/bmpx/images/main/header-logo-left.png
-share/bmpx/images/main/header-logo-right.png
-share/bmpx/images/main/header-logo-slice.png
-share/bmpx/images/main/playing.png
-share/bmpx/images/main/remove.png
-share/bmpx/images/main/warning.png
-share/bmpx/images/main/yingyang.gif
-share/bmpx/images/main/yingyang_paused.gif
-share/bmpx/images/main/yingyang_seeking.png
-share/bmpx/images/podcast/feed-default.png
-share/bmpx/images/preferences/library.png
-share/bmpx/images/preferences/misc.png
-share/bmpx/images/preferences/musicbrainz.png
-share/bmpx/images/preferences/playback.png
-share/bmpx/images/preferences/podcasts.png
-share/bmpx/images/rating/stars_0.png
-share/bmpx/images/rating/stars_1.png
-share/bmpx/images/rating/stars_2.png
-share/bmpx/images/rating/stars_3.png
-share/bmpx/images/rating/stars_4.png
-share/bmpx/images/rating/stars_5.png
-share/bmpx/images/stock/approve-partial.png
-share/bmpx/images/stock/approve.png
-share/bmpx/images/stock/audio.png
-share/bmpx/images/stock/bmp.png
-share/bmpx/images/stock/cdrom.png
-share/bmpx/images/stock/entry-clear.png
-share/bmpx/images/stock/lastfm-ban.png
-share/bmpx/images/stock/lastfm-love.png
-share/bmpx/images/stock/lastfm-skip.png
-share/bmpx/images/stock/lastfm.png
-share/bmpx/images/stock/library.png
-share/bmpx/images/stock/museek.png
-share/bmpx/images/stock/musicbrainz.png
-share/bmpx/images/stock/playlist.png
-share/bmpx/images/stock/shoutcast.png
-share/bmpx/images/stock/silk-add.png
-share/bmpx/images/stock/silk-application_edit.png
-share/bmpx/images/stock/silk-attach.png
-share/bmpx/images/stock/silk-cart_put.png
-share/bmpx/images/stock/silk-cd_add.png
-share/bmpx/images/stock/silk-cd_delete.png
-share/bmpx/images/stock/silk-cd_edit.png
-share/bmpx/images/stock/silk-cd_go.png
-share/bmpx/images/stock/silk-cog.png
-share/bmpx/images/stock/silk-control_pause_blue.png
-share/bmpx/images/stock/silk-control_play_blue.png
-share/bmpx/images/stock/silk-control_stop_blue.png
-share/bmpx/images/stock/silk-delete.png
-share/bmpx/images/stock/silk-drive.png
-share/bmpx/images/stock/silk-exclamation.png
-share/bmpx/images/stock/silk-feed.png
-share/bmpx/images/stock/silk-feed_add.png
-share/bmpx/images/stock/silk-feed_delete.png
-share/bmpx/images/stock/silk-folder_star.png
-share/bmpx/images/stock/silk-html.png
-share/bmpx/images/stock/silk-mod-server_down.png
-share/bmpx/images/stock/silk-mod-server_up.png
-share/bmpx/images/stock/silk-new.png
-share/bmpx/images/stock/silk-picture.png
-share/bmpx/images/stock/silk-plugin.png
-share/bmpx/images/stock/silk-plugin_disabled.png
-share/bmpx/images/stock/silk-tag_blue_add.png
-share/bmpx/images/stock/silk-tag_blue_delete.png
-share/bmpx/images/stock/tag.png
-share/bmpx/images/stock/xiph.png
-share/bmpx/images/svg/button-background.svg
-share/bmpx/images/svg/button-glow-overlay.svg
-share/bmpx/images/svg/button-outline.svg
-share/bmpx/images/throbber.gif
-share/dbus-1/services/org.beepmediaplayer.bmp.service
-share/dbus-1/services/org.beepmediaplayer.sentinel.service
-share/icons/hicolor/48x48/apps/bmpx.png
-share/locale/af/LC_MESSAGES/bmpx.mo
-share/locale/cs/LC_MESSAGES/bmpx.mo
-share/locale/de/LC_MESSAGES/bmpx.mo
-share/locale/el/LC_MESSAGES/bmpx.mo
-share/locale/es/LC_MESSAGES/bmpx.mo
-share/locale/et/LC_MESSAGES/bmpx.mo
-share/locale/fi/LC_MESSAGES/bmpx.mo
-share/locale/fr/LC_MESSAGES/bmpx.mo
-share/locale/hu/LC_MESSAGES/bmpx.mo
-share/locale/it/LC_MESSAGES/bmpx.mo
-share/locale/ja/LC_MESSAGES/bmpx.mo
-share/locale/ka/LC_MESSAGES/bmpx.mo
-share/locale/lt/LC_MESSAGES/bmpx.mo
-share/locale/nl/LC_MESSAGES/bmpx.mo
-share/locale/pl/LC_MESSAGES/bmpx.mo
-share/locale/pt_BR/LC_MESSAGES/bmpx.mo
-share/locale/ro/LC_MESSAGES/bmpx.mo
-share/locale/ru/LC_MESSAGES/bmpx.mo
-share/locale/sv/LC_MESSAGES/bmpx.mo
-share/locale/th_TH/LC_MESSAGES/bmpx.mo
-share/locale/zh_CN/LC_MESSAGES/bmpx.mo
-@comment in dbus: @dirrm share/dbus-1/services
-@dirrm share/bmpx/images/svg
-@dirrm share/bmpx/images/stock
-@dirrm share/bmpx/images/rating
-@dirrm share/bmpx/images/preferences
-@dirrm share/bmpx/images/podcast
-@dirrm share/bmpx/images/main
-@dirrm share/bmpx/images/library
-@dirrm share/bmpx/images/lastfm
-@dirrm share/bmpx/images/hal
-@dirrm share/bmpx/images/collections
-@dirrm share/bmpx/images/cdda
-@dirrm share/bmpx/images
-@dirrm share/bmpx/icons/tray-icons
-@dirrm share/bmpx/icons/themes/tango
-@dirrm share/bmpx/icons/themes/red
-@dirrm share/bmpx/icons/themes/plastic
-@dirrm share/bmpx/icons/themes/display
-@dirrm share/bmpx/icons/themes/darksphere
-@dirrm share/bmpx/icons/themes
-@dirrm share/bmpx/icons
-@dirrm share/bmpx/glade
-@dirrm share/bmpx/data
-@dirrm share/bmpx
-@comment in xdg-dirs: @dirrm share/applications
-@dirrm lib/bmpx/plugins/vfs/transport
-@dirrm lib/bmpx/plugins/vfs/container
-@dirrm lib/bmpx/plugins/vfs
-@dirrm lib/bmpx/plugins/taglib
-@dirrm lib/bmpx/plugins
-@dirrm lib/bmpx
-@dirrm include/bmp-2.0/bmp
-@dirrm include/bmp-2.0
diff --git a/audio/bmpx/distinfo b/audio/bmpx/distinfo
deleted file mode 100644
index 69338c020e4..00000000000
--- a/audio/bmpx/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.2 2007/02/19 08:38:48 joerg Exp $
-
-SHA1 (bmpx-0.36.1.tar.bz2) = d1f798038add19b95f292e16cbfe88e91f02034a
-RMD160 (bmpx-0.36.1.tar.bz2) = 92acca3fd41fff77f1e8224b186ccfb6e7de6f2f
-Size (bmpx-0.36.1.tar.bz2) = 2452879 bytes
-SHA1 (patch-aa) = 9d8eb9ef61823fe1e93b2963016fcc40093fd850
-SHA1 (patch-ab) = a386c54450a03a303dea8db6baac06c97f6a6f3b
-SHA1 (patch-ac) = 66336aa81fabe140ea9698d0cada3a4273695074
-SHA1 (patch-ad) = 87c6603433349ea15c3a85637f57daa99f8f8a9d
diff --git a/audio/bmpx/patches/patch-aa b/audio/bmpx/patches/patch-aa
deleted file mode 100644
index 9074185a4f6..00000000000
--- a/audio/bmpx/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/02/09 21:04:00 drochner Exp $
-
---- src/Makefile.in.orig 2006-12-13 21:35:45.000000000 +0000
-+++ src/Makefile.in
-@@ -38,7 +38,6 @@ host_triplet = @host@
- target_triplet = @target@
- libexec_PROGRAMS = bmp2-bin$(EXEEXT)
- @HAVE_HAL_TRUE@am__append_1 = $(top_builddir)/libhal++/libhalcc.la
--@HAVE_SUN_FALSE@am__append_2 = -D_XOPEN_SOURCE=600
- @HAVE_VISUALIZATIONS_TRUE@am__append_3 = video-widget.hh \
- @HAVE_VISUALIZATIONS_TRUE@ video-widget.cc
- @HAVE_GAIM_TRUE@am__append_4 = gaim-dbus.hh dialog-gaim-send-file.hh
diff --git a/audio/bmpx/patches/patch-ab b/audio/bmpx/patches/patch-ab
deleted file mode 100644
index a64bdcb92d4..00000000000
--- a/audio/bmpx/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/02/19 08:38:48 joerg Exp $
-
---- src/memmem.h.orig 2007-02-16 15:14:24.000000000 +0000
-+++ src/memmem.h
-@@ -23,6 +23,8 @@
- #ifndef _MEMMEM_H
- #define _MEMMEM_H 1
-
-+#include <stdlib.h>
-+
- #if defined(__cplusplus)
- extern "C" {
- #endif
diff --git a/audio/bmpx/patches/patch-ac b/audio/bmpx/patches/patch-ac
deleted file mode 100644
index e4cfbc99e8c..00000000000
--- a/audio/bmpx/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/02/19 08:38:48 joerg Exp $
-
---- sqlite/Makefile.in.orig 2007-02-16 15:19:28.000000000 +0000
-+++ sqlite/Makefile.in
-@@ -404,7 +404,7 @@ libsqlite_la_CFLAGS = \
- -DSQLITE_ENABLE_COLUMN_METADATA
-
- libsqlite_la_LDFLAGS = \
-- -lpthread
-+ ${SQLITE_PTHREAD}
-
- libsqlite_la_SOURCES = \
- alter.c \
diff --git a/audio/bmpx/patches/patch-ad b/audio/bmpx/patches/patch-ad
deleted file mode 100644
index bd5a4963396..00000000000
--- a/audio/bmpx/patches/patch-ad
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/02/19 08:38:49 joerg Exp $
-
---- sqlite/os_unix.c.orig 2006-12-13 19:53:18.000000000 +0000
-+++ sqlite/os_unix.c
-@@ -494,6 +494,7 @@ static int lockTrace(int fd, int op, str
- #define fcntl lockTrace
- #endif /* SQLITE_LOCK_TRACE */
-
-+#if SQLITE_THREAD_OVERRIDE_LOCK == -1
- /*
- ** The testThreadLockingBehavior() routine launches two separate
- ** threads on this routine. This routine attempts to lock a file
-@@ -534,6 +535,7 @@ static void testThreadLockingBehavior(in
- close(fd);
- threadsOverrideEachOthersLocks = d[0].result==0 && d[1].result==0;
- }
-+#endif
- #endif /* SQLITE_UNIX_THREADS */
-
- /*
-@@ -662,9 +664,11 @@ static int findLockInfo(
- key1.dev = statbuf.st_dev;
- key1.ino = statbuf.st_ino;
- #ifdef SQLITE_UNIX_THREADS
-+#if SQLITE_THREAD_OVERRIDE_LOCK == -1
- if( threadsOverrideEachOthersLocks<0 ){
- testThreadLockingBehavior(fd);
- }
-+#endif
- key1.tid = threadsOverrideEachOthersLocks ? 0 : pthread_self();
- #endif
- memset(&key2, 0, sizeof(key2));
diff --git a/audio/cam/DESCR b/audio/cam/DESCR
deleted file mode 100644
index ef6c2b6f627..00000000000
--- a/audio/cam/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-CAM - Cpu's Audio Mixer
-=================================
-
-This is an audio mixer with an interface or
-command line support.
diff --git a/audio/cam/Makefile b/audio/cam/Makefile
deleted file mode 100644
index 0af9e846275..00000000000
--- a/audio/cam/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.22 2007/01/07 09:13:47 rillig Exp $
-#
-
-DISTNAME= cam-1.02
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/sound/mixers/}
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= hubertf@NetBSD.org
-COMMENT= Cpu's Audio Mixer [curses based]
-
-CONFLICTS+= feh<1.2.6nb3
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-NO_CONFIGURE= yes
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-.include "../../mk/bsd.prefs.mk"
-
-CAMLIBS= -lcurses
-.if ${OPSYS} == "NetBSD"
-CAMLIBS+= -lossaudio
-.endif
-
-MAKE_ENV+= CAMLIBS=${CAMLIBS:Q}
-
-.include "../../mk/curses.buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/cam/PLIST b/audio/cam/PLIST
deleted file mode 100644
index 9cd0ba8780a..00000000000
--- a/audio/cam/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:15:20 zuntum Exp $
-bin/cam
-man/man1/cam.1.gz
diff --git a/audio/cam/distinfo b/audio/cam/distinfo
deleted file mode 100644
index b954be35aa1..00000000000
--- a/audio/cam/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 20:39:43 agc Exp $
-
-SHA1 (cam-1.02.tgz) = 3bdd11137cfe637bc3c0a77ab1bdbe3df89cbfa3
-RMD160 (cam-1.02.tgz) = acd2074d3c8caa6892600f3ff2934e392bae5efd
-Size (cam-1.02.tgz) = 26307 bytes
-SHA1 (patch-aa) = 39ebb8450eab5317ec743a5d8ed3a2e5a565acbd
-SHA1 (patch-ab) = 6537cf1cecef47ab99b52d3d0942ca7ea6b435e4
-SHA1 (patch-ac) = e4458def4576321293dac5bb66c4c4e162eaaf82
-SHA1 (patch-ad) = e9e398143aa7f4d7c06f78fff8279a49bbf21f81
-SHA1 (patch-ae) = 570f663a3288d53ae7365d088edefc4146ddba74
diff --git a/audio/cam/patches/patch-aa b/audio/cam/patches/patch-aa
deleted file mode 100644
index a6c3db3866c..00000000000
--- a/audio/cam/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2000/09/30 17:24:49 hubertf Exp $
-
---- sounds.c.orig Mon Oct 21 20:33:55 1996
-+++ sounds.c
-@@ -36,7 +36,7 @@
-
-
- int mixer_fd, recmask, devmask, stereodevs, recsrc;
--char *devname[DEV_COUNT] = SOUND_DEVICE_LABELS;
-+char *cam_devname[DEV_COUNT] = SOUND_DEVICE_LABELS;
- char *mixer_dev = "/dev/mixer";
- struct devices
- {
-@@ -287,7 +287,7 @@
- else
- dev_vol[dev_count].vol_right = dev_vol[dev_count].vol_left;
-
-- draw_slider( Y, X, devname[dev_nr]);
-+ draw_slider( Y, X, cam_devname[dev_nr]);
- draw_handle( Y+1, X+14+dev_vol[dev_count].vol_left, FALSE, 4);
- if (STEREO(dev_nr))
- draw_handle( Y+2, X+14+dev_vol[dev_count].vol_right, FALSE, 4);
-@@ -301,7 +301,7 @@
- int ch;
- int X,Y;
- int left = TRUE;
-- int locked = FALSE;
-+ int locked = TRUE;
- FILE *save_file;
- int dev_nr = 0;
- char *SAVE_FILE;
diff --git a/audio/cam/patches/patch-ab b/audio/cam/patches/patch-ab
deleted file mode 100644
index bfa427af7a2..00000000000
--- a/audio/cam/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2004/06/02 20:28:59 jschauma Exp $
-
---- cam.h.orig 1996-10-21 14:08:08.000000000 -0400
-+++ cam.h 2004-06-02 16:31:19.000000000 -0400
-@@ -21,7 +21,8 @@
- */
-
- #include <stdio.h>
--#include <ncurses.h>
-+#include <string.h>
-+#include <curses.h>
- #include <signal.h>
- #include <sys/soundcard.h>
- #include <fcntl.h>
diff --git a/audio/cam/patches/patch-ac b/audio/cam/patches/patch-ac
deleted file mode 100644
index dd821136d1c..00000000000
--- a/audio/cam/patches/patch-ac
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2004/06/02 20:28:59 jschauma Exp $
-
---- Makefile.orig 1996-09-19 13:18:29.000000000 -0400
-+++ Makefile 2004-06-02 16:31:54.000000000 -0400
-@@ -4,13 +4,13 @@
- # jvdbergh@uia.ua.ac.be #
- ###############################################################################
-
--CC = gcc
--CFLAGS = -Wall -O2
--LIBS = -lncurses
-+#CC = gcc
-+#CFLAGS = -Wall -O2
-+LIBS = ${CAMLIBS}
- INSTALL = install
--BINDIR = /usr/local/bin
-+BINDIR = ${PREFIX}/bin
- MANFILE= cam.1
--MANDIR = /usr/man/man1
-+MANDIR = ${PREFIX}/man/man1
- EFILE = cam
- XEFILE = xcam
- OBJS = cam.o screens.o sounds.o
-@@ -24,7 +24,7 @@
- @echo ""
- @echo " linking ..."
- @echo ""
-- $(CC) -o $(EFILE) $(OBJS) $(LIBS)
-+ $(CC) $(LDFLAGS) -o $(EFILE) $(OBJS) $(LIBS)
- @echo ""
-
- ###############################################################################
-@@ -68,11 +68,8 @@
- install:$(EFILE) $(MANFILE)
- @echo ""
- @echo "installing $(EFILE) in directory $(BINDIR)"
-- @$(INSTALL) -m 755 -o root -g root $(EFILE) $(BINDIR)
-- @$(INSTALL) -m 755 -o root -g root $(XEFILE) $(BINDIR)
-+ @$(BSD_INSTALL_PROGRAM) $(EFILE) $(BINDIR)
- @echo ""
- @echo "installing manpages for cam"
-- @$(INSTALL) -m 644 -o root -g root $(MANFILE) $(MANDIR)
-- @echo ""
-- @. installvgafont.sh
-+ @$(BSD_INSTALL_DATA) $(MANFILE) $(MANDIR)
- @echo ""
diff --git a/audio/cam/patches/patch-ad b/audio/cam/patches/patch-ad
deleted file mode 100644
index 09c3abfe030..00000000000
--- a/audio/cam/patches/patch-ad
+++ /dev/null
@@ -1,124 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2000/04/27 20:44:21 mycroft Exp $
-
---- screens.c.orig Mon Oct 21 14:18:25 1996
-+++ screens.c Thu Apr 27 16:41:05 2000
-@@ -25,14 +25,15 @@
- #include "cam.h"
-
- #include <strings.h>
-+#include <stdlib.h>
-
- void finish(int sig)
- {
- close_mixer();
- echo();
-- endwin();
- clear();
- refresh();
-+ endwin();
- if (sig != 0)
- exit(1);
- }
-@@ -40,19 +41,21 @@
-
- void set_screen(void)
- {
-- char dummy[COLS];
-+ char *dummy;
- int left, right;
-
-- left = ( COLS - 15 - strlen(VERSION_HIGH) - strlen(VERSION_LOW) ) / 2;
-- right = COLS - 15 - strlen(VERSION_HIGH) - strlen(VERSION_LOW) - left;
-+ left = ( COLS - 16 - strlen(VERSION_HIGH) - strlen(VERSION_LOW) ) / 2;
-+ right = COLS - 16 - strlen(VERSION_HIGH) - strlen(VERSION_LOW) - left;
- clear();
- leaveok(stdscr ,TRUE);
- attrset(COLOR_PAIR( COLOR_SCREEN ) | A_BOLD);
-- sprintf(dummy,"%*cCAM %s.%s for Linux%*c",left,' ',VERSION_HIGH,VERSION_LOW,right,' ');
-+ asprintf(&dummy, "%*cCAM %s.%s for NetBSD%*c",left,' ',VERSION_HIGH,VERSION_LOW,right,' ');
- mvaddstr(0,0,dummy);
-- sprintf(dummy," Cpu's Audio Mixer %s.%s%*cauthor : Jan 'TWP' VANDENBERGHE (c)1994-1996 ",VERSION_HIGH,VERSION_LOW,COLS-20-45-strlen(VERSION_HIGH)-strlen(VERSION_LOW),' ');
-- mvaddstr(LINES-1,0,dummy );
-- attrset(A_NORMAL | A_BOLD );
-+ free(dummy);
-+ asprintf(&dummy, " Cpu's Audio Mixer %s.%s%*cauthor : Jan 'TWP' VANDENBERGHE (c)1994-1996 ",VERSION_HIGH,VERSION_LOW,COLS-20-45-strlen(VERSION_HIGH)-strlen(VERSION_LOW),' ');
-+ mvaddstr(LINES-1,0,dummy);
-+ free(dummy);
-+ attrset(A_NORMAL | A_BOLD);
- mvaddstr(LINES-2,4,"Press 'h' for help");
- }
-
-@@ -64,17 +67,17 @@
- mvaddstr(Y+1,X+8,"Left");
- mvaddstr(Y+2,X+8,"Right");
- attrset(COLOR_PAIR(COLOR_SLIDER) | A_ALTCHARSET);
-- mvaddstr(Y+1,X+14,"ÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍ");
-- mvaddstr(Y+2,X+14,"ÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍ");
-+ mvhline(Y+1,X+14,ACS_HLINE,21);
-+ mvhline(Y+2,X+14,ACS_HLINE,21);
- attrset(COLOR_PAIR(COLOR_VOL1) | A_ALTCHARSET);
-- mvaddstr(Y,X+14,"ù ù ù ù");
-- mvaddstr(Y+3,X+14,"ù ù ù ù");
-+ mvaddstr(Y,X+14,". . . .");
-+ mvaddstr(Y+3,X+14,". . . .");
- attrset(COLOR_PAIR(COLOR_VOL2) | A_ALTCHARSET);
-- mvaddstr(Y,X+22,"ù ù ù ù");
-- mvaddstr(Y+3,X+22,"ù ù ù ù");
-+ mvaddstr(Y,X+22,". : . .");
-+ mvaddstr(Y+3,X+22,". : . .");
- attrset(COLOR_PAIR(COLOR_VOL3) | A_ALTCHARSET);
-- mvaddstr(Y,X+30,"ù ù ù");
-- mvaddstr(Y+3,X+30,"ù ù ù");
-+ mvaddstr(Y,X+30,". . .");
-+ mvaddstr(Y+3,X+30,". . .");
- }
-
- /*
-@@ -87,21 +90,21 @@
- {
- if ((level == 1 ) || ( level == 2 )) {
- attrset(A_NORMAL | A_ALTCHARSET);
-- mvaddch(Y,X++,205);
-+ mvaddch(Y,X++,ACS_HLINE);
- }
- if ( level != 5) {
-- #define ACT_HANDLE COLOR_PAIR(COLOR_HANDLE) | A_BOLD | A_ALTCHARSET
-- #define NACT_HANDLE COLOR_PAIR(COLOR_HANDLE) | A_DIM | A_ALTCHARSET
-+ #define ACT_HANDLE COLOR_PAIR(COLOR_HANDLE) | A_BOLD
-+ #define NACT_HANDLE COLOR_PAIR(COLOR_HANDLE) | A_DIM
- attrset(( active == TRUE ? ACT_HANDLE : NACT_HANDLE));
-- mvaddch(Y,X++,178);
-+ mvaddch(Y,X++,(active ? 'O' : 'o'));
- }
- if ((level == 3) || (level == 2)) {
- attrset(A_NORMAL | A_ALTCHARSET);
-- mvaddch(Y,X++,205);
-+ mvaddch(Y,X++,ACS_HLINE);
- }
- if ( level == 5 ) {
- attrset(A_NORMAL | A_ALTCHARSET);
-- mvaddch(Y,X++,205);
-+ mvaddch(Y,X++,ACS_HLINE);
- }
- }
-
-@@ -113,6 +116,7 @@
- fprintf(stderr,"The screensize has to be minimum 80x25\n");
- exit(1);
- }
-+ curs_set(0);
- make_colors();
- }
-
-@@ -181,9 +185,9 @@
- char ch;
- touchwin(stdscr);
- help_win = newwin(15,50,(LINES - 15) / 2,(COLS - 50) / 2);
-- wattrset(help_win, COLOR_PAIR( COLOR_HELP) | A_BOLD | A_ALTCHARSET);
-+ wattrset(help_win, COLOR_PAIR( COLOR_HELP) | A_BOLD );
- leaveok(help_win,TRUE);
-- wborder(help_win,179,179,196,196,218, 191,192,217);
-+ wborder(help_win,ACS_VLINE,ACS_VLINE,ACS_HLINE,ACS_HLINE,ACS_ULCORNER,ACS_URCORNER,ACS_LLCORNER,ACS_LRCORNER);
- wattrset(help_win, A_NORMAL | A_BOLD);
- mvwaddstr(help_win,2,2," Left/Right : Lower/Higher ");
- mvwaddstr(help_win,3,2," Up/Down : Previous/Next ");
diff --git a/audio/cam/patches/patch-ae b/audio/cam/patches/patch-ae
deleted file mode 100644
index 5b7bda51cd0..00000000000
--- a/audio/cam/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2001/01/11 06:24:23 lukem Exp $
-
---- /usr/pkgsrc/audio/cam/mycam/screens.c Thu Jan 11 10:05:44 2001
-+++ ./screens.c Thu Jan 11 11:38:19 2001
-@@ -111,9 +111,9 @@
- void init_screen(void)
- {
- stdscr = initscr();
-- if ( (COLS < 80) || (LINES < 25) ) {
-+ if ( (COLS < 80) || (LINES < 24) ) {
- finish(0);
-- fprintf(stderr,"The screensize has to be minimum 80x25\n");
-+ fprintf(stderr,"The screensize has to be minimum 80x24\n");
- exit(1);
- }
- curs_set(0);
diff --git a/audio/cd-discid/DESCR b/audio/cd-discid/DESCR
deleted file mode 100644
index c31e06827b2..00000000000
--- a/audio/cd-discid/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-cd-discid is a backend utility to get CDDB discid information from a CD-ROM
-disc. It was originally designed for abcde (AKA cdgrab), but can be used for
-any purpose requiring CDDB data.
diff --git a/audio/cd-discid/Makefile b/audio/cd-discid/Makefile
deleted file mode 100644
index b38b8de31cc..00000000000
--- a/audio/cd-discid/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2006/10/14 13:11:23 rillig Exp $
-
-DISTNAME= cd-discid_0.9.orig
-PKGNAME= cd-discid-0.9
-CATEGORIES= audio
-MASTER_SITES= http://lly.org/~rcw/cd-discid/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= Read CD to obtain CDDB discid information
-
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-
-NOT_FOR_PLATFORM= Interix-*-*
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-do-build:
- cd ${WRKSRC} && ${CC} -O -o cd-discid cd-discid.c
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/cd-discid ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/cd-discid.1 ${PREFIX}/${PKGMANDIR}/man1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/cd-discid/PLIST b/audio/cd-discid/PLIST
deleted file mode 100644
index 092d800c535..00000000000
--- a/audio/cd-discid/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:15:22 zuntum Exp $
-bin/cd-discid
-man/man1/cd-discid.1
diff --git a/audio/cd-discid/distinfo b/audio/cd-discid/distinfo
deleted file mode 100644
index 08d3b20be55..00000000000
--- a/audio/cd-discid/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/10/03 12:35:39 joerg Exp $
-
-SHA1 (cd-discid_0.9.orig.tar.gz) = 389c3b5bbfb96b113f85a8d206f9d0d7052146a4
-RMD160 (cd-discid_0.9.orig.tar.gz) = 58049ba778243019a96ab7f8d8eaf213e8eca4fa
-Size (cd-discid_0.9.orig.tar.gz) = 11217 bytes
-SHA1 (patch-aa) = 80dc0338faf17f8b8cb556fa08e973cd01759a02
diff --git a/audio/cd-discid/patches/patch-aa b/audio/cd-discid/patches/patch-aa
deleted file mode 100644
index 7634894b4c1..00000000000
--- a/audio/cd-discid/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/10/03 12:35:39 joerg Exp $
-
---- cd-discid.c.orig 2005-07-22 16:14:41.000000000 +0000
-+++ cd-discid.c
-@@ -37,7 +37,7 @@
- * to compile on Solaris */
- #define cdte_track_address cdte_addr.lba
-
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-
- #include <sys/cdio.h>
- #define CDROM_LBA CD_LBA_FORMAT /* first frame is 0 */
-@@ -214,12 +214,12 @@ int main(int argc, char *argv[])
- }
- #endif
-
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- TocEntry[i].cdte_track_address = ntohl(TocEntry[i].cdte_track_address);
- #endif
-
- for (i=0; i < last; i++) {
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- TocEntry[i].cdte_track_address = ntohl(TocEntry[i].cdte_track_address);
- #endif
- cksum += cddb_sum((TocEntry[i].cdte_track_address + CD_MSF_OFFSET) / CD_FRAMES);
diff --git a/audio/cdd/DESCR b/audio/cdd/DESCR
deleted file mode 100644
index 009c63c0f78..00000000000
--- a/audio/cdd/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-CDD is as the name implies, an attempt at a DD utility for CD's of all
-flavors. CDD will do its best to copy CD audio data, CD-ROM data in both
-raw and "cooked" forms to a directory of the users choice.
-
-CDD doesn't support every CD-ROM drive, though it supports many common
-ones, including those that support the new MMC command set.
diff --git a/audio/cdd/Makefile b/audio/cdd/Makefile
deleted file mode 100644
index 75e2e95751b..00000000000
--- a/audio/cdd/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2006/05/11 10:07:58 rillig Exp $
-
-DISTNAME= cdd-1.0nb3
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-
-MAINTAINER= thorpej@NetBSD.org
-COMMENT= Program for reading CD audio from SCSI/ATAPI CD-ROM drives
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(CDDCPPFLAGS)
-MAKE_ENV+= CDDCPPFLAGS=${CDDCPPFLAGS:Q}
-.endif
-
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/cdd ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/stripzeros ${PREFIX}/bin
-
-.include "../../devel/libscsi/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/cdd/PLIST b/audio/cdd/PLIST
deleted file mode 100644
index a328e06c70c..00000000000
--- a/audio/cdd/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:15:24 zuntum Exp $
-bin/cdd
-bin/stripzeros
diff --git a/audio/cdd/distinfo b/audio/cdd/distinfo
deleted file mode 100644
index b85fce3a383..00000000000
--- a/audio/cdd/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 20:39:43 agc Exp $
-
-SHA1 (cdd-1.0nb3.tar.gz) = 333323444571f463501c206f9d9fd7dde09d12a6
-RMD160 (cdd-1.0nb3.tar.gz) = 052cec366dbadde0c2de0f61a2d7a004cdf35a23
-Size (cdd-1.0nb3.tar.gz) = 48699 bytes
-SHA1 (patch-aa) = ab0188fe827c25a0c13c2af4a2b2f4806ac096bb
-SHA1 (patch-ab) = e126697b7ecc8a1d03fcc9db9d12d5667e3b787c
-SHA1 (patch-ac) = 39c609ac477981948f5f6822e188b52cd87d6489
-SHA1 (patch-ad) = 366d863c01f38056ef636a1f5e14632236d7fb77
-SHA1 (patch-ae) = fe2de6aa637a2832c066eb38f02fb9d438c1b78b
diff --git a/audio/cdd/patches/patch-aa b/audio/cdd/patches/patch-aa
deleted file mode 100644
index 5231b60cfac..00000000000
--- a/audio/cdd/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2004/11/28 23:02:26 simonb Exp $
-
---- cdd_cddb.c.orig Thu Jun 26 03:29:21 1997
-+++ cdd_cddb.c
-@@ -49,7 +49,7 @@
- #include "st.h"
-
- #define NETBUFSIZ 256;
--#define CDDB_SERVER "cddb.sonic.net"
-+#define CDDB_SERVER "freedb.freedb.org"
- #define CDDB_PORT 888
- #define CDDB_TIMEOUT 30
-
diff --git a/audio/cdd/patches/patch-ab b/audio/cdd/patches/patch-ab
deleted file mode 100644
index c2bb31ba16d..00000000000
--- a/audio/cdd/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2002/07/19 04:18:25 mycroft Exp $
-
---- st/stdriver.c.orig Tue Jun 24 19:46:28 1997
-+++ st/stdriver.c Fri Jul 19 04:10:44 2002
-@@ -607,8 +607,8 @@
- int st_read(SOCK *entry, int timeout)
- {
- int ret; /* Generic return variable */
--long starttime;
--long endtime;
-+time_t starttime;
-+time_t endtime;
- static struct timeval read_timer; /* Timeout struct for select */
- static fd_set local_readfds; /* Socket bit sets for select */
-
diff --git a/audio/cdd/patches/patch-ac b/audio/cdd/patches/patch-ac
deleted file mode 100644
index d8db43958a8..00000000000
--- a/audio/cdd/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2002/07/19 04:18:25 mycroft Exp $
-
---- cdd_cddb.c.orig Fri Jul 19 04:09:28 2002
-+++ cdd_cddb.c Fri Jul 19 04:13:25 2002
-@@ -63,7 +63,7 @@
- int count;
- int ret;
- int track;
--long discid;
-+unsigned int discid;
-
- for(count=0;count<toc->numentries;count++)
- {
diff --git a/audio/cdd/patches/patch-ad b/audio/cdd/patches/patch-ad
deleted file mode 100644
index 6ee051ebe00..00000000000
--- a/audio/cdd/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.8 2002/07/19 04:18:40 mycroft Exp $
-
---- cdd_cdcmds.c.orig Sat Jan 6 06:29:43 2001
-+++ cdd_cdcmds.c Fri Jul 19 04:15:28 2002
-@@ -356,7 +356,7 @@
- return (F_dtable[F_pte].end_cdda_func)(scsifd);
- }
-
--int unsupported(void)
-+int unsupported()
- {
- cdd_printf("This operation is not supported on this device!\n");
-
diff --git a/audio/cdd/patches/patch-ae b/audio/cdd/patches/patch-ae
deleted file mode 100644
index 74617fd1b2e..00000000000
--- a/audio/cdd/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2002/07/19 04:18:40 mycroft Exp $
-
---- cdd_cdcmds.h.orig Tue Feb 20 21:57:29 1996
-+++ cdd_cdcmds.h Fri Jul 19 04:15:16 2002
-@@ -57,7 +57,7 @@
-
- void doinquiry(int scsifd);
-
--int unsupported(void);
-+int unsupported();
- int getcdtoc(int scsifd, CDTOC *cdtoc);
- int cd_setblocksize(int scsifd, int bytessec);
- int cddaread(char *buffer, int startlba, int blocksize,
diff --git a/audio/cddb-bundle/DESCR b/audio/cddb-bundle/DESCR
deleted file mode 100644
index 1a0d71105a8..00000000000
--- a/audio/cddb-bundle/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
- This is a GNUstep bundle for clients that want to query or updata entries
-in the CDDB database.
diff --git a/audio/cddb-bundle/Makefile b/audio/cddb-bundle/Makefile
deleted file mode 100644
index 64405773d9f..00000000000
--- a/audio/cddb-bundle/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2006/09/22 06:33:30 rillig Exp $
-#
-
-DISTNAME= cddb.bundle-0.2
-PKGNAME= ${DISTNAME:S/./-/}
-PKGREVISION= 1
-CATEGORIES= audio gnustep
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gsburn/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://gsburn.sourceforge.net/
-COMMENT= CDDB client bundle
-
-WRKSRC= ${WRKDIR}/cddb.bundle
-NO_CONFIGURE= yes
-USE_LANGUAGES= objc
-MAKE_ENV+= ADDITIONAL_CPPFLAGS="-Wno-import"
-MAKE_FILE= GNUmakefile
-
-.include "../../devel/gnustep-base/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/cddb-bundle/PLIST b/audio/cddb-bundle/PLIST
deleted file mode 100644
index e16a6e4c990..00000000000
--- a/audio/cddb-bundle/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/05/16 09:40:59 rh Exp $
-share/GNUstep/Local/Library/Bundles/Cddb.bundle/Cddb
-share/GNUstep/Local/Library/Bundles/Cddb.bundle/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Bundles/Cddb.bundle/stamp.make
-share/GNUstep/Local/Library/Headers/Cddb/Cddb.h
-@dirrm share/GNUstep/Local/Library/Headers/Cddb
-@comment in devel/gnustep-make: @dirrm share/GNUstep/Local/Library/Headers
-@dirrm share/GNUstep/Local/Library/Bundles/Cddb.bundle/Resources
-@dirrm share/GNUstep/Local/Library/Bundles/Cddb.bundle
-@comment in devel/gnustep-make: @dirrm share/GNUstep/Local/Library/Bundles
diff --git a/audio/cddb-bundle/buildlink3.mk b/audio/cddb-bundle/buildlink3.mk
deleted file mode 100644
index 8203ee17cfa..00000000000
--- a/audio/cddb-bundle/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:35 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-CDDB_BUNDLE_BUILDLINK3_MK:= ${CDDB_BUNDLE_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= cddb-bundle
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncddb-bundle}
-BUILDLINK_PACKAGES+= cddb-bundle
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cddb-bundle
-
-.if !empty(CDDB_BUNDLE_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.cddb-bundle+= cddb-bundle>=0.2
-BUILDLINK_ABI_DEPENDS.cddb-bundle?= cddb-bundle>=0.2nb1
-BUILDLINK_PKGSRCDIR.cddb-bundle?= ../../audio/cddb-bundle
-.endif # CDDB_BUNDLE_BUILDLINK3_MK
-
-.include "../../devel/gnustep-make/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/cddb-bundle/distinfo b/audio/cddb-bundle/distinfo
deleted file mode 100644
index 0b90a2d2e25..00000000000
--- a/audio/cddb-bundle/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/05/16 09:40:59 rh Exp $
-
-SHA1 (cddb.bundle-0.2.tar.gz) = d1401dd70587ff0cdebe88098dd38eb3bd218e29
-RMD160 (cddb.bundle-0.2.tar.gz) = 2de6c627b64dd644ba7612159b86fae83a79e6df
-Size (cddb.bundle-0.2.tar.gz) = 16936 bytes
diff --git a/audio/cddbd/DESCR b/audio/cddbd/DESCR
deleted file mode 100644
index 5bf40a4f117..00000000000
--- a/audio/cddbd/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-This is a port of The Internet CD Database Server (cddbd v1.3.1)
-
-Copyright (c) 1996 Steve Scherf <steve@moonsoft.com>
-A Moondog Software Production
-
-The CD Database Server (cddbd) is a program designed to allow remote
-access of xmcd-style Compact Disc database entries via the Internet.
-Many CD players (such as xmcd, and DiscPlay for Windows) can connect
-to this server through the Internet and download CD data from the
-server machine's CDDB.
diff --git a/audio/cddbd/Makefile b/audio/cddbd/Makefile
deleted file mode 100644
index 1a4083ef305..00000000000
--- a/audio/cddbd/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2006/10/04 20:46:06 wiz Exp $
-#
-
-DISTNAME= cddbd-1.3.1
-PKGNAME= cddbd-1.3.1p1
-CATEGORIES= audio net
-MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/}
-
-PATCH_SITES= ${MASTER_SITES}
-PATCHFILES= cddbd-1.3.1.patch1.gz
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.freedb.org/en/download__server_software.4.html
-COMMENT= Internet CD Database Server
-
-INTERACTIVE_STAGE= configure install
-NO_PACKAGE= too interactive
-MAKE_FILE= makefile
-
-do-configure:
- cd ${WRKSRC}; \
- ${SETENV} BASEDIR=${PREFIX:Q}/share ${SH} config.sh
-
-do-install:
- cd ${WRKSRC}; \
- ${SETENV} INSTALL=${INSTALL:Q} BINDIR=${PREFIX:Q}/bin \
- BINPERM=${BINMODE:Q} BINOWNER=${BINOWN:Q} \
- BINGROUP=${BINGRP:Q} ${SH} install.sh
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/cddbd/PLIST b/audio/cddbd/PLIST
deleted file mode 100644
index dcfb1b50be0..00000000000
--- a/audio/cddbd/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:15:25 zuntum Exp $
-bin/cddbd
-share/xmcd/cddbd/access
-share/xmcd/cddbd/motd
-share/xmcd/cddbd/sites
-@dirrm share/xmcd/cddbd
-@dirrm share/xmcd
diff --git a/audio/cddbd/distinfo b/audio/cddbd/distinfo
deleted file mode 100644
index 1c4c21a2c19..00000000000
--- a/audio/cddbd/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/05/23 08:42:39 rillig Exp $
-
-SHA1 (cddbd-1.3.1.tar.gz) = 2e8ab932750e54e6058edbcc6107835c9be7840c
-RMD160 (cddbd-1.3.1.tar.gz) = a2b666407db9d6415f430a9df8ef4a96fa24572c
-Size (cddbd-1.3.1.tar.gz) = 93959 bytes
-SHA1 (cddbd-1.3.1.patch1.gz) = 08a96dac6c95cf6c289922215be6e6c99cd9f49e
-RMD160 (cddbd-1.3.1.patch1.gz) = 6e0343ded77336cec190682581ad8b9ee78f46d8
-Size (cddbd-1.3.1.patch1.gz) = 416 bytes
-SHA1 (patch-aa) = 67b421ce9ee431dcfdd9152dad281626c64685de
-SHA1 (patch-ab) = 6a84d5d1c9c811dc6d5faf8e806b065bc79e0959
-SHA1 (patch-ac) = 3701b82b47444eb8196069580e46f31d1d800160
diff --git a/audio/cddbd/patches/patch-aa b/audio/cddbd/patches/patch-aa
deleted file mode 100644
index ccee8747291..00000000000
--- a/audio/cddbd/patches/patch-aa
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:35:55 agc Exp $
-
---- install.sh.orig Sat Dec 21 21:49:54 1996
-+++ install.sh Fri Apr 18 15:12:25 1997
-@@ -37,11 +37,25 @@
- # Set up access defaults.
- DIRPERM=755
- FILEPERM=644
--BINPERM=6711
-+if [ -z "$BINPERM" ]
-+then
-+ BINPERM=6711
-+fi
- UMASK=022
- OWNER=`expr "$id" : '.*uid=.*(\(.*\)).*gid'`
- GROUP=`expr "$id" : '.*gid=[0-9]*(\([a-zA-Z0-9_]*\))'`
--BINOWNER=$OWNER
-+if [ -z "$BINOWNER" ]
-+then
-+ BINOWNER=$OWNER
-+fi
-+if [ -z "$BINGROUP" ]
-+then
-+ BINGROUP=$GROUP
-+fi
-+if [ -z "$INSTALL" ]
-+then
-+ INSTALL=/usr/bin/install
-+fi
-
- USERS=100
- LINES=1024
-@@ -202,28 +216,12 @@
- rm -f $2
- fi
-
-- cp $1 $2
-+ $INSTALL -c -m $3 -o $4 -g $5 $1 $2
- if [ $? != 0 ]
- then
- logerr -n "Cannot install $2: file copy error."
- return 1
- fi
--
-- if [ -f $2 ]
-- then
-- if [ $3 != default ]
-- then
-- chmod $3 $2 2>/dev/null
-- fi
-- if [ $4 != default ]
-- then
-- chown $4 $2 2>/dev/null
-- fi
-- if [ $5 != default ]
-- then
-- chgrp $5 $2 2>/dev/null
-- fi
-- fi
- return 0
- else
- $ECHO "\t$2 NOT installed"
-@@ -624,7 +622,7 @@
- $ECHO "\nInstalling cddbd files..."
-
- # Binaries
--instfile cddbd ${BINDIR}/cddbd $BINPERM $BINOWNER $GROUP
-+instfile cddbd ${BINDIR}/cddbd $BINPERM $BINOWNER $BINGROUP
-
- # Configuration files
- instfile access `cat .accessfile`/access $FPERM $OWNID $GRPID
diff --git a/audio/cddbd/patches/patch-ab b/audio/cddbd/patches/patch-ab
deleted file mode 100644
index 23ebf41ae40..00000000000
--- a/audio/cddbd/patches/patch-ab
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/05/23 08:42:39 rillig Exp $
-
---- cddbd.c.orig Sun Jun 14 06:42:12 1998
-+++ cddbd.c Sun Jun 14 06:42:50 1998
-@@ -191,14 +191,14 @@
- access_t acctab[] = {
-- "logfile", logfile, AC_PATH, 0, (int)TMPDIR"/log",
-- "motdfile", motdfile, AC_PATH, 0, (int)"",
-- "sitefile", sitefile, AC_PATH, 0, (int)"",
-- "histfile", histfile, AC_PATH, 0, (int)"",
-- "lockdir", lockdir, AC_PATH, 0, (int)"",
-- "hashdir", hashdir, AC_PATH, 0, (int)"",
-- "cddbdir", cddbdir, AC_PATH, 0, (int)"",
-- "dupdir", dupdir, AC_PATH, 0, (int)"",
-- "postdir", postdir, AC_PATH, 0, (int)"",
-- "smtphost", smtphost, AC_STRING, 0, (int)"localhost",
-+ "logfile", logfile, AC_PATH, 0, (long)TMPDIR"/log",
-+ "motdfile", motdfile, AC_PATH, 0, (long)"",
-+ "sitefile", sitefile, AC_PATH, 0, (long)"",
-+ "histfile", histfile, AC_PATH, 0, (long)"",
-+ "lockdir", lockdir, AC_PATH, 0, (long)"",
-+ "hashdir", hashdir, AC_PATH, 0, (long)"",
-+ "cddbdir", cddbdir, AC_PATH, 0, (long)"",
-+ "dupdir", dupdir, AC_PATH, 0, (long)"",
-+ "postdir", postdir, AC_PATH, 0, (long)"",
-+ "smtphost", smtphost, AC_STRING, 0, (long)"localhost",
- "admin_email", admin_email, AC_STRING, AF_NODEF, 0,
-- "bounce_email", bounce_email, AC_STRING, 0, (int)"",
-+ "bounce_email", bounce_email, AC_STRING, 0, (long)"",
- "xmit_time", &xmit_time, AC_NUMERIC, AF_ZERO, DEF_XMIT_TO,
diff --git a/audio/cddbd/patches/patch-ac b/audio/cddbd/patches/patch-ac
deleted file mode 100644
index 852c6c36ba4..00000000000
--- a/audio/cddbd/patches/patch-ac
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/05/23 08:42:39 rillig Exp $
-
---- cddbd.h.orig Sun Jun 14 06:41:32 1998
-+++ cddbd.h Sun Jun 14 06:42:05 1998
-@@ -261,3 +261,3 @@
- int at_flags; /* Access flags. */
-- int at_def; /* Default value. */
-+ long at_def; /* Default value. */
- } access_t;
diff --git a/audio/cdparanoia/DESCR b/audio/cdparanoia/DESCR
deleted file mode 100644
index c4c5cd62671..00000000000
--- a/audio/cdparanoia/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Cdparanoia retrieves audio tracks from CDDA capable CDROM drives.
-The data can be saved to a file or directed to standard output
-in WAV, AIFF, AIFF-C or raw format. Most ATAPI, SCSI and several
-proprietary CDROM drive makes are supported; cdparanoia can
-determine if the target drive is CDDA capable.
-
-In addition to simple reading, cdparanoia adds extra-robust
-data verification, synchronization, error handling and scratch
-reconstruction capability.
diff --git a/audio/cdparanoia/Makefile b/audio/cdparanoia/Makefile
deleted file mode 100644
index ae5e4036208..00000000000
--- a/audio/cdparanoia/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2007/02/22 19:26:05 wiz Exp $
-#
-
-DISTNAME= cdparanoia-III-alpha9.8
-PKGNAME= cdparanoia-3.0.9.8
-PKGREVISION= 6
-CATEGORIES= audio
-MASTER_SITES= http://www.xiph.org/paranoia/download/
-EXTRACT_SUFX= .src.tgz
-
-MAINTAINER= kim@tac.nyc.ny.us
-HOMEPAGE= http://www.xiph.org/paranoia/
-COMMENT= CDDA reading utility with extra data verification features
-
-ONLY_FOR_PLATFORM= FreeBSD-*-* NetBSD-*-* Linux-*-* DragonFly-*-* Darwin-*-*
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
-
-USE_TOOLS+= gmake
-USE_LIBTOOL= YES
-GNU_CONFIGURE= YES
-
-CONFIGURE_ARGS+= --includedir=${PREFIX}/include/cdparanoia
-
-MAKE_ENV+= GCC=yes
-
-LDFLAGS.FreeBSD+= -lcam
-LDFLAGS.DragonFly+= -lcam
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/cdparanoia/PLIST b/audio/cdparanoia/PLIST
deleted file mode 100644
index f3052e25f02..00000000000
--- a/audio/cdparanoia/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:15 jlam Exp $
-bin/cdparanoia
-include/cdparanoia/cdda_interface.h
-include/cdparanoia/cdda_paranoia.h
-include/cdparanoia/utils.h
-lib/libcdda_interface.la
-lib/libcdda_paranoia.la
-man/man1/cdparanoia.1
-@dirrm include/cdparanoia
diff --git a/audio/cdparanoia/buildlink3.mk b/audio/cdparanoia/buildlink3.mk
deleted file mode 100644
index 927ef6084b5..00000000000
--- a/audio/cdparanoia/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:35 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-CDPARANOIA_BUILDLINK3_MK:= ${CDPARANOIA_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= cdparanoia
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncdparanoia}
-BUILDLINK_PACKAGES+= cdparanoia
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cdparanoia
-
-.if !empty(CDPARANOIA_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.cdparanoia+= cdparanoia>=3.0
-BUILDLINK_ABI_DEPENDS.cdparanoia?= cdparanoia>=3.0.9.8nb5
-BUILDLINK_PKGSRCDIR.cdparanoia?= ../../audio/cdparanoia
-.endif # CDPARANOIA_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/cdparanoia/distinfo b/audio/cdparanoia/distinfo
deleted file mode 100644
index ee8cfd720c0..00000000000
--- a/audio/cdparanoia/distinfo
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: distinfo,v 1.19 2007/03/08 19:24:24 rillig Exp $
-
-SHA1 (cdparanoia-III-alpha9.8.src.tgz) = 04cc33a7d22d6255f6239e3e74195506b3bdde06
-RMD160 (cdparanoia-III-alpha9.8.src.tgz) = d9225165f83b5386c58db263d6918a7006df1481
-Size (cdparanoia-III-alpha9.8.src.tgz) = 116591 bytes
-SHA1 (patch-aa) = 29fd5767b37360fe804013bb171fc7e5f4d8311f
-SHA1 (patch-ab) = 7b3d4b325c4095c08425cc28033297f1ffc3ce95
-SHA1 (patch-ac) = 6bd7ad7a0e8bcd1f8354c73706cafb0e789b8252
-SHA1 (patch-ad) = 9a1ea1b98b5f3810e1ccae57beb8c68b5e189716
-SHA1 (patch-ae) = 6ba166c2ac73b9c03a1944989c6ffbe655d80c71
-SHA1 (patch-ba) = 51151796493c946e5bdafbd22005136ea7f27a09
-SHA1 (patch-ca) = 9c35254c09a96b622cac44198443f66f7bc0e428
-SHA1 (patch-cb) = c19ee04017b836842bb0f2d2c77e8f35aad0f9bb
-SHA1 (patch-cc) = adea4fd9682c0543e5749c6f3fe73697d8663c6c
-SHA1 (patch-cd) = 81d31fb55db0f982959395cdecc3da826bf23bfb
-SHA1 (patch-ce) = efbdd8b7f8908c9c4916f2356f9ff14658c27c15
-SHA1 (patch-cf) = 650de2a80235e42acd5670a06bd1e5bcf346100d
-SHA1 (patch-cg) = b9786ee81dcb7bd2f6572a20f424dd5291a8720d
-SHA1 (patch-ch) = 8d16dd8c80e8f1ee35ccc299ba927d685adde01c
-SHA1 (patch-ci) = 60db1d1d2e8ec9c6d446543762218b22c597d986
-SHA1 (patch-cj) = e2420e2ccadd2d6ea30d6bf48af9c141dc395afc
-SHA1 (patch-ck) = 0232f8f42d98b49043f55cd6aaf1f50ab38fadfb
-SHA1 (patch-cl) = f511570233524feac434db160e51099316618058
-SHA1 (patch-cm) = 18001a6cf96dd6bfde8e1208be56a40fac9aa0d5
-SHA1 (patch-cn) = b79db0b24a042a5801b47e6db5e20cbf07a53475
diff --git a/audio/cdparanoia/patches/patch-aa b/audio/cdparanoia/patches/patch-aa
deleted file mode 100644
index 0779e82a0f4..00000000000
--- a/audio/cdparanoia/patches/patch-aa
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/09/03 17:13:30 ben Exp $
-
---- configure.in.orig 2000-03-25 23:33:22.000000000 -0800
-+++ configure.in
-@@ -12,6 +12,17 @@ AC_PROG_RANLIB
- AC_CHECK_PROG(AR,ar,ar)
- AC_CHECK_PROG(INSTALL,install,install)
-
-+case $host in
-+*-*-darwin*)
-+ EXTRA_OBJS=osx_interface.o
-+ EXTRA_LIBS=-framework CoreFoundation -framework IOKit
-+ ;;
-+*)
-+ EXTRA_OBJS=cooked_interface.o scsi_interface.o
-+ EXTRA_LIBS=
-+ ;;
-+esac
-+
- if test -z "$GCC"; then
- DEBUG="-g"
- OPT="-O"
-@@ -20,6 +31,12 @@ else
- i?86-*-linux*)
- DEBUG="-g -Wall -fsigned-char"
- OPT="-O20 -ffast-math -fsigned-char -finline-functions";;
-+ i?86-*-netbsd*)
-+ DEBUG="-g -Wall -fsigned-char"
-+ OPT="-O2 -ffast-math -fsigned-char -finline-functions";;
-+ *-netbsd*)
-+ DEBUG="-g -Wall"
-+ OPT="-O";;
- *)
- DEBUG="-g -Wall -fsigned-char"
- OPT="-O20 -fsigned-char";;
-@@ -28,7 +45,10 @@ fi
-
- AC_HEADER_STDC
-
--CFLAGS=""
-+dnl Uncomment the following if you don't want to honor CFLAGS passed in from
-+dnl the environment.
-+dnl
-+dnl CFLAGS=""
-
- TYPESIZES=""
-
-@@ -62,15 +82,27 @@ fi
-
- AC_CHECK_HEADERS(linux/sbpcd.h, SBPCD_H="-DSBPCD_H='1' ")
- AC_CHECK_HEADERS(linux/ucdrom.h, UCDROM_H="-DUCDROM_H='1' ")
-+AC_CHECK_HEADERS(util.h,
-+ AC_CHECK_LIB(util, getrawpartition,
-+ RAWPART="-DHAVE_GETRAWPARTITION='1' " LIBUTIL="-lutil"
-+ )
-+)
-+
-+AC_CHECK_FUNCS(getopt_long, GETOPT_LONG="-DGETOPT_LONG='1' ")
-
- AC_PROG_MAKE_SET
- AC_C_CONST
-
- AC_SUBST(SBPCD_H)
- AC_SUBST(UCDROM_H)
-+AC_SUBST(GETOPT_LONG)
-+AC_SUBST(RAWPART)
- AC_SUBST(TYPESIZES)
- AC_SUBST(OPT)
- AC_SUBST(DEBUG)
- AC_SUBST(CC)
-+AC_SUBST(LIBUTIL)
-+AC_SUBST(EXTRA_OBJS)
-+AC_SUBST(EXTRA_LIBS)
-
- AC_OUTPUT(Makefile interface/Makefile paranoia/Makefile)
diff --git a/audio/cdparanoia/patches/patch-ab b/audio/cdparanoia/patches/patch-ab
deleted file mode 100644
index 4ea6e45bacf..00000000000
--- a/audio/cdparanoia/patches/patch-ab
+++ /dev/null
@@ -1,108 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2006/11/03 12:45:21 joerg Exp $
-
---- Makefile.in.orig 2001-03-27 22:46:58.000000000 +0000
-+++ Makefile.in
-@@ -3,12 +3,12 @@
- # DO NOT EDIT BELOW! ##########################################################
- # (unless, of course, you know what you are doing :) ##########################
-
--VERSION=9.8
-+VERSION=98
- VPATH=@srcdir@
- srcdir=@srcdir@
-
- @SET_MAKE@
--FLAGS=@TYPESIZES@ @CFLAGS@
-+FLAGS=@GETOPT_LONG@ @RAWPART@ @TYPESIZES@ @CFLAGS@
- OPT=@OPT@ $(FLAGS)
- DEBUG=@DEBUG@ $(FLAGS)
- CC=@CC@
-@@ -27,29 +27,29 @@ PWD = $(shell pwd)
-
- OFILES = main.o report.o header.o buffering_write.o
-
--export STATIC
- export VERSION
-
--ifeq ($(STATIC),TRUE)
-- LIBS = interface/libcdda_interface.a paranoia/libcdda_paranoia.a \
-- -static -lm
-- LIBDEP = interface/libcdda_interface.a paranoia/libcdda_paranoia.a
--else
-- LIBS = -lcdda_interface -lcdda_paranoia -lm
-- LIBDEP = interface/libcdda_interface.so paranoia/libcdda_paranoia.so
--endif
-+STLIBS = interface/libcdda_interface.a paranoia/libcdda_paranoia.a @LIBUTIL@ -lm
-+STLIBDEP = interface/libcdda_interface.a paranoia/libcdda_paranoia.a
-
-+SHLIBDEP = interface/libcdda_interface.la paranoia/libcdda_paranoia.la
-+SHLIBS = $(SHLIBDEP) @LIBUTIL@ @EXTRA_LIBS@ -lm
-
--all:
-+
-+all:
- cd interface && $(MAKE) all
- cd paranoia && $(MAKE) all
-- $(MAKE) cdparanoia CFLAGS="$(OPT)"
-- strip cdparanoia
-+ $(MAKE) cdparanoia CFLAGS="$(OPT)" LIBS="$(SHLIBS)" LIBDEP="$(SHLIBDEP)"
-+
-+static:
-+ cd interface && $(MAKE) lib
-+ cd paranoia && $(MAKE) lib
-+ $(MAKE) cdparanoia CFLAGS="$(OPT)" LIBS="$(STLIBS)" LIBDEP="$(STLIBDEP)"
-
--debug:
-+debug:
- cd interface && $(MAKE) debug
- cd paranoia && $(MAKE) debug
-- $(MAKE) cdparanoia CFLAGS="$(DEBUG)" STATIC=TRUE
-+ $(MAKE) cdparanoia CFLAGS="$(DEBUG)" LIBS="$(STLIBS)" LIBDEP="$(STLIBDEP)"
-
- test:
- cd interface && $(MAKE) all
-@@ -64,32 +64,20 @@ slib:
- cd paranoia && $(MAKE) slib
-
- install:
-- $(INSTALL) -d -m 0755 $(BINDIR)
-- $(INSTALL) -m 0755 $(srcdir)/cdparanoia $(BINDIR)
-- $(INSTALL) -d -m 0755 $(MANDIR)
-- $(INSTALL) -d -m 0755 $(MANDIR)/man1
-- $(INSTALL) -m 0644 $(srcdir)/cdparanoia.1 $(MANDIR)/man1
-- $(INSTALL) -d -m 0755 $(INCLUDEDIR)
-- $(INSTALL) -m 0644 $(srcdir)/paranoia/cdda_paranoia.h $(INCLUDEDIR)
-- $(INSTALL) -d -m 0755 $(LIBDIR)
-- $(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.so.0.$(VERSION) $(LIBDIR)
-- $(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.a $(LIBDIR)
-- $(INSTALL) -m 0644 $(srcdir)/interface/cdda_interface.h $(INCLUDEDIR)
-- $(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.so.0.$(VERSION) $(LIBDIR)
-- $(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.a $(LIBDIR)
-- $(INSTALL) -m 0644 $(srcdir)/utils.h $(INCLUDEDIR)
-- ln -fs libcdda_interface.so.0.$(VERSION) \
-- $(LIBDIR)/libcdda_interface.so.0
-- ln -fs libcdda_interface.so.0.$(VERSION) \
-- $(LIBDIR)/libcdda_interface.so
-- ln -fs libcdda_paranoia.so.0.$(VERSION) \
-- $(LIBDIR)/libcdda_paranoia.so.0
-- ln -fs libcdda_paranoia.so.0.$(VERSION) \
-- $(LIBDIR)/libcdda_paranoia.so
-+ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}$(BINDIR)
-+ $(LIBTOOL) --mode=install ${BSD_INSTALL_PROGRAM} $(srcdir)/cdparanoia ${DESTDIR}$(BINDIR)
-+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-+ ${BSD_INSTALL_MAN} $(srcdir)/cdparanoia.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(INCLUDEDIR)
-+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(LIBDIR)
-+ ${BSD_INSTALL_DATA} $(srcdir)/interface/cdda_interface.h ${DESTDIR}$(INCLUDEDIR)
-+ ${BSD_INSTALL_DATA} $(srcdir)/paranoia/cdda_paranoia.h ${DESTDIR}$(INCLUDEDIR)
-+ ${BSD_INSTALL_DATA} $(srcdir)/utils.h ${DESTDIR}$(INCLUDEDIR)
-+ $(LIBTOOL) --mode=install ${BSD_INSTALL_LIB} $(srcdir)/paranoia/libcdda_paranoia.la ${DESTDIR}$(LIBDIR)
-+ $(LIBTOOL) --mode=install ${BSD_INSTALL_LIB} $(srcdir)/interface/libcdda_interface.la ${DESTDIR}$(LIBDIR)
-
- cdparanoia: $(OFILES) $(LIBDEP)
-- $(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \
-- -L$(PWD)/paranoia -L$(PWD)/interface \
-+ $(LIBTOOL) --mode=link $(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \
- -o cdparanoia $(LIBS)
-
- .c.o:
diff --git a/audio/cdparanoia/patches/patch-ac b/audio/cdparanoia/patches/patch-ac
deleted file mode 100644
index 1722cef9ede..00000000000
--- a/audio/cdparanoia/patches/patch-ac
+++ /dev/null
@@ -1,208 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2007/03/08 19:24:24 rillig Exp $
-
---- configure.orig 2000-04-15 08:13:01.000000000 -0700
-+++ configure
-@@ -884,6 +884,16 @@ else
- echo "$ac_t""no" 1>&6
- fi
-
-+case $host in
-+*-*-darwin*)
-+ EXTRA_OBJS=osx_interface.o
-+ EXTRA_LIBS="-framework CoreFoundation -framework IOKit"
-+ ;;
-+*)
-+ EXTRA_OBJS="cooked_interface.o scsi_interface.o"
-+ EXTRA_LIBS=
-+ ;;
-+esac
-
- if test -z "$GCC"; then
- DEBUG="-g"
-@@ -893,6 +903,12 @@ else
- i?86-*-linux*)
- DEBUG="-g -Wall -fsigned-char"
- OPT="-O20 -ffast-math -fsigned-char -finline-functions";;
-+ i?86-*-netbsd*)
-+ DEBUG="-g -Wall -fsigned-char"
-+ OPT="-O2 -ffast-math -fsigned-char -finline-functions";;
-+ *-netbsd*)
-+ DEBUG="-g -Wall"
-+ OPT="-O";;
- *)
- DEBUG="-g -Wall -fsigned-char"
- OPT="-O20 -fsigned-char";;
-@@ -1084,7 +1100,6 @@ EOF
- fi
-
-
--CFLAGS=""
-
- TYPESIZES=""
-
-@@ -1476,6 +1491,143 @@ else
- fi
- done
-
-+for ac_hdr in util.h
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:1489: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ cat > conftest.$ac_ext <<EOF
-+#line 1494 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:1499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+ rm -rf conftest*
-+ eval "ac_cv_header_$ac_safe=yes"
-+else
-+ echo "$ac_err" >&5
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+ echo "$ac_t""yes" 1>&6
-+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+ cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+ echo $ac_n "checking for getrawpartition in -lutil""... $ac_c" 1>&6
-+echo "configure:1520: checking for getrawpartition in -lutil" >&5
-+ac_lib_var=`echo util'_'getrawpartition | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ ac_save_LIBS="$LIBS"
-+LIBS="-lutil $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 1528 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char getrawpartition();
-+
-+int main() {
-+getrawpartition()
-+; return 0; }
-+EOF
-+if { (eval echo configure:1539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+ rm -rf conftest*
-+ eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+ echo "$ac_t""yes" 1>&6
-+ RAWPART="-DHAVE_GETRAWPARTITION='1' " LIBUTIL="-lutil"
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+
-+for ac_func in getopt_long
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:1570: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ cat > conftest.$ac_ext <<EOF
-+#line 1575 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func(); below. */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+ to always fail with ENOSYS. Some functions are actually named
-+ something starting with __ and the normal name is an alias. */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:1598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+ rm -rf conftest*
-+ eval "ac_cv_func_$ac_func=yes"
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+ echo "$ac_t""yes" 1>&6
-+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+ cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ GETOPT_LONG="-DGETOPT_LONG='1' "
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-
- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
- echo "configure:1482: checking whether ${MAKE-make} sets \${MAKE}" >&5
-@@ -1736,6 +1892,8 @@ s%@host_alias@%$host_alias%g
- s%@host_cpu@%$host_cpu%g
- s%@host_vendor@%$host_vendor%g
- s%@host_os@%$host_os%g
-+s%@EXTRA_OBJS@%$EXTRA_OBJS%g
-+s%@EXTRA_LIBS@%$EXTRA_LIBS%g
- s%@CC@%$CC%g
- s%@RANLIB@%$RANLIB%g
- s%@AR@%$AR%g
-@@ -1744,9 +1902,12 @@ s%@CPP@%$CPP%g
- s%@SET_MAKE@%$SET_MAKE%g
- s%@SBPCD_H@%$SBPCD_H%g
- s%@UCDROM_H@%$UCDROM_H%g
-+s%@GETOPT_LONG@%$GETOPT_LONG%g
-+s%@RAWPART@%$RAWPART%g
- s%@TYPESIZES@%$TYPESIZES%g
- s%@OPT@%$OPT%g
- s%@DEBUG@%$DEBUG%g
-+s%@LIBUTIL@%$LIBUTIL%g
-
- CEOF
- EOF
diff --git a/audio/cdparanoia/patches/patch-ad b/audio/cdparanoia/patches/patch-ad
deleted file mode 100644
index 12ee25d654b..00000000000
--- a/audio/cdparanoia/patches/patch-ad
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2006/09/03 17:13:30 ben Exp $
-
---- utils.h.orig 2000-04-19 15:41:04.000000000 -0700
-+++ utils.h
-@@ -1,5 +1,20 @@
- #include <stdlib.h>
-+#ifdef __linux__
- #include <endian.h>
-+#endif
-+#ifdef __NetBSD__
-+#include <sys/param.h>
-+#if __NetBSD_Version__ >= 104010000
-+#include <sys/endian.h>
-+#else
-+#include <machine/endian.h>
-+#include <machine/bswap.h>
-+#endif
-+#endif
-+#if defined(__APPLE__) && defined(__MACH__)
-+#include <stdint.h>
-+#include <machine/endian.h>
-+#endif
- #include <stdio.h>
- #include <errno.h>
- #include <string.h>
-@@ -19,15 +34,34 @@ static inline int bigendianp(void){
- }
-
- static inline int32_t swap32(int32_t x){
-+#ifdef __NetBSD__
-+ return bswap32(x);
-+#else
-+#if defined(__APPLE__) && defined(__MACH__)
-+ return((((uint32_t)x & 0x000000ffU) << 24) |
-+ (((uint32_t)x & 0x0000ff00U) << 8) |
-+ (((uint32_t)x & 0x00ff0000U) >> 8) |
-+ (((uint32_t)x & 0xff000000U) >> 24));
-+#else
- return((((u_int32_t)x & 0x000000ffU) << 24) |
- (((u_int32_t)x & 0x0000ff00U) << 8) |
- (((u_int32_t)x & 0x00ff0000U) >> 8) |
- (((u_int32_t)x & 0xff000000U) >> 24));
-+#endif
-+#endif
- }
-
- static inline int16_t swap16(int16_t x){
-+#ifdef __NetBSD__
-+ return bswap16(x);
-+#else
-+#if defined(__APPLE__) && defined(__MACH__)
-+ return((((uint16_t)x & 0x00ffU) << 8) |
-+ (((uint16_t)x & 0xff00U) >> 8));
-+#endif
- return((((u_int16_t)x & 0x00ffU) << 8) |
- (((u_int16_t)x & 0xff00U) >> 8));
-+#endif
- }
-
- #if BYTE_ORDER == LITTLE_ENDIAN
diff --git a/audio/cdparanoia/patches/patch-ae b/audio/cdparanoia/patches/patch-ae
deleted file mode 100644
index cdb0681cd3e..00000000000
--- a/audio/cdparanoia/patches/patch-ae
+++ /dev/null
@@ -1,200 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2006/09/03 17:13:30 ben Exp $
-
---- main.c.orig 2001-03-25 19:44:50.000000000 -0800
-+++ main.c
-@@ -49,12 +49,18 @@
- #include <unistd.h>
- #include <string.h>
- #include <fcntl.h>
-+#ifdef GETOPT_LONG
- #include <getopt.h>
-+#endif
- #include <errno.h>
- #include <math.h>
- #include <sys/time.h>
- #include <sys/stat.h>
-
-+#ifdef HAVE_GETRAWPARTITION
-+#include <util.h>
-+#endif
-+
- #include "interface/cdda_interface.h"
- #include "paranoia/cdda_paranoia.h"
- #include "utils.h"
-@@ -231,6 +237,7 @@ VERSION"\n"
- " cdparanoia [options] <span> [outfile]\n\n"
-
- "OPTIONS:\n"
-+#ifdef GETOPT_LONG
- " -v --verbose : extra verbose operation\n"
- " -q --quiet : quiet operation\n"
- " -e --stderr-progress : force output of progress information to\n"
-@@ -256,9 +263,11 @@ VERSION"\n"
- " to n sectors\n"
- " -o --force-search-overlap <n> : force minimum overlap search during\n"
- " verification to n sectors\n"
-+#if !(defined(__APPLE__) && defined(__MACH__))
- " -d --force-cdrom-device <dev> : use specified device; disallow \n"
- " autosense\n"
- " -g --force-generic-device <dev> : use specified generic scsi device\n"
-+#endif
- " -S --force-read-speed <n> : read from device at specified speed\n"
- " -t --toc-offset <n> : Add <n> sectors to the values reported\n"
- " when addressing tracks. May be negative\n"
-@@ -276,6 +285,52 @@ VERSION"\n"
- " -Z --disable-paranoia : disable all paranoia checking\n"
- " -Y --disable-extra-paranoia : only do cdda2wav-style overlap checking\n"
- " -X --abort-on-skip : abort on imperfect reads/skips\n\n"
-+#else
-+" -v : extra verbose operation\n"
-+" -q : quiet operation\n"
-+" -e : force output of progress information to\n"
-+" stderr (for wrapper scripts)\n"
-+" -V : print version info and quit\n"
-+" -Q : autosense drive, query disc and quit\n"
-+" -B : 'batch' mode (saves each track to a seperate file.\n"
-+" -s : do an exhaustive search for drive\n"
-+" -h : print help\n\n"
-+
-+" -p : output raw 16 bit PCM in host byte order\n"
-+" -r : output raw 16 bit little-endian PCM\n"
-+" -R : output raw 16 bit big-endian PCM\n"
-+" -w : output as WAV file (default)\n"
-+" -f : output as AIFF file\n"
-+" -a : output as AIFF-C file\n"
-+" -i <file> : output human readable ripping info to file\n\n"
-+
-+" -c : force treating drive as little endian\n"
-+" -C : force treating drive as big endian\n"
-+" -n <n> : force default number of sectors in read to n sectors\n"
-+" -o <n> : force minimum overlap search during\n"
-+" verification to n sectors\n"
-+#if !(defined(__APPLE__) && defined(__MACH__))
-+" -d <dev> : use specified device; disallow autosense\n"
-+" -g <dev> : use specified generic scsi device\n"
-+#endif
-+" -S <n> : read from device at specified speed\n"
-+" -t <n> : Add <n> sectors to the values reported\n"
-+" when addressing tracks. May be negative\n"
-+" -T : Assume that the beginning offset of\n"
-+" track 1 as reported in the TOC will be\n"
-+" addressed as LBA 0. Necessary for some\n"
-+" Toshiba drives to get track boundaries\n"
-+" correct\n"
-+" -O <n> : Add <n> samples to the offset when\n"
-+" reading data. May be negative.\n"
-+" -z[=n] : never accept any less than perfect\n"
-+" data reconstruction (don't allow 'V's)\n"
-+" but if [n] is given, skip after [n]\n"
-+" retries without progress.\n"
-+" -Z : disable all paranoia checking\n"
-+" -Y : only do cdda2wav-style overlap checking\n"
-+" -X : abort on imperfect reads/skips\n\n"
-+#endif
-
- "OUTPUT SMILIES:\n"
- " :-) Normal operation, low/no jitter\n"
-@@ -376,7 +431,7 @@ static void callback(long inpos, int fun
- int graph=30;
- char buffer[256];
- static long c_sector=0,v_sector=0;
-- static char dispcache[30]=" ";
-+ static char dispcache[30 + 1]=" ";
- static int last=0;
- static long lasttime=0;
- long sector,osector=0;
-@@ -587,6 +642,7 @@ static void callback(long inpos, int fun
-
- const char *optstring = "escCn:o:O:d:g:S:prRwafvqVQhZz::YXWBi:Tt:";
-
-+#ifdef GETOPT_LONG
- struct option options [] = {
- {"stderr-progress",no_argument,NULL,'e'},
- {"search-for-drive",no_argument,NULL,'s'},
-@@ -621,6 +677,7 @@ struct option options [] = {
-
- {NULL,0,NULL,0}
- };
-+#endif
-
- long blocking_write(int outf, char *buffer, long num){
- long words=0,temp;
-@@ -673,7 +730,12 @@ int main(int argc,char *argv[]){
-
- atexit(cleanup);
-
-- while((c=getopt_long(argc,argv,optstring,options,&long_option_index))!=EOF){
-+#ifdef GETOPT_LONG
-+ while((c=getopt_long(argc,argv,optstring,options,&long_option_index))!=EOF)
-+#else
-+ while((c=getopt(argc,argv,optstring))!=EOF)
-+#endif
-+ {
- switch(c){
- case 'B':
- batch=1;
-@@ -690,6 +752,7 @@ int main(int argc,char *argv[]){
- case 'o':
- force_cdrom_overlap=atoi(optarg);
- break;
-+#if !(defined(__APPLE__) && defined(__MACH__))
- case 'd':
- if(force_cdrom_device)free(force_cdrom_device);
- force_cdrom_device=copystring(optarg);
-@@ -698,6 +761,7 @@ int main(int argc,char *argv[]){
- if(force_generic_device)free(force_generic_device);
- force_generic_device=copystring(optarg);
- break;
-+#endif
- case 'S':
- force_cdrom_speed=atoi(optarg);
- break;
-@@ -811,6 +875,30 @@ int main(int argc,char *argv[]){
-
- /* Query the cdrom/disc; we may need to override some settings */
-
-+#if defined(__APPLE__) && defined(__MACH__)
-+ d=cdda_find_a_cdrom(verbose,NULL);
-+#else
-+#ifndef __linux__ /* XXX */
-+#ifdef __NetBSD__
-+ if (!force_generic_device) {
-+ int raw;
-+ static char devstring[16];
-+#ifdef HAVE_GETRAWPARTITION
-+ raw = getrawpartition();
-+#else
-+ raw = 'c' - 'a';
-+#endif
-+ snprintf(devstring, sizeof(devstring) - 1, "/dev/rcd0%c", raw + 'a');
-+ force_generic_device=devstring;
-+ }
-+#else
-+ if (!force_generic_device)
-+ errx(1, "-g option is currently required by the NetBSD pkg version");
-+#endif
-+ if (!force_cdrom_device)
-+ force_cdrom_device=copystring(force_generic_device);
-+#endif
-+
- if(force_generic_device)
- d=cdda_identify_scsi(force_generic_device,force_cdrom_device,verbose,NULL);
- else
-@@ -841,6 +929,7 @@ int main(int argc,char *argv[]){
- report("");
- }
- }
-+#endif /* __APPLE__ && __DARWIN__ */
-
- if(!d){
- if(!verbose)
-@@ -878,7 +967,9 @@ int main(int argc,char *argv[]){
- "ignoring preset and autosense",force_cdrom_sectors);
- report(buffer);
- d->nsectors=force_cdrom_sectors;
-+#if !(defined(__APPLE__) && defined(__MACH__))
- d->bigbuff=force_cdrom_sectors*CD_FRAMESIZE_RAW;
-+#endif
- }
- }
- if(force_cdrom_overlap!=-1){
diff --git a/audio/cdparanoia/patches/patch-ba b/audio/cdparanoia/patches/patch-ba
deleted file mode 100644
index 5c866c415e8..00000000000
--- a/audio/cdparanoia/patches/patch-ba
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ba,v 1.3 2006/03/07 06:29:03 joerg Exp $
-
---- paranoia/Makefile.in.orig Tue Dec 14 04:28:04 1999
-+++ paranoia/Makefile.in
-@@ -21,10 +21,9 @@ CPPFLAGS+=-D_REENTRANT
- OFILES = paranoia.o p_block.o overlap.o gap.o isort.o
- #TFILES = isort.t gap.t p_block.t paranoia.t
-
--LIBS = ../interface/libcdda_interface.a -lm
--export VERSION
-+LIBS = ../interface/libcdda_interface.la -lm
-
--all: lib slib
-+all: slib
-
- debug:
- $(MAKE) libcdda_paranoia.a CFLAGS="$(DEBUG)"
-@@ -33,23 +32,21 @@ lib:
- $(MAKE) libcdda_paranoia.a CFLAGS="$(OPT)"
-
- slib:
-- $(MAKE) lessmessy
-- $(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fpic"
-+ $(MAKE) libcdda_paranoia.so VERSION=$(VERSION) CFLAGS="$(OPT)"
-
- #test: $(TFILES)
- #
-
--libcdda_paranoia.a: $(OFILES)
-- $(AR) -r libcdda_paranoia.a $(OFILES)
-- $(RANLIB) libcdda_paranoia.a
--
--libcdda_paranoia.so: $(OFILES)
-- $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES)
-- [ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0
-- [ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so
-+libcdda_paranoia.la: $(OFILES)
-+ $(LIBTOOL) --mode=link $(CC) -o libcdda_paranoia.la $(OFILES:.o=.lo) \
-+ -version-info 1:0 -rpath $(PREFIX)/lib
-+
-+libcdda_paranoia.a: libcdda_paranoia.la
-+
-+libcdda_paranoia.so: libcdda_paranoia.la
-
- .c.o:
-- $(CC) $(CFLAGS) -c $<
-+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
-
- .c.t:
- $(CC) -g -DTEST $(DEBUG) -o $@ $< $(LIBS)
diff --git a/audio/cdparanoia/patches/patch-ca b/audio/cdparanoia/patches/patch-ca
deleted file mode 100644
index 98e508d3cc6..00000000000
--- a/audio/cdparanoia/patches/patch-ca
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ca,v 1.5 2006/09/03 17:13:30 ben Exp $
-
---- interface/Makefile.in.orig 1999-12-13 20:27:59.000000000 -0800
-+++ interface/Makefile.in
-@@ -18,12 +18,10 @@ RANLIB=@RANLIB@
- LIBS = -lm
- CPPFLAGS+=-D_REENTRANT
-
--OFILES = scan_devices.o common_interface.o cooked_interface.o interface.o\
-- scsi_interface.o smallft.o toc.o test_interface.o
-+OFILES = scan_devices.o common_interface.o interface.o\
-+ smallft.o toc.o test_interface.o @EXTRA_OBJS@
-
--export VERSION
--
--all: lib slib
-+all: slib
-
- debug:
- $(MAKE) libcdda_interface.a CFLAGS="$(DEBUG)"
-@@ -32,26 +30,24 @@ lib:
- $(MAKE) libcdda_interface.a CFLAGS="$(OPT)"
-
- slib:
-- $(MAKE) lessmessy
-- $(MAKE) libcdda_interface.so CFLAGS="$(OPT) -fpic"
-- [ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so libcdda_interface.so.0
-+ $(MAKE) libcdda_interface.la VERSION=$(VERSION) CFLAGS="$(OPT)"
-
- test:
-+ $(MAKE) lessmessy
- $(MAKE) libcdda_interface.a CFLAGS="$(DEBUG)"
- $(CC) $(DEBUG) -c test.c
-- $(LD) $(DEBUG) test.o $(LDFLAGS) -o cdda_test $(LIBS) libcdda_interface.a
-+ $(LIBTOOL) --mode=link $(LD) $(DEBUG) test.o $(LDFLAGS) -o cdda_test $(LIBS) libcdda_interface.la
-+
-+libcdda_interface.la: $(OFILES)
-+ $(LIBTOOL) --mode=link $(CC) -o libcdda_interface.la $(OFILES:.o=.lo) \
-+ -version-info 1:0 -rpath $(PREFIX)/lib $(LDFLAGS)
-+
-+libcdda_interface.a: libcdda_interface.la
-
--libcdda_interface.a: $(OFILES)
-- $(AR) -r libcdda_interface.a $(OFILES)
-- $(RANLIB) libcdda_interface.a
--
--libcdda_interface.so: $(OFILES)
-- $(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES)
-- [ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0
-- [ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so
-+libcdda_interface.so: libcdda_interface.la
-
- .c.o:
-- $(CC) $(CFLAGS) -c $<
-+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
-
- lessmessy:
- -rm -f *.o core *~ *.out
diff --git a/audio/cdparanoia/patches/patch-cb b/audio/cdparanoia/patches/patch-cb
deleted file mode 100644
index cd2612c35a0..00000000000
--- a/audio/cdparanoia/patches/patch-cb
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-cb,v 1.5 2006/09/03 17:13:30 ben Exp $
-
---- interface/low_interface.h.orig 2001-03-25 22:12:11.000000000 -0800
-+++ interface/low_interface.h
-@@ -25,6 +25,7 @@
- #include <sys/time.h>
- #include <sys/types.h>
-
-+#ifdef __linux__
- #include <linux/major.h>
- #include <linux/version.h>
-
-@@ -48,12 +49,32 @@
- #include <linux/cdrom.h>
- #include <linux/major.h>
-
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+
-+#include <sys/cdio.h>
-+#include <sys/cdrio.h>
-+
-+#include <cam/scsi/scsi_message.h>
-+#include <camlib.h>
-+
-+#elif defined(__NetBSD__)
-+
-+#include <sys/scsiio.h>
-+#include <sys/cdio.h>
-+#endif
-+
- #include "cdda_interface.h"
-
- #define MAX_RETRIES 8
- #define MAX_BIG_BUFF_SIZE 65536
- #define MIN_BIG_BUFF_SIZE 4096
-+#ifdef __linux__
- #define SG_OFF sizeof(struct sg_header)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+#define SG_OFF (0)
-+#elif defined(__NetBSD__)
-+#define SG_OFF sizeof(scsireq_t)
-+#endif
-
- #ifndef SG_EMULATED_HOST
- /* old kernel version; the check for the ioctl is still runtime, this
-@@ -64,7 +85,9 @@
- #endif
-
- extern int cooked_init_drive (cdrom_drive *d);
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
- extern unsigned char *scsi_inquiry (cdrom_drive *d);
-+#endif
- extern int scsi_init_drive (cdrom_drive *d);
- #ifdef CDDA_TEST
- extern int test_init_drive (cdrom_drive *d);
diff --git a/audio/cdparanoia/patches/patch-cc b/audio/cdparanoia/patches/patch-cc
deleted file mode 100644
index 318cdf0048b..00000000000
--- a/audio/cdparanoia/patches/patch-cc
+++ /dev/null
@@ -1,88 +0,0 @@
-$NetBSD: patch-cc,v 1.6 2006/09/03 17:13:30 ben Exp $
-
---- interface/utils.h.orig 2000-04-19 15:41:04.000000000 -0700
-+++ interface/utils.h
-@@ -1,4 +1,23 @@
-+#ifdef __linux__
- #include <endian.h>
-+#endif
-+#ifdef __NetBSD__
-+#include <sys/param.h>
-+#if __NetBSD_Version__ >= 104010000
-+#include <sys/endian.h>
-+#else
-+#include <machine/endian.h>
-+#include <machine/bswap.h>
-+#endif
-+#include <err.h> /* XXX */
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+#include <machine/endian.h>
-+#endif
-+#if defined(__APPLE__) && defined(__MACH__)
-+#include <stdint.h>
-+#include <machine/endian.h>
-+#define STDERR_FILENO 2
-+#endif
- #include <stdio.h>
- #include <errno.h>
- #include <string.h>
-@@ -14,15 +33,27 @@ static inline int bigendianp(void){
- }
-
- static inline int32_t swap32(int32_t x){
-+#if defined(__APPLE__) && defined(__MACH__)
-+ return((((uint32_t)x & 0x000000ffU) << 24) |
-+ (((uint32_t)x & 0x0000ff00U) << 8) |
-+ (((uint32_t)x & 0x00ff0000U) >> 8) |
-+ (((uint32_t)x & 0xff000000U) >> 24));
-+#else
- return((((u_int32_t)x & 0x000000ffU) << 24) |
- (((u_int32_t)x & 0x0000ff00U) << 8) |
- (((u_int32_t)x & 0x00ff0000U) >> 8) |
- (((u_int32_t)x & 0xff000000U) >> 24));
-+#endif
- }
-
- static inline int16_t swap16(int16_t x){
-+#if defined(__APPLE__) && defined(__MACH__)
-+ return((((uint16_t)x & 0x00ffU) << 8) |
-+ (((uint16_t)x & 0xff00U) >> 8));
-+#else
- return((((u_int16_t)x & 0x00ffU) << 8) |
- (((u_int16_t)x & 0xff00U) >> 8));
-+#endif
- }
-
- #if BYTE_ORDER == LITTLE_ENDIAN
-@@ -112,6 +143,7 @@ static void cderror(cdrom_drive *d,const
- break;
- case CDDA_MESSAGE_FORGETIT:
- default:
-+ break;
- }
- }
- }
-@@ -127,6 +159,7 @@ static void cdmessage(cdrom_drive *d,con
- break;
- case CDDA_MESSAGE_FORGETIT:
- default:
-+ break;
- }
- }
- }
-@@ -169,6 +202,7 @@ static void idperror(int messagedest,cha
- break;
- case CDDA_MESSAGE_FORGETIT:
- default:
-+ break;
- }
- }
- if(malloced)free(buffer);
-@@ -205,6 +239,7 @@ static void idmessage(int messagedest,ch
- break;
- case CDDA_MESSAGE_FORGETIT:
- default:
-+ break;
- }
- }
- if(malloced)free(buffer);
diff --git a/audio/cdparanoia/patches/patch-cd b/audio/cdparanoia/patches/patch-cd
deleted file mode 100644
index 2299a1283a9..00000000000
--- a/audio/cdparanoia/patches/patch-cd
+++ /dev/null
@@ -1,112 +0,0 @@
-$NetBSD: patch-cd,v 1.4 2006/09/03 17:13:30 ben Exp $
-
---- interface/common_interface.c.orig 2000-04-19 15:41:04.000000000 -0700
-+++ interface/common_interface.c
-@@ -9,23 +9,39 @@
- ******************************************************************/
-
- #include <math.h>
-+#if defined(__APPLE__) && defined(__MACH__)
-+#include <sys/syslimits.h>
-+#include <assert.h>
-+#include <stdlib.h>
-+#include <paths.h>
-+#include <fcntl.h>
-+#endif
- #include "low_interface.h"
- #include "utils.h"
- #include "smallft.h"
-
-+#ifdef __linux__
- #include <linux/hdreg.h>
-+#endif
-
- /* Test for presence of a cdrom by pinging with the 'CDROMVOLREAD' ioctl() */
- int ioctl_ping_cdrom(int fd){
-+#ifdef __linux__
- struct cdrom_volctrl volctl;
- if (ioctl(fd, CDROMVOLREAD, &volctl))
- return(1); /* failure */
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-+ struct ioc_vol volctl;
-+ if (ioctl(fd, CDIOCGETVOL, &volctl))
-+ return(1); /* failure */
-+#endif
-
- return(0);
- /* success! */
- }
-
-
-+#ifdef __linux__
- /* Use the ioctl thingy above ping the cdrom; this will get model info */
- char *atapi_drive_info(int fd){
- /* Work around the fact that the struct grew without warning in
-@@ -46,6 +62,7 @@ char *atapi_drive_info(int fd){
- free(id);
- return(ret);
- }
-+#endif
-
- int data_bigendianp(cdrom_drive *d){
- float lsb_votes=0;
-@@ -171,9 +188,12 @@ int data_bigendianp(cdrom_drive *d){
- knows the leasoud/leadin size. */
-
- int FixupTOC(cdrom_drive *d,int tracks){
-+#ifdef __linux__
- struct cdrom_multisession ms_str;
-+#endif
- int j;
-
-+#if !(defined(__APPLE__) && defined(__MACH__))
- /* First off, make sure the 'starting sector' is >=0 */
-
- for(j=0;j<tracks;j++){
-@@ -208,14 +228,26 @@ int FixupTOC(cdrom_drive *d,int tracks){
- /* For a scsi device, the ioctl must go to the specialized SCSI
- CDROM device, not the generic device. */
-
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
- if (d->ioctl_fd != -1) {
-+#ifdef __linux__
- int result;
-
- ms_str.addr_format = CDROM_LBA;
- result = ioctl(d->ioctl_fd, CDROMMULTISESSION, &ms_str);
- if (result == -1) return -1;
-+# define ms_addr (ms_str.addr.lba)
-+#endif
-+
-+#ifdef __NetBSD__
-+ int ms_addr;
-+
-+ ms_addr = 0; /* last session */
-+ if (ioctl(d->ioctl_fd, CDIOREADMSADDR, &ms_addr) == -1)
-+ return -1;
-+#endif
-
-- if (ms_str.addr.lba > 100) {
-+ if (ms_addr > 100) {
-
- /* This is an odd little piece of code --Monty */
-
-@@ -223,14 +255,16 @@ int FixupTOC(cdrom_drive *d,int tracks){
- /* adjust end of last audio track to be in the first session */
- for (j = tracks-1; j >= 0; j--) {
- if (j > 0 && !IS_AUDIO(d,j) && IS_AUDIO(d,j-1)) {
-- if (d->disc_toc[j].dwStartSector > ms_str.addr.lba - 11400)
-- d->disc_toc[j].dwStartSector = ms_str.addr.lba - 11400;
-+ if (d->disc_toc[j].dwStartSector > ms_addr - 11400)
-+ d->disc_toc[j].dwStartSector = ms_addr - 11400;
- break;
- }
- }
- return 1;
- }
- }
-+#endif
-+#endif
- return 0;
- }
-
diff --git a/audio/cdparanoia/patches/patch-ce b/audio/cdparanoia/patches/patch-ce
deleted file mode 100644
index ae5820d2f17..00000000000
--- a/audio/cdparanoia/patches/patch-ce
+++ /dev/null
@@ -1,264 +0,0 @@
-$NetBSD: patch-ce,v 1.4 2006/11/05 13:45:37 wiz Exp $
-
---- interface/cooked_interface.c.orig Thu Apr 20 00:41:04 2000
-+++ interface/cooked_interface.c
-@@ -10,9 +10,11 @@
- #include "common_interface.h"
- #include "utils.h"
-
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
- static int cooked_readtoc (cdrom_drive *d){
- int i;
- int tracks;
-+#ifdef __linux__
- struct cdrom_tochdr hdr;
- struct cdrom_tocentry entry;
-
-@@ -52,6 +54,45 @@ static int cooked_readtoc (cdrom_drive *
- d->disc_toc[i].dwStartSector = entry.cdte_addr.lba;
-
- tracks=hdr.cdth_trk1+1;
-+#endif
-+
-+#ifdef __NetBSD__
-+ struct ioc_read_toc_entry hdr;
-+ struct cd_toc_entry entries[MAXTRK + 1]; /* + 1 for leadout */
-+
-+ hdr.address_format = CD_LBA_FORMAT;
-+ hdr.starting_track = 1;
-+ hdr.data_len = sizeof entries;
-+ hdr.data = entries;
-+ memset(entries, 0, sizeof entries);
-+
-+ /* get all TOC entries at once */
-+#ifndef CDIOREADTOCENTRIES
-+#define CDIOREADTOCENTRIES CDIOREADTOCENTRYS
-+#endif
-+ if(ioctl(d->ioctl_fd, CDIOREADTOCENTRIES, &hdr))
-+ switch(errno){
-+ case EPERM:
-+ cderror(d,"102: Permision denied on cdrom (ioctl) device\n");
-+ return(-102);
-+ default:
-+ cderror(d,"004: Unable to read table of contents header\n");
-+ return(-4);
-+ }
-+
-+ for(i = 0; i < MAXTRK + 1; i++) {
-+ d->disc_toc[i].bFlags = (entries[i].addr_type << 4) | (entries[i].control & 0x0f);
-+ d->disc_toc[i].bTrack = entries[i].track;
-+ d->disc_toc[i].dwStartSector = entries[i].addr.lba;
-+ if (entries[i].track == 0) {
-+ cderror(d,"005: Unable to read table of contents entry\n");
-+ return(-5);
-+ }
-+ if (entries[i].track >= 100)
-+ break; /* leadout */
-+ }
-+ tracks = i;
-+#endif
- d->cd_extra=FixupTOC(d,tracks);
- return(--tracks); /* without lead-out */
- }
-@@ -60,10 +101,15 @@ static int cooked_readtoc (cdrom_drive *
- /* Set operating speed */
- static int cooked_setspeed(cdrom_drive *d, int speed)
- {
-+#ifdef __linux__
- if(d->ioctl_fd!=-1)
- return ioctl(d->ioctl_fd, CDROM_SELECT_SPEED, speed);
- else
- return 0;
-+#endif
-+#ifdef __NetBSD__
-+ errx(1, "cooked_setspeed: not implemented");
-+#endif
- }
-
-
-@@ -72,6 +118,7 @@ static int cooked_setspeed(cdrom_drive *
- */
-
- static long cooked_read (cdrom_drive *d, void *p, long begin, long sectors){
-+#ifdef __linux__
- int retry_count,err;
- struct cdrom_read_audio arg;
- char *buffer=(char *)p;
-@@ -127,7 +174,147 @@ static long cooked_read (cdrom_drive *d,
- } while (err);
-
- return(sectors);
-+#endif
-+#ifdef __NetBSD__
-+ errx(1, "cooked_read: not implemented");
-+#endif
- }
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+static int
-+cooked_readtoc(cdrom_drive *d)
-+{
-+ int i;
-+ struct ioc_toc_header hdr;
-+ struct ioc_read_toc_single_entry entry;
-+
-+ if (ioctl(d->ioctl_fd, CDIOREADTOCHEADER, &hdr) == -1) {
-+ int ret;
-+
-+ if (errno == EPERM) {
-+ ret = -102;
-+ cderror(d, "102: ");
-+ } else {
-+ ret = -4;
-+ cderror(d, "004: Unable to read table of contents header: ");
-+ }
-+ cderror(d, strerror(errno));
-+ cderror(d, "\n");
-+ return ret;
-+ }
-+
-+ entry.address_format = CD_LBA_FORMAT;
-+ for (i = hdr.starting_track; i <= hdr.ending_track; ++i) {
-+ entry.track = i;
-+
-+ if (ioctl(d->ioctl_fd, CDIOREADTOCENTRY, &entry) == -1) {
-+ cderror(d, "005: Unable to read table of contents entry\n");
-+ return -5;
-+ }
-+
-+ d->disc_toc[i - hdr.starting_track].bFlags = entry.entry.control;
-+ d->disc_toc[i - hdr.starting_track].bTrack = entry.entry.track;
-+ d->disc_toc[i - hdr.starting_track].dwStartSector = be32_to_cpu(entry.entry.addr.lba);
-+ }
-+
-+ entry.track = 0xaa; /* leadout */
-+
-+ if (ioctl(d->ioctl_fd, CDIOREADTOCENTRY, &entry) == -1) {
-+ cderror(d, "005: Unable to read table of contents entry\n");
-+ return -5;
-+ }
-+
-+ d->disc_toc[i - hdr.starting_track].bFlags = entry.entry.control;
-+ d->disc_toc[i - hdr.starting_track].bTrack = entry.entry.track;
-+ d->disc_toc[i - hdr.starting_track].dwStartSector = be32_to_cpu(entry.entry.addr.lba);
-+
-+ d->cd_extra = FixupTOC(d, hdr.ending_track - hdr.starting_track + 2); /* with TOC */
-+
-+ return hdr.ending_track - hdr.starting_track + 1;
-+}
-+
-+static int
-+cooked_setspeed(cdrom_drive *d, int speed)
-+{
-+#ifdef CDRIOCREADSPEED
-+ speed *= 177;
-+ return ioctl(d->ioctl_fd, CDRIOCREADSPEED, &speed);
-+#else
-+ return -1;
-+#endif
-+}
-+
-+
-+static long
-+cooked_read(cdrom_drive *d, void *p, long begin, long sectors)
-+{
-+ int retry_count = 0;
-+/* CDIOCREADAUDIO has been removed in FreeBSD 5.1-CURRENT */
-+#if __FreeBSD_version >= 501106
-+ int bsize = CD_FRAMESIZE_RAW;
-+#else
-+ struct ioc_read_audio arg;
-+
-+ if (sectors > d->nsectors)
-+ sectors = d->nsectors;
-+
-+ arg.address_format = CD_LBA_FORMAT;
-+ arg.address.lba = begin;
-+ arg.buffer = p;
-+#endif
-+
-+#if __FreeBSD_version >= 501106
-+ if (ioctl(d->ioctl_fd, CDRIOCSETBLOCKSIZE, &bsize) == -1) {
-+ return -7;
-+ }
-+#endif
-+ for (;;) {
-+#if __FreeBSD_version >= 501106
-+ if (pread(d->ioctl_fd, p, sectors*bsize, begin*bsize) != sectors*bsize) {
-+#else
-+ arg.nframes = sectors;
-+ if (ioctl(d->ioctl_fd, CDIOCREADAUDIO, &arg) == -1) {
-+#endif
-+ if (!d->error_retry)
-+ return -7;
-+
-+ switch (errno) {
-+ case ENOMEM:
-+ if (sectors == 1) {
-+ cderror(d, "300: Kernel memory error\n");
-+ return -300;
-+ }
-+ /* FALLTHROUGH */
-+ default:
-+ if (sectors == 1) {
-+ if (retry_count > MAX_RETRIES - 1) {
-+ char b[256];
-+ snprintf(b, sizeof(b),
-+ "010: Unable to access sector %ld; "
-+ "skipping...\n", begin);
-+ cderror(d, b);
-+ return -10;
-+ }
-+ break;
-+ }
-+ }
-+
-+ if (retry_count > 4 && sectors > 1)
-+ sectors = sectors * 3 / 4;
-+
-+ ++retry_count;
-+
-+ if (retry_count > MAX_RETRIES) {
-+ cderror(d, "007: Unknown, unrecoverable error reading data\n");
-+ return -7;
-+ }
-+ } else
-+ break;
-+ }
-+
-+ return sectors;
-+}
-+#endif
-+
-
- /* hook */
- static int Dummy (cdrom_drive *d,int Switch){
-@@ -191,8 +378,11 @@ static void check_exceptions(cdrom_drive
-
- /* set function pointers to use the ioctl routines */
- int cooked_init_drive (cdrom_drive *d){
-+#ifdef __NetBSD__
-+ errx(1, "cooked_init_drive: not implemented");
-+#else
- int ret;
--
-+#ifdef __linux__
- switch(d->drive_type){
- case MATSUSHITA_CDROM_MAJOR: /* sbpcd 1 */
- case MATSUSHITA_CDROM2_MAJOR: /* sbpcd 2 */
-@@ -243,6 +433,9 @@ int cooked_init_drive (cdrom_drive *d){
- default:
- d->nsectors=40;
- }
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+ d->nsectors = 26; /* FreeBSD only supports 64K I/O transfer size */
-+#endif
- d->enable_cdda = Dummy;
- d->read_audio = cooked_read;
- d->set_speed = cooked_setspeed;
-@@ -255,5 +448,6 @@ int cooked_init_drive (cdrom_drive *d){
- if((ret=verify_read_command(d)))return(ret);
- d->error_retry=1;
- return(0);
-+#endif
- }
-
diff --git a/audio/cdparanoia/patches/patch-cf b/audio/cdparanoia/patches/patch-cf
deleted file mode 100644
index 5aba4a64f1f..00000000000
--- a/audio/cdparanoia/patches/patch-cf
+++ /dev/null
@@ -1,425 +0,0 @@
-$NetBSD: patch-cf,v 1.7 2006/09/03 17:13:30 ben Exp $
-
---- interface/scan_devices.c.orig 2001-03-25 21:44:01.000000000 -0800
-+++ interface/scan_devices.c
-@@ -19,6 +19,8 @@
- #include "common_interface.h"
- #include "utils.h"
-
-+#ifdef __linux__
-+
- #define MAX_DEV_LEN 20 /* Safe because strings only come from below */
- /* must be absolute paths! */
- static char *scsi_cdrom_prefixes[]={
-@@ -49,11 +51,24 @@ static char *cdrom_devices[]={
- "/dev/cm206cd",
- "/dev/gscd",
- "/dev/optcd",NULL};
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+static char *cdrom_devices[] = {
-+ "/dev/cd?c",
-+ "/dev/acd?c",
-+ "/dev/wcd?c",
-+ "/dev/mcd?c", NULL};
-+#endif
-
- /* Functions here look for a cdrom drive; full init of a drive type
- happens in interface.c */
-
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) || (defined(__APPLE__) && defined(__MACH__))
- cdrom_drive *cdda_find_a_cdrom(int messagedest,char **messages){
-+#if defined(__APPLE__) && defined(__MACH__)
-+ cdrom_drive *d = calloc(1, sizeof(cdrom_drive));
-+ d->interface = OSX_IOKIT;
-+ return d;
-+#else
- /* Brute force... */
-
- int i=0;
-@@ -75,10 +90,12 @@ cdrom_drive *cdda_find_a_cdrom(int messa
- if((d=cdda_identify(buffer,messagedest,messages)))
- return(d);
- idmessage(messagedest,messages,"",NULL);
-+#ifdef __linux__
- buffer[pos-(cdrom_devices[i])]=j+97;
- if((d=cdda_identify(buffer,messagedest,messages)))
- return(d);
- idmessage(messagedest,messages,"",NULL);
-+#endif
- }
- }else{
- /* Name. Go for it. */
-@@ -97,8 +114,20 @@ cdrom_drive *cdda_find_a_cdrom(int messa
- temp->pw_name);
- }
- return(NULL);
-+#endif
- }
-+#endif /* __linux__ */
-
-+#ifdef __NetBSD__
-+
-+cdrom_drive *cdda_find_a_cdrom(int messagedest,char **messages)
-+{
-+ errx(1, "cdda_find_a_cdrom: not implemented");
-+ /* NOTREACHED */
-+}
-+#endif /* __NetBSD__ */
-+
-+#if !(defined(__APPLE__) && defined(__MACH__))
- cdrom_drive *cdda_identify(const char *device, int messagedest,char **messages){
- struct stat st;
- cdrom_drive *d=NULL;
-@@ -117,8 +146,14 @@ cdrom_drive *cdda_identify(const char *d
- }
- #endif
-
-+#if defined(__linux__) || defined(__NetBSD__)
- d=cdda_identify_cooked(device,messagedest,messages);
- if(!d)d=cdda_identify_scsi(device,NULL,messagedest,messages);
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+ d = cdda_identify_scsi(device, NULL, messagedest, messages);
-+ if (d == NULL)
-+ d = cdda_identify_cooked(device, messagedest, messages);
-+#endif
-
- #ifdef CDDA_TEST
- if(!d)d=cdda_identify_test(device,messagedest,messages);
-@@ -146,6 +181,7 @@ char *test_resolve_symlink(const char *f
- cdrom_drive *cdda_identify_cooked(const char *dev, int messagedest,
- char **messages){
-
-+#ifdef __linux__
- cdrom_drive *d=NULL;
- struct stat st;
- int fd=-1;
-@@ -273,8 +309,60 @@ cdrom_drive *cdda_identify_cooked(const
- idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description);
-
- return(d);
-+#elif defined(__NetBSD__)
-+ /* no kernel support for CD-DA */
-+ return NULL;
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+ cdrom_drive *d;
-+ struct stat st;
-+
-+ if (stat(dev, &st)) {
-+ idperror(messagedest, messages, "\t\tCould not stat %s", dev);
-+ return NULL;
-+ }
-+
-+ if (!S_ISCHR(st.st_mode)) {
-+ idmessage(messagedest, messages, "\t\t%s is no block device", dev);
-+ return NULL;
-+ }
-+
-+ if ((d = calloc(1, sizeof(*d))) == NULL) {
-+ idperror(messagedest, messages, "\t\tCould not allocate memory", NULL);
-+ return NULL;
-+ }
-+ d->ioctl_fd = -1;
-+
-+ if ((d->ioctl_fd = open(dev, O_RDONLY)) == -1) {
-+ idperror(messagedest, messages, "\t\tCould not open %s", dev);
-+ goto cdda_identify_cooked_fail;
-+ }
-+
-+ if (ioctl_ping_cdrom(d->ioctl_fd)) {
-+ idmessage(messagedest, messages, "\t\tDevice %s is not a CDROM", dev);
-+ goto cdda_identify_cooked_fail;
-+ }
-+
-+ d->cdda_device_name = copystring(dev);
-+ d->drive_model = copystring("Generic cooked ioctl CDROM");
-+ d->interface = COOKED_IOCTL;
-+ d->bigendianp = -1;
-+ d->nsectors = -1;
-+
-+ idmessage(messagedest, messages, "\t\tCDROM sensed: %s\n", d->drive_model);
-+
-+ return d;
-+
-+cdda_identify_cooked_fail:
-+ if (d != NULL) {
-+ if (d->ioctl_fd != -1)
-+ close(d->ioctl_fd);
-+ free(d);
-+ }
-+ return NULL;
-+#endif
- }
-
-+#if !defined(__FreeBSD__) || defined(__DragonFly__)
- struct sg_id {
- long l1; /* target | lun << 8 | channel << 16 | low_ino << 24 */
- long l2; /* Unique id */
-@@ -289,12 +377,18 @@ typedef struct scsiid{
- /* Even *this* isn't as simple as it bloody well should be :-P */
- /* SG has an easy interface, but SCSI overall does not */
- static int get_scsi_id(int fd, scsiid *id){
-+#ifdef __linux__
- struct sg_id argid;
-+#endif
-+#ifdef __NetBSD__
-+ struct scsi_addr argid;
-+#endif
- int busarg;
-
- /* get the host/id/lun */
-
- if(fd==-1)return(-1);
-+#ifdef __linux__
- if(ioctl(fd,SCSI_IOCTL_GET_IDLUN,&argid))return(-1);
- id->bus=argid.l2; /* for now */
- id->id=argid.l1&0xff;
-@@ -302,6 +396,13 @@ static int get_scsi_id(int fd, scsiid *i
-
- if(ioctl(fd,SCSI_IOCTL_GET_BUS_NUMBER,&busarg)==0)
- id->bus=busarg;
-+#endif
-+#ifdef __NetBSD__
-+ if(ioctl(fd,SCIOCIDENTIFY,&argid))return(-1);
-+ id->bus=argid.addr.scsi.scbus;
-+ id->id=argid.addr.scsi.target;
-+ id->lun=argid.addr.scsi.lun;
-+#endif
-
- return(0);
- }
-@@ -390,6 +491,7 @@ matchfail:
- if(dev!=-1)close(dev);
- return(NULL);
- }
-+#endif
-
- void strscat(char *a,char *b,int n){
- int i;
-@@ -401,6 +503,7 @@ void strscat(char *a,char *b,int n){
- strcat(a," ");
- }
-
-+#ifdef __linux__
- /* At this point, we're going to punt compatability before SG2, and
- allow only SG2 and SG3 */
- static int verify_SG_version(cdrom_drive *d,int messagedest,
-@@ -430,7 +533,9 @@ static int verify_SG_version(cdrom_drive
- idmessage(messagedest,messages,buffer,"");
- return(major);
- }
-+#endif
-
-+#if defined(__linux__) || defined(__NetBSD__)
- cdrom_drive *cdda_identify_scsi(const char *generic_device,
- const char *ioctl_device, int messagedest,
- char **messages){
-@@ -460,6 +565,7 @@ cdrom_drive *cdda_identify_scsi(const ch
- generic_device);
- return(NULL);
- }
-+#ifdef __linux__
- if((int)(g_st.st_rdev>>8)!=SCSI_GENERIC_MAJOR){
- if((int)(g_st.st_rdev>>8)!=SCSI_CDROM_MAJOR){
- idmessage(messagedest,messages,"\t\t%s is not a SCSI device",
-@@ -471,6 +577,7 @@ cdrom_drive *cdda_identify_scsi(const ch
- ioctl_device=temp;
- }
- }
-+#endif
- }
- if(ioctl_device){
- if(stat(ioctl_device,&i_st)){
-@@ -478,6 +585,7 @@ cdrom_drive *cdda_identify_scsi(const ch
- ioctl_device);
- return(NULL);
- }
-+#ifdef __linux__
- if((int)(i_st.st_rdev>>8)!=SCSI_CDROM_MAJOR){
- if((int)(i_st.st_rdev>>8)!=SCSI_GENERIC_MAJOR){
- idmessage(messagedest,messages,"\t\t%s is not a SCSI device",
-@@ -489,6 +597,7 @@ cdrom_drive *cdda_identify_scsi(const ch
- ioctl_device=temp;
- }
- }
-+#endif
- }
-
- /* we need to resolve any symlinks for the lookup code to work */
-@@ -505,6 +614,7 @@ cdrom_drive *cdda_identify_scsi(const ch
- }
-
- if(!generic_device || !ioctl_device){
-+#ifdef __linux__
- if(generic_device){
- ioctl_device=
- scsi_match(generic_device,scsi_cdrom_prefixes,
-@@ -520,6 +630,12 @@ cdrom_drive *cdda_identify_scsi(const ch
- if(!generic_device)
- goto cdda_identify_scsi_fail;
- }
-+#else
-+ if(!generic_device)
-+ generic_device = strdup(ioctl_device);
-+ else
-+ ioctl_device = strdup(generic_device);
-+#endif
- }
-
- idmessage(messagedest,messages,"\t\tgeneric device: %s",generic_device);
-@@ -556,6 +672,7 @@ cdrom_drive *cdda_identify_scsi(const ch
-
- type=(int)(i_st.st_rdev>>8);
-
-+#ifdef __linux__
- if(type==SCSI_CDROM_MAJOR){
- if (!S_ISBLK(i_st.st_mode)) {
- idmessage(messagedest,messages,"\t\tSCSI CDROM device %s not a "
-@@ -567,8 +684,10 @@ cdrom_drive *cdda_identify_scsi(const ch
- "major number",ioctl_device);
- goto cdda_identify_scsi_fail;
- }
-+#endif
- }
-
-+#ifdef __linux__
- if((int)(g_st.st_rdev>>8)==SCSI_GENERIC_MAJOR){
- if (!S_ISCHR(g_st.st_mode)) {
- idmessage(messagedest,messages,"\t\tGeneric SCSI device %s not a "
-@@ -580,6 +699,7 @@ cdrom_drive *cdda_identify_scsi(const ch
- "major number",generic_device);
- goto cdda_identify_scsi_fail;
- }
-+#endif
-
-
- d=calloc(1,sizeof(cdrom_drive));
-@@ -590,6 +710,7 @@ cdrom_drive *cdda_identify_scsi(const ch
- d->bigendianp=-1; /* We don't know yet... */
- d->nsectors=-1;
-
-+#ifdef __linux__
- version=verify_SG_version(d,messagedest,messages);
- switch(version){
- case -1:case 0:case 1:
-@@ -599,6 +720,9 @@ cdrom_drive *cdda_identify_scsi(const ch
- d->interface=GENERIC_SCSI;
- break;
- }
-+#else
-+ d->interface=GENERIC_SCSI;
-+#endif
-
- /* malloc our big buffer for scsi commands */
- d->sg=malloc(MAX_BIG_BUFF_SIZE);
-@@ -617,7 +741,16 @@ cdrom_drive *cdda_identify_scsi(const ch
-
- /* It would seem some TOSHIBA CDROMs gets things wrong */
-
-- if (!strncmp (p + 8, "TOSHIBA", 7) &&
-+#ifndef TYPE_DISK
-+#define TYPE_DISK 0 /* direct */
-+#endif
-+#ifndef TYPE_WORM
-+#define TYPE_WORM 4 /* write once, read many */
-+#endif
-+#ifndef TYPE_ROM
-+#define TYPE_ROM 5 /* CD-ROM */
-+#endif
-+ if (p && !strncmp (p + 8, "TOSHIBA", 7) &&
- !strncmp (p + 16, "CD-ROM", 6) &&
- p[0] == TYPE_DISK) {
- p[0] = TYPE_ROM;
-@@ -653,6 +786,88 @@ cdda_identify_scsi_fail:
- if(g_fd!=-1)close(g_fd);
- return(NULL);
- }
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+cdrom_drive *cdda_identify_scsi(const char *device,
-+ const char *dummy,
-+ int messagedest,
-+ char **messages)
-+{
-+ char *devname;
-+ cdrom_drive *d = NULL;
-+
-+ if (device == NULL) {
-+ idperror(messagedest, messages, "\t\tNo device specified", NULL);
-+ return NULL;
-+ }
-+
-+ if ((devname = test_resolve_symlink(device, messagedest, messages)) == NULL)
-+ return NULL;
-+
-+ if ((d = calloc(1, sizeof(*d))) == NULL) {
-+ idperror(messagedest, messages, "\t\tCould not allocate memory", NULL);
-+ free(devname);
-+ return NULL;
-+ }
-+
-+ if ((d->dev = cam_open_device(devname, O_RDWR)) == NULL) {
-+ idperror(messagedest, messages, "\t\tCould not open SCSI device: %s", cam_errbuf);
-+ goto cdda_identify_scsi_fail;
-+ }
-+
-+ if ((d->ccb = cam_getccb(d->dev)) == NULL) {
-+ idperror(messagedest, messages, "\t\tCould not allocate ccb", NULL);
-+ goto cdda_identify_scsi_fail;
-+ }
-+
-+ if (strncmp(d->dev->inq_data.vendor, "TOSHIBA", 7) == 0 &&
-+ strncmp(d->dev->inq_data.product, "CD_ROM", 6) == 0 &&
-+ SID_TYPE(&d->dev->inq_data) == T_DIRECT) {
-+ d->dev->inq_data.device = T_CDROM;
-+ d->dev->inq_data.dev_qual2 |= 0x80;
-+ }
-+
-+ if (SID_TYPE(&d->dev->inq_data) != T_CDROM &&
-+ SID_TYPE(&d->dev->inq_data) != T_WORM) {
-+ idmessage(messagedest, messages,
-+ "\t\tDevice is neither a CDROM nor a WORM device\n", NULL);
-+ goto cdda_identify_scsi_fail;
-+ }
-+
-+ d->cdda_device_name = copystring(devname);
-+ d->ioctl_fd = -1;
-+ d->bigendianp = -1;
-+ d->nsectors = -1;
-+ d->lun = d->dev->target_lun;
-+ d->interface = GENERIC_SCSI;
-+
-+ if ((d->sg_buffer = malloc(MAX_BIG_BUFF_SIZE)) == NULL) {
-+ idperror(messagedest, messages, "Could not allocate buffer memory", NULL);
-+ goto cdda_identify_scsi_fail;
-+ }
-+
-+ if ((d->drive_model = calloc(36,1)) == NULL) {
-+ }
-+
-+ strscat(d->drive_model, d->dev->inq_data.vendor, SID_VENDOR_SIZE);
-+ strscat(d->drive_model, d->dev->inq_data.product, SID_PRODUCT_SIZE);
-+ strscat(d->drive_model, d->dev->inq_data.revision, SID_REVISION_SIZE);
-+
-+ idmessage(messagedest, messages, "\nCDROM model sensed: %s", d->drive_model);
-+
-+ return d;
-+
-+cdda_identify_scsi_fail:
-+ free(devname);
-+ if (d) {
-+ if (d->ccb)
-+ cam_freeccb(d->ccb);
-+ if (d->dev)
-+ cam_close_device(d->dev);
-+ free(d);
-+ }
-+ return NULL;
-+}
-+#endif
-
- #ifdef CDDA_TEST
-
-@@ -702,3 +917,4 @@ cdrom_drive *cdda_identify_test(const ch
- }
-
- #endif
-+#endif /* __APPLE__ && __MACH__ */
diff --git a/audio/cdparanoia/patches/patch-cg b/audio/cdparanoia/patches/patch-cg
deleted file mode 100644
index 0f5f0aacc8b..00000000000
--- a/audio/cdparanoia/patches/patch-cg
+++ /dev/null
@@ -1,506 +0,0 @@
-$NetBSD: patch-cg,v 1.8 2006/03/07 06:29:04 joerg Exp $
-
---- interface/scsi_interface.c.orig 2001-03-24 12:15:46.000000000 +1100
-+++ interface/scsi_interface.c
-@@ -23,6 +23,8 @@ static void tweak_SG_buffer(cdrom_drive
- int table,reserved;
- char buffer[256];
-
-+#if !defined(__FreeBSD__) || defined(__DragonFly__)
-+#ifdef __linux__
- /* maximum transfer size? */
- if(ioctl(d->cdda_fd,SG_GET_RESERVED_SIZE,&reserved)){
- /* Up, guess not. */
-@@ -31,6 +33,10 @@ static void tweak_SG_buffer(cdrom_drive
- }
-
- if(ioctl(d->cdda_fd,SG_GET_SG_TABLESIZE,&table))table=1;
-+#else
-+ reserved = 32*1024; /* ? */
-+ table = 1;
-+#endif
- {
- int cur;
-
-@@ -53,14 +59,24 @@ static void tweak_SG_buffer(cdrom_drive
- cdmessage(d,buffer);
- }
-
-+#ifdef __linux__
- /* Disable command queue; we don't need it, no reason to have it on */
- reserved=0;
- if(ioctl(d->cdda_fd,SG_SET_COMMAND_Q,&reserved)){
- cdmessage(d,"\tCouldn't disable command queue! Continuing anyway...\n");
- }
--
-+#endif
-+#else /* FreeBSD */
-+ d->nsectors = 26; /* FreeBSD only supports 64K I/O transfer size */
-+ d->bigbuff = d->nsectors * CD_FRAMESIZE_RAW;
-+
-+ sprintf(buffer,"\tSetting default read size to %d sectors (%d bytes).\n\n",
-+ d->nsectors,d->nsectors*CD_FRAMESIZE_RAW);
-+ cdmessage(d,buffer);
-+#endif
- }
-
-+#ifdef __linux__
- static void reset_scsi(cdrom_drive *d){
- int arg;
- d->enable_cdda(d,0);
-@@ -74,6 +90,44 @@ static void reset_scsi(cdrom_drive *d){
- d->enable_cdda(d,1);
- }
-
-+#elif defined(__NetBSD__)
-+static void reset_scsi(cdrom_drive *d){
-+ int arg;
-+ d->enable_cdda(d,0);
-+
-+ cdmessage(d,"sending SCSI reset... ");
-+ if(ioctl(d->cdda_fd,CDIOCRESET,&arg))
-+ cdmessage(d,"FAILED: EBUSY\n");
-+ else
-+ cdmessage(d,"OK\n");
-+
-+ d->enable_cdda(d,1);
-+}
-+
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+static void reset_scsi(cdrom_drive *d) {
-+ d->enable_cdda(d,0);
-+
-+ d->ccb->ccb_h.func_code = XPT_RESET_DEV;
-+ d->ccb->ccb_h.timeout = 5000;
-+
-+ cdmessage(d, "sending SCSI reset... ");
-+ if (cam_send_ccb(d->dev, d->ccb)) {
-+ cdmessage(d, "error sending XPT_RESET_DEV CCB");
-+ } else {
-+
-+ if (((d->ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP) ||
-+ ((d->ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_BDR_SENT))
-+ cdmessage(d,"OK\n");
-+ else
-+ cdmessage(d,"FAILED\n");
-+ }
-+
-+ d->enable_cdda(d,1);
-+}
-+#endif
-+
-+#ifdef __linux__
- static void clear_garbage(cdrom_drive *d){
- fd_set fdset;
- struct timeval tv;
-@@ -104,21 +158,30 @@ static void clear_garbage(cdrom_drive *d
- flag=1;
- }
- }
-+#endif
-
- /* process a complete scsi command. */
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
- static int handle_scsi_cmd(cdrom_drive *d,
- unsigned int cmd_len,
- unsigned int in_size,
- unsigned int out_size,
-
-- unsigned char bytefill,
-+ unsigned int bfill,
- int bytecheck){
-+ unsigned char bytefill = bfill;
- int status = 0;
-+#ifdef __linux__
- struct sg_header *sg_hd=(struct sg_header *)d->sg;
- long writebytes=SG_OFF+cmd_len+in_size;
-+#endif
-+#ifdef __NetBSD__
-+ scsireq_t *sreq = (scsireq_t *)d->sg;
-+#endif
-
- /* generic scsi device services */
-
-+#ifdef __linux__
- /* clear out any possibly preexisting garbage */
- clear_garbage(d);
-
-@@ -224,11 +287,53 @@ static int handle_scsi_cmd(cdrom_drive *
- if(errno==0)errno=EIO;
- return(TR_EREAD);
- }
-+#endif /* __linux__ */
-
-- if(sg_hd->sense_buffer[0]){
-+#ifdef __NetBSD__
-+ if (in_size && out_size) {
-+ warnx("handle_scsi_cmd: in and out is not supported");
-+ abort();
-+ }
-+ memset(sreq, 0, sizeof(scsireq_t));
-+ sreq->cmdlen = cmd_len;
-+ memcpy(sreq->cmd, d->sg_buffer, cmd_len);
-+ if (in_size) {
-+ sreq->flags = SCCMD_WRITE;
-+ sreq->databuf = d->sg_buffer + cmd_len;
-+ sreq->datalen = in_size;
-+ }
-+ if (out_size) {
-+ sreq->flags = SCCMD_READ;
-+ sreq->databuf = d->sg_buffer;
-+ sreq->datalen = out_size;
-+ if(bytecheck)
-+ memset(d->sg_buffer, bytefill, out_size);
-+ }
-+ sreq->senselen = SENSEBUFLEN;
-+ sreq->timeout = 60000; /* 60s */
-+
-+ status = ioctl(d->cdda_fd, SCIOCCOMMAND, (void *) sreq);
-+ if (status < 0)
-+ return(TR_ILLEGAL);
-+#endif
-+
-+#ifdef __linux__
-+ if(sg_hd->sense_buffer[0])
-+#endif
-+#ifdef __NetBSD__
-+ if (sreq->sense[0])
-+#endif
-+ {
-+#ifdef __linux__
- char key=sg_hd->sense_buffer[2]&0xf;
- char ASC=sg_hd->sense_buffer[12];
- char ASCQ=sg_hd->sense_buffer[13];
-+#endif
-+#ifdef __NetBSD__
-+ char key = sreq->sense[2]&0xf;
-+ char ASC = sreq->sense[12];
-+ char ASCQ = sreq->sense[13];
-+#endif
- switch(key){
- case 0:
- if(errno==0)errno=EIO;
-@@ -266,9 +371,20 @@ static int handle_scsi_cmd(cdrom_drive *
- commands still get through. Perhaps no data comes back even
- though the target reports success? */
-
-- if(bytecheck && in_size+cmd_len<out_size){
-+#ifdef __linux__
-+ if(bytecheck && in_size+cmd_len<out_size)
-+#endif
-+#ifdef __NetBSD__
-+ if(bytecheck && out_size)
-+#endif
-+ {
- long i,flag=0;
-+#ifdef __linux__
- for(i=in_size;i<out_size;i++)
-+#endif
-+#ifdef __NetBSD__
-+ for(i=0;i<out_size;i++)
-+#endif
- if(d->sg_buffer[i]!=bytefill){
- flag=1;
- break;
-@@ -284,6 +400,83 @@ static int handle_scsi_cmd(cdrom_drive *
- return(0);
- }
-
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+static int handle_scsi_cmd(cdrom_drive *d,
-+ unsigned int cmd_len,
-+ unsigned int out_size,
-+ unsigned int in_size,
-+ unsigned char bytefill,
-+ int bytecheck) {
-+ int result;
-+
-+ bzero(&d->ccb->csio, sizeof(d->ccb->csio));
-+
-+ memcpy(d->ccb->csio.cdb_io.cdb_bytes, d->sg_buffer, cmd_len);
-+
-+ if (bytecheck && out_size == 0)
-+ memset(d->sg_buffer, bytefill, in_size);
-+
-+ cam_fill_csio(&d->ccb->csio,
-+ /* retries */ 0,
-+ /* cbfcnp */ NULL,
-+ /* flags */ CAM_DEV_QFRZDIS | (out_size ? CAM_DIR_OUT : CAM_DIR_IN),
-+ /* tag_action */ MSG_SIMPLE_Q_TAG,
-+ /* data_ptr */ out_size ? d->sg_buffer + cmd_len : d->sg_buffer,
-+ /* dxfer_len */ out_size ? out_size : in_size,
-+ /* sense_len */ SSD_FULL_SIZE,
-+ /* cdb_len */ cmd_len,
-+ /* timeout */ 60000); /* XXX */
-+
-+ if ((result = cam_send_ccb(d->dev, d->ccb)) < 0 ||
-+ (d->ccb->ccb_h.status & CAM_STATUS_MASK) == 0 /* hack? */)
-+ return TR_EREAD;
-+
-+ if ((d->ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP &&
-+ (d->ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_SCSI_STATUS_ERROR) {
-+ fprintf (stderr, "\t\terror returned from SCSI command:\n"
-+ "\t\tccb->ccb_h.status == %d\n", d->ccb->ccb_h.status);
-+ errno = EIO;
-+ return TR_UNKNOWN;
-+ }
-+
-+ if (d->ccb->csio.dxfer_len != in_size) {
-+ errno = EIO;
-+ return TR_EREAD;
-+ }
-+
-+ if (d->ccb->csio.sense_data.error_code & SSD_ERRCODE) {
-+ switch (d->ccb->csio.sense_data.flags & SSD_KEY) {
-+ case SSD_KEY_NO_SENSE:
-+ errno = EIO;
-+ return TR_UNKNOWN;
-+ case SSD_KEY_RECOVERED_ERROR:
-+ break;
-+ case SSD_KEY_NOT_READY:
-+ errno = EBUSY;
-+ return TR_BUSY;
-+ case SSD_KEY_MEDIUM_ERROR:
-+ errno = EIO;
-+ if (d->ccb->csio.sense_data.add_sense_code == 0x0c &&
-+ d->ccb->csio.sense_data.add_sense_code_qual == 0x09)
-+ return TR_STREAMING;
-+ else
-+ return TR_MEDIUM;
-+ case SSD_KEY_HARDWARE_ERROR:
-+ errno = EIO;
-+ return TR_FAULT;
-+ case SSD_KEY_ILLEGAL_REQUEST:
-+ errno = EINVAL;
-+ return TR_ILLEGAL;
-+ default:
-+ errno = EIO;
-+ return TR_UNKNOWN;
-+ }
-+ }
-+
-+ return 0;
-+}
-+#endif
-+
- /* Group 1 (10b) command */
-
- static int mode_sense_atapi(cdrom_drive *d,int size,int page){
-@@ -600,6 +793,23 @@ static int scsi_read_toc2 (cdrom_drive *
- return(tracks);
- }
-
-+/* Set operating speed */
-+static int scsi_setspeed(cdrom_drive *d, int speed)
-+{
-+ if (speed == 0)
-+ speed = 0xffff; /* maximum speed */
-+ else if (speed < 176)
-+ speed *= 176;
-+
-+ memset(d->sg_buffer, 0, 12);
-+ d->sg_buffer[0] = 0xbb; /* set speed */
-+ d->sg_buffer[2] = speed >> 8;
-+ d->sg_buffer[3] = speed;
-+ d->sg_buffer[4] = -1;
-+ d->sg_buffer[5] = -1;
-+ return handle_scsi_cmd(d, 12, 0, 0, 0, 0);
-+}
-+
- /* These do one 'extra' copy in the name of clean code */
-
- static int i_read_28 (cdrom_drive *d, void *p, long begin, long sectors){
-@@ -833,30 +1043,59 @@ static long scsi_read_map (cdrom_drive *
- while(1) {
- if((err=map(d,(p?buffer:NULL),begin,sectors))){
- if(d->report_all){
-+#ifdef __linux__
- struct sg_header *sg_hd=(struct sg_header *)d->sg;
-+#endif
-+#ifdef __NetBSD__
-+ scsireq_t *sreq=(scsireq_t *)d->sg;
-+#endif
- char b[256];
-
- sprintf(b,"scsi_read error: sector=%ld length=%ld retry=%d\n",
- begin,sectors,retry_count);
-+ fputs(b, stderr);
- cdmessage(d,b);
- sprintf(b," Sense key: %x ASC: %x ASCQ: %x\n",
-+#ifdef __linux__
- (int)(sg_hd->sense_buffer[2]&0xf),
- (int)(sg_hd->sense_buffer[12]),
- (int)(sg_hd->sense_buffer[13]));
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+ d->ccb->csio.sense_data.flags & SSD_KEY,
-+ d->ccb->csio.sense_data.add_sense_code,
-+ d->ccb->csio.sense_data.add_sense_code_qual);
-+#elif defined(__NetBSD__)
-+ (int)(sreq->sense[2]&0xf),
-+ (int)(sreq->sense[12]),
-+ (int)(sreq->sense[13]));
-+#endif
-+ fputs(b, stderr);
- cdmessage(d,b);
- sprintf(b," Transport error: %s\n",strerror_tr[err]);
-+ fputs(b, stderr);
- cdmessage(d,b);
- sprintf(b," System error: %s\n",strerror(errno));
-+ fputs(b, stderr);
- cdmessage(d,b);
-
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
- fprintf(stderr,"scsi_read error: sector=%ld length=%ld retry=%d\n",
- begin,sectors,retry_count);
- fprintf(stderr," Sense key: %x ASC: %x ASCQ: %x\n",
-+#ifdef __linux__
- (int)(sg_hd->sense_buffer[2]&0xf),
- (int)(sg_hd->sense_buffer[12]),
-- (int)(sg_hd->sense_buffer[13]));
-+ (int)(sg_hd->sense_buffer[13])
-+#endif
-+#ifdef __NetBSD__
-+ (int)(sreq->sense[2]&0xf),
-+ (int)(sreq->sense[12]),
-+ (int)(sreq->sense[13])
-+#endif
-+ );
- fprintf(stderr," Transport error: %s\n",strerror_tr[err]);
- fprintf(stderr," System error: %s\n",strerror(errno));
-+#endif
- }
-
- if(!d->error_retry)return(-7);
-@@ -1307,22 +1546,45 @@ static void check_fua_bit(cdrom_drive *d
- return;
- }
-
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
- static int check_atapi(cdrom_drive *d){
-+#ifdef __linux__
- int atapiret=-1;
-+#endif
-+#ifdef __NetBSD__
-+ struct scsi_addr scaddr;
-+#endif
- int fd = d->cdda_fd; /* this is the correct fd (not ioctl_fd), as the
- generic device is the device we need to check */
-
- cdmessage(d,"\nChecking for SCSI emulation...\n");
-
-- if (ioctl(fd,SG_EMULATED_HOST,&atapiret)){
-+#ifdef __linux__
-+ if (ioctl(fd,SG_EMULATED_HOST,&atapiret))
-+#endif
-+#ifdef __NetBSD__
-+ if(ioctl(fd,SCIOCIDENTIFY,&scaddr))
-+#endif
-+ {
- cderror(d,"\tSG_EMULATED_HOST ioctl() failed!\n");
- return(-1);
- } else {
-- if(atapiret==1){
-+#ifdef __linux__
-+ if(atapiret==1)
-+#endif
-+#ifdef __NetBSD__
-+ if(scaddr.type == TYPE_ATAPI)
-+#endif
-+ {
-+#ifdef __linux__
- cdmessage(d,"\tDrive is ATAPI (using SCSI host adaptor emulation)\n");
- /* Disable kernel SCSI command translation layer for access through sg */
- if (ioctl(fd,SG_SET_TRANSFORM,0))
- cderror(d,"\tCouldn't disable kernel command translation layer\n");
-+#endif
-+#ifdef __NetBSD__
-+ cdmessage(d,"\tDrive is ATAPI\n");
-+#endif
- d->is_atapi=1;
- }else{
- cdmessage(d,"\tDrive is SCSI\n");
-@@ -1332,6 +1594,46 @@ static int check_atapi(cdrom_drive *d){
- return(d->is_atapi);
- }
- }
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+static int
-+check_atapi(cdrom_drive *d)
-+{
-+ bzero(&(&d->ccb->ccb_h)[1], sizeof(d->ccb->cpi) - sizeof(d->ccb->ccb_h));
-+
-+ d->ccb->ccb_h.func_code = XPT_PATH_INQ;
-+
-+ cdmessage(d, "\nChecking for ATAPICAM...\n");
-+
-+ if (cam_send_ccb(d->dev, d->ccb) < 0) {
-+ cderror(d, "\terror sending XPT_PATH_INQ CCB: ");
-+ cderror(d, cam_errbuf);
-+ cderror(d, "\n");
-+ return -1;
-+ }
-+
-+ if ((d->ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
-+ cderror(d, "\tXPT_PATH_INQ CCB failed: ");
-+ cderror(d, cam_errbuf);
-+ cderror(d, "\n");
-+ return -1;
-+ }
-+
-+ /*
-+ * if the bus device name is `ata', we're (obviously)
-+ * running ATAPICAM.
-+ */
-+
-+ if (strncmp(d->ccb->cpi.dev_name, "ata", 3) == 0) {
-+ cdmessage(d, "\tDrive is ATAPI (using ATAPICAM)\n");
-+ d->is_atapi = 1;
-+ } else {
-+ cdmessage(d, "\tDrive is SCSI\n");
-+ d->is_atapi = 0;
-+ }
-+
-+ return d->is_atapi;
-+}
-+#endif
-
- static int check_mmc(cdrom_drive *d){
- char *b;
-@@ -1379,6 +1681,7 @@ static void check_exceptions(cdrom_drive
- }
- }
-
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
- /* request vendor brand and model */
- unsigned char *scsi_inquiry(cdrom_drive *d){
- memcpy(d->sg_buffer,(char[]){ 0x12,0,0,0,56,0},6);
-@@ -1389,6 +1692,7 @@ unsigned char *scsi_inquiry(cdrom_drive
- }
- return (d->sg_buffer);
- }
-+#endif
-
-
- int scsi_init_drive(cdrom_drive *d){
-@@ -1434,7 +1738,7 @@ int scsi_init_drive(cdrom_drive *d){
-
- d->read_toc = (!memcmp(d->drive_model, "IMS", 3) && !d->is_atapi) ? scsi_read_toc2 :
- scsi_read_toc;
-- d->set_speed = NULL;
-+ d->set_speed = scsi_setspeed;
-
-
- if(!d->is_atapi){
-@@ -1458,8 +1762,12 @@ int scsi_init_drive(cdrom_drive *d){
- check_fua_bit(d);
-
- d->error_retry=1;
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
- d->sg=realloc(d->sg,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);
- d->sg_buffer=d->sg+SG_OFF;
-+#else
-+ d->sg_buffer = realloc(d->sg_buffer, d->nsectors * CD_FRAMESIZE_RAW);
-+#endif
- d->report_all=1;
- return(0);
- }
diff --git a/audio/cdparanoia/patches/patch-ch b/audio/cdparanoia/patches/patch-ch
deleted file mode 100644
index 99bb152ae68..00000000000
--- a/audio/cdparanoia/patches/patch-ch
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-ch,v 1.3 2006/09/03 17:13:30 ben Exp $
-
---- interface/cdda_interface.h.orig 2001-03-23 17:15:46.000000000 -0800
-+++ interface/cdda_interface.h
-@@ -18,9 +18,19 @@
- #endif
- #define CD_FRAMESAMPLES (CD_FRAMESIZE_RAW / 4)
-
-+#if defined(__APPLE__) && defined(__MACH__)
-+#include <IOKit/IOKitLib.h>
-+#include <IOKit/storage/IOCDTypes.h>
-+#endif
-+
- #include <sys/types.h>
- #include <signal.h>
-
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
-+#include <stdio.h>
-+#include <camlib.h>
-+#endif
-+
- #define MAXTRK 100
-
- typedef struct TOC { /* structure of table of contents */
-@@ -33,6 +43,7 @@ typedef struct TOC { /* structure of tab
- #define GENERIC_SCSI 0
- #define COOKED_IOCTL 1
- #define TEST_INTERFACE 2
-+#define OSX_IOKIT 3
-
- #define CDDA_MESSAGE_FORGETIT 0
- #define CDDA_MESSAGE_PRINTIT 1
-@@ -47,13 +58,27 @@ typedef struct cdrom_drive{
- int opened; /* This struct may just represent a candidate for opening */
-
- char *cdda_device_name;
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
- char *ioctl_device_name;
-
- int cdda_fd;
-- int ioctl_fd;
-
-- char *drive_model;
- int drive_type;
-+#else
-+ struct cam_device *dev;
-+ union ccb *ccb;
-+#endif
-+
-+#if defined(__APPLE__) && defined(__MACH__)
-+ io_object_t io;
-+ int fd;
-+ char *dev;
-+ CDTOC *raw_toc;
-+ int descriptor_count;
-+#endif
-+
-+ int ioctl_fd;
-+ char *drive_model;
- int interface;
- int bigendianp;
- int nsectors;
-@@ -83,9 +108,13 @@ typedef struct cdrom_drive{
- int is_mmc;
-
- /* SCSI command buffer and offset pointers */
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
- unsigned char *sg;
- unsigned char *sg_buffer;
- unsigned char inqbytes[4];
-+#else
-+ unsigned char *sg_buffer;
-+#endif
-
- /* Scsi parameters and state */
- unsigned char density;
diff --git a/audio/cdparanoia/patches/patch-ci b/audio/cdparanoia/patches/patch-ci
deleted file mode 100644
index 2aeef343992..00000000000
--- a/audio/cdparanoia/patches/patch-ci
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-ci,v 1.4 2006/09/03 17:13:30 ben Exp $
-
---- interface/interface.c.orig 2000-04-19 15:41:04.000000000 -0700
-+++ interface/interface.c
-@@ -30,12 +30,29 @@ int cdda_close(cdrom_drive *d){
-
- _clean_messages(d);
- if(d->cdda_device_name)free(d->cdda_device_name);
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
-+#if defined(__APPLE__) && defined(__MACH__)
-+ if(d->fd != -1) close(d->fd);
-+#else
- if(d->ioctl_device_name)free(d->ioctl_device_name);
- if(d->drive_model)free(d->drive_model);
- if(d->cdda_fd!=-1)close(d->cdda_fd);
- if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd);
- if(d->sg)free(d->sg);
--
-+#endif
-+#else
-+ if(d->drive_model)
-+ free(d->drive_model);
-+ if(d->ccb)
-+ cam_freeccb(d->ccb);
-+ if(d->dev)
-+ cam_close_device(d->dev);
-+ if(d->sg_buffer)
-+ free(d->sg_buffer);
-+ if(d->ioctl_fd != -1)
-+ close(d->ioctl_fd);
-+#endif
-+
- free(d);
- }
- return(0);
-@@ -47,6 +64,12 @@ int cdda_open(cdrom_drive *d){
- if(d->opened)return(0);
-
- switch(d->interface){
-+#if defined(__APPLE__) && defined(__MACH__)
-+ case OSX_IOKIT:
-+ if((ret=osx_open_device(d)))
-+ return ret;
-+ break;
-+#else
- case GENERIC_SCSI:
- if((ret=scsi_init_drive(d)))
- return(ret);
-@@ -61,6 +84,7 @@ int cdda_open(cdrom_drive *d){
- return(ret);
- break;
- #endif
-+#endif
- default:
- cderror(d,"100: Interface not supported\n");
- return(-100);
diff --git a/audio/cdparanoia/patches/patch-cj b/audio/cdparanoia/patches/patch-cj
deleted file mode 100644
index b4b649b22bc..00000000000
--- a/audio/cdparanoia/patches/patch-cj
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-cj,v 1.1 2006/09/03 17:13:30 ben Exp $
-
---- interface/common_interface.h.orig 1999-08-15 14:52:42.000000000 -0700
-+++ interface/common_interface.h
-@@ -9,8 +9,10 @@
-
- #include "low_interface.h"
-
-+#if !(defined(__APPLE__) && defined(__MACH__))
- extern int ioctl_ping_cdrom(int fd);
- extern char *atapi_drive_info(int fd);
-+#endif
- extern int data_bigendianp(cdrom_drive *d);
- extern int FixupTOC(cdrom_drive *d,int tracks);
-
diff --git a/audio/cdparanoia/patches/patch-ck b/audio/cdparanoia/patches/patch-ck
deleted file mode 100644
index 759fe9c3e8d..00000000000
--- a/audio/cdparanoia/patches/patch-ck
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ck,v 1.1 2006/09/03 17:13:30 ben Exp $
-
---- /dev/null 2006-09-03 08:46:15.000000000 -0700
-+++ interface/osx_interface.h 2006-09-03 08:49:13.000000000 -0700
-@@ -0,0 +1,31 @@
-+/******************************************************************
-+ * CopyPolicy: GNU Public License 2 applies
-+ * Copyright (C) 1998 Monty xiphmont@mit.edu
-+ *
-+ ******************************************************************/
-+
-+#ifndef _cdda_osx_interface_h_
-+#define _cdda_osx_interface_h_
-+
-+#include <CoreFoundation/CFBase.h>
-+#include <CoreFoundation/CFString.h>
-+#include <CoreFoundation/CFNumber.h>
-+#include <IOKit/IOBSD.h>
-+#include <IOKit/storage/IOMedia.h>
-+#include <IOKit/storage/IOCDMedia.h>
-+#include <IOKit/storage/IOCDMediaBSDClient.h>
-+#include "cdda_interface.h"
-+
-+char *osx_bsd_device_for_media(io_object_t media);
-+int osx_enumerate_devices(cdrom_drive *d,
-+ int (*device_found)(cdrom_drive *, io_object_t, void *),
-+ void *data);
-+io_object_t osx_default_device(cdrom_drive *d);
-+int osx_read_toc(cdrom_drive *d);
-+int osx_open_device(cdrom_drive *d);
-+int osx_open_device_orig(cdrom_drive *d, io_object_t io);
-+int osx_set_speed(cdrom_drive *d, int speed);
-+int osx_enable_cdda(cdrom_drive *d, int enable);
-+long osx_read_audio(cdrom_drive *d, void *buf, long begin, long sectors);
-+
-+#endif
diff --git a/audio/cdparanoia/patches/patch-cl b/audio/cdparanoia/patches/patch-cl
deleted file mode 100644
index 8aaf32787ee..00000000000
--- a/audio/cdparanoia/patches/patch-cl
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cl,v 1.1 2006/09/03 17:13:30 ben Exp $
-
---- configure.sub.orig 2006-09-03 08:31:08.000000000 -0700
-+++ configure.sub
-@@ -641,7 +641,7 @@ case $os in
- | -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix* \
- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-- | -udi* | -eabi* | -lites* )
-+ | -udi* | -eabi* | -lites* | -darwin* )
- # Remember, each alternative MUST END IN *, to match a version number.
- ;;
- -sunos5*)
diff --git a/audio/cdparanoia/patches/patch-cm b/audio/cdparanoia/patches/patch-cm
deleted file mode 100644
index 1cc39fb91ed..00000000000
--- a/audio/cdparanoia/patches/patch-cm
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-cm,v 1.1 2006/09/03 17:13:30 ben Exp $
-
---- configure.guess.orig 1999-08-15 14:52:30.000000000 -0700
-+++ configure.guess
-@@ -459,6 +459,9 @@ EOF
- echo mips-unknown-sysv${UNAME_RELEASE}
- fi
- exit 0 ;;
-+ *:Darwin:*:*)
-+ echo `uname -p`-apple-darwin${UNAME_RELEASE}
-+ exit 0 ;;
- esac
-
- #echo '(No uname command or uname output not recognized.)' 1>&2
diff --git a/audio/cdparanoia/patches/patch-cn b/audio/cdparanoia/patches/patch-cn
deleted file mode 100644
index 3b0d482aad3..00000000000
--- a/audio/cdparanoia/patches/patch-cn
+++ /dev/null
@@ -1,272 +0,0 @@
-$NetBSD: patch-cn,v 1.1 2006/09/03 17:13:30 ben Exp $
-
---- /dev/null 2006-09-03 09:28:05.000000000 -0700
-+++ interface/osx_interface.c 2006-09-03 09:35:39.000000000 -0700
-@@ -0,0 +1,267 @@
-+/******************************************************************
-+ * CopyPolicy: GNU Public License 2 applies
-+ * Copyright (C) 1998 Monty xiphmont@mit.edu
-+ ******************************************************************/
-+
-+#include <math.h>
-+#include <assert.h>
-+#include <stdlib.h>
-+#include <paths.h>
-+#include <fcntl.h>
-+#include <sys/syslimits.h>
-+
-+#include "osx_interface.h"
-+#include "utils.h"
-+
-+char *osx_bsd_device_for_media(io_object_t media)
-+{
-+ char buf[PATH_MAX];
-+ size_t dev_path_length;
-+ CFTypeRef str_bsd_path;
-+ char *result;
-+
-+ str_bsd_path = IORegistryEntryCreateCFProperty(media,
-+ CFSTR(kIOBSDNameKey), kCFAllocatorDefault, 0);
-+
-+ if(str_bsd_path == NULL) {
-+ return NULL;
-+ }
-+
-+ snprintf(buf, sizeof(buf), "%s%c", _PATH_DEV, 'r' );
-+ dev_path_length = strlen(buf);
-+
-+ if (CFStringGetCString(str_bsd_path,
-+ buf + dev_path_length,
-+ sizeof(buf) - dev_path_length,
-+ kCFStringEncodingASCII)) {
-+ result = strdup(buf);
-+ } else {
-+ result = NULL;
-+ }
-+ CFRelease(str_bsd_path);
-+ return result;
-+}
-+
-+int osx_enumerate_devices(cdrom_drive *d,
-+ int (*device_found)(cdrom_drive *, io_object_t, void *),
-+ void *data)
-+{
-+ kern_return_t ret;
-+ mach_port_t port;
-+ int drives = 0;
-+ CFMutableDictionaryRef classes_to_match;
-+ kern_return_t kern_result;
-+ io_iterator_t media_iterator;
-+ io_object_t next_media;
-+
-+ /* get port for IOKit communication */
-+ if ((ret = IOMasterPort(MACH_PORT_NULL, &port)) != KERN_SUCCESS) {
-+ cderror(d,"099: IOMasterPort fail\n");
-+ return -1;
-+ }
-+
-+ classes_to_match = IOServiceMatching(kIOCDMediaClass);
-+ if(classes_to_match == NULL) {
-+ cderror(d,"099: IOServiceMatching: NULL\n");
-+ return -1;
-+ }
-+
-+ CFDictionarySetValue(classes_to_match, CFSTR(kIOMediaEjectableKey),
-+ kCFBooleanTrue);
-+
-+ kern_result = IOServiceGetMatchingServices(port, classes_to_match,
-+ &media_iterator);
-+ if (kern_result != KERN_SUCCESS) {
-+ cderror(d,"099: IOServiceGetMatchingServices fail\n");
-+ return -1;
-+ }
-+
-+ while (1) {
-+ drives++;
-+ next_media = IOIteratorNext(media_iterator);
-+ if (next_media == 0) {
-+ break;
-+ }
-+
-+ if (!device_found(d, next_media, data))
-+ break;
-+ IOObjectRelease(next_media);
-+ }
-+ if (next_media) IOObjectRelease(next_media);
-+ IOObjectRelease(media_iterator);
-+
-+ return drives;
-+}
-+
-+static int find_first_device(cdrom_drive *d, io_object_t io, void *data)
-+{
-+ io_object_t *dev = (io_object_t *)data;
-+ *dev = io;
-+ IOObjectRetain(io);
-+ return 0;
-+}
-+
-+io_object_t osx_default_device(cdrom_drive *d)
-+{
-+ io_object_t io;
-+ osx_enumerate_devices(d, find_first_device, (void *)&io);
-+ return io;
-+}
-+
-+int osx_read_toc(cdrom_drive *d)
-+{
-+ kern_return_t ret;
-+ char *devname;
-+ CFRange range;
-+ CFIndex buf_len;
-+ int leadout;
-+ CFMutableDictionaryRef properties;
-+ CFDataRef data;
-+ int i;
-+
-+ devname = strrchr(d->dev, '/');
-+
-+ if (devname != NULL) {
-+ devname++;
-+ } else {
-+ devname = d->dev;
-+ }
-+
-+ if (*devname == 'r') devname++;
-+
-+ /* create a CF dictionary containing the TOC */
-+ ret = IORegistryEntryCreateCFProperties(d->io, &properties,
-+ kCFAllocatorDefault, kNilOptions);
-+
-+ if( ret != KERN_SUCCESS) {
-+ cderror(d, "099: IORegistryEntryCreateCFProperties fail\n");
-+ return -1;
-+ }
-+
-+ /* get the TOC from the dictionary */
-+ data = (CFDataRef)CFDictionaryGetValue(properties,
-+ CFSTR(kIOCDMediaTOCKey));
-+ if(data == NULL) {
-+ cderror(d, "099: CFDictionaryGetValue fail\n");
-+ return -1;
-+ }
-+
-+ buf_len = CFDataGetLength(data) + 1;
-+ range = CFRangeMake(0, buf_len);
-+
-+ d->raw_toc = (CDTOC *)malloc(buf_len);
-+ if (d->raw_toc == NULL) {
-+ cderror(d, "099: toc malloc fail\n");
-+ CFRelease(properties);
-+ return -1;
-+ }
-+ CFDataGetBytes(data, range, (u_char *)d->raw_toc);
-+
-+ CFRelease(properties);
-+
-+ d->descriptor_count = CDTOCGetDescriptorCount(d->raw_toc);
-+ d->tracks = 0;
-+
-+ for (i = 0; i < d->descriptor_count; i++) {
-+ int track_num = d->raw_toc->descriptors[i].point;
-+ CDMSF msf = d->raw_toc->descriptors[i].p;
-+ int start_sector = CDConvertMSFToLBA(msf);
-+ if (track_num == 0xa2) {
-+ leadout = i;
-+ }
-+ fprintf(stderr,
-+ "track_num = %d start sector %d msf: %d,%d,%d\n",
-+ track_num, start_sector,
-+ msf.minute, msf.second, msf.frame);
-+ if (track_num > 99 || track_num < 1) {
-+ // e.g.:
-+ // track_num = 160 start sector 4350 msf: 1,0,0
-+ // track_num = 161 start sector 67350 msf: 15,0,0
-+ // track_num = 162 start sector 330645 msf: 73,30,45
-+
-+ continue;
-+ // XXX don't know what happens here. tracks 0xa0, 0xa1, 0xa2 (leadout)
-+ }
-+ d->disc_toc[d->tracks].bTrack = track_num;
-+ d->disc_toc[d->tracks].bFlags = (d->raw_toc->descriptors[i].adr << 4) |
-+ d->raw_toc->descriptors[i].control;
-+ d->disc_toc[d->tracks].dwStartSector = start_sector;
-+ d->tracks++;
-+ }
-+ d->disc_toc[d->tracks].bTrack = 0xaa;
-+ d->disc_toc[d->tracks].bFlags = (d->raw_toc->descriptors[i].adr << 4) |
-+ d->raw_toc->descriptors[leadout].control;
-+ d->disc_toc[d->tracks].dwStartSector = CDConvertMSFToLBA(
-+ d->raw_toc->descriptors[leadout].p);
-+
-+ return 0;
-+}
-+
-+int osx_open_device_orig(cdrom_drive *d, io_object_t io)
-+{
-+ if (io == NULL) {
-+ d->io = osx_default_device(d);
-+ } else {
-+ IOObjectRetain(io);
-+ d->io = io;
-+ }
-+ d->dev = osx_bsd_device_for_media(d->io);
-+ if (!d->dev) {
-+ IOObjectRelease(d->io);
-+ return -1;
-+ }
-+
-+ d->fd = open(d->dev, O_RDONLY | O_NONBLOCK, 0);
-+ d->enable_cdda = osx_enable_cdda;
-+ d->read_toc = osx_read_toc;
-+ d->read_audio = osx_read_audio;
-+ d->set_speed = osx_set_speed;
-+
-+ if (d->fd == -1) {
-+ free(d->dev);
-+ IOObjectRelease(d->io);
-+ return -1;
-+ }
-+
-+ osx_read_toc(d);
-+
-+ d->nsectors = 32;
-+ d->opened = 1;
-+ return 0;
-+}
-+
-+int osx_open_device(cdrom_drive *d)
-+{
-+ osx_open_device_orig(d, NULL);
-+}
-+
-+int osx_set_speed(cdrom_drive *d, int speed)
-+{
-+ return 0;
-+}
-+
-+int osx_enable_cdda(cdrom_drive *d, int enable)
-+{
-+ return 0;
-+}
-+
-+long osx_read_audio(cdrom_drive *d, void *buf, long begin, long sectors)
-+{
-+ dk_cd_read_t cd_read;
-+
-+ // fprintf(stderr, "read_audio %p, %d, %d\n", buf, begin, sectors);
-+
-+ memset(&cd_read, 0, sizeof(cd_read));
-+
-+ cd_read.offset = begin * kCDSectorSizeCDDA;
-+ cd_read.sectorArea = kCDSectorAreaUser;
-+ cd_read.sectorType = kCDSectorTypeCDDA;
-+
-+ cd_read.buffer = buf;
-+ cd_read.bufferLength = kCDSectorSizeCDDA * sectors;
-+
-+ if( ioctl(d->fd, DKIOCCDREAD, &cd_read) == -1) {
-+ return 0;
-+ }
-+ return cd_read.bufferLength / kCDSectorSizeCDDA;
-+}
diff --git a/audio/cdplayer/DESCR b/audio/cdplayer/DESCR
deleted file mode 100644
index d5354bdf34e..00000000000
--- a/audio/cdplayer/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
- A simple CD player application for GNUstep that acts as a front end for
-libcdaudio and cddb-bundle. This package also includes an AudioCD.bundle
-that allows access to audio CD meta data from other applications.
diff --git a/audio/cdplayer/Makefile b/audio/cdplayer/Makefile
deleted file mode 100644
index b365a535aae..00000000000
--- a/audio/cdplayer/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2006/09/09 02:41:54 obache Exp $
-#
-
-DISTNAME= cdplayer-0.4.2
-PKGREVISION= 4
-CATEGORIES= audio gnustep
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gsburn/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://gsburn.sourceforge.net/
-COMMENT= GNUstep CD player with CDDB support
-
-WRKSRC= ${WRKDIR}/${PKGBASE}
-USE_LANGUAGES= objc
-USE_TOOLS+= gmake
-MAKE_FILE= GNUmakefile
-MAKE_ENV+= ADDITIONAL_CPPFLAGS="-Wno-import"
-
-do-configure:
- ${LN} -s ${BUILDLINK_DIR}/${GNUSTEP_SUBDIR}/System/Library/Frameworks/PrefsModule.framework/Versions/A/Headers ${WRKSRC}/AudioCD/AudioCDPrefs/PrefsModule
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/include/CDPlayer
- ${INSTALL_DATA} ${WRKSRC}/CDPlayer/AudioCDProtocol.h \
- ${PREFIX}/include/CDPlayer
-
-.include "../../audio/libcdaudio/buildlink3.mk"
-.include "../../audio/cddb-bundle/buildlink3.mk"
-.include "../../x11/gnustep-back/buildlink3.mk"
-.include "../../x11/gnustep-preferences/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/cdplayer/PLIST b/audio/cdplayer/PLIST
deleted file mode 100644
index 50b47e0a0ec..00000000000
--- a/audio/cdplayer/PLIST
+++ /dev/null
@@ -1,106 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2005/09/18 16:46:44 hira Exp $
-include/CDPlayer/AudioCDProtocol.h
-share/GNUstep/Local/Applications/CDPlayer.app/CDPlayer
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/CDPlayer.desktop
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/CDPlayer.help/Config.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/CDPlayer.help/Configuration.xlp
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/CDPlayer.help/HowItWorks.xlp
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/CDPlayer.help/Logo.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/CDPlayer.help/Main.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/CDPlayer.help/MainEmpty.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/CDPlayer.help/ToDo.xlp
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/CDPlayer.help/TrackList.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/CDPlayer.help/main.xlp
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/English.lproj/FreeDB.gorm/data.classes
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/English.lproj/FreeDB.gorm/objects.gorm
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/English.lproj/General.gorm/data.classes
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/English.lproj/General.gorm/objects.gorm
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/English.lproj/Localizable.strings
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/English.lproj/TrackList.gorm/data.classes
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/English.lproj/TrackList.gorm/objects.gorm
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/French.lproj/FreeDB.gorm/data.classes
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/French.lproj/FreeDB.gorm/objects.gorm
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/French.lproj/General.gorm/data.classes
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/French.lproj/General.gorm/objects.gorm
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/French.lproj/Localizable.strings
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/French.lproj/TrackList.gorm/data.classes
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/French.lproj/TrackList.gorm/objects.gorm
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/German.lproj/FreeDB.gorm/data.classes
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/German.lproj/FreeDB.gorm/objects.gorm
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/German.lproj/General.gorm/data.classes
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/German.lproj/General.gorm/objects.gorm
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/German.lproj/Localizable.strings
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/German.lproj/TrackList.gorm/data.classes
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/German.lproj/TrackList.gorm/objects.gorm
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/Info-gnustep.plist
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/app.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/ffwd.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/iconDnDAudio.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/iconDnDAudioMulti.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/info.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/led0.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/led1.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/led10.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/led11.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/led12.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/led2.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/led3.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/led4.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/led5.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/led6.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/led7.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/led8.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/led9.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/next.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/pause.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/play.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/prev.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/rwd.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/Resources/stop.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/library_paths.openapp
-share/GNUstep/Local/Applications/CDPlayer.app/stamp.make
-share/GNUstep/Local/Library/Bundles/AudioCD.bundle/AudioCD
-share/GNUstep/Local/Library/Bundles/AudioCD.bundle/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Bundles/AudioCD.bundle/stamp.make
-share/GNUstep/Local/Library/Preferences/AudioCD.prefs/AudioCD
-share/GNUstep/Local/Library/Preferences/AudioCD.prefs/Resources/AudioCD.tiff
-share/GNUstep/Local/Library/Preferences/AudioCD.prefs/Resources/English.lproj/AudioCD.gorm/data.classes
-share/GNUstep/Local/Library/Preferences/AudioCD.prefs/Resources/English.lproj/AudioCD.gorm/objects.gorm
-share/GNUstep/Local/Library/Preferences/AudioCD.prefs/Resources/English.lproj/Localizable.strings
-share/GNUstep/Local/Library/Preferences/AudioCD.prefs/Resources/French.lproj/AudioCD.gorm/data.classes
-share/GNUstep/Local/Library/Preferences/AudioCD.prefs/Resources/French.lproj/AudioCD.gorm/objects.gorm
-share/GNUstep/Local/Library/Preferences/AudioCD.prefs/Resources/French.lproj/Localizable.strings
-share/GNUstep/Local/Library/Preferences/AudioCD.prefs/Resources/German.lproj/AudioCD.gorm/data.classes
-share/GNUstep/Local/Library/Preferences/AudioCD.prefs/Resources/German.lproj/AudioCD.gorm/objects.gorm
-share/GNUstep/Local/Library/Preferences/AudioCD.prefs/Resources/German.lproj/Localizable.strings
-share/GNUstep/Local/Library/Preferences/AudioCD.prefs/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Preferences/AudioCD.prefs/stamp.make
-@dirrm share/GNUstep/Local/Library/Preferences/AudioCD.prefs/Resources/German.lproj/AudioCD.gorm
-@dirrm share/GNUstep/Local/Library/Preferences/AudioCD.prefs/Resources/German.lproj
-@dirrm share/GNUstep/Local/Library/Preferences/AudioCD.prefs/Resources/French.lproj/AudioCD.gorm
-@dirrm share/GNUstep/Local/Library/Preferences/AudioCD.prefs/Resources/French.lproj
-@dirrm share/GNUstep/Local/Library/Preferences/AudioCD.prefs/Resources/English.lproj/AudioCD.gorm
-@dirrm share/GNUstep/Local/Library/Preferences/AudioCD.prefs/Resources/English.lproj
-@dirrm share/GNUstep/Local/Library/Preferences/AudioCD.prefs/Resources
-@dirrm share/GNUstep/Local/Library/Preferences/AudioCD.prefs
-@dirrm share/GNUstep/Local/Library/Preferences
-@dirrm share/GNUstep/Local/Library/Bundles/AudioCD.bundle/Resources
-@dirrm share/GNUstep/Local/Library/Bundles/AudioCD.bundle
-@comment in devel/gnustep-make: @dirrm share/GNUstep/Local/Library/Bundles
-@dirrm share/GNUstep/Local/Applications/CDPlayer.app/Resources/German.lproj/TrackList.gorm
-@dirrm share/GNUstep/Local/Applications/CDPlayer.app/Resources/German.lproj/General.gorm
-@dirrm share/GNUstep/Local/Applications/CDPlayer.app/Resources/German.lproj/FreeDB.gorm
-@dirrm share/GNUstep/Local/Applications/CDPlayer.app/Resources/German.lproj
-@dirrm share/GNUstep/Local/Applications/CDPlayer.app/Resources/French.lproj/TrackList.gorm
-@dirrm share/GNUstep/Local/Applications/CDPlayer.app/Resources/French.lproj/General.gorm
-@dirrm share/GNUstep/Local/Applications/CDPlayer.app/Resources/French.lproj/FreeDB.gorm
-@dirrm share/GNUstep/Local/Applications/CDPlayer.app/Resources/French.lproj
-@dirrm share/GNUstep/Local/Applications/CDPlayer.app/Resources/English.lproj/TrackList.gorm
-@dirrm share/GNUstep/Local/Applications/CDPlayer.app/Resources/English.lproj/General.gorm
-@dirrm share/GNUstep/Local/Applications/CDPlayer.app/Resources/English.lproj/FreeDB.gorm
-@dirrm share/GNUstep/Local/Applications/CDPlayer.app/Resources/English.lproj
-@dirrm share/GNUstep/Local/Applications/CDPlayer.app/Resources/CDPlayer.help
-@dirrm share/GNUstep/Local/Applications/CDPlayer.app/Resources
-@dirrm share/GNUstep/Local/Applications/CDPlayer.app
-@comment in devel/gnustep-make: @dirrm share/GNUstep/Local/Applications
-@dirrm include/CDPlayer
diff --git a/audio/cdplayer/buildlink3.mk b/audio/cdplayer/buildlink3.mk
deleted file mode 100644
index cdfafc7f18e..00000000000
--- a/audio/cdplayer/buildlink3.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:35 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-CDPLAYER_BUILDLINK3_MK:= ${CDPLAYER_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= cdplayer
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncdplayer}
-BUILDLINK_PACKAGES+= cdplayer
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cdplayer
-
-.if !empty(CDPLAYER_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.cdplayer+= cdplayer>=0.4.2
-BUILDLINK_ABI_DEPENDS.cdplayer?= cdplayer>=0.4.2nb3
-BUILDLINK_PKGSRCDIR.cdplayer?= ../../audio/cdplayer
-.endif # CDPLAYER_BUILDLINK3_MK
-
-.include "../../audio/libcdaudio/buildlink3.mk"
-.include "../../audio/cddb-bundle/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/cdplayer/distinfo b/audio/cdplayer/distinfo
deleted file mode 100644
index 2a50b2275f9..00000000000
--- a/audio/cdplayer/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/05/16 09:55:04 rh Exp $
-
-SHA1 (cdplayer-0.4.2.tar.gz) = 0d16c0adc02a9884f8ef01e6fe028b72711c898a
-RMD160 (cdplayer-0.4.2.tar.gz) = 7d955295cfde801ae3cf1a6e03fdda994504544d
-Size (cdplayer-0.4.2.tar.gz) = 171280 bytes
diff --git a/audio/cmp3/DESCR b/audio/cmp3/DESCR
deleted file mode 100644
index dee1a3c35f3..00000000000
--- a/audio/cmp3/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-A simple yet featureful curses frontend to mpg123. Includes playlist
-support, volume control and tools to help with file management.
diff --git a/audio/cmp3/Makefile b/audio/cmp3/Makefile
deleted file mode 100644
index bb3c2caa7a7..00000000000
--- a/audio/cmp3/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2006/02/05 23:08:06 joerg Exp $
-#
-
-DISTNAME= cmp3-2.0pre6
-PKGNAME= cmp3-2.0.p6
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cmp3/}
-
-MAINTAINER= rxg@NetBSD.org
-HOMEPAGE= http://cmp3.sourceforge.net/
-COMMENT= Curses based frontend to mpg123
-
-DEPENDS+= mpg123-[0-9]*:../../audio/mpg123
-DEPENDS+= vorbis-tools-[0-9]*:../../audio/vorbis-tools
-
-WRKSRC= ${WRKDIR}/cmp3-kenrevs
-USE_TOOLS+= gmake
-INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
-INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-H]*-*
-
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/cmp3 ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/rnmp3 ${PREFIX}/bin
- @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cmp3
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cmp3
- ${INSTALL_DATA} ${WRKSRC}/cmp3rc ${PREFIX}/share/doc/cmp3/sample.cmp3rc
-
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/cmp3/PLIST b/audio/cmp3/PLIST
deleted file mode 100644
index efc1a535a7f..00000000000
--- a/audio/cmp3/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:15:30 zuntum Exp $
-bin/cmp3
-bin/rnmp3
-share/doc/cmp3/README
-share/doc/cmp3/sample.cmp3rc
-@dirrm share/doc/cmp3
diff --git a/audio/cmp3/distinfo b/audio/cmp3/distinfo
deleted file mode 100644
index 074687e09f7..00000000000
--- a/audio/cmp3/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.7 2007/02/16 14:54:16 joerg Exp $
-
-SHA1 (cmp3-2.0pre6.tar.gz) = 5c1454117be282cf673de7a701f8d08f6224d2f8
-RMD160 (cmp3-2.0pre6.tar.gz) = c7d5f774c05734e8fca8ec8d536b2843cb99ad80
-Size (cmp3-2.0pre6.tar.gz) = 183749 bytes
-SHA1 (patch-aa) = 3881ea3b11f4949e0704ee13414ede93e23a7c50
-SHA1 (patch-ab) = 9a4a87691727a2ee4b63961415d137da08502edb
-SHA1 (patch-ac) = 03a9b0660a6167dd2b8ef3c58f16ec0c95a9921a
-SHA1 (patch-ad) = a50d87140e557eb3bef1a5d68ad3e18bba73e03e
-SHA1 (patch-ae) = 4ddb74587d34dc2698c2a49ca7c476b5b90540d9
-SHA1 (patch-af) = f15c60207248248f5cb7efa4c046cd246e247018
diff --git a/audio/cmp3/patches/patch-aa b/audio/cmp3/patches/patch-aa
deleted file mode 100644
index b1341dcf099..00000000000
--- a/audio/cmp3/patches/patch-aa
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/03/02 17:50:18 rxg Exp $
-
---- Makefile.orig 2001-07-29 13:43:49.000000000 +0800
-+++ Makefile
-@@ -4,25 +4,25 @@
- # Set these variables
- #
- # initial_directory is now set in the config file
--mpg123_location := "mpg123"
--ogg123_location := "ogg123"
--install_directory := "$(HOME)/bin"
-+mpg123_location := "$(LOCALBASE)/bin/mpg123"
-+ogg123_location := "$(LOCALBASE)/bin/ogg123"
-+install_directory := "$(PREFIX)/bin"
-
- #
- # Location of config file - Please edit this file before installing
- #
--config_file := "$(HOME)/.cmp3rc"
-+#config_file := "$(HOME)/.cmp3rc"
-
- #
- # Uncomment and set if desired
- #
-
- ## An ass repository is a nice thing to have. See README
--ass_repository := "$(HOME)/.cmp3ass"
-+#ass_repository := "$(HOME)/.cmp3ass"
-
- ## Define this for bufferring or add other parameters to mpg123 and ogg123
--mpg123_params := -b 320
--ogg123_params := -d oss
-+#mpg123_params := -b 320
-+#ogg123_params := -d oss
-
- # You need debugging info? Uncomment this and check /tmp/cmp3log
- #debugging := 1
-@@ -42,9 +42,9 @@ RNMP3PARAMS= -DVERSION="\$(VERSION)\"
- # Something for me and my cd changer, you definately don't want it as it
- # stands. Change the code to do something else you want it to do...
- #PARAMS +=-DMY_CD
--LIBS= -lform -lncurses
--CFLAGS= -g -O -Inevlib
--CC= gcc
-+LIBS= $(LDFLAGS) -lform -lncurses
-+CFLAGS+= -Inevlib
-+CC?= gcc
- OBJS= cmp3common.o cmp3fileio.o cmp3manager.o cmp3curses.o \
- cmp3llist.o cmp3main.o cmp3listfiles.o cmp3playlist.o cmp3volume.o \
- cmp3general.o cmp3id3.o
-@@ -60,6 +60,7 @@ PARAMS += -DEXEC_PARAMS="$(foreach token
- PARAMS += -DOGG_PARAMS="$(foreach token, $(ogg123_params),\"$(token)\",)"
- else
- PARAMS += -DEXEC_PARAMS=\"\",
-+PARAMS += -DOGG_PARAMS=\"\",
- endif
- ifdef filespacing
- RNMP3PARAMS += -DSPACEIT
-@@ -87,7 +88,7 @@ cmp3: lib $(OBJS)
- $(CC) $(CFLAGS) $(OBJS) nevlib/libnev.a $(LIBS) -o cmp3
-
- lib:
-- @$(MAKE) -C nevlib lib
-+ @$(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" -C nevlib lib
-
- cleanlib:
- @$(MAKE) -C nevlib clean
diff --git a/audio/cmp3/patches/patch-ab b/audio/cmp3/patches/patch-ab
deleted file mode 100644
index f2b36cd770e..00000000000
--- a/audio/cmp3/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2007/02/16 14:54:16 joerg Exp $
-
---- cmp3.h.orig 2001-07-01 12:38:08.000000000 +0800
-+++ cmp3.h
-@@ -1,7 +1,7 @@
- #ifndef _CMP3_H
- #define _CMP3_H
-
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- #include <ncurses.h>
- #include <termios.h>
- #else
-@@ -9,9 +9,6 @@
- #endif
-
-
--#ifndef NCURSES_VERSION
-- #error "This program requires ncurses to function"
--#endif
-
- #include <signal.h>
- #include <dirent.h>
diff --git a/audio/cmp3/patches/patch-ac b/audio/cmp3/patches/patch-ac
deleted file mode 100644
index c03adea880d..00000000000
--- a/audio/cmp3/patches/patch-ac
+++ /dev/null
@@ -1,149 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2007/02/16 14:54:16 joerg Exp $
-
---- cmp3volume.c.orig 2001-07-01 04:38:08.000000000 +0000
-+++ cmp3volume.c
-@@ -3,8 +3,8 @@
- */
-
- #include "cmp3funcs.h"
--#if defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#if defined(__NetBSD__)
-+#include <sys/audioio.h>
- #else
- #include<sys/soundcard.h>
- #endif
-@@ -16,6 +16,63 @@ static int mixernum,
- * Initialize volume control
- * Returns: nothing
- ****************************************************************************/
-+#if defined(__NetBSD__)
-+
-+int device_id;
-+mixer_ctrl_t *m, *values;
-+
-+extern void initvol()
-+{
-+ int i, ndev;
-+ char *mixer_device;
-+ mixer_devinfo_t dinfo, *infos;
-+
-+ mixer_device = getenv("MIXERDEVICE");
-+ if (mixer_device == NULL)
-+ mixer_device = "/dev/mixer0";
-+
-+ if ((mixernum=open(mixer_device, O_RDWR)) < 0) {
-+ fprintf(stderr, "open mixer device: %s", strerror(errno));
-+ enditall(SIGSEGV);
-+ }
-+
-+ for (ndev = 0; ; ndev++) {
-+ dinfo.index = ndev;
-+ if (ioctl(mixernum, AUDIO_MIXER_DEVINFO, &dinfo) < 0)
-+ break;
-+ }
-+ infos = calloc(ndev, sizeof *infos);
-+ values = calloc(ndev, sizeof *values);
-+
-+ for (i = 0; i < ndev; i++) {
-+ infos[i].index = i;
-+ ioctl(mixernum, AUDIO_MIXER_DEVINFO, &infos[i]);
-+ }
-+
-+ for (i = 0; i < ndev; i++) {
-+ if (infos[i].type == AUDIO_MIXER_VALUE) {
-+ values[i].dev = i;
-+ values[i].type = infos[i].type;
-+ }
-+ if (strcmp(infos[i].label.name, AudioNdac) == 0) {
-+ device_id = i;
-+ break;
-+ }
-+ }
-+
-+ values[device_id].un.value.num_channels = 2;
-+
-+ m = &values[device_id];
-+ ioctl(mixernum, AUDIO_MIXER_READ, m);
-+ vol = m->un.value.level[0] * 100 / AUDIO_MAX_GAIN;
-+ mvprintw(3,COLS/2-1,"-");
-+ mvprintw(LINES-7,COLS/2-1,"-");
-+ mvprintw((LINES-8)-(vol*(LINES-12)/100),COLS/2-1,"*");
-+ return;
-+}
-+
-+#else
-+
- extern void initvol()
- {
- if ((mixernum=open("/dev/mixer", O_RDWR)) < 0) {
-@@ -30,6 +87,8 @@ extern void initvol()
- return;
- }
-
-+#endif
-+
- extern void endvol()
- {
- close(mixernum);
-@@ -61,6 +120,23 @@ extern void volclean()
- * Although I hate users in general, we should probably do it.
- * Returns: nothing
- ****************************************************************************/
-+#if defined(__NetBSD__)
-+
-+extern void volup()
-+{
-+ mvprintw((LINES-8)-(vol*(LINES-12)/100),COLS/2-1," ");
-+ vol += 3;
-+ if (vol > 100)
-+ vol = 100;
-+ m = &values[device_id];
-+ ioctl(mixernum, AUDIO_MIXER_WRITE, m);
-+ m->un.value.level[0] = m->un.value.level[1] = vol * AUDIO_MAX_GAIN / 100;
-+ mvprintw((LINES-8)-(vol*(LINES-12)/100), COLS/2-1, "*");
-+ return;
-+}
-+
-+#else
-+
- extern void volup()
- {
- int i;
-@@ -75,10 +151,29 @@ extern void volup()
- return;
- }
-
-+#endif
-+
- /****************************************************************************
- * It's too loud junior, turn it down!
- * Returns: nothing
- ****************************************************************************/
-+#if defined(__NetBSD__)
-+
-+extern void voldown()
-+{
-+ mvprintw((LINES-8)-(vol*(LINES-12)/100),COLS/2-1," ");
-+ vol -= 3;
-+ if (vol < 0)
-+ vol = 0;
-+ m = &values[device_id];
-+ ioctl(mixernum, AUDIO_MIXER_WRITE, m);
-+ m->un.value.level[0] = m->un.value.level[1] = vol * AUDIO_MAX_GAIN / 100;
-+ mvprintw((LINES-8)-(vol*(LINES-12)/100), COLS/2-1, "*");
-+ return;
-+}
-+
-+#else
-+
- extern void voldown()
- {
- int i;
-@@ -93,4 +188,6 @@ extern void voldown()
- return;
- }
-
-+#endif
-+
- /* EOF */
diff --git a/audio/cmp3/patches/patch-ad b/audio/cmp3/patches/patch-ad
deleted file mode 100644
index ff143ea9107..00000000000
--- a/audio/cmp3/patches/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/02/10 14:18:35 hubertf Exp $
-
---- cmp3main.c.orig Fri Mar 17 08:40:00 2000
-+++ cmp3main.c Fri Jan 12 02:16:41 2001
-@@ -33,13 +33,18 @@
- int lastleftline = 0;
- int lastrightline = 0;
- char *init_dir = NULL;
-+ char *home_dir = NULL;
-+ char cmp3_config[4096];
-
- if (argc > 1)
- docmdline(argc, argv);
- shm_init();
-
- cmp3rc = ini_create();
-- if (ini_load(cmp3rc, CMP3_CONFIG) == INI_FAIL)
-+ home_dir = getenv("HOME");
-+ strcpy (cmp3_config, home_dir);
-+ strcat (cmp3_config, "/.cmp3rc");
-+ if (ini_load(cmp3rc, cmp3_config) == INI_FAIL)
- {
- ini_destroy(cmp3rc);
- cmp3rc = NULL;
diff --git a/audio/cmp3/patches/patch-ae b/audio/cmp3/patches/patch-ae
deleted file mode 100644
index 2b85b1ba6bb..00000000000
--- a/audio/cmp3/patches/patch-ae
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/01/02 16:17:40 cjep Exp $
---- rnmp3.c.orig 2000-01-14 13:55:56.000000000 +0000
-+++ rnmp3.c 2004-01-02 16:06:58.000000000 +0000
-@@ -256,26 +256,25 @@
-
- void usage()
- {
-- printf("rnmp3 %s:
--
--Usage - pipe names into rnmp3. (\"find | rnmp3 args\")
-- If first parameter starts with -, the following string will be removed
-- from all names if they exist (enclose spaces with \"\")
-- If any other commands are entered, commands will not be executed,
-- just printed
--
-- rnmp3 Rename
-- rnmp3 test Don't rename, just show changes
-- rnmp3 -\"string\" Rename after removing \"string\"
-- rnmp3 -\"string\" test Don't rename after removing \"string\"
-- rnmp3 --test test Rename after removing \"-test\"
--
-- Before - \"1-This is my (file name) man.mp3\"
-- After - \"01-ThisIsMy-FileName-Man.mp3\"
--
--Suggested uses:
-- find . | rnmp3
-- find . -type f | rnmp3\n", VERSION);
-+ printf("rnmp3 %s:\n\n", VERSION);
-+ printf("Usage - pipe names into rnmp3. (\"find | rnmp3 args\")\n");
-+ printf(" If first parameter starts with -, the following string will be removed\n");
-+ printf(" from all names if they exist (enclose spaces with \"\")\n");
-+ printf(" If any other commands are entered, commands will not be executed,\n");
-+ printf(" just printed\n\n");
-+
-+ printf(" rnmp3 Rename\n");
-+ printf(" rnmp3 test Don't rename, just show changes\n");
-+ printf(" rnmp3 -\"string\" Rename after removing \"string\"\n");
-+ printf(" rnmp3 -\"string\" test Don't rename after removing \"string\"\n");
-+ printf(" rnmp3 --test test Rename after removing \"-test\"\n\n");
-+
-+ printf(" Before - \"1-This is my (file name) man.mp3\"\n");
-+ printf(" After - \"01-ThisIsMy-FileName-Man.mp3\"\n\n");
-+
-+ printf("Suggested uses:\n");
-+ printf(" find . | rnmp3\n");
-+ printf(" find . -type f | rnmp3\n");
-
- exit(0);
- }
diff --git a/audio/cmp3/patches/patch-af b/audio/cmp3/patches/patch-af
deleted file mode 100644
index fc6bbdd3df7..00000000000
--- a/audio/cmp3/patches/patch-af
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/01/02 16:17:40 cjep Exp $
---- cmp3listfiles.c.orig 2000-03-17 00:06:25.000000000 +0000
-+++ cmp3listfiles.c 2004-01-02 16:12:02.000000000 +0000
-@@ -7,7 +7,7 @@
- #include <stdio.h>
- #include <string.h>
-
--#include"cmp3funcs.h"
-+#include "cmp3funcs.h"
-
- typedef struct {
- char dirLetter;
-@@ -269,15 +269,14 @@
- if (outfile == NULL)
- /* XXX - alert person */
- return;
-- fprintf(outfile,
--"##############################################################################
--# Dumped Cmp3 playlist ass file
--#
--# Addable features (on individual lines):
--# %%[command] - executes commands initially using system() call
--# @ - randomizes this playlist at load time
--# $ - turns on repeat mode at load time
--#\n\n");
-+fprintf(outfile, "##############################################################################\n");
-+fprintf(outfile, "# Dumped Cmp3 playlist ass file\n");
-+fprintf(outfile, "#\n");
-+fprintf(outfile, "# Addable features (on individual lines):\n");
-+fprintf(outfile, "# %%[command] - executes commands initially using system() call\n");
-+fprintf(outfile, "# @ - randomizes this playlist at load time\n");
-+fprintf(outfile, "# $ - turns on repeat mode at load time\n");
-+fprintf(outfile, "#\n\n");
-
- filename = shmptr->plhead;
- for(i=0; i < shmptr->listlen; i++) {
diff --git a/audio/cmus/DESCR b/audio/cmus/DESCR
deleted file mode 100644
index d8c5feb3ab5..00000000000
--- a/audio/cmus/DESCR
+++ /dev/null
@@ -1,20 +0,0 @@
-CMus is a small and fast music player using the ncurses library.
-CMus has vi-style command interface, e.g. searching using '/' or
-'?' and adding files to playlist ':add ~/foo.ogg'.
-
- * Plays FLAC, OGG, MP3, WAV, modules
- * MP3 and Ogg streaming (Shoutcast/Icecast)
- * WinAmp / XMMS keys "zxcvb"
- * Can be controlled via UNIX socket
- * Customizable colors
- * Nice vi-style interface with tabulator expansion
- * Background playlist loading
- * Track metadata database makes adding files to playlist very fast.
- * Album/artist modes. Playing within one album or artist.
- * Powerful playlist filters
- * Can run external commands for the currently selected files
- * Directory browser
- * Supports 256 colors
- * Play Queue
- * Dynamic Keybinding
- * Easy to use directory browser
diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
deleted file mode 100644
index 1549e85b182..00000000000
--- a/audio/cmus/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2007/02/22 19:26:05 wiz Exp $
-#
-
-DISTNAME= cmus-2.1.0
-CATEGORIES= audio
-MASTER_SITES= http://onion.dynserv.net/~timo/files/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= webmaster@deepblack24.de
-HOMEPAGE= http://onion.dynserv.net/~timo/files/
-COMMENT= Cmus is an ncurses based mp3/ogg player with a lot of features
-
-HAS_CONFIGURE= yes
-USE_TOOLS+= gmake pkg-config
-
-CONFIGURE_ARGS+= prefix=${PREFIX}
-CONFIGURE_ARGS+= CONFIG_ALSA=n
-CONFIGURE_ARGS+= CONFIG_ARTS=n
-CONFIGURE_ARGS+= CONFIG_OSS=y
-CONFIGURE_ARGS+= CONFIG_MAD=y
-CONFIGURE_ARGS+= CONFIG_AO=y
-CONFIGURE_ARGS+= CONFIG_FLAC=y
-CONFIGURE_ARGS+= mandir=${PREFIX}/${PKGMANDIR}/
-
-.if exists(/usr/include/sys/audioio.h)
-PLIST_SUBST+= SUN=""
-.else
-PLIST_SUBST+= SUN="@comment "
-.endif
-
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+= CONFIG_SUN=y
-.endif
-
-.include "../../audio/flac/buildlink3.mk"
-.include "../../audio/libao/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/libmodplug/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/cmus/PLIST b/audio/cmus/PLIST
deleted file mode 100644
index a41881fdc7b..00000000000
--- a/audio/cmus/PLIST
+++ /dev/null
@@ -1,26 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/01/13 08:57:56 wiz Exp $
-bin/cmus
-bin/cmus-remote
-lib/cmus/ip/flac.so
-lib/cmus/ip/mad.so
-lib/cmus/ip/modplug.so
-lib/cmus/ip/vorbis.so
-lib/cmus/ip/wav.so
-lib/cmus/op/ao.so
-lib/cmus/op/oss.so
-${SUN}lib/cmus/op/sun.so
-man/man1/cmus-remote.1
-man/man1/cmus.1
-share/cmus/cyan.theme
-share/cmus/default.theme
-share/cmus/gray-88.theme
-share/cmus/green-mono-88.theme
-share/cmus/rc
-share/cmus/xterm-white.theme
-share/doc/cmus/examples/cmus-status-display
-@dirrm share/doc/cmus/examples
-@dirrm share/cmus
-@dirrm lib/cmus/op
-@dirrm lib/cmus/ip
-@dirrm lib/cmus
-@dirrm share/doc/cmus
diff --git a/audio/cmus/distinfo b/audio/cmus/distinfo
deleted file mode 100644
index 5f68cf0532f..00000000000
--- a/audio/cmus/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2007/01/13 08:57:56 wiz Exp $
-
-SHA1 (cmus-2.1.0.tar.bz2) = 961d4bd1446c9499aeaac5a280761e5d98ca514f
-RMD160 (cmus-2.1.0.tar.bz2) = f359c8929dd616855aedbe2c4d1d2e252a8946ca
-Size (cmus-2.1.0.tar.bz2) = 146956 bytes
diff --git a/audio/cplay/DESCR b/audio/cplay/DESCR
deleted file mode 100644
index dec7aa81788..00000000000
--- a/audio/cplay/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-cplay is a curses front-end for various audio players. It aims to
-provide a power-user-friendly interface with simple filelist and
-playlist control. cplay is written in Python and can use either
-pyncurses or the standard curses module.
-
-Supported players:
-* ogg123
-* splay
-* mpg123
-* mpg321
-* madplay
-* mikmod
-* xmp
-* sox
diff --git a/audio/cplay/MESSAGE b/audio/cplay/MESSAGE
deleted file mode 100644
index 15617ff8c4f..00000000000
--- a/audio/cplay/MESSAGE
+++ /dev/null
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2005/11/08 15:56:40 tonio Exp $
-
-In order to make this package actually useful, you should install at least
-one of the following audio players:
-
-audio/splay
-audio/mpg123
-audio/mpg321
-audio/madplay
-audio/mikmod
-audio/xmp
-audio/sox
-===========================================================================
diff --git a/audio/cplay/Makefile b/audio/cplay/Makefile
deleted file mode 100644
index c68d5e80a55..00000000000
--- a/audio/cplay/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2006/07/17 19:04:50 ghen Exp $
-
-DISTNAME= cplay-1.49
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= ${HOMEPAGE}
-
-MAINTAINER= ghen@NetBSD.org
-HOMEPAGE= http://mask.tf.hut.fi/~flu/hacks/cplay/
-COMMENT= Curses front-end for various audio players
-
-PYTHON_PATCH_SCRIPTS= cplay
-
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= msgfmt
-
-PKGLOCALES= da de hu pl
-EGDIR= ${PREFIX}/share/examples/cplay
-CONF_FILES= ${EGDIR}/cplayrc ${PKG_SYSCONFDIR}/cplayrc
-
-SUBST_CLASSES+= paths
-SUBST_STAGE.paths= pre-build
-SUBST_FILES.paths= cplay cplay.1
-SUBST_SED.paths= -e 's,/etc/cplayrc,${PKG_SYSCONFDIR}/cplayrc,g'
-SUBST_SED.paths+= -e 's,/usr/local/share/locale,${PREFIX}/${PKGLOCALEDIR}/locale,g'
-
-do-build:
- cd ${WRKSRC} && ${MAKE_PROGRAM} cplayrc
-.for m in ${PKGLOCALES}
- msgfmt -o ${WRKSRC}/po/${m}.mo ${WRKSRC}/po/${m}.po
-.endfor
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/cplay ${PREFIX}/bin/
- ${INSTALL_MAN} ${WRKSRC}/cplay.1 ${PREFIX}/${PKGMANDIR}/man1/
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/cplayrc ${EGDIR}
-.for l in ${PKGLOCALES}
- ${INSTALL_DATA_DIR} ${PREFIX}/${PKGLOCALEDIR}/locale/${l}/LC_MESSAGES
- ${INSTALL_DATA} ${WRKSRC}/po/${l}.mo ${PREFIX}/${PKGLOCALEDIR}/locale/${l}/LC_MESSAGES/cplay.mo
-.endfor
-
-.include "../../lang/python/application.mk"
-.include "../../devel/py-curses/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/cplay/PLIST b/audio/cplay/PLIST
deleted file mode 100644
index adc013e0f15..00000000000
--- a/audio/cplay/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/04/17 07:07:11 jlam Exp $
-bin/cplay
-man/man1/cplay.1
-share/examples/cplay/cplayrc
-share/locale/da/LC_MESSAGES/cplay.mo
-share/locale/de/LC_MESSAGES/cplay.mo
-share/locale/hu/LC_MESSAGES/cplay.mo
-share/locale/pl/LC_MESSAGES/cplay.mo
-@dirrm share/examples/cplay
diff --git a/audio/cplay/distinfo b/audio/cplay/distinfo
deleted file mode 100644
index 9dee0e0ca12..00000000000
--- a/audio/cplay/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/11/10 09:04:25 tonio Exp $
-
-SHA1 (cplay-1.49.tar.gz) = 5dc77ad0046419f6657249fa95829b3714beb1d6
-RMD160 (cplay-1.49.tar.gz) = e370ca609f8a17f428cf67ef85d55ee55cd5738b
-Size (cplay-1.49.tar.gz) = 36400 bytes
-SHA1 (patch-aa) = e7a1f3b34a5557e637d34b778b8a8cf796c9c8a9
diff --git a/audio/cplay/patches/patch-aa b/audio/cplay/patches/patch-aa
deleted file mode 100644
index 64cd47ef5e2..00000000000
--- a/audio/cplay/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/11/10 09:04:25 tonio Exp $
-
---- cplay.orig 2005-11-10 09:50:37.000000000 +0100
-+++ cplay
-@@ -1165,13 +1165,15 @@ def get_tag(pathname):
-
- # ------------------------------------------
- class Player:
-+
-+ stdin_r, stdin_w = os.pipe()
-+ stdout_r, stdout_w = os.pipe()
-+ stderr_r, stderr_w = os.pipe()
-+
- def __init__(self, commandline, files, fps=1):
- self.commandline = commandline
- self.re_files = re.compile(files, re.I)
- self.fps = fps
-- self.stdin_r, self.stdin_w = os.pipe()
-- self.stdout_r, self.stdout_w = os.pipe()
-- self.stderr_r, self.stderr_w = os.pipe()
- self.entry = None
- self.stopped = 0
- self.paused = 0
diff --git a/audio/cripple/DESCR b/audio/cripple/DESCR
deleted file mode 100644
index cc73dc6c21e..00000000000
--- a/audio/cripple/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Cripple is a simple command line CD ripper wrapper. It uses audio/cdparanoia,
-misc/libcdio or sysutils/cdrtools to rip, and audio/lame or audio/bladeenc to
-encode tracks from a CD.
-
-Cripple retrieves naming information for filenames and ID3 tags from the freedb
-(CDDB) or local xmcd/CDDB format files, which it can write. CDDB access is
-implemented via HTTP and works through proxies. There is built-in support for
-writing ID3v1.1 tags to output files.
diff --git a/audio/cripple/MESSAGE b/audio/cripple/MESSAGE
deleted file mode 100644
index 7ed73319c0e..00000000000
--- a/audio/cripple/MESSAGE
+++ /dev/null
@@ -1,16 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2006/01/05 23:29:04 wiz Exp $
-
-To use this package you will need at least one of the following rippers:
-
-audio/cdparanoia
-misc/libcdio
-sysutils/cdrtools
-
-and one of the following encoders:
-
-audio/lame
-audio/bladeenc
-
-It will use cdparanoia and lame by default.
-===========================================================================
diff --git a/audio/cripple/Makefile b/audio/cripple/Makefile
deleted file mode 100644
index 946f099374a..00000000000
--- a/audio/cripple/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/12/28 15:52:01 ghen Exp $
-
-DISTNAME= cripple-0.06b
-CATEGORIES= audio
-MASTER_SITES= ${HOMEPAGE}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= ghen@NetBSD.org
-HOMEPAGE= http://www.vortex.prodigynet.co.uk/cripple/
-COMMENT= Command line CD ripper/encoder wrapper with cddb support
-
-GNU_CONFIGURE= yes
-BUILD_TARGET= cripple
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/cripple/PLIST b/audio/cripple/PLIST
deleted file mode 100644
index cb571ecd96e..00000000000
--- a/audio/cripple/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/12/28 15:52:01 ghen Exp $
-bin/cripple
-man/man1/cripple.1
diff --git a/audio/cripple/distinfo b/audio/cripple/distinfo
deleted file mode 100644
index acbace4b1a4..00000000000
--- a/audio/cripple/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/12/28 15:52:01 ghen Exp $
-
-SHA1 (cripple-0.06b.tar.bz2) = 24a2ad31a056549fa52751937ed6b582e34acb85
-RMD160 (cripple-0.06b.tar.bz2) = 7cdfad53667a2a35e6a4e32505654d2fcd57c856
-Size (cripple-0.06b.tar.bz2) = 56452 bytes
-SHA1 (patch-aa) = 142b9dceb2f2c77f1cb2452f02d0c084ca188a95
diff --git a/audio/cripple/patches/patch-aa b/audio/cripple/patches/patch-aa
deleted file mode 100644
index 2b307d1ee39..00000000000
--- a/audio/cripple/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/12/28 15:52:01 ghen Exp $
-
---- cripple.h.orig 2005-05-01 22:56:23.000000000 +0200
-+++ cripple.h
-@@ -68,6 +68,8 @@
-
- #ifdef __sun
- # define DEF_CD_DEV "/vol/dev/aliases/cdrom0"
-+#elif defined(__NetBSD__)
-+# define DEF_CD_DEV "/dev/rcd0d"
- #elif defined(__win32__)
- /*
- * on win32 a null path will cause read_cdtoc_from_drive() to search for one.
diff --git a/audio/cs4235/DESCR b/audio/cs4235/DESCR
deleted file mode 100644
index 5c7fab63e8a..00000000000
--- a/audio/cs4235/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Program to enable and modify the 3D mode on Crystal CS4235 sound cards.
-It's working quite well for me; it seems to work just as well as the 3D
-control in Windows.
-
-Unfortunately the code only works on i386, but if anybody wants to fix
-that they're more than welcome :-)
diff --git a/audio/cs4235/Makefile b/audio/cs4235/Makefile
deleted file mode 100644
index 0de6db7fe55..00000000000
--- a/audio/cs4235/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2006/11/05 14:47:55 rillig Exp $
-#
-
-DISTNAME= cs4235-20001009
-CATEGORIES= audio sysutils
-MASTER_SITES= http://www.invisible.ca/~jmcneill/
-
-MAINTAINER= jmcneill@NetBSD.org
-HOMEPAGE= http://www.invisible.ca/~jmcneill/
-COMMENT= Modifies the 3D mode on Crystal CS4235 sound cards
-
-ONLY_FOR_PLATFORM= NetBSD-*-i386
-
-WRKSRC= ${WRKDIR}/cs4235
-MAKE_ENV+= ${BSD_MAKE_ENV}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/cs4235/PLIST b/audio/cs4235/PLIST
deleted file mode 100644
index 065fe8a3cd7..00000000000
--- a/audio/cs4235/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:15:32 zuntum Exp $
-bin/cs4235_3dctl
diff --git a/audio/cs4235/distinfo b/audio/cs4235/distinfo
deleted file mode 100644
index 566edeb2ef3..00000000000
--- a/audio/cs4235/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:43 agc Exp $
-
-SHA1 (cs4235-20001009.tar.gz) = 599d28d94dc72ccccb0d9478f5e0383bcbff2bd8
-RMD160 (cs4235-20001009.tar.gz) = f1768596e9dee389d9435f8ce72fc61ba2f36dfa
-Size (cs4235-20001009.tar.gz) = 1967 bytes
diff --git a/audio/csound4-manual/DESCR b/audio/csound4-manual/DESCR
deleted file mode 100644
index d8a9512e079..00000000000
--- a/audio/csound4-manual/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-These are the manuals for Csound, in HTML, plain text and PDF. A Spanish
-manual, in PDF only, is included.
-Orchestra and score example files are also included.
diff --git a/audio/csound4-manual/Makefile b/audio/csound4-manual/Makefile
deleted file mode 100644
index 7c461b09d9d..00000000000
--- a/audio/csound4-manual/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/12/15 14:34:19 wiz Exp $
-#
-
-DISTNAME= manual-html-4.23
-PKGNAME= csound4-manual-4.23
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.cs.bath.ac.uk/pub/dream/documentation/manuals/ \
- http://www.kevindumpscore.com/download/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.csounds.com/
-COMMENT= Csound4 Reference Manual
-
-NO_BUILD= yes
-WRKSRC= ${WRKDIR}
-DIST_SUBDIR= ${PKGNAME_NOREV}
-
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/csound4
- cd ${WRKSRC}/csound-4.23/manual \
- && ${PAX} -rw -s '|.*/CVS/.*||' -s ',.*/CVS$$,,' * ${PREFIX}/share/doc/csound4
- cd ${FILESDIR} && ${INSTALL_DATA} rt-midi-input.* \
- ${PREFIX}/share/doc/csound4/examples
- ${LN} -s ../../share/doc/csound4/examples \
- ${PREFIX}/share/examples/csound4
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/csound4-manual/PLIST b/audio/csound4-manual/PLIST
deleted file mode 100644
index 5f197d02c2e..00000000000
--- a/audio/csound4-manual/PLIST
+++ /dev/null
@@ -1,1802 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/21 22:34:10 ben Exp $
-share/doc/csound4/a.html
-share/doc/csound4/abetarand.html
-share/doc/csound4/abexprnd.html
-share/doc/csound4/abs.html
-share/doc/csound4/acauchy.html
-share/doc/csound4/active.html
-share/doc/csound4/addmodaddspace.html
-share/doc/csound4/addmodfsharing.html
-share/doc/csound4/addmodstringargs.html
-share/doc/csound4/addmodtop.html
-share/doc/csound4/adds.html
-share/doc/csound4/adsr.html
-share/doc/csound4/adsyn.html
-share/doc/csound4/adsynt.html
-share/doc/csound4/aexprand.html
-share/doc/csound4/aftouch.html
-share/doc/csound4/agauss.html
-share/doc/csound4/agogobel.html
-share/doc/csound4/alinrand.html
-share/doc/csound4/alpass.html
-share/doc/csound4/ampdb.html
-share/doc/csound4/ampdbfs.html
-share/doc/csound4/ampmidi.html
-share/doc/csound4/apcauchy.html
-share/doc/csound4/apoisson.html
-share/doc/csound4/apow.html
-share/doc/csound4/areson.html
-share/doc/csound4/aresonk.html
-share/doc/csound4/assign.html
-share/doc/csound4/atone.html
-share/doc/csound4/atonek.html
-share/doc/csound4/atonex.html
-share/doc/csound4/atrirand.html
-share/doc/csound4/aunirand.html
-share/doc/csound4/aweibull.html
-share/doc/csound4/b.html
-share/doc/csound4/babo.html
-share/doc/csound4/balance.html
-share/doc/csound4/bamboo.html
-share/doc/csound4/bbcutm.html
-share/doc/csound4/bbcuts.html
-share/doc/csound4/betarand.html
-share/doc/csound4/bexprnd.html
-share/doc/csound4/biquad.html
-share/doc/csound4/biquada.html
-share/doc/csound4/birnd.html
-share/doc/csound4/bqrez.html
-share/doc/csound4/bugs.txt
-share/doc/csound4/butbp.html
-share/doc/csound4/butbr.html
-share/doc/csound4/buthp.html
-share/doc/csound4/butlp.html
-share/doc/csound4/butterbp.html
-share/doc/csound4/butterbr.html
-share/doc/csound4/butterhp.html
-share/doc/csound4/butterlp.html
-share/doc/csound4/button.html
-share/doc/csound4/buzz.html
-share/doc/csound4/cabasa.html
-share/doc/csound4/cauchy.html
-share/doc/csound4/cent.html
-share/doc/csound4/cggoto.html
-share/doc/csound4/chanctrl.html
-share/doc/csound4/checkbox.html
-share/doc/csound4/cigoto.html
-share/doc/csound4/ckgoto.html
-share/doc/csound4/clear.html
-share/doc/csound4/clfilt.html
-share/doc/csound4/clip.html
-share/doc/csound4/clock.html
-share/doc/csound4/clockoff.html
-share/doc/csound4/clockon.html
-share/doc/csound4/cngoto.html
-share/doc/csound4/comb.html
-share/doc/csound4/commanddesc.html
-share/doc/csound4/commandflags.html
-share/doc/csound4/commandpreproc.html
-share/doc/csound4/commandtop.html
-share/doc/csound4/commandunifile.html
-share/doc/csound4/control.html
-share/doc/csound4/controlconditional.html
-share/doc/csound4/controldurctl.html
-share/doc/csound4/controlfltkintro.html
-share/doc/csound4/controlinvocat.html
-share/doc/csound4/controlmacros.html
-share/doc/csound4/controlpgmctl.html
-share/doc/csound4/controlrealtime.html
-share/doc/csound4/controlreinitn.html
-share/doc/csound4/controlsensing.html
-share/doc/csound4/controlsubinstrument.html
-share/doc/csound4/controltimeread.html
-share/doc/csound4/controltop.html
-share/doc/csound4/convle.html
-share/doc/csound4/convolve.html
-share/doc/csound4/copying.txt
-share/doc/csound4/cos.html
-share/doc/csound4/cosh.html
-share/doc/csound4/cosinv.html
-share/doc/csound4/cps2pch.html
-share/doc/csound4/cpsmidi.html
-share/doc/csound4/cpsmidib.html
-share/doc/csound4/cpsoct.html
-share/doc/csound4/cpspch.html
-share/doc/csound4/cpstmid.html
-share/doc/csound4/cpstun.html
-share/doc/csound4/cpstuni.html
-share/doc/csound4/cpsxpch.html
-share/doc/csound4/cpuprc.html
-share/doc/csound4/credits.txt
-share/doc/csound4/cross2.html
-share/doc/csound4/crunch.html
-share/doc/csound4/cscoreadvancd.html
-share/doc/csound4/cscorecompile.html
-share/doc/csound4/cscoremain.html
-share/doc/csound4/cscoretop.html
-share/doc/csound4/ctrl14.html
-share/doc/csound4/ctrl21.html
-share/doc/csound4/ctrl7.html
-share/doc/csound4/ctrlinit.html
-share/doc/csound4/cuserrnd.html
-share/doc/csound4/cvanal.html
-share/doc/csound4/dam.html
-share/doc/csound4/db.html
-share/doc/csound4/dbamp.html
-share/doc/csound4/dbfsamp.html
-share/doc/csound4/dcblock.html
-share/doc/csound4/dconv.html
-share/doc/csound4/define.html
-share/doc/csound4/delay.html
-share/doc/csound4/delay1.html
-share/doc/csound4/delayr.html
-share/doc/csound4/delayw.html
-share/doc/csound4/deltap.html
-share/doc/csound4/deltap3.html
-share/doc/csound4/deltapi.html
-share/doc/csound4/deltapn.html
-share/doc/csound4/deltapx.html
-share/doc/csound4/deltapxw.html
-share/doc/csound4/diff.html
-share/doc/csound4/diskin.html
-share/doc/csound4/dispfft.html
-share/doc/csound4/display.html
-share/doc/csound4/distort1.html
-share/doc/csound4/divides.html
-share/doc/csound4/divz.html
-share/doc/csound4/dnoise.html
-share/doc/csound4/dollar.html
-share/doc/csound4/downsamp.html
-share/doc/csound4/dripwater.html
-share/doc/csound4/dumpk.html
-share/doc/csound4/dumpk2.html
-share/doc/csound4/dumpk3.html
-share/doc/csound4/dumpk4.html
-share/doc/csound4/duserrnd.html
-share/doc/csound4/e.html
-share/doc/csound4/else.html
-share/doc/csound4/elseif.html
-share/doc/csound4/endif.html
-share/doc/csound4/endin.html
-share/doc/csound4/endop.html
-share/doc/csound4/envlpx.html
-share/doc/csound4/envlpxr.html
-share/doc/csound4/equals.html
-share/doc/csound4/event.html
-share/doc/csound4/examples/0dbfs.orc
-share/doc/csound4/examples/0dbfs.sco
-share/doc/csound4/examples/HRTFcompact
-share/doc/csound4/examples/a.orc
-share/doc/csound4/examples/a.sco
-share/doc/csound4/examples/abs.orc
-share/doc/csound4/examples/abs.sco
-share/doc/csound4/examples/active.orc
-share/doc/csound4/examples/active.sco
-share/doc/csound4/examples/active_k.orc
-share/doc/csound4/examples/active_k.sco
-share/doc/csound4/examples/adds.orc
-share/doc/csound4/examples/adds.sco
-share/doc/csound4/examples/adsr.orc
-share/doc/csound4/examples/adsr.sco
-share/doc/csound4/examples/adsyn.orc
-share/doc/csound4/examples/adsyn.sco
-share/doc/csound4/examples/adsynt.orc
-share/doc/csound4/examples/adsynt.sco
-share/doc/csound4/examples/aftouch.orc
-share/doc/csound4/examples/aftouch.sco
-share/doc/csound4/examples/ahh.aiff
-share/doc/csound4/examples/alpass.orc
-share/doc/csound4/examples/alpass.sco
-share/doc/csound4/examples/ampdb.orc
-share/doc/csound4/examples/ampdb.sco
-share/doc/csound4/examples/ampdbfs.orc
-share/doc/csound4/examples/ampdbfs.sco
-share/doc/csound4/examples/ampmidi.orc
-share/doc/csound4/examples/ampmidi.sco
-share/doc/csound4/examples/areson.orc
-share/doc/csound4/examples/areson.sco
-share/doc/csound4/examples/assign.orc
-share/doc/csound4/examples/assign.sco
-share/doc/csound4/examples/atone.orc
-share/doc/csound4/examples/atone.sco
-share/doc/csound4/examples/babo.orc
-share/doc/csound4/examples/babo.sco
-share/doc/csound4/examples/babo_expert.orc
-share/doc/csound4/examples/babo_expert.sco
-share/doc/csound4/examples/balance.orc
-share/doc/csound4/examples/balance.sco
-share/doc/csound4/examples/bamboo.orc
-share/doc/csound4/examples/bamboo.sco
-share/doc/csound4/examples/bbcutm.orc
-share/doc/csound4/examples/bbcutm.sco
-share/doc/csound4/examples/beats.aiff
-share/doc/csound4/examples/beats.wav
-share/doc/csound4/examples/betarand.orc
-share/doc/csound4/examples/betarand.sco
-share/doc/csound4/examples/bexprnd.orc
-share/doc/csound4/examples/bexprnd.sco
-share/doc/csound4/examples/biquad.orc
-share/doc/csound4/examples/biquad.sco
-share/doc/csound4/examples/birnd.orc
-share/doc/csound4/examples/birnd.sco
-share/doc/csound4/examples/bqrez.orc
-share/doc/csound4/examples/bqrez.sco
-share/doc/csound4/examples/butterbp.orc
-share/doc/csound4/examples/butterbp.sco
-share/doc/csound4/examples/butterbr.orc
-share/doc/csound4/examples/butterbr.sco
-share/doc/csound4/examples/butterhp.orc
-share/doc/csound4/examples/butterhp.sco
-share/doc/csound4/examples/butterlp.orc
-share/doc/csound4/examples/butterlp.sco
-share/doc/csound4/examples/buzz.orc
-share/doc/csound4/examples/buzz.sco
-share/doc/csound4/examples/cabasa.orc
-share/doc/csound4/examples/cabasa.sco
-share/doc/csound4/examples/cauchy.orc
-share/doc/csound4/examples/cauchy.sco
-share/doc/csound4/examples/cent.orc
-share/doc/csound4/examples/cent.sco
-share/doc/csound4/examples/cggoto.orc
-share/doc/csound4/examples/cggoto.sco
-share/doc/csound4/examples/checkbox.orc
-share/doc/csound4/examples/checkbox.sco
-share/doc/csound4/examples/cigoto.orc
-share/doc/csound4/examples/cigoto.sco
-share/doc/csound4/examples/ckgoto.orc
-share/doc/csound4/examples/ckgoto.sco
-share/doc/csound4/examples/clfilt_highpass.orc
-share/doc/csound4/examples/clfilt_highpass.sco
-share/doc/csound4/examples/clfilt_lowpass.orc
-share/doc/csound4/examples/clfilt_lowpass.sco
-share/doc/csound4/examples/clip.orc
-share/doc/csound4/examples/clip.sco
-share/doc/csound4/examples/cngoto.orc
-share/doc/csound4/examples/cngoto.sco
-share/doc/csound4/examples/comb.orc
-share/doc/csound4/examples/comb.sco
-share/doc/csound4/examples/cos.orc
-share/doc/csound4/examples/cos.sco
-share/doc/csound4/examples/cosh.orc
-share/doc/csound4/examples/cosh.sco
-share/doc/csound4/examples/cosinv.orc
-share/doc/csound4/examples/cosinv.sco
-share/doc/csound4/examples/cps2pch.orc
-share/doc/csound4/examples/cps2pch.sco
-share/doc/csound4/examples/cps2pch_19et.orc
-share/doc/csound4/examples/cps2pch_19et.sco
-share/doc/csound4/examples/cps2pch_ftable.orc
-share/doc/csound4/examples/cps2pch_ftable.sco
-share/doc/csound4/examples/cpsmidi.orc
-share/doc/csound4/examples/cpsmidi.sco
-share/doc/csound4/examples/cpsmidib.orc
-share/doc/csound4/examples/cpsmidib.sco
-share/doc/csound4/examples/cpsoct.orc
-share/doc/csound4/examples/cpsoct.sco
-share/doc/csound4/examples/cpspch.orc
-share/doc/csound4/examples/cpspch.sco
-share/doc/csound4/examples/cpstmid.orc
-share/doc/csound4/examples/cpstmid.sco
-share/doc/csound4/examples/cpstun.orc
-share/doc/csound4/examples/cpstun.sco
-share/doc/csound4/examples/cpstuni.orc
-share/doc/csound4/examples/cpstuni.sco
-share/doc/csound4/examples/cpsxpch.orc
-share/doc/csound4/examples/cpsxpch.sco
-share/doc/csound4/examples/cpsxpch_105et.orc
-share/doc/csound4/examples/cpsxpch_105et.sco
-share/doc/csound4/examples/cpsxpch_pierce.orc
-share/doc/csound4/examples/cpsxpch_pierce.sco
-share/doc/csound4/examples/cpuprc.orc
-share/doc/csound4/examples/cpuprc.sco
-share/doc/csound4/examples/cross2.orc
-share/doc/csound4/examples/cross2.sco
-share/doc/csound4/examples/crunch.orc
-share/doc/csound4/examples/crunch.sco
-share/doc/csound4/examples/dam.orc
-share/doc/csound4/examples/dam.sco
-share/doc/csound4/examples/dam_expanded.orc
-share/doc/csound4/examples/dam_expanded.sco
-share/doc/csound4/examples/db.orc
-share/doc/csound4/examples/db.sco
-share/doc/csound4/examples/dbamp.orc
-share/doc/csound4/examples/dbamp.sco
-share/doc/csound4/examples/dbfsamp.orc
-share/doc/csound4/examples/dbfsamp.sco
-share/doc/csound4/examples/dcblock.orc
-share/doc/csound4/examples/dcblock.sco
-share/doc/csound4/examples/dconv.orc
-share/doc/csound4/examples/dconv.sco
-share/doc/csound4/examples/define.orc
-share/doc/csound4/examples/define.sco
-share/doc/csound4/examples/define_args.orc
-share/doc/csound4/examples/define_args.sco
-share/doc/csound4/examples/delay.orc
-share/doc/csound4/examples/delay.sco
-share/doc/csound4/examples/delayw.orc
-share/doc/csound4/examples/delayw.sco
-share/doc/csound4/examples/diff.orc
-share/doc/csound4/examples/diff.sco
-share/doc/csound4/examples/diskin.orc
-share/doc/csound4/examples/diskin.sco
-share/doc/csound4/examples/dispfft.orc
-share/doc/csound4/examples/dispfft.sco
-share/doc/csound4/examples/display.orc
-share/doc/csound4/examples/display.sco
-share/doc/csound4/examples/distort1.orc
-share/doc/csound4/examples/distort1.sco
-share/doc/csound4/examples/divides.orc
-share/doc/csound4/examples/divides.sco
-share/doc/csound4/examples/divz.orc
-share/doc/csound4/examples/divz.sco
-share/doc/csound4/examples/downsamp.orc
-share/doc/csound4/examples/downsamp.sco
-share/doc/csound4/examples/dripwater.orc
-share/doc/csound4/examples/dripwater.sco
-share/doc/csound4/examples/eee.aiff
-share/doc/csound4/examples/endin.orc
-share/doc/csound4/examples/endin.sco
-share/doc/csound4/examples/envlpx.orc
-share/doc/csound4/examples/envlpx.sco
-share/doc/csound4/examples/equal.orc
-share/doc/csound4/examples/equal.sco
-share/doc/csound4/examples/event.orc
-share/doc/csound4/examples/event.sco
-share/doc/csound4/examples/event_named.orc
-share/doc/csound4/examples/event_named.sco
-share/doc/csound4/examples/exp.orc
-share/doc/csound4/examples/exp.sco
-share/doc/csound4/examples/expon.orc
-share/doc/csound4/examples/expon.sco
-share/doc/csound4/examples/exprand.orc
-share/doc/csound4/examples/exprand.sco
-share/doc/csound4/examples/expseg.orc
-share/doc/csound4/examples/expseg.sco
-share/doc/csound4/examples/expsega.orc
-share/doc/csound4/examples/expsega.sco
-share/doc/csound4/examples/expsegr.orc
-share/doc/csound4/examples/expsegr.sco
-share/doc/csound4/examples/fdl.txt
-share/doc/csound4/examples/filelen.orc
-share/doc/csound4/examples/filelen.sco
-share/doc/csound4/examples/filenchnls.orc
-share/doc/csound4/examples/filenchnls.sco
-share/doc/csound4/examples/filepeak.orc
-share/doc/csound4/examples/filepeak.sco
-share/doc/csound4/examples/filesr.orc
-share/doc/csound4/examples/filesr.sco
-share/doc/csound4/examples/flanger.orc
-share/doc/csound4/examples/flanger.sco
-share/doc/csound4/examples/flashtxt.orc
-share/doc/csound4/examples/flashtxt.sco
-share/doc/csound4/examples/flbox.orc
-share/doc/csound4/examples/flbox.sco
-share/doc/csound4/examples/flbutton.orc
-share/doc/csound4/examples/flbutton.sco
-share/doc/csound4/examples/flcount.orc
-share/doc/csound4/examples/flcount.sco
-share/doc/csound4/examples/fljoy.orc
-share/doc/csound4/examples/fljoy.sco
-share/doc/csound4/examples/flknob.orc
-share/doc/csound4/examples/flknob.sco
-share/doc/csound4/examples/flpanel.orc
-share/doc/csound4/examples/flpanel.sco
-share/doc/csound4/examples/flroller.orc
-share/doc/csound4/examples/flroller.sco
-share/doc/csound4/examples/flscroll.orc
-share/doc/csound4/examples/flscroll.sco
-share/doc/csound4/examples/flsetcolor.orc
-share/doc/csound4/examples/flsetcolor.sco
-share/doc/csound4/examples/flslider.orc
-share/doc/csound4/examples/flslider.sco
-share/doc/csound4/examples/fltabs.orc
-share/doc/csound4/examples/fltabs.sco
-share/doc/csound4/examples/fltext.orc
-share/doc/csound4/examples/fltext.sco
-share/doc/csound4/examples/flvalue.orc
-share/doc/csound4/examples/flvalue.sco
-share/doc/csound4/examples/fmb3.orc
-share/doc/csound4/examples/fmb3.sco
-share/doc/csound4/examples/fmbell.orc
-share/doc/csound4/examples/fmbell.sco
-share/doc/csound4/examples/fmmetal.orc
-share/doc/csound4/examples/fmmetal.sco
-share/doc/csound4/examples/fmpercfl.orc
-share/doc/csound4/examples/fmpercfl.sco
-share/doc/csound4/examples/fmrhode.orc
-share/doc/csound4/examples/fmrhode.sco
-share/doc/csound4/examples/fmvoice.orc
-share/doc/csound4/examples/fmvoice.sco
-share/doc/csound4/examples/fmwurlie.orc
-share/doc/csound4/examples/fmwurlie.sco
-share/doc/csound4/examples/fof.orc
-share/doc/csound4/examples/fof.sco
-share/doc/csound4/examples/fold.orc
-share/doc/csound4/examples/fold.sco
-share/doc/csound4/examples/follow.orc
-share/doc/csound4/examples/follow.sco
-share/doc/csound4/examples/follow2.orc
-share/doc/csound4/examples/follow2.sco
-share/doc/csound4/examples/foscil.orc
-share/doc/csound4/examples/foscil.sco
-share/doc/csound4/examples/foscili.orc
-share/doc/csound4/examples/foscili.sco
-share/doc/csound4/examples/fout.orc
-share/doc/csound4/examples/fout.sco
-share/doc/csound4/examples/fout_poly.orc
-share/doc/csound4/examples/fout_poly.sco
-share/doc/csound4/examples/fprintks.orc
-share/doc/csound4/examples/fprintks.sco
-share/doc/csound4/examples/fprints.orc
-share/doc/csound4/examples/fprints.sco
-share/doc/csound4/examples/frac.orc
-share/doc/csound4/examples/frac.sco
-share/doc/csound4/examples/ftchnls.orc
-share/doc/csound4/examples/ftchnls.sco
-share/doc/csound4/examples/ftgen.orc
-share/doc/csound4/examples/ftgen.sco
-share/doc/csound4/examples/ftlen.orc
-share/doc/csound4/examples/ftlen.sco
-share/doc/csound4/examples/ftlptim.orc
-share/doc/csound4/examples/ftlptim.sco
-share/doc/csound4/examples/ftmorf.orc
-share/doc/csound4/examples/ftmorf.sco
-share/doc/csound4/examples/ftsave.orc
-share/doc/csound4/examples/ftsave.sco
-share/doc/csound4/examples/ftsr.orc
-share/doc/csound4/examples/ftsr.sco
-share/doc/csound4/examples/fwavblnk.aiff
-share/doc/csound4/examples/gauss.orc
-share/doc/csound4/examples/gauss.sco
-share/doc/csound4/examples/gbuzz.orc
-share/doc/csound4/examples/gbuzz.sco
-share/doc/csound4/examples/gen01.orc
-share/doc/csound4/examples/gen01.sco
-share/doc/csound4/examples/gen01computed.orc
-share/doc/csound4/examples/gen01computed.sco
-share/doc/csound4/examples/gen02.orc
-share/doc/csound4/examples/gen02.sco
-share/doc/csound4/examples/gen03.orc
-share/doc/csound4/examples/gen03.sco
-share/doc/csound4/examples/gen05.orc
-share/doc/csound4/examples/gen05.sco
-share/doc/csound4/examples/gen06.orc
-share/doc/csound4/examples/gen06.sco
-share/doc/csound4/examples/gen07.orc
-share/doc/csound4/examples/gen07.sco
-share/doc/csound4/examples/gen08.orc
-share/doc/csound4/examples/gen08.sco
-share/doc/csound4/examples/gen09.orc
-share/doc/csound4/examples/gen09.sco
-share/doc/csound4/examples/gen09square.orc
-share/doc/csound4/examples/gen09square.sco
-share/doc/csound4/examples/gen10.orc
-share/doc/csound4/examples/gen10.sco
-share/doc/csound4/examples/gen11.orc
-share/doc/csound4/examples/gen11.sco
-share/doc/csound4/examples/gen12.orc
-share/doc/csound4/examples/gen12.sco
-share/doc/csound4/examples/gen13.orc
-share/doc/csound4/examples/gen13.sco
-share/doc/csound4/examples/gen14.orc
-share/doc/csound4/examples/gen14.sco
-share/doc/csound4/examples/gen19.orc
-share/doc/csound4/examples/gen19.sco
-share/doc/csound4/examples/gogobel.orc
-share/doc/csound4/examples/gogobel.sco
-share/doc/csound4/examples/goto.orc
-share/doc/csound4/examples/goto.sco
-share/doc/csound4/examples/grain.orc
-share/doc/csound4/examples/grain.sco
-share/doc/csound4/examples/grain2.orc
-share/doc/csound4/examples/grain2.sco
-share/doc/csound4/examples/grain3.orc
-share/doc/csound4/examples/grain3.sco
-share/doc/csound4/examples/granule.orc
-share/doc/csound4/examples/granule.sco
-share/doc/csound4/examples/greaterequal.orc
-share/doc/csound4/examples/greaterequal.sco
-share/doc/csound4/examples/greaterthan.orc
-share/doc/csound4/examples/greaterthan.sco
-share/doc/csound4/examples/guiro.orc
-share/doc/csound4/examples/guiro.sco
-share/doc/csound4/examples/harmon.orc
-share/doc/csound4/examples/harmon.sco
-share/doc/csound4/examples/hilbert.orc
-share/doc/csound4/examples/hilbert.sco
-share/doc/csound4/examples/hilbert_barberpole.orc
-share/doc/csound4/examples/hilbert_barberpole.sco
-share/doc/csound4/examples/hrtfer.orc
-share/doc/csound4/examples/hrtfer.sco
-share/doc/csound4/examples/hsboscil.orc
-share/doc/csound4/examples/hsboscil.sco
-share/doc/csound4/examples/hsboscil_midi.orc
-share/doc/csound4/examples/hsboscil_midi.sco
-share/doc/csound4/examples/ifthen.orc
-share/doc/csound4/examples/ifthen.sco
-share/doc/csound4/examples/igoto.orc
-share/doc/csound4/examples/igoto.sco
-share/doc/csound4/examples/ihold.orc
-share/doc/csound4/examples/ihold.sco
-share/doc/csound4/examples/impuls20.aiff
-share/doc/csound4/examples/include.orc
-share/doc/csound4/examples/include.sco
-share/doc/csound4/examples/instr.orc
-share/doc/csound4/examples/instr.sco
-share/doc/csound4/examples/int.orc
-share/doc/csound4/examples/int.sco
-share/doc/csound4/examples/integ.orc
-share/doc/csound4/examples/integ.sco
-share/doc/csound4/examples/interp.orc
-share/doc/csound4/examples/interp.sco
-share/doc/csound4/examples/jitter.orc
-share/doc/csound4/examples/jitter.sco
-share/doc/csound4/examples/jitter2.orc
-share/doc/csound4/examples/jitter2.sco
-share/doc/csound4/examples/kgoto.orc
-share/doc/csound4/examples/kgoto.sco
-share/doc/csound4/examples/kickroll.het
-share/doc/csound4/examples/kickroll.wav
-share/doc/csound4/examples/lessequal.orc
-share/doc/csound4/examples/lessequal.sco
-share/doc/csound4/examples/lessthan.orc
-share/doc/csound4/examples/lessthan.sco
-share/doc/csound4/examples/lfo.orc
-share/doc/csound4/examples/lfo.sco
-share/doc/csound4/examples/line.orc
-share/doc/csound4/examples/line.sco
-share/doc/csound4/examples/linrand.orc
-share/doc/csound4/examples/linrand.sco
-share/doc/csound4/examples/linseg.orc
-share/doc/csound4/examples/linseg.sco
-share/doc/csound4/examples/linsegr.orc
-share/doc/csound4/examples/linsegr.sco
-share/doc/csound4/examples/log.orc
-share/doc/csound4/examples/log.sco
-share/doc/csound4/examples/log10.orc
-share/doc/csound4/examples/log10.sco
-share/doc/csound4/examples/logbtwo.orc
-share/doc/csound4/examples/logbtwo.sco
-share/doc/csound4/examples/loopseg.orc
-share/doc/csound4/examples/loopseg.sco
-share/doc/csound4/examples/lorenz.orc
-share/doc/csound4/examples/lorenz.sco
-share/doc/csound4/examples/loscil.orc
-share/doc/csound4/examples/loscil.sco
-share/doc/csound4/examples/loscil3.orc
-share/doc/csound4/examples/loscil3.sco
-share/doc/csound4/examples/lowpass2.orc
-share/doc/csound4/examples/lowpass2.sco
-share/doc/csound4/examples/lowres.orc
-share/doc/csound4/examples/lowres.sco
-share/doc/csound4/examples/lowresx.orc
-share/doc/csound4/examples/lowresx.sco
-share/doc/csound4/examples/lpf18.orc
-share/doc/csound4/examples/lpf18.sco
-share/doc/csound4/examples/lpshold.orc
-share/doc/csound4/examples/lpshold.sco
-share/doc/csound4/examples/madsr.orc
-share/doc/csound4/examples/madsr.sco
-share/doc/csound4/examples/mandol.orc
-share/doc/csound4/examples/mandol.sco
-share/doc/csound4/examples/mandpluk.aiff
-share/doc/csound4/examples/marimba.orc
-share/doc/csound4/examples/marimba.sco
-share/doc/csound4/examples/marmstk1.wav
-share/doc/csound4/examples/mary.wav
-share/doc/csound4/examples/maxalloc.orc
-share/doc/csound4/examples/maxalloc.sco
-share/doc/csound4/examples/midichannelaftertouch.orc
-share/doc/csound4/examples/midichannelaftertouch.sco
-share/doc/csound4/examples/midichn.orc
-share/doc/csound4/examples/midichn.sco
-share/doc/csound4/examples/midichn_advanced.mid
-share/doc/csound4/examples/midichn_advanced.orc
-share/doc/csound4/examples/midichn_advanced.sco
-share/doc/csound4/examples/midinoteoff.orc
-share/doc/csound4/examples/midinoteoff.sco
-share/doc/csound4/examples/midinoteoncps.orc
-share/doc/csound4/examples/midinoteoncps.sco
-share/doc/csound4/examples/midinoteonkey.orc
-share/doc/csound4/examples/midinoteonkey.sco
-share/doc/csound4/examples/midinoteonoct.orc
-share/doc/csound4/examples/midinoteonoct.sco
-share/doc/csound4/examples/midinoteonpch.orc
-share/doc/csound4/examples/midinoteonpch.sco
-share/doc/csound4/examples/midipitchbend.orc
-share/doc/csound4/examples/midipitchbend.sco
-share/doc/csound4/examples/modulus.orc
-share/doc/csound4/examples/modulus.sco
-share/doc/csound4/examples/moog.orc
-share/doc/csound4/examples/moog.sco
-share/doc/csound4/examples/moogvcf.orc
-share/doc/csound4/examples/moogvcf.sco
-share/doc/csound4/examples/mpulse.orc
-share/doc/csound4/examples/mpulse.sco
-share/doc/csound4/examples/multiplies.orc
-share/doc/csound4/examples/multiplies.sco
-share/doc/csound4/examples/mute.orc
-share/doc/csound4/examples/mute.sco
-share/doc/csound4/examples/nestedap.orc
-share/doc/csound4/examples/nestedap.sco
-share/doc/csound4/examples/noise.orc
-share/doc/csound4/examples/noise.sco
-share/doc/csound4/examples/notequal.orc
-share/doc/csound4/examples/notequal.sco
-share/doc/csound4/examples/notnum.orc
-share/doc/csound4/examples/notnum.sco
-share/doc/csound4/examples/nreverb.orc
-share/doc/csound4/examples/nreverb.sco
-share/doc/csound4/examples/nreverb_ftable.orc
-share/doc/csound4/examples/nreverb_ftable.sco
-share/doc/csound4/examples/nsamp.orc
-share/doc/csound4/examples/nsamp.sco
-share/doc/csound4/examples/octave.orc
-share/doc/csound4/examples/octave.sco
-share/doc/csound4/examples/octcps.orc
-share/doc/csound4/examples/octcps.sco
-share/doc/csound4/examples/octmidi.orc
-share/doc/csound4/examples/octmidi.sco
-share/doc/csound4/examples/octmidib.orc
-share/doc/csound4/examples/octmidib.sco
-share/doc/csound4/examples/octpch.orc
-share/doc/csound4/examples/octpch.sco
-share/doc/csound4/examples/ooo.aiff
-share/doc/csound4/examples/opcode1.sgml
-share/doc/csound4/examples/opcode_example.orc
-share/doc/csound4/examples/opcode_example.sco
-share/doc/csound4/examples/oscbnk.orc
-share/doc/csound4/examples/oscbnk.sco
-share/doc/csound4/examples/oscil.orc
-share/doc/csound4/examples/oscil.sco
-share/doc/csound4/examples/oscil3.orc
-share/doc/csound4/examples/oscil3.sco
-share/doc/csound4/examples/oscili.orc
-share/doc/csound4/examples/oscili.sco
-share/doc/csound4/examples/oscilikt.orc
-share/doc/csound4/examples/oscilikt.sco
-share/doc/csound4/examples/osciliktp.orc
-share/doc/csound4/examples/osciliktp.sco
-share/doc/csound4/examples/oscilikts.orc
-share/doc/csound4/examples/oscilikts.sco
-share/doc/csound4/examples/oscils.orc
-share/doc/csound4/examples/oscils.sco
-share/doc/csound4/examples/p.orc
-share/doc/csound4/examples/p.sco
-share/doc/csound4/examples/pareq.orc
-share/doc/csound4/examples/pareq.sco
-share/doc/csound4/examples/pcauchy.orc
-share/doc/csound4/examples/pcauchy.sco
-share/doc/csound4/examples/pchbend.orc
-share/doc/csound4/examples/pchbend.sco
-share/doc/csound4/examples/pchmidi.orc
-share/doc/csound4/examples/pchmidi.sco
-share/doc/csound4/examples/pchmidib.orc
-share/doc/csound4/examples/pchmidib.sco
-share/doc/csound4/examples/pchoct.orc
-share/doc/csound4/examples/pchoct.sco
-share/doc/csound4/examples/peak.orc
-share/doc/csound4/examples/peak.sco
-share/doc/csound4/examples/pgmassign.orc
-share/doc/csound4/examples/pgmassign.sco
-share/doc/csound4/examples/pgmassign_advanced.mid
-share/doc/csound4/examples/pgmassign_advanced.orc
-share/doc/csound4/examples/pgmassign_advanced.sco
-share/doc/csound4/examples/pgmassign_ignore.orc
-share/doc/csound4/examples/pgmassign_ignore.sco
-share/doc/csound4/examples/phaser1.orc
-share/doc/csound4/examples/phaser1.sco
-share/doc/csound4/examples/phaser2.orc
-share/doc/csound4/examples/phaser2.sco
-share/doc/csound4/examples/phasor.orc
-share/doc/csound4/examples/phasor.sco
-share/doc/csound4/examples/phasorbnk.orc
-share/doc/csound4/examples/phasorbnk.sco
-share/doc/csound4/examples/pinkish.orc
-share/doc/csound4/examples/pinkish.sco
-share/doc/csound4/examples/pitch.orc
-share/doc/csound4/examples/pitch.sco
-share/doc/csound4/examples/pitchamdf.orc
-share/doc/csound4/examples/pitchamdf.sco
-share/doc/csound4/examples/planet.orc
-share/doc/csound4/examples/planet.sco
-share/doc/csound4/examples/pluck.orc
-share/doc/csound4/examples/pluck.sco
-share/doc/csound4/examples/poisson.orc
-share/doc/csound4/examples/poisson.sco
-share/doc/csound4/examples/polyaft.mid
-share/doc/csound4/examples/polyaft.orc
-share/doc/csound4/examples/polyaft.sco
-share/doc/csound4/examples/poscil.orc
-share/doc/csound4/examples/poscil.sco
-share/doc/csound4/examples/poscil3.orc
-share/doc/csound4/examples/poscil3.sco
-share/doc/csound4/examples/pow.orc
-share/doc/csound4/examples/pow.sco
-share/doc/csound4/examples/powoftwo.orc
-share/doc/csound4/examples/powoftwo.sco
-share/doc/csound4/examples/prealloc.orc
-share/doc/csound4/examples/prealloc.sco
-share/doc/csound4/examples/print.orc
-share/doc/csound4/examples/print.sco
-share/doc/csound4/examples/printk.orc
-share/doc/csound4/examples/printk.sco
-share/doc/csound4/examples/printk2.orc
-share/doc/csound4/examples/printk2.sco
-share/doc/csound4/examples/printks.orc
-share/doc/csound4/examples/printks.sco
-share/doc/csound4/examples/prints.orc
-share/doc/csound4/examples/prints.sco
-share/doc/csound4/examples/r.orc
-share/doc/csound4/examples/r.sco
-share/doc/csound4/examples/raises.orc
-share/doc/csound4/examples/raises.sco
-share/doc/csound4/examples/rand.orc
-share/doc/csound4/examples/rand.sco
-share/doc/csound4/examples/randh.orc
-share/doc/csound4/examples/randh.sco
-share/doc/csound4/examples/randi.orc
-share/doc/csound4/examples/randi.sco
-share/doc/csound4/examples/random.orc
-share/doc/csound4/examples/random.sco
-share/doc/csound4/examples/randomh.orc
-share/doc/csound4/examples/randomh.sco
-share/doc/csound4/examples/randomi.orc
-share/doc/csound4/examples/randomi.sco
-share/doc/csound4/examples/readclock.orc
-share/doc/csound4/examples/readclock.sco
-share/doc/csound4/examples/reinit.orc
-share/doc/csound4/examples/reinit.sco
-share/doc/csound4/examples/repluck.orc
-share/doc/csound4/examples/repluck.sco
-share/doc/csound4/examples/reson.orc
-share/doc/csound4/examples/reson.sco
-share/doc/csound4/examples/resonr.orc
-share/doc/csound4/examples/resonr.sco
-share/doc/csound4/examples/resony.orc
-share/doc/csound4/examples/resony.sco
-share/doc/csound4/examples/reverb.orc
-share/doc/csound4/examples/reverb.sco
-share/doc/csound4/examples/rezzy.orc
-share/doc/csound4/examples/rezzy.sco
-share/doc/csound4/examples/rnd.orc
-share/doc/csound4/examples/rnd.sco
-share/doc/csound4/examples/rnd31.orc
-share/doc/csound4/examples/rnd31.sco
-share/doc/csound4/examples/rnd31_krate.orc
-share/doc/csound4/examples/rnd31_krate.sco
-share/doc/csound4/examples/rnd31_seed7.orc
-share/doc/csound4/examples/rnd31_seed7.sco
-share/doc/csound4/examples/rnd31_time.orc
-share/doc/csound4/examples/rnd31_time.sco
-share/doc/csound4/examples/rt-midi-input.orc
-share/doc/csound4/examples/rt-midi-input.sco
-share/doc/csound4/examples/rtclock.orc
-share/doc/csound4/examples/rtclock.sco
-share/doc/csound4/examples/sandpaper.orc
-share/doc/csound4/examples/sandpaper.sco
-share/doc/csound4/examples/scans.orc
-share/doc/csound4/examples/scans.sco
-share/doc/csound4/examples/scantable.orc
-share/doc/csound4/examples/scantable.sco
-share/doc/csound4/examples/schedkwhen.orc
-share/doc/csound4/examples/schedkwhen.sco
-share/doc/csound4/examples/schedule.orc
-share/doc/csound4/examples/schedule.sco
-share/doc/csound4/examples/schedwhen.orc
-share/doc/csound4/examples/schedwhen.sco
-share/doc/csound4/examples/sekere.orc
-share/doc/csound4/examples/sekere.sco
-share/doc/csound4/examples/semitone.orc
-share/doc/csound4/examples/semitone.sco
-share/doc/csound4/examples/sensekey.orc
-share/doc/csound4/examples/sensekey.sco
-share/doc/csound4/examples/setctrl.orc
-share/doc/csound4/examples/setctrl.sco
-share/doc/csound4/examples/shaker.orc
-share/doc/csound4/examples/shaker.sco
-share/doc/csound4/examples/sin.orc
-share/doc/csound4/examples/sin.sco
-share/doc/csound4/examples/sinh.orc
-share/doc/csound4/examples/sinh.sco
-share/doc/csound4/examples/sininv.orc
-share/doc/csound4/examples/sininv.sco
-share/doc/csound4/examples/sleighbells.orc
-share/doc/csound4/examples/sleighbells.sco
-share/doc/csound4/examples/sndwarp.orc
-share/doc/csound4/examples/sndwarp.sco
-share/doc/csound4/examples/soundin.orc
-share/doc/csound4/examples/soundin.sco
-share/doc/csound4/examples/spat3d_UHJ.orc
-share/doc/csound4/examples/spat3d_UHJ.sco
-share/doc/csound4/examples/spat3d_quad.orc
-share/doc/csound4/examples/spat3d_quad.sco
-share/doc/csound4/examples/spat3d_stereo.orc
-share/doc/csound4/examples/spat3d_stereo.sco
-share/doc/csound4/examples/sqrt.orc
-share/doc/csound4/examples/sqrt.sco
-share/doc/csound4/examples/stix.orc
-share/doc/csound4/examples/stix.sco
-share/doc/csound4/examples/streson.orc
-share/doc/csound4/examples/streson.sco
-share/doc/csound4/examples/string-128.matrix
-share/doc/csound4/examples/subinstr.orc
-share/doc/csound4/examples/subinstr.sco
-share/doc/csound4/examples/subinstr_named.orc
-share/doc/csound4/examples/subinstr_named.sco
-share/doc/csound4/examples/subtracts.orc
-share/doc/csound4/examples/subtracts.sco
-share/doc/csound4/examples/svfilter.orc
-share/doc/csound4/examples/svfilter.sco
-share/doc/csound4/examples/table.orc
-share/doc/csound4/examples/table.sco
-share/doc/csound4/examples/table1.inc
-share/doc/csound4/examples/tableng.orc
-share/doc/csound4/examples/tableng.sco
-share/doc/csound4/examples/tambourine.orc
-share/doc/csound4/examples/tambourine.sco
-share/doc/csound4/examples/tan.orc
-share/doc/csound4/examples/tan.sco
-share/doc/csound4/examples/tanh.orc
-share/doc/csound4/examples/tanh.sco
-share/doc/csound4/examples/taninv.orc
-share/doc/csound4/examples/taninv.sco
-share/doc/csound4/examples/taninv2.orc
-share/doc/csound4/examples/taninv2.sco
-share/doc/csound4/examples/tbvcf.orc
-share/doc/csound4/examples/tbvcf.sco
-share/doc/csound4/examples/tempest.orc
-share/doc/csound4/examples/tempest.sco
-share/doc/csound4/examples/tempo.orc
-share/doc/csound4/examples/tempo.sco
-share/doc/csound4/examples/tempoval.orc
-share/doc/csound4/examples/tempoval.sco
-share/doc/csound4/examples/timeinstk.orc
-share/doc/csound4/examples/timeinstk.sco
-share/doc/csound4/examples/timeinsts.orc
-share/doc/csound4/examples/timeinsts.sco
-share/doc/csound4/examples/timek.orc
-share/doc/csound4/examples/timek.sco
-share/doc/csound4/examples/times.orc
-share/doc/csound4/examples/times.sco
-share/doc/csound4/examples/trigger.orc
-share/doc/csound4/examples/trigger.sco
-share/doc/csound4/examples/trirand.orc
-share/doc/csound4/examples/trirand.sco
-share/doc/csound4/examples/turnoff.orc
-share/doc/csound4/examples/turnoff.sco
-share/doc/csound4/examples/twopeaks.aiff
-share/doc/csound4/examples/unirand.orc
-share/doc/csound4/examples/unirand.sco
-share/doc/csound4/examples/vco.orc
-share/doc/csound4/examples/vco.sco
-share/doc/csound4/examples/vco2.orc
-share/doc/csound4/examples/vco2.sco
-share/doc/csound4/examples/veloc.orc
-share/doc/csound4/examples/veloc.sco
-share/doc/csound4/examples/vibes.orc
-share/doc/csound4/examples/vibes.sco
-share/doc/csound4/examples/vibr.orc
-share/doc/csound4/examples/vibr.sco
-share/doc/csound4/examples/vibrato.orc
-share/doc/csound4/examples/vibrato.sco
-share/doc/csound4/examples/vlowres.orc
-share/doc/csound4/examples/vlowres.sco
-share/doc/csound4/examples/voice.orc
-share/doc/csound4/examples/voice.sco
-share/doc/csound4/examples/waveset.orc
-share/doc/csound4/examples/waveset.sco
-share/doc/csound4/examples/weibull.orc
-share/doc/csound4/examples/weibull.sco
-share/doc/csound4/examples/wgbow.orc
-share/doc/csound4/examples/wgbow.sco
-share/doc/csound4/examples/wgbowedbar.orc
-share/doc/csound4/examples/wgbowedbar.sco
-share/doc/csound4/examples/wgbrass.orc
-share/doc/csound4/examples/wgbrass.sco
-share/doc/csound4/examples/wgclar.orc
-share/doc/csound4/examples/wgclar.sco
-share/doc/csound4/examples/wgflute.orc
-share/doc/csound4/examples/wgflute.sco
-share/doc/csound4/examples/wgpluck.orc
-share/doc/csound4/examples/wgpluck.sco
-share/doc/csound4/examples/wgpluck2.orc
-share/doc/csound4/examples/wgpluck2.sco
-share/doc/csound4/examples/wgpluck_brighter.orc
-share/doc/csound4/examples/wgpluck_brighter.sco
-share/doc/csound4/examples/wguide1.orc
-share/doc/csound4/examples/wguide1.sco
-share/doc/csound4/examples/wterrain.orc
-share/doc/csound4/examples/wterrain.sco
-share/doc/csound4/examples/xyin.orc
-share/doc/csound4/examples/xyin.sco
-share/doc/csound4/examples/zacl.orc
-share/doc/csound4/examples/zacl.sco
-share/doc/csound4/examples/zakinit.orc
-share/doc/csound4/examples/zakinit.sco
-share/doc/csound4/examples/zamod.orc
-share/doc/csound4/examples/zamod.sco
-share/doc/csound4/examples/zar.orc
-share/doc/csound4/examples/zar.sco
-share/doc/csound4/examples/zarg.orc
-share/doc/csound4/examples/zarg.sco
-share/doc/csound4/examples/zaw.orc
-share/doc/csound4/examples/zaw.sco
-share/doc/csound4/examples/zawm.orc
-share/doc/csound4/examples/zawm.sco
-share/doc/csound4/examples/zir.orc
-share/doc/csound4/examples/zir.sco
-share/doc/csound4/examples/ziw.orc
-share/doc/csound4/examples/ziw.sco
-share/doc/csound4/examples/ziwm.orc
-share/doc/csound4/examples/ziwm.sco
-share/doc/csound4/examples/zkcl.orc
-share/doc/csound4/examples/zkcl.sco
-share/doc/csound4/examples/zkmod.orc
-share/doc/csound4/examples/zkmod.sco
-share/doc/csound4/examples/zkr.orc
-share/doc/csound4/examples/zkr.sco
-share/doc/csound4/examples/zkw.orc
-share/doc/csound4/examples/zkw.sco
-share/doc/csound4/examples/zkwm.orc
-share/doc/csound4/examples/zkwm.sco
-share/doc/csound4/exp.html
-share/doc/csound4/expon.html
-share/doc/csound4/exprand.html
-share/doc/csound4/expseg.html
-share/doc/csound4/expsega.html
-share/doc/csound4/expsegr.html
-share/doc/csound4/f.html
-share/doc/csound4/filelen.html
-share/doc/csound4/filenchnls.html
-share/doc/csound4/filepeak.html
-share/doc/csound4/filesr.html
-share/doc/csound4/filter2.html
-share/doc/csound4/fin.html
-share/doc/csound4/fini.html
-share/doc/csound4/fink.html
-share/doc/csound4/fiopen.html
-share/doc/csound4/flanger.html
-share/doc/csound4/flashtxt.html
-share/doc/csound4/flbox.html
-share/doc/csound4/flbutbank.html
-share/doc/csound4/flbutton.html
-share/doc/csound4/flcolor.html
-share/doc/csound4/flcolor2.html
-share/doc/csound4/flcount.html
-share/doc/csound4/flgetsnap.html
-share/doc/csound4/flgroup.html
-share/doc/csound4/flgroupend.html
-share/doc/csound4/flhide.html
-share/doc/csound4/fljoy.html
-share/doc/csound4/flkeyb.html
-share/doc/csound4/flknob.html
-share/doc/csound4/fllabel.html
-share/doc/csound4/flloadsnap.html
-share/doc/csound4/flpack.html
-share/doc/csound4/flpackend.html
-share/doc/csound4/flpanel.html
-share/doc/csound4/flpanelend.html
-share/doc/csound4/flprintk.html
-share/doc/csound4/flprintk2.html
-share/doc/csound4/flroller.html
-share/doc/csound4/flrun.html
-share/doc/csound4/flsavesnap.html
-share/doc/csound4/flscroll.html
-share/doc/csound4/flscrollend.html
-share/doc/csound4/flsetalign.html
-share/doc/csound4/flsetbox.html
-share/doc/csound4/flsetcolor.html
-share/doc/csound4/flsetcolor2.html
-share/doc/csound4/flsetfont.html
-share/doc/csound4/flsetposition.html
-share/doc/csound4/flsetsize.html
-share/doc/csound4/flsetsnap.html
-share/doc/csound4/flsettext.html
-share/doc/csound4/flsettextcolor.html
-share/doc/csound4/flsettextsize.html
-share/doc/csound4/flsettexttype.html
-share/doc/csound4/flsetval.html
-share/doc/csound4/flsetvali.html
-share/doc/csound4/flshow.html
-share/doc/csound4/flslidbnk.html
-share/doc/csound4/flslider.html
-share/doc/csound4/fltabs.html
-share/doc/csound4/fltabsend.html
-share/doc/csound4/fltext.html
-share/doc/csound4/flupdate.html
-share/doc/csound4/flvalue.html
-share/doc/csound4/fmb3.html
-share/doc/csound4/fmbell.html
-share/doc/csound4/fmmetal.html
-share/doc/csound4/fmpercfl.html
-share/doc/csound4/fmrhode.html
-share/doc/csound4/fmvoice.html
-share/doc/csound4/fmwurlie.html
-share/doc/csound4/fof.html
-share/doc/csound4/fof2.html
-share/doc/csound4/fog.html
-share/doc/csound4/fold.html
-share/doc/csound4/follow.html
-share/doc/csound4/follow2.html
-share/doc/csound4/foscil.html
-share/doc/csound4/foscili.html
-share/doc/csound4/fout.html
-share/doc/csound4/fouti.html
-share/doc/csound4/foutir.html
-share/doc/csound4/foutk.html
-share/doc/csound4/fprintks.html
-share/doc/csound4/fprints.html
-share/doc/csound4/frac.html
-share/doc/csound4/ftchnls.html
-share/doc/csound4/ftgen.html
-share/doc/csound4/ftlen.html
-share/doc/csound4/ftload.html
-share/doc/csound4/ftloadk.html
-share/doc/csound4/ftlptim.html
-share/doc/csound4/ftmorf.html
-share/doc/csound4/ftsave.html
-share/doc/csound4/ftsavek.html
-share/doc/csound4/ftsr.html
-share/doc/csound4/gain.html
-share/doc/csound4/gauss.html
-share/doc/csound4/gbuzz.html
-share/doc/csound4/gen01.html
-share/doc/csound4/gen02.html
-share/doc/csound4/gen03.html
-share/doc/csound4/gen04.html
-share/doc/csound4/gen05.html
-share/doc/csound4/gen06.html
-share/doc/csound4/gen07.html
-share/doc/csound4/gen08.html
-share/doc/csound4/gen09.html
-share/doc/csound4/gen10.html
-share/doc/csound4/gen11.html
-share/doc/csound4/gen12.html
-share/doc/csound4/gen13.html
-share/doc/csound4/gen14.html
-share/doc/csound4/gen15.html
-share/doc/csound4/gen16.html
-share/doc/csound4/gen17.html
-share/doc/csound4/gen18.html
-share/doc/csound4/gen19.html
-share/doc/csound4/gen20.html
-share/doc/csound4/gen21.html
-share/doc/csound4/gen22.html
-share/doc/csound4/gen23.html
-share/doc/csound4/gen24.html
-share/doc/csound4/gen25.html
-share/doc/csound4/gen27.html
-share/doc/csound4/gen28.html
-share/doc/csound4/gen30.html
-share/doc/csound4/gen31.html
-share/doc/csound4/gen32.html
-share/doc/csound4/gen33.html
-share/doc/csound4/gen34.html
-share/doc/csound4/gen40.html
-share/doc/csound4/gen41.html
-share/doc/csound4/gen42.html
-share/doc/csound4/genindex.html
-share/doc/csound4/gogobel.html
-share/doc/csound4/goto.html
-share/doc/csound4/grain.html
-share/doc/csound4/grain2.html
-share/doc/csound4/grain3.html
-share/doc/csound4/granule.html
-share/doc/csound4/greaterequal.html
-share/doc/csound4/greaterthan.html
-share/doc/csound4/guiro.html
-share/doc/csound4/harmon.html
-share/doc/csound4/hetro.html
-share/doc/csound4/hilbert.html
-share/doc/csound4/hrtfer.html
-share/doc/csound4/hsboscil.html
-share/doc/csound4/i.html
-share/doc/csound4/ibetarand.html
-share/doc/csound4/ibexprnd.html
-share/doc/csound4/icauchy.html
-share/doc/csound4/ictrl14.html
-share/doc/csound4/ictrl21.html
-share/doc/csound4/ictrl7.html
-share/doc/csound4/iexprand.html
-share/doc/csound4/if.html
-share/doc/csound4/igauss.html
-share/doc/csound4/igoto.html
-share/doc/csound4/ihold.html
-share/doc/csound4/ilinrand.html
-share/doc/csound4/images/adsr.png
-share/doc/csound4/images/caution.gif
-share/doc/csound4/images/flanger.png
-share/doc/csound4/images/flbutbank.png
-share/doc/csound4/images/flbutton.png
-share/doc/csound4/images/flcount.png
-share/doc/csound4/images/flknob_3d.png
-share/doc/csound4/images/flknob_clock.png
-share/doc/csound4/images/flknob_flat.png
-share/doc/csound4/images/flknob_pie.png
-share/doc/csound4/images/flpack.png
-share/doc/csound4/images/flpanel.png
-share/doc/csound4/images/flroller.png
-share/doc/csound4/images/flscroll.png
-share/doc/csound4/images/flslider_horizontal-engraved.png
-share/doc/csound4/images/flslider_horizontal-fill.png
-share/doc/csound4/images/flslider_horizontal-nice.png
-share/doc/csound4/images/fltabs.png
-share/doc/csound4/images/fltabs_joysticks-tab.png
-share/doc/csound4/images/fltabs_rollers-tab.png
-share/doc/csound4/images/fltabs_sliders-tab.png
-share/doc/csound4/images/fltext.png
-share/doc/csound4/images/gen01.png
-share/doc/csound4/images/gen02.png
-share/doc/csound4/images/gen03.png
-share/doc/csound4/images/gen05.png
-share/doc/csound4/images/gen06.png
-share/doc/csound4/images/gen07.png
-share/doc/csound4/images/gen08.png
-share/doc/csound4/images/gen09.png
-share/doc/csound4/images/gen09square.png
-share/doc/csound4/images/gen10.png
-share/doc/csound4/images/gen11.png
-share/doc/csound4/images/gen12.png
-share/doc/csound4/images/gen13.png
-share/doc/csound4/images/gen14.png
-share/doc/csound4/images/gen19.png
-share/doc/csound4/images/grain2_rand-448x289.png
-share/doc/csound4/images/grain3_2.png
-share/doc/csound4/images/home.gif
-share/doc/csound4/images/image1.png
-share/doc/csound4/images/image2.png
-share/doc/csound4/images/image3.png
-share/doc/csound4/images/image4.png
-share/doc/csound4/images/image5.png
-share/doc/csound4/images/image6.png
-share/doc/csound4/images/image7.png
-share/doc/csound4/images/image8.png
-share/doc/csound4/images/imode1.png
-share/doc/csound4/images/imode2.png
-share/doc/csound4/images/imode3.png
-share/doc/csound4/images/important.gif
-share/doc/csound4/images/next.gif
-share/doc/csound4/images/note.gif
-share/doc/csound4/images/prev.gif
-share/doc/csound4/images/rnd31_rand.png
-share/doc/csound4/images/sfr2.png
-share/doc/csound4/images/symbols.png
-share/doc/csound4/images/tip.gif
-share/doc/csound4/images/toc-blank.gif
-share/doc/csound4/images/toc-minus.gif
-share/doc/csound4/images/toc-plus.gif
-share/doc/csound4/images/up.gif
-share/doc/csound4/images/warning.gif
-share/doc/csound4/images/wguide1.png
-share/doc/csound4/images/wguide2.png
-share/doc/csound4/imidic14.html
-share/doc/csound4/imidic21.html
-share/doc/csound4/imidic7.html
-share/doc/csound4/in.html
-share/doc/csound4/in32.html
-share/doc/csound4/inch.html
-share/doc/csound4/include.html
-share/doc/csound4/index.html
-share/doc/csound4/inh.html
-share/doc/csound4/init.html
-share/doc/csound4/initc14.html
-share/doc/csound4/initc21.html
-share/doc/csound4/initc7.html
-share/doc/csound4/ink.html
-share/doc/csound4/ino.html
-share/doc/csound4/inq.html
-share/doc/csound4/ins.html
-share/doc/csound4/instimek.html
-share/doc/csound4/instimes.html
-share/doc/csound4/instr.html
-share/doc/csound4/int.html
-share/doc/csound4/integ.html
-share/doc/csound4/interp.html
-share/doc/csound4/introinstall.html
-share/doc/csound4/introlist.html
-share/doc/csound4/introtop.html
-share/doc/csound4/invalue.html
-share/doc/csound4/inx.html
-share/doc/csound4/inz.html
-share/doc/csound4/ioff.html
-share/doc/csound4/ion.html
-share/doc/csound4/iondur.html
-share/doc/csound4/iondur2.html
-share/doc/csound4/ioutat.html
-share/doc/csound4/ioutc.html
-share/doc/csound4/ioutc14.html
-share/doc/csound4/ioutpat.html
-share/doc/csound4/ioutpb.html
-share/doc/csound4/ioutpc.html
-share/doc/csound4/ipcauchy.html
-share/doc/csound4/ipoisson.html
-share/doc/csound4/ipow.html
-share/doc/csound4/is16b14.html
-share/doc/csound4/is32b14.html
-share/doc/csound4/islider16.html
-share/doc/csound4/islider32.html
-share/doc/csound4/islider64.html
-share/doc/csound4/islider8.html
-share/doc/csound4/itablecopy.html
-share/doc/csound4/itablegpw.html
-share/doc/csound4/itablemix.html
-share/doc/csound4/itablew.html
-share/doc/csound4/itrirand.html
-share/doc/csound4/iunirand.html
-share/doc/csound4/iweibull.html
-share/doc/csound4/jitter.html
-share/doc/csound4/jitter2.html
-share/doc/csound4/jspline.html
-share/doc/csound4/kbetarand.html
-share/doc/csound4/kbexprnd.html
-share/doc/csound4/kcauchy.html
-share/doc/csound4/kdump.html
-share/doc/csound4/kdump2.html
-share/doc/csound4/kdump3.html
-share/doc/csound4/kdump4.html
-share/doc/csound4/kexprand.html
-share/doc/csound4/kfilter2.html
-share/doc/csound4/kgauss.html
-share/doc/csound4/kgoto.html
-share/doc/csound4/klinrand.html
-share/doc/csound4/kon.html
-share/doc/csound4/koutat.html
-share/doc/csound4/koutc.html
-share/doc/csound4/koutc14.html
-share/doc/csound4/koutpat.html
-share/doc/csound4/koutpb.html
-share/doc/csound4/koutpc.html
-share/doc/csound4/kpcauchy.html
-share/doc/csound4/kpoisson.html
-share/doc/csound4/kpow.html
-share/doc/csound4/kr.html
-share/doc/csound4/kread.html
-share/doc/csound4/kread2.html
-share/doc/csound4/kread3.html
-share/doc/csound4/kread4.html
-share/doc/csound4/ksmps.html
-share/doc/csound4/ktableseg.html
-share/doc/csound4/ktrirand.html
-share/doc/csound4/kunirand.html
-share/doc/csound4/kweibull.html
-share/doc/csound4/lessequal.html
-share/doc/csound4/lessthan.html
-share/doc/csound4/lfo.html
-share/doc/csound4/limit.html
-share/doc/csound4/line.html
-share/doc/csound4/linen.html
-share/doc/csound4/linenr.html
-share/doc/csound4/lineto.html
-share/doc/csound4/linrand.html
-share/doc/csound4/linseg.html
-share/doc/csound4/linsegr.html
-share/doc/csound4/locsend.html
-share/doc/csound4/locsig.html
-share/doc/csound4/log.html
-share/doc/csound4/log10.html
-share/doc/csound4/logbtwo.html
-share/doc/csound4/loopseg.html
-share/doc/csound4/lorenz.html
-share/doc/csound4/loscil.html
-share/doc/csound4/loscil3.html
-share/doc/csound4/lowpass2.html
-share/doc/csound4/lowres.html
-share/doc/csound4/lowresx.html
-share/doc/csound4/lpanal.html
-share/doc/csound4/lpf18.html
-share/doc/csound4/lpfreson.html
-share/doc/csound4/lphasor.html
-share/doc/csound4/lpinterp.html
-share/doc/csound4/lposcil.html
-share/doc/csound4/lposcil3.html
-share/doc/csound4/lpread.html
-share/doc/csound4/lpreson.html
-share/doc/csound4/lpshold.html
-share/doc/csound4/lpslot.html
-share/doc/csound4/m.html
-share/doc/csound4/mac.html
-share/doc/csound4/maca.html
-share/doc/csound4/madsr.html
-share/doc/csound4/mandol.html
-share/doc/csound4/marimba.html
-share/doc/csound4/massign.html
-share/doc/csound4/mathartlogic.html
-share/doc/csound4/mathmatfunc.html
-share/doc/csound4/mathopeqfunc.html
-share/doc/csound4/mathrndfunc.html
-share/doc/csound4/mathtop.html
-share/doc/csound4/mathtrig.html
-share/doc/csound4/maxalloc.html
-share/doc/csound4/mclock.html
-share/doc/csound4/mdelay.html
-share/doc/csound4/midic14.html
-share/doc/csound4/midic21.html
-share/doc/csound4/midic7.html
-share/doc/csound4/midichannelaftertouch.html
-share/doc/csound4/midichn.html
-share/doc/csound4/midicontrolchange.html
-share/doc/csound4/midiconvert.html
-share/doc/csound4/midictrl.html
-share/doc/csound4/mididefault.html
-share/doc/csound4/midiextender.html
-share/doc/csound4/midigeneric.html
-share/doc/csound4/midiin.html
-share/doc/csound4/midinoteoff.html
-share/doc/csound4/midinoteoncps.html
-share/doc/csound4/midinoteonkey.html
-share/doc/csound4/midinoteonoct.html
-share/doc/csound4/midinoteonpch.html
-share/doc/csound4/midion.html
-share/doc/csound4/midion2.html
-share/doc/csound4/midionoff.html
-share/doc/csound4/midiout.html
-share/doc/csound4/midioutput.html
-share/doc/csound4/midipitchbend.html
-share/doc/csound4/midipolyaftertouch.html
-share/doc/csound4/midiprogramchange.html
-share/doc/csound4/midirealtime.html
-share/doc/csound4/midislidrbk.html
-share/doc/csound4/miditop.html
-share/doc/csound4/mirror.html
-share/doc/csound4/miscamp.html
-share/doc/csound4/misccsound64.html
-share/doc/csound4/miscformants.html
-share/doc/csound4/miscpitch.html
-share/doc/csound4/miscquickref.html
-share/doc/csound4/miscsf2.html
-share/doc/csound4/miscwindows.html
-share/doc/csound4/modulus.html
-share/doc/csound4/moog.html
-share/doc/csound4/moogvcf.html
-share/doc/csound4/moscil.html
-share/doc/csound4/mpulse.html
-share/doc/csound4/mrtmsg.html
-share/doc/csound4/mult.html
-share/doc/csound4/multiplies.html
-share/doc/csound4/multitap.html
-share/doc/csound4/mute.html
-share/doc/csound4/mxadsr.html
-share/doc/csound4/n.html
-share/doc/csound4/nchnls.html
-share/doc/csound4/nestedap.html
-share/doc/csound4/news.txt
-share/doc/csound4/nlfilt.html
-share/doc/csound4/noise.html
-share/doc/csound4/noteoff.html
-share/doc/csound4/noteon.html
-share/doc/csound4/noteondur.html
-share/doc/csound4/noteondur2.html
-share/doc/csound4/notequal.html
-share/doc/csound4/notnum.html
-share/doc/csound4/nreverb.html
-share/doc/csound4/nrpn.html
-share/doc/csound4/nsamp.html
-share/doc/csound4/nstrnum.html
-share/doc/csound4/ntrpol.html
-share/doc/csound4/octave.html
-share/doc/csound4/octcps.html
-share/doc/csound4/octmidi.html
-share/doc/csound4/octmidib.html
-share/doc/csound4/octpch.html
-share/doc/csound4/opa.html
-share/doc/csound4/opand.html
-share/doc/csound4/opcode.html
-share/doc/csound4/opcodestop.html
-share/doc/csound4/opi.html
-share/doc/csound4/opor.html
-share/doc/csound4/orchexpress.html
-share/doc/csound4/orchheader.html
-share/doc/csound4/orchiblock.html
-share/doc/csound4/orchkvar.html
-share/doc/csound4/orchnomen.html
-share/doc/csound4/orchstatemnt.html
-share/doc/csound4/orchtop.html
-share/doc/csound4/orchvarinit.html
-share/doc/csound4/oscbnk.html
-share/doc/csound4/oscil.html
-share/doc/csound4/oscil1.html
-share/doc/csound4/oscil1i.html
-share/doc/csound4/oscil3.html
-share/doc/csound4/oscili.html
-share/doc/csound4/oscilikt.html
-share/doc/csound4/osciliktp.html
-share/doc/csound4/oscilikts.html
-share/doc/csound4/osciln.html
-share/doc/csound4/oscils.html
-share/doc/csound4/oscilx.html
-share/doc/csound4/out.html
-share/doc/csound4/out32.html
-share/doc/csound4/outc.html
-share/doc/csound4/outch.html
-share/doc/csound4/outh.html
-share/doc/csound4/outiat.html
-share/doc/csound4/outic.html
-share/doc/csound4/outic14.html
-share/doc/csound4/outipat.html
-share/doc/csound4/outipb.html
-share/doc/csound4/outipc.html
-share/doc/csound4/outk.html
-share/doc/csound4/outkat.html
-share/doc/csound4/outkc.html
-share/doc/csound4/outkc14.html
-share/doc/csound4/outkpat.html
-share/doc/csound4/outkpb.html
-share/doc/csound4/outkpc.html
-share/doc/csound4/outo.html
-share/doc/csound4/outq.html
-share/doc/csound4/outq1.html
-share/doc/csound4/outq2.html
-share/doc/csound4/outq3.html
-share/doc/csound4/outq4.html
-share/doc/csound4/outs.html
-share/doc/csound4/outs1.html
-share/doc/csound4/outs2.html
-share/doc/csound4/outvalue.html
-share/doc/csound4/outx.html
-share/doc/csound4/outz.html
-share/doc/csound4/p.html
-share/doc/csound4/pan.html
-share/doc/csound4/pareq.html
-share/doc/csound4/partoverview.html
-share/doc/csound4/partreference.html
-share/doc/csound4/pcauchy.html
-share/doc/csound4/pchbend.html
-share/doc/csound4/pchmidi.html
-share/doc/csound4/pchmidib.html
-share/doc/csound4/pchoct.html
-share/doc/csound4/peak.html
-share/doc/csound4/peakk.html
-share/doc/csound4/pgmassign.html
-share/doc/csound4/phaser1.html
-share/doc/csound4/phaser2.html
-share/doc/csound4/phasor.html
-share/doc/csound4/phasorbnk.html
-share/doc/csound4/pinkish.html
-share/doc/csound4/pitch.html
-share/doc/csound4/pitchamdf.html
-share/doc/csound4/pitchtop.html
-share/doc/csound4/pitchtuning.html
-share/doc/csound4/planet.html
-share/doc/csound4/pluck.html
-share/doc/csound4/poisson.html
-share/doc/csound4/polyaft.html
-share/doc/csound4/port.html
-share/doc/csound4/portk.html
-share/doc/csound4/poscil.html
-share/doc/csound4/poscil3.html
-share/doc/csound4/pow.html
-share/doc/csound4/powoftwo.html
-share/doc/csound4/prealloc.html
-share/doc/csound4/prefaceacknowledgements.html
-share/doc/csound4/prefacecopy.html
-share/doc/csound4/prefacecsoundav.html
-share/doc/csound4/prefacename.html
-share/doc/csound4/prefacescope.html
-share/doc/csound4/prefacetop.html
-share/doc/csound4/print.html
-share/doc/csound4/printk.html
-share/doc/csound4/printk2.html
-share/doc/csound4/printks.html
-share/doc/csound4/prints.html
-share/doc/csound4/product.html
-share/doc/csound4/pset.html
-share/doc/csound4/pvadd.html
-share/doc/csound4/pvanal.html
-share/doc/csound4/pvbufread.html
-share/doc/csound4/pvcross.html
-share/doc/csound4/pvinterp.html
-share/doc/csound4/pvlook.html
-share/doc/csound4/pvoc.html
-share/doc/csound4/pvread.html
-share/doc/csound4/pvsadsyn.html
-share/doc/csound4/pvsanal.html
-share/doc/csound4/pvscross.html
-share/doc/csound4/pvsfread.html
-share/doc/csound4/pvsftr.html
-share/doc/csound4/pvsftw.html
-share/doc/csound4/pvsinfo.html
-share/doc/csound4/pvsmaska.html
-share/doc/csound4/pvsynth.html
-share/doc/csound4/q.html
-share/doc/csound4/r.html
-share/doc/csound4/raises.html
-share/doc/csound4/rand.html
-share/doc/csound4/randh.html
-share/doc/csound4/randi.html
-share/doc/csound4/random.html
-share/doc/csound4/randomh.html
-share/doc/csound4/randomi.html
-share/doc/csound4/readclock.html
-share/doc/csound4/readk.html
-share/doc/csound4/readk2.html
-share/doc/csound4/readk3.html
-share/doc/csound4/readk4.html
-share/doc/csound4/reinit.html
-share/doc/csound4/release.html
-share/doc/csound4/repluck.html
-share/doc/csound4/reson.html
-share/doc/csound4/resonk.html
-share/doc/csound4/resonr.html
-share/doc/csound4/resonx.html
-share/doc/csound4/resony.html
-share/doc/csound4/resonz.html
-share/doc/csound4/reverb.html
-share/doc/csound4/reverb2.html
-share/doc/csound4/rezzy.html
-share/doc/csound4/rigoto.html
-share/doc/csound4/rireturn.html
-share/doc/csound4/rms.html
-share/doc/csound4/rnd.html
-share/doc/csound4/rnd31.html
-share/doc/csound4/rspline.html
-share/doc/csound4/rtclock.html
-share/doc/csound4/s.html
-share/doc/csound4/s16b14.html
-share/doc/csound4/s32b14.html
-share/doc/csound4/samphold.html
-share/doc/csound4/sandpaper.html
-share/doc/csound4/scanhammer.html
-share/doc/csound4/scans.html
-share/doc/csound4/scantable.html
-share/doc/csound4/scanu.html
-share/doc/csound4/schedkwhen.html
-share/doc/csound4/schedkwhennamed.html
-share/doc/csound4/schedule.html
-share/doc/csound4/schedwhen.html
-share/doc/csound4/scoreampgen.html
-share/doc/csound4/scoreeval.html
-share/doc/csound4/scorefilegen.html
-share/doc/csound4/scoregenref.html
-share/doc/csound4/scoregenstop.html
-share/doc/csound4/scoremacros.html
-share/doc/csound4/scoremixgen.html
-share/doc/csound4/scorenextp.html
-share/doc/csound4/scorenumgen.html
-share/doc/csound4/scoreramping.html
-share/doc/csound4/scorerandgen.html
-share/doc/csound4/scoreseggen.html
-share/doc/csound4/scoresinegen.html
-share/doc/csound4/scorestatements.html
-share/doc/csound4/scoretop.html
-share/doc/csound4/scorewavegen.html
-share/doc/csound4/scorewingen.html
-share/doc/csound4/sdif2ad.html
-share/doc/csound4/seed.html
-share/doc/csound4/sekere.html
-share/doc/csound4/semitone.html
-share/doc/csound4/sense.html
-share/doc/csound4/sensekey.html
-share/doc/csound4/seqtime.html
-share/doc/csound4/setctrl.html
-share/doc/csound4/setksmps.html
-share/doc/csound4/sfilist.html
-share/doc/csound4/sfinstr.html
-share/doc/csound4/sfinstr3.html
-share/doc/csound4/sfinstr3m.html
-share/doc/csound4/sfinstrm.html
-share/doc/csound4/sfload.html
-share/doc/csound4/sfpassign.html
-share/doc/csound4/sfplay.html
-share/doc/csound4/sfplay3.html
-share/doc/csound4/sfplay3m.html
-share/doc/csound4/sfplaym.html
-share/doc/csound4/sfplist.html
-share/doc/csound4/sfpreset.html
-share/doc/csound4/shaker.html
-share/doc/csound4/siggenbasic.html
-share/doc/csound4/siggendynamic.html
-share/doc/csound4/siggenfmsynth.html
-share/doc/csound4/siggengranular.html
-share/doc/csound4/siggenlineexp.html
-share/doc/csound4/siggenlpcresyn.html
-share/doc/csound4/siggenmodels.html
-share/doc/csound4/siggennoise.html
-share/doc/csound4/siggenphasors.html
-share/doc/csound4/siggensample.html
-share/doc/csound4/siggenscantop.html
-share/doc/csound4/siggenstft.html
-share/doc/csound4/siggentableacc.html
-share/doc/csound4/siggentop.html
-share/doc/csound4/siggenwaveterr.html
-share/doc/csound4/siggenwavguide.html
-share/doc/csound4/sigioinput.html
-share/doc/csound4/sigiooutput.html
-share/doc/csound4/sigiopdisplay.html
-share/doc/csound4/sigioqueries.html
-share/doc/csound4/sigiotop.html
-share/doc/csound4/sigmodconmorph.html
-share/doc/csound4/sigmoddelay.html
-share/doc/csound4/sigmodenvelope.html
-share/doc/csound4/sigmodpanspatl.html
-share/doc/csound4/sigmodreverbtn.html
-share/doc/csound4/sigmodsample.html
-share/doc/csound4/sigmodsiglimit.html
-share/doc/csound4/sigmodspeciale.html
-share/doc/csound4/sigmodspeciali.html
-share/doc/csound4/sigmodstandard.html
-share/doc/csound4/sigmodtop.html
-share/doc/csound4/sigmodwavguide.html
-share/doc/csound4/sin.html
-share/doc/csound4/sinh.html
-share/doc/csound4/sininv.html
-share/doc/csound4/sleighbells.html
-share/doc/csound4/slider16.html
-share/doc/csound4/slider16f.html
-share/doc/csound4/slider32.html
-share/doc/csound4/slider32f.html
-share/doc/csound4/slider64.html
-share/doc/csound4/slider64f.html
-share/doc/csound4/slider8.html
-share/doc/csound4/slider8f.html
-share/doc/csound4/sndinfo.html
-share/doc/csound4/sndwarp.html
-share/doc/csound4/sndwarpst.html
-share/doc/csound4/soundin.html
-share/doc/csound4/soundout.html
-share/doc/csound4/space.html
-share/doc/csound4/spat3d.html
-share/doc/csound4/spat3di.html
-share/doc/csound4/spat3dt.html
-share/doc/csound4/spdist.html
-share/doc/csound4/specaddm.html
-share/doc/csound4/specdiff.html
-share/doc/csound4/specdisp.html
-share/doc/csound4/specfilt.html
-share/doc/csound4/spechist.html
-share/doc/csound4/specptrk.html
-share/doc/csound4/specscal.html
-share/doc/csound4/specsum.html
-share/doc/csound4/spectralrealtime.html
-share/doc/csound4/spectraltop.html
-share/doc/csound4/spectrum.html
-share/doc/csound4/spsend.html
-share/doc/csound4/sqrt.html
-share/doc/csound4/sr.html
-share/doc/csound4/srconv.html
-share/doc/csound4/stix.html
-share/doc/csound4/streson.html
-share/doc/csound4/strset.html
-share/doc/csound4/subinstr.html
-share/doc/csound4/subinstrinit.html
-share/doc/csound4/subtracts.html
-share/doc/csound4/sum.html
-share/doc/csound4/svfilter.html
-share/doc/csound4/t.html
-share/doc/csound4/table.html
-share/doc/csound4/table3.html
-share/doc/csound4/tablecopy.html
-share/doc/csound4/tablegpw.html
-share/doc/csound4/tablei.html
-share/doc/csound4/tableicopy.html
-share/doc/csound4/tableigpw.html
-share/doc/csound4/tableikt.html
-share/doc/csound4/tableimix.html
-share/doc/csound4/tableiw.html
-share/doc/csound4/tablekt.html
-share/doc/csound4/tablemix.html
-share/doc/csound4/tableng.html
-share/doc/csound4/tablera.html
-share/doc/csound4/tablereadwrit.html
-share/doc/csound4/tableseg.html
-share/doc/csound4/tableselect.html
-share/doc/csound4/tabletop.html
-share/doc/csound4/tablew.html
-share/doc/csound4/tablewa.html
-share/doc/csound4/tablewkt.html
-share/doc/csound4/tablexkt.html
-share/doc/csound4/tablexseg.html
-share/doc/csound4/tambourine.html
-share/doc/csound4/tan.html
-share/doc/csound4/tanh.html
-share/doc/csound4/taninv.html
-share/doc/csound4/taninv2.html
-share/doc/csound4/tbvcf.html
-share/doc/csound4/tempest.html
-share/doc/csound4/tempo.html
-share/doc/csound4/tempoval.html
-share/doc/csound4/tigoto.html
-share/doc/csound4/timeinstk.html
-share/doc/csound4/timeinsts.html
-share/doc/csound4/timek.html
-share/doc/csound4/times.html
-share/doc/csound4/timout.html
-share/doc/csound4/tival.html
-share/doc/csound4/tlineto.html
-share/doc/csound4/tone.html
-share/doc/csound4/tonek.html
-share/doc/csound4/tonex.html
-share/doc/csound4/transeg.html
-share/doc/csound4/trigger.html
-share/doc/csound4/trigseq.html
-share/doc/csound4/trirand.html
-share/doc/csound4/turnoff.html
-share/doc/csound4/turnon.html
-share/doc/csound4/undef.html
-share/doc/csound4/unirand.html
-share/doc/csound4/upsamp.html
-share/doc/csound4/urd.html
-share/doc/csound4/utilityanalysis.html
-share/doc/csound4/utilityconversion.html
-share/doc/csound4/utilitycredits.html
-share/doc/csound4/utilityqueries.html
-share/doc/csound4/utilitysoundfile.html
-share/doc/csound4/utilitytop.html
-share/doc/csound4/v.html
-share/doc/csound4/valpass.html
-share/doc/csound4/vbap16.html
-share/doc/csound4/vbap16move.html
-share/doc/csound4/vbap4.html
-share/doc/csound4/vbap4move.html
-share/doc/csound4/vbap8.html
-share/doc/csound4/vbap8move.html
-share/doc/csound4/vbaplsinit.html
-share/doc/csound4/vbapz.html
-share/doc/csound4/vbapzmove.html
-share/doc/csound4/vco.html
-share/doc/csound4/vco2.html
-share/doc/csound4/vco2ft.html
-share/doc/csound4/vco2ift.html
-share/doc/csound4/vco2init.html
-share/doc/csound4/vcomb.html
-share/doc/csound4/vdelay.html
-share/doc/csound4/vdelay3.html
-share/doc/csound4/vdelayx.html
-share/doc/csound4/vdelayxq.html
-share/doc/csound4/vdelayxs.html
-share/doc/csound4/vdelayxw.html
-share/doc/csound4/vdelayxwq.html
-share/doc/csound4/vdelayxws.html
-share/doc/csound4/veloc.html
-share/doc/csound4/vibes.html
-share/doc/csound4/vibr.html
-share/doc/csound4/vibrato.html
-share/doc/csound4/vincr.html
-share/doc/csound4/vlowres.html
-share/doc/csound4/voice.html
-share/doc/csound4/vpvoc.html
-share/doc/csound4/waveset.html
-share/doc/csound4/weibull.html
-share/doc/csound4/wgbow.html
-share/doc/csound4/wgbowedbar.html
-share/doc/csound4/wgbrass.html
-share/doc/csound4/wgclar.html
-share/doc/csound4/wgflute.html
-share/doc/csound4/wgpluck.html
-share/doc/csound4/wgpluck2.html
-share/doc/csound4/wguide1.html
-share/doc/csound4/wguide2.html
-share/doc/csound4/wrap.html
-share/doc/csound4/wterrain.html
-share/doc/csound4/x.html
-share/doc/csound4/xadsr.html
-share/doc/csound4/xin.html
-share/doc/csound4/xout.html
-share/doc/csound4/xscanmap.html
-share/doc/csound4/xscans.html
-share/doc/csound4/xscansmap.html
-share/doc/csound4/xscanu.html
-share/doc/csound4/xtratim.html
-share/doc/csound4/xyin.html
-share/doc/csound4/zacl.html
-share/doc/csound4/zakinit.html
-share/doc/csound4/zaktop.html
-share/doc/csound4/zamod.html
-share/doc/csound4/zar.html
-share/doc/csound4/zarg.html
-share/doc/csound4/zaw.html
-share/doc/csound4/zawm.html
-share/doc/csound4/zerodbfs.html
-share/doc/csound4/zfilter2.html
-share/doc/csound4/zir.html
-share/doc/csound4/ziw.html
-share/doc/csound4/ziwm.html
-share/doc/csound4/zkcl.html
-share/doc/csound4/zkmod.html
-share/doc/csound4/zkr.html
-share/doc/csound4/zkw.html
-share/doc/csound4/zkwm.html
-share/examples/csound4
-@dirrm share/doc/csound4/examples
-@dirrm share/doc/csound4/images
-@dirrm share/doc/csound4
diff --git a/audio/csound4-manual/distinfo b/audio/csound4-manual/distinfo
deleted file mode 100644
index 6e2c830a5a1..00000000000
--- a/audio/csound4-manual/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/05/21 23:08:19 ben Exp $
-
-SHA1 (csound4-manual-4.23/manual-html-4.23.tar.gz) = 114c4155ae5de4260827f7f0d9342c3b200a171f
-RMD160 (csound4-manual-4.23/manual-html-4.23.tar.gz) = 47008c7bd4437ddfd7739f1795a631bc94234d5b
-Size (csound4-manual-4.23/manual-html-4.23.tar.gz) = 1762467 bytes
diff --git a/audio/csound4-manual/files/rt-midi-input.orc b/audio/csound4-manual/files/rt-midi-input.orc
deleted file mode 100644
index 57d12052c0a..00000000000
--- a/audio/csound4-manual/files/rt-midi-input.orc
+++ /dev/null
@@ -1,23 +0,0 @@
-# use: csound -o /dev/sound -M /dev/rmidi1 rt-midi-input.orc rt-midi-input.sco
-#
-# you may need to use /dev/rmidi0 instead
-
-instr 1
-inum notnum ; note number
-kfreq cpsmidib ; MIDI to frequency
-iamp ampmidi inum*100 ; MIDI to amplitude
- ; (scaled within range)
-if inum > 60 goto fun1 ; if the MIDI note number
- ; is over 60...
-if inum < 61 goto fun2 ; if the note number is
- ; less than 61...
-fun1:
-ifn = 1
- goto contin
-fun2:
-ifn = 2
- goto contin
-contin:
-asig oscil iamp,kfreq,ifn
- out asig
- endin
diff --git a/audio/csound4-manual/files/rt-midi-input.sco b/audio/csound4-manual/files/rt-midi-input.sco
deleted file mode 100644
index d6a9ce2ec36..00000000000
--- a/audio/csound4-manual/files/rt-midi-input.sco
+++ /dev/null
@@ -1,4 +0,0 @@
-f1 0 8192 10 1 ; sine wave
-f2 0 8192 10 1 .9 .8 .7 .6 .5 .4 .3 .2 .1 ; ramp wave
-f0 10000
-e
diff --git a/audio/csound4/DESCR b/audio/csound4/DESCR
deleted file mode 100644
index 909beaee389..00000000000
--- a/audio/csound4/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Csound is a software synthesis package in the tradition of so-called
-music-N languages, among which the best-known is Music V. It consists
-of an orchestra- and score-driven executable, written in C for
-portability. Since Csound is a computational language, it is highly
-flexible and efficient; complexity is gained only at the expense of
-computation time. Basically Csound reads some files and creates the
-result as a file on disk or, on faster machines, through a DAC in real
-time.
diff --git a/audio/csound4/Makefile b/audio/csound4/Makefile
deleted file mode 100644
index 62e67c4cb24..00000000000
--- a/audio/csound4/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2006/12/15 14:34:19 wiz Exp $
-#
-
-DISTNAME= csound-4.23f13gbs.0
-PKGNAME= csound4-4.23.13.0
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=csound/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://sourceforge.net/projects/csound/
-COMMENT= Software synthesizer and sequencer
-
-DIST_SUBDIR= csound
-CONFLICTS+= csound-bath-4*
-CONFLICTS+= csound-dev-4*
-USE_LANGUAGES= c c++
-USE_TOOLS+= gmake makeinfo
-GNU_CONFIGURE= yes
-TEXINFO_REQD= 4.2
-CONFIGURE_ARGS+= --enable-debug
-CONFIGURE_ARGS+= --bindir=${PREFIX}/lib/csound4
-CFLAGS+= -g
-INFO_FILES= # PLIST
-
-NOT_FOR_PLATFORM= *-*-alpha *-*-sparc64 # Severe LP64 problems
-
-post-install:
- cd ${PREFIX} && ${LN} -s ../lib/csound4/csound bin/csound4
-
-.include "../../x11/fltk/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/csound4/PLIST b/audio/csound4/PLIST
deleted file mode 100644
index 35da6b556e9..00000000000
--- a/audio/csound4/PLIST
+++ /dev/null
@@ -1,55 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2006/05/21 22:29:09 ben Exp $
-bin/csound4
-lib/csound4/csound
-lib/csound4/csound-config
-lib/csound4/cvanal
-lib/csound4/dnoise
-lib/csound4/envext
-lib/csound4/extract
-lib/csound4/extractor
-lib/csound4/flcsound
-lib/csound4/het_export
-lib/csound4/het_import
-lib/csound4/hetro
-lib/csound4/lpanal
-lib/csound4/lpc_export
-lib/csound4/mixer
-lib/csound4/pv_export
-lib/csound4/pv_import
-lib/csound4/pvanal
-lib/csound4/pvlook
-lib/csound4/scale
-lib/csound4/scot
-lib/csound4/scsort
-lib/csound4/sdif2ad
-lib/csound4/sndinfo
-lib/csound4/srconv
-include/csound4/OpcodeBase.hpp
-include/csound4/autoheader.h
-include/csound4/config.h
-include/csound4/cs.h
-include/csound4/cscore.h
-include/csound4/csound.h
-include/csound4/cwindow.h
-include/csound4/midiops.h
-include/csound4/midiops2.h
-include/csound4/opcode.h
-include/csound4/prototyp.h
-include/csound4/sort.h
-include/csound4/sysdep.h
-include/csound4/text.h
-include/csound4/version.h
-info/csoundgbs.info
-lib/csound4/gabops.la
-lib/csound4/metro.la
-lib/csound4/newfils.la
-lib/csound4/syncgrain.la
-lib/csound4/vectorial.la
-lib/csound4/libcscore.a
-lib/csound4/libcsound.la
-share/csound4/csound.xmg
-share/csound4/csoundgbs.html
-share/csound4/flcsound.html
-@dirrm share/csound4
-@dirrm lib/csound4
-@dirrm include/csound4
diff --git a/audio/csound4/distinfo b/audio/csound4/distinfo
deleted file mode 100644
index 4b5a3ee605c..00000000000
--- a/audio/csound4/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: distinfo,v 1.9 2006/05/21 22:29:09 ben Exp $
-
-SHA1 (csound/csound-4.23f13gbs.0.tar.gz) = 2f86efb6e53f43cd16a6cfb0ff9a0786982f7af9
-RMD160 (csound/csound-4.23f13gbs.0.tar.gz) = 46e161975afbf68f5591842e2921ea1822df30b2
-Size (csound/csound-4.23f13gbs.0.tar.gz) = 1676345 bytes
-SHA1 (patch-aa) = ec2b962f512bbb93aa6255dff0efa4d93aa035a8
-SHA1 (patch-ab) = 49e1780581c8aecd4962e7f05d573671576cfe42
-SHA1 (patch-ac) = fc9dd07c754e330d23f13233116852add9e8a633
-SHA1 (patch-ad) = 3b1301614e80c9ace2a39c8385162bb8896f6c27
-SHA1 (patch-ae) = c4d1d57ffdcf6b091253d6e4523bdc8ff7f955f7
-SHA1 (patch-af) = dfb30631b332da5c2557cc8e2ef18679d12697d5
-SHA1 (patch-ag) = a3563963001e7b1fe9081e3137fdfc35c8ea953b
-SHA1 (patch-ah) = 4bd7cc1935be17c4d4629d1b59e93c9836868a04
-SHA1 (patch-ai) = b53a6e8fdb4cb53dd07ab122023f0bf291c350d3
-SHA1 (patch-aj) = fa3c05b0c5e24775d5c05838177fcec943809b35
diff --git a/audio/csound4/patches/patch-aa b/audio/csound4/patches/patch-aa
deleted file mode 100644
index d750a000e71..00000000000
--- a/audio/csound4/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/10/04 19:23:39 joerg Exp $
-
---- csound/main.c.orig 2005-07-22 18:16:01.000000000 +0000
-+++ csound/main.c
-@@ -149,7 +149,7 @@ void set_rt_priority(int argc, char **ar
-
- #endif
-
--#if !defined(LINUX) && !defined(SGI) && !defined(__BEOS__) && !defined(__MACH__) && !defined(NETBSD)
-+#if !defined(LINUX) && !defined(SGI) && !defined(__BEOS__) && !defined(__MACH__) && !defined(NETBSD) && !defined(__DragonFly__)
- static char *signal_to_string(int sig)
- {
- switch(sig) {
diff --git a/audio/csound4/patches/patch-ab b/audio/csound4/patches/patch-ab
deleted file mode 100644
index ee55850fb58..00000000000
--- a/audio/csound4/patches/patch-ab
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/10/04 19:23:39 joerg Exp $
-
---- csound/mididevice.c.orig 2005-07-22 18:27:05.000000000 +0000
-+++ csound/mididevice.c
-@@ -79,7 +79,7 @@ struct pollfd midipoll;
- # include <sgtty.h>
- # define INBAUD EXTB
- static struct sgttyb tty;
--#elif defined(LINUX) || defined(NETBSD) /* J. Mohr 1995 Oct 17 */
-+#elif defined(LINUX) || defined(NETBSD) || defined(__DragonFly__) /* J. Mohr 1995 Oct 17 */
- # include <sys/time.h>
- # include <unistd.h>
-
-@@ -366,7 +366,7 @@ void OpenMIDIDevice(void)
- /* allocate the message structure */
- in_msg = (msg_header_t *)mmalloc(MSG_SIZE_MAX);
- }
--#elif defined(LINUX) || defined(NETBSD)
-+#elif defined(LINUX) || defined(NETBSD) || defined(__DragonFly__)
- # ifdef HAVE_TERMIOS_H
- if (isatty(rtfd)) {
- if (tcgetattr(rtfd, &tty) < 0) {
-@@ -521,7 +521,7 @@ long GetMIDIData(void)
- #ifdef SGI /* for new SGI media library implementation*/
- int i, j;
- #endif
--#if defined(LINUX) || defined(NETBSD)
-+#if defined(LINUX) || defined(NETBSD) || defined(__DragonFly__)
- /* For select() call, from David Ratajczak */
- fd_set rfds;
- struct timeval tv;
-@@ -543,7 +543,7 @@ long GetMIDIData(void)
- return (long)n; /* JPff added 23 Jun 2004 */
- }
- else return(0) ;
--#elif defined(LINUX) || defined(NETBSD)
-+#elif defined(LINUX) || defined(NETBSD) || defined(__DragonFly__)
- /******** NEW STUFF **********/ /* from David Ratajczak */
- /* Use select() to make truly */
- /* non-blocking call to midi */
diff --git a/audio/csound4/patches/patch-ac b/audio/csound4/patches/patch-ac
deleted file mode 100644
index f01bec7245a..00000000000
--- a/audio/csound4/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/10/04 19:23:39 joerg Exp $
-
---- csound/sysdep.h.orig 2005-10-04 15:13:28.000000000 +0200
-+++ csound/sysdep.h
-@@ -38,7 +38,7 @@
- #define __FL_DEF
- #endif
-
--#if defined(LINUX) || defined(__MACH__) || defined(NETBSD)
-+#if defined(LINUX) || defined(__MACH__) || defined(NETBSD) || defined(__DragonFly__)
- # include <unistd.h> /* for open() etc protos on mac */
- #endif
-
diff --git a/audio/csound4/patches/patch-ad b/audio/csound4/patches/patch-ad
deleted file mode 100644
index 4dd65e34991..00000000000
--- a/audio/csound4/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/10/04 19:23:39 joerg Exp $
-
---- csound/linevent.c.orig 2005-07-22 18:36:59.000000000 +0000
-+++ csound/linevent.c
-@@ -42,7 +42,7 @@ extern int read(int, void*, unsigned);
- #endif
-
- #ifdef PIPES
--# if defined(SGI) || defined(LINUX) || defined(NeXT) || defined(__MACH__) || defined(NETBSD)
-+# if defined(SGI) || defined(LINUX) || defined(NeXT) || defined(__MACH__) || defined(NETBSD) || defined(__DragonFly__)
- # define _popen popen
- # define _pclose pclose
- # elif defined(__BEOS__)
diff --git a/audio/csound4/patches/patch-ae b/audio/csound4/patches/patch-ae
deleted file mode 100644
index 6cbb46509fc..00000000000
--- a/audio/csound4/patches/patch-ae
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/10/04 19:23:39 joerg Exp $
-
---- csound/soundio.c.orig 2005-07-22 18:43:26.000000000 +0000
-+++ csound/soundio.c
-@@ -24,7 +24,7 @@
- #include "cs.h" /* SOUNDIO.C */
- #include "soundio.h"
- #include <math.h>
--#if defined(LINUX) || defined(NETBSD) || defined(__MACH__)
-+#if defined(LINUX) || defined(NETBSD) || defined(__MACH__) || defined(__DragonFly__)
- #include <unistd.h>
- #endif
- #ifdef mills_macintosh
-@@ -102,7 +102,7 @@ extern int audiofd;
- #ifdef PIPES
- FILE* pin=NULL, *pout=NULL;
- /*sbrandon: added NeXT to line below*/
--# if defined(SGI) || defined(LINUX) || defined(__BEOS__) || defined(NeXT) || defined(__MACH__) || defined(NETBSD)
-+# if defined(SGI) || defined(LINUX) || defined(__BEOS__) || defined(NeXT) || defined(__MACH__) || defined(NETBSD) || defined(__DragonFly__)
- # define _popen popen
- # define _pclose pclose
- # endif
-@@ -238,7 +238,7 @@ static int audread(char *inbuf, int nbyt
- return(sreadin(isfd,inbuf,nbytes,p));
- }
-
--#if !defined(SYMANTEC) && !defined(mac_classic) && !defined(LINUX) && !defined(__BEOS__) && !defined(__MACH__) && !defined(NETBSD)
-+#if !defined(SYMANTEC) && !defined(mac_classic) && !defined(LINUX) && !defined(__BEOS__) && !defined(__MACH__) && !defined(NETBSD) && !defined(__DragonFly__)
- extern int write(int, const void*, unsigned int);
- #endif
-
diff --git a/audio/csound4/patches/patch-af b/audio/csound4/patches/patch-af
deleted file mode 100644
index 9ae33e79196..00000000000
--- a/audio/csound4/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/11/09 06:35:25 ben Exp $
-
---- csound/soundin.c.orig 2005-04-10 02:43:07.000000000 -0700
-+++ csound/soundin.c
-@@ -204,7 +204,7 @@ int sndgetset(SOUNDIN *p) /* core
- strsets[filno])
- strcpy(soundiname, strsets[filno]);
- else sprintf(soundiname,"soundin.%ld",filno); /* soundin.filno */
-- if ((int) *p->skipinit != 0) {
-+ if (p->skipinit != NULL && (int) *p->skipinit != 0) {
- if (strcmp(p->sfname,soundiname)) {
- printf("error: cannot tie to a new soundfile\n");
- return -1;
-@@ -909,7 +909,7 @@ void sndinset(SOUNDIN *p) /* init rou
- if (p->fdch.fd) { /* if file already open, close it */
- /* RWD: it is not safe to assume all compilers init this to 0 */
- /* (IV: but it is allocated with mcalloc...) */
-- if ((int) *p->skipinit == 0) {
-+ if (p->skipinit != NULL && (int) *p->skipinit == 0) {
- /* reload the file */
- reinit++; close(p->fdch.fd);
- }
diff --git a/audio/csound4/patches/patch-ag b/audio/csound4/patches/patch-ag
deleted file mode 100644
index e2cfccd32d4..00000000000
--- a/audio/csound4/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/11/09 06:35:25 ben Exp $
-
---- csound/diskin.c.orig 2005-03-16 09:08:15.000000000 -0800
-+++ csound/diskin.c
-@@ -267,7 +267,7 @@ void newsndinset(SOUNDINEW *p) /*
- /* should go in SOUNDINEW struct eventually */
- long snewbufsize = SNDINEWBUFSIZ;
-
-- if (*p->skipinit != FL(0.0)) return;
-+ if (p->skipinit != NULL && *p->skipinit != FL(0.0)) return;
- if (skiptime < 0) {
- warning(Str(X_1460,"negative skip time, substituting zero."));
- skiptime = FL(0.0);
diff --git a/audio/csound4/patches/patch-ah b/audio/csound4/patches/patch-ah
deleted file mode 100644
index 5eaf940825f..00000000000
--- a/audio/csound4/patches/patch-ah
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/05/21 22:29:09 ben Exp $
-
---- csound/Makefile.am.orig 2005-03-24 18:55:53.000000000 -0800
-+++ csound/Makefile.am
-@@ -1,10 +1,9 @@
- bin_SCRIPTS = csound-config
- bin_PROGRAMS = csound sdif2ad het_export het_import lpc_export \
- pv_export pv_import
--lib_LTLIBRARIES = libcsound.la
- pkglib_LTLIBRARIES = gabops.la metro.la newfils.la syncgrain.la \
--vectorial.la
--lib_LIBRARIES = libcscore.a
-+vectorial.la libcsound.la
-+pkglib_LIBRARIES = libcscore.a
- noinst_LIBRARIES = libanalutils.a
- noinst_PROGRAMS = makedb
- pkgdata_DATA = csound.xmg
diff --git a/audio/csound4/patches/patch-ai b/audio/csound4/patches/patch-ai
deleted file mode 100644
index 9379fc1233f..00000000000
--- a/audio/csound4/patches/patch-ai
+++ /dev/null
@@ -1,129 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/05/21 22:29:09 ben Exp $
-
---- csound/Makefile.in.orig 2005-05-20 15:11:23.000000000 -0700
-+++ csound/Makefile.in
-@@ -68,8 +68,8 @@ am__installdirs = "$(DESTDIR)$(libdir)"
- "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" \
- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)" \
- "$(DESTDIR)$(pkgincludedir)" "$(DESTDIR)$(pkgincludedir)"
--libLIBRARIES_INSTALL = $(INSTALL_DATA)
--LIBRARIES = $(lib_LIBRARIES) $(noinst_LIBRARIES)
-+pkglibLIBRARIES_INSTALL = $(INSTALL_DATA)
-+LIBRARIES = $(lib_LIBRARIES) $(noinst_LIBRARIES) $(pkglib_LIBRARIES)
- ARFLAGS = cru
- libanalutils_a_AR = $(AR) $(ARFLAGS)
- am_libanalutils_a_OBJECTS = libanalutils_a-aifc.$(OBJEXT) \
-@@ -401,11 +401,10 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- bin_SCRIPTS = csound-config
--lib_LTLIBRARIES = libcsound.la
- pkglib_LTLIBRARIES = gabops.la metro.la newfils.la syncgrain.la \
--vectorial.la
-+vectorial.la libcsound.la
-
--lib_LIBRARIES = libcscore.a
-+pkglib_LIBRARIES = libcscore.a
- noinst_LIBRARIES = libanalutils.a
- pkgdata_DATA = csound.xmg
- pkginclude_HEADERS = csound.h cwindow.h opcode.h sysdep.h autoheader.h \
-@@ -600,35 +599,35 @@ distclean-hdr:
- -rm -f config.h stamp-h1
- csound-config: $(top_builddir)/config.status $(srcdir)/csound-config.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
--install-libLIBRARIES: $(lib_LIBRARIES)
-+install-pkglibLIBRARIES: $(pkglib_LIBRARIES)
- @$(NORMAL_INSTALL)
-- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-- @list='$(lib_LIBRARIES)'; for p in $$list; do \
-+ test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
-+ @list='$(pkglib_LIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- f=$(am__strip_dir) \
-- echo " $(libLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-- $(libLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-+ echo " $(pkglibLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
-+ $(pkglibLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
- else :; fi; \
- done
- @$(POST_INSTALL)
-- @list='$(lib_LIBRARIES)'; for p in $$list; do \
-+ @list='$(pkglib_LIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- p=$(am__strip_dir) \
-- echo " $(RANLIB) '$(DESTDIR)$(libdir)/$$p'"; \
-- $(RANLIB) "$(DESTDIR)$(libdir)/$$p"; \
-+ echo " $(RANLIB) '$(DESTDIR)$(pkglibdir)/$$p'"; \
-+ $(RANLIB) "$(DESTDIR)$(pkglibdir)/$$p"; \
- else :; fi; \
- done
-
--uninstall-libLIBRARIES:
-+uninstall-pkglibLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(lib_LIBRARIES)'; for p in $$list; do \
-+ @list='$(pkglib_LIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
-- echo " rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-- rm -f "$(DESTDIR)$(libdir)/$$p"; \
-+ echo " rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
-+ rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
- done
-
- clean-libLIBRARIES:
-- -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
-+ -test -z "$(pkglib_LIBRARIES)" || rm -f $(pkglib_LIBRARIES)
-
- clean-noinstLIBRARIES:
- -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-@@ -3124,7 +3123,7 @@ maintainer-clean-generic:
- @echo "it deletes files that may require special tools to rebuild."
- clean: clean-am
-
--clean-am: clean-binPROGRAMS clean-generic clean-libLIBRARIES \
-+clean-am: clean-binPROGRAMS clean-generic clean-pkglibLIBRARIES \
- clean-libLTLIBRARIES clean-libtool clean-noinstLIBRARIES \
- clean-noinstPROGRAMS clean-pkglibLTLIBRARIES mostlyclean-am
-
-@@ -3148,7 +3147,7 @@ install-data-am: install-nodist_pkginclu
- install-pkgincludeHEADERS
-
- install-exec-am: install-binPROGRAMS install-binSCRIPTS \
-- install-libLIBRARIES install-libLTLIBRARIES \
-+ install-pkglibLIBRARIES install-libLTLIBRARIES \
- install-pkglibLTLIBRARIES
-
- install-info: install-info-am
-@@ -3176,20 +3175,20 @@ ps: ps-am
- ps-am:
-
- uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
-- uninstall-info-am uninstall-libLIBRARIES \
-+ uninstall-info-am uninstall-pkglibLIBRARIES \
- uninstall-libLTLIBRARIES uninstall-nodist_pkgincludeHEADERS \
- uninstall-pkgdataDATA uninstall-pkgincludeHEADERS \
- uninstall-pkglibLTLIBRARIES
-
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-- clean-generic clean-libLIBRARIES clean-libLTLIBRARIES \
-+ clean-generic clean-pkglibLIBRARIES clean-libLTLIBRARIES \
- clean-libtool clean-noinstLIBRARIES clean-noinstPROGRAMS \
- clean-pkglibLTLIBRARIES ctags distclean distclean-compile \
- distclean-generic distclean-hdr distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-binPROGRAMS install-binSCRIPTS \
- install-data install-data-am install-exec install-exec-am \
-- install-info install-info-am install-libLIBRARIES \
-+ install-info install-info-am install-pkglibLIBRARIES \
- install-libLTLIBRARIES install-man \
- install-nodist_pkgincludeHEADERS install-pkgdataDATA \
- install-pkgincludeHEADERS install-pkglibLTLIBRARIES \
-@@ -3198,7 +3197,7 @@ uninstall-am: uninstall-binPROGRAMS unin
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-info-am \
-- uninstall-libLIBRARIES uninstall-libLTLIBRARIES \
-+ uninstall-pkglibLIBRARIES uninstall-libLTLIBRARIES \
- uninstall-nodist_pkgincludeHEADERS uninstall-pkgdataDATA \
- uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES
-
diff --git a/audio/csound4/patches/patch-aj b/audio/csound4/patches/patch-aj
deleted file mode 100644
index 692d7d5bac8..00000000000
--- a/audio/csound4/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2006/05/21 22:29:09 ben Exp $
-
---- configure.orig 2006-05-20 10:58:05.000000000 -0700
-+++ configure
-@@ -1849,7 +1849,7 @@ fi
-
-
- # Define the identity of the package.
-- PACKAGE='csound'
-+ PACKAGE='csound4'
- VERSION='4.23f13gbs.0'
-
-
diff --git a/audio/csound5-manual/DESCR b/audio/csound5-manual/DESCR
deleted file mode 100644
index 0f3943a6a16..00000000000
--- a/audio/csound5-manual/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Csound5 manual in HTML format.
diff --git a/audio/csound5-manual/Makefile b/audio/csound5-manual/Makefile
deleted file mode 100644
index 4e91cb55ddf..00000000000
--- a/audio/csound5-manual/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2006/12/15 14:34:19 wiz Exp $
-#
-
-DISTNAME= Csound${CSOUND_VERSION}_manual_html
-PKGNAME= csound5-manual-${CSOUND_VERSION}
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=csound/}
-EXTRACT_SUFX= .zip
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.csounds.com/
-COMMENT= Csound5 Reference Manual
-
-CSOUND_VERSION= 5.01
-NO_BUILD= yes
-WRKSRC= ${WRKDIR}/html
-DIST_SUBDIR= ${PKGNAME_NOREV}
-EXTRACT_OPTS_ZIP= -aqo
-
-INSTALLATION_DIRS+= share/doc/csound5
-
-do-install:
- cd ${WRKSRC} && ${PAX} -rw * ${PREFIX}/share/doc/csound5
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/csound5-manual/PLIST b/audio/csound5-manual/PLIST
deleted file mode 100644
index abc7080ed02..00000000000
--- a/audio/csound5-manual/PLIST
+++ /dev/null
@@ -1,2084 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2006/07/12 17:09:50 rillig Exp $
-share/doc/csound5/CommandDesc.html
-share/doc/csound5/CommandFlags.html
-share/doc/csound5/CommandPreproc.html
-share/doc/csound5/CommandTop.html
-share/doc/csound5/CommandUnifile.html
-share/doc/csound5/ControlConditional.html
-share/doc/csound5/ControlDurctl.html
-share/doc/csound5/ControlFltkIntro.html
-share/doc/csound5/ControlFltkOther.html
-share/doc/csound5/ControlFltkValuators.html
-share/doc/csound5/ControlInvocat.html
-share/doc/csound5/ControlMacros.html
-share/doc/csound5/ControlPgmctl.html
-share/doc/csound5/ControlRealtime.html
-share/doc/csound5/ControlReinitn.html
-share/doc/csound5/ControlSensing.html
-share/doc/csound5/ControlSubinstrument.html
-share/doc/csound5/ControlTimeread.html
-share/doc/csound5/ControlTop.html
-share/doc/csound5/CscoreAdvancd.html
-share/doc/csound5/CscoreCompile.html
-share/doc/csound5/CscoreMain.html
-share/doc/csound5/CscoreTop.html
-share/doc/csound5/FLbox.html
-share/doc/csound5/FLbutBank.html
-share/doc/csound5/FLbutton.html
-share/doc/csound5/FLcolor.html
-share/doc/csound5/FLcolor2.html
-share/doc/csound5/FLcount.html
-share/doc/csound5/FLgetsnap.html
-share/doc/csound5/FLgroup.html
-share/doc/csound5/FLgroup_end.html
-share/doc/csound5/FLgroupend.html
-share/doc/csound5/FLhide.html
-share/doc/csound5/FLjoy.html
-share/doc/csound5/FLkeyb.html
-share/doc/csound5/FLknob.html
-share/doc/csound5/FLlabel.html
-share/doc/csound5/FLloadsnap.html
-share/doc/csound5/FLpack.html
-share/doc/csound5/FLpack_end.html
-share/doc/csound5/FLpackend.html
-share/doc/csound5/FLpanel.html
-share/doc/csound5/FLpanel_end.html
-share/doc/csound5/FLpanelend.html
-share/doc/csound5/FLprintk.html
-share/doc/csound5/FLprintk2.html
-share/doc/csound5/FLroller.html
-share/doc/csound5/FLrun.html
-share/doc/csound5/FLsavesnap.html
-share/doc/csound5/FLscroll.html
-share/doc/csound5/FLscroll_end.html
-share/doc/csound5/FLscrollend.html
-share/doc/csound5/FLsetalign.html
-share/doc/csound5/FLsetbox.html
-share/doc/csound5/FLsetcolor.html
-share/doc/csound5/FLsetcolor2.html
-share/doc/csound5/FLsetfont.html
-share/doc/csound5/FLsetposition.html
-share/doc/csound5/FLsetsize.html
-share/doc/csound5/FLsetsnap.html
-share/doc/csound5/FLsettext.html
-share/doc/csound5/FLsettextcolor.html
-share/doc/csound5/FLsettextsize.html
-share/doc/csound5/FLsettexttype.html
-share/doc/csound5/FLsetval.html
-share/doc/csound5/FLsetvali.html
-share/doc/csound5/FLshow.html
-share/doc/csound5/FLslidbnk.html
-share/doc/csound5/FLslider.html
-share/doc/csound5/FLtabs.html
-share/doc/csound5/FLtabs_end.html
-share/doc/csound5/FLtabsend.html
-share/doc/csound5/FLtext.html
-share/doc/csound5/FLupdate.html
-share/doc/csound5/FLvalue.html
-share/doc/csound5/GEN01.html
-share/doc/csound5/GEN02.html
-share/doc/csound5/GEN03.html
-share/doc/csound5/GEN04.html
-share/doc/csound5/GEN05.html
-share/doc/csound5/GEN06.html
-share/doc/csound5/GEN07.html
-share/doc/csound5/GEN08.html
-share/doc/csound5/GEN09.html
-share/doc/csound5/GEN10.html
-share/doc/csound5/GEN11.html
-share/doc/csound5/GEN12.html
-share/doc/csound5/GEN13.html
-share/doc/csound5/GEN14.html
-share/doc/csound5/GEN15.html
-share/doc/csound5/GEN16.html
-share/doc/csound5/GEN17.html
-share/doc/csound5/GEN18.html
-share/doc/csound5/GEN19.html
-share/doc/csound5/GEN20.html
-share/doc/csound5/GEN21.html
-share/doc/csound5/GEN22.html
-share/doc/csound5/GEN23.html
-share/doc/csound5/GEN24.html
-share/doc/csound5/GEN25.html
-share/doc/csound5/GEN27.html
-share/doc/csound5/GEN28.html
-share/doc/csound5/GEN30.html
-share/doc/csound5/GEN31.html
-share/doc/csound5/GEN32.html
-share/doc/csound5/GEN33.html
-share/doc/csound5/GEN34.html
-share/doc/csound5/GEN40.html
-share/doc/csound5/GEN41.html
-share/doc/csound5/GEN42.html
-share/doc/csound5/GEN43.html
-share/doc/csound5/GEN51.html
-share/doc/csound5/GEN52.html
-share/doc/csound5/IntroInstall.html
-share/doc/csound5/IntroInstallMac.html
-share/doc/csound5/IntroInstallMsdos.html
-share/doc/csound5/IntroInstallOther.html
-share/doc/csound5/IntroInstallWindow.html
-share/doc/csound5/IntroList.html
-share/doc/csound5/IntroTop.html
-share/doc/csound5/ManualLicense.html
-share/doc/csound5/MathArtLogic.html
-share/doc/csound5/MathMatfunc.html
-share/doc/csound5/MathOpeqfunc.html
-share/doc/csound5/MathRndfunc.html
-share/doc/csound5/MathTop.html
-share/doc/csound5/MathTrig.html
-share/doc/csound5/MidiConvert.html
-share/doc/csound5/MidiExtender.html
-share/doc/csound5/MidiGeneric.html
-share/doc/csound5/MidiOnoff.html
-share/doc/csound5/MidiOutput.html
-share/doc/csound5/MidiRealtime.html
-share/doc/csound5/MidiSlidrbk.html
-share/doc/csound5/MidiTop.html
-share/doc/csound5/MiscAmp.html
-share/doc/csound5/MiscCsound64.html
-share/doc/csound5/MiscFormants.html
-share/doc/csound5/MiscGlossary.html
-share/doc/csound5/MiscPitch.html
-share/doc/csound5/MiscQuickref.html
-share/doc/csound5/MiscSf2.html
-share/doc/csound5/MiscWindows.html
-share/doc/csound5/Mixer.html
-share/doc/csound5/MixerClear.html
-share/doc/csound5/MixerGetLevel.html
-share/doc/csound5/MixerReceive.html
-share/doc/csound5/MixerSend.html
-share/doc/csound5/MixerSetLevel.html
-share/doc/csound5/OSC.html
-share/doc/csound5/OSCinit.html
-share/doc/csound5/OSClisten.html
-share/doc/csound5/OSCsend.html
-share/doc/csound5/OpcodesTop.html
-share/doc/csound5/OrchExpress.html
-share/doc/csound5/OrchHeader.html
-share/doc/csound5/OrchIblock.html
-share/doc/csound5/OrchKvar.html
-share/doc/csound5/OrchNamedInstruments.html
-share/doc/csound5/OrchNomen.html
-share/doc/csound5/OrchStatemnt.html
-share/doc/csound5/OrchTop.html
-share/doc/csound5/OrchVarinit.html
-share/doc/csound5/PartOverview.html
-share/doc/csound5/PartReference.html
-share/doc/csound5/PitchTop.html
-share/doc/csound5/PitchTuning.html
-share/doc/csound5/PrefaceAcknowledgements.html
-share/doc/csound5/PrefaceCopy.html
-share/doc/csound5/PrefaceHistory.html
-share/doc/csound5/PrefaceTop.html
-share/doc/csound5/ScoreAmpGen.html
-share/doc/csound5/ScoreEval.html
-share/doc/csound5/ScoreFileGen.html
-share/doc/csound5/ScoreGenRef.html
-share/doc/csound5/ScoreMacros.html
-share/doc/csound5/ScoreMixGen.html
-share/doc/csound5/ScoreNextp.html
-share/doc/csound5/ScoreNumGen.html
-share/doc/csound5/ScoreRamping.html
-share/doc/csound5/ScoreRandGen.html
-share/doc/csound5/ScoreSegGen.html
-share/doc/csound5/ScoreSineGen.html
-share/doc/csound5/ScoreStatements.html
-share/doc/csound5/ScoreTop.html
-share/doc/csound5/ScoreWaveGen.html
-share/doc/csound5/ScoreWinGen.html
-share/doc/csound5/ScoregensTop.html
-share/doc/csound5/SiggenBasic.html
-share/doc/csound5/SiggenDynamic.html
-share/doc/csound5/SiggenFmsynth.html
-share/doc/csound5/SiggenGranular.html
-share/doc/csound5/SiggenLineexp.html
-share/doc/csound5/SiggenLpcresyn.html
-share/doc/csound5/SiggenModels.html
-share/doc/csound5/SiggenNoise.html
-share/doc/csound5/SiggenPhasors.html
-share/doc/csound5/SiggenSample.html
-share/doc/csound5/SiggenScanTop.html
-share/doc/csound5/SiggenStft.html
-share/doc/csound5/SiggenTableacc.html
-share/doc/csound5/SiggenTop.html
-share/doc/csound5/SiggenWaveterr.html
-share/doc/csound5/SiggenWavguide.html
-share/doc/csound5/SigioInput.html
-share/doc/csound5/SigioOutput.html
-share/doc/csound5/SigioPdisplay.html
-share/doc/csound5/SigioQueries.html
-share/doc/csound5/SigioTop.html
-share/doc/csound5/SigmodConmorph.html
-share/doc/csound5/SigmodDelay.html
-share/doc/csound5/SigmodEnvelope.html
-share/doc/csound5/SigmodPanspatl.html
-share/doc/csound5/SigmodReverbtn.html
-share/doc/csound5/SigmodSample.html
-share/doc/csound5/SigmodSiglimit.html
-share/doc/csound5/SigmodSpeciale.html
-share/doc/csound5/SigmodSpeciali.html
-share/doc/csound5/SigmodStandard.html
-share/doc/csound5/SigmodTop.html
-share/doc/csound5/SigmodWavguide.html
-share/doc/csound5/SpectralRealTime.html
-share/doc/csound5/SpectralTop.html
-share/doc/csound5/TableReadwrit.html
-share/doc/csound5/TableSelect.html
-share/doc/csound5/TableTop.html
-share/doc/csound5/UtilityAnalysis.html
-share/doc/csound5/UtilityConversion.html
-share/doc/csound5/UtilityCredits.html
-share/doc/csound5/UtilityOther.html
-share/doc/csound5/UtilityQueries.html
-share/doc/csound5/UtilitySoundfile.html
-share/doc/csound5/UtilityTop.html
-share/doc/csound5/VSTSDKLicense.html
-share/doc/csound5/ZakTop.html
-share/doc/csound5/Zerodbfs.html
-share/doc/csound5/a.html
-share/doc/csound5/abetarand.html
-share/doc/csound5/abexprnd.html
-share/doc/csound5/abs.html
-share/doc/csound5/acauchy.html
-share/doc/csound5/active.html
-share/doc/csound5/adds.html
-share/doc/csound5/adsr.html
-share/doc/csound5/adsyn.html
-share/doc/csound5/adsynt.html
-share/doc/csound5/adsynt2.html
-share/doc/csound5/aexprand.html
-share/doc/csound5/aftouch.html
-share/doc/csound5/agauss.html
-share/doc/csound5/agogobel.html
-share/doc/csound5/alinrand.html
-share/doc/csound5/alpass.html
-share/doc/csound5/ampdb.html
-share/doc/csound5/ampdbfs.html
-share/doc/csound5/ampmidi.html
-share/doc/csound5/apcauchy.html
-share/doc/csound5/apoisson.html
-share/doc/csound5/apow.html
-share/doc/csound5/areson.html
-share/doc/csound5/aresonk.html
-share/doc/csound5/assign.html
-share/doc/csound5/atone.html
-share/doc/csound5/atonek.html
-share/doc/csound5/atonex.html
-share/doc/csound5/atrirand.html
-share/doc/csound5/aunirand.html
-share/doc/csound5/aweibull.html
-share/doc/csound5/b.html
-share/doc/csound5/babo.html
-share/doc/csound5/balance.html
-share/doc/csound5/bamboo.html
-share/doc/csound5/barmodel.html
-share/doc/csound5/bbcutm.html
-share/doc/csound5/bbcuts.html
-share/doc/csound5/betarand.html
-share/doc/csound5/bexprnd.html
-share/doc/csound5/bformdec.html
-share/doc/csound5/bformenc.html
-share/doc/csound5/binit.html
-share/doc/csound5/biquad.html
-share/doc/csound5/biquada.html
-share/doc/csound5/birnd.html
-share/doc/csound5/bqrez.html
-share/doc/csound5/buildingCsound.html
-share/doc/csound5/butbp.html
-share/doc/csound5/butbr.html
-share/doc/csound5/buthp.html
-share/doc/csound5/butlp.html
-share/doc/csound5/butterbp.html
-share/doc/csound5/butterbr.html
-share/doc/csound5/butterhp.html
-share/doc/csound5/butterlp.html
-share/doc/csound5/button.html
-share/doc/csound5/buzz.html
-share/doc/csound5/cabasa.html
-share/doc/csound5/cauchy.html
-share/doc/csound5/ceil.html
-share/doc/csound5/cent.html
-share/doc/csound5/cggoto.html
-share/doc/csound5/ch06s02.html
-share/doc/csound5/ch06s03.html
-share/doc/csound5/ch07s02.html
-share/doc/csound5/ch07s02s02.html
-share/doc/csound5/ch07s02s03.html
-share/doc/csound5/ch07s02s04.html
-share/doc/csound5/ch07s02s05.html
-share/doc/csound5/ch13s02.html
-share/doc/csound5/ch15s02.html
-share/doc/csound5/ch15s03.html
-share/doc/csound5/ch19s04s02.html
-share/doc/csound5/ch19s04s03.html
-share/doc/csound5/ch32s05s02.html
-share/doc/csound5/ch32s05s03.html
-share/doc/csound5/ch32s05s04.html
-share/doc/csound5/ch32s06s02.html
-share/doc/csound5/chanctrl.html
-share/doc/csound5/changed.html
-share/doc/csound5/chani.html
-share/doc/csound5/chano.html
-share/doc/csound5/checkbox.html
-share/doc/csound5/chn.html
-share/doc/csound5/chnclear.html
-share/doc/csound5/chnexport.html
-share/doc/csound5/chnget.html
-share/doc/csound5/chnmix.html
-share/doc/csound5/chnparams.html
-share/doc/csound5/chnset.html
-share/doc/csound5/cigoto.html
-share/doc/csound5/ckgoto.html
-share/doc/csound5/clear.html
-share/doc/csound5/clfilt.html
-share/doc/csound5/clip.html
-share/doc/csound5/clock.html
-share/doc/csound5/clockoff.html
-share/doc/csound5/clockon.html
-share/doc/csound5/cngoto.html
-share/doc/csound5/comb.html
-share/doc/csound5/commandpreindie.html
-share/doc/csound5/control.html
-share/doc/csound5/convle.html
-share/doc/csound5/convolve.html
-share/doc/csound5/cos.html
-share/doc/csound5/cosh.html
-share/doc/csound5/cosinv.html
-share/doc/csound5/cps2pch.html
-share/doc/csound5/cpsmidi.html
-share/doc/csound5/cpsmidib.html
-share/doc/csound5/cpsoct.html
-share/doc/csound5/cpspch.html
-share/doc/csound5/cpstmid.html
-share/doc/csound5/cpstun.html
-share/doc/csound5/cpstuni.html
-share/doc/csound5/cpsxpch.html
-share/doc/csound5/cpuprc.html
-share/doc/csound5/cross2.html
-share/doc/csound5/crunch.html
-share/doc/csound5/cs.html
-share/doc/csound5/csound5Opcodes.html
-share/doc/csound5/csound5extending.html
-share/doc/csound5/csound5intro.html
-share/doc/csound5/csound5licenses.html
-share/doc/csound5/csound5todo.html
-share/doc/csound5/csound5usersguide.html
-share/doc/csound5/csoundLinks.html
-share/doc/csound5/ctrl14.html
-share/doc/csound5/ctrl21.html
-share/doc/csound5/ctrl7.html
-share/doc/csound5/ctrlinit.html
-share/doc/csound5/cuserrnd.html
-share/doc/csound5/cvanal.html
-share/doc/csound5/dam.html
-share/doc/csound5/db.html
-share/doc/csound5/dbamp.html
-share/doc/csound5/dbfsamp.html
-share/doc/csound5/dcblock.html
-share/doc/csound5/dconv.html
-share/doc/csound5/define.html
-share/doc/csound5/delay.html
-share/doc/csound5/delay1.html
-share/doc/csound5/delayk.html
-share/doc/csound5/delayr.html
-share/doc/csound5/delayw.html
-share/doc/csound5/deltap.html
-share/doc/csound5/deltap3.html
-share/doc/csound5/deltapi.html
-share/doc/csound5/deltapn.html
-share/doc/csound5/deltapx.html
-share/doc/csound5/deltapxw.html
-share/doc/csound5/denorm.html
-share/doc/csound5/diff.html
-share/doc/csound5/diskin.html
-share/doc/csound5/diskin2.html
-share/doc/csound5/dispfft.html
-share/doc/csound5/display.html
-share/doc/csound5/distort1.html
-share/doc/csound5/divides.html
-share/doc/csound5/divz.html
-share/doc/csound5/dnoise.html
-share/doc/csound5/dollar.html
-share/doc/csound5/downsamp.html
-share/doc/csound5/dripwater.html
-share/doc/csound5/dssi4cs.html
-share/doc/csound5/dssiactivate.html
-share/doc/csound5/dssiaudio.html
-share/doc/csound5/dssictls.html
-share/doc/csound5/dssiinit.html
-share/doc/csound5/dssilist.html
-share/doc/csound5/dumpk.html
-share/doc/csound5/dumpk2.html
-share/doc/csound5/dumpk3.html
-share/doc/csound5/dumpk4.html
-share/doc/csound5/duserrnd.html
-share/doc/csound5/e.html
-share/doc/csound5/else.html
-share/doc/csound5/elseif.html
-share/doc/csound5/endif.html
-share/doc/csound5/endin.html
-share/doc/csound5/endop.html
-share/doc/csound5/envelopeGenerators.html
-share/doc/csound5/envlpx.html
-share/doc/csound5/envlpxr.html
-share/doc/csound5/equals.html
-share/doc/csound5/event.html
-share/doc/csound5/event_i.html
-share/doc/csound5/examples/0dbfs.orc
-share/doc/csound5/examples/0dbfs.sco
-share/doc/csound5/examples/FLbox.orc
-share/doc/csound5/examples/FLbox.sco
-share/doc/csound5/examples/FLbutton.orc
-share/doc/csound5/examples/FLbutton.sco
-share/doc/csound5/examples/FLcount.orc
-share/doc/csound5/examples/FLcount.sco
-share/doc/csound5/examples/FLjoy.orc
-share/doc/csound5/examples/FLjoy.sco
-share/doc/csound5/examples/FLknob.orc
-share/doc/csound5/examples/FLknob.sco
-share/doc/csound5/examples/FLpanel.orc
-share/doc/csound5/examples/FLpanel.sco
-share/doc/csound5/examples/FLroller.orc
-share/doc/csound5/examples/FLroller.sco
-share/doc/csound5/examples/FLscroll.orc
-share/doc/csound5/examples/FLscroll.sco
-share/doc/csound5/examples/FLsetcolor.orc
-share/doc/csound5/examples/FLsetcolor.sco
-share/doc/csound5/examples/FLslider.orc
-share/doc/csound5/examples/FLslider.sco
-share/doc/csound5/examples/FLtabs.orc
-share/doc/csound5/examples/FLtabs.sco
-share/doc/csound5/examples/FLtext.orc
-share/doc/csound5/examples/FLtext.sco
-share/doc/csound5/examples/FLvalue.orc
-share/doc/csound5/examples/FLvalue.sco
-share/doc/csound5/examples/HRTFcompact
-share/doc/csound5/examples/a.orc
-share/doc/csound5/examples/a.sco
-share/doc/csound5/examples/abs.orc
-share/doc/csound5/examples/abs.sco
-share/doc/csound5/examples/active.orc
-share/doc/csound5/examples/active.sco
-share/doc/csound5/examples/active_k.orc
-share/doc/csound5/examples/active_k.sco
-share/doc/csound5/examples/adds.orc
-share/doc/csound5/examples/adds.sco
-share/doc/csound5/examples/adsr.orc
-share/doc/csound5/examples/adsr.sco
-share/doc/csound5/examples/adsyn.orc
-share/doc/csound5/examples/adsyn.sco
-share/doc/csound5/examples/adsynt.orc
-share/doc/csound5/examples/adsynt.sco
-share/doc/csound5/examples/aftouch.orc
-share/doc/csound5/examples/aftouch.sco
-share/doc/csound5/examples/ahh.aiff
-share/doc/csound5/examples/alpass.orc
-share/doc/csound5/examples/alpass.sco
-share/doc/csound5/examples/ambisonic.orc
-share/doc/csound5/examples/ampdb.orc
-share/doc/csound5/examples/ampdb.sco
-share/doc/csound5/examples/ampdbfs.orc
-share/doc/csound5/examples/ampdbfs.sco
-share/doc/csound5/examples/ampmidi.orc
-share/doc/csound5/examples/ampmidi.sco
-share/doc/csound5/examples/areson.orc
-share/doc/csound5/examples/areson.sco
-share/doc/csound5/examples/assign.orc
-share/doc/csound5/examples/assign.sco
-share/doc/csound5/examples/atone.orc
-share/doc/csound5/examples/atone.sco
-share/doc/csound5/examples/babo.orc
-share/doc/csound5/examples/babo.sco
-share/doc/csound5/examples/babo_expert.orc
-share/doc/csound5/examples/babo_expert.sco
-share/doc/csound5/examples/balance.orc
-share/doc/csound5/examples/balance.sco
-share/doc/csound5/examples/bamboo.orc
-share/doc/csound5/examples/bamboo.sco
-share/doc/csound5/examples/barmodel.orc
-share/doc/csound5/examples/barmodel.sco
-share/doc/csound5/examples/bbcutm.orc
-share/doc/csound5/examples/bbcutm.sco
-share/doc/csound5/examples/beats.aiff
-share/doc/csound5/examples/beats.wav
-share/doc/csound5/examples/betarand.orc
-share/doc/csound5/examples/betarand.sco
-share/doc/csound5/examples/bexprnd.orc
-share/doc/csound5/examples/bexprnd.sco
-share/doc/csound5/examples/biquad.orc
-share/doc/csound5/examples/biquad.sco
-share/doc/csound5/examples/birnd.orc
-share/doc/csound5/examples/birnd.sco
-share/doc/csound5/examples/bqrez.orc
-share/doc/csound5/examples/bqrez.sco
-share/doc/csound5/examples/butterbp.orc
-share/doc/csound5/examples/butterbp.sco
-share/doc/csound5/examples/butterbr.orc
-share/doc/csound5/examples/butterbr.sco
-share/doc/csound5/examples/butterhp.orc
-share/doc/csound5/examples/butterhp.sco
-share/doc/csound5/examples/butterlp.orc
-share/doc/csound5/examples/butterlp.sco
-share/doc/csound5/examples/buzz.orc
-share/doc/csound5/examples/buzz.sco
-share/doc/csound5/examples/cabasa.orc
-share/doc/csound5/examples/cabasa.sco
-share/doc/csound5/examples/cauchy.orc
-share/doc/csound5/examples/cauchy.sco
-share/doc/csound5/examples/cent.orc
-share/doc/csound5/examples/cent.sco
-share/doc/csound5/examples/cggoto.orc
-share/doc/csound5/examples/cggoto.sco
-share/doc/csound5/examples/changed.csd
-share/doc/csound5/examples/checkbox.orc
-share/doc/csound5/examples/checkbox.sco
-share/doc/csound5/examples/cigoto.orc
-share/doc/csound5/examples/cigoto.sco
-share/doc/csound5/examples/ckgoto.orc
-share/doc/csound5/examples/ckgoto.sco
-share/doc/csound5/examples/clfilt_highpass.orc
-share/doc/csound5/examples/clfilt_highpass.sco
-share/doc/csound5/examples/clfilt_lowpass.orc
-share/doc/csound5/examples/clfilt_lowpass.sco
-share/doc/csound5/examples/clip.orc
-share/doc/csound5/examples/clip.sco
-share/doc/csound5/examples/cngoto.orc
-share/doc/csound5/examples/cngoto.sco
-share/doc/csound5/examples/comb.orc
-share/doc/csound5/examples/comb.sco
-share/doc/csound5/examples/cos.orc
-share/doc/csound5/examples/cos.sco
-share/doc/csound5/examples/cosh.orc
-share/doc/csound5/examples/cosh.sco
-share/doc/csound5/examples/cosinv.orc
-share/doc/csound5/examples/cosinv.sco
-share/doc/csound5/examples/cps2pch.orc
-share/doc/csound5/examples/cps2pch.sco
-share/doc/csound5/examples/cps2pch_19et.orc
-share/doc/csound5/examples/cps2pch_19et.sco
-share/doc/csound5/examples/cps2pch_ftable.orc
-share/doc/csound5/examples/cps2pch_ftable.sco
-share/doc/csound5/examples/cpsmidi.orc
-share/doc/csound5/examples/cpsmidi.sco
-share/doc/csound5/examples/cpsmidib.orc
-share/doc/csound5/examples/cpsmidib.sco
-share/doc/csound5/examples/cpsoct.orc
-share/doc/csound5/examples/cpsoct.sco
-share/doc/csound5/examples/cpspch.orc
-share/doc/csound5/examples/cpspch.sco
-share/doc/csound5/examples/cpstmid.orc
-share/doc/csound5/examples/cpstmid.sco
-share/doc/csound5/examples/cpstun.orc
-share/doc/csound5/examples/cpstun.sco
-share/doc/csound5/examples/cpstuni.orc
-share/doc/csound5/examples/cpstuni.sco
-share/doc/csound5/examples/cpsxpch.orc
-share/doc/csound5/examples/cpsxpch.sco
-share/doc/csound5/examples/cpsxpch_105et.orc
-share/doc/csound5/examples/cpsxpch_105et.sco
-share/doc/csound5/examples/cpsxpch_pierce.orc
-share/doc/csound5/examples/cpsxpch_pierce.sco
-share/doc/csound5/examples/cpuprc.orc
-share/doc/csound5/examples/cpuprc.sco
-share/doc/csound5/examples/cross2.orc
-share/doc/csound5/examples/cross2.sco
-share/doc/csound5/examples/crunch.orc
-share/doc/csound5/examples/crunch.sco
-share/doc/csound5/examples/dam.orc
-share/doc/csound5/examples/dam.sco
-share/doc/csound5/examples/dam_expanded.orc
-share/doc/csound5/examples/dam_expanded.sco
-share/doc/csound5/examples/db.orc
-share/doc/csound5/examples/db.sco
-share/doc/csound5/examples/dbamp.orc
-share/doc/csound5/examples/dbamp.sco
-share/doc/csound5/examples/dbfsamp.orc
-share/doc/csound5/examples/dbfsamp.sco
-share/doc/csound5/examples/dcblock.orc
-share/doc/csound5/examples/dcblock.sco
-share/doc/csound5/examples/dconv.orc
-share/doc/csound5/examples/dconv.sco
-share/doc/csound5/examples/define.orc
-share/doc/csound5/examples/define.sco
-share/doc/csound5/examples/define_args.orc
-share/doc/csound5/examples/define_args.sco
-share/doc/csound5/examples/delay.orc
-share/doc/csound5/examples/delay.sco
-share/doc/csound5/examples/delayw.orc
-share/doc/csound5/examples/delayw.sco
-share/doc/csound5/examples/diff.orc
-share/doc/csound5/examples/diff.sco
-share/doc/csound5/examples/diskin.orc
-share/doc/csound5/examples/diskin.sco
-share/doc/csound5/examples/diskin2.csd
-share/doc/csound5/examples/dispfft.orc
-share/doc/csound5/examples/dispfft.sco
-share/doc/csound5/examples/display.orc
-share/doc/csound5/examples/display.sco
-share/doc/csound5/examples/distort1.orc
-share/doc/csound5/examples/distort1.sco
-share/doc/csound5/examples/divides.orc
-share/doc/csound5/examples/divides.sco
-share/doc/csound5/examples/divz.orc
-share/doc/csound5/examples/divz.sco
-share/doc/csound5/examples/downsamp.orc
-share/doc/csound5/examples/downsamp.sco
-share/doc/csound5/examples/dripwater.orc
-share/doc/csound5/examples/dripwater.sco
-share/doc/csound5/examples/dssi4cs.csd
-share/doc/csound5/examples/eee.aiff
-share/doc/csound5/examples/endin.orc
-share/doc/csound5/examples/endin.sco
-share/doc/csound5/examples/envlpx.orc
-share/doc/csound5/examples/envlpx.sco
-share/doc/csound5/examples/equal.orc
-share/doc/csound5/examples/equal.sco
-share/doc/csound5/examples/event.orc
-share/doc/csound5/examples/event.sco
-share/doc/csound5/examples/event_named.orc
-share/doc/csound5/examples/event_named.sco
-share/doc/csound5/examples/exp.orc
-share/doc/csound5/examples/exp.sco
-share/doc/csound5/examples/expon.orc
-share/doc/csound5/examples/expon.sco
-share/doc/csound5/examples/exprand.orc
-share/doc/csound5/examples/exprand.sco
-share/doc/csound5/examples/expseg.orc
-share/doc/csound5/examples/expseg.sco
-share/doc/csound5/examples/expsega.orc
-share/doc/csound5/examples/expsega.sco
-share/doc/csound5/examples/expsegr.orc
-share/doc/csound5/examples/expsegr.sco
-share/doc/csound5/examples/fdl.txt
-share/doc/csound5/examples/filelen.orc
-share/doc/csound5/examples/filelen.sco
-share/doc/csound5/examples/filenchnls.orc
-share/doc/csound5/examples/filenchnls.sco
-share/doc/csound5/examples/filepeak.orc
-share/doc/csound5/examples/filepeak.sco
-share/doc/csound5/examples/filesr.orc
-share/doc/csound5/examples/filesr.sco
-share/doc/csound5/examples/flanger.orc
-share/doc/csound5/examples/flanger.sco
-share/doc/csound5/examples/flashtxt.orc
-share/doc/csound5/examples/flashtxt.sco
-share/doc/csound5/examples/fmb3.orc
-share/doc/csound5/examples/fmb3.sco
-share/doc/csound5/examples/fmbell.orc
-share/doc/csound5/examples/fmbell.sco
-share/doc/csound5/examples/fmmetal.orc
-share/doc/csound5/examples/fmmetal.sco
-share/doc/csound5/examples/fmpercfl.orc
-share/doc/csound5/examples/fmpercfl.sco
-share/doc/csound5/examples/fmrhode.orc
-share/doc/csound5/examples/fmrhode.sco
-share/doc/csound5/examples/fmvoice.orc
-share/doc/csound5/examples/fmvoice.sco
-share/doc/csound5/examples/fmwurlie.orc
-share/doc/csound5/examples/fmwurlie.sco
-share/doc/csound5/examples/fof.orc
-share/doc/csound5/examples/fof.sco
-share/doc/csound5/examples/fold.orc
-share/doc/csound5/examples/fold.sco
-share/doc/csound5/examples/follow.orc
-share/doc/csound5/examples/follow.sco
-share/doc/csound5/examples/follow2.orc
-share/doc/csound5/examples/follow2.sco
-share/doc/csound5/examples/foscil.orc
-share/doc/csound5/examples/foscil.sco
-share/doc/csound5/examples/foscili.orc
-share/doc/csound5/examples/foscili.sco
-share/doc/csound5/examples/fout.orc
-share/doc/csound5/examples/fout.sco
-share/doc/csound5/examples/fout_poly.orc
-share/doc/csound5/examples/fout_poly.sco
-share/doc/csound5/examples/fprintks.orc
-share/doc/csound5/examples/fprintks.sco
-share/doc/csound5/examples/fprints.orc
-share/doc/csound5/examples/fprints.sco
-share/doc/csound5/examples/frac.orc
-share/doc/csound5/examples/frac.sco
-share/doc/csound5/examples/freeverb.orc
-share/doc/csound5/examples/freeverb.sco
-share/doc/csound5/examples/ftchnls.orc
-share/doc/csound5/examples/ftchnls.sco
-share/doc/csound5/examples/ftconv.csd
-share/doc/csound5/examples/ftgen.orc
-share/doc/csound5/examples/ftgen.sco
-share/doc/csound5/examples/ftlen.orc
-share/doc/csound5/examples/ftlen.sco
-share/doc/csound5/examples/ftlptim.orc
-share/doc/csound5/examples/ftlptim.sco
-share/doc/csound5/examples/ftmorf.orc
-share/doc/csound5/examples/ftmorf.sco
-share/doc/csound5/examples/ftsave.orc
-share/doc/csound5/examples/ftsave.sco
-share/doc/csound5/examples/ftsr.orc
-share/doc/csound5/examples/ftsr.sco
-share/doc/csound5/examples/fwavblnk.aiff
-share/doc/csound5/examples/gauss.orc
-share/doc/csound5/examples/gauss.sco
-share/doc/csound5/examples/gbuzz.orc
-share/doc/csound5/examples/gbuzz.sco
-share/doc/csound5/examples/gen01.orc
-share/doc/csound5/examples/gen01.sco
-share/doc/csound5/examples/gen01computed.orc
-share/doc/csound5/examples/gen01computed.sco
-share/doc/csound5/examples/gen02.orc
-share/doc/csound5/examples/gen02.sco
-share/doc/csound5/examples/gen03.orc
-share/doc/csound5/examples/gen03.sco
-share/doc/csound5/examples/gen05.orc
-share/doc/csound5/examples/gen05.sco
-share/doc/csound5/examples/gen06.orc
-share/doc/csound5/examples/gen06.sco
-share/doc/csound5/examples/gen07.orc
-share/doc/csound5/examples/gen07.sco
-share/doc/csound5/examples/gen08.orc
-share/doc/csound5/examples/gen08.sco
-share/doc/csound5/examples/gen09.orc
-share/doc/csound5/examples/gen09.sco
-share/doc/csound5/examples/gen09square.orc
-share/doc/csound5/examples/gen09square.sco
-share/doc/csound5/examples/gen10.orc
-share/doc/csound5/examples/gen10.sco
-share/doc/csound5/examples/gen11.orc
-share/doc/csound5/examples/gen11.sco
-share/doc/csound5/examples/gen12.orc
-share/doc/csound5/examples/gen12.sco
-share/doc/csound5/examples/gen13.orc
-share/doc/csound5/examples/gen13.sco
-share/doc/csound5/examples/gen14.orc
-share/doc/csound5/examples/gen14.sco
-share/doc/csound5/examples/gen19.orc
-share/doc/csound5/examples/gen19.sco
-share/doc/csound5/examples/gogobel.orc
-share/doc/csound5/examples/gogobel.sco
-share/doc/csound5/examples/goto.orc
-share/doc/csound5/examples/goto.sco
-share/doc/csound5/examples/grain.orc
-share/doc/csound5/examples/grain.sco
-share/doc/csound5/examples/grain2.orc
-share/doc/csound5/examples/grain2.sco
-share/doc/csound5/examples/grain3.orc
-share/doc/csound5/examples/grain3.sco
-share/doc/csound5/examples/granule.orc
-share/doc/csound5/examples/granule.sco
-share/doc/csound5/examples/greaterequal.orc
-share/doc/csound5/examples/greaterequal.sco
-share/doc/csound5/examples/greaterthan.orc
-share/doc/csound5/examples/greaterthan.sco
-share/doc/csound5/examples/guiro.orc
-share/doc/csound5/examples/guiro.sco
-share/doc/csound5/examples/harmon.orc
-share/doc/csound5/examples/harmon.sco
-share/doc/csound5/examples/hilbert.orc
-share/doc/csound5/examples/hilbert.sco
-share/doc/csound5/examples/hilbert_barberpole.orc
-share/doc/csound5/examples/hilbert_barberpole.sco
-share/doc/csound5/examples/hrtfer.orc
-share/doc/csound5/examples/hrtfer.sco
-share/doc/csound5/examples/hsboscil.orc
-share/doc/csound5/examples/hsboscil.sco
-share/doc/csound5/examples/hsboscil_midi.orc
-share/doc/csound5/examples/hsboscil_midi.sco
-share/doc/csound5/examples/ifthen.orc
-share/doc/csound5/examples/ifthen.sco
-share/doc/csound5/examples/igoto.orc
-share/doc/csound5/examples/igoto.sco
-share/doc/csound5/examples/ihold.orc
-share/doc/csound5/examples/ihold.sco
-share/doc/csound5/examples/impuls20.aiff
-share/doc/csound5/examples/include.orc
-share/doc/csound5/examples/include.sco
-share/doc/csound5/examples/instr.orc
-share/doc/csound5/examples/instr.sco
-share/doc/csound5/examples/int.orc
-share/doc/csound5/examples/int.sco
-share/doc/csound5/examples/integ.orc
-share/doc/csound5/examples/integ.sco
-share/doc/csound5/examples/interp.orc
-share/doc/csound5/examples/interp.sco
-share/doc/csound5/examples/jitter.orc
-share/doc/csound5/examples/jitter.sco
-share/doc/csound5/examples/jitter2.orc
-share/doc/csound5/examples/jitter2.sco
-share/doc/csound5/examples/kgoto.orc
-share/doc/csound5/examples/kgoto.sco
-share/doc/csound5/examples/kickroll.het
-share/doc/csound5/examples/kickroll.wav
-share/doc/csound5/examples/lessequal.orc
-share/doc/csound5/examples/lessequal.sco
-share/doc/csound5/examples/lessthan.orc
-share/doc/csound5/examples/lessthan.sco
-share/doc/csound5/examples/lfo.orc
-share/doc/csound5/examples/lfo.sco
-share/doc/csound5/examples/line.orc
-share/doc/csound5/examples/line.sco
-share/doc/csound5/examples/linrand.orc
-share/doc/csound5/examples/linrand.sco
-share/doc/csound5/examples/linseg.orc
-share/doc/csound5/examples/linseg.sco
-share/doc/csound5/examples/linsegr.orc
-share/doc/csound5/examples/linsegr.sco
-share/doc/csound5/examples/log.orc
-share/doc/csound5/examples/log.sco
-share/doc/csound5/examples/log10.orc
-share/doc/csound5/examples/log10.sco
-share/doc/csound5/examples/logbtwo.orc
-share/doc/csound5/examples/logbtwo.sco
-share/doc/csound5/examples/loopseg.orc
-share/doc/csound5/examples/loopseg.sco
-share/doc/csound5/examples/lorenz.orc
-share/doc/csound5/examples/lorenz.sco
-share/doc/csound5/examples/loscil.orc
-share/doc/csound5/examples/loscil.sco
-share/doc/csound5/examples/loscil3.orc
-share/doc/csound5/examples/loscil3.sco
-share/doc/csound5/examples/lowpass2.orc
-share/doc/csound5/examples/lowpass2.sco
-share/doc/csound5/examples/lowres.orc
-share/doc/csound5/examples/lowres.sco
-share/doc/csound5/examples/lowresx.orc
-share/doc/csound5/examples/lowresx.sco
-share/doc/csound5/examples/lpf18.orc
-share/doc/csound5/examples/lpf18.sco
-share/doc/csound5/examples/lpshold.orc
-share/doc/csound5/examples/lpshold.sco
-share/doc/csound5/examples/madsr.orc
-share/doc/csound5/examples/madsr.sco
-share/doc/csound5/examples/mandol.orc
-share/doc/csound5/examples/mandol.sco
-share/doc/csound5/examples/mandpluk.aiff
-share/doc/csound5/examples/marimba.orc
-share/doc/csound5/examples/marimba.sco
-share/doc/csound5/examples/marmstk1.wav
-share/doc/csound5/examples/mary.wav
-share/doc/csound5/examples/maxalloc.orc
-share/doc/csound5/examples/maxalloc.sco
-share/doc/csound5/examples/metro.csd
-share/doc/csound5/examples/midichannelaftertouch.orc
-share/doc/csound5/examples/midichannelaftertouch.sco
-share/doc/csound5/examples/midichn.orc
-share/doc/csound5/examples/midichn.sco
-share/doc/csound5/examples/midichn_advanced.mid
-share/doc/csound5/examples/midichn_advanced.orc
-share/doc/csound5/examples/midichn_advanced.sco
-share/doc/csound5/examples/midinoteoff.orc
-share/doc/csound5/examples/midinoteoff.sco
-share/doc/csound5/examples/midinoteoncps.orc
-share/doc/csound5/examples/midinoteoncps.sco
-share/doc/csound5/examples/midinoteonkey.orc
-share/doc/csound5/examples/midinoteonkey.sco
-share/doc/csound5/examples/midinoteonoct.orc
-share/doc/csound5/examples/midinoteonoct.sco
-share/doc/csound5/examples/midinoteonpch.orc
-share/doc/csound5/examples/midinoteonpch.sco
-share/doc/csound5/examples/midipitchbend.orc
-share/doc/csound5/examples/midipitchbend.sco
-share/doc/csound5/examples/modulus.orc
-share/doc/csound5/examples/modulus.sco
-share/doc/csound5/examples/moog.orc
-share/doc/csound5/examples/moog.sco
-share/doc/csound5/examples/moogvcf.orc
-share/doc/csound5/examples/moogvcf.sco
-share/doc/csound5/examples/mpulse.orc
-share/doc/csound5/examples/mpulse.sco
-share/doc/csound5/examples/multiplies.orc
-share/doc/csound5/examples/multiplies.sco
-share/doc/csound5/examples/mute.orc
-share/doc/csound5/examples/mute.sco
-share/doc/csound5/examples/nestedap.orc
-share/doc/csound5/examples/nestedap.sco
-share/doc/csound5/examples/noise.orc
-share/doc/csound5/examples/noise.sco
-share/doc/csound5/examples/notequal.orc
-share/doc/csound5/examples/notequal.sco
-share/doc/csound5/examples/notnum.orc
-share/doc/csound5/examples/notnum.sco
-share/doc/csound5/examples/nreverb.orc
-share/doc/csound5/examples/nreverb.sco
-share/doc/csound5/examples/nreverb_ftable.orc
-share/doc/csound5/examples/nreverb_ftable.sco
-share/doc/csound5/examples/nsamp.orc
-share/doc/csound5/examples/nsamp.sco
-share/doc/csound5/examples/octave.orc
-share/doc/csound5/examples/octave.sco
-share/doc/csound5/examples/octcps.orc
-share/doc/csound5/examples/octcps.sco
-share/doc/csound5/examples/octmidi.orc
-share/doc/csound5/examples/octmidi.sco
-share/doc/csound5/examples/octmidib.orc
-share/doc/csound5/examples/octmidib.sco
-share/doc/csound5/examples/octpch.orc
-share/doc/csound5/examples/octpch.sco
-share/doc/csound5/examples/ooo.aiff
-share/doc/csound5/examples/opcode1.xml
-share/doc/csound5/examples/opcode_example.orc
-share/doc/csound5/examples/opcode_example.sco
-share/doc/csound5/examples/oscbnk.orc
-share/doc/csound5/examples/oscbnk.sco
-share/doc/csound5/examples/oscil.orc
-share/doc/csound5/examples/oscil.sco
-share/doc/csound5/examples/oscil3.orc
-share/doc/csound5/examples/oscil3.sco
-share/doc/csound5/examples/oscili.orc
-share/doc/csound5/examples/oscili.sco
-share/doc/csound5/examples/oscilikt.orc
-share/doc/csound5/examples/oscilikt.sco
-share/doc/csound5/examples/osciliktp.orc
-share/doc/csound5/examples/osciliktp.sco
-share/doc/csound5/examples/oscilikts.orc
-share/doc/csound5/examples/oscilikts.sco
-share/doc/csound5/examples/oscils.orc
-share/doc/csound5/examples/oscils.sco
-share/doc/csound5/examples/p.orc
-share/doc/csound5/examples/p.sco
-share/doc/csound5/examples/pareq.orc
-share/doc/csound5/examples/pareq.sco
-share/doc/csound5/examples/pcauchy.orc
-share/doc/csound5/examples/pcauchy.sco
-share/doc/csound5/examples/pchbend.orc
-share/doc/csound5/examples/pchbend.sco
-share/doc/csound5/examples/pchmidi.orc
-share/doc/csound5/examples/pchmidi.sco
-share/doc/csound5/examples/pchmidib.orc
-share/doc/csound5/examples/pchmidib.sco
-share/doc/csound5/examples/pchoct.orc
-share/doc/csound5/examples/pchoct.sco
-share/doc/csound5/examples/peak.orc
-share/doc/csound5/examples/peak.sco
-share/doc/csound5/examples/pgmassign.orc
-share/doc/csound5/examples/pgmassign.sco
-share/doc/csound5/examples/pgmassign_advanced.mid
-share/doc/csound5/examples/pgmassign_advanced.orc
-share/doc/csound5/examples/pgmassign_advanced.sco
-share/doc/csound5/examples/pgmassign_ignore.orc
-share/doc/csound5/examples/pgmassign_ignore.sco
-share/doc/csound5/examples/phaser1.orc
-share/doc/csound5/examples/phaser1.sco
-share/doc/csound5/examples/phaser2.orc
-share/doc/csound5/examples/phaser2.sco
-share/doc/csound5/examples/phasor.orc
-share/doc/csound5/examples/phasor.sco
-share/doc/csound5/examples/phasorbnk.orc
-share/doc/csound5/examples/phasorbnk.sco
-share/doc/csound5/examples/pinkish.orc
-share/doc/csound5/examples/pinkish.sco
-share/doc/csound5/examples/pitch.orc
-share/doc/csound5/examples/pitch.sco
-share/doc/csound5/examples/pitchamdf.orc
-share/doc/csound5/examples/pitchamdf.sco
-share/doc/csound5/examples/planet.orc
-share/doc/csound5/examples/planet.sco
-share/doc/csound5/examples/pluck.orc
-share/doc/csound5/examples/pluck.sco
-share/doc/csound5/examples/poisson.orc
-share/doc/csound5/examples/poisson.sco
-share/doc/csound5/examples/polyaft.mid
-share/doc/csound5/examples/polyaft.orc
-share/doc/csound5/examples/polyaft.sco
-share/doc/csound5/examples/poscil.orc
-share/doc/csound5/examples/poscil.sco
-share/doc/csound5/examples/poscil3.orc
-share/doc/csound5/examples/poscil3.sco
-share/doc/csound5/examples/pow.orc
-share/doc/csound5/examples/pow.sco
-share/doc/csound5/examples/powoftwo.orc
-share/doc/csound5/examples/powoftwo.sco
-share/doc/csound5/examples/prealloc.orc
-share/doc/csound5/examples/prealloc.sco
-share/doc/csound5/examples/print.orc
-share/doc/csound5/examples/print.sco
-share/doc/csound5/examples/printk.orc
-share/doc/csound5/examples/printk.sco
-share/doc/csound5/examples/printk2.orc
-share/doc/csound5/examples/printk2.sco
-share/doc/csound5/examples/printks.orc
-share/doc/csound5/examples/printks.sco
-share/doc/csound5/examples/prints.orc
-share/doc/csound5/examples/prints.sco
-share/doc/csound5/examples/r.orc
-share/doc/csound5/examples/r.sco
-share/doc/csound5/examples/raises.orc
-share/doc/csound5/examples/raises.sco
-share/doc/csound5/examples/rand.orc
-share/doc/csound5/examples/rand.sco
-share/doc/csound5/examples/randh.orc
-share/doc/csound5/examples/randh.sco
-share/doc/csound5/examples/randi.orc
-share/doc/csound5/examples/randi.sco
-share/doc/csound5/examples/random.orc
-share/doc/csound5/examples/random.sco
-share/doc/csound5/examples/randomh.orc
-share/doc/csound5/examples/randomh.sco
-share/doc/csound5/examples/randomi.orc
-share/doc/csound5/examples/randomi.sco
-share/doc/csound5/examples/rbjeq.orc
-share/doc/csound5/examples/rbjeq.sco
-share/doc/csound5/examples/readclock.orc
-share/doc/csound5/examples/readclock.sco
-share/doc/csound5/examples/reinit.orc
-share/doc/csound5/examples/reinit.sco
-share/doc/csound5/examples/repluck.orc
-share/doc/csound5/examples/repluck.sco
-share/doc/csound5/examples/reson.orc
-share/doc/csound5/examples/reson.sco
-share/doc/csound5/examples/resonr.orc
-share/doc/csound5/examples/resonr.sco
-share/doc/csound5/examples/resony.orc
-share/doc/csound5/examples/resony.sco
-share/doc/csound5/examples/reverb.orc
-share/doc/csound5/examples/reverb.sco
-share/doc/csound5/examples/reverbsc.orc
-share/doc/csound5/examples/reverbsc.sco
-share/doc/csound5/examples/rezzy.orc
-share/doc/csound5/examples/rezzy.sco
-share/doc/csound5/examples/rnd.orc
-share/doc/csound5/examples/rnd.sco
-share/doc/csound5/examples/rnd31.orc
-share/doc/csound5/examples/rnd31.sco
-share/doc/csound5/examples/rnd31_krate.orc
-share/doc/csound5/examples/rnd31_krate.sco
-share/doc/csound5/examples/rnd31_seed7.orc
-share/doc/csound5/examples/rnd31_seed7.sco
-share/doc/csound5/examples/rnd31_time.orc
-share/doc/csound5/examples/rnd31_time.sco
-share/doc/csound5/examples/rtclock.orc
-share/doc/csound5/examples/rtclock.sco
-share/doc/csound5/examples/sandpaper.orc
-share/doc/csound5/examples/sandpaper.sco
-share/doc/csound5/examples/scans.orc
-share/doc/csound5/examples/scans.sco
-share/doc/csound5/examples/scantable.orc
-share/doc/csound5/examples/scantable.sco
-share/doc/csound5/examples/schedkwhen.orc
-share/doc/csound5/examples/schedkwhen.sco
-share/doc/csound5/examples/schedule.orc
-share/doc/csound5/examples/schedule.sco
-share/doc/csound5/examples/schedwhen.orc
-share/doc/csound5/examples/schedwhen.sco
-share/doc/csound5/examples/sekere.orc
-share/doc/csound5/examples/sekere.sco
-share/doc/csound5/examples/semitone.orc
-share/doc/csound5/examples/semitone.sco
-share/doc/csound5/examples/sensekey.orc
-share/doc/csound5/examples/sensekey.sco
-share/doc/csound5/examples/setctrl.orc
-share/doc/csound5/examples/setctrl.sco
-share/doc/csound5/examples/shaker.orc
-share/doc/csound5/examples/shaker.sco
-share/doc/csound5/examples/sin.orc
-share/doc/csound5/examples/sin.sco
-share/doc/csound5/examples/sinh.orc
-share/doc/csound5/examples/sinh.sco
-share/doc/csound5/examples/sininv.orc
-share/doc/csound5/examples/sininv.sco
-share/doc/csound5/examples/sleighbells.orc
-share/doc/csound5/examples/sleighbells.sco
-share/doc/csound5/examples/sndwarp.orc
-share/doc/csound5/examples/sndwarp.sco
-share/doc/csound5/examples/soundin.orc
-share/doc/csound5/examples/soundin.sco
-share/doc/csound5/examples/spat3d_UHJ.orc
-share/doc/csound5/examples/spat3d_UHJ.sco
-share/doc/csound5/examples/spat3d_quad.orc
-share/doc/csound5/examples/spat3d_quad.sco
-share/doc/csound5/examples/spat3d_stereo.orc
-share/doc/csound5/examples/spat3d_stereo.sco
-share/doc/csound5/examples/sqrt.orc
-share/doc/csound5/examples/sqrt.sco
-share/doc/csound5/examples/stix.orc
-share/doc/csound5/examples/stix.sco
-share/doc/csound5/examples/streson.orc
-share/doc/csound5/examples/streson.sco
-share/doc/csound5/examples/string-128.matrix
-share/doc/csound5/examples/subinstr.orc
-share/doc/csound5/examples/subinstr.sco
-share/doc/csound5/examples/subinstr_named.orc
-share/doc/csound5/examples/subinstr_named.sco
-share/doc/csound5/examples/subtracts.orc
-share/doc/csound5/examples/subtracts.sco
-share/doc/csound5/examples/svfilter.orc
-share/doc/csound5/examples/svfilter.sco
-share/doc/csound5/examples/table.orc
-share/doc/csound5/examples/table.sco
-share/doc/csound5/examples/table1.inc
-share/doc/csound5/examples/tableng.orc
-share/doc/csound5/examples/tableng.sco
-share/doc/csound5/examples/tambourine.orc
-share/doc/csound5/examples/tambourine.sco
-share/doc/csound5/examples/tan.orc
-share/doc/csound5/examples/tan.sco
-share/doc/csound5/examples/tanh.orc
-share/doc/csound5/examples/tanh.sco
-share/doc/csound5/examples/taninv.orc
-share/doc/csound5/examples/taninv.sco
-share/doc/csound5/examples/taninv2.orc
-share/doc/csound5/examples/taninv2.sco
-share/doc/csound5/examples/tbvcf.orc
-share/doc/csound5/examples/tbvcf.sco
-share/doc/csound5/examples/tempest.orc
-share/doc/csound5/examples/tempest.sco
-share/doc/csound5/examples/tempo.orc
-share/doc/csound5/examples/tempo.sco
-share/doc/csound5/examples/tempoval.orc
-share/doc/csound5/examples/tempoval.sco
-share/doc/csound5/examples/timeinstk.orc
-share/doc/csound5/examples/timeinstk.sco
-share/doc/csound5/examples/timeinsts.orc
-share/doc/csound5/examples/timeinsts.sco
-share/doc/csound5/examples/timek.orc
-share/doc/csound5/examples/timek.sco
-share/doc/csound5/examples/times.orc
-share/doc/csound5/examples/times.sco
-share/doc/csound5/examples/trigger.orc
-share/doc/csound5/examples/trigger.sco
-share/doc/csound5/examples/trirand.orc
-share/doc/csound5/examples/trirand.sco
-share/doc/csound5/examples/turnoff.orc
-share/doc/csound5/examples/turnoff.sco
-share/doc/csound5/examples/twopeaks.aiff
-share/doc/csound5/examples/unirand.orc
-share/doc/csound5/examples/unirand.sco
-share/doc/csound5/examples/vaddv.csd
-share/doc/csound5/examples/vco.orc
-share/doc/csound5/examples/vco.sco
-share/doc/csound5/examples/vco2.orc
-share/doc/csound5/examples/vco2.sco
-share/doc/csound5/examples/vcopy.csd
-share/doc/csound5/examples/veloc.orc
-share/doc/csound5/examples/veloc.sco
-share/doc/csound5/examples/vexpseg.csd
-share/doc/csound5/examples/vibes.orc
-share/doc/csound5/examples/vibes.sco
-share/doc/csound5/examples/vibr.orc
-share/doc/csound5/examples/vibr.sco
-share/doc/csound5/examples/vibrato.orc
-share/doc/csound5/examples/vibrato.sco
-share/doc/csound5/examples/vlinseg.csd
-share/doc/csound5/examples/vlowres.orc
-share/doc/csound5/examples/vlowres.sco
-share/doc/csound5/examples/vmult.csd
-share/doc/csound5/examples/voice.orc
-share/doc/csound5/examples/voice.sco
-share/doc/csound5/examples/vtablei.csd
-share/doc/csound5/examples/vtablek.csd
-share/doc/csound5/examples/vtablewa.csd
-share/doc/csound5/examples/vtablewk.csd
-share/doc/csound5/examples/waveset.orc
-share/doc/csound5/examples/waveset.sco
-share/doc/csound5/examples/weibull.orc
-share/doc/csound5/examples/weibull.sco
-share/doc/csound5/examples/wgbow.orc
-share/doc/csound5/examples/wgbow.sco
-share/doc/csound5/examples/wgbowedbar.orc
-share/doc/csound5/examples/wgbowedbar.sco
-share/doc/csound5/examples/wgbrass.orc
-share/doc/csound5/examples/wgbrass.sco
-share/doc/csound5/examples/wgclar.orc
-share/doc/csound5/examples/wgclar.sco
-share/doc/csound5/examples/wgflute.orc
-share/doc/csound5/examples/wgflute.sco
-share/doc/csound5/examples/wgpluck.orc
-share/doc/csound5/examples/wgpluck.sco
-share/doc/csound5/examples/wgpluck2.orc
-share/doc/csound5/examples/wgpluck2.sco
-share/doc/csound5/examples/wgpluck_brighter.orc
-share/doc/csound5/examples/wgpluck_brighter.sco
-share/doc/csound5/examples/wguide1.orc
-share/doc/csound5/examples/wguide1.sco
-share/doc/csound5/examples/wterrain.orc
-share/doc/csound5/examples/wterrain.sco
-share/doc/csound5/examples/xyin.orc
-share/doc/csound5/examples/xyin.sco
-share/doc/csound5/examples/zacl.orc
-share/doc/csound5/examples/zacl.sco
-share/doc/csound5/examples/zakinit.orc
-share/doc/csound5/examples/zakinit.sco
-share/doc/csound5/examples/zamod.orc
-share/doc/csound5/examples/zamod.sco
-share/doc/csound5/examples/zar.orc
-share/doc/csound5/examples/zar.sco
-share/doc/csound5/examples/zarg.orc
-share/doc/csound5/examples/zarg.sco
-share/doc/csound5/examples/zaw.orc
-share/doc/csound5/examples/zaw.sco
-share/doc/csound5/examples/zawm.orc
-share/doc/csound5/examples/zawm.sco
-share/doc/csound5/examples/zir.orc
-share/doc/csound5/examples/zir.sco
-share/doc/csound5/examples/ziw.orc
-share/doc/csound5/examples/ziw.sco
-share/doc/csound5/examples/ziwm.orc
-share/doc/csound5/examples/ziwm.sco
-share/doc/csound5/examples/zkcl.orc
-share/doc/csound5/examples/zkcl.sco
-share/doc/csound5/examples/zkmod.orc
-share/doc/csound5/examples/zkmod.sco
-share/doc/csound5/examples/zkr.orc
-share/doc/csound5/examples/zkr.sco
-share/doc/csound5/examples/zkw.orc
-share/doc/csound5/examples/zkw.sco
-share/doc/csound5/examples/zkwm.orc
-share/doc/csound5/examples/zkwm.sco
-share/doc/csound5/exitnow.html
-share/doc/csound5/exp.html
-share/doc/csound5/expon.html
-share/doc/csound5/exprand.html
-share/doc/csound5/expseg.html
-share/doc/csound5/expsega.html
-share/doc/csound5/expsegr.html
-share/doc/csound5/f.html
-share/doc/csound5/featuresOfCsoundVST.html
-share/doc/csound5/filelen.html
-share/doc/csound5/filenchnls.html
-share/doc/csound5/filepeak.html
-share/doc/csound5/filesr.html
-share/doc/csound5/filter2.html
-share/doc/csound5/fin.html
-share/doc/csound5/fini.html
-share/doc/csound5/fink.html
-share/doc/csound5/fiopen.html
-share/doc/csound5/flanger.html
-share/doc/csound5/flashtxt.html
-share/doc/csound5/flooper.html
-share/doc/csound5/floor.html
-share/doc/csound5/fluid.html
-share/doc/csound5/fluidAllOut.html
-share/doc/csound5/fluidCCi.html
-share/doc/csound5/fluidCCk.html
-share/doc/csound5/fluidControl.html
-share/doc/csound5/fluidEngine.html
-share/doc/csound5/fluidLoad.html
-share/doc/csound5/fluidNote.html
-share/doc/csound5/fluidOut.html
-share/doc/csound5/fluidProgramSelect.html
-share/doc/csound5/fmb3.html
-share/doc/csound5/fmbell.html
-share/doc/csound5/fmmetal.html
-share/doc/csound5/fmpercfl.html
-share/doc/csound5/fmrhode.html
-share/doc/csound5/fmvoice.html
-share/doc/csound5/fmwurlie.html
-share/doc/csound5/fof.html
-share/doc/csound5/fof2.html
-share/doc/csound5/fofilter.html
-share/doc/csound5/fog.html
-share/doc/csound5/fold.html
-share/doc/csound5/follow.html
-share/doc/csound5/follow2.html
-share/doc/csound5/foscil.html
-share/doc/csound5/foscili.html
-share/doc/csound5/fout.html
-share/doc/csound5/fouti.html
-share/doc/csound5/foutir.html
-share/doc/csound5/foutk.html
-share/doc/csound5/fprintks.html
-share/doc/csound5/fprints.html
-share/doc/csound5/frac.html
-share/doc/csound5/freeverb.html
-share/doc/csound5/ftchnls.html
-share/doc/csound5/ftconv.html
-share/doc/csound5/ftfree.html
-share/doc/csound5/ftgen.html
-share/doc/csound5/ftgentmp.html
-share/doc/csound5/ftlen.html
-share/doc/csound5/ftload.html
-share/doc/csound5/ftloadk.html
-share/doc/csound5/ftlptim.html
-share/doc/csound5/ftmorf.html
-share/doc/csound5/ftsave.html
-share/doc/csound5/ftsavek.html
-share/doc/csound5/ftsr.html
-share/doc/csound5/gain.html
-share/doc/csound5/gauss.html
-share/doc/csound5/gbuzz.html
-share/doc/csound5/gogobel.html
-share/doc/csound5/goto.html
-share/doc/csound5/grain.html
-share/doc/csound5/grain2.html
-share/doc/csound5/grain3.html
-share/doc/csound5/granule.html
-share/doc/csound5/greaterequal.html
-share/doc/csound5/greaterthan.html
-share/doc/csound5/guiro.html
-share/doc/csound5/harmon.html
-share/doc/csound5/hetro.html
-share/doc/csound5/hilbert.html
-share/doc/csound5/hrtfer.html
-share/doc/csound5/hsboscil.html
-share/doc/csound5/i.html
-share/doc/csound5/ibetarand.html
-share/doc/csound5/ibexprnd.html
-share/doc/csound5/icauchy.html
-share/doc/csound5/ictrl14.html
-share/doc/csound5/ictrl21.html
-share/doc/csound5/ictrl7.html
-share/doc/csound5/iexprand.html
-share/doc/csound5/if.html
-share/doc/csound5/ifdef.html
-share/doc/csound5/igauss.html
-share/doc/csound5/igoto.html
-share/doc/csound5/ihold.html
-share/doc/csound5/ilinrand.html
-share/doc/csound5/images/adsr.png
-share/doc/csound5/images/blank.png
-share/doc/csound5/images/callouts/1.png
-share/doc/csound5/images/callouts/10.png
-share/doc/csound5/images/callouts/11.png
-share/doc/csound5/images/callouts/12.png
-share/doc/csound5/images/callouts/13.png
-share/doc/csound5/images/callouts/14.png
-share/doc/csound5/images/callouts/15.png
-share/doc/csound5/images/callouts/2.png
-share/doc/csound5/images/callouts/3.png
-share/doc/csound5/images/callouts/4.png
-share/doc/csound5/images/callouts/5.png
-share/doc/csound5/images/callouts/6.png
-share/doc/csound5/images/callouts/7.png
-share/doc/csound5/images/callouts/8.png
-share/doc/csound5/images/callouts/9.png
-share/doc/csound5/images/caution.gif
-share/doc/csound5/images/caution.png
-share/doc/csound5/images/delayk.png
-share/doc/csound5/images/draft.png
-share/doc/csound5/images/flanger.png
-share/doc/csound5/images/flbutbank.png
-share/doc/csound5/images/flbutton.png
-share/doc/csound5/images/flcount.png
-share/doc/csound5/images/flknob_3d.png
-share/doc/csound5/images/flknob_clock.png
-share/doc/csound5/images/flknob_flat.png
-share/doc/csound5/images/flknob_pie.png
-share/doc/csound5/images/flpack.png
-share/doc/csound5/images/flpanel.png
-share/doc/csound5/images/flroller.png
-share/doc/csound5/images/flscroll.png
-share/doc/csound5/images/flslider_horizontal-engraved.png
-share/doc/csound5/images/flslider_horizontal-fill.png
-share/doc/csound5/images/flslider_horizontal-nice.png
-share/doc/csound5/images/fltabs.png
-share/doc/csound5/images/fltabs_joysticks-tab.png
-share/doc/csound5/images/fltabs_rollers-tab.png
-share/doc/csound5/images/fltabs_sliders-tab.png
-share/doc/csound5/images/fltext.png
-share/doc/csound5/images/gen01.png
-share/doc/csound5/images/gen02.png
-share/doc/csound5/images/gen03.png
-share/doc/csound5/images/gen05.png
-share/doc/csound5/images/gen06.png
-share/doc/csound5/images/gen07.png
-share/doc/csound5/images/gen08.png
-share/doc/csound5/images/gen09.png
-share/doc/csound5/images/gen09square.png
-share/doc/csound5/images/gen10.png
-share/doc/csound5/images/gen11.png
-share/doc/csound5/images/gen12.png
-share/doc/csound5/images/gen13.png
-share/doc/csound5/images/gen14.png
-share/doc/csound5/images/gen19.png
-share/doc/csound5/images/grain2_rand-448x289.png
-share/doc/csound5/images/grain3_2.png
-share/doc/csound5/images/home.gif
-share/doc/csound5/images/home.png
-share/doc/csound5/images/image1.png
-share/doc/csound5/images/image2.png
-share/doc/csound5/images/image3.png
-share/doc/csound5/images/image4.png
-share/doc/csound5/images/image5.png
-share/doc/csound5/images/image6.png
-share/doc/csound5/images/image7.png
-share/doc/csound5/images/image8.png
-share/doc/csound5/images/imode1.png
-share/doc/csound5/images/imode2.png
-share/doc/csound5/images/imode3.png
-share/doc/csound5/images/important.gif
-share/doc/csound5/images/important.png
-share/doc/csound5/images/next.gif
-share/doc/csound5/images/next.png
-share/doc/csound5/images/note.gif
-share/doc/csound5/images/note.png
-share/doc/csound5/images/prev.gif
-share/doc/csound5/images/prev.png
-share/doc/csound5/images/rnd31_rand.png
-share/doc/csound5/images/sfr2.png
-share/doc/csound5/images/symbols.png
-share/doc/csound5/images/tip.gif
-share/doc/csound5/images/tip.png
-share/doc/csound5/images/toc-blank.gif
-share/doc/csound5/images/toc-blank.png
-share/doc/csound5/images/toc-minus.gif
-share/doc/csound5/images/toc-minus.png
-share/doc/csound5/images/toc-plus.gif
-share/doc/csound5/images/toc-plus.png
-share/doc/csound5/images/up.gif
-share/doc/csound5/images/up.png
-share/doc/csound5/images/v5_0.png
-share/doc/csound5/images/warning.gif
-share/doc/csound5/images/warning.png
-share/doc/csound5/images/wguide1.png
-share/doc/csound5/images/wguide2.png
-share/doc/csound5/imidic14.html
-share/doc/csound5/imidic21.html
-share/doc/csound5/imidic7.html
-share/doc/csound5/in.html
-share/doc/csound5/in32.html
-share/doc/csound5/inch.html
-share/doc/csound5/include.html
-share/doc/csound5/index.html
-share/doc/csound5/inh.html
-share/doc/csound5/init.html
-share/doc/csound5/initc14.html
-share/doc/csound5/initc21.html
-share/doc/csound5/initc7.html
-share/doc/csound5/ino.html
-share/doc/csound5/inq.html
-share/doc/csound5/ins.html
-share/doc/csound5/installing.html
-share/doc/csound5/instimek.html
-share/doc/csound5/instimes.html
-share/doc/csound5/instr.html
-share/doc/csound5/int.html
-share/doc/csound5/integ.html
-share/doc/csound5/interp.html
-share/doc/csound5/invalue.html
-share/doc/csound5/inx.html
-share/doc/csound5/inz.html
-share/doc/csound5/ioff.html
-share/doc/csound5/ion.html
-share/doc/csound5/iondur.html
-share/doc/csound5/iondur2.html
-share/doc/csound5/ioutat.html
-share/doc/csound5/ioutc.html
-share/doc/csound5/ioutc14.html
-share/doc/csound5/ioutpat.html
-share/doc/csound5/ioutpb.html
-share/doc/csound5/ioutpc.html
-share/doc/csound5/ipcauchy.html
-share/doc/csound5/ipoisson.html
-share/doc/csound5/ipow.html
-share/doc/csound5/is16b14.html
-share/doc/csound5/is32b14.html
-share/doc/csound5/islider16.html
-share/doc/csound5/islider32.html
-share/doc/csound5/islider64.html
-share/doc/csound5/islider8.html
-share/doc/csound5/itablecopy.html
-share/doc/csound5/itablegpw.html
-share/doc/csound5/itablemix.html
-share/doc/csound5/itablew.html
-share/doc/csound5/itrirand.html
-share/doc/csound5/iunirand.html
-share/doc/csound5/iweibull.html
-share/doc/csound5/jitter.html
-share/doc/csound5/jitter2.html
-share/doc/csound5/jspline.html
-share/doc/csound5/kbetarand.html
-share/doc/csound5/kbexprnd.html
-share/doc/csound5/kcauchy.html
-share/doc/csound5/kdump.html
-share/doc/csound5/kdump2.html
-share/doc/csound5/kdump3.html
-share/doc/csound5/kdump4.html
-share/doc/csound5/kexprand.html
-share/doc/csound5/kfilter2.html
-share/doc/csound5/kgauss.html
-share/doc/csound5/kgoto.html
-share/doc/csound5/klinrand.html
-share/doc/csound5/kon.html
-share/doc/csound5/koutat.html
-share/doc/csound5/koutc.html
-share/doc/csound5/koutc14.html
-share/doc/csound5/koutpat.html
-share/doc/csound5/koutpb.html
-share/doc/csound5/koutpc.html
-share/doc/csound5/kpcauchy.html
-share/doc/csound5/kpoisson.html
-share/doc/csound5/kpow.html
-share/doc/csound5/kr.html
-share/doc/csound5/kread.html
-share/doc/csound5/kread2.html
-share/doc/csound5/kread3.html
-share/doc/csound5/kread4.html
-share/doc/csound5/ksmps.html
-share/doc/csound5/ktableseg.html
-share/doc/csound5/ktrirand.html
-share/doc/csound5/kunirand.html
-share/doc/csound5/kweibull.html
-share/doc/csound5/lessequal.html
-share/doc/csound5/lessthan.html
-share/doc/csound5/lfo.html
-share/doc/csound5/limit.html
-share/doc/csound5/line.html
-share/doc/csound5/linen.html
-share/doc/csound5/linenr.html
-share/doc/csound5/lineto.html
-share/doc/csound5/linrand.html
-share/doc/csound5/linseg.html
-share/doc/csound5/linsegr.html
-share/doc/csound5/locsend.html
-share/doc/csound5/locsig.html
-share/doc/csound5/log.html
-share/doc/csound5/log10.html
-share/doc/csound5/logbtwo.html
-share/doc/csound5/loop.html
-share/doc/csound5/loopseg.html
-share/doc/csound5/loopsegp.html
-share/doc/csound5/lorenz.html
-share/doc/csound5/loris.html
-share/doc/csound5/lorismorph.html
-share/doc/csound5/lorisplay.html
-share/doc/csound5/lorisread.html
-share/doc/csound5/loscil.html
-share/doc/csound5/loscil3.html
-share/doc/csound5/lowpass2.html
-share/doc/csound5/lowres.html
-share/doc/csound5/lowresx.html
-share/doc/csound5/lpanal.html
-share/doc/csound5/lpf18.html
-share/doc/csound5/lpfreson.html
-share/doc/csound5/lphasor.html
-share/doc/csound5/lpinterp.html
-share/doc/csound5/lposcil.html
-share/doc/csound5/lposcil3.html
-share/doc/csound5/lpread.html
-share/doc/csound5/lpreson.html
-share/doc/csound5/lpshold.html
-share/doc/csound5/lpsholdp.html
-share/doc/csound5/lpslot.html
-share/doc/csound5/m.html
-share/doc/csound5/mac.html
-share/doc/csound5/maca.html
-share/doc/csound5/madsr.html
-share/doc/csound5/makecsd.html
-share/doc/csound5/mandel.html
-share/doc/csound5/mandol.html
-share/doc/csound5/marimba.html
-share/doc/csound5/massign.html
-share/doc/csound5/max.html
-share/doc/csound5/max_k.html
-share/doc/csound5/maxabs.html
-share/doc/csound5/maxabsaccum.html
-share/doc/csound5/maxaccum.html
-share/doc/csound5/maxalloc.html
-share/doc/csound5/mclock.html
-share/doc/csound5/mdelay.html
-share/doc/csound5/metro.html
-share/doc/csound5/midic14.html
-share/doc/csound5/midic21.html
-share/doc/csound5/midic7.html
-share/doc/csound5/midichannelaftertouch.html
-share/doc/csound5/midichn.html
-share/doc/csound5/midicontrolchange.html
-share/doc/csound5/midictrl.html
-share/doc/csound5/mididefault.html
-share/doc/csound5/midiin.html
-share/doc/csound5/midinoteoff.html
-share/doc/csound5/midinoteoncps.html
-share/doc/csound5/midinoteonkey.html
-share/doc/csound5/midinoteonoct.html
-share/doc/csound5/midinoteonpch.html
-share/doc/csound5/midion.html
-share/doc/csound5/midion2.html
-share/doc/csound5/midiout.html
-share/doc/csound5/midipitchbend.html
-share/doc/csound5/midipolyaftertouch.html
-share/doc/csound5/midiprogramchange.html
-share/doc/csound5/miditempo.html
-share/doc/csound5/min.html
-share/doc/csound5/minabs.html
-share/doc/csound5/minabsaccum.html
-share/doc/csound5/minaccum.html
-share/doc/csound5/mirror.html
-share/doc/csound5/modulus.html
-share/doc/csound5/moog.html
-share/doc/csound5/moogladder.html
-share/doc/csound5/moogvcf.html
-share/doc/csound5/moscil.html
-share/doc/csound5/mpulse.html
-share/doc/csound5/mrtmsg.html
-share/doc/csound5/mult.html
-share/doc/csound5/multiplies.html
-share/doc/csound5/multitap.html
-share/doc/csound5/mute.html
-share/doc/csound5/mxadsr.html
-share/doc/csound5/n.html
-share/doc/csound5/nchnls.html
-share/doc/csound5/nestedap.html
-share/doc/csound5/newFeaturesInCsound5.html
-share/doc/csound5/nlfilt.html
-share/doc/csound5/noise.html
-share/doc/csound5/noteoff.html
-share/doc/csound5/noteon.html
-share/doc/csound5/noteondur.html
-share/doc/csound5/noteondur2.html
-share/doc/csound5/notequal.html
-share/doc/csound5/notnum.html
-share/doc/csound5/nreverb.html
-share/doc/csound5/nrpn.html
-share/doc/csound5/nsamp.html
-share/doc/csound5/nstrnum.html
-share/doc/csound5/ntrpol.html
-share/doc/csound5/octave.html
-share/doc/csound5/octcps.html
-share/doc/csound5/octmidi.html
-share/doc/csound5/octmidib.html
-share/doc/csound5/octpch.html
-share/doc/csound5/opa.html
-share/doc/csound5/opand.html
-share/doc/csound5/opbitand.html
-share/doc/csound5/opbitnot.html
-share/doc/csound5/opbitor.html
-share/doc/csound5/opcode.html
-share/doc/csound5/opi.html
-share/doc/csound5/opk.html
-share/doc/csound5/opnonequiv.html
-share/doc/csound5/opor.html
-share/doc/csound5/oscbnk.html
-share/doc/csound5/oscil.html
-share/doc/csound5/oscil1.html
-share/doc/csound5/oscil1i.html
-share/doc/csound5/oscil3.html
-share/doc/csound5/oscili.html
-share/doc/csound5/oscilikt.html
-share/doc/csound5/osciliktp.html
-share/doc/csound5/oscilikts.html
-share/doc/csound5/osciln.html
-share/doc/csound5/oscils.html
-share/doc/csound5/oscilx.html
-share/doc/csound5/out.html
-share/doc/csound5/out32.html
-share/doc/csound5/outc.html
-share/doc/csound5/outch.html
-share/doc/csound5/outh.html
-share/doc/csound5/outiat.html
-share/doc/csound5/outic.html
-share/doc/csound5/outic14.html
-share/doc/csound5/outipat.html
-share/doc/csound5/outipb.html
-share/doc/csound5/outipc.html
-share/doc/csound5/outkat.html
-share/doc/csound5/outkc.html
-share/doc/csound5/outkc14.html
-share/doc/csound5/outkpat.html
-share/doc/csound5/outkpb.html
-share/doc/csound5/outkpc.html
-share/doc/csound5/outo.html
-share/doc/csound5/outq.html
-share/doc/csound5/outq1.html
-share/doc/csound5/outq2.html
-share/doc/csound5/outq3.html
-share/doc/csound5/outq4.html
-share/doc/csound5/outs.html
-share/doc/csound5/outs1.html
-share/doc/csound5/outs2.html
-share/doc/csound5/outvalue.html
-share/doc/csound5/outx.html
-share/doc/csound5/outz.html
-share/doc/csound5/p.html
-share/doc/csound5/pan.html
-share/doc/csound5/pareq.html
-share/doc/csound5/partials.html
-share/doc/csound5/pcauchy.html
-share/doc/csound5/pchbend.html
-share/doc/csound5/pchmidi.html
-share/doc/csound5/pchmidib.html
-share/doc/csound5/pchoct.html
-share/doc/csound5/pconvolve.html
-share/doc/csound5/peak.html
-share/doc/csound5/peakk.html
-share/doc/csound5/pgmassign.html
-share/doc/csound5/phaser1.html
-share/doc/csound5/phaser2.html
-share/doc/csound5/phasor.html
-share/doc/csound5/phasorbnk.html
-share/doc/csound5/pinkish.html
-share/doc/csound5/pitch.html
-share/doc/csound5/pitchamdf.html
-share/doc/csound5/planet.html
-share/doc/csound5/pluck.html
-share/doc/csound5/poisson.html
-share/doc/csound5/polyaft.html
-share/doc/csound5/port.html
-share/doc/csound5/portk.html
-share/doc/csound5/poscil.html
-share/doc/csound5/poscil3.html
-share/doc/csound5/pow.html
-share/doc/csound5/powoftwo.html
-share/doc/csound5/prealloc.html
-share/doc/csound5/print.html
-share/doc/csound5/printf.html
-share/doc/csound5/printk.html
-share/doc/csound5/printk2.html
-share/doc/csound5/printks.html
-share/doc/csound5/prints.html
-share/doc/csound5/product.html
-share/doc/csound5/pset.html
-share/doc/csound5/puts.html
-share/doc/csound5/pvadd.html
-share/doc/csound5/pvanal.html
-share/doc/csound5/pvbufread.html
-share/doc/csound5/pvcross.html
-share/doc/csound5/pvinterp.html
-share/doc/csound5/pvlook.html
-share/doc/csound5/pvoc.html
-share/doc/csound5/pvread.html
-share/doc/csound5/pvsadsyn.html
-share/doc/csound5/pvsanal.html
-share/doc/csound5/pvsarp.html
-share/doc/csound5/pvsblur.html
-share/doc/csound5/pvscale.html
-share/doc/csound5/pvscent.html
-share/doc/csound5/pvscross.html
-share/doc/csound5/pvsdemix.html
-share/doc/csound5/pvsfilter.html
-share/doc/csound5/pvsfread.html
-share/doc/csound5/pvsftr.html
-share/doc/csound5/pvsftw.html
-share/doc/csound5/pvshift.html
-share/doc/csound5/pvsifd.html
-share/doc/csound5/pvsinfo.html
-share/doc/csound5/pvsinit.html
-share/doc/csound5/pvsmaska.html
-share/doc/csound5/pvsmix.html
-share/doc/csound5/pvstencil.html
-share/doc/csound5/pvsvoc.html
-share/doc/csound5/pvsynth.html
-share/doc/csound5/py.html
-share/doc/csound5/pyassign.html
-share/doc/csound5/pycall.html
-share/doc/csound5/pyeval.html
-share/doc/csound5/pyexec.html
-share/doc/csound5/pyinit.html
-share/doc/csound5/pyrun.html
-share/doc/csound5/q.html
-share/doc/csound5/r.html
-share/doc/csound5/raises.html
-share/doc/csound5/rand.html
-share/doc/csound5/randh.html
-share/doc/csound5/randi.html
-share/doc/csound5/random.html
-share/doc/csound5/randomh.html
-share/doc/csound5/randomi.html
-share/doc/csound5/rbjeq.html
-share/doc/csound5/readclock.html
-share/doc/csound5/readk.html
-share/doc/csound5/readk2.html
-share/doc/csound5/readk3.html
-share/doc/csound5/readk4.html
-share/doc/csound5/recentDevelopments.html
-share/doc/csound5/reinit.html
-share/doc/csound5/release.html
-share/doc/csound5/repluck.html
-share/doc/csound5/reson.html
-share/doc/csound5/resonk.html
-share/doc/csound5/resonr.html
-share/doc/csound5/resonx.html
-share/doc/csound5/resonxk.html
-share/doc/csound5/resony.html
-share/doc/csound5/resonz.html
-share/doc/csound5/resyn.html
-share/doc/csound5/reverb.html
-share/doc/csound5/reverb2.html
-share/doc/csound5/reverbsc.html
-share/doc/csound5/rezzy.html
-share/doc/csound5/rigoto.html
-share/doc/csound5/rireturn.html
-share/doc/csound5/rms.html
-share/doc/csound5/rnd.html
-share/doc/csound5/rnd31.html
-share/doc/csound5/round.html
-share/doc/csound5/rspline.html
-share/doc/csound5/rtclock.html
-share/doc/csound5/s.html
-share/doc/csound5/s16b14.html
-share/doc/csound5/s32b14.html
-share/doc/csound5/samphold.html
-share/doc/csound5/sandpaper.html
-share/doc/csound5/scanhammer.html
-share/doc/csound5/scans.html
-share/doc/csound5/scantable.html
-share/doc/csound5/scanu.html
-share/doc/csound5/schedkwhen.html
-share/doc/csound5/schedkwhennamed.html
-share/doc/csound5/schedule.html
-share/doc/csound5/schedwhen.html
-share/doc/csound5/sdif2ad.html
-share/doc/csound5/seed.html
-share/doc/csound5/sekere.html
-share/doc/csound5/semitone.html
-share/doc/csound5/sense.html
-share/doc/csound5/sensekey.html
-share/doc/csound5/seqtime.html
-share/doc/csound5/seqtime2.html
-share/doc/csound5/setctrl.html
-share/doc/csound5/setksmps.html
-share/doc/csound5/sfilist.html
-share/doc/csound5/sfinstr.html
-share/doc/csound5/sfinstr3.html
-share/doc/csound5/sfinstr3m.html
-share/doc/csound5/sfinstrm.html
-share/doc/csound5/sfload.html
-share/doc/csound5/sfpassign.html
-share/doc/csound5/sfplay.html
-share/doc/csound5/sfplay3.html
-share/doc/csound5/sfplay3m.html
-share/doc/csound5/sfplaym.html
-share/doc/csound5/sfplist.html
-share/doc/csound5/sfpreset.html
-share/doc/csound5/shaker.html
-share/doc/csound5/sin.html
-share/doc/csound5/sinh.html
-share/doc/csound5/sininv.html
-share/doc/csound5/sinsyn.html
-share/doc/csound5/sleighbells.html
-share/doc/csound5/slider16.html
-share/doc/csound5/slider16f.html
-share/doc/csound5/slider32.html
-share/doc/csound5/slider32f.html
-share/doc/csound5/slider64.html
-share/doc/csound5/slider64f.html
-share/doc/csound5/slider8.html
-share/doc/csound5/slider8f.html
-share/doc/csound5/sndinfo.html
-share/doc/csound5/sndloop.html
-share/doc/csound5/sndwarp.html
-share/doc/csound5/sndwarpst.html
-share/doc/csound5/soundin.html
-share/doc/csound5/soundout.html
-share/doc/csound5/soundouts.html
-share/doc/csound5/space.html
-share/doc/csound5/spat3d.html
-share/doc/csound5/spat3di.html
-share/doc/csound5/spat3dt.html
-share/doc/csound5/spdist.html
-share/doc/csound5/specaddm.html
-share/doc/csound5/specdiff.html
-share/doc/csound5/specdisp.html
-share/doc/csound5/specfilt.html
-share/doc/csound5/spechist.html
-share/doc/csound5/specptrk.html
-share/doc/csound5/specscal.html
-share/doc/csound5/specsum.html
-share/doc/csound5/spectrum.html
-share/doc/csound5/splitrig.html
-share/doc/csound5/sprintf.html
-share/doc/csound5/spsend.html
-share/doc/csound5/sqrt.html
-share/doc/csound5/sr.html
-share/doc/csound5/srconv.html
-share/doc/csound5/statevar.html
-share/doc/csound5/stix.html
-share/doc/csound5/strcat.html
-share/doc/csound5/strcmp.html
-share/doc/csound5/strcpy.html
-share/doc/csound5/streson.html
-share/doc/csound5/strget.html
-share/doc/csound5/stringconvert.html
-share/doc/csound5/strset.html
-share/doc/csound5/strtod.html
-share/doc/csound5/strtodk.html
-share/doc/csound5/strtol.html
-share/doc/csound5/strtolk.html
-share/doc/csound5/subinstr.html
-share/doc/csound5/subinstrinit.html
-share/doc/csound5/subtracts.html
-share/doc/csound5/sum.html
-share/doc/csound5/svfilter.html
-share/doc/csound5/syncgrain.html
-share/doc/csound5/t.html
-share/doc/csound5/tab.html
-share/doc/csound5/table.html
-share/doc/csound5/table3.html
-share/doc/csound5/tablecopy.html
-share/doc/csound5/tablegpw.html
-share/doc/csound5/tablei.html
-share/doc/csound5/tableicopy.html
-share/doc/csound5/tableigpw.html
-share/doc/csound5/tableikt.html
-share/doc/csound5/tableimix.html
-share/doc/csound5/tableiw.html
-share/doc/csound5/tablekt.html
-share/doc/csound5/tablemix.html
-share/doc/csound5/tableng.html
-share/doc/csound5/tablera.html
-share/doc/csound5/tableseg.html
-share/doc/csound5/tablew.html
-share/doc/csound5/tablewa.html
-share/doc/csound5/tablewkt.html
-share/doc/csound5/tablexkt.html
-share/doc/csound5/tablexseg.html
-share/doc/csound5/tabrec.html
-share/doc/csound5/tambourine.html
-share/doc/csound5/tan.html
-share/doc/csound5/tanh.html
-share/doc/csound5/taninv.html
-share/doc/csound5/taninv2.html
-share/doc/csound5/tb.html
-share/doc/csound5/tbvcf.html
-share/doc/csound5/tempest.html
-share/doc/csound5/tempo.html
-share/doc/csound5/tempoval.html
-share/doc/csound5/tigoto.html
-share/doc/csound5/timedseq.html
-share/doc/csound5/timeinstk.html
-share/doc/csound5/timeinsts.html
-share/doc/csound5/timek.html
-share/doc/csound5/times.html
-share/doc/csound5/timout.html
-share/doc/csound5/tival.html
-share/doc/csound5/tlineto.html
-share/doc/csound5/tone.html
-share/doc/csound5/tonek.html
-share/doc/csound5/tonex.html
-share/doc/csound5/tradsyn.html
-share/doc/csound5/transeg.html
-share/doc/csound5/trcross.html
-share/doc/csound5/trfilter.html
-share/doc/csound5/trhighest.html
-share/doc/csound5/trigger.html
-share/doc/csound5/trigseq.html
-share/doc/csound5/trirand.html
-share/doc/csound5/trlowest.html
-share/doc/csound5/trmix.html
-share/doc/csound5/trscale.html
-share/doc/csound5/trshift.html
-share/doc/csound5/trsplit.html
-share/doc/csound5/turnoff.html
-share/doc/csound5/turnoff2.html
-share/doc/csound5/turnon.html
-share/doc/csound5/undef.html
-share/doc/csound5/unirand.html
-share/doc/csound5/upsamp.html
-share/doc/csound5/urd.html
-share/doc/csound5/using.html
-share/doc/csound5/v.html
-share/doc/csound5/vadd.html
-share/doc/csound5/vaddv.html
-share/doc/csound5/valpass.html
-share/doc/csound5/vbap16.html
-share/doc/csound5/vbap16move.html
-share/doc/csound5/vbap4.html
-share/doc/csound5/vbap4move.html
-share/doc/csound5/vbap8.html
-share/doc/csound5/vbap8move.html
-share/doc/csound5/vbaplsinit.html
-share/doc/csound5/vbapz.html
-share/doc/csound5/vbapzmove.html
-share/doc/csound5/vcella.html
-share/doc/csound5/vco.html
-share/doc/csound5/vco2.html
-share/doc/csound5/vco2ft.html
-share/doc/csound5/vco2ift.html
-share/doc/csound5/vco2init.html
-share/doc/csound5/vcomb.html
-share/doc/csound5/vcopy.html
-share/doc/csound5/vcopy_i.html
-share/doc/csound5/vdelay.html
-share/doc/csound5/vdelay3.html
-share/doc/csound5/vdelayk.html
-share/doc/csound5/vdelayx.html
-share/doc/csound5/vdelayxq.html
-share/doc/csound5/vdelayxs.html
-share/doc/csound5/vdelayxw.html
-share/doc/csound5/vdelayxwq.html
-share/doc/csound5/vdelayxws.html
-share/doc/csound5/vdivv.html
-share/doc/csound5/vecdelay.html
-share/doc/csound5/vectorial.html
-share/doc/csound5/vectorialdelay.html
-share/doc/csound5/vectorialimiting.html
-share/doc/csound5/vectorialrandom.html
-share/doc/csound5/vectorialscalar.html
-share/doc/csound5/vectorialvectorial.html
-share/doc/csound5/veloc.html
-share/doc/csound5/vexp.html
-share/doc/csound5/vexpseg.html
-share/doc/csound5/vexpv.html
-share/doc/csound5/vibes.html
-share/doc/csound5/vibr.html
-share/doc/csound5/vibrato.html
-share/doc/csound5/vincr.html
-share/doc/csound5/vlimit.html
-share/doc/csound5/vlinseg.html
-share/doc/csound5/vlowres.html
-share/doc/csound5/vmap.html
-share/doc/csound5/vmirror.html
-share/doc/csound5/vmult.html
-share/doc/csound5/vmultv.html
-share/doc/csound5/voice.html
-share/doc/csound5/vport.html
-share/doc/csound5/vpow.html
-share/doc/csound5/vpowv.html
-share/doc/csound5/vpvoc.html
-share/doc/csound5/vrandh.html
-share/doc/csound5/vrandi.html
-share/doc/csound5/vst4cs.html
-share/doc/csound5/vstaudio.html
-share/doc/csound5/vstbankload.html
-share/doc/csound5/vstedit.html
-share/doc/csound5/vstinfo.html
-share/doc/csound5/vstinit.html
-share/doc/csound5/vstmidiout.html
-share/doc/csound5/vstnote.html
-share/doc/csound5/vstparamset.html
-share/doc/csound5/vstprogset.html
-share/doc/csound5/vsubv.html
-share/doc/csound5/vtaba.html
-share/doc/csound5/vtabi.html
-share/doc/csound5/vtabk.html
-share/doc/csound5/vtablea.html
-share/doc/csound5/vtablei.html
-share/doc/csound5/vtablek.html
-share/doc/csound5/vtablewa.html
-share/doc/csound5/vtablewi.html
-share/doc/csound5/vtablewk.html
-share/doc/csound5/vtabwa.html
-share/doc/csound5/vtabwi.html
-share/doc/csound5/vtabwk.html
-share/doc/csound5/vwrap.html
-share/doc/csound5/waveset.html
-share/doc/csound5/weibull.html
-share/doc/csound5/wgbow.html
-share/doc/csound5/wgbowedbar.html
-share/doc/csound5/wgbrass.html
-share/doc/csound5/wgclar.html
-share/doc/csound5/wgflute.html
-share/doc/csound5/wgpluck.html
-share/doc/csound5/wgpluck2.html
-share/doc/csound5/wguide1.html
-share/doc/csound5/wguide2.html
-share/doc/csound5/wrap.html
-share/doc/csound5/wterrain.html
-share/doc/csound5/x.html
-share/doc/csound5/xadsr.html
-share/doc/csound5/xin.html
-share/doc/csound5/xout.html
-share/doc/csound5/xscanmap.html
-share/doc/csound5/xscans.html
-share/doc/csound5/xscansmap.html
-share/doc/csound5/xscanu.html
-share/doc/csound5/xtratim.html
-share/doc/csound5/xyin.html
-share/doc/csound5/zacl.html
-share/doc/csound5/zakinit.html
-share/doc/csound5/zamod.html
-share/doc/csound5/zar.html
-share/doc/csound5/zarg.html
-share/doc/csound5/zaw.html
-share/doc/csound5/zawm.html
-share/doc/csound5/zfilter2.html
-share/doc/csound5/zir.html
-share/doc/csound5/ziw.html
-share/doc/csound5/ziwm.html
-share/doc/csound5/zkcl.html
-share/doc/csound5/zkmod.html
-share/doc/csound5/zkr.html
-share/doc/csound5/zkw.html
-share/doc/csound5/zkwm.html
-@dirrm share/doc/csound5/images/callouts
-@dirrm share/doc/csound5/images
-@dirrm share/doc/csound5/examples
-@dirrm share/doc/csound5
diff --git a/audio/csound5-manual/distinfo b/audio/csound5-manual/distinfo
deleted file mode 100644
index 006d2940bcb..00000000000
--- a/audio/csound5-manual/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/21 22:51:05 ben Exp $
-
-SHA1 (csound5-manual-5.01/Csound5.01_manual_html.zip) = c861123744619b4b611b7573a9cfcfd424f9b74f
-RMD160 (csound5-manual-5.01/Csound5.01_manual_html.zip) = af7e21224f848575ffe0cc32173aebb7e537db97
-Size (csound5-manual-5.01/Csound5.01_manual_html.zip) = 3595855 bytes
diff --git a/audio/csound5/DESCR b/audio/csound5/DESCR
deleted file mode 100644
index 909beaee389..00000000000
--- a/audio/csound5/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Csound is a software synthesis package in the tradition of so-called
-music-N languages, among which the best-known is Music V. It consists
-of an orchestra- and score-driven executable, written in C for
-portability. Since Csound is a computational language, it is highly
-flexible and efficient; complexity is gained only at the expense of
-computation time. Basically Csound reads some files and creates the
-result as a file on disk or, on faster machines, through a DAC in real
-time.
diff --git a/audio/csound5/Makefile b/audio/csound5/Makefile
deleted file mode 100644
index ef93b191757..00000000000
--- a/audio/csound5/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2007/02/22 19:26:05 wiz Exp $
-#
-
-DISTNAME= Csound${CSOUND_VERSION}_src
-PKGNAME= csound5-${CSOUND_VERSION}
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=csound/}
-WRKSRC= ${WRKDIR}/Csound${CSOUND_VERSION}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://sourceforge.net/projects/csound/
-COMMENT= Software synthesizer and sequencer
-
-CSOUND_VERSION= 5.01
-USE_LANGUAGES= c c++
-CFLAGS+= -g -D__PKGSRC_PREFIX__=${PREFIX}/ -DBETA
-BUILD_DEPENDS+= scons>=0.96:../../devel/scons
-NOT_FOR_PLATFORM= *-*-alpha *-*-sparc64 # Severe LP64 problems
-SCONS= ${PREFIX}/bin/scons
-SCONS_ARGS= -C ${WRKSRC} prefix=${PREFIX}
-SCONS_ARGS+= buildDSSI=0 buildLoris=0 buildRelease=1
-SCONS_ARGS+= useALSA=0 useJack=0 useOSC=0 usePortMIDI=0
-SCONS_ARGS+= usePortAudio=0
-SCONS_ENV_FILE= ${WRKDIR}/ugly-pkgsrc-scons-hack.txt
-
-do-build:
- ${ECHO} ${MAKE_ENV:Q} >${SCONS_ENV_FILE}
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONS} ${SCONS_ARGS}
-
-do-install:
- cd ${WRKSRC} && SCONS_ENV="`${CAT} ${SCONS_ENV_FILE}`" && \
- eval "${SETENV} $${SCONS_ENV} ${SCONS} ${SCONS_ARGS} install"
- cd ${PREFIX} && ${LN} -s ../lib/csound5/csound bin/csound5
-
-.include "../../audio/fluidsynth/buildlink3.mk"
-.include "../../audio/libsndfile/buildlink3.mk"
-.include "../../devel/swig/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../lang/python24/buildlink3.mk"
-.include "../../x11/fltk/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/csound5/PLIST b/audio/csound5/PLIST
deleted file mode 100644
index 51978aa5b8c..00000000000
--- a/audio/csound5/PLIST
+++ /dev/null
@@ -1,69 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
-bin/csound5
-include/csound5/CppSound.hpp
-include/csound5/CsoundFile.hpp
-include/csound5/OpcodeBase.hpp
-include/csound5/cfgvar.h
-include/csound5/cscore.h
-include/csound5/csdl.h
-include/csound5/csound.h
-include/csound5/csound.hpp
-include/csound5/csoundCore.h
-include/csound5/cwindow.h
-include/csound5/filebuilding.h
-include/csound5/msg_attr.h
-include/csound5/pstream.h
-include/csound5/pvfileio.h
-include/csound5/soundio.h
-include/csound5/sysdep.h
-include/csound5/text.h
-include/csound5/version.h
-lib/csound5/cs
-lib/csound5/csb64enc
-lib/csound5/csound
-lib/csound5/cvanal
-lib/csound5/dnoise
-lib/csound5/envext
-lib/csound5/extract
-lib/csound5/extractor
-lib/csound5/het_export
-lib/csound5/het_import
-lib/csound5/hetro
-lib/csound5/lpanal
-lib/csound5/lpc_export
-lib/csound5/lpc_import
-lib/csound5/makecsd
-lib/csound5/mixer
-lib/csound5/pvanal
-lib/csound5/pvlook
-lib/csound5/scale
-lib/csound5/scot
-lib/csound5/scsort
-lib/csound5/sndinfo
-lib/csound5/srconv
-lib/csound5/csnd.py
-lib/csound5/plugins/libbabo.so
-lib/csound5/plugins/libbarmodel.so
-lib/csound5/plugins/libfluidOpcodes.so
-lib/csound5/plugins/libftest.so
-lib/csound5/plugins/libgrain4.so
-lib/csound5/plugins/libhrtferX.so
-lib/csound5/plugins/libminmax.so
-lib/csound5/plugins/libmixer.so
-lib/csound5/plugins/libmodal4.so
-lib/csound5/plugins/libphisem.so
-lib/csound5/plugins/libphysmod.so
-lib/csound5/plugins/libpitch.so
-@comment -- portaudio module -- lib/csound5/plugins/librtpa.so
-lib/csound5/plugins/libscansyn.so
-lib/csound5/plugins/libsfont.so
-lib/csound5/plugins/libstdopcod.so
-lib/csound5/plugins/libstdutil.so
-lib/csound5/plugins/libvbap.so
-lib/csound5/plugins/libwidgets.so
-lib/csound5/plugins/opcodes.dir
-lib/csound5/lib_csnd.so
-lib/csound5/libcsound.a
-@dirrm include/csound5
-@dirrm lib/csound5/plugins
-@dirrm lib/csound5
diff --git a/audio/csound5/distinfo b/audio/csound5/distinfo
deleted file mode 100644
index 3dd1e3c5e81..00000000000
--- a/audio/csound5/distinfo
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: distinfo,v 1.4 2007/01/02 12:53:55 rillig Exp $
-
-SHA1 (Csound5.01_src.tar.gz) = b387da9b6c24961397e89ddcedd1229cdfebffe7
-RMD160 (Csound5.01_src.tar.gz) = 24652f8f650464d886f6d537ae991654f475ad4a
-Size (Csound5.01_src.tar.gz) = 2031426 bytes
-SHA1 (patch-ac) = 0ece70604a7d71ece78b5af65420a53adc381d3c
-SHA1 (patch-ad) = 343b5767584cf4ddfbc7664e3234577fe22ff03a
-SHA1 (patch-ae) = 705d56ce7a03cd10763542a9ec71b393474c0595
-SHA1 (patch-af) = 4444b8efe47a401e01718c21197c2b6e19ec548c
-SHA1 (patch-ag) = 2771fdce6a054d96e51dd70df1264fe2cfdcdf58
-SHA1 (patch-ah) = e9978da3a14140f072ca12ca25b4c9a67ea4ede4
-SHA1 (patch-ai) = 4c86c1cd8c6c9ff48cd890255523b08848d56764
-SHA1 (patch-aj) = c22d25d55387c232187259690a43512457e18c54
-SHA1 (patch-ak) = 1f3a7ec113a5185a81fe219d99061afb025bc13b
-SHA1 (patch-al) = 7da1e82a280b6803e2f0f75b8fb1eafbc3206636
-SHA1 (patch-am) = 9770973e54770b9eebcf66c17f90f459e71a71c6
-SHA1 (patch-an) = 7dfbd38a4eca8c7767a53c2b93bb4967344c0f0e
-SHA1 (patch-ao) = 64ee0a2a70dd317c992088212bc3f241f6296113
-SHA1 (patch-ap) = 9229c0166b37fb6991da5557c475d754715df711
diff --git a/audio/csound5/patches/patch-ac b/audio/csound5/patches/patch-ac
deleted file mode 100644
index 618e7defafe..00000000000
--- a/audio/csound5/patches/patch-ac
+++ /dev/null
@@ -1,247 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2007/01/02 12:53:55 rillig Exp $
-
---- SConstruct.orig 2006-03-15 16:22:43.000000000 +0100
-+++ SConstruct 2007-01-02 13:32:42.000000000 +0100
-@@ -50,6 +50,10 @@ def today():
- def getPlatform():
- if sys.platform[:5] == 'linux':
- return 'linux'
-+ elif sys.platform[:6] == 'netbsd':
-+ return 'netbsd'
-+ elif sys.platform[:9] == 'dragonfly':
-+ return 'dragonfly'
- elif sys.platform[:3] == 'win':
- return 'mingw'
- elif sys.platform[:6] == 'darwin':
-@@ -335,6 +339,15 @@ elif getPlatform() == 'mingw':
- pythonLinkFlags = []
- pythonLibraryPath = []
- pythonLibs = ['python%s' % commonEnvironment['pythonVersion'].replace('.', '')]
-+elif getPlatform() == 'netbsd' or getPlatform() == 'dragonfly':
-+ commonEnvironment.Append(CCFLAGS = Split(os.environ['CFLAGS']))
-+ commonEnvironment.Append(CXXFLAGS = Split(os.environ['CXXFLAGS']))
-+ commonEnvironment.Append(LINKFLAGS = Split(os.environ['LDFLAGS']))
-+ pythonIncludePath = []
-+ pythonLinkFlags = []
-+ pythonLibraryPath = []
-+ pythonLibs = []
-+ SConsignFile("unused-consign-file")
-
- # Check for prerequisites.
- # We check only for headers; checking for libs may fail
-@@ -485,7 +498,7 @@ def buildzip(env, target, source):
- # library version is CS_VERSION.CS_APIVERSION
- csoundLibraryVersion = '5.1'
- csoundLibraryName = 'csound'
--if getPlatform() == 'linux' and commonEnvironment['useDouble'] != '0':
-+if (getPlatform() == 'linux' or getPlatform() == 'netbsd' or getPlatform() == 'dragonfly') and commonEnvironment['useDouble'] != '0':
- csoundLibraryName += '64'
- # flags for linking with the Csound library
- libCsoundLinkFlags = []
-@@ -526,6 +539,12 @@ if commonEnvironment['buildRelease'] !=
- tmp += '64'
- s = '-DCS_DEFAULT_PLUGINDIR=\\"%s\\"' % tmp
- csoundLibraryEnvironment.Append(CPPFLAGS = [s])
-+ if getPlatform() == 'netbsd' or getPlatform() == 'dragonfly':
-+ tmp = '%s/lib/csound5/plugins' % commonEnvironment['prefix']
-+ if commonEnvironment['useDouble'] != '0':
-+ tmp += '64'
-+ s = '-DCS_DEFAULT_PLUGINDIR=\\"%s\\"' % tmp
-+ csoundLibraryEnvironment.Append(CPPFLAGS = [s])
- csoundDynamicLibraryEnvironment = csoundLibraryEnvironment.Copy()
- csoundDynamicLibraryEnvironment.Append(LIBS = ['sndfile'])
- if getPlatform() == 'mingw':
-@@ -550,6 +569,11 @@ if getPlatform() == 'mingw':
- csoundDynamicLibraryEnvironment['ENV']['PATH'] = os.environ['PATH']
- elif getPlatform() == 'linux':
- csoundDynamicLibraryEnvironment.Append(LIBS = ['dl', 'm', 'pthread'])
-+elif getPlatform() == 'netbsd':
-+ csoundDynamicLibraryEnvironment.Append(LIBS = ['m', 'pthread'])
-+elif getPlatform() == 'dragonfly':
-+ csoundDynamicLibraryEnvironment.Append(LINKFLAGS = ['-pthread'])
-+ csoundDynamicLibraryEnvironment.Append(LIBS = ['m'])
- csoundInterfacesEnvironment = csoundDynamicLibraryEnvironment.Copy()
-
- if buildOSXFramework:
-@@ -776,9 +800,17 @@ else:
- csoundProgramEnvironment.Append(LIBS = ['dl'])
- vstEnvironment.Append(LIBS = ['dl'])
- guiProgramEnvironment.Append(LIBS = ['dl'])
-- csoundProgramEnvironment.Append(LIBS = ['pthread', 'm'])
-- vstEnvironment.Append(LIBS = ['stdc++', 'pthread', 'm'])
-- guiProgramEnvironment.Append(LIBS = ['stdc++', 'pthread', 'm'])
-+ if getPlatform() == 'dragonfly':
-+ csoundProgramEnvironment.Append(LIBS = ['m'])
-+ csoundProgramEnvironment.Append(LINKFLAGS = ['-pthread'])
-+ vstEnvironment.Append(LIBS = ['stdc++', 'm'])
-+ vstEnvironment.Append(LINKFLAGS = ['-pthread'])
-+ guiProgramEnvironment.Append(LIBS = ['stdc++', 'm'])
-+ guiProgramEnvironment.Append(LINKFLAGS = ['-pthread'])
-+ else:
-+ csoundProgramEnvironment.Append(LIBS = ['pthread', 'm'])
-+ vstEnvironment.Append(LIBS = ['stdc++', 'pthread', 'm'])
-+ guiProgramEnvironment.Append(LIBS = ['stdc++', 'pthread', 'm'])
- if getPlatform() == 'darwin':
- csoundProgramEnvironment.Append(LINKFLAGS = Split('''
- -framework Carbon -framework CoreAudio -framework CoreMidi
-@@ -989,7 +1021,7 @@ makePlugin(pluginEnvironment, 'stdopcod'
- pluginLibraries.append('opcodes.dir')
- MacOSX_InstallPlugin('opcodes.dir')
-
--if getPlatform() == 'linux' or getPlatform() == 'darwin':
-+if getPlatform() == 'linux' or getPlatform() == 'darwin' or getPlatform == 'netbsd' or getPlatform == 'dragonfly':
- makePlugin(pluginEnvironment, 'control', ['Opcodes/control.c'])
- makePlugin(pluginEnvironment, 'ftest', ['Opcodes/ftest.c'])
- makePlugin(pluginEnvironment, 'mixer', ['Opcodes/mixer.cpp'])
-@@ -1042,6 +1074,13 @@ else:
- -framework Carbon -framework CoreAudio -framework CoreMidi
- -framework ApplicationServices
- '''))
-+ elif getPlatform() == 'netbsd':
-+ widgetsEnvironment.ParseConfig('fltk-config --use-images --cflags --cxxflags --ldflags')
-+ widgetsEnvironment.Append(LIBS = ['stdc++', 'pthread', 'm'])
-+ elif getPlatform() == 'dragonfly':
-+ widgetsEnvironment.ParseConfig('fltk-config --use-images --cflags --cxxflags --ldflags')
-+ widgetsEnvironment.Append(LIBS = ['stdc++', 'm'])
-+ widgetsEnvironment.Append(LINKFLAGS = ['-pthread'])
- makePlugin(widgetsEnvironment, 'widgets',
- ['InOut/FL_graph.cpp', 'InOut/winFLTK.c', 'InOut/widgets.cpp'])
-
-@@ -1060,7 +1099,11 @@ if not (commonEnvironment['useALSA'] ==
- else:
- print "CONFIGURATION DECISION: Building ALSA plugin."
- alsaEnvironment = pluginEnvironment.Copy()
-- alsaEnvironment.Append(LIBS = ['asound', 'pthread'])
-+ if getPlatform() == 'dragonfly':
-+ alsaEnvironment.Append(LIBS = ['asound'])
-+ alsaEnvironment.Append(LINKFLAGS = ['-pthread'])
-+ else:
-+ alsaEnvironment.Append(LIBS = ['asound', 'pthread'])
- makePlugin(alsaEnvironment, 'rtalsa', ['InOut/rtalsa.c'])
-
- if getPlatform() == 'mingw':
-@@ -1082,6 +1125,8 @@ else:
- elif getPlatform() == 'mingw':
- portaudioEnvironment.Append(LIBS = ['winmm', 'dsound'])
- portaudioEnvironment.Append(LIBS = csoundWindowsLibraries)
-+ elif getPlatform() == 'netbsd' or getPlatform() == 'dragonfly':
-+ portaudioEnvironment.ParseConfig('pkg-config --cflags --libs portaudio-2.0')
- makePlugin(portaudioEnvironment, 'rtpa', ['InOut/rtpa.c'])
-
- if not (commonEnvironment['useJack'] == '1' and jackFound):
-@@ -1091,6 +1136,9 @@ else:
- jackEnvironment = pluginEnvironment.Copy()
- if getPlatform() == 'linux':
- jackEnvironment.Append(LIBS = ['jack', 'asound', 'pthread'])
-+ elif getPlatform() == 'dragonfly':
-+ jackEnvironment.Append(LIBS = ['jack'])
-+ jackEnvironment.Append(LINKFLAGS = ['-pthread'])
- else:
- jackEnvironment.Append(LIBS = ['jack', 'pthread'])
- makePlugin(jackEnvironment, 'rtjack', ['InOut/rtjack.c'])
-@@ -1100,7 +1148,11 @@ if not (commonEnvironment['useOSC'] == '
- else:
- print "CONFIGURATION DECISION: Building OSC plugin."
- oscEnvironment = pluginEnvironment.Copy()
-- oscEnvironment.Append(LIBS = ['lo', 'pthread'])
-+ if getPlatform() == 'dragonfly':
-+ oscEnvironment.Append(LIBS = ['lo'])
-+ oscEnvironment.Append(LINKFLAGS = ['-pthread'])
-+ else:
-+ oscEnvironment.Append(LIBS = ['lo', 'pthread'])
- if getPlatform() == 'mingw':
- oscEnvironment.Append(LIBS = csoundWindowsLibraries)
- oscEnvironment.Append(SHLINKFLAGS = ['-Wl,--enable-stdcall-fixup'])
-@@ -1118,8 +1170,10 @@ else:
- fluidEnvironment.Append(CPPFLAGS = ['-DFLUIDSYNTH_NOT_A_DLL'])
- fluidEnvironment.Append(LIBS = ['winmm', 'dsound'])
- fluidEnvironment.Append(LIBS = csoundWindowsLibraries)
-- elif getPlatform() == 'linux' or getPlatform() == 'darwin':
-+ elif getPlatform() == 'linux' or getPlatform() == 'darwin' or getPlatform() == 'netbsd':
- fluidEnvironment.Append(LIBS = ['pthread'])
-+ elif getPlatform() == 'dragonfly':
-+ fluidEnvironment.Append(LINKFLAGS = ['-pthread'])
- makePlugin(fluidEnvironment, 'fluidOpcodes',
- ['Opcodes/fluidOpcodes/fluidOpcodes.c'])
-
-@@ -1237,6 +1291,13 @@ else:
- guiProgramEnvironment.Prepend(LINKFLAGS = ['-mwindows'])
- vstEnvironment.Append(LIBS = ['fltk_images', 'fltk'])
- guiProgramEnvironment.Append(LINKFLAGS = '-mwindows')
-+ elif getPlatform() == 'netbsd' or getPlatform() == 'dragonfly':
-+ vstEnvironment.Append(LIBS = ['m'])
-+ vstEnvironment.Append(SHLINKFLAGS = '--no-export-all-symbols')
-+ vstEnvironment.Append(LINKFLAGS = ['-Wl,-rpath-link,.'])
-+ guiProgramEnvironment.Prepend(LINKFLAGS = ['-Wl,-rpath-link,.'])
-+ os.spawnvp(os.P_WAIT, 'rm', ['rm', '-f', '_CsoundVST.so'])
-+ os.symlink('lib_CsoundVST.so', '_CsoundVST.so')
- guiProgramEnvironment.Prepend(LIBS = ['_CsoundVST'])
- for option in vstEnvironment['CCFLAGS']:
- if string.find(option, '-D') == 0:
-@@ -1420,8 +1481,10 @@ else:
- stkEnvironment.Append(LIBS = ['stdc++'])
- if getPlatform() == 'mingw':
- stkEnvironment.Append(LIBS = csoundWindowsLibraries)
-- elif getPlatform() == 'linux' or getPlatform() == 'darwin':
-+ elif getPlatform() == 'linux' or getPlatform() == 'darwin' or getPlatform() == 'netbsd':
- stkEnvironment.Append(LIBS = ['pthread'])
-+ elif getPlatform() == 'dragonfly':
-+ stkEnvironment.Append(LINKFLAGS = ['-pthread'])
- # This is the one that actually defines the opcodes.
- # They are straight wrappers, as simple as possible.
- stk = makePlugin(stkEnvironment, 'stk', ['Opcodes/stk/stkOpcodes.cpp'])
-@@ -1443,6 +1506,8 @@ else:
- elif getPlatform() == 'mingw':
- pyEnvironment['ENV']['PATH'] = os.environ['PATH']
- pyEnvironment.Append(SHLINKFLAGS = '--no-export-all-symbols')
-+ elif getPlatform() == 'netbsd' or getPlatform() == 'dragonfly':
-+ pyEnvironment.Append(LIBS = ['m'])
- pythonOpcodes = makePlugin(pyEnvironment, 'py',
- ['Opcodes/py/pythonopcodes.c'])
- if getPlatform() == 'mingw' and pythonLibs[0] < 'python24':
-@@ -1461,7 +1526,7 @@ if commonEnvironment['buildPDClass']=='1
- pdClass = pdClassEnvironment.Program(
- 'csoundapi~.pd_darwin',
- 'frontends/csoundapi_tilde/csoundapi_tilde.c')
-- elif getPlatform() == 'linux':
-+ elif getPlatform() == 'linux' or getPlatform() == 'netbsd' or getPlatform() == 'dragonfly':
- pdClass = pdClassEnvironment.SharedLibrary(
- 'csoundapi~.pd_linux',
- 'frontends/csoundapi_tilde/csoundapi_tilde.c',
-@@ -1493,6 +1558,11 @@ if commonEnvironment['buildTclcsound'] =
- '''))
- elif getPlatform() == 'linux':
- csTclEnvironment.Append(LIBS = ['tcl8.4', 'tk8.4', 'dl', 'pthread'])
-+ elif getPlatform() == 'netbsd':
-+ csTclEnvironment.Append(LIBS = ['tcl8.4', 'tk8.4', 'pthread'])
-+ elif getPlatform() == 'dragonfly':
-+ csTclEnvironment.Append(LIBS = ['tcl8.4', 'tk8.4'])
-+ csTclEnvironment.Append(LINKFLAGS = ['-pthread'])
- elif getPlatform() == 'mingw':
- csTclEnvironment.Append(LIBS = ['tcl84', 'tk84'])
- csTclEnvironment.Append(LIBS = csoundWindowsLibraries)
-@@ -1591,18 +1661,18 @@ else:
-
- PREFIX = commonEnvironment['prefix']
-
--BIN_DIR = PREFIX + "/bin"
--INCLUDE_DIR = PREFIX + "/include/csound"
-+BIN_DIR = PREFIX + "/lib/csound5"
-+INCLUDE_DIR = PREFIX + "/include/csound5"
-
- if (commonEnvironment['Word64'] == '1'):
-- LIB_DIR = PREFIX + "/lib64"
-+ LIB_DIR = PREFIX + "/lib64/csound5"
- else:
-- LIB_DIR = PREFIX + "/lib"
-+ LIB_DIR = PREFIX + "/lib/csound5"
-
- if commonEnvironment['useDouble'] == '0':
-- PLUGIN_DIR = LIB_DIR + "/csound/plugins"
-+ PLUGIN_DIR = LIB_DIR + "/plugins"
- else:
-- PLUGIN_DIR = LIB_DIR + "/csound/plugins64"
-+ PLUGIN_DIR = LIB_DIR + "/plugins"
-
- if commonEnvironment['install'] == '1':
- installExecutables = Alias('install-executables',
diff --git a/audio/csound5/patches/patch-ad b/audio/csound5/patches/patch-ad
deleted file mode 100644
index 2544cd2be3a..00000000000
--- a/audio/csound5/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/05/29 19:44:24 joerg Exp $
-
---- Top/csound.c.orig 2006-03-10 08:37:48.000000000 -0800
-+++ Top/csound.c
-@@ -613,7 +613,7 @@ static const CSOUND cenviron_ = {
- csound_free_string_database();
- }
-
--#if !defined(LINUX) && !defined(SGI) && !defined(__BEOS__) && !defined(__MACH__)
-+#if !defined(__NetBSD__) && !defined(LINUX) && !defined(SGI) && !defined(__BEOS__) && !defined(__MACH__) && !defined(__DragonFly__)
- static char *signal_to_string(int sig)
- {
- switch(sig) {
diff --git a/audio/csound5/patches/patch-ae b/audio/csound5/patches/patch-ae
deleted file mode 100644
index 2e93eebab64..00000000000
--- a/audio/csound5/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2006/05/29 19:44:24 joerg Exp $
-
---- Engine/linevent.c.orig 2005-12-06 14:58:54.000000000 -0800
-+++ Engine/linevent.c
-@@ -30,7 +30,7 @@
- #include "linevent.h"
-
- #ifdef PIPES
--# if defined(SGI) || defined(LINUX) || defined(NeXT) || defined(__MACH__)
-+# if defined(SGI) || defined(LINUX) || defined(NeXT) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__)
- # define _popen popen
- # define _pclose pclose
- # elif defined(__BEOS__) || defined(__MACH__)
diff --git a/audio/csound5/patches/patch-af b/audio/csound5/patches/patch-af
deleted file mode 100644
index e5c6cba76e7..00000000000
--- a/audio/csound5/patches/patch-af
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-af,v 1.2 2006/05/29 19:44:24 joerg Exp $
-
---- Engine/namedins.c.orig 2006-03-11 08:30:35.000000000 -0800
-+++ Engine/namedins.c
-@@ -1342,7 +1342,7 @@ PUBLIC int csoundGetControlChannelParams
-
- int csoundCheckOpcodePluginFile(CSOUND *csound, const char *fname)
- {
--#if !(defined(LINUX) || defined(__unix__) || defined(__MACH__))
-+#if !(defined(LINUX) || defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__))
- char buf[512];
- size_t i;
- #endif
-@@ -1352,7 +1352,7 @@ int csoundCheckOpcodePluginFile(CSOUND *
-
- if (fname == NULL || fname[0] == (char) 0)
- return 0;
--#if !(defined(LINUX) || defined(__unix__) || defined(__MACH__))
-+#if !(defined(LINUX) || defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__))
- /* on some platforms, file names are case insensitive */
- i = (size_t) 0;
- do {
-@@ -1502,7 +1502,7 @@ int csoundLoadOpcodeDB(CSOUND *csound, c
- }
- opcodeCnt++;
- }
--#if !(defined(LINUX) || defined(__unix__) || defined(__MACH__))
-+#if !(defined(LINUX) || defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__))
- else {
- size_t j;
- /* on some platforms, file names are case insensitive */
diff --git a/audio/csound5/patches/patch-ag b/audio/csound5/patches/patch-ag
deleted file mode 100644
index da5c2e30e92..00000000000
--- a/audio/csound5/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2006/05/29 19:44:24 joerg Exp $
-
---- frontends/CsoundVST/System.cpp.orig 2005-12-22 09:06:21.000000000 -0800
-+++ frontends/CsoundVST/System.cpp
-@@ -468,7 +468,7 @@ namespace csound
- Beep(880, 1000);
- }
-
--#elif defined(LINUX) || defined(MACOSX)
-+#elif defined(LINUX) || defined(MACOSX) || defined(__NetBSD__) || defined(__DragonFly__)
-
- #include <dlfcn.h>
- #include <dirent.h>
diff --git a/audio/csound5/patches/patch-ah b/audio/csound5/patches/patch-ah
deleted file mode 100644
index d1374132e59..00000000000
--- a/audio/csound5/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2006/05/29 19:44:24 joerg Exp $
-
---- frontends/CsoundVST/CsoundVSTMain.cpp.orig 2005-09-02 07:30:33.000000000 -0700
-+++ frontends/CsoundVST/CsoundVSTMain.cpp
-@@ -36,7 +36,7 @@ bool oome = false;
- #if defined(__GNUC__) && defined(WIN32)
- #define main main_plugin
- extern "C" __declspec(dllexport) AEffect *main_plugin (audioMasterCallback audioMaster)
--#elif defined(LINUX) || defined(MACOSX)
-+#elif defined(LINUX) || defined(MACOSX) || defined(__NetBSD__) || defined(__DragonFly__)
- AEffect *main_plugin (audioMasterCallback audioMaster)
- #else
- AEffect *main(audioMasterCallback audioMaster)
diff --git a/audio/csound5/patches/patch-ai b/audio/csound5/patches/patch-ai
deleted file mode 100644
index fa5fa9ca19e..00000000000
--- a/audio/csound5/patches/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2006/05/29 19:44:24 joerg Exp $
-
---- InOut/widgets.cpp.orig 2006-02-15 10:25:55.000000000 -0800
-+++ InOut/widgets.cpp
-@@ -29,7 +29,7 @@
- # include <windows.h>
- #endif /* defined(WIN32) */
-
--#if defined(LINUX)
-+#if defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__)
- # include <pthread.h>
- # include <sched.h>
- # include <sys/time.h>
-@@ -1722,7 +1722,7 @@ static uintptr_t fltkRun(void *userdata)
-
- p = (widgetsGlobals_t*) csound->QueryGlobalVariable(csound,
- "_widgets_globals");
--#ifdef LINUX
-+#if defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__)
- {
- struct sched_param sp;
- // IV - Aug 27 2002: widget thread is always run with normal priority
diff --git a/audio/csound5/patches/patch-aj b/audio/csound5/patches/patch-aj
deleted file mode 100644
index 99bd6bdda8b..00000000000
--- a/audio/csound5/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2006/05/29 19:44:24 joerg Exp $
-
---- InOut/libsnd.c.orig 2006-02-13 09:05:46.000000000 -0800
-+++ InOut/libsnd.c
-@@ -47,7 +47,7 @@ typedef struct {
-
- #ifdef PIPES
- # if defined(SGI) || defined(LINUX) || defined(__BEOS__) || defined(NeXT) || \
-- defined(__MACH__)
-+ defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__)
- # define _popen popen
- # define _pclose pclose
- # endif
diff --git a/audio/csound5/patches/patch-ak b/audio/csound5/patches/patch-ak
deleted file mode 100644
index 266217cbc9c..00000000000
--- a/audio/csound5/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2006/05/29 19:44:24 joerg Exp $
-
---- InOut/winEPS.c.orig 2005-12-29 05:49:04.000000000 -0800
-+++ InOut/winEPS.c
-@@ -146,7 +146,7 @@ void PS_MakeGraph(CSOUND *csound, WINDAT
- * Get the current time and date
- */
- lt = time(NULL);
--#ifndef LINUX
-+#if !defined(LINUX) && !defined(__NetBSD__) && !defined(__DragonFly__)
- {
- struct tm *date_ptr;
- char *date;
diff --git a/audio/csound5/patches/patch-al b/audio/csound5/patches/patch-al
deleted file mode 100644
index 672aabf7ac8..00000000000
--- a/audio/csound5/patches/patch-al
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-al,v 1.2 2006/05/29 19:44:24 joerg Exp $
-
---- InOut/winFLTK.c.orig 2005-12-30 07:21:18.000000000 -0800
-+++ InOut/winFLTK.c
-@@ -29,7 +29,7 @@
- #include <stdio.h>
- #include "cwindow.h"
-
--#ifdef LINUX
-+#if defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__)
- #include <X11/Xlib.h>
- #endif
-
-@@ -54,7 +54,7 @@ static void KillGraph_FLTK(CSOUND *csoun
-
- void set_display_callbacks(CSOUND *csound)
- {
--#ifdef LINUX
-+#if defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__)
- Display *dpy = XOpenDisplay(NULL);
- if (dpy == NULL)
- return;
diff --git a/audio/csound5/patches/patch-am b/audio/csound5/patches/patch-am
deleted file mode 100644
index abc3fdf3966..00000000000
--- a/audio/csound5/patches/patch-am
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-am,v 1.2 2006/05/29 19:44:24 joerg Exp $
-
---- Top/csmodule.c.orig 2006-03-08 15:13:15.000000000 -0800
-+++ Top/csmodule.c
-@@ -78,7 +78,7 @@
- #include "csoundCore.h"
- #include "csmodule.h"
-
--#if defined(LINUX)
-+#if defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__)
- #include <dlfcn.h>
- #elif defined(WIN32)
- #include <windows.h>
-@@ -121,7 +121,7 @@ static const char *plugindir_envva
- static const char *plugindir64_envvar = "OPCODEDIR64";
-
- /* default directory to load plugins from if environment variable is not set */
--#if !(defined(_CSOUND_RELEASE_) && (defined(LINUX) || defined(__MACH__)))
-+#if !(defined(_CSOUND_RELEASE_) && (defined(LINUX) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__)))
- # define ENABLE_OPCODEDIR_WARNINGS 1
- # ifdef CS_DEFAULT_PLUGINDIR
- # undef CS_DEFAULT_PLUGINDIR
-@@ -131,9 +131,9 @@ static const char *plugindir64_env
- # define ENABLE_OPCODEDIR_WARNINGS 0
- # ifndef CS_DEFAULT_PLUGINDIR
- # ifndef USE_DOUBLE
--# define CS_DEFAULT_PLUGINDIR "/usr/local/lib/csound/plugins"
-+# define CS_DEFAULT_PLUGINDIR __PKGSRC_PREFIX__ "lib/csound5/plugins"
- # else
--# define CS_DEFAULT_PLUGINDIR "/usr/local/lib/csound/plugins64"
-+# define CS_DEFAULT_PLUGINDIR __PKGSRC_PREFIX__ "lib/csound5/plugins64"
- # endif
- # endif
- #endif
-@@ -225,7 +225,7 @@ static CS_NOINLINE int csoundLoadExterna
- /* load library */
- err = csound->OpenLibrary(&h, libraryPath);
- if (err) {
--#if defined(BETA) && defined(LINUX)
-+#if defined(BETA) && (defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__))
- csound->Warning(csound, "%s", dlerror());
- #endif
- csound->Warning(csound, Str("could not open library '%s' (%d)"),
-@@ -591,7 +591,7 @@ PUBLIC void *csoundGetLibrarySymbol(void
- return (void*) GetProcAddress((HMODULE) library, procedureName);
- }
-
--#elif defined(LINUX)
-+#elif defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__)
-
- PUBLIC int csoundOpenLibrary(void **library, const char *libraryPath)
- {
diff --git a/audio/csound5/patches/patch-an b/audio/csound5/patches/patch-an
deleted file mode 100644
index 3c9a5dfd78d..00000000000
--- a/audio/csound5/patches/patch-an
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-an,v 1.2 2006/05/29 19:44:24 joerg Exp $
-
---- Top/one_file.c.orig 2006-01-11 03:47:55.000000000 -0800
-+++ Top/one_file.c
-@@ -24,7 +24,7 @@
- #include "csoundCore.h"
- #include <ctype.h>
- #include <errno.h>
--#if defined(LINUX) || defined(__MACH__) || defined(WIN32)
-+#if defined(LINUX) || defined(__MACH__) || defined(WIN32) || defined(__NetBSD__) || defined(__DragonFly__)
- # include <sys/types.h>
- # include <sys/stat.h>
- #endif
-@@ -66,7 +66,7 @@ CS_NOINLINE char *csoundTmpFileName(CSOU
- buf = csound->Malloc(csound, nBytes);
- }
- {
--#if defined(LINUX) || defined(__MACH__)
-+#if defined(LINUX) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__)
- struct stat tmp;
- do {
- #elif defined(WIN32)
-@@ -89,7 +89,7 @@ CS_NOINLINE char *csoundTmpFileName(CSOU
- }
- #endif
- if (ext != NULL && ext[0] != (char) 0) {
--#if !defined(LINUX) && !defined(__MACH__) && !defined(WIN32)
-+#if !defined(LINUX) && !defined(__MACH__) && !defined(WIN32) && !defined(__NetBSD__) && !defined(__DragonFly__)
- char *p;
- /* remove original extension (does not work on OS X */
- /* and may be a bad idea) */
-@@ -109,7 +109,7 @@ CS_NOINLINE char *csoundTmpFileName(CSOU
- } while (buf[i] != (char) 0);
- }
- #endif
--#if defined(LINUX) || defined(__MACH__)
-+#if defined(LINUX) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__)
- /* if the file already exists, try again */
- } while (stat(buf, &tmp) == 0);
- #elif defined(WIN32)
diff --git a/audio/csound5/patches/patch-ao b/audio/csound5/patches/patch-ao
deleted file mode 100644
index d7202647818..00000000000
--- a/audio/csound5/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2006/05/29 19:44:24 joerg Exp $
-
---- Top/threads.c.orig 2005-12-26 09:27:07.000000000 -0800
-+++ Top/threads.c
-@@ -109,7 +109,7 @@ PUBLIC void csoundSleep(size_t milliseco
- Sleep((DWORD) milliseconds);
- }
-
--#elif defined(LINUX) || defined(__MACH__)
-+#elif defined(LINUX) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__)
-
- #include <pthread.h>
- #include <time.h>
diff --git a/audio/csound5/patches/patch-ap b/audio/csound5/patches/patch-ap
deleted file mode 100644
index a5c6ab7e8f3..00000000000
--- a/audio/csound5/patches/patch-ap
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2006/10/17 21:32:37 rillig Exp $
-
---- cleanup.sh.orig 2005-12-20 20:50:46.000000000 +0100
-+++ cleanup.sh 2006-10-17 23:28:47.000000000 +0200
-@@ -1,7 +1,7 @@
- #!/bin/sh
-
--if [ "$#" == "2" ] ; then
-- if [ "$1" == "remove" ] ; then
-+if [ "$#" = "2" ] ; then
-+ if [ "$1" = "remove" ] ; then
- if ( test -e "$2" ) ; then
- echo -e "Removing '$2'"
- rm -Rf "$2" ;
diff --git a/audio/daapd/DESCR b/audio/daapd/DESCR
deleted file mode 100644
index 1e01c36ec50..00000000000
--- a/audio/daapd/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Server for DAAP, the digital audio access protocol
-Copyright deleet 2003, Alexander Oberdorster
-
-daapd scans a directory for mp3 files and makes them available via the Apple
-proprietary protocol DAAP. DAAP clients can browse the directory and retrieve
-individual files, either by streaming or by downloading them.
diff --git a/audio/daapd/Makefile b/audio/daapd/Makefile
deleted file mode 100644
index ccb43eabef5..00000000000
--- a/audio/daapd/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2007/01/30 07:05:58 wiz Exp $
-
-DISTNAME= daapd-0.2.4b
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${HOMEPAGE}
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= nathanw@NetBSD.org
-HOMEPAGE= http://www.deleet.de/projekte/daap/daapd/
-COMMENT= Server for DAA protocol (iTunes)
-
-USE_LANGUAGES= c c++
-USE_TOOLS+= gmake
-MAKE_FILE= makefile
-
-RCD_SCRIPTS= daapd
-EGDIR= ${PREFIX}/share/examples/${PKGBASE}
-
-CONF_FILES= ${EGDIR}/daapd.conf ${PKG_SYSCONFDIR}/daapd.conf
-
-.include "options.mk"
-
-MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
-
-FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
-
-SUBST_CLASSES+= paths
-SUBST_MESSAGE.paths= Fixing hardcoded paths.
-SUBST_STAGE.paths= post-patch
-SUBST_FILES.paths= daapd.8 daapd.cc
-SUBST_SED.paths= -e 's,/etc/,${PKG_SYSCONFDIR}/,g'
-
-post-extract:
- for FILE in `${FIND} ${WRKSRC}/daaplib -type f -print`; do \
- ${TR} -d \\r <$${FILE} >$${FILE}.new; \
- ${MV} $${FILE}.new $${FILE}; \
- done
-
-post-install:
- ${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/daapd-example.conf ${EGDIR}/daapd.conf
-
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../net/howl/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/daapd/PLIST b/audio/daapd/PLIST
deleted file mode 100644
index fa79cae132f..00000000000
--- a/audio/daapd/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2005/05/02 20:33:57 reed Exp $
-bin/daapd
-man/man8/daapd.8
-share/examples/daapd/daapd.conf
-share/examples/rc.d/daapd
-@dirrm share/examples/daapd
diff --git a/audio/daapd/distinfo b/audio/daapd/distinfo
deleted file mode 100644
index 789c21bae78..00000000000
--- a/audio/daapd/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.18 2007/02/09 20:32:38 drochner Exp $
-
-SHA1 (daapd-0.2.4b.tgz) = 0903303f155c19ae12cdc78be05799508156a16b
-RMD160 (daapd-0.2.4b.tgz) = 899b37b3872623ef918f7faa4eb8bad2dfc5b369
-Size (daapd-0.2.4b.tgz) = 205476 bytes
-SHA1 (patch-aa) = c10564ede45fa92b18926da68a7a9a2d9547627d
-SHA1 (patch-ac) = 0a4e3dfb010bbf2cc01843987c970548cb4c646f
-SHA1 (patch-ad) = 05a61ced18d5b0827ade7e6b3341430ff9b9e89d
-SHA1 (patch-ae) = 3433d7e944999e10690ccdda1d49d3c711671446
-SHA1 (patch-af) = 1a453dde4dd7d33061a500729b9ef5d89e850133
diff --git a/audio/daapd/files/daapd.sh b/audio/daapd/files/daapd.sh
deleted file mode 100644
index 9850ed35e53..00000000000
--- a/audio/daapd/files/daapd.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: daapd.sh,v 1.5 2006/01/01 18:34:13 tron Exp $
-#
-
-# PROVIDE: daapd
-# REQUIRE: DAEMON LOGIN howl
-
-. /etc/rc.subr
-
-name="daapd"
-rcvar=$name
-command="@PREFIX@/bin/${name}"
-required_files="@PKG_SYSCONFDIR@/daapd.conf"
-command_args="</dev/null >/dev/null 2>&1 &"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/audio/daapd/options.mk b/audio/daapd/options.mk
deleted file mode 100644
index 91d2f756b29..00000000000
--- a/audio/daapd/options.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2007/02/09 20:32:38 drochner Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.daapd
-PKG_SUPPORTED_OPTIONS= mpeg4ip
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mmpeg4ip)
-.include "../../multimedia/libmp4v2/buildlink3.mk"
-MAKE_ENV+= WITH_FAAD=1
-.else
-MAKE_ENV+= WITH_FAAD=0
-.endif
diff --git a/audio/daapd/patches/patch-aa b/audio/daapd/patches/patch-aa
deleted file mode 100644
index 46de10fa4fa..00000000000
--- a/audio/daapd/patches/patch-aa
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-aa,v 1.12 2006/04/23 18:25:27 tonio Exp $
-
---- makefile.orig 2006-03-05 14:39:37.000000000 +0100
-+++ makefile
-@@ -2,28 +2,28 @@
-
- HOWL_ENABLE = 1
- ZLIB_ENABLE = 1
--MPEG4_ENABLE = 0
-+MPEG4_ENABLE = $(WITH_FAAD)
-
-
- # no need to touch anything below this line
- # -----------------------------------------
-
--CC = g++
-+CC = $(CXX)
- MAKE = $(MAKE_COMMAND)
- TARGET = daapd
- DEPS = daaplib_ libhttpd_
- OBJS = daapd.o db.o dboutput.o songcache.o parsemp3.o util.o
- LIBS = -ldaaplib -lhttpd-persistent -lid3tag -lz
--LIBPATH = -L. -L./daaplib/src -L./libhttpd/src -L/usr/local/lib
--INCPATH = -I. -I./daaplib/include -I./libhttpd/src -I/usr/local/include
--DEPLOY = /usr/local
--CFLAGS = -Wall -Wno-multichar
-+LIBPATH = -L. -L./daaplib/src -L./libhttpd/src -L$(PREFIX)/lib $(LDFLAGS)
-+INCPATH = -I. -I./daaplib/include -I./libhttpd/src -I$(PREFIX)/include
-+DEPLOY = $(PREFIX)
-+CFLAGS += -Wall -Wno-multichar
-
- # HOWL
- ifeq ($(HOWL_ENABLE),1)
-- HOWLDIRS := $(sort $(wildcard /usr/local/include/howl*) )
-+ HOWLDIRS := $(sort $(wildcard $(PREFIX)/include/howl*) )
- ifeq ($(words $(HOWLDIRS) ), 0)
--$(error howl not found in /usr/local/include. Install howl or disable it in the makefile)
-+$(error howl not found in $(PREFIX)/include. Install howl or disable it in the makefile)
- endif
- HOWLRECENT := $(word $(words $(HOWLDIRS)),$(HOWLDIRS) )
- INCPATH := $(INCPATH) -I$(HOWLRECENT)
-@@ -46,11 +46,7 @@ ifneq ($(shell $(CC) -E -dM - < /dev/nul
- LIBS := $(LIBS) -lsocket -lnsl
- endif
-
--ifneq ($(shell $(CC) -E -dM - < /dev/null | grep __FreeBSD__),)
-- LIBS := $(LIBS) -pthread
--else
-- LIBS := $(LIBS) -lpthread
--endif
-+LIBS+= ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
-
- ifneq ($(shell $(CC) -E -dM - < /dev/null | grep __sgi__),)
- LIBS := $(LIBS) /usr/lib/snprintf.o
-@@ -80,8 +76,6 @@ clean:
- rm $(OBJS) $(TARGET)
-
- install: $(DEPS) $(TARGET)
-- cd libhttpd && $(MAKE) install
-- cd daaplib/src && $(MAKE) install
- cp $(TARGET) $(DEPLOY)/bin
- chmod a+rx $(DEPLOY)/bin/$(TARGET)
- cp $(TARGET).8 $(DEPLOY)/man/man8
diff --git a/audio/daapd/patches/patch-ac b/audio/daapd/patches/patch-ac
deleted file mode 100644
index 7cff9e08aae..00000000000
--- a/audio/daapd/patches/patch-ac
+++ /dev/null
@@ -1,111 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/07/03 02:18:15 tron Exp $
-
---- libhttpd/src/select.h.orig 2006-03-05 14:00:38.000000000 +0000
-+++ libhttpd/src/select.h 2006-07-03 03:10:45.000000000 +0100
-@@ -81,7 +81,7 @@
- c++;
- }
-
-- return 0;
-+ return c;
- }
-
-
-@@ -154,7 +154,7 @@
-
- void erase( const int fDesc ) {
- ClientIterator c;
-- if ((c = locateFDesc(fDesc)) != 0) {
-+ if ((c = locateFDesc(fDesc)) != clientList.end()) {
- clientList.erase(c);
- close(fDesc);
- }
-@@ -162,14 +162,14 @@
-
- void finish( const int fDesc ) {
- ClientIterator c;
-- if ((c = locateFDesc(fDesc)) != 0) {
-+ if ((c = locateFDesc(fDesc)) != clientList.end()) {
- c->finished = true;
- }
- }
-
- void address( const int fDesc, char address[HTTP_IP_ADDR_LEN] ) {
- ClientIterator c;
-- if ((c = locateFDesc(fDesc)) != 0) {
-+ if ((c = locateFDesc(fDesc)) != clientList.end()) {
- strncpy(address, c->address, HTTP_IP_ADDR_LEN);
- }
- }
-@@ -180,7 +180,7 @@
-
- int readBuf(const int fDesc, char *destBuf, const uint len) {
- ClientIterator c;
-- if ((c = locateFDesc(fDesc)) == 0) {
-+ if ((c = locateFDesc(fDesc)) == clientList.end()) {
- // printf("unknown client id %d\n", fDesc);
- return 0;
- }
-@@ -192,7 +192,7 @@
-
- int readLine(const int fDesc, char *destBuf, const uint len) {
- ClientIterator c;
-- if ((c = locateFDesc(fDesc)) == 0) {
-+ if ((c = locateFDesc(fDesc)) == clientList.end()) {
- // printf("unknown client id %d\n", fDesc);
- return 0;
- }
-@@ -217,7 +217,7 @@
- int handleWrite(int socket) {
- int bytesWritten;
- ClientIterator c;
-- if ((c = locateFDesc(socket)) == 0) {
-+ if ((c = locateFDesc(socket)) == clientList.end()) {
- // printf("unknown client id %d\n", socket);
- return 2;
- }
-@@ -260,7 +260,7 @@
- return 1;
- } else {
- ClientIterator c;
-- if ((c = locateFDesc(fDesc)) == 0) {
-+ if ((c = locateFDesc(fDesc)) == clientList.end()) {
- // printf("unknown client id %d\n", fDesc);
- return 2;
- }
-@@ -304,7 +304,7 @@
-
- void doWrite(const int fDesc, const char* string, const uint len) {
- ClientIterator c;
-- if ((c = locateFDesc(fDesc)) == 0) {
-+ if ((c = locateFDesc(fDesc)) == clientList.end()) {
- //printf("unknown client id %d\n", fDesc);
- return;
- }
-@@ -318,7 +318,7 @@
-
- void doWrite(const int fDesc, const char* string) {
- ClientIterator c;
-- if ((c = locateFDesc(fDesc)) == 0) {
-+ if ((c = locateFDesc(fDesc)) == clientList.end()) {
- //printf("unknown client id %d\n", fDesc);
- return;
- }
-@@ -351,7 +351,7 @@
-
- void queueFile(const int socket, const int pendingFile ) {
- ClientIterator c;
-- if ((c = locateFDesc(socket)) == 0) {
-+ if ((c = locateFDesc(socket)) == clientList.end()) {
- // printf("unknown client id %d\n", socket);
- return;
- }
-@@ -360,7 +360,7 @@
-
- void subscribe(const int fDesc) {
- ClientIterator c;
-- if ((c = locateFDesc(fDesc)) == 0) {
-+ if ((c = locateFDesc(fDesc)) == clientList.end()) {
- //printf("unknown client id %d\n", fDesc);
- return;
- }
diff --git a/audio/daapd/patches/patch-ad b/audio/daapd/patches/patch-ad
deleted file mode 100644
index 7810ff74532..00000000000
--- a/audio/daapd/patches/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/07/03 13:58:31 tron Exp $
-
---- daaplib/include/daap/tagoutput.h.orig 2006-07-03 10:56:28.000000000 +0100
-+++ daaplib/include/daap/tagoutput.h 2006-07-03 10:39:27.000000000 +0100
-@@ -98,9 +98,7 @@
- return( func( *this ));
- }
-
-- friend inline TagOutput& end( TagOutput& x ) {
-- return( x.closeTag());
-- }
-+ friend inline TagOutput& end( TagOutput& x );
-
- protected:
- typedef std::vector<u8> DataInt8;
-@@ -125,4 +123,8 @@
- TagOutput( const TagOutput& );
- TagOutput& operator = ( const TagOutput& );
- };
-+
-+ inline TagOutput& end( TagOutput& x ) {
-+ return( x.closeTag());
-+ }
- #endif
diff --git a/audio/daapd/patches/patch-ae b/audio/daapd/patches/patch-ae
deleted file mode 100644
index 075f2543308..00000000000
--- a/audio/daapd/patches/patch-ae
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/07/03 13:58:31 tron Exp $
-
---- daaplib/include/daap/taginput.h.orig 2006-07-03 14:32:01.000000000 +0100
-+++ daaplib/include/daap/taginput.h 2006-07-03 14:36:37.000000000 +0100
-@@ -71,9 +71,7 @@
- return( func( *this ));
- }
-
-- friend inline TagInput& end( TagInput& x ) {
-- return( x.closeTag() );
-- }
-+ friend inline TagInput& end( TagInput& x );
-
-
- //////
-@@ -95,15 +93,9 @@
- return( *this );
- }
-
-- friend inline TagInput& skipTag( TagInput& x ) {
-- x.skipTag();
-- return( x );
-- }
-+ friend inline TagInput& skipTag( TagInput& x );
-
-- friend inline TagInput& skipRestOfTag( TagInput& x ) {
-- x.skipRestOfTag();
-- return( x );
-- }
-+ friend inline TagInput& skipRestOfTag( TagInput& x );
-
- protected:
- typedef std::vector<u32> StackInt32;
-@@ -131,4 +123,20 @@
- TagInput( const TagInput& );
- TagInput& operator = ( const TagInput& );
- };
-+
-+ inline TagInput& end( TagInput& x ) {
-+ return( x.closeTag() );
-+ }
-+
-+
-+ inline TagInput& skipTag( TagInput& x ) {
-+ x.skipTag();
-+ return( x );
-+ }
-+
-+ inline TagInput& skipRestOfTag( TagInput& x ) {
-+ x.skipRestOfTag();
-+ return( x );
-+ }
-+
- #endif
diff --git a/audio/daapd/patches/patch-af b/audio/daapd/patches/patch-af
deleted file mode 100644
index 06ee965c619..00000000000
--- a/audio/daapd/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2007/02/09 20:32:38 drochner Exp $
-
---- db.cc.orig 2007-02-09 16:49:38.000000000 +0100
-+++ db.cc
-@@ -325,7 +325,7 @@ void Database::addM4a( std::string& path
- MP4TrackId trackId = MP4FindTrackId(mp4file, 0);
- u32 timeScale = MP4GetTrackTimeScale(mp4file, trackId);
- MP4Duration trackDuration = MP4GetTrackDuration(mp4file, trackId);
-- double msDuration = UINT64_TO_DOUBLE(MP4ConvertFromTrackDuration(mp4file, trackId, trackDuration, MP4_MSECS_TIME_SCALE));
-+ double msDuration = (double)MP4ConvertFromTrackDuration(mp4file, trackId, trackDuration, MP4_MSECS_TIME_SCALE);
- u32 avgBitRate = MP4GetTrackBitRate(mp4file, trackId);
- song->time = (u32) (msDuration);
- song->bitrate = (u16) ((avgBitRate + 500) / 1000);
diff --git a/audio/dap/DESCR b/audio/dap/DESCR
deleted file mode 100644
index 8dcd730c71f..00000000000
--- a/audio/dap/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-DAP is a comprehensive audio sample editing and processing suite. DAP
-currently supports AIFF, AIFF-C, WAV and RAW audio files, 8 or 16 bit
-resolution and 1, 2 or 4 channels of audio data. Note however that compressed
-AIFF-C files are not currently supported, only non-compressed AIFF-C files.
-
-The package itself offers comprehensive editing, playback and recording
-facilities including full time stretch resampling, manual data editing and a
-reasonably complete DSP processing suite. Note however that time stretching
-does not currently work on Solaris (still trying to debug !!).
-
-For compatibility with sox, the popular audio conversion tool, the "Sox
-Compatible" preference must be switched on in DAP. Switching this option on
-simply tells DAP not to save any strings when saving AIFF files. This is
-necessary as the current version of sox is rather buggy and doesn't like odd
-length strings. I'm gonna try and check in a fix to sox but for now if you have
-any problems converting using sox switch this option on.
diff --git a/audio/dap/Makefile b/audio/dap/Makefile
deleted file mode 100644
index 7a02f7eb9dc..00000000000
--- a/audio/dap/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.32 2006/12/15 20:32:52 joerg Exp $
-
-DISTNAME= dap-2.1.2
-PKGREVISION= 6
-CATEGORIES= audio
-MASTER_SITES= # http://www.cee.hw.ac.uk/~richardk/downloads/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= scw@NetBSD.org
-HOMEPAGE= http://www.cee.hw.ac.uk/~richardk/
-COMMENT= Digital audio recording and processing package
-
-MAKE_FILE= Makefile.netbsd
-
-MAKE_ENV+= X11PREFIX=${X11PREFIX:Q}
-
-USE_LANGUAGES= c c++
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/main/DAP ${PREFIX}/bin/dap
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dap
- ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/TODO ${WRKSRC}/COPYING \
- ${WRKSRC}/FEATURES ${PREFIX}/share/doc/dap
-
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../x11/xforms/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/dap/PLIST b/audio/dap/PLIST
deleted file mode 100644
index e9e2a8408ff..00000000000
--- a/audio/dap/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/04/01 15:26:36 fredb Exp $
-bin/dap
-share/doc/dap/COPYING
-share/doc/dap/FEATURES
-share/doc/dap/README
-share/doc/dap/TODO
-@dirrm share/doc/dap
diff --git a/audio/dap/distinfo b/audio/dap/distinfo
deleted file mode 100644
index d9fe251266b..00000000000
--- a/audio/dap/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 20:39:44 agc Exp $
-
-SHA1 (dap-2.1.2.tgz) = 42bfc1a79507fe5f5d175fd2d27a7a5264f1398b
-RMD160 (dap-2.1.2.tgz) = c5b44b41e3abf48af99c85fd875b905c371a1425
-Size (dap-2.1.2.tgz) = 290292 bytes
-SHA1 (patch-aa) = 0addbbf0c0be3065a2126c703ef1e37ee4402e8a
-SHA1 (patch-ab) = 3708354e3e5ac3681cd443bbbcbbb4b280a737c3
-SHA1 (patch-ad) = 01d6e14e7e9fffb9e16a85ddfaf60c96cb98afab
-SHA1 (patch-af) = 28d7ef813ea4147b0a2413bbfc3d9fc1bb90993c
-SHA1 (patch-ao) = 121724ac62a0879720cd8a9649676cf47a29a316
-SHA1 (patch-ap) = 8f9eefb33e6bdad1035d7d463698a61537663a69
diff --git a/audio/dap/patches/patch-aa b/audio/dap/patches/patch-aa
deleted file mode 100644
index 0a715c6ecc6..00000000000
--- a/audio/dap/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2005/01/01 18:13:15 minskim Exp $
-
---- main/Makefile.netbsd.orig 2000-05-22 18:07:21.000000000 -0500
-+++ main/Makefile.netbsd
-@@ -8,13 +8,13 @@ AUDIO = ../libaudio
- AUDIOF = ../libaudiofile
- BACKDIR = ../bak/main
- HOMEDIR = $(HOME)
--X11DIR = /usr/X11R6
--INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11
--LIBDIR = -L$(SPKIT)/spkit -L$(FORMS) -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib
-+X11DIR = ${X11BASE}
-+INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I${X11PREFIX}/include -I${X11PREFIX}/include/X11 -I${LOCALBASE}/include
-+LIBDIR = -Wl,-R$(X11DIR)/lib -L$(SPKIT)/spkit -L$(FORMS) -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib -Wl,-R${X11PREFIX}/lib -L${X11PREFIX}/lib -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
- CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DNETBSD -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
--DEBUG = -g3
-+DEBUG = #-g3
- OPTIM = -O1
--LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lforms -lXpm -lX11 -lm -lossaudio
-+LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lforms -ljpeg -lXpm -lX11 -lm ${LIBOSSAUDIO}
-
- PROGS = DAP
- OBJS = DPTich.o DPTich_cb.o DPTich_DSP.o DPTich_edit_cb.o DPTich_macros.o \
diff --git a/audio/dap/patches/patch-ab b/audio/dap/patches/patch-ab
deleted file mode 100644
index c871faa121f..00000000000
--- a/audio/dap/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/01/01 18:13:15 minskim Exp $
-
---- sound/Makefile.netbsd.orig 2000-05-22 18:18:15.000000000 -0500
-+++ sound/Makefile.netbsd
-@@ -10,9 +10,9 @@ HOMEDIR = $(HOME)
- INCDIR = -I. -I.. -I$(SPKIT) -I$(MAINDIR)
- LIBDIR = -L$(SPKIT)/spkit -L$(AUDIO) -L$(AUDIOF)
- CCFLAGS = $(DEBUG) $(OPTIM) -DNOFORMS -DLINUX -DNETBSD -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
--DEBUG = -g3
-+DEBUG = #-g3
- OPTIM = -O1
--LDFLAGS = $(LIBDIR) -laudio -laudiofile -lm -lossaudio
-+LDFLAGS = $(LIBDIR) -laudio -laudiofile -lm ${LIBOSSAUDIO}
-
- PROGS = SampleTest
- OBJS = DPSample.o DPResample.o DPMixPlay.o SampleTest.o
diff --git a/audio/dap/patches/patch-ad b/audio/dap/patches/patch-ad
deleted file mode 100644
index f3eb3c691fd..00000000000
--- a/audio/dap/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2000/02/29 16:57:46 scw Exp $
-
---- libaudio/Makefile.netbsd.orig Fri Dec 3 21:50:24 1999
-+++ libaudio/Makefile.netbsd Fri Dec 3 21:50:43 1999
-@@ -4,7 +4,7 @@
- HOMEDIR = $(HOME)
- INCDIR = -I.
- CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DNETBSD -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
--DEBUG = -g3
-+DEBUG = #-g3
- OPTIM = -O1
-
- LIBNAME = libaudio.a
diff --git a/audio/dap/patches/patch-af b/audio/dap/patches/patch-af
deleted file mode 100644
index 024ee2ce79b..00000000000
--- a/audio/dap/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 2000/02/29 16:57:46 scw Exp $
-
---- libaudiofile/Makefile.netbsd.orig Thu Nov 11 01:13:56 1999
-+++ libaudiofile/Makefile.netbsd Fri Dec 3 21:55:30 1999
-@@ -4,7 +4,7 @@
- HOMEDIR = $(HOME)
- INCDIR = -I.
- CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DNETBSD -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
--DEBUG = -g3
-+DEBUG = #-g3
- OPTIM = -O1
-
- LIBNAME = libaudiofile.a
diff --git a/audio/dap/patches/patch-ao b/audio/dap/patches/patch-ao
deleted file mode 100644
index 022638c2f9f..00000000000
--- a/audio/dap/patches/patch-ao
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ao,v 1.3 2001/05/31 12:30:12 agc Exp $
-
---- spkit/spkit/Makefile.netbsd.orig Fri Dec 3 22:05:21 1999
-+++ spkit/spkit/Makefile.netbsd Fri Dec 3 22:06:18 1999
-@@ -7,9 +7,9 @@
- MAINDIR = ../../main
- HOMEDIR = $(HOME)
- X11DIR = /usr/X11R6
--INCDIR = -I. -I.. -I../.. -I$(SOUND) -I$(FORMS) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11
-+INCDIR = -I. -I.. -I../.. -I$(SOUND) -I$(FORMS) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I${X11PREFIX}/include -I${X11PREFIX}/include/X11
- CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DNETBSD -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
--DEBUG = -g3
-+DEBUG = #-g3
- OPTIM = -O2
-
- .c.o:
diff --git a/audio/dap/patches/patch-ap b/audio/dap/patches/patch-ap
deleted file mode 100644
index bf6765a9728..00000000000
--- a/audio/dap/patches/patch-ap
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ap,v 1.4 2001/05/31 12:30:12 agc Exp $
-
---- tooltips/Makefile.netbsd.orig Thu Feb 24 01:01:26 2000
-+++ tooltips/Makefile.netbsd Mon Apr 10 20:34:10 2000
-@@ -29,17 +29,19 @@
- XFORMS_INCLUDE_DIR = $(HOME)/xforms/FORMS
-
- # Define where the X11 include files are.
--X11_INCLUDE_DIR = /usr/X11R6/include/X11
-+X11_INCLUDE_DIR = ${X11BASE}/include/X11
-
- # Define where the X11 include files are for Sun systems
- SUN_INCLUDE_DIR = /usr/openwin/include
-
- # Define other include file directories.
--OTHER_INCLUDE_DIR = /usr/X11R6/include
-+OTHER_INCLUDE_DIR = ${X11PREFIX}/include/X11
-+
-+X11_BASE_INCLUDE= ${X11BASE}/include
-
- # Uncomment out this line if you do not want debug information included.
- # DEBUG = -g -Wall -ansi -pedantic
--DEBUG =
-+DEBUG = -O2
-
- # Set the default optimisation
- OPTIM = -O1
-@@ -47,7 +49,7 @@
- # Define the utilities to use for compilation.
- CC = gcc
- CCOPTS = $(DEBUG) $(OPTIM) -I$(XFORMS_INCLUDE_DIR) -I$(X11_INCLUDE_DIR) \
-- -I$(SUN_INCLUDE_DIR) -I$(OTHER_INCLUDE_DIR)
-+ -I$(SUN_INCLUDE_DIR) -I$(OTHER_INCLUDE_DIR) -I${X11_BASE_INCLUDE}
- AR = ar
- AROPTS = ruv
- SED = sed
diff --git a/audio/darkice/DESCR b/audio/darkice/DESCR
deleted file mode 100644
index 800ae05e37c..00000000000
--- a/audio/darkice/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-DarkIce is an IceCast, IceCast2 and ShoutCast live audio streamer. It takes
-audio input from a sound card, encodes it into mp3 and/or Ogg Vorbis, and sends
-the streams to one or more IceCast, ShoutCast and/or IceCast2 servers. DarkIce
-uses lame as a shared object as its mp3 encoder, and the Ogg Vorbis libs as its
-Ogg Vorbis encoder.
diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile
deleted file mode 100644
index 63b064b5489..00000000000
--- a/audio/darkice/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2007/02/22 19:01:13 wiz Exp $
-#
-
-DISTNAME= darkice-0.17.1
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=darkice/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://darkice.sourceforge.net/
-COMMENT= IceCast, IceCast2 and ShoutCast live audio streamer
-
-GNU_CONFIGURE= yes
-USE_LANGUAGES= c c++
-USE_TOOLS+= gmake
-
-CONFIGURE_ARGS+= --with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis}
-CONFIGURE_ARGS+= --with-lame-prefix=${BUILDLINK_PREFIX.lame}
-CONFIGURE_ARGS+= --with-twolame-prefix=${BUILDLINK_PREFIX.twolame}
-CONFIGURE_ARGS+= --with-faac-prefix=${BUILDLINK_PREFIX.faac}
-CONFIGURE_ARGS+= --without-jack
-LIBS+= ${LIBOSSAUDIO:Q}
-
-EGDIR= ${PREFIX}/share/examples/darkice
-HTMLDIR= ${PREFIX}/share/doc/darkice
-
-CONF_FILES= ${EGDIR}/darkice.conf ${PKG_SYSCONFDIR}/darkice.conf
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
-
-do-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA_DIR} ${HTMLDIR}
- ${INSTALL_DATA} ${WRKSRC}/darkice.cfg ${EGDIR}/darkice.conf
- ${INSTALL_PROGRAM} ${WRKSRC}/src/darkice ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/man/darkice.1 ${PREFIX}/${PKGMANDIR}/man1
- ${INSTALL_MAN} ${WRKSRC}/man/darkice.cfg.5 \
- ${PREFIX}/${PKGMANDIR}/man5/darkice.conf.5
- cd ${WRKSRC}/doc/doxygen/html && ${INSTALL_DATA} *.html ${HTMLDIR}
-
-.include "../../audio/faac/buildlink3.mk"
-.include "../../audio/lame/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/twolame/buildlink3.mk"
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/darkice/PLIST b/audio/darkice/PLIST
deleted file mode 100644
index 937d2096ec3..00000000000
--- a/audio/darkice/PLIST
+++ /dev/null
@@ -1,223 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2006/05/21 10:27:01 xtraeme Exp $
-bin/darkice
-man/man1/darkice.1
-man/man5/darkice.conf.5
-share/doc/darkice/AacEncoder_8cpp-source.html
-share/doc/darkice/AacEncoder_8cpp.html
-share/doc/darkice/AacEncoder_8h-source.html
-share/doc/darkice/AacEncoder_8h.html
-share/doc/darkice/AlsaDspSource_8cpp-source.html
-share/doc/darkice/AlsaDspSource_8cpp.html
-share/doc/darkice/AlsaDspSource_8h-source.html
-share/doc/darkice/AlsaDspSource_8h.html
-share/doc/darkice/AudioEncoder_8h-source.html
-share/doc/darkice/AudioEncoder_8h.html
-share/doc/darkice/AudioSource_8cpp-source.html
-share/doc/darkice/AudioSource_8cpp.html
-share/doc/darkice/AudioSource_8h-source.html
-share/doc/darkice/AudioSource_8h.html
-share/doc/darkice/BufferedSink_8cpp-source.html
-share/doc/darkice/BufferedSink_8cpp.html
-share/doc/darkice/BufferedSink_8h-source.html
-share/doc/darkice/BufferedSink_8h.html
-share/doc/darkice/CastSink_8cpp-source.html
-share/doc/darkice/CastSink_8cpp.html
-share/doc/darkice/CastSink_8h-source.html
-share/doc/darkice/CastSink_8h.html
-share/doc/darkice/ConfigSection_8cpp-source.html
-share/doc/darkice/ConfigSection_8cpp.html
-share/doc/darkice/ConfigSection_8h-source.html
-share/doc/darkice/ConfigSection_8h.html
-share/doc/darkice/Connector_8cpp-source.html
-share/doc/darkice/Connector_8cpp.html
-share/doc/darkice/Connector_8h-source.html
-share/doc/darkice/Connector_8h.html
-share/doc/darkice/DarkIceConfig_8cpp-source.html
-share/doc/darkice/DarkIceConfig_8cpp.html
-share/doc/darkice/DarkIceConfig_8h-source.html
-share/doc/darkice/DarkIceConfig_8h.html
-share/doc/darkice/DarkIce_8cpp-source.html
-share/doc/darkice/DarkIce_8cpp.html
-share/doc/darkice/DarkIce_8h-source.html
-share/doc/darkice/DarkIce_8h.html
-share/doc/darkice/Exception_8cpp-source.html
-share/doc/darkice/Exception_8cpp.html
-share/doc/darkice/Exception_8h-source.html
-share/doc/darkice/Exception_8h.html
-share/doc/darkice/FaacEncoder_8cpp-source.html
-share/doc/darkice/FaacEncoder_8cpp.html
-share/doc/darkice/FaacEncoder_8h-source.html
-share/doc/darkice/FaacEncoder_8h.html
-share/doc/darkice/FileCast_8cpp-source.html
-share/doc/darkice/FileCast_8cpp.html
-share/doc/darkice/FileCast_8h-source.html
-share/doc/darkice/FileCast_8h.html
-share/doc/darkice/FileSink_8cpp-source.html
-share/doc/darkice/FileSink_8cpp.html
-share/doc/darkice/FileSink_8h-source.html
-share/doc/darkice/FileSink_8h.html
-share/doc/darkice/IceCast2_8cpp-source.html
-share/doc/darkice/IceCast2_8cpp.html
-share/doc/darkice/IceCast2_8h-source.html
-share/doc/darkice/IceCast2_8h.html
-share/doc/darkice/IceCast_8cpp-source.html
-share/doc/darkice/IceCast_8cpp.html
-share/doc/darkice/IceCast_8h-source.html
-share/doc/darkice/IceCast_8h.html
-share/doc/darkice/JackDspSource_8cpp-source.html
-share/doc/darkice/JackDspSource_8cpp.html
-share/doc/darkice/JackDspSource_8h-source.html
-share/doc/darkice/JackDspSource_8h.html
-share/doc/darkice/LameLibEncoder_8cpp-source.html
-share/doc/darkice/LameLibEncoder_8cpp.html
-share/doc/darkice/LameLibEncoder_8h-source.html
-share/doc/darkice/LameLibEncoder_8h.html
-share/doc/darkice/MultiThreadedConnector_8cpp-source.html
-share/doc/darkice/MultiThreadedConnector_8cpp.html
-share/doc/darkice/MultiThreadedConnector_8h-source.html
-share/doc/darkice/MultiThreadedConnector_8h.html
-share/doc/darkice/OssDspSource_8cpp-source.html
-share/doc/darkice/OssDspSource_8cpp.html
-share/doc/darkice/OssDspSource_8h-source.html
-share/doc/darkice/OssDspSource_8h.html
-share/doc/darkice/Ref_8h-source.html
-share/doc/darkice/Ref_8h.html
-share/doc/darkice/Referable_8h-source.html
-share/doc/darkice/Referable_8h.html
-share/doc/darkice/Reporter_8cpp-source.html
-share/doc/darkice/Reporter_8cpp.html
-share/doc/darkice/Reporter_8h-source.html
-share/doc/darkice/Reporter_8h.html
-share/doc/darkice/ShoutCast_8cpp-source.html
-share/doc/darkice/ShoutCast_8cpp.html
-share/doc/darkice/ShoutCast_8h-source.html
-share/doc/darkice/ShoutCast_8h.html
-share/doc/darkice/Sink_8h-source.html
-share/doc/darkice/Sink_8h.html
-share/doc/darkice/SolarisDspSource_8cpp-source.html
-share/doc/darkice/SolarisDspSource_8cpp.html
-share/doc/darkice/SolarisDspSource_8h-source.html
-share/doc/darkice/SolarisDspSource_8h.html
-share/doc/darkice/Source_8h-source.html
-share/doc/darkice/Source_8h.html
-share/doc/darkice/TcpSocket_8cpp-source.html
-share/doc/darkice/TcpSocket_8cpp.html
-share/doc/darkice/TcpSocket_8h-source.html
-share/doc/darkice/TcpSocket_8h.html
-share/doc/darkice/TwoLameLibEncoder_8cpp-source.html
-share/doc/darkice/TwoLameLibEncoder_8cpp.html
-share/doc/darkice/TwoLameLibEncoder_8h-source.html
-share/doc/darkice/TwoLameLibEncoder_8h.html
-share/doc/darkice/Util_8cpp-source.html
-share/doc/darkice/Util_8cpp.html
-share/doc/darkice/Util_8h-source.html
-share/doc/darkice/Util_8h.html
-share/doc/darkice/VorbisLibEncoder_8cpp-source.html
-share/doc/darkice/VorbisLibEncoder_8cpp.html
-share/doc/darkice/VorbisLibEncoder_8h-source.html
-share/doc/darkice/VorbisLibEncoder_8h.html
-share/doc/darkice/aflibConverterLargeFilter_8h-source.html
-share/doc/darkice/aflibConverterLargeFilter_8h.html
-share/doc/darkice/aflibConverterSmallFilter_8h-source.html
-share/doc/darkice/aflibConverterSmallFilter_8h.html
-share/doc/darkice/aflibConverter_8cc-source.html
-share/doc/darkice/aflibConverter_8cc.html
-share/doc/darkice/aflibConverter_8h-source.html
-share/doc/darkice/aflibConverter_8h.html
-share/doc/darkice/aflibDebug_8cc-source.html
-share/doc/darkice/aflibDebug_8cc.html
-share/doc/darkice/aflibDebug_8h-source.html
-share/doc/darkice/aflibDebug_8h.html
-share/doc/darkice/annotated.html
-share/doc/darkice/classAacEncoder-members.html
-share/doc/darkice/classAacEncoder.html
-share/doc/darkice/classAlsaDspSource-members.html
-share/doc/darkice/classAlsaDspSource.html
-share/doc/darkice/classAudioEncoder-members.html
-share/doc/darkice/classAudioEncoder.html
-share/doc/darkice/classAudioSource-members.html
-share/doc/darkice/classAudioSource.html
-share/doc/darkice/classBufferedSink-members.html
-share/doc/darkice/classBufferedSink.html
-share/doc/darkice/classCastSink-members.html
-share/doc/darkice/classCastSink.html
-share/doc/darkice/classConfig-members.html
-share/doc/darkice/classConfig.html
-share/doc/darkice/classConfigSection-members.html
-share/doc/darkice/classConfigSection.html
-share/doc/darkice/classConnector-members.html
-share/doc/darkice/classConnector.html
-share/doc/darkice/classDarkIce-members.html
-share/doc/darkice/classDarkIce.html
-share/doc/darkice/classDebugInitFromEnv-members.html
-share/doc/darkice/classDebugInitFromEnv.html
-share/doc/darkice/classException-members.html
-share/doc/darkice/classException.html
-share/doc/darkice/classFaacEncoder-members.html
-share/doc/darkice/classFaacEncoder.html
-share/doc/darkice/classFileCast-members.html
-share/doc/darkice/classFileCast.html
-share/doc/darkice/classFileSink-members.html
-share/doc/darkice/classFileSink.html
-share/doc/darkice/classIceCast-members.html
-share/doc/darkice/classIceCast.html
-share/doc/darkice/classIceCast2-members.html
-share/doc/darkice/classIceCast2.html
-share/doc/darkice/classJackDspSource-members.html
-share/doc/darkice/classJackDspSource.html
-share/doc/darkice/classLameLibEncoder-members.html
-share/doc/darkice/classLameLibEncoder.html
-share/doc/darkice/classMultiThreadedConnector-members.html
-share/doc/darkice/classMultiThreadedConnector.html
-share/doc/darkice/classOssDspSource-members.html
-share/doc/darkice/classOssDspSource.html
-share/doc/darkice/classRef-members.html
-share/doc/darkice/classRef.html
-share/doc/darkice/classReferable-members.html
-share/doc/darkice/classReferable.html
-share/doc/darkice/classReporter-members.html
-share/doc/darkice/classReporter.html
-share/doc/darkice/classShoutCast-members.html
-share/doc/darkice/classShoutCast.html
-share/doc/darkice/classSink-members.html
-share/doc/darkice/classSink.html
-share/doc/darkice/classSolarisDspSource-members.html
-share/doc/darkice/classSolarisDspSource.html
-share/doc/darkice/classSource-members.html
-share/doc/darkice/classSource.html
-share/doc/darkice/classTcpSocket-members.html
-share/doc/darkice/classTcpSocket.html
-share/doc/darkice/classTwoLameLibEncoder-members.html
-share/doc/darkice/classTwoLameLibEncoder.html
-share/doc/darkice/classUtil-members.html
-share/doc/darkice/classUtil.html
-share/doc/darkice/classVorbisLibEncoder-members.html
-share/doc/darkice/classVorbisLibEncoder.html
-share/doc/darkice/classaflibConverter-members.html
-share/doc/darkice/classaflibConverter.html
-share/doc/darkice/classaflibDebug-members.html
-share/doc/darkice/classaflibDebug.html
-share/doc/darkice/classes.html
-share/doc/darkice/config_8h-source.html
-share/doc/darkice/config_8h.html
-share/doc/darkice/dir_000000.html
-share/doc/darkice/dirs.html
-share/doc/darkice/files.html
-share/doc/darkice/functions.html
-share/doc/darkice/functions_enum.html
-share/doc/darkice/functions_eval.html
-share/doc/darkice/functions_func.html
-share/doc/darkice/functions_vars.html
-share/doc/darkice/globals.html
-share/doc/darkice/globals_defs.html
-share/doc/darkice/globals_func.html
-share/doc/darkice/globals_vars.html
-share/doc/darkice/graph_legend.html
-share/doc/darkice/hierarchy.html
-share/doc/darkice/index.html
-share/doc/darkice/inherits.html
-share/doc/darkice/main_8cpp-source.html
-share/doc/darkice/main_8cpp.html
-share/examples/darkice/darkice.conf
-@dirrm share/examples/darkice
-@dirrm share/doc/darkice
diff --git a/audio/darkice/distinfo b/audio/darkice/distinfo
deleted file mode 100644
index 2c73530b50e..00000000000
--- a/audio/darkice/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.7 2006/10/10 20:09:22 rillig Exp $
-
-SHA1 (darkice-0.17.1.tar.gz) = 2952961c8e99412d831ca619f152ba6774efefac
-RMD160 (darkice-0.17.1.tar.gz) = b6575b28190276d77e721e2ef15e8a93162693cc
-Size (darkice-0.17.1.tar.gz) = 1407826 bytes
-SHA1 (patch-aa) = 6f58c2ae94a9b199ac733fd4b0742178f46dc961
diff --git a/audio/darkice/patches/patch-aa b/audio/darkice/patches/patch-aa
deleted file mode 100644
index c2f5f1d1d46..00000000000
--- a/audio/darkice/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2006/10/10 20:09:22 rillig Exp $
-
---- configure.orig 2006-10-10 22:01:05.000000000 +0200
-+++ configure 2006-10-10 22:07:44.000000000 +0200
-@@ -6750,7 +6750,7 @@ else
- USE_DEBUG="no"
- fi;
-
--if test "x${USE_DEBUG}" == "xyes" ; then
-+if test "x${USE_DEBUG}" = "xyes" ; then
- DEBUG_CXXFLAGS="-g"
- echo "$as_me:$LINENO: result: compiling in debug mode" >&5
- echo "${ECHO_T}compiling in debug mode" >&6
diff --git a/audio/disc-cover/DESCR b/audio/disc-cover/DESCR
deleted file mode 100644
index f045d4cc6cf..00000000000
--- a/audio/disc-cover/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Providing an easy way to produce covers for audio cds. It scans audio cds and
-uses information from the freedb database to build a back and front cover for
-the cd. The cover is output is in Latex, Dvi, Pdf or Postscript.
diff --git a/audio/disc-cover/Makefile b/audio/disc-cover/Makefile
deleted file mode 100644
index 346bbd47384..00000000000
--- a/audio/disc-cover/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.22 2007/01/07 09:13:47 rillig Exp $
-#
-
-DISTNAME= disc-cover-1.5.6
-CATEGORIES= audio
-MASTER_SITES= http://www.vanhemert.co.uk/files/
-
-MAINTAINER= drochner@NetBSD.org
-HOMEPAGE= http://www.vanhemert.co.uk/disc-cover.html
-COMMENT= Generation of CD covers
-
-DEPENDS+= p5-Audio-CD>=0.05:../../audio/p5-Audio-CD
-
-USE_TOOLS+= perl:run pod2man
-REPLACE_PERL= disc-cover
-
-DCTMPL= ${PREFIX}/share/disc-cover/templates
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-do-build:
- cd ${WRKSRC} && ${POD2MAN} disc-cover > disc-cover.1
- ${SED} "s|@DCTMPL@|${DCTMPL}|g" <${WRKSRC}/disc-cover \
- >${WRKDIR}/disc-cover
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKDIR}/disc-cover ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/disc-cover.1 ${PREFIX}/${PKGMANDIR}/man1
- ${INSTALL_DATA_DIR} ${DCTMPL}
- ${INSTALL_DATA} ${WRKSRC}/templates/* ${DCTMPL}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/disc-cover/PLIST b/audio/disc-cover/PLIST
deleted file mode 100644
index 2c0172ebaec..00000000000
--- a/audio/disc-cover/PLIST
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2006/07/03 18:45:24 drochner Exp $
-bin/disc-cover
-man/man1/disc-cover.1
-share/disc-cover/templates/backonly
-share/disc-cover/templates/jewel
-share/disc-cover/templates/jewel-picture
-share/disc-cover/templates/letter-slim
-share/disc-cover/templates/paper-box
-share/disc-cover/templates/sleeve
-share/disc-cover/templates/slim
-share/disc-cover/templates/tape
-share/disc-cover/templates/tdk-slim
-share/disc-cover/templates/tevion-slim
-share/disc-cover/templates/x-slim
-@dirrm share/disc-cover/templates
-@dirrm share/disc-cover
diff --git a/audio/disc-cover/distinfo b/audio/disc-cover/distinfo
deleted file mode 100644
index c893c4a0ca6..00000000000
--- a/audio/disc-cover/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.13 2006/07/03 18:45:24 drochner Exp $
-
-SHA1 (disc-cover-1.5.6.tar.gz) = 83d5ed56e955219ca71f66900b9873f1a8999384
-RMD160 (disc-cover-1.5.6.tar.gz) = 946dc1854425876dffb122b949af277958eda2a4
-Size (disc-cover-1.5.6.tar.gz) = 52749 bytes
-SHA1 (patch-aa) = 599f6715726d2d23c99c412e578394efa6174593
diff --git a/audio/disc-cover/patches/patch-aa b/audio/disc-cover/patches/patch-aa
deleted file mode 100644
index 5e344ed764a..00000000000
--- a/audio/disc-cover/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2006/07/03 18:45:25 drochner Exp $
-
---- disc-cover.orig 2006-06-20 14:16:24.000000000 +0200
-+++ disc-cover
-@@ -39,7 +39,7 @@ my $cvs_id_string = '$Id: disc-cover,v 1
- my ($config_homedir) = "";
- $config_homedir = "$ENV{HOME}" if (defined $ENV{HOME});
- my ($config_tmp_dir) = '/tmp';
--my (@config_template_dirs) = ('/usr/share/disc-cover/templates','/usr/lib/disc-cover/templates','templates');
-+my (@config_template_dirs) = ('@DCTMPL@', 'templates');
- my ($config_output_format) = 'ps';
- my ($config_device) = "/dev/cdrom";
- my ($config_cddb_cache_directory) = "$config_homedir/.cddb";
diff --git a/audio/distmp3/DESCR b/audio/distmp3/DESCR
deleted file mode 100644
index 232515f6c37..00000000000
--- a/audio/distmp3/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-distmp3 is a client and a daemon (both written in perl) for distributed
-mp3-encoding across multiple hosts on a network.
-
-distmp3 can be used standalone or with a front-end CD ripper such as
-audio/abcde.
diff --git a/audio/distmp3/MESSAGE b/audio/distmp3/MESSAGE
deleted file mode 100644
index 1358142ba81..00000000000
--- a/audio/distmp3/MESSAGE
+++ /dev/null
@@ -1,11 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2005/02/13 11:55:56 grant Exp $
-
-You will need edit the distmp3 configuration file
-
- ${PKG_SYSCONFDIR}/distmp3.conf
-
-to define at least SERVER_PROGRAM for your choice of encoder on the
-encoding hosts.
-
-===========================================================================
diff --git a/audio/distmp3/Makefile b/audio/distmp3/Makefile
deleted file mode 100644
index 46a25be5b23..00000000000
--- a/audio/distmp3/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2006/10/25 18:54:08 rillig Exp $
-#
-
-DISTNAME= distmp3-0.1.9
-CATEGORIES= audio
-MASTER_SITES= http://distro.ibiblio.org/pub/linux/distributions/sorcerer/sources/distmp3/0.1.9/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= grant@NetBSD.org
-COMMENT= Distributed mp3 encoding across multiple hosts
-
-USE_LANGUAGES= # empty
-USE_TOOLS+= perl:run
-NO_BUILD= yes
-
-EGDIR= ${PREFIX}/share/examples/distmp3
-CONF_FILES= ${EGDIR}/distmp3.conf ${PKG_SYSCONFDIR}/distmp3.conf
-REPLACE_PERL= distmp3 distmp3host
-
-SUBST_CLASSES+= paths
-SUBST_MESSAGE.paths= Fixing configuration file path.
-SUBST_STAGE.paths= post-configure
-SUBST_FILES.paths= distmp3 distmp3.1 distmp3host distmp3host.1
-SUBST_SED.paths= -e 's,/etc/distmp3,${PKG_SYSCONFDIR},'
-
-SUBST_CLASSES+= config
-SUBST_MESSAGE.config= Fixing configuration file parameters.
-SUBST_STAGE.config= post-configure
-SUBST_FILES.config= distmp3.conf
-SUBST_SED.config+= -e 's,^SERVER_PROGRAM,; SERVER_PROGRAM,'
-SUBST_SED.config+= -e 's,/usr/local,${PREFIX},'
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/distmp3 ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/distmp3host ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/distmp3.1 ${PREFIX}/${PKGMANDIR}/man1
- ${INSTALL_MAN} ${WRKSRC}/distmp3host.1 ${PREFIX}/${PKGMANDIR}/man1
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/distmp3.conf ${EGDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/distmp3/PLIST b/audio/distmp3/PLIST
deleted file mode 100644
index db8d07ae927..00000000000
--- a/audio/distmp3/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/02/13 11:55:56 grant Exp $
-bin/distmp3
-bin/distmp3host
-man/man1/distmp3.1
-man/man1/distmp3host.1
-share/examples/distmp3/distmp3.conf
-@dirrm share/examples/distmp3
diff --git a/audio/distmp3/distinfo b/audio/distmp3/distinfo
deleted file mode 100644
index c2fea283438..00000000000
--- a/audio/distmp3/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:44 agc Exp $
-
-SHA1 (distmp3-0.1.9.tar.bz2) = 009b6131a13213ca08bc860027340cc640535a76
-RMD160 (distmp3-0.1.9.tar.bz2) = d9cea57e9974386fc5ac1c790d19e00aa3ff2615
-Size (distmp3-0.1.9.tar.bz2) = 12133 bytes
diff --git a/audio/easyh10/DESCR b/audio/easyh10/DESCR
deleted file mode 100644
index c5e7ba43917..00000000000
--- a/audio/easyh10/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-EasyH10 is an open source project for the development of a software suite for
-iRiver H10 digital audio players. It creates the database layout for an H10
-player, without the need for iRiver Plus or Windows Media Player 10, based on
-music and playlist files transferred manually (e.g., drag-and-drop operation,
-copy command, rsync utility, etc). EasyH10 is compatible with iriver H10 5GB,
-6GB, and 20GB models shipped worldwide as well as various platforms such as
-Windows 98SE/ME/2000/XP, Linux, MacOS X, and other POSIX-like operating
-systems.
diff --git a/audio/easyh10/MESSAGE b/audio/easyh10/MESSAGE
deleted file mode 100644
index 672acd8f42f..00000000000
--- a/audio/easyh10/MESSAGE
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2006/08/01 08:24:13 ghen Exp $
-
-For convenience you should copy the proper model template file from
-${PREFIX}/share/easyh10/model/ to "easyh10.model" or "easyh10/model"
-under the root of your H10's filesystem.
-===========================================================================
diff --git a/audio/easyh10/Makefile b/audio/easyh10/Makefile
deleted file mode 100644
index 3daea56d62f..00000000000
--- a/audio/easyh10/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/11/29 16:59:57 ghen Exp $
-
-DISTNAME= easyh10-1.5
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=easyh10/}
-
-MAINTAINER= ghen@NetBSD.org
-HOMEPAGE= http://easyh10.sourceforge.net/
-COMMENT= Database tool for the iRiver H10 digital audio player
-
-USE_TOOLS+= gmake
-USE_GNU_ICONV= yes
-
-GNU_CONFIGURE= yes
-
-CONFIGURE_ARGS+=--with-id3tag-library=${BUILDLINK_PREFIX.libid3tag}/lib
-CONFIGURE_ARGS+=--with-iconv-library=${BUILDLINK_PREFIX.iconv}/lib
-
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/easyh10/PLIST b/audio/easyh10/PLIST
deleted file mode 100644
index 037b2633bf9..00000000000
--- a/audio/easyh10/PLIST
+++ /dev/null
@@ -1,28 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/08/01 08:24:13 ghen Exp $
-bin/easyh10
-man/man1/easyh10.1
-share/doc/easyh10/AUTHORS
-share/doc/easyh10/COPYING
-share/doc/easyh10/ChangeLog
-share/doc/easyh10/INSTALL
-share/doc/easyh10/NEWS
-share/doc/easyh10/README
-share/easyh10/model/H10MTP_20GB_FW1.00-1.02.model
-share/easyh10/model/H10MTP_20GB_FW2.51.model
-share/easyh10/model/H10MTP_5GB_FW2.03-2.10.model
-share/easyh10/model/H10MTP_5GB_FW2.51.model
-share/easyh10/model/H10MTP_6GB_FW2.03-2.10.model
-share/easyh10/model/H10MTP_6GB_FW2.51.model
-share/easyh10/model/H10UMS_5GB_FW2.03.model
-share/easyh10/model/H10UMS_5GB_FW2.04-2.51.model
-share/easyh10/model/H10UMS_5GB_FW2.04-2.52.model
-share/easyh10/model/H10UMS_6GB_FW2.03.model
-share/easyh10/model/H10UMS_6GB_FW2.04-2.51.model
-share/easyh10/model/H10UMS_6GB_FW2.04-2.52.model
-share/easyh10/model/berlin.de.fmr
-share/easyh10/model/default.fmr
-share/easyh10/model/dublin.ie.fmr
-share/easyh10/model/tokyo.jp.fmr
-@dirrm share/easyh10/model
-@dirrm share/easyh10
-@dirrm share/doc/easyh10
diff --git a/audio/easyh10/distinfo b/audio/easyh10/distinfo
deleted file mode 100644
index 3b3d3a74074..00000000000
--- a/audio/easyh10/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/11/29 16:59:57 ghen Exp $
-
-SHA1 (easyh10-1.5.tar.gz) = 2d6dd78f23829b6e2d21e3362a8eafd651597f19
-RMD160 (easyh10-1.5.tar.gz) = 87893bbcf595f928ba94fcde3b2b2c16b2e09c76
-Size (easyh10-1.5.tar.gz) = 406548 bytes
diff --git a/audio/easytag/DESCR b/audio/easytag/DESCR
deleted file mode 100644
index 9e8e2cb3c9b..00000000000
--- a/audio/easytag/DESCR
+++ /dev/null
@@ -1,24 +0,0 @@
-EasyTAG is an utility to easily and quickly view, edit and write your audio
-files' tags from a nice GTK+ interface.
-
-Its main features include:
-o View, edit and write tags of MP3, MP2 files (ID3 tag with pictures), FLAC
- files (FLAC Vorbis tag), Ogg Vorbis files (Ogg Vorbis tag), MP4/AAC
- (MP4/AAC tag), MusePack and Monkey's Audio files (APE tag).
-o Can edit many tag fields : Title, Artist, Album, Disc Album, Year, Track
- Number, Genre, Comment, Composer, Original Artist/Performer, Copyright,
- URL and Encoder name.
-o Auto tagging: parse file name and directory to automatically complete the
- fields (using masks).
-o Ability to rename files and directories from the tag (using masks) or by
- loading a text file.
-o Process all of the selected directory.
-o Recursion for tagging, removing, renaming, saving...
-o Can set a field (artist, title...) to all other files.
-o Read file header informations (bitrate, time...) and display them.
-o Auto completion of a date if a partial one is entered.
-o Ability to process fields of tag and file name (convert letters into
- uppercase, downcase, ...).
-o CDDB support using Freedb.org servers (manual and automatic search).
-o A tree-based browser or a view by Artist & Album.
-o A playlist generator window.
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
deleted file mode 100644
index 95df38f61ae..00000000000
--- a/audio/easytag/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.55 2007/02/27 09:58:49 wiz Exp $
-#
-
-DISTNAME= easytag-2.0
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=easytag/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= wiz@NetBSD.org
-HOMEPAGE= http://easytag.sourceforge.net/
-COMMENT= GTK+ tag editor for MP3, Ogg Vorbis files, and others
-
-GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.1
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= pkg-config xgettext
-
-.include "options.mk"
-
-BUILDLINK_API_DEPENDS.glib2+= glib2>=2.4.1
-BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.4.1
-
-.include "../../audio/id3lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/easytag/PLIST b/audio/easytag/PLIST
deleted file mode 100644
index 4e1f2cbad40..00000000000
--- a/audio/easytag/PLIST
+++ /dev/null
@@ -1,28 +0,0 @@
-@comment $NetBSD: PLIST,v 1.15 2007/02/27 09:58:49 wiz Exp $
-bin/easytag
-man/man1/easytag.1
-share/applications/easytag.desktop
-share/easytag/ChangeLog
-share/easytag/EasyTAG_logo.xpm
-share/locale/bg/LC_MESSAGES/easytag.mo
-share/locale/cs/LC_MESSAGES/easytag.mo
-share/locale/da/LC_MESSAGES/easytag.mo
-share/locale/de/LC_MESSAGES/easytag.mo
-share/locale/el/LC_MESSAGES/easytag.mo
-share/locale/es/LC_MESSAGES/easytag.mo
-share/locale/fr/LC_MESSAGES/easytag.mo
-share/locale/hu/LC_MESSAGES/easytag.mo
-share/locale/it/LC_MESSAGES/easytag.mo
-share/locale/ja/LC_MESSAGES/easytag.mo
-share/locale/nl/LC_MESSAGES/easytag.mo
-share/locale/pl/LC_MESSAGES/easytag.mo
-share/locale/pt_BR/LC_MESSAGES/easytag.mo
-share/locale/ro/LC_MESSAGES/easytag.mo
-share/locale/ru/LC_MESSAGES/easytag.mo
-share/locale/sv/LC_MESSAGES/easytag.mo
-share/locale/uk/LC_MESSAGES/easytag.mo
-share/locale/zh_CN/LC_MESSAGES/easytag.mo
-share/pixmaps/EasyTAG.xpm
-@comment in xdg-dirs: @dirrm share/pixmaps
-@dirrm share/easytag
-@comment in xdg-dirs: @dirrm share/applications
diff --git a/audio/easytag/distinfo b/audio/easytag/distinfo
deleted file mode 100644
index efc1f0f15c8..00000000000
--- a/audio/easytag/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.25 2007/02/27 09:58:49 wiz Exp $
-
-SHA1 (easytag-2.0.tar.bz2) = 07d38a9192d4759904c2aec0530efa82c683af76
-RMD160 (easytag-2.0.tar.bz2) = 11fe2acea3c0c017ed904eb1171669024ab54301
-Size (easytag-2.0.tar.bz2) = 2889829 bytes
diff --git a/audio/easytag/options.mk b/audio/easytag/options.mk
deleted file mode 100644
index e428f0fb718..00000000000
--- a/audio/easytag/options.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2007/02/27 09:58:49 wiz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.easytag-gtk2
-PKG_SUPPORTED_OPTIONS= flac mpeg4ip ogg
-PKG_SUGGESTED_OPTIONS= flac mpeg4ip ogg
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mflac)
-. include "../../audio/flac/buildlink3.mk"
-. include "../../audio/libvorbis/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-flac
-.else
-CONFIGURE_ARGS+= --disable-flac
-.endif
-
-.if !empty(PKG_OPTIONS:Mmpeg4ip)
-.include "../../multimedia/libmp4v2/buildlink3.mk"
-# for mpeg4ip.h
-CPPFLAGS+= -DHAVE_GTK
-.endif
-
-.if !empty(PKG_OPTIONS:Mogg)
-. include "../../audio/libvorbis/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-ogg
-.else
-CONFIGURE_ARGS+= --disable-ogg
-.endif
diff --git a/audio/eawpatches/DESCR b/audio/eawpatches/DESCR
deleted file mode 100644
index 512d199f9c1..00000000000
--- a/audio/eawpatches/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Eric A. Welsh' patches (audio samples) for TiMidity
diff --git a/audio/eawpatches/MESSAGE b/audio/eawpatches/MESSAGE
deleted file mode 100644
index 56240df6aa5..00000000000
--- a/audio/eawpatches/MESSAGE
+++ /dev/null
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.4 2006/10/27 13:45:44 drochner Exp $
-
- To use timidity with eawpatches, you have a couple of options.
-
- 1) at the command-line:
-
- timidity -L ${PREFIX}/share/eawpats -c timidity.cfg file.mid
-
- 2) in the system-wide timidity configuration:
-
- cp ${PREFIX}/share/eawpats/timidity.cfg ${PKG_SYSCONFDIR}
-
-===========================================================================
diff --git a/audio/eawpatches/Makefile b/audio/eawpatches/Makefile
deleted file mode 100644
index 4ba10c5b7cc..00000000000
--- a/audio/eawpatches/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2007/02/22 16:42:10 drochner Exp $
-#
-
-DISTNAME= eawpats12_full
-PKGNAME= eawpatches-12
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_GENTOO:=distfiles/}
-
-MAINTAINER= adam@NetBSD.org
-COMMENT= Eric A. Welsh' patches (audio samples) for TiMidity
-
-RESTRICTED= Some patches are copyrighted, some marked no-commercial-use
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-LICENSE= generic-nonlicense
-
-WRKSRC= ${WRKDIR}
-NO_BUILD= yes
-MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
-
-post-extract:
- chmod go-w ${WRKSRC}/eawpats/gravis.cfg
-
-pre-configure:
- sed -e "s@/home/user/eawpats@${PREFIX}/share/eawpats@" \
- < ${WRKSRC}/eawpats/linuxconfig/timidity.cfg \
- > ${WRKSRC}/eawpats/timidity.cfg
- rm -r ${WRKSRC}/eawpats/linuxconfig \
- ${WRKSRC}/eawpats/winconfig
-
-do-install:
- cd ${WRKSRC} && pax -wr eawpats ${PREFIX}/share
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/eawpatches/PLIST b/audio/eawpatches/PLIST
deleted file mode 100644
index fdb1fe023f4..00000000000
--- a/audio/eawpatches/PLIST
+++ /dev/null
@@ -1,384 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2006/10/27 13:45:44 drochner Exp $
-share/eawpats/acbass.pat
-share/eawpats/accordn.pat
-share/eawpats/acguitar.pat
-share/eawpats/acpiano.pat
-share/eawpats/agogo.pat
-share/eawpats/agogohi.pat
-share/eawpats/agogolo.pat
-share/eawpats/altosax.pat
-share/eawpats/applause.pat
-share/eawpats/atmosphr.pat
-share/eawpats/aurora.pat
-share/eawpats/bagpipes.pat
-share/eawpats/banjo.pat
-share/eawpats/barisax.pat
-share/eawpats/basslead.pat
-share/eawpats/bassoon.pat
-share/eawpats/belltree.pat
-share/eawpats/blank.pat
-share/eawpats/bongohi.pat
-share/eawpats/bongolo.pat
-share/eawpats/bottle.pat
-share/eawpats/bowglass.pat
-share/eawpats/britepno.pat
-share/eawpats/cabasa.pat
-share/eawpats/calliope.pat
-share/eawpats/carillon.pat
-share/eawpats/castinet.pat
-share/eawpats/celeste.pat
-share/eawpats/cello.pat
-share/eawpats/changelog.txt
-share/eawpats/charang.pat
-share/eawpats/chiflead.pat
-share/eawpats/choir.pat
-share/eawpats/church.pat
-share/eawpats/claps.pat
-share/eawpats/clarinet.pat
-share/eawpats/clave.pat
-share/eawpats/clavinet.pat
-share/eawpats/cleangtr.pat
-share/eawpats/concrtbd.pat
-share/eawpats/concrtna.pat
-share/eawpats/congahi1.pat
-share/eawpats/congahi2.pat
-share/eawpats/congalo.pat
-share/eawpats/contraba.pat
-share/eawpats/copyrigh.txt
-share/eawpats/cowbell.pat
-share/eawpats/crystal.pat
-share/eawpats/cuica1.pat
-share/eawpats/cuica2.pat
-share/eawpats/cymbell.pat
-share/eawpats/cymchina.pat
-share/eawpats/cymcrsh1.pat
-share/eawpats/cymcrsh2.pat
-share/eawpats/cymride1.pat
-share/eawpats/cymride2.pat
-share/eawpats/cymsplsh.pat
-share/eawpats/default.cfg
-share/eawpats/distgtr.pat
-share/eawpats/doo.pat
-share/eawpats/drumsfx.txt
-share/eawpats/eawpats.txt
-share/eawpats/echovox.pat
-share/eawpats/englhorn.pat
-share/eawpats/epiano1.pat
-share/eawpats/epiano2.pat
-share/eawpats/ethnic/gong.pat
-share/eawpats/ethnic/tabla.pat
-share/eawpats/ethnic/tabla.txt
-share/eawpats/ethnic/talkbend.pat
-share/eawpats/ethnic/talkdrum.pat
-share/eawpats/fiddle.pat
-share/eawpats/flute.pat
-share/eawpats/fngrbass.pat
-share/eawpats/frenchrn.pat
-share/eawpats/freshair.pat
-share/eawpats/fretless.pat
-share/eawpats/fx-blow.pat
-share/eawpats/fx-fret.pat
-share/eawpats/ghostie.pat
-share/eawpats/glocken.pat
-share/eawpats/gravis.cfg
-share/eawpats/gsdrum08/gsdrum08.txt
-share/eawpats/gsdrum08/roomhi1.pat
-share/eawpats/gsdrum08/roomhi2.pat
-share/eawpats/gsdrum08/roomkick.pat
-share/eawpats/gsdrum08/roomlow1.pat
-share/eawpats/gsdrum08/roomlow2.pat
-share/eawpats/gsdrum08/roommid1.pat
-share/eawpats/gsdrum08/roommid2.pat
-share/eawpats/gsdrum25/78hhc.pat
-share/eawpats/gsdrum25/78hho.pat
-share/eawpats/gsdrum25/78kick.pat
-share/eawpats/gsdrum25/78snare.pat
-share/eawpats/gsdrum25/808bd2.pat
-share/eawpats/gsdrum25/808clap1.pat
-share/eawpats/gsdrum25/808clap2.pat
-share/eawpats/gsdrum25/808cowbl.pat
-share/eawpats/gsdrum25/808crsh1.pat
-share/eawpats/gsdrum25/808cymb.pat
-share/eawpats/gsdrum25/808hhc.pat
-share/eawpats/gsdrum25/808hho.pat
-share/eawpats/gsdrum25/808kick.pat
-share/eawpats/gsdrum25/808sd1.pat
-share/eawpats/gsdrum25/808sd2.pat
-share/eawpats/gsdrum25/808snar2.pat
-share/eawpats/gsdrum25/808snare.pat
-share/eawpats/gsdrum25/808stick.pat
-share/eawpats/gsdrum25/808tomh1.pat
-share/eawpats/gsdrum25/808tomh2.pat
-share/eawpats/gsdrum25/808toml1.pat
-share/eawpats/gsdrum25/808toml2.pat
-share/eawpats/gsdrum25/808tomm1.pat
-share/eawpats/gsdrum25/808tomm2.pat
-share/eawpats/gsdrum25/909hhc.pat
-share/eawpats/gsdrum25/909hho.pat
-share/eawpats/gsdrum25/909kick.pat
-share/eawpats/gsdrum25/909snare.pat
-share/eawpats/gsdrum25/909stick.pat
-share/eawpats/gsdrum25/gsdrm25p.txt
-share/eawpats/gsdrum25/revcym.pat
-share/eawpats/gsdrum25/scratch.pat
-share/eawpats/gsdrum40/br_slap.pat
-share/eawpats/gsdrum40/br_swirl.pat
-share/eawpats/gsdrum40/br_swish.pat
-share/eawpats/gsdrum40/gsdrum40.txt
-share/eawpats/gsdrum40/hihatcl.pat
-share/eawpats/gsdrum40/hihatop.pat
-share/eawpats/gsdrums.cfg
-share/eawpats/gssfx.cfg
-share/eawpats/gtrharm.pat
-share/eawpats/guiro1.pat
-share/eawpats/guiro2.pat
-share/eawpats/gus/scratch1.pat
-share/eawpats/gus/scratch2.pat
-share/eawpats/gus/slap.pat
-share/eawpats/gus/sqrwave.pat
-share/eawpats/halopad.pat
-share/eawpats/hammond.pat
-share/eawpats/harmonca.pat
-share/eawpats/harp.pat
-share/eawpats/helicptr.pat
-share/eawpats/highq.pat
-share/eawpats/hihatcl.pat
-share/eawpats/hihatop.pat
-share/eawpats/hihatpd.pat
-share/eawpats/hitbrass.pat
-share/eawpats/honky.pat
-share/eawpats/hrpschrd.pat
-share/eawpats/install.txt
-share/eawpats/jazzgtr.pat
-share/eawpats/jingles.pat
-share/eawpats/jungle.pat
-share/eawpats/kalimba.pat
-share/eawpats/kick1.pat
-share/eawpats/kick2.pat
-share/eawpats/koto.pat
-share/eawpats/lead5th.pat
-share/eawpats/maracas.pat
-share/eawpats/marcato.pat
-share/eawpats/marimba.pat
-share/eawpats/mazpat/fx/birdy5.pat
-share/eawpats/mazpat/fx/carstart.pat
-share/eawpats/mazpat/fx/drop.pat
-share/eawpats/mazpat/fx/footstep.pat
-share/eawpats/mazpat/fx/jet.pat
-share/eawpats/mazpat/fx/jungle.pat
-share/eawpats/mazpat/fx/laser2.pat
-share/eawpats/mazpat/fx/newstep.pat
-share/eawpats/mazpat/fx/newtrain.pat
-share/eawpats/mazpat/fx/rainyday.pat
-share/eawpats/mazpat/fx/sn-roll.pat
-share/eawpats/mazpat/fx/steps.pat
-share/eawpats/mazpat/fx/train.pat
-share/eawpats/mazpat/fx/water1.pat
-share/eawpats/mazpat/fx/water2.pat
-share/eawpats/mazpat/fx/water3.pat
-share/eawpats/mazpat/fx/water4.pat
-share/eawpats/mazpat/fx/watrbird.pat
-share/eawpats/mazpat/fx/wind3a.pat
-share/eawpats/mazpat/fx/windnois.pat
-share/eawpats/metalpad.pat
-share/eawpats/metbell.pat
-share/eawpats/metclick.pat
-share/eawpats/mt-32.cfg
-share/eawpats/musicbox.pat
-share/eawpats/mutegtr.pat
-share/eawpats/mutetrum.pat
-share/eawpats/newage.pat
-share/eawpats/nyguitar.pat
-share/eawpats/oboe.pat
-share/eawpats/ocarina.pat
-share/eawpats/odguitar.pat
-share/eawpats/orchhit.pat
-share/eawpats/patguide.txt
-share/eawpats/patref24.hlp
-share/eawpats/percorg.pat
-share/eawpats/piccolo.pat
-share/eawpats/pickbass.pat
-share/eawpats/pistol.pat
-share/eawpats/pizzcato.pat
-share/eawpats/polysyn.pat
-share/eawpats/power/e_power.txt
-share/eawpats/power/gatedbd.pat
-share/eawpats/power/gatesd0.pat
-share/eawpats/power/gatesd1.pat
-share/eawpats/power/gatesd2.pat
-share/eawpats/power/h-bd.pat
-share/eawpats/power/h-crash.pat
-share/eawpats/power/h-hihatc.pat
-share/eawpats/power/h-hihato.pat
-share/eawpats/power/h-hihatp.pat
-share/eawpats/power/h-ride.pat
-share/eawpats/power/h-rim.pat
-share/eawpats/power/h-snare.pat
-share/eawpats/power/h-splash.pat
-share/eawpats/power/h-tomhi1.pat
-share/eawpats/power/h-tomhi2.pat
-share/eawpats/power/h-tomlo1.pat
-share/eawpats/power/h-tomlo2.pat
-share/eawpats/power/h-tommd1.pat
-share/eawpats/power/h-tommd2.pat
-share/eawpats/power/hihatcl.pat
-share/eawpats/power/hihatop.pat
-share/eawpats/power/hihatpd.pat
-share/eawpats/power/powrkic0.pat
-share/eawpats/power/powrkic1.pat
-share/eawpats/power/powrkic2.pat
-share/eawpats/power/powrkic3.pat
-share/eawpats/power/roomhi1.pat
-share/eawpats/power/roomhi2.pat
-share/eawpats/power/roomkick.pat
-share/eawpats/power/roomlow1.pat
-share/eawpats/power/roomlow2.pat
-share/eawpats/power/roommid1.pat
-share/eawpats/power/roommid2.pat
-share/eawpats/proteus2.cfg
-share/eawpats/recorder.pat
-share/eawpats/reedorg.pat
-share/eawpats/revcym.pat
-share/eawpats/rockorg.pat
-share/eawpats/santur.pat
-share/eawpats/sawwave.pat
-share/eawpats/scratch1.pat
-share/eawpats/scratch2.pat
-share/eawpats/seashore.pat
-share/eawpats/sfx/ambulanc.pat
-share/eawpats/sfx/badmaou.pat
-share/eawpats/sfx/birdtwee.pat
-share/eawpats/sfx/bubbles1.pat
-share/eawpats/sfx/bubbling.pat
-share/eawpats/sfx/carcrash.pat
-share/eawpats/sfx/carengin.pat
-share/eawpats/sfx/carpass.pat
-share/eawpats/sfx/carstop.pat
-share/eawpats/sfx/cat1.pat
-share/eawpats/sfx/creak.pat
-share/eawpats/sfx/cutnoiz.pat
-share/eawpats/sfx/dialtone.pat
-share/eawpats/sfx/dog1.pat
-share/eawpats/sfx/dog2.pat
-share/eawpats/sfx/doggrowl.pat
-share/eawpats/sfx/door.pat
-share/eawpats/sfx/explsion.pat
-share/eawpats/sfx/firework.pat
-share/eawpats/sfx/flclick.pat
-share/eawpats/sfx/fretnoyz.pat
-share/eawpats/sfx/funkgtr.pat
-share/eawpats/sfx/gallop.pat
-share/eawpats/sfx/ghost.pat
-share/eawpats/sfx/ghost2.pat
-share/eawpats/sfx/heartbt.pat
-share/eawpats/sfx/hoofs.pat
-share/eawpats/sfx/laugh.pat
-share/eawpats/sfx/machgun1.pat
-share/eawpats/sfx/machgun2.pat
-share/eawpats/sfx/meow.pat
-share/eawpats/sfx/newwind.pat
-share/eawpats/sfx/punch.pat
-share/eawpats/sfx/rain1.pat
-share/eawpats/sfx/scratch1.pat
-share/eawpats/sfx/scratch2.pat
-share/eawpats/sfx/scream.pat
-share/eawpats/sfx/siren1.pat
-share/eawpats/sfx/siren2.pat
-share/eawpats/sfx/starship.pat
-share/eawpats/sfx/stream.pat
-share/eawpats/sfx/stream1.pat
-share/eawpats/sfx/telephon.pat
-share/eawpats/sfx/thunder1.pat
-share/eawpats/sfx/thunder2.pat
-share/eawpats/sfx/train.pat
-share/eawpats/sfx/whales.pat
-share/eawpats/sfx/windchim.pat
-share/eawpats/shakazul.pat
-share/eawpats/shaker.pat
-share/eawpats/shamisen.pat
-share/eawpats/shannai.pat
-share/eawpats/sitar.pat
-share/eawpats/slap.pat
-share/eawpats/slapbas1.pat
-share/eawpats/slapbas2.pat
-share/eawpats/slowstr.pat
-share/eawpats/snap.pat
-share/eawpats/snare1.pat
-share/eawpats/snare2.pat
-share/eawpats/snarerol.pat
-share/eawpats/sndfont.cfg
-share/eawpats/soundtrk.pat
-share/eawpats/sprnosax.pat
-share/eawpats/sqrclick.pat
-share/eawpats/sqrwave.pat
-share/eawpats/startrak.pat
-share/eawpats/steeldrm.pat
-share/eawpats/stickrim.pat
-share/eawpats/sticks.pat
-share/eawpats/surdo1.pat
-share/eawpats/surdo2.pat
-share/eawpats/sustain.cfg
-share/eawpats/sweeper.pat
-share/eawpats/synbass1.pat
-share/eawpats/synbass2.pat
-share/eawpats/synbras1.pat
-share/eawpats/synbras2.pat
-share/eawpats/synpiano.pat
-share/eawpats/synstr1.pat
-share/eawpats/synstr2.pat
-share/eawpats/syntom.pat
-share/eawpats/taiko.pat
-share/eawpats/tamborin.pat
-share/eawpats/telephon.pat
-share/eawpats/tenorsax.pat
-share/eawpats/timbaleh.pat
-share/eawpats/timbalel.pat
-share/eawpats/timidity.cfg
-share/eawpats/timpani.pat
-share/eawpats/tomhi1.pat
-share/eawpats/tomhi2.pat
-share/eawpats/tomlo1.pat
-share/eawpats/tomlo2.pat
-share/eawpats/tommid1.pat
-share/eawpats/tommid2.pat
-share/eawpats/toms.pat
-share/eawpats/tremstr.pat
-share/eawpats/triangl1.pat
-share/eawpats/triangl2.pat
-share/eawpats/trombone.pat
-share/eawpats/trump2.pat
-share/eawpats/trumpet.pat
-share/eawpats/tuba.pat
-share/eawpats/tubebell.pat
-share/eawpats/ultrasnd.ini
-share/eawpats/unicorn.pat
-share/eawpats/vibes.pat
-share/eawpats/vibslap.pat
-share/eawpats/viola.pat
-share/eawpats/violin.pat
-share/eawpats/voices.pat
-share/eawpats/voxlead.pat
-share/eawpats/warmpad.pat
-share/eawpats/whistle.pat
-share/eawpats/whistle1.pat
-share/eawpats/whistle2.pat
-share/eawpats/wime/wime.txt
-share/eawpats/wime/wimebd.pat
-share/eawpats/wime/wimesd.pat
-share/eawpats/woodblk.pat
-share/eawpats/woodblk1.pat
-share/eawpats/woodblk2.pat
-share/eawpats/woodflut.pat
-share/eawpats/xgmap2.cfg
-share/eawpats/xylophon.pat
-@dirrm share/eawpats/wime
-@dirrm share/eawpats/sfx
-@dirrm share/eawpats/power
-@dirrm share/eawpats/mazpat/fx
-@dirrm share/eawpats/mazpat
-@dirrm share/eawpats/gus
-@dirrm share/eawpats/gsdrum40
-@dirrm share/eawpats/gsdrum25
-@dirrm share/eawpats/gsdrum08
-@dirrm share/eawpats/ethnic
-@dirrm share/eawpats
diff --git a/audio/eawpatches/distinfo b/audio/eawpatches/distinfo
deleted file mode 100644
index 9603ffe76ff..00000000000
--- a/audio/eawpatches/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.8 2006/10/27 13:45:44 drochner Exp $
-
-SHA1 (eawpats12_full.tar.gz) = 838fa08e405a65e988f4d576b086a3e4d99a4da0
-RMD160 (eawpats12_full.tar.gz) = 79616f0417943a72e616898a69b85b6cfd81f492
-Size (eawpats12_full.tar.gz) = 32047230 bytes
diff --git a/audio/emixer/DESCR b/audio/emixer/DESCR
deleted file mode 100644
index 1eae68c1ce3..00000000000
--- a/audio/emixer/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-eMixer is a front-end to mpg123 that allows you to
-play and mix two mp3 streams together. This ability
-to mix two mp3s together makes eMixer act like a
-cross-fader effectively giving the user DJ like
-capabilities from their computer console. eMixer is
-also very able in a "real time" party environment.
-
-Best viewed in an (color-)rxvt.
diff --git a/audio/emixer/Makefile b/audio/emixer/Makefile
deleted file mode 100644
index 6be3bba283c..00000000000
--- a/audio/emixer/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2006/03/09 21:04:40 jlam Exp $
-#
-
-DISTNAME= emixer-0.05.5
-PKGNAME= emixer-0.5.5
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= http://emixer.linuxbox.com/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://toaster.muc-t-systems.com/~emixer/
-COMMENT= mpg123-frontend that can mix two mp3 streams, and fade between them
-
-DEPENDS+= mpg123{,-esound,-nas}-0.59*:../../audio/mpg123
-
-NO_CONFIGURE= YES
-
-post-extract:
- ${CP} ${FILESDIR}/Makefile ${WRKSRC}
-
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/emixer/PLIST b/audio/emixer/PLIST
deleted file mode 100644
index edab65732ef..00000000000
--- a/audio/emixer/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:15:44 zuntum Exp $
-bin/emixer
-share/doc/emixer.readme
diff --git a/audio/emixer/distinfo b/audio/emixer/distinfo
deleted file mode 100644
index 7d7eb9dce35..00000000000
--- a/audio/emixer/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 20:39:44 agc Exp $
-
-SHA1 (emixer-0.05.5.tar.gz) = acae7acf3cd11633d1f800047287d9f52e8e7d02
-RMD160 (emixer-0.05.5.tar.gz) = f937ae68e32917e58983d9ccfec7039a8e8f1be3
-Size (emixer-0.05.5.tar.gz) = 19609 bytes
-SHA1 (patch-aa) = f6039822d61548ba93ec9db9b31380f14c36cdd8
-SHA1 (patch-ab) = a782737118c0ba6ae704a1839d93047a6f7e568e
-SHA1 (patch-ac) = 453d5510e1a0c342b7a69fe3033c4677f9f77db5
-SHA1 (patch-ad) = 031e3f007b6c820c09f0673f592008a9c137bec7
-SHA1 (patch-ae) = 237b10820c528aa4fbcdef31331cd1b4d1098968
diff --git a/audio/emixer/files/Makefile b/audio/emixer/files/Makefile
deleted file mode 100644
index edc47b0dd46..00000000000
--- a/audio/emixer/files/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2004/05/03 17:32:36 minskim Exp $
-
-all: emixer
-emixer: main.o
- ${CC} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} -lncurses ${LIBOSSAUDIO}
-
-install:
- ${BSD_INSTALL_PROGRAM} emixer ${PREFIX}/bin/emixer
- ${BSD_INSTALL_DATA} readme ${PREFIX}/share/doc/emixer.readme
diff --git a/audio/emixer/patches/patch-aa b/audio/emixer/patches/patch-aa
deleted file mode 100644
index 115d4fd20b7..00000000000
--- a/audio/emixer/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/12/13 02:48:41 hubertf Exp $
-
---- mixer.h.orig Mon Dec 13 02:18:43 1999
-+++ mixer.h Mon Dec 13 02:19:01 1999
-@@ -17,7 +17,11 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#ifdef __NetBSD__
-+#include <soundcard.h>
-+#else
- #include <sys/soundcard.h>
-+#endif
- #include <signal.h>
- #include <sys/types.h>
- #include <termios.h>
diff --git a/audio/emixer/patches/patch-ab b/audio/emixer/patches/patch-ab
deleted file mode 100644
index 1927222eba5..00000000000
--- a/audio/emixer/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2001/06/19 15:57:39 jlam Exp $
-
---- nctgui.h.orig Mon Dec 27 19:47:02 1999
-+++ nctgui.h
-@@ -9,7 +9,6 @@
-
- /* include files used by gui.c and main.c */
- #include <ncurses.h>
--#include <slang/slang.h>
- #include <string.h>
-
- /* defines used by gui.c and main.c */
diff --git a/audio/emixer/patches/patch-ac b/audio/emixer/patches/patch-ac
deleted file mode 100644
index b0a2f5fc9df..00000000000
--- a/audio/emixer/patches/patch-ac
+++ /dev/null
@@ -1,184 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2001/01/07 03:10:50 wiz Exp $
-
---- nctgui.c.orig Fri Jan 28 17:30:52 2000
-+++ nctgui.c
-@@ -31,6 +31,10 @@
- {
- (void) initscr();
- curs_set(0);
-+ cbreak();
-+ noecho();
-+ timeout(2);
-+ keypad(stdscr,TRUE);
- }/* ncurses_init */
-
- void ncurses_exit(void)
-@@ -66,24 +70,23 @@
- int j;
- int maxY,maxX;
-
-- wattrset(barWin,COLOR_PAIR(2)); wbkgdset(barWin,COLOR_PAIR(2));
-+ wbkgdset(barWin,COLOR_PAIR(2));
-+ wmove(barWin,0,0); wclrtoeol(barWin);
-
-- wmove(barWin,0,0); wclrtoeol(barWin); wrefresh(barWin);
- for(j=0; j<num_menus; j++)
- {
- wmove(barWin,0,(j*MENU_WIDTH));
- if(j==hpos && menus_active)
-- {
- wattrset(barWin,COLOR_PAIR(3)|A_BOLD);
-- }
-- waddstr(barWin,menu_name[j]); wrefresh (barWin);
-+ else
-+ wattrset(barWin,COLOR_PAIR(2));
-+ waddstr(barWin,menu_name[j]);
-
- wattrset(barWin,COLOR_PAIR(15));
- getmaxyx(stdscr,maxY,maxX); mvwaddstr(barWin,0,maxX-20,emixer_version);
--
-- wattrset(barWin,COLOR_PAIR(2));
-- wrefresh (barWin);
- }
-+
-+ wrefresh (barWin);
- } /* display_bar */
-
- /*Display additional info at bottom of screen*/
-@@ -106,14 +109,14 @@
-
- for(j=0;j<num_items[hpos];j++)
- {
-- if(j==vpos){wattrset(subWn,COLOR_PAIR(3)); wbkgdset(subWn,COLOR_PAIR(3)); }
-+ if(j==vpos){wattrset(subWn,COLOR_PAIR(3)|A_BOLD);wbkgdset(subWn,COLOR_PAIR(3)); }
- else {wattrset(subWn,COLOR_PAIR(2));wbkgdset(subWn,COLOR_PAIR(2)); }
-
- wmove(subWn,j+1,1);
- waddstr(subWn,menu_item[hpos][j]); wclrtoeol(subWn);
-- wrefresh(subWn);
- }
-- wattrset(subWn,COLOR_PAIR(2));wbkgdset(subWn,COLOR_PAIR(2));
-+ wattrset(subWn,COLOR_PAIR(2)|A_ALTCHARSET);
-+ wbkgdset(subWn,COLOR_PAIR(2));
- box(subWn,0,0);
- wrefresh(subWn);
- } /* display_menu */
-@@ -127,7 +130,8 @@
- switch(active_channel)
- {
- case CHANNEL_1:
-- wbkgd(chWin,COLOR_PAIR(11)|A_BOLD);
-+ wattrset(chWin,COLOR_PAIR(11)|A_BOLD|A_ALTCHARSET);
-+ wbkgdset(chWin,COLOR_PAIR(11)|A_BOLD);
- box(chWin,0,0);
- wmove(chWin,0,2);
- wattrset(chWin,COLOR_PAIR(5)|A_BOLD|A_BLINK);
-@@ -137,7 +141,8 @@
- break;
-
- case CHANNEL_2:
-- wbkgd(chWin,COLOR_PAIR(12)|A_BOLD);
-+ wattrset(chWin,COLOR_PAIR(12)|A_BOLD|A_ALTCHARSET);
-+ wbkgdset(chWin,COLOR_PAIR(12)|A_BOLD);
- box(chWin,0,0);
- wmove(chWin,0,width-13);
- wattrset(chWin,COLOR_PAIR(6)|A_BOLD|A_BLINK);
-@@ -155,6 +160,7 @@
- int centre, j;
-
- centre=(FADER_BARS/2)+2;
-+ wattrset(faderWin,COLOR_PAIR(1)|A_BOLD|A_ALTCHARSET);
- wbkgd(faderWin,COLOR_PAIR(1)|A_BOLD);
- box(faderWin,0,0);
- wattrset(faderWin,COLOR_PAIR(9)|A_BOLD);
-@@ -201,6 +207,7 @@
-
- getmaxyx(volumeWin,maxY,maxX);
- centre=(VOLUME_BARS/2)+2;
-+ wattrset(volumeWin,COLOR_PAIR(1)|A_BOLD|A_ALTCHARSET);
- wbkgd(volumeWin,COLOR_PAIR(1)|A_BOLD);
- box(volumeWin,0,0);
- if(bar==VOLBAR)mvwaddstr(volumeWin,maxY-1,maxX-9,"[Active]");
-@@ -263,6 +270,7 @@
-
- getmaxyx(speedWin,maxY,maxX);
- centre=(SPEED_BARS/2)+2;
-+ wattrset(speedWin,COLOR_PAIR(1)|A_BOLD|A_ALTCHARSET);
- wbkgd(speedWin,COLOR_PAIR(1)|A_BOLD);
- box(speedWin,0,0);
- if(bar==SPDBAR)mvwaddstr(speedWin,maxY-1,maxX-9,"[Active]");
-@@ -323,6 +331,7 @@
- void display_player_status(int sim_play, int playmode)
- {
-
-+ wattrset(pStatusWin,COLOR_PAIR(1)|A_BOLD|A_ALTCHARSET);
- wbkgd(pStatusWin,COLOR_PAIR(1)|A_BOLD);
- box(pStatusWin,0,0);
- wattrset(pStatusWin,COLOR_PAIR(9)|A_BOLD);
-@@ -343,54 +352,6 @@
- exit(0);
- } /*gui_exit/*/
-
--void sLang_init(void)
--{
-- SLtt_get_terminfo();
-- SLang_init_tty(0,0,1);
-- SLkp_init();
-- SLsmg_init_smg();
-- SLsig_block_signals();
-- /*ncurses stuff - experimental */
-- (void) initscr();
-- curs_set(0);
-- noecho();
-- keypad(stdscr,TRUE);
--} /* sLang_init*/
--
--
--void sLang_exit(void)
--{
-- /*ncurses stuff - experimental */
-- endwin();
--
-- SLsmg_cls();
-- SLsmg_refresh ();
-- SLsmg_reset_smg();
-- SLang_reset_tty();
--} /* sLang_exit*/
--
--void set_color_schemes(void)
--{
-- SLtt_set_color(1, NULL, "white", "blue");
-- SLtt_set_color(2, NULL, "black", "lightgray");
-- SLtt_set_color(3, NULL, "black", "green");
-- SLtt_set_color(4, NULL, "red","lightgray");
-- SLtt_set_color(5, NULL, "yellow","blue");
-- SLtt_set_color(6, NULL, "lightgray","blue");
-- SLtt_set_color(7, NULL, "yellow","black");
-- SLtt_set_color(8, NULL, "green","blue");
-- SLtt_set_color(9, NULL, "lightgray","black");
-- SLtt_set_color(10, NULL, "red","black");
-- SLtt_set_color(11, NULL, "brightcyan","black");
-- SLtt_set_color(12, NULL, "brightmagenta","black");
-- SLtt_set_color(13, NULL, "black","brightcyan");
-- SLtt_set_color(14, NULL, "black","brightmagenta");
-- SLtt_set_color(15, NULL, "white","brightcyan");
-- SLtt_set_color(16, NULL, "white","brightmagenta");
--
--
--}/*set_color_schemes*/
--
- void create_windows()
- {
- int maxY, maxX, height, width, origY=1, origX=0;
-@@ -398,10 +359,7 @@
- getmaxyx(stdscr,maxY,maxX);
- height = maxY-4; width = (maxX/10)*7;
- chWin = newwin(height,width,origY,origX);
--
-- origY=origY++; origX=origX++ ;
-- height = maxY-6; width = ((maxX/10)*7)-2;
-- subWin = newwin(height,width,origY,origX);
-+ subWin = subwin(chWin,height-2,width-2,origY+1,origX+1);
-
- origY=maxY-1; origX=0;
- height = 1; width = maxX-1;
diff --git a/audio/emixer/patches/patch-ad b/audio/emixer/patches/patch-ad
deleted file mode 100644
index 198a7f700c2..00000000000
--- a/audio/emixer/patches/patch-ad
+++ /dev/null
@@ -1,390 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2004/01/28 10:56:21 agc Exp $
-
---- main.c.orig 2000-01-26 00:11:56.000000000 +0000
-+++ main.c 2004-01-28 10:53:42.000000000 +0000
-@@ -115,8 +115,6 @@
-
- menus_active = FALSE;
- /*initialize screen routines*/
-- sLang_init();
-- set_color_schemes();
- ncurses_init();
- set_ncurses_color_schemes();
- create_windows();
-@@ -125,19 +123,9 @@
- change_channel(&ch1,mp3Path1);
- change_channel(&ch2,mp3Path2);
-
--
- /*display windows*/
-- display_bar(num_menus, menu_name);
-- display_ch_window(active_channel);
-- display_track_path(active_channel,sim_play,ch1_current,ch2_current);
-- display_track_status();
-- adjust_display(get_code());
-- display_listdata();
-- display_player_status(sim_play,playmode);
-- display_volume(ch1_volume_pos,ch2_volume_pos,active_bar);
-- display_speed(ch1_speed_pos,ch2_speed_pos,active_bar);
-- display_fader(fader_pos);
--
-+ refresh_windows();
-+ display_bar(num_menus,menu_name);
-
- while(TRUE)
- {
-@@ -149,9 +137,9 @@
- if((ch1.end==1)||(ch2.end==1)) display_track_status();
- if(rcount==5)
- {
-- refresh_windows();
-- display_bar(num_menus, menu_name);
-- rcount=0;
-+ refresh_windows();
-+ display_bar(num_menus,menu_name);
-+ rcount=0;
- }
-
- if(playmode==1) /*loop play*/
-@@ -173,7 +161,7 @@
- }
-
- }
-- else if(playmode==2) /*continous play*/
-+ else if(playmode==2) /*continous play*/
- {
- if((ch1.on==0)&&(ch1.end==1))
- {
-@@ -215,7 +203,7 @@
- }
-
- }
-- else if(playmode==3) /*random play*/
-+ else if(playmode==3) /*random play*/
- {
- if((ch1.on==0)&&(ch1.end==1))
- {
-@@ -259,9 +247,9 @@
- {
- {
- display_info(inactive_info);
-- switch(get_code())
-+ switch(getch())
- {
-- case SL_KEY_LEFT:
-+ case KEY_LEFT:
- vpos=0;
- hpos=(hpos>0) ? --hpos: num_menus-1;
- display_bar(num_menus, menu_name);
-@@ -270,7 +258,7 @@
- display_menu(menu_item,num_items);
- break;
-
-- case SL_KEY_RIGHT:
-+ case KEY_RIGHT:
- vpos=0;
- hpos=(hpos<num_menus-1) ? ++hpos: 0;
- display_bar(num_menus, menu_name);
-@@ -279,28 +267,27 @@
- display_menu(menu_item,num_items);
- break;
-
-- case SL_KEY_UP:
-+ case KEY_UP:
- vpos=(vpos>0) ? --vpos: num_items[hpos]-1;
- display_menu(menu_item,num_items);
- break;
-
-- case SL_KEY_DOWN:
-+ case KEY_DOWN:
- vpos=(vpos<num_items[hpos]-1) ? ++vpos:0;
- display_menu(menu_item,num_items);
- break;
-
-- case 10:
-- case ENTER:
-+ case '\n':
-+ case KEY_ENTER:
- menus_active=FALSE;
- menu_action(menu_item[hpos][vpos]);
- vpos=0;
- display_ch_window(active_channel);
- display_listdata();
-+ display_bar(num_menus,menu_name);
- break;
-
--
-- /*case KEY_F(1):*/
-- case '`':
-+ case KEY_F(1):
- vpos=0;
- menus_active=FALSE;
- display_ch_window(active_channel);
-@@ -318,42 +305,41 @@
- else
- {
- display_info(inactive_info);
-- extcode = get_code();
-+ extcode = getch();
-
- switch(extcode)
- {
-- case 10:
-- case ENTER: /*enter key pressed, selects track in active channel */
-+ case '\n':
-+ case KEY_ENTER: /*enter key pressed, selects track in active channel */
- if(active_channel==CHANNEL_1)
- {
- ch1_speed=1.0;ch1_speed_pos=0;ch1.speed=ch1_speed;
-+ ch1_last=ch1_current;
- if(sim_play) /*starts same track in both channels*/
- {
-- /* ch2_current = ch1_current;*/
- ch2_speed=1.0;ch2_speed_pos=0;ch2.speed=ch2_speed;
- mp3Path2=track_selection(&ch2,ch1_current,mp3Path1);
- mp3Path1=track_selection(&ch1,ch1_current,mp3Path1);
- ch2_Head=ch1_Head;
- ch2_current=ch1_current;
--
-+ ch2_last=ch1_last;
- }
- else mp3Path1=track_selection(&ch1,ch1_current,mp3Path1);
-- ch1_last=ch1_current;
- }
- else
- {
- ch2_speed=1.0;ch2_speed_pos=0; ch2.speed=ch2_speed;
-+ ch2_last=ch2_current;
- if(sim_play) /*starts same track in both channels*/
- {
-- /*ch1_current = ch2_current; */
- ch1_speed=1.0;ch1_speed_pos=0;ch1.speed=ch1_speed;
- mp3Path1=track_selection(&ch1,ch2_current,mp3Path2);
- mp3Path2=track_selection(&ch2,ch2_current,mp3Path2);
-- ch1_current=ch2_current;
- ch1_Head=ch2_Head;
-+ ch1_current=ch2_current;
-+ ch1_last=ch2_last;
- }
- else mp3Path2=track_selection(&ch2,ch2_current,mp3Path2);
-- ch2_last=ch2_current;
- }
- display_listdata();
- display_track_path(active_channel,sim_play,ch1_last,ch2_last);
-@@ -472,7 +458,7 @@
- //printf("------- %i ----------\n",playmode);
- break;
-
-- case SL_KEY_IC:
-+ case KEY_IC:
- if (active_bar==VOLBAR)
- {
- ch1_volume_pos--;
-@@ -507,7 +493,7 @@
-
- break;
-
-- case SL_KEY_HOME:
-+ case KEY_HOME:
-
- if (active_bar==VOLBAR)
- {
-@@ -542,7 +528,7 @@
- }
- break;
-
-- case SL_KEY_DELETE:
-+ case KEY_DC:
- if (active_bar==VOLBAR)
- {
- ch2_volume_pos--;
-@@ -574,7 +560,7 @@
- }
- break;
-
-- case SL_KEY_END:
-+ case KEY_END:
- if (active_bar==VOLBAR)
- {
- ch2_volume_pos++;
-@@ -605,7 +591,7 @@
- }
- break;
-
-- case SL_KEY_LEFT : /* left arrow pressed, adjusts fader postion */
-+ case KEY_LEFT : /* left arrow pressed, adjusts fader postion */
- fader_pos-- ;
- if(fader_pos<=-(fader_bars/2))fader_pos=-(fader_bars/2);
- if(fader_pos == 0)
-@@ -620,7 +606,7 @@
- display_fader(fader_pos);
- break;
-
-- case SL_KEY_RIGHT:
-+ case KEY_RIGHT:
- fader_pos++;
- if(fader_pos>=(fader_bars/2))fader_pos=(fader_bars/2) ;
- if(fader_pos == 0)
-@@ -660,10 +646,10 @@
- display_fader(fader_pos);
- break;
-
-- case SL_KEY_DOWN:
-- case SL_KEY_UP:
-- case SL_KEY_PPAGE:
-- case SL_KEY_NPAGE:
-+ case KEY_DOWN:
-+ case KEY_UP:
-+ case KEY_PPAGE:
-+ case KEY_NPAGE:
- adjust_display(extcode);
- display_ch_window(active_channel);
- display_listdata();
-@@ -671,9 +657,10 @@
-
- case'r': /*redraws screen*/
- case'R':
-+ clearok(stdscr,TRUE);
- refresh_windows();
-- display_bar(num_menus, menu_name);
-- break ;
-+ display_bar(num_menus,menu_name);
-+ break;
-
- default:
- for(j=0; j<num_menus; j++)
-@@ -792,7 +779,7 @@
- a circular linked list*/
- switch(key)
- {
-- case SL_KEY_DOWN:
-+ case KEY_DOWN:
- if((counter >= height-1)&&(current->fLink!=NULL))
- {
- top=top->fLink; current=current->fLink;
-@@ -800,7 +787,7 @@
- else if(current->fLink!=NULL) current=current->fLink;
- break;
-
-- case SL_KEY_UP:
-+ case KEY_UP:
- if((top->bLink!=NULL)&&(top==current))
- {
- top=top->bLink; current=current->bLink;
-@@ -809,14 +796,14 @@
- if(current->bLink!=NULL) current=current->bLink ;
- break;
-
-- case SL_KEY_NPAGE: /*pagedown*/
-+ case KEY_NPAGE: /*pagedown*/
- while((index < height-1)&&(current->fLink!=NULL))
- {
- top=top->fLink; current=current->fLink; index++;
- }
- break;
-
-- case SL_KEY_PPAGE:/*pageup*/
-+ case KEY_PPAGE:/*pageup*/
- while((index < height-1)&(top->bLink!=NULL))
- {
- top=top->bLink; current=current->bLink; index++;
-@@ -884,11 +871,9 @@
- height1,width1;
- node *top, *current, *temp;
-
--
- if (active_channel==CHANNEL_1)
- {
- top=ch1_Head; current=ch1_current;
--
- }
- else if(active_channel==CHANNEL_2)
- {
-@@ -904,46 +889,53 @@
- while(temp!=bHead){tracktotal++;temp=temp->fLink;}
-
- /* display current track number and total tracks */
-- /*wmove(chWin,height1-1,width1-15);*/
- mvwprintw(chWin,height1-1,width1-15,"[%5i][%5i]",tracknum,tracktotal);
-
-- touchwin(chWin);
- wrefresh(chWin);
-
- getmaxyx(subWin,height,width);
-- wbkgd(subWin,COLOR_PAIR(9)|A_BOLD);
-
- while (top!=NULL)
- {
-+ char *fnstart;
- fpath=top->filePath;
- playcount=top->playcount;
- /*get songname from path, the songname is assumed to be
- the characters after the last forward slash(/) */
-- songname=strstr(strrchr(fpath,'/'),"/")+1;
-+ fnstart = strrchr(fpath,'/');
-+ if (fnstart == NULL)
-+ songname=fpath;
-+ else
-+ songname=strstr(fnstart,"/")+1;
- if(current==top)
-+ {
- if(active_channel==CHANNEL_1)
- {
-- wbkgdset(subWin,COLOR_PAIR(7)|A_BOLD);
- wattrset(subWin,COLOR_PAIR(7)|A_BOLD);
-+ wbkgdset(subWin,COLOR_PAIR(7)|A_BOLD);
- }
- else if(active_channel==CHANNEL_2)
- {
-- wbkgdset(subWin,COLOR_PAIR(8)|A_BOLD);
- wattrset(subWin,COLOR_PAIR(8)|A_BOLD);
-+ wbkgdset(subWin,COLOR_PAIR(8)|A_BOLD);
- }
-+ }
-+ else
-+ {
-+ wattrset(subWin,COLOR_PAIR(9));
-+ wbkgdset(subWin,COLOR_PAIR(9));
-+ }
-
- tempname=strdup(songname);
- /*shorten song so that it fits in channel/display window*/
- mvwaddstr(subWin,index,0,tempname); wclrtoeol(subWin);
- mvwprintw(subWin,index,width-6,"*%5i",playcount);
--
-- touchwin(subWin);
-- wrefresh(subWin);
-
-- wbkgdset(subWin,COLOR_PAIR(9)|A_BOLD);
-- index++; if(index==height)return;
-+ index++; if(index==height)break;
- top=top->fLink;
- }
-+
-+ wrefresh(subWin);
- } /*display_listdata */
-
- void menu_action(char *item_name)
-@@ -967,21 +959,10 @@
- void exit_prog(void)
- {
- reset_audio();
-- sLang_exit();
-+ ncurses_exit();
- gui_exit();
- }/*exit_prog*/
-
--int get_code(void)
--{
-- int key;
-- /*qiflush(); */
-- /*if(clickcount>=15){flushinp(); clickcount=0;}*/
-- if(SLang_input_pending(-10)) key= /*getch(); */
-- SLkp_getkey();
-- else key=0;
-- /*clickcount++;*/
-- return(key);
--} /* get_code */
- void refresh_windows(void)
- {
- erase();refresh();
diff --git a/audio/emixer/patches/patch-ae b/audio/emixer/patches/patch-ae
deleted file mode 100644
index ef7f0ff0983..00000000000
--- a/audio/emixer/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2000/04/16 03:59:54 mycroft Exp $
-
---- mixer.c.bak Fri Jan 28 11:29:40 2000
-+++ mixer.c Sat Apr 15 23:32:21 2000
-@@ -57,9 +57,9 @@
- int format;
- int stereo = 1;
- int rate = 44100;
-- if ((audio_fd = open("/dev/dsp", O_WRONLY , 0)) == -1)
-+ if ((audio_fd = open("/dev/sound", O_WRONLY , 0)) == -1)
- {
-- perror("/dev/dsp");
-+ perror("/dev/sound");
- return;
- /*exit(1); */
- }
diff --git a/audio/esound/DESCR b/audio/esound/DESCR
deleted file mode 100644
index 53bf8e54d83..00000000000
--- a/audio/esound/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-EsounD, the Enlightened Sound Daemon, is a server process that mixes
-several audio streams for playback by a single audio device. For
-example, if you're listening to music on a CD and you receive a
-sound-related event from ICQ, the two applications won't have to
-jockey for the use of your sound card.
diff --git a/audio/esound/MESSAGE.Interix b/audio/esound/MESSAGE.Interix
deleted file mode 100644
index aaa77197559..00000000000
--- a/audio/esound/MESSAGE.Interix
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.Interix,v 1.1 2004/10/11 22:18:45 tv Exp $
-
-On Interix, this package does not provide physical audio output support,
-nor is "autospawn" supported. For the server side of esound, you will
-need to install the emulators/cygwin_esound package, and start the
-cygwin_esd server using its included rc.d script. Once cygwin_esd is
-started, esound-enabled applications will use it automatically.
-
-===========================================================================
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
deleted file mode 100644
index c1effbdecdc..00000000000
--- a/audio/esound/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# $NetBSD: Makefile,v 1.66 2007/03/01 14:19:29 wiz Exp $
-
-DISTNAME= esound-0.2.37
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/esound/0.2/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= root@garbled.net
-HOMEPAGE= http://www.tux.org/~ricdude/EsounD.html
-COMMENT= The Enlightened sound daemon
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
-
-USE_LIBTOOL= YES
-USE_TOOLS+= pkg-config
-PKGCONFIG_OVERRIDE= esound.pc.in
-
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-
-EGDIR= ${PREFIX}/share/examples/esound
-CONF_FILES= ${EGDIR}/esd.conf ${PKG_SYSCONFDIR}/esd.conf
-
-.include "options.mk"
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Interix"
-# no sound output device, but can support a remote esound server
-CONFIGURE_ARGS+= --disable-local-sound
-.else
-.include "../../mk/oss.buildlink3.mk"
-MAKE_ENV+= AM_CPPFLAGS='-DDEV_DSP=\"${DEVOSSAUDIO}\"'
-SUBST_CLASSES+= oss
-SUBST_STAGE.oss= post-patch
-SUBST_FILES.oss= configure
-SUBST_SED.oss= -e 's,-lossaudio,${LIBOSSAUDIO},g'
-SUBST_MESSAGE.oss= Fixing oss.
-.endif
-
-LDFLAGS.IRIX+= -lm
-
-.include "../../audio/libaudiofile/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/esound/PLIST.FreeBSD b/audio/esound/PLIST.FreeBSD
deleted file mode 100644
index 18179a8a651..00000000000
--- a/audio/esound/PLIST.FreeBSD
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.1 2006/08/26 15:25:26 joerg Exp $
-bin/esddsp
-lib/libesddsp.la
diff --git a/audio/esound/PLIST.Linux b/audio/esound/PLIST.Linux
deleted file mode 100644
index 73687d7e9c5..00000000000
--- a/audio/esound/PLIST.Linux
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.5 2004/09/22 08:09:15 jlam Exp $
-bin/esddsp
-lib/libesddsp.la
diff --git a/audio/esound/PLIST.common b/audio/esound/PLIST.common
deleted file mode 100644
index f68a259b082..00000000000
--- a/audio/esound/PLIST.common
+++ /dev/null
@@ -1,28 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.6 2005/07/27 17:16:32 drochner Exp $
-bin/esd
-bin/esd-config
-bin/esdcat
-bin/esdctl
-bin/esdfilt
-bin/esdloop
-bin/esdmon
-bin/esdplay
-bin/esdrec
-bin/esdsample
-include/esd.h
-lib/libesd.la
-lib/pkgconfig/esound.pc
-man/man1/esd-config.1
-man/man1/esd.1
-man/man1/esdcat.1
-man/man1/esdctl.1
-man/man1/esddsp.1
-man/man1/esdfilt.1
-man/man1/esdloop.1
-man/man1/esdmon.1
-man/man1/esdplay.1
-man/man1/esdrec.1
-man/man1/esdsample.1
-share/aclocal/esd.m4
-share/examples/esound/esd.conf
-@dirrm share/examples/esound
diff --git a/audio/esound/buildlink3.mk b/audio/esound/buildlink3.mk
deleted file mode 100644
index 75502e6f91c..00000000000
--- a/audio/esound/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:35 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-ESOUND_BUILDLINK3_MK:= ${ESOUND_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= esound
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nesound}
-BUILDLINK_PACKAGES+= esound
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}esound
-
-.if !empty(ESOUND_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.esound+= esound>=0.2.18
-BUILDLINK_ABI_DEPENDS.esound+= esound>=0.2.35nb1
-BUILDLINK_PKGSRCDIR.esound?= ../../audio/esound
-.endif # ESOUND_BUILDLINK3_MK
-
-.include "../../audio/libaudiofile/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/esound/distinfo b/audio/esound/distinfo
deleted file mode 100644
index 3d63135cf5b..00000000000
--- a/audio/esound/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.23 2007/03/01 14:19:29 wiz Exp $
-
-SHA1 (esound-0.2.37.tar.bz2) = f5fd4a138598b01471907cd758077513c45a0dc4
-RMD160 (esound-0.2.37.tar.bz2) = 36f6630df4fa3c611d9b7ff40157504334535abe
-Size (esound-0.2.37.tar.bz2) = 383831 bytes
-SHA1 (patch-aa) = d734a1004026287071e571ceb3fd346b809a6a30
-SHA1 (patch-ab) = 50d4c829fe5d53f28a4a38b1962097b8a47b97c7
-SHA1 (patch-ac) = 8ab2eebc32792102a6d74b57f75a4381a218186e
diff --git a/audio/esound/options.mk b/audio/esound/options.mk
deleted file mode 100644
index eb586cf26e1..00000000000
--- a/audio/esound/options.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2005/06/08 13:20:04 wiz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.esound
-PKG_SUPPORTED_OPTIONS= inet6
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --enable-ipv6
-.else
-CONFIGURE_ARGS+= --disable-ipv6
-.endif
diff --git a/audio/esound/patches/patch-aa b/audio/esound/patches/patch-aa
deleted file mode 100644
index bcdbb1bea38..00000000000
--- a/audio/esound/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2005/07/27 17:16:33 drochner Exp $
-
---- Makefile.in.orig 2005-06-07 03:04:14.000000000 +0200
-+++ Makefile.in
-@@ -425,7 +425,7 @@ LDADD = libesd.la $(AUDIOFILE_LIBS)
- esd_LDADD = $(WRAP_LIB) $(LDADD)
- m4datadir = $(datadir)/aclocal
- m4data_DATA = esd.m4
--esdconfdir = $(sysconfdir)
-+esdconfdir = $(datadir)/examples/@PACKAGE@
- esdconf_DATA = esd.conf
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = esound.pc
diff --git a/audio/esound/patches/patch-ab b/audio/esound/patches/patch-ab
deleted file mode 100644
index fdba4b3b609..00000000000
--- a/audio/esound/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2002/10/03 12:21:29 jlam Exp $
-
---- audio_oss.c.orig Tue Jul 18 18:33:41 2000
-+++ audio_oss.c
-@@ -19,7 +19,7 @@
- #define ARCH_esd_audio_devices
- const char *esd_audio_devices()
- {
-- return "/dev/dsp, /dev/dsp2, etc.";
-+ return "/dev/audio, /dev/audio2, etc. or /dev/dsp, /dev/dsp2, etc.";
- }
-
-
-@@ -38,7 +38,7 @@
- mode |= O_NONBLOCK;
-
- /* open the sound device */
-- device = esd_audio_device ? esd_audio_device : "/dev/dsp";
-+ device = esd_audio_device ? esd_audio_device : DEV_DSP;
- if ((afd = open(device, mode, 0)) == -1)
- { /* Opening device failed */
- perror(device);
diff --git a/audio/esound/patches/patch-ac b/audio/esound/patches/patch-ac
deleted file mode 100644
index a6970896817..00000000000
--- a/audio/esound/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2003/11/10 01:14:43 danw Exp $
-
---- esd-config.in.orig Fri Feb 5 23:34:19 1999
-+++ esd-config.in
-@@ -54,9 +54,9 @@
- ;;
- --libs)
- my_audiofile_libs=
-- libdirs=-L@libdir@
-+ libdirs="-L@libdir@ -Wl,-R@libdir@"
- for i in $audiofile_libs ; do
-- if test $i != -L@libdir@ ; then
-+ if test $i != -L@libdir@ -a "$i" != "-Wl,-R@libdir@"; then
- if test -z "$my_audiofile_libs" ; then
- my_audiofile_libs="$i"
- else
diff --git a/audio/exaile/DESCR b/audio/exaile/DESCR
deleted file mode 100644
index a2b7b54462f..00000000000
--- a/audio/exaile/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Exaile is a media player aiming to be similar to KDE's AmaroK, but for
-GTK+. It incorporates many of the cool things from AmaroK (and other media
-players) like automatic fetching of album art, handling of large libraries,
-lyrics fetching, artist/album information via the wikipedia, last.fm
-support, optional iPod support (assuming you have python-gpod installed).
diff --git a/audio/exaile/Makefile b/audio/exaile/Makefile
deleted file mode 100644
index cce64dd769f..00000000000
--- a/audio/exaile/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/01/10 10:48:21 drochner Exp $
-#
-
-DISTNAME= exaile_0.2.8
-PKGNAME= exaile-0.2.8
-CATEGORIES= audio
-MASTER_SITES= http://www.exaile.org/files/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.exaile.org/
-COMMENT= Music player
-
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= pkg-config gmake
-USE_DIRS+= xdg-1.1
-
-PYTHON_PATCH_SCRIPTS= exaile.py
-
-.include "../../lang/python/application.mk"
-.include "../../x11/py-gtk2/buildlink3.mk"
-.include "../../sysutils/py-dbus/buildlink3.mk"
-.include "../../audio/py-mutagen/buildlink3.mk"
-.include "../../multimedia/py-gstreamer0.10/buildlink3.mk"
-.include "../../textproc/py-elementtree/buildlink3.mk"
-.include "../../databases/py-sqlite2/buildlink3.mk"
-.include "../../sysutils/py-notify/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/exaile/PLIST b/audio/exaile/PLIST
deleted file mode 100644
index a6f63f131c5..00000000000
--- a/audio/exaile/PLIST
+++ /dev/null
@@ -1,82 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/01/10 10:48:21 drochner Exp $
-bin/exaile
-share/applications/exaile.desktop
-share/exaile/exaile.glade
-share/exaile/exaile.py
-share/exaile/images/artist.png
-share/exaile/images/close.png
-share/exaile/images/default_theme/add.png
-share/exaile/images/default_theme/clear.png
-share/exaile/images/default_theme/gnome-dev-cdrom-audio.png
-share/exaile/images/default_theme/gnome-dev-ipod.png
-share/exaile/images/default_theme/gnome-fs-directory-accept.png
-share/exaile/images/default_theme/gnome-fs-directory.png
-share/exaile/images/default_theme/gnome-globe.png
-share/exaile/images/default_theme/go-back.png
-share/exaile/images/default_theme/go-forward.png
-share/exaile/images/default_theme/go-up.png
-share/exaile/images/default_theme/media-next.png
-share/exaile/images/default_theme/media-pause.png
-share/exaile/images/default_theme/media-play.png
-share/exaile/images/default_theme/media-previous.png
-share/exaile/images/default_theme/refresh.png
-share/exaile/images/default_theme/remove.png
-share/exaile/images/default_theme/stock_volume.png
-share/exaile/images/exailelogo-sml.png
-share/exaile/images/exailelogo.png
-share/exaile/images/genre.png
-share/exaile/images/icon.png
-share/exaile/images/ipod.png
-share/exaile/images/largeicon.png
-share/exaile/images/media-audiofile.png
-share/exaile/images/nocover.png
-share/exaile/images/playlist.png
-share/exaile/images/splash.png
-share/exaile/images/track.png
-share/exaile/images/trayicon.png
-share/exaile/mmkeys.so
-share/exaile/plugins/__init__.py
-share/exaile/plugins/alarmclock.py
-share/exaile/plugins/desktopcover.py
-share/exaile/plugins/exailenotify.py
-share/exaile/plugins/gui.py
-share/exaile/plugins/manager.py
-share/exaile/plugins/minimode.py
-share/exaile/plugins/plugins.glade
-share/exaile/plugins/serp.py
-share/exaile/plugins/streamripper.py
-share/exaile/po/ca.po
-share/exaile/po/de_DE.po
-share/exaile/po/en_GB.po
-share/exaile/po/es_ES.po
-share/exaile/po/pl.po
-share/exaile/po/ru.po
-share/exaile/po/sv.po
-share/exaile/po/zh_CN.po
-share/exaile/sql/db.sql
-share/exaile/xl/__init__.py
-share/exaile/xl/audioscrobbler.py
-share/exaile/xl/common.py
-share/exaile/xl/config.py
-share/exaile/xl/covers.py
-share/exaile/xl/db.py
-share/exaile/xl/dbusinterface.py
-share/exaile/xl/filtergui.py
-share/exaile/xl/media.py
-share/exaile/xl/panels.py
-share/exaile/xl/prefs.py
-share/exaile/xl/shoutcast.py
-share/exaile/xl/track.py
-share/exaile/xl/tracks.py
-share/exaile/xl/trackslist.py
-share/exaile/xl/xlmisc.py
-share/pixmaps/exaile.png
-@comment in xdg-dirs: @dirrm share/pixmaps
-@dirrm share/exaile/xl
-@dirrm share/exaile/sql
-@dirrm share/exaile/po
-@dirrm share/exaile/plugins
-@dirrm share/exaile/images/default_theme
-@dirrm share/exaile/images
-@dirrm share/exaile
-@comment in xdg-dirs: @dirrm share/applications
diff --git a/audio/exaile/distinfo b/audio/exaile/distinfo
deleted file mode 100644
index a48daafd7fd..00000000000
--- a/audio/exaile/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/01/10 10:48:21 drochner Exp $
-
-SHA1 (exaile_0.2.8.tar.gz) = 12f9773796331c06792a95e7af700275bfa6b3de
-RMD160 (exaile_0.2.8.tar.gz) = 414cf041cad28ad2f301d6c7ece1f2dcac21fef8
-Size (exaile_0.2.8.tar.gz) = 371231 bytes
-SHA1 (patch-aa) = c9b35c1319d9d0bc230310d5fdd7afd695526b29
diff --git a/audio/exaile/patches/patch-aa b/audio/exaile/patches/patch-aa
deleted file mode 100644
index c3113a22f65..00000000000
--- a/audio/exaile/patches/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/01/10 10:48:21 drochner Exp $
-
---- Makefile.orig 2007-01-08 13:18:58.000000000 +0100
-+++ Makefile
-@@ -1,4 +1,4 @@
--PREFIX=/usr
-+#PREFIX=/usr
- CWD=`pwd`
- all: build
- @echo "Done"
diff --git a/audio/faac/DESCR b/audio/faac/DESCR
deleted file mode 100644
index 2d6d4cc34d8..00000000000
--- a/audio/faac/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-FAAC is an AAC audio encoder. FAAC currently supports MPEG-4 LTP, MAIN
-and LOW COMPLEXITY object types and MAIN and LOW MPEG-2 object types. It
-also supports multichannel and gapless encoding.
diff --git a/audio/faac/Makefile b/audio/faac/Makefile
deleted file mode 100644
index 868ac9582c3..00000000000
--- a/audio/faac/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2007/02/09 20:27:16 drochner Exp $
-#
-
-DISTNAME= faac-1.25
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.audiocoding.com/
-COMMENT= AAC audio encoder
-
-USE_LIBTOOL= yes
-USE_TOOLS+= automake
-GNU_CONFIGURE= yes
-WRKSRC= ${WRKDIR}/faac
-
-LIBTOOLIZE= ${PREFIX}/bin/libtoolize
-
-pre-configure:
- cd ${WRKSRC}; \
- ${LIBTOOLIZE} --automake; \
- aclocal; autoheader; automake -a --foreign -i; autoconf
-
-.include "options.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/faac/PLIST b/audio/faac/PLIST
deleted file mode 100644
index fbe837dce1e..00000000000
--- a/audio/faac/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:15 jlam Exp $
-bin/faac
-include/faac.h
-include/faaccfg.h
-lib/libfaac.la
diff --git a/audio/faac/buildlink3.mk b/audio/faac/buildlink3.mk
deleted file mode 100644
index 808b0d36a49..00000000000
--- a/audio/faac/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:35 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-FAAC_BUILDLINK3_MK:= ${FAAC_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= faac
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfaac}
-BUILDLINK_PACKAGES+= faac
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}faac
-
-.if !empty(FAAC_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.faac+= faac>=1.24
-BUILDLINK_ABI_DEPENDS.faac+= faac>=1.24nb1
-BUILDLINK_PKGSRCDIR.faac?= ../../audio/faac
-.endif # FAAC_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/faac/distinfo b/audio/faac/distinfo
deleted file mode 100644
index d9627b74dd5..00000000000
--- a/audio/faac/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.5 2007/02/15 06:44:32 tron Exp $
-
-SHA1 (faac-1.25.tar.gz) = 482a0217362c50ce523ce5e165c5566e1a4a2a87
-RMD160 (faac-1.25.tar.gz) = 63a884775081e3d9a66dffaab341ed10e73365b8
-Size (faac-1.25.tar.gz) = 386608 bytes
-SHA1 (patch-aa) = fbb129223dd460b6b3c7a1f7ba9d1fc4d536b0df
-SHA1 (patch-ab) = 18f1573536d61ed4d4133119d199815ec7eeed21
-SHA1 (patch-ac) = 072259985b81c866102cbfedd4590129cd722d38
diff --git a/audio/faac/options.mk b/audio/faac/options.mk
deleted file mode 100644
index 252db93aa5e..00000000000
--- a/audio/faac/options.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: options.mk,v 1.4 2007/02/09 20:27:16 drochner Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.faac
-PKG_SUPPORTED_OPTIONS= mpeg4ip
-PKG_SUGGESTED_OPTIONS=
-PKG_OPTIONS_LEGACY_OPTS+= faad:mpeg4ip
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mmpeg4ip)
-. include "../../multimedia/libmp4v2/buildlink3.mk"
-.else
-# ignore bundled mp4v2 lib
-CONFIGURE_ARGS+= --without-mp4v2
-.endif
diff --git a/audio/faac/patches/patch-aa b/audio/faac/patches/patch-aa
deleted file mode 100644
index d42ae6dfc29..00000000000
--- a/audio/faac/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2007/02/09 20:27:16 drochner Exp $
-
---- frontend/main.c.orig 2004-12-08 12:07:17.000000000 +0100
-+++ frontend/main.c
-@@ -39,6 +39,7 @@
- #include <windows.h>
- #include <fcntl.h>
- #else
-+#include <sys/param.h>
- #include <signal.h>
- #endif
-
diff --git a/audio/faac/patches/patch-ab b/audio/faac/patches/patch-ab
deleted file mode 100644
index 8c0d1a3bf9b..00000000000
--- a/audio/faac/patches/patch-ab
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/02/09 20:27:16 drochner Exp $
-
---- configure.in.orig 2006-08-13 16:17:26.000000000 +0200
-+++ configure.in
-@@ -27,6 +27,7 @@ AC_CHECK_DECL(strcasecmp, MY_DEFINE(HAVE
- AC_CHECK_LIB(gnugetopt, getopt_long)
-
- AM_CONDITIONAL(WITH_MP4V2, false)
-+AM_CONDITIONAL(WITH_EXTMP4V2, false)
-
- AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
- AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
-@@ -35,6 +36,8 @@ AC_CHECK_DECLS([MP4Create, MP4MetadataDe
-
- if test x$external_mp4v2 = xyes; then
- AC_MSG_NOTICE([*** Building with external mp4v2 ***])
-+ MY_DEFINE(HAVE_LIBMP4V2)
-+ AM_CONDITIONAL(WITH_EXTMP4V2, true)
- else
- if test x$WITHMP4V2 = xyes; then
- AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
-@@ -66,6 +69,6 @@ AC_CHECK_TYPES([in_port_t, socklen_t], ,
- #include <netinet/in.h>])
- AC_CHECK_MEMBERS(fpos_t.__pos,,, [#include <stdio.h>])
-
--AC_OUTPUT(common/Makefile common/mp4v2/Makefile \
-- libfaac/Makefile frontend/Makefile \
-+AC_OUTPUT(common/Makefile common/mp4v2/Makefile
-+ libfaac/Makefile frontend/Makefile
- include/Makefile Makefile)
diff --git a/audio/faac/patches/patch-ac b/audio/faac/patches/patch-ac
deleted file mode 100644
index 9e93ecbc6f2..00000000000
--- a/audio/faac/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2007/02/15 06:44:32 tron Exp $
-
---- frontend/Makefile.am.orig 2004-07-28 09:18:21.000000000 +0100
-+++ frontend/Makefile.am 2007-02-12 09:03:04.000000000 +0000
-@@ -6,6 +6,11 @@
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
- LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.la -lm -lstdc++
- else
-+if WITH_EXTMP4V2
-+INCLUDES = -I$(top_srcdir)/include
-+LDADD = $(top_builddir)/libfaac/libfaac.la -lmp4v2 -lm
-+else
- INCLUDES = -I$(top_srcdir)/include
- LDADD = $(top_builddir)/libfaac/libfaac.la -lm
-+endif
- endif
diff --git a/audio/faad2/DESCR b/audio/faad2/DESCR
deleted file mode 100644
index 0077b5eca52..00000000000
--- a/audio/faad2/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-FAAD2 is the fastest ISO AAC audio decoder available. FAAD2 correctly
-decodes all MPEG-4 and MPEG-2 MAIN, LOW, LTP, LD and ER object type
-AAC files.
-
-There is a stable version of FAAD2 available, source code can be
-downloaded on the download page. The advantage of this new library
-is the lack of copyrighted code written by third parties. Further
-it is coded much cleaner and will give a much better understanding
-of the AAC coding algorithms.
diff --git a/audio/faad2/Makefile b/audio/faad2/Makefile
deleted file mode 100644
index 6208fce024c..00000000000
--- a/audio/faad2/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# $NetBSD: Makefile,v 1.38 2007/02/09 20:10:50 drochner Exp $
-
-DISTNAME= faad2-2.0
-PKGREVISION= 9
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.audiocoding.com/
-COMMENT= AAC decoding library
-
-RESTRICTED= Dolby doesn't allow binary distributions
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_CDROM=${RESTRICTED}
-
-WRKSRC= ${WRKDIR}/faad2
-USE_TOOLS+= automake gmake
-USE_LANGUAGES= c c++
-USE_LIBTOOL= YES
-
-AUTOCONF_REQD= 2.50
-GNU_CONFIGURE= YES
-
-CONFIGURE_ARGS+= --includedir=${PREFIX}/include/faad2
-# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE:Q}
-
-LIBS+= -lm
-
-CPPFLAGS.SunOS+=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1
-
-pre-configure:
- @${CP} ${WRKSRC}/common/faad/getopt.* ${WRKSRC}/frontend
- for dir in . ; do \
- cd ${WRKSRC}/$$dir; \
- aclocal -I .; \
- autoheader; \
- ${LOCALBASE}/bin/libtoolize --automake; \
- automake --add-missing; \
- autoconf; \
- done
-
-.include "../../multimedia/libmp4v2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/faad2/PLIST b/audio/faad2/PLIST
deleted file mode 100644
index 50d364e2c25..00000000000
--- a/audio/faad2/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.9 2007/02/09 20:10:50 drochner Exp $
-bin/faad
-include/faad2/faad2-config.h
-include/faad2/faad.h
-include/faad2/mp4ff.h
-lib/libfaad.la
-lib/libmp4ff.la
-@dirrm include/faad2
diff --git a/audio/faad2/buildlink3.mk b/audio/faad2/buildlink3.mk
deleted file mode 100644
index 277959f6ee9..00000000000
--- a/audio/faad2/buildlink3.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:35 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-FAAD2_BUILDLINK3_MK:= ${FAAD2_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= faad2
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfaad2}
-BUILDLINK_PACKAGES+= faad2
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}faad2
-
-.if !empty(FAAD2_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.faad2+= faad2>=2.0nb3
-BUILDLINK_ABI_DEPENDS.faad2?= faad2>=2.0nb5
-BUILDLINK_PKGSRCDIR.faad2?= ../../audio/faad2
-BUILDLINK_INCDIRS.faad2?= include/faad2
-.endif # FAAD2_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/faad2/distinfo b/audio/faad2/distinfo
deleted file mode 100644
index 6b3d33ee5e6..00000000000
--- a/audio/faad2/distinfo
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: distinfo,v 1.14 2007/02/09 20:10:50 drochner Exp $
-
-SHA1 (faad2-2.0.tar.gz) = fc9f8d0812a9f46bbd851880045131e0e4ab08b8
-RMD160 (faad2-2.0.tar.gz) = e1e4d7c96cbc3db2b9e67385062ccf5decb61f90
-Size (faad2-2.0.tar.gz) = 766660 bytes
-SHA1 (patch-aa) = 60f8ee14a3da38405eeab29047670b6878114244
-SHA1 (patch-ab) = 33c8c741f3b3870d84c66b6eb8bf95d4b768f39e
-SHA1 (patch-ac) = 0e7b30fa05d995f2061bcb0669a396701dc1e9d6
-SHA1 (patch-ad) = 4d57360bfd5e9c7f75d06ae274723f7aa1e11186
-SHA1 (patch-ae) = 04b09d0ace9381152b1ebc12951c530c5c3c46fc
-SHA1 (patch-af) = c6da419d2ac6b120b2e70c72f240c6f6b83ca39a
-SHA1 (patch-ag) = a2527f6ddfcf65ba6077bc6145c87bb354c740db
-SHA1 (patch-ah) = d062e23144932994c4193189efc6dfc47520f139
-SHA1 (patch-ai) = 0f09c422d764467fdb5d4bce846bc80e653d4aac
-SHA1 (patch-aj) = 06a8641803fdae5055f66255c57634b8f8619a77
-SHA1 (patch-ak) = d0a89de2fe7be1d784ea65433521d29f13c130a5
-SHA1 (patch-al) = e3dcbf3a0f19a4aca58bcad4ba079b2fee7415e2
-SHA1 (patch-am) = 7473594abc5349658a100db4a7dada5a8835468c
-SHA1 (patch-an) = 2267c3e65f820e72e0db4f2ce7b4c14f430e4cf4
-SHA1 (patch-ao) = 53739236153804fe4d9a663654f5822d44aee826
-SHA1 (patch-aq) = 145ec56e89f0533480888fd6a0bb87896d865fc1
-SHA1 (patch-ar) = 0eea09b484217e5b763b2e9ce012414dc77c95df
-SHA1 (patch-as) = f90050ba166e5a7eac7b0db5e9360eecab59dba7
diff --git a/audio/faad2/patches/patch-aa b/audio/faad2/patches/patch-aa
deleted file mode 100644
index 550b3e8e51d..00000000000
--- a/audio/faad2/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/10/06 13:13:28 ben Exp $
-
---- libfaad/Makefile.am.orig 2004-02-06 13:12:28.000000000 +0000
-+++ libfaad/Makefile.am 2004-03-27 22:27:18.000000000 +0000
-@@ -1,5 +1,4 @@
- lib_LTLIBRARIES = libfaad.la
--include_HEADERS = ../include/faad.h
-
- libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \
- error.c filtbank.c \
-@@ -7,8 +6,9 @@ ic_predict.c is.c lt_predict.c mdct.c mp
- pulse.c specrec.c syntax.c tns.c hcr.c huffman.c \
- rvlc.c ssr.c ssr_fb.c ssr_ipqf.c common.c \
- sbr_dct.c sbr_e_nf.c sbr_fbt.c sbr_hfadj.c sbr_hfgen.c \
--sbr_huff.c sbr_qmf.c sbr_syntax.c sbr_tf_grid.c sbr_dec.c \
--analysis.h bits.h cfft.h cfft_tab.h common.h \
-+sbr_huff.c sbr_qmf.c sbr_syntax.c sbr_tf_grid.c sbr_dec.c
-+
-+libfaad_la_INCLUDES = analysis.h bits.h cfft.h cfft_tab.h common.h \
- decoder.h drc.h error.h fixed.h filtbank.h \
- huffman.h ic_predict.h iq_table.h is.h kbd_win.h lt_predict.h mdct.h mp4.h \
- ms.h output.h pns.h pulse.h rvlc.h sine_win.h ssr.h ssr_fb.h ssr_ipqf.h \
diff --git a/audio/faad2/patches/patch-ab b/audio/faad2/patches/patch-ab
deleted file mode 100644
index f5c82f53f25..00000000000
--- a/audio/faad2/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/03/28 20:16:09 mycroft Exp $
-
---- frontend/Makefile.am.orig 2003-11-06 11:04:13.000000000 +0000
-+++ frontend/Makefile.am 2004-03-27 22:31:13.000000000 +0000
-@@ -1,7 +1,7 @@
- bin_PROGRAMS = faad
-
--faad_SOURCES = main.c audio.c $(top_srcdir)/common/faad/getopt.c \
-- audio.h
-+faad_SOURCES = main.c audio.c getopt.c
-+faad_INCLUDES = audio.h
-
- AM_CFLAGS = -O2
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \
diff --git a/audio/faad2/patches/patch-ac b/audio/faad2/patches/patch-ac
deleted file mode 100644
index b6cffa5c4bd..00000000000
--- a/audio/faad2/patches/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2007/02/09 20:10:50 drochner Exp $
-
---- Makefile.am.orig 2004-02-06 17:04:39.000000000 +0100
-+++ Makefile.am
-@@ -1,8 +1,10 @@
--SUBDIRS = libfaad common frontend plugins
-+SUBDIRS = libfaad common frontend include
-
- EXTRA_DIST = faad2.spec
-
-+include_HEADERS = faad2-config.h
-+
- rpm: Makefile
-- make dist
-- $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
-- rm $(PACKAGE)-$(VERSION).tar.gz
-+ make dist
-+ $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
-+ rm $(PACKAGE)-$(VERSION).tar.gz
diff --git a/audio/faad2/patches/patch-ad b/audio/faad2/patches/patch-ad
deleted file mode 100644
index 212a9e6427a..00000000000
--- a/audio/faad2/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2004/07/31 08:10:47 xtraeme Exp $
-
---- libfaad/common.h.orig 2004-07-31 09:50:50.000000000 +0200
-+++ libfaad/common.h 2004-07-31 09:54:34.000000000 +0200
-@@ -32,7 +32,7 @@
- extern "C" {
- #endif
-
--#define INLINE __inline
-+#define INLINE inline
- #if defined(_WIN32) && !defined(_WIN32_WCE)
- #define ALIGN __declspec(align(16))
- #else
-@@ -310,7 +310,7 @@
- #elif (defined(__i386__) && defined(__GNUC__))
- #define HAS_LRINTF
- // from http://www.stereopsis.com/FPU.html
-- static INLINE int lrintf(float f)
-+ static long INLINE int lrintf(float f)
- {
- int i;
- __asm__ __volatile__ (
diff --git a/audio/faad2/patches/patch-ae b/audio/faad2/patches/patch-ae
deleted file mode 100644
index 1cfb40dcc19..00000000000
--- a/audio/faad2/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/05/15 13:02:33 grant Exp $
-
---- common/mp4v2/rtphint.cpp.orig 2003-06-30 07:41:00.000000000 +1000
-+++ common/mp4v2/rtphint.cpp
-@@ -321,8 +321,8 @@ void MP4RtpHintTrack::GetPayload(
- if (ppEncodingParams)
- *ppEncodingParams = NULL;
- if (m_pRtpMapProperty) {
-- const char* pRtpMap = m_pRtpMapProperty->GetValue();
-- char* pSlash = strchr(pRtpMap, '/');
-+ const char* pRtpMap = (const char *)m_pRtpMapProperty->GetValue();
-+ char* pSlash = (char *)strchr(pRtpMap, '/');
-
- u_int32_t length;
- if (pSlash) {
diff --git a/audio/faad2/patches/patch-af b/audio/faad2/patches/patch-af
deleted file mode 100644
index d80c293c33e..00000000000
--- a/audio/faad2/patches/patch-af
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-af,v 1.2 2004/12/30 06:35:38 minskim Exp $
-
---- common/mp4ff/mp4ff_int_types.h.orig 2003-12-13 16:26:56.000000000 -0600
-+++ common/mp4ff/mp4ff_int_types.h
-@@ -1,3 +1,5 @@
-+#include "config.h"
-+
- #ifndef _MP4FF_INT_TYPES_H_
- #define _MP4FF_INT_TYPES_H_
-
-@@ -15,9 +17,18 @@ typedef unsigned __int64 uint64_t;
-
- #else
-
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+#if HAVE_INTTYPES_H
-+#include <inttypes.h>
-+#endif
-+#if HAVE_STDINT_H
- #include <stdint.h>
-+#endif
-+
-
- #endif
-
-
--#endif
-\ No newline at end of file
-+#endif
diff --git a/audio/faad2/patches/patch-ag b/audio/faad2/patches/patch-ag
deleted file mode 100644
index 73b47474b3b..00000000000
--- a/audio/faad2/patches/patch-ag
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/08/05 13:01:57 tonio Exp $
-
---- common/mp4v2/mp4property.h.orig 2005-08-05 12:14:37.000000000 +0200
-+++ common/mp4v2/mp4property.h 2005-08-05 12:16:34.000000000 +0200
-@@ -58,7 +58,7 @@
- return m_name;
- }
-
-- virtual MP4PropertyType GetType() = NULL;
-+ virtual MP4PropertyType GetType() = 0;
-
- bool IsReadOnly() {
- return m_readOnly;
-@@ -74,17 +74,17 @@
- m_implicit = value;
- }
-
-- virtual u_int32_t GetCount() = NULL;
-- virtual void SetCount(u_int32_t count) = NULL;
-+ virtual u_int32_t GetCount() = 0;
-+ virtual void SetCount(u_int32_t count) = 0;
-
- virtual void Generate() { /* default is a no-op */ };
-
-- virtual void Read(MP4File* pFile, u_int32_t index = 0) = NULL;
-+ virtual void Read(MP4File* pFile, u_int32_t index = 0) = 0;
-
-- virtual void Write(MP4File* pFile, u_int32_t index = 0) = NULL;
-+ virtual void Write(MP4File* pFile, u_int32_t index = 0) = 0;
-
- virtual void Dump(FILE* pFile, u_int8_t indent,
-- bool dumpImplicits, u_int32_t index = 0) = NULL;
-+ bool dumpImplicits, u_int32_t index = 0) = 0;
-
- virtual bool FindProperty(const char* name,
- MP4Property** ppProperty, u_int32_t* pIndex = NULL);
diff --git a/audio/faad2/patches/patch-ah b/audio/faad2/patches/patch-ah
deleted file mode 100644
index 9631874b7d5..00000000000
--- a/audio/faad2/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/08/05 13:01:57 tonio Exp $
-
---- common/mp4v2/rtphint.h.orig 2005-08-05 12:17:32.000000000 +0200
-+++ common/mp4v2/rtphint.h 2005-08-05 12:17:55.000000000 +0200
-@@ -35,8 +35,8 @@
- return m_pPacket;
- }
-
-- virtual u_int16_t GetDataSize() = NULL;
-- virtual void GetData(u_int8_t* pDest) = NULL;
-+ virtual u_int16_t GetDataSize() = 0;
-+ virtual void GetData(u_int8_t* pDest) = 0;
-
- MP4Track* FindTrackFromRefIndex(u_int8_t refIndex);
-
diff --git a/audio/faad2/patches/patch-ai b/audio/faad2/patches/patch-ai
deleted file mode 100644
index dff0dd16f57..00000000000
--- a/audio/faad2/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2005/08/05 13:01:57 tonio Exp $
-
---- common/mp4ff/mp4ffint.h.orig 2005-08-05 13:09:25.000000000 +0200
-+++ common/mp4ff/mp4ffint.h 2005-08-05 13:09:52.000000000 +0200
-@@ -301,7 +301,7 @@
- mp4ff_t *mp4ff_open_edit(mp4ff_callback_t *f);
- #endif
- void mp4ff_close(mp4ff_t *ff);
--void mp4ff_track_add(mp4ff_t *f);
-+static void mp4ff_track_add(mp4ff_t *f);
- int32_t parse_sub_atoms(mp4ff_t *f, const uint64_t total_size);
- int32_t parse_atoms(mp4ff_t *f);
-
diff --git a/audio/faad2/patches/patch-aj b/audio/faad2/patches/patch-aj
deleted file mode 100644
index 0275fe78c8d..00000000000
--- a/audio/faad2/patches/patch-aj
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2005/10/06 13:13:28 ben Exp $
-
---- /dev/null 2005-10-05 21:10:17.000000000 -0700
-+++ include/Makefile.am 2005-10-05 21:10:37.000000000 -0700
-@@ -0,0 +1 @@
-+include_HEADERS = faad.h
diff --git a/audio/faad2/patches/patch-ak b/audio/faad2/patches/patch-ak
deleted file mode 100644
index 7d315e660b5..00000000000
--- a/audio/faad2/patches/patch-ak
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2006/07/27 17:27:29 wiz Exp $
-
---- configure.in.orig 2004-02-06 17:04:39.000000000 +0100
-+++ configure.in
-@@ -1,5 +1,5 @@
- AC_INIT
--AM_INIT_AUTOMAKE(faad2, 2.0)
-+AM_INIT_AUTOMAKE(faad2, 2.0, do-not-define-PACKAGE-or-VERSION)
-
- AC_PROG_LIBTOOL
- AC_SUBST(LIBTOOL_DEPS)
-@@ -13,7 +13,7 @@ AC_PROG_LN_S
- AC_PROG_MAKE_SET
- AC_CHECK_PROGS(RPMBUILD, rpmbuild, rpm)
-
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
-
- AC_ARG_WITH( xmms, [ --with-xmms compile XMMS plugins],WITHXMMS=$withval, WITHXMMS=no)
-
-@@ -114,7 +114,7 @@ if test x$WITHDRM = xyes; then
- AC_DEFINE(DRM, 1, [Define if you want to use libfaad together with Digital Radio Mondiale (DRM)])
- fi
-
--AC_CONFIG_FILES(libfaad/Makefile frontend/Makefile common/Makefile plugins/Makefile Makefile )
-+AC_CONFIG_FILES(libfaad/Makefile frontend/Makefile common/Makefile plugins/Makefile include/Makefile Makefile )
-
- AC_CONFIG_FILES(plugins/mpeg4ip/Makefile)
-
-@@ -122,3 +122,4 @@ AC_CONFIG_FILES(common/mp4ff/Makefile co
-
- AC_CONFIG_FILES(faad2.spec)
- AC_OUTPUT
-+cp config.h faad2-config.h
diff --git a/audio/faad2/patches/patch-al b/audio/faad2/patches/patch-al
deleted file mode 100644
index 8defc7dcbf4..00000000000
--- a/audio/faad2/patches/patch-al
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-al,v 1.1 2005/10/09 03:23:11 ben Exp $
-
---- common/mp4v2/systems.h.orig 2003-06-29 14:41:00.000000000 -0700
-+++ common/mp4v2/systems.h
-@@ -29,9 +29,7 @@
- #include <win32_ver.h>
- #define NEED_SDL_VIDEO_IN_MAIN_THREAD
- #else
--#undef PACKAGE
--#undef VERSION
--#include <config.h>
-+#include <faad2-config.h>
- #endif
-
-
-@@ -269,7 +267,8 @@ char *strsep(char **strp, const char *de
-
- #define NUM_ELEMENTS_IN_ARRAY(name) ((sizeof((name))) / (sizeof(*(name))))
-
--#ifndef HAVE_GLIB_H
-+#ifndef __G_LIB_H__
-+/* #ifndef HAVE_GLIB_H */
- typedef char gchar;
- typedef unsigned char guchar;
-
diff --git a/audio/faad2/patches/patch-am b/audio/faad2/patches/patch-am
deleted file mode 100644
index 6cd0a997a58..00000000000
--- a/audio/faad2/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1 2005/12/08 10:06:32 wiz Exp $
-
---- frontend/main.c.orig 2004-01-06 12:59:47.000000000 +0100
-+++ frontend/main.c
-@@ -832,7 +832,7 @@ int decodeMP4file(char *mp4file, char *s
- }
- }
- }
-- if (j > 0) printf("\n");
-+ if (j > 0) fprintf(stderr, "\n");
- #endif
- }
-
diff --git a/audio/faad2/patches/patch-an b/audio/faad2/patches/patch-an
deleted file mode 100644
index 0d3419ac75c..00000000000
--- a/audio/faad2/patches/patch-an
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-an,v 1.1 2006/05/30 20:28:34 tron Exp $
-
---- plugins/mpeg4ip/aa_file.cpp.orig 2004-01-05 14:05:12.000000000 +0000
-+++ plugins/mpeg4ip/aa_file.cpp 2006-05-30 16:04:22.000000000 +0100
-@@ -77,7 +77,7 @@
-
- int aac_file_next_frame (codec_data_t *your,
- uint8_t **buffer,
-- uint64_t *ts)
-+ frame_timestamp_t *ts)
- {
- aac_codec_t *aac = (aac_codec_t *)your;
-
-@@ -98,7 +98,7 @@
- uint64_t calc;
- calc = aac->m_framecount * 1024 * M_LLU;
- calc /= aac->m_freq;
-- *ts = calc;
-+ ts->msec_timestamp = calc;
- *buffer = aac->m_buffer;
- aac->m_framecount++;
- return (aac->m_buffer_size);
diff --git a/audio/faad2/patches/patch-ao b/audio/faad2/patches/patch-ao
deleted file mode 100644
index 319cf005a4f..00000000000
--- a/audio/faad2/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2006/05/30 20:28:34 tron Exp $
-
---- plugins/mpeg4ip/faad2.h.orig 2004-01-05 14:05:12.000000000 +0000
-+++ plugins/mpeg4ip/faad2.h 2006-05-30 16:04:22.000000000 +0100
-@@ -81,7 +81,7 @@
-
- int aac_file_next_frame(codec_data_t *ifptr,
- uint8_t **buffer,
-- uint64_t *ts);
-+ frame_timestamp_t *ts);
- int aac_file_eof(codec_data_t *ifptr);
-
- void aac_file_used_for_frame(codec_data_t *ifptr,
diff --git a/audio/faad2/patches/patch-aq b/audio/faad2/patches/patch-aq
deleted file mode 100644
index 5e49edbd68c..00000000000
--- a/audio/faad2/patches/patch-aq
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2006/05/30 20:28:34 tron Exp $
-
---- plugins/mpeg4ip/faad2.cpp.orig 2004-01-05 14:05:12.000000000 +0000
-+++ plugins/mpeg4ip/faad2.cpp 2006-05-30 16:04:22.000000000 +0100
-@@ -35,7 +35,9 @@
- /*
- * Create CAACodec class
- */
--static codec_data_t *aac_codec_create (const char *compressor,
-+static codec_data_t *aac_codec_create (
-+ const char* /*stream_type*/,
-+ const char* /*compressor*/,
- int type,
- int profile,
- format_list_t *media_fmt,
-@@ -148,7 +150,7 @@
- * Decode task call for FAAC
- */
- static int aac_decode (codec_data_t *ptr,
-- uint64_t ts,
-+ frame_timestamp_t* ts,
- int from_rtp,
- int *sync_frame,
- uint8_t *buffer,
-@@ -163,15 +165,15 @@
- if (aac->m_record_sync_time) {
- aac->m_current_frame = 0;
- aac->m_record_sync_time = 0;
-- aac->m_current_time = ts;
-- aac->m_last_rtp_ts = ts;
-+ aac->m_current_time = ts->msec_timestamp;
-+ aac->m_last_rtp_ts = ts->msec_timestamp;
- } else {
-- if (aac->m_last_rtp_ts == ts) {
-+ if (aac->m_last_rtp_ts == ts->msec_timestamp) {
- aac->m_current_time += aac->m_msec_per_frame;
- aac->m_current_frame++;
- } else {
-- aac->m_last_rtp_ts = ts;
-- aac->m_current_time = ts;
-+ aac->m_last_rtp_ts = ts->msec_timestamp;
-+ aac->m_current_time = ts->msec_timestamp;
- aac->m_current_frame = 0;
- }
-
-@@ -237,9 +239,9 @@
- aac->m_vft->audio_configure(aac->m_ifptr,
- aac->m_freq,
- aac->m_chans,
-- AUDIO_S16SYS,
-+ AUDIO_FMT_S16,
- aac->m_output_frame_size);
-- uint8_t *now = aac->m_vft->audio_get_buffer(aac->m_ifptr);
-+ uint8_t *now = aac->m_vft->audio_get_buffer(aac->m_ifptr, aac->m_freq, aac->m_current_time);
- aac->m_audio_inited = 1;
- }
- /*
-@@ -281,6 +283,7 @@
- };
-
- static int aac_codec_check (lib_message_func_t message,
-+ const char *stream_type,
- const char *compressor,
- int type,
- int profile,
-@@ -322,7 +325,7 @@
- }
- if (userdata != NULL) {
- mpeg4_audio_config_t audio_config;
-- decode_mpeg4_audio_config(userdata, userdata_size, &audio_config);
-+ decode_mpeg4_audio_config(userdata, userdata_size, &audio_config, false);
- message(LOG_DEBUG, "aac", "audio type is %d", audio_config.audio_object_type);
- if (fmtp != NULL) free_fmtp_parse(fmtp);
-
diff --git a/audio/faad2/patches/patch-ar b/audio/faad2/patches/patch-ar
deleted file mode 100644
index 20bea66754d..00000000000
--- a/audio/faad2/patches/patch-ar
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2006/08/06 10:38:42 wiz Exp $
-
---- plugins/xmms/src/Makefile.am.orig 2004-02-07 03:05:07.000000000 +1100
-+++ plugins/xmms/src/Makefile.am
-@@ -5,9 +5,9 @@ libmp4_la_CFLAGS = `$(XMMS_CONFIG) --cfl
- `$(GTK_CONFIG) --cflags` -DHAVE_GLIB_H=1 \
- -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
-
--libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
-- $(top_builddir)/common/mp4v2/libmp4v2.la
-+LIBS = -lfaad -lmp4v2
-+CFLAGS = `$(XMMS_CONFIG) --cflags` `$(GTK_CONFIG) --cflags` -DHAVE_GLIB_H=1
-
- libmp4_la_LDFLAGS = -module -avoid-version `$(XMMS_CONFIG) --libs` \
-- `$(GTK_CONFIG) --libs` -lpthread -lstdc++
-+ `$(GTK_CONFIG) --libs` -lstdc++ ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
- libmp4_la_SOURCES = libmp4.c mp4_utils.c aac_utils.c
diff --git a/audio/faad2/patches/patch-as b/audio/faad2/patches/patch-as
deleted file mode 100644
index 20cf88af6a6..00000000000
--- a/audio/faad2/patches/patch-as
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-as,v 1.1 2006/08/06 10:38:42 wiz Exp $
-
---- plugins/xmms/src/libmp4.c.orig 2003-12-04 05:37:56.000000000 +1100
-+++ plugins/xmms/src/libmp4.c
-@@ -8,8 +8,8 @@
-
- #include <pthread.h>
- #include <gtk/gtk.h>
--#include "faad.h"
--#include "mp4.h"
-+#include <faad.h>
-+#include <mp4.h>
-
- #include <xmms/plugin.h>
- #include <xmms/util.h>
diff --git a/audio/festival-doc/DESCR b/audio/festival-doc/DESCR
deleted file mode 100644
index 4791c171392..00000000000
--- a/audio/festival-doc/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Festival documentation, in (text)info, html, dvi and ps formats
diff --git a/audio/festival-doc/Makefile b/audio/festival-doc/Makefile
deleted file mode 100644
index 466695526fa..00000000000
--- a/audio/festival-doc/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2006/12/28 11:47:51 wiz Exp $
-
-DISTNAME= festdoc-1.4.0.1
-PKGNAME= festival-doc-1.4.0.1
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
- http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.cstr.ed.ac.uk/projects/festival/
-COMMENT= Festival documentation, in (tex)info, html, dvi and ps formats
-
-NO_BUILD= yes
-
-DOC= ${PREFIX}/share/doc/festival
-
-INFO_FILES= # PLIST
-
-INSTALLATION_DIRS= ${PKGINFODIR}
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
- ${RM} ${WRKSRC}/festival/src-manual/c3750.htm~
- ${RM} ${WRKSRC}/speechtools/c16909.htm~
- ${RMDIR} ${WRKSRC}/festival/src-manual/images_gen
-
-do-install:
- ${INSTALL_DATA_DIR} ${DOC}
- cd ${WRKSRC}; \
- ${PAX} -rw speechtools ${DOC}; \
- cd festival; \
- for f in info/*.info info/*.info-[0-9]*; do \
- ${INSTALL_DATA} $${f} ${PREFIX}/${PKGINFODIR}; \
- done; \
- ${PAX} -rw user-manual ${DOC}; \
- ${PAX} -rw src-manual ${DOC}; \
- for f in festival.* refcard.*; do \
- ${INSTALL_DATA} $${f} ${DOC}; \
- done
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festival-doc/PLIST b/audio/festival-doc/PLIST
deleted file mode 100644
index d73f4b20c72..00000000000
--- a/audio/festival-doc/PLIST
+++ /dev/null
@@ -1,189 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/03/30 03:44:41 jlam Exp $
-info/festival.info
-share/doc/festival/festival.dvi
-share/doc/festival/festival.ps
-share/doc/festival/refcard.dvi
-share/doc/festival/refcard.ps
-share/doc/festival/speechtools/HTML.index
-share/doc/festival/speechtools/TeX.formulae
-share/doc/festival/speechtools/a17354.htm
-share/doc/festival/speechtools/arch_doc/Makefile
-share/doc/festival/speechtools/arch_doc/eq01.gif
-share/doc/festival/speechtools/arch_doc/eq02.gif
-share/doc/festival/speechtools/arch_doc/eq03.gif
-share/doc/festival/speechtools/arch_doc/eq04.gif
-share/doc/festival/speechtools/arch_doc/eq05.gif
-share/doc/festival/speechtools/arch_doc/eq06.gif
-share/doc/festival/speechtools/arch_doc/eq07.gif
-share/doc/festival/speechtools/arch_doc/eq08.gif
-share/doc/festival/speechtools/arch_doc/eq09.gif
-share/doc/festival/speechtools/arch_doc/figure01.gif
-share/doc/festival/speechtools/arch_doc/figure02.gif
-share/doc/festival/speechtools/arch_doc/figure03.gif
-share/doc/festival/speechtools/arch_doc/figure04.gif
-share/doc/festival/speechtools/arch_doc/figure05.gif
-share/doc/festival/speechtools/arch_doc/figure06.gif
-share/doc/festival/speechtools/arch_doc/figure07.gif
-share/doc/festival/speechtools/arch_doc/figure15.gif
-share/doc/festival/speechtools/arch_doc/tilt_eq01.gif
-share/doc/festival/speechtools/arch_doc/tilt_eq02.gif
-share/doc/festival/speechtools/arch_doc/tilt_eq03.gif
-share/doc/festival/speechtools/arch_doc/tilt_eq04.gif
-share/doc/festival/speechtools/arch_doc/tilt_eq05.gif
-share/doc/festival/speechtools/arch_doc/tilt_eq06.gif
-share/doc/festival/speechtools/arch_doc/tilt_eq07.gif
-share/doc/festival/speechtools/arch_doc/tilt_eq08.gif
-share/doc/festival/speechtools/arch_doc/tilt_eq09.gif
-share/doc/festival/speechtools/arch_doc/tilt_eq10.gif
-share/doc/festival/speechtools/arch_doc/tilt_eq11.gif
-share/doc/festival/speechtools/arch_doc/tilt_fig01.fig
-share/doc/festival/speechtools/arch_doc/tilt_fig01.gif
-share/doc/festival/speechtools/arch_doc/tilt_fig02.fig
-share/doc/festival/speechtools/arch_doc/tilt_fig02.gif
-share/doc/festival/speechtools/arch_doc/tilt_fig03.gif
-share/doc/festival/speechtools/arch_doc/track_fig01.fig
-share/doc/festival/speechtools/arch_doc/track_fig01.gif
-share/doc/festival/speechtools/book1.htm
-share/doc/festival/speechtools/c10710.htm
-share/doc/festival/speechtools/c12967.htm
-share/doc/festival/speechtools/c13670.htm
-share/doc/festival/speechtools/c15774.htm
-share/doc/festival/speechtools/c16616.htm
-share/doc/festival/speechtools/c16909.htm
-share/doc/festival/speechtools/c23.htm
-share/doc/festival/speechtools/c409.htm
-share/doc/festival/speechtools/c4327.htm
-share/doc/festival/speechtools/c76.htm
-share/doc/festival/speechtools/c9312.htm
-share/doc/festival/speechtools/cstr.gif
-share/doc/festival/speechtools/cstrdoc.css
-share/doc/festival/speechtools/edcrest.gif
-share/doc/festival/speechtools/est.jpg
-share/doc/festival/speechtools/est_small.jpg
-share/doc/festival/speechtools/i17445.htm
-share/doc/festival/speechtools/images_gen/docppimath_929959717_2.gif
-share/doc/festival/speechtools/images_gen/docppimath_929959730_1.gif
-share/doc/festival/speechtools/images_gen/docppimath_929959730_2.gif
-share/doc/festival/speechtools/images_gen/docppimath_929959730_3.gif
-share/doc/festival/speechtools/images_gen/docppimath_929959730_4.gif
-share/doc/festival/speechtools/images_gen/docppimath_929959730_5.gif
-share/doc/festival/speechtools/images_gen/docppimath_929959730_6.gif
-share/doc/festival/speechtools/images_gen/docppmath_929959726_1.gif
-share/doc/festival/speechtools/images_gen/docppmath_929959726_2.gif
-share/doc/festival/speechtools/images_gen/docppmath_929959726_3.gif
-share/doc/festival/speechtools/images_gen/docppmath_929959728_1.gif
-share/doc/festival/speechtools/images_gen/docppmath_929959728_2.gif
-share/doc/festival/speechtools/images_gen/docppmath_929959730_1.gif
-share/doc/festival/speechtools/images_gen/docppmath_929959730_2.gif
-share/doc/festival/speechtools/images_gen/docppmath_929959731_1.gif
-share/doc/festival/speechtools/images_gen/docppmath_929959731_2.gif
-share/doc/festival/speechtools/images_gen/docppmath_929959741_1.gif
-share/doc/festival/speechtools/images_gen/docppmath_929959741_2.gif
-share/doc/festival/speechtools/images_gen/docppmath_929959741_3.gif
-share/doc/festival/speechtools/images_gen/docppmath_929959741_4.gif
-share/doc/festival/speechtools/images_gen/docppmath_929959741_5.gif
-share/doc/festival/speechtools/images_gen/docppmath_929959743_1.gif
-share/doc/festival/speechtools/index.html
-share/doc/festival/speechtools/x10356.htm
-share/doc/festival/speechtools/x10572.htm
-share/doc/festival/speechtools/x10806.htm
-share/doc/festival/speechtools/x11037.htm
-share/doc/festival/speechtools/x1196.htm
-share/doc/festival/speechtools/x130.htm
-share/doc/festival/speechtools/x1374.htm
-share/doc/festival/speechtools/x13778.htm
-share/doc/festival/speechtools/x1440.htm
-share/doc/festival/speechtools/x154.htm
-share/doc/festival/speechtools/x15608.htm
-share/doc/festival/speechtools/x15742.htm
-share/doc/festival/speechtools/x15902.htm
-share/doc/festival/speechtools/x15937.htm
-share/doc/festival/speechtools/x16708.htm
-share/doc/festival/speechtools/x16710.htm
-share/doc/festival/speechtools/x16721.htm
-share/doc/festival/speechtools/x17072.htm
-share/doc/festival/speechtools/x17086.htm
-share/doc/festival/speechtools/x1717.htm
-share/doc/festival/speechtools/x17367.htm
-share/doc/festival/speechtools/x17375.htm
-share/doc/festival/speechtools/x17399.htm
-share/doc/festival/speechtools/x17409.htm
-share/doc/festival/speechtools/x17426.htm
-share/doc/festival/speechtools/x1888.htm
-share/doc/festival/speechtools/x2086.htm
-share/doc/festival/speechtools/x2152.htm
-share/doc/festival/speechtools/x2378.htm
-share/doc/festival/speechtools/x2656.htm
-share/doc/festival/speechtools/x2759.htm
-share/doc/festival/speechtools/x2921.htm
-share/doc/festival/speechtools/x3039.htm
-share/doc/festival/speechtools/x3206.htm
-share/doc/festival/speechtools/x3391.htm
-share/doc/festival/speechtools/x3475.htm
-share/doc/festival/speechtools/x3661.htm
-share/doc/festival/speechtools/x3736.htm
-share/doc/festival/speechtools/x3787.htm
-share/doc/festival/speechtools/x3857.htm
-share/doc/festival/speechtools/x3927.htm
-share/doc/festival/speechtools/x3988.htm
-share/doc/festival/speechtools/x4041.htm
-share/doc/festival/speechtools/x4122.htm
-share/doc/festival/speechtools/x4167.htm
-share/doc/festival/speechtools/x4218.htm
-share/doc/festival/speechtools/x427.htm
-share/doc/festival/speechtools/x4273.htm
-share/doc/festival/speechtools/x4298.htm
-share/doc/festival/speechtools/x444.htm
-share/doc/festival/speechtools/x737.htm
-share/doc/festival/speechtools/x83.htm
-share/doc/festival/speechtools/x9162.htm
-share/doc/festival/speechtools/x9210.htm
-share/doc/festival/speechtools/x9265.htm
-share/doc/festival/speechtools/x9347.htm
-share/doc/festival/speechtools/x9358.htm
-share/doc/festival/speechtools/x961.htm
-share/doc/festival/src-manual/c3750.htm
-share/doc/festival/src-manual/unisyn02.gif
-share/doc/festival/src-manual/x3792.htm
-share/doc/festival/user-manual/festival_1.html
-share/doc/festival/user-manual/festival_10.html
-share/doc/festival/user-manual/festival_11.html
-share/doc/festival/user-manual/festival_12.html
-share/doc/festival/user-manual/festival_13.html
-share/doc/festival/user-manual/festival_14.html
-share/doc/festival/user-manual/festival_15.html
-share/doc/festival/user-manual/festival_16.html
-share/doc/festival/user-manual/festival_17.html
-share/doc/festival/user-manual/festival_18.html
-share/doc/festival/user-manual/festival_19.html
-share/doc/festival/user-manual/festival_2.html
-share/doc/festival/user-manual/festival_20.html
-share/doc/festival/user-manual/festival_21.html
-share/doc/festival/user-manual/festival_22.html
-share/doc/festival/user-manual/festival_23.html
-share/doc/festival/user-manual/festival_24.html
-share/doc/festival/user-manual/festival_25.html
-share/doc/festival/user-manual/festival_26.html
-share/doc/festival/user-manual/festival_27.html
-share/doc/festival/user-manual/festival_28.html
-share/doc/festival/user-manual/festival_29.html
-share/doc/festival/user-manual/festival_3.html
-share/doc/festival/user-manual/festival_30.html
-share/doc/festival/user-manual/festival_31.html
-share/doc/festival/user-manual/festival_32.html
-share/doc/festival/user-manual/festival_33.html
-share/doc/festival/user-manual/festival_34.html
-share/doc/festival/user-manual/festival_35.html
-share/doc/festival/user-manual/festival_4.html
-share/doc/festival/user-manual/festival_5.html
-share/doc/festival/user-manual/festival_6.html
-share/doc/festival/user-manual/festival_7.html
-share/doc/festival/user-manual/festival_8.html
-share/doc/festival/user-manual/festival_9.html
-share/doc/festival/user-manual/festival_toc.html
-@dirrm share/doc/festival/user-manual
-@dirrm share/doc/festival/src-manual
-@dirrm share/doc/festival/speechtools/images_gen
-@dirrm share/doc/festival/speechtools/arch_doc
-@dirrm share/doc/festival/speechtools
-@dirrm share/doc/festival
diff --git a/audio/festival-doc/distinfo b/audio/festival-doc/distinfo
deleted file mode 100644
index 79e395d5e3f..00000000000
--- a/audio/festival-doc/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:44 agc Exp $
-
-SHA1 (festdoc-1.4.0.1.tar.gz) = 8738d5415e6e10b67daae3bba6d2c2136175a911
-RMD160 (festdoc-1.4.0.1.tar.gz) = ba5153ec149169e01fd1e8f51d63e2aafe9a8dc9
-Size (festdoc-1.4.0.1.tar.gz) = 1265147 bytes
-SHA1 (patch-aa) = 9905ed3fb3a66a5dd47697db52b4cd649bbd9fc9
diff --git a/audio/festival-doc/patches/patch-aa b/audio/festival-doc/patches/patch-aa
deleted file mode 100644
index 3549141d20b..00000000000
--- a/audio/festival-doc/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/01/21 23:02:10 wiz Exp $
-
---- festival/info/festival.info.orig Sat Jun 19 17:08:03 1999
-+++ festival/info/festival.info Wed Jan 5 16:36:08 2000
-@@ -1,6 +1,11 @@
- This is Info file festival.info, produced by Makeinfo-1.63 from the
- input file festival.texi.
-
-+INFO-DIR-SECTION Speech Synthesis
-+START-INFO-DIR-ENTRY
-+* Festival: (festival). A general text to speech system.
-+END-INFO-DIR-ENTRY
-+
- This file documents the `Festival' Speech Synthesis System a general
- text to speech system for making your computer talk and developing new
- synthesis techniques.
diff --git a/audio/festival/DESCR b/audio/festival/DESCR
deleted file mode 100644
index 668c1da11ca..00000000000
--- a/audio/festival/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-Festival is an advanced multi-lingual speech synthesis system
-developed at CSTR. It offers a full text to speech system with various
-APIs, as well an environment for development and research of speech
-synthesis techniques. It is written in C++ with a Scheme-based command
-interpreter for general control.
-
-You will also need to install at least one festvox-* (festival voice)
-package (infact, the festvox packages are dependent on this package).
-
-festival --tts foo.bar will speak ASCII file foo.bar, (SayText "Oh
-Dad! We're ALL Devo!")
diff --git a/audio/festival/MESSAGE b/audio/festival/MESSAGE
deleted file mode 100644
index 93a586ec42e..00000000000
--- a/audio/festival/MESSAGE
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/12 17:06:58 wiz Exp $
-
-You need to install at least one festvox-* package before festival can
-do anything other than mumble silently to itself. See the festival
-package description, the festdoc package
-(${PREFIX}/share/doc/festival/*), or the festival homepage for more
-information.
-
-===========================================================================
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
deleted file mode 100644
index 5f6e01b82bf..00000000000
--- a/audio/festival/Makefile
+++ /dev/null
@@ -1,103 +0,0 @@
-# $NetBSD: Makefile,v 1.53 2007/01/26 21:58:42 joerg Exp $
-
-DISTNAME= festival-1.95-beta
-PKGNAME= festival-1.95beta
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= http://festvox.org/packed/festival/1.95/ \
- ftp://cslu.cse.ogi.edu/pub/tts/
-DISTFILES= ${DISTNAME}.tar.gz \
- speech_tools-1.2.95-beta.tar.gz
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.cstr.ed.ac.uk/projects/festival/
-COMMENT= Advanced multi-lingual speech synthesis system
-
-WRKSRC= ${WRKDIR}
-USE_LANGUAGES= c c++
-USE_TOOLS+= gmake
-
-SPEECHTOOLS= ${WRKSRC}/speech_tools
-FESTIVAL= ${WRKSRC}/festival
-
-FHOME= ${PREFIX}/share/festival
-
-GNU_CONFIGURE= yes
-CONFIGURE_SCRIPT= ${SPEECHTOOLS}/configure
-CONFIG_GUESS_OVERRIDE= ${SPEECHTOOLS}/config.guess ${FESTIVAL}/config.guess
-CONFIG_SUB_OVERRIDE= ${SPEECHTOOLS}/config.sub ${FESTIVAL}/config.sub
-
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Msunpro)
-PKG_COMPILER?= suncc
-.else
-PKG_COMPILER_cmd= case "${CC_VERSION}" in \
- gcc-2.6.*) ${ECHO} gcc26;; \
- gcc-2.7.*) ${ECHO} gcc27;; \
- gcc-2.8.*) ${ECHO} gcc28;; \
- gcc-2.95.*) ${ECHO} gcc295;; \
- gcc-3.3.*) ${ECHO} gcc32;; \
- gcc-3.4.*) ${ECHO} gcc32;; \
- egcs*) ${ECHO} egcs;; \
- *) ${ECHO} ;; \
- esac
-PKG_COMPILER= ${PKG_COMPILER_cmd:sh}
-.endif
-
-.if empty(PKG_COMPILER)
-PKG_FAIL_REASON+= "${CC_VERSION} is not currently supported."
-.endif
-
-MAKE_ENV+= PKG_EST_HOME=${SPEECHTOOLS:Q} \
- EST_HOME=${SPEECHTOOLS:Q} \
- PKG_FESTIVAL_BUILD_HOME=${FESTIVAL:Q} \
- PKG_FESTIVAL_HOME=${FHOME:Q} \
- PKG_COMPILER=${PKG_COMPILER:Q} \
- PKG_X11BASE=${X11BASE:Q} \
- PKG_PREFIX=${PREFIX:Q} \
- EGCS_CC=${CC:Q} \
- EGCS_CXX=${CXX:Q} \
- GCC295_CC=${CC:Q} \
- GCC295_CXX=${CXX:Q} \
- GCC28_CC=${CC:Q} \
- GCC28_CXX=${CXX:Q} \
- GCC27_CC=${CC:Q} \
- GCC27_CXX=${CXX:Q} \
- GCC26_CC=${CC:Q} \
- GCC26_CXX=${CXX:Q} \
- CC=${CC:Q} \
- CXX=${CXX:Q}
-
-INSTALLATION_DIRS= bin libexec ${PKGMANDIR}/man1
-
-post-patch:
- ${CP} ${FILESDIR}/top-Makefile ${WRKSRC}/Makefile
-.if exists(${FILESDIR}/unknown_${OPSYS}.mak)
- ${CP} ${FILESDIR}/unknown_${OPSYS}.mak ${SPEECHTOOLS}/config/systems/unknown_${OPSYS}.mak
- ${CP} ${FILESDIR}/unknown_${OPSYS}.mak ${FESTIVAL}/config/systems/unknown_${OPSYS}.mak
-.endif
-
-do-install:
- ${INSTALL_DATA_DIR} ${FHOME}
- ${CHMOD} -R u+w,a+r,og-w ${FESTIVAL}/lib
- ${FIND} ${FESTIVAL}/lib -type d -print | ${XARGS} ${CHMOD} 755
- -@${MV} ${FESTIVAL}/lib/etc/unknown_${OPSYS} ${FESTIVAL}/lib/etc/pkgsrc
- cd ${FESTIVAL} && ${PAX} -rw lib examples ${FHOME}
- ${RM} ${FHOME}/examples/Makefile.orig
- ${RM} -f ${FHOME}/lib/etc/unknown_${OPSYS}/audsp ${FHOME}/lib/etc/pkgsrc/audsp
- ${INSTALL_PROGRAM} ${FESTIVAL}/lib/etc/pkgsrc/audsp ${PREFIX}/libexec
- ${INSTALL_PROGRAM} ${FESTIVAL}/src/main/festival ${PREFIX}/libexec/festival.naked
- ${INSTALL_PROGRAM} ${FESTIVAL}/src/main/festival_client ${PREFIX}/libexec/festival_client.naked
- for n in festival.sh festival_client.sh sitevars.scm; do \
- ${SED} "s%@PKG_FESTIVAL_LOCATION@%${FHOME}%; \
- s%@PKG_PREFIX@%${PREFIX}%" <${FILESDIR}/$$n > ${WRKDIR}/$$n ; \
- done
- ${INSTALL_SCRIPT} ${WRKDIR}/festival.sh ${PREFIX}/bin/festival
- ${INSTALL_SCRIPT} ${WRKDIR}/festival_client.sh ${PREFIX}/bin/festival_client
- ${INSTALL_DATA} ${WRKDIR}/sitevars.scm ${FHOME}/lib/sitevars.scm
- ${INSTALL_MAN} ${FESTIVAL}/doc/festival.1 ${PREFIX}/${PKGMANDIR}/man1/festival.1
- ${INSTALL_MAN} ${FESTIVAL}/doc/festival_client.1 ${PREFIX}/${PKGMANDIR}/man1/festival_client.1
-
-.include "../../audio/nas/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festival/PLIST b/audio/festival/PLIST
deleted file mode 100644
index eb140187238..00000000000
--- a/audio/festival/PLIST
+++ /dev/null
@@ -1,146 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2005/05/23 08:14:36 rillig Exp $
-bin/festival
-bin/festival_client
-libexec/audsp
-libexec/festival.naked
-libexec/festival_client.naked
-man/man1/festival.1
-man/man1/festival_client.1
-share/festival/examples/Makefile
-share/festival/examples/addr-mode.scm
-share/festival/examples/apml.dtd
-share/festival/examples/benchmark
-share/festival/examples/benchmark.text
-share/festival/examples/dumpfeats
-share/festival/examples/dumpfeats.sh
-share/festival/examples/durmeanstd
-share/festival/examples/durmeanstd.sh
-share/festival/examples/ex1.email
-share/festival/examples/ex1.ogi
-share/festival/examples/example.apml
-share/festival/examples/example.sable
-share/festival/examples/example.th
-share/festival/examples/example2.sable
-share/festival/examples/festival_client.c
-share/festival/examples/festival_client.h
-share/festival/examples/festival_client.pl
-share/festival/examples/intro.text
-share/festival/examples/latest
-share/festival/examples/latest.sh
-share/festival/examples/make_utts
-share/festival/examples/make_utts.sh
-share/festival/examples/powmeanstd
-share/festival/examples/powmeanstd.sh
-share/festival/examples/saytime
-share/festival/examples/saytime.sh
-share/festival/examples/scfg_parse_text
-share/festival/examples/scfg_parse_text.sh
-share/festival/examples/songs/Makefile
-share/festival/examples/songs/america1.xml
-share/festival/examples/songs/america2.xml
-share/festival/examples/songs/america3.xml
-share/festival/examples/songs/america4.xml
-share/festival/examples/songs/daisy.xml
-share/festival/examples/songs/doremi.xml
-share/festival/examples/songs/lochlomond.xml
-share/festival/examples/songs/spice1.xml
-share/festival/examples/songs/spice2.xml
-share/festival/examples/songs/spice3.xml
-share/festival/examples/songs/spice4.xml
-share/festival/examples/speech_pm_1.0.tar
-share/festival/examples/spintro.text
-share/festival/examples/text2pos
-share/festival/examples/text2pos.sh
-share/festival/examples/text2wave
-share/festival/examples/text2wave.sh
-share/festival/examples/th-mode.scm
-share/festival/examples/tobi.stml
-share/festival/examples/toksearch.scm
-share/festival/examples/webdemo.scm
-share/festival/lib/Makefile
-share/festival/lib/Sable.v0_2.dtd
-share/festival/lib/Singing.v0_1.dtd
-share/festival/lib/VCLocalRules
-share/festival/lib/apml.scm
-share/festival/lib/apml_f2bf0lr.scm
-share/festival/lib/apml_kaldurtreeZ.scm
-share/festival/lib/cart_aux.scm
-share/festival/lib/clunits.scm
-share/festival/lib/clunits_build.scm
-share/festival/lib/cmusphinx2_phones.scm
-share/festival/lib/cslush.scm
-share/festival/lib/cstr.scm
-share/festival/lib/darpa_phones.scm
-share/festival/lib/display.scm
-share/festival/lib/duration.scm
-share/festival/lib/email-mode.scm
-share/festival/lib/engmorph.scm
-share/festival/lib/engmorphsyn.scm
-share/festival/lib/etc/Makefile
-share/festival/lib/etc/email_filter
-share/festival/lib/etc/pkgsrc/.made
-share/festival/lib/f2bdurtreeZ.scm
-share/festival/lib/f2bf0lr.scm
-share/festival/lib/festdoc.scm
-share/festival/lib/festival.el
-share/festival/lib/festival.scm
-share/festival/lib/festtest.scm
-share/festival/lib/fringe.scm
-share/festival/lib/gswdurtreeZ.scm
-share/festival/lib/holmes_phones.scm
-share/festival/lib/hts.scm
-share/festival/lib/init.scm
-share/festival/lib/intonation.scm
-share/festival/lib/java.scm
-share/festival/lib/klatt_durs.scm
-share/festival/lib/languages.scm
-share/festival/lib/lexicons.scm
-share/festival/lib/lts.scm
-share/festival/lib/lts_build.scm
-share/festival/lib/mbrola.scm
-share/festival/lib/mettree.scm
-share/festival/lib/module_description.scm
-share/festival/lib/mrpa_allophones.scm
-share/festival/lib/mrpa_durs.scm
-share/festival/lib/mrpa_phones.scm
-share/festival/lib/multisyn/Makefile
-share/festival/lib/multisyn/multisyn.scm
-share/festival/lib/multisyn/multisyn_pauses.scm
-share/festival/lib/multisyn/radio_phones_multisyn.scm
-share/festival/lib/multisyn/send_xwaves.scm
-share/festival/lib/multisyn/target_cost.scm
-share/festival/lib/ogimarkup-mode.scm
-share/festival/lib/pauses.scm
-share/festival/lib/phoneset.scm
-share/festival/lib/phrase.scm
-share/festival/lib/pos.scm
-share/festival/lib/postlex.scm
-share/festival/lib/radio_phones.scm
-share/festival/lib/sable-latin.ent
-share/festival/lib/sable-mode.scm
-share/festival/lib/scfg.scm
-share/festival/lib/scfg_wsj_wp20.gram
-share/festival/lib/sec.B.hept.ngrambin
-share/festival/lib/sec.ts20.quad.ngrambin
-share/festival/lib/singing-mode.scm
-share/festival/lib/siod.scm
-share/festival/lib/siteinit.scm
-share/festival/lib/sitevars.scm
-share/festival/lib/soleml-mode.scm
-share/festival/lib/speech.properties
-share/festival/lib/synthesis.scm
-share/festival/lib/tilt.scm
-share/festival/lib/tobi.scm
-share/festival/lib/tobi_rules.scm
-share/festival/lib/token.scm
-share/festival/lib/tokenpos.scm
-share/festival/lib/tts.scm
-share/festival/lib/voices.scm
-share/festival/lib/web.scm
-@dirrm share/festival/lib/multisyn
-@dirrm share/festival/lib/etc/pkgsrc
-@dirrm share/festival/lib/etc
-@dirrm share/festival/lib
-@dirrm share/festival/examples/songs
-@dirrm share/festival/examples
-@dirrm share/festival
diff --git a/audio/festival/distinfo b/audio/festival/distinfo
deleted file mode 100644
index 1d3191225c4..00000000000
--- a/audio/festival/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.13 2005/12/03 04:14:05 joerg Exp $
-
-SHA1 (festival-1.95-beta.tar.gz) = 7bbf841b07a09cfe1ab17db23c2ebc12ea3d854b
-RMD160 (festival-1.95-beta.tar.gz) = 7f7cce6ab170ab1e83911ed92408576fff32cbd6
-Size (festival-1.95-beta.tar.gz) = 707573 bytes
-SHA1 (speech_tools-1.2.95-beta.tar.gz) = 5f0533a1b06c56f06e382d752b920ee62a5e8312
-RMD160 (speech_tools-1.2.95-beta.tar.gz) = 874b9e6d35bf8a59aeacd3d5b149e24e2a490008
-Size (speech_tools-1.2.95-beta.tar.gz) = 1281274 bytes
-SHA1 (patch-aa) = 016faac0fbd2291f349b3710aefdc4df736af0d8
-SHA1 (patch-ab) = 23e55253b22df5b8d2bc44b08f6757c90c1f13a8
-SHA1 (patch-ac) = c0a3fbd4e98ef941ef78c1ae800ef33a5153e8f9
-SHA1 (patch-ad) = b035df9c711d0f7ee1a31b663bc44c94bd904304
-SHA1 (patch-ae) = b957601a9038dc614fdec2a720da4b30909cab1b
diff --git a/audio/festival/files/NetBSD.mak b/audio/festival/files/NetBSD.mak
deleted file mode 100644
index 9bd20cab284..00000000000
--- a/audio/festival/files/NetBSD.mak
+++ /dev/null
@@ -1,12 +0,0 @@
-include $(EST)/config/systems/default.mak
-
-## echo -n doesn't work (well only sometimes ?)
-ECHO_N = /usr/bin/printf "%s"
-
-NAWK=awk
-
-NAS_LIB=$(PKG_PREFIX)/lib
-NAS_INCLUDE=$(PKG_PREFIX)/include
-
-X11_LIB=$(PKG_X11BASE)/lib
-X11_INCLUDE=$(PKG_X11BASE)/include
diff --git a/audio/festival/files/festival.sh b/audio/festival/files/festival.sh
deleted file mode 100644
index 6d606b8a44e..00000000000
--- a/audio/festival/files/festival.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-# path for audsp
-PATH=@PKG_PREFIX@/libexec:$PATH
-export PATH
-exec festival.naked --libdir @PKG_FESTIVAL_LOCATION@/lib $*
diff --git a/audio/festival/files/festival_client.sh b/audio/festival/files/festival_client.sh
deleted file mode 100644
index fc4ba4c944b..00000000000
--- a/audio/festival/files/festival_client.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-PATH=@PKG_PREFIX@/libexec:$PATH
-export PATH
-exec festival_client.naked @PKG_FESTIVAL_LOCATION@/lib $*
diff --git a/audio/festival/files/sitevars.scm b/audio/festival/files/sitevars.scm
deleted file mode 100644
index e80dbfa1c73..00000000000
--- a/audio/festival/files/sitevars.scm
+++ /dev/null
@@ -1,2 +0,0 @@
-(set! system-voice-path '("@PKG_FESTIVAL_LOCATION@/lib/voices"))
-(set! sgml_parse_progname "nsgmls")
diff --git a/audio/festival/files/top-Makefile b/audio/festival/files/top-Makefile
deleted file mode 100644
index ee190c4fe49..00000000000
--- a/audio/festival/files/top-Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-all:
- cd speech_tools && $(MAKE)
- cd festival && $(MAKE)
diff --git a/audio/festival/files/unknown_DragonFly.mak b/audio/festival/files/unknown_DragonFly.mak
deleted file mode 100644
index 623a1a1cfc5..00000000000
--- a/audio/festival/files/unknown_DragonFly.mak
+++ /dev/null
@@ -1,27 +0,0 @@
- ###########################################################################
- ## ##
- ## Author: Alistair Crooks (agc@netbsd.org) ##
- ## Date: Wed Oct 27 2004 ##
- ## -------------------------------------------------------------------- ##
- ## Settings for DragonFly. ##
- ## ##
- ###########################################################################
-
-include $(EST)/config/systems/default.mak
-
-## the native audio module for this type of system
-NATIVE_AUDIO_MODULE = freebsd16
-
-## echo -n doesn't work (well only sometimes ?)
-ECHO_N = /usr/bin/printf "%s"
-
-NAWK=awk
-
-# GCC_MAKE_SHARED_LIB = ld -Bshareable -x -o XXX
-
-DEFAULT_JAVA_HOME=${PREFIX}/java
-
-JAVA=$(JAVA_HOME)/bin/java
-JAVAC=$(JAVA_HOME)/bin/javac
-JAVAH=$(JAVA_HOME)/bin/javah -jni
-JAR=$(JAVA_HOME)/bin/jar cf0v
diff --git a/audio/festival/files/unknown_NetBSD.mak b/audio/festival/files/unknown_NetBSD.mak
deleted file mode 100644
index 6feac067ff9..00000000000
--- a/audio/festival/files/unknown_NetBSD.mak
+++ /dev/null
@@ -1,27 +0,0 @@
- ###########################################################################
- ## ##
- ## Author: Alistair Crooks (agc@netbsd.org) ##
- ## Date: Wed Oct 27 2004 ##
- ## -------------------------------------------------------------------- ##
- ## Settings for NetBSD. ##
- ## ##
- ###########################################################################
-
-include $(EST)/config/systems/default.mak
-
-## the native audio module for this type of system
-NATIVE_AUDIO_MODULE = NETBSD
-
-## echo -n doesn't work (well only sometimes ?)
-ECHO_N = /usr/bin/printf "%s"
-
-NAWK=awk
-
-# GCC_MAKE_SHARED_LIB = ld -Bshareable -x -o XXX
-
-DEFAULT_JAVA_HOME=${PREFIX}/java
-
-JAVA=$(JAVA_HOME)/bin/java
-JAVAC=$(JAVA_HOME)/bin/javac
-JAVAH=$(JAVA_HOME)/bin/javah -jni
-JAR=$(JAVA_HOME)/bin/jar cf0v
diff --git a/audio/festival/patches/patch-aa b/audio/festival/patches/patch-aa
deleted file mode 100644
index 816cde32fe3..00000000000
--- a/audio/festival/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/03/07 10:35:44 agc Exp $
-
---- speech_tools/config/system.sh 2005/01/10 09:00:19 1.1
-+++ speech_tools/config/system.sh 2005/01/10 09:02:26
-@@ -46,7 +46,7 @@
- sed -e '/^\([^_]*\).*/s//\1/' -e '/\//s///g'`
-
- # CPU, downcased, /s and some uninteresting details eliminated
--MACHINETYPE=`{ mach || uname -m || echo unknown ; } 2>/dev/null |
-+MACHINETYPE=`{ echo unknown ; } 2>/dev/null |
- tr ABCDEFGHIJKLMNOPQRSTUVWXYZ/ abcdefghijklmnopqrstuvwxyz_ |
- sed -e 's/i[0-9]86/ix86/' \
- -e 's/sun4/sparc/' \
-@@ -56,7 +56,7 @@
- `
-
- # OR revision, only take first two numbers.
--OSREV=`{ uname -r || echo ""; } 2> /dev/null |
-+OSREV=`{ echo ""; } 2> /dev/null |
- sed -e 's/^\([^.]*\)\(\.[^-. ]*\).*/\1\2/'`
-
- # Sort out various flavours of Linux
diff --git a/audio/festival/patches/patch-ab b/audio/festival/patches/patch-ab
deleted file mode 100644
index ac0d080b1a1..00000000000
--- a/audio/festival/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2005/03/07 10:35:44 agc Exp $
-
---- festival/config/system.sh 2005/01/10 09:08:39 1.1
-+++ festival/config/system.sh 2005/01/10 09:08:58
-@@ -46,7 +46,7 @@
- sed -e '/^\([^_]*\).*/s//\1/' -e '/\//s///g'`
-
- # CPU, downcased, /s and some uninteresting details eliminated
--MACHINETYPE=`{ mach || uname -m || echo unknown ; } 2>/dev/null |
-+MACHINETYPE=`{ echo unknown ; } 2>/dev/null |
- tr ABCDEFGHIJKLMNOPQRSTUVWXYZ/ abcdefghijklmnopqrstuvwxyz_ |
- sed -e 's/i[0-9]86/ix86/' \
- -e 's/sun4/sparc/' \
-@@ -56,7 +56,7 @@
- `
-
- # OR revision, only take first two numbers.
--OSREV=`{ uname -r || echo ""; } 2> /dev/null |
-+OSREV=`{ echo ""; } 2> /dev/null |
- sed -e 's/^\([^.]*\)\(\.[^-. ]*\).*/\1\2/'`
-
- # Sort out various flavours of Linux
diff --git a/audio/festival/patches/patch-ac b/audio/festival/patches/patch-ac
deleted file mode 100644
index 4581b324706..00000000000
--- a/audio/festival/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2005/03/07 11:32:09 agc Exp $
-
---- festival/examples/Makefile 2005/03/07 11:05:22 1.1
-+++ festival/examples/Makefile 2005/03/07 11:05:45
-@@ -55,7 +55,7 @@
- $(ALL) : % : %.sh
- rm -f $@
- @echo "#!/bin/sh" >$@
-- @echo "\"true\" ; exec "$(FESTIVAL_HOME)/bin/festival --script '$$0 $$*' >>$@
-+ @echo "\"true\" ; exec "$(PREFIX)/bin/festival --script '$$0 $$*' >>$@
- cat $< >>$@
- chmod +x $@
-
diff --git a/audio/festival/patches/patch-ad b/audio/festival/patches/patch-ad
deleted file mode 100644
index e298e3ca28b..00000000000
--- a/audio/festival/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2005/12/03 04:14:05 joerg Exp $
-
---- speech_tools/audio/voxware.cc.orig 2005-12-03 02:59:39.000000000 +0000
-+++ speech_tools/audio/voxware.cc
-@@ -66,6 +66,7 @@
- int freebsd16_supported = TRUE;
- int linux16_supported = FALSE;
- static char *aud_sys_name = "FreeBSD";
-+static int stereo_only = 0;
- #endif
-
- #ifdef SUPPORT_LINUX16
diff --git a/audio/festival/patches/patch-ae b/audio/festival/patches/patch-ae
deleted file mode 100644
index 50b24a9b557..00000000000
--- a/audio/festival/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2005/12/03 04:14:05 joerg Exp $
-
---- speech_tools/include/EST_math.h.orig 2005-12-03 03:17:51.000000000 +0000
-+++ speech_tools/include/EST_math.h
-@@ -94,6 +94,11 @@ extern "C" {
- #define isnanf(X) isnan(X)
- #endif
-
-+/* If isnan is a macro, assume it is C99 type-variadic. */
-+#if defined(__DragonFly__) && defined(isnan)
-+#define isnanf(X) isnan(X)
-+#endif
-+
- /* FreeBSD *and other 4.4 based systems require anything, isnanf is defined */
- #if defined(__FreeBSD__)
-
diff --git a/audio/festlex-cmu/DESCR b/audio/festlex-cmu/DESCR
deleted file mode 100644
index 05778099fee..00000000000
--- a/audio/festlex-cmu/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-CMU American English pronunciation dictionary for the Festival
-speech synthesis system.
diff --git a/audio/festlex-cmu/Makefile b/audio/festlex-cmu/Makefile
deleted file mode 100644
index 2cb2808c257..00000000000
--- a/audio/festlex-cmu/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2006/12/28 11:47:51 wiz Exp $
-
-DISTNAME= festlex_CMU
-PKGNAME= festlex-cmu-1.4.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
- http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.cstr.ed.ac.uk/projects/festival/
-COMMENT= CMU American English pronunciation dictionary for Festival
-
-DEPENDS+= festival>=1.4.0:../../audio/festival
-
-WRKSRC= ${WRKDIR}/festival
-NO_BUILD= yes
-
-FHOME= ${PREFIX}/share/festival
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
-
-do-install:
- ${INSTALL_DATA_DIR} ${FHOME}
- cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festlex-cmu/PLIST b/audio/festlex-cmu/PLIST
deleted file mode 100644
index 9e69c33ecfe..00000000000
--- a/audio/festlex-cmu/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/23 08:09:20 rillig Exp $
-share/festival/lib/dicts/cmu/COPYING
-share/festival/lib/dicts/cmu/Makefile
-share/festival/lib/dicts/cmu/cmu2ft
-share/festival/lib/dicts/cmu/cmu_lts_rules.scm
-share/festival/lib/dicts/cmu/cmudict-0.4.diff
-share/festival/lib/dicts/cmu/cmudict-0.4.out
-share/festival/lib/dicts/cmu/cmudict-0.4.scm
-share/festival/lib/dicts/cmu/cmudict_extensions.scm
-share/festival/lib/dicts/cmu/cmulex.scm
-@dirrm share/festival/lib/dicts/cmu
diff --git a/audio/festlex-cmu/distinfo b/audio/festlex-cmu/distinfo
deleted file mode 100644
index 121cb356c24..00000000000
--- a/audio/festlex-cmu/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:44 agc Exp $
-
-SHA1 (festlex_CMU.tar.gz) = 968f0007c4cd7d92ce0a786840b6dc64628776b7
-RMD160 (festlex_CMU.tar.gz) = 852a007b5d50ff32d098a4dbd303a4d9c63a1802
-Size (festlex_CMU.tar.gz) = 1697709 bytes
diff --git a/audio/festlex-oald/DESCR b/audio/festlex-oald/DESCR
deleted file mode 100644
index 1de4c443ae4..00000000000
--- a/audio/festlex-oald/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Modified Oxford Advanced Learner's pronunciation dictionary (British
-English), suitable for use with the Festival speech synthesis
-system.
diff --git a/audio/festlex-oald/Makefile b/audio/festlex-oald/Makefile
deleted file mode 100644
index 878d6b81b3a..00000000000
--- a/audio/festlex-oald/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2006/12/28 11:47:51 wiz Exp $
-
-DISTNAME= festlex_OALD
-PKGNAME= festlex-oald-1.4.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
- http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.cstr.ed.ac.uk/projects/festival/
-COMMENT= Oxford Advanced Learner's pronunciation dictionary for Festival
-
-DEPENDS+= festival>=1.4.0:../../audio/festival
-
-LICENSE= no-commercial-use
-
-WRKSRC= ${WRKDIR}/festival
-NO_BUILD= yes
-
-FHOME= ${PREFIX}/share/festival
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
-
-do-install:
- ${INSTALL_DATA_DIR} ${FHOME}
- cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festlex-oald/PLIST b/audio/festlex-oald/PLIST
deleted file mode 100644
index e7ac947fb28..00000000000
--- a/audio/festlex-oald/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/23 08:21:34 rillig Exp $
-share/festival/lib/dicts/oald/COPYING
-share/festival/lib/dicts/oald/Makefile
-share/festival/lib/dicts/oald/README.oald
-share/festival/lib/dicts/oald/cuvoald710-0.2.scm
-share/festival/lib/dicts/oald/oald-0.4.out
-share/festival/lib/dicts/oald/oald2ft.tar.gz
-share/festival/lib/dicts/oald/oald_extensions.scm
-share/festival/lib/dicts/oald/oald_lts_rules.scm
-share/festival/lib/dicts/oald/oaldlex.scm
-@dirrm share/festival/lib/dicts/oald
diff --git a/audio/festlex-oald/distinfo b/audio/festlex-oald/distinfo
deleted file mode 100644
index 7ba74f9fbff..00000000000
--- a/audio/festlex-oald/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:44 agc Exp $
-
-SHA1 (festlex_OALD.tar.gz) = 53c9470d62da9754db85b11c2c82a3dd6b5ddc71
-RMD160 (festlex_OALD.tar.gz) = d3fc4c549626dcc2a0d5d37fee7d8ebb3bf89c20
-Size (festlex_OALD.tar.gz) = 1472516 bytes
diff --git a/audio/festlex-ogi/DESCR b/audio/festlex-ogi/DESCR
deleted file mode 100644
index a838f30d58b..00000000000
--- a/audio/festlex-ogi/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-A composite pronunciation dictionary from ogi.edu suitable for
-use with the festival speech synthesis system.
diff --git a/audio/festlex-ogi/Makefile b/audio/festlex-ogi/Makefile
deleted file mode 100644
index bb520b407cd..00000000000
--- a/audio/festlex-ogi/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2006/12/28 11:47:51 wiz Exp $
-
-DISTNAME= OGIlexicon-2.0
-PKGNAME= festlex-ogi-2.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://cslu.cse.ogi.edu/pub/tts/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://cslu.cse.ogi.edu/tts/
-COMMENT= Composite pronunciation dictionary from ogi.edu for festival
-
-DEPENDS+= festival>=1.4.0:../../audio/festival
-DEPENDS+= festlex-poslex>=1.4.0:../../audio/festlex-poslex
-
-LICENSE= no-commercial-use
-
-WRKSRC= ${WRKDIR}/festival
-NO_BUILD= yes
-
-FHOME= ${PREFIX}/share/festival
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
-
-do-install:
- ${INSTALL_DATA_DIR} ${FHOME}
- cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festlex-ogi/PLIST b/audio/festlex-ogi/PLIST
deleted file mode 100644
index 48e7bdf4281..00000000000
--- a/audio/festlex-ogi/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:15:54 zuntum Exp $
-share/festival/lib/dicts/ogi_lex.out
-share/festival/lib/dicts/ogilex_lts_rules.scm
diff --git a/audio/festlex-ogi/distinfo b/audio/festlex-ogi/distinfo
deleted file mode 100644
index e3afd57df5e..00000000000
--- a/audio/festlex-ogi/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:44 agc Exp $
-
-SHA1 (OGIlexicon-2.0.tar.gz) = d0ef5f5e197a0e6d1ca9c28a891f0aa1fd29f747
-RMD160 (OGIlexicon-2.0.tar.gz) = 7b7be6617dbe9baf1764a613b7a83996b28622a7
-Size (OGIlexicon-2.0.tar.gz) = 1602265 bytes
diff --git a/audio/festlex-poslex/DESCR b/audio/festlex-poslex/DESCR
deleted file mode 100644
index c0ed54cdee2..00000000000
--- a/audio/festlex-poslex/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-An English lexicon suitable for use with Festival speech synthesis system.
diff --git a/audio/festlex-poslex/Makefile b/audio/festlex-poslex/Makefile
deleted file mode 100644
index c50830383eb..00000000000
--- a/audio/festlex-poslex/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2006/12/28 11:47:51 wiz Exp $
-
-DISTNAME= festlex_POSLEX
-PKGNAME= festlex-poslex-1.4.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
- http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.cstr.ed.ac.uk/projects/festival/
-COMMENT= English lexicon suitable for use with Festival
-
-DEPENDS+= festival>=1.4.0:../../audio/festival
-
-WRKSRC= ${WRKDIR}/festival
-NO_BUILD= yes
-
-FHOME= ${PREFIX}/share/festival
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
-
-do-install:
- ${INSTALL_DATA_DIR} ${FHOME}
- cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festlex-poslex/PLIST b/audio/festlex-poslex/PLIST
deleted file mode 100644
index d1e5fcf3585..00000000000
--- a/audio/festlex-poslex/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/23 08:21:34 rillig Exp $
-share/festival/lib/dicts/COPYING.poslex
-share/festival/lib/dicts/wsj.wp39.poslexR
-share/festival/lib/dicts/wsj.wp39.tri.ngrambin
diff --git a/audio/festlex-poslex/distinfo b/audio/festlex-poslex/distinfo
deleted file mode 100644
index 9697117de34..00000000000
--- a/audio/festlex-poslex/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:44 agc Exp $
-
-SHA1 (festlex_POSLEX.tar.gz) = cb7f7a3643c1af95d82144a342397cc118605f73
-RMD160 (festlex_POSLEX.tar.gz) = d52d6cf4f4300751598facf1b6ff7985a8210b09
-Size (festlex_POSLEX.tar.gz) = 242914 bytes
diff --git a/audio/festogi-spanish/DESCR b/audio/festogi-spanish/DESCR
deleted file mode 100644
index b2b09df9f66..00000000000
--- a/audio/festogi-spanish/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Festival Spanish (Mexican) language support routines (in scheme)
-from ogi.edu
-
-OGIspanish is an extension to the Festival TTS system
-(http://www.cstr.ed.ac.uk/projects/festival). This version of
-OGIspanish has been designed to work with Festival version 1.4.0
-released June 1999. It provides Mexican Spanish voices created by OGI
-staff and Alejandro Barbosa from UDLA, Puebla, Mexico.
diff --git a/audio/festogi-spanish/Makefile b/audio/festogi-spanish/Makefile
deleted file mode 100644
index a2593bc9504..00000000000
--- a/audio/festogi-spanish/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2006/12/28 11:47:51 wiz Exp $
-
-DISTNAME= OGIspanish-2.0.1
-PKGNAME= festogi-spanish-2.0.1
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://cslu.cse.ogi.edu/pub/tts/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://cslu.cse.ogi.edu/tts/
-COMMENT= Festival Spanish (Mexican) language support routines (in scheme)
-
-DEPENDS+= festival>=1.4.0:../../audio/festival
-
-LICENSE= no-commercial-use
-
-WRKSRC= ${WRKDIR}/festival
-NO_BUILD= yes
-
-FHOME= ${PREFIX}/share/festival
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
- ${RM} -r ${WRKSRC}/lib/ogi_spanish/CVS
-
-do-install:
- ${INSTALL_DATA_DIR} ${FHOME}
- cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festogi-spanish/PLIST b/audio/festogi-spanish/PLIST
deleted file mode 100644
index b286a91b3a2..00000000000
--- a/audio/festogi-spanish/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:15:56 zuntum Exp $
-share/festival/lib/ogi_spanish/ogi_span_mx_duration.scm
-share/festival/lib/ogi_spanish/ogi_span_mx_intonation.scm
-share/festival/lib/ogi_spanish/ogi_span_mx_lexicon.scm
-share/festival/lib/ogi_spanish/ogi_span_mx_lts.scm
-share/festival/lib/ogi_spanish/ogi_span_mx_phones.scm
-share/festival/lib/ogi_spanish/ogi_span_mx_phrasing.scm
-share/festival/lib/ogi_spanish/ogi_span_mx_syl.scm
-share/festival/lib/ogi_spanish/ogi_span_mx_token.scm
-@dirrm share/festival/lib/ogi_spanish
diff --git a/audio/festogi-spanish/distinfo b/audio/festogi-spanish/distinfo
deleted file mode 100644
index 3b688806b19..00000000000
--- a/audio/festogi-spanish/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:44 agc Exp $
-
-SHA1 (OGIspanish-2.0.1.tar.gz) = d5eeec91574606cf6edbb580ba53850a18f0af2c
-RMD160 (OGIspanish-2.0.1.tar.gz) = 293ab7845bbdc25b13bb4f44b807e7b60efa679e
-Size (OGIspanish-2.0.1.tar.gz) = 15783 bytes
diff --git a/audio/festvox-abc/DESCR b/audio/festvox-abc/DESCR
deleted file mode 100644
index 48282123648..00000000000
--- a/audio/festvox-abc/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Mexican Spanish male voice for the festival speech synthesis system.
-
-This voice provides a Mexican Spanish male voice using a residual
-excited LPC diphone synthesis module, both created at OGI. It uses
-a lexicon compiled from MOBY and CMU lexicons, and other trained
-modules used by CSTR voices.
-
-This voice can be activated via (voice_abc_diphone)
diff --git a/audio/festvox-abc/Makefile b/audio/festvox-abc/Makefile
deleted file mode 100644
index 8e0acf489b9..00000000000
--- a/audio/festvox-abc/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2006/12/28 11:47:51 wiz Exp $
-
-DISTNAME= voice_abc_di-2.0
-PKGNAME= festvox-abc-2.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://cslu.cse.ogi.edu/pub/tts/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://cslu.cse.ogi.edu/tts/
-COMMENT= Mexican Spanish male voice for the festival speech synthesis system
-
-DEPENDS+= festival>=1.4.0:../../audio/festival
-DEPENDS+= festlex-ogi>=2.0:../../audio/festlex-ogi
-DEPENDS+= festogi-spanish>=2.0:../../audio/festogi-spanish
-
-LICENSE= no-commercial-use
-
-WRKSRC= ${WRKDIR}/festival
-NO_BUILD= yes
-
-FHOME= ${PREFIX}/share/festival
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
- ${RM} -f ${WRKSRC}/lib/voices/spanish/abc_diphone/group/hvslpcOGI16k.group
- ${FIND} ${WRKSRC} -type d -name CVS -print | ${XARGS} ${RM} -fr
-
-do-install:
- ${INSTALL_DATA_DIR} ${FHOME}
- cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-abc/PLIST b/audio/festvox-abc/PLIST
deleted file mode 100644
index 50423edeea8..00000000000
--- a/audio/festvox-abc/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:15:58 zuntum Exp $
-share/festival/lib/voices/spanish/abc_diphone/festvox/abc_diphone.scm
-share/festival/lib/voices/spanish/abc_diphone/festvox/abcdiph.msec
-share/festival/lib/voices/spanish/abc_diphone/group/abc_di_resLPC.group
-@dirrm share/festival/lib/voices/spanish/abc_diphone/festvox
-@dirrm share/festival/lib/voices/spanish/abc_diphone/group
-@dirrm share/festival/lib/voices/spanish/abc_diphone
diff --git a/audio/festvox-abc/distinfo b/audio/festvox-abc/distinfo
deleted file mode 100644
index 246ebdff69a..00000000000
--- a/audio/festvox-abc/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:44 agc Exp $
-
-SHA1 (voice_abc_di-2.0.tar.gz) = f9a3f4ac4a1a00bd4bcf6f9c5355ba66950cc9ba
-RMD160 (voice_abc_di-2.0.tar.gz) = d7404ea96ee89ff4c51ca80ce222400ff040d203
-Size (voice_abc_di-2.0.tar.gz) = 1690367 bytes
diff --git a/audio/festvox-aec/DESCR b/audio/festvox-aec/DESCR
deleted file mode 100644
index 5fbca8bdc13..00000000000
--- a/audio/festvox-aec/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-American English male voice for the festival speech synthesis system.
-
-This voice provides an American English male voice using a residual
-excited LPC diphone synthesis module, both created at OGI. It uses
-a lexicon compiled from MOBY and CMU lexicons, and other trained
-modules used by CSTR voices.
-
-This voice can be activated via (voice_aec_diphone)
diff --git a/audio/festvox-aec/Makefile b/audio/festvox-aec/Makefile
deleted file mode 100644
index 389addc001f..00000000000
--- a/audio/festvox-aec/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2006/12/28 11:47:51 wiz Exp $
-
-DISTNAME= voice_aec_di-2.0
-PKGNAME= festvox-aec-2.0
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= ftp://cslu.cse.ogi.edu/pub/tts/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://cslu.cse.ogi.edu/tts/
-COMMENT= American English male voice for the festival speech synthesis system
-
-DEPENDS+= festival>=1.4.0:../../audio/festival
-DEPENDS+= festlex-ogi>=2.0:../../audio/festlex-ogi
-
-LICENSE= no-commercial-use
-
-DIST_SUBDIR= ${PKGNAME_NOREV}nb1
-WRKSRC= ${WRKDIR}/festival
-
-NO_BUILD= yes
-
-FHOME= ${PREFIX}/share/festival
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
- ${FIND} ${WRKSRC} -type d -name CVS -print | ${XARGS} ${RM} -fr
-
-do-install:
- ${INSTALL_DATA_DIR} ${FHOME}
- cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-aec/PLIST b/audio/festvox-aec/PLIST
deleted file mode 100644
index 842db236cda..00000000000
--- a/audio/festvox-aec/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:15:59 zuntum Exp $
-share/festival/lib/voices/english/aec_diphone/festvox/aec_diphone.scm
-share/festival/lib/voices/english/aec_diphone/festvox/aecdiph.msec
-share/festival/lib/voices/english/aec_diphone/festvox/aecgain.dat
-share/festival/lib/voices/english/aec_diphone/group/aec_di_resLPC.group
-@dirrm share/festival/lib/voices/english/aec_diphone/group
-@dirrm share/festival/lib/voices/english/aec_diphone/festvox
-@dirrm share/festival/lib/voices/english/aec_diphone
diff --git a/audio/festvox-aec/distinfo b/audio/festvox-aec/distinfo
deleted file mode 100644
index 34855ec1cb5..00000000000
--- a/audio/festvox-aec/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:44 agc Exp $
-
-SHA1 (festvox-aec-2.0nb1/voice_aec_di-2.0.tar.gz) = bc53c8cc3b22adb72f9ce720f8cc95df7df106a6
-RMD160 (festvox-aec-2.0nb1/voice_aec_di-2.0.tar.gz) = c1fcfa12c24915b566cb18e5ceba7b6c8956992a
-Size (festvox-aec-2.0nb1/voice_aec_di-2.0.tar.gz) = 5778312 bytes
diff --git a/audio/festvox-don/DESCR b/audio/festvox-don/DESCR
deleted file mode 100644
index 8aa6c40716c..00000000000
--- a/audio/festvox-don/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-British English male voice for the festival speech synthesis system.
-
-This voice uses a very small and efficient pulse-excited LPC diphone
-synthesis method. It was originally written by Steve Isard. The
-front end uses the same British English lexicon, intonation and
-duration methods as rab_diphone
-
-This voice can be activated via (voice_don_diphone)
diff --git a/audio/festvox-don/Makefile b/audio/festvox-don/Makefile
deleted file mode 100644
index d40823ecffe..00000000000
--- a/audio/festvox-don/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2006/12/28 11:47:51 wiz Exp $
-
-DISTNAME= festvox_don
-PKGNAME= festvox-don-1.4.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
- http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.cstr.ed.ac.uk/projects/festival/
-COMMENT= British English male voice for the festival speech synthesis system
-
-DEPENDS+= festival>=1.4.0:../../audio/festival
-DEPENDS+= festlex-poslex>=1.4.0:../../audio/festlex-poslex
-DEPENDS+= festlex-oald>=1.4.0:../../audio/festlex-oald
-
-WRKSRC= ${WRKDIR}/festival
-NO_BUILD= yes
-
-FHOME= ${PREFIX}/share/festival
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
-
-do-install:
- ${INSTALL_DATA_DIR} ${FHOME}
- cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-don/PLIST b/audio/festvox-don/PLIST
deleted file mode 100644
index 41fee9f84f3..00000000000
--- a/audio/festvox-don/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/23 08:21:34 rillig Exp $
-share/festival/lib/voices/english/don_diphone/COPYING
-share/festival/lib/voices/english/don_diphone/diphlocs.txt
-share/festival/lib/voices/english/don_diphone/festvox/don_diphone.scm
-share/festival/lib/voices/english/don_diphone/lpcdiphs.bin
-@dirrm share/festival/lib/voices/english/don_diphone/festvox
-@dirrm share/festival/lib/voices/english/don_diphone
diff --git a/audio/festvox-don/distinfo b/audio/festvox-don/distinfo
deleted file mode 100644
index 1c48cbf1cc1..00000000000
--- a/audio/festvox-don/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:44 agc Exp $
-
-SHA1 (festvox_don.tar.gz) = c841345bf3ad02067b38010e8a1dcb827d85c361
-RMD160 (festvox_don.tar.gz) = b601a712d893e6d6f70c1d3a3fa87903aae81917
-Size (festvox_don.tar.gz) = 645583 bytes
diff --git a/audio/festvox-el11/DESCR b/audio/festvox-el11/DESCR
deleted file mode 100644
index 9d4bc15b7ea..00000000000
--- a/audio/festvox-el11/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Castilian Spanish male voice for the festival speech synthesis system.
-
-This voice provides a Castilian Spanish male voice using a residual
-excited LPC diphone synthesis method. The lexicon is provided by
-a set of letter to sound rules producing pronunciation accents and
-syllabification. The durations, intonation and prosodic phrasing
-are minimal but are acceptable for simple examples.
-
-This voice can be activated via (voice_el_diphone)
diff --git a/audio/festvox-el11/Makefile b/audio/festvox-el11/Makefile
deleted file mode 100644
index 992b82f4ca6..00000000000
--- a/audio/festvox-el11/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2006/12/28 11:47:51 wiz Exp $
-
-DISTNAME= festvox_ellpc11k
-PKGNAME= festvox-el11-1.4.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
- http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.cstr.ed.ac.uk/projects/festival/
-COMMENT= Castilian Spanish male voice for the festival speech synthesis system
-
-DEPENDS+= festival>=1.4.1:../../audio/festival
-
-LICENSE= no-commercial-use
-
-WRKSRC= ${WRKDIR}/festival
-NO_BUILD= yes
-
-FHOME= ${PREFIX}/share/festival
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
-
-do-install:
- ${INSTALL_DATA_DIR} ${FHOME}
- cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-el11/PLIST b/audio/festvox-el11/PLIST
deleted file mode 100644
index 3a190076119..00000000000
--- a/audio/festvox-el11/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/23 08:21:34 rillig Exp $
-share/festival/lib/voices/spanish/el_diphone/COPYING
-share/festival/lib/voices/spanish/el_diphone/festvox/el_diphone.scm
-share/festival/lib/voices/spanish/el_diphone/festvox/spanint.scm
-share/festival/lib/voices/spanish/el_diphone/festvox/spanlex.scm
-share/festival/lib/voices/spanish/el_diphone/festvox/sptoken.scm
-share/festival/lib/voices/spanish/el_diphone/group/ellpc11k.group
-@dirrm share/festival/lib/voices/spanish/el_diphone/festvox
-@dirrm share/festival/lib/voices/spanish/el_diphone/group
-@dirrm share/festival/lib/voices/spanish/el_diphone
diff --git a/audio/festvox-el11/distinfo b/audio/festvox-el11/distinfo
deleted file mode 100644
index 7b5f2ba81d4..00000000000
--- a/audio/festvox-el11/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:44 agc Exp $
-
-SHA1 (festvox_ellpc11k.tar.gz) = 73ecc7b3c0a04102b1a591a2061b1b1998edbe4e
-RMD160 (festvox_ellpc11k.tar.gz) = 75c92fe845c7ded2341d8717784bf7bdc93fa966
-Size (festvox_ellpc11k.tar.gz) = 1473907 bytes
diff --git a/audio/festvox-en1/DESCR b/audio/festvox-en1/DESCR
deleted file mode 100644
index 1b594b932b8..00000000000
--- a/audio/festvox-en1/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-MBROLA based British English male voice for the festival speech
-synthesis system.
-
-This voice provides a British RP English male voice using the MBROLA
-wave synthesis method (via the MBROLA package). It uses a modified
-Oxford Advanced Learners' Dictionary for pronunciations. Prosodic
-phrasing is provided by a statistically trained model using part
-of speech and local distribution of breaks. Intonation is provided
-by a CART tree predicting ToBI accents and an F0 contour generated
-from a model trained from natural speech. The duration model is
-also trained from data using a CART tree.
-
-This voice can be activated via (voice_rab_mbrola)
diff --git a/audio/festvox-en1/Makefile b/audio/festvox-en1/Makefile
deleted file mode 100644
index 0d32ef44fc0..00000000000
--- a/audio/festvox-en1/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2006/12/28 11:47:51 wiz Exp $
-
-DISTNAME= festvox_en1
-PKGNAME= festvox-en1-1.4.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
- http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.cstr.ed.ac.uk/projects/festival/
-COMMENT= MBROLA based British English male voice for festival
-
-DEPENDS+= festival>=1.4.0:../../audio/festival
-DEPENDS+= festlex-poslex>=1.4.0:../../audio/festlex-poslex
-DEPENDS+= festlex-oald>=1.4.0:../../audio/festlex-oald
-DEPENDS+= mbrola-301hnb1:../../audio/mbrola
-DEPENDS+= mbrolavox-en1-980910nb1:../../audio/mbrolavox-en1
-
-LICENSE= no-commercial-use
-
-WRKSRC= ${WRKDIR}/festival
-NO_BUILD= yes
-
-FHOME= ${PREFIX}/share/festival
-MBROLA= ${FHOME}/lib/voices/english/en1_mbrola
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
-
-do-install:
- cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
-#ugh
- ${LN} -fs ../../../../../mbrola/voices/en1 ${MBROLA}
- ${LN} -fs ../../../../../mbrola/voices/en1/en1mrpa ${MBROLA}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-en1/PLIST b/audio/festvox-en1/PLIST
deleted file mode 100644
index 2608d9cba50..00000000000
--- a/audio/festvox-en1/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/23 08:21:35 rillig Exp $
-@comment the next two entries are symlinks
-share/festival/lib/voices/english/en1_mbrola/en1
-share/festival/lib/voices/english/en1_mbrola/en1mrpa
-share/festival/lib/voices/english/en1_mbrola/festvox/en1_mbrola.scm
-@dirrm share/festival/lib/voices/english/en1_mbrola/festvox
-@dirrm share/festival/lib/voices/english/en1_mbrola
diff --git a/audio/festvox-en1/distinfo b/audio/festvox-en1/distinfo
deleted file mode 100644
index 1837eb76d25..00000000000
--- a/audio/festvox-en1/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:45 agc Exp $
-
-SHA1 (festvox_en1.tar.gz) = 92d3e06ced67de02b5aa18f111c33b7874376050
-RMD160 (festvox_en1.tar.gz) = 48edf2ad55774712754af341f73ced53aa1d963e
-Size (festvox_en1.tar.gz) = 3323 bytes
diff --git a/audio/festvox-hvs/DESCR b/audio/festvox-hvs/DESCR
deleted file mode 100644
index 0ef827755ea..00000000000
--- a/audio/festvox-hvs/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Mexican Spanish female voice for the festival speech synthesis system.
-
-This voice provides an Mexican Spanish female voice using a residual
-excited LPC diphone synthesis module, both created at OGI. It uses
-a lexicon compiled from MOBY and CMU lexicons, and other trained
-modules used by CSTR voices.
-
-This voice can be activated via (voice_hvs_diphone)
diff --git a/audio/festvox-hvs/Makefile b/audio/festvox-hvs/Makefile
deleted file mode 100644
index 57872e564e4..00000000000
--- a/audio/festvox-hvs/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2006/12/28 11:47:51 wiz Exp $
-
-DISTNAME= voice_hvs_di-2.0
-PKGNAME= festvox-hvs-2.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://cslu.cse.ogi.edu/pub/tts/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://cslu.cse.ogi.edu/tts/
-COMMENT= Mexican Spanish female voice for the festival
-
-DEPENDS+= festival>=1.4.0:../../audio/festival
-DEPENDS+= festlex-ogi>=2.0:../../audio/festlex-ogi
-DEPENDS+= festogi-spanish>=2.0:../../audio/festogi-spanish
-
-LICENSE= no-commercial-use
-
-WRKSRC= ${WRKDIR}/festival
-NO_BUILD= yes
-
-FHOME= ${PREFIX}/share/festival
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
- ${FIND} ${WRKSRC} -type d -name CVS -print | ${XARGS} ${RM} -fr
-
-do-install:
- ${INSTALL_DATA_DIR} ${FHOME}
- cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-hvs/PLIST b/audio/festvox-hvs/PLIST
deleted file mode 100644
index 38be19c0ea4..00000000000
--- a/audio/festvox-hvs/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/23 08:21:35 rillig Exp $
-share/festival/lib/voices/spanish/hvs_diphone/festvox/hvs_diphone.scm
-share/festival/lib/voices/spanish/hvs_diphone/festvox/hvsdiph.msec
-share/festival/lib/voices/spanish/hvs_diphone/group/hvs_di_resLPC.group
-@dirrm share/festival/lib/voices/spanish/hvs_diphone/festvox
-@dirrm share/festival/lib/voices/spanish/hvs_diphone/group
-@dirrm share/festival/lib/voices/spanish/hvs_diphone
diff --git a/audio/festvox-hvs/distinfo b/audio/festvox-hvs/distinfo
deleted file mode 100644
index 13e8cbb596d..00000000000
--- a/audio/festvox-hvs/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:45 agc Exp $
-
-SHA1 (voice_hvs_di-2.0.tar.gz) = cdeaa997340918580432ae1a6ed1dddcb63a4f21
-RMD160 (voice_hvs_di-2.0.tar.gz) = 76c3a1c4be57375a80a2fccc75aba8ebb087e12f
-Size (voice_hvs_di-2.0.tar.gz) = 2325321 bytes
diff --git a/audio/festvox-jph/DESCR b/audio/festvox-jph/DESCR
deleted file mode 100644
index 7d4e2ea29d6..00000000000
--- a/audio/festvox-jph/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-American English male voice for the festival speech synthesis system.
-
-This voice provides an American English male voice using a residual
-excited LPC diphone synthesis module, both created at OGI. It uses
-a lexicon compiled from MOBY and CMU lexicons, and other trained
-modules used by CSTR voices.
-
-This voice can be activated via (voice_jph_diphone)
diff --git a/audio/festvox-jph/Makefile b/audio/festvox-jph/Makefile
deleted file mode 100644
index 13f5e254f9a..00000000000
--- a/audio/festvox-jph/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2006/12/28 11:47:51 wiz Exp $
-
-DISTNAME= voice_jph_di-2.0
-PKGNAME= festvox-jph-2.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://cslu.cse.ogi.edu/pub/tts/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://cslu.cse.ogi.edu/tts/
-COMMENT= American English male voice for the festival speech synthesis system
-
-DEPENDS+= festival>=1.4.0:../../audio/festival
-DEPENDS+= festlex-ogi>=2.0:../../audio/festlex-ogi
-
-LICENSE= no-commercial-use
-
-WRKSRC= ${WRKDIR}/festival
-NO_BUILD= yes
-
-FHOME= ${PREFIX}/share/festival
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
- ${FIND} ${WRKSRC} -type d -name CVS -print | ${XARGS} ${RM} -fr
-
-do-install:
- ${INSTALL_DATA_DIR} ${FHOME}
- cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-jph/PLIST b/audio/festvox-jph/PLIST
deleted file mode 100644
index 178baffb1ac..00000000000
--- a/audio/festvox-jph/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:16:07 zuntum Exp $
-share/festival/lib/voices/english/jph_diphone/festvox/jph_diphone.scm
-share/festival/lib/voices/english/jph_diphone/festvox/jphdiph.msec
-share/festival/lib/voices/english/jph_diphone/festvox/jphgain.dat
-share/festival/lib/voices/english/jph_diphone/group/jph_di_resLPC.group
-@dirrm share/festival/lib/voices/english/jph_diphone/group
-@dirrm share/festival/lib/voices/english/jph_diphone/festvox
-@dirrm share/festival/lib/voices/english/jph_diphone
diff --git a/audio/festvox-jph/distinfo b/audio/festvox-jph/distinfo
deleted file mode 100644
index 62722cef6fc..00000000000
--- a/audio/festvox-jph/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:45 agc Exp $
-
-SHA1 (voice_jph_di-2.0.tar.gz) = 19f397de2dfe714bd1d1b155e7edce8327c76c3c
-RMD160 (voice_jph_di-2.0.tar.gz) = e11a83c7d6b714dc7169b0ed3d1d6eb701a399b7
-Size (voice_jph_di-2.0.tar.gz) = 5694766 bytes
diff --git a/audio/festvox-kal16/DESCR b/audio/festvox-kal16/DESCR
deleted file mode 100644
index d4e4e828f9e..00000000000
--- a/audio/festvox-kal16/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-16khz American English male voice for the festival speech synthesis system.
-
-This voice provides an American English male voice using a residual
-excited LPC diphone synthesis method. It uses the CMU Lexicon
-pronunciations. Prosodic phrasing is provided by a statistically
-trained model using part of speech and local distribution of breaks.
-Intonation is provided by a CART tree predicting ToBI accents and
-an F0 contour generated from a model trained from natural speech.
-The duration model is also trained from data using a CART tree.
-
-This voice can be activated via (voice_kal_diphone)
diff --git a/audio/festvox-kal16/Makefile b/audio/festvox-kal16/Makefile
deleted file mode 100644
index 622f415d988..00000000000
--- a/audio/festvox-kal16/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2006/12/28 11:47:52 wiz Exp $
-
-DISTNAME= festvox_kallpc16k
-PKGNAME= festvox-kal16-1.4.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
- http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.cstr.ed.ac.uk/projects/festival/
-COMMENT= 16khz American English male voice for festival
-
-DEPENDS+= festival>=1.4.0:../../audio/festival
-DEPENDS+= festlex-poslex>=1.4.0:../../audio/festlex-poslex
-DEPENDS+= festlex-cmu>=1.4.0:../../audio/festlex-cmu
-
-CONFLICTS= festvox-kal8-[0-9]*
-
-WRKSRC= ${WRKDIR}/festival
-NO_BUILD= yes
-
-FHOME= ${PREFIX}/share/festival
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
-
-do-install:
- ${INSTALL_DATA_DIR} ${FHOME}
- cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-kal16/PLIST b/audio/festvox-kal16/PLIST
deleted file mode 100644
index b7431ae343d..00000000000
--- a/audio/festvox-kal16/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/23 08:21:35 rillig Exp $
-share/festival/lib/voices/english/kal_diphone/COPYING
-share/festival/lib/voices/english/kal_diphone/festvox/kal_diphone.scm
-share/festival/lib/voices/english/kal_diphone/festvox/kaldurtreeZ.scm
-share/festival/lib/voices/english/kal_diphone/group/kallpc16k.group
-@dirrm share/festival/lib/voices/english/kal_diphone/festvox
-@dirrm share/festival/lib/voices/english/kal_diphone/group
-@dirrm share/festival/lib/voices/english/kal_diphone
diff --git a/audio/festvox-kal16/distinfo b/audio/festvox-kal16/distinfo
deleted file mode 100644
index 238e6ca9108..00000000000
--- a/audio/festvox-kal16/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:45 agc Exp $
-
-SHA1 (festvox_kallpc16k.tar.gz) = ad18502ae0fd10bdc3db189fa9afa8a167eceebb
-RMD160 (festvox_kallpc16k.tar.gz) = f8be814267359ac9d4fa5d0bcade18e15b64beb2
-Size (festvox_kallpc16k.tar.gz) = 4104056 bytes
diff --git a/audio/festvox-kal8/DESCR b/audio/festvox-kal8/DESCR
deleted file mode 100644
index 813fff920f4..00000000000
--- a/audio/festvox-kal8/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-8khz American English male voice for the festival speech synthesis system.
-
-This voice provides an American English male voice using a residual
-excited LPC diphone synthesis method. It uses the CMU Lexicon
-pronunciations. Prosodic phrasing is provided by a statistically
-trained model using part of speech and local distribution of breaks.
-Intonation is provided by a CART tree predicting ToBI accents and
-an F0 contour generated from a model trained from natural speech.
-The duration model is also trained from data using a CART tree.
-
-This voice can be activated via (voice_kal_diphone)
diff --git a/audio/festvox-kal8/Makefile b/audio/festvox-kal8/Makefile
deleted file mode 100644
index 081a5f03001..00000000000
--- a/audio/festvox-kal8/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.23 2006/12/28 11:47:52 wiz Exp $
-
-DISTNAME= festvox_kallpc8k
-PKGNAME= festvox-kal8-1.4.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
- http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.cstr.ed.ac.uk/projects/festival/
-COMMENT= 8khz American English male voice for festival
-
-DEPENDS+= festival>=1.4.0:../../audio/festival
-DEPENDS+= festlex-poslex>=1.4.0:../../audio/festlex-poslex
-DEPENDS+= festlex-cmu>=1.4.0:../../audio/festlex-cmu
-
-CONFLICTS= festvox-kal16-[0-9]*
-
-WRKSRC= ${WRKDIR}/festival
-NO_BUILD= yes
-
-FHOME= ${PREFIX}/share/festival
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
-
-do-install:
- ${INSTALL_DATA_DIR} ${FHOME}
- cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-kal8/PLIST b/audio/festvox-kal8/PLIST
deleted file mode 100644
index c4bcfffa27e..00000000000
--- a/audio/festvox-kal8/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/23 08:21:35 rillig Exp $
-share/festival/lib/voices/english/kal_diphone/COPYING
-share/festival/lib/voices/english/kal_diphone/festvox/kal_diphone.scm
-share/festival/lib/voices/english/kal_diphone/festvox/kaldurtreeZ.scm
-share/festival/lib/voices/english/kal_diphone/group/kallpc8k.group
-@dirrm share/festival/lib/voices/english/kal_diphone/festvox
-@dirrm share/festival/lib/voices/english/kal_diphone/group
-@dirrm share/festival/lib/voices/english/kal_diphone
diff --git a/audio/festvox-kal8/distinfo b/audio/festvox-kal8/distinfo
deleted file mode 100644
index bf7609036a4..00000000000
--- a/audio/festvox-kal8/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:45 agc Exp $
-
-SHA1 (festvox_kallpc8k.tar.gz) = 4005942b90c981ce8b28649f7e54fc9cb7b505ff
-RMD160 (festvox_kallpc8k.tar.gz) = 7346b0a0ab78fbe2ee89c3ee21b09c3f3ddbeaae
-Size (festvox_kallpc8k.tar.gz) = 2362746 bytes
diff --git a/audio/festvox-ked16/DESCR b/audio/festvox-ked16/DESCR
deleted file mode 100644
index afdfa0c3dd7..00000000000
--- a/audio/festvox-ked16/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-16khz American English male voice for the festival speech synthesis system.
-
-This voice provides an American English male voice using a residual
-excited LPC diphone synthesis method. It uses the CMU Lexicon
-pronunciations. Prosodic phrasing is provided by a statistically
-trained model using part of speech and local distribution of breaks.
-Intonation is provided by a CART tree predicting ToBI accents and
-an F0 contour generated from a model trained from natural speech.
-The duration model is also trained from data using a CART tree.
-
-This voice can be activated via (voice_ked_diphone)
diff --git a/audio/festvox-ked16/Makefile b/audio/festvox-ked16/Makefile
deleted file mode 100644
index b6c79033f6b..00000000000
--- a/audio/festvox-ked16/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2006/12/28 11:47:52 wiz Exp $
-
-DISTNAME= festvox_kedlpc16k
-PKGNAME= festvox-ked16-1.4.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
- http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.cstr.ed.ac.uk/projects/festival/
-COMMENT= 16khz American English male voice for festival
-
-DEPENDS+= festival>=1.4.0:../../audio/festival
-DEPENDS+= festlex-poslex>=1.4.0:../../audio/festlex-poslex
-DEPENDS+= festlex-cmu>=1.4.0:../../audio/festlex-cmu
-
-CONFLICTS= festvox-ked8-[0-9]*
-
-WRKSRC= ${WRKDIR}/festival
-NO_BUILD= yes
-
-FHOME= ${PREFIX}/share/festival
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
-
-do-install:
- ${INSTALL_DATA_DIR} ${FHOME}
- cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-ked16/PLIST b/audio/festvox-ked16/PLIST
deleted file mode 100644
index 948cce5809c..00000000000
--- a/audio/festvox-ked16/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/23 08:21:35 rillig Exp $
-share/festival/lib/voices/english/ked_diphone/COPYING
-share/festival/lib/voices/english/ked_diphone/festvox/kddurtreeZ.scm
-share/festival/lib/voices/english/ked_diphone/festvox/ked_diphone.scm
-share/festival/lib/voices/english/ked_diphone/group/kedlpc16k.group
-@dirrm share/festival/lib/voices/english/ked_diphone/festvox
-@dirrm share/festival/lib/voices/english/ked_diphone/group
-@dirrm share/festival/lib/voices/english/ked_diphone
diff --git a/audio/festvox-ked16/distinfo b/audio/festvox-ked16/distinfo
deleted file mode 100644
index e625dc91761..00000000000
--- a/audio/festvox-ked16/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:45 agc Exp $
-
-SHA1 (festvox_kedlpc16k.tar.gz) = 777e58d25fd499530601c514650328267fb716fb
-RMD160 (festvox_kedlpc16k.tar.gz) = 63480c4ed695c86fc8de0f3a0740196debc710ae
-Size (festvox_kedlpc16k.tar.gz) = 4221528 bytes
diff --git a/audio/festvox-ked8/DESCR b/audio/festvox-ked8/DESCR
deleted file mode 100644
index 73a8c7e7df4..00000000000
--- a/audio/festvox-ked8/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-8khz American English male voice for the festival speech synthesis system.
-
-This voice provides an American English male voice using a residual
-excited LPC diphone synthesis method. It uses the CMU Lexicon
-pronunciations. Prosodic phrasing is provided by a statistically
-trained model using part of speech and local distribution of breaks.
-Intonation is provided by a CART tree predicting ToBI accents and
-an F0 contour generated from a model trained from natural speech.
-The duration model is also trained from data using a CART tree.
-
-This voice can be activated via (voice_ked_diphone)
diff --git a/audio/festvox-ked8/Makefile b/audio/festvox-ked8/Makefile
deleted file mode 100644
index 41119bf8776..00000000000
--- a/audio/festvox-ked8/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.23 2006/12/28 11:47:52 wiz Exp $
-
-DISTNAME= festvox_kedlpc8k
-PKGNAME= festvox-ked8-1.4.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
- http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.cstr.ed.ac.uk/projects/festival/
-COMMENT= 8khz American English male voice for festival
-
-DEPENDS+= festival>=1.4.0:../../audio/festival
-DEPENDS+= festlex-poslex>=1.4.0:../../audio/festlex-poslex
-DEPENDS+= festlex-cmu>=1.4.0:../../audio/festlex-cmu
-
-CONFLICTS= festvox-ked16-[0-9]*
-
-WRKSRC= ${WRKDIR}/festival
-NO_BUILD= yes
-
-FHOME= ${PREFIX}/share/festival
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
-
-do-install:
- ${INSTALL_DATA_DIR} ${FHOME}
- cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-ked8/PLIST b/audio/festvox-ked8/PLIST
deleted file mode 100644
index ffab786cd3a..00000000000
--- a/audio/festvox-ked8/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/23 08:21:35 rillig Exp $
-share/festival/lib/voices/english/ked_diphone/COPYING
-share/festival/lib/voices/english/ked_diphone/festvox/kddurtreeZ.scm
-share/festival/lib/voices/english/ked_diphone/festvox/ked_diphone.scm
-share/festival/lib/voices/english/ked_diphone/group/kedlpc8k.group
-@dirrm share/festival/lib/voices/english/ked_diphone/festvox
-@dirrm share/festival/lib/voices/english/ked_diphone/group
-@dirrm share/festival/lib/voices/english/ked_diphone
diff --git a/audio/festvox-ked8/distinfo b/audio/festvox-ked8/distinfo
deleted file mode 100644
index aeb30ede281..00000000000
--- a/audio/festvox-ked8/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:45 agc Exp $
-
-SHA1 (festvox_kedlpc8k.tar.gz) = 5e48ab05f93da24f201023c2be67180307d06783
-RMD160 (festvox_kedlpc8k.tar.gz) = 91a6ed7516c092645fe64205491e0f9ddf6ac507
-Size (festvox_kedlpc8k.tar.gz) = 2318524 bytes
diff --git a/audio/festvox-mwm/DESCR b/audio/festvox-mwm/DESCR
deleted file mode 100644
index dc155d80767..00000000000
--- a/audio/festvox-mwm/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-American English male voice for the festival speech synthesis system.
-
-This voice provides an American English male voice using a residual
-excited LPC diphone synthesis module, both created at OGI. It uses
-a lexicon compiled from MOBY and CMU lexicons, and other trained
-modules used by CSTR voices.
-
-This voice can be activated via (voice_mwm_diphone)
diff --git a/audio/festvox-mwm/Makefile b/audio/festvox-mwm/Makefile
deleted file mode 100644
index ccbacc7a8ae..00000000000
--- a/audio/festvox-mwm/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2006/12/28 11:47:52 wiz Exp $
-
-DISTNAME= voice_mwm_di-2.0
-PKGNAME= festvox-mwm-2.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://cslu.cse.ogi.edu/pub/tts/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://cslu.cse.ogi.edu/tts/
-COMMENT= American English male voice for the festival speech synthesis system
-
-DEPENDS+= festival>=1.4.0:../../audio/festival
-DEPENDS+= festlex-ogi>=2.0:../../audio/festlex-ogi
-
-LICENSE= no-commercial-use
-
-WRKSRC= ${WRKDIR}/festival
-NO_BUILD= yes
-
-FHOME= ${PREFIX}/share/festival
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
- ${FIND} ${WRKSRC} -type d -name CVS -print | ${XARGS} ${RM} -fr
-
-do-install:
- ${INSTALL_DATA_DIR} ${FHOME}
- cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-mwm/PLIST b/audio/festvox-mwm/PLIST
deleted file mode 100644
index bff36ee3e4e..00000000000
--- a/audio/festvox-mwm/PLIST
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/23 08:21:35 rillig Exp $
-share/festival/lib/voices/english/mwm_diphone/dic/mwmdemi.ms
-share/festival/lib/voices/english/mwm_diphone/dic/mwmdiph.ms
-share/festival/lib/voices/english/mwm_diphone/dic/mwmgain.dat
-share/festival/lib/voices/english/mwm_diphone/festvox/mwm_diphone.scm
-share/festival/lib/voices/english/mwm_diphone/festvox/mwmdiph.ms
-share/festival/lib/voices/english/mwm_diphone/festvox/mwmgain.dat
-share/festival/lib/voices/english/mwm_diphone/group/mwm_di_resLPC.group
-@dirrm share/festival/lib/voices/english/mwm_diphone/dic
-@dirrm share/festival/lib/voices/english/mwm_diphone/festvox
-@dirrm share/festival/lib/voices/english/mwm_diphone/group
-@dirrm share/festival/lib/voices/english/mwm_diphone/work
-@dirrm share/festival/lib/voices/english/mwm_diphone
diff --git a/audio/festvox-mwm/distinfo b/audio/festvox-mwm/distinfo
deleted file mode 100644
index 7d9b856b1f6..00000000000
--- a/audio/festvox-mwm/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:45 agc Exp $
-
-SHA1 (voice_mwm_di-2.0.tar.gz) = abd273149ca8437f80f9eacc7ba48956c197f8ea
-RMD160 (voice_mwm_di-2.0.tar.gz) = bcc453fca534333dcc15ad016848542b48791195
-Size (voice_mwm_di-2.0.tar.gz) = 5032801 bytes
diff --git a/audio/festvox-ogirab/DESCR b/audio/festvox-ogirab/DESCR
deleted file mode 100644
index 3072a6b24bd..00000000000
--- a/audio/festvox-ogirab/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-British English male voice for the festival speech synthesis system.
-
-This voice provides a British English male voice using a residual
-excited LPC diphone synthesis module, both created at OGI. It uses
-a lexicon compiled from MOBY and CMU lexicons, and other trained
-modules used by CSTR voices.
-
-This voice can be activated via (voice_ogirab_diphone)
diff --git a/audio/festvox-ogirab/Makefile b/audio/festvox-ogirab/Makefile
deleted file mode 100644
index eda961dfac5..00000000000
--- a/audio/festvox-ogirab/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2006/12/28 11:47:52 wiz Exp $
-
-DISTNAME= voice_ogirab_di-2.0
-PKGNAME= festvox-ogirab-2.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://cslu.cse.ogi.edu/pub/tts/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://cslu.cse.ogi.edu/tts/
-COMMENT= British English male voice for the festival speech synthesis system
-
-DEPENDS+= festival>=1.4.0:../../audio/festival
-DEPENDS+= festlex-ogi>=2.0:../../audio/festlex-ogi
-
-LICENSE= no-commercial-use
-
-WRKSRC= ${WRKDIR}/festival
-NO_BUILD= yes
-
-FHOME= ${PREFIX}/share/festival
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
- ${FIND} ${WRKSRC} -type d -name CVS -print | ${XARGS} ${RM} -fr
-
-do-install:
- ${INSTALL_DATA_DIR} ${FHOME}
- cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-ogirab/PLIST b/audio/festvox-ogirab/PLIST
deleted file mode 100644
index cc3c880964b..00000000000
--- a/audio/festvox-ogirab/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:16:16 zuntum Exp $
-share/festival/lib/voices/english/ogirab_diphone/festvox/ogirab_diphone.scm
-share/festival/lib/voices/english/ogirab_diphone/festvox/rabdiph.msec
-share/festival/lib/voices/english/ogirab_diphone/festvox/rabgain.dat
-share/festival/lib/voices/english/ogirab_diphone/group/ogirab_di_resLPC.group
-@dirrm share/festival/lib/voices/english/ogirab_diphone/group
-@dirrm share/festival/lib/voices/english/ogirab_diphone/festvox
-@dirrm share/festival/lib/voices/english/ogirab_diphone
diff --git a/audio/festvox-ogirab/distinfo b/audio/festvox-ogirab/distinfo
deleted file mode 100644
index cee0d4b6b0a..00000000000
--- a/audio/festvox-ogirab/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:45 agc Exp $
-
-SHA1 (voice_ogirab_di-2.0.tar.gz) = 1777a144d3dff405ac4cd1331ac836c6ddbc556c
-RMD160 (voice_ogirab_di-2.0.tar.gz) = 2b94bd98663598230de50fdade85e56a8bb98af3
-Size (voice_ogirab_di-2.0.tar.gz) = 4496890 bytes
diff --git a/audio/festvox-rab16/DESCR b/audio/festvox-rab16/DESCR
deleted file mode 100644
index ba30d61bf5b..00000000000
--- a/audio/festvox-rab16/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-16khz British English male voice for the festival speech synthesis system.
-
-This voice provides a British English male voice using a residual
-excited LPC diphone synthesis method. It uses the CMU Lexicon
-pronunciations. Prosodic phrasing is provided by a statistically
-trained model using part of speech and local distribution of breaks.
-Intonation is provided by a CART tree predicting ToBI accents and
-an F0 contour generated from a model trained from natural speech.
-The duration model is also trained from data using a CART tree.
-
-This voice can be activated via (voice_rab_diphone)
diff --git a/audio/festvox-rab16/Makefile b/audio/festvox-rab16/Makefile
deleted file mode 100644
index c2fb50c3847..00000000000
--- a/audio/festvox-rab16/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2006/12/28 11:47:52 wiz Exp $
-
-DISTNAME= festvox_rablpc16k
-PKGNAME= festvox-rab16-1.4.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
- http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.cstr.ed.ac.uk/projects/festival/
-COMMENT= 16khz British English male voice for festival
-
-DEPENDS+= festival>=1.4.0:../../audio/festival
-DEPENDS+= festlex-poslex>=1.4.0:../../audio/festlex-poslex
-DEPENDS+= festlex-oald>=1.4.0:../../audio/festlex-oald
-
-CONFLICTS= festvox-rab8-[0-9]*
-
-WRKSRC= ${WRKDIR}/festival
-NO_BUILD= yes
-
-FHOME= ${PREFIX}/share/festival
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
-
-do-install:
- ${INSTALL_DATA_DIR} ${FHOME}
- cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-rab16/PLIST b/audio/festvox-rab16/PLIST
deleted file mode 100644
index 58c2f347f24..00000000000
--- a/audio/festvox-rab16/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:16:18 zuntum Exp $
-share/festival/lib/voices/english/rab_diphone/COPYING
-share/festival/lib/voices/english/rab_diphone/group/rablpc16k.group
-@dirrm share/festival/lib/voices/english/rab_diphone/group
-share/festival/lib/voices/english/rab_diphone/festvox/rab_diphone.scm
-@dirrm share/festival/lib/voices/english/rab_diphone/festvox
-@dirrm share/festival/lib/voices/english/rab_diphone
diff --git a/audio/festvox-rab16/distinfo b/audio/festvox-rab16/distinfo
deleted file mode 100644
index 2c1d5da7e54..00000000000
--- a/audio/festvox-rab16/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:45 agc Exp $
-
-SHA1 (festvox_rablpc16k.tar.gz) = 164983d46df6a09b07a5550f4613047f94b1764a
-RMD160 (festvox_rablpc16k.tar.gz) = d98cc1df3e922fe9894cf51e5913f8bfd0b99889
-Size (festvox_rablpc16k.tar.gz) = 5369001 bytes
diff --git a/audio/festvox-rab8/DESCR b/audio/festvox-rab8/DESCR
deleted file mode 100644
index 1d38f66fe28..00000000000
--- a/audio/festvox-rab8/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-8khz British English male voice for the festival speech synthesis system.
-
-This voice provides a British English male voice using a residual
-excited LPC diphone synthesis method. It uses the CMU Lexicon
-pronunciations. Prosodic phrasing is provided by a statistically
-trained model using part of speech and local distribution of breaks.
-Intonation is provided by a CART tree predicting ToBI accents and
-an F0 contour generated from a model trained from natural speech.
-The duration model is also trained from data using a CART tree.
-
-This voice can be activated via (voice_rab_diphone)
diff --git a/audio/festvox-rab8/Makefile b/audio/festvox-rab8/Makefile
deleted file mode 100644
index cc3fd87accd..00000000000
--- a/audio/festvox-rab8/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.23 2006/12/28 11:47:52 wiz Exp $
-
-DISTNAME= festvox_rablpc8k
-PKGNAME= festvox-rab8-1.4.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
- http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.cstr.ed.ac.uk/projects/festival/
-COMMENT= 6khz British English male voice for the festival
-
-DEPENDS+= festival>=1.4.0:../../audio/festival
-DEPENDS+= festlex-poslex>=1.4.0:../../audio/festlex-poslex
-DEPENDS+= festlex-oald>=1.4.0:../../audio/festlex-oald
-
-CONFLICTS= festvox-rab16-[0-9]*
-
-WRKSRC= ${WRKDIR}/festival
-NO_BUILD= yes
-
-FHOME= ${PREFIX}/share/festival
-
-post-extract:
- @ ${CHMOD} -R a+r ${WRKSRC}
- @ ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
-
-do-install:
- ${INSTALL_DATA_DIR} ${FHOME}
- cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-rab8/PLIST b/audio/festvox-rab8/PLIST
deleted file mode 100644
index 6310f0aed38..00000000000
--- a/audio/festvox-rab8/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:16:20 zuntum Exp $
-share/festival/lib/voices/english/rab_diphone/group/rablpc8k.group
-share/festival/lib/voices/english/rab_diphone/festvox/rab_diphone.scm
-share/festival/lib/voices/english/rab_diphone/COPYING
-@dirrm share/festival/lib/voices/english/rab_diphone/group
-@dirrm share/festival/lib/voices/english/rab_diphone/festvox
-@dirrm share/festival/lib/voices/english/rab_diphone
diff --git a/audio/festvox-rab8/distinfo b/audio/festvox-rab8/distinfo
deleted file mode 100644
index f36d64a1f8e..00000000000
--- a/audio/festvox-rab8/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:45 agc Exp $
-
-SHA1 (festvox_rablpc8k.tar.gz) = 6a0f27e0a40e70994b5ee308eda336545fffcd1b
-RMD160 (festvox_rablpc8k.tar.gz) = 399d1388de0d2e48ea60618f50792f266fa19d58
-Size (festvox_rablpc8k.tar.gz) = 3117763 bytes
diff --git a/audio/festvox-tll/DESCR b/audio/festvox-tll/DESCR
deleted file mode 100644
index 6c254474221..00000000000
--- a/audio/festvox-tll/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-American English female voice for the festival speech synthesis system.
-
-This voice provides an American English female voice using a residual
-excited LPC diphone synthesis module, both created at OGI. It uses
-a lexicon compiled from MOBY and CMU lexicons, and other trained
-modules used by CSTR voices.
-
-This voice can be activated via (voice_tll_diphone)
diff --git a/audio/festvox-tll/Makefile b/audio/festvox-tll/Makefile
deleted file mode 100644
index 425b53b070e..00000000000
--- a/audio/festvox-tll/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2006/12/28 11:47:52 wiz Exp $
-
-DISTNAME= voice_tll_di-2.0
-PKGNAME= festvox-tll-2.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://cslu.cse.ogi.edu/pub/tts/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://cslu.cse.ogi.edu/tts/
-COMMENT= American English female voice for the festival speech synthesis system
-
-DEPENDS+= festival>=1.4.0:../../audio/festival
-DEPENDS+= festlex-ogi>=2.0:../../audio/festlex-ogi
-
-LICENSE= no-commercial-use
-
-WRKSRC= ${WRKDIR}/festival
-NO_BUILD= yes
-
-FHOME= ${PREFIX}/share/festival
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
- ${FIND} ${WRKSRC} -type d -name CVS -print | ${XARGS} ${RM} -fr
-
-do-install:
- ${INSTALL_DATA_DIR} ${FHOME}
- cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-tll/PLIST b/audio/festvox-tll/PLIST
deleted file mode 100644
index 36fa37bdb25..00000000000
--- a/audio/festvox-tll/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:16:21 zuntum Exp $
-share/festival/lib/voices/english/tll_diphone/group/tll_di_resLPC.group
-share/festival/lib/voices/english/tll_diphone/festvox/tll_diphone.scm
-share/festival/lib/voices/english/tll_diphone/festvox/tlldiph.msec
-share/festival/lib/voices/english/tll_diphone/festvox/tllgain.dat
-@dirrm share/festival/lib/voices/english/tll_diphone/group
-@dirrm share/festival/lib/voices/english/tll_diphone/festvox
-@dirrm share/festival/lib/voices/english/tll_diphone
diff --git a/audio/festvox-tll/distinfo b/audio/festvox-tll/distinfo
deleted file mode 100644
index da54b984633..00000000000
--- a/audio/festvox-tll/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:45 agc Exp $
-
-SHA1 (voice_tll_di-2.0.tar.gz) = 3b253b89088e95608a50a9986d0fe086dce0fe99
-RMD160 (voice_tll_di-2.0.tar.gz) = 7912b96535df5d25fd6a1f325c89912e3799f2bf
-Size (voice_tll_di-2.0.tar.gz) = 4740378 bytes
diff --git a/audio/festvox-us1/DESCR b/audio/festvox-us1/DESCR
deleted file mode 100644
index 8c0749a999b..00000000000
--- a/audio/festvox-us1/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-MBROLA based American English female voice for the festival speech
-synthesis system.
-
-This voice provides a American English female voice using the MBROLA
-synthesis method. It uses a modified CMU lexicon for pronunciations.
-Prosodic phrasing is provided by a statistically trained model using
-part of speech and local distribution of breaks. Intonation is
-provided by a CART tree predicting ToBI accents and an F0 contour
-generated from a model trained from natural speech. The duration
-model is also trained from data using a CART tree.
-
-This voice can be activated via (voice_us1_mbrola)
diff --git a/audio/festvox-us1/Makefile b/audio/festvox-us1/Makefile
deleted file mode 100644
index e7c4e1f473d..00000000000
--- a/audio/festvox-us1/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2006/12/28 11:47:52 wiz Exp $
-
-DISTNAME= festvox_us1
-PKGNAME= festvox-us1-1.4.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
- http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.cstr.ed.ac.uk/projects/festival/
-COMMENT= MBROLA based American English female voice for festival
-
-DEPENDS+= festival>=1.4.0:../../audio/festival
-DEPENDS+= festlex-poslex>=1.4.0:../../audio/festlex-poslex
-DEPENDS+= festlex-cmu>=1.4.0:../../audio/festlex-cmu
-DEPENDS+= mbrola-301hnb1:../../audio/mbrola
-DEPENDS+= mbrolavox-us1-980512nb1:../../audio/mbrolavox-us1
-
-LICENSE= no-commercial-use
-
-WRKSRC= ${WRKDIR}/festival
-NO_BUILD= yes
-
-FHOME= ${PREFIX}/share/festival
-MBROLA= ${FHOME}/lib/voices/english/us1_mbrola
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
-
-do-install:
- cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
-#ugh
- ${LN} -fs ../../../../../mbrola/voices/us1 ${MBROLA}
- ${LN} -fs ../../../../../mbrola/voices/us1/us1mrpa ${MBROLA}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-us1/PLIST b/audio/festvox-us1/PLIST
deleted file mode 100644
index 14ba8b02bea..00000000000
--- a/audio/festvox-us1/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:16:24 zuntum Exp $
-@comment the next two entries are symlinks
-share/festival/lib/voices/english/us1_mbrola/us1
-share/festival/lib/voices/english/us1_mbrola/us1mrpa
-share/festival/lib/voices/english/us1_mbrola/usradio
-share/festival/lib/voices/english/us1_mbrola/festvox/us1_mbrola.scm
-share/festival/lib/voices/english/us1_mbrola/festvox/usdurtreeZ.scm
-@dirrm share/festival/lib/voices/english/us1_mbrola/festvox
-@dirrm share/festival/lib/voices/english/us1_mbrola
diff --git a/audio/festvox-us1/distinfo b/audio/festvox-us1/distinfo
deleted file mode 100644
index 5f308c24534..00000000000
--- a/audio/festvox-us1/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:45 agc Exp $
-
-SHA1 (festvox_us1.tar.gz) = f740064af99670e35879352d164b7aa9f2079820
-RMD160 (festvox_us1.tar.gz) = 97cfd8e62347aa28cf2319174021bc002044ffd5
-Size (festvox_us1.tar.gz) = 11040 bytes
diff --git a/audio/festvox-us2/DESCR b/audio/festvox-us2/DESCR
deleted file mode 100644
index 5cc722a8039..00000000000
--- a/audio/festvox-us2/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-MBROLA based American English male voice for the festival speech
-synthesis system.
-
-This voice provides a American English male voice using the MBROLA
-synthesis method. It uses a modified CMU lexicon for pronunciations.
-Prosodic phrasing is provided by a statistically trained model using
-part of speech and local distribution of breaks. Intonation is
-provided by a CART tree predicting ToBI accents and an F0 contour
-generated from a model trained from natural speech. The duration
-model is also trained from data using a CART tree.
-
-This voice can be activated via (voice_us2_mbrola)
diff --git a/audio/festvox-us2/Makefile b/audio/festvox-us2/Makefile
deleted file mode 100644
index b706b8e0608..00000000000
--- a/audio/festvox-us2/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2006/12/28 11:47:52 wiz Exp $
-
-DISTNAME= festvox_us2
-PKGNAME= festvox-us2-1.4.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
- http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.cstr.ed.ac.uk/projects/festival/
-COMMENT= MBROLA based Americal English male voice for festival
-
-DEPENDS+= festival>=1.4.0:../../audio/festival
-DEPENDS+= festlex-poslex>=1.4.0:../../audio/festlex-poslex
-DEPENDS+= festlex-cmu>=1.4.0:../../audio/festlex-cmu
-DEPENDS+= mbrola-301hnb1:../../audio/mbrola
-DEPENDS+= mbrolavox-us2-980812nb1:../../audio/mbrolavox-us2
-
-LICENSE= no-commercial-use
-
-WRKSRC= ${WRKDIR}/festival
-NO_BUILD= yes
-
-FHOME= ${PREFIX}/share/festival
-MBROLA= ${FHOME}/lib/voices/english/us2_mbrola
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
-
-do-install:
- cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
-#ugh
- ${LN} -fs ../../../../../mbrola/voices/us2 ${MBROLA}
- ${LN} -fs ../../../../../mbrola/voices/us2/us2mrpa ${MBROLA}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-us2/PLIST b/audio/festvox-us2/PLIST
deleted file mode 100644
index 2bcdc09e5b1..00000000000
--- a/audio/festvox-us2/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:16:25 zuntum Exp $
-@comment the next two entries are symlinks
-share/festival/lib/voices/english/us2_mbrola/us2mrpa
-share/festival/lib/voices/english/us2_mbrola/us2
-share/festival/lib/voices/english/us2_mbrola/usradio
-share/festival/lib/voices/english/us2_mbrola/festvox/us2_mbrola.scm
-share/festival/lib/voices/english/us2_mbrola/festvox/usdurtreeZ.scm
-@dirrm share/festival/lib/voices/english/us2_mbrola/festvox
-@dirrm share/festival/lib/voices/english/us2_mbrola
diff --git a/audio/festvox-us2/distinfo b/audio/festvox-us2/distinfo
deleted file mode 100644
index 3bb4dec9d9e..00000000000
--- a/audio/festvox-us2/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:45 agc Exp $
-
-SHA1 (festvox_us2.tar.gz) = 227df7165a47d181eb019c7774d7b8517436507d
-RMD160 (festvox_us2.tar.gz) = 62528dc44291be4f7e7fda1677f3074fcc9fdab7
-Size (festvox_us2.tar.gz) = 11037 bytes
diff --git a/audio/festvox-us3/DESCR b/audio/festvox-us3/DESCR
deleted file mode 100644
index 6b044559700..00000000000
--- a/audio/festvox-us3/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-MBROLA based American English male voice for the festival speech
-synthesis system.
-
-This voice provides a American English male voice using the MBROLA
-synthesis method. It uses a modified CMU lexicon for pronunciations.
-Prosodic phrasing is provided by a statistically trained model using
-part of speech and local distribution of breaks. Intonation is
-provided by a CART tree predicting ToBI accents and an F0 contour
-generated from a model trained from natural speech. The duration
-model is also trained from data using a CART tree.
-
-The quality of this voice is not as high as us1 and us2
-
-This voice can be activated via (voice_us3_mbrola)
diff --git a/audio/festvox-us3/Makefile b/audio/festvox-us3/Makefile
deleted file mode 100644
index 9d572236feb..00000000000
--- a/audio/festvox-us3/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2006/12/28 11:47:52 wiz Exp $
-
-DISTNAME= festvox_us3
-PKGNAME= festvox-us3-1.4.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
- http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.cstr.ed.ac.uk/projects/festival/
-COMMENT= MBROLA based American English male voice for festival
-
-DEPENDS+= festival>=1.4.0:../../audio/festival
-DEPENDS+= festlex-poslex>=1.4.0:../../audio/festlex-poslex
-DEPENDS+= festlex-cmu>=1.4.0:../../audio/festlex-cmu
-DEPENDS+= mbrola-301hnb1:../../audio/mbrola
-DEPENDS+= mbrolavox-us3-990208nb1:../../audio/mbrolavox-us3
-
-LICENSE= no-commercial-use
-
-WRKSRC= ${WRKDIR}/festival
-NO_BUILD= yes
-
-FHOME= ${PREFIX}/share/festival
-MBROLA= ${FHOME}/lib/voices/english/us3_mbrola
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
-
-do-install:
- cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
-#ugh
- ${LN} -fs ../../../../../mbrola/voices/us3 ${MBROLA}
- ${LN} -fs ../../../../../mbrola/voices/us3/us3mrpa ${MBROLA}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-us3/PLIST b/audio/festvox-us3/PLIST
deleted file mode 100644
index 11c30660703..00000000000
--- a/audio/festvox-us3/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:16:27 zuntum Exp $
-@comment the next two entries are symlinks
-share/festival/lib/voices/english/us3_mbrola/us3mrpa
-share/festival/lib/voices/english/us3_mbrola/us3
-share/festival/lib/voices/english/us3_mbrola/usradio
-share/festival/lib/voices/english/us3_mbrola/festvox/us3_mbrola.scm
-share/festival/lib/voices/english/us3_mbrola/festvox/usdurtreeZ.scm
-@dirrm share/festival/lib/voices/english/us3_mbrola/festvox
-@dirrm share/festival/lib/voices/english/us3_mbrola
diff --git a/audio/festvox-us3/distinfo b/audio/festvox-us3/distinfo
deleted file mode 100644
index 579cf94ab42..00000000000
--- a/audio/festvox-us3/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:45 agc Exp $
-
-SHA1 (festvox_us3.tar.gz) = 8302d0875c2872c45ff4a8ec633f9bb916a2a814
-RMD160 (festvox_us3.tar.gz) = 86946aa9718b7dacfbb884ba02254e59ebdb7247
-Size (festvox_us3.tar.gz) = 11220 bytes
diff --git a/audio/flac/DESCR b/audio/flac/DESCR
deleted file mode 100644
index 9a6e7f2d239..00000000000
--- a/audio/flac/DESCR
+++ /dev/null
@@ -1,15 +0,0 @@
-FLAC stands for Free Lossless Audio Codec. Grossly oversimplified, FLAC is
-similar to MP3, but lossless. The FLAC project consists of:
- * the stream format
- * libFLAC, which implements reference encoders and decoders
- * flac, a command-line wrapper around libFLAC to encode and decode .flac
- files
- * input plugins for various music players (Winamp, XMMS, and more in the
- works)
-
-"Free" means that the specification of the stream format is in the public
-domain (the FLAC project reserves the right to set the FLAC specification
-and certify compliance), and that neither the FLAC format nor any of the
-implemented encoding/decoding methods are covered by any patent. It also
-means that the source for libFLAC is available under the LGPL and the
-sources for flac and the plugins are available under the GPL.
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
deleted file mode 100644
index 7a0bc67f742..00000000000
--- a/audio/flac/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-# $NetBSD: Makefile,v 1.41 2007/01/07 15:01:52 wiz Exp $
-
-DISTNAME= flac-1.1.3
-PKGREVISION= 1
-CATEGORIES= audio archivers
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flac/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://flac.sourceforge.net/
-COMMENT= Free lossless audio codec
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
-
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake
-USE_LANGUAGES= c c++
-GNU_CONFIGURE= yes
-
-CONFIGURE_ENV+= ac_cv_path_XMMS_CONFIG="no"
-CONFIGURE_ENV+= ac_cv_prog_DOXYGEN=""
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
-BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm
-.endif
-
-.if !empty(MACHINE_PLATFORM:M*-*-powerpc)
-.if ${OPSYS} != "Darwin"
-CONFIGURE_ARGS+= --disable-asm-optimizations
-CONFIGURE_ARGS+= --disable-altivec
-.endif
-.endif
-
-.if !empty(MACHINE_PLATFORM:MDarwin-*-i386)
-CONFIGURE_ARGS+= --disable-asm-optimizations
-.endif
-
-.include "../../mk/compiler.mk"
-
-# Version 1.1.2 of flac doesn't seem to build correctly with -O3 using
-# the MIPSpro compiler.
-# XXX: retry for 1.1.3
-.if !empty(PKGSRC_COMPILER:Mmipspro)
-BUILDLINK_TRANSFORM+= rm:-O3
-.endif
-
-# SunPro does not support __inline
-.if !empty(PKGSRC_COMPILER:Msunpro)
-CFLAGS+= -D__inline=inline
-.endif
-
-.include "../../multimedia/libogg/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/flac/PLIST b/audio/flac/PLIST
deleted file mode 100644
index 37f76343179..00000000000
--- a/audio/flac/PLIST
+++ /dev/null
@@ -1,244 +0,0 @@
-@comment $NetBSD: PLIST,v 1.9 2007/01/07 12:25:05 wiz Exp $
-bin/flac
-bin/metaflac
-include/FLAC++/all.h
-include/FLAC++/decoder.h
-include/FLAC++/encoder.h
-include/FLAC++/export.h
-include/FLAC++/metadata.h
-include/FLAC/all.h
-include/FLAC/assert.h
-include/FLAC/callback.h
-include/FLAC/export.h
-include/FLAC/format.h
-include/FLAC/metadata.h
-include/FLAC/ordinals.h
-include/FLAC/stream_decoder.h
-include/FLAC/stream_encoder.h
-lib/libFLAC++.la
-lib/libFLAC.la
-man/man1/flac.1
-man/man1/metaflac.1
-share/aclocal/libFLAC++.m4
-share/aclocal/libFLAC.m4
-share/doc/html/flac/FLAC.tag
-share/doc/html/flac/api/+_2all_8h-source.html
-share/doc/html/flac/api/+_2export_8h-source.html
-share/doc/html/flac/api/+_2metadata_8h-source.html
-share/doc/html/flac/api/+_2metadata_8h.html
-share/doc/html/flac/api/all_8h-source.html
-share/doc/html/flac/api/annotated.html
-share/doc/html/flac/api/assert_8h-source.html
-share/doc/html/flac/api/callback_8h-source.html
-share/doc/html/flac/api/callback_8h.html
-share/doc/html/flac/api/classFLAC_1_1Decoder_1_1File-members.html
-share/doc/html/flac/api/classFLAC_1_1Decoder_1_1File.html
-share/doc/html/flac/api/classFLAC_1_1Decoder_1_1File.png
-share/doc/html/flac/api/classFLAC_1_1Decoder_1_1Stream-members.html
-share/doc/html/flac/api/classFLAC_1_1Decoder_1_1Stream.html
-share/doc/html/flac/api/classFLAC_1_1Decoder_1_1Stream.png
-share/doc/html/flac/api/classFLAC_1_1Decoder_1_1Stream_1_1State-members.html
-share/doc/html/flac/api/classFLAC_1_1Decoder_1_1Stream_1_1State.html
-share/doc/html/flac/api/classFLAC_1_1Encoder_1_1File-members.html
-share/doc/html/flac/api/classFLAC_1_1Encoder_1_1File.html
-share/doc/html/flac/api/classFLAC_1_1Encoder_1_1File.png
-share/doc/html/flac/api/classFLAC_1_1Encoder_1_1Stream-members.html
-share/doc/html/flac/api/classFLAC_1_1Encoder_1_1Stream.html
-share/doc/html/flac/api/classFLAC_1_1Encoder_1_1Stream.png
-share/doc/html/flac/api/classFLAC_1_1Encoder_1_1Stream_1_1State-members.html
-share/doc/html/flac/api/classFLAC_1_1Encoder_1_1Stream_1_1State.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Application-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Application.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Application.png
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Chain-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Chain.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Chain_1_1Status-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Chain_1_1Status.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1CueSheet-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1CueSheet.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1CueSheet.png
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Iterator-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Iterator.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Padding-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Padding.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Padding.png
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Picture-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Picture.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Picture.png
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Prototype-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Prototype.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Prototype.png
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1SeekTable-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1SeekTable.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1SeekTable.png
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1SimpleIterator-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1SimpleIterator.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1StreamInfo-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1StreamInfo.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1StreamInfo.png
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Unknown-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Unknown.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Unknown.png
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1VorbisComment-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1VorbisComment.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1VorbisComment.png
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html
-share/doc/html/flac/api/classes.html
-share/doc/html/flac/api/decoder_8h-source.html
-share/doc/html/flac/api/decoder_8h.html
-share/doc/html/flac/api/dir_000000.html
-share/doc/html/flac/api/dir_000001.html
-share/doc/html/flac/api/dir_000002.html
-share/doc/html/flac/api/dirs.html
-share/doc/html/flac/api/doxygen.css
-share/doc/html/flac/api/doxygen.png
-share/doc/html/flac/api/encoder_8h-source.html
-share/doc/html/flac/api/encoder_8h.html
-share/doc/html/flac/api/export_8h-source.html
-share/doc/html/flac/api/export_8h.html
-share/doc/html/flac/api/files.html
-share/doc/html/flac/api/format_8h-source.html
-share/doc/html/flac/api/format_8h.html
-share/doc/html/flac/api/functions.html
-share/doc/html/flac/api/functions_func.html
-share/doc/html/flac/api/functions_vars.html
-share/doc/html/flac/api/globals.html
-share/doc/html/flac/api/globals_0x66.html
-share/doc/html/flac/api/globals_0x67.html
-share/doc/html/flac/api/globals_defs.html
-share/doc/html/flac/api/globals_enum.html
-share/doc/html/flac/api/globals_eval.html
-share/doc/html/flac/api/globals_func.html
-share/doc/html/flac/api/globals_type.html
-share/doc/html/flac/api/globals_vars.html
-share/doc/html/flac/api/group__flac.html
-share/doc/html/flac/api/group__flac__callbacks.html
-share/doc/html/flac/api/group__flac__decoder.html
-share/doc/html/flac/api/group__flac__encoder.html
-share/doc/html/flac/api/group__flac__export.html
-share/doc/html/flac/api/group__flac__format.html
-share/doc/html/flac/api/group__flac__metadata.html
-share/doc/html/flac/api/group__flac__metadata__level0.html
-share/doc/html/flac/api/group__flac__metadata__level1.html
-share/doc/html/flac/api/group__flac__metadata__level2.html
-share/doc/html/flac/api/group__flac__metadata__object.html
-share/doc/html/flac/api/group__flac__stream__decoder.html
-share/doc/html/flac/api/group__flac__stream__encoder.html
-share/doc/html/flac/api/group__flacpp.html
-share/doc/html/flac/api/group__flacpp__decoder.html
-share/doc/html/flac/api/group__flacpp__encoder.html
-share/doc/html/flac/api/group__flacpp__metadata.html
-share/doc/html/flac/api/group__flacpp__metadata__level0.html
-share/doc/html/flac/api/group__flacpp__metadata__level1.html
-share/doc/html/flac/api/group__flacpp__metadata__level2.html
-share/doc/html/flac/api/group__flacpp__metadata__object.html
-share/doc/html/flac/api/group__porting.html
-share/doc/html/flac/api/group__porting__1__1__2__to__1__1__3.html
-share/doc/html/flac/api/hierarchy.html
-share/doc/html/flac/api/index.html
-share/doc/html/flac/api/metadata_8h-source.html
-share/doc/html/flac/api/metadata_8h.html
-share/doc/html/flac/api/modules.html
-share/doc/html/flac/api/ordinals_8h-source.html
-share/doc/html/flac/api/stream__decoder_8h-source.html
-share/doc/html/flac/api/stream__decoder_8h.html
-share/doc/html/flac/api/stream__encoder_8h-source.html
-share/doc/html/flac/api/stream__encoder_8h.html
-share/doc/html/flac/api/structFLAC____EntropyCodingMethod-members.html
-share/doc/html/flac/api/structFLAC____EntropyCodingMethod.html
-share/doc/html/flac/api/structFLAC____EntropyCodingMethod__PartitionedRice-members.html
-share/doc/html/flac/api/structFLAC____EntropyCodingMethod__PartitionedRice.html
-share/doc/html/flac/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents-members.html
-share/doc/html/flac/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents.html
-share/doc/html/flac/api/structFLAC____Frame-members.html
-share/doc/html/flac/api/structFLAC____Frame.html
-share/doc/html/flac/api/structFLAC____FrameFooter-members.html
-share/doc/html/flac/api/structFLAC____FrameFooter.html
-share/doc/html/flac/api/structFLAC____FrameHeader-members.html
-share/doc/html/flac/api/structFLAC____FrameHeader.html
-share/doc/html/flac/api/structFLAC____IOCallbacks-members.html
-share/doc/html/flac/api/structFLAC____IOCallbacks.html
-share/doc/html/flac/api/structFLAC____StreamDecoder-members.html
-share/doc/html/flac/api/structFLAC____StreamDecoder.html
-share/doc/html/flac/api/structFLAC____StreamEncoder-members.html
-share/doc/html/flac/api/structFLAC____StreamEncoder.html
-share/doc/html/flac/api/structFLAC____StreamMetadata-members.html
-share/doc/html/flac/api/structFLAC____StreamMetadata.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__Application-members.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__Application.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__CueSheet-members.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__CueSheet.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__CueSheet__Index-members.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__CueSheet__Index.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__CueSheet__Track-members.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__CueSheet__Track.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__Padding-members.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__Padding.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__Picture-members.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__Picture.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__SeekPoint-members.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__SeekPoint.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__SeekTable-members.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__SeekTable.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__StreamInfo-members.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__StreamInfo.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__Unknown-members.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__Unknown.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__VorbisComment-members.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__VorbisComment.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__VorbisComment__Entry-members.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__VorbisComment__Entry.html
-share/doc/html/flac/api/structFLAC____Subframe-members.html
-share/doc/html/flac/api/structFLAC____Subframe.html
-share/doc/html/flac/api/structFLAC____Subframe__Constant-members.html
-share/doc/html/flac/api/structFLAC____Subframe__Constant.html
-share/doc/html/flac/api/structFLAC____Subframe__Fixed-members.html
-share/doc/html/flac/api/structFLAC____Subframe__Fixed.html
-share/doc/html/flac/api/structFLAC____Subframe__LPC-members.html
-share/doc/html/flac/api/structFLAC____Subframe__LPC.html
-share/doc/html/flac/api/structFLAC____Subframe__Verbatim-members.html
-share/doc/html/flac/api/structFLAC____Subframe__Verbatim.html
-share/doc/html/flac/changelog.html
-share/doc/html/flac/comparison.html
-share/doc/html/flac/developers.html
-share/doc/html/flac/documentation.html
-share/doc/html/flac/download.html
-share/doc/html/flac/faq.html
-share/doc/html/flac/favicon.ico
-share/doc/html/flac/features.html
-share/doc/html/flac/flac.css
-share/doc/html/flac/format.html
-share/doc/html/flac/goals.html
-share/doc/html/flac/id.html
-share/doc/html/flac/images/1x1.gif
-share/doc/html/flac/images/cafebug.gif
-share/doc/html/flac/images/logo100.gif
-share/doc/html/flac/images/logo130.gif
-share/doc/html/flac/index.html
-share/doc/html/flac/license.html
-share/doc/html/flac/links.html
-share/doc/html/flac/news.html
-share/doc/html/flac/ogg_mapping.html
-share/doc/html/flac/ru/authors.html
-share/doc/html/flac/ru/comparison.html
-share/doc/html/flac/ru/developers.html
-share/doc/html/flac/ru/documentation.html
-share/doc/html/flac/ru/download.html
-share/doc/html/flac/ru/features.html
-share/doc/html/flac/ru/format.html
-share/doc/html/flac/ru/goals.html
-share/doc/html/flac/ru/id.html
-share/doc/html/flac/ru/index.html
-share/doc/html/flac/ru/links.html
-share/doc/html/flac/ru/news.html
-@dirrm share/doc/html/flac/ru
-@dirrm share/doc/html/flac/images
-@dirrm share/doc/html/flac/api
-@dirrm share/doc/html/flac
-@dirrm include/FLAC++
-@dirrm include/FLAC
diff --git a/audio/flac/buildlink3.mk b/audio/flac/buildlink3.mk
deleted file mode 100644
index 9a54d136e9b..00000000000
--- a/audio/flac/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.12 2007/01/07 15:01:52 wiz Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-FLAC_BUILDLINK3_MK:= ${FLAC_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= flac
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nflac}
-BUILDLINK_PACKAGES+= flac
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}flac
-
-.if !empty(FLAC_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.flac+= flac>=1.1.0nb1
-BUILDLINK_ABI_DEPENDS.flac+= flac>=1.1.3nb1
-BUILDLINK_PKGSRCDIR.flac?= ../../audio/flac
-.endif # FLAC_BUILDLINK3_MK
-
-.include "../../multimedia/libogg/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/flac/distinfo b/audio/flac/distinfo
deleted file mode 100644
index 169baa15f2c..00000000000
--- a/audio/flac/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.16 2007/02/22 19:11:25 rillig Exp $
-
-SHA1 (flac-1.1.3.tar.gz) = e19c92bebe536b69dd14d54de76c1f626b83b295
-RMD160 (flac-1.1.3.tar.gz) = 3bb360940775b6b2a5127accfb12d29c04da1132
-Size (flac-1.1.3.tar.gz) = 1592699 bytes
-SHA1 (patch-aa) = 2e81bac9dba5b7f66118bbdb3ed77786701072e4
-SHA1 (patch-ab) = d7b48e37ca81450d0ffc4a97914d06c1464daf7b
-SHA1 (patch-ac) = 647657a3af2db35dbce6fcef2f238c543b55573e
-SHA1 (patch-ad) = 9df5668bb5ffc0850be0a3b34ada825642752874
-SHA1 (patch-ae) = b73e4b160c9435525e96213d6c77e743947746d3
-SHA1 (patch-af) = a91054ce5d37ac2dc88725fa68c59413b5f52067
-SHA1 (patch-ag) = ec37d2e4ce9c0a8d4d638fe08d1f38914029a205
-SHA1 (patch-ah) = 90452d2983aed07a8a0c14926772610ef3799099
diff --git a/audio/flac/patches/patch-aa b/audio/flac/patches/patch-aa
deleted file mode 100644
index b2e0a3d1aef..00000000000
--- a/audio/flac/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2007/01/07 12:25:05 wiz Exp $
-
---- doc/Makefile.in.orig 2006-11-27 06:40:50.000000000 +0000
-+++ doc/Makefile.in
-@@ -220,7 +220,7 @@ AUTOMAKE_OPTIONS = foreign
-
- SUBDIRS = . html
-
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
-+docdir = $(datadir)/doc/html/$(PACKAGE)
-
- doc_DATA = \
- FLAC.tag
diff --git a/audio/flac/patches/patch-ab b/audio/flac/patches/patch-ab
deleted file mode 100644
index 37dfa194a47..00000000000
--- a/audio/flac/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2007/01/07 12:25:05 wiz Exp $
-
---- doc/html/images/Makefile.in.orig 2006-11-27 06:40:52.000000000 +0000
-+++ doc/html/images/Makefile.in
-@@ -218,7 +218,7 @@ target_alias = @target_alias@
-
- AUTOMAKE_OPTIONS = foreign
-
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/images
-+docdir = $(datadir)/doc/html/$(PACKAGE)/images
-
- doc_DATA = \
- 1x1.gif \
diff --git a/audio/flac/patches/patch-ac b/audio/flac/patches/patch-ac
deleted file mode 100644
index ef7cc78afcf..00000000000
--- a/audio/flac/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2007/01/07 12:25:05 wiz Exp $
-
---- doc/html/ru/Makefile.in.orig 2006-11-27 06:40:53.000000000 +0000
-+++ doc/html/ru/Makefile.in
-@@ -218,7 +218,7 @@ target_alias = @target_alias@
-
- AUTOMAKE_OPTIONS = foreign
-
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/ru
-+docdir = $(datadir)/doc/html/$(PACKAGE)/ru
-
- doc_DATA = \
- authors.html \
diff --git a/audio/flac/patches/patch-ad b/audio/flac/patches/patch-ad
deleted file mode 100644
index 3182f366c9d..00000000000
--- a/audio/flac/patches/patch-ad
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2007/01/07 12:25:05 wiz Exp $
-
---- include/FLAC/ordinals.h.orig 2006-11-20 07:05:18.000000000 +0000
-+++ include/FLAC/ordinals.h
-@@ -32,7 +32,7 @@
- #ifndef FLAC__ORDINALS_H
- #define FLAC__ORDINALS_H
-
--#if !(defined(_MSC_VER) || defined(__BORLANDC__) || defined(__EMX__))
-+#if !(defined(_MSC_VER) || defined(__BORLANDC__) || defined(__EMX__) || defined(__INTERIX))
- #include <inttypes.h>
- #endif
-
-@@ -59,8 +59,12 @@ typedef int32_t FLAC__int32;
- typedef int64_t FLAC__int64;
- typedef uint16_t FLAC__uint16;
- typedef uint32_t FLAC__uint32;
-+#if defined __INTERIX
-+typedef u_int64_t FLAC__uint64;
-+#else
- typedef uint64_t FLAC__uint64;
- #endif
-+#endif
-
- typedef int FLAC__bool;
-
diff --git a/audio/flac/patches/patch-ae b/audio/flac/patches/patch-ae
deleted file mode 100644
index 891afcfa091..00000000000
--- a/audio/flac/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2007/01/07 12:25:05 wiz Exp $
-
---- doc/html/Makefile.in.orig 2006-11-27 06:40:51.000000000 +0000
-+++ doc/html/Makefile.in
-@@ -220,7 +220,7 @@ AUTOMAKE_OPTIONS = foreign
-
- SUBDIRS = ru images
-
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html
-+docdir = $(datadir)/doc/html/$(PACKAGE)
-
- doc_DATA = \
- changelog.html \
diff --git a/audio/flac/patches/patch-af b/audio/flac/patches/patch-af
deleted file mode 100644
index 8da936f7186..00000000000
--- a/audio/flac/patches/patch-af
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-af,v 1.4 2007/02/22 19:11:26 rillig Exp $
-
---- strip_non_asm_libtool_args.sh.orig 2004-07-29 08:43:23.000000000 +0200
-+++ strip_non_asm_libtool_args.sh 2007-02-22 20:11:41.000000000 +0100
-@@ -5,15 +5,12 @@
- # Also, on some versions of OS X it tries to pass -fno-common
- # to 'as' which causes problems.
- command=""
--while [ $1 ]; do
-- if [ "$1" != "-fPIC" ]; then
-- if [ "$1" != "-DPIC" ]; then
-- if [ "$1" != "-fno-common" ]; then
-- command="$command $1"
-- fi
-- fi
-- fi
-- shift
-+for arg; do
-+ case "$arg" in
-+ -[DfK]PIC |\
-+ -fno-common) continue;;
-+ esac
-+ command="$command $arg"
- done
--echo $command
-+echo "$command"
- exec $command
diff --git a/audio/flac/patches/patch-ag b/audio/flac/patches/patch-ag
deleted file mode 100644
index 2a61bba591c..00000000000
--- a/audio/flac/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2007/01/07 15:01:52 wiz Exp $
-
---- src/libFLAC/Makefile.am.orig 2006-10-13 04:25:26.000000000 +0000
-+++ src/libFLAC/Makefile.am
-@@ -86,9 +86,10 @@ extra_ogg_sources = \
- ogg_encoder_aspect.c \
- ogg_helper.c \
- ogg_mapping.c
-+extra_ogg_libs = -logg
- endif
- # see 'http://www.gnu.org/software/libtool/manual.html#Libtool-versioning' for numbering convention
--libFLAC_la_LDFLAGS = -version-info 8:0:0 -lm $(LOCAL_EXTRA_LDFLAGS)
-+libFLAC_la_LDFLAGS = -version-info 8:0:0 -lm $(LOCAL_EXTRA_LDFLAGS) $(extra_ogg_libs)
- libFLAC_la_SOURCES = \
- bitbuffer.c \
- bitmath.c \
diff --git a/audio/flac/patches/patch-ah b/audio/flac/patches/patch-ah
deleted file mode 100644
index 0b19d8c05e5..00000000000
--- a/audio/flac/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2007/01/07 15:01:52 wiz Exp $
-
---- src/libFLAC/Makefile.in.orig 2006-11-27 06:41:11.000000000 +0000
-+++ src/libFLAC/Makefile.in
-@@ -267,8 +267,9 @@ EXTRA_DIST = \
- @FLaC__HAS_OGG_TRUE@ ogg_helper.c \
- @FLaC__HAS_OGG_TRUE@ ogg_mapping.c
-
-+@FLaC__HAS_OGG_TRUE@extra_ogg_libs = -logg
- # see 'http://www.gnu.org/software/libtool/manual.html#Libtool-versioning' for numbering convention
--libFLAC_la_LDFLAGS = -version-info 8:0:0 -lm $(LOCAL_EXTRA_LDFLAGS)
-+libFLAC_la_LDFLAGS = -version-info 8:0:0 -lm $(LOCAL_EXTRA_LDFLAGS) $(extra_ogg_libs)
- libFLAC_la_SOURCES = \
- bitbuffer.c \
- bitmath.c \
diff --git a/audio/flac123/DESCR b/audio/flac123/DESCR
deleted file mode 100644
index d313036ead5..00000000000
--- a/audio/flac123/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-flac123 is a command-line program for playing FLAC audio files.
diff --git a/audio/flac123/Makefile b/audio/flac123/Makefile
deleted file mode 100644
index 3c2be1f0e76..00000000000
--- a/audio/flac123/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2007/01/07 12:25:50 wiz Exp $
-
-DISTNAME= flac123-0.0.9
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flac-tools/}
-
-MAINTAINER= snj@NetBSD.org
-HOMEPAGE= http://flac-tools.sourceforge.net/
-COMMENT= Command-line program for playing FLAC audio files
-
-GNU_CONFIGURE= yes
-
-.include "../../audio/flac/buildlink3.mk"
-.include "../../audio/libao/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/popt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/flac123/PLIST b/audio/flac123/PLIST
deleted file mode 100644
index 847b50892dc..00000000000
--- a/audio/flac123/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/05/16 00:53:02 xtraeme Exp $
-bin/flac123
diff --git a/audio/flac123/distinfo b/audio/flac123/distinfo
deleted file mode 100644
index a754d8c0316..00000000000
--- a/audio/flac123/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.4 2007/01/09 23:36:45 wiz Exp $
-
-SHA1 (flac123-0.0.9.tar.gz) = 54784aeda6c016759007e02e51076c0ea0b937ed
-RMD160 (flac123-0.0.9.tar.gz) = f84a0373f86322d419487492858fb0973e3accfb
-Size (flac123-0.0.9.tar.gz) = 69647 bytes
-SHA1 (patch-aa) = 64bd66c707bdafbd1c831791e7fe8638f6e26b2f
-SHA1 (patch-ab) = a482ae41ceb521dfd167608a443d5724a205653d
-SHA1 (patch-ac) = dc0ffe3663ffaad341bf9d85df10dcb3b40e3d90
-SHA1 (patch-ad) = f2802ebf8454ecf8d9cf47c5d5b868d277ee8697
-SHA1 (patch-ae) = 98e44d7cbccfcbdff01c0637afa4d29dfbd6ef39
diff --git a/audio/flac123/patches/patch-aa b/audio/flac123/patches/patch-aa
deleted file mode 100644
index af0b318e22d..00000000000
--- a/audio/flac123/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2007/01/09 23:36:45 wiz Exp $
-
---- configure.ac.orig 2005-05-07 23:05:24.000000000 +0000
-+++ configure.ac
-@@ -40,9 +40,9 @@ fi
- AC_PROG_CC
-
- # Checks for libraries.
--AC_CHECK_LIB(FLAC, FLAC__file_decoder_new, [haveflac=yes], [haveflac=no], -lm)
-+AC_CHECK_LIB(FLAC, FLAC__stream_decoder_new, [haveflac=yes], [haveflac=no], -lm -logg)
- if test "$haveflac" = "yes"; then
-- FLAC_LIBS="-lFLAC -lm"
-+ FLAC_LIBS="-lFLAC -logg -lm"
- AC_SUBST(FLAC_LIBS)
- else
- AC_MSG_ERROR(FLAC required!)
diff --git a/audio/flac123/patches/patch-ab b/audio/flac123/patches/patch-ab
deleted file mode 100644
index adba315ba36..00000000000
--- a/audio/flac123/patches/patch-ab
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/01/09 23:36:45 wiz Exp $
-
---- configure.orig 2007-01-09 23:33:42.000000000 +0000
-+++ configure
-@@ -2688,13 +2688,13 @@ CCDEPMODE=depmode=$am_cv_CC_dependencies
-
- # Checks for libraries.
-
--echo "$as_me:$LINENO: checking for FLAC__file_decoder_new in -lFLAC" >&5
--echo $ECHO_N "checking for FLAC__file_decoder_new in -lFLAC... $ECHO_C" >&6
--if test "${ac_cv_lib_FLAC_FLAC__file_decoder_new+set}" = set; then
-+echo "$as_me:$LINENO: checking for FLAC__stream_decoder_new in -lFLAC" >&5
-+echo $ECHO_N "checking for FLAC__stream_decoder_new in -lFLAC... $ECHO_C" >&6
-+if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_new+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lFLAC -lm $LIBS"
-+LIBS="-lFLAC -logg -lm $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h. */
-@@ -2709,11 +2709,11 @@ extern "C"
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char FLAC__file_decoder_new ();
-+char FLAC__stream_decoder_new ();
- int
- main ()
- {
--FLAC__file_decoder_new ();
-+FLAC__stream_decoder_new ();
- ;
- return 0;
- }
-@@ -2730,26 +2730,26 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_lib_FLAC_FLAC__file_decoder_new=yes
-+ ac_cv_lib_FLAC_FLAC__stream_decoder_new=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_FLAC_FLAC__file_decoder_new=no
-+ac_cv_lib_FLAC_FLAC__stream_decoder_new=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__file_decoder_new" >&5
--echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__file_decoder_new" >&6
--if test $ac_cv_lib_FLAC_FLAC__file_decoder_new = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&5
-+echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&6
-+if test $ac_cv_lib_FLAC_FLAC__stream_decoder_new = yes; then
- haveflac=yes
- else
- haveflac=no
- fi
-
- if test "$haveflac" = "yes"; then
-- FLAC_LIBS="-lFLAC -lm"
-+ FLAC_LIBS="-lFLAC -logg -lm"
-
- else
- { { echo "$as_me:$LINENO: error: FLAC required!" >&5
diff --git a/audio/flac123/patches/patch-ac b/audio/flac123/patches/patch-ac
deleted file mode 100644
index 139f6bd542b..00000000000
--- a/audio/flac123/patches/patch-ac
+++ /dev/null
@@ -1,184 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/01/09 23:36:45 wiz Exp $
-
---- flac123.c.orig 2005-05-09 04:25:20.000000000 +0000
-+++ flac123.c
-@@ -49,12 +49,17 @@ struct poptOption cli_options[] = {
-
- static void play_file(const char *);
- static void play_remote_file(void);
--void flac_error_hdl(const FLAC__FileDecoder *, FLAC__StreamDecoderErrorStatus,
-- void *);
--void flac_metadata_hdl(const FLAC__FileDecoder *, const FLAC__StreamMetadata *,
-- void *);
-+#ifdef LEGACY_FLAC
-+void flac_error_hdl(const FLAC__FileDecoder *, FLAC__StreamDecoderErrorStatus, void *);
-+void flac_metadata_hdl(const FLAC__FileDecoder *, const FLAC__StreamMetadata *, void *);
- FLAC__StreamDecoderWriteStatus flac_write_hdl(const FLAC__FileDecoder *,
- const FLAC__Frame *, const FLAC__int32 * const buf[], void *);
-+#else
-+void flac_error_hdl(const FLAC__StreamDecoder *, FLAC__StreamDecoderErrorStatus, void *);
-+void flac_metadata_hdl(const FLAC__StreamDecoder *, const FLAC__StreamMetadata *, void *);
-+FLAC__StreamDecoderWriteStatus flac_write_hdl(const FLAC__StreamDecoder *,
-+ const FLAC__Frame *, const FLAC__int32 * const buf[], void *);
-+#endif
-
- static void signal_handler(int);
- static int quit_now = 0;
-@@ -190,6 +195,7 @@ FLAC__bool decoder_constructor(const cha
- file_info.year[VORBIS_YEAR_LEN] = '\0';
-
- /* create and initialize flac decoder object */
-+#ifdef LEGACY_FLAC
- file_info.decoder = FLAC__file_decoder_new();
- FLAC__file_decoder_set_md5_checking(file_info.decoder, true);
- FLAC__file_decoder_set_filename(file_info.decoder, filename);
-@@ -210,13 +216,29 @@ FLAC__bool decoder_constructor(const cha
- FLAC__file_decoder_delete(file_info.decoder);
- return false;
- }
-+#else
-+ file_info.decoder = FLAC__stream_decoder_new();
-+ FLAC__stream_decoder_set_md5_checking(file_info.decoder, true);
-+
-+ /* read metadata */
-+ if ((FLAC__stream_decoder_init_file(file_info.decoder, filename, flac_write_hdl, flac_metadata_hdl, flac_error_hdl, (void *)&file_info) != FLAC__STREAM_DECODER_INIT_STATUS_OK)
-+ || (!FLAC__stream_decoder_process_until_end_of_metadata(file_info.decoder)))
-+ {
-+ FLAC__stream_decoder_delete(file_info.decoder);
-+ return false;
-+ }
-+#endif
-
- /* open libao output device */
- if (cli_args.wavfile) {
- if (!(file_info.ao_dev = ao_open_file(ao_driver_id("wav"), cli_args.wavfile, /*overwrite*/ 1, &(file_info.ao_fmt), NULL)))
- {
- fprintf(stderr, "Error opening wav file %s\n", cli_args.wavfile);
-+#ifdef LEGACY_FLAC
- FLAC__file_decoder_delete(file_info.decoder);
-+#else
-+ FLAC__stream_decoder_delete(file_info.decoder);
-+#endif
- return false;
- }
- }
-@@ -224,7 +246,11 @@ FLAC__bool decoder_constructor(const cha
- if (!(file_info.ao_dev = ao_open_live(ao_output_id, &(file_info.ao_fmt), NULL)))
- {
- fprintf(stderr, "Error opening ao device %d\n", ao_output_id);
-+#ifdef LEGACY_FLAC
- FLAC__file_decoder_delete(file_info.decoder);
-+#else
-+ FLAC__stream_decoder_delete(file_info.decoder);
-+#endif
- return false;
- }
- }
-@@ -237,7 +263,11 @@ FLAC__bool decoder_constructor(const cha
- if (!(file_info.ao_dev = ao_open_live(ao_output_id, &(file_info.ao_fmt), NULL)))
- {
- fprintf(stderr, "Error opening ao device %d\n", ao_output_id);
-+#ifdef LEGACY_FLAC
- FLAC__file_decoder_delete(file_info.decoder);
-+#else
-+ FLAC__stream_decoder_delete(file_info.decoder);
-+#endif
- return false;
- }
- }
-@@ -257,8 +287,13 @@ FLAC__bool decoder_constructor(const cha
-
- void decoder_destructor(void)
- {
-+#ifdef LEGACY_FLAC
- FLAC__file_decoder_finish(file_info.decoder);
- FLAC__file_decoder_delete(file_info.decoder);
-+#else
-+ FLAC__stream_decoder_finish(file_info.decoder);
-+ FLAC__stream_decoder_delete(file_info.decoder);
-+#endif
- file_info.is_loaded = false;
- file_info.is_playing = false;
- file_info.filename[0] = '\0';
-@@ -272,9 +307,15 @@ static void play_file(const char *filena
- return;
- }
-
-+#ifdef LEGACY_FLAC
- while (FLAC__file_decoder_process_single(file_info.decoder) == true &&
- FLAC__file_decoder_get_state(file_info.decoder) ==
- FLAC__FILE_DECODER_OK && !interrupted)
-+#else
-+ while (FLAC__stream_decoder_process_single(file_info.decoder) == true &&
-+ FLAC__stream_decoder_get_state(file_info.decoder) <
-+ FLAC__STREAM_DECODER_END_OF_STREAM && !interrupted)
-+#endif
- {
- }
- interrupted = 0; /* more accurate feedback if placed after loop */
-@@ -292,13 +333,22 @@ static void play_remote_file(void)
- {
- if (file_info.is_playing == true)
- {
-+#ifdef LEGACY_FLAC
- if (FLAC__file_decoder_get_state(file_info.decoder) ==
- FLAC__FILE_DECODER_END_OF_FILE)
-+#else
-+ if (FLAC__stream_decoder_get_state(file_info.decoder) ==
-+ FLAC__STREAM_DECODER_END_OF_STREAM)
-+#endif
- {
- decoder_destructor();
- printf("@P 0\n");
- }
-+#ifdef LEGACY_FLAC
- else if (!FLAC__file_decoder_process_single(file_info.decoder))
-+#else
-+ else if (!FLAC__stream_decoder_process_single(file_info.decoder))
-+#endif
- {
- fprintf(stderr, "error decoding single frame!\n");
- }
-@@ -314,14 +364,24 @@ static void play_remote_file(void)
- }
- }
-
-+#ifdef LEGACY_FLAC
- void flac_error_hdl(const FLAC__FileDecoder *dec,
- FLAC__StreamDecoderErrorStatus status, void *data)
-+#else
-+void flac_error_hdl(const FLAC__StreamDecoder *dec,
-+ FLAC__StreamDecoderErrorStatus status, void *data)
-+#endif
- {
- fprintf(stderr, "error handler called!\n");
- }
-
-+#ifdef LEGACY_FLAC
- void flac_metadata_hdl(const FLAC__FileDecoder *dec,
- const FLAC__StreamMetadata *meta, void *data)
-+#else
-+void flac_metadata_hdl(const FLAC__StreamDecoder *dec,
-+ const FLAC__StreamMetadata *meta, void *data)
-+#endif
- {
- file_info_struct *p = (file_info_struct *) data;
-
-@@ -344,10 +404,17 @@ void flac_metadata_hdl(const FLAC__FileD
- }
- }
-
-+#ifdef LEGACY_FLAC
- FLAC__StreamDecoderWriteStatus flac_write_hdl(const FLAC__FileDecoder *dec,
- const FLAC__Frame *frame,
- const FLAC__int32 * const buf[],
- void *data)
-+#else
-+FLAC__StreamDecoderWriteStatus flac_write_hdl(const FLAC__StreamDecoder *dec,
-+ const FLAC__Frame *frame,
-+ const FLAC__int32 * const buf[],
-+ void *data)
-+#endif
- {
- int sample, channel, i;
- uint_32 samples = frame->header.blocksize;
diff --git a/audio/flac123/patches/patch-ad b/audio/flac123/patches/patch-ad
deleted file mode 100644
index 7e957360b39..00000000000
--- a/audio/flac123/patches/patch-ad
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/01/09 23:36:45 wiz Exp $
-
---- flac123.h.orig 2005-02-25 05:52:02.000000000 +0000
-+++ flac123.h
-@@ -22,13 +22,24 @@
- #include <limits.h>
- #include <FLAC/all.h>
-
-+/* by LEGACY_FLAC we mean pre-1.1.3 before FLAC__FileDecoder was merged into FLAC__StreamDecoder */
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+
- /* string widths for printing ID3 (vorbis) data in remote mode */
- #define VORBIS_TAG_LEN 30
- #define VORBIS_YEAR_LEN 4
-
- /* the main data structure of the program */
- typedef struct {
-+#ifdef LEGACY_FLAC
- FLAC__FileDecoder *decoder;
-+#else
-+ FLAC__StreamDecoder *decoder;
-+#endif
-
- /* bits, rate, channels, byte_format */
- ao_sample_format sam_fmt; /* input sample's true format */
diff --git a/audio/flac123/patches/patch-ae b/audio/flac123/patches/patch-ae
deleted file mode 100644
index 2cd84f8304d..00000000000
--- a/audio/flac123/patches/patch-ae
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2007/01/09 23:36:45 wiz Exp $
-
---- remote.c.orig 2005-02-25 05:50:41.000000000 +0000
-+++ remote.c
-@@ -150,8 +150,13 @@ static int remote_parse_input(void)
- file_info.current_sample += delta_frames;
- }
-
-+#ifdef LEGACY_FLAC
- FLAC__file_decoder_seek_absolute(file_info.decoder,
- file_info.current_sample);
-+#else
-+ FLAC__stream_decoder_seek_absolute(file_info.decoder,
-+ file_info.current_sample);
-+#endif
- }
- /* absolute seek */
- else
-@@ -161,7 +166,11 @@ static int remote_parse_input(void)
- file_info.elapsed_time = absolute_time;
- file_info.current_sample = absolute_frame;
-
-+#ifdef LEGACY_FLAC
- FLAC__file_decoder_seek_absolute(file_info.decoder, absolute_frame);
-+#else
-+ FLAC__stream_decoder_seek_absolute(file_info.decoder, absolute_frame);
-+#endif
- }
-
- }
diff --git a/audio/flac2mp3/DESCR b/audio/flac2mp3/DESCR
deleted file mode 100644
index b164a059c62..00000000000
--- a/audio/flac2mp3/DESCR
+++ /dev/null
@@ -1,18 +0,0 @@
-With the cost of hard drive storage falling under $1 USD per GB,
-storing audio in a lossless format is now inexpensive and practical.
-The FLAC codec is an OpenSource and Free software of very high
-quality. The FLAC format supports meta-info as ID3v1 tags or OGG
-comments. FLAC even has plugins for popular audio players such as
-XMMS and WinAMP. This script also helps with the generation of MP3
-files from FLAC, whilst preserving the tags. This way you can easily
-convert an album from FLAC to MP3 for playing on a mobile audio
-device. You will need LAME installed and in your $PATH. Using the
-script is simple:
-
- * cd /path/to/directory/with/FLACS
- * flac2mp3 *flac
-
-After transcoding, you will have matching, tagged MP3 files in the
-same directory. Note: Only use this script on flac files that you
-trust to have non-malicious tags (ie, ones that you've created
-yourself).
diff --git a/audio/flac2mp3/Makefile b/audio/flac2mp3/Makefile
deleted file mode 100644
index d2fb9dd2d27..00000000000
--- a/audio/flac2mp3/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:28:55 jlam Exp $
-
-DISTNAME= flac2mp3
-PKGNAME= flac2mp3-20041223
-PKGREVISION= 1
-CATEGORIES= audio converters
-MASTER_SITES= http://www.gurulabs.com/files/
-EXTRACT_SUFX= .pl
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.gurulabs.com/
-COMMENT= Script to convert flac to mp3
-
-DEPENDS+= lame-[0-9]*:../../audio/lame
-DEPENDS+= p5-MP3-Info-[0-9]*:../../audio/p5-MP3-Info
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-REPLACE_PERL= flac2mp3.pl
-USE_TOOLS+= perl:run
-WRKSRC= ${WRKDIR}
-
-NO_BUILD= yes
-
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/flac2mp3.pl ${PREFIX}/bin/flac2mp3
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/flac2mp3/PLIST b/audio/flac2mp3/PLIST
deleted file mode 100644
index 7b98cd08247..00000000000
--- a/audio/flac2mp3/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/12/23 10:57:20 agc Exp $
-bin/flac2mp3
diff --git a/audio/flac2mp3/distinfo b/audio/flac2mp3/distinfo
deleted file mode 100644
index f3deed23116..00000000000
--- a/audio/flac2mp3/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:45 agc Exp $
-
-SHA1 (flac2mp3.pl) = 7818bb421dec92071f19958b9f5d668e91730e31
-RMD160 (flac2mp3.pl) = eb5d32d163f217ccbd5c2c969159486adcf922be
-Size (flac2mp3.pl) = 1255 bytes
diff --git a/audio/flite/DESCR b/audio/flite/DESCR
deleted file mode 100644
index 91bde080691..00000000000
--- a/audio/flite/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Flite (festival-lite) is a small, fast run-time synthesis engine developed
-at CMU and primarily designed for small embedded machines and/or large
-servers. Flite is designed as an alternative synthesis engine to Festival
-for voices built using the FestVox suite of voice building tools.
diff --git a/audio/flite/Makefile b/audio/flite/Makefile
deleted file mode 100644
index b3ff7b1fa78..00000000000
--- a/audio/flite/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2006/09/01 15:44:44 gdt Exp $
-#
-
-DISTNAME= flite-1.3-release
-PKGNAME= ${DISTNAME:S/-release//}
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= http://www.speech.cs.cmu.edu/flite/packed/flite-1.3/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.speech.cs.cmu.edu/flite/
-COMMENT= Small and fast run-time synthesis engine
-
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake pkg-config
-GNU_CONFIGURE= yes
-
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/flite/PLIST b/audio/flite/PLIST
deleted file mode 100644
index ffee5c9d142..00000000000
--- a/audio/flite/PLIST
+++ /dev/null
@@ -1,50 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/09/01 15:44:44 gdt Exp $
-bin/flite
-bin/flite_time
-include/flite/cst_alloc.h
-include/flite/cst_args.h
-include/flite/cst_audio.h
-include/flite/cst_cart.h
-include/flite/cst_clunits.h
-include/flite/cst_diphone.h
-include/flite/cst_endian.h
-include/flite/cst_error.h
-include/flite/cst_features.h
-include/flite/cst_file.h
-include/flite/cst_hrg.h
-include/flite/cst_item.h
-include/flite/cst_lexicon.h
-include/flite/cst_lts.h
-include/flite/cst_lts_rewrites.h
-include/flite/cst_math.h
-include/flite/cst_phoneset.h
-include/flite/cst_regex.h
-include/flite/cst_relation.h
-include/flite/cst_sigpr.h
-include/flite/cst_socket.h
-include/flite/cst_ss.h
-include/flite/cst_string.h
-include/flite/cst_sts.h
-include/flite/cst_synth.h
-include/flite/cst_tokenstream.h
-include/flite/cst_track.h
-include/flite/cst_units.h
-include/flite/cst_utt_utils.h
-include/flite/cst_utterance.h
-include/flite/cst_val.h
-include/flite/cst_val_const.h
-include/flite/cst_val_defs.h
-include/flite/cst_viterbi.h
-include/flite/cst_voice.h
-include/flite/cst_wave.h
-include/flite/flite.h
-include/flite/flite_version.h
-lib/libflite.a
-lib/libflite_cmu_time_awb.a
-lib/libflite_cmu_us_kal.a
-lib/libflite_cmu_us_kal16.a
-lib/libflite_cmulex.a
-lib/libflite_usenglish.a
-share/doc/flite/README
-@dirrm share/doc/flite
-@dirrm include/flite
diff --git a/audio/flite/distinfo b/audio/flite/distinfo
deleted file mode 100644
index 229cfb52f3c..00000000000
--- a/audio/flite/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.4 2007/01/21 04:39:14 rillig Exp $
-
-SHA1 (flite-1.3-release.tar.gz) = 233144a772de72741ae1aa2292f672c30224afb3
-RMD160 (flite-1.3-release.tar.gz) = a908acfd196754783ee4665ac84ea860d54bcf80
-Size (flite-1.3-release.tar.gz) = 10663835 bytes
-SHA1 (patch-aa) = 1b603b6595d97526913d7d91a02993e6ad5a4ce1
-SHA1 (patch-ab) = 253876a3edc65b60a5891375b2a90a4fcc01da24
-SHA1 (patch-ac) = 9e533a22ed3a59cb6d99b6bbd6eacdfaa1695285
-SHA1 (patch-ad) = e75da7826581a1d93d4f5efe75f257cc749358a7
diff --git a/audio/flite/patches/patch-aa b/audio/flite/patches/patch-aa
deleted file mode 100644
index 502e37e0280..00000000000
--- a/audio/flite/patches/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/09/01 15:44:44 gdt Exp $
-
---- Makefile.orig 2005-11-01 08:40:45.000000000 -0500
-+++ Makefile
-@@ -48,6 +48,7 @@ CONFIG=configure configure.in config.sub
- FILES = Makefile README ACKNOWLEDGEMENTS COPYING $(CONFIG)
- DIST_CLEAN = config.cache config.log config.status \
- config/config config/system.mak FileList
-+DOCDIR= $(PREFIX)/share/doc/flite
-
- HOST_ONLY_DIRS = tools main
- ALL = $(BUILD_DIRS)
-@@ -105,13 +106,15 @@ tags:
-
- install:
- @echo Installing
-- mkdir -p $(INSTALLBINDIR)
-- mkdir -p $(INSTALLLIBDIR)
-- mkdir -p $(INSTALLINCDIR)
-- $(INSTALL) -m 644 include/*.h $(INSTALLINCDIR)
-- @ $(MAKE) -C lib --no-print-directory install
-- $(INSTALL) -m 755 bin/flite $(INSTALLBINDIR)
-- $(INSTALL) -m 755 bin/flite_time $(INSTALLBINDIR)
-+ $(BSD_INSTALL_PROGRAM_DIR) $(INSTALLBINDIR)
-+ $(BSD_INSTALL_DATA_DIR) $(INSTALLLIBDIR)
-+ $(BSD_INSTALL_DATA_DIR) $(INSTALLINCDIR)
-+ $(BSD_INSTALL_DATA_DIR) $(DOCDIR)
-+ $(BSD_INSTALL_DATA) include/*.h $(INSTALLINCDIR)
-+ $(BSD_INSTALL_DATA) $(LIBDIR)/libflite* $(INSTALLLIBDIR)
-+ $(BSD_INSTALL_PROGRAM) bin/flite $(INSTALLBINDIR)
-+ $(BSD_INSTALL_PROGRAM) bin/flite_time $(INSTALLBINDIR)
-+ $(BSD_INSTALL_DATA) README $(DOCDIR)
-
- time-stamp :
- @ echo $(PROJECT_NAME) >.time-stamp
diff --git a/audio/flite/patches/patch-ab b/audio/flite/patches/patch-ab
deleted file mode 100644
index 395a56b5437..00000000000
--- a/audio/flite/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/10/08 21:35:13 rillig Exp $
-
---- lang/cmulex/make_cmulex.orig 2005-07-11 00:28:52.000000000 +0200
-+++ lang/cmulex/make_cmulex 2006-10-08 23:33:26.000000000 +0200
-@@ -36,7 +36,7 @@
- ## ##
- ###########################################################################
-
--if [ "x$FLITEDIR" == "x" ]
-+if [ "x$FLITEDIR" = "x" ]
- then
- FLITEDIR=`pwd`/../..
- fi
diff --git a/audio/flite/patches/patch-ac b/audio/flite/patches/patch-ac
deleted file mode 100644
index 4ce40f18d2c..00000000000
--- a/audio/flite/patches/patch-ac
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/10/08 21:35:13 rillig Exp $
-
---- tools/huff_table.orig 2005-01-20 18:01:53.000000000 +0100
-+++ tools/huff_table 2006-10-08 23:34:05.000000000 +0200
-@@ -62,7 +62,7 @@ export LANG
- ## 0 is reserved, 1 is reserved too
- ALPHABET_SIZE=254
-
--if [ $1 == "entries" ]
-+if [ $1 = "entries" ]
- then
- infile=$2
- outfile=$3
-@@ -74,7 +74,7 @@ then
- printf("\n");}' >huff.tmp.corpus
- fi
-
--if [ $1 == "phones" ]
-+if [ $1 = "phones" ]
- then
- infile=$2
- outfile=$3
-@@ -83,7 +83,7 @@ then
- sed 's/\\/ /g' >huff.tmp.corpus
- fi
-
--if [ $1 == "residual" ]
-+if [ $1 = "residual" ]
- then
- # This really doesn't work: just some tests to see what's worthwhile
- infile=$2
-@@ -110,7 +110,7 @@ then
- sed 's/,//g;s/};//' >huff.tmp.corpus
- fi
-
--if [ $1 == "other" ]
-+if [ $1 = "other" ]
- then
- infile=$2
- outfile=$3
-@@ -242,7 +242,7 @@ awk 'BEGIN {'"$maptable"'}
- printf("\n");
- }' > huff.tmp.corpus.uncompressed
-
--if [ $1 == "phones" ]
-+if [ $1 = "phones" ]
- then
- cat huff.tmp.corpus.best |
- sed 's/+/\\/g' |
-@@ -259,7 +259,7 @@ then
- mv huff.tmp.corpus.compressed huff.phones.compressed
- fi
-
--if [ $1 == "entries" ]
-+if [ $1 = "entries" ]
- then
- cat huff.tmp.corpus.best |
- sed 's/+//g' |
diff --git a/audio/flite/patches/patch-ad b/audio/flite/patches/patch-ad
deleted file mode 100644
index 42b6d000ff8..00000000000
--- a/audio/flite/patches/patch-ad
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/01/21 04:39:14 rillig Exp $
-
-Tags: for-upstream
-
-The standard headers must be included before the behavior gets undefined
-by the following macro definition.
-
---- tools/find_sts_main.c.orig 2005-01-01 15:04:43.000000000 +0100
-+++ tools/find_sts_main.c 2007-01-21 04:36:17.750982588 +0100
-@@ -40,6 +40,8 @@
- #include <stdio.h>
- #include <math.h>
- #include <string.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-
- /* To allow some normally const fields to manipulated during building */
- #define const
diff --git a/audio/fluidsynth/DESCR b/audio/fluidsynth/DESCR
deleted file mode 100644
index 610ab01e8ab..00000000000
--- a/audio/fluidsynth/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-FluidSynth is a real-time software synthesizer based on the SoundFont 2
-specifications. FluidSynth can read MIDI events from a MIDI input
-device and render them to an audio device using SoundFont instruments.
-SoundFont files are composed of digital audio "samples" and additional
-instrument parameters. These files can be created or downloaded off the
-Internet. FluidSynth also has support for controlling effects in real
-time and can play MIDI files.
-
-Note: FluidSynth was previously called IIWU Synth.
diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile
deleted file mode 100644
index b38c6baf33d..00000000000
--- a/audio/fluidsynth/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2007/02/05 23:23:12 wiz Exp $
-
-DISTNAME= fluidsynth-1.0.7a
-CATEGORIES= audio
-MASTER_SITES= http://savannah.nongnu.org/download/fluid/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.nongnu.org/fluid/
-COMMENT= Software synthesizer based on SoundFont2
-
-WRKSRC= ${WRKDIR}/fluidsynth-1.0.7
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-PKGCONFIG_OVERRIDE= fluidsynth.pc.in
-PTHREAD_AUTO_VARS= yes
-
-CFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
-LDFLAGS+= ${LIBOSSAUDIO}
-
-.include "../../devel/libgetopt/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/fluidsynth/PLIST b/audio/fluidsynth/PLIST
deleted file mode 100644
index d7689b644ca..00000000000
--- a/audio/fluidsynth/PLIST
+++ /dev/null
@@ -1,24 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/04/25 13:53:37 adam Exp $
-bin/fluidsynth
-include/fluidsynth.h
-include/fluidsynth/audio.h
-include/fluidsynth/event.h
-include/fluidsynth/gen.h
-include/fluidsynth/log.h
-include/fluidsynth/midi.h
-include/fluidsynth/misc.h
-include/fluidsynth/mod.h
-include/fluidsynth/ramsfont.h
-include/fluidsynth/seq.h
-include/fluidsynth/seqbind.h
-include/fluidsynth/settings.h
-include/fluidsynth/sfont.h
-include/fluidsynth/shell.h
-include/fluidsynth/synth.h
-include/fluidsynth/types.h
-include/fluidsynth/version.h
-include/fluidsynth/voice.h
-lib/libfluidsynth.la
-lib/pkgconfig/fluidsynth.pc
-man/man1/fluidsynth.1
-@dirrm include/fluidsynth
diff --git a/audio/fluidsynth/buildlink3.mk b/audio/fluidsynth/buildlink3.mk
deleted file mode 100644
index e998aaae83c..00000000000
--- a/audio/fluidsynth/buildlink3.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:35 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-FLUIDSYNTH_BUILDLINK3_MK:= ${FLUIDSYNTH_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= fluidsynth
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfluidsynth}
-BUILDLINK_PACKAGES+= fluidsynth
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fluidsynth
-
-.if !empty(FLUIDSYNTH_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.fluidsynth+= fluidsynth>=1.0.5
-BUILDLINK_PKGSRCDIR.fluidsynth?= ../../audio/fluidsynth
-.endif # FLUIDSYNTH_BUILDLINK3_MK
-
-.include "../../devel/readline/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/fluidsynth/distinfo b/audio/fluidsynth/distinfo
deleted file mode 100644
index f2334fff58d..00000000000
--- a/audio/fluidsynth/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.6 2007/02/05 23:23:12 wiz Exp $
-
-SHA1 (fluidsynth-1.0.7a.tar.gz) = c1ab6dc2913539ea868c6d56f23381650f25c964
-RMD160 (fluidsynth-1.0.7a.tar.gz) = c4d31711443c0dad42937a38a0360d114525d076
-Size (fluidsynth-1.0.7a.tar.gz) = 1064677 bytes
-SHA1 (patch-aa) = 0cd5f42d4df763ef358f1d8a05826e0626882bf2
-SHA1 (patch-ab) = 8b9f615cf81bab81e0e6fc8f3e1c1a589b29cd90
-SHA1 (patch-ac) = 238fb1ee72c54a57ff57930b8fa1f7777009d616
-SHA1 (patch-ad) = 36e62eb4efc1c380f9cb8cfc5777493c0162f719
-SHA1 (patch-ae) = 175f319f90e71361a60225bc2d8f2050215697ab
diff --git a/audio/fluidsynth/hacks.mk b/audio/fluidsynth/hacks.mk
deleted file mode 100644
index b946977403f..00000000000
--- a/audio/fluidsynth/hacks.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2005/10/31 15:23:54 tv Exp $
-
-###
-### Define socklen_t on platforms without it (there's no easy autoconf
-### CHECK_TYPE check to insert this without depending on autoconf)
-###
-.if ${OPSYS} == "Interix"
-PKG_HACKS+= socklen-int
-CPPFLAGS+= -Dsocklen_t=int
-.endif
diff --git a/audio/fluidsynth/patches/patch-aa b/audio/fluidsynth/patches/patch-aa
deleted file mode 100644
index fff40b6c3fd..00000000000
--- a/audio/fluidsynth/patches/patch-aa
+++ /dev/null
@@ -1,162 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/04/25 13:53:37 adam Exp $
-
---- src/fluid_oss.c.orig Wed Mar 3 03:02:28 2004
-+++ src/fluid_oss.c
-@@ -43,6 +43,12 @@
- #include <errno.h>
- #include <sys/poll.h>
-
-+#ifdef __NetBSD__
-+#define DEVOSSMIDI "/dev/rmidi0"
-+#else
-+#define DEVOSSMIDI "/dev/midi"
-+#endif
-+
- #define BUFFER_LENGTH 512
-
- /* SCHED_FIFO priorities for OSS threads (see pthread_attr_setschedparam) */
-@@ -103,7 +109,7 @@ static void* fluid_oss_midi_run(void* d)
- void
- fluid_oss_audio_driver_settings(fluid_settings_t* settings)
- {
-- fluid_settings_register_str(settings, "audio.oss.device", "/dev/dsp", 0, NULL, NULL);
-+ fluid_settings_register_str(settings, "audio.oss.device", DEVOSSAUDIO, 0, NULL, NULL);
- }
-
- /*
-@@ -122,8 +128,10 @@ new_fluid_oss_audio_driver(fluid_setting
- int format;
- pthread_attr_t attr;
- int err;
-+#if !defined(__NetBSD__)
- int sched = SCHED_FIFO;
- struct sched_param priority;
-+#endif
-
- dev = FLUID_NEW(fluid_oss_audio_driver_t);
- if (dev == NULL) {
-@@ -168,7 +176,7 @@ new_fluid_oss_audio_driver(fluid_setting
- }
-
- if (!fluid_settings_getstr(settings, "audio.oss.device", &devname)) {
-- devname = "/dev/dsp";
-+ devname = DEVOSSAUDIO;
- }
-
- if (stat(devname, &devstat) == -1) {
-@@ -229,6 +237,13 @@ new_fluid_oss_audio_driver(fluid_setting
- goto error_recovery;
- }
-
-+#ifdef __NetBSD__
-+ err = pthread_create(&dev->thread, &attr, fluid_oss_audio_run, (void*) dev);
-+ if (err) {
-+ FLUID_LOG(FLUID_ERR, "Couldn't create audio thread");
-+ goto error_recovery;
-+ }
-+#else
- /* the pthread_create man page explains that
- pthread_attr_setschedpolicy returns an error if the user is not
- permitted the set SCHED_FIFO. it seems however that no error is
-@@ -264,6 +279,7 @@ new_fluid_oss_audio_driver(fluid_setting
- }
- break;
- }
-+#endif /* __NetBSD__ */
-
- return (fluid_audio_driver_t*) dev;
-
-@@ -285,8 +301,10 @@ new_fluid_oss_audio_driver2(fluid_settin
- int format;
- pthread_attr_t attr;
- int err;
-+#if !defined(__NetBSD__)
- int sched = SCHED_FIFO;
- struct sched_param priority;
-+#endif
-
- dev = FLUID_NEW(fluid_oss_audio_driver_t);
- if (dev == NULL) {
-@@ -311,7 +329,7 @@ new_fluid_oss_audio_driver2(fluid_settin
-
-
- if (!fluid_settings_getstr(settings, "audio.oss.device", &devname)) {
-- devname = "/dev/dsp";
-+ devname = DEVOSSAUDIO;
- }
- if (stat(devname, &devstat) == -1) {
- FLUID_LOG(FLUID_ERR, "Device <%s> does not exists", devname);
-@@ -380,6 +398,13 @@ new_fluid_oss_audio_driver2(fluid_settin
- goto error_recovery;
- }
-
-+#ifdef __NetBSD__
-+ err = pthread_create(&dev->thread, &attr, fluid_oss_audio_run2, (void*) dev);
-+ if (err) {
-+ FLUID_LOG(FLUID_ERR, "Couldn't create audio2 thread");
-+ goto error_recovery;
-+ }
-+#else
- /* the pthread_create man page explains that
- pthread_attr_setschedpolicy returns an error if the user is not
- permitted the set SCHED_FIFO. it seems however that no error is
-@@ -415,6 +440,7 @@ new_fluid_oss_audio_driver2(fluid_settin
- }
- break;
- }
-+#endif /* __NetBSD__ */
-
- return (fluid_audio_driver_t*) dev;
-
-@@ -644,7 +670,7 @@ fluid_oss_audio_run2(void* d)
-
- void fluid_oss_midi_driver_settings(fluid_settings_t* settings)
- {
-- fluid_settings_register_str(settings, "midi.oss.device", "/dev/midi", 0, NULL, NULL);
-+ fluid_settings_register_str(settings, "midi.oss.device", DEVOSSMIDI, 0, NULL, NULL);
- }
-
- /*
-@@ -657,8 +683,10 @@ new_fluid_oss_midi_driver(fluid_settings
- int err;
- fluid_oss_midi_driver_t* dev;
- pthread_attr_t attr;
-+#if !defined __NetBSD__
- int sched = SCHED_FIFO;
- struct sched_param priority;
-+#endif
- char* device;
-
- /* not much use doing anything */
-@@ -689,7 +717,7 @@ new_fluid_oss_midi_driver(fluid_settings
- /* get the device name. if none is specified, use the default device. */
- fluid_settings_getstr(settings, "midi.oss.device", &device);
- if (device == NULL) {
-- device = "/dev/midi";
-+ device = DEVOSSMIDI;
- }
-
- /* open the default hardware device. only use midi in. */
-@@ -706,6 +734,14 @@ new_fluid_oss_midi_driver(fluid_settings
- FLUID_LOG(FLUID_ERR, "Couldn't initialize midi thread attributes");
- goto error_recovery;
- }
-+
-+#ifdef __NetBSD__
-+ err = pthread_create(&dev->thread, &attr, fluid_oss_midi_run, (void*) dev);
-+ if (err) {
-+ FLUID_LOG(FLUID_ERR, "Couldn't create midi thread");
-+ goto error_recovery;
-+ }
-+#else
- /* use fifo scheduling. if it fails, use default scheduling. */
- while (1) {
- err = pthread_attr_setschedpolicy(&attr, sched);
-@@ -737,6 +773,7 @@ new_fluid_oss_midi_driver(fluid_settings
- }
- break;
- }
-+#endif /* __NetBSD__ */
- return (fluid_midi_driver_t*) dev;
-
- error_recovery:
diff --git a/audio/fluidsynth/patches/patch-ab b/audio/fluidsynth/patches/patch-ab
deleted file mode 100644
index 282e5a18f78..00000000000
--- a/audio/fluidsynth/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/04/25 13:53:37 adam Exp $
-
---- src/fluid_sys.c.orig Fri Mar 26 01:20:55 2004
-+++ src/fluid_sys.c
-@@ -630,8 +630,10 @@ new_fluid_timer(int msec, fluid_timer_ca
- {
- pthread_attr_t *attr = NULL;
- pthread_attr_t rt_attr;
-+#if !defined(__NetBSD__)
- int sched = SCHED_FIFO;
- struct sched_param priority;
-+#endif
- int err;
-
- fluid_timer_t* timer = FLUID_NEW(fluid_timer_t);
-@@ -647,6 +649,7 @@ new_fluid_timer(int msec, fluid_timer_ca
- timer->auto_destroy = auto_destroy;
-
- err = pthread_attr_init(&rt_attr);
-+#if !defined(__NetBSD__)
- if (err == 0) {
- err = pthread_attr_setschedpolicy(&rt_attr, SCHED_FIFO);
- if (err == 0) {
-@@ -657,6 +660,7 @@ new_fluid_timer(int msec, fluid_timer_ca
- }
- }
- }
-+#endif
-
- if (new_thread) {
- err = pthread_create(&timer->thread, attr, fluid_timer_start, (void*) timer);
diff --git a/audio/fluidsynth/patches/patch-ac b/audio/fluidsynth/patches/patch-ac
deleted file mode 100644
index 22755adbf30..00000000000
--- a/audio/fluidsynth/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2006/10/02 15:29:36 rillig Exp $
-
---- configure.orig 2006-02-19 10:38:11.000000000 +0100
-+++ configure 2006-10-02 17:27:18.000000000 +0200
-@@ -21101,7 +21101,7 @@ esac
-
-
-
--if test "$mingw32_support" == "yes"; then
-+if test "$mingw32_support" = "yes"; then
- MINGW32_SUPPORT_TRUE=
- MINGW32_SUPPORT_FALSE='#'
- else
-@@ -21310,7 +21310,7 @@ cat >>confdefs.h <<\_ACEOF
- _ACEOF
-
- else
-- CFLAGS="${CFLAGS} ${FCCFLAGS} -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Wno-unused -Winline"
-+ CFLAGS="${CFLAGS} ${FCCFLAGS} -Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Wno-unused -Winline"
-
- cat >>confdefs.h <<\_ACEOF
- #define DEBUG 0
diff --git a/audio/fluidsynth/patches/patch-ad b/audio/fluidsynth/patches/patch-ad
deleted file mode 100644
index 9d581101c4e..00000000000
--- a/audio/fluidsynth/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/10/31 15:23:54 tv Exp $
-
---- src/fluid_sys.h.orig 2003-03-11 11:57:51.000000000 -0500
-+++ src/fluid_sys.h
-@@ -261,7 +261,7 @@ extern fluid_profile_data_t fluid_profil
- sample data.
- */
-
--#if HAVE_SYS_MMAN_H
-+#if HAVE_SYS_MMAN_H && !defined(__INTERIX)
- #define fluid_mlock(_p,_n) mlock(_p, _n)
- #define fluid_munlock(_p,_n) munlock(_p,_n)
- #else
diff --git a/audio/fluidsynth/patches/patch-ae b/audio/fluidsynth/patches/patch-ae
deleted file mode 100644
index d59e4a73595..00000000000
--- a/audio/fluidsynth/patches/patch-ae
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2007/02/05 23:23:12 wiz Exp $
-
---- src/fluidsynth.c.orig 2006-02-20 11:29:58.000000000 +0000
-+++ src/fluidsynth.c
-@@ -214,9 +214,9 @@ int main(int argc, char** argv)
- int audio_channels = 0;
- int with_server = 0;
- int dump = 0;
-- int connect_lash = 1;
- char *optchars = "a:C:c:df:G:g:hijK:L:lm:no:R:r:sVvz:";
- #ifdef LASH_ENABLED
-+ int connect_lash = 1;
- int enabled_lash = 0; /* set to TRUE if lash gets enabled */
- fluid_lash_args_t *lash_args;
-
-@@ -239,7 +239,9 @@ int main(int argc, char** argv)
- {"audio-groups", 1, 0, 'G'},
- {"chorus", 1, 0, 'C'},
- {"connect-jack-outputs", 0, 0, 'j'},
-+#ifdef LASH_ENABLED
- {"disable-lash", 0, 0, 'l'},
-+#endif
- {"dump", 0, 0, 'd'},
- {"gain", 1, 0, 'g'},
- {"help", 0, 0, 'h'},
-@@ -345,9 +347,11 @@ int main(int argc, char** argv)
- audio_channels = atoi(optarg);
- fluid_settings_setint(settings, "synth.audio-channels", audio_channels);
- break;
-+#ifdef LASH_ENABLED
- case 'l': /* disable LASH */
- connect_lash = 0;
- break;
-+#endif
- case 'm':
- fluid_settings_setstr(settings, "midi.driver", optarg);
- break;
-@@ -419,6 +423,7 @@ int main(int argc, char** argv)
- #endif
-
- #ifdef LASH_ENABLED
-+#ifdef LASH_ENABLED
- /* connect to the lash server */
- if (connect_lash)
- {
-@@ -426,6 +431,7 @@ int main(int argc, char** argv)
- fluid_settings_setint (settings, "lash.enable", enabled_lash ? 1 : 0);
- }
- #endif
-+#endif
-
- /* The 'groups' setting is only relevant for LADSPA operation
- * If not given, set number groups to number of audio channels, because
diff --git a/audio/freepats/DESCR b/audio/freepats/DESCR
deleted file mode 100644
index 621de3f79e7..00000000000
--- a/audio/freepats/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-FreePats is a project to create a free and open set of GUS compatible
-patches that can be used with softsynths such as Timidity and WildMidi.
diff --git a/audio/freepats/MESSAGE b/audio/freepats/MESSAGE
deleted file mode 100644
index fc44153b968..00000000000
--- a/audio/freepats/MESSAGE
+++ /dev/null
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2005/04/12 17:12:16 ben Exp $
-
- To use timidity with freepats, you have a couple of options.
-
- 1) at the command-line:
-
- timidity -L ${PREFIX}/share/freepats -c timidity.cfg file.mid
-
- 2) in the system-wide timidity configuration:
-
- cp ${PREFIX}/share/freepats/timidity.cfg ${PKG_SYSCONFDIR}
-
-===========================================================================
diff --git a/audio/freepats/Makefile b/audio/freepats/Makefile
deleted file mode 100644
index c3f11e152f8..00000000000
--- a/audio/freepats/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2007/02/22 19:01:13 wiz Exp $
-#
-
-DISTNAME= freepats-20060219
-CATEGORIES= audio
-MASTER_SITES= http://freepats.opensrc.org/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://freepats.opensrc.org/
-COMMENT= Free patches (audio samples) for TiMidity
-
-WRKSRC= ${WRKDIR}/freepats
-NO_CONFIGURE= yes
-NO_BUILD= yes
-
-MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
-
-INSTALLATION_DIRS= share
-
-post-patch:
- ${ECHO} "dir ${PREFIX}/share/freepats" >${WRKSRC}/timidity.cfg
- cat ${WRKSRC}/freepats.cfg >>${WRKSRC}/timidity.cfg
-
-do-install:
- cd ${WRKDIR} && pax -rw -pp freepats ${PREFIX}/share
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/freepats/PLIST b/audio/freepats/PLIST
deleted file mode 100644
index a03e2be627d..00000000000
--- a/audio/freepats/PLIST
+++ /dev/null
@@ -1,153 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/05/13 13:38:34 wiz Exp $
-share/freepats/COPYING
-share/freepats/Drum_000/025_Snare_Roll.pat
-share/freepats/Drum_000/026_Snap.pat
-share/freepats/Drum_000/027_High_Q.pat
-share/freepats/Drum_000/031_Sticks.pat
-share/freepats/Drum_000/032_Square_Click.pat
-share/freepats/Drum_000/033_Metronome_Click.pat
-share/freepats/Drum_000/034_Metronome_Bell.pat
-share/freepats/Drum_000/035_Kick_1.pat
-share/freepats/Drum_000/035_Kick_1.txt
-share/freepats/Drum_000/036_Kick_2.pat
-share/freepats/Drum_000/036_Kick_2.txt
-share/freepats/Drum_000/037_Stick_Rim.pat
-share/freepats/Drum_000/038_Snare_1.pat
-share/freepats/Drum_000/039_Clap_Hand.pat
-share/freepats/Drum_000/039_Clap_Hand.txt
-share/freepats/Drum_000/040_Snare_2.pat
-share/freepats/Drum_000/041_Tom_Low_2.pat
-share/freepats/Drum_000/041_Tom_Low_2.txt
-share/freepats/Drum_000/042_Hi-Hat_Closed.pat
-share/freepats/Drum_000/043_Tom_Low_1.pat
-share/freepats/Drum_000/043_Tom_Low_1.txt
-share/freepats/Drum_000/044_Hi-Hat_Pedal.pat
-share/freepats/Drum_000/045_Tom_Mid_2.pat
-share/freepats/Drum_000/045_Tom_Mid_2.txt
-share/freepats/Drum_000/046_Hi-Hat_Open.pat
-share/freepats/Drum_000/047_Tom_Mid_1.pat
-share/freepats/Drum_000/047_Tom_Mid_1.txt
-share/freepats/Drum_000/048_Tom_High_2.pat
-share/freepats/Drum_000/048_Tom_High_2.txt
-share/freepats/Drum_000/049_Cymbal_Crash_1.pat
-share/freepats/Drum_000/050_Tom_High_1.pat
-share/freepats/Drum_000/050_Tom_High_1.txt
-share/freepats/Drum_000/051_Cymbal_Ride_1.pat
-share/freepats/Drum_000/052_Cymbal_Chinese.pat
-share/freepats/Drum_000/053_Cymbal_Ride_Bell.pat
-share/freepats/Drum_000/053_Cymbal_Ride_Bell.txt
-share/freepats/Drum_000/054_Tombourine.pat
-share/freepats/Drum_000/055_Cymbal_Splash.pat
-share/freepats/Drum_000/056_Cow_Bell.pat
-share/freepats/Drum_000/057_Cymbal_Crash_2.pat
-share/freepats/Drum_000/058_Vibra-Slap.pat
-share/freepats/Drum_000/059_Cymbal_Ride_2.pat
-share/freepats/Drum_000/060_Bongo_High.pat
-share/freepats/Drum_000/061_Bongo_Low.pat
-share/freepats/Drum_000/062_Conga_High_1_Mute.pat
-share/freepats/Drum_000/062_Conga_High_1_mute.txt
-share/freepats/Drum_000/063_Conga_High_2_Open.pat
-share/freepats/Drum_000/064_Conga_Low.pat
-share/freepats/Drum_000/065_Timbale_High.pat
-share/freepats/Drum_000/066_Timbale_Low.pat
-share/freepats/Drum_000/067_Agogo_High.pat
-share/freepats/Drum_000/068_Agogo_Low.pat
-share/freepats/Drum_000/069_Cabasa.pat
-share/freepats/Drum_000/069_Cabasa.txt
-share/freepats/Drum_000/070_Maracas.pat
-share/freepats/Drum_000/071_Whistle_1_High_Short.pat
-share/freepats/Drum_000/072_Whistle_2_Low_Long.pat
-share/freepats/Drum_000/073_Guiro_1_Short.pat
-share/freepats/Drum_000/074_Guiro_2_Long.pat
-share/freepats/Drum_000/075_Claves.pat
-share/freepats/Drum_000/075_Claves.txt
-share/freepats/Drum_000/076_Wood_Block_1_High.pat
-share/freepats/Drum_000/077_Wood_Block_2_Low.pat
-share/freepats/Drum_000/078_Cuica_1_Mute.pat
-share/freepats/Drum_000/078_Cuica_1_Mute.txt
-share/freepats/Drum_000/079_Cuica_2_Open.pat
-share/freepats/Drum_000/079_Cuica_2_Open.txt
-share/freepats/Drum_000/080_Triangle_1_Mute.pat
-share/freepats/Drum_000/081_Triangle_2_Open.pat
-share/freepats/Drum_000/082_Shaker.pat
-share/freepats/Drum_000/084_Belltree.pat
-share/freepats/README
-share/freepats/Tone_000/000_Acoustic_Grand_Piano.pat
-share/freepats/Tone_000/000_Acoustic_Grand_Piano.txt
-share/freepats/Tone_000/001_Acoustic_Brite_Piano.pat
-share/freepats/Tone_000/002_Electric_Grand_Piano.pat
-share/freepats/Tone_000/004_Electric_Piano_1_Rhodes.pat
-share/freepats/Tone_000/005_Electric_Piano_2_Chorused_Yamaha_DX.pat
-share/freepats/Tone_000/006_Harpsichord.pat
-share/freepats/Tone_000/007_Clavinet.pat
-share/freepats/Tone_000/008_Celesta.pat
-share/freepats/Tone_000/009_Glockenspiel.pat
-share/freepats/Tone_000/013_Xylophone.pat
-share/freepats/Tone_000/014_Tubular_Bells.pat
-share/freepats/Tone_000/015_Dulcimer.pat
-share/freepats/Tone_000/016_Hammond_Organ.pat
-share/freepats/Tone_000/019_Church_Organ.pat
-share/freepats/Tone_000/021_Accordion.pat
-share/freepats/Tone_000/023_Tango_Accordion.pat
-share/freepats/Tone_000/024_Nylon_Guitar.pat
-share/freepats/Tone_000/025_Steel_Guitar.pat
-share/freepats/Tone_000/026_Jazz_Guitar.pat
-share/freepats/Tone_000/027_Clean_Electric_Guitar.pat
-share/freepats/Tone_000/028_Muted_Electric_Guitar.pat
-share/freepats/Tone_000/029_Overdriven_Guitar.pat
-share/freepats/Tone_000/030_Distortion_Guitar.pat
-share/freepats/Tone_000/032_Acoustic_Bass.pat
-share/freepats/Tone_000/033_Finger_Bass.pat
-share/freepats/Tone_000/034_Pick_Bass.pat
-share/freepats/Tone_000/035_Fretless_Bass.pat
-share/freepats/Tone_000/036_Slap_Bass_1.pat
-share/freepats/Tone_000/037_Slap_Bass_2.pat
-share/freepats/Tone_000/038_Synth_Bass_1.pat
-share/freepats/Tone_000/040_Violin.pat
-share/freepats/Tone_000/042_Cello.pat
-share/freepats/Tone_000/044_Tremolo_Strings.pat
-share/freepats/Tone_000/045_Pizzicato_Strings.pat
-share/freepats/Tone_000/046_Harp.pat
-share/freepats/Tone_000/047_Timpani.pat
-share/freepats/Tone_000/048_String_Ensemble_1_Marcato.pat
-share/freepats/Tone_000/053_Voice_Oohs.pat
-share/freepats/Tone_000/056_Trumpet.pat
-share/freepats/Tone_000/057_Trombone.pat
-share/freepats/Tone_000/058_Tuba.pat
-share/freepats/Tone_000/059_Muted_Trumpet.pat
-share/freepats/Tone_000/060_French_Horn.pat
-share/freepats/Tone_000/061_Brass_Section.pat
-share/freepats/Tone_000/064_Soprano_Sax.pat
-share/freepats/Tone_000/065_Alto_Sax.pat
-share/freepats/Tone_000/066_Tenor_Sax.pat
-share/freepats/Tone_000/067_Baritone_Sax.pat
-share/freepats/Tone_000/068_Oboe.pat
-share/freepats/Tone_000/069_English_Horn.pat
-share/freepats/Tone_000/070_Bassoon.pat
-share/freepats/Tone_000/071_Clarinet.pat
-share/freepats/Tone_000/072_Piccolo.pat
-share/freepats/Tone_000/073_Flute.pat
-share/freepats/Tone_000/074_Recorder.pat
-share/freepats/Tone_000/075_Pan_Flute.pat
-share/freepats/Tone_000/076_Bottle_Blow.pat
-share/freepats/Tone_000/079_Ocarina.pat
-share/freepats/Tone_000/080_Square_Wave.pat
-share/freepats/Tone_000/084_Charang.pat
-share/freepats/Tone_000/088_New_Age.pat
-share/freepats/Tone_000/094_Halo_Pad.pat
-share/freepats/Tone_000/095_Sweep_Pad.pat
-share/freepats/Tone_000/098_Crystal.pat
-share/freepats/Tone_000/101_Goblins--Unicorn.pat
-share/freepats/Tone_000/102_Echo_Voice.pat
-share/freepats/Tone_000/104_Sitar.pat
-share/freepats/Tone_000/114_Steel_Drums.pat
-share/freepats/Tone_000/115_Wood_Block.pat
-share/freepats/Tone_000/120_Guitar_Fret_Noise.pat
-share/freepats/Tone_000/122_Seashore.pat
-share/freepats/Tone_000/125_Helicopter.pat
-share/freepats/crude.cfg
-share/freepats/freepats.cfg
-share/freepats/timidity.cfg
-@dirrm share/freepats/Tone_000
-@dirrm share/freepats/Drum_000
-@dirrm share/freepats
diff --git a/audio/freepats/distinfo b/audio/freepats/distinfo
deleted file mode 100644
index 46e06186574..00000000000
--- a/audio/freepats/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/05/13 13:38:34 wiz Exp $
-
-SHA1 (freepats-20060219.tar.bz2) = a8940516a719460954bb45bb27a15a22fe57de61
-RMD160 (freepats-20060219.tar.bz2) = 276fcf5ee008decb3640f22fe753639de072bbf9
-Size (freepats-20060219.tar.bz2) = 25791733 bytes
diff --git a/audio/freezetag/DESCR b/audio/freezetag/DESCR
deleted file mode 100644
index 5fccc6664d2..00000000000
--- a/audio/freezetag/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-freezetag is an id3 tag editor for GTK+-1.2.0 and higher. It currently
-supports adding directories recursively, changing multiple tags at a time,
-and the viewing of current tags. In addition to viewing and changing tags,
-freezetag can also rename your files based on the tag from a format specifier
-Also, since freezetag uses GTK+ 1.2.0+, it takes advantage of your GTK+ themes.
diff --git a/audio/freezetag/Makefile b/audio/freezetag/Makefile
deleted file mode 100644
index fe96710aa5d..00000000000
--- a/audio/freezetag/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:28:55 jlam Exp $
-#
-
-DISTNAME= freezetag-0.9.2
-PKGREVISION= 4
-CATEGORIES= audio
-MASTER_SITES= http://katz.linuxpower.org/freezetag/current/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://katz.linuxpower.org/freezetag/
-COMMENT= Id3 tag editor for GTK+-1.2.0 and higher
-
-GNU_CONFIGURE= YES
-
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/freezetag/PLIST b/audio/freezetag/PLIST
deleted file mode 100644
index 2da16166340..00000000000
--- a/audio/freezetag/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:16:32 zuntum Exp $
-bin/freezetag
diff --git a/audio/freezetag/distinfo b/audio/freezetag/distinfo
deleted file mode 100644
index d03e7ddd71c..00000000000
--- a/audio/freezetag/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:45 agc Exp $
-
-SHA1 (freezetag-0.9.2.tar.gz) = 2f532384f1e224bf570d633470aa7767dd967550
-RMD160 (freezetag-0.9.2.tar.gz) = 579d4223024074a5763a85854a64773f7ca3f455
-Size (freezetag-0.9.2.tar.gz) = 120872 bytes
-SHA1 (patch-aa) = f4498192417d81a2560ca0bbf4b526f2557502fe
-SHA1 (patch-ab) = 562f8497071ffcfd3af8a3f77e04d5df21efaee2
-SHA1 (patch-ac) = 91275693b6fd366cd4600534460c3682b99154ed
-SHA1 (patch-ad) = 703538ca267ce2a90c94bc211d845de48568199f
-SHA1 (patch-ae) = b193138d6fe4818ea21148236c5918898a090346
diff --git a/audio/freezetag/patches/patch-aa b/audio/freezetag/patches/patch-aa
deleted file mode 100644
index ef93c948faa..00000000000
--- a/audio/freezetag/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/06/16 15:00:40 kleink Exp $
-
---- src/freezetag.h.orig Fri Apr 9 00:12:25 1999
-+++ src/freezetag.h Wed Jun 16 02:04:00 1999
-@@ -7,6 +7,8 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <stdio.h>
-+#include <string.h>
-
-
- #include "dirbrowser.h"
diff --git a/audio/freezetag/patches/patch-ab b/audio/freezetag/patches/patch-ab
deleted file mode 100644
index e1725af2e39..00000000000
--- a/audio/freezetag/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/06/16 15:00:40 kleink Exp $
-
---- src/edit_box.c.orig Fri Apr 9 05:42:58 1999
-+++ src/edit_box.c Wed Jun 16 01:37:41 1999
-@@ -86,7 +86,7 @@
- int fd, length,i, genre;
- gchar *song, *artist, *album, *year, *comments;
- char tag[4];
-- char fulltag = "TAG ";
-+ char *fulltag = "TAG ";
- extern GtkWidget *filelist;
-
- if ( ! ((song_flag != 0) || (artist_flag != 0) || (album_flag != 0) || (year_flag != 0) || (comments_flag != 0) || (genre_flag != 0) )) {
diff --git a/audio/freezetag/patches/patch-ac b/audio/freezetag/patches/patch-ac
deleted file mode 100644
index 84725d0d011..00000000000
--- a/audio/freezetag/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1999/06/30 16:39:50 kleink Exp $
-
---- src/freezetag.c.orig Sat Apr 10 03:46:02 1999
-+++ src/freezetag.c Wed Jun 16 02:17:13 1999
-@@ -174,7 +174,7 @@
- genre = genre_table[genrenum];
-
-
-- if ( (buf[0] != 'T') && (buf[1] != 'A') && (buf[2] != 'G') ) {
-+ if ( (buf[0] != 'T') || (buf[1] != 'A') || (buf[2] != 'G') ) {
- gtk_clist_append( GTK_CLIST (clist), line );
- } else {
- gchar *row[7] = { file, song, artist, album, year, comment, genre };
-@@ -322,7 +322,7 @@
- gtk_box_pack_start (GTK_BOX (mainbox), topbox, FALSE, TRUE, 0);
- gtk_widget_show(topbox);
-
-- directorylist = create_dir_browser((gchar *) get_current_dir_name(), window);
-+ directorylist = create_dir_browser((gchar *) g_get_current_dir(), window);
- gtk_widget_set_usize( GTK_WIDGET (directorylist), 400, 100);
- gtk_box_pack_start (GTK_BOX (topbox), directorylist, FALSE, TRUE, 0);
- gtk_widget_show (directorylist);
diff --git a/audio/freezetag/patches/patch-ad b/audio/freezetag/patches/patch-ad
deleted file mode 100644
index 8dfda3c89df..00000000000
--- a/audio/freezetag/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/06/16 15:00:40 kleink Exp $
-
---- src/rename.c.orig Sat Apr 10 03:46:18 1999
-+++ src/rename.c Wed Jun 16 02:14:25 1999
-@@ -53,7 +53,7 @@
-
- lseek(fd, -128, SEEK_END);
- read(fd, tag, 128);
-- if ( (tag[0] != 'T') && (tag[1] != 'A') && (tag[2] != 'G') ) {
-+ if ( (tag[0] != 'T') || (tag[1] != 'A') || (tag[2] != 'G') ) {
- #ifdef DEBUG
- g_warning("Can't rename a file without a tag - %s\n", filename);
- #endif
diff --git a/audio/freezetag/patches/patch-ae b/audio/freezetag/patches/patch-ae
deleted file mode 100644
index a9de6e1f09a..00000000000
--- a/audio/freezetag/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2000/12/02 13:26:05 hubertf Exp $
-
---- src/util.c.orig Fri Apr 9 00:12:25 1999
-+++ src/util.c
-@@ -28,7 +28,9 @@
- gchar *part;
- gint i;
-
-- if( strlen(original) < offset+length )
-+ /* Only re-calculate length if there is anything there, prevent
-+ * negative length! - HF */
-+ if( strlen(original) < offset+length && strlen(original) > offset)
- length = strlen(original) - offset;
-
- part = g_malloc0( length * sizeof(original[0]) );
diff --git a/audio/gkrellm-volume/DESCR b/audio/gkrellm-volume/DESCR
deleted file mode 100644
index ece565f5008..00000000000
--- a/audio/gkrellm-volume/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-gkrellm-volume is a gkrellm plugin to control all your mixer volumes.
-It also allows to save/restore volumes between sessions.
diff --git a/audio/gkrellm-volume/Makefile b/audio/gkrellm-volume/Makefile
deleted file mode 100644
index 39d97cd024c..00000000000
--- a/audio/gkrellm-volume/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2006/04/17 13:46:15 wiz Exp $
-
-DISTNAME= gkrellm-volume-2.1.13
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= http://gkrellm.luon.net/files/
-
-MAINTAINER= cube@NetBSD.org
-HOMEPAGE= http://gkrellm.luon.net/volume.phtml
-COMMENT= Gkrellm2 volume mixer plugin
-
-USE_TOOLS+= gmake msgfmt pkg-config
-USE_PKGLOCALEDIR= YES
-WRKSRC= ${WRKDIR}/gkrellm-volume
-
-MAKE_ENV+= LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale \
- enable_nls=1
-
-.include "../../sysutils/gkrellm/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gkrellm-volume/PLIST b/audio/gkrellm-volume/PLIST
deleted file mode 100644
index 0a18791e29b..00000000000
--- a/audio/gkrellm-volume/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2006/04/17 07:07:11 jlam Exp $
-lib/gkrellm2/plugins/volume.so
-share/locale/de/LC_MESSAGES/gkrellm-volume.mo
-share/locale/es/LC_MESSAGES/gkrellm-volume.mo
-share/locale/fr/LC_MESSAGES/gkrellm-volume.mo
-share/locale/nl/LC_MESSAGES/gkrellm-volume.mo
-share/locale/pl/LC_MESSAGES/gkrellm-volume.mo
-share/locale/ru/LC_MESSAGES/gkrellm-volume.mo
diff --git a/audio/gkrellm-volume/distinfo b/audio/gkrellm-volume/distinfo
deleted file mode 100644
index 16ddd07cfef..00000000000
--- a/audio/gkrellm-volume/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/03/30 12:17:36 cube Exp $
-
-SHA1 (gkrellm-volume-2.1.13.tar.gz) = e9ea9bdd8eac53e8d99baf7705e76c28d8c4f2c3
-RMD160 (gkrellm-volume-2.1.13.tar.gz) = 4ebc28a6a97f5d31d73927509ab956422e9a79de
-Size (gkrellm-volume-2.1.13.tar.gz) = 42087 bytes
-SHA1 (patch-aa) = 450cbad8d74cdbf3d6795bb81facd7ff4a080a5a
-SHA1 (patch-ab) = 5f71beea53f24f0c9649db0d855974eff0394352
diff --git a/audio/gkrellm-volume/patches/patch-aa b/audio/gkrellm-volume/patches/patch-aa
deleted file mode 100644
index 5db07d9391f..00000000000
--- a/audio/gkrellm-volume/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/03/22 14:58:55 cube Exp $
-
---- Makefile.orig 2004-05-16 19:21:50.000000000 +0200
-+++ Makefile
-@@ -8,14 +8,14 @@ export PACKAGE LOCALEDIR
-
- GTK_CONFIG = pkg-config gtk+-2.0
-
--PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins
-+PLUGIN_DIR ?= $(PREFIX)/lib/gkrellm2/plugins
- GKRELLM_INCLUDE = -I/usr/local/include
-
- GTK_CFLAGS = `$(GTK_CONFIG) --cflags`
- GTK_LIB = `$(GTK_CONFIG) --libs`
-
- FLAGS = -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
--LIBS = $(GTK_LIB)
-+LIBS = $(GTK_LIB) $(LIBOSSAUDIO)
- LFLAGS = -shared
-
- OBJS = volume.o mixer.o oss_mixer.o
diff --git a/audio/gkrellm-volume/patches/patch-ab b/audio/gkrellm-volume/patches/patch-ab
deleted file mode 100644
index a73bfe7b6e1..00000000000
--- a/audio/gkrellm-volume/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2005/03/30 12:17:36 cube Exp $
-
---- po/es.po.orig 2004-08-19 22:07:27.000000000 +0200
-+++ po/es.po
-@@ -6,9 +6,9 @@
- #, fuzzy
- msgid ""
- msgstr ""
--"Project-Id-Version: PACKAGE VERSION\n"
-+"Project-Id-Version: gkrellm-volume 2.1.13\n"
- "POT-Creation-Date: 2004-07-21 12:53+0200\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-+"PO-Revision-Date: 2005-03-26 16:45+0100\n"
- "Last-Translator: YoaR <yoar@users.sf.net>\n"
- "Language-Team: none <none>\n"
- "MIME-Version: 1.0\n"
diff --git a/audio/gkrellm-xmms/DESCR b/audio/gkrellm-xmms/DESCR
deleted file mode 100644
index e14ff0aa341..00000000000
--- a/audio/gkrellm-xmms/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-gkrellm plugin for controlling XMMS from within GKrellM.
-
-GKrellMMS Features:
-
- -Local Playlist Editor
- -Title scrolling
- -Progress bar (Krell) to see where you are in a song
- -Jumping in a file, by picking up the Krell
- -LED indicator which indicates whether XMMS is on, off, stopped,
- playing or paused
- -Themeable buttons, to control XMMS
- -A menu for some misc. XMMS-commands
diff --git a/audio/gkrellm-xmms/Makefile b/audio/gkrellm-xmms/Makefile
deleted file mode 100644
index fa1aae35a85..00000000000
--- a/audio/gkrellm-xmms/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.27 2006/04/17 13:46:15 wiz Exp $
-#
-
-DISTNAME= gkrellmms-2.1.20
-PKGNAME= ${DISTNAME:S/mms/m-xmms/}
-PKGREVISION= 4
-CATEGORIES= audio
-MASTER_SITES= http://gkrellm.luon.net/files/
-
-MAINTAINER= cube@NetBSD.org
-HOMEPAGE= http://gkrellm.luon.net/gkrellmms.phtml
-COMMENT= GKrellM2 plugin to remotely control XMMS
-
-USE_TOOLS+= gmake msgfmt pkg-config
-USE_PKGLOCALEDIR= YES
-
-BUILDLINK_API_DEPENDS.gkrellm+= gkrellm>=2.2.0
-
-WRKSRC= ${WRKDIR}/gkrellmms
-MAKE_ENV+= LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale \
- enable_nls=1
-
-.include "../../sysutils/gkrellm/buildlink3.mk"
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gkrellm-xmms/PLIST b/audio/gkrellm-xmms/PLIST
deleted file mode 100644
index 85532d48b13..00000000000
--- a/audio/gkrellm-xmms/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2006/04/17 07:07:11 jlam Exp $
-lib/gkrellm2/plugins/gkrellmms.so
-share/locale/da/LC_MESSAGES/gkrellmms.mo
-share/locale/fr/LC_MESSAGES/gkrellmms.mo
-share/locale/nl/LC_MESSAGES/gkrellmms.mo
-share/locale/ru/LC_MESSAGES/gkrellmms.mo
diff --git a/audio/gkrellm-xmms/distinfo b/audio/gkrellm-xmms/distinfo
deleted file mode 100644
index 19c54d315e3..00000000000
--- a/audio/gkrellm-xmms/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.6 2006/03/28 16:24:21 joerg Exp $
-
-SHA1 (gkrellmms-2.1.20.tar.gz) = 6aa0b3910fdfc9003305bc6735b44bd70e81be16
-RMD160 (gkrellmms-2.1.20.tar.gz) = ac03b2be23f1eb6807621f9ca37e2cc460bed58b
-Size (gkrellmms-2.1.20.tar.gz) = 44937 bytes
-SHA1 (patch-aa) = 8dc3c0f6c9eca258cae03c97c218efbabd605137
diff --git a/audio/gkrellm-xmms/patches/patch-aa b/audio/gkrellm-xmms/patches/patch-aa
deleted file mode 100644
index 6c5276098ef..00000000000
--- a/audio/gkrellm-xmms/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/03/28 16:24:21 joerg Exp $
-
---- Makefile.orig 2004-05-17 20:07:07.000000000 +0000
-+++ Makefile
-@@ -9,11 +9,11 @@ IMLIB_INCLUDE ?=
- IMLIB_LIB ?=
- XMMS_INCLUDE ?= `xmms-config --cflags`
- XMMS_LIB ?= `xmms-config --libs`
--PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins
-+PLUGIN_DIR ?= $(PREFIX)/lib/gkrellm2/plugins
-
- FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE)
- LIBS = $(GTK_LIB) $(IMLIB_LIB) $(XMMS_LIB)
--LFLAGS = -shared -lpthread
-+LFLAGS = -shared ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
-
- LOCALEDIR ?= /usr/share/locale
- ifeq ($(enable_nls),1)
diff --git a/audio/gkrellm1-volume/DESCR b/audio/gkrellm1-volume/DESCR
deleted file mode 100644
index ece565f5008..00000000000
--- a/audio/gkrellm1-volume/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-gkrellm-volume is a gkrellm plugin to control all your mixer volumes.
-It also allows to save/restore volumes between sessions.
diff --git a/audio/gkrellm1-volume/Makefile b/audio/gkrellm1-volume/Makefile
deleted file mode 100644
index 9c9678790ec..00000000000
--- a/audio/gkrellm1-volume/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2007/02/22 19:01:13 wiz Exp $
-
-DISTNAME= volume-0.8
-PKGNAME= gkrellm-${DISTNAME}
-PKGREVISION= 7
-CATEGORIES= audio
-MASTER_SITES= http://gkrellm.luon.net/files/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://gkrellm.luon.net/volume.phtml
-COMMENT= GKrellM volume mixer plugin
-
-WRKSRC= ${WRKDIR}/volume
-PTHREAD_OPTS= require
-
-.include "../../graphics/imlib/buildlink3.mk"
-.include "../../sysutils/gkrellm1/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gkrellm1-volume/PLIST b/audio/gkrellm1-volume/PLIST
deleted file mode 100644
index 7068a9812f2..00000000000
--- a/audio/gkrellm1-volume/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/24 22:33:50 cube Exp $
-lib/gkrellm/plugins/volume.so
diff --git a/audio/gkrellm1-volume/distinfo b/audio/gkrellm1-volume/distinfo
deleted file mode 100644
index ba825b2d9f8..00000000000
--- a/audio/gkrellm1-volume/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:46 agc Exp $
-
-SHA1 (volume-0.8.tar.gz) = 7348c8fc41bdc6c236442748ef3c803851a151f8
-RMD160 (volume-0.8.tar.gz) = 11cfcedf4f695904b5d1b6900f89acbc5c6a8ae6
-Size (volume-0.8.tar.gz) = 8395 bytes
-SHA1 (patch-aa) = adf96e0bd1e2b65e85394c4c50ce1db587b73195
-SHA1 (patch-ab) = 9281f2e550134887bfbc99464ab79987f4a26183
diff --git a/audio/gkrellm1-volume/patches/patch-aa b/audio/gkrellm1-volume/patches/patch-aa
deleted file mode 100644
index 43dbdfbb8e8..00000000000
--- a/audio/gkrellm1-volume/patches/patch-aa
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/02/24 22:33:50 cube Exp $
-
---- Makefile.orig Fri Jun 23 19:47:00 2000
-+++ Makefile
-@@ -1,27 +1,19 @@
- # Makefile for GKrellM volume plugin
-
--# Linux
--GTK_CONFIG = gtk-config
--SYSLIB = -lpthread
--
--# FreeBSD
--#GTK_CONFIG = gtk12-config
--#SYSLIB =
--
--PLUGIN_DIR = /usr/share/gkrellm/plugins
-+PLUGIN_DIR = ${LOCALBASE}/lib/gkrellm/plugins
- GKRELLM_INCLUDE = -I/usr/local/include
-
--GTK_INCLUDE = `$(GTK_CONFIG) --cflags`
--GTK_LIB = `$(GTK_CONFIG) --libs`
-+GTK_INCLUDE = `gtk-config --cflags`
-+GTK_LIB = `gtk-config --libs`
-
- IMLIB_INCLUDE = `imlib-config --cflags-gdk`
- IMLIB_LIB = `imlib-config --libs-gdk`
-
--FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE)
--LIBS = $(GTK_LIB) $(IMLIB_LIB) $(SYSLIB)
--LFLAGS = -shared
-+CFLAGS+= -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE)
-+LIBS+= $(GTK_LIB) $(IMLIB_LIB) $(SYSLIB)
-+LFLAGS+= -shared -lpthread -lossaudio
-
--CC = gcc $(CFLAGS) $(FLAGS)
-+CC = gcc $(CFLAGS)
-
- INSTALL = install -c
- INSTALL_PROGRAM = $(INSTALL) -s
-@@ -30,9 +22,6 @@
-
- all: volume.so
-
--freebsd:
-- make GTK_CONFIG=gtk12-config SYSLIB=all
--
- volume.so: $(OBJS)
- $(CC) $(OBJS) -o volume.so $(LIBS) $(LFLAGS)
-
-@@ -40,6 +29,7 @@
- rm -f *.o core *.so* *.bak *~
-
- install:
-+ mkdir -p $(PLUGIN_DIR)
- $(INSTALL_PROGRAM) volume.so $(PLUGIN_DIR)
-
- volume.c.o: volume.c
diff --git a/audio/gkrellm1-volume/patches/patch-ab b/audio/gkrellm1-volume/patches/patch-ab
deleted file mode 100644
index 3bf518bd27a..00000000000
--- a/audio/gkrellm1-volume/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/02/24 22:33:50 cube Exp $
-
---- volume.c.orig Wed Nov 22 21:35:42 2000
-+++ volume.c
-@@ -19,6 +19,8 @@
-
- #ifdef __FreeBSD__
- #include <machine/soundcard.h>
-+#elif __NetBSD__
-+#include <soundcard.h>
- #else
- #include <sys/soundcard.h>
- #endif
diff --git a/audio/gkrellm1-xmms/DESCR b/audio/gkrellm1-xmms/DESCR
deleted file mode 100644
index e14ff0aa341..00000000000
--- a/audio/gkrellm1-xmms/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-gkrellm plugin for controlling XMMS from within GKrellM.
-
-GKrellMMS Features:
-
- -Local Playlist Editor
- -Title scrolling
- -Progress bar (Krell) to see where you are in a song
- -Jumping in a file, by picking up the Krell
- -LED indicator which indicates whether XMMS is on, off, stopped,
- playing or paused
- -Themeable buttons, to control XMMS
- -A menu for some misc. XMMS-commands
diff --git a/audio/gkrellm1-xmms/Makefile b/audio/gkrellm1-xmms/Makefile
deleted file mode 100644
index b5d041ad929..00000000000
--- a/audio/gkrellm1-xmms/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2007/02/22 19:01:13 wiz Exp $
-
-DISTNAME= gkrellmms-0.5.6
-PKGNAME= gkrellm-xmms-0.5.6
-PKGREVISION= 7
-CATEGORIES= audio
-MASTER_SITES= http://gkrellm.luon.net/files/
-
-MAINTAINER= damon@NetBSD.org
-HOMEPAGE= http://gkrellm.luon.net/gkrellmms.phtml
-COMMENT= GKrellM xmms plugin
-
-WRKSRC= ${WRKDIR}/gkrellmms
-
-pre-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../sysutils/gkrellm1/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gkrellm1-xmms/PLIST b/audio/gkrellm1-xmms/PLIST
deleted file mode 100644
index c34b8230abc..00000000000
--- a/audio/gkrellm1-xmms/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/24 22:44:35 cube Exp $
-lib/gkrellm/plugins/gkrellmms.so
diff --git a/audio/gkrellm1-xmms/distinfo b/audio/gkrellm1-xmms/distinfo
deleted file mode 100644
index 13dbc27ac95..00000000000
--- a/audio/gkrellm1-xmms/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:46 agc Exp $
-
-SHA1 (gkrellmms-0.5.6.tar.gz) = a657f47c5e8f5a874c0ad0b91e238147065593bc
-RMD160 (gkrellmms-0.5.6.tar.gz) = aae09db9b58ad97bb4faa9f2aaad773c564c8a7a
-Size (gkrellmms-0.5.6.tar.gz) = 27249 bytes
-SHA1 (patch-aa) = f0b0c9266046bcea9b97fd9ae57f41b595d1eb11
diff --git a/audio/gkrellm1-xmms/patches/patch-aa b/audio/gkrellm1-xmms/patches/patch-aa
deleted file mode 100644
index 6bc30784124..00000000000
--- a/audio/gkrellm1-xmms/patches/patch-aa
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/02/24 22:44:35 cube Exp $
-
---- Makefile.orig Sat Jan 20 15:28:38 2001
-+++ Makefile
-@@ -10,14 +10,16 @@
- XMMS_INCLUDE = `xmms-config --cflags`
- XMMS_LIB = `xmms-config --libs`
-
--FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE)
-+CFLAGS += -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE)
- LIBS = $(GTK_LIB) $(IMLIB_LIB) $(XMMS_LIB)
- LFLAGS = -shared -lpthread
-
--CC = gcc $(CFLAGS) $(FLAGS)
-+CC = gcc $(CFLAGS)
-
- OBJS = gkrellmms.o options.o playlist.o
-
-+all: $(BIN_FILENAME).so
-+
- $(BIN_FILENAME).so: $(OBJS)
- $(CC) $(OBJS) -o $(BIN_FILENAME).so $(LFLAGS) $(LIBS)
-
-@@ -25,7 +27,7 @@
- rm -f *.o core *.so* *.bak *~
-
- install:
-- install -c -s -m 755 $(BIN_FILENAME).so /usr/share/gkrellm/plugins
-+ install -c -s -m 644 $(BIN_FILENAME).so ${PREFIX}/lib/gkrellm/plugins
-
- gkrellmms.c.o: gkrellmms.c
- options.c.o: options.c
diff --git a/audio/glurp/DESCR b/audio/glurp/DESCR
deleted file mode 100644
index 3df9dfbb4a0..00000000000
--- a/audio/glurp/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-A GTK2-based musicpd client with a simple and clean interface.
-
-Features include:
- * Support for loading/saving playlists
- * A file browser
- * Playlist quicksearch
- * Supports streams in MPD (MPD 0.11.0 and newer)
- * ID3 Information
- * Single window interface, with possibility to hide the playlist
- * Support for enabling and disabling MPD outputs (MPD 0.12.0 and newer)
diff --git a/audio/glurp/Makefile b/audio/glurp/Makefile
deleted file mode 100644
index 70020af0721..00000000000
--- a/audio/glurp/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2006/07/05 05:37:39 jlam Exp $
-#
-
-DISTNAME= glurp-0.11.6
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=glurp/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.musicpd.org/glurp.shtml
-COMMENT= Graphical GTK+2-based client for musicpd
-
-GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.1
-USE_TOOLS+= intltool pkg-config
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/glurp/PLIST b/audio/glurp/PLIST
deleted file mode 100644
index 8f9a7305256..00000000000
--- a/audio/glurp/PLIST
+++ /dev/null
@@ -1,21 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/15 01:00:05 xtraeme Exp $
-bin/glurp
-share/glurp/glurp.glade
-share/glurp/pixmaps/add.png
-share/glurp/pixmaps/config.png
-share/glurp/pixmaps/media-audiofile.png
-share/glurp/pixmaps/offline.png
-share/glurp/pixmaps/online.png
-share/glurp/pixmaps/outputs.png
-share/glurp/pixmaps/player-next.png
-share/glurp/pixmaps/player-pause.png
-share/glurp/pixmaps/player-play.png
-share/glurp/pixmaps/player-prev.png
-share/glurp/pixmaps/player-random.png
-share/glurp/pixmaps/player-repeat.png
-share/glurp/pixmaps/player-stop.png
-share/glurp/pixmaps/playlist.png
-share/glurp/pixmaps/playlists.png
-share/glurp/pixmaps/remove.png
-@dirrm share/glurp/pixmaps
-@dirrm share/glurp
diff --git a/audio/glurp/distinfo b/audio/glurp/distinfo
deleted file mode 100644
index 226768fb943..00000000000
--- a/audio/glurp/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/15 01:00:05 xtraeme Exp $
-
-SHA1 (glurp-0.11.6.tar.gz) = 5ded37b3573b4f486addd60f96875e52803d5434
-RMD160 (glurp-0.11.6.tar.gz) = 4f12249b5830374ec874e7ce28d92d317c03e142
-Size (glurp-0.11.6.tar.gz) = 138603 bytes
-SHA1 (patch-aa) = d7f7a0d9aa8a46c1d711abf93cc3dbf6b250365f
diff --git a/audio/glurp/patches/patch-aa b/audio/glurp/patches/patch-aa
deleted file mode 100644
index ee2702003d6..00000000000
--- a/audio/glurp/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/10/15 01:00:05 xtraeme Exp $
-
---- src/comm.c.orig 2005-06-05 15:44:09.000000000 +0000
-+++ src/comm.c
-@@ -20,6 +20,7 @@
-
- */
-
-+#include <stdlib.h>
- #include <glib.h>
- #include <gtk/gtk.h>
- #include <glade/glade.h>
diff --git a/audio/gmp3info/DESCR b/audio/gmp3info/DESCR
deleted file mode 100644
index 3bf7996fa18..00000000000
--- a/audio/gmp3info/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-MP3Info is a little utility used to read and modify the ID3 tags of
-MP3 files. MP3Info can also display various techincal aspects of an
-MP3 file including playing time, bit-rate, sampling frequency and
-other attributes in a pre-defined or user-specifiable output format.
diff --git a/audio/gmp3info/Makefile b/audio/gmp3info/Makefile
deleted file mode 100644
index ec666f87121..00000000000
--- a/audio/gmp3info/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.23 2006/02/05 23:08:08 joerg Exp $
-
-DISTNAME= mp3info-0.8.4
-PKGNAME= g${DISTNAME}
-PKGREVISION= 4
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/mp3info/ \
- ${MASTER_SITE_SUNSITE:=apps/sound/mp3-utils/mp3info/}
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= tron@NetBSD.org
-HOMEPAGE= http://www.ibiblio.org/mp3info/
-COMMENT= Utility to read and modify the ID3 tags of MP3 files
-
-CONFLICTS= mp3info-[0-9]*
-
-# wgetnstr()
-INCOMPAT_CURSES= NetBSD-1.5-* NetBSD-1.5.*-* NetBSD-1.5[A-U]-*
-
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gmp3info/PLIST b/audio/gmp3info/PLIST
deleted file mode 100644
index dd1a9399f6a..00000000000
--- a/audio/gmp3info/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:16:38 zuntum Exp $
-bin/gmp3info
-bin/mp3info
-man/man1/mp3info.1
diff --git a/audio/gmp3info/distinfo b/audio/gmp3info/distinfo
deleted file mode 100644
index 93815448d41..00000000000
--- a/audio/gmp3info/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 20:39:46 agc Exp $
-
-SHA1 (mp3info-0.8.4.tgz) = a291aa1c3c216f838f85c1148adbb69f7bf31d80
-RMD160 (mp3info-0.8.4.tgz) = 265db8a8c32956b485c4af8aa42f2f29d4bb0825
-Size (mp3info-0.8.4.tgz) = 38773 bytes
-SHA1 (patch-aa) = 8d371ae15a05bd3d4f52ad0b850b9e739fcb0b54
-SHA1 (patch-ab) = 7b96582d8b0681383afacb89c3ca968b3d6b24c4
diff --git a/audio/gmp3info/patches/patch-aa b/audio/gmp3info/patches/patch-aa
deleted file mode 100644
index bdb78044d55..00000000000
--- a/audio/gmp3info/patches/patch-aa
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/09/21 00:44:10 jlam Exp $
-
---- Makefile.orig Fri Aug 18 17:42:22 2000
-+++ Makefile
-@@ -28,9 +28,8 @@
- # bindir = where binaries get installed (default = /usr/local/bin)
- # mandir = where the manual page gets installed (default = /usr/local/man/man1)
-
--prefix=/usr/local
--bindir=${prefix}/bin
--mandir = $(prefix)/man/man1
-+bindir=$(PREFIX)/bin
-+mandir = $(PREFIX)/man/man1
-
- # No changes necessary below this line
-
-@@ -43,9 +42,9 @@
- INSTALL = /usr/bin/install -c
- STRIP = strip
-
--LIBS = -lncurses
--CC = gcc
--CFLAGS = -g -O2 -Wall
-+LIBS = -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib -lncurses
-+#CC = gcc
-+#CFLAGS = -g -O2 -Wall
-
- all: mp3info gmp3info doc
-
-@@ -69,11 +68,9 @@
- $(RM) -f mp3info.txt
-
- install: mp3info gmp3info
-- $(STRIP) mp3info
-- $(INSTALL) mp3info $(bindir)/mp3info
-- $(STRIP) gmp3info
-- $(INSTALL) gmp3info $(bindir)/gmp3info
-- $(INSTALL) mp3info.1 $(mandir)/mp3info.1
-+ $(BSD_INSTALL_PROGRAM) mp3info $(bindir)/mp3info
-+ $(BSD_INSTALL_PROGRAM) gmp3info $(bindir)/gmp3info
-+ $(BSD_INSTALL_DATA) mp3info.1 $(mandir)/mp3info.1
-
- uninstall:
- rm -f $(bindir)/mp3info
diff --git a/audio/gmp3info/patches/patch-ab b/audio/gmp3info/patches/patch-ab
deleted file mode 100644
index 390051b37e4..00000000000
--- a/audio/gmp3info/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/09/21 20:39:27 tron Exp $
-
---- gmp3info.c.orig 2001-07-16 11:17:16.000000000 +0200
-+++ gmp3info.c 2003-09-21 22:36:40.000000000 +0200
-@@ -484,12 +484,12 @@
- }
-
- void about_mp3info(void) {
-- quick_popup(VERSION,"MP3Info
-- An ID3 Tag Editor\n\n
-- Original author: Ricardo Cerqueira <rmc@plug.pt>
-- Current maintainer: Cedric Tefft <cedric@earthling.net>
-- GTK Version: Ricardo Cerqueira <rmc@plug.pt>\n\n
-- Ricardo Cerqueira, Cedric Tefft 1999-2001\n\n");
-+ quick_popup(VERSION,"MP3Info\n"
-+ "An ID3 Tag Editor\n\n\n"
-+ "Original author: Ricardo Cerqueira <rmc@plug.pt>\n"
-+ "Current maintainer: Cedric Tefft <cedric@earthling.net>\n"
-+ "GTK Version: Ricardo Cerqueira <rmc@plug.pt>\n\n\n"
-+ "Ricardo Cerqueira, Cedric Tefft 1999-2001\n\n\n");
- }
-
- /* rmcc has left the building */
diff --git a/audio/gmpc/DESCR b/audio/gmpc/DESCR
deleted file mode 100644
index 04c84df4ed2..00000000000
--- a/audio/gmpc/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-The GNOME Music Player Client is a GTK+ client for remote access,
-control and playlist management of the Music Player Daemon featuring
-ID3 Support and a tray icon for your notification area.
diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
deleted file mode 100644
index 002a5e63ba9..00000000000
--- a/audio/gmpc/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2006/09/16 12:20:35 jmmv Exp $
-#
-
-DISTNAME= gmpc-0.13.0
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= http://download.qballcow.nl/programs/gmpc-0.13/
-
-MAINTAINER= pkg@burningsoda.com
-HOMEPAGE= http://qballcow.nl/?name=gmpc
-COMMENT= GNOME client for the Music Player Daemon
-
-USE_PKGLOCALEDIR= yes
-GNU_CONFIGURE= yes
-USE_TOOLS+= intltool msgfmt pkg-config
-PKGCONFIG_OVERRIDE= data/gmpc.pc.in
-
-USE_DIRS+= xdg-1.1
-
-.include "../../audio/libmpd/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gmpc/PLIST b/audio/gmpc/PLIST
deleted file mode 100644
index b3501975e7b..00000000000
--- a/audio/gmpc/PLIST
+++ /dev/null
@@ -1,34 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2006/04/17 07:07:11 jlam Exp $
-bin/gmpc
-include/gmpc/config1.h
-include/gmpc/cover-art.h
-include/gmpc/plugin.h
-include/gmpc/qthread.h
-share/applications/gmpc.desktop
-share/gmpc/add-browser.glade
-share/gmpc/gmpc-tray.png
-share/gmpc/gmpc.glade
-share/gmpc/gmpc.png
-share/gmpc/icecast.png
-share/gmpc/media-album.png
-share/gmpc/media-artist.png
-share/gmpc/media-audiofile.png
-share/gmpc/media-next.png
-share/gmpc/media-pause.png
-share/gmpc/media-play.png
-share/gmpc/media-playlist.png
-share/gmpc/media-prev.png
-share/gmpc/media-stop.png
-share/gmpc/media-stream.png
-share/gmpc/open-location.glade
-share/gmpc/player-repeat.png
-share/gmpc/player-shuffle.png
-share/gmpc/playlist3.glade
-share/locale/fr/LC_MESSAGES/gmpc.mo
-share/locale/ru/LC_MESSAGES/gmpc.mo
-share/pixmaps/gmpc.png
-lib/pkgconfig/gmpc.pc
-@comment in xdg-dirs: @dirrm share/pixmaps
-@dirrm share/gmpc
-@comment in xdg-dirs: @dirrm share/applications
-@dirrm include/gmpc
diff --git a/audio/gmpc/distinfo b/audio/gmpc/distinfo
deleted file mode 100644
index 8c1d1ffcc1d..00000000000
--- a/audio/gmpc/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.10 2006/05/15 16:52:42 joerg Exp $
-
-SHA1 (gmpc-0.13.0.tar.gz) = 587adeb34786cad639dd426be864fe6be4398db1
-RMD160 (gmpc-0.13.0.tar.gz) = bcc9444346406d6a22a72e994bd183c6ede7c437
-Size (gmpc-0.13.0.tar.gz) = 476926 bytes
-SHA1 (patch-aa) = 14134100c0deb0f3cb031e327f844b1a1154198d
-SHA1 (patch-ab) = 91ed0e58cc8403f7e65df6ed5245b4e1e27ebfb3
-SHA1 (patch-ac) = a88c2782233136e4ad50ba183e5b53278a69b755
-SHA1 (patch-ad) = 5685d0065100b3dcfe96aec773d38d8c70dad783
-SHA1 (patch-ae) = c9e881619a00a037a2b8b8fc6a1e4f26c7a15fe5
-SHA1 (patch-af) = c6993d734c1ac8e8dd41376f50bf31c2abd74036
-SHA1 (patch-ag) = 16a41bf8acfac8738a1cc589aeae102a3f9ccecb
diff --git a/audio/gmpc/patches/patch-aa b/audio/gmpc/patches/patch-aa
deleted file mode 100644
index 0e49c0ca2f4..00000000000
--- a/audio/gmpc/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/04/07 17:40:22 rpaulo Exp $
-
---- src/Makefile.in.orig 2006-04-07 18:20:35.000000000 +0100
-+++ src/Makefile.in 2006-04-07 18:20:45.000000000 +0100
-@@ -198,6 +198,7 @@ LIBS = \
-
-
- LDFLAGS = \
-+ @LDFLAGS@ \
- @EXTRA_LDFLAGS@
-
-
diff --git a/audio/gmpc/patches/patch-ab b/audio/gmpc/patches/patch-ab
deleted file mode 100644
index 883f879990f..00000000000
--- a/audio/gmpc/patches/patch-ab
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/04/07 17:40:22 rpaulo Exp $
-
---- src/main.c.orig 2006-02-14 18:04:43.000000000 +0000
-+++ src/main.c 2006-04-06 21:53:15.000000000 +0100
-@@ -378,6 +378,7 @@ int update_interface ()
- void playlist_changed(MpdObj *mi)
- {
- MpdData *data = NULL;
-+ char *string;
- long long new_playlist_id = mpd_playlist_get_playlist_id(connection);
- /*
- * so I don't have to check all the time
-@@ -387,7 +388,7 @@ void playlist_changed(MpdObj *mi)
- gchar buffer[1024];
- debug_printf(DEBUG_INFO, "playlist changed length: %i %i\n",info.playlist_length, mpd_playlist_get_playlist_length(mi));
- old_length = info.playlist_length;
-- char *string = cfg_get_single_value_as_string_with_default(config,
-+ string = cfg_get_single_value_as_string_with_default(config,
- "playlist","markup", DEFAULT_PLAYLIST_MARKUP);
-
- data = mpd_playlist_get_changes(mi,info.playlist_id);
-@@ -804,6 +805,7 @@ void password_dialog(int failed)
- void error_callback(MpdObj *mi, int error_id, char *error_msg, gpointer data)
- {
- int autoconnect = cfg_get_single_value_as_int_with_default(config, "connection","autoconnect", DEFAULT_AUTOCONNECT);
-+ GtkWidget *dialog;
- /* if we are not connected we show a reconnect */
- if(!mpd_check_connected(mi))
- {
-@@ -816,7 +818,7 @@ void error_callback(MpdObj *mi, int erro
- gchar *path = gmpc_get_full_glade_path("gmpc.glade");
- xml_error_window = glade_xml_new(path,"error_dialog",NULL);
- g_free(path);
-- GtkWidget *dialog = glade_xml_get_widget(xml_error_window, "error_dialog");
-+ dialog = glade_xml_get_widget(xml_error_window, "error_dialog");
- gtk_label_set_markup(GTK_LABEL(glade_xml_get_widget(xml_error_window,"em_label")), str);
- gtk_widget_show_all(dialog);
- g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(error_window_destroy), GINT_TO_POINTER(autoconnect));
-@@ -842,7 +844,7 @@ void error_callback(MpdObj *mi, int erro
- }
- else {
-
-- GtkWidget *dialog = gtk_message_dialog_new_with_markup(NULL,
-+ dialog = gtk_message_dialog_new_with_markup(NULL,
- GTK_DIALOG_MODAL,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
diff --git a/audio/gmpc/patches/patch-ac b/audio/gmpc/patches/patch-ac
deleted file mode 100644
index 54e187d29ec..00000000000
--- a/audio/gmpc/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/12/18 20:24:46 rillig Exp $
-
-Keywords: c90
-
---- src/misc.c.orig Tue May 3 10:40:16 2005
-+++ src/misc.c Sun Dec 18 21:06:07 2005
-@@ -87,12 +87,14 @@ gchar * format_time(unsigned long second
- int houres = (seconds % 86400)/3600;
- int minutes = (seconds % 3600)/60;
- char *ret;
-+ GString *str;
-+
- if(seconds == 0)
- {
- GString *str = g_string_new(NULL);
- return str->str;
- }
-- GString *str = g_string_new(" Total time: ");
-+ str = g_string_new(" Total time: ");
- if(days != 0)
- {
- g_string_append_printf(str, "%i days ", days);
diff --git a/audio/gmpc/patches/patch-ad b/audio/gmpc/patches/patch-ad
deleted file mode 100644
index 03573cf2f0e..00000000000
--- a/audio/gmpc/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/04/07 17:40:22 rpaulo Exp $
-
---- src/player.c.orig 2006-02-06 18:46:50.000000000 +0000
-+++ src/player.c 2006-04-06 21:49:45.000000000 +0100
-@@ -300,6 +300,8 @@ int msg_pop_popup()
-
- int update_player()
- {
-+ GtkRange *scale;
-+
- if(!xml_main_window) return FALSE;
- if(!mpd_check_connected(connection)) return FALSE;
- /* things that only need to be updated during playing */
-@@ -308,7 +310,7 @@ int update_player()
- int elapsedTime = mpd_status_get_elapsed_song_time(connection);
- /* update the progress bar */
- if(!seek){
-- GtkRange *scale = (GtkRange *)glade_xml_get_widget(xml_main_window, "progress_slider");
-+ scale = (GtkRange *)glade_xml_get_widget(xml_main_window, "progress_slider");
- gdouble prog = ((double)elapsedTime/(double)totalTime)*100;
- gtk_range_set_value(scale, prog);
- }
diff --git a/audio/gmpc/patches/patch-ae b/audio/gmpc/patches/patch-ae
deleted file mode 100644
index 25f55bc9ed5..00000000000
--- a/audio/gmpc/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/04/28 11:09:37 joerg Exp $
-
---- src/cover-art-manager.c.orig 2006-04-28 10:34:30.000000000 +0000
-+++ src/cover-art-manager.c
-@@ -13,7 +13,6 @@
-
- GladeXML *cam_pref_xml = NULL;
- extern config_obj *cover_index;
--extern int errno;
-
- void cover_art_manager_close(GtkWidget *widget);
- void cover_art_pref_construct(GtkWidget *container);
diff --git a/audio/gmpc/patches/patch-af b/audio/gmpc/patches/patch-af
deleted file mode 100644
index 0d5965c1e58..00000000000
--- a/audio/gmpc/patches/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-af,v 1.2 2006/04/07 17:40:22 rpaulo Exp $
-
---- src/playlist3.c.orig 2006-02-15 21:09:17.000000000 +0000
-+++ src/playlist3.c 2006-04-06 21:51:40.000000000 +0100
-@@ -105,10 +105,12 @@ int pl3_cat_get_selected_browser()
- void pl3_initialize_tree()
- {
- int i;
-+ GtkTreePath *path;
-+ GtkTreeSelection *sel;
- if(pl3_xml == NULL) return;
-
-- GtkTreePath *path = gtk_tree_path_new_from_string("0");
-- GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(glade_xml_get_widget(pl3_xml, "cat_tree")));
-+ path = gtk_tree_path_new_from_string("0");
-+ sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(glade_xml_get_widget(pl3_xml, "cat_tree")));
- if((old_type&PLUGIN_ID_MARK || old_type&PLUGIN_ID_INTERNALL) != 0)
- {
- if(old_type >= 0)
diff --git a/audio/gmpc/patches/patch-ag b/audio/gmpc/patches/patch-ag
deleted file mode 100644
index 275f8d976e1..00000000000
--- a/audio/gmpc/patches/patch-ag
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/04/28 11:09:37 joerg Exp $
-
---- src/TreeSearchWidget.c.orig 2006-04-28 10:38:32.000000000 +0000
-+++ src/TreeSearchWidget.c
-@@ -1,3 +1,4 @@
-+#include <sys/types.h>
- #include <gtk/gtk.h>
- #include <gtk/gtksignal.h>
- #include <gdk/gdkkeysyms.h>
diff --git a/audio/gnome-audio/DESCR b/audio/gnome-audio/DESCR
deleted file mode 100644
index 6b842cf8967..00000000000
--- a/audio/gnome-audio/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-This package contains the GNOME audio files.
-
-From the GNOME home page:
-
-GNOME stands for GNU Network Object Model Environment. The GNOME
-project intends to build a complete, user-friendly desktop based
-entirely on free software. GNOME is part of the GNU project, and
-GNOME is part of the OpenSource(tm) movement. The desktop will
-consist of small utilities and larger applications which share a
-consistent look and feel. GNOME uses GTK+ as the GUI toolkit for
-all GNOME-compliant applications.
diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile
deleted file mode 100644
index 2b89bd99367..00000000000
--- a/audio/gnome-audio/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2007/01/26 18:28:24 joerg Exp $
-#
-
-DISTNAME= gnome-audio-2.0.0
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-audio/2.0/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= rh@NetBSD.org
-HOMEPAGE= http://www.gnome.org/
-COMMENT= Set of audio files for GNOME
-
-NO_CONFIGURE= YES
-NO_BUILD= YES
-USE_DIRS+= xdg-1.1
-
-do-install:
- cd ${WRKSRC}/sounds && for f in *.wav */*.wav; do \
- dst=`${DIRNAME} $$f`; \
- ${INSTALL_DATA_DIR} ${PREFIX}/share/sounds/$$dst; \
- ${INSTALL_DATA} $$f ${PREFIX}/share/sounds/$$f; \
- done
- ${RM} -f ${PREFIX}/share/sounds/login.wav
- ${RM} -f ${PREFIX}/share/sounds/logout.wav
- ${LN} -fs startup3.wav ${PREFIX}/share/sounds/login.wav
- ${LN} -fs shutdown1.wav ${PREFIX}/share/sounds/logout.wav
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gnome-audio/PLIST b/audio/gnome-audio/PLIST
deleted file mode 100644
index 373a7bc5d7b..00000000000
--- a/audio/gnome-audio/PLIST
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2004/03/08 19:40:36 jmmv Exp $
-share/sounds/card_shuffle.wav
-share/sounds/email.wav
-share/sounds/error.wav
-share/sounds/generic.wav
-share/sounds/gtk-events/activate.wav
-share/sounds/gtk-events/clicked.wav
-share/sounds/gtk-events/toggled.wav
-share/sounds/info.wav
-share/sounds/login.wav
-share/sounds/logout.wav
-share/sounds/panel/slide.wav
-share/sounds/phone.wav
-share/sounds/question.wav
-share/sounds/shutdown1.wav
-share/sounds/startup3.wav
-share/sounds/warning.wav
-@dirrm share/sounds/panel
-@dirrm share/sounds/gtk-events
diff --git a/audio/gnome-audio/distinfo b/audio/gnome-audio/distinfo
deleted file mode 100644
index e620d363094..00000000000
--- a/audio/gnome-audio/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:46 agc Exp $
-
-SHA1 (gnome-audio-2.0.0.tar.bz2) = 488f6295e2e1f54a8988dd7e71ab673cd7fc8a00
-RMD160 (gnome-audio-2.0.0.tar.bz2) = 90baaffd9ac5159ce5851094ad9069d51dea9592
-Size (gnome-audio-2.0.0.tar.bz2) = 1401319 bytes
diff --git a/audio/gnome-speech/DESCR b/audio/gnome-speech/DESCR
deleted file mode 100644
index cbd6c24ce38..00000000000
--- a/audio/gnome-speech/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-GNOME 2 Speech is a simple general API for producing text-to-speech output.
diff --git a/audio/gnome-speech/Makefile b/audio/gnome-speech/Makefile
deleted file mode 100644
index 09faf78a8fc..00000000000
--- a/audio/gnome-speech/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.32 2007/02/22 19:26:05 wiz Exp $
-#
-
-DISTNAME= gnome-speech-0.4.6
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-speech/0.4/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.gnome.org/
-COMMENT= GNOME 2 text-to-speech API
-
-USE_TOOLS+= gmake msgfmt pkg-config
-USE_PKGLOCALEDIR= yes
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-
-# Disable Java support.
-CONFIGURE_ARGS+= JAVAC=no JAVA=no IDLJ=no JAB=no
-
-PKGCONFIG_OVERRIDE+= gnome-speech-1.0.pc.in
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../net/ORBit2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gnome-speech/PLIST b/audio/gnome-speech/PLIST
deleted file mode 100644
index 7492d8ec04a..00000000000
--- a/audio/gnome-speech/PLIST
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:15 jlam Exp $
-bin/festival-synthesis-driver
-bin/test-speech
-include/gnome-speech-1.0/gnome-speech/GNOME_Speech.h
-include/gnome-speech-1.0/gnome-speech/gnome-speech.h
-include/gnome-speech-1.0/gnome-speech/speaker.h
-lib/bonobo/servers/GNOME_Speech_SynthesisDriver_Festival.server
-lib/libgnomespeech.la
-lib/orbit-2.0/GNOME_Speech_module.la
-lib/pkgconfig/gnome-speech-1.0.pc
-share/idl/gnome-speech-1.0/GNOME_Speech.idl
-share/idl/gnome-speech-1.0/GNOME_Speech_Speaker.idl
-share/idl/gnome-speech-1.0/GNOME_Speech_SpeechCallback.idl
-share/idl/gnome-speech-1.0/GNOME_Speech_SynthesisDriver.idl
-@dirrm share/idl/gnome-speech-1.0
-@comment in ORBit2: @dirrm share/idl
-@comment in ORBit2: @dirrm lib/orbit-2.0
-@comment in libbonobo: @dirrm lib/bonobo/servers
-@dirrm include/gnome-speech-1.0/gnome-speech
-@dirrm include/gnome-speech-1.0
diff --git a/audio/gnome-speech/buildlink3.mk b/audio/gnome-speech/buildlink3.mk
deleted file mode 100644
index 8cf40439e4b..00000000000
--- a/audio/gnome-speech/buildlink3.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:36 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-GNOME_SPEECH_BUILDLINK3_MK:= ${GNOME_SPEECH_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= gnome-speech
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-speech}
-BUILDLINK_PACKAGES+= gnome-speech
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-speech
-
-.if !empty(GNOME_SPEECH_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.gnome-speech+= gnome-speech>=0.3.2
-BUILDLINK_ABI_DEPENDS.gnome-speech+= gnome-speech>=0.3.9nb2
-BUILDLINK_PKGSRCDIR.gnome-speech?= ../../audio/gnome-speech
-.endif # GNOME_SPEECH_BUILDLINK3_MK
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../net/ORBit2/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/gnome-speech/distinfo b/audio/gnome-speech/distinfo
deleted file mode 100644
index 1b5c5b4ef25..00000000000
--- a/audio/gnome-speech/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.17 2006/11/28 22:31:21 drochner Exp $
-
-SHA1 (gnome-speech-0.4.6.tar.bz2) = e2896cb05f0247a3aa444a585b8847fb06623f46
-RMD160 (gnome-speech-0.4.6.tar.bz2) = 4e6ca040f590492aa58b40ed6cd8b690b05fcde7
-Size (gnome-speech-0.4.6.tar.bz2) = 311080 bytes
-SHA1 (patch-aa) = 039606f4e47be7d6e812687504a577fc149b5722
-SHA1 (patch-ab) = cb32d023cfdd791d779c772513c5a307d6ef654d
diff --git a/audio/gnome-speech/patches/patch-aa b/audio/gnome-speech/patches/patch-aa
deleted file mode 100644
index a5e963518cf..00000000000
--- a/audio/gnome-speech/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/10/14 21:50:45 jmmv Exp $
-
-Added some necessary header files.
-
---- drivers/festival/festivalsynthesisdriver.c.orig Tue Mar 8 14:10:23 2005
-+++ drivers/festival/festivalsynthesisdriver.c Fri Mar 11 09:47:37 2005
-@@ -25,8 +25,10 @@
- *
- */
-
--#include <string.h>
- #include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#include <string.h>
- #include <sys/wait.h>
- #include <signal.h>
- #include <unistd.h>
diff --git a/audio/gnome-speech/patches/patch-ab b/audio/gnome-speech/patches/patch-ab
deleted file mode 100644
index 924e25b424a..00000000000
--- a/audio/gnome-speech/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/10/10 20:14:51 rillig Exp $
-
---- configure.orig 2006-10-10 21:31:46.000000000 +0200
-+++ configure 2006-10-10 22:14:15.000000000 +0200
-@@ -20953,7 +20953,7 @@ if test "${with_theta_dir+set}" = set; t
- withval=$with_theta_dir;
- fi
-
--if test x$with_theta_dir == x ; then
-+if test x$with_theta_dir = x ; then
- # Check default location /opt/theta
-
- with_theta_dir="/opt/theta"
diff --git a/audio/gnome-vfs2-cdda/DESCR b/audio/gnome-vfs2-cdda/DESCR
deleted file mode 100644
index 6261fbcf7ef..00000000000
--- a/audio/gnome-vfs2-cdda/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-GNOME VFS provides an abstraction layer of the file system; applications
-use this layer to access many different protocols and simulate that they
-are part of the local file system.
-
-This package provides the cdda module for GNOME VFS, which allows it to
-retrieve audio tracks from CDDA capable CDROM drives.
diff --git a/audio/gnome-vfs2-cdda/Makefile b/audio/gnome-vfs2-cdda/Makefile
deleted file mode 100644
index b51e536f4ce..00000000000
--- a/audio/gnome-vfs2-cdda/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2006/11/24 17:31:40 drochner Exp $
-#
-
-GNOME_VFS2_NAME= cdda
-CATEGORIES= audio
-
-CPPFLAGS+= -I${BUILDLINK_PREFIX.cdparanoia}/include/cdparanoia
-
-EGFILES+= modules/cdda-module.conf
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/modules/cdda-module.conf ${EGDIR}/modules
-
-.include "../../sysutils/gnome-vfs2/Makefile.common"
-
-.include "../../audio/cdparanoia/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gnome-vfs2-cdda/PLIST b/audio/gnome-vfs2-cdda/PLIST
deleted file mode 100644
index 886eea7cf1a..00000000000
--- a/audio/gnome-vfs2-cdda/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:15 jlam Exp $
-lib/gnome-vfs-2.0/modules/libcdda.la
-share/examples/gnome-vfs-2.0/modules/cdda-module.conf
-@comment in gnome-vfs2: @dirrm share/examples/gnome-vfs-2.0/modules
-@comment in gnome-vfs2: @dirrm lib/gnome-vfs-2.0/modules
diff --git a/audio/gogo/DESCR b/audio/gogo/DESCR
deleted file mode 100644
index 47ddc771c8e..00000000000
--- a/audio/gogo/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This is gogo, a very fast mp3 encoder based on the lame-encoder.
-Its core parts have been rewritten in x86-assembler.
diff --git a/audio/gogo/Makefile b/audio/gogo/Makefile
deleted file mode 100644
index d8df9de816b..00000000000
--- a/audio/gogo/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2006/05/19 16:18:52 rillig Exp $
-#
-
-DISTNAME= gogo239b
-PKGNAME= gogo-2.39.1
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= http://homepage1.nifty.com/herumi/soft/gogo2/src/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://homepage1.nifty.com/herumi/gogo_e.html
-COMMENT= Very fast lame-based mp3 encoder, i386 only
-
-BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm
-
-ONLY_FOR_PLATFORM= *-*-i386
-
-USE_TOOLS+= gmake
-
-RESTRICTED= Source based on patent protected Fraunhofer code
-NO_SRC_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_CDROM= ${RESTRICTED}
-LICENSE= fee-based-commercial-use
-
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OBJECT_FMT} == "a.out")
-MAKE_FLAGS+= ASFLAGS="-f aoutb -D__unix__ -DAOUT ${E3DN}"
-.else
-MAKE_FLAGS+= ASFLAGS="-f elf -D__unix__ ${E3DN}"
-.endif
-
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/gogo ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gogo
- ${INSTALL_DATA} ${WRKSRC}/readme.txt ${PREFIX}/share/doc/gogo
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gogo/PLIST b/audio/gogo/PLIST
deleted file mode 100644
index 9d31efb266a..00000000000
--- a/audio/gogo/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:16:42 zuntum Exp $
-bin/gogo
-share/doc/gogo/readme.txt
-@dirrm share/doc/gogo
diff --git a/audio/gogo/distinfo b/audio/gogo/distinfo
deleted file mode 100644
index 04eae40fc92..00000000000
--- a/audio/gogo/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:46 agc Exp $
-
-SHA1 (gogo239b.tgz) = 9665d73d21314c6945c1f89b4d84f8f56f82d676
-RMD160 (gogo239b.tgz) = 3808683c76cdeb7b065272577258b66294c58a53
-Size (gogo239b.tgz) = 293494 bytes
-SHA1 (patch-aa) = 41639b1c9b7d981991a7e3684540ec96018a6c5e
diff --git a/audio/gogo/patches/patch-aa b/audio/gogo/patches/patch-aa
deleted file mode 100644
index d2ef389a568..00000000000
--- a/audio/gogo/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/08/13 19:01:53 wiz Exp $
-
---- Makefile.orig Fri Apr 28 06:11:32 2000
-+++ Makefile Sun Aug 13 03:56:27 2000
-@@ -81,7 +81,7 @@
- AS=nasm
-
- #if Borland C++ then add -D__BORLANDC__ to ASFLAGS
--ASFLAGS=-f elf -D__unix__ $(E3DN)
-+#ASFLAGS=-f elf -D__unix__ $(E3DN)
- #if FreeBSD 2.x then
- #ASFLAGS = -f aoutb -D__unix__ -DAOUT
-
diff --git a/audio/goom/DESCR b/audio/goom/DESCR
deleted file mode 100644
index 8d78c7e3618..00000000000
--- a/audio/goom/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-A cool visual effects program that runs on almost all multimedia
-players.
diff --git a/audio/goom/Makefile b/audio/goom/Makefile
deleted file mode 100644
index d1e2a89d576..00000000000
--- a/audio/goom/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:28:55 jlam Exp $
-#
-
-DISTNAME= goom-2k4-0-src
-PKGNAME= goom-2004.0
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=goom/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.ios-software.com/index.php3?page=projet&quoi=1&lg=AN
-COMMENT= Visual effects generator for mp3 players
-
-WRKSRC= ${WRKDIR}/goom2k4-0
-USE_PKGLOCALEDIR= yes
-USE_LIBTOOL= yes
-PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgoom2.pc.in
-GNU_CONFIGURE= yes
-GCC_REQD+= 3.3
-USE_TOOLS+= pkg-config
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/goom/PLIST b/audio/goom/PLIST
deleted file mode 100644
index e07b9bf3a2a..00000000000
--- a/audio/goom/PLIST
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/02/20 14:59:24 wiz Exp $
-include/goom/goom.h
-include/goom/goom_config.h
-include/goom/goom_config_param.h
-include/goom/goom_filters.h
-include/goom/goom_graphic.h
-include/goom/goom_plugin_info.h
-include/goom/goom_tools.h
-include/goom/goom_typedefs.h
-include/goom/goom_visual_fx.h
-include/goom/goomsl.h
-include/goom/goomsl_hash.h
-include/goom/goomsl_heap.h
-lib/libgoom2.la
-lib/pkgconfig/libgoom2.pc
-@dirrm include/goom
diff --git a/audio/goom/buildlink3.mk b/audio/goom/buildlink3.mk
deleted file mode 100644
index 9f81f7b3640..00000000000
--- a/audio/goom/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:36 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-GOOM_BUILDLINK3_MK:= ${GOOM_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= goom
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngoom}
-BUILDLINK_PACKAGES+= goom
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}goom
-
-.if !empty(GOOM_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.goom+= goom>=2004.0
-BUILDLINK_PKGSRCDIR.goom?= ../../audio/goom
-.endif # GOOM_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/goom/distinfo b/audio/goom/distinfo
deleted file mode 100644
index 401ff6f9bfc..00000000000
--- a/audio/goom/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/10/31 15:33:19 tv Exp $
-
-SHA1 (goom-2k4-0-src.tar.gz) = 4856b86aadc67676c473a4664c5281bc05df278d
-RMD160 (goom-2k4-0-src.tar.gz) = 280c0db57f437b072a49ff80f5bf85d57892af8e
-Size (goom-2k4-0-src.tar.gz) = 757058 bytes
-SHA1 (patch-aa) = 44b8332db3e7b6ec15fcc7d94d68bd0b884c6e8a
-SHA1 (patch-ab) = 7a703e75ad8d9895c28f6579ee80240f1c2d0cfb
-SHA1 (patch-ac) = 341a075d8a2b41b522fe313ca13f5ca7c5476f6f
diff --git a/audio/goom/patches/patch-aa b/audio/goom/patches/patch-aa
deleted file mode 100644
index fe2cd0837cb..00000000000
--- a/audio/goom/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/02/20 14:59:24 wiz Exp $
-
-Force xmms plugin off.
-
---- configure.orig 2005-02-07 14:49:28.000000000 +0100
-+++ configure
-@@ -20733,6 +20733,7 @@ echo "${ECHO_T}no" >&6
- fi
-
-
-+ HAVE_XMMS="no"
-
-
-
diff --git a/audio/goom/patches/patch-ab b/audio/goom/patches/patch-ab
deleted file mode 100644
index cb49f8b14ae..00000000000
--- a/audio/goom/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/10/31 15:33:19 tv Exp $
-
---- src/filters.c.orig 2005-02-07 08:46:41.000000000 -0500
-+++ src/filters.c
-@@ -18,7 +18,11 @@
- #include <stdlib.h>
- #include <math.h>
- #include <stdio.h>
-+#include <stdlib.h>
-+
-+#if HAVE_INTTYPES_H
- #include <inttypes.h>
-+#endif
-
- #include "goom_filters.h"
- #include "goom_graphic.h"
diff --git a/audio/goom/patches/patch-ac b/audio/goom/patches/patch-ac
deleted file mode 100644
index 5b93e7838f3..00000000000
--- a/audio/goom/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/10/31 15:33:19 tv Exp $
-
---- src/goom_core.c.orig 2005-02-07 08:46:41.000000000 -0500
-+++ src/goom_core.c
-@@ -11,7 +11,10 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+
-+#if HAVE_INTTYPES_H
- #include <inttypes.h>
-+#endif
-
- #include "goom.h"
- #include "goom_tools.h"
diff --git a/audio/gqmpeg-devel/DEINSTALL b/audio/gqmpeg-devel/DEINSTALL
deleted file mode 100644
index 31157154b71..00000000000
--- a/audio/gqmpeg-devel/DEINSTALL
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.1.1.1 2004/11/03 03:21:13 sekiya Exp $
-
-case ${STAGE} in
-POST-DEINSTALL)
- ${CAT} << EOF
-=============================================================================
-If you won't be using ${PKGNAME} any longer, you may want to remove
-any skins that were installed in ${PKG_PREFIX}/share/gqmpeg/skins.
-=============================================================================
-EOF
- ;;
-esac
diff --git a/audio/gqmpeg-devel/DESCR b/audio/gqmpeg-devel/DESCR
deleted file mode 100644
index 445180dcc20..00000000000
--- a/audio/gqmpeg-devel/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-GQmpeg is a frontend to mpg123 with extensive themeability and playlist
-support.
-
-Features:
- - Extensive mpg123 option support.
- - Shuffle, repeat.
- - Shuffle and repeat preferences can be saved in each playlist.
- - Customizable skins, including winamp skin support.
- - A skin can contain an alternative face (shade mode for instance)
- - ID3 tag reading/writing support (v1)
- - Volume controls (can be connected to any available device)
- - Basic file management (move/copy/rename/delete)
- - Tab completion in most dialogs.
- - Presets for playlists.
- - Drag and drop support.
- - Shoutcast (http://server:port) support.
diff --git a/audio/gqmpeg-devel/MESSAGE b/audio/gqmpeg-devel/MESSAGE
deleted file mode 100644
index aebf572c574..00000000000
--- a/audio/gqmpeg-devel/MESSAGE
+++ /dev/null
@@ -1,15 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2004/11/03 03:21:13 sekiya Exp $
-
-If you want other skins, you can download them from
-
- http://gqmpeg.sourceforge.net/mpeg-skin-index.html
-
-Unpack them into the directory $HOME/.gqmpeg/skins, then type
-
- gqmpeg -skin:skindir
-
-to use them, where "skindir" is the directory containing the skin you
-wish to use.
-
-===========================================================================
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
deleted file mode 100644
index db34ae2e8c8..00000000000
--- a/audio/gqmpeg-devel/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2006/04/17 13:46:16 wiz Exp $
-
-DISTNAME= gqmpeg-0.91.1
-PKGREVISION= 5
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqmpeg/}
-
-MAINTAINER= sekiya@NetBSD.org
-HOMEPAGE= http://gqmpeg.sourceforge.net/
-COMMENT= GTK+ front end to mpg123
-
-DEPENDS+= mpg123{,-esound,-nas}>=0.59.18:../../audio/mpg123
-DEPENDS+= vorbis-tools>=1.0.0.6:../../audio/vorbis-tools
-DEPENDS+= xmp>=2.0.2:../../audio/xmp
-
-USE_TOOLS+= msgfmt pkg-config
-USE_DIRS+= gnome2-1.5
-USE_DIRS+= xdg-1.2
-USE_PKGLOCALEDIR= YES
-GNU_CONFIGURE= YES
-
-CONFIGURE_ARGS+= --without-included-gettext
-CONFIGURE_ENV+= GNOME_DATADIR=${PREFIX}/share
-
-.include "options.mk"
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gqmpeg-devel/PLIST b/audio/gqmpeg-devel/PLIST
deleted file mode 100644
index 67fd42b2d72..00000000000
--- a/audio/gqmpeg-devel/PLIST
+++ /dev/null
@@ -1,82 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2006/04/17 07:07:11 jlam Exp $
-bin/gqmpeg
-bin/gqmpeg-shoutcast-plugin.sh
-man/man1/gqmpeg.1
-share/applications/gqmpeg.desktop
-share/gqmpeg/skins/README
-share/gqmpeg/skins/SKIN-SPECS
-share/gqmpeg/skins/mrclean/blue-handle-24.png
-share/gqmpeg/skins/mrclean/blue2-about.png
-share/gqmpeg/skins/mrclean/blue2-round-shadowed.png
-share/gqmpeg/skins/mrclean/blue2-soft-round-7.png
-share/gqmpeg/skins/mrclean/blue2-soft-round-logo.png
-share/gqmpeg/skins/mrclean/btn-expand-toggle-20-h.png
-share/gqmpeg/skins/mrclean/btn-rect-clr-32-eject.png
-share/gqmpeg/skins/mrclean/btn-rect-clr-32-stop.png
-share/gqmpeg/skins/mrclean/btn-rect-clr-32r-pause.png
-share/gqmpeg/skins/mrclean/btn-rect-clr-32r-play.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-16-left.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-16-plus.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-16-right.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-01.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-02.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-03.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-04.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-05.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-06.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-07.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-08.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-09.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-10.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-dn.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-eye.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-left.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-list.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-max.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-min.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-right.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-toggle.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-up.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-x.png
-share/gqmpeg/skins/mrclean/bubble-fly.png
-share/gqmpeg/skins/mrclean/bubble-slider-16-h.png
-share/gqmpeg/skins/mrclean/bubble-slider-16-v.png
-share/gqmpeg/skins/mrclean/dial-ball2.png
-share/gqmpeg/skins/mrclean/dial-clip2.png
-share/gqmpeg/skins/mrclean/dial-eye.png
-share/gqmpeg/skins/mrclean/digit-digital-15-aa.png
-share/gqmpeg/skins/mrclean/digit-digital-24-aa.png
-share/gqmpeg/skins/mrclean/focus-rect-border-1.png
-share/gqmpeg/skins/mrclean/focus-rect-border-7b.png
-share/gqmpeg/skins/mrclean/item-ab-static.png
-share/gqmpeg/skins/mrclean/item-clear-load-aa.png
-share/gqmpeg/skins/mrclean/item-colon-15.png
-share/gqmpeg/skins/mrclean/item-colon-24.png
-share/gqmpeg/skins/mrclean/item-pda-minus.png
-share/gqmpeg/skins/mrclean/item-pda-random-static.png
-share/gqmpeg/skins/mrclean/item-pda-repeat-static.png
-share/gqmpeg/skins/mrclean/item-repeat1-static.png
-share/gqmpeg/skins/mrclean/item-volume-static.png
-share/gqmpeg/skins/mrclean/list-clear-back.png
-share/gqmpeg/skins/mrclean/list-clear-flags.png
-share/gqmpeg/skins/mrclean/list-clear.png
-share/gqmpeg/skins/mrclean/list-menu-flags.png
-share/gqmpeg/skins/mrclean/list-row-clear.png
-share/gqmpeg/skins/mrclean/skindata
-share/gqmpeg/skins/mrclean/skindata_about
-share/gqmpeg/skins/mrclean/skindata_compact
-share/gqmpeg/skins/mrclean/skindata_extra
-share/gqmpeg/skins/mrclean/skindata_flyby
-share/gqmpeg/skins/mrclean/skindata_menu
-share/gqmpeg/skins/mrclean/skindata_playlist
-share/gqmpeg/skins/mrclean/skindata_submenu
-share/locale/cs/LC_MESSAGES/gqmpeg.mo
-share/locale/de/LC_MESSAGES/gqmpeg.mo
-share/locale/fi/LC_MESSAGES/gqmpeg.mo
-share/locale/fr/LC_MESSAGES/gqmpeg.mo
-share/locale/ja/LC_MESSAGES/gqmpeg.mo
-share/locale/pt_BR/LC_MESSAGES/gqmpeg.mo
-share/locale/zh_TW/LC_MESSAGES/gqmpeg.mo
-share/pixmaps/gqmpeg.png
-@dirrm share/gqmpeg/skins/mrclean
-@unexec ${RMDIR} -p %D/share/gqmpeg/skins 2> /dev/null || ${TRUE}
diff --git a/audio/gqmpeg-devel/distinfo b/audio/gqmpeg-devel/distinfo
deleted file mode 100644
index e62f8d33f77..00000000000
--- a/audio/gqmpeg-devel/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/12/12 00:11:52 joerg Exp $
-
-SHA1 (gqmpeg-0.91.1.tar.gz) = 23d81dbf49a2d44ceda58bea2b324716b42edbb5
-RMD160 (gqmpeg-0.91.1.tar.gz) = 7e10b097bc2af3010f43c47a1f905e6103c8dd5f
-Size (gqmpeg-0.91.1.tar.gz) = 1078478 bytes
-SHA1 (patch-aa) = a5f2f8c90a674019055c6d6d76b1ca5d708ea407
-SHA1 (patch-ab) = 2713a8e627acf2a52a77b42fc851062e6d60fa69
-SHA1 (patch-ac) = 0ff360b28488c30bebf23b52f0d641de9b6a1ea0
-SHA1 (patch-ad) = 92df0981620929511eb90a09159f5d97411f79f4
diff --git a/audio/gqmpeg-devel/options.mk b/audio/gqmpeg-devel/options.mk
deleted file mode 100644
index fec94b08020..00000000000
--- a/audio/gqmpeg-devel/options.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2005/10/05 13:29:49 wiz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.gqmpeg
-PKG_SUPPORTED_OPTIONS= gqmpeg-japanese gqmpeg-russian
-PKG_SUGGESTED_OPTIONS= gqmpeg-japanese gqmpeg-russian
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mgqmpeg-japanese)
-CONFIGURE_ARGS+= --enable-japanese
-.endif
-
-.if !empty(PKG_OPTIONS:Mgqmpeg-russian)
-CONFIGURE_ARGS+= --enable-russian
-.endif
diff --git a/audio/gqmpeg-devel/patches/patch-aa b/audio/gqmpeg-devel/patches/patch-aa
deleted file mode 100644
index 0c61264ba0a..00000000000
--- a/audio/gqmpeg-devel/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/12/08 08:57:56 minskim Exp $
-
---- configure.in.orig 2004-04-07 08:05:11.000000000 -0500
-+++ configure.in
-@@ -75,6 +75,8 @@ dnl Test for libpng
-
- AC_SUBST(LIBPNG)
-
-+AC_CHECK_HEADERS([sys/statvfs.h])
-+
- dnl Video4Linux
- AC_CHECK_HEADER(linux/videodev.h, AC_DEFINE(HAVE_VIDEO4LINUX))
-
diff --git a/audio/gqmpeg-devel/patches/patch-ab b/audio/gqmpeg-devel/patches/patch-ab
deleted file mode 100644
index 24837184b23..00000000000
--- a/audio/gqmpeg-devel/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/12/08 08:57:56 minskim Exp $
-
---- config.h.in.orig 2004-04-07 08:08:10.000000000 -0500
-+++ config.h.in
-@@ -164,6 +164,9 @@
- /* Define to 1 if you have the <sys/param.h> header file. */
- #undef HAVE_SYS_PARAM_H
-
-+/* Define to 1 if you have the <sys/statvfs.h> header file. */
-+#undef HAVE_SYS_STATVFS_H
-+
- /* Define to 1 if you have the <sys/stat.h> header file. */
- #undef HAVE_SYS_STAT_H
-
diff --git a/audio/gqmpeg-devel/patches/patch-ac b/audio/gqmpeg-devel/patches/patch-ac
deleted file mode 100644
index 30a8816c86e..00000000000
--- a/audio/gqmpeg-devel/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/12/08 08:57:56 minskim Exp $
-
---- configure.orig 2004-04-07 08:07:48.000000000 -0500
-+++ configure
-@@ -4342,7 +4342,7 @@ echo "$as_me: error: GTK+ >= 2.2.0 not i
-
-
- for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-- inttypes.h stdint.h unistd.h
-+ inttypes.h stdint.h unistd.h sys/statvfs.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_header" >&5
diff --git a/audio/gqmpeg-devel/patches/patch-ad b/audio/gqmpeg-devel/patches/patch-ad
deleted file mode 100644
index d4625a38d06..00000000000
--- a/audio/gqmpeg-devel/patches/patch-ad
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2005/12/12 00:11:52 joerg Exp $
-
---- src/cpu_perc.c.orig 2002-05-07 02:50:10.000000000 +0000
-+++ src/cpu_perc.c
-@@ -45,6 +45,9 @@
- #include <fcntl.h>
- #include <sys/mount.h>
- #endif
-+#ifdef HAVE_SYS_STATVFS_H
-+#include <sys/statvfs.h>
-+#endif
-
- gfloat check_child_cpu_usage(int childs_pid)
- {
-@@ -66,7 +69,11 @@ gfloat check_child_cpu_usage(int childs_
- /* find where the proc fs is mounted, some strange people could mount it
- in another place than /proc, it can even be not mounted at all */
- {
-+#if defined(HAVE_SYS_STATVFS_H) && !defined(__DragonFly__)
-+ struct statvfs *mntbufp;
-+#else
- struct statfs *mntbufp;
-+#endif
- int fs_count;
- int procfs_found = 0;
-
diff --git a/audio/gqmpeg-skins/DESCR b/audio/gqmpeg-skins/DESCR
deleted file mode 100644
index 349b02b2d98..00000000000
--- a/audio/gqmpeg-skins/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Lots of skins for the world's greatest mp3 player.
diff --git a/audio/gqmpeg-skins/Makefile b/audio/gqmpeg-skins/Makefile
deleted file mode 100644
index 29f9446c923..00000000000
--- a/audio/gqmpeg-skins/Makefile
+++ /dev/null
@@ -1,104 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2006/10/17 21:45:14 rillig Exp $
-
-DISTNAME= gqmpeg-skins-20030712
-PKGREVISION= 4
-CATEGORIES= audio
-MASTER_SITES= http://gqmpeg.sourceforge.net/skins/
-DISTFILES+= \
- 2black.tar.gz \
- 4thTry.tar.gz \
- AZD.tar.gz \
- Aggressive.blue.tar.gz \
- Agressive.tar.gz \
- BlueSteel.tar.gz \
- CoronerQ.tar.gz \
- FlatLine.tar.gz \
- GTK.tar.gz \
- MoonIce.tar.gz \
- aluminotic-1.1.tar.gz \
- aluminotic.tar.gz \
- bakedbabies.tar.gz \
- blackboard-1.0.tar.gz \
- blue-i_1.tar.gz \
- bubble-mim.tar.gz \
- clean.tar.gz \
- cool.tar.gz \
- fortissimo.2.0.tar.gz \
- fortissimo.tar.gz \
- freeamp.tar.gz \
- gothic.tar.gz \
- gqmpeg-skins-osk-1.0.1.tar.gz \
- gqofol.tar.gz \
- gray.tar.gz \
- grey-black.tar.gz \
- helix.tar.gz \
- hfcool2.tar.gz \
- iMpeg.tar.gz \
- impact.tar.gz \
- info-mod2.tar.gz \
- k-nine.tar.gz \
- kpanel-dock.tar.gz \
- kpanel-normal-horizontal.tar.gz \
- line.tar.gz \
- minialum.tar.gz \
- module.tar.gz \
- sand.tar.gz \
- simplistic.tar.gz \
- skin-bubble-1.0.tar.gz \
- skin-car-preset-1.0.tar.gz \
- skin-circle-1.0.tar.gz \
- skin-e-theme-1.0.tar.gz \
- skin-example-1.2.tar.gz \
- skin-example-d4.tar.gz \
- skin-example2-1.1.tar.gz \
- skin-example3-1.0.tar.gz \
- skin-odometer-1.0.tar.gz \
- skin-paper-1.3.tar.gz \
- skin-pda-1.0.tar.gz \
- skin-pro-player-1.0.tar.gz \
- skin-pro-player2-1.0.tar.gz \
- skin-purple-preset-1.0.tar.gz \
- skin-sg-1.1.tar.gz \
- skin-shiny-blue-1.0.tar.gz \
- skin-silver-1.0.tar.gz \
- skin-slate-alpha.tar.gz \
- skin-wharf.tar.gz \
- spiral.tar.gz \
- swish.tar.gz \
- tattered.19990919.tar.gz \
- tauceti-1.1.tar.gz \
- tildouf-skins.tar.gz \
- ufo.tar.gz \
- wmcool-1.3.tar.gz \
- ye-olde.tar.gz \
- yelojckt.tar.gz \
- zoom-information.tar.gz
-
-MAINTAINER= hubertf@NetBSD.org
-HOMEPAGE= http://gqmpeg.sourceforge.net/
-COMMENT= Skins for gqmpeg
-
-DEPENDS+= gqmpeg-[0-9]*:../../audio/gqmpeg
-
-DIST_SUBDIR= gqmpeg-skins
-WRKSRC= ${WRKDIR}
-NO_BUILD= yes
-
-USE_TOOLS+= gtar
-
-INSTALLATION_DIRS= share/gqmpeg/skins
-
-do-install:
- for i in ${DISTFILES} ; do \
- ${ECHO} unpacking $$i ; \
- ${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$i | ( cd ${PREFIX}/share/gqmpeg/skins ; \
- ${GTAR} -zxf - ) ; \
- done
- ${FIND} ${PREFIX}/share/gqmpeg/skins -type d -print | \
- ${XARGS} ${CHMOD} 755
- ${FIND} ${PREFIX}/share/gqmpeg/skins -type f -print | \
- ${XARGS} ${CHMOD} 644
- ${FIND} ${PREFIX}/share/gqmpeg/skins -name "*~" -print | \
- ${XARGS} ${RM}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gqmpeg-skins/PLIST b/audio/gqmpeg-skins/PLIST
deleted file mode 100644
index ac312a96be5..00000000000
--- a/audio/gqmpeg-skins/PLIST
+++ /dev/null
@@ -1,1955 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/01/12 22:52:52 tron Exp $
-share/gqmpeg/skins/2black/b-conf.png
-share/gqmpeg/skins/2black/b-min.png
-share/gqmpeg/skins/2black/b-next.png
-share/gqmpeg/skins/2black/b-pause.png
-share/gqmpeg/skins/2black/b-play.png
-share/gqmpeg/skins/2black/b-plist.png
-share/gqmpeg/skins/2black/b-prev.png
-share/gqmpeg/skins/2black/b-quit.png
-share/gqmpeg/skins/2black/b-repeat.png
-share/gqmpeg/skins/2black/b-shuffle.png
-share/gqmpeg/skins/2black/b-stop.png
-share/gqmpeg/skins/2black/digits.png
-share/gqmpeg/skins/2black/letters.png
-share/gqmpeg/skins/2black/main.png
-share/gqmpeg/skins/2black/pos-item.png
-share/gqmpeg/skins/2black/pos-slider.png
-share/gqmpeg/skins/2black/skindata
-share/gqmpeg/skins/2black/vol-item.png
-share/gqmpeg/skins/2black/vol-slider.png
-share/gqmpeg/skins/4thTry/btn_close.png
-share/gqmpeg/skins/4thTry/btn_file.png
-share/gqmpeg/skins/4thTry/btn_fwd.png
-share/gqmpeg/skins/4thTry/btn_iconify.png
-share/gqmpeg/skins/4thTry/btn_play.png
-share/gqmpeg/skins/4thTry/btn_pref.png
-share/gqmpeg/skins/4thTry/btn_repeat.png
-share/gqmpeg/skins/4thTry/btn_rwd.png
-share/gqmpeg/skins/4thTry/btn_shuffle.png
-share/gqmpeg/skins/4thTry/btn_skintoggle.png
-share/gqmpeg/skins/4thTry/btn_stop.png
-share/gqmpeg/skins/4thTry/btn_time.png
-share/gqmpeg/skins/4thTry/button.png
-share/gqmpeg/skins/4thTry/dig.png
-share/gqmpeg/skins/4thTry/digsml.png
-share/gqmpeg/skins/4thTry/icon_repeat.png
-share/gqmpeg/skins/4thTry/icon_shuffle.png
-share/gqmpeg/skins/4thTry/icon_stereo.png
-share/gqmpeg/skins/4thTry/letters.png
-share/gqmpeg/skins/4thTry/main.png
-share/gqmpeg/skins/4thTry/main_alt.png
-share/gqmpeg/skins/4thTry/main_alt_mask.png
-share/gqmpeg/skins/4thTry/main_mask.png
-share/gqmpeg/skins/4thTry/skindata
-share/gqmpeg/skins/4thTry/skindata_alt
-share/gqmpeg/skins/4thTry/slider_position.png
-share/gqmpeg/skins/4thTry/xcf/button.xcf
-share/gqmpeg/skins/4thTry/xcf/buttonsml.xcf
-share/gqmpeg/skins/4thTry/xcf/main.xcf
-share/gqmpeg/skins/AZD/button-back.png
-share/gqmpeg/skins/AZD/button-eject.png
-share/gqmpeg/skins/AZD/button-forward.png
-share/gqmpeg/skins/AZD/button-norepeat.png
-share/gqmpeg/skins/AZD/button-pause.png
-share/gqmpeg/skins/AZD/button-play.png
-share/gqmpeg/skins/AZD/button-settings.png
-share/gqmpeg/skins/AZD/button-shuffle.png
-share/gqmpeg/skins/AZD/button-stop.png
-share/gqmpeg/skins/AZD/letters.png
-share/gqmpeg/skins/AZD/littlenumbers.png
-share/gqmpeg/skins/AZD/main.png
-share/gqmpeg/skins/AZD/mpeglayer.png
-share/gqmpeg/skins/AZD/numbers.png
-share/gqmpeg/skins/AZD/position-slider.png
-share/gqmpeg/skins/AZD/skindata
-share/gqmpeg/skins/AZD/stereo.png
-share/gqmpeg/skins/AZD/volume-slider.png
-share/gqmpeg/skins/Aggressive.blue/Config.png
-share/gqmpeg/skins/Aggressive.blue/Folder.png
-share/gqmpeg/skins/Aggressive.blue/Louder.png
-share/gqmpeg/skins/Aggressive.blue/Muter.png
-share/gqmpeg/skins/Aggressive.blue/Next.png
-share/gqmpeg/skins/Aggressive.blue/Pause.png
-share/gqmpeg/skins/Aggressive.blue/Play.png
-share/gqmpeg/skins/Aggressive.blue/Playlist.png
-share/gqmpeg/skins/Aggressive.blue/Prefr.png
-share/gqmpeg/skins/Aggressive.blue/Prev.png
-share/gqmpeg/skins/Aggressive.blue/Previous.png
-share/gqmpeg/skins/Aggressive.blue/Shuffle.png
-share/gqmpeg/skins/Aggressive.blue/Status.png
-share/gqmpeg/skins/Aggressive.blue/Stop.png
-share/gqmpeg/skins/Aggressive.blue/digits.png
-share/gqmpeg/skins/Aggressive.blue/exit.png
-share/gqmpeg/skins/Aggressive.blue/layer.png
-share/gqmpeg/skins/Aggressive.blue/main.png
-share/gqmpeg/skins/Aggressive.blue/mask.png
-share/gqmpeg/skins/Aggressive.blue/mini.png
-share/gqmpeg/skins/Aggressive.blue/mpeg.png
-share/gqmpeg/skins/Aggressive.blue/playlist.png
-share/gqmpeg/skins/Aggressive.blue/pos_balans.png
-share/gqmpeg/skins/Aggressive.blue/pos_slider.png
-share/gqmpeg/skins/Aggressive.blue/repeat.png
-share/gqmpeg/skins/Aggressive.blue/skindata
-share/gqmpeg/skins/Aggressive.blue/stereo.png
-share/gqmpeg/skins/Aggressive.blue/text.png
-share/gqmpeg/skins/Aggressive.blue/volume.png
-share/gqmpeg/skins/Agressive/Config.png
-share/gqmpeg/skins/Agressive/Folder.png
-share/gqmpeg/skins/Agressive/Louder.png
-share/gqmpeg/skins/Agressive/Muter.png
-share/gqmpeg/skins/Agressive/Next.png
-share/gqmpeg/skins/Agressive/Pause.png
-share/gqmpeg/skins/Agressive/Play.png
-share/gqmpeg/skins/Agressive/Playlist.png
-share/gqmpeg/skins/Agressive/Prefr.png
-share/gqmpeg/skins/Agressive/Prev.png
-share/gqmpeg/skins/Agressive/Previous.png
-share/gqmpeg/skins/Agressive/Shuffle.png
-share/gqmpeg/skins/Agressive/Status.png
-share/gqmpeg/skins/Agressive/Stop.png
-share/gqmpeg/skins/Agressive/digits.png
-share/gqmpeg/skins/Agressive/exit.png
-share/gqmpeg/skins/Agressive/layer.png
-share/gqmpeg/skins/Agressive/main.png
-share/gqmpeg/skins/Agressive/mask.png
-share/gqmpeg/skins/Agressive/mini.png
-share/gqmpeg/skins/Agressive/mpeg.png
-share/gqmpeg/skins/Agressive/playlist.png
-share/gqmpeg/skins/Agressive/pos_balans.png
-share/gqmpeg/skins/Agressive/pos_slider.png
-share/gqmpeg/skins/Agressive/repeat.png
-share/gqmpeg/skins/Agressive/skindata
-share/gqmpeg/skins/Agressive/stereo.png
-share/gqmpeg/skins/Agressive/text.png
-share/gqmpeg/skins/Agressive/volume.png
-share/gqmpeg/skins/BlueSteel/Time.png
-share/gqmpeg/skins/BlueSteel/body2.png
-share/gqmpeg/skins/BlueSteel/button_Backward.png
-share/gqmpeg/skins/BlueSteel/button_Config.png
-share/gqmpeg/skins/BlueSteel/button_Forward.png
-share/gqmpeg/skins/BlueSteel/button_PlayPause.png
-share/gqmpeg/skins/BlueSteel/button_Playlist.png
-share/gqmpeg/skins/BlueSteel/button_Repeat.png
-share/gqmpeg/skins/BlueSteel/button_Shuffle.png
-share/gqmpeg/skins/BlueSteel/button_Stop.png
-share/gqmpeg/skins/BlueSteel/letters.png
-share/gqmpeg/skins/BlueSteel/numbers.png
-share/gqmpeg/skins/BlueSteel/skindata
-share/gqmpeg/skins/CoronerQ/bClose.png
-share/gqmpeg/skins/CoronerQ/bLoad.png
-share/gqmpeg/skins/CoronerQ/bMin.png
-share/gqmpeg/skins/CoronerQ/bMixer.png
-share/gqmpeg/skins/CoronerQ/bNext.png
-share/gqmpeg/skins/CoronerQ/bPause.png
-share/gqmpeg/skins/CoronerQ/bPlay.png
-share/gqmpeg/skins/CoronerQ/bPrefs.png
-share/gqmpeg/skins/CoronerQ/bPrev.png
-share/gqmpeg/skins/CoronerQ/bRepeat.png
-share/gqmpeg/skins/CoronerQ/bShuffle.png
-share/gqmpeg/skins/CoronerQ/bStop.png
-share/gqmpeg/skins/CoronerQ/back.png
-share/gqmpeg/skins/CoronerQ/dBig.png
-share/gqmpeg/skins/CoronerQ/dMed.png
-share/gqmpeg/skins/CoronerQ/dSml.png
-share/gqmpeg/skins/CoronerQ/lBig1.png
-share/gqmpeg/skins/CoronerQ/lBig2.png
-share/gqmpeg/skins/CoronerQ/lBig3.png
-share/gqmpeg/skins/CoronerQ/lSml.png
-share/gqmpeg/skins/CoronerQ/mpegLayer.png
-share/gqmpeg/skins/CoronerQ/mpegVer.png
-share/gqmpeg/skins/CoronerQ/pos.png
-share/gqmpeg/skins/CoronerQ/posSlider.png
-share/gqmpeg/skins/CoronerQ/skindata
-share/gqmpeg/skins/CoronerQ/stereo.png
-share/gqmpeg/skins/CoronerQ/vol.png
-share/gqmpeg/skins/CoronerQ/volSlider.png
-share/gqmpeg/skins/CoronerQ/volbar.png
-share/gqmpeg/skins/FlatLine/b-list.png
-share/gqmpeg/skins/FlatLine/b-next.png
-share/gqmpeg/skins/FlatLine/b-pause.png
-share/gqmpeg/skins/FlatLine/b-play.png
-share/gqmpeg/skins/FlatLine/b-prev.png
-share/gqmpeg/skins/FlatLine/b-repeat.png
-share/gqmpeg/skins/FlatLine/b-shuffle.png
-share/gqmpeg/skins/FlatLine/b-stop.png
-share/gqmpeg/skins/FlatLine/back.png
-share/gqmpeg/skins/FlatLine/digits-small.png
-share/gqmpeg/skins/FlatLine/font.png
-share/gqmpeg/skins/FlatLine/i-pos.png
-share/gqmpeg/skins/FlatLine/i-vol.png
-share/gqmpeg/skins/FlatLine/s-pos.png
-share/gqmpeg/skins/FlatLine/s-vol.png
-share/gqmpeg/skins/FlatLine/skindata
-share/gqmpeg/skins/GTK/back.png
-share/gqmpeg/skins/GTK/digits.png
-share/gqmpeg/skins/GTK/letters.png
-share/gqmpeg/skins/GTK/mixer.png
-share/gqmpeg/skins/GTK/next.png
-share/gqmpeg/skins/GTK/play.png
-share/gqmpeg/skins/GTK/prev.png
-share/gqmpeg/skins/GTK/repeat.png
-share/gqmpeg/skins/GTK/shuffle.png
-share/gqmpeg/skins/GTK/skindata
-share/gqmpeg/skins/GTK/slider.png
-share/gqmpeg/skins/GTK/stop.png
-share/gqmpeg/skins/GTK/toggle.png
-share/gqmpeg/skins/Gqofol/README
-share/gqmpeg/skins/Gqofol/bal_down.png
-share/gqmpeg/skins/Gqofol/bal_slide.png
-share/gqmpeg/skins/Gqofol/bal_up.png
-share/gqmpeg/skins/Gqofol/digits.png
-share/gqmpeg/skins/Gqofol/exit.png
-share/gqmpeg/skins/Gqofol/iconize.png
-share/gqmpeg/skins/Gqofol/left.png
-share/gqmpeg/skins/Gqofol/opt.png
-share/gqmpeg/skins/Gqofol/pause.png
-share/gqmpeg/skins/Gqofol/play.png
-share/gqmpeg/skins/Gqofol/playlist.png
-share/gqmpeg/skins/Gqofol/repeat.png
-share/gqmpeg/skins/Gqofol/right.png
-share/gqmpeg/skins/Gqofol/sg.png
-share/gqmpeg/skins/Gqofol/sg_mask.png
-share/gqmpeg/skins/Gqofol/shuffle.png
-share/gqmpeg/skins/Gqofol/skindata
-share/gqmpeg/skins/Gqofol/slid_vol2.png
-share/gqmpeg/skins/Gqofol/slider.png
-share/gqmpeg/skins/Gqofol/slider_vol.png
-share/gqmpeg/skins/Gqofol/slider_vol2.png
-share/gqmpeg/skins/Gqofol/stereo.png
-share/gqmpeg/skins/Gqofol/stop.png
-share/gqmpeg/skins/Gqofol/text.png
-share/gqmpeg/skins/Gqofol/vol_down.png
-share/gqmpeg/skins/Gqofol/vol_up.png
-share/gqmpeg/skins/MoonIce/README
-share/gqmpeg/skins/MoonIce/background.png
-share/gqmpeg/skins/MoonIce/background_sm.png
-share/gqmpeg/skins/MoonIce/btn_config.png
-share/gqmpeg/skins/MoonIce/btn_exit.png
-share/gqmpeg/skins/MoonIce/btn_exit_sm.png
-share/gqmpeg/skins/MoonIce/btn_ff.png
-share/gqmpeg/skins/MoonIce/btn_ff_sm.png
-share/gqmpeg/skins/MoonIce/btn_iconify.png
-share/gqmpeg/skins/MoonIce/btn_iconify_sm.png
-share/gqmpeg/skins/MoonIce/btn_mode.png
-share/gqmpeg/skins/MoonIce/btn_mode_sm.png
-share/gqmpeg/skins/MoonIce/btn_next.png
-share/gqmpeg/skins/MoonIce/btn_next_sm.png
-share/gqmpeg/skins/MoonIce/btn_pause.png
-share/gqmpeg/skins/MoonIce/btn_pause_sm.png
-share/gqmpeg/skins/MoonIce/btn_play.png
-share/gqmpeg/skins/MoonIce/btn_play_sm.png
-share/gqmpeg/skins/MoonIce/btn_playlist.png
-share/gqmpeg/skins/MoonIce/btn_prev.png
-share/gqmpeg/skins/MoonIce/btn_prev_sm.png
-share/gqmpeg/skins/MoonIce/btn_repeat.png
-share/gqmpeg/skins/MoonIce/btn_rw.png
-share/gqmpeg/skins/MoonIce/btn_rw_sm.png
-share/gqmpeg/skins/MoonIce/btn_shuffle.png
-share/gqmpeg/skins/MoonIce/btn_stop.png
-share/gqmpeg/skins/MoonIce/btn_stop_sm.png
-share/gqmpeg/skins/MoonIce/btn_templ_sm.png
-share/gqmpeg/skins/MoonIce/digits-gray.png
-share/gqmpeg/skins/MoonIce/digits.png
-share/gqmpeg/skins/MoonIce/letters-gray.png
-share/gqmpeg/skins/MoonIce/letters.png
-share/gqmpeg/skins/MoonIce/skindata
-share/gqmpeg/skins/MoonIce/skindata_alt
-share/gqmpeg/skins/MoonIce/slider_pos.png
-share/gqmpeg/skins/MoonIce/slider_pos_sm.png
-share/gqmpeg/skins/MoonIce/slider_vol.png
-share/gqmpeg/skins/aluminotic/README
-share/gqmpeg/skins/aluminotic/about.png
-share/gqmpeg/skins/aluminotic/aluminotic.png
-share/gqmpeg/skins/aluminotic/alumno.bmp
-share/gqmpeg/skins/aluminotic/back.png
-share/gqmpeg/skins/aluminotic/config.png
-share/gqmpeg/skins/aluminotic/digit_small.png
-share/gqmpeg/skins/aluminotic/eq.png
-share/gqmpeg/skins/aluminotic/ff.png
-share/gqmpeg/skins/aluminotic/kill.png
-share/gqmpeg/skins/aluminotic/left.png
-share/gqmpeg/skins/aluminotic/list_1.png
-share/gqmpeg/skins/aluminotic/list_10.png
-share/gqmpeg/skins/aluminotic/list_2.png
-share/gqmpeg/skins/aluminotic/list_3.png
-share/gqmpeg/skins/aluminotic/list_4.png
-share/gqmpeg/skins/aluminotic/list_5.png
-share/gqmpeg/skins/aluminotic/list_6.png
-share/gqmpeg/skins/aluminotic/list_7.png
-share/gqmpeg/skins/aluminotic/list_8.png
-share/gqmpeg/skins/aluminotic/list_9.png
-share/gqmpeg/skins/aluminotic/mask.png
-share/gqmpeg/skins/aluminotic/mini.png
-share/gqmpeg/skins/aluminotic/newtext.png
-share/gqmpeg/skins/aluminotic/numbers-small.png
-share/gqmpeg/skins/aluminotic/open.png
-share/gqmpeg/skins/aluminotic/pause.png
-share/gqmpeg/skins/aluminotic/play.png
-share/gqmpeg/skins/aluminotic/pos.png
-share/gqmpeg/skins/aluminotic/pos_item.png
-share/gqmpeg/skins/aluminotic/repeat.png
-share/gqmpeg/skins/aluminotic/right.png
-share/gqmpeg/skins/aluminotic/shuff.png
-share/gqmpeg/skins/aluminotic/skindata
-share/gqmpeg/skins/aluminotic/slide.png
-share/gqmpeg/skins/aluminotic/status.png
-share/gqmpeg/skins/aluminotic/stop.png
-share/gqmpeg/skins/aluminotic/vol_item.png
-share/gqmpeg/skins/bakedbabies/background.png
-share/gqmpeg/skins/bakedbabies/btn_exit.png
-share/gqmpeg/skins/bakedbabies/btn_next.png
-share/gqmpeg/skins/bakedbabies/btn_play.png
-share/gqmpeg/skins/bakedbabies/btn_playlist.png
-share/gqmpeg/skins/bakedbabies/btn_prev.png
-share/gqmpeg/skins/bakedbabies/btn_shuffle.png
-share/gqmpeg/skins/bakedbabies/btn_stop.png
-share/gqmpeg/skins/bakedbabies/digbig.png
-share/gqmpeg/skins/bakedbabies/letters_sm.png
-share/gqmpeg/skins/bakedbabies/pos_slider.png
-share/gqmpeg/skins/bakedbabies/shuffle.png
-share/gqmpeg/skins/bakedbabies/skindata
-share/gqmpeg/skins/black/back.png
-share/gqmpeg/skins/black/digits.png
-share/gqmpeg/skins/black/exit.png
-share/gqmpeg/skins/black/letters.png
-share/gqmpeg/skins/black/list.png
-share/gqmpeg/skins/black/next.png
-share/gqmpeg/skins/black/play.png
-share/gqmpeg/skins/black/prev.png
-share/gqmpeg/skins/black/skindata
-share/gqmpeg/skins/black/slider.png
-share/gqmpeg/skins/black/stop.png
-share/gqmpeg/skins/blackboard/button_conf.png
-share/gqmpeg/skins/blackboard/button_exit.png
-share/gqmpeg/skins/blackboard/button_min.png
-share/gqmpeg/skins/blackboard/button_next.png
-share/gqmpeg/skins/blackboard/button_play.png
-share/gqmpeg/skins/blackboard/button_prev.png
-share/gqmpeg/skins/blackboard/button_random.png
-share/gqmpeg/skins/blackboard/button_repeat.png
-share/gqmpeg/skins/blackboard/button_stop.png
-share/gqmpeg/skins/blackboard/digits_sm.png
-share/gqmpeg/skins/blackboard/letters.png
-share/gqmpeg/skins/blackboard/mainboard.png
-share/gqmpeg/skins/blackboard/mask.png
-share/gqmpeg/skins/blackboard/mini.png
-share/gqmpeg/skins/blackboard/newvol.png
-share/gqmpeg/skins/blackboard/pos.png
-share/gqmpeg/skins/blackboard/pos_item.png
-share/gqmpeg/skins/blackboard/pos_vol.png
-share/gqmpeg/skins/blackboard/skindata
-share/gqmpeg/skins/blackboard/volpos.png
-share/gqmpeg/skins/blackboard/vpos.png
-share/gqmpeg/skins/blue-information-screenshot.gif
-share/gqmpeg/skins/blue-information/.directory
-share/gqmpeg/skins/blue-information/1-7s-big.png
-share/gqmpeg/skins/blue-information/1-7s-small.png
-share/gqmpeg/skins/blue-information/1-font-2x2-lat2.png
-share/gqmpeg/skins/blue-information/1-mpeg-layer.png
-share/gqmpeg/skins/blue-information/1-mpeg-mode.png
-share/gqmpeg/skins/blue-information/1-mpeg-ver.png
-share/gqmpeg/skins/blue-information/1-playstatus.png
-share/gqmpeg/skins/blue-information/2-mode-repeat.png
-share/gqmpeg/skins/blue-information/2-mode-shuffle.png
-share/gqmpeg/skins/blue-information/2-mode-stereo.png
-share/gqmpeg/skins/blue-information/2-volume-slider.png
-share/gqmpeg/skins/blue-information/2b-alap.png
-share/gqmpeg/skins/blue-information/2b-b-back.png
-share/gqmpeg/skins/blue-information/2b-b-back_mello.png
-share/gqmpeg/skins/blue-information/2b-b-eq.png
-share/gqmpeg/skins/blue-information/2b-b-fwd.png
-share/gqmpeg/skins/blue-information/2b-b-mixer.png
-share/gqmpeg/skins/blue-information/2b-b-next.png
-share/gqmpeg/skins/blue-information/2b-b-p-1.png
-share/gqmpeg/skins/blue-information/2b-b-p-2.png
-share/gqmpeg/skins/blue-information/2b-b-p-3.png
-share/gqmpeg/skins/blue-information/2b-b-p-4.png
-share/gqmpeg/skins/blue-information/2b-b-p-5.png
-share/gqmpeg/skins/blue-information/2b-b-p-6.png
-share/gqmpeg/skins/blue-information/2b-b-p-7.png
-share/gqmpeg/skins/blue-information/2b-b-p-8.png
-share/gqmpeg/skins/blue-information/2b-b-play.png
-share/gqmpeg/skins/blue-information/2b-b-playlist.png
-share/gqmpeg/skins/blue-information/2b-b-preferences.png
-share/gqmpeg/skins/blue-information/2b-b-repeat.png
-share/gqmpeg/skins/blue-information/2b-b-rew.png
-share/gqmpeg/skins/blue-information/2b-b-shuffle.png
-share/gqmpeg/skins/blue-information/2b-b-stop.png
-share/gqmpeg/skins/blue-information/2b-mask.png
-share/gqmpeg/skins/blue-information/2b-pos.png
-share/gqmpeg/skins/blue-information/README
-share/gqmpeg/skins/blue-information/skindata
-share/gqmpeg/skins/bubble-mim/README
-share/gqmpeg/skins/bubble-mim/balance.png
-share/gqmpeg/skins/bubble-mim/bub_mask.png
-share/gqmpeg/skins/bubble-mim/bubble.png
-share/gqmpeg/skins/bubble-mim/digits.png
-share/gqmpeg/skins/bubble-mim/exit.png
-share/gqmpeg/skins/bubble-mim/mini.png
-share/gqmpeg/skins/bubble-mim/next.png
-share/gqmpeg/skins/bubble-mim/pause.png
-share/gqmpeg/skins/bubble-mim/pl.png
-share/gqmpeg/skins/bubble-mim/play.png
-share/gqmpeg/skins/bubble-mim/position.png
-share/gqmpeg/skins/bubble-mim/prefs.png
-share/gqmpeg/skins/bubble-mim/prev.png
-share/gqmpeg/skins/bubble-mim/repeat.png
-share/gqmpeg/skins/bubble-mim/shuffle.png
-share/gqmpeg/skins/bubble-mim/skindata
-share/gqmpeg/skins/bubble-mim/stereo.png
-share/gqmpeg/skins/bubble-mim/stop.png
-share/gqmpeg/skins/bubble-mim/text.bmp
-share/gqmpeg/skins/bubble-mim/text.png
-share/gqmpeg/skins/bubble-mim/volume.png
-share/gqmpeg/skins/bubble/README
-share/gqmpeg/skins/bubble/balance.png
-share/gqmpeg/skins/bubble/bub_mask.png
-share/gqmpeg/skins/bubble/bubble.png
-share/gqmpeg/skins/bubble/digits.png
-share/gqmpeg/skins/bubble/exit.png
-share/gqmpeg/skins/bubble/mini.png
-share/gqmpeg/skins/bubble/next.png
-share/gqmpeg/skins/bubble/pause.png
-share/gqmpeg/skins/bubble/pl.png
-share/gqmpeg/skins/bubble/play.png
-share/gqmpeg/skins/bubble/position.png
-share/gqmpeg/skins/bubble/prefs.png
-share/gqmpeg/skins/bubble/prev.png
-share/gqmpeg/skins/bubble/repeat.png
-share/gqmpeg/skins/bubble/shuffle.png
-share/gqmpeg/skins/bubble/skindata
-share/gqmpeg/skins/bubble/stereo.png
-share/gqmpeg/skins/bubble/stop.png
-share/gqmpeg/skins/bubble/text.png
-share/gqmpeg/skins/bubble/volume.png
-share/gqmpeg/skins/car-preset/README
-share/gqmpeg/skins/car-preset/btn_exit.png
-share/gqmpeg/skins/car-preset/btn_iconify.png
-share/gqmpeg/skins/car-preset/btn_list.png
-share/gqmpeg/skins/car-preset/btn_next.png
-share/gqmpeg/skins/car-preset/btn_p1.png
-share/gqmpeg/skins/car-preset/btn_p2.png
-share/gqmpeg/skins/car-preset/btn_p3.png
-share/gqmpeg/skins/car-preset/btn_p4.png
-share/gqmpeg/skins/car-preset/btn_p5.png
-share/gqmpeg/skins/car-preset/btn_p6.png
-share/gqmpeg/skins/car-preset/btn_play.png
-share/gqmpeg/skins/car-preset/btn_prev.png
-share/gqmpeg/skins/car-preset/btn_sml.png
-share/gqmpeg/skins/car-preset/btn_stop.png
-share/gqmpeg/skins/car-preset/btn_voldn.png
-share/gqmpeg/skins/car-preset/btn_volup.png
-share/gqmpeg/skins/car-preset/digbig.png
-share/gqmpeg/skins/car-preset/digmed.png
-share/gqmpeg/skins/car-preset/letters.png
-share/gqmpeg/skins/car-preset/main.png
-share/gqmpeg/skins/car-preset/monoster.png
-share/gqmpeg/skins/car-preset/posbar.png
-share/gqmpeg/skins/car-preset/random.png
-share/gqmpeg/skins/car-preset/repeat.png
-share/gqmpeg/skins/car-preset/skindata
-share/gqmpeg/skins/car-preset/status.png
-share/gqmpeg/skins/car-preset/volume.png
-share/gqmpeg/skins/circle/README
-share/gqmpeg/skins/circle/back.png
-share/gqmpeg/skins/circle/back_mask.png
-share/gqmpeg/skins/circle/back_sm.png
-share/gqmpeg/skins/circle/back_sm_mask.png
-share/gqmpeg/skins/circle/bar_pos.png
-share/gqmpeg/skins/circle/bar_vol.png
-share/gqmpeg/skins/circle/btn_exit.png
-share/gqmpeg/skins/circle/btn_iconify.png
-share/gqmpeg/skins/circle/btn_list.png
-share/gqmpeg/skins/circle/btn_mode.png
-share/gqmpeg/skins/circle/btn_next.png
-share/gqmpeg/skins/circle/btn_play.png
-share/gqmpeg/skins/circle/btn_pref.png
-share/gqmpeg/skins/circle/btn_prev.png
-share/gqmpeg/skins/circle/btn_repeat.png
-share/gqmpeg/skins/circle/btn_shuffle.png
-share/gqmpeg/skins/circle/btn_sm_exit.png
-share/gqmpeg/skins/circle/btn_sm_iconify.png
-share/gqmpeg/skins/circle/btn_sm_mode.png
-share/gqmpeg/skins/circle/btn_sm_next.png
-share/gqmpeg/skins/circle/btn_sm_play.png
-share/gqmpeg/skins/circle/btn_sm_prev.png
-share/gqmpeg/skins/circle/btn_sm_stop.png
-share/gqmpeg/skins/circle/btn_stop.png
-share/gqmpeg/skins/circle/dig.png
-share/gqmpeg/skins/circle/digsml.png
-share/gqmpeg/skins/circle/letters.png
-share/gqmpeg/skins/circle/skindata
-share/gqmpeg/skins/circle/skindata_alt
-share/gqmpeg/skins/circle/status.png
-share/gqmpeg/skins/clean/back.png
-share/gqmpeg/skins/clean/digits.png
-share/gqmpeg/skins/clean/letters.png
-share/gqmpeg/skins/clean/mixer.png
-share/gqmpeg/skins/clean/next.png
-share/gqmpeg/skins/clean/play.png
-share/gqmpeg/skins/clean/prev.png
-share/gqmpeg/skins/clean/repeat.png
-share/gqmpeg/skins/clean/shuffle.png
-share/gqmpeg/skins/clean/skindata
-share/gqmpeg/skins/clean/slider.png
-share/gqmpeg/skins/clean/stop.png
-share/gqmpeg/skins/clean/toggle.png
-share/gqmpeg/skins/cool/background.png
-share/gqmpeg/skins/cool/btn_eject.png
-share/gqmpeg/skins/cool/btn_ff.png
-share/gqmpeg/skins/cool/btn_next.png
-share/gqmpeg/skins/cool/btn_pause.png
-share/gqmpeg/skins/cool/btn_play.png
-share/gqmpeg/skins/cool/btn_prev.png
-share/gqmpeg/skins/cool/btn_rw.png
-share/gqmpeg/skins/cool/btn_stop.png
-share/gqmpeg/skins/cool/letters.png
-share/gqmpeg/skins/cool/numbers.png
-share/gqmpeg/skins/cool/position.png
-share/gqmpeg/skins/cool/repeat.png
-share/gqmpeg/skins/cool/skindata
-share/gqmpeg/skins/e-theme/README
-share/gqmpeg/skins/e-theme/button-big.png
-share/gqmpeg/skins/e-theme/button-config.png
-share/gqmpeg/skins/e-theme/button-exit.png
-share/gqmpeg/skins/e-theme/button-iconify.png
-share/gqmpeg/skins/e-theme/button-list.png
-share/gqmpeg/skins/e-theme/button-next.png
-share/gqmpeg/skins/e-theme/button-play.png
-share/gqmpeg/skins/e-theme/button-prev.png
-share/gqmpeg/skins/e-theme/button-repeat.png
-share/gqmpeg/skins/e-theme/button-shade.png
-share/gqmpeg/skins/e-theme/button-shuffle.png
-share/gqmpeg/skins/e-theme/button-stop.png
-share/gqmpeg/skins/e-theme/e-back.png
-share/gqmpeg/skins/e-theme/e-digbig.png
-share/gqmpeg/skins/e-theme/e-digmed.png
-share/gqmpeg/skins/e-theme/e-fonts-sm.png
-share/gqmpeg/skins/e-theme/e-fonts.png
-share/gqmpeg/skins/e-theme/e-shaded.png
-share/gqmpeg/skins/e-theme/posbar.png
-share/gqmpeg/skins/e-theme/repeat-sm.png
-share/gqmpeg/skins/e-theme/shuffle-sm.png
-share/gqmpeg/skins/e-theme/skindata
-share/gqmpeg/skins/e-theme/skindata_alt
-share/gqmpeg/skins/e-theme/status-sm.png
-share/gqmpeg/skins/e-theme/status.png
-share/gqmpeg/skins/e-theme/stereo.png
-share/gqmpeg/skins/e-theme/volbar.png
-share/gqmpeg/skins/example-d4/README
-share/gqmpeg/skins/example-d4/background.png
-share/gqmpeg/skins/example-d4/background_sm.png
-share/gqmpeg/skins/example-d4/btn_config.png
-share/gqmpeg/skins/example-d4/btn_exit.png
-share/gqmpeg/skins/example-d4/btn_ff.png
-share/gqmpeg/skins/example-d4/btn_iconify.png
-share/gqmpeg/skins/example-d4/btn_mixer.png
-share/gqmpeg/skins/example-d4/btn_mode.png
-share/gqmpeg/skins/example-d4/btn_mode_sm.png
-share/gqmpeg/skins/example-d4/btn_next.png
-share/gqmpeg/skins/example-d4/btn_next_sm.png
-share/gqmpeg/skins/example-d4/btn_pause.png
-share/gqmpeg/skins/example-d4/btn_pause_sm.png
-share/gqmpeg/skins/example-d4/btn_play.png
-share/gqmpeg/skins/example-d4/btn_play_sm.png
-share/gqmpeg/skins/example-d4/btn_playlist.png
-share/gqmpeg/skins/example-d4/btn_prev.png
-share/gqmpeg/skins/example-d4/btn_prev_sm.png
-share/gqmpeg/skins/example-d4/btn_repeat.png
-share/gqmpeg/skins/example-d4/btn_rw.png
-share/gqmpeg/skins/example-d4/btn_shuffle.png
-share/gqmpeg/skins/example-d4/btn_stop.png
-share/gqmpeg/skins/example-d4/btn_stop_sm.png
-share/gqmpeg/skins/example-d4/digbig.png
-share/gqmpeg/skins/example-d4/digmed.png
-share/gqmpeg/skins/example-d4/digsml.png
-share/gqmpeg/skins/example-d4/layer.png
-share/gqmpeg/skins/example-d4/letters.png
-share/gqmpeg/skins/example-d4/letters_sm.png
-share/gqmpeg/skins/example-d4/mode.png
-share/gqmpeg/skins/example-d4/mpegver.png
-share/gqmpeg/skins/example-d4/pos_slider.png
-share/gqmpeg/skins/example-d4/repeat.png
-share/gqmpeg/skins/example-d4/repeat_sm.png
-share/gqmpeg/skins/example-d4/shuffle.png
-share/gqmpeg/skins/example-d4/shuffle_sm.png
-share/gqmpeg/skins/example-d4/skindata
-share/gqmpeg/skins/example-d4/skindata_alt
-share/gqmpeg/skins/example-d4/status.png
-share/gqmpeg/skins/example-d4/stereo.png
-share/gqmpeg/skins/example-d4/vslide.png
-share/gqmpeg/skins/example/README
-share/gqmpeg/skins/example/background.png
-share/gqmpeg/skins/example/background_sm.png
-share/gqmpeg/skins/example/btn_config.png
-share/gqmpeg/skins/example/btn_exit.png
-share/gqmpeg/skins/example/btn_ff.png
-share/gqmpeg/skins/example/btn_iconify.png
-share/gqmpeg/skins/example/btn_mixer.png
-share/gqmpeg/skins/example/btn_mode.png
-share/gqmpeg/skins/example/btn_mode_sm.png
-share/gqmpeg/skins/example/btn_next.png
-share/gqmpeg/skins/example/btn_next_sm.png
-share/gqmpeg/skins/example/btn_pause.png
-share/gqmpeg/skins/example/btn_pause_sm.png
-share/gqmpeg/skins/example/btn_play.png
-share/gqmpeg/skins/example/btn_play_sm.png
-share/gqmpeg/skins/example/btn_playlist.png
-share/gqmpeg/skins/example/btn_prev.png
-share/gqmpeg/skins/example/btn_prev_sm.png
-share/gqmpeg/skins/example/btn_repeat.png
-share/gqmpeg/skins/example/btn_rw.png
-share/gqmpeg/skins/example/btn_shuffle.png
-share/gqmpeg/skins/example/btn_stop.png
-share/gqmpeg/skins/example/btn_stop_sm.png
-share/gqmpeg/skins/example/digbig.png
-share/gqmpeg/skins/example/digmed.png
-share/gqmpeg/skins/example/digsml.png
-share/gqmpeg/skins/example/layer.png
-share/gqmpeg/skins/example/letters.png
-share/gqmpeg/skins/example/letters_sm.png
-share/gqmpeg/skins/example/mode.png
-share/gqmpeg/skins/example/mpegver.png
-share/gqmpeg/skins/example/repeat.png
-share/gqmpeg/skins/example/repeat_sm.png
-share/gqmpeg/skins/example/shuffle.png
-share/gqmpeg/skins/example/shuffle_sm.png
-share/gqmpeg/skins/example/skindata
-share/gqmpeg/skins/example/skindata_alt
-share/gqmpeg/skins/example/stereo.png
-share/gqmpeg/skins/example2/README
-share/gqmpeg/skins/example2/background.xpm
-share/gqmpeg/skins/example2/btn_config.xpm
-share/gqmpeg/skins/example2/btn_exit.xpm
-share/gqmpeg/skins/example2/btn_iconify.xpm
-share/gqmpeg/skins/example2/btn_next.xpm
-share/gqmpeg/skins/example2/btn_pause.xpm
-share/gqmpeg/skins/example2/btn_play.xpm
-share/gqmpeg/skins/example2/btn_playlist.xpm
-share/gqmpeg/skins/example2/btn_prev.xpm
-share/gqmpeg/skins/example2/btn_repeat.xpm
-share/gqmpeg/skins/example2/btn_shuffle.xpm
-share/gqmpeg/skins/example2/btn_stop.xpm
-share/gqmpeg/skins/example2/digbig.xpm
-share/gqmpeg/skins/example2/digsml.xpm
-share/gqmpeg/skins/example2/letters.xpm
-share/gqmpeg/skins/example2/repeat.xpm
-share/gqmpeg/skins/example2/shuffle.xpm
-share/gqmpeg/skins/example2/skindata
-share/gqmpeg/skins/example2/stereo.xpm
-share/gqmpeg/skins/example3/README
-share/gqmpeg/skins/example3/background.png
-share/gqmpeg/skins/example3/background_sm.png
-share/gqmpeg/skins/example3/btn_config.png
-share/gqmpeg/skins/example3/btn_exit.png
-share/gqmpeg/skins/example3/btn_ff.png
-share/gqmpeg/skins/example3/btn_iconify.png
-share/gqmpeg/skins/example3/btn_mixer.png
-share/gqmpeg/skins/example3/btn_mode.png
-share/gqmpeg/skins/example3/btn_mode_sm.png
-share/gqmpeg/skins/example3/btn_next.png
-share/gqmpeg/skins/example3/btn_next_sm.png
-share/gqmpeg/skins/example3/btn_pause.png
-share/gqmpeg/skins/example3/btn_pause_sm.png
-share/gqmpeg/skins/example3/btn_play.png
-share/gqmpeg/skins/example3/btn_play_sm.png
-share/gqmpeg/skins/example3/btn_playlist.png
-share/gqmpeg/skins/example3/btn_prev.png
-share/gqmpeg/skins/example3/btn_prev_sm.png
-share/gqmpeg/skins/example3/btn_repeat.png
-share/gqmpeg/skins/example3/btn_rw.png
-share/gqmpeg/skins/example3/btn_shuffle.png
-share/gqmpeg/skins/example3/btn_stop.png
-share/gqmpeg/skins/example3/btn_stop_sm.png
-share/gqmpeg/skins/example3/digbig.png
-share/gqmpeg/skins/example3/digmed.png
-share/gqmpeg/skins/example3/digsml.png
-share/gqmpeg/skins/example3/layer.png
-share/gqmpeg/skins/example3/letters.png
-share/gqmpeg/skins/example3/letters_sm.png
-share/gqmpeg/skins/example3/mode.png
-share/gqmpeg/skins/example3/mpegver.png
-share/gqmpeg/skins/example3/pos_slider.png
-share/gqmpeg/skins/example3/repeat.png
-share/gqmpeg/skins/example3/repeat_sm.png
-share/gqmpeg/skins/example3/shuffle.png
-share/gqmpeg/skins/example3/shuffle_sm.png
-share/gqmpeg/skins/example3/skindata
-share/gqmpeg/skins/example3/skindata_alt
-share/gqmpeg/skins/example3/status.png
-share/gqmpeg/skins/example3/stereo.png
-share/gqmpeg/skins/fortissimo.2.0/README
-share/gqmpeg/skins/fortissimo.2.0/balance.png
-share/gqmpeg/skins/fortissimo.2.0/bkgnd.png
-share/gqmpeg/skins/fortissimo.2.0/config.png
-share/gqmpeg/skins/fortissimo.2.0/digit_modd12.png
-share/gqmpeg/skins/fortissimo.2.0/digit_modd13.png
-share/gqmpeg/skins/fortissimo.2.0/letters_modd12.png
-share/gqmpeg/skins/fortissimo.2.0/letters_modd13.png
-share/gqmpeg/skins/fortissimo.2.0/list.png
-share/gqmpeg/skins/fortissimo.2.0/mask.png
-share/gqmpeg/skins/fortissimo.2.0/mini_bkgnd.png
-share/gqmpeg/skins/fortissimo.2.0/mini_bkgnd_.png
-share/gqmpeg/skins/fortissimo.2.0/mini_list.png
-share/gqmpeg/skins/fortissimo.2.0/mini_mode.png
-share/gqmpeg/skins/fortissimo.2.0/mini_next.png
-share/gqmpeg/skins/fortissimo.2.0/mini_play.png
-share/gqmpeg/skins/fortissimo.2.0/mini_prev.png
-share/gqmpeg/skins/fortissimo.2.0/minimizer.png
-share/gqmpeg/skins/fortissimo.2.0/minus.png
-share/gqmpeg/skins/fortissimo.2.0/mixer.png
-share/gqmpeg/skins/fortissimo.2.0/mode.png
-share/gqmpeg/skins/fortissimo.2.0/next.png
-share/gqmpeg/skins/fortissimo.2.0/play.png
-share/gqmpeg/skins/fortissimo.2.0/pos.png
-share/gqmpeg/skins/fortissimo.2.0/pos_slider.png
-share/gqmpeg/skins/fortissimo.2.0/prev.png
-share/gqmpeg/skins/fortissimo.2.0/quit.png
-share/gqmpeg/skins/fortissimo.2.0/random.png
-share/gqmpeg/skins/fortissimo.2.0/repeat.png
-share/gqmpeg/skins/fortissimo.2.0/sel_1.png
-share/gqmpeg/skins/fortissimo.2.0/sel_2.png
-share/gqmpeg/skins/fortissimo.2.0/sel_3.png
-share/gqmpeg/skins/fortissimo.2.0/sel_4.png
-share/gqmpeg/skins/fortissimo.2.0/sel_5.png
-share/gqmpeg/skins/fortissimo.2.0/sel_6.png
-share/gqmpeg/skins/fortissimo.2.0/sel_7.png
-share/gqmpeg/skins/fortissimo.2.0/sel_8.png
-share/gqmpeg/skins/fortissimo.2.0/sel_9.png
-share/gqmpeg/skins/fortissimo.2.0/skindata
-share/gqmpeg/skins/fortissimo.2.0/skindata.bak
-share/gqmpeg/skins/fortissimo.2.0/skindata.old
-share/gqmpeg/skins/fortissimo.2.0/skindata_alt
-share/gqmpeg/skins/fortissimo.2.0/stereo.png
-share/gqmpeg/skins/fortissimo.2.0/stop.png
-share/gqmpeg/skins/fortissimo.2.0/total.png
-share/gqmpeg/skins/fortissimo.2.0/volume.png
-share/gqmpeg/skins/fortissimo.2.0/volume_slider.png
-share/gqmpeg/skins/fortissimo_black/README
-share/gqmpeg/skins/fortissimo_black/bkgnd.xpm
-share/gqmpeg/skins/fortissimo_black/bkgnd_alt.xpm
-share/gqmpeg/skins/fortissimo_black/bkgnd_mask.xpm
-share/gqmpeg/skins/fortissimo_black/bkgnd_mask_alt.xpm
-share/gqmpeg/skins/fortissimo_black/config.xpm
-share/gqmpeg/skins/fortissimo_black/digit.xpm
-share/gqmpeg/skins/fortissimo_black/digit_trans.xpm
-share/gqmpeg/skins/fortissimo_black/fb.xpm
-share/gqmpeg/skins/fortissimo_black/ff.xpm
-share/gqmpeg/skins/fortissimo_black/letters.xpm
-share/gqmpeg/skins/fortissimo_black/letters_trans.xpm
-share/gqmpeg/skins/fortissimo_black/list.xpm
-share/gqmpeg/skins/fortissimo_black/list_alt.xpm
-share/gqmpeg/skins/fortissimo_black/mixer.xpm
-share/gqmpeg/skins/fortissimo_black/mode.xpm
-share/gqmpeg/skins/fortissimo_black/mode_alt.xpm
-share/gqmpeg/skins/fortissimo_black/next.xpm
-share/gqmpeg/skins/fortissimo_black/play.xpm
-share/gqmpeg/skins/fortissimo_black/play_alt.xpm
-share/gqmpeg/skins/fortissimo_black/pos.xpm
-share/gqmpeg/skins/fortissimo_black/pos_slider.xpm
-share/gqmpeg/skins/fortissimo_black/prev.xpm
-share/gqmpeg/skins/fortissimo_black/random.xpm
-share/gqmpeg/skins/fortissimo_black/repeat.xpm
-share/gqmpeg/skins/fortissimo_black/skindata
-share/gqmpeg/skins/fortissimo_black/skindata_alt
-share/gqmpeg/skins/fortissimo_black/skindata_reg
-share/gqmpeg/skins/fortissimo_black/stop.xpm
-share/gqmpeg/skins/fortissimo_black/test_mask.xpm
-share/gqmpeg/skins/fortissimo_black/volume.xpm
-share/gqmpeg/skins/fortissimo_black/volume_slider.xpm
-share/gqmpeg/skins/fortissimo_blue/README
-share/gqmpeg/skins/fortissimo_blue/bkgnd.xpm
-share/gqmpeg/skins/fortissimo_blue/bkgnd_alt.xpm
-share/gqmpeg/skins/fortissimo_blue/bkgnd_mask.xpm
-share/gqmpeg/skins/fortissimo_blue/bkgnd_mask_alt.xpm
-share/gqmpeg/skins/fortissimo_blue/config.xpm
-share/gqmpeg/skins/fortissimo_blue/digit.xpm
-share/gqmpeg/skins/fortissimo_blue/digit_trans.xpm
-share/gqmpeg/skins/fortissimo_blue/fb.xpm
-share/gqmpeg/skins/fortissimo_blue/ff.xpm
-share/gqmpeg/skins/fortissimo_blue/letters.xpm
-share/gqmpeg/skins/fortissimo_blue/letters_pre_.xpm
-share/gqmpeg/skins/fortissimo_blue/letters_trans.xpm
-share/gqmpeg/skins/fortissimo_blue/list.xpm
-share/gqmpeg/skins/fortissimo_blue/list_alt.xpm
-share/gqmpeg/skins/fortissimo_blue/mixer.xpm
-share/gqmpeg/skins/fortissimo_blue/mode.xpm
-share/gqmpeg/skins/fortissimo_blue/mode_alt.xpm
-share/gqmpeg/skins/fortissimo_blue/next.xpm
-share/gqmpeg/skins/fortissimo_blue/play.xpm
-share/gqmpeg/skins/fortissimo_blue/play_alt.xpm
-share/gqmpeg/skins/fortissimo_blue/pos.xpm
-share/gqmpeg/skins/fortissimo_blue/pos_slider.xpm
-share/gqmpeg/skins/fortissimo_blue/prev.xpm
-share/gqmpeg/skins/fortissimo_blue/random.xpm
-share/gqmpeg/skins/fortissimo_blue/repeat.xpm
-share/gqmpeg/skins/fortissimo_blue/skindata
-share/gqmpeg/skins/fortissimo_blue/skindata_alt
-share/gqmpeg/skins/fortissimo_blue/skindata_reg
-share/gqmpeg/skins/fortissimo_blue/stop.xpm
-share/gqmpeg/skins/fortissimo_blue/test.xbm
-share/gqmpeg/skins/fortissimo_blue/test.xpm
-share/gqmpeg/skins/fortissimo_blue/test_mask.xpm
-share/gqmpeg/skins/fortissimo_blue/volume.xpm
-share/gqmpeg/skins/fortissimo_blue/volume_slider.xpm
-share/gqmpeg/skins/fortissimo_green/README
-share/gqmpeg/skins/fortissimo_green/bkgnd.xpm
-share/gqmpeg/skins/fortissimo_green/bkgnd_alt.xpm
-share/gqmpeg/skins/fortissimo_green/bkgnd_mask.xpm
-share/gqmpeg/skins/fortissimo_green/bkgnd_mask_alt.xpm
-share/gqmpeg/skins/fortissimo_green/config.xpm
-share/gqmpeg/skins/fortissimo_green/digit.xpm
-share/gqmpeg/skins/fortissimo_green/digit_trans.xpm
-share/gqmpeg/skins/fortissimo_green/fb.xpm
-share/gqmpeg/skins/fortissimo_green/ff.xpm
-share/gqmpeg/skins/fortissimo_green/letters.xpm
-share/gqmpeg/skins/fortissimo_green/letters_trans.xpm
-share/gqmpeg/skins/fortissimo_green/list.xpm
-share/gqmpeg/skins/fortissimo_green/list_alt.xpm
-share/gqmpeg/skins/fortissimo_green/mixer.xpm
-share/gqmpeg/skins/fortissimo_green/mode.xpm
-share/gqmpeg/skins/fortissimo_green/mode_alt.xpm
-share/gqmpeg/skins/fortissimo_green/next.xpm
-share/gqmpeg/skins/fortissimo_green/play.xpm
-share/gqmpeg/skins/fortissimo_green/play_alt.xpm
-share/gqmpeg/skins/fortissimo_green/pos.xpm
-share/gqmpeg/skins/fortissimo_green/pos_slider.xpm
-share/gqmpeg/skins/fortissimo_green/prev.xpm
-share/gqmpeg/skins/fortissimo_green/random.xpm
-share/gqmpeg/skins/fortissimo_green/repeat.xpm
-share/gqmpeg/skins/fortissimo_green/skindata
-share/gqmpeg/skins/fortissimo_green/skindata_alt
-share/gqmpeg/skins/fortissimo_green/skindata_reg
-share/gqmpeg/skins/fortissimo_green/stop.xpm
-share/gqmpeg/skins/fortissimo_green/test.xbm
-share/gqmpeg/skins/fortissimo_green/test.xpm
-share/gqmpeg/skins/fortissimo_green/test_mask.xpm
-share/gqmpeg/skins/fortissimo_green/volume.xpm
-share/gqmpeg/skins/fortissimo_green/volume_slider.xpm
-share/gqmpeg/skins/fortissimo_trans/README
-share/gqmpeg/skins/fortissimo_trans/bkgnd_alt.xpm
-share/gqmpeg/skins/fortissimo_trans/bkgnd_mask_alt.xpm
-share/gqmpeg/skins/fortissimo_trans/bkgnd_mask_trans.xpm
-share/gqmpeg/skins/fortissimo_trans/bkgnd_mask_trans2.xpm
-share/gqmpeg/skins/fortissimo_trans/bkgnd_trans.xpm
-share/gqmpeg/skins/fortissimo_trans/config_trans.xpm
-share/gqmpeg/skins/fortissimo_trans/digit_trans.xpm
-share/gqmpeg/skins/fortissimo_trans/fb_trans.xpm
-share/gqmpeg/skins/fortissimo_trans/ff_trans.xpm
-share/gqmpeg/skins/fortissimo_trans/letters_trans.xpm
-share/gqmpeg/skins/fortissimo_trans/list_alt.xpm
-share/gqmpeg/skins/fortissimo_trans/list_trans.xpm
-share/gqmpeg/skins/fortissimo_trans/mixer_trans.xpm
-share/gqmpeg/skins/fortissimo_trans/mode_alt.xpm
-share/gqmpeg/skins/fortissimo_trans/mode_trans.xpm
-share/gqmpeg/skins/fortissimo_trans/next_trans.xpm
-share/gqmpeg/skins/fortissimo_trans/play_alt.xpm
-share/gqmpeg/skins/fortissimo_trans/play_trans.xpm
-share/gqmpeg/skins/fortissimo_trans/pos_slider.xpm
-share/gqmpeg/skins/fortissimo_trans/pos_trans.xpm
-share/gqmpeg/skins/fortissimo_trans/prev_trans.xpm
-share/gqmpeg/skins/fortissimo_trans/random_trans.xpm
-share/gqmpeg/skins/fortissimo_trans/repeat_trans.xpm
-share/gqmpeg/skins/fortissimo_trans/skindata
-share/gqmpeg/skins/fortissimo_trans/skindata_
-share/gqmpeg/skins/fortissimo_trans/skindata_alt
-share/gqmpeg/skins/fortissimo_trans/skindata_alt_
-share/gqmpeg/skins/fortissimo_trans/skindata_trans
-share/gqmpeg/skins/fortissimo_trans/stop_trans.xpm
-share/gqmpeg/skins/fortissimo_trans/volume_slider.xpm
-share/gqmpeg/skins/fortissimo_trans/volume_trans.xpm
-share/gqmpeg/skins/freeamp/alt.png
-share/gqmpeg/skins/freeamp/close.png
-share/gqmpeg/skins/freeamp/digits.png
-share/gqmpeg/skins/freeamp/digits_small.png
-share/gqmpeg/skins/freeamp/font.png
-share/gqmpeg/skins/freeamp/freeamp.png
-share/gqmpeg/skins/freeamp/icon.png
-share/gqmpeg/skins/freeamp/jog.png
-share/gqmpeg/skins/freeamp/mask.png
-share/gqmpeg/skins/freeamp/next.png
-share/gqmpeg/skins/freeamp/open.png
-share/gqmpeg/skins/freeamp/pause.png
-share/gqmpeg/skins/freeamp/play.png
-share/gqmpeg/skins/freeamp/prev.png
-share/gqmpeg/skins/freeamp/random.png
-share/gqmpeg/skins/freeamp/random_icon.png
-share/gqmpeg/skins/freeamp/repeat.png
-share/gqmpeg/skins/freeamp/repeat_icon.png
-share/gqmpeg/skins/freeamp/skindata
-share/gqmpeg/skins/freeamp/slider.png
-share/gqmpeg/skins/freeamp/stop.png
-share/gqmpeg/skins/gothic/Button_about.xpm
-share/gqmpeg/skins/gothic/Button_balance_left.xpm
-share/gqmpeg/skins/gothic/Button_balance_right.xpm
-share/gqmpeg/skins/gothic/Button_config.xpm
-share/gqmpeg/skins/gothic/Button_exit.xpm
-share/gqmpeg/skins/gothic/Button_ff.xpm
-share/gqmpeg/skins/gothic/Button_iconify.xpm
-share/gqmpeg/skins/gothic/Button_next.xpm
-share/gqmpeg/skins/gothic/Button_pause.xpm
-share/gqmpeg/skins/gothic/Button_play.xpm
-share/gqmpeg/skins/gothic/Button_playlist.xpm
-share/gqmpeg/skins/gothic/Button_prev.xpm
-share/gqmpeg/skins/gothic/Button_repeat.xpm
-share/gqmpeg/skins/gothic/Button_rw.xpm
-share/gqmpeg/skins/gothic/Button_shuffle.xpm
-share/gqmpeg/skins/gothic/Button_stop.xpm
-share/gqmpeg/skins/gothic/Button_volume_down.xpm
-share/gqmpeg/skins/gothic/Button_volume_up.xpm
-share/gqmpeg/skins/gothic/Digit_large.xpm
-share/gqmpeg/skins/gothic/Digit_small.xpm
-share/gqmpeg/skins/gothic/Slider_balance.xpm
-share/gqmpeg/skins/gothic/Slider_position.xpm
-share/gqmpeg/skins/gothic/Slider_volume.xpm
-share/gqmpeg/skins/gothic/bg.xpm
-share/gqmpeg/skins/gothic/mask.xpm
-share/gqmpeg/skins/gothic/mpeglayer.xpm
-share/gqmpeg/skins/gothic/mpegmode.xpm
-share/gqmpeg/skins/gothic/repeat.xpm
-share/gqmpeg/skins/gothic/skindata
-share/gqmpeg/skins/gothic/status.xpm
-share/gqmpeg/skins/gothic/stereo.xpm
-share/gqmpeg/skins/gothic/text.xpm
-share/gqmpeg/skins/gothic/volume.xpm
-share/gqmpeg/skins/gray/bg.png
-share/gqmpeg/skins/gray/digits.png
-share/gqmpeg/skins/gray/duration.png
-share/gqmpeg/skins/gray/letters.png
-share/gqmpeg/skins/gray/mixer.png
-share/gqmpeg/skins/gray/next.png
-share/gqmpeg/skins/gray/play.png
-share/gqmpeg/skins/gray/prev.png
-share/gqmpeg/skins/gray/repeat-item.png
-share/gqmpeg/skins/gray/repeat.png
-share/gqmpeg/skins/gray/shuffle-item.png
-share/gqmpeg/skins/gray/shuffle.png
-share/gqmpeg/skins/gray/skindata
-share/gqmpeg/skins/gray/stop.png
-share/gqmpeg/skins/grey/back.png
-share/gqmpeg/skins/grey/digits.png
-share/gqmpeg/skins/grey/exit.png
-share/gqmpeg/skins/grey/letters.png
-share/gqmpeg/skins/grey/list.png
-share/gqmpeg/skins/grey/next.png
-share/gqmpeg/skins/grey/play.png
-share/gqmpeg/skins/grey/prev.png
-share/gqmpeg/skins/grey/skindata
-share/gqmpeg/skins/grey/slider.png
-share/gqmpeg/skins/grey/stop.png
-share/gqmpeg/skins/helix/README
-share/gqmpeg/skins/helix/background.png
-share/gqmpeg/skins/helix/background_mask.png
-share/gqmpeg/skins/helix/btn_exit.png
-share/gqmpeg/skins/helix/btn_ff.png
-share/gqmpeg/skins/helix/btn_next.png
-share/gqmpeg/skins/helix/btn_pause.png
-share/gqmpeg/skins/helix/btn_play.png
-share/gqmpeg/skins/helix/btn_playlist.png
-share/gqmpeg/skins/helix/btn_prev.png
-share/gqmpeg/skins/helix/btn_rw.png
-share/gqmpeg/skins/helix/btn_shuffle.png
-share/gqmpeg/skins/helix/btn_stop.png
-share/gqmpeg/skins/helix/digit_large.png
-share/gqmpeg/skins/helix/digit_small.png
-share/gqmpeg/skins/helix/font_author.png
-share/gqmpeg/skins/helix/letters.png
-share/gqmpeg/skins/helix/posbar.png
-share/gqmpeg/skins/helix/skindata
-share/gqmpeg/skins/helix/volbar.png
-share/gqmpeg/skins/helix/volume.png
-share/gqmpeg/skins/hfcool2/background.png
-share/gqmpeg/skins/hfcool2/background2.gif
-share/gqmpeg/skins/hfcool2/background3.gif
-share/gqmpeg/skins/hfcool2/btn_eject.png
-share/gqmpeg/skins/hfcool2/btn_ff.png
-share/gqmpeg/skins/hfcool2/btn_next.png
-share/gqmpeg/skins/hfcool2/btn_pause.png
-share/gqmpeg/skins/hfcool2/btn_play.png
-share/gqmpeg/skins/hfcool2/btn_prev.png
-share/gqmpeg/skins/hfcool2/btn_rw.png
-share/gqmpeg/skins/hfcool2/btn_stop.png
-share/gqmpeg/skins/hfcool2/letters.png
-share/gqmpeg/skins/hfcool2/letters2.gif
-share/gqmpeg/skins/hfcool2/numbers.png
-share/gqmpeg/skins/hfcool2/position.png
-share/gqmpeg/skins/hfcool2/repeat.png
-share/gqmpeg/skins/hfcool2/skindata
-share/gqmpeg/skins/hfcool2/skindata.BAK
-share/gqmpeg/skins/hfcool2/smallnumbers.gif
-share/gqmpeg/skins/iMpeg/README
-share/gqmpeg/skins/iMpeg/digit.png
-share/gqmpeg/skins/iMpeg/digit_small.png
-share/gqmpeg/skins/iMpeg/impeg.png
-share/gqmpeg/skins/iMpeg/left.png
-share/gqmpeg/skins/iMpeg/mask.png
-share/gqmpeg/skins/iMpeg/newtext.png
-share/gqmpeg/skins/iMpeg/numbers-small.png
-share/gqmpeg/skins/iMpeg/play.png
-share/gqmpeg/skins/iMpeg/right.png
-share/gqmpeg/skins/iMpeg/skindata
-share/gqmpeg/skins/iMpeg/stop.png
-share/gqmpeg/skins/impact/README
-share/gqmpeg/skins/impact/background.png
-share/gqmpeg/skins/impact/background_sm.png
-share/gqmpeg/skins/impact/btn_config.png
-share/gqmpeg/skins/impact/btn_exit.png
-share/gqmpeg/skins/impact/btn_ff.png
-share/gqmpeg/skins/impact/btn_iconify.png
-share/gqmpeg/skins/impact/btn_mixer.png
-share/gqmpeg/skins/impact/btn_mode.png
-share/gqmpeg/skins/impact/btn_mode_sm.png
-share/gqmpeg/skins/impact/btn_next.png
-share/gqmpeg/skins/impact/btn_next_sm.png
-share/gqmpeg/skins/impact/btn_pause.png
-share/gqmpeg/skins/impact/btn_pause_sm.png
-share/gqmpeg/skins/impact/btn_play.png
-share/gqmpeg/skins/impact/btn_play_sm.png
-share/gqmpeg/skins/impact/btn_playlist.png
-share/gqmpeg/skins/impact/btn_prev.png
-share/gqmpeg/skins/impact/btn_prev_sm.png
-share/gqmpeg/skins/impact/btn_repeat.png
-share/gqmpeg/skins/impact/btn_rw.png
-share/gqmpeg/skins/impact/btn_shuffle.png
-share/gqmpeg/skins/impact/btn_stop.png
-share/gqmpeg/skins/impact/btn_stop_sm.png
-share/gqmpeg/skins/impact/digbig.png
-share/gqmpeg/skins/impact/digmed.png
-share/gqmpeg/skins/impact/digsml.png
-share/gqmpeg/skins/impact/layer.png
-share/gqmpeg/skins/impact/letters.png
-share/gqmpeg/skins/impact/letters_sm.png
-share/gqmpeg/skins/impact/mode.png
-share/gqmpeg/skins/impact/mpegver.png
-share/gqmpeg/skins/impact/repeat.png
-share/gqmpeg/skins/impact/repeat_sm.png
-share/gqmpeg/skins/impact/shuffle.png
-share/gqmpeg/skins/impact/shuffle_sm.png
-share/gqmpeg/skins/impact/skindata
-share/gqmpeg/skins/impact/skindata_alt
-share/gqmpeg/skins/impact/stereo.png
-share/gqmpeg/skins/info-mod2/1-7s-big.png
-share/gqmpeg/skins/info-mod2/1-7s-small.png
-share/gqmpeg/skins/info-mod2/1-font-2x2-lat2.png
-share/gqmpeg/skins/info-mod2/1-mpeg-layer.png
-share/gqmpeg/skins/info-mod2/1-mpeg-mode.png
-share/gqmpeg/skins/info-mod2/1-mpeg-ver.png
-share/gqmpeg/skins/info-mod2/1-playstatus.png
-share/gqmpeg/skins/info-mod2/2-mode-repeat.png
-share/gqmpeg/skins/info-mod2/2-mode-shuffle.png
-share/gqmpeg/skins/info-mod2/2-mode-stereo.png
-share/gqmpeg/skins/info-mod2/2b-alap.png
-share/gqmpeg/skins/info-mod2/2b-b-back.png
-share/gqmpeg/skins/info-mod2/2b-b-eq.png
-share/gqmpeg/skins/info-mod2/2b-b-fwd.png
-share/gqmpeg/skins/info-mod2/2b-b-mixer.png
-share/gqmpeg/skins/info-mod2/2b-b-next.png
-share/gqmpeg/skins/info-mod2/2b-b-p-1.png
-share/gqmpeg/skins/info-mod2/2b-b-p-2.png
-share/gqmpeg/skins/info-mod2/2b-b-p-3.png
-share/gqmpeg/skins/info-mod2/2b-b-p-4.png
-share/gqmpeg/skins/info-mod2/2b-b-p-5.png
-share/gqmpeg/skins/info-mod2/2b-b-p-6.png
-share/gqmpeg/skins/info-mod2/2b-b-p-7.png
-share/gqmpeg/skins/info-mod2/2b-b-p-8.png
-share/gqmpeg/skins/info-mod2/2b-b-play.png
-share/gqmpeg/skins/info-mod2/2b-b-playlist.png
-share/gqmpeg/skins/info-mod2/2b-b-preferences.png
-share/gqmpeg/skins/info-mod2/2b-b-repeat.png
-share/gqmpeg/skins/info-mod2/2b-b-rew.png
-share/gqmpeg/skins/info-mod2/2b-b-shuffle.png
-share/gqmpeg/skins/info-mod2/2b-b-stop.png
-share/gqmpeg/skins/info-mod2/2b-mask.png
-share/gqmpeg/skins/info-mod2/2b-pos.png
-share/gqmpeg/skins/info-mod2/2b-vslide.png
-share/gqmpeg/skins/info-mod2/skindata
-share/gqmpeg/skins/information/1-7s-big.png
-share/gqmpeg/skins/information/1-7s-small.png
-share/gqmpeg/skins/information/1-font-2x2-lat2.png
-share/gqmpeg/skins/information/1-mpeg-layer.png
-share/gqmpeg/skins/information/1-mpeg-mode.png
-share/gqmpeg/skins/information/1-mpeg-ver.png
-share/gqmpeg/skins/information/1-playstatus.png
-share/gqmpeg/skins/information/2-mode-repeat.png
-share/gqmpeg/skins/information/2-mode-shuffle.png
-share/gqmpeg/skins/information/2-mode-stereo.png
-share/gqmpeg/skins/information/2b-alap.png
-share/gqmpeg/skins/information/2b-b-back.png
-share/gqmpeg/skins/information/2b-b-eq.png
-share/gqmpeg/skins/information/2b-b-fwd.png
-share/gqmpeg/skins/information/2b-b-mixer.png
-share/gqmpeg/skins/information/2b-b-next.png
-share/gqmpeg/skins/information/2b-b-p-1.png
-share/gqmpeg/skins/information/2b-b-p-2.png
-share/gqmpeg/skins/information/2b-b-p-3.png
-share/gqmpeg/skins/information/2b-b-p-4.png
-share/gqmpeg/skins/information/2b-b-p-5.png
-share/gqmpeg/skins/information/2b-b-p-6.png
-share/gqmpeg/skins/information/2b-b-p-7.png
-share/gqmpeg/skins/information/2b-b-p-8.png
-share/gqmpeg/skins/information/2b-b-play.png
-share/gqmpeg/skins/information/2b-b-playlist.png
-share/gqmpeg/skins/information/2b-b-preferences.png
-share/gqmpeg/skins/information/2b-b-repeat.png
-share/gqmpeg/skins/information/2b-b-rew.png
-share/gqmpeg/skins/information/2b-b-shuffle.png
-share/gqmpeg/skins/information/2b-b-stop.png
-share/gqmpeg/skins/information/2b-mask.png
-share/gqmpeg/skins/information/2b-pos.png
-share/gqmpeg/skins/information/skindata
-share/gqmpeg/skins/k9/README
-share/gqmpeg/skins/k9/conf.png
-share/gqmpeg/skins/k9/eject.jpg
-share/gqmpeg/skins/k9/icon.png
-share/gqmpeg/skins/k9/kill.png
-share/gqmpeg/skins/k9/knine-nfont.png
-share/gqmpeg/skins/k9/knine-nfont2.png
-share/gqmpeg/skins/k9/knine-normal2.png
-share/gqmpeg/skins/k9/knine-vfont.png
-share/gqmpeg/skins/k9/long2.jpg
-share/gqmpeg/skins/k9/mask.png
-share/gqmpeg/skins/k9/newtext.png
-share/gqmpeg/skins/k9/next.jpg
-share/gqmpeg/skins/k9/pause.jpg
-share/gqmpeg/skins/k9/play.jpg
-share/gqmpeg/skins/k9/pos_item.jpg
-share/gqmpeg/skins/k9/repeat.png
-share/gqmpeg/skins/k9/reverse.jpg
-share/gqmpeg/skins/k9/shuffle.png
-share/gqmpeg/skins/k9/skindata
-share/gqmpeg/skins/k9/small-k.png
-share/gqmpeg/skins/k9/square.png
-share/gqmpeg/skins/k9/status.png
-share/gqmpeg/skins/k9/stop.jpg
-share/gqmpeg/skins/k9/trans-pos.png
-share/gqmpeg/skins/k9/trans-slide.png
-share/gqmpeg/skins/kpanel-dock/README
-share/gqmpeg/skins/kpanel-dock/alt.png
-share/gqmpeg/skins/kpanel-dock/alt2.png
-share/gqmpeg/skins/kpanel-dock/back.png
-share/gqmpeg/skins/kpanel-dock/back2.png
-share/gqmpeg/skins/kpanel-dock/config.png
-share/gqmpeg/skins/kpanel-dock/digits.png
-share/gqmpeg/skins/kpanel-dock/letters.png
-share/gqmpeg/skins/kpanel-dock/mixer.png
-share/gqmpeg/skins/kpanel-dock/next.png
-share/gqmpeg/skins/kpanel-dock/pause.png
-share/gqmpeg/skins/kpanel-dock/play.png
-share/gqmpeg/skins/kpanel-dock/playlist.png
-share/gqmpeg/skins/kpanel-dock/prev.png
-share/gqmpeg/skins/kpanel-dock/repeat.png
-share/gqmpeg/skins/kpanel-dock/shuffle.png
-share/gqmpeg/skins/kpanel-dock/skindata
-share/gqmpeg/skins/kpanel-dock/skindata_alt
-share/gqmpeg/skins/kpanel-dock/slider.png
-share/gqmpeg/skins/kpanel-dock/stop.png
-share/gqmpeg/skins/kpanel-normal-horizontal/GQmpeg-panel.kdelnk
-share/gqmpeg/skins/kpanel-normal-horizontal/README
-share/gqmpeg/skins/kpanel-normal-horizontal/back_sm.png
-share/gqmpeg/skins/kpanel-normal-horizontal/back_sm_mask.png
-share/gqmpeg/skins/kpanel-normal-horizontal/btn_sm_config.png
-share/gqmpeg/skins/kpanel-normal-horizontal/btn_sm_iconify.png
-share/gqmpeg/skins/kpanel-normal-horizontal/btn_sm_list.png
-share/gqmpeg/skins/kpanel-normal-horizontal/btn_sm_next.png
-share/gqmpeg/skins/kpanel-normal-horizontal/btn_sm_play.png
-share/gqmpeg/skins/kpanel-normal-horizontal/btn_sm_prev.png
-share/gqmpeg/skins/kpanel-normal-horizontal/btn_sm_repeat.png
-share/gqmpeg/skins/kpanel-normal-horizontal/btn_sm_shuffle.png
-share/gqmpeg/skins/kpanel-normal-horizontal/btn_sm_stop.png
-share/gqmpeg/skins/kpanel-normal-horizontal/digsml.png
-share/gqmpeg/skins/kpanel-normal-horizontal/letters.png
-share/gqmpeg/skins/kpanel-normal-horizontal/skindata
-share/gqmpeg/skins/line/README
-share/gqmpeg/skins/line/background.png
-share/gqmpeg/skins/line/btn_next.png
-share/gqmpeg/skins/line/btn_play.png
-share/gqmpeg/skins/line/btn_prev.png
-share/gqmpeg/skins/line/btn_repeat.png
-share/gqmpeg/skins/line/btn_shuffle.png
-share/gqmpeg/skins/line/btn_stop.png
-share/gqmpeg/skins/line/digit_big.png
-share/gqmpeg/skins/line/digit_small.png
-share/gqmpeg/skins/line/letters.png
-share/gqmpeg/skins/line/lettersbackup.png
-share/gqmpeg/skins/line/pos_slider.png
-share/gqmpeg/skins/line/positem.png
-share/gqmpeg/skins/line/skindata
-share/gqmpeg/skins/line/status_item.png
-share/gqmpeg/skins/minialum/README
-share/gqmpeg/skins/minialum/miniAltconfig.png
-share/gqmpeg/skins/minialum/miniBack.png
-share/gqmpeg/skins/minialum/miniBackmask.png
-share/gqmpeg/skins/minialum/miniPause.png
-share/gqmpeg/skins/minialum/miniPlay.png
-share/gqmpeg/skins/minialum/miniPlay.png.back
-share/gqmpeg/skins/minialum/miniRepeat.png
-share/gqmpeg/skins/minialum/miniShuffle.png
-share/gqmpeg/skins/minialum/miniSkipback.png
-share/gqmpeg/skins/minialum/miniSkipforward.png
-share/gqmpeg/skins/minialum/miniStop.png
-share/gqmpeg/skins/minialum/minidigit_small.png
-share/gqmpeg/skins/minialum/mininewtext.png
-share/gqmpeg/skins/minialum/minipos_slider.png
-share/gqmpeg/skins/minialum/minipos_slider_piece.png
-share/gqmpeg/skins/minialum/minivol_item.png
-share/gqmpeg/skins/minialum/minivol_slide.png
-share/gqmpeg/skins/minialum/skindata
-share/gqmpeg/skins/minialum/skindata_alt
-share/gqmpeg/skins/module/FW_button.png
-share/gqmpeg/skins/module/README
-share/gqmpeg/skins/module/RW_button.png
-share/gqmpeg/skins/module/background_temp.png
-share/gqmpeg/skins/module/config_button.png
-share/gqmpeg/skins/module/digits_large_default6.png
-share/gqmpeg/skins/module/exit_button.png
-share/gqmpeg/skins/module/iconify_button.png
-share/gqmpeg/skins/module/mask7.png
-share/gqmpeg/skins/module/mixer_button.png
-share/gqmpeg/skins/module/next_button.png
-share/gqmpeg/skins/module/play_button.png
-share/gqmpeg/skins/module/playlist_button.png
-share/gqmpeg/skins/module/prev_button.png
-share/gqmpeg/skins/module/repeat_button.png
-share/gqmpeg/skins/module/shuffle_button2.png
-share/gqmpeg/skins/module/skindata
-share/gqmpeg/skins/module/status_item.png
-share/gqmpeg/skins/module/stereo_item.png
-share/gqmpeg/skins/module/stop_button.png
-share/gqmpeg/skins/module/title4.png
-share/gqmpeg/skins/module/vol_item_temp.png
-share/gqmpeg/skins/module/volume_slider2.png
-share/gqmpeg/skins/odometer/README
-share/gqmpeg/skins/odometer/background.png
-share/gqmpeg/skins/odometer/background_sm.png
-share/gqmpeg/skins/odometer/btn_exit.png
-share/gqmpeg/skins/odometer/btn_exit_sm.png
-share/gqmpeg/skins/odometer/btn_iconify.png
-share/gqmpeg/skins/odometer/btn_iconify_sm.png
-share/gqmpeg/skins/odometer/btn_list.png
-share/gqmpeg/skins/odometer/btn_mode.png
-share/gqmpeg/skins/odometer/btn_mode_sm.png
-share/gqmpeg/skins/odometer/btn_next.png
-share/gqmpeg/skins/odometer/btn_next_sm.png
-share/gqmpeg/skins/odometer/btn_pause.png
-share/gqmpeg/skins/odometer/btn_play.png
-share/gqmpeg/skins/odometer/btn_prev.png
-share/gqmpeg/skins/odometer/btn_prev_sm.png
-share/gqmpeg/skins/odometer/btn_repeat.png
-share/gqmpeg/skins/odometer/btn_shuffle.png
-share/gqmpeg/skins/odometer/btn_stop.png
-share/gqmpeg/skins/odometer/letters.png
-share/gqmpeg/skins/odometer/monoster.png
-share/gqmpeg/skins/odometer/numlrg.png
-share/gqmpeg/skins/odometer/numsml.png
-share/gqmpeg/skins/odometer/pos_slider.png
-share/gqmpeg/skins/odometer/skindata
-share/gqmpeg/skins/odometer/skindata_alt
-share/gqmpeg/skins/odometer/status.png
-share/gqmpeg/skins/osk-deck-118x44-gray/background.xpm
-share/gqmpeg/skins/osk-deck-118x44-gray/button-backward.xpm
-share/gqmpeg/skins/osk-deck-118x44-gray/button-exit.xpm
-share/gqmpeg/skins/osk-deck-118x44-gray/button-iconify.xpm
-share/gqmpeg/skins/osk-deck-118x44-gray/button-next.xpm
-share/gqmpeg/skins/osk-deck-118x44-gray/button-play.xpm
-share/gqmpeg/skins/osk-deck-118x44-gray/button-previous.xpm
-share/gqmpeg/skins/osk-deck-118x44-gray/button-stop.xpm
-share/gqmpeg/skins/osk-deck-118x44-gray/channels.xpm
-share/gqmpeg/skins/osk-deck-118x44-gray/font-numeric-8x11.xpm
-share/gqmpeg/skins/osk-deck-118x44-gray/skindata
-share/gqmpeg/skins/osk-deck-118x44-gray/slider-volume.xpm
-share/gqmpeg/skins/osk-deck-279x89-gray/background.xpm
-share/gqmpeg/skins/osk-deck-279x89-gray/button-altskin.xpm
-share/gqmpeg/skins/osk-deck-279x89-gray/button-backward.xpm
-share/gqmpeg/skins/osk-deck-279x89-gray/button-eject.xpm
-share/gqmpeg/skins/osk-deck-279x89-gray/button-exit.xpm
-share/gqmpeg/skins/osk-deck-279x89-gray/button-forward.xpm
-share/gqmpeg/skins/osk-deck-279x89-gray/button-iconify.xpm
-share/gqmpeg/skins/osk-deck-279x89-gray/button-next.xpm
-share/gqmpeg/skins/osk-deck-279x89-gray/button-pause.xpm
-share/gqmpeg/skins/osk-deck-279x89-gray/button-play.xpm
-share/gqmpeg/skins/osk-deck-279x89-gray/button-previous.xpm
-share/gqmpeg/skins/osk-deck-279x89-gray/button-random.xpm
-share/gqmpeg/skins/osk-deck-279x89-gray/button-repeat.xpm
-share/gqmpeg/skins/osk-deck-279x89-gray/button-stop.xpm
-share/gqmpeg/skins/osk-deck-279x89-gray/channels.xpm
-share/gqmpeg/skins/osk-deck-279x89-gray/font-alphanum-7x14.xpm
-share/gqmpeg/skins/osk-deck-279x89-gray/font-numeric-15x20.xpm
-share/gqmpeg/skins/osk-deck-279x89-gray/font-numeric-8x11.xpm
-share/gqmpeg/skins/osk-deck-279x89-gray/skindata
-share/gqmpeg/skins/osk-deck-279x89-gray/slider-position.xpm
-share/gqmpeg/skins/osk-dock-64x64-gray/background.xpm
-share/gqmpeg/skins/osk-dock-64x64-gray/button-backward.xpm
-share/gqmpeg/skins/osk-dock-64x64-gray/button-eject.xpm
-share/gqmpeg/skins/osk-dock-64x64-gray/button-forward.xpm
-share/gqmpeg/skins/osk-dock-64x64-gray/button-next.xpm
-share/gqmpeg/skins/osk-dock-64x64-gray/button-play.xpm
-share/gqmpeg/skins/osk-dock-64x64-gray/button-previous.xpm
-share/gqmpeg/skins/osk-dock-64x64-gray/button-stop.xpm
-share/gqmpeg/skins/osk-dock-64x64-gray/font-numeric-6x9.xpm
-share/gqmpeg/skins/osk-dock-64x64-gray/skindata
-share/gqmpeg/skins/osk-dock-64x64-gray/slider-volume.xpm
-share/gqmpeg/skins/osk-dock-64x64-gray/status.xpm
-share/gqmpeg/skins/osk-dock-64x64-tile1/background.xpm
-share/gqmpeg/skins/osk-dock-64x64-tile1/button-backward.xpm
-share/gqmpeg/skins/osk-dock-64x64-tile1/button-eject.xpm
-share/gqmpeg/skins/osk-dock-64x64-tile1/button-forward.xpm
-share/gqmpeg/skins/osk-dock-64x64-tile1/button-next.xpm
-share/gqmpeg/skins/osk-dock-64x64-tile1/button-play.xpm
-share/gqmpeg/skins/osk-dock-64x64-tile1/button-previous.xpm
-share/gqmpeg/skins/osk-dock-64x64-tile1/button-stop.xpm
-share/gqmpeg/skins/osk-dock-64x64-tile1/font-numeric-6x9.xpm
-share/gqmpeg/skins/osk-dock-64x64-tile1/skindata
-share/gqmpeg/skins/osk-dock-64x64-tile1/slider-volume.xpm
-share/gqmpeg/skins/osk-dock-64x64-tile1/status.xpm
-share/gqmpeg/skins/osk-skins-README
-share/gqmpeg/skins/osk-ultrabar-152x20-a/background.xpm
-share/gqmpeg/skins/osk-ultrabar-152x20-a/button-altskin.xpm
-share/gqmpeg/skins/osk-ultrabar-152x20-a/button-eject.xpm
-share/gqmpeg/skins/osk-ultrabar-152x20-a/button-exit.xpm
-share/gqmpeg/skins/osk-ultrabar-152x20-a/button-next.xpm
-share/gqmpeg/skins/osk-ultrabar-152x20-a/button-pause.xpm
-share/gqmpeg/skins/osk-ultrabar-152x20-a/button-play.xpm
-share/gqmpeg/skins/osk-ultrabar-152x20-a/button-previous.xpm
-share/gqmpeg/skins/osk-ultrabar-152x20-a/button-stop.xpm
-share/gqmpeg/skins/osk-ultrabar-152x20-a/font-alphanum-7x5.xpm
-share/gqmpeg/skins/osk-ultrabar-152x20-a/font-numeric-7x5.xpm
-share/gqmpeg/skins/osk-ultrabar-152x20-a/skindata
-share/gqmpeg/skins/osk-ultrabar-152x20-b/background.xpm
-share/gqmpeg/skins/osk-ultrabar-152x20-b/button-altskin.xpm
-share/gqmpeg/skins/osk-ultrabar-152x20-b/button-eject.xpm
-share/gqmpeg/skins/osk-ultrabar-152x20-b/button-exit.xpm
-share/gqmpeg/skins/osk-ultrabar-152x20-b/button-next.xpm
-share/gqmpeg/skins/osk-ultrabar-152x20-b/button-pause.xpm
-share/gqmpeg/skins/osk-ultrabar-152x20-b/button-play.xpm
-share/gqmpeg/skins/osk-ultrabar-152x20-b/button-previous.xpm
-share/gqmpeg/skins/osk-ultrabar-152x20-b/button-stop.xpm
-share/gqmpeg/skins/osk-ultrabar-152x20-b/font-alphanum-7x5.xpm
-share/gqmpeg/skins/osk-ultrabar-152x20-b/font-numeric-7x5.xpm
-share/gqmpeg/skins/osk-ultrabar-152x20-b/skindata
-share/gqmpeg/skins/osk-ultrabar-340x10/background.xpm
-share/gqmpeg/skins/osk-ultrabar-340x10/button-altskin.xpm
-share/gqmpeg/skins/osk-ultrabar-340x10/button-eject.xpm
-share/gqmpeg/skins/osk-ultrabar-340x10/button-exit.xpm
-share/gqmpeg/skins/osk-ultrabar-340x10/button-next.xpm
-share/gqmpeg/skins/osk-ultrabar-340x10/button-pause.xpm
-share/gqmpeg/skins/osk-ultrabar-340x10/button-play.xpm
-share/gqmpeg/skins/osk-ultrabar-340x10/button-previous.xpm
-share/gqmpeg/skins/osk-ultrabar-340x10/button-stop.xpm
-share/gqmpeg/skins/osk-ultrabar-340x10/font-alphanum-7x5.xpm
-share/gqmpeg/skins/osk-ultrabar-340x10/font-numeric-7x5.xpm
-share/gqmpeg/skins/osk-ultrabar-340x10/skindata
-share/gqmpeg/skins/paper/backplate.png
-share/gqmpeg/skins/paper/backplate_mask.png
-share/gqmpeg/skins/paper/btn_config.png
-share/gqmpeg/skins/paper/btn_list.png
-share/gqmpeg/skins/paper/btn_next.png
-share/gqmpeg/skins/paper/btn_play.png
-share/gqmpeg/skins/paper/btn_prev.png
-share/gqmpeg/skins/paper/btn_random.png
-share/gqmpeg/skins/paper/btn_repeat.png
-share/gqmpeg/skins/paper/btn_stop.png
-share/gqmpeg/skins/paper/digits.png
-share/gqmpeg/skins/paper/font.png
-share/gqmpeg/skins/paper/knob-s.png
-share/gqmpeg/skins/paper/knob.png
-share/gqmpeg/skins/paper/pos_slider.png
-share/gqmpeg/skins/paper/skindata
-share/gqmpeg/skins/pda/README
-share/gqmpeg/skins/pda/btn-pda-12-check.png
-share/gqmpeg/skins/pda/btn-pda-16-random.png
-share/gqmpeg/skins/pda/btn-pda-16-repeat.png
-share/gqmpeg/skins/pda/btn-pda-26-oval-down.png
-share/gqmpeg/skins/pda/btn-pda-26-oval-up.png
-share/gqmpeg/skins/pda/btn-pda-30-round-home.png
-share/gqmpeg/skins/pda/btn-pda-30-round-list.png
-share/gqmpeg/skins/pda/btn-pda-30-round-play.png
-share/gqmpeg/skins/pda/btn-pda-30-round-stop.png
-share/gqmpeg/skins/pda/btn-pda-ab.png
-share/gqmpeg/skins/pda/btn-pda-exit.png
-share/gqmpeg/skins/pda/btn-pda-icon-config.png
-share/gqmpeg/skins/pda/btn-pda-icon-controls.png
-share/gqmpeg/skins/pda/btn-pda-icon-info.png
-share/gqmpeg/skins/pda/btn-pda-icon-list.png
-share/gqmpeg/skins/pda/btn-pda-icon-pref.png
-share/gqmpeg/skins/pda/btn-pda-icon-preset.png
-share/gqmpeg/skins/pda/btn-pda-iconify.png
-share/gqmpeg/skins/pda/btn-pda-mixer.png
-share/gqmpeg/skins/pda/btn-pda-r1.png
-share/gqmpeg/skins/pda/btn-pda-radio.png
-share/gqmpeg/skins/pda/btn-pos-7-down.png
-share/gqmpeg/skins/pda/btn-pos-7-up.png
-share/gqmpeg/skins/pda/digit-clean-13.png
-share/gqmpeg/skins/pda/digit-std-15-bold.png
-share/gqmpeg/skins/pda/item-pda-check.png
-share/gqmpeg/skins/pda/item-pda-control.png
-share/gqmpeg/skins/pda/item-pda-info.png
-share/gqmpeg/skins/pda/item-pda-load.png
-share/gqmpeg/skins/pda/item-pda-minus.png
-share/gqmpeg/skins/pda/item-pda-os.png
-share/gqmpeg/skins/pda/item-pda-prefs.png
-share/gqmpeg/skins/pda/item-pda-preset.png
-share/gqmpeg/skins/pda/item-pda-radio1.png
-share/gqmpeg/skins/pda/item-pda-status.png
-share/gqmpeg/skins/pda/item-pda-stereo.png
-share/gqmpeg/skins/pda/list-pos-back.png
-share/gqmpeg/skins/pda/list-pos-flags.png
-share/gqmpeg/skins/pda/list-pos-row.png
-share/gqmpeg/skins/pda/main-pda-blue.png
-share/gqmpeg/skins/pda/main-pda-complete.png
-share/gqmpeg/skins/pda/main-pda-titanium.png
-share/gqmpeg/skins/pda/skindata
-share/gqmpeg/skins/pda/skindata_blue
-share/gqmpeg/skins/pda/skindata_blue_control
-share/gqmpeg/skins/pda/skindata_blue_info
-share/gqmpeg/skins/pda/skindata_blue_playlist
-share/gqmpeg/skins/pda/skindata_blue_pref
-share/gqmpeg/skins/pda/skindata_blue_preset
-share/gqmpeg/skins/pda/skindata_control
-share/gqmpeg/skins/pda/skindata_info
-share/gqmpeg/skins/pda/skindata_playlist
-share/gqmpeg/skins/pda/skindata_pref
-share/gqmpeg/skins/pda/skindata_preset
-share/gqmpeg/skins/pda/skindata_titanium
-share/gqmpeg/skins/pda/skindata_titanium_control
-share/gqmpeg/skins/pda/skindata_titanium_info
-share/gqmpeg/skins/pda/skindata_titanium_playlist
-share/gqmpeg/skins/pda/skindata_titanium_pref
-share/gqmpeg/skins/pda/skindata_titanium_preset
-share/gqmpeg/skins/pda/slider-pos-h.png
-share/gqmpeg/skins/pda/slider-pos-v.png
-share/gqmpeg/skins/pda/text-clean-12.png
-share/gqmpeg/skins/pda/text-clean-13.png
-share/gqmpeg/skins/pro-player/README
-share/gqmpeg/skins/pro-player/backplate.png
-share/gqmpeg/skins/pro-player/btn_config.png
-share/gqmpeg/skins/pro-player/btn_exit.png
-share/gqmpeg/skins/pro-player/btn_iconify.png
-share/gqmpeg/skins/pro-player/btn_list.png
-share/gqmpeg/skins/pro-player/btn_next.png
-share/gqmpeg/skins/pro-player/btn_p1.png
-share/gqmpeg/skins/pro-player/btn_p2.png
-share/gqmpeg/skins/pro-player/btn_p3.png
-share/gqmpeg/skins/pro-player/btn_p4.png
-share/gqmpeg/skins/pro-player/btn_p5.png
-share/gqmpeg/skins/pro-player/btn_p6.png
-share/gqmpeg/skins/pro-player/btn_p7.png
-share/gqmpeg/skins/pro-player/btn_p8.png
-share/gqmpeg/skins/pro-player/btn_play.png
-share/gqmpeg/skins/pro-player/btn_prev.png
-share/gqmpeg/skins/pro-player/btn_random.png
-share/gqmpeg/skins/pro-player/btn_repeat.png
-share/gqmpeg/skins/pro-player/btn_stop.png
-share/gqmpeg/skins/pro-player/digits.png
-share/gqmpeg/skins/pro-player/font.png
-share/gqmpeg/skins/pro-player/knob-s.png
-share/gqmpeg/skins/pro-player/knob.png
-share/gqmpeg/skins/pro-player/random.png
-share/gqmpeg/skins/pro-player/repeat.png
-share/gqmpeg/skins/pro-player/skindata
-share/gqmpeg/skins/pro-player/status.png
-share/gqmpeg/skins/pro-player/stereo.png
-share/gqmpeg/skins/pro-player2/README
-share/gqmpeg/skins/pro-player2/backplate.png
-share/gqmpeg/skins/pro-player2/btn_config.png
-share/gqmpeg/skins/pro-player2/btn_exit.png
-share/gqmpeg/skins/pro-player2/btn_list.png
-share/gqmpeg/skins/pro-player2/btn_next.png
-share/gqmpeg/skins/pro-player2/btn_p1.png
-share/gqmpeg/skins/pro-player2/btn_p2.png
-share/gqmpeg/skins/pro-player2/btn_p3.png
-share/gqmpeg/skins/pro-player2/btn_p4.png
-share/gqmpeg/skins/pro-player2/btn_p5.png
-share/gqmpeg/skins/pro-player2/btn_p6.png
-share/gqmpeg/skins/pro-player2/btn_p7.png
-share/gqmpeg/skins/pro-player2/btn_p8.png
-share/gqmpeg/skins/pro-player2/btn_play.png
-share/gqmpeg/skins/pro-player2/btn_prev.png
-share/gqmpeg/skins/pro-player2/btn_round.png
-share/gqmpeg/skins/pro-player2/btn_stop.png
-share/gqmpeg/skins/pro-player2/digits.png
-share/gqmpeg/skins/pro-player2/font.png
-share/gqmpeg/skins/pro-player2/knob-handle.png
-share/gqmpeg/skins/pro-player2/minus.png
-share/gqmpeg/skins/pro-player2/random.png
-share/gqmpeg/skins/pro-player2/repeat.png
-share/gqmpeg/skins/pro-player2/skindata
-share/gqmpeg/skins/pro-player2/status.png
-share/gqmpeg/skins/pro-player2/stereo.png
-share/gqmpeg/skins/pro-player2/time.png
-share/gqmpeg/skins/purple-preset/README
-share/gqmpeg/skins/purple-preset/btn_exit.png
-share/gqmpeg/skins/purple-preset/btn_iconify.png
-share/gqmpeg/skins/purple-preset/btn_list.png
-share/gqmpeg/skins/purple-preset/btn_next.png
-share/gqmpeg/skins/purple-preset/btn_p1.png
-share/gqmpeg/skins/purple-preset/btn_p2.png
-share/gqmpeg/skins/purple-preset/btn_p3.png
-share/gqmpeg/skins/purple-preset/btn_p4.png
-share/gqmpeg/skins/purple-preset/btn_p5.png
-share/gqmpeg/skins/purple-preset/btn_p6.png
-share/gqmpeg/skins/purple-preset/btn_play.png
-share/gqmpeg/skins/purple-preset/btn_prev.png
-share/gqmpeg/skins/purple-preset/btn_sml.png
-share/gqmpeg/skins/purple-preset/btn_stop.png
-share/gqmpeg/skins/purple-preset/btn_voldn.png
-share/gqmpeg/skins/purple-preset/btn_volup.png
-share/gqmpeg/skins/purple-preset/digbig.png
-share/gqmpeg/skins/purple-preset/digmed.png
-share/gqmpeg/skins/purple-preset/letters.png
-share/gqmpeg/skins/purple-preset/main.png
-share/gqmpeg/skins/purple-preset/monoster.png
-share/gqmpeg/skins/purple-preset/random.png
-share/gqmpeg/skins/purple-preset/repeat.png
-share/gqmpeg/skins/purple-preset/skindata
-share/gqmpeg/skins/purple-preset/status.png
-share/gqmpeg/skins/purple-preset/volume.png
-share/gqmpeg/skins/sand/background.png
-share/gqmpeg/skins/sand/btn-mixer.png
-share/gqmpeg/skins/sand/btn-next.png
-share/gqmpeg/skins/sand/btn-pause.png
-share/gqmpeg/skins/sand/btn-play.png
-share/gqmpeg/skins/sand/btn-playlist.png
-share/gqmpeg/skins/sand/btn-prev.png
-share/gqmpeg/skins/sand/btn-repeat.png
-share/gqmpeg/skins/sand/btn-shuffle.png
-share/gqmpeg/skins/sand/btn-stop.png
-share/gqmpeg/skins/sand/letters.png
-share/gqmpeg/skins/sand/numbers.png
-share/gqmpeg/skins/sand/posbar.png
-share/gqmpeg/skins/sand/skindata
-share/gqmpeg/skins/sand/stereo.png
-share/gqmpeg/skins/sand/vol.png
-share/gqmpeg/skins/sg/README
-share/gqmpeg/skins/sg/bal_down.png
-share/gqmpeg/skins/sg/bal_slide.png
-share/gqmpeg/skins/sg/bal_up.png
-share/gqmpeg/skins/sg/digits.png
-share/gqmpeg/skins/sg/exit.png
-share/gqmpeg/skins/sg/iconize.png
-share/gqmpeg/skins/sg/left.png
-share/gqmpeg/skins/sg/opt.png
-share/gqmpeg/skins/sg/pause.png
-share/gqmpeg/skins/sg/play.png
-share/gqmpeg/skins/sg/playlist.png
-share/gqmpeg/skins/sg/repeat.png
-share/gqmpeg/skins/sg/right.png
-share/gqmpeg/skins/sg/sg.png
-share/gqmpeg/skins/sg/sg_mask.png
-share/gqmpeg/skins/sg/shuffle.png
-share/gqmpeg/skins/sg/skindata
-share/gqmpeg/skins/sg/slid_vol.png
-share/gqmpeg/skins/sg/slider.png
-share/gqmpeg/skins/sg/stereo.png
-share/gqmpeg/skins/sg/stop.png
-share/gqmpeg/skins/sg/text.png
-share/gqmpeg/skins/sg/vol_down.png
-share/gqmpeg/skins/sg/vol_up.png
-share/gqmpeg/skins/shiny-blue/alt_btn_mode.png
-share/gqmpeg/skins/shiny-blue/alt_btn_sr-mask.png
-share/gqmpeg/skins/shiny-blue/alt_main.png
-share/gqmpeg/skins/shiny-blue/alt_position-handle.png
-share/gqmpeg/skins/shiny-blue/alt_position-mask.png
-share/gqmpeg/skins/shiny-blue/btn_exit.png
-share/gqmpeg/skins/shiny-blue/btn_iconify.png
-share/gqmpeg/skins/shiny-blue/btn_list-mask.png
-share/gqmpeg/skins/shiny-blue/btn_list.png
-share/gqmpeg/skins/shiny-blue/btn_mode.png
-share/gqmpeg/skins/shiny-blue/btn_next-mask.png
-share/gqmpeg/skins/shiny-blue/btn_next.png
-share/gqmpeg/skins/shiny-blue/btn_play.png
-share/gqmpeg/skins/shiny-blue/btn_prev-mask.png
-share/gqmpeg/skins/shiny-blue/btn_prev.png
-share/gqmpeg/skins/shiny-blue/btn_random.png
-share/gqmpeg/skins/shiny-blue/btn_repeat.png
-share/gqmpeg/skins/shiny-blue/btn_stop.png
-share/gqmpeg/skins/shiny-blue/dig_large.png
-share/gqmpeg/skins/shiny-blue/dig_small.png
-share/gqmpeg/skins/shiny-blue/main.png
-share/gqmpeg/skins/shiny-blue/minus.png
-share/gqmpeg/skins/shiny-blue/position-handle.png
-share/gqmpeg/skins/shiny-blue/position-mask.png
-share/gqmpeg/skins/shiny-blue/repeat.png
-share/gqmpeg/skins/shiny-blue/shuffle.png
-share/gqmpeg/skins/shiny-blue/skindata
-share/gqmpeg/skins/shiny-blue/skindata_alt
-share/gqmpeg/skins/shiny-blue/stereo.png
-share/gqmpeg/skins/shiny-blue/text.png
-share/gqmpeg/skins/shiny-blue/total.png
-share/gqmpeg/skins/shiny-blue/volume-mask.png
-share/gqmpeg/skins/shiny-blue/volume.png
-share/gqmpeg/skins/silver/background.png
-share/gqmpeg/skins/silver/btn_exit.png
-share/gqmpeg/skins/silver/btn_next.png
-share/gqmpeg/skins/silver/btn_play.png
-share/gqmpeg/skins/silver/btn_playlist.png
-share/gqmpeg/skins/silver/btn_prev.png
-share/gqmpeg/skins/silver/btn_repeat.png
-share/gqmpeg/skins/silver/btn_shuffle.png
-share/gqmpeg/skins/silver/btn_stop.png
-share/gqmpeg/skins/silver/digits-large.png
-share/gqmpeg/skins/silver/digits-small.png
-share/gqmpeg/skins/silver/letters.png
-share/gqmpeg/skins/silver/repeat.png
-share/gqmpeg/skins/silver/shuffle.png
-share/gqmpeg/skins/silver/skindata
-share/gqmpeg/skins/silver/slider.png
-share/gqmpeg/skins/silver/stereo.png
-share/gqmpeg/skins/silver/volume.png
-share/gqmpeg/skins/silver/volume_sl.png
-share/gqmpeg/skins/simplistic/button_alt.png
-share/gqmpeg/skins/simplistic/button_exit.png
-share/gqmpeg/skins/simplistic/button_ff.png
-share/gqmpeg/skins/simplistic/button_icon.png
-share/gqmpeg/skins/simplistic/button_loop.png
-share/gqmpeg/skins/simplistic/button_loop_ab.png
-share/gqmpeg/skins/simplistic/button_loop_one.png
-share/gqmpeg/skins/simplistic/button_next.png
-share/gqmpeg/skins/simplistic/button_next_alt.png
-share/gqmpeg/skins/simplistic/button_pause.png
-share/gqmpeg/skins/simplistic/button_pause_alt.png
-share/gqmpeg/skins/simplistic/button_play.png
-share/gqmpeg/skins/simplistic/button_play_alt.png
-share/gqmpeg/skins/simplistic/button_playlist.png
-share/gqmpeg/skins/simplistic/button_playlist_alt.png
-share/gqmpeg/skins/simplistic/button_prev.png
-share/gqmpeg/skins/simplistic/button_prev_alt.png
-share/gqmpeg/skins/simplistic/button_random.png
-share/gqmpeg/skins/simplistic/button_rw.png
-share/gqmpeg/skins/simplistic/button_stop.png
-share/gqmpeg/skins/simplistic/button_stop_alt.png
-share/gqmpeg/skins/simplistic/digit_small.png
-share/gqmpeg/skins/simplistic/frame.png
-share/gqmpeg/skins/simplistic/frame_alt.png
-share/gqmpeg/skins/simplistic/skindata
-share/gqmpeg/skins/simplistic/skindata-alt
-share/gqmpeg/skins/simplistic/slider_position.png
-share/gqmpeg/skins/simplistic/slider_volume.png
-share/gqmpeg/skins/simplistic/text_large.png
-share/gqmpeg/skins/slate-alpha/btn-12-exit.png
-share/gqmpeg/skins/slate-alpha/btn-12-iconify.png
-share/gqmpeg/skins/slate-alpha/btn-12-remain.png
-share/gqmpeg/skins/slate-alpha/btn-16-down.png
-share/gqmpeg/skins/slate-alpha/btn-16-random.png
-share/gqmpeg/skins/slate-alpha/btn-16-repeat.png
-share/gqmpeg/skins/slate-alpha/btn-16-up.png
-share/gqmpeg/skins/slate-alpha/btn-32-back.png
-share/gqmpeg/skins/slate-alpha/btn-32-next.png
-share/gqmpeg/skins/slate-alpha/btn-32-pause.png
-share/gqmpeg/skins/slate-alpha/btn-32-play.png
-share/gqmpeg/skins/slate-alpha/btn-32-stop.png
-share/gqmpeg/skins/slate-alpha/btn-size.png
-share/gqmpeg/skins/slate-alpha/digit-digital-13.png
-share/gqmpeg/skins/slate-alpha/digit-digital-15.png
-share/gqmpeg/skins/slate-alpha/item-load.png
-share/gqmpeg/skins/slate-alpha/knob-32-back.png
-share/gqmpeg/skins/slate-alpha/knob-32-handle.png
-share/gqmpeg/skins/slate-alpha/list-divider.png
-share/gqmpeg/skins/slate-alpha/list-flags.png
-share/gqmpeg/skins/slate-alpha/list-row.png
-share/gqmpeg/skins/slate-alpha/list-watermark.png
-share/gqmpeg/skins/slate-alpha/main-complete.png
-share/gqmpeg/skins/slate-alpha/skindata
-share/gqmpeg/skins/slate-alpha/slider-v.png
-share/gqmpeg/skins/slate-alpha/text-classic-14.png
-share/gqmpeg/skins/slate-alpha/text-std-13.png
-share/gqmpeg/skins/spiral/back.png
-share/gqmpeg/skins/spiral/digits.png
-share/gqmpeg/skins/spiral/exit.png
-share/gqmpeg/skins/spiral/letters.png
-share/gqmpeg/skins/spiral/list.png
-share/gqmpeg/skins/spiral/next.png
-share/gqmpeg/skins/spiral/play.png
-share/gqmpeg/skins/spiral/prev.png
-share/gqmpeg/skins/spiral/skindata
-share/gqmpeg/skins/spiral/slider.png
-share/gqmpeg/skins/spiral/stop.png
-share/gqmpeg/skins/swish-flat/back.png
-share/gqmpeg/skins/swish-flat/digits.png
-share/gqmpeg/skins/swish-flat/letters.png
-share/gqmpeg/skins/swish-flat/mixer.png
-share/gqmpeg/skins/swish-flat/next.png
-share/gqmpeg/skins/swish-flat/play.png
-share/gqmpeg/skins/swish-flat/playlist.png
-share/gqmpeg/skins/swish-flat/prev.png
-share/gqmpeg/skins/swish-flat/repeat.png
-share/gqmpeg/skins/swish-flat/shuffle.png
-share/gqmpeg/skins/swish-flat/skindata
-share/gqmpeg/skins/swish-flat/slider.png
-share/gqmpeg/skins/swish-flat/stop.png
-share/gqmpeg/skins/swish-short/back.png
-share/gqmpeg/skins/swish-short/digits.png
-share/gqmpeg/skins/swish-short/letters.png
-share/gqmpeg/skins/swish-short/mixer.png
-share/gqmpeg/skins/swish-short/next.png
-share/gqmpeg/skins/swish-short/play.png
-share/gqmpeg/skins/swish-short/prev.png
-share/gqmpeg/skins/swish-short/repeat.png
-share/gqmpeg/skins/swish-short/shuffle.png
-share/gqmpeg/skins/swish-short/skindata
-share/gqmpeg/skins/swish-short/slider.png
-share/gqmpeg/skins/swish-short/stop.png
-share/gqmpeg/skins/tattered/README
-share/gqmpeg/skins/tattered/b0.xpm
-share/gqmpeg/skins/tattered/b1.xpm
-share/gqmpeg/skins/tattered/b2.xpm
-share/gqmpeg/skins/tattered/b3.xpm
-share/gqmpeg/skins/tattered/b4.xpm
-share/gqmpeg/skins/tattered/b_repeat.xpm
-share/gqmpeg/skins/tattered/b_shuffle.xpm
-share/gqmpeg/skins/tattered/btn_config.png
-share/gqmpeg/skins/tattered/default_prefs.js
-share/gqmpeg/skins/tattered/digits.png
-share/gqmpeg/skins/tattered/font-bw.xbm
-share/gqmpeg/skins/tattered/font.png
-share/gqmpeg/skins/tattered/font.xbm
-share/gqmpeg/skins/tattered/gauge-vol2.xpm
-share/gqmpeg/skins/tattered/gauge-vol_s.xpm
-share/gqmpeg/skins/tattered/skew_stat.xpm
-share/gqmpeg/skins/tattered/skewgrid.06.xpm
-share/gqmpeg/skins/tattered/skewgrid.mask.xpm
-share/gqmpeg/skins/tattered/skindata
-share/gqmpeg/skins/tauceti/README
-share/gqmpeg/skins/tauceti/b-exit.png
-share/gqmpeg/skins/tauceti/b-iconize.png
-share/gqmpeg/skins/tauceti/b-left.png
-share/gqmpeg/skins/tauceti/b-opt.png
-share/gqmpeg/skins/tauceti/b-pause.png
-share/gqmpeg/skins/tauceti/b-play.png
-share/gqmpeg/skins/tauceti/b-playlist.png
-share/gqmpeg/skins/tauceti/b-rand.png
-share/gqmpeg/skins/tauceti/b-repeat.png
-share/gqmpeg/skins/tauceti/b-right.png
-share/gqmpeg/skins/tauceti/b-stop.png
-share/gqmpeg/skins/tauceti/back.png
-share/gqmpeg/skins/tauceti/back_mask.png
-share/gqmpeg/skins/tauceti/letter.png
-share/gqmpeg/skins/tauceti/letters.png
-share/gqmpeg/skins/tauceti/numbers-big.png
-share/gqmpeg/skins/tauceti/numbers-small.png
-share/gqmpeg/skins/tauceti/skindata
-share/gqmpeg/skins/tauceti/slider.png
-share/gqmpeg/skins/tauceti/stats.png
-share/gqmpeg/skins/tildouf-skins/background.png
-share/gqmpeg/skins/tildouf-skins/background_sm.png
-share/gqmpeg/skins/tildouf-skins/btn_config.png
-share/gqmpeg/skins/tildouf-skins/btn_exit.png
-share/gqmpeg/skins/tildouf-skins/btn_ff.png
-share/gqmpeg/skins/tildouf-skins/btn_iconify.png
-share/gqmpeg/skins/tildouf-skins/btn_mixer.png
-share/gqmpeg/skins/tildouf-skins/btn_mode.png
-share/gqmpeg/skins/tildouf-skins/btn_mode_sm.png
-share/gqmpeg/skins/tildouf-skins/btn_next.png
-share/gqmpeg/skins/tildouf-skins/btn_next_sm.png
-share/gqmpeg/skins/tildouf-skins/btn_pause.png
-share/gqmpeg/skins/tildouf-skins/btn_pause_sm.png
-share/gqmpeg/skins/tildouf-skins/btn_play.png
-share/gqmpeg/skins/tildouf-skins/btn_play_sm.png
-share/gqmpeg/skins/tildouf-skins/btn_playlist.png
-share/gqmpeg/skins/tildouf-skins/btn_prev.png
-share/gqmpeg/skins/tildouf-skins/btn_prev_sm.png
-share/gqmpeg/skins/tildouf-skins/btn_repeat.png
-share/gqmpeg/skins/tildouf-skins/btn_rw.png
-share/gqmpeg/skins/tildouf-skins/btn_shuffle.png
-share/gqmpeg/skins/tildouf-skins/btn_stop.png
-share/gqmpeg/skins/tildouf-skins/btn_stop_sm.png
-share/gqmpeg/skins/tildouf-skins/digbig.png
-share/gqmpeg/skins/tildouf-skins/digmed.png
-share/gqmpeg/skins/tildouf-skins/digsml.png
-share/gqmpeg/skins/tildouf-skins/layer.png
-share/gqmpeg/skins/tildouf-skins/letters.png
-share/gqmpeg/skins/tildouf-skins/letters_sm.png
-share/gqmpeg/skins/tildouf-skins/mode.png
-share/gqmpeg/skins/tildouf-skins/mpegver.png
-share/gqmpeg/skins/tildouf-skins/repeat.png
-share/gqmpeg/skins/tildouf-skins/repeat_sm.png
-share/gqmpeg/skins/tildouf-skins/shuffle.png
-share/gqmpeg/skins/tildouf-skins/shuffle_sm.png
-share/gqmpeg/skins/tildouf-skins/skindata
-share/gqmpeg/skins/tildouf-skins/skindata_alt
-share/gqmpeg/skins/tildouf-skins/stereo.png
-share/gqmpeg/skins/ufo/background.png
-share/gqmpeg/skins/ufo/background_mask.png
-share/gqmpeg/skins/ufo/background_mask_shadow.png
-share/gqmpeg/skins/ufo/background_shadow.png
-share/gqmpeg/skins/ufo/btn_config.png
-share/gqmpeg/skins/ufo/btn_exit.png
-share/gqmpeg/skins/ufo/btn_iconify.png
-share/gqmpeg/skins/ufo/btn_next.png
-share/gqmpeg/skins/ufo/btn_play.png
-share/gqmpeg/skins/ufo/btn_playlist.png
-share/gqmpeg/skins/ufo/btn_prev.png
-share/gqmpeg/skins/ufo/btn_repeat.png
-share/gqmpeg/skins/ufo/btn_shuffle.png
-share/gqmpeg/skins/ufo/btn_stop.png
-share/gqmpeg/skins/ufo/digits.png
-share/gqmpeg/skins/ufo/icon_repeat.png
-share/gqmpeg/skins/ufo/icon_shuffle.png
-share/gqmpeg/skins/ufo/letters.png
-share/gqmpeg/skins/ufo/skindata
-share/gqmpeg/skins/wharf/background.png
-share/gqmpeg/skins/wharf/eject.png
-share/gqmpeg/skins/wharf/ff.png
-share/gqmpeg/skins/wharf/letters.png
-share/gqmpeg/skins/wharf/pause.png
-share/gqmpeg/skins/wharf/play.png
-share/gqmpeg/skins/wharf/position.png
-share/gqmpeg/skins/wharf/rw.png
-share/gqmpeg/skins/wharf/skindata
-share/gqmpeg/skins/wharf/stop.png
-share/gqmpeg/skins/wharf/volume.png
-share/gqmpeg/skins/wharf/wharf_mask.png
-share/gqmpeg/skins/wmcool/.xvpics/mask.png
-share/gqmpeg/skins/wmcool/background.png
-share/gqmpeg/skins/wmcool/btn_eject.png
-share/gqmpeg/skins/wmcool/btn_ff.png
-share/gqmpeg/skins/wmcool/btn_next.png
-share/gqmpeg/skins/wmcool/btn_pause.png
-share/gqmpeg/skins/wmcool/btn_play.png
-share/gqmpeg/skins/wmcool/btn_prev.png
-share/gqmpeg/skins/wmcool/btn_rw.png
-share/gqmpeg/skins/wmcool/btn_stop.png
-share/gqmpeg/skins/wmcool/letters.png
-share/gqmpeg/skins/wmcool/mask.png
-share/gqmpeg/skins/wmcool/numbers.png
-share/gqmpeg/skins/wmcool/position.png
-share/gqmpeg/skins/wmcool/repeat.png
-share/gqmpeg/skins/wmcool/skindata
-share/gqmpeg/skins/ye-olde/README
-share/gqmpeg/skins/ye-olde/base.xcf
-share/gqmpeg/skins/ye-olde/config.png
-share/gqmpeg/skins/ye-olde/digbig.png
-share/gqmpeg/skins/ye-olde/digsml.png
-share/gqmpeg/skins/ye-olde/exit.png
-share/gqmpeg/skins/ye-olde/ff.png
-share/gqmpeg/skins/ye-olde/iconify.png
-share/gqmpeg/skins/ye-olde/letters.png
-share/gqmpeg/skins/ye-olde/mask.png
-share/gqmpeg/skins/ye-olde/next.png
-share/gqmpeg/skins/ye-olde/play.png
-share/gqmpeg/skins/ye-olde/playlist.png
-share/gqmpeg/skins/ye-olde/posbar.png
-share/gqmpeg/skins/ye-olde/position.png
-share/gqmpeg/skins/ye-olde/prev.png
-share/gqmpeg/skins/ye-olde/repeat.png
-share/gqmpeg/skins/ye-olde/repeat_item.png
-share/gqmpeg/skins/ye-olde/rw.png
-share/gqmpeg/skins/ye-olde/shuffle.png
-share/gqmpeg/skins/ye-olde/shuffle_item.png
-share/gqmpeg/skins/ye-olde/skindata
-share/gqmpeg/skins/ye-olde/stand.png
-share/gqmpeg/skins/ye-olde/status.png
-share/gqmpeg/skins/ye-olde/stereo.png
-share/gqmpeg/skins/ye-olde/stereo_item.png
-share/gqmpeg/skins/ye-olde/stop.png
-share/gqmpeg/skins/ye-olde/volbar.png
-share/gqmpeg/skins/ye-olde/volume.png
-share/gqmpeg/skins/yelojckt/bg3.png
-share/gqmpeg/skins/yelojckt/close.png
-share/gqmpeg/skins/yelojckt/config.png
-share/gqmpeg/skins/yelojckt/eject.png
-share/gqmpeg/skins/yelojckt/icon.png
-share/gqmpeg/skins/yelojckt/lastbtn.png
-share/gqmpeg/skins/yelojckt/letters.png
-share/gqmpeg/skins/yelojckt/nextbtn.png
-share/gqmpeg/skins/yelojckt/numerals.png
-share/gqmpeg/skins/yelojckt/pausebtn.png
-share/gqmpeg/skins/yelojckt/playbtn.png
-share/gqmpeg/skins/yelojckt/posbar.png
-share/gqmpeg/skins/yelojckt/pre1.png
-share/gqmpeg/skins/yelojckt/pre10.png
-share/gqmpeg/skins/yelojckt/pre2.png
-share/gqmpeg/skins/yelojckt/pre3.png
-share/gqmpeg/skins/yelojckt/pre4.png
-share/gqmpeg/skins/yelojckt/pre5.png
-share/gqmpeg/skins/yelojckt/pre6.png
-share/gqmpeg/skins/yelojckt/pre7.png
-share/gqmpeg/skins/yelojckt/pre8.png
-share/gqmpeg/skins/yelojckt/pre9.png
-share/gqmpeg/skins/yelojckt/repeat.png
-share/gqmpeg/skins/yelojckt/shflbtn.png
-share/gqmpeg/skins/yelojckt/skindata
-share/gqmpeg/skins/yelojckt/stopbtn.png
-share/gqmpeg/skins/yelojckt/voldn.png
-share/gqmpeg/skins/yelojckt/volume.png
-share/gqmpeg/skins/yelojckt/volup.png
-@dirrm share/gqmpeg/skins/yelojckt
-@dirrm share/gqmpeg/skins/ye-olde
-@dirrm share/gqmpeg/skins/wmcool/.xvpics
-@dirrm share/gqmpeg/skins/wmcool
-@dirrm share/gqmpeg/skins/wharf
-@dirrm share/gqmpeg/skins/ufo
-@dirrm share/gqmpeg/skins/tildouf-skins
-@dirrm share/gqmpeg/skins/tauceti
-@dirrm share/gqmpeg/skins/tattered
-@dirrm share/gqmpeg/skins/swish-short
-@dirrm share/gqmpeg/skins/swish-flat
-@dirrm share/gqmpeg/skins/spiral
-@dirrm share/gqmpeg/skins/slate-alpha
-@dirrm share/gqmpeg/skins/simplistic
-@dirrm share/gqmpeg/skins/silver
-@dirrm share/gqmpeg/skins/shiny-blue
-@dirrm share/gqmpeg/skins/sg
-@dirrm share/gqmpeg/skins/sand
-@dirrm share/gqmpeg/skins/purple-preset
-@dirrm share/gqmpeg/skins/pro-player2
-@dirrm share/gqmpeg/skins/pro-player
-@dirrm share/gqmpeg/skins/pda
-@dirrm share/gqmpeg/skins/paper
-@dirrm share/gqmpeg/skins/osk-ultrabar-340x10
-@dirrm share/gqmpeg/skins/osk-ultrabar-152x20-b
-@dirrm share/gqmpeg/skins/osk-ultrabar-152x20-a
-@dirrm share/gqmpeg/skins/osk-dock-64x64-tile1
-@dirrm share/gqmpeg/skins/osk-dock-64x64-gray
-@dirrm share/gqmpeg/skins/osk-deck-279x89-gray
-@dirrm share/gqmpeg/skins/osk-deck-118x44-gray
-@dirrm share/gqmpeg/skins/odometer
-@dirrm share/gqmpeg/skins/module
-@dirrm share/gqmpeg/skins/minialum
-@dirrm share/gqmpeg/skins/line
-@dirrm share/gqmpeg/skins/kpanel-normal-horizontal
-@dirrm share/gqmpeg/skins/kpanel-dock
-@dirrm share/gqmpeg/skins/k9
-@dirrm share/gqmpeg/skins/information
-@dirrm share/gqmpeg/skins/info-mod2
-@dirrm share/gqmpeg/skins/impact
-@dirrm share/gqmpeg/skins/iMpeg
-@dirrm share/gqmpeg/skins/hfcool2
-@dirrm share/gqmpeg/skins/helix
-@dirrm share/gqmpeg/skins/grey
-@dirrm share/gqmpeg/skins/gray
-@dirrm share/gqmpeg/skins/gothic
-@dirrm share/gqmpeg/skins/freeamp
-@dirrm share/gqmpeg/skins/fortissimo_trans
-@dirrm share/gqmpeg/skins/fortissimo_green
-@dirrm share/gqmpeg/skins/fortissimo_blue
-@dirrm share/gqmpeg/skins/fortissimo_black
-@dirrm share/gqmpeg/skins/fortissimo.2.0
-@dirrm share/gqmpeg/skins/example3
-@dirrm share/gqmpeg/skins/example2
-@dirrm share/gqmpeg/skins/example-d4
-@dirrm share/gqmpeg/skins/example
-@dirrm share/gqmpeg/skins/e-theme
-@dirrm share/gqmpeg/skins/cool
-@dirrm share/gqmpeg/skins/clean
-@dirrm share/gqmpeg/skins/circle
-@dirrm share/gqmpeg/skins/car-preset
-@dirrm share/gqmpeg/skins/bubble-mim
-@dirrm share/gqmpeg/skins/bubble
-@dirrm share/gqmpeg/skins/blue-information
-@dirrm share/gqmpeg/skins/blackboard
-@dirrm share/gqmpeg/skins/black
-@dirrm share/gqmpeg/skins/bakedbabies
-@dirrm share/gqmpeg/skins/aluminotic
-@dirrm share/gqmpeg/skins/MoonIce
-@dirrm share/gqmpeg/skins/Gqofol
-@dirrm share/gqmpeg/skins/GTK
-@dirrm share/gqmpeg/skins/FlatLine
-@dirrm share/gqmpeg/skins/CoronerQ
-@dirrm share/gqmpeg/skins/BlueSteel
-@dirrm share/gqmpeg/skins/Agressive
-@dirrm share/gqmpeg/skins/Aggressive.blue
-@dirrm share/gqmpeg/skins/AZD
-@dirrm share/gqmpeg/skins/4thTry/xcf
-@dirrm share/gqmpeg/skins/4thTry
-@dirrm share/gqmpeg/skins/2black
diff --git a/audio/gqmpeg-skins/distinfo b/audio/gqmpeg-skins/distinfo
deleted file mode 100644
index d9f8d4268be..00000000000
--- a/audio/gqmpeg-skins/distinfo
+++ /dev/null
@@ -1,206 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:46 agc Exp $
-
-SHA1 (gqmpeg-skins/2black.tar.gz) = 0d658ecf12bad3d1adefc2ead3f980d0d0e5c356
-RMD160 (gqmpeg-skins/2black.tar.gz) = 39e78af31167c76b0442be15a12fb763f3b1bb36
-Size (gqmpeg-skins/2black.tar.gz) = 8754 bytes
-SHA1 (gqmpeg-skins/4thTry.tar.gz) = 57df16ca1c93fba2875f1e9fe60c6c9d0452a0b8
-RMD160 (gqmpeg-skins/4thTry.tar.gz) = 4d9bbdbc90b9b7fd5954d5f13af1b8ba0b012397
-Size (gqmpeg-skins/4thTry.tar.gz) = 52972 bytes
-SHA1 (gqmpeg-skins/AZD.tar.gz) = f7ea9da0285f6fa7e92662f8fbdd01e7ac803b19
-RMD160 (gqmpeg-skins/AZD.tar.gz) = accacc955f862f835dabb0ef216b60df93d701a6
-Size (gqmpeg-skins/AZD.tar.gz) = 23362 bytes
-SHA1 (gqmpeg-skins/Aggressive.blue.tar.gz) = ae0bcb187d787418dcc097ca0fe894875ae72ecb
-RMD160 (gqmpeg-skins/Aggressive.blue.tar.gz) = a6517e99e3e8201b97759665770e68b9f1e1154b
-Size (gqmpeg-skins/Aggressive.blue.tar.gz) = 256062 bytes
-SHA1 (gqmpeg-skins/Agressive.tar.gz) = fa44206b1c939b1bc61d1b6b0fd676b83e68ed41
-RMD160 (gqmpeg-skins/Agressive.tar.gz) = c10e9beafd00bc51128e16ca9b77aa71f75f1d4d
-Size (gqmpeg-skins/Agressive.tar.gz) = 242508 bytes
-SHA1 (gqmpeg-skins/BlueSteel.tar.gz) = 0bc83d27a76318b72f803a031a6fa6fb8fa758c8
-RMD160 (gqmpeg-skins/BlueSteel.tar.gz) = 1057a2ddd71806889a5654f8d6fa9a5fa3e18bad
-Size (gqmpeg-skins/BlueSteel.tar.gz) = 18002 bytes
-SHA1 (gqmpeg-skins/CoronerQ.tar.gz) = cddd0d53a250de52bba22da69b3375abee0230c6
-RMD160 (gqmpeg-skins/CoronerQ.tar.gz) = 98c1cec6805c1283adbbbe2a321649954f2076cc
-Size (gqmpeg-skins/CoronerQ.tar.gz) = 39351 bytes
-SHA1 (gqmpeg-skins/FlatLine.tar.gz) = 154306fe5d57a3a15d366004ad0e96603ff778a0
-RMD160 (gqmpeg-skins/FlatLine.tar.gz) = 8d19277e2a8c3411060bc81cc079a59b96cf7f3a
-Size (gqmpeg-skins/FlatLine.tar.gz) = 10783 bytes
-SHA1 (gqmpeg-skins/GTK.tar.gz) = 6ef7b50d32f1dca02836c35c1dd97b906d31cd75
-RMD160 (gqmpeg-skins/GTK.tar.gz) = 4afc2dc4146fd390dc815adf046320deb02bc4d6
-Size (gqmpeg-skins/GTK.tar.gz) = 4201 bytes
-SHA1 (gqmpeg-skins/MoonIce.tar.gz) = 501e55cad70284bc591a9dbfd8fe569de29be898
-RMD160 (gqmpeg-skins/MoonIce.tar.gz) = b6103e53054efe4e0cb69339c4f59011fee6d003
-Size (gqmpeg-skins/MoonIce.tar.gz) = 17863 bytes
-SHA1 (gqmpeg-skins/aluminotic-1.1.tar.gz) = f52bda40c26b8c50dd3e4b9f112e9853d82c65b5
-RMD160 (gqmpeg-skins/aluminotic-1.1.tar.gz) = 854d1629d1384a337f9507c050766cc364d38dad
-Size (gqmpeg-skins/aluminotic-1.1.tar.gz) = 123167 bytes
-SHA1 (gqmpeg-skins/aluminotic.tar.gz) = 35b650946c2885bb012964c12964bc513eeafb93
-RMD160 (gqmpeg-skins/aluminotic.tar.gz) = 3cdc66eddc1b327243e50330d98eccbcd0cb0054
-Size (gqmpeg-skins/aluminotic.tar.gz) = 123090 bytes
-SHA1 (gqmpeg-skins/bakedbabies.tar.gz) = 2d000941bd84afdeb520839259801276a9141e24
-RMD160 (gqmpeg-skins/bakedbabies.tar.gz) = 8a9cdee4d524f21f3425e7e521735823dda075da
-Size (gqmpeg-skins/bakedbabies.tar.gz) = 29733 bytes
-SHA1 (gqmpeg-skins/blackboard-1.0.tar.gz) = c24261c010d9d0968d5b8867aa4895106ca90cdb
-RMD160 (gqmpeg-skins/blackboard-1.0.tar.gz) = 095e8c52b759d0adeca1d32e74a723b24a0cba91
-Size (gqmpeg-skins/blackboard-1.0.tar.gz) = 71790 bytes
-SHA1 (gqmpeg-skins/blue-i_1.tar.gz) = 3fb13c6ae5000bdf56b6c89fa700238f6058c112
-RMD160 (gqmpeg-skins/blue-i_1.tar.gz) = 72312d229814126ba930a995e3cffc2fa44e6710
-Size (gqmpeg-skins/blue-i_1.tar.gz) = 21768 bytes
-SHA1 (gqmpeg-skins/bubble-mim.tar.gz) = cd572fc8e4b5aba6aad562a2c4b087a47fbd4a17
-RMD160 (gqmpeg-skins/bubble-mim.tar.gz) = 149a9500690999b7d8aa50388119a2d8da5f3282
-Size (gqmpeg-skins/bubble-mim.tar.gz) = 53755 bytes
-SHA1 (gqmpeg-skins/clean.tar.gz) = b7cba43617daa3dccd81ea5bf5df8f55b9560c74
-RMD160 (gqmpeg-skins/clean.tar.gz) = 46d042244e28ca862ddf69427f8ecfc4ff80acc6
-Size (gqmpeg-skins/clean.tar.gz) = 4018 bytes
-SHA1 (gqmpeg-skins/cool.tar.gz) = 55a722e93b4f05eaeb91474c8d6976917d8cc0f6
-RMD160 (gqmpeg-skins/cool.tar.gz) = 1af3650856519ae6ab02ea77af8a9e39835ed32b
-Size (gqmpeg-skins/cool.tar.gz) = 4565 bytes
-SHA1 (gqmpeg-skins/fortissimo.2.0.tar.gz) = 530c01b2c32c7b6c15f19ad00bab3d2b2dfb275f
-RMD160 (gqmpeg-skins/fortissimo.2.0.tar.gz) = 8fac11dad84593ae3c1121a42bbfb61f2304939a
-Size (gqmpeg-skins/fortissimo.2.0.tar.gz) = 104637 bytes
-SHA1 (gqmpeg-skins/fortissimo.tar.gz) = b93ecbe368509b9841f9ce75ae7ff72c56acd152
-RMD160 (gqmpeg-skins/fortissimo.tar.gz) = 14fc1d6aa2697d14c853247d245e9c20471d3f6e
-Size (gqmpeg-skins/fortissimo.tar.gz) = 326520 bytes
-SHA1 (gqmpeg-skins/freeamp.tar.gz) = 97540de0438473e0563fd8cffaa2a4a007ca8308
-RMD160 (gqmpeg-skins/freeamp.tar.gz) = 0c8d13e69e6db98854a76b1b5396168943907c46
-Size (gqmpeg-skins/freeamp.tar.gz) = 69019 bytes
-SHA1 (gqmpeg-skins/gothic.tar.gz) = 35af37dc3d826649f6b2ec99c2d0bd281c6d56a3
-RMD160 (gqmpeg-skins/gothic.tar.gz) = e9d75e37481b1d834c16159bbe2b3db778c745c5
-Size (gqmpeg-skins/gothic.tar.gz) = 55689 bytes
-SHA1 (gqmpeg-skins/gqmpeg-skins-osk-1.0.1.tar.gz) = 8bf8d50a0691582e5882d11be1fbd03766c35d8d
-RMD160 (gqmpeg-skins/gqmpeg-skins-osk-1.0.1.tar.gz) = f75ad717cc9d401b13cd8ad5105eec677cf95b4e
-Size (gqmpeg-skins/gqmpeg-skins-osk-1.0.1.tar.gz) = 22169 bytes
-SHA1 (gqmpeg-skins/gqofol.tar.gz) = a059f246bd9237193ee138493f58cc5fdd5adad3
-RMD160 (gqmpeg-skins/gqofol.tar.gz) = 374493882e664aba4daf57c15659e2357a4239d3
-Size (gqmpeg-skins/gqofol.tar.gz) = 129086 bytes
-SHA1 (gqmpeg-skins/gray.tar.gz) = 860b21a507b11da17618e8e898895585a67c3a42
-RMD160 (gqmpeg-skins/gray.tar.gz) = edb1ef36475b58fdeebecc77f74a59089d5fc304
-Size (gqmpeg-skins/gray.tar.gz) = 6302 bytes
-SHA1 (gqmpeg-skins/grey-black.tar.gz) = ed9919ac249ff71824af9f8a2a4461429ac43f43
-RMD160 (gqmpeg-skins/grey-black.tar.gz) = 376341864a6698048cc2e4f8d93ed4720b7004c9
-Size (gqmpeg-skins/grey-black.tar.gz) = 10519 bytes
-SHA1 (gqmpeg-skins/helix.tar.gz) = d2ec0267ed181fd78a541d16d4027adf4ff3c2a1
-RMD160 (gqmpeg-skins/helix.tar.gz) = fd2afe7e7242a0bfa71fe893ad37b87bf18bd6ac
-Size (gqmpeg-skins/helix.tar.gz) = 49763 bytes
-SHA1 (gqmpeg-skins/hfcool2.tar.gz) = 3e7e50e9c9193d7368ad0bda2ec5d9f5fb5692e9
-RMD160 (gqmpeg-skins/hfcool2.tar.gz) = e3e460edf01c9c5cf3e98ec07917a7e33d4b18dd
-Size (gqmpeg-skins/hfcool2.tar.gz) = 6809 bytes
-SHA1 (gqmpeg-skins/iMpeg.tar.gz) = 745299107e755ea0d220083bbc8371c62efa25d3
-RMD160 (gqmpeg-skins/iMpeg.tar.gz) = 7e12c5875f61103809044091d339967dd24e75cd
-Size (gqmpeg-skins/iMpeg.tar.gz) = 108769 bytes
-SHA1 (gqmpeg-skins/impact.tar.gz) = 97d6df283f6d05531c5ed7b5635ee05feb4ae421
-RMD160 (gqmpeg-skins/impact.tar.gz) = 8240ac314e104401f678320164944fd02f63f892
-Size (gqmpeg-skins/impact.tar.gz) = 37662 bytes
-SHA1 (gqmpeg-skins/info-mod2.tar.gz) = 8a1b3bdd5ad18cdb4cdd3eea1ae5028cc5e94911
-RMD160 (gqmpeg-skins/info-mod2.tar.gz) = d353df174abf3433a12fa6de757758eb2ca15a92
-Size (gqmpeg-skins/info-mod2.tar.gz) = 11617 bytes
-SHA1 (gqmpeg-skins/k-nine.tar.gz) = 3e662fae843c0458f3b3da23144f4a98dbfac4dc
-RMD160 (gqmpeg-skins/k-nine.tar.gz) = 5eb42f937ff6b1a4fad48dad2a07e2c1c1dd8f20
-Size (gqmpeg-skins/k-nine.tar.gz) = 278891 bytes
-SHA1 (gqmpeg-skins/kpanel-dock.tar.gz) = 0c2285833e856226efaa560e52a3e05870e7bdd0
-RMD160 (gqmpeg-skins/kpanel-dock.tar.gz) = d6a6df8f975b3531003003fadae8a534b485c49b
-Size (gqmpeg-skins/kpanel-dock.tar.gz) = 6081 bytes
-SHA1 (gqmpeg-skins/kpanel-normal-horizontal.tar.gz) = 656c17f3a43650ba016d8358d5a3af9741fa4734
-RMD160 (gqmpeg-skins/kpanel-normal-horizontal.tar.gz) = b8b21d3aab12ff9e2e974396aa97e9587a5d53ff
-Size (gqmpeg-skins/kpanel-normal-horizontal.tar.gz) = 12869 bytes
-SHA1 (gqmpeg-skins/line.tar.gz) = 4c0234fa99527af4fca59d589303d2209834b243
-RMD160 (gqmpeg-skins/line.tar.gz) = bca4c29b465d1eecf8a9811cb5ef82ef9529dd7f
-Size (gqmpeg-skins/line.tar.gz) = 78584 bytes
-SHA1 (gqmpeg-skins/minialum.tar.gz) = 49a8e8176b3f9fbb9253e33ee8dec108b2960702
-RMD160 (gqmpeg-skins/minialum.tar.gz) = da27213257178c9cd10482ba9d9fc919673f5887
-Size (gqmpeg-skins/minialum.tar.gz) = 23916 bytes
-SHA1 (gqmpeg-skins/module.tar.gz) = 1d8b0291d0bd9df45c557c3da47aaa97b46ce883
-RMD160 (gqmpeg-skins/module.tar.gz) = 0444986faf777febcd202a6db1c379cfeee3eea4
-Size (gqmpeg-skins/module.tar.gz) = 191114 bytes
-SHA1 (gqmpeg-skins/sand.tar.gz) = 515758f613e44bde1efdcd82f9b335778b724965
-RMD160 (gqmpeg-skins/sand.tar.gz) = 25c41358995dd62358301caaeac4707f1188fb08
-Size (gqmpeg-skins/sand.tar.gz) = 7371 bytes
-SHA1 (gqmpeg-skins/simplistic.tar.gz) = 9ff1b22158c9d447aa3f4c1160b9a7715e850028
-RMD160 (gqmpeg-skins/simplistic.tar.gz) = 0f02470fdb3dc42d99687fa87df0d21a8badac22
-Size (gqmpeg-skins/simplistic.tar.gz) = 10272 bytes
-SHA1 (gqmpeg-skins/skin-bubble-1.0.tar.gz) = 9fb14928c79127c474747392a1f1406a72bada20
-RMD160 (gqmpeg-skins/skin-bubble-1.0.tar.gz) = 1d267ff3e9edd57d487c1f3d64927308074c72ac
-Size (gqmpeg-skins/skin-bubble-1.0.tar.gz) = 51027 bytes
-SHA1 (gqmpeg-skins/skin-car-preset-1.0.tar.gz) = 8ce605b0ea43744066815f3876261113592e34d7
-RMD160 (gqmpeg-skins/skin-car-preset-1.0.tar.gz) = 0d052dfeac6bb511d7c341a6477c8c20175566a2
-Size (gqmpeg-skins/skin-car-preset-1.0.tar.gz) = 23911 bytes
-SHA1 (gqmpeg-skins/skin-circle-1.0.tar.gz) = e6082092d2c2f25074ef5332a4cbf40722f86146
-RMD160 (gqmpeg-skins/skin-circle-1.0.tar.gz) = db8998ff788caff6f8142517a3c2c27f89ed9643
-Size (gqmpeg-skins/skin-circle-1.0.tar.gz) = 63317 bytes
-SHA1 (gqmpeg-skins/skin-e-theme-1.0.tar.gz) = 9c61e204f1f8591d845863410b075ddbc0828fa4
-RMD160 (gqmpeg-skins/skin-e-theme-1.0.tar.gz) = 8eebc165612190d23141ffefbe4231f5334c839d
-Size (gqmpeg-skins/skin-e-theme-1.0.tar.gz) = 92528 bytes
-SHA1 (gqmpeg-skins/skin-example-1.2.tar.gz) = 296329a1a882e6a9d9c44c05ed4d1ec801e8dd9c
-RMD160 (gqmpeg-skins/skin-example-1.2.tar.gz) = 8b17e85cad796937523827ed5c2826eb5436cefc
-Size (gqmpeg-skins/skin-example-1.2.tar.gz) = 27805 bytes
-SHA1 (gqmpeg-skins/skin-example-d4.tar.gz) = 8d23c9a4670198c994900ddcdeeb1cbd07b3c2e2
-RMD160 (gqmpeg-skins/skin-example-d4.tar.gz) = e685c80c5b6d8844963079214a7628d79f65d027
-Size (gqmpeg-skins/skin-example-d4.tar.gz) = 57087 bytes
-SHA1 (gqmpeg-skins/skin-example2-1.1.tar.gz) = be9a2fe9e35a90df0225897c4c3e28b9bb850cde
-RMD160 (gqmpeg-skins/skin-example2-1.1.tar.gz) = 41a5c5de86b643eaaa25f99e757260e35c7a56be
-Size (gqmpeg-skins/skin-example2-1.1.tar.gz) = 34092 bytes
-SHA1 (gqmpeg-skins/skin-example3-1.0.tar.gz) = 12c85ec837d8679cdc9f6eff89ccb1d7e689182e
-RMD160 (gqmpeg-skins/skin-example3-1.0.tar.gz) = 26ae272f8fce9c6816ff6e7f4008e704bbb75e02
-Size (gqmpeg-skins/skin-example3-1.0.tar.gz) = 28971 bytes
-SHA1 (gqmpeg-skins/skin-odometer-1.0.tar.gz) = 3f9d3ce1af2792caab2fb7ca833585aac98b735f
-RMD160 (gqmpeg-skins/skin-odometer-1.0.tar.gz) = 1f3059ca00244789d595cde6dacb32b7faec0df9
-Size (gqmpeg-skins/skin-odometer-1.0.tar.gz) = 50874 bytes
-SHA1 (gqmpeg-skins/skin-paper-1.3.tar.gz) = 10b64fb2546523e69694418afda446456d0225c9
-RMD160 (gqmpeg-skins/skin-paper-1.3.tar.gz) = 010d3499ed52b0231f4873c37e6b740cd118dc6c
-Size (gqmpeg-skins/skin-paper-1.3.tar.gz) = 121789 bytes
-SHA1 (gqmpeg-skins/skin-pda-1.0.tar.gz) = 9bcf25154ebaa92eff89269f6ef06f42bd4b37d3
-RMD160 (gqmpeg-skins/skin-pda-1.0.tar.gz) = 2ad2fde8c36c686ac8f26b64963ac3c2790f15d1
-Size (gqmpeg-skins/skin-pda-1.0.tar.gz) = 39034 bytes
-SHA1 (gqmpeg-skins/skin-pro-player-1.0.tar.gz) = 1510e281c3f4231e989debdf169db68d65294589
-RMD160 (gqmpeg-skins/skin-pro-player-1.0.tar.gz) = cec74374ed8dbbbc11f12f43a82410b68897f045
-Size (gqmpeg-skins/skin-pro-player-1.0.tar.gz) = 81542 bytes
-SHA1 (gqmpeg-skins/skin-pro-player2-1.0.tar.gz) = bb958d69e48308a0b8ca6a28b0faa2ca7a63ec0a
-RMD160 (gqmpeg-skins/skin-pro-player2-1.0.tar.gz) = 16411208dd4a50b692e3107fabcb72f1128bd12f
-Size (gqmpeg-skins/skin-pro-player2-1.0.tar.gz) = 68547 bytes
-SHA1 (gqmpeg-skins/skin-purple-preset-1.0.tar.gz) = adb43d944bd6ad7c66d783d4b773df1f51dafab5
-RMD160 (gqmpeg-skins/skin-purple-preset-1.0.tar.gz) = 353114e524d80220dcb0f8f58e03fe013aebeb94
-Size (gqmpeg-skins/skin-purple-preset-1.0.tar.gz) = 21788 bytes
-SHA1 (gqmpeg-skins/skin-sg-1.1.tar.gz) = 67bcfb10b288b77f0058b009720509496b095ed8
-RMD160 (gqmpeg-skins/skin-sg-1.1.tar.gz) = 15514d1e6ce077b0ef22d5ad565a709200e6b604
-Size (gqmpeg-skins/skin-sg-1.1.tar.gz) = 80654 bytes
-SHA1 (gqmpeg-skins/skin-shiny-blue-1.0.tar.gz) = 45a6a0643b51c916081d5a8e99d4882716fcfb08
-RMD160 (gqmpeg-skins/skin-shiny-blue-1.0.tar.gz) = be19976b980fd20c07c88522f04001e293ec047c
-Size (gqmpeg-skins/skin-shiny-blue-1.0.tar.gz) = 118647 bytes
-SHA1 (gqmpeg-skins/skin-silver-1.0.tar.gz) = fb41ff9e53d5dbb38d038caa1a647953c47fde8b
-RMD160 (gqmpeg-skins/skin-silver-1.0.tar.gz) = 253bbc52449eba5cdb37393361fe2af6818f1709
-Size (gqmpeg-skins/skin-silver-1.0.tar.gz) = 23963 bytes
-SHA1 (gqmpeg-skins/skin-slate-alpha.tar.gz) = a39fc31b3e7f69fe4cbb330703675e7d087b493b
-RMD160 (gqmpeg-skins/skin-slate-alpha.tar.gz) = f7b4b7b71d22ca6f104ea579a5b9eb06e6038f81
-Size (gqmpeg-skins/skin-slate-alpha.tar.gz) = 18662 bytes
-SHA1 (gqmpeg-skins/skin-wharf.tar.gz) = b3394571b6f2a7f673ee858a44ec2072efe39681
-RMD160 (gqmpeg-skins/skin-wharf.tar.gz) = dfb63363abda1fff154630442fa30b61afc3c85a
-Size (gqmpeg-skins/skin-wharf.tar.gz) = 17374 bytes
-SHA1 (gqmpeg-skins/spiral.tar.gz) = 466fcc3aa0489960c98bc7ee2973289c82cf3246
-RMD160 (gqmpeg-skins/spiral.tar.gz) = a295daaaa7c097cd20f68da036a5fde6454e5a7c
-Size (gqmpeg-skins/spiral.tar.gz) = 10145 bytes
-SHA1 (gqmpeg-skins/swish.tar.gz) = 62f45471400ce2dabe4d3ae017637626d17804c2
-RMD160 (gqmpeg-skins/swish.tar.gz) = df5ea2b106480a3fcc0bbe959dacc9141743e506
-Size (gqmpeg-skins/swish.tar.gz) = 5504 bytes
-SHA1 (gqmpeg-skins/tattered.19990919.tar.gz) = 81fc9e9254ba7d5e0bf7fa534a263b2e59eced78
-RMD160 (gqmpeg-skins/tattered.19990919.tar.gz) = 03b15be6bca23e74af37d0a927b1e4ce3abbc181
-Size (gqmpeg-skins/tattered.19990919.tar.gz) = 123173 bytes
-SHA1 (gqmpeg-skins/tauceti-1.1.tar.gz) = 8935a31ae6fd2862a454cd6a2cd6ac90d259e58a
-RMD160 (gqmpeg-skins/tauceti-1.1.tar.gz) = 5d4c26bbf8a30219a2787c1b85b109467bdd62cf
-Size (gqmpeg-skins/tauceti-1.1.tar.gz) = 54572 bytes
-SHA1 (gqmpeg-skins/tildouf-skins.tar.gz) = 5057a38b54f1d1ac78716c1b468e4ce2415da597
-RMD160 (gqmpeg-skins/tildouf-skins.tar.gz) = f8534ae74196ac1a58f497e1cb9d2d5b821f515a
-Size (gqmpeg-skins/tildouf-skins.tar.gz) = 39974 bytes
-SHA1 (gqmpeg-skins/ufo.tar.gz) = f3362cf6fca95c8214c6c3c7fc4aafcbc19939d4
-RMD160 (gqmpeg-skins/ufo.tar.gz) = 6a3e85ee9c9c38a7b7011ba746eda74e0c0e774e
-Size (gqmpeg-skins/ufo.tar.gz) = 144412 bytes
-SHA1 (gqmpeg-skins/wmcool-1.3.tar.gz) = 61d86b4fdb1635be6a40de80f7ccc43fbe215edd
-RMD160 (gqmpeg-skins/wmcool-1.3.tar.gz) = 43b33a1a4084c620e6824c29c9a916e4d715e25d
-Size (gqmpeg-skins/wmcool-1.3.tar.gz) = 4268 bytes
-SHA1 (gqmpeg-skins/ye-olde.tar.gz) = 101e2ddc215339862dd972c93821000728b6fc94
-RMD160 (gqmpeg-skins/ye-olde.tar.gz) = 5393ebab93461a2194ece8d492cdae26b9d566f1
-Size (gqmpeg-skins/ye-olde.tar.gz) = 214149 bytes
-SHA1 (gqmpeg-skins/yelojckt.tar.gz) = e008cf1406dfa2170e49c40cdb3f5a7915e0f081
-RMD160 (gqmpeg-skins/yelojckt.tar.gz) = fda7a0f53e2134e854cc8cfd6a10c25e5a06e55c
-Size (gqmpeg-skins/yelojckt.tar.gz) = 10309 bytes
-SHA1 (gqmpeg-skins/zoom-information.tar.gz) = 128eee6e1af6136861fbbafdfcf52a68a9b77195
-RMD160 (gqmpeg-skins/zoom-information.tar.gz) = ba87288be1a81f6f5cb3656ad2dee116c6b479fb
-Size (gqmpeg-skins/zoom-information.tar.gz) = 14309 bytes
diff --git a/audio/gqmpeg/DEINSTALL b/audio/gqmpeg/DEINSTALL
deleted file mode 100644
index 6265e6e219e..00000000000
--- a/audio/gqmpeg/DEINSTALL
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:22:49 jlam Exp $
-
-case ${STAGE} in
-POST-DEINSTALL)
- ${CAT} << EOF
-=============================================================================
-If you won't be using ${PKGNAME} any longer, you may want to remove
-any skins that were installed in ${PKG_PREFIX}/share/gqmpeg/skins.
-=============================================================================
-EOF
- ;;
-esac
diff --git a/audio/gqmpeg/DESCR b/audio/gqmpeg/DESCR
deleted file mode 100644
index 445180dcc20..00000000000
--- a/audio/gqmpeg/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-GQmpeg is a frontend to mpg123 with extensive themeability and playlist
-support.
-
-Features:
- - Extensive mpg123 option support.
- - Shuffle, repeat.
- - Shuffle and repeat preferences can be saved in each playlist.
- - Customizable skins, including winamp skin support.
- - A skin can contain an alternative face (shade mode for instance)
- - ID3 tag reading/writing support (v1)
- - Volume controls (can be connected to any available device)
- - Basic file management (move/copy/rename/delete)
- - Tab completion in most dialogs.
- - Presets for playlists.
- - Drag and drop support.
- - Shoutcast (http://server:port) support.
diff --git a/audio/gqmpeg/MESSAGE b/audio/gqmpeg/MESSAGE
deleted file mode 100644
index 0b8871fd4f3..00000000000
--- a/audio/gqmpeg/MESSAGE
+++ /dev/null
@@ -1,15 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2003/02/10 16:04:46 salo Exp $
-
-If you want other skins, you can download them from
-
- http://gqmpeg.sourceforge.net/mpeg-skin-index.html
-
-Unpack them into the directory $HOME/.gqmpeg/skins, then type
-
- gqmpeg -skin:skindir
-
-to use them, where "skindir" is the directory containing the skin you
-wish to use.
-
-===========================================================================
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
deleted file mode 100644
index 45ef076764f..00000000000
--- a/audio/gqmpeg/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.92 2006/07/13 10:13:54 wiz Exp $
-
-DISTNAME= gqmpeg-0.20.0
-PKGREVISION= 10
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqmpeg/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://gqmpeg.sourceforge.net/
-COMMENT= GTK+ front end to mpg123
-
-DEPENDS+= mpg123{,-esound,-nas}>=0.59.18:../../audio/mpg123
-DEPENDS+= vorbis-tools>=1.0.0.6:../../audio/vorbis-tools
-DEPENDS+= xmp>=2.0.2:../../audio/xmp
-
-USE_TOOLS+= msgfmt
-USE_DIRS+= gnome1-1.5
-USE_DIRS+= xdg-1.2
-USE_PKGLOCALEDIR= YES
-GNU_CONFIGURE= YES
-
-.include "options.mk"
-
-CONFIGURE_ARGS+= --without-included-gettext
-CONFIGURE_ENV+= GNOME_DATADIR=${PREFIX}/share
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/gdk-pixbuf/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gqmpeg/PLIST b/audio/gqmpeg/PLIST
deleted file mode 100644
index 00866ff788f..00000000000
--- a/audio/gqmpeg/PLIST
+++ /dev/null
@@ -1,83 +0,0 @@
-@comment $NetBSD: PLIST,v 1.12 2006/04/17 07:07:11 jlam Exp $
-bin/gqmpeg
-bin/gqmpeg-shoutcast-plugin.sh
-man/man1/gqmpeg.1
-share/gnome/apps/Multimedia/gqmpeg.desktop
-share/gqmpeg/skins/README
-share/gqmpeg/skins/SKIN-SPECS
-share/gqmpeg/skins/mrclean/blue-handle-24.png
-share/gqmpeg/skins/mrclean/blue2-about.png
-share/gqmpeg/skins/mrclean/blue2-round-shadowed.png
-share/gqmpeg/skins/mrclean/blue2-soft-round-7.png
-share/gqmpeg/skins/mrclean/blue2-soft-round-logo.png
-share/gqmpeg/skins/mrclean/btn-expand-toggle-20-h.png
-share/gqmpeg/skins/mrclean/btn-rect-clr-32-eject.png
-share/gqmpeg/skins/mrclean/btn-rect-clr-32-stop.png
-share/gqmpeg/skins/mrclean/btn-rect-clr-32r-pause.png
-share/gqmpeg/skins/mrclean/btn-rect-clr-32r-play.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-16-left.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-16-plus.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-16-right.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-01.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-02.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-03.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-04.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-05.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-06.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-07.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-08.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-09.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-10.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-dn.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-eye.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-left.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-list.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-max.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-min.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-right.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-toggle.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-up.png
-share/gqmpeg/skins/mrclean/btn-rnd-clr-26-x.png
-share/gqmpeg/skins/mrclean/bubble-fly.png
-share/gqmpeg/skins/mrclean/bubble-slider-16-h.png
-share/gqmpeg/skins/mrclean/bubble-slider-16-v.png
-share/gqmpeg/skins/mrclean/dial-ball2.png
-share/gqmpeg/skins/mrclean/dial-clip2.png
-share/gqmpeg/skins/mrclean/dial-eye.png
-share/gqmpeg/skins/mrclean/digit-digital-15-aa.png
-share/gqmpeg/skins/mrclean/digit-digital-24-aa.png
-share/gqmpeg/skins/mrclean/focus-rect-border-1.png
-share/gqmpeg/skins/mrclean/focus-rect-border-7b.png
-share/gqmpeg/skins/mrclean/item-ab-static.png
-share/gqmpeg/skins/mrclean/item-clear-load-aa.png
-share/gqmpeg/skins/mrclean/item-colon-15.png
-share/gqmpeg/skins/mrclean/item-colon-24.png
-share/gqmpeg/skins/mrclean/item-pda-minus.png
-share/gqmpeg/skins/mrclean/item-pda-random-static.png
-share/gqmpeg/skins/mrclean/item-pda-repeat-static.png
-share/gqmpeg/skins/mrclean/item-repeat1-static.png
-share/gqmpeg/skins/mrclean/item-volume-static.png
-share/gqmpeg/skins/mrclean/list-clear-back.png
-share/gqmpeg/skins/mrclean/list-clear-flags.png
-share/gqmpeg/skins/mrclean/list-clear.png
-share/gqmpeg/skins/mrclean/list-menu-flags.png
-share/gqmpeg/skins/mrclean/list-row-clear.png
-share/gqmpeg/skins/mrclean/skindata
-share/gqmpeg/skins/mrclean/skindata_about
-share/gqmpeg/skins/mrclean/skindata_compact
-share/gqmpeg/skins/mrclean/skindata_extra
-share/gqmpeg/skins/mrclean/skindata_flyby
-share/gqmpeg/skins/mrclean/skindata_menu
-share/gqmpeg/skins/mrclean/skindata_playlist
-share/gqmpeg/skins/mrclean/skindata_submenu
-share/locale/cs/LC_MESSAGES/gqmpeg.mo
-share/locale/de/LC_MESSAGES/gqmpeg.mo
-share/locale/fi/LC_MESSAGES/gqmpeg.mo
-share/locale/fr/LC_MESSAGES/gqmpeg.mo
-share/locale/ja/LC_MESSAGES/gqmpeg.mo
-share/locale/pt_BR/LC_MESSAGES/gqmpeg.mo
-share/locale/zh_TW/LC_MESSAGES/gqmpeg.mo
-share/pixmaps/gqmpeg.png
-@dirrm share/gqmpeg/skins/mrclean
-@unexec ${RMDIR} -p %D/share/gqmpeg/skins 2> /dev/null || ${TRUE}
-@comment in gnome-dirs: @dirrm share/gnome/apps/Multimedia
diff --git a/audio/gqmpeg/distinfo b/audio/gqmpeg/distinfo
deleted file mode 100644
index 2394902f2de..00000000000
--- a/audio/gqmpeg/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.25 2005/09/08 22:37:53 abs Exp $
-
-SHA1 (gqmpeg-0.20.0.tar.gz) = e1a69f49c3a4063f4e16c6f3242b49eb31718418
-RMD160 (gqmpeg-0.20.0.tar.gz) = ac8f5ebdd3a62e02551860d18c292a5fadef7033
-Size (gqmpeg-0.20.0.tar.gz) = 966991 bytes
-SHA1 (patch-aa) = 00f989d188bd6b578c492505204c68017f9445a1
-SHA1 (patch-ab) = 67a95f35118daf4588b44bc34dbfa36db93b7f8e
diff --git a/audio/gqmpeg/options.mk b/audio/gqmpeg/options.mk
deleted file mode 100644
index fec94b08020..00000000000
--- a/audio/gqmpeg/options.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2005/10/05 13:29:49 wiz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.gqmpeg
-PKG_SUPPORTED_OPTIONS= gqmpeg-japanese gqmpeg-russian
-PKG_SUGGESTED_OPTIONS= gqmpeg-japanese gqmpeg-russian
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mgqmpeg-japanese)
-CONFIGURE_ARGS+= --enable-japanese
-.endif
-
-.if !empty(PKG_OPTIONS:Mgqmpeg-russian)
-CONFIGURE_ARGS+= --enable-russian
-.endif
diff --git a/audio/gqmpeg/patches/patch-aa b/audio/gqmpeg/patches/patch-aa
deleted file mode 100644
index f0b72863676..00000000000
--- a/audio/gqmpeg/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.15 2002/08/20 11:39:10 wiz Exp $
-
---- Makefile.in.orig Tue Aug 20 12:25:47 2002
-+++ Makefile.in
-@@ -120,11 +120,11 @@ EXTRA_DIST = config.rpath \
- skindir = $(prefix)/share/gqmpeg/skins
- skin_DATA = SKIN-SPECS README
-
--@HAVE_GNOME_TRUE@desktopdir = @HAVE_GNOME_TRUE@$(GNOME_DATADIR)/gnome/apps/Multimedia
--@HAVE_GNOME_TRUE@desktop_DATA = @HAVE_GNOME_TRUE@gqmpeg.desktop
-+desktopdir = $(GNOME_DATADIR)/gnome/apps/Multimedia
-+desktop_DATA = gqmpeg.desktop
-
--@HAVE_GNOME_TRUE@icondir = @HAVE_GNOME_TRUE@$(GNOME_DATADIR)/pixmaps
--@HAVE_GNOME_TRUE@icon_DATA = @HAVE_GNOME_TRUE@gqmpeg.png
-+icondir = $(GNOME_DATADIR)/pixmaps
-+icon_DATA = gqmpeg.png
-
- ACLOCAL_AMFLAGS = -I m4
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/audio/gqmpeg/patches/patch-ab b/audio/gqmpeg/patches/patch-ab
deleted file mode 100644
index 0571efc0373..00000000000
--- a/audio/gqmpeg/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.23 2005/09/08 22:37:53 abs Exp $
-
---- src/cpu_perc.c.orig 2002-05-02 21:08:34.000000000 +0200
-+++ src/cpu_perc.c 2004-05-10 20:22:09.000000000 +0200
-@@ -66,7 +66,11 @@
- /* find where the proc fs is mounted, some strange people could mount it
- in another place than /proc, it can even be not mounted at all */
- {
-+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900)
-+ struct statvfs *mntbufp;
-+#else
- struct statfs *mntbufp;
-+#endif
- int fs_count;
- int procfs_found = 0;
-
diff --git a/audio/gramofile/DESCR b/audio/gramofile/DESCR
deleted file mode 100644
index a525f180494..00000000000
--- a/audio/gramofile/DESCR
+++ /dev/null
@@ -1,21 +0,0 @@
-GramoFile is able to record hours of CD quality music, split long
-sound files in separate tracks, and remove ticks and pops from
-recordings. It can be used for ripping audio from vinyl LPs.
-
-+ Integrated sound recording and playback (with customized versions of
- brec(1) and bplay(1) by David Monro);
-+ Handling of large sound files up to a few GB;
-+ Signal peak level meter during recording;
-+ Playback of user-specifiable parts of sound files;
-+ Signal processing through application of `filters';
-+ Nine filters (filter types, actually) are supplied, new ones can be
- added fairly easily;
-+ Multiple filters can be used, in random order, in one single run - even
- multiple instances of the same filter;
-+ Most filters can be fine-tuned through a number of parameters
- (independent of each filter instance);
-+ A large sound file containing an entire side of a gramophone record can
- be split into separate sound files, one for each track;
-+ Signal processing and track splitting are performed simultaneously;
-+ Text mode user interface with a windows-like look and `feel';
-+ Sound files of the familiar .wav type are used
diff --git a/audio/gramofile/Makefile b/audio/gramofile/Makefile
deleted file mode 100644
index a51d69bda36..00000000000
--- a/audio/gramofile/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2006/04/22 09:22:05 rillig Exp $
-#
-
-DISTNAME= gramofile-1.6
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= http://www.opensourcepartners.nl/~costar/gramofile/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.opensourcepartners.nl/~costar/gramofile/
-COMMENT= Tool for ripping audio from vinyl
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-BUILD_TARGET= gramofile makebplay
-
-USE_TOOLS+= gmake
-
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/gramofile ${PREFIX}/bin/gramofile
- ${INSTALL_PROGRAM} ${WRKSRC}/bplaysrc/bplay ${PREFIX}/bin/bplay_gramo
- cd ${PREFIX}/bin && ${LN} -s bplay_gramo brec_gramo
-
-SUBST_CLASSES+= snd
-SUBST_STAGE.snd= post-patch
-SUBST_FILES.snd= bplaysrc/sndfunc.c
-SUBST_SED.snd= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
-SUBST_MESSAGE.snd= Fixing harcoded audio device.
-
-.include "../../mk/curses.buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gramofile/PLIST b/audio/gramofile/PLIST
deleted file mode 100644
index c26b65b263f..00000000000
--- a/audio/gramofile/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/07/08 18:33:07 agc Exp $
-bin/gramofile
-bin/bplay_gramo
-bin/brec_gramo
diff --git a/audio/gramofile/distinfo b/audio/gramofile/distinfo
deleted file mode 100644
index 7f43621248e..00000000000
--- a/audio/gramofile/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/11/11 16:49:32 joerg Exp $
-
-SHA1 (gramofile-1.6.tar.gz) = 6e5365d9e04801725be694fefcff5fc10ea2f912
-RMD160 (gramofile-1.6.tar.gz) = 3f7c8a8e8053e92ece830bbb1138fc7ed1c49967
-Size (gramofile-1.6.tar.gz) = 108596 bytes
-SHA1 (patch-aa) = 020f858ca852b1ffaaecf3dba44b734c5bc2fbb2
-SHA1 (patch-ab) = 504cdb14c7ab11179e6cddfc32179a7a3528a67a
-SHA1 (patch-ac) = 38094ec6a4e1e90e3d03eef5ce3f6fdb8d0621bb
diff --git a/audio/gramofile/patches/patch-aa b/audio/gramofile/patches/patch-aa
deleted file mode 100644
index 78160e86dd2..00000000000
--- a/audio/gramofile/patches/patch-aa
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/11/11 16:49:32 joerg Exp $
-
---- Makefile.orig 2000-03-28 20:23:58.000000000 +0000
-+++ Makefile
-@@ -18,23 +18,29 @@ LDFLAGS =
-
- ########## CHOOSE YOUR ARCHITECTURE: (NOTE: also see bplaysrc/Makefile!)
-
-+OS= $(shell uname -s)
-+
-+ifeq ($(OS), Linux)
- # For Linux (and maybe others), use these:
- CFLAGS = -Wall -O2 -DTURBO_MEDIAN -DTURBO_BUFFER
- DEPS = $(OBJS) makebplay
- LIBS = -lncurses -lm
- COPY_A = -a
--
-+else
-+ifeq (,$(filter-out NetBSD DragonFly,$(OS)))
- # For FreeBSD (and maybe others), use these:
--#CFLAGS = -Wall -O2 -DTURBO_MEDIAN -DTURBO_BUFFER
--#DEPS = $(OBJS) makebplay
--#LIBS = -lncurses -lm
--#COPY_A = -p
--
-+CFLAGS = -Wall -O2 -DTURBO_MEDIAN -DTURBO_BUFFER -DOLD_CURSES
-+DEPS = $(OBJS) makebplay
-+LIBS = -lcurses -lm
-+COPY_A = -p
-+else
- # For IRIX (and maybe others), use these:
--#CFLAGS = -Wall -O2 -DTURBO_MEDIAN -DTURBO_BUFFER -DSWAP_ENDIAN -DOLD_CURSES
--#DEPS = $(OBJS)
--#LIBS = -lcurses -lm
--#COPY_A = -a
-+CFLAGS = -Wall -O2 -DTURBO_MEDIAN -DTURBO_BUFFER -DSWAP_ENDIAN -DOLD_CURSES
-+DEPS = $(OBJS)
-+LIBS = -lcurses -lm
-+COPY_A = -a
-+endif
-+endif
-
- ##########
-
diff --git a/audio/gramofile/patches/patch-ab b/audio/gramofile/patches/patch-ab
deleted file mode 100644
index aa2bfe80080..00000000000
--- a/audio/gramofile/patches/patch-ab
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/11/11 16:49:32 joerg Exp $
-
---- bplaysrc/Makefile.orig 2000-03-27 21:24:46.000000000 +0000
-+++ bplaysrc/Makefile
-@@ -6,18 +6,29 @@ OBJS = bplay.o sndfunc.o shmbuf.o ../yes
- ../clrscr.o ../secshms.o
- #SRCS = bplay.c sndfunc.o shmbuf.c
-
--CC = gcc
--LDFLAGS =
-+#CC = gcc
-+#LDFLAGS =
-
- ########## CHOOSE YOUR ARCHITECTURE: (NOTE: also see ../Makefile!)
-
-+OS= $(shell uname -s)
-+
-+ifeq (${OS}, Linux)
- # For Linux (and maybe others), use these:
- CFLAGS = -Wall -O2 -DUSEBUFFLOCK -DREDHAT50 -DLP2CD -DVUMETER # -DDEBUG
- LIBS = -lncurses
--
-+else
-+ifeq (${OS}, DragonFly)
-+CFLAGS = -Wall -O2 -DLP2CD -DVUMETER
-+LIBS = -lcurses ${LIBOSSAUDIO}
-+else
-+ifeq (${OS}, NetBSD)
- # For FreeBSD (and maybe others), use these:
--#CFLAGS = -Wall -O2 -DLP2CD -DVUMETER # -DDEBUG
--#LIBS = -lncurses
-+CFLAGS = -Wall -O2 -DLP2CD -DVUMETER -DOLD_CURSES -D_SEM_SEMUN_UNDEFINED # -DDEBUG
-+LIBS = -lcurses ${LIBOSSAUDIO}
-+endif
-+endif
-+endif
-
- # -DOLD_CURSES can be used here, too.
-
diff --git a/audio/gramofile/patches/patch-ac b/audio/gramofile/patches/patch-ac
deleted file mode 100644
index b08b0cc0350..00000000000
--- a/audio/gramofile/patches/patch-ac
+++ /dev/null
@@ -1,83 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2004/11/29 09:17:10 agc Exp $
-
-Use fixed size fields
-
---- fmtheaders.h.orig 2000-03-28 22:07:26.000000000 +0100
-+++ fmtheaders.h 2004-11-29 09:12:19.000000000 +0000
-@@ -7,16 +7,16 @@
-
- #define VOC_MAGIC "Creative Voice File\032"
-
--#define DATALEN(bp) ((u_long)(bp.BlockLen[0]) | \
-- ((u_long)(bp.BlockLen[1]) << 8) | \
-- ((u_long)(bp.BlockLen[2]) << 16) )
-+#define DATALEN(bp) ((u_int32_t)(bp.BlockLen[0]) | \
-+ ((u_int32_t)(bp.BlockLen[1]) << 8) | \
-+ ((u_int32_t)(bp.BlockLen[2]) << 16) )
-
- typedef struct vochead
- {
- u_char Magic[20]; /* must be VOC_MAGIC */
-- u_short BlockOffset; /* Offset to first block from top of file */
-- u_short Version; /* VOC-file version */
-- u_short IDCode; /* complement of version + 0x1234 */
-+ u_int16_t BlockOffset; /* Offset to first block from top of file */
-+ u_int16_t Version; /* VOC-file version */
-+ u_int16_t IDCode; /* complement of version + 0x1234 */
- }
- vochead;
-
-@@ -36,7 +36,7 @@
-
- typedef struct blockT8
- {
-- u_short TimeConstant;
-+ u_int16_t TimeConstant;
- u_char PackMethod;
- u_char VoiceMode;
- }
-@@ -47,7 +47,7 @@
- u_int SamplesPerSec;
- u_char BitsPerSample;
- u_char Channels;
-- u_short Format;
-+ u_int16_t Format;
- u_char reserved[4];
- }
- blockT9;
-@@ -62,21 +62,21 @@
- */
- typedef struct wavhead
- {
-- u_long main_chunk; /* 'RIFF' */
-- u_long length; /* Length of rest of file */
-- u_long chunk_type; /* 'WAVE' */
--
-- u_long sub_chunk; /* 'fmt ' */
-- u_long sc_len; /* length of sub_chunk, =16 (rest of chunk) */
-- u_short format; /* should be 1 for PCM-code */
-- u_short modus; /* 1 Mono, 2 Stereo */
-- u_long sample_fq; /* frequence of sample */
-- u_long byte_p_sec;
-- u_short byte_p_spl; /* samplesize; 1 or 2 bytes */
-- u_short bit_p_spl; /* 8, 12 or 16 bit */
-+ u_int32_t main_chunk; /* 'RIFF' */
-+ u_int32_t length; /* Length of rest of file */
-+ u_int32_t chunk_type; /* 'WAVE' */
-+
-+ u_int32_t sub_chunk; /* 'fmt ' */
-+ u_int32_t sc_len; /* length of sub_chunk, =16 (rest of chunk) */
-+ u_int16_t format; /* should be 1 for PCM-code */
-+ u_int16_t modus; /* 1 Mono, 2 Stereo */
-+ u_int32_t sample_fq; /* frequence of sample */
-+ u_int32_t byte_p_sec;
-+ u_int16_t byte_p_spl; /* samplesize; 1 or 2 bytes */
-+ u_int16_t bit_p_spl; /* 8, 12 or 16 bit */
-
-- u_long data_chunk; /* 'data' */
-- u_long data_length; /* samplecount (lenth of rest of block?) */
-+ u_int32_t data_chunk; /* 'data' */
-+ u_int32_t data_length; /* samplecount (lenth of rest of block?) */
- }
- wavhead;
-
diff --git a/audio/gsm/DESCR b/audio/gsm/DESCR
deleted file mode 100644
index 1436934430a..00000000000
--- a/audio/gsm/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-gsm is a conversion package and library for converting u-law audio to
-gsm encoding (which is much more efficient) and back again.
diff --git a/audio/gsm/Makefile b/audio/gsm/Makefile
deleted file mode 100644
index 570cd12e731..00000000000
--- a/audio/gsm/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.29 2007/02/22 19:26:05 wiz Exp $
-#
-
-DISTNAME= gsm-1.0.10
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.cs.tu-berlin.de/pub/local/kbs/tubmik/gsm/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://kbs.cs.tu-berlin.de/~jutta/toast.html
-COMMENT= Audio converter and library for converting u-law to gsm encoding
-
-WRKSRC= ${WRKDIR}/gsm-1.0-pl10
-USE_LIBTOOL= yes
-
-NO_CONFIGURE= yes
-MAKE_ENV+= INSTALL_ROOT=${PREFIX:Q} ROOT=${WRKSRC:Q}
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/include/gsm
- ${INSTALL_DATA} ${WRKSRC}/inc/private.h ${PREFIX}/include/gsm
- ${INSTALL_DATA} ${WRKSRC}/inc/proto.h ${PREFIX}/include/gsm
- ${INSTALL_DATA} ${WRKSRC}/inc/unproto.h ${PREFIX}/include/gsm
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gsm/PLIST b/audio/gsm/PLIST
deleted file mode 100644
index 4580cfaea97..00000000000
--- a/audio/gsm/PLIST
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:15 jlam Exp $
-bin/tcat
-bin/toast
-bin/untoast
-include/gsm.h
-include/gsm/private.h
-include/gsm/proto.h
-include/gsm/unproto.h
-lib/libgsm.la
-man/man1/toast.1
-man/man3/gsm.3
-man/man3/gsm_explode.3
-man/man3/gsm_option.3
-man/man3/gsm_print.3
-@dirrm include/gsm
diff --git a/audio/gsm/buildlink3.mk b/audio/gsm/buildlink3.mk
deleted file mode 100644
index 2835bce3c75..00000000000
--- a/audio/gsm/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:36 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-GSM_BUILDLINK3_MK:= ${GSM_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= gsm
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngsm}
-BUILDLINK_PACKAGES+= gsm
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gsm
-
-.if !empty(GSM_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.gsm+= gsm>=1.0.10
-BUILDLINK_ABI_DEPENDS.gsm+= gsm>=1.0.10nb1
-BUILDLINK_PKGSRCDIR.gsm?= ../../audio/gsm
-.endif # GSM_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/gsm/distinfo b/audio/gsm/distinfo
deleted file mode 100644
index 070f38def1c..00000000000
--- a/audio/gsm/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/10/29 16:20:26 tv Exp $
-
-SHA1 (gsm-1.0.10.tar.gz) = ee47a81f4137bf3ce933dc610cb2293055ce9c02
-RMD160 (gsm-1.0.10.tar.gz) = 334f93ab232c0b5c1b3090ffa551af0ee0455ed0
-Size (gsm-1.0.10.tar.gz) = 65928 bytes
-SHA1 (patch-aa) = 2c36148172e64602903e18d93e685d5bd84db5c8
-SHA1 (patch-ab) = 88bc6a8d77589f0ee95fca9268ae36a8d4a8b50a
-SHA1 (patch-ac) = 9e4e582cfd4f6892531578d9df25a29485e8cf32
diff --git a/audio/gsm/patches/patch-aa b/audio/gsm/patches/patch-aa
deleted file mode 100644
index ba4e272ba41..00000000000
--- a/audio/gsm/patches/patch-aa
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/10/29 16:20:26 tv Exp $
-
---- inc/config.h.orig 1996-07-02 10:32:27.000000000 -0400
-+++ inc/config.h
-@@ -10,12 +10,15 @@
- #define CONFIG_H
-
- /*efine SIGHANDLER_T int /* signal handlers are void */
--/*efine HAS_SYSV_SIGNAL 1 /* sigs not blocked/reset? */
-+
-+#if defined(__INTERIX)
-+#define HAS_SYSV_SIGNAL 1 /* sigs not blocked/reset? */
-+#endif
-
- #define HAS_STDLIB_H 1 /* /usr/include/stdlib.h */
--/*efine HAS_LIMITS_H 1 /* /usr/include/limits.h */
-+#define HAS_LIMITS_H 1 /* /usr/include/limits.h */
- #define HAS_FCNTL_H 1 /* /usr/include/fcntl.h */
--/*efine HAS_ERRNO_DECL 1 /* errno.h declares errno */
-+#define HAS_ERRNO_DECL 1 /* errno.h declares errno */
-
- #define HAS_FSTAT 1 /* fstat syscall */
- #define HAS_FCHMOD 1 /* fchmod syscall */
-@@ -28,10 +31,19 @@
- /*efine HAS_STRINGS_H 1 /* /usr/include/strings.h */
-
- #define HAS_UNISTD_H 1 /* /usr/include/unistd.h */
--#define HAS_UTIME 1 /* POSIX utime(path, times) */
--/*efine HAS_UTIMES 1 /* use utimes() syscall instead */
-+
-+#if defined(__INTERIX)
-+#define HAS_UTIME 1 /* POSIX utime(path, times) */
-+#else
-+#define HAS_UTIMES 1 /* use utimes() syscall instead */
-+#endif
-+
- #define HAS_UTIME_H 1 /* UTIME header file */
--/*efine HAS_UTIMBUF 1 /* struct utimbuf */
-+
-+#if defined(__INTERIX)
-+#define HAS_UTIMBUF 1 /* struct utimbuf */
-+#endif
-+
- /*efine HAS_UTIMEUSEC 1 /* microseconds in utimbuf? */
-
- #endif /* CONFIG_H */
diff --git a/audio/gsm/patches/patch-ab b/audio/gsm/patches/patch-ab
deleted file mode 100644
index 3dd888ea51b..00000000000
--- a/audio/gsm/patches/patch-ab
+++ /dev/null
@@ -1,215 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2003/09/18 18:55:23 wiz Exp $
-
---- Makefile.orig Tue Jul 2 10:36:06 1996
-+++ Makefile Sun Jan 16 02:16:43 2000
-@@ -7,11 +7,13 @@
- SASR = -DSASR
- ######### Define SASR if >> is a signed arithmetic shift (-1 >> 1 == -1)
-
--MULHACK = -DUSE_FLOAT_MUL
-+#MULHACK = -DUSE_FLOAT_MUL
-+MULHACK =
- ######### Define this if your host multiplies floats faster than integers,
- ######### e.g. on a SPARCstation.
-
--FAST = -DFAST
-+#FAST = -DFAST
-+FAST =
- ######### Define together with USE_FLOAT_MUL to enable the GSM library's
- ######### approximation option for incorrect, but good-enough results.
-
-@@ -43,7 +45,7 @@
- # CC = /usr/lang/acc
- # CCFLAGS = -c -O
-
--CC = gcc -ansi -pedantic
-+# CC = gcc -ansi -pedantic
- CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1
-
- LD = $(CC)
-@@ -71,7 +73,7 @@
- # Leave INSTALL_ROOT empty (or just don't execute "make install") to
- # not install gsm and toast outside of this directory.
-
--INSTALL_ROOT =
-+# INSTALL_ROOT =
-
- # Where do you want to install the gsm library, header file, and manpages?
- #
-@@ -80,7 +82,7 @@
-
- GSM_INSTALL_ROOT = $(INSTALL_ROOT)
- GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
--GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/inc
-+GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/include
- GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
-
-
-@@ -96,8 +98,9 @@
- # Other tools
-
- SHELL = /bin/sh
--LN = ln
-+LN = ln -s
- BASENAME = basename
-+DIRNAME = dirname
- AR = ar
- ARFLAGS = cr
- RMFLAGS =
-@@ -114,7 +117,7 @@
-
- # Local Directories
-
--ROOT = .
-+#ROOT = .
- ADDTST = $(ROOT)/add-test
- TST = $(ROOT)/tst
- MAN = $(ROOT)/man
-@@ -129,7 +132,7 @@
- # DEBUG = -DNDEBUG
- ######### Remove -DNDEBUG to enable assertions.
-
--CFLAGS = $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
-+CFLAGS += $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
- $(WAV49) $(CCINC) -I$(INC)
- ######### It's $(CC) $(CFLAGS)
-
-@@ -139,7 +142,7 @@
-
- # Targets
-
--LIBGSM = $(LIB)/libgsm.a
-+LIBGSM = $(LIB)/libgsm.la
-
- TOAST = $(BIN)/toast
- UNTOAST = $(BIN)/untoast
-@@ -257,7 +260,7 @@
- # Install targets
-
- GSM_INSTALL_TARGETS = \
-- $(GSM_INSTALL_LIB)/libgsm.a \
-+ $(GSM_INSTALL_LIB)/libgsm.la \
- $(GSM_INSTALL_INC)/gsm.h \
- $(GSM_INSTALL_MAN)/gsm.3 \
- $(GSM_INSTALL_MAN)/gsm_explode.3 \
-@@ -273,10 +276,15 @@
-
- # Default rules
-
-+.SUFFIXES: .o .lo
-+
- .c.o:
- $(CC) $(CFLAGS) $?
- @-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
-
-+.c.lo:
-+ cd `${DIRNAME} $@` && ${LIBTOOL} --mode=compile ${CC} ${CFLAGS} $?
-+
- # Target rules
-
- all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
-@@ -299,16 +307,20 @@
-
- # The basic API: libgsm
-
--$(LIBGSM): $(LIB) $(GSM_OBJECTS)
-+$(LIBGSM): $(LIB) $(GSM_OBJECTS:.o=.lo)
- -rm $(RMFLAGS) $(LIBGSM)
-- $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
-- $(RANLIB) $(LIBGSM)
-+ cd $(LIB) && \
-+ $(LIBTOOL) --mode=link $(CC) -o `$(BASENAME) $@` \
-+ $(GSM_OBJECTS:.o=.lo) \
-+ -rpath $(GSM_INSTALL_LIB) -version-info 1:10
-
-
- # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
-
- $(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM)
-- $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
-+ cd $(BIN) && \
-+ $(LIBTOOL) --mode=link $(LD) $(LFLAGS) -o `$(BASENAME) $@` \
-+ $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
-
- $(UNTOAST): $(BIN) $(TOAST)
- -rm $(RMFLAGS) $(UNTOAST)
-@@ -332,12 +344,12 @@
-
- gsminstall:
- -if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \
-- make $(GSM_INSTALL_TARGETS) ; \
-+ $(MAKE) $(GSM_INSTALL_TARGETS) ; \
- fi
-
- toastinstall:
- -if [ x"$(TOAST_INSTALL_ROOT)" != x ]; then \
-- make $(TOAST_INSTALL_TARGETS); \
-+ $(MAKE) $(TOAST_INSTALL_TARGETS); \
- fi
-
- gsmuninstall:
-@@ -351,52 +363,34 @@
- fi
-
- $(TOAST_INSTALL_BIN)/toast: $(TOAST)
-- -rm $@
-- cp $(TOAST) $@
-- chmod 755 $@
-+ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} $? $(TOAST_INSTALL_BIN)
-
- $(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast
-- -rm $@
-- ln $? $@
-+ ${LN} -f toast $@
-
- $(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast
-- -rm $@
-- ln $? $@
-+ ${LN} -f toast $@
-
- $(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1
-- -rm $@
-- cp $? $@
-- chmod 444 $@
-+ ${BSD_INSTALL_MAN} $? $(TOAST_INSTALL_MAN)
-
- $(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3
-- -rm $@
-- cp $? $@
-- chmod 444 $@
-+ ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN)
-
- $(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3
-- -rm $@
-- cp $? $@
-- chmod 444 $@
-+ ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN)
-
- $(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3
-- -rm $@
-- cp $? $@
-- chmod 444 $@
-+ ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN)
-
- $(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3
-- -rm $@
-- cp $? $@
-- chmod 444 $@
-+ ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN)
-
- $(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h
-- -rm $@
-- cp $? $@
-- chmod 444 $@
--
--$(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM)
-- -rm $@
-- cp $? $@
-- chmod 444 $@
-+ ${BSD_INSTALL_DATA} $? $(GSM_INSTALL_INC)
-+
-+$(GSM_INSTALL_LIB)/libgsm.la: $(LIBGSM)
-+ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} $? $(GSM_INSTALL_LIB)
-
-
- # Distribution
diff --git a/audio/gsm/patches/patch-ac b/audio/gsm/patches/patch-ac
deleted file mode 100644
index 02c66f4b82c..00000000000
--- a/audio/gsm/patches/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1998/12/31 05:51:01 garbled Exp $
---- src/code.c.orig Mon Dec 28 11:04:16 1998
-+++ src/code.c Mon Dec 28 11:04:46 1998
-@@ -11,6 +11,7 @@
-
- #ifdef HAS_STDLIB_H
- #include <stdlib.h>
-+#include <string.h>
- #else
- # include "proto.h"
- extern char * memcpy P((char *, char *, int));
diff --git a/audio/gst-plugins0.10-a52/DESCR b/audio/gst-plugins0.10-a52/DESCR
deleted file mode 100644
index 6bafc912d3e..00000000000
--- a/audio/gst-plugins0.10-a52/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple Ogg/Vorbis playback to
-complex audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently. Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-GStreamer is released under the LGPL.
-
-This package is part of the 'ugly' plugins for GStreamer. It provides the
-a52dec plugin, which allows playback of A/52 audio streams.
diff --git a/audio/gst-plugins0.10-a52/Makefile b/audio/gst-plugins0.10-a52/Makefile
deleted file mode 100644
index 50555118a47..00000000000
--- a/audio/gst-plugins0.10-a52/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/01/05 10:54:00 drochner Exp $
-#
-
-GST_PLUGINS0.10_NAME= a52
-GST_PLUGINS0.10_DIRS= ext/a52dec
-
-.include "../../multimedia/gst-plugins0.10-ugly/Makefile.common"
-
-.include "../../audio/liba52/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.10-a52/PLIST b/audio/gst-plugins0.10-a52/PLIST
deleted file mode 100644
index 174b7c03994..00000000000
--- a/audio/gst-plugins0.10-a52/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/01/05 10:54:00 drochner Exp $
-lib/gstreamer-0.10/libgsta52dec.la
-@comment in gstreamer0.10: @dirrm lib/gstreamer-0.10
diff --git a/audio/gst-plugins0.10-cdparanoia/DESCR b/audio/gst-plugins0.10-cdparanoia/DESCR
deleted file mode 100644
index 4493fd7cdc2..00000000000
--- a/audio/gst-plugins0.10-cdparanoia/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple mp3 playback to complex
-audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently. Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-This package provides the cdparanoia plugin for GStreamer, which allows
-audio extraction from CDs.
diff --git a/audio/gst-plugins0.10-cdparanoia/Makefile b/audio/gst-plugins0.10-cdparanoia/Makefile
deleted file mode 100644
index b689c7b8351..00000000000
--- a/audio/gst-plugins0.10-cdparanoia/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/07/02 11:41:34 drochner Exp $
-#
-
-GST_PLUGINS0.10_NAME= cdparanoia
-GST_PLUGINS0.10_DIRS= ext/cdparanoia
-GST_PLUGINS0.10_FLAGS= cdparanoia
-
-.include "../../multimedia/gst-plugins0.10-base/Makefile.common"
-
-CPPFLAGS+= -I${BUILDLINK_PREFIX.cdparanoia}/include/cdparanoia
-
-.include "../../audio/cdparanoia/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.10-cdparanoia/PLIST b/audio/gst-plugins0.10-cdparanoia/PLIST
deleted file mode 100644
index 6911cf63383..00000000000
--- a/audio/gst-plugins0.10-cdparanoia/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/07/02 11:41:34 drochner Exp $
-lib/gstreamer-0.10/libgstcdparanoia.la
diff --git a/audio/gst-plugins0.10-dts/DESCR b/audio/gst-plugins0.10-dts/DESCR
deleted file mode 100644
index 54d62106a83..00000000000
--- a/audio/gst-plugins0.10-dts/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple Ogg/Vorbis playback to
-complex audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently. Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-GStreamer is released under the LGPL.
-
-This package is part of the 'bad' plugins for GStreamer. It provides the
-dtsdec plugin, which allows playback of DTS audio streams.
diff --git a/audio/gst-plugins0.10-dts/Makefile b/audio/gst-plugins0.10-dts/Makefile
deleted file mode 100644
index 5fd0608ddb0..00000000000
--- a/audio/gst-plugins0.10-dts/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/01/05 10:56:18 drochner Exp $
-#
-
-GST_PLUGINS0.10_NAME= dts
-GST_PLUGINS0.10_DIRS= ext/dts
-
-.include "../../multimedia/gst-plugins0.10-bad/Makefile.common"
-
-.include "../../audio/libdca/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.10-dts/PLIST b/audio/gst-plugins0.10-dts/PLIST
deleted file mode 100644
index ee9ce3a5f4f..00000000000
--- a/audio/gst-plugins0.10-dts/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/01/05 10:56:18 drochner Exp $
-lib/gstreamer-0.10/libgstdtsdec.la
-@comment in gstreamer0.10: @dirrm lib/gstreamer-0.10
diff --git a/audio/gst-plugins0.10-esound/DESCR b/audio/gst-plugins0.10-esound/DESCR
deleted file mode 100644
index 334db30a1ac..00000000000
--- a/audio/gst-plugins0.10-esound/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple Ogg/Vorbis playback to
-complex audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently. Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-GStreamer is released under the LGPL.
-
-This package is part of the 'good' plugins for GStreamer. It provides the
-esound plugin for GStreamer, which allows playback and recording of sound
-through the Enlightened Sound Daemon.
diff --git a/audio/gst-plugins0.10-esound/Makefile b/audio/gst-plugins0.10-esound/Makefile
deleted file mode 100644
index 359f22c4352..00000000000
--- a/audio/gst-plugins0.10-esound/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/05/22 16:32:37 drochner Exp $
-#
-
-GST_PLUGINS0.10_NAME= esound
-GST_PLUGINS0.10_DIRS= ext/esd
-GST_PLUGINS0.10_FLAGS= esd
-
-.include "../../multimedia/gst-plugins0.10-good/Makefile.common"
-
-.include "../../audio/esound/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.10-esound/PLIST b/audio/gst-plugins0.10-esound/PLIST
deleted file mode 100644
index 185c7e98c5e..00000000000
--- a/audio/gst-plugins0.10-esound/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/03/30 21:20:59 jmmv Exp $
-lib/gstreamer-0.10/libgstesd.la
-@comment in gstreamer0.10: @dirrm lib/gstreamer-0.10
diff --git a/audio/gst-plugins0.10-faad/DESCR b/audio/gst-plugins0.10-faad/DESCR
deleted file mode 100644
index 3e4e169ef7f..00000000000
--- a/audio/gst-plugins0.10-faad/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple mp3 playback to complex
-audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently. Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-This package provides the faad plugin for GStreamer, the ISO AAC
-audio codec.
diff --git a/audio/gst-plugins0.10-faad/Makefile b/audio/gst-plugins0.10-faad/Makefile
deleted file mode 100644
index 49eb225ef11..00000000000
--- a/audio/gst-plugins0.10-faad/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/06/14 11:00:41 drochner Exp $
-#
-
-GST_PLUGINS0.10_NAME= faad
-GST_PLUGINS0.10_DIRS= ext/faad
-
-.include "../../multimedia/gst-plugins0.10-bad/Makefile.common"
-
-.include "../../audio/faad2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.10-faad/PLIST b/audio/gst-plugins0.10-faad/PLIST
deleted file mode 100644
index 625bbfa3c4d..00000000000
--- a/audio/gst-plugins0.10-faad/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/06/14 11:00:41 drochner Exp $
-lib/gstreamer-0.10/libgstfaad.la
diff --git a/audio/gst-plugins0.10-flac/DESCR b/audio/gst-plugins0.10-flac/DESCR
deleted file mode 100644
index fb4090832cc..00000000000
--- a/audio/gst-plugins0.10-flac/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple mp3 playback to complex
-audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently. Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-This package provides the flac plugin for GStreamer, a lossless audio codec.
diff --git a/audio/gst-plugins0.10-flac/Makefile b/audio/gst-plugins0.10-flac/Makefile
deleted file mode 100644
index f8013765460..00000000000
--- a/audio/gst-plugins0.10-flac/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2007/01/13 09:19:07 wiz Exp $
-#
-
-GST_PLUGINS0.10_NAME= flac
-GST_PLUGINS0.10_DIRS= ext/flac
-GST_PLUGINS0.10_FLAGS= flac
-
-.include "../../multimedia/gst-plugins0.10-good/Makefile.common"
-PKGREVISION= 1
-
-BUILDLINK_API_DEPENDS.flac+= flac>=1.1.3nb1
-.include "../../audio/flac/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.10-flac/PLIST b/audio/gst-plugins0.10-flac/PLIST
deleted file mode 100644
index 248d5fd72f9..00000000000
--- a/audio/gst-plugins0.10-flac/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/07/02 11:42:49 drochner Exp $
-lib/gstreamer-0.10/libgstflac.la
diff --git a/audio/gst-plugins0.10-fluendo-mp3/DESCR b/audio/gst-plugins0.10-fluendo-mp3/DESCR
deleted file mode 100644
index ccae1f81c0c..00000000000
--- a/audio/gst-plugins0.10-fluendo-mp3/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Fluendo mp3 decoder (encoder, later?) GStreamer plugin.
-
-Base code is from the ISO MPEG dist10 reference package, which is freely
-reusable.
diff --git a/audio/gst-plugins0.10-fluendo-mp3/Makefile b/audio/gst-plugins0.10-fluendo-mp3/Makefile
deleted file mode 100644
index 44cef4cc5bf..00000000000
--- a/audio/gst-plugins0.10-fluendo-mp3/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/08/22 14:01:11 joerg Exp $
-#
-
-DISTNAME= gst-fluendo-mp3-0.10.2
-CATEGORIES= audio
-MASTER_SITES= http://core.fluendo.com/gstreamer/src/gst-fluendo-mp3/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.fluendo.com/resources/fluendo_mp3.php
-COMMENT= mp3 decoder for gstreamer
-
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config
-
-.include "../../multimedia/gstreamer0.10/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.10-fluendo-mp3/PLIST b/audio/gst-plugins0.10-fluendo-mp3/PLIST
deleted file mode 100644
index ac8eb08f957..00000000000
--- a/audio/gst-plugins0.10-fluendo-mp3/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/07/26 13:12:34 drochner Exp $
-lib/gstreamer-0.10/libgstflump3dec.la
diff --git a/audio/gst-plugins0.10-fluendo-mp3/distinfo b/audio/gst-plugins0.10-fluendo-mp3/distinfo
deleted file mode 100644
index 2a2df6d883b..00000000000
--- a/audio/gst-plugins0.10-fluendo-mp3/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/07/26 13:12:34 drochner Exp $
-
-SHA1 (gst-fluendo-mp3-0.10.2.tar.bz2) = bcf299cb2e3a76d853d06ced02f286d3927ce056
-RMD160 (gst-fluendo-mp3-0.10.2.tar.bz2) = daeec89fb965b6fabaf1afdb9629ec86a3d7c25d
-Size (gst-fluendo-mp3-0.10.2.tar.bz2) = 302057 bytes
diff --git a/audio/gst-plugins0.10-libvisual/DESCR b/audio/gst-plugins0.10-libvisual/DESCR
deleted file mode 100644
index ec5a5fa21d3..00000000000
--- a/audio/gst-plugins0.10-libvisual/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-Libvisual is an abstraction library that comes between applications
-and audio visualisation plugins.
-
-Often when it comes to audio visualisation plugins or programs that
-create visuals, they depend on a player or something else; basically,
-there is no general framework that enabled application developers
-to easily access cool audio visualisation plugins. Libvisual wants
-to change this by providing an interface towards plugins and
-applications; through this easy to use interface applications can
-easily access plugins and, since the drawing is done by the
-application, it also enables the developer to draw the visual
-anywhere he wants.
-
-The framework also allows you to morph to different plugins and
-mix two at once; all kinds of neat tricks are possible using this
-method.
diff --git a/audio/gst-plugins0.10-libvisual/Makefile b/audio/gst-plugins0.10-libvisual/Makefile
deleted file mode 100644
index f798bc4b0e7..00000000000
--- a/audio/gst-plugins0.10-libvisual/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2006/07/26 13:03:15 drochner Exp $
-#
-
-GST_PLUGINS0.10_NAME= libvisual
-GST_PLUGINS0.10_DIRS= ext/libvisual
-GST_PLUGINS0.10_FLAGS= libvisual
-
-.include "../../multimedia/gst-plugins0.10-base/Makefile.common"
-
-.include "../../audio/libvisual/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.10-libvisual/PLIST b/audio/gst-plugins0.10-libvisual/PLIST
deleted file mode 100644
index be78912a35f..00000000000
--- a/audio/gst-plugins0.10-libvisual/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/07/02 11:45:05 drochner Exp $
-lib/gstreamer-0.10/libgstlibvisual.la
diff --git a/audio/gst-plugins0.10-mad/DESCR b/audio/gst-plugins0.10-mad/DESCR
deleted file mode 100644
index 217603b4be8..00000000000
--- a/audio/gst-plugins0.10-mad/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple Ogg/Vorbis playback to
-complex audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently. Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-GStreamer is released under the LGPL.
-
-This package is part of the 'ugly' plugins for GStreamer. It provides the
-mad plugin, which allows playback of MPEG Layer 3 audio files.
diff --git a/audio/gst-plugins0.10-mad/Makefile b/audio/gst-plugins0.10-mad/Makefile
deleted file mode 100644
index 9a28a9a8aa3..00000000000
--- a/audio/gst-plugins0.10-mad/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/04/08 11:44:28 jmmv Exp $
-#
-
-GST_PLUGINS0.10_NAME= mad
-GST_PLUGINS0.10_DIRS= ext/mad
-
-.include "../../multimedia/gst-plugins0.10-ugly/Makefile.common"
-
-CONFIGURE_ARGS+= --enable-id3tag
-CONFIGURE_ARGS+= --enable-mad
-
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.10-mad/PLIST b/audio/gst-plugins0.10-mad/PLIST
deleted file mode 100644
index 8ff3afc7b0b..00000000000
--- a/audio/gst-plugins0.10-mad/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/04/08 11:44:28 jmmv Exp $
-lib/gstreamer-0.10/libgstmad.la
-@comment in gstreamer0.10: @dirrm lib/gstreamer-0.10
diff --git a/audio/gst-plugins0.10-musepack/DESCR b/audio/gst-plugins0.10-musepack/DESCR
deleted file mode 100644
index 37bedae5386..00000000000
--- a/audio/gst-plugins0.10-musepack/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple Ogg/Vorbis playback to
-complex audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently. Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-GStreamer is released under the LGPL.
-
-This package is part of the 'bad' plugins for GStreamer. It provides the
-musepack plugin, which allows playback of musepack audio streams.
diff --git a/audio/gst-plugins0.10-musepack/Makefile b/audio/gst-plugins0.10-musepack/Makefile
deleted file mode 100644
index 7d3177bc655..00000000000
--- a/audio/gst-plugins0.10-musepack/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/01/25 19:33:08 drochner Exp $
-#
-
-GST_PLUGINS0.10_NAME= musepack
-GST_PLUGINS0.10_DIRS= ext/musepack
-
-.include "../../multimedia/gst-plugins0.10-bad/Makefile.common"
-
-.include "../../audio/libmpcdec/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.10-musepack/PLIST b/audio/gst-plugins0.10-musepack/PLIST
deleted file mode 100644
index 85e977d1910..00000000000
--- a/audio/gst-plugins0.10-musepack/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/01/25 19:33:08 drochner Exp $
-lib/gstreamer-0.10/libgstmusepack.la
-@comment in gstreamer0.10: @dirrm lib/gstreamer-0.10
diff --git a/audio/gst-plugins0.10-oss/DESCR b/audio/gst-plugins0.10-oss/DESCR
deleted file mode 100644
index e92f2aa0bad..00000000000
--- a/audio/gst-plugins0.10-oss/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple Ogg/Vorbis playback to
-complex audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently. Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-GStreamer is released under the LGPL.
-
-This package is part of the 'good' plugins for GStreamer. It provides the
-oss plugin, which allows playback and recording of sound through the Open
-Sound System audio libraries.
diff --git a/audio/gst-plugins0.10-oss/Makefile b/audio/gst-plugins0.10-oss/Makefile
deleted file mode 100644
index 393e6cb6906..00000000000
--- a/audio/gst-plugins0.10-oss/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2006/06/14 11:24:30 drochner Exp $
-#
-
-GST_PLUGINS0.10_NAME= oss
-GST_PLUGINS0.10_DIRS= sys/oss
-
-.include "../../multimedia/gst-plugins0.10-good/Makefile.common"
-
-SUBST_CLASSES+= devoss
-SUBST_MESSAGE.devoss= Fixing path to OSS audio device.
-SUBST_STAGE.devoss= pre-configure
-SUBST_FILES.devoss= sys/oss/*.c
-SUBST_SED.devoss= -e 's|/dev/dsp|${DEVOSSAUDIO}|g'
-
-LIBS+= ${LIBOSSAUDIO}
-
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.10-oss/PLIST b/audio/gst-plugins0.10-oss/PLIST
deleted file mode 100644
index be4e8ed219f..00000000000
--- a/audio/gst-plugins0.10-oss/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/01/18 15:50:04 jmmv Exp $
-lib/gstreamer-0.10/libgstossaudio.la
-@comment in gstreamer0.10: @dirrm lib/gstreamer-0.10
diff --git a/audio/gst-plugins0.10-sid/DESCR b/audio/gst-plugins0.10-sid/DESCR
deleted file mode 100644
index fca26cdadac..00000000000
--- a/audio/gst-plugins0.10-sid/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple Ogg/Vorbis playback to
-complex audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently. Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-GStreamer is released under the LGPL.
-
-This package is part of the 'ugly' plugins for GStreamer. It provides the
-sid plugin, which allows playback of Commodore sid sounds.
diff --git a/audio/gst-plugins0.10-sid/Makefile b/audio/gst-plugins0.10-sid/Makefile
deleted file mode 100644
index 538634617a4..00000000000
--- a/audio/gst-plugins0.10-sid/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2007/01/30 14:59:08 joerg Exp $
-#
-
-GST_PLUGINS0.10_NAME= sid
-GST_PLUGINS0.10_DIRS= ext/sidplay
-GST_PLUGINS0.10_FLAGS= sidplay
-
-USE_LANGUAGES= c c++
-
-.include "../../multimedia/gst-plugins0.10-ugly/Makefile.common"
-
-.include "../../audio/libsidplay/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.10-sid/PLIST b/audio/gst-plugins0.10-sid/PLIST
deleted file mode 100644
index d7635e93f0e..00000000000
--- a/audio/gst-plugins0.10-sid/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/01/17 18:23:14 drochner Exp $
-lib/gstreamer-0.10/libgstsid.la
-@comment in gstreamer0.10: @dirrm lib/gstreamer-0.10
diff --git a/audio/gst-plugins0.10-spc/DESCR b/audio/gst-plugins0.10-spc/DESCR
deleted file mode 100644
index e2f6991607f..00000000000
--- a/audio/gst-plugins0.10-spc/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple Ogg/Vorbis playback to
-complex audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently. Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-GStreamer is released under the LGPL.
-
-This package is part of the 'ugly' plugins for GStreamer. It provides the
-spcdec plugin, which allows playback of SNES SPC audio files.
diff --git a/audio/gst-plugins0.10-spc/Makefile b/audio/gst-plugins0.10-spc/Makefile
deleted file mode 100644
index 9f9ae979d07..00000000000
--- a/audio/gst-plugins0.10-spc/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/01/26 16:45:38 drochner Exp $
-#
-
-GST_PLUGINS0.10_NAME= spc
-GST_PLUGINS0.10_DIRS= ext/spc
-
-.include "../../multimedia/gst-plugins0.10-bad/Makefile.common"
-
-.include "../../audio/libopenspc/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.10-spc/PLIST b/audio/gst-plugins0.10-spc/PLIST
deleted file mode 100644
index dff0eb75777..00000000000
--- a/audio/gst-plugins0.10-spc/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/01/26 16:45:38 drochner Exp $
-lib/gstreamer-0.10/libgstspc.la
-@comment in gstreamer0.10: @dirrm lib/gstreamer-0.10
diff --git a/audio/gst-plugins0.10-speex/DESCR b/audio/gst-plugins0.10-speex/DESCR
deleted file mode 100644
index 8b557db62ae..00000000000
--- a/audio/gst-plugins0.10-speex/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-The Speex project aims to build an open-source, patent-free voice
-codec. Unlike other codecs like MP3 and Ogg Vorbis, Speex is
-specially designed for compressing voice at low bitrates in the
-8-32 kbps/channel range. Possible applications include Voice over
-IP (VoIP), internet audio streaming, archiving of speech data (e.g.
-voice mail), and audio books. In some sense, it is meant to be
-complementary to the Ogg Vorbis codec.
diff --git a/audio/gst-plugins0.10-speex/Makefile b/audio/gst-plugins0.10-speex/Makefile
deleted file mode 100644
index 144d7fa9e74..00000000000
--- a/audio/gst-plugins0.10-speex/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/07/02 11:44:00 drochner Exp $
-#
-
-GST_PLUGINS0.10_NAME= speex
-GST_PLUGINS0.10_DIRS= ext/speex
-GST_PLUGINS0.10_FLAGS= speex
-
-.include "../../multimedia/gst-plugins0.10-good/Makefile.common"
-
-.include "../../audio/speex/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.10-speex/PLIST b/audio/gst-plugins0.10-speex/PLIST
deleted file mode 100644
index b904111d0d5..00000000000
--- a/audio/gst-plugins0.10-speex/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/07/02 11:44:00 drochner Exp $
-lib/gstreamer-0.10/libgstspeex.la
diff --git a/audio/gst-plugins0.10-vorbis/DESCR b/audio/gst-plugins0.10-vorbis/DESCR
deleted file mode 100644
index 74a2d4bbc03..00000000000
--- a/audio/gst-plugins0.10-vorbis/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple mp3 playback to complex
-audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently. Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-This package provides the vorbis plugin for GStreamer, the OGG's free audio
-codec.
diff --git a/audio/gst-plugins0.10-vorbis/Makefile b/audio/gst-plugins0.10-vorbis/Makefile
deleted file mode 100644
index 9df3a8b9345..00000000000
--- a/audio/gst-plugins0.10-vorbis/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/07/02 11:35:20 drochner Exp $
-#
-
-GST_PLUGINS0.10_NAME= vorbis
-GST_PLUGINS0.10_DIRS= ext/vorbis
-GST_PLUGINS0.10_FLAGS= vorbis
-
-.include "../../multimedia/gst-plugins0.10-base/Makefile.common"
-
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.10-vorbis/PLIST b/audio/gst-plugins0.10-vorbis/PLIST
deleted file mode 100644
index 012f08e5bbd..00000000000
--- a/audio/gst-plugins0.10-vorbis/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/07/02 11:35:20 drochner Exp $
-lib/gstreamer-0.10/libgstvorbis.la
diff --git a/audio/gst-plugins0.10-wavpack/DESCR b/audio/gst-plugins0.10-wavpack/DESCR
deleted file mode 100644
index b156c147214..00000000000
--- a/audio/gst-plugins0.10-wavpack/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple Ogg/Vorbis playback to
-complex audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently. Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-GStreamer is released under the LGPL.
-
-This package is part of the 'bad' plugins for GStreamer. It provides the
-wavpack plugin, which allows playback of wavpack audio streams.
diff --git a/audio/gst-plugins0.10-wavpack/Makefile b/audio/gst-plugins0.10-wavpack/Makefile
deleted file mode 100644
index 2ac97b5b2e2..00000000000
--- a/audio/gst-plugins0.10-wavpack/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/02/01 16:53:31 drochner Exp $
-#
-
-GST_PLUGINS0.10_NAME= wavpack
-GST_PLUGINS0.10_DIRS= ext/wavpack
-
-.include "../../multimedia/gst-plugins0.10-bad/Makefile.common"
-
-.include "../../audio/wavpack/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.10-wavpack/PLIST b/audio/gst-plugins0.10-wavpack/PLIST
deleted file mode 100644
index d2bab3e2117..00000000000
--- a/audio/gst-plugins0.10-wavpack/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/02/01 16:53:31 drochner Exp $
-lib/gstreamer-0.10/libgstwavpack.la
-@comment in gstreamer0.10: @dirrm lib/gstreamer-0.10
diff --git a/audio/gst-plugins0.8-artsd/DESCR b/audio/gst-plugins0.8-artsd/DESCR
deleted file mode 100644
index 2e8d6a0fccd..00000000000
--- a/audio/gst-plugins0.8-artsd/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple mp3 playback to complex
-audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently. Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-This package provides the artsd plugin for GStreamer.
diff --git a/audio/gst-plugins0.8-artsd/Makefile b/audio/gst-plugins0.8-artsd/Makefile
deleted file mode 100644
index 07278cdb1f2..00000000000
--- a/audio/gst-plugins0.8-artsd/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2006/04/17 14:52:10 wiz Exp $
-#
-
-GST_PLUGINS0.8_NAME= artsd
-GST_PLUGINS0.8_DIR= ext/artsd
-
-.include "../../multimedia/gst-plugins0.8/Makefile.common"
-PKGREVISION= 5
-
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../audio/arts/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.8-artsd/PLIST b/audio/gst-plugins0.8-artsd/PLIST
deleted file mode 100644
index 5b8167b3deb..00000000000
--- a/audio/gst-plugins0.8-artsd/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2006/01/18 12:44:01 jmmv Exp $
-lib/gstreamer-0.8/libgstartsdsink.la
-@comment in gstreamer0.8: @dirrm lib/gstreamer-0.8
diff --git a/audio/gst-plugins0.8-artsd/buildlink3.mk b/audio/gst-plugins0.8-artsd/buildlink3.mk
deleted file mode 100644
index 80940e1d3a0..00000000000
--- a/audio/gst-plugins0.8-artsd/buildlink3.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:36 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-GST_PLUGINS0.8_ARTSD_BUILDLINK3_MK:= ${GST_PLUGINS0.8_ARTSD_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= gst-plugins0.8-artsd
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngst-plugins0.8-artsd}
-BUILDLINK_PACKAGES+= gst-plugins0.8-artsd
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gst-plugins0.8-artsd
-
-.if !empty(GST_PLUGINS0.8_ARTSD_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.gst-plugins0.8-artsd+= gst-plugins0.8-artsd>=0.8.11
-BUILDLINK_ABI_DEPENDS.gst-plugins0.8-artsd?= gst-plugins0.8-artsd>=0.8.11nb5
-BUILDLINK_PKGSRCDIR.gst-plugins0.8-artsd?= ../../audio/gst-plugins0.8-artsd
-.endif # GST_PLUGINS0.8_ARTSD_BUILDLINK3_MK
-
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../audio/arts/buildlink3.mk"
-.include "../../multimedia/gst-plugins0.8/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/gst-plugins0.8-cdparanoia/DESCR b/audio/gst-plugins0.8-cdparanoia/DESCR
deleted file mode 100644
index 4493fd7cdc2..00000000000
--- a/audio/gst-plugins0.8-cdparanoia/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple mp3 playback to complex
-audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently. Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-This package provides the cdparanoia plugin for GStreamer, which allows
-audio extraction from CDs.
diff --git a/audio/gst-plugins0.8-cdparanoia/Makefile b/audio/gst-plugins0.8-cdparanoia/Makefile
deleted file mode 100644
index f36ce00a66a..00000000000
--- a/audio/gst-plugins0.8-cdparanoia/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2006/04/17 14:52:10 wiz Exp $
-#
-
-GST_PLUGINS0.8_NAME= cdparanoia
-GST_PLUGINS0.8_DIR= ext/cdparanoia
-
-.include "../../multimedia/gst-plugins0.8/Makefile.common"
-PKGREVISION= 6
-
-CPPFLAGS+= -I${BUILDLINK_PREFIX.cdparanoia}/include/cdparanoia
-
-.include "../../audio/cdparanoia/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.8-cdparanoia/PLIST b/audio/gst-plugins0.8-cdparanoia/PLIST
deleted file mode 100644
index 87bd95eede2..00000000000
--- a/audio/gst-plugins0.8-cdparanoia/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2006/01/18 12:44:01 jmmv Exp $
-lib/gstreamer-0.8/libgstcdparanoia.la
-@comment in gstreamer0.8: @dirrm lib/gstreamer-0.8
diff --git a/audio/gst-plugins0.8-esound/DESCR b/audio/gst-plugins0.8-esound/DESCR
deleted file mode 100644
index 3da90ca7152..00000000000
--- a/audio/gst-plugins0.8-esound/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple mp3 playback to complex
-audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently. Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-This package provides the esound plugin for GStreamer, which allows playback
-and recording of sound through the Enlightened Sound Daemon.
diff --git a/audio/gst-plugins0.8-esound/Makefile b/audio/gst-plugins0.8-esound/Makefile
deleted file mode 100644
index 4568ec86115..00000000000
--- a/audio/gst-plugins0.8-esound/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2006/04/17 14:52:10 wiz Exp $
-#
-
-GST_PLUGINS0.8_NAME= esound
-GST_PLUGINS0.8_DIR= ext/esd
-GST_PLUGINS0.8_FLAG= esd
-
-.include "../../multimedia/gst-plugins0.8/Makefile.common"
-PKGREVISION= 5
-
-.include "../../audio/esound/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.8-esound/PLIST b/audio/gst-plugins0.8-esound/PLIST
deleted file mode 100644
index f0f709d34b1..00000000000
--- a/audio/gst-plugins0.8-esound/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2006/01/18 12:44:01 jmmv Exp $
-lib/gstreamer-0.8/libgstesd.la
-@comment in gstreamer0.8: @dirrm lib/gstreamer-0.8
diff --git a/audio/gst-plugins0.8-esound/buildlink3.mk b/audio/gst-plugins0.8-esound/buildlink3.mk
deleted file mode 100644
index 7a168fc9e46..00000000000
--- a/audio/gst-plugins0.8-esound/buildlink3.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:36 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-GST_PLUGINS0.8_ESOUND_BUILDLINK3_MK:= ${GST_PLUGINS0.8_ESOUND_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= gst-plugins0.8-esound
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngst-plugins0.8-esound}
-BUILDLINK_PACKAGES+= gst-plugins0.8-esound
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gst-plugins0.8-esound
-
-.if !empty(GST_PLUGINS0.8_ESOUND_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.gst-plugins0.8-esound+= gst-plugins0.8-esound>=0.8.11
-BUILDLINK_ABI_DEPENDS.gst-plugins0.8-esound?= gst-plugins0.8-esound>=0.8.11nb5
-BUILDLINK_PKGSRCDIR.gst-plugins0.8-esound?= ../../audio/gst-plugins0.8-esound
-.endif # GST_PLUGINS0.8_ESOUND_BUILDLINK3_MK
-
-.include "../../audio/esound/buildlink3.mk"
-.include "../../multimedia/gst-plugins0.8/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/gst-plugins0.8-faad/DESCR b/audio/gst-plugins0.8-faad/DESCR
deleted file mode 100644
index 3e4e169ef7f..00000000000
--- a/audio/gst-plugins0.8-faad/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple mp3 playback to complex
-audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently. Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-This package provides the faad plugin for GStreamer, the ISO AAC
-audio codec.
diff --git a/audio/gst-plugins0.8-faad/Makefile b/audio/gst-plugins0.8-faad/Makefile
deleted file mode 100644
index 52a908cafe2..00000000000
--- a/audio/gst-plugins0.8-faad/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2006/04/17 14:52:10 wiz Exp $
-#
-
-GST_PLUGINS0.8_NAME= faad
-GST_PLUGINS0.8_DIR= ext/faad
-
-.include "../../multimedia/gst-plugins0.8/Makefile.common"
-PKGREVISION= 5
-
-.include "../../audio/faad2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.8-faad/PLIST b/audio/gst-plugins0.8-faad/PLIST
deleted file mode 100644
index 1e42e2be377..00000000000
--- a/audio/gst-plugins0.8-faad/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2006/01/18 12:44:01 jmmv Exp $
-lib/gstreamer-0.8/libgstfaad.la
-@comment in gstreamer0.8: @dirrm lib/gstreamer-0.8
diff --git a/audio/gst-plugins0.8-lame/DESCR b/audio/gst-plugins0.8-lame/DESCR
deleted file mode 100644
index f5ec8fb2ebb..00000000000
--- a/audio/gst-plugins0.8-lame/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple mp3 playback to complex
-audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently. Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-This package provides the lame plugin for GStreamer, which allows MP3 encoding
-of audio streams.
diff --git a/audio/gst-plugins0.8-lame/Makefile b/audio/gst-plugins0.8-lame/Makefile
deleted file mode 100644
index 1b7f62e80de..00000000000
--- a/audio/gst-plugins0.8-lame/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2006/04/17 14:52:11 wiz Exp $
-#
-
-GST_PLUGINS0.8_NAME= lame
-GST_PLUGINS0.8_DIR= ext/lame
-
-.include "../../multimedia/gst-plugins0.8/Makefile.common"
-PKGREVISION= 5
-
-.include "../../audio/lame/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.8-lame/PLIST b/audio/gst-plugins0.8-lame/PLIST
deleted file mode 100644
index e5143afc83c..00000000000
--- a/audio/gst-plugins0.8-lame/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2006/01/18 12:44:01 jmmv Exp $
-lib/gstreamer-0.8/libgstlame.la
-@comment in gstreamer0.8: @dirrm lib/gstreamer-0.8
diff --git a/audio/gst-plugins0.8-mad/DESCR b/audio/gst-plugins0.8-mad/DESCR
deleted file mode 100644
index 1ebef21a574..00000000000
--- a/audio/gst-plugins0.8-mad/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple mp3 playback to complex
-audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently. Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-This package provides the mad plugin for GStreamer, which allows playback of
-MP3 audio streams.
diff --git a/audio/gst-plugins0.8-mad/Makefile b/audio/gst-plugins0.8-mad/Makefile
deleted file mode 100644
index 861a502d884..00000000000
--- a/audio/gst-plugins0.8-mad/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2006/04/17 14:52:11 wiz Exp $
-#
-
-GST_PLUGINS0.8_NAME= mad
-GST_PLUGINS0.8_DIR= ext/mad
-
-.include "../../multimedia/gst-plugins0.8/Makefile.common"
-PKGREVISION= 5
-
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.8-mad/PLIST b/audio/gst-plugins0.8-mad/PLIST
deleted file mode 100644
index ab00578bceb..00000000000
--- a/audio/gst-plugins0.8-mad/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2006/01/18 12:44:01 jmmv Exp $
-lib/gstreamer-0.8/libgstmad.la
-@comment in gstreamer0.8: @dirrm lib/gstreamer-0.8
diff --git a/audio/gst-plugins0.8-mad/buildlink3.mk b/audio/gst-plugins0.8-mad/buildlink3.mk
deleted file mode 100644
index f98d7b4ecb8..00000000000
--- a/audio/gst-plugins0.8-mad/buildlink3.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:36 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-GST_PLUGINS0.8_MAD_BUILDLINK3_MK:= ${GST_PLUGINS0.8_MAD_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= gst-plugins0.8-mad
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngst-plugins0.8-mad}
-BUILDLINK_PACKAGES+= gst-plugins0.8-mad
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gst-plugins0.8-mad
-
-.if !empty(GST_PLUGINS0.8_MAD_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.gst-plugins0.8-mad+= gst-plugins0.8-mad>=0.8.11
-BUILDLINK_ABI_DEPENDS.gst-plugins0.8-mad?= gst-plugins0.8-mad>=0.8.11nb5
-BUILDLINK_PKGSRCDIR.gst-plugins0.8-mad?= ../../audio/gst-plugins0.8-mad
-.endif # GST_PLUGINS0.8_MAD_BUILDLINK3_MK
-
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../multimedia/gst-plugins0.8/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/gst-plugins0.8-oss/DESCR b/audio/gst-plugins0.8-oss/DESCR
deleted file mode 100644
index c246e50189a..00000000000
--- a/audio/gst-plugins0.8-oss/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple mp3 playback to complex
-audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently. Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-This package provides the oss plugin for GStreamer, which allows playback
-and recording of sound through the Open Sound System audio libraries.
diff --git a/audio/gst-plugins0.8-oss/Makefile b/audio/gst-plugins0.8-oss/Makefile
deleted file mode 100644
index 6931ff83583..00000000000
--- a/audio/gst-plugins0.8-oss/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2006/04/22 09:22:05 rillig Exp $
-#
-
-GST_PLUGINS0.8_NAME= oss
-GST_PLUGINS0.8_DIR= sys/oss
-
-.include "../../multimedia/gst-plugins0.8/Makefile.common"
-PKGREVISION= 5
-
-SUBST_CLASSES+= devoss
-SUBST_MESSAGE.devoss= Fixing path to OSS audio device.
-SUBST_STAGE.devoss= pre-configure
-SUBST_FILES.devoss= sys/oss/*.c
-SUBST_SED.devoss= -e 's|/dev/dsp|${DEVOSSAUDIO}|g'
-
-LIBS+= ${LIBOSSAUDIO}
-
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.8-oss/PLIST b/audio/gst-plugins0.8-oss/PLIST
deleted file mode 100644
index 8fe3db04e2f..00000000000
--- a/audio/gst-plugins0.8-oss/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2006/01/18 12:44:01 jmmv Exp $
-lib/gstreamer-0.8/libgstossaudio.la
-@comment in gstreamer0.8: @dirrm lib/gstreamer-0.8
diff --git a/audio/gst-plugins0.8-vorbis/DESCR b/audio/gst-plugins0.8-vorbis/DESCR
deleted file mode 100644
index 74a2d4bbc03..00000000000
--- a/audio/gst-plugins0.8-vorbis/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple mp3 playback to complex
-audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently. Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-This package provides the vorbis plugin for GStreamer, the OGG's free audio
-codec.
diff --git a/audio/gst-plugins0.8-vorbis/Makefile b/audio/gst-plugins0.8-vorbis/Makefile
deleted file mode 100644
index e65bc8e33e7..00000000000
--- a/audio/gst-plugins0.8-vorbis/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2006/04/17 14:52:11 wiz Exp $
-#
-
-GST_PLUGINS0.8_NAME= vorbis
-GST_PLUGINS0.8_DIR= ext/vorbis
-
-.include "../../multimedia/gst-plugins0.8/Makefile.common"
-PKGREVISION= 5
-
-DEPENDS+= gst-plugins0.8-ogg>=0.8.0:../../multimedia/gst-plugins0.8-ogg
-
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.8-vorbis/PLIST b/audio/gst-plugins0.8-vorbis/PLIST
deleted file mode 100644
index 710563aa8e2..00000000000
--- a/audio/gst-plugins0.8-vorbis/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2006/01/18 12:44:01 jmmv Exp $
-lib/gstreamer-0.8/libgstvorbis.la
-@comment in gstreamer0.8: @dirrm lib/gstreamer-0.8
diff --git a/audio/gtick/DESCR b/audio/gtick/DESCR
deleted file mode 100644
index 2c72462eb12..00000000000
--- a/audio/gtick/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-GTick is a metronome application written for GNU/Linux and other
-UN*X-like operting systems supporting different meters (Even, 2/4,
-3/4, 4/4 and more) and speeds ranging from 10 to 1000 bpm.
diff --git a/audio/gtick/Makefile b/audio/gtick/Makefile
deleted file mode 100644
index 5414e86aedc..00000000000
--- a/audio/gtick/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2007/02/22 19:26:05 wiz Exp $
-#
-
-DISTNAME= gtick-0.3.10
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= http://www.antcom.de/gtick/download/
-
-MAINTAINER= rpaulo@NetBSD.org
-HOMEPAGE= http://www.antcom.de/gtick/
-COMMENT= Metronome application using GTK2+
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= pkg-config
-
-LIBS+= ${LIBOSSAUDIO}
-
-SUBST_CLASSES+= oss
-SUBST_MESSAGE.oss= Fixing paths to OSS devices.
-SUBST_STAGE.oss= pre-configure
-SUBST_FILES.oss= src/globals.h
-SUBST_SED.oss= -e 's|/dev/dsp|${DEVOSSAUDIO}|g'
-
-SUBST_CLASSES+= header
-SUBST_MESSAGE.header= Fixing include dependency.
-SUBST_STAGE.header= pre-configure
-SUBST_FILES.header= src/dsp.c
-SUBST_SED.header= -e 's/FreeBSD__)/& || defined(__NetBSD__)/g'
-
-.include "../../audio/libsndfile/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gtick/PLIST b/audio/gtick/PLIST
deleted file mode 100644
index f8dbd2c82a4..00000000000
--- a/audio/gtick/PLIST
+++ /dev/null
@@ -1,22 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2006/07/03 22:34:51 rpaulo Exp $
-bin/gtick
-man/man1/gtick.1
-share/locale/en@quot/LC_MESSAGES/gtick.mo
-share/locale/en@boldquot/LC_MESSAGES/gtick.mo
-share/locale/af/LC_MESSAGES/gtick.mo
-share/locale/ca/LC_MESSAGES/gtick.mo
-share/locale/de/LC_MESSAGES/gtick.mo
-share/locale/cs/LC_MESSAGES/gtick.mo
-share/locale/es/LC_MESSAGES/gtick.mo
-share/locale/eu/LC_MESSAGES/gtick.mo
-share/locale/fi/LC_MESSAGES/gtick.mo
-share/locale/fr/LC_MESSAGES/gtick.mo
-share/locale/ga/LC_MESSAGES/gtick.mo
-share/locale/it/LC_MESSAGES/gtick.mo
-share/locale/nl/LC_MESSAGES/gtick.mo
-share/locale/pt_BR/LC_MESSAGES/gtick.mo
-share/locale/ro/LC_MESSAGES/gtick.mo
-share/locale/ru/LC_MESSAGES/gtick.mo
-share/locale/sv/LC_MESSAGES/gtick.mo
-share/locale/uk/LC_MESSAGES/gtick.mo
-share/locale/vi/LC_MESSAGES/gtick.mo
diff --git a/audio/gtick/distinfo b/audio/gtick/distinfo
deleted file mode 100644
index 05dba5c40e3..00000000000
--- a/audio/gtick/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/07/03 22:34:51 rpaulo Exp $
-
-SHA1 (gtick-0.3.10.tar.gz) = 4271a5d8266cb03155e6084d58156ccd495826e7
-RMD160 (gtick-0.3.10.tar.gz) = 3b319f016cc25bc663178d7fcd06a9ecab857fb1
-Size (gtick-0.3.10.tar.gz) = 406145 bytes
-SHA1 (patch-aa) = 5cfafc41d6db4205321d7e89b438833002be1f25
diff --git a/audio/gtick/patches/patch-aa b/audio/gtick/patches/patch-aa
deleted file mode 100644
index 12f392a21cc..00000000000
--- a/audio/gtick/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/12/12 00:15:13 joerg Exp $
-
---- src/dsp.c.orig 2005-11-20 20:20:49.000000000 +0000
-+++ src/dsp.c
-@@ -41,7 +41,7 @@
- #endif
-
- /* OSS headers */
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- #include <sys/soundcard.h>
- #else
- #include <linux/soundcard.h>
diff --git a/audio/gtkmserv/DESCR b/audio/gtkmserv/DESCR
deleted file mode 100644
index 65a00ae954d..00000000000
--- a/audio/gtkmserv/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-A gtk-based client for the audio/mserv package to remote-control
-the mserv mp3 player.
diff --git a/audio/gtkmserv/Makefile b/audio/gtkmserv/Makefile
deleted file mode 100644
index 09be479899b..00000000000
--- a/audio/gtkmserv/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:28:56 jlam Exp $
-#
-
-DISTNAME= gtkmserv-0.5.2
-PKGREVISION= 4
-CATEGORIES= audio
-MASTER_SITES= http://projects.ubertechnique.com/downloads/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://projects.ubertechnique.com/index.html
-COMMENT= Gtk-based GUI client for the audio/mserv package
-
-WRKSRC= ${WRKDIR}/${DISTNAME}/src
-GNU_CONFIGURE= YES
-
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/gtkMserv ${PREFIX}/bin
-
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gtkmserv/PLIST b/audio/gtkmserv/PLIST
deleted file mode 100644
index f5d230d3200..00000000000
--- a/audio/gtkmserv/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/02/15 01:10:53 hubertf Exp $
-bin/gtkMserv
diff --git a/audio/gtkmserv/distinfo b/audio/gtkmserv/distinfo
deleted file mode 100644
index c102fc82fc7..00000000000
--- a/audio/gtkmserv/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 20:39:46 agc Exp $
-
-SHA1 (gtkmserv-0.5.2.tar.gz) = 59829ef0c2a438b6f35577effbeaff5ed91ccd0d
-RMD160 (gtkmserv-0.5.2.tar.gz) = 073cabc485d4abca55d545c230b9023d021d95cc
-Size (gtkmserv-0.5.2.tar.gz) = 22441 bytes
-SHA1 (patch-aa) = b9b0b62d0444c5e793ea0f331444b25417e1a882
diff --git a/audio/gtkmserv/patches/patch-aa b/audio/gtkmserv/patches/patch-aa
deleted file mode 100644
index ae37b4afc39..00000000000
--- a/audio/gtkmserv/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2004/06/12 01:20:57 grant Exp $
-
---- Makefile.in.orig 2001-01-30 13:20:31.000000000 +1100
-+++ Makefile.in
-@@ -1,4 +1,4 @@
--CC = gcc -Wall -ggdb
-+# CC = gcc -Wall -ggdb
- LIBS = `gtk-config --libs`
- LIBS_DEBUG = -lefence
- CFLAGS = `gtk-config --cflags`
-@@ -9,11 +9,11 @@ SRCS = main.c menu.c mserv.c on.c se
- OBJS = main.o menu.o mserv.o on.o setup.o utils.o window.o album.o \
- queue.o
- .c.o:
-- $(CC) $(CFLAGS) -c $<
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
-
- all: $(OBJS)
-- $(CC) $(LIBS) -o gtkMserv $(OBJS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o gtkMserv $(OBJS)
-
- clean:
- rm *.o
-- rm core
-\ No newline at end of file
-+ rm core
diff --git a/audio/gtkpod/DESCR b/audio/gtkpod/DESCR
deleted file mode 100644
index c18bf061fb6..00000000000
--- a/audio/gtkpod/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-gtkpod allows you to
- * Read your existing iTunesDB (i.e. import the existing contents of your iPod)
- * Add mp3 files (single files, directories or existing playlists) to the iPod
- You can choose the charset the ID3 tags are encoded in from within gtkpod
- The default is the charset currently used by your locale setting
- * When adding songs, gtkpod detects duplicates (option)
- * Remove songs from the iPod
- * Create and modify playlists
- * Modify ID3 tags -- changes are also updated in the original file (option)
- * Refresh ID3 tags from file
- * Write the updated iTunesDB and added songs to your iPod
- * Work offline and synchronize your new playlists / songs with the iPod
- at a later time
diff --git a/audio/gtkpod/MESSAGE.NetBSD b/audio/gtkpod/MESSAGE.NetBSD
deleted file mode 100644
index 558fbb57ea7..00000000000
--- a/audio/gtkpod/MESSAGE.NetBSD
+++ /dev/null
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.4 2006/10/01 00:06:31 smb Exp $
-
-If you are running a version of NetBSD earlier than 3.0 and mounting your
-iPod via USB, you need at least version 1.130 of usb_subr.c. 3.0 and later
-include the fix.
-
-At this time, there appears to be an unresolved problem involving the very
-newest Fifth Generation iPods -- they are not detected properly by NetBSD,
-and cannot be used.
-===========================================================================
-Before uncabling your iPod, use the 'eject' command to turn off the
-"do not disconnect" message.
-===========================================================================
diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
deleted file mode 100644
index 29fe2c816fa..00000000000
--- a/audio/gtkpod/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2007/01/26 20:09:14 joerg Exp $
-#
-
-DISTNAME= gtkpod-0.94.0
-PKGREVISION= 5
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkpod/}
-
-MAINTAINER= smb@NetBSD.org
-HOMEPAGE= http://www.gtkpod.org/
-COMMENT= GUI for iPod using GTK2
-
-GNU_CONFIGURE= yes
-
-USE_LIBTOOL= yes
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= intltool msgfmt perl:run pkg-config
-
-REPLACE_PERL+= scripts/mab2vcard
-
-BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.4.0
-
-.include "options.mk"
-
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../devel/atk/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gtkpod/PLIST b/audio/gtkpod/PLIST
deleted file mode 100644
index daddc7a1419..00000000000
--- a/audio/gtkpod/PLIST
+++ /dev/null
@@ -1,37 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/04/17 07:07:12 jlam Exp $
-bin/gtkpod
-share/gtkpod/gtkpod.glade
-share/gtkpod/gtkpod.gladep
-share/gtkpod/pixmaps/gtkpod-add-dirs.png
-share/gtkpod/pixmaps/gtkpod-add-files.png
-share/gtkpod/pixmaps/gtkpod-add-playlists.png
-share/gtkpod/pixmaps/gtkpod-icon-32.png
-share/gtkpod/pixmaps/gtkpod-icon-32x32-2.png
-share/gtkpod/pixmaps/gtkpod-icon-32x32.png
-share/gtkpod/pixmaps/gtkpod-icon-48.png
-share/gtkpod/pixmaps/gtkpod-icon-48x48.png
-share/gtkpod/pixmaps/gtkpod-icon-64x64.png
-share/gtkpod/pixmaps/gtkpod-logo.png
-share/gtkpod/pixmaps/gtkpod-new-playlist.png
-share/gtkpod/pixmaps/gtkpod-read.png
-share/gtkpod/pixmaps/gtkpod-sync.png
-share/gtkpod/pixmaps/gtkpod.glade
-share/gtkpod/pixmaps/gtkpod.gladep
-share/gtkpod/scripts/mab2vcard
-share/gtkpod/scripts/sync-abook.sh
-share/gtkpod/scripts/sync-evocalendar.sh
-share/gtkpod/scripts/sync-evolution.sh
-share/gtkpod/scripts/sync-kaddressbook.sh
-share/gtkpod/scripts/sync-korganizer.sh
-share/gtkpod/scripts/sync-notes.sh
-share/gtkpod/scripts/sync-thunderbird.sh
-share/gtkpod/scripts/sync-webcalendar.sh
-share/locale/de/LC_MESSAGES/gtkpod.mo
-share/locale/fr/LC_MESSAGES/gtkpod.mo
-share/locale/he/LC_MESSAGES/gtkpod.mo
-share/locale/it/LC_MESSAGES/gtkpod.mo
-share/locale/ja/LC_MESSAGES/gtkpod.mo
-share/locale/sv/LC_MESSAGES/gtkpod.mo
-@dirrm share/gtkpod/scripts
-@dirrm share/gtkpod/pixmaps
-@dirrm share/gtkpod
diff --git a/audio/gtkpod/distinfo b/audio/gtkpod/distinfo
deleted file mode 100644
index 3d013a9ed6e..00000000000
--- a/audio/gtkpod/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/10/17 22:00:16 rillig Exp $
-
-SHA1 (gtkpod-0.94.0.tar.gz) = 5c6fcb70a90e4ee879e2b2a6fa54b81c57a0378d
-RMD160 (gtkpod-0.94.0.tar.gz) = 0714c6e6f221f124e6f1d53545089af86023600b
-Size (gtkpod-0.94.0.tar.gz) = 983815 bytes
-SHA1 (patch-aa) = b1ffd2a81d5d012bacf069bfbcfb47323cfa0a2d
-SHA1 (patch-ab) = 536611987d882d9c77c21f055bfa0b3299b6b980
-SHA1 (patch-ac) = f1378c5c9154308ce521bf16edd68703f6784980
-SHA1 (patch-ba) = cd23859131e89a3ea7c54a900026589193a16130
-SHA1 (patch-bb) = 599ca360537fc007275096843f7ddcc143148227
-SHA1 (patch-bc) = 50d902cb7f91a16424bec543c7a3dd033cb6f957
-SHA1 (patch-bd) = 7f95521e7b79c5eb5db66e661b6ec1bbbbfa8cad
-SHA1 (patch-be) = b15b57f87b6bb8ece7f99daad4f2824f7a016595
-SHA1 (patch-bf) = 6425770193600e7aca9decd129839a95d1590d31
-SHA1 (patch-bg) = 645e060a2f5c455b893d57cc008b4b134fafe799
diff --git a/audio/gtkpod/options.mk b/audio/gtkpod/options.mk
deleted file mode 100644
index 7315b25ab46..00000000000
--- a/audio/gtkpod/options.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: options.mk,v 1.3 2007/02/09 20:32:38 drochner Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.gtkpod
-PKG_SUPPORTED_OPTIONS= mpeg4ip
-PKG_SUGGESTED_OPTIONS=
-PKG_OPTIONS_LEGACY_OPTS+= faad:mpeg4ip
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mmpeg4ip)
-. include "../../multimedia/libmp4v2/buildlink3.mk"
-.endif
diff --git a/audio/gtkpod/patches/patch-aa b/audio/gtkpod/patches/patch-aa
deleted file mode 100644
index 0e392d4355d..00000000000
--- a/audio/gtkpod/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/10/01 13:29:52 smb Exp $
-
---- src/misc.c.orig 2005-07-15 10:39:37.000000000 -0400
-+++ src/misc.c
-@@ -347,6 +347,7 @@ GList *glist_duplicate (GList *list)
- * does not check prefs to see if the current prefs want gtkpod itself to
- * mount the ipod drive, that should be checked before making this call.
- */
-+#include <sys/param.h>
- #include <sys/mount.h>
- #include <errno.h>
- #include <stdio.h>
diff --git a/audio/gtkpod/patches/patch-ab b/audio/gtkpod/patches/patch-ab
deleted file mode 100644
index a313299ea24..00000000000
--- a/audio/gtkpod/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/10/01 13:29:52 smb Exp $
-
---- src/Makefile.am.orig 2005-09-17 18:19:42.000000000 -0400
-+++ src/Makefile.am 2005-09-17 18:20:23.000000000 -0400
-@@ -3,6 +3,7 @@
- AM_CFLAGS = @PACKAGE_CFLAGS@
-
- INCLUDES = @PACKAGE_CFLAGS@ \
-+ -DHAVE_statvfs \
- -DMOUNT_BIN=\""@MOUNT@\"" \
- -DUMOUNT_BIN=\""@UMOUNT@\"" \
- -DEJECT_BIN=\""@EJECT@\"" \
diff --git a/audio/gtkpod/patches/patch-ac b/audio/gtkpod/patches/patch-ac
deleted file mode 100644
index 1eebbc67f46..00000000000
--- a/audio/gtkpod/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2005/10/01 13:29:52 smb Exp $
-
---- src/info.c.orig 2005-09-17 18:18:15.000000000 -0400
-+++ src/info.c 2005-09-17 18:18:47.000000000 -0400
-@@ -687,7 +687,7 @@
- {
- for (;;)
- {
-- usleep (SPACE_TIMEOUT*1000);
-+ (void) sleep (SPACE_TIMEOUT/1000);
- if (!space_uptodate) th_space_update ();
- }
- }
diff --git a/audio/gtkpod/patches/patch-ba b/audio/gtkpod/patches/patch-ba
deleted file mode 100644
index bac648747d1..00000000000
--- a/audio/gtkpod/patches/patch-ba
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2005/12/18 21:03:46 rillig Exp $
-
-Keywords: c90
-
---- src/display_playlists.c.orig Fri Jun 24 18:17:18 2005
-+++ src/display_playlists.c Sun Dec 18 21:12:39 2005
-@@ -1142,6 +1142,11 @@ void pm_add_playlist (Playlist *playlist
- (useful when quitting program) */
- void pm_remove_playlist (Playlist *playlist, gboolean select)
- {
-+ GtkTreeModel *model;
-+ gboolean have_iter = FALSE;
-+ GtkTreeIter i;
-+ GtkTreeSelection *ts = NULL;
-+
- gboolean pm_delete_playlist_fe (GtkTreeModel *model,
- GtkTreePath *path,
- GtkTreeIter *iter,
-@@ -1156,10 +1161,6 @@ void pm_remove_playlist (Playlist *playl
- }
- return FALSE;
- };
-- GtkTreeModel *model;
-- gboolean have_iter = FALSE;
-- GtkTreeIter i;
-- GtkTreeSelection *ts = NULL;
-
- g_return_if_fail (playlist);
- model = gtk_tree_view_get_model (playlist_treeview);
diff --git a/audio/gtkpod/patches/patch-bb b/audio/gtkpod/patches/patch-bb
deleted file mode 100644
index 1d5d720659c..00000000000
--- a/audio/gtkpod/patches/patch-bb
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2005/12/18 21:03:46 rillig Exp $
-
-Keywords: c90
-
---- src/display_sorttabs.c.orig Fri Jul 1 18:53:43 2005
-+++ src/display_sorttabs.c Sun Dec 18 21:15:48 2005
-@@ -2088,12 +2088,14 @@ st_cell_edited (GtkCellRendererText *ren
- {
- ExtraTrackData *etr;
- Track *track = (Track *)g_list_nth_data (members, i);
-+ T_item t_item;
-+
- g_return_if_fail (track);
- etr = track->userdata;
- g_return_if_fail (etr);
- g_return_if_fail (track->itdb);
- if (!itdb) itdb = track->itdb;
-- T_item t_item = ST_to_T (sorttab[inst]->current_category);
-+ t_item = ST_to_T (sorttab[inst]->current_category);
- if (t_item == T_YEAR)
- {
- gint nr = atoi (new_text);
diff --git a/audio/gtkpod/patches/patch-bc b/audio/gtkpod/patches/patch-bc
deleted file mode 100644
index b23755dad34..00000000000
--- a/audio/gtkpod/patches/patch-bc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2005/12/18 21:03:46 rillig Exp $
-
-Keywords: c90
-
---- src/file.c.orig Fri Jul 15 18:58:40 2005
-+++ src/file.c Sun Dec 18 21:58:03 2005
-@@ -940,8 +940,10 @@ void update_tracks (GList *selected_trac
- for (gl=selected_tracks; gl; gl=gl->next)
- {
- Track *track = gl->data;
-+ gchar *buf;
-+
- g_return_if_fail (track);
-- gchar *buf = g_strdup_printf (_("Updating %s"),
-+ buf = g_strdup_printf (_("Updating %s"),
- get_track_info (track, TRUE));
- gtkpod_statusbar_message (buf);
- g_free (buf);
diff --git a/audio/gtkpod/patches/patch-bd b/audio/gtkpod/patches/patch-bd
deleted file mode 100644
index 12803e8b774..00000000000
--- a/audio/gtkpod/patches/patch-bd
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2005/12/18 21:03:46 rillig Exp $
-
-Keywords: c90
-
---- src/itdb_itunesdb.c.orig Sat Jul 16 09:13:50 2005
-+++ src/itdb_itunesdb.c Sun Dec 18 21:59:37 2005
-@@ -477,9 +477,10 @@ static gunichar2 *fixup_big_utf16 (gunic
- * return value after use */
- static struct playcount *playcount_get_next (FImport *fimp)
- {
-- g_return_val_if_fail (fimp, NULL);
-+ struct playcount *playcount;
-
-- struct playcount *playcount = g_list_nth_data (fimp->playcounts, 0);
-+ g_return_val_if_fail (fimp, NULL);
-+ playcount = g_list_nth_data (fimp->playcounts, 0);
-
- if (playcount)
- fimp->playcounts = g_list_remove (fimp->playcounts, playcount);
-@@ -1780,8 +1781,10 @@ static gboolean parse_fimp (FImport *fim
- { /* We just check if it's actually a playlist mhsd (type=2)
- or not (type = 1, should not be...) */
- guint32 len = get32lint (cts, seek+8);
-+ guint32 type;
-+
- CHECK_ERROR (fimp, FALSE);
-- guint32 type = get32lint (cts, seek+12);
-+ type = get32lint (cts, seek+12);
- CHECK_ERROR (fimp, FALSE);
- if (type != 2)
- { /* this is not a playlist MHSD -> skip it */
diff --git a/audio/gtkpod/patches/patch-be b/audio/gtkpod/patches/patch-be
deleted file mode 100644
index f6608b47a6f..00000000000
--- a/audio/gtkpod/patches/patch-be
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-be,v 1.1 2005/12/18 21:03:46 rillig Exp $
-
-Keywords: c90
-
---- src/itdb_playlist.c.orig Sat Jul 9 08:53:26 2005
-+++ src/itdb_playlist.c Sun Dec 18 22:00:14 2005
-@@ -1184,8 +1184,10 @@ Itdb_Playlist *itdb_playlist_by_id (Itdb
- /* Return playlist at position @num in @itdb */
- Itdb_Playlist *itdb_playlist_by_nr (Itdb_iTunesDB *itdb, guint32 num)
- {
-+ Itdb_Playlist *pl;
-+
- g_return_val_if_fail (itdb, NULL);
-- Itdb_Playlist *pl = g_list_nth_data (itdb->playlists, num);
-+ pl = g_list_nth_data (itdb->playlists, num);
- g_return_val_if_fail (pl, NULL);
- return pl;
- }
diff --git a/audio/gtkpod/patches/patch-bf b/audio/gtkpod/patches/patch-bf
deleted file mode 100644
index 142beb61ad1..00000000000
--- a/audio/gtkpod/patches/patch-bf
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-bf,v 1.1 2005/12/18 21:03:46 rillig Exp $
-
-Keywords: c90
-
---- src/misc_track.c.orig Mon Jun 20 16:32:06 2005
-+++ src/misc_track.c Sun Dec 18 22:01:25 2005
-@@ -544,9 +544,11 @@ guint32 *track_get_timestamp_ptr (Track
- illegal, "0" is returned. */
- guint32 track_get_timestamp (Track *track, T_item t_item)
- {
-+ guint32 *ptr;
-+
- g_return_val_if_fail (track, 0);
-
-- guint32 *ptr = track_get_timestamp_ptr (track, t_item);
-+ ptr = track_get_timestamp_ptr (track, t_item);
- if (ptr) return *ptr;
- else return 0;
- }
diff --git a/audio/gtkpod/patches/patch-bg b/audio/gtkpod/patches/patch-bg
deleted file mode 100644
index 0c61f59d35e..00000000000
--- a/audio/gtkpod/patches/patch-bg
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bg,v 1.1 2006/10/17 22:00:16 rillig Exp $
-
---- scripts/sync-notes.sh.orig 2005-06-12 10:41:46.000000000 +0200
-+++ scripts/sync-notes.sh 2006-10-17 23:54:59.000000000 +0200
-@@ -122,7 +122,7 @@ I=0
- find -type f |
- (
- read FILE
-- while [ "$?" == "0" ]; do
-+ while [ "$?" = "0" ]; do
- ((++I))
- mkdir -p "$IPOD_MOUNT/Notes/`dirname "$FILE"`/"
- cat "$FILE" | $RECODE > "$IPOD_MOUNT/Notes/$FILE"
diff --git a/audio/guspatches/DESCR b/audio/guspatches/DESCR
deleted file mode 100644
index a7cf28b2b4d..00000000000
--- a/audio/guspatches/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-GUS (Gravis Ultrasound) patches (audio samples) for TiMidity
diff --git a/audio/guspatches/MESSAGE b/audio/guspatches/MESSAGE
deleted file mode 100644
index eb2daf3c8c4..00000000000
--- a/audio/guspatches/MESSAGE
+++ /dev/null
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2005/04/12 17:12:16 ben Exp $
-
- To use timidity with guspatches, you have a couple of options.
-
- 1) at the command-line:
-
- timidity -L ${PREFIX}/share/guspatches -c timidity.cfg file.mid
-
- 2) in the system-wide timidity configuration:
-
- cp ${PREFIX}/share/guspatches/timidity.cfg ${PKG_SYSCONFDIR}
-
-===========================================================================
diff --git a/audio/guspatches/Makefile b/audio/guspatches/Makefile
deleted file mode 100644
index b7050ea8e83..00000000000
--- a/audio/guspatches/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2007/02/22 19:26:05 wiz Exp $
-#
-
-DISTNAME= dgguspat
-PKGNAME= guspatches-1.0
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-EXTRACT_SUFX= .zip
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= GUS (Gravis Ultrasound) patches (audio samples) for TiMidity
-
-RESTRICTED= Uses copyrighted patches
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-
-EXTRACT_ONLY= # empty
-NO_BUILD= yes
-USE_TOOLS+= unzip
-MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
-
-do-configure:
- ${SED} "s|@PREFIX@|${PREFIX}|" < ${FILESDIR}/gravis.cfg > \
- ${WRKDIR}/gravis.cfg
- ${SED} "s|@PREFIX@|${PREFIX}|" < ${FILESDIR}/timidity.cfg > \
- ${WRKDIR}/timidity.cfg
-
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/guspatches
- cd ${PREFIX}/share/guspatches && unzip -oqL ${DISTDIR}/${DISTFILES}
- ${INSTALL_DATA} ${FILESDIR}/midia.cfg ${PREFIX}/share/guspatches
- ${INSTALL_DATA} ${WRKDIR}/gravis.cfg ${PREFIX}/share/guspatches
- ${INSTALL_DATA} ${WRKDIR}/timidity.cfg ${PREFIX}/share/guspatches
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/guspatches/PLIST b/audio/guspatches/PLIST
deleted file mode 100644
index 4a63fa9deb5..00000000000
--- a/audio/guspatches/PLIST
+++ /dev/null
@@ -1,204 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/12/03 14:20:03 ben Exp $
-share/guspatches/timidity.cfg
-share/guspatches/gravis.cfg
-share/guspatches/midia.cfg
-share/guspatches/acbass.pat
-share/guspatches/accordn.pat
-share/guspatches/acguitar.pat
-share/guspatches/acpiano.pat
-share/guspatches/agogo.pat
-share/guspatches/agogohi.pat
-share/guspatches/agogolo.pat
-share/guspatches/altosax.pat
-share/guspatches/applause.pat
-share/guspatches/atmosphr.pat
-share/guspatches/aurora.pat
-share/guspatches/bagpipes.pat
-share/guspatches/banjo.pat
-share/guspatches/barisax.pat
-share/guspatches/basslead.pat
-share/guspatches/bassoon.pat
-share/guspatches/belltree.pat
-share/guspatches/blank.pat
-share/guspatches/bongohi.pat
-share/guspatches/bongolo.pat
-share/guspatches/bottle.pat
-share/guspatches/bowglass.pat
-share/guspatches/britepno.pat
-share/guspatches/c550kc_1.pat
-share/guspatches/c550sn10.pat
-share/guspatches/c550sn_6.pat
-share/guspatches/c550vibs.pat
-share/guspatches/cabasa.pat
-share/guspatches/calliope.pat
-share/guspatches/carillon.pat
-share/guspatches/castinet.pat
-share/guspatches/celeste.pat
-share/guspatches/cello.pat
-share/guspatches/charang.pat
-share/guspatches/chiflead.pat
-share/guspatches/choir.pat
-share/guspatches/church.pat
-share/guspatches/claps.pat
-share/guspatches/clarinet.pat
-share/guspatches/clave.pat
-share/guspatches/clavinet.pat
-share/guspatches/cleangtr.pat
-share/guspatches/concrtna.pat
-share/guspatches/congahi1.pat
-share/guspatches/congahi2.pat
-share/guspatches/congalo.pat
-share/guspatches/contraba.pat
-share/guspatches/cowbell.pat
-share/guspatches/crystal.pat
-share/guspatches/cuica1.pat
-share/guspatches/cuica2.pat
-share/guspatches/cymbell.pat
-share/guspatches/cymchina.pat
-share/guspatches/cymcrsh1.pat
-share/guspatches/cymcrsh2.pat
-share/guspatches/cymride1.pat
-share/guspatches/cymride2.pat
-share/guspatches/cymsplsh.pat
-share/guspatches/distgtr.pat
-share/guspatches/doo.pat
-share/guspatches/echovox.pat
-share/guspatches/englhorn.pat
-share/guspatches/epiano1.pat
-share/guspatches/epiano2.pat
-share/guspatches/fantasia.pat
-share/guspatches/fiddle.pat
-share/guspatches/flute.pat
-share/guspatches/fngrbass.pat
-share/guspatches/frenchrn.pat
-share/guspatches/freshair.pat
-share/guspatches/fretless.pat
-share/guspatches/fx-blow.pat
-share/guspatches/fx-fret.pat
-share/guspatches/ghostie.pat
-share/guspatches/glocken.pat
-share/guspatches/gtrharm.pat
-share/guspatches/guiro1.pat
-share/guspatches/guiro2.pat
-share/guspatches/halopad.pat
-share/guspatches/harmonca.pat
-share/guspatches/harp.pat
-share/guspatches/helicptr.pat
-share/guspatches/highq.pat
-share/guspatches/hihatcl.pat
-share/guspatches/hihatop.pat
-share/guspatches/hihatpd.pat
-share/guspatches/hitbrass.pat
-share/guspatches/homeorg.pat
-share/guspatches/honky.pat
-share/guspatches/hrpschrd.pat
-share/guspatches/jazzgtr.pat
-share/guspatches/jingles.pat
-share/guspatches/jungle.pat
-share/guspatches/kalimba.pat
-share/guspatches/kick1.pat
-share/guspatches/kick2.pat
-share/guspatches/koto.pat
-share/guspatches/lead5th.pat
-share/guspatches/maracas.pat
-share/guspatches/marcato.pat
-share/guspatches/marimba.pat
-share/guspatches/metalpad.pat
-share/guspatches/metbell.pat
-share/guspatches/metclick.pat
-share/guspatches/musicbox.pat
-share/guspatches/mutegtr.pat
-share/guspatches/mutetrum.pat
-share/guspatches/nyguitar.pat
-share/guspatches/oboe.pat
-share/guspatches/ocarina.pat
-share/guspatches/odguitar.pat
-share/guspatches/orchhit.pat
-share/guspatches/percorg.pat
-share/guspatches/piccolo.pat
-share/guspatches/pickbass.pat
-share/guspatches/pistol.pat
-share/guspatches/pizzcato.pat
-share/guspatches/polysyn.pat
-share/guspatches/recorder.pat
-share/guspatches/reedorg.pat
-share/guspatches/revcym.pat
-share/guspatches/ringwhsl.pat
-share/guspatches/rockorg.pat
-share/guspatches/santur.pat
-share/guspatches/sawwave.pat
-share/guspatches/scratch1.pat
-share/guspatches/scratch2.pat
-share/guspatches/seashore.pat
-share/guspatches/shakazul.pat
-share/guspatches/shaker.pat
-share/guspatches/shamisen.pat
-share/guspatches/shannai.pat
-share/guspatches/sitar.pat
-share/guspatches/slap.pat
-share/guspatches/slapbas1.pat
-share/guspatches/slapbas2.pat
-share/guspatches/slowstr.pat
-share/guspatches/snare1.pat
-share/guspatches/snare2.pat
-share/guspatches/soundtrk.pat
-share/guspatches/sprnosax.pat
-share/guspatches/sqrclick.pat
-share/guspatches/sqrwave.pat
-share/guspatches/startrak.pat
-share/guspatches/steeldrm.pat
-share/guspatches/stickrim.pat
-share/guspatches/sticks.pat
-share/guspatches/surdo1.pat
-share/guspatches/surdo2.pat
-share/guspatches/sweeper.pat
-share/guspatches/synbass1.pat
-share/guspatches/synbass2.pat
-share/guspatches/synbras1.pat
-share/guspatches/synbras2.pat
-share/guspatches/synpiano.pat
-share/guspatches/synstr1.pat
-share/guspatches/synstr2.pat
-share/guspatches/syntom.pat
-share/guspatches/taiko.pat
-share/guspatches/tamborin.pat
-share/guspatches/telephon.pat
-share/guspatches/tenorsax.pat
-share/guspatches/timbaleh.pat
-share/guspatches/timbalel.pat
-share/guspatches/timpani.pat
-share/guspatches/tomhi1.pat
-share/guspatches/tomhi2.pat
-share/guspatches/tomlo1.pat
-share/guspatches/tomlo2.pat
-share/guspatches/tommid1.pat
-share/guspatches/tommid2.pat
-share/guspatches/toms.pat
-share/guspatches/tremstr.pat
-share/guspatches/triangl1.pat
-share/guspatches/triangl2.pat
-share/guspatches/trombone.pat
-share/guspatches/trumpet.pat
-share/guspatches/tuba.pat
-share/guspatches/tubebell.pat
-share/guspatches/unicorn.pat
-share/guspatches/vibes.pat
-share/guspatches/vibslap.pat
-share/guspatches/viola.pat
-share/guspatches/violin.pat
-share/guspatches/voices.pat
-share/guspatches/voxlead.pat
-share/guspatches/warmpad.pat
-share/guspatches/whistle.pat
-share/guspatches/whistle1.pat
-share/guspatches/whistle2.pat
-share/guspatches/woodblk.pat
-share/guspatches/woodblk1.pat
-share/guspatches/woodblk2.pat
-share/guspatches/woodflut.pat
-share/guspatches/xylophon.pat
-share/guspatches/chris6.cfg
-share/guspatches/default.cfg
-share/guspatches/maplerag.cfg
-share/guspatches/ultramid.ini
-@dirrm share/guspatches
diff --git a/audio/guspatches/distinfo b/audio/guspatches/distinfo
deleted file mode 100644
index 4a289764a39..00000000000
--- a/audio/guspatches/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:46 agc Exp $
-
-SHA1 (dgguspat.zip) = 72f007d42b753a9f8de39bf562453eade44c41ae
-RMD160 (dgguspat.zip) = f627f1b7d2e01764c6abe370c9dbbc847202c8e8
-Size (dgguspat.zip) = 5286686 bytes
diff --git a/audio/guspatches/files/gravis.cfg b/audio/guspatches/files/gravis.cfg
deleted file mode 100644
index a4df1aa0ea6..00000000000
--- a/audio/guspatches/files/gravis.cfg
+++ /dev/null
@@ -1,205 +0,0 @@
-##############################################################################
-# These are the standard patches that come with the GUS, mapped into GM
-# programs.
-#
-
-dir @PREFIX@/share/guspatches/patch
-
-bank 0
-
- 0 acpiano
- 1 britepno
- 2 synpiano
- 3 honky
- 4 epiano1
- 5 epiano2
- 6 hrpschrd
- 7 clavinet
- 8 celeste
- 9 glocken
- 10 musicbox
- 11 vibes
- 12 marimba
- 13 xylophon amp=200
- 14 tubebell
- 15 santur
- 16 homeorg
- 17 percorg
- 18 rockorg
- 19 church
- 20 reedorg
- 21 accordn
- 22 harmonca
- 23 concrtna
- 24 nyguitar
- 25 acguitar
- 26 jazzgtr
- 27 cleangtr
- 28 mutegtr
- 29 odguitar
- 30 distgtr
- 31 gtrharm
- 32 acbass
- 33 fngrbass
- 34 pickbass
- 35 fretless
- 36 slapbas1
- 37 slapbas2
- 38 synbass1
- 39 synbass2
- 40 violin
- 41 viola
- 42 cello
- 43 contraba
- 44 tremstr
- 45 pizzcato
- 46 harp
- 47 timpani
- # This sounds pretty dumb with the default panning
- 48 marcato pan=center
- 49 slowstr
- 50 synstr1
- 51 synstr2
- 52 choir
- 53 doo
- 54 voices
- 55 orchhit
- 56 trumpet
- 57 trombone
- 58 tuba
- 59 mutetrum
- 60 frenchrn
- 61 hitbrass
- 62 synbras1
- 63 synbras2
- 64 sprnosax
- 65 altosax
- 66 tenorsax
- 67 barisax
- 68 oboe
- 69 englhorn
- 70 bassoon
- 71 clarinet
- 72 piccolo
- 73 flute
- 74 recorder
- 75 woodflut
- 76 bottle
- 77 shakazul
- 78 whistle
- 79 ocarina
- 80 sqrwave
- 81 sawwave
- 82 calliope
- 83 chiflead
- 84 charang
- 85 voxlead
- 86 lead5th
- 87 basslead
- 88 fantasia
- 89 warmpad
- 90 polysyn
- 91 ghostie
- 92 bowglass
- 93 metalpad
- 94 halopad
- 95 sweeper
- 96 aurora
- 97 soundtrk
- 98 crystal
- 99 atmosphr
- 100 freshair
- 101 unicorn
- 102 echovox
- 103 startrak
- 104 sitar
- 105 banjo
- 106 shamisen
- 107 koto
- 108 kalimba
- 109 bagpipes
- 110 fiddle
- 111 shannai
- 112 carillon
- 113 agogo
- 114 steeldrm
- 115 woodblk
- 116 taiko
- 117 toms
- 118 syntom
- 119 revcym
- 120 fx-fret
- 121 fx-blow
- 122 seashore
- 123 jungle
- 124 telephon
- 125 helicptr
- 126 applause note=69
- 127 pistol
-
-##############################################################################
-# The GUS drum patches
-
-drumset 0
-
- 27 highq
- 28 slap
- 29 scratch1
- 30 scratch2
- 31 sticks strip=tail
- 32 sqrclick
- 33 metclick
- 34 metbell keep=loop keep=env
- 35 kick1
- 36 kick2
- 37 stickrim strip=tail
- 38 snare1
- 39 claps
- 40 snare2 note=38
- 41 tomlo2
- 42 hihatcl
- 43 tomlo1
- 44 hihatpd
- 45 tommid2
- 46 hihatop
- 47 tommid1
- 48 tomhi2
- 49 cymcrsh1
- 50 tomhi1
- 51 cymride1
- 52 cymchina
- 53 cymbell
- 54 tamborin
- 55 cymsplsh
- 56 cowbell
- 57 cymcrsh2
- 58 vibslap
- 59 cymride2
- 60 bongohi
- 61 bongolo
- 62 congahi1
- 63 congahi2
- 64 congalo
- 65 timbaleh
- 66 timbalel
- 67 agogohi
- 68 agogolo
- 69 cabasa strip=tail
- 70 maracas
- 71 whistle1 keep=loop keep=env
- 72 whistle2 keep=loop keep=env
- 73 guiro1
- 74 guiro2
- 75 clave
- 76 woodblk1
- 77 woodblk2
- 78 cuica1
- 79 cuica2
- 80 triangl1
- 81 triangl2
- 82 shaker
- 83 jingles
- 84 belltree keep=loop keep=env
- 85 castinet
- 86 surdo1
- 87 surdo2
diff --git a/audio/guspatches/files/midia.cfg b/audio/guspatches/files/midia.cfg
deleted file mode 100644
index 8aac978b57c..00000000000
--- a/audio/guspatches/files/midia.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-##############################################################################
-# A config file for the Midia patch set. The patch filenames are identical
-# to the GUS ones, although many of the patches themselves are different.
-
-source gravis.cfg
-
-bank 0
-
-# The Midia set doesn't have a bright piano, so we substitute acpiano instead.
-# (Yes, it can get loaded into memory twice -- don't worry, it's only some
-# 970kB long... :)
-
- 1 acpiano
-
-# There's no pistol either, but I can't think of a reasonable substitute.
diff --git a/audio/guspatches/files/timidity.cfg b/audio/guspatches/files/timidity.cfg
deleted file mode 100644
index b8b709ea086..00000000000
--- a/audio/guspatches/files/timidity.cfg
+++ /dev/null
@@ -1,75 +0,0 @@
-##############################################################################
-#
-# Instrument configuration file for timidity
-#
-# Specify library directory: dir <directory>
-#
-# - Multiple library directories may be given. The ones given last will be
-# searched first so you can override them in later configuration files.
-# Extra configuration files and MIDI files will also be searched in these
-# directories.
-#
-# Set tone bank or drum set to modify: bank <number>
-# drumset <number>
-#
-# Map program number to patch map: <program number> <patch name>
-#
-# - If the patch can't be found in the library directories, TiMidity will
-# search again with ".pat" appended to the name.
-# Programs without a loaded patch will be silent, except that for
-# banks/drumsets >0, the corresponding patch in bank/drumset 0 will
-# be used (if one exists).
-#
-# Read another configuration file: source <file name>
-#
-
-##############################################################################
-# If you've moved things around since compiling, uncomment and edit this to
-# point to the library directory:
-#
-dir @PREFIX@/share/guspatches
-#
-
-##############################################################################
-# This sets up the default patches in the TiMidity support package
-# "timidity-lib-0.1.tar.gz":
-
-#bank 0
-# 0 patch/acpiano.pat
-# 24 patch/nylongt2.pat
-
-##############################################################################
-# If you have Dustin McCartney's "wowpats" patches, you can source the
-# config file to set them up for TiMidity:
-#
-# (Note that later entries in config files always override earlier ones)
-#
-#source wowpats.cfg
-#
-
-##############################################################################
-# If you have Dustin McCartney's GS drum sets, you can source the config
-# file to set them up for TiMidity:
-#
-#source gsdrum.cfg
-#
-
-##############################################################################
-# If you have the GUS General MIDI patch set, uncomment the following lines
-# and edit the "dir" statement to point to your GUS patch directory.
-#
-#dir /dos-C/ultrasnd/midi
-source gravis.cfg
-#
-
-##############################################################################
-# If you have the Midia patch set, you can source midia.cfg to set them up.
-# Note that midia.cfg sources gravis.cfg in turn, since the filenames are
-# almost identical.
-#
-#source midia.cfg
-#
-
-
-##############################################################################
-# End of configuration file
diff --git a/audio/hydrogen/DESCR b/audio/hydrogen/DESCR
deleted file mode 100644
index e95f86ccd37..00000000000
--- a/audio/hydrogen/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Hydrogen is a simple real-time drum machine/sequencer for CAC (Computer
-Aided Composition).
diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
deleted file mode 100644
index 1a5bf65b6ea..00000000000
--- a/audio/hydrogen/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2007/01/11 10:50:38 joerg Exp $
-
-DISTNAME= hydrogen-0.8.0
-PKGREVISION= 5
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hydrogen/}
-
-MAINTAINER= chris.wareham@btinternet.com
-HOMEPAGE= http://hydrogen.sourceforge.net/
-COMMENT= Real time drum machine/sequencer
-
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake
-GNU_CONFIGURE= yes
-
-CONFIGURE_ARGS+= --disable-alsa-seq
-CONFIGURE_ARGS+= --disable-jack-support
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${X11_TYPE} != "native"
-.include "../../x11/libXinerama/buildlink3.mk"
-CONFIGURE_ARGS+= --with-xinerama
-.elif exists(${X11BASE}/include/X11/extensions/Xinerama.h)
-.endif
-
-BUILDLINK_DEPMETHOD.libXt?= build
-
-.include "../../audio/libhydrogen/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/qt3-libs/buildlink3.mk"
-.include "../../x11/qt3-tools/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/hydrogen/PLIST b/audio/hydrogen/PLIST
deleted file mode 100644
index 320b47680aa..00000000000
--- a/audio/hydrogen/PLIST
+++ /dev/null
@@ -1,110 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/06 14:52:27 xtraeme Exp $
-bin/hydrogen
-man/man1/hydrogen.1
-share/hydrogen/img/about/aboutLogo.png
-share/hydrogen/img/icon16.png
-share/hydrogen/img/icon32.png
-share/hydrogen/img/mdiBackground.png
-share/hydrogen/img/mixerPanel/btn_load_off.png
-share/hydrogen/img/mixerPanel/btn_load_over.png
-share/hydrogen/img/mixerPanel/btn_mute_off.png
-share/hydrogen/img/mixerPanel/btn_mute_on.png
-share/hydrogen/img/mixerPanel/btn_mute_over.png
-share/hydrogen/img/mixerPanel/btn_on_off.png
-share/hydrogen/img/mixerPanel/btn_on_on.png
-share/hydrogen/img/mixerPanel/btn_on_over.png
-share/hydrogen/img/mixerPanel/btn_play_off.png
-share/hydrogen/img/mixerPanel/btn_play_on.png
-share/hydrogen/img/mixerPanel/btn_play_over.png
-share/hydrogen/img/mixerPanel/btn_solo_off.png
-share/hydrogen/img/mixerPanel/btn_solo_on.png
-share/hydrogen/img/mixerPanel/btn_solo_over.png
-share/hydrogen/img/mixerPanel/fader_background.png
-share/hydrogen/img/mixerPanel/fader_knob.png
-share/hydrogen/img/mixerPanel/fader_leds.png
-share/hydrogen/img/mixerPanel/masterMixerline_background.png
-share/hydrogen/img/mixerPanel/mixer_background.png
-share/hydrogen/img/mixerPanel/mixerline_background.png
-share/hydrogen/img/mixerPanel/mixerline_label_background.png
-share/hydrogen/img/mixerPanel/panFader_background.png
-share/hydrogen/img/patternEditor/editor_background.png
-share/hydrogen/img/patternEditor/hearBtn_off.png
-share/hydrogen/img/patternEditor/hearBtn_on.png
-share/hydrogen/img/patternEditor/hearBtn_over.png
-share/hydrogen/img/patternEditor/patternEditor_background.png
-share/hydrogen/img/patternEditor/tickPosition.png
-share/hydrogen/img/playerControlPanel/background.png
-share/hydrogen/img/playerControlPanel/btn_live_off.png
-share/hydrogen/img/playerControlPanel/btn_live_on.png
-share/hydrogen/img/playerControlPanel/btn_live_over.png
-share/hydrogen/img/playerControlPanel/btn_loop_off.png
-share/hydrogen/img/playerControlPanel/btn_loop_on.png
-share/hydrogen/img/playerControlPanel/btn_loop_over.png
-share/hydrogen/img/playerControlPanel/btn_play_off.png
-share/hydrogen/img/playerControlPanel/btn_play_on.png
-share/hydrogen/img/playerControlPanel/btn_play_over.png
-share/hydrogen/img/playerControlPanel/btn_song_off.png
-share/hydrogen/img/playerControlPanel/btn_song_on.png
-share/hydrogen/img/playerControlPanel/btn_song_over.png
-share/hydrogen/img/playerControlPanel/btn_stop_off.png
-share/hydrogen/img/playerControlPanel/btn_stop_on.png
-share/hydrogen/img/playerControlPanel/btn_stop_over.png
-share/hydrogen/img/songEditor/downBtn_off.png
-share/hydrogen/img/songEditor/downBtn_on.png
-share/hydrogen/img/songEditor/downBtn_over.png
-share/hydrogen/img/songEditor/newPatternBtn_off.png
-share/hydrogen/img/songEditor/newPatternBtn_on.png
-share/hydrogen/img/songEditor/newPatternBtn_over.png
-share/hydrogen/img/songEditor/patternIcon.png
-share/hydrogen/img/songEditor/patternListIcon.png
-share/hydrogen/img/songEditor/patternSequenceIcon.png
-share/hydrogen/img/songEditor/playingIcon.png
-share/hydrogen/img/songEditor/songFuncBtn_off.png
-share/hydrogen/img/songEditor/songFuncBtn_on.png
-share/hydrogen/img/songEditor/songFuncBtn_over.png
-share/hydrogen/img/songEditor/songIcon.png
-share/hydrogen/img/songEditor/upBtn_off.png
-share/hydrogen/img/songEditor/upBtn_on.png
-share/hydrogen/img/songEditor/upBtn_over.png
-share/hydrogen/img/splash/splash.png
-share/hydrogen/manual/img/AudioEngineInfoDialog.png
-share/hydrogen/manual/img/CreateNewPattern.png
-share/hydrogen/manual/img/DrumkitExport.png
-share/hydrogen/manual/img/DrumkitImport.png
-share/hydrogen/manual/img/DrumkitLoad.png
-share/hydrogen/manual/img/DrumkitSave.png
-share/hydrogen/manual/img/MainModeLive.png
-share/hydrogen/manual/img/MainModeSong.png
-share/hydrogen/manual/img/MainPlay.png
-share/hydrogen/manual/img/MainRecord.png
-share/hydrogen/manual/img/MainStop.png
-share/hydrogen/manual/img/Mixer.png
-share/hydrogen/manual/img/MixerDelay.png
-share/hydrogen/manual/img/MixerLoadSample.png
-share/hydrogen/manual/img/MixerMute.png
-share/hydrogen/manual/img/MixerPan.png
-share/hydrogen/manual/img/MixerPlayTest.png
-share/hydrogen/manual/img/MixerSolo.png
-share/hydrogen/manual/img/MovePatternDown.png
-share/hydrogen/manual/img/MovePatternUp.png
-share/hydrogen/manual/img/PatternEditor.png
-share/hydrogen/manual/img/PreferencesAppearance.png
-share/hydrogen/manual/img/PreferencesAudioSystem.png
-share/hydrogen/manual/img/PreferencesMidiSystem.png
-share/hydrogen/manual/img/SongEditor.png
-share/hydrogen/manual/img/SongLoop.png
-share/hydrogen/manual/img/SongOperations.png
-share/hydrogen/manual/img/TutorialEnd.png
-share/hydrogen/manual/img/TutorialStart.png
-share/hydrogen/manual/manual.html
-share/hydrogen/manual/manual_en.html
-share/hydrogen/manual/manual_it.html
-@dirrm share/hydrogen/manual/img
-@dirrm share/hydrogen/manual
-@dirrm share/hydrogen/img/splash
-@dirrm share/hydrogen/img/songEditor
-@dirrm share/hydrogen/img/playerControlPanel
-@dirrm share/hydrogen/img/patternEditor
-@dirrm share/hydrogen/img/mixerPanel
-@dirrm share/hydrogen/img/about
-@dirrm share/hydrogen/img
diff --git a/audio/hydrogen/distinfo b/audio/hydrogen/distinfo
deleted file mode 100644
index 4aa2b0e224f..00000000000
--- a/audio/hydrogen/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:46 agc Exp $
-
-SHA1 (hydrogen-0.8.0.tar.gz) = c3e3b09f661451a313c6d10c4dae76831b9cbf44
-RMD160 (hydrogen-0.8.0.tar.gz) = 5a246b728ca837987f4a5a15d42053d36c3848b1
-Size (hydrogen-0.8.0.tar.gz) = 1578054 bytes
diff --git a/audio/icecast/DESCR b/audio/icecast/DESCR
deleted file mode 100644
index eba2af5cd55..00000000000
--- a/audio/icecast/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Icecast is a streaming media server which currently supports Ogg
-Vorbis and MP3 audio streams. It can be used to create an Internet
-radio station or a privately running jukebox and many things in
-between. It is very versatile in that new formats can be added
-relatively easily and it supports open standards for communication
-and interaction.
diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile
deleted file mode 100644
index 3c41b82b631..00000000000
--- a/audio/icecast/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-# $NetBSD: Makefile,v 1.41 2007/02/22 19:26:05 wiz Exp $
-#
-
-DISTNAME= icecast-2.3.0
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= http://svn.xiph.org/releases/icecast/
-
-MAINTAINER= pancake@phreaker.net
-HOMEPAGE= http://www.icecast.org/
-COMMENT= Live streaming audio server
-
-USE_PKGLOCALEDIR= yes
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-PTHREAD_AUTO_VARS= yes
-
-BUILD_DEFS+= ICECAST_CHROOTDIR
-
-PKG_SYSCONFSUBDIR= icecast
-RCD_SCRIPTS= icecast
-
-ICECAST_LOGDIR?= ${ICECAST_CHROOTDIR}/log
-
-ICECAST_USER?= icecast
-ICECAST_GROUP?= icecast
-
-PKG_GROUPS= ${ICECAST_GROUP}
-PKG_USERS= ${ICECAST_USER}:${ICECAST_GROUP}
-
-EGDIR= ${PREFIX}/share/examples/icecast
-CONF_FILES= ${EGDIR}/icecast.xml ${PKG_SYSCONFDIR}/icecast.xml
-
-OWN_DIRS_PERMS= ${ICECAST_CHROOTDIR} ${ICECAST_USER} ${ICECAST_GROUP} 770
-OWN_DIRS_PERMS+= ${ICECAST_LOGDIR} ${ICECAST_USER} ${ICECAST_GROUP} 770
-
-post-extract:
- ${MV} ${WRKSRC}/conf/icecast.xml.in ${WRKSRC}/conf/icecast.fixme
-
-post-install:
- ${SED} \
- -e "s,@BASEDIR@,${ICECAST_CHROOTDIR},g" \
- -e "s,@LOGDIR@,log/,g" \
- -e "s,@WEBROOT@,${PREFIX}/share/icecast/web,g" \
- -e "s,@ADMINROOT@,${PREFIX}/share/icecast/admin,g" \
- -e "s,@PIDDIR@,${ICECAST_CHROOTDIR},g" \
- -e "s,@ICECAST_USER@,${ICECAST_USER},g" \
- -e "s,@ICECAST_GROUP@,${ICECAST_GROUP},g" \
- ${WRKSRC}/conf/icecast.fixme > ${WRKSRC}/conf/icecast.xml
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/conf/icecast.xml ${EGDIR}
-
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/speex/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../multimedia/libtheora/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/icecast/PLIST b/audio/icecast/PLIST
deleted file mode 100644
index 9d25c81ef68..00000000000
--- a/audio/icecast/PLIST
+++ /dev/null
@@ -1,51 +0,0 @@
-@comment $NetBSD: PLIST,v 1.12 2005/10/12 22:26:59 wiz Exp $
-bin/icecast
-share/doc/icecast/AUTHORS
-share/doc/icecast/COPYING
-share/doc/icecast/ChangeLog
-share/doc/icecast/NEWS
-share/doc/icecast/README
-share/doc/icecast/TODO
-share/doc/icecast/icecast2_admin.html
-share/doc/icecast/icecast2_basicsetup.html
-share/doc/icecast/icecast2_changes.html
-share/doc/icecast/icecast2_config_file.html
-share/doc/icecast/icecast2_faq.html
-share/doc/icecast/icecast2_glossary.html
-share/doc/icecast/icecast2_introduction.html
-share/doc/icecast/icecast2_listenerauth.html
-share/doc/icecast/icecast2_relay.html
-share/doc/icecast/icecast2_stats.html
-share/doc/icecast/icecast2_win32.html
-share/doc/icecast/icecast2_yp.html
-share/doc/icecast/index.html
-share/doc/icecast/listener_auth1.jpg
-share/doc/icecast/listener_auth2.jpg
-share/doc/icecast/listener_auth3.jpg
-share/examples/icecast/icecast.xml
-share/examples/rc.d/icecast
-share/icecast/admin/listclients.xsl
-share/icecast/admin/listmounts.xsl
-share/icecast/admin/manageauth.xsl
-share/icecast/admin/moveclients.xsl
-share/icecast/admin/response.xsl
-share/icecast/admin/stats.xsl
-share/icecast/admin/updatemetadata.xsl
-share/icecast/web/auth.xsl
-share/icecast/web/corner_bottomleft.jpg
-share/icecast/web/corner_bottomright.jpg
-share/icecast/web/corner_topleft.jpg
-share/icecast/web/corner_topright.jpg
-share/icecast/web/icecast.png
-share/icecast/web/key.gif
-share/icecast/web/key.png
-share/icecast/web/server_version.xsl
-share/icecast/web/status.xsl
-share/icecast/web/status2.xsl
-share/icecast/web/style.css
-share/icecast/web/tunein.png
-@dirrm share/icecast/web
-@dirrm share/icecast/admin
-@dirrm share/icecast
-@dirrm share/doc/icecast
-@dirrm share/examples/icecast
diff --git a/audio/icecast/distinfo b/audio/icecast/distinfo
deleted file mode 100644
index 4da6fb6885a..00000000000
--- a/audio/icecast/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.15 2005/10/12 22:26:59 wiz Exp $
-
-SHA1 (icecast-2.3.0.tar.gz) = 9210403649d178591d5f750bc88896352480ccb8
-RMD160 (icecast-2.3.0.tar.gz) = 59ffe3fa53ef20d4a31c2d9ac3b73d2edc064911
-Size (icecast-2.3.0.tar.gz) = 1091422 bytes
-SHA1 (patch-aa) = 907083be5ba10710180a58054358d53dbbce37e4
-SHA1 (patch-ab) = a0a1c457d772446e16caba1eec925ac3c4b760b7
diff --git a/audio/icecast/files/icecast.sh b/audio/icecast/files/icecast.sh
deleted file mode 100644
index ba1e98261c2..00000000000
--- a/audio/icecast/files/icecast.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: icecast.sh,v 1.4 2004/01/12 05:56:04 xtraeme Exp $
-#
-
-# PROVIDE: icecast
-# REQUIRE: DAEMON LOGIN
-
-. /etc/rc.subr
-
-name="icecast"
-rcvar=$name
-command="@PREFIX@/bin/${name}"
-command_args="-b -c @PKG_SYSCONFDIR@/$name.xml >/dev/null 2>&1"
-required_files="@PKG_SYSCONFDIR@/$name.xml"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/audio/icecast/patches/patch-aa b/audio/icecast/patches/patch-aa
deleted file mode 100644
index 87297a1458e..00000000000
--- a/audio/icecast/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/10/12 22:26:59 wiz Exp $
-
---- Makefile.in.orig 2005-09-23 16:18:44.000000000 -0500
-+++ Makefile.in
-@@ -128,7 +128,7 @@ install_sh = @install_sh@
- AUTOMAKE_OPTIONS = 1.6 foreign dist-zip
- ACLOCAL_AMFLAGS = -I m4
-
--SUBDIRS = src conf debian doc web admin win32 examples
-+SUBDIRS = src doc web admin
-
- EXTRA_DIST = HACKING m4/acx_pthread.m4 m4/ogg.m4 \
- m4/theora.m4 m4/vorbis.m4 m4/speex.m4 \
diff --git a/audio/icecast/patches/patch-ab b/audio/icecast/patches/patch-ab
deleted file mode 100644
index 33fe059258c..00000000000
--- a/audio/icecast/patches/patch-ab
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2005/10/12 22:26:59 wiz Exp $
-
---- conf/icecast.fixme.orig 2005-09-08 16:03:51.000000000 +0200
-+++ conf/icecast.fixme
-@@ -132,14 +132,15 @@
-
- <paths>
- <!-- basedir is only used if chroot is enabled -->
-- <basedir>@pkgdatadir@</basedir>
-+ <basedir>@BASEDIR@</basedir>
-
- <!-- Note that if <chroot> is turned on below, these paths must both
- be relative to the new root, not the original root -->
-- <logdir>@localstatedir@/log/@PACKAGE@</logdir>
-- <webroot>@pkgdatadir@/web</webroot>
-- <adminroot>@pkgdatadir@/admin</adminroot>
-- <!-- <pidfile>@pkgdatadir@/icecast.pid</pidfile> -->
-+
-+ <logdir>@LOGDIR@/</logdir>
-+ <webroot>@WEBROOT@</webroot>
-+ <adminroot>@ADMINROOT@</adminroot>
-+ <pidfile>@PIDDIR@/icecast.pid</pidfile>
-
- <!-- Aliases: treat requests for 'source' path as being for 'dest' path
- May be made specific to a port or bound address using the "port"
-@@ -159,15 +160,15 @@
- <accesslog>access.log</accesslog>
- <errorlog>error.log</errorlog>
- <!-- <playlistlog>playlist.log</playlistlog> -->
-- <loglevel>4</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
-+ <loglevel>2</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
- </logging>
-
- <security>
-- <chroot>0</chroot>
-+ <chroot>1</chroot>
- <!--
- <changeowner>
-- <user>nobody</user>
-- <group>nogroup</group>
-+ <user>@ICECAST_USER@</user>
-+ <group>@ICECAST_GROUP@</group>
- </changeowner>
- -->
- </security>
diff --git a/audio/icecast1/DESCR b/audio/icecast1/DESCR
deleted file mode 100644
index 78edcf9aa81..00000000000
--- a/audio/icecast1/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Icecast is an Internet based broadcasting system based on the Mpeg
-Layer III streaming technology. It is, however, not limited to
-streaming mp3 files. It was originally inspired by Nullsoft's
-Shoutcast and also mp3serv by Scott Man ley.
diff --git a/audio/icecast1/Makefile b/audio/icecast1/Makefile
deleted file mode 100644
index 0eb5f9498e8..00000000000
--- a/audio/icecast1/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2006/06/18 11:07:36 rillig Exp $
-#
-
-DISTNAME= icecast-1.3.12
-PKGREVISION= 8
-CATEGORIES= audio
-MASTER_SITES= http://www.icecast.org/releases/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.icecast.org/
-COMMENT= Internet broadcasting system using Mpeg Layer III streaming
-
-RCD_SCRIPTS= icecast
-PKG_SYSCONFSUBDIR= icecast
-
-GNU_CONFIGURE= yes
-CONFIGURE_ENV+= VARBASE=${VARBASE}
-CONFIGURE_ARGS+= --with-readline \
- --with-libwrap \
- --with-python \
- --sysconfdir=${PKG_SYSCONFDIR:Q}
-CPPFLAGS+= -I${BUILDLINK_PREFIX.readline}/include/readline
-CPPFLAGS+= ${BUILDLINK_CPPFLAGS.${PYPACKAGE}}
-LDFLAGS+= ${BUILDLINK_LDFLAGS.${PYPACKAGE}}
-LIBS+= -lutil
-PTHREAD_OPTS+= require
-
-EGDIR= ${PREFIX}/share/examples/icecast
-EGFILES= groups.aut mounts.aut users.aut icecast.conf
-
-.for f in ${EGFILES}
-CONF_FILES+= ${EGDIR}/${f}.dist ${PKG_SYSCONFDIR}/${f}
-.endfor
-
-.include "../../mk/bsd.prefs.mk"
-
-ICECAST_SOURCE_BUFFSIZE?= 8192
-ICECAST_CHUNKLEN?= 64
-
-BUILD_DEFS+= ICECAST_SOURCE_BUFFSIZE
-BUILD_DEFS+= ICECAST_CHUNKLEN
-
-SUBST_CLASSES+= ice
-SUBST_STAGE.ice= pre-configure
-SUBST_MESSAGE.ice= Configuring in src/icetypes.h
-SUBST_FILES.ice= src/icetypes.h
-SUBST_SED.ice= -e 's/@SOURCE_BUFFSIZE@/${ICECAST_SOURCE_BUFFSIZE}/'
-SUBST_SED.ice+= -e 's/@CHUNKLEN@/${ICECAST_CHUNKLEN}/'
-
-.include "../../devel/readline/buildlink3.mk"
-.include "../../lang/python/application.mk"
-.include "../../security/tcp_wrappers/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/icecast1/PLIST b/audio/icecast1/PLIST
deleted file mode 100644
index 8b1fb0aa6f2..00000000000
--- a/audio/icecast1/PLIST
+++ /dev/null
@@ -1,32 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2005/05/02 20:33:57 reed Exp $
-bin/icecast
-share/doc/icecast/manual.html
-share/examples/icecast/groups.aut.dist
-share/examples/icecast/icecast.conf.dist
-share/examples/icecast/mounts.aut.dist
-share/examples/icecast/users.aut.dist
-share/examples/rc.d/icecast
-share/icecast/templates/306.html
-share/icecast/templates/400.html
-share/icecast/templates/403.html
-share/icecast/templates/404.html
-share/icecast/templates/504.html
-share/icecast/templates/admin.html
-share/icecast/templates/admin_change.html
-share/icecast/templates/admin_describe.html
-share/icecast/templates/alias_add.html
-share/icecast/templates/alias_del.html
-share/icecast/templates/bodytag.html
-share/icecast/templates/footer.html
-share/icecast/templates/header.html
-share/icecast/templates/info.html
-share/icecast/templates/list_directory.html
-share/icecast/templates/manual.html
-share/icecast/templates/mountlist.html
-share/icecast/templates/statistics.html
-@dirrm share/icecast/templates
-@exec ${MKDIR} %D/share/icecast/static
-@dirrm share/icecast/static
-@dirrm share/icecast
-@dirrm share/examples/icecast
-@dirrm share/doc/icecast
diff --git a/audio/icecast1/distinfo b/audio/icecast1/distinfo
deleted file mode 100644
index 31925bb8188..00000000000
--- a/audio/icecast1/distinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/06/18 11:07:36 rillig Exp $
-
-SHA1 (icecast-1.3.12.tar.gz) = bacb760390453718de536b85979ff3a9a73c7710
-RMD160 (icecast-1.3.12.tar.gz) = 7b576dbc16103c01b5393880ab51c532662334a9
-Size (icecast-1.3.12.tar.gz) = 269822 bytes
-SHA1 (patch-aa) = 169202f563e4e2812d8d532264dcdb4f9ffc8df2
-SHA1 (patch-ab) = 28dc8d9416b606aca4861df80332f9bf50458b45
-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/files/icecast.sh b/audio/icecast1/files/icecast.sh
deleted file mode 100644
index bcc80dbeb9e..00000000000
--- a/audio/icecast1/files/icecast.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: icecast.sh,v 1.1.1.1 2004/01/08 20:48:46 xtraeme Exp $
-#
-# PROVIDE: icecast
-# REQUIRE: DAEMON LOGIN network
-
-
-name="icecast"
-command="@PREFIX@/bin/${name}"
-mainconfigfile="@PKG_SYSCONFDIR@/${name}.conf"
-icecast_flags="-c ${mainconfigfile} -d @PKG_SYSCONFDIR@ -b"
-sig_stop="KILL"
-
-
-. /etc/rc.subr
-
-
-pidfile="/var/run/${name}.pid"
-required_files="${mainconfigfile}"
-
-
-load_rc_config $name
-run_rc_command "$1"
-
-
-if [ "$1" != "stop" ]; then
- echo $(check_process $command) > $pidfile
-fi
diff --git a/audio/icecast1/patches/patch-aa b/audio/icecast1/patches/patch-aa
deleted file mode 100644
index db172558f82..00000000000
--- a/audio/icecast1/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/01/08 20:48:46 xtraeme Exp $
-
---- src/definitions.h.orig Tue Nov 21 02:26:07 2000
-+++ src/definitions.h
-@@ -31,6 +31,7 @@
- # define __USE_BSD
- #endif
-
-+#ifndef __NetBSD__
- #ifndef __EXTENSIONS__
- # define __EXTENSIONS__
- #endif
-@@ -62,6 +63,7 @@
- # endif
- #endif
-
-+#endif /* __NetBSD__ */
-
-
-
diff --git a/audio/icecast1/patches/patch-ab b/audio/icecast1/patches/patch-ab
deleted file mode 100644
index 6d318e837ce..00000000000
--- a/audio/icecast1/patches/patch-ab
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/06/18 11:07:36 rillig Exp $
-
---- configure.orig 2002-04-11 00:50:20.000000000 +0200
-+++ configure
-@@ -876,16 +876,16 @@ if test "x$enable_fsstd" = "xyes"; then
- else
- ICECAST_BINDIR=${prefix}/bin
- ICECAST_SBINDIR=${prefix}/bin
-- ICECAST_ETCDIR=conf
-- ICECAST_ETCDIR_INST=${prefix}/conf
-+ ICECAST_ETCDIR=${sysconfdir}
-+ ICECAST_ETCDIR_INST=${prefix}/share/examples/icecast
- ICECAST_SHAREDIR=${prefix}
- ICECAST_LOGDIR=logs
-- ICECAST_LOGDIR_INST=${prefix}/logs
-+ ICECAST_LOGDIR_INST=${VARBASE}/log/icecast
- ICECAST_TEMPLATEDIR=templates
-- ICECAST_TEMPLATEDIR_INST=${prefix}/templates
-+ ICECAST_TEMPLATEDIR_INST=${prefix}/share/icecast/templates
- ICECAST_STATICDIR=static
-- ICECAST_STATICDIR_INST=${prefix}/static
-- ICECAST_DOCDIR=${prefix}/doc
-+ ICECAST_STATICDIR_INST=${prefix}/share/icecast/static
-+ ICECAST_DOCDIR=${prefix}/share/doc/icecast
- USE_FSSTD=no
- fi
-
-@@ -1540,7 +1540,7 @@ EOF
-
- echo "$ac_t""BSD/OS" 1>&6
- ;;
-- *BSD*)
-+ unused)
- __SOMEBSD__=yes
- cat >> confdefs.h <<\EOF
- #define __SOMEBSD__ 1
diff --git a/audio/icecast1/patches/patch-ac b/audio/icecast1/patches/patch-ac
deleted file mode 100644
index e00e2ec60cc..00000000000
--- a/audio/icecast1/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/01/11 16:59:34 kim Exp $
-
---- src/icetypes.h.orig Wed Jul 5 15:51:14 2000
-+++ src/icetypes.h Fri Oct 17 21:49:19 2003
-@@ -41,9 +41,9 @@
- typedef enum type_e {integer_e, real_e, string_e, function_e} type_t;
-
- #define BUFSIZE 8192
--#define CHUNKLEN 64
-+#define CHUNKLEN @CHUNKLEN@
- #define MAXMETADATALENGTH (16 * 256)
--#define SOURCE_BUFFSIZE 8192
-+#define SOURCE_BUFFSIZE @SOURCE_BUFFSIZE@
- #define SOURCE_READSIZE (SOURCE_BUFFSIZE - MAXMETADATALENGTH) /* Please be careful here... */
- #define MAXLISTEN 5 /* max number of listening ports */
-
diff --git a/audio/icecast1/patches/patch-ad b/audio/icecast1/patches/patch-ad
deleted file mode 100644
index e6c772a98ef..00000000000
--- a/audio/icecast1/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/04/11 05:48:34 kim Exp $
-
---- src/client.c.orig 2001-08-01 20:56:47.000000000 -0400
-+++ src/client.c 2004-04-11 01:41:01.000000000 -0400
-@@ -476,6 +476,8 @@
- return 1;
- if (strstr(val, "RMA/1.0"))
- return 1;
-+ if (strstr(val, "NSPlayer/9"))
-+ return 0;
- if (strstr(val, "NSPlayer"))
- return 1;
- return 0;
diff --git a/audio/icecast1/patches/patch-ae b/audio/icecast1/patches/patch-ae
deleted file mode 100644
index 7f5c9bd30f3..00000000000
--- a/audio/icecast1/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$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
deleted file mode 100644
index 3fd1d78d5fd..00000000000
--- a/audio/icecast1/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 18057afdd3a..00000000000
--- a/audio/icecast1/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index c0676b72d40..00000000000
--- a/audio/icecast1/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 39191b18cf6..00000000000
--- a/audio/icecast1/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index ff403cf9fff..00000000000
--- a/audio/icecast1/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index e7e41448717..00000000000
--- a/audio/icecast1/patches/patch-ak
+++ /dev/null
@@ -1,20 +0,0 @@
-$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;
diff --git a/audio/ices-mp3/DESCR b/audio/ices-mp3/DESCR
deleted file mode 100644
index cf323f964e0..00000000000
--- a/audio/ices-mp3/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-IceS is a source client for a streaming server. The purpose of this
-client is to provide an audio stream to a streaming server such that
-one or more listeners can access the stream.
diff --git a/audio/ices-mp3/Makefile b/audio/ices-mp3/Makefile
deleted file mode 100644
index abceb0c7576..00000000000
--- a/audio/ices-mp3/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2007/01/13 09:34:59 wiz Exp $
-#
-
-DISTNAME= ices-${ICES_VERSION}
-PKGNAME= ices-mp3-${ICES_VERSION}
-PKGREVISION= 5
-ICES_VERSION= 0.4
-CATEGORIES= audio
-MASTER_SITES= http://svn.xiph.org/releases/ices/
-
-MAINTAINER= kim@tac.nyc.ny.us
-HOMEPAGE= http://www.icecast.org/ices.php
-COMMENT= Source client for a streaming server
-
-USE_TOOLS+= automake
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-
-BUILD_DEFS+= ICES_USE_PERL ICES_USE_PYTHON
-ICES_USE_PERL?= NO
-ICES_USE_PYTHON?= NO
-
-CONFIGURE_ARGS+= --program-suffix=-mp3
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+= --with-docdir=${DOCDIR:Q}
-CONFIGURE_ARGS+= --with-moddir=${MODDIR:Q}
-
-PKG_SYSCONFSUBDIR= icecast
-#RCD_SCRIPTS= ${PKGBASE}
-
-DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
-EGDIR= ${PREFIX}/share/examples/${PKGBASE}
-MODDIR= ${PREFIX}/share/${PKGBASE}
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-pre-configure:
- cd ${WRKSRC} && autoreconf --force
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/src/ices ${PREFIX}/bin/${PKGBASE}
- ${INSTALL_MAN} ${WRKSRC}/doc/ices.1 ${PREFIX}/${PKGMANDIR}/man1/${PKGBASE}.1
- ${INSTALL_DATA_DIR} ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/icesmanual.html ${DOCDIR}
- for i in AUTHORS BUGS COPYING NEWS README README.playlist TODO ; \
- do \
- ${INSTALL_DATA} ${WRKSRC}/$$i ${DOCDIR}/$$i ; \
- done
- ${INSTALL_DATA_DIR} ${EGDIR}
- for i in ices.conf.dist ices.pm.dist ices.py.dist ; \
- do \
- ${INSTALL_DATA} ${WRKSRC}/conf/$$i ${EGDIR}/$$i ; \
- done
- ${INSTALL_DATA_DIR} ${MODDIR}
-
-# does not support flac-1.1.3 API
-#.include "../../audio/flac/buildlink3.mk"
-.include "../../audio/lame/buildlink3.mk"
-.include "../../audio/libshout/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.if defined(ICES_USE_PERL) && (${ICES_USE_PERL} == "YES")
-.include "../../lang/perl5/buildlink3.mk"
-CONFIGURE_ARGS+= --with-perl=${PERL5:Q}
-.endif
-.if defined(ICES_USE_PYTHON) && (${ICES_USE_PYTHON} == "YES")
-.include "../../lang/python/application.mk"
-CONFIGURE_ARGS+= --with-python=${PYTHONBIN:Q}
-.endif
-.include "../../textproc/libxml2/buildlink3.mk"
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/ices-mp3/PLIST b/audio/ices-mp3/PLIST
deleted file mode 100644
index 6d1e808f938..00000000000
--- a/audio/ices-mp3/PLIST
+++ /dev/null
@@ -1,18 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/24 18:08:13 kim Exp $
-bin/${PKGBASE}
-man/man1/${PKGBASE}.1
-share/doc/${PKGBASE}/AUTHORS
-share/doc/${PKGBASE}/BUGS
-share/doc/${PKGBASE}/COPYING
-share/doc/${PKGBASE}/NEWS
-share/doc/${PKGBASE}/README
-share/doc/${PKGBASE}/README.playlist
-share/doc/${PKGBASE}/TODO
-share/doc/${PKGBASE}/icesmanual.html
-share/examples/${PKGBASE}/ices.conf.dist
-share/examples/${PKGBASE}/ices.pm.dist
-share/examples/${PKGBASE}/ices.py.dist
-@exec ${MKDIR} %D/share/${PKGBASE}
-@dirrm share/${PKGBASE}
-@dirrm share/doc/${PKGBASE}
-@dirrm share/examples/${PKGBASE}
diff --git a/audio/ices-mp3/distinfo b/audio/ices-mp3/distinfo
deleted file mode 100644
index 2b11c36aff8..00000000000
--- a/audio/ices-mp3/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:46 agc Exp $
-
-SHA1 (ices-0.4.tar.gz) = 427f39d3ac4a45e84222c8f8a4007767a754749c
-RMD160 (ices-0.4.tar.gz) = 2a40856c8dbcef8558c7a85bf247c2c7cdf97c22
-Size (ices-0.4.tar.gz) = 372837 bytes
-SHA1 (patch-aa) = 39818857ea23f620e8d85e36a1c9225a3787c490
diff --git a/audio/ices-mp3/patches/patch-aa b/audio/ices-mp3/patches/patch-aa
deleted file mode 100644
index a3dadf434fb..00000000000
--- a/audio/ices-mp3/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/09/24 01:39:30 kim Exp $
-
---- configure.ac.orig 2004-08-28 14:54:44.000000000 -0400
-+++ configure.ac 2004-09-23 21:28:38.000000000 -0400
-@@ -367,7 +367,7 @@
- LDFLAGS="$LDFLAGS -L$with_flac/lib"
- fi
-
-- AC_CHECK_HEADER(faad.h, have_flac="maybe")
-+ AC_CHECK_HEADER(FLAC/stream_decoder.h, have_flac="maybe")
- if test "$have_flac" != "no"
- then
- AC_CHECK_LIB(FLAC, FLAC__stream_decoder_new, [
diff --git a/audio/id3/DESCR b/audio/id3/DESCR
deleted file mode 100644
index bc02df7443f..00000000000
--- a/audio/id3/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-id3 is an ID3 v1.1 tag editor. ID3 tags are traditionally put at the
-end of compressed streamed audio files to denote information about the
-audio contents. Up to thirty characters of Title, Artist, and Album
-information can be stored, as well as a 28-character comment,
-four-digit year, track number up to 255, and an enumerated genre.
diff --git a/audio/id3/Makefile b/audio/id3/Makefile
deleted file mode 100644
index 59ee7068691..00000000000
--- a/audio/id3/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2006/10/14 13:12:44 rillig Exp $
-
-DISTNAME= id3_0.12.orig
-PKGNAME= id3-0.12
-CATEGORIES= audio
-MASTER_SITES= http://frantica.lly.org/~rcw/id3/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://frantica.lly.org/~rcw/abcde/page/
-COMMENT= ID3 v1.1 tag editor
-
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR}/man1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/id3/PLIST b/audio/id3/PLIST
deleted file mode 100644
index 3d269be6597..00000000000
--- a/audio/id3/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:16:50 zuntum Exp $
-bin/id3
-man/man1/id3.1
diff --git a/audio/id3/distinfo b/audio/id3/distinfo
deleted file mode 100644
index 6c1329bc9ff..00000000000
--- a/audio/id3/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:46 agc Exp $
-
-SHA1 (id3_0.12.orig.tar.gz) = 6e74313f56214a73ef8b54edabd698444e07080f
-RMD160 (id3_0.12.orig.tar.gz) = 04bbb9077e606d4768e93a13b8f92cb9202a8f5c
-Size (id3_0.12.orig.tar.gz) = 12492 bytes
-SHA1 (patch-aa) = 94a50bdb147f9cc1df48409882ccdd4a76a43c69
-SHA1 (patch-ab) = e9343a34088e6ca9bbb0315399e9c8e604546c54
diff --git a/audio/id3/patches/patch-aa b/audio/id3/patches/patch-aa
deleted file mode 100644
index 3e012fc1e89..00000000000
--- a/audio/id3/patches/patch-aa
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/12/23 18:11:19 sketch Exp $
-
---- Makefile 2001/10/12 08:59:21 1.1
-+++ Makefile 2001/10/12 09:11:16
-@@ -3,17 +3,17 @@
-
- SHELL = /bin/sh
-
--CC = gcc
--CFLAGS = -g -O2
--LDFLAGS =
-+#CC = gcc
-+#CFLAGS = -g -O2
-+#LDFLAGS =
- LIBS =
- DEFS =
--INSTALL = /usr/bin/install -c
-+#INSTALL = /usr/bin/install
-
- # Installation directories
--prefix = ${DESTDIR}/usr
-+prefix = ${PREFIX}
- exec_prefix = ${prefix}
--mandir = ${prefix}/share/man/man1
-+mandir = ${prefix}/man/man1
- bindir = ${exec_prefix}/bin
-
- INCL =
-@@ -34,7 +34,5 @@
- rm -f *~ *.o core $(PRODUCT)
-
- install: $(PRODUCT)
-- $(INSTALL) -d -m 755 $(bindir)
-- $(INSTALL) -s -m 755 -o 0 $(PRODUCT) $(bindir)
-- $(INSTALL) -d -m 755 $(mandir)
-- $(INSTALL) -m 644 -o 0 $(PRODUCT).1 $(mandir)
-+ $(BSD_INSTALL_PROGRAM) $(PRODUCT) $(bindir)
-+ $(BSD_INSTALL_MAN) $(PRODUCT).1 $(mandir)
diff --git a/audio/id3/patches/patch-ab b/audio/id3/patches/patch-ab
deleted file mode 100644
index 326a5769a65..00000000000
--- a/audio/id3/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/12/23 18:11:19 sketch Exp $
-
---- id3.c.orig 2003-12-23 12:32:28.874414092 +0000
-+++ id3.c 2003-12-23 12:32:49.648359969 +0000
-@@ -34,7 +34,6 @@
-
- #include <stdio.h>
- #include <stdlib.h>
--#include <getopt.h>
- #include <errno.h>
- #include <unistd.h>
- #include <string.h>
diff --git a/audio/id3ed/DESCR b/audio/id3ed/DESCR
deleted file mode 100644
index 9d6e92a1d0f..00000000000
--- a/audio/id3ed/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-id3ed edits the "id3" tag for mpeg layer3 files. The mpeg3
-specification does not provide any method for storing song
-information, however the id3 tag has become a standard method for
-doing this, and most mp3 players can read the tag. It will not cause
-any errors in players that do not support it. The tag is 128 bytes
-long and is located at the end of the file.
diff --git a/audio/id3ed/Makefile b/audio/id3ed/Makefile
deleted file mode 100644
index 446df7a34f8..00000000000
--- a/audio/id3ed/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.28 2007/02/22 19:01:13 wiz Exp $
-#
-
-DISTNAME= id3ed-1.10.4
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= http://www.dakotacom.net/~donut/programs/id3ed/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.dakotacom.net/~donut/programs/id3ed.html
-COMMENT= Edit id3 description tags in mpeg3 files
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_LANGUAGES= c c++
-GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
-
-# uses rl_startup_hook
-USE_GNU_READLINE= yes
-
-.include "../../devel/readline/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/id3ed/PLIST b/audio/id3ed/PLIST
deleted file mode 100644
index dcc52254795..00000000000
--- a/audio/id3ed/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:16:51 zuntum Exp $
-bin/id3ed
-man/man1/id3ed.1
diff --git a/audio/id3ed/distinfo b/audio/id3ed/distinfo
deleted file mode 100644
index f237e73b4d5..00000000000
--- a/audio/id3ed/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 20:39:47 agc Exp $
-
-SHA1 (id3ed-1.10.4.tar.gz) = b699e645fcea2fa42658886621eb10531d24008a
-RMD160 (id3ed-1.10.4.tar.gz) = c01388bcde85c271ea1a9f1f07a2769913c40e18
-Size (id3ed-1.10.4.tar.gz) = 31610 bytes
-SHA1 (patch-aa) = b20838a13e1cae3217917d4f5f8023c4329aa979
-SHA1 (patch-ab) = cafd397b8e994eea35e7d87d504c84c79c158fc2
diff --git a/audio/id3ed/patches/patch-aa b/audio/id3ed/patches/patch-aa
deleted file mode 100644
index b940dfcd89d..00000000000
--- a/audio/id3ed/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2003/07/02 09:04:37 martin Exp $
-
---- misc.cc.orig 2003-07-02 10:55:17.000000000 +0200
-+++ misc.cc 2003-07-02 10:57:55.000000000 +0200
-@@ -8,7 +8,7 @@
- int doread(int handle,void * buf,ssize_t len, const char * name){
- ssize_t i;
- if ((i=read(handle,buf,len))!=len){
-- fprintf(stderr,"Error reading %s (%i/%i): %s\n",name,i,len,strerror(errno));
-+ fprintf(stderr,"Error reading %s (%li/%li): %s\n",name,(long)i,(long)len,strerror(errno));
- return -1;
- }
- return 0;
-@@ -16,7 +16,7 @@
- int dowrite(int handle, const void * buf, ssize_t len,const char *name,const char *name2){
- ssize_t i;
- if ((i=write(handle,buf,len))!=len){
-- fprintf(stderr,"Error writing %s %s (%i/%i): %s\n",name,name2,i,len,strerror(errno));
-+ fprintf(stderr,"Error writing %s %s (%li/%li): %s\n",name,name2,(long)i,(long)len,strerror(errno));
- return -1;
- }
- else return 0;
diff --git a/audio/id3ed/patches/patch-ab b/audio/id3ed/patches/patch-ab
deleted file mode 100644
index 3427db86f1c..00000000000
--- a/audio/id3ed/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/01/28 22:34:08 grant Exp $
-
---- Makefile.in.orig 2003-01-10 14:09:20.000000000 +1100
-+++ Makefile.in
-@@ -22,7 +22,7 @@ all: id3ed
- OBJS=id3ed.o misc.o
-
- id3ed: $(OBJS) .depend
-- $(CXX) $(CXXFLAGS) $(OBJS) -o $@ $(LIBS)
-+ $(CXX) $(CXXFLAGS) $(OBJS) -o $@ $(LDFLAGS) $(LIBS)
-
- dep depend .depend:
- $(CXX) -MM *.cc > .depend
diff --git a/audio/id3lib/DESCR b/audio/id3lib/DESCR
deleted file mode 100644
index a734d76b201..00000000000
--- a/audio/id3lib/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-id3lib is an open-source, cross-platform software development library for
-reading, writing, and manipulating ID3v1 and ID3v2 tags. It is an on-going
-project whose primary goals are full compliance with the ID3v2 standard,
-portability across several platforms, and providing a powerful and feature-rich
-API with a highly stable and efficient implementation.
diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile
deleted file mode 100644
index fd800cb54f9..00000000000
--- a/audio/id3lib/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2006/09/23 13:26:24 wiz Exp $
-#
-
-DISTNAME= id3lib-3.8.3
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=id3lib/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://id3lib.sourceforge.net/
-COMMENT= Library for manipulating ID3v1 and ID3v2 tags
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_LANGUAGES= c c++
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-
-CPPFLAGS+=-DID3_NEED_WCHAR_TEMPLATE
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/id3lib/PLIST b/audio/id3lib/PLIST
deleted file mode 100644
index 07c51392bd6..00000000000
--- a/audio/id3lib/PLIST
+++ /dev/null
@@ -1,21 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2004/09/22 08:09:16 jlam Exp $
-bin/id3convert
-bin/id3cp
-bin/id3info
-bin/id3tag
-include/id3.h
-include/id3/field.h
-include/id3/globals.h
-include/id3/id3lib_frame.h
-include/id3/id3lib_streams.h
-include/id3/id3lib_strings.h
-include/id3/misc_support.h
-include/id3/reader.h
-include/id3/readers.h
-include/id3/sized_types.h
-include/id3/tag.h
-include/id3/utils.h
-include/id3/writer.h
-include/id3/writers.h
-lib/libid3.la
-@dirrm include/id3
diff --git a/audio/id3lib/buildlink3.mk b/audio/id3lib/buildlink3.mk
deleted file mode 100644
index d503d49248f..00000000000
--- a/audio/id3lib/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:36 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-ID3LIB_BUILDLINK3_MK:= ${ID3LIB_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= id3lib
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nid3lib}
-BUILDLINK_PACKAGES+= id3lib
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}id3lib
-
-.if !empty(ID3LIB_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.id3lib+= id3lib>=3.8.3
-BUILDLINK_ABI_DEPENDS.id3lib+= id3lib>=3.8.3nb1
-BUILDLINK_PKGSRCDIR.id3lib?= ../../audio/id3lib
-.endif # ID3LIB_BUILDLINK3_MK
-
-.include "../../devel/zlib/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/id3lib/distinfo b/audio/id3lib/distinfo
deleted file mode 100644
index d0a0bd74cc2..00000000000
--- a/audio/id3lib/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.14 2007/01/20 01:04:04 rillig Exp $
-
-SHA1 (id3lib-3.8.3.tar.gz) = c92c880da41d1ec0b242745a901702ae87970838
-RMD160 (id3lib-3.8.3.tar.gz) = bfa2499ec649ed40815ad0a370c78eb1517952c4
-Size (id3lib-3.8.3.tar.gz) = 950726 bytes
-SHA1 (patch-aa) = 35e7df9577fd7fdd8657dca32207e34b580a0b57
-SHA1 (patch-af) = 0266e9220791b7b14a35dc9b7564ab75cbc6562b
-SHA1 (patch-ag) = a047fe90d83c88e0f6d0a6a0595a440ef49276e3
-SHA1 (patch-ah) = 42a04014cc839565063daa395884b757214eb911
-SHA1 (patch-ai) = c0521a6d62d17826c9b1f35f6be51e1b72c48e7c
-SHA1 (patch-aj) = cbffa394ef07e59e3036788f265b3319bbdf2c39
diff --git a/audio/id3lib/patches/patch-aa b/audio/id3lib/patches/patch-aa
deleted file mode 100644
index fc6e9eb403f..00000000000
--- a/audio/id3lib/patches/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/09/23 13:26:24 wiz Exp $
-
---- include/id3/id3lib_strings.h.orig 2003-03-02 00:23:00.000000000 +0000
-+++ include/id3/id3lib_strings.h
-@@ -100,10 +100,10 @@ namespace std
-
- static char_type
- to_char_type(const int_type& __c)
-- { return char_type(); }
-+ { return char_type(__c); }
-
- static int_type
-- to_int_type(const char_type& __c) { return int_type(); }
-+ to_int_type(const char_type& __c) { return int_type(__c); }
-
- static bool
- eq_int_type(const int_type& __c1, const int_type& __c2)
-@@ -117,7 +117,8 @@ namespace std
- { return eq_int_type(__c, eof()) ? int_type(0) : __c; }
- };
-
--#ifndef _GLIBCPP_USE_WCHAR_T
-+/* gcc-3.4 defines _GLIBCXX_USE_WCHAR_T instead of _GLIBCPP_USE_WCHAR_T */
-+#if !defined(_GLIBCPP_USE_WCHAR_T) && !defined(_GLIBCXX_USE_WCHAR_T)
- #if (defined(ID3_NEED_WCHAR_TEMPLATE))
- template<>
- struct char_traits<wchar_t>
diff --git a/audio/id3lib/patches/patch-af b/audio/id3lib/patches/patch-af
deleted file mode 100644
index fe9b6cdfeba..00000000000
--- a/audio/id3lib/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 2002/01/08 17:49:13 drochner Exp $
-
---- include/id3/reader.h.orig Mon Jul 30 20:22:53 2001
-+++ include/id3/reader.h Tue Jan 8 18:27:06 2002
-@@ -33,7 +33,7 @@
- class ID3_CPP_EXPORT ID3_Reader
- {
- public:
-- typedef uint32 size_type;
-+ typedef size_t size_type;
- typedef uint8 char_type;
- typedef uint32 pos_type;
- typedef int32 off_type;
diff --git a/audio/id3lib/patches/patch-ag b/audio/id3lib/patches/patch-ag
deleted file mode 100644
index 541f12bb611..00000000000
--- a/audio/id3lib/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2002/01/08 17:49:13 drochner Exp $
-
---- include/id3/writer.h.orig Mon Jul 30 20:22:53 2001
-+++ include/id3/writer.h Tue Jan 8 18:28:35 2002
-@@ -33,7 +33,7 @@
- class ID3_CPP_EXPORT ID3_Writer
- {
- public:
-- typedef uint32 size_type;
-+ typedef size_t size_type;
- typedef uint8 char_type;
- typedef uint32 pos_type;
- typedef int32 off_type;
diff --git a/audio/id3lib/patches/patch-ah b/audio/id3lib/patches/patch-ah
deleted file mode 100644
index dcfa9a4a03d..00000000000
--- a/audio/id3lib/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2006/09/13 12:06:28 ben Exp $
-
---- ChangeLog.orig 2003-03-01 16:23:00.000000000 -0800
-+++ ChangeLog
-@@ -1,3 +1,8 @@
-+2006-02-17 Jerome Couderc
-+
-+ * Patch from Spoon to fix UTF-16 writing bug
-+ http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979
-+
- 2003-03-02 Sunday 17:38 Thijmen Klok <thijmen@id3lib.org>
-
- * THANKS (1.20): added more people
diff --git a/audio/id3lib/patches/patch-ai b/audio/id3lib/patches/patch-ai
deleted file mode 100644
index a229676d097..00000000000
--- a/audio/id3lib/patches/patch-ai
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2006/09/13 12:06:28 ben Exp $
-
---- src/io_helpers.cpp.orig 2003-03-01 16:23:00.000000000 -0800
-+++ src/io_helpers.cpp
-@@ -363,11 +363,22 @@ size_t io::writeUnicodeText(ID3_Writer&
- // Write the BOM: 0xFEFF
- unicode_t BOM = 0xFEFF;
- writer.writeChars((const unsigned char*) &BOM, 2);
-+ // Patch from Spoon : 2004-08-25 14:17
-+ // http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979
-+ // Wrong code
-+ //for (size_t i = 0; i < size; i += 2)
-+ //{
-+ // unicode_t ch = (data[i] << 8) | data[i+1];
-+ // writer.writeChars((const unsigned char*) &ch, 2);
-+ //}
-+ // Right code
-+ unsigned char *pdata = (unsigned char *) data.c_str();
- for (size_t i = 0; i < size; i += 2)
- {
-- unicode_t ch = (data[i] << 8) | data[i+1];
-+ unicode_t ch = (pdata[i] << 8) | pdata[i+1];
- writer.writeChars((const unsigned char*) &ch, 2);
- }
-+ // End patch
- }
- return writer.getCur() - beg;
- }
diff --git a/audio/id3lib/patches/patch-aj b/audio/id3lib/patches/patch-aj
deleted file mode 100644
index 3cc8fb1a259..00000000000
--- a/audio/id3lib/patches/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2007/01/20 01:04:04 rillig Exp $
-
-char and unsigned char are different data types.
-
---- src/tag_file.cpp.orig 2003-03-02 01:23:00.000000000 +0100
-+++ src/tag_file.cpp 2007-01-10 21:57:03.513247016 +0100
-@@ -282,7 +282,7 @@ size_t RenderV2ToFile(const ID3_TagImpl&
-
- tmpOut.write(tagData, tagSize);
- file.seekg(tag.GetPrependedBytes(), ios::beg);
-- uchar tmpBuffer[BUFSIZ];
-+ char tmpBuffer[BUFSIZ];
- while (file)
- {
- file.read(tmpBuffer, BUFSIZ);
diff --git a/audio/id3v2/DESCR b/audio/id3v2/DESCR
deleted file mode 100644
index 275c9c352b0..00000000000
--- a/audio/id3v2/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-This command-line utility will allow you to modify MP3's id3v2
-tags. They are more powerful than the default id3v1; they can store
-information about what band recorded the song, the song name, etc. and
-without string length limits.
diff --git a/audio/id3v2/Makefile b/audio/id3v2/Makefile
deleted file mode 100644
index fa660ad6c37..00000000000
--- a/audio/id3v2/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2006/10/14 13:15:18 rillig Exp $
-
-DISTNAME= id3v2-0.1.11
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=id3v2/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://id3v2.sourceforge.net/
-COMMENT= Command line editor for id3v2 tags
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_LANGUAGES= c++
-USE_TOOLS+= gmake
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/id3v2 ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/id3v2.1 ${PREFIX}/${PKGMANDIR}/man1
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/id3v2
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/id3v2/README
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../audio/id3lib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/id3v2/PLIST b/audio/id3v2/PLIST
deleted file mode 100644
index 2a71f623ed7..00000000000
--- a/audio/id3v2/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/05/04 19:03:25 jmmv Exp $
-bin/id3v2
-man/man1/id3v2.1
-share/doc/id3v2/README
-@dirrm share/doc/id3v2
diff --git a/audio/id3v2/distinfo b/audio/id3v2/distinfo
deleted file mode 100644
index 00a5a01b60e..00000000000
--- a/audio/id3v2/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.8 2006/10/01 12:23:39 tonio Exp $
-
-SHA1 (id3v2-0.1.11.tar.gz) = ca825d851ca0c6a5783af107dc6baa7aa93f0bad
-RMD160 (id3v2-0.1.11.tar.gz) = 433900ec5ccc072e5daeaf3fc25902d87bc95a01
-Size (id3v2-0.1.11.tar.gz) = 52427 bytes
-SHA1 (patch-aa) = 24369db9115ea921e5ebaa4befa66a71ebb4da19
diff --git a/audio/id3v2/patches/patch-aa b/audio/id3v2/patches/patch-aa
deleted file mode 100644
index 643bddf0d03..00000000000
--- a/audio/id3v2/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2006/10/01 12:23:39 tonio Exp $
-
---- Makefile.orig 2004-05-04 20:33:53.000000000 +0200
-+++ Makefile
-@@ -2,12 +2,12 @@ all: id3v2
-
- VERSION=0.1.11
-
--PREFIX= /usr/local
-+PREFIX?= /usr/local
- CXXFLAGS+= -I${PREFIX}/include/ -DVERSION="\"${VERSION}\"" #-DSORT_RUNTIME
- LDFLAGS+= -L${PREFIX}/lib/
-
- id3v2: convert.o list.o id3v2.o genre.o
-- c++ ${LDFLAGS} -pedantic -Wall -lz -lid3 -g -o $@ $^
-+ c++ ${LDFLAGS} -pedantic -Wall -lz -lid3 -liconv -g -o $@ $^
-
- create_map: create_map.o
- c++ -Wall -g -o $@ $^
diff --git a/audio/ifp-line/DESCR b/audio/ifp-line/DESCR
deleted file mode 100644
index 4dd65e77202..00000000000
--- a/audio/ifp-line/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-ifp-line is part of the ifp-driver project, which aims to be an open-source
-driver for the iRiver iFP line of MP3 players.
-
-It uses the native manager firmware; it does not use nor support the optional
-UMS firmware.
diff --git a/audio/ifp-line/Makefile b/audio/ifp-line/Makefile
deleted file mode 100644
index 4d862dfd033..00000000000
--- a/audio/ifp-line/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2005/09/22 04:08:31 minskim Exp $
-
-DISTNAME= ifp-line-0.2.4.4
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ifp-driver/}
-
-MAINTAINER= sekiya@NetBSD.org
-HOMEPAGE= http://ifp-driver.sourceforge.net/
-COMMENT= Command-line interface to iRiver MP3 players
-
-.include "../../devel/libusb/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/ifp-line/PLIST b/audio/ifp-line/PLIST
deleted file mode 100644
index 317015c916e..00000000000
--- a/audio/ifp-line/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/09/22 04:08:31 minskim Exp $
-bin/ifp
-man/man1/ifp.1
diff --git a/audio/ifp-line/distinfo b/audio/ifp-line/distinfo
deleted file mode 100644
index fb18b34ac75..00000000000
--- a/audio/ifp-line/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/05/24 13:54:30 rillig Exp $
-
-SHA1 (ifp-line-0.2.4.4.tar.gz) = f801a7a8179ab5430631f1027c25b449998cbc84
-RMD160 (ifp-line-0.2.4.4.tar.gz) = d67b5683b075f7e121585de21d9ebb475fcc3bd6
-Size (ifp-line-0.2.4.4.tar.gz) = 23879 bytes
-SHA1 (patch-aa) = 0524d1a5834f6b0320173c5eafff258e78ec1220
diff --git a/audio/ifp-line/patches/patch-aa b/audio/ifp-line/patches/patch-aa
deleted file mode 100644
index df415bd05bc..00000000000
--- a/audio/ifp-line/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2005/05/24 13:54:30 rillig Exp $
-
---- Makefile.orig 2004-07-13 20:28:31.000000000 +0900
-+++ Makefile 2004-07-13 20:29:06.000000000 +0900
-@@ -2,7 +2,7 @@
-
--CFLAGS = `libusb-config --cflags` -Wall -g
-+CFLAGS = `libusb-config --cflags` -Wall -O2
- LDFLAGS = `libusb-config --libs`
--PREFIX ?= /usr/local
-+PREFIX ?= $(LOCALBASE)
- MANDIR ?= ${PREFIX}/man/man1
--INSTALL ?= /usr/bin/install
-+INSTALL ?= install
-
diff --git a/audio/jack/DESCR b/audio/jack/DESCR
deleted file mode 100644
index f3b11443581..00000000000
--- a/audio/jack/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-JACK is a low-latency audio server, written for POSIX conformant
-operating systems such as GNU/Linux and Apple's OS X. It can connect a
-number of different applications to an audio device, as well as allowing
-them to share audio between themselves. Its clients can run in their own
-processes (ie. as normal applications), or can they can run within the
-JACK server (ie. as a "plugin").
diff --git a/audio/jack/Makefile b/audio/jack/Makefile
deleted file mode 100644
index 7f48e2acb49..00000000000
--- a/audio/jack/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2007/03/18 21:19:09 rillig Exp $
-#
-
-DISTNAME= jack-audio-connection-kit-0.100.0
-PKGNAME= jack-0.100.0
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=jackit/}
-
-MAINTAINER= chriswareham@chriswareham.demon.co.uk
-HOMEPAGE= http://jackaudio.org/
-COMMENT= Low-latency audio server
-
-USE_LIBTOOL= yes
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= perl pkg-config
-GNU_CONFIGURE= yes
-CONFIGURE_ENV+= ac_cv_header_readline_chardefs_h=yes
-
-PKGCONFIG_OVERRIDE+= jack.pc.in
-
-LIBS+= ${LIBOSSAUDIO}
-
-.include "../../devel/libgetopt/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/jack/PLIST b/audio/jack/PLIST
deleted file mode 100644
index 07d81596a39..00000000000
--- a/audio/jack/PLIST
+++ /dev/null
@@ -1,33 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/04/19 15:25:09 joerg Exp $
-bin/jack_bufsize
-bin/jack_connect
-bin/jack_disconnect
-bin/jack_freewheel
-bin/jack_impulse_grabber
-bin/jack_load
-bin/jack_lsp
-bin/jack_metro
-bin/jack_monitor_client
-bin/jack_showtime
-bin/jack_simple_client
-bin/jack_transport
-bin/jack_unload
-bin/jackd
-include/jack/intclient.h
-include/jack/jack.h
-include/jack/ringbuffer.h
-include/jack/statistics.h
-include/jack/thread.h
-include/jack/timestamps.h
-include/jack/transport.h
-include/jack/types.h
-lib/jack/inprocess.la
-lib/jack/intime.la
-lib/jack/jack_dummy.la
-lib/jack/jack_oss.la
-lib/libjack.la
-lib/pkgconfig/jack.pc
-man/man1/jackd.1
-man/man1/jackstart.1
-@dirrm lib/jack
-@dirrm include/jack
diff --git a/audio/jack/buildlink3.mk b/audio/jack/buildlink3.mk
deleted file mode 100644
index 025cac90a2d..00000000000
--- a/audio/jack/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:10:36 jlam Exp $
-#
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-JACK_BUILDLINK3_MK:= ${JACK_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= jack
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njack}
-BUILDLINK_PACKAGES+= jack
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}jack
-
-.if !empty(JACK_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.jack= jack>=0.100.0
-BUILDLINK_PKGSRCDIR.jack?= ../../audio/jack
-.endif # JACK_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/jack/distinfo b/audio/jack/distinfo
deleted file mode 100644
index 34de9b3d04f..00000000000
--- a/audio/jack/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/06/23 14:44:03 jlam Exp $
-
-SHA1 (jack-audio-connection-kit-0.100.0.tar.gz) = 431ab7647f694d57bc697d150742d70cccdcd43b
-RMD160 (jack-audio-connection-kit-0.100.0.tar.gz) = 31548d58e545cb117428ca72e256a395363ff9b6
-Size (jack-audio-connection-kit-0.100.0.tar.gz) = 682799 bytes
-SHA1 (patch-aa) = 537836a22c61534595dacd2afe69488b4b70e6b1
-SHA1 (patch-ab) = 288aed771bad16d068ad7f78435e09aca7e10535
diff --git a/audio/jack/patches/patch-aa b/audio/jack/patches/patch-aa
deleted file mode 100644
index 4b4ab40c8a9..00000000000
--- a/audio/jack/patches/patch-aa
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/04/19 15:25:09 joerg Exp $
-
---- configure.orig 2006-04-19 15:06:18.000000000 +0000
-+++ configure
-@@ -21428,13 +21428,13 @@ if test $ac_cv_func_pthread_create = yes
- :
- else
-
--echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -21497,7 +21497,7 @@ if test $ac_cv_lib_pthread_pthread_creat
- #define HAVE_LIBPTHREAD 1
- _ACEOF
-
-- LIBS="-lpthread $LIBS"
-+ LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
-
- else
- { { echo "$as_me:$LINENO: error: *** JACK requires POSIX threads support" >&5
-@@ -22981,13 +22981,13 @@ if test "${with_barrier+set}" = set; the
- USE_BARRIER=$withval
- fi;
- if test "x$USE_BARRIER" = "xyes"; then
-- echo "$as_me:$LINENO: checking for pthread_barrier_init in -lpthread" >&5
--echo $ECHO_N "checking for pthread_barrier_init in -lpthread... $ECHO_C" >&6
-+ echo "$as_me:$LINENO: checking for pthread_barrier_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_barrier_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_pthread_barrier_init+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
diff --git a/audio/jack/patches/patch-ab b/audio/jack/patches/patch-ab
deleted file mode 100644
index 935638797ef..00000000000
--- a/audio/jack/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/06/23 14:44:04 jlam Exp $
-
---- example-clients/transport.c.orig 2005-06-02 14:31:18.000000000 -0400
-+++ example-clients/transport.c
-@@ -29,6 +29,10 @@
- #include <jack/jack.h>
- #include <jack/transport.h>
-
-+#ifndef whitespace
-+#define whitespace(c) (((c) == ' ') || ((c) == '\t'))
-+#endif
-+
- char *package; /* program name */
- int done = 0;
- jack_client_t *client;
diff --git a/audio/juke/DESCR b/audio/juke/DESCR
deleted file mode 100644
index b9acb272fc5..00000000000
--- a/audio/juke/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Juke is a simple ncurses based jukebox program for Unix computers.
-It uses command line based players to play different kinds of music
-formats.
diff --git a/audio/juke/MESSAGE b/audio/juke/MESSAGE
deleted file mode 100644
index c36927d6030..00000000000
--- a/audio/juke/MESSAGE
+++ /dev/null
@@ -1,21 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2003/03/06 22:30:57 salo Exp $
-
-You may wish to install at least some players from pkgsrc to use with juke
-(if you don't have them installed already). You can try the following
-packages:
-
- audio/amp another mp3 player
- audio/flac free lossless audio codec
- audio/mad High-quality MPEG audio decoder
- audio/mikmod MOD player for UNI IT XM S3M MOD MTM STM DSM MED FAR
- ULT 669 files
- audio/mpg123 Command-line player for mpeg layer 1, 2 and 3 audio
- audio/sidplay tools for playing sidtunes
- audio/sox SOund eXchange - universal sound sample translator
- audio/vorbis-tools Ogg Vorbis encoder and player
- audio/xmp Player for many different Amiga and PC module formats
-
-Preferences can be set in ~/.juke.conf for each user, and for all users in
-${PKG_SYSCONFDIR}/juke.conf system-wide.
-===========================================================================
diff --git a/audio/juke/Makefile b/audio/juke/Makefile
deleted file mode 100644
index 9e12cc56dc8..00000000000
--- a/audio/juke/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2006/01/04 17:31:28 joerg Exp $
-#
-
-DISTNAME= juke-0.7
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= http://www.moll.no/oyvind/distfiles/
-
-MAINTAINER= mob@bicekru.org
-#HOMEPAGE= http://johan.nocrew.org/nav10/unix/juke/
-COMMENT= Simple ncurses based jukebox
-
-GNU_CONFIGURE= YES
-
-# halfdelay()
-INCOMPAT_CURSES= NetBSD-1.[45]*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-L]-*
-
-EGDIR= ${PREFIX}/share/examples/juke
-
-CONF_FILES= ${EGDIR}/juke.conf.default ${PKG_SYSCONFDIR}/juke.conf
-
-SUBST_CLASSES+= paths
-SUBST_FILES.paths= doc/juke.1 MANUAL src/conf.c
-SUBST_STAGE.paths= post-patch
-SUBST_SED.paths= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},'
-
-post-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/juke
- ${INSTALL_DATA} ${WRKSRC}/juke.conf ${EGDIR}/juke.conf.default
- ${INSTALL_DATA} ${WRKSRC}/MANUAL ${PREFIX}/share/doc/juke/
-
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/juke/PLIST b/audio/juke/PLIST
deleted file mode 100644
index 6f274cc1f37..00000000000
--- a/audio/juke/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/03/06 22:30:57 salo Exp $
-bin/juke
-man/man1/juke.1
-share/doc/juke/MANUAL
-share/examples/juke/juke.conf.default
-@dirrm share/examples/juke
-@dirrm share/doc/juke
diff --git a/audio/juke/distinfo b/audio/juke/distinfo
deleted file mode 100644
index d222cd7cc69..00000000000
--- a/audio/juke/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.4 2007/03/18 21:24:00 rillig Exp $
-
-SHA1 (juke-0.7.tar.gz) = 04f5e2265743e2ea01a43ea71531845f97c095c3
-RMD160 (juke-0.7.tar.gz) = c3a61c32cf1b340723e097620b8f95670a27b65f
-Size (juke-0.7.tar.gz) = 64103 bytes
-SHA1 (patch-aa) = e835b1fe8f00d8c5581a87d55407b9979bb73710
-SHA1 (patch-ab) = e4a089f7307e6a029b7e0c6b5b862326e160f6d5
-SHA1 (patch-ac) = f1c7233cd88ebdbc8df1a5ec5955b6506fd73634
-SHA1 (patch-ad) = 3080321b954c2fa1ae83c6e945214c62f0f34e72
-SHA1 (patch-ae) = fe4a70293f762a17503c5782163181e873b52186
-SHA1 (patch-af) = ec5e9602ffcef4b8e01c00a260b65612e1d9f89a
diff --git a/audio/juke/patches/patch-aa b/audio/juke/patches/patch-aa
deleted file mode 100644
index 2cfe80301cc..00000000000
--- a/audio/juke/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/03/06 22:30:57 salo Exp $
-
---- src/conf.c.orig 2000-03-06 21:43:13.000000000 +0100
-+++ src/conf.c 2003-02-26 17:36:08.000000000 +0100
-@@ -207,11 +207,11 @@
- return;
- }
- }
-- cfg->file_len = load_file ("/etc/juke.conf", (void **)&cfg->file);
-+ cfg->file_len = load_file ("@PKG_SYSCONFDIR@/juke.conf", (void **)&cfg->file);
- if (cfg->file_len != ERROR) {
- evaluate (cfg);
- if (! cfg->formats) {
-- fprintf (stderr, "error: No formats in /etc/juke.conf\n");
-+ fprintf (stderr, "error: No formats in @PKG_SYSCONFDIR@/juke.conf\n");
- exit (ERROR);
- }
- build_arg_lists (cfg);
diff --git a/audio/juke/patches/patch-ab b/audio/juke/patches/patch-ab
deleted file mode 100644
index a46abb444a9..00000000000
--- a/audio/juke/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/03/06 22:30:57 salo Exp $
-
---- doc/juke.1.orig 2003-02-26 17:37:02.000000000 +0100
-+++ doc/juke.1 2003-02-26 17:37:20.000000000 +0100
-@@ -34,7 +34,7 @@
- give the user the possibily of choosing audio files and queue them
- for playback. Juke will play mp3, mod, wav and other formats.
- .SH FILES
--/etc/juke.conf, ~/.juke.conf
-+@PKG_SYSCONFDIR@/juke.conf, ~/.juke.conf
- .SH SEE ALSO
- .BR mpg123 (1),
- .BR play (1),
diff --git a/audio/juke/patches/patch-ac b/audio/juke/patches/patch-ac
deleted file mode 100644
index 5e0a484fa3d..00000000000
--- a/audio/juke/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/03/06 22:30:57 salo Exp $
-
---- MANUAL.orig 2000-09-27 09:06:52.000000000 +0200
-+++ MANUAL 2003-02-26 17:38:28.000000000 +0100
-@@ -22,8 +22,8 @@
-
- I hope that the format is kind of self explaining.
-
--The configuration file can be saved as /etc/juke.conf or
--~/.juke.conf. The later is used if both files exists.
-+The configuration file can be saved as @PKG_SYSCONFDIR@/juke.conf
-+or ~/.juke.conf. The later is used if both files exists.
-
- 3 Usage
-
diff --git a/audio/juke/patches/patch-ad b/audio/juke/patches/patch-ad
deleted file mode 100644
index 61ce7088f34..00000000000
--- a/audio/juke/patches/patch-ad
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/01/28 11:15:35 agc Exp $
-
---- configure.in 2004/01/28 11:10:31 1.1
-+++ configure.in 2004/01/28 11:11:22
-@@ -4,12 +4,12 @@
- dnl Check system type
- AC_CANONICAL_HOST
- AC_CANONICAL_TARGET
--case "$target" in
-- *-*-netbsd*)
-- CPPFLAGS="${CPPFLAGS} -I/usr/pkg/include";
-- LDFLAGS="${LDFLAGS} -L/usr/pkg/lib -rpath/usr/pkg/lib";
-- ;;
--esac
-+dnl case "$target" in
-+dnl *-*-netbsd*)
-+dnl CPPFLAGS="${CPPFLAGS} -I/usr/pkg/include";
-+dnl LDFLAGS="${LDFLAGS} -L/usr/pkg/lib -rpath/usr/pkg/lib";
-+dnl ;;
-+dnl esac
-
- dnl Set CFLAGS
- CFLAGS="$CFLAGS -Wall -O2 -pipe -fomit-frame-pointer"
diff --git a/audio/juke/patches/patch-ae b/audio/juke/patches/patch-ae
deleted file mode 100644
index 07b7e752df4..00000000000
--- a/audio/juke/patches/patch-ae
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/01/28 11:15:35 agc Exp $
-
---- configure 2004/01/28 11:10:31 1.1
-+++ configure 2004/01/28 11:10:56
-@@ -586,12 +586,12 @@
- target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- echo "$ac_t""$target" 1>&6
-
--case "$target" in
-- *-*-netbsd*)
-- CPPFLAGS="${CPPFLAGS} -I/usr/pkg/include";
-- LDFLAGS="${LDFLAGS} -L/usr/pkg/lib -rpath/usr/pkg/lib";
-- ;;
--esac
-+#case "$target" in
-+# *-*-netbsd*)
-+# CPPFLAGS="${CPPFLAGS} -I/usr/pkg/include";
-+# LDFLAGS="${LDFLAGS} -L/usr/pkg/lib -rpath/usr/pkg/lib";
-+# ;;
-+#esac
-
- CFLAGS="$CFLAGS -Wall -O2 -pipe -fomit-frame-pointer"
-
diff --git a/audio/juke/patches/patch-af b/audio/juke/patches/patch-af
deleted file mode 100644
index 5861ddb5c2c..00000000000
--- a/audio/juke/patches/patch-af
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-af,v 1.1 2007/03/18 21:24:00 rillig Exp $
-
-Unfortunately, "case 1 ... 255" is not included in ISO C99, though it
-would be very useful in some cases.
-
---- src/tui.c.orig 2001-02-11 20:28:53.000000000 +0100
-+++ src/tui.c 2007-03-18 22:21:46.000000000 +0100
-@@ -688,8 +688,8 @@ static void tui_player_control (struct T
- player_kill (p);
-
- if (!p->paused) {
-- switch (player_status (p)) {
-- case 0:
-+ int status = player_status(p);
-+ if (status == 0) {
- if (tui->queue->items && p->pid) {
- queue_skip (tui->queue, tui->dinfo);
- tui->disp[DM_QUEUE].items = tui->queue->items;
-@@ -699,7 +699,7 @@ static void tui_player_control (struct T
- if (!tui->queue->items)
- p->pid = 0;
- }
-- case 1 ... 255:
-+ } else if (1 <= status && status <= 255) {
- if (tui->queue->items) {
- item = queue_get_item (tui->queue, 0);
- p->pid = player_play (tui->cfg, tui->dinfo, item);
diff --git a/audio/kid3/DESCR b/audio/kid3/DESCR
deleted file mode 100644
index a423f93b867..00000000000
--- a/audio/kid3/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-With Kid3 you can:
-
- * Edit ID3v1.1 tags, edit all ID3v2.3 frames
- * Convert between ID3v1.1 and ID3v2.3 tags
- * Edit Ogg/Vorbis and FLAC tags
- * Edit tags of multiple files, e.g. the artist, album, year and
- genre of all files of an album typically have the same values and
- can be set together.
- * Generate tags from filenames and filenames from tags
- * Rename and create directories from tags
- * Generate playlist files
- * Automatically convert upper and lower case and replace strings
- * Import from freedb.org, MusicBrainz and other sources of album data
diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile
deleted file mode 100644
index 21073fe3697..00000000000
--- a/audio/kid3/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2007/02/22 19:30:03 wiz Exp $
-#
-
-DISTNAME= kid3-0.8.1
-CATEGORIES= kde audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kid3/}
-
-MAINTAINER= shattered@users.sourceforge.net
-HOMEPAGE= http://kid3.sourceforge.net/
-COMMENT= KDE ID3 tagger
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_LANGUAGES= c c++
-
-CHECK_PORTABILITY_SKIP+= make_qtonly.sh
-
-BUILDLINK_DEPMETHOD.libXt?= build
-
-.include "../../meta-pkgs/kde3/kde3.mk"
-.include "../../audio/flac/buildlink3.mk"
-.include "../../audio/id3lib/buildlink3.mk"
-.include "../../audio/libtunepimp/buildlink3.mk"
-.include "../../audio/taglib/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/kid3/PLIST b/audio/kid3/PLIST
deleted file mode 100644
index e1561948374..00000000000
--- a/audio/kid3/PLIST
+++ /dev/null
@@ -1,29 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2007/01/26 03:53:56 markd Exp $
-bin/kid3
-share/applications/kde/kid3.desktop
-share/doc/kde/HTML/de/kid3/common
-share/doc/kde/HTML/de/kid3/index.cache.bz2
-share/doc/kde/HTML/de/kid3/index.docbook
-share/doc/kde/HTML/en/kid3/common
-share/doc/kde/HTML/en/kid3/index.cache.bz2
-share/doc/kde/HTML/en/kid3/index.docbook
-share/icons/hicolor/16x16/apps/kid3.png
-share/icons/hicolor/32x32/apps/kid3.png
-share/icons/hicolor/48x48/apps/kid3.png
-share/icons/hicolor/scalable/apps/kid3.svgz
-share/kde/apps/kid3/kid3ui.rc
-share/locale/de/LC_MESSAGES/kid3.mo
-share/locale/es/LC_MESSAGES/kid3.mo
-share/locale/ru/LC_MESSAGES/kid3.mo
-@dirrm share/kde/apps/kid3
-@comment in kde: @dirrm share/kde/apps
-@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
-@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
-@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
-@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
-@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
-@dirrm share/doc/kde/HTML/en/kid3
-@comment in kde: @dirrm share/doc/kde/HTML/en
-@dirrm share/doc/kde/HTML/de/kid3
-@comment in kde: @dirrm share/doc/kde/HTML/de
-@comment in kde: @dirrm share/applications/kde
diff --git a/audio/kid3/distinfo b/audio/kid3/distinfo
deleted file mode 100644
index 7643971c59d..00000000000
--- a/audio/kid3/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.4 2007/02/07 07:54:45 wiz Exp $
-
-SHA1 (kid3-0.8.1.tar.gz) = 17d89087c3a21a2963fdd39600d5dac50922bb80
-RMD160 (kid3-0.8.1.tar.gz) = 6054aa27b2df3aba7c4f5302c1954241710aaa2b
-Size (kid3-0.8.1.tar.gz) = 871390 bytes
-SHA1 (patch-ab) = 75955211d667793420a481cfa269dec29bd49221
-SHA1 (patch-ac) = 9db1beeb39a5e08f682a0d16e5d1a9754877419e
diff --git a/audio/kid3/patches/patch-ab b/audio/kid3/patches/patch-ab
deleted file mode 100644
index 453478bc230..00000000000
--- a/audio/kid3/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/08/22 14:32:11 joerg Exp $
-
---- configure.orig 2006-08-22 16:07:31.000000000 +0000
-+++ configure
-@@ -31804,7 +31804,7 @@ if test "${ac_cv_lib_tunepimp_tp_SetPUID
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ltunepimp $LIBS"
-+LIBS="-ltunepimp $PTHREAD_LDFLAGS $PTHREAD_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -31874,7 +31874,7 @@ if test "${ac_cv_lib_tunepimp_tp_SetFile
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ltunepimp $LIBS"
-+LIBS="-ltunepimp $PTHREAD_LDFLAGS $PTHREAD_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
diff --git a/audio/kid3/patches/patch-ac b/audio/kid3/patches/patch-ac
deleted file mode 100644
index f61ae78d1c1..00000000000
--- a/audio/kid3/patches/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/02/07 07:54:45 wiz Exp $
-
---- kid3/oggfile.cpp.orig 2006-11-04 22:14:53.000000000 +0000
-+++ kid3/oggfile.cpp
-@@ -18,6 +18,9 @@
- #if QT_VERSION >= 0x040000
- #include <Q3CString>
- #endif
-+#ifdef __NetBSD__
-+#include <sys/param.h>
-+#endif
- #include <sys/stat.h>
- #ifdef WIN32
- #include <sys/utime.h>
-@@ -607,7 +610,7 @@ bool OggFile::FileInfo::read(const char*
- bitrate = vi->bitrate_lower;
- }
- }
--#ifdef WIN32
-+#if defined(WIN32) || (defined(__NetBSD__) && __NetBSD_Version__ < 299000000)
- duration = (long)::ov_time_total(&vf, -1);
- #else
- duration = ::lrint(::ov_time_total(&vf, -1));
diff --git a/audio/kmp/DESCR b/audio/kmp/DESCR
deleted file mode 100644
index e8730fb547c..00000000000
--- a/audio/kmp/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-KMP is an Music Player Daemon client that uses the QT GUI toolkit so
-it will comfortably fit in with your KDE desktop, although only QT is
-required. MPD is a daemon that runs in the background and accepts
-connections from clients which can then tell MPD what to do. KMP aims
-to be a full featured and easy-to-use client. KMP will allow you to
-browse the server's collection, add songs to the playlist, change the
-volume, etc.
diff --git a/audio/kmp/Makefile b/audio/kmp/Makefile
deleted file mode 100644
index 4d6414acda6..00000000000
--- a/audio/kmp/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2006/08/06 10:24:44 wiz Exp $
-
-DISTNAME= kmp-0.01
-PKGREVISION= 4
-CATEGORIES= audio
-MASTER_SITES= http://mercury.chem.pitt.edu/~shank/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkg@burningsoda.com
-#HOMEPAGE= http://www.threadbox.net/index.php/code/kmp/
-COMMENT= Qt client for the Music Player Daemon
-
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS+= ${PREFIX}
-
-.include "../../x11/qt3-libs/buildlink3.mk"
-.include "../../x11/qt3-tools/buildlink3.mk"
-# XXX Please verify whether qt3-tools is really needed at run-time.
-# If it is, then remove this comment. If it is not, then remove
-# this comment and the line below, and bump PKGREVISION.
-BUILDLINK_DEPMETHOD.qt3-tools= full
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/kmp/PLIST b/audio/kmp/PLIST
deleted file mode 100644
index 93520d5d6d8..00000000000
--- a/audio/kmp/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/05/02 04:30:09 grant Exp $
-bin/kmp
diff --git a/audio/kmp/distinfo b/audio/kmp/distinfo
deleted file mode 100644
index ba5a51a2f5e..00000000000
--- a/audio/kmp/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/01/05 14:24:38 joerg Exp $
-
-SHA1 (kmp-0.01.tar.bz2) = 7da2b6b71b9c41ca7429479c683cbbfc62d980c1
-RMD160 (kmp-0.01.tar.bz2) = ba880f7483dcb0f4772a7f41cd79ef1309fd5e58
-Size (kmp-0.01.tar.bz2) = 486474 bytes
-SHA1 (patch-aa) = 8ca65b5df3b68b18773ca0b9c34b3e5cde21bdd6
-SHA1 (patch-ab) = 31f7fab9191384b2f16eb87f854fed63f3244f72
diff --git a/audio/kmp/patches/patch-aa b/audio/kmp/patches/patch-aa
deleted file mode 100644
index 4478ca734fe..00000000000
--- a/audio/kmp/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/05/02 04:30:09 grant Exp $
-
---- configure.orig Thu Jan 1 03:53:34 2004
-+++ configure
-@@ -1,5 +1,5 @@
- #!/bin/sh
--qmake kmp.pro
-+$1/qt3/bin/qmake kmp.pro
- echo "install:
-- install --owner=root --group=root --mode=755 kmp /usr/local/bin" >> Makefile
-+ install kmp $1/bin" >> Makefile
- echo "Configured! Now run 'make'"
diff --git a/audio/kmp/patches/patch-ab b/audio/kmp/patches/patch-ab
deleted file mode 100644
index 54295fca999..00000000000
--- a/audio/kmp/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/01/05 14:24:38 joerg Exp $
-
---- linkedlist.h.orig 2006-01-05 14:01:20.000000000 +0000
-+++ linkedlist.h
-@@ -121,7 +121,7 @@ template <class ItemType>
- int linkedList<ItemType>::add(ItemType Item, int location) {
- node* parent;
- node* nextspot;
-- if(!find(location, root_, parent)) return 0;
-+ if(!find(location, this->root_, parent)) return 0;
- nextspot = parent->next;
- parent->next = new node;
- parent->next->next = nextspot;
diff --git a/audio/ladspa/DESCR b/audio/ladspa/DESCR
deleted file mode 100644
index befb524d5b5..00000000000
--- a/audio/ladspa/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Many audio synthesis and recording packages are in use or in
-development. These work in many different ways. LADSPA
-provides a standard way for `plugin' audio processors to be used with
-a wide range of these packages.
-
-For instance, this allows a developer to make a reverb program and
-bundle it into a LADSPA `plugin library.' Ordinary users can then use
-this reverb within any LADSPA-friendly audio application.
diff --git a/audio/ladspa/Makefile b/audio/ladspa/Makefile
deleted file mode 100644
index f1c2ec245ad..00000000000
--- a/audio/ladspa/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2006/09/09 02:41:55 obache Exp $
-#
-
-DISTNAME= ladspa_sdk_1.12
-PKGNAME= ${DISTNAME:S/_sdk_/-/}
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= http://www.ladspa.org/download/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.ladspa.org/
-COMMENT= Linux Audio Developers Simple Plugin API
-
-WRKSRC= ${WRKDIR}/ladspa_sdk/src
-USE_TOOLS+= gmake
-USE_LANGUAGES= c c++
-
-MAKE_FILE= makefile
-
-BUILDLINK_LIBS.dl+= ${BUILDLINK_LDADD.dl}
-
-INSTALLATION_DIRS+= bin include lib
-
-.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/ladspa/PLIST b/audio/ladspa/PLIST
deleted file mode 100644
index d8fcd4dfb70..00000000000
--- a/audio/ladspa/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/01/12 13:57:49 xtraeme Exp $
-bin/analyseplugin
-bin/applyplugin
-bin/listplugins
-include/ladspa.h
-lib/ladspa/amp.so
-lib/ladspa/delay.so
-lib/ladspa/filter.so
-lib/ladspa/noise.so
-lib/ladspa/sine.so
-@dirrm lib/ladspa
diff --git a/audio/ladspa/buildlink3.mk b/audio/ladspa/buildlink3.mk
deleted file mode 100644
index 472fbbcc470..00000000000
--- a/audio/ladspa/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/08/08 15:19:15 wiz Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LADSPA_BUILDLINK3_MK:= ${LADSPA_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= ladspa
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nladspa}
-BUILDLINK_PACKAGES+= ladspa
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ladspa
-
-.if ${LADSPA_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.ladspa+= ladspa>=1.12
-BUILDLINK_ABI_DEPENDS.ladspa?= ladspa>=1.12nb1
-BUILDLINK_PKGSRCDIR.ladspa?= ../../audio/ladspa
-.endif # LADSPA_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/ladspa/distinfo b/audio/ladspa/distinfo
deleted file mode 100644
index 4f4f3b98c87..00000000000
--- a/audio/ladspa/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/08/08 15:16:40 wiz Exp $
-
-SHA1 (ladspa_sdk_1.12.tgz) = 36a3a7a00f96281ca443dcae15d33f462398c4d4
-RMD160 (ladspa_sdk_1.12.tgz) = 7967731c28785287691655d9346cf46654f4235b
-Size (ladspa_sdk_1.12.tgz) = 71165 bytes
-SHA1 (patch-aa) = 358fd53cf33d2856442afc649e788916919b86be
-SHA1 (patch-ab) = 729277aaae806d9698e185f630aa6ec65f009d51
-SHA1 (patch-ac) = d3367fa484cc0b2d4cef733832de3b1ddc147bdb
diff --git a/audio/ladspa/patches/patch-aa b/audio/ladspa/patches/patch-aa
deleted file mode 100644
index d203c2bf0a2..00000000000
--- a/audio/ladspa/patches/patch-aa
+++ /dev/null
@@ -1,88 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/03/31 17:17:07 minskim Exp $
-
---- makefile.orig 2004-02-28 17:30:22.000000000 +0100
-+++ makefile 2004-02-28 17:35:17.000000000 +0100
-@@ -5,9 +5,9 @@
- # Change these if you want to install somewhere else. In particularly
- # you may wish to remove the middle "local/" part of each entry.
-
--INSTALL_PLUGINS_DIR = /usr/local/lib/ladspa/
--INSTALL_INCLUDE_DIR = /usr/include/
--INSTALL_BINARY_DIR = /usr/local/bin/
-+INSTALL_PLUGINS_DIR = ${PREFIX}/lib/ladspa
-+INSTALL_INCLUDE_DIR = ${PREFIX}/include
-+INSTALL_BINARY_DIR = ${PREFIX}/bin
-
- ###############################################################################
- #
-@@ -15,8 +15,8 @@
- #
-
- INCLUDES = -I.
--LIBRARIES = -ldl -lm
--CFLAGS = $(INCLUDES) -Wall -Werror -O3 -fPIC
-+LIBRARIES = $(DL_LIBS) -lm
-+CFLAGS = $(INCLUDES) -Wall -Werror -fPIC
- CXXFLAGS = $(CFLAGS)
- PLUGINS = ../plugins/amp.so \
- ../plugins/delay.so \
-@@ -26,8 +26,8 @@
- PROGRAMS = ../bin/analyseplugin \
- ../bin/applyplugin \
- ../bin/listplugins
--CC = cc
--CPP = c++
-+#CC = cc
-+#CPP = c++
-
- ###############################################################################
- #
-@@ -39,32 +39,19 @@
- $(LD) -o ../plugins/$*.so plugins/$*.o -shared
-
- ../plugins/%.so: plugins/%.cpp ladspa.h
-- $(CPP) $(CXXFLAGS) -o plugins/$*.o -c plugins/$*.cpp
-- $(CPP) -o ../plugins/$*.so plugins/$*.o -shared
-+ $(CXX) $(CXXFLAGS) -o plugins/$*.o -c plugins/$*.cpp
-+ $(CXX) -o ../plugins/$*.so plugins/$*.o -shared
-
- ###############################################################################
- #
- # TARGETS
- #
-
--test: /tmp/test.wav ../snd/noise.wav always
-- @echo ---------------------------------------------
-- @echo First listen to the white noise input signal:
-- @echo ---------------------------------------------
-- play ../snd/noise.wav
-- @echo -------------------------
-- @echo Compare to plugin output.
-- @echo -------------------------
-- @echo Should be a noise band around 6000Hz, repeated quietly after 1s.
-- play /tmp/test.wav
--
--install: targets
-- -mkdirhier $(INSTALL_PLUGINS_DIR) \
-- $(INSTALL_INCLUDE_DIR) \
-- $(INSTALL_BINARY_DIR)
-- cp ../plugins/* $(INSTALL_PLUGINS_DIR)
-- cp ladspa.h $(INSTALL_INCLUDE_DIR)
-- cp ../bin/* $(INSTALL_BINARY_DIR)
-+install:
-+ $(BSD_INSTALL_DATA_DIR) $(INSTALL_PLUGINS_DIR)
-+ $(BSD_INSTALL_DATA) ../plugins/* $(INSTALL_PLUGINS_DIR)
-+ $(BSD_INSTALL_DATA) ladspa.h $(INSTALL_INCLUDE_DIR)
-+ $(BSD_INSTALL_PROGRAM) ../bin/* $(INSTALL_BINARY_DIR)
-
- /tmp/test.wav: targets ../snd/noise.wav
- ../bin/listplugins
-@@ -82,7 +69,7 @@
- ../plugins/delay.so delay_5s 1 0.1 \
- ../plugins/amp.so amp_mono 4 \
-
--targets: $(PLUGINS) $(PROGRAMS)
-+all: $(PLUGINS) $(PROGRAMS)
-
- ###############################################################################
- #
diff --git a/audio/ladspa/patches/patch-ab b/audio/ladspa/patches/patch-ab
deleted file mode 100644
index 570183a629c..00000000000
--- a/audio/ladspa/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/03/31 17:06:29 minskim Exp $
-
---- applyplugin.c.orig 2004-02-28 17:11:28.000000000 +0100
-+++ applyplugin.c 2004-02-28 17:12:19.000000000 +0100
-@@ -6,7 +6,11 @@
- /*****************************************************************************/
-
- #include <dlfcn.h>
--#include <endian.h>
-+#ifdef __linux__
-+# include <endian.h>
-+#else
-+# include <sys/endian.h>
-+#endif
- #include <errno.h>
- #include <math.h>
- #include <stdlib.h>
diff --git a/audio/ladspa/patches/patch-ac b/audio/ladspa/patches/patch-ac
deleted file mode 100644
index 40bc343e0aa..00000000000
--- a/audio/ladspa/patches/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/08/08 15:16:40 wiz Exp $
-
---- plugins/sine.cpp.orig 2002-07-06 17:23:17.000000000 +0000
-+++ plugins/sine.cpp
-@@ -59,6 +59,15 @@ initialise_sine_table() {
-
- /*****************************************************************************/
-
-+LADSPA_Handle instantiateSineOscillator(const LADSPA_Descriptor *, unsigned long SampleRate);
-+void connectPortToSineOscillator(LADSPA_Handle Instance, unsigned long Port, LADSPA_Data * DataLocation);
-+void activateSineOscillator(void * pvHandle);
-+void runSineOscillator_FreqAudio_AmpAudio(LADSPA_Handle Instance, unsigned long SampleCount);
-+void runSineOscillator_FreqAudio_AmpCtrl(LADSPA_Handle Instance, unsigned long SampleCount);
-+void runSineOscillator_FreqCtrl_AmpAudio(LADSPA_Handle Instance, unsigned long SampleCount);
-+void runSineOscillator_FreqCtrl_AmpCtrl(LADSPA_Handle Instance, unsigned long SampleCount);
-+void cleanupSineOscillator(void *pvHandle);
-+
- class SineOscillator {
- private:
-
diff --git a/audio/lame/DESCR b/audio/lame/DESCR
deleted file mode 100644
index 33dcbf2f417..00000000000
--- a/audio/lame/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-Following the great history of GNU naming, LAME originally stood for
-LAME Ain't an Mp3 Encoder. LAME started life as a GPL'd patch against
-the dist10 ISO demonstration source, and thus was incapable of
-producing an mp3 stream or even being compiled by itself. But in May
-2000, the last remnants of the ISO source code were replaced, and now
-LAME is the source code for a fully GPL'd MP3 encoder, with speed and
-quality to rival all commercial competitors.
-
-LAME is an educational tool to be used for learning about MP3
-encoding. The goal of the LAME project is to use the open source model
-to improve the psycho acoustics, noise shaping and speed of
-MP3. Another goal of the LAME project is to use these improvements for
-the basis of a patent free audio compression codec for the GNU
-project.
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
deleted file mode 100644
index c9e206ed2ee..00000000000
--- a/audio/lame/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# $NetBSD: Makefile,v 1.57 2006/12/15 14:34:19 wiz Exp $
-#
-
-DISTNAME= lame-${VERS}
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lame/} \
- http://hive.me.gu.edu.au/not_lame/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://lame.sourceforge.net/
-COMMENT= Fast, high quality MP3 encoder
-
-VERS= 3.97
-
-LICENSE= lame-license
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_TOOLS+= gmake
-USE_LIBTOOL= yes
-USE_LANGUAGES= c c++
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --without-vorbis
-
-# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE:Q}
-
-LDFLAGS.SunOS+= -lm
-
-.include "options.mk"
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "alpha"
-. include "../../math/libffm/buildlink3.mk"
-# double is faster than float on Alpha
-CFLAGS+= -O2 -Wall -fomit-frame-pointer -ffast-math -funroll-loops \
- -mfp-regs -fschedule-insns -fschedule-insns2 \
- -finline-functions -DFLOAT=double -DFLOAT_MAX=DBL_MAX
-.endif
-
-.if ${MACHINE_ARCH} == "i386" && ${OPSYS} != "SunOS" && ${OPSYS} != "Darwin"
-BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm
-CONFIGURE_ARGS+= --enable-nasm
-.endif
-
-.include "../../mk/curses.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/lame/PLIST b/audio/lame/PLIST
deleted file mode 100644
index 70937b8144c..00000000000
--- a/audio/lame/PLIST
+++ /dev/null
@@ -1,18 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2006/10/23 01:30:34 ben Exp $
-bin/lame
-include/lame/lame.h
-lib/libmp3lame.la
-man/man1/lame.1
-share/doc/lame/basic.html
-share/doc/lame/contributors.html
-share/doc/lame/examples.html
-share/doc/lame/history.html
-share/doc/lame/id3.html
-share/doc/lame/index.html
-share/doc/lame/lame.css
-share/doc/lame/modes.html
-share/doc/lame/node6.html
-share/doc/lame/presets.html
-share/doc/lame/switchs.html
-@dirrm share/doc/lame
-@dirrm include/lame
diff --git a/audio/lame/buildlink3.mk b/audio/lame/buildlink3.mk
deleted file mode 100644
index fa64eb83990..00000000000
--- a/audio/lame/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:36 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LAME_BUILDLINK3_MK:= ${LAME_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= lame
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlame}
-BUILDLINK_PACKAGES+= lame
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lame
-
-.if !empty(LAME_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.lame+= lame>=3.93.1nb2
-BUILDLINK_ABI_DEPENDS.lame+= lame>=3.96.1nb4
-BUILDLINK_PKGSRCDIR.lame?= ../../audio/lame
-.endif # LAME_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/lame/distinfo b/audio/lame/distinfo
deleted file mode 100644
index 7943cc7e0ef..00000000000
--- a/audio/lame/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.16 2007/01/29 23:05:51 dmcmahill Exp $
-
-SHA1 (lame-3.97.tar.gz) = acf56065f4e31ce023b0f99002d537adb1ec09df
-RMD160 (lame-3.97.tar.gz) = 5c4cf02c0f4e10c4cd2ab610d62478b554cd0873
-Size (lame-3.97.tar.gz) = 1328058 bytes
-SHA1 (patch-aa) = 171a672d21f0bcef64867efebf8a772ce986cd80
-SHA1 (patch-ab) = 0d018fa85580f1653deaa61689c901af3e17b42c
-SHA1 (patch-ac) = dc1fe7bccdf15b293a0c655c2ddf651d25fada43
-SHA1 (patch-ad) = c6012f720b0d24775539dd915a1466ebbf065c62
-SHA1 (patch-ae) = 09935a5a63ba2e474cedc439b58dad18397d4a19
diff --git a/audio/lame/options.mk b/audio/lame/options.mk
deleted file mode 100644
index 0fcaef3df5a..00000000000
--- a/audio/lame/options.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2005/10/05 13:29:49 wiz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.lame
-PKG_SUPPORTED_OPTIONS= gtk
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mgtk)
-CONFIGURE_ENV+= GTK_CONFIG=${BUILDLINK_PREFIX.gtk}/bin/gtk-config
-. include "../../x11/gtk/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-analyzer
-.endif
diff --git a/audio/lame/patches/patch-aa b/audio/lame/patches/patch-aa
deleted file mode 100644
index 066724e8ee6..00000000000
--- a/audio/lame/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.14 2007/01/29 23:05:51 dmcmahill Exp $
-
-name space collision with a #define in /usr/include/term.h on solaris-2.9
-
---- frontend/brhist.c.orig 2006-09-24 09:53:31.000000000 -0400
-+++ frontend/brhist.c
-@@ -429,7 +429,7 @@ stats_line(double *stat)
- void
- brhist_disp(const lame_global_flags * gf)
- {
-- int i, lines = 0;
-+ int i, mylines = 0;
- int br_hist[BRHIST_WIDTH]; /* how often a frame size was used */
- int br_sm_hist[BRHIST_WIDTH][4]; /* how often a special frame size/stereo mode commbination was used */
- int st_mode[4];
-@@ -456,13 +456,13 @@ brhist_disp(const lame_global_flags * gf
- if (most_often < br_hist[i])
- most_often = br_hist[i];
- if (br_hist[i])
-- ++lines;
-+ ++mylines;
- }
-
- for (i = 0; i < BRHIST_WIDTH; i++) {
- int show = br_hist[i];
- #ifdef RH_HIST
-- show = show && (lines > 1);
-+ show = show && (mylines > 1);
- #endif
- if (show
- || (i >= brhist.vbr_bitrate_min_index
diff --git a/audio/lame/patches/patch-ab b/audio/lame/patches/patch-ab
deleted file mode 100644
index 68c839b26ab..00000000000
--- a/audio/lame/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2006/10/23 01:30:34 ben Exp $
-
---- doc/html/Makefile.in.orig 2006-09-24 13:53:31.000000000 +0000
-+++ doc/html/Makefile.in
-@@ -189,7 +189,7 @@ AUTOMAKE_OPTIONS = foreign ansi2knr
- docdir = $(datadir)/doc
- pkgdocdir = $(docdir)/$(PACKAGE)
- htmldir = $(docdir)/html
--pkghtmldir = $(pkgdocdir)/html
-+pkghtmldir = $(pkgdocdir)
- pkghtml_DATA = \
- basic.html \
- contributors.html \
diff --git a/audio/lame/patches/patch-ac b/audio/lame/patches/patch-ac
deleted file mode 100644
index 2130cec5843..00000000000
--- a/audio/lame/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2006/10/23 01:30:34 ben Exp $
-
---- frontend/Makefile.in.orig 2006-09-24 13:53:31.000000000 +0000
-+++ frontend/Makefile.in
-@@ -156,7 +156,7 @@ LDADD = @LDADD@ \
- $(top_builddir)/libmp3lame/libmp3lame.la \
- @FRONTEND_LDADD@
-
--LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static
-+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
diff --git a/audio/lame/patches/patch-ad b/audio/lame/patches/patch-ad
deleted file mode 100644
index 5887e4771fa..00000000000
--- a/audio/lame/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/10/23 01:30:34 ben Exp $
-
---- libmp3lame/machine.h.orig 2006-09-24 13:53:32.000000000 +0000
-+++ libmp3lame/machine.h
-@@ -111,6 +111,7 @@ char *strchr (), *strrchr ();
- # include <float.h>
- # define FLOAT_MAX FLT_MAX
- #else
-+# include <float.h>
- # ifndef FLOAT
- typedef float FLOAT;
- # ifdef FLT_MAX
diff --git a/audio/lame/patches/patch-ae b/audio/lame/patches/patch-ae
deleted file mode 100644
index 10f07c4ff90..00000000000
--- a/audio/lame/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2006/10/23 01:30:34 ben Exp $
-
---- libmp3lame/gain_analysis.c.orig 2006-09-24 13:53:32.000000000 +0000
-+++ libmp3lame/gain_analysis.c
-@@ -248,7 +248,7 @@ InitGainAnalysis (replaygain_t* rgData,
-
- /* returns GAIN_ANALYSIS_OK if successful, GAIN_ANALYSIS_ERROR if not */
-
--static __inline double fsqr(const double d)
-+static inline double fsqr(const double d)
- { return d*d;
- }
-
diff --git a/audio/liba52/DESCR b/audio/liba52/DESCR
deleted file mode 100644
index 9768db999d6..00000000000
--- a/audio/liba52/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-liba52 is a free library for decoding ATSC A/52 streams. It is
-released under the terms of the GPL license.
-The A/52 standard is used in a variety of applications, including
-digital television and DVD. It is also known as AC-three.
diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile
deleted file mode 100644
index c8c089ada06..00000000000
--- a/audio/liba52/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2007/02/22 19:26:06 wiz Exp $
-#
-
-DISTNAME= a52dec-0.7.4
-PKGNAME= ${DISTNAME:S/a52dec/liba52/}
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= http://liba52.sourceforge.net/files/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://liba52.sourceforge.net/
-COMMENT= Free ATSC A/52 stream decoder library
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-
-CONFIGURE_ARGS+= --disable-oss
-CONFIGURE_ARGS+= --disable-mlib
-CONFIGURE_ARGS+= --enable-shared
-
-# does not work until libdjbfft is shared
-#CONFIGURE_ARGS+= --enable-djbfft
-#CONFIGURE_ENV+= LIBA52_CFLAGS=-I${LOCALBASE}/include/djbfft
-#.include "../../math/djbfft/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/liba52/PLIST b/audio/liba52/PLIST
deleted file mode 100644
index ed404f13f91..00000000000
--- a/audio/liba52/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2007/02/22 19:01:14 wiz Exp $
-bin/a52dec
-bin/extract_a52
-include/a52dec/a52.h
-include/a52dec/attributes.h
-include/a52dec/audio_out.h
-include/a52dec/mm_accel.h
-lib/liba52.la
-man/man1/a52dec.1
-man/man1/extract_a52.1
-@dirrm include/a52dec
diff --git a/audio/liba52/buildlink3.mk b/audio/liba52/buildlink3.mk
deleted file mode 100644
index cddd09dde9a..00000000000
--- a/audio/liba52/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:36 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBA52_BUILDLINK3_MK:= ${LIBA52_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= liba52
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nliba52}
-BUILDLINK_PACKAGES+= liba52
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}liba52
-
-.if !empty(LIBA52_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.liba52+= liba52>=0.7.4
-BUILDLINK_ABI_DEPENDS.liba52+= liba52>=0.7.4nb3
-BUILDLINK_PKGSRCDIR.liba52?= ../../audio/liba52
-.endif # LIBA52_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/liba52/distinfo b/audio/liba52/distinfo
deleted file mode 100644
index 0cc88f59a20..00000000000
--- a/audio/liba52/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/07/29 00:41:51 grant Exp $
-
-SHA1 (a52dec-0.7.4.tar.gz) = 79b33bd8d89dad7436f85b9154ad35667aa37321
-RMD160 (a52dec-0.7.4.tar.gz) = 5b63b34c5840e7182b733cad41e916a8d4875eb1
-Size (a52dec-0.7.4.tar.gz) = 241507 bytes
-SHA1 (patch-aa) = f31a0e354ab7f1111c03196bf1a11d7caab0f1e9
-SHA1 (patch-ab) = 79341f97816b93731bdb5999957e36f36b30e63a
-SHA1 (patch-ac) = d226b58ae1314deaa8c938d39669139bd513be18
-SHA1 (patch-ad) = 680e399e79211fb3f788111d5221c5f8227f23b6
diff --git a/audio/liba52/patches/patch-aa b/audio/liba52/patches/patch-aa
deleted file mode 100644
index 2fe00371457..00000000000
--- a/audio/liba52/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2002/06/16 18:08:05 wiz Exp $
-
---- libao/configure.incl.orig Sun Feb 17 10:23:15 2002
-+++ libao/configure.incl Thu Jun 13 10:27:49 2002
-@@ -19,6 +19,8 @@
- case "$host" in
- *-sun-solaris*)
- AC_DEFINE([LIBAO_SOLARIS],,[libao solaris support]);;
-+ *-netbsd*)
-+ AC_DEFINE([LIBAO_SOLARIS],,[libao solaris compat support]);;
- esac
- fi
-
diff --git a/audio/liba52/patches/patch-ab b/audio/liba52/patches/patch-ab
deleted file mode 100644
index f909bde9c08..00000000000
--- a/audio/liba52/patches/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2005/07/29 00:41:51 grant Exp $
-
---- configure.orig 2002-07-28 13:50:42.000000000 +1000
-+++ configure
-@@ -9639,8 +9639,8 @@ _ACEOF
-
-
-
--
--LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
-+# we set LIBA52_CFLAGS in CONFIGURE_ENV
-+# LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
-
- # Check whether --enable-double or --disable-double was given.
- if test "${enable_double+set}" = set; then
-@@ -9743,6 +9743,11 @@ if test $ac_cv_lib_ossaudio__oss_ioctl =
- LIBAO_LIBS="$LIBAO_LIBS -lossaudio"
- fi
- ;;
-+ *-netbsd*)
-+cat >> confdefs.h <<\EOF
-+#define LIBAO_SOLARIS
-+EOF
-+;;
- esac
- fi
-
diff --git a/audio/liba52/patches/patch-ac b/audio/liba52/patches/patch-ac
deleted file mode 100644
index 58c4b3d172d..00000000000
--- a/audio/liba52/patches/patch-ac
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2004/08/23 04:03:34 mrg Exp $
-
---- Makefile.am.orig Mon Dec 17 00:23:45 2001
-+++ Makefile.am Thu Jun 13 10:04:13 2002
-@@ -1,3 +1,3 @@
--SUBDIRS = autotools include doc liba52 libao src vc++ test
-+SUBDIRS = autotools include liba52 libao src
-
- EXTRA_DIST = HISTORY bootstrap
diff --git a/audio/liba52/patches/patch-ad b/audio/liba52/patches/patch-ad
deleted file mode 100644
index 9bf3fa3b850..00000000000
--- a/audio/liba52/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2004/08/23 04:03:34 mrg Exp $
-
---- Makefile.in.orig Thu Feb 21 08:58:36 2002
-+++ Makefile.in Thu Jun 13 10:03:57 2002
-@@ -76,7 +76,7 @@
- STRIP = @STRIP@
- VERSION = @VERSION@
-
--SUBDIRS = autotools include doc liba52 libao src vc++ test
-+SUBDIRS = autotools include liba52 libao src
-
- EXTRA_DIST = HISTORY bootstrap
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/audio/libao-arts/DESCR b/audio/libao-arts/DESCR
deleted file mode 100644
index cfc4127ec4c..00000000000
--- a/audio/libao-arts/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Libao is a cross-platform audio library that allows programs to
-output audio using a simple API on a wide variety of platforms.
-
-This package provides an arts plugin for libao's core.
diff --git a/audio/libao-arts/Makefile b/audio/libao-arts/Makefile
deleted file mode 100644
index 879a645fc77..00000000000
--- a/audio/libao-arts/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2007/01/20 14:25:24 joerg Exp $
-
-.include "../../audio/libao/Makefile.common"
-
-PKGNAME= ${DISTNAME:S/libao/libao-arts/}
-PKGREVISION= 3
-
-COMMENT+= (arts plugin)
-
-CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/disable-arts/enable-arts/g}
-BUILD_DIRS= ${WRKSRC}/src/plugins/arts
-INSTALL_DIRS= ${WRKSRC}/src/plugins/arts
-
-_LIBAO_BUILDING_PLUGIN= yes
-
-.include "../../audio/arts/buildlink3.mk"
-.include "../../audio/libao/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libao-arts/PLIST b/audio/libao-arts/PLIST
deleted file mode 100644
index f39d6557e4a..00000000000
--- a/audio/libao-arts/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:16 jlam Exp $
-lib/ao/plugins-2/libarts.la
-@comment in libao: @dirrm lib/ao/plugins-2
diff --git a/audio/libao-esound/DESCR b/audio/libao-esound/DESCR
deleted file mode 100644
index 08444ec5349..00000000000
--- a/audio/libao-esound/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Libao is a cross-platform audio library that allows programs to
-output audio using a simple API on a wide variety of platforms.
-
-This package provides an esound plugin for libao's core.
diff --git a/audio/libao-esound/Makefile b/audio/libao-esound/Makefile
deleted file mode 100644
index d94e8d076b8..00000000000
--- a/audio/libao-esound/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:10 joerg Exp $
-
-.include "../../audio/libao/Makefile.common"
-
-PKGNAME= ${DISTNAME:S/libao/libao-esound/}
-PKGREVISION= 1
-
-COMMENT+= (esound plugin)
-
-CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/disable-esd/enable-esd/g}
-BUILD_DIRS= ${WRKSRC}/src/plugins/esd
-INSTALL_DIRS= ${WRKSRC}/src/plugins/esd
-
-_LIBAO_BUILDING_PLUGIN= yes
-
-.include "../../audio/esound/buildlink3.mk"
-.include "../../audio/libao/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libao-esound/PLIST b/audio/libao-esound/PLIST
deleted file mode 100644
index af8d325f486..00000000000
--- a/audio/libao-esound/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:16 jlam Exp $
-lib/ao/plugins-2/libesd.la
-@comment in libao: @dirrm lib/ao/plugins-2
diff --git a/audio/libao-macosx/DESCR b/audio/libao-macosx/DESCR
deleted file mode 100644
index 6d7cfbc98de..00000000000
--- a/audio/libao-macosx/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Libao is a cross-platform audio library that allows programs to
-output audio using a simple API on a wide variety of platforms.
-
-This package provides a MacOS X plugin for libao's core.
diff --git a/audio/libao-macosx/Makefile b/audio/libao-macosx/Makefile
deleted file mode 100644
index 8405b44b0dc..00000000000
--- a/audio/libao-macosx/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2006/04/06 06:21:34 reed Exp $
-
-.include "../../audio/libao/Makefile.common"
-
-PKGNAME= ${DISTNAME:S/libao/libao-macosx/}
-PKGREVISION= 1
-
-COMMENT+= (MacOS X plugin)
-
-ONLY_FOR_PLATFORM+= Darwin-*-*
-
-CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/ENABLE_MACOSX=no/ENABLE_MACOSX=yes/g}
-BUILD_DIRS= ${WRKSRC}/src/plugins/macosx
-INSTALL_DIRS= ${WRKSRC}/src/plugins/macosx
-
-BUILDLINK_API_DEPENDS.libao+= libao>=0.8.6nb1
-
-_LIBAO_BUILDING_PLUGIN= yes
-
-.include "../../audio/libao/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libao-macosx/PLIST b/audio/libao-macosx/PLIST
deleted file mode 100644
index d90cd844a57..00000000000
--- a/audio/libao-macosx/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2005/05/20 19:20:56 jmmv Exp $
-lib/ao/plugins-2/libmacosx.la
-@comment in libao: @dirrm lib/ao/plugins-2
diff --git a/audio/libao-oss/DESCR b/audio/libao-oss/DESCR
deleted file mode 100644
index 565a511bde2..00000000000
--- a/audio/libao-oss/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Libao is a cross-platform audio library that allows programs to
-output audio using a simple API on a wide variety of platforms.
-
-This package provides an OSS plugin for libao's core.
diff --git a/audio/libao-oss/Makefile b/audio/libao-oss/Makefile
deleted file mode 100644
index afd71aaf04b..00000000000
--- a/audio/libao-oss/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2006/04/22 09:22:06 rillig Exp $
-
-.include "../../audio/libao/Makefile.common"
-
-PKGNAME= ${DISTNAME:S/libao/libao-oss/}
-PKGREVISION= 1
-
-COMMENT+= (OSS plugin)
-
-NOT_FOR_PLATFORM+= Darwin-*-* Interix-*-* SunOS-*-*
-
-CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/ENABLE_OSS=no/ENABLE_OSS=yes/g}
-BUILD_DIRS= ${WRKSRC}/src/plugins/oss
-INSTALL_DIRS= ${WRKSRC}/src/plugins/oss
-
-SUBST_CLASSES+= oss
-SUBST_MESSAGE.oss= Fixing paths to OSS devices.
-SUBST_STAGE.oss= pre-configure
-SUBST_FILES.oss= src/plugins/oss/ao_oss.c
-SUBST_SED.oss= -e 's|/dev/dsp|${DEVOSSAUDIO}|g'
-SUBST_SED.oss+= -e 's|/dev/sound/dsp|${DEVOSSAUDIO}|g'
-
-BUILDLINK_API_DEPENDS.libao+= libao>=0.8.6nb1
-
-_LIBAO_BUILDING_PLUGIN= yes
-
-.include "../../audio/libao/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libao-oss/PLIST b/audio/libao-oss/PLIST
deleted file mode 100644
index 7025c423c0c..00000000000
--- a/audio/libao-oss/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2005/05/20 19:20:56 jmmv Exp $
-lib/ao/plugins-2/liboss.la
-@comment in libao: @dirrm lib/ao/plugins-2
diff --git a/audio/libao-sun/DESCR b/audio/libao-sun/DESCR
deleted file mode 100644
index 062fef315d2..00000000000
--- a/audio/libao-sun/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Libao is a cross-platform audio library that allows programs to
-output audio using a simple API on a wide variety of platforms.
-
-This package provides a Sun audio plugin for libao's core.
-
-This is used on many BSD systems as well as Solaris.
diff --git a/audio/libao-sun/Makefile b/audio/libao-sun/Makefile
deleted file mode 100644
index 70d76a12f15..00000000000
--- a/audio/libao-sun/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2006/04/06 06:21:35 reed Exp $
-
-.include "../../audio/libao/Makefile.common"
-
-PKGNAME= ${DISTNAME:S/libao/libao-sun/}
-PKGREVISION= 1
-
-COMMENT+= (Sun audio plugin)
-
-ONLY_FOR_PLATFORM+= NetBSD-*-* SunOS-*-*
-
-CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/ENABLE_SUN_AUDIO=no/ENABLE_SUN_AUDIO=yes/g}
-BUILD_DIRS= ${WRKSRC}/src/plugins/sun
-INSTALL_DIRS= ${WRKSRC}/src/plugins/sun
-
-BUILDLINK_API_DEPENDS.libao+= libao>=0.8.6nb1
-
-_LIBAO_BUILDING_PLUGIN= yes
-
-.include "../../audio/libao/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libao-sun/PLIST b/audio/libao-sun/PLIST
deleted file mode 100644
index b2368889177..00000000000
--- a/audio/libao-sun/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2005/05/20 19:20:56 jmmv Exp $
-lib/ao/plugins-2/libsun.la
-@comment in libao: @dirrm lib/ao/plugins-2
diff --git a/audio/libao/DESCR b/audio/libao/DESCR
deleted file mode 100644
index a70166e8b61..00000000000
--- a/audio/libao/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Libao is a cross-platform audio library that allows programs to
-output audio using a simple API on a wide variety of platforms.
-
-This package provides the libao's core library and support for AU
-(.au) file output, Null output (does nothing), RAW sample output,
-and WAV (.wav) file output.
-
-You will have to install a libao-* plugin package in order to get
-audio working.
diff --git a/audio/libao/MESSAGE.common b/audio/libao/MESSAGE.common
deleted file mode 100644
index 1e5bd2be4f7..00000000000
--- a/audio/libao/MESSAGE.common
+++ /dev/null
@@ -1,16 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.common,v 1.2 2006/04/13 21:40:26 reed Exp $
-
-This libao package provides its core library but no output plugins
-by itself. You will have to install an audio/libao-* plugin package
-in order to get audio working.
-
- libao-arts -- aRts plugin
- libao-esound -- EsounD (ESD or Enlighten Sound Daemon) plugin
- libao-macosx -- MacOS X plugin
- libao-oss -- OSS (Open Sound System) plugin
- libao-sun -- Sun audio plugin
-
-Not all are available on every platform.
-
-===========================================================================
diff --git a/audio/libao/Makefile b/audio/libao/Makefile
deleted file mode 100644
index f34d944c8f7..00000000000
--- a/audio/libao/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.31 2006/11/02 17:59:37 joerg Exp $
-
-PKGREVISION= 4
-
-PKG_INSTALLATION_TYPES= overwrite
-
-.include "Makefile.common"
-
-post-install:
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/ao/plugins-2
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libao/Makefile.common b/audio/libao/Makefile.common
deleted file mode 100644
index 73028112a5e..00000000000
--- a/audio/libao/Makefile.common
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile.common,v 1.28 2006/12/19 01:18:18 rillig Exp $
-
-DISTNAME= libao-0.8.6
-CATEGORIES= audio devel
-MASTER_SITES= http://downloads.xiph.org/releases/ao/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.xiph.org/ao/
-COMMENT= Cross-platform audio library
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-DISTINFO_FILE= ${.CURDIR}/../../audio/libao/distinfo
-PATCHDIR= ${.CURDIR}/../../audio/libao/patches
-
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake pkg-config
-USE_LIBTOOL= yes
-MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}
-MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR}
-
-PKGCONFIG_OVERRIDE+= ao.pc.in
-
-CONFIGURE_ARGS+= --disable-alsa
-CONFIGURE_ARGS+= --disable-alsa09
-CONFIGURE_ARGS+= --disable-arts
-CONFIGURE_ARGS+= --disable-esd
-CONFIGURE_ARGS+= --disable-nas
-CONFIGURE_ARGS+= --disable-polyp
-CONFIGURE_ARGS+= ENABLE_AIX_AUDIO=no
-CONFIGURE_ARGS+= ENABLE_IRIX=no
-CONFIGURE_ARGS+= ENABLE_OSS=no
-CONFIGURE_ARGS+= ENABLE_SUN_AUDIO=no
-CONFIGURE_ARGS+= ENABLE_MACOSX=no
-CONFIGURE_ARGS+= ENABLE_SOLARIS=no
-
-MAKE_ENV+= DLLIB=${BUILDLINK_LDADD.dl}
-
-.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
diff --git a/audio/libao/PLIST b/audio/libao/PLIST
deleted file mode 100644
index 5498125aa06..00000000000
--- a/audio/libao/PLIST
+++ /dev/null
@@ -1,49 +0,0 @@
-@comment $NetBSD: PLIST,v 1.12 2005/05/31 21:57:15 rillig Exp $
-include/ao/ao.h
-include/ao/os_types.h
-include/ao/plugin.h
-lib/libao.la
-lib/pkgconfig/ao.pc
-man/man5/libao.conf.5
-share/aclocal/ao.m4
-share/doc/${PKGNAME}/ao_append_option.html
-share/doc/${PKGNAME}/ao_close.html
-share/doc/${PKGNAME}/ao_default_driver_id.html
-share/doc/${PKGNAME}/ao_device.html
-share/doc/${PKGNAME}/ao_driver_id.html
-share/doc/${PKGNAME}/ao_driver_info.html
-share/doc/${PKGNAME}/ao_driver_info_list.html
-share/doc/${PKGNAME}/ao_example.c
-share/doc/${PKGNAME}/ao_file_extension.html
-share/doc/${PKGNAME}/ao_free_options.html
-share/doc/${PKGNAME}/ao_info.html
-share/doc/${PKGNAME}/ao_initialize.html
-share/doc/${PKGNAME}/ao_is_big_endian.html
-share/doc/${PKGNAME}/ao_open_file.html
-share/doc/${PKGNAME}/ao_open_live.html
-share/doc/${PKGNAME}/ao_option.html
-share/doc/${PKGNAME}/ao_play.html
-share/doc/${PKGNAME}/ao_plugin_close.html
-share/doc/${PKGNAME}/ao_plugin_device_clear.html
-share/doc/${PKGNAME}/ao_plugin_device_init.html
-share/doc/${PKGNAME}/ao_plugin_driver_info.html
-share/doc/${PKGNAME}/ao_plugin_file_extension.html
-share/doc/${PKGNAME}/ao_plugin_open.html
-share/doc/${PKGNAME}/ao_plugin_play.html
-share/doc/${PKGNAME}/ao_plugin_set_option.html
-share/doc/${PKGNAME}/ao_plugin_test.html
-share/doc/${PKGNAME}/ao_sample_format.html
-share/doc/${PKGNAME}/ao_shutdown.html
-share/doc/${PKGNAME}/config.html
-share/doc/${PKGNAME}/drivers.html
-share/doc/${PKGNAME}/index.html
-share/doc/${PKGNAME}/libao-api.html
-share/doc/${PKGNAME}/overview.html
-share/doc/${PKGNAME}/plugin-api.html
-share/doc/${PKGNAME}/plugin-overview.html
-share/doc/${PKGNAME}/style.css
-@dirrm share/doc/${PKGNAME}
-@exec ${MKDIR} -p %D/lib/ao/plugins-2
-@dirrm lib/ao/plugins-2
-@dirrm lib/ao
-@dirrm include/ao
diff --git a/audio/libao/buildlink3.mk b/audio/libao/buildlink3.mk
deleted file mode 100644
index 396f640f511..00000000000
--- a/audio/libao/buildlink3.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/12/12 21:52:34 joerg Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBAO_BUILDLINK3_MK:= ${LIBAO_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libao
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibao}
-BUILDLINK_PACKAGES+= libao
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libao
-
-.if !empty(LIBAO_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libao+= libao>=0.8.4
-BUILDLINK_ABI_DEPENDS.libao+= libao>=0.8.6nb3
-BUILDLINK_PKGSRCDIR.libao?= ../../audio/libao
-
-. if !defined(_LIBAO_BUILDING_PLUGIN)
-. include "../../mk/bsd.fast.prefs.mk"
-. if ${OPSYS} != "Darwin" && ${OPSYS} != "Interix" && ${OPSYS} != "SunOS"
-_LIBAO_DEFAULT_PLUGIN= oss
-. elif ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
-_LIBAO_DEFAULT_PLUGIN= sun
-. else
-_LIBAO_DEFAULT_PLUGIN=
-. endif
-
-. if !empty(_LIBAO_DEFAULT_PLUGIN)
-DEPENDS+= libao-[a-z]*-[0-9]*:../../audio/libao-${_LIBAO_DEFAULT_PLUGIN}
-. endif
-. endif
-.endif # LIBAO_BUILDLINK3_MK
-
-PRINT_PLIST_AWK+= /^@dirrm lib\/ao\/plugins-2$$/ \
- { print "@comment in libao: " $$0; next }
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libao/distinfo b/audio/libao/distinfo
deleted file mode 100644
index 7d020966b03..00000000000
--- a/audio/libao/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.18 2005/06/06 01:37:13 minskim Exp $
-
-SHA1 (libao-0.8.6.tar.gz) = 2050e008ffcfd6803e2c2c03c7d5f469b6d8379e
-RMD160 (libao-0.8.6.tar.gz) = 650258240295f221e95d39cf2380ada73f3cb4e1
-Size (libao-0.8.6.tar.gz) = 387583 bytes
-SHA1 (patch-ab) = 9d6902cf3532d858e9c3d2cce75c5b5869634028
-SHA1 (patch-ac) = b5b83ebdb0dc37a9c6c7004a766691a0c712f62d
-SHA1 (patch-ad) = 8ff730f3d05ad3341bf0da478ee5a702e398cfec
-SHA1 (patch-ae) = 06e4d61d6465009e509d58a4eec6bd8c6f09b62f
diff --git a/audio/libao/patches/patch-ab b/audio/libao/patches/patch-ab
deleted file mode 100644
index faea11bf71c..00000000000
--- a/audio/libao/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2005/02/18 17:22:07 wiz Exp $
-
---- src/plugins/oss/Makefile.in.orig 2005-01-11 23:12:07.000000000 +0100
-+++ src/plugins/oss/Makefile.in
-@@ -226,7 +226,7 @@ AUTOMAKE_OPTIONS = foreign
- @HAVE_OSS_TRUE@osssources = ao_oss.c
- INCLUDES = -I$(top_builddir)/include/ao -I$(top_srcdir)/include
- lib_LTLIBRARIES = $(ossltlibs)
--liboss_la_LDFLAGS = @PLUGIN_LDFLAGS@
-+liboss_la_LDFLAGS = @PLUGIN_LDFLAGS@ ${LIBOSSAUDIO}
- liboss_la_SOURCES = $(osssources)
- EXTRA_DIST = ao_oss.c
- all: all-am
diff --git a/audio/libao/patches/patch-ac b/audio/libao/patches/patch-ac
deleted file mode 100644
index aa46c079949..00000000000
--- a/audio/libao/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2005/06/06 01:37:13 minskim Exp $
-
---- src/Makefile.am.orig Wed Jan 8 04:48:54 2003
-+++ src/Makefile.am
-@@ -8,7 +8,7 @@ INCLUDES = -I$(top_builddir)/include/ao
- lib_LTLIBRARIES = libao.la
-
- libao_la_SOURCES = audio_out.c config.c ao_null.c ao_wav.c ao_au.c ao_raw.c ao_aixs.c ao_private.h
--libao_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -ldl
-+libao_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ ${DLLIB}
-
-
- debug:
diff --git a/audio/libao/patches/patch-ad b/audio/libao/patches/patch-ad
deleted file mode 100644
index 724fc920823..00000000000
--- a/audio/libao/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2005/06/06 01:37:13 minskim Exp $
-
---- src/Makefile.in.orig 2005-01-11 23:12:05.000000000 +0100
-+++ src/Makefile.in
-@@ -233,7 +233,7 @@ SUBDIRS = plugins
- INCLUDES = -I$(top_builddir)/include/ao -I$(top_srcdir)/include -DAO_PLUGIN_PATH=\"@plugindir@\"
- lib_LTLIBRARIES = libao.la
- libao_la_SOURCES = audio_out.c config.c ao_null.c ao_wav.c ao_au.c ao_raw.c ao_aixs.c ao_private.h
--libao_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -ldl
-+libao_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ ${DLLIB}
- all: all-recursive
-
- .SUFFIXES:
diff --git a/audio/libao/patches/patch-ae b/audio/libao/patches/patch-ae
deleted file mode 100644
index a6a798252ea..00000000000
--- a/audio/libao/patches/patch-ae
+++ /dev/null
@@ -1,95 +0,0 @@
-$NetBSD: patch-ae,v 1.7 2005/05/20 19:20:55 jmmv Exp $
-
---- configure.orig 2005-01-11 22:08:26.000000000 +0000
-+++ configure
-@@ -19121,9 +19121,9 @@ else
- PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
- *-darwin*)
- PLUGIN_LDFLAGS="-module -avoid-version"
-- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -Ddlsym=dlsym_auto_underscore"
-- CFLAGS="-D__NO_MATH_INLINES -fsigned-char -Ddlsym=dlsym_auto_underscore"
-- PROFILE="-g -pg -D__NO_MATH_INLINES -fsigned-char -Ddlsym=dlsym_auto_underscore" ;;
-+ DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char "
-+ CFLAGS="-D__NO_MATH_INLINES -fsigned-char "
-+ PROFILE="-g -pg -D__NO_MATH_INLINES -fsigned-char " ;;
- *)
- PLUGIN_LDFLAGS="-export-dynamic -avoid-version"
- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
-@@ -20505,6 +20505,11 @@ else
- BUILD_ESD="yes"
- fi;
-
-+if test "$BUILD_ESD" = "no"; then
-+ HAVE_ESD_TRUE='#'
-+ HAVE_ESD_FALSE=
-+fi;
-+
- if test "$BUILD_ESD" = "yes"; then
-
- # Check whether --with-esd-prefix or --without-esd-prefix was given.
-@@ -21108,6 +21113,10 @@ else
- HAVE_OSS_FALSE=
- fi
-
-+if test "x${ENABLE_OSS}" = xno; then
-+ HAVE_OSS_TRUE='#'
-+ HAVE_OSS_FALSE=
-+fi
-
-
-
-@@ -21932,6 +21941,10 @@ else
- HAVE_SUN_AUDIO_FALSE=
- fi
-
-+if test "x${ENABLE_SUN_AUDIO}" = xno; then
-+ HAVE_SUN_AUDIO_TRUE='#'
-+ HAVE_SUN_AUDIO_FALSE=
-+fi
-
-
- case $host in
-@@ -22097,6 +22110,10 @@ else
- HAVE_AIX_AUDIO_FALSE=
- fi
-
-+if test "x${ENABLE_AIX_AUDIO}" = xno; then
-+ HAVE_AIX_AUDIO_TRUE='#'
-+ HAVE_AIX_AUDIO_FALSE=
-+fi
-
-
- # Check whether --enable-arts or --disable-arts was given.
-@@ -22367,6 +22384,10 @@ else
- HAVE_IRIX_FALSE=
- fi
-
-+if test "x${ENABLE_IRIX}" = xno; then
-+ HAVE_IRIX_TRUE='#'
-+ HAVE_IRIX_FALSE=
-+fi
-
-
- case $host in
-@@ -22385,6 +22406,10 @@ else
- HAVE_MACOSX_FALSE=
- fi
-
-+if test "x${ENABLE_MACOSX}" = xno; then
-+ HAVE_MACOSX_TRUE='#'
-+ HAVE_MACOSX_FALSE=
-+fi
-
-
-
-@@ -24218,6 +24243,10 @@ else
- HAVE_SOLARIS_FALSE=
- fi
-
-+if test "x${ENABLE_SOLARIS}" = xno; then
-+ HAVE_SOLARIS_TRUE='#'
-+ HAVE_SOLARIS_FALSE=
-+fi
-
-
-
diff --git a/audio/libaudiofile/DESCR b/audio/libaudiofile/DESCR
deleted file mode 100644
index 4a073ef1f88..00000000000
--- a/audio/libaudiofile/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-This Audio File Library is an implementation of the SGI Audio File
-library. Since the latter is specified ambiguously in places, I've
-taken some liberties in interpreting certain such ambiguities. At the
-present, not all features of the SGI Audio File library are
-implemented. I feel, though, that this implementation of the Audio
-File Library offers enough functionality to be useful for general
-tasks.
-
-This library allows the processing of audio data to and from audio
-files of many common formats (currently AIFF, AIFC, WAVE, and
-NeXT/Sun).
diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
deleted file mode 100644
index 7aaf942ebe3..00000000000
--- a/audio/libaudiofile/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.40 2006/11/05 17:14:19 joerg Exp $
-
-DISTNAME= audiofile-0.2.6
-PKGNAME= lib${DISTNAME}
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= http://www.68k.org/~michael/audiofile/ \
- ftp://ftp.68k.org/pub/michael/ \
- ${MASTER_SITE_GNOME:=sources/audiofile/0.2/}
-
-MAINTAINER= tron@NetBSD.org
-HOMEPAGE= http://andromeda.68k.org/~michael/audiofile/
-COMMENT= Sound library for SGI audio file
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
-
-GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
-PKGCONFIG_OVERRIDE= audiofile.pc.in
-
-DOCDIR= ${PREFIX}/share/doc/libaudiofile
-
-INSTALLATION_DIRS= ${DOCDIR}
-
-post-install:
- cd ${WRKSRC}/docs; ${INSTALL_DATA} af* sf* ${DESTDIR}${DOCDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libaudiofile/PLIST b/audio/libaudiofile/PLIST
deleted file mode 100644
index a7b7d7c239d..00000000000
--- a/audio/libaudiofile/PLIST
+++ /dev/null
@@ -1,26 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:16 jlam Exp $
-bin/audiofile-config
-bin/sfconvert
-bin/sfinfo
-include/af_vfs.h
-include/audiofile.h
-include/aupvlist.h
-lib/libaudiofile.la
-lib/pkgconfig/audiofile.pc
-share/aclocal/audiofile.m4
-share/doc/libaudiofile/afCloseFile
-share/doc/libaudiofile/afGetFrameSize
-share/doc/libaudiofile/afGetTrackBytes
-share/doc/libaudiofile/afIntro
-share/doc/libaudiofile/afNewFileSetup
-share/doc/libaudiofile/afOpenFile
-share/doc/libaudiofile/afQuery
-share/doc/libaudiofile/afReadFrames
-share/doc/libaudiofile/afReadMisc
-share/doc/libaudiofile/afSeekFrame
-share/doc/libaudiofile/afSetErrorHandler
-share/doc/libaudiofile/afSetVirtualByteOrder
-share/doc/libaudiofile/afWriteFrames
-share/doc/libaudiofile/sfconvert
-share/doc/libaudiofile/sfinfo
-@dirrm share/doc/libaudiofile
diff --git a/audio/libaudiofile/buildlink3.mk b/audio/libaudiofile/buildlink3.mk
deleted file mode 100644
index 9608fca635d..00000000000
--- a/audio/libaudiofile/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:36 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-AUDIOFILE_BUILDLINK3_MK:= ${AUDIOFILE_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= audiofile
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Naudiofile}
-BUILDLINK_PACKAGES+= audiofile
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}audiofile
-
-.if !empty(AUDIOFILE_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.audiofile+= libaudiofile>=0.2.1
-BUILDLINK_ABI_DEPENDS.audiofile+= libaudiofile>=0.2.6nb1
-BUILDLINK_PKGSRCDIR.audiofile?= ../../audio/libaudiofile
-.endif # AUDIOFILE_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libaudiofile/distinfo b/audio/libaudiofile/distinfo
deleted file mode 100644
index 078a63cd472..00000000000
--- a/audio/libaudiofile/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.11 2005/04/27 08:59:41 wiz Exp $
-
-SHA1 (audiofile-0.2.6.tar.gz) = 94a6ab8e5122bc1971cf186e5a52d032811c9bc5
-RMD160 (audiofile-0.2.6.tar.gz) = b61fbc856768a5838ca5c0fad602f35205e8d037
-Size (audiofile-0.2.6.tar.gz) = 374688 bytes
-SHA1 (patch-aa) = 7c498a63fe055f1f7e16f45f655341a9b6708f71
-SHA1 (patch-ab) = cd292a827aa18b9839305b2c62c3dbd526384430
diff --git a/audio/libaudiofile/patches/patch-aa b/audio/libaudiofile/patches/patch-aa
deleted file mode 100644
index aeb9599c840..00000000000
--- a/audio/libaudiofile/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2005/04/27 08:59:41 wiz Exp $
-
---- audiofile.m4.orig 2004-03-06 07:39:23.000000000 +0100
-+++ audiofile.m4
-@@ -9,7 +9,7 @@
- dnl AM_PATH_AUDIOFILE([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
- dnl Test for Audio File Library, and define AUDIOFILE_CFLAGS and AUDIOFILE_LIBS.
- dnl
--AC_DEFUN(AM_PATH_AUDIOFILE,
-+AC_DEFUN([AM_PATH_AUDIOFILE],
- [dnl
- dnl Get compiler flags and libraries from the audiofile-config script.
- dnl
diff --git a/audio/libaudiofile/patches/patch-ab b/audio/libaudiofile/patches/patch-ab
deleted file mode 100644
index d5efc8fbb42..00000000000
--- a/audio/libaudiofile/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 1999/04/28 12:18:20 tron Exp $
-
---- audiofile-config.in.orig Sat Nov 21 15:55:23 1998
-+++ audiofile-config.in Wed Apr 28 14:09:47 1999
-@@ -45,7 +45,7 @@
- echo $includes
- ;;
- --libs)
-- libdirs=-L@libdir@
-+ libdirs="-L@libdir@ -Wl,-R@libdir@"
- echo $libdirs -laudiofile -lm
- ;;
- *)
diff --git a/audio/libcdaudio/DESCR b/audio/libcdaudio/DESCR
deleted file mode 100644
index 16d0905d135..00000000000
--- a/audio/libcdaudio/DESCR
+++ /dev/null
@@ -1,23 +0,0 @@
- libcdaudio is a multi-platform CD player development library which
-works with NetBSD, Linux, FreeBSD, OpenBSD, Solaris, and Irix. It
-includes a basic command set for controlling the operation of the
-CD-ROM drive as well as functions for accessing both the CDDB, CD
-Index, and Cover Art Index.
-
- It is recommended that all programs wishing to specifically use CDDB
-data use the FreeDB at "http://www.freedb.org/", which works well with
-libcdaudio.
-
- The CD Index ("http://www.cdindex.org/") is a rethought track
-information management system that uses SQL servers to manage the data.
-This is another track information method libcdaudio is capable of
-using.
-
- The Cover Art Index ("http://coverart.undergrid.net/") provides a
-method of locating cover art for a particular CD based upon the disc's
-name or CD Index ID.
-
- The entire libcdaudio API may be found in the libcdaudio
-programmer's manual at "http://cdcd.undergrid.net/libcdaudio/manual/".
-The interface to the given functions will remain as they are
-specified, although new functions may continue to be added.
diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile
deleted file mode 100644
index ce8be844421..00000000000
--- a/audio/libcdaudio/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.28 2005/10/31 15:37:50 tv Exp $
-
-DISTNAME= libcdaudio-0.99.12
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libcdaudio/}
-
-MAINTAINER= rh@NetBSD.org
-HOMEPAGE= http://libcdaudio.sourceforge.net/
-COMMENT= Multi-platform CD player development library
-
-NOT_FOR_PLATFORM= Interix-*-*
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_TOOLS+= pkg-config
-USE_LIBTOOL= YES
-GNU_CONFIGURE= YES
-PKGCONFIG_OVERRIDE= libcdaudio.pc.in
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libcdaudio/PLIST b/audio/libcdaudio/PLIST
deleted file mode 100644
index 4cb2b1e3d3a..00000000000
--- a/audio/libcdaudio/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:16 jlam Exp $
-bin/libcdaudio-config
-include/cdaudio.h
-lib/libcdaudio.la
-lib/pkgconfig/libcdaudio.pc
-share/aclocal/libcdaudio.m4
diff --git a/audio/libcdaudio/buildlink3.mk b/audio/libcdaudio/buildlink3.mk
deleted file mode 100644
index 51263903c30..00000000000
--- a/audio/libcdaudio/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:36 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBCDAUDIO_BUILDLINK3_MK:= ${LIBCDAUDIO_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libcdaudio
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcdaudio}
-BUILDLINK_PACKAGES+= libcdaudio
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcdaudio
-
-.if !empty(LIBCDAUDIO_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libcdaudio+= libcdaudio>=0.99.4nb1
-BUILDLINK_ABI_DEPENDS.libcdaudio+= libcdaudio>=0.99.12nb1
-BUILDLINK_PKGSRCDIR.libcdaudio?= ../../audio/libcdaudio
-.endif # LIBCDAUDIO_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libcdaudio/distinfo b/audio/libcdaudio/distinfo
deleted file mode 100644
index 9132a33852b..00000000000
--- a/audio/libcdaudio/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.12 2005/09/06 08:10:57 abs Exp $
-
-SHA1 (libcdaudio-0.99.12.tar.gz) = 1862d3f387634a216faa867164d840b6f5552294
-RMD160 (libcdaudio-0.99.12.tar.gz) = 57f7446db6c65c968eb58a9404652718d6517b74
-Size (libcdaudio-0.99.12.tar.gz) = 357150 bytes
-SHA1 (patch-aa) = f7cf7d430917e6860fb43529cb349d358890f7a4
-SHA1 (patch-ab) = 9df8c234de3cb5a6b262fae093e430e471afa1f0
-SHA1 (patch-ac) = 073ceed3794fbd889b0efec49cd2dfe63c7fda07
diff --git a/audio/libcdaudio/patches/patch-aa b/audio/libcdaudio/patches/patch-aa
deleted file mode 100644
index 47a41cb0d57..00000000000
--- a/audio/libcdaudio/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2005/09/06 08:10:57 abs Exp $
-
---- src/cdaudio.c.orig 2004-09-09 00:26:20.000000000 +0000
-+++ src/cdaudio.c
-@@ -121,8 +121,12 @@ cd_init_device(char *device_name)
- #endif
- #ifdef HAVE_GETMNTINFO
- int mounts;
-+#if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */
-+ struct statvfs *mnt;
-+#else
- struct statfs *mnt;
- #endif
-+#endif
- char devname[255];
- struct stat st;
- int len = 0;
diff --git a/audio/libcdaudio/patches/patch-ab b/audio/libcdaudio/patches/patch-ab
deleted file mode 100644
index 51e29a7b946..00000000000
--- a/audio/libcdaudio/patches/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/11/26 13:38:30 adam Exp $
-
---- configure.orig 2004-11-26 14:32:17.000000000 +0000
-+++ configure
-@@ -24040,16 +24040,16 @@ echo
- echo Ready to build libcdaudio $LIBCDAUDIO_VERSION.
- echo
- case $sys in
-- (irix)
-+ irix)
- echo "* I am configured for IRIX."
- ;;
-- (beos)
-+ beos)
- echo "* I am configured for BeOS."
- ;;
-- (solaris)
-+ solaris)
- echo "* I am configured Solaris."
- ;;
-- (*)
-+ *)
- echo "* I am configured for a generic or GNU or GNU-like system."
- ;;
- esac
diff --git a/audio/libcdaudio/patches/patch-ac b/audio/libcdaudio/patches/patch-ac
deleted file mode 100644
index ccfc506a413..00000000000
--- a/audio/libcdaudio/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/04/15 01:50:57 rh Exp $
-
---- src/cddb.c.orig 2004-09-09 11:26:39.000000000 +1000
-+++ src/cddb.c
-@@ -1052,7 +1052,7 @@ cddb_query(int cd_desc, int sock,
- }
-
- query->query_matches = 0;
-- while(!cddb_read_line(sock, inbuffer, 256)) {
-+ while(query->query_matches < MAX_INEXACT_MATCHES && !cddb_read_line(sock, inbuffer, 256)) {
- slashed = 0;
- if(strchr(inbuffer, '/') != NULL && parse_disc_artist) {
- index = 0;
diff --git a/audio/libcddb/DESCR b/audio/libcddb/DESCR
deleted file mode 100644
index 24bb4174af2..00000000000
--- a/audio/libcddb/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Libcddb is a library that implements the different protocols (CDDBP,
-HTTP, SMTP) to access data on a CDDB server (http://freedb.org). It
-tries to be as cross-platform as possible. The initial libary will
-have a C API.
diff --git a/audio/libcddb/Makefile b/audio/libcddb/Makefile
deleted file mode 100644
index 0d5cdbe1518..00000000000
--- a/audio/libcddb/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.22 2007/01/20 17:43:36 wiz Exp $
-
-DISTNAME= libcddb-1.3.0
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libcddb/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= drochner@NetBSD.org
-HOMEPAGE= http://libcddb.sourceforge.net/
-COMMENT= Library to access data on a CDDB server
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_PKGLOCALEDIR= yes
-USE_LIBTOOL= yes
-PKGCONFIG_OVERRIDE+= libcddb.pc.in
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --without-cdio
-GCC_REQD+= 2.95
-USE_TOOLS+= pkg-config
-
-TEST_TARGET= check
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libcddb/PLIST b/audio/libcddb/PLIST
deleted file mode 100644
index 3b37e8b5866..00000000000
--- a/audio/libcddb/PLIST
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2005/08/08 08:41:44 adam Exp $
-bin/cddb_query
-include/cddb/cddb.h
-include/cddb/cddb_cmd.h
-include/cddb/cddb_config.h
-include/cddb/cddb_conn.h
-include/cddb/cddb_disc.h
-include/cddb/cddb_error.h
-include/cddb/cddb_log.h
-include/cddb/cddb_site.h
-include/cddb/cddb_track.h
-include/cddb/version.h
-lib/libcddb.la
-lib/pkgconfig/libcddb.pc
-@dirrm include/cddb
diff --git a/audio/libcddb/buildlink3.mk b/audio/libcddb/buildlink3.mk
deleted file mode 100644
index 44470525499..00000000000
--- a/audio/libcddb/buildlink3.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:36 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBCDDB_BUILDLINK3_MK:= ${LIBCDDB_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libcddb
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcddb}
-BUILDLINK_PACKAGES+= libcddb
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcddb
-
-.if !empty(LIBCDDB_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libcddb+= libcddb>=0.9.4
-BUILDLINK_ABI_DEPENDS.libcddb+= libcddb>=0.9.5nb1
-BUILDLINK_PKGSRCDIR.libcddb?= ../../audio/libcddb
-.endif # LIBCDDB_BUILDLINK3_MK
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../misc/libcdio/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libcddb/distinfo b/audio/libcddb/distinfo
deleted file mode 100644
index 603b15b90cb..00000000000
--- a/audio/libcddb/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.10 2007/01/20 17:43:36 wiz Exp $
-
-SHA1 (libcddb-1.3.0.tar.bz2) = 171618045dfa75075c6ced446d25e88f2c7ca88a
-RMD160 (libcddb-1.3.0.tar.bz2) = d34588f416ba80ececb23ffcff3312fc0b699f30
-Size (libcddb-1.3.0.tar.bz2) = 329319 bytes
diff --git a/audio/libdca/DESCR b/audio/libdca/DESCR
deleted file mode 100644
index a1138fb7097..00000000000
--- a/audio/libdca/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-libdca is a free library for decoding DTS Coherent Acoustics streams.
-The DTS Coherent Acoustics standard is used in a variety of applications,
-including DVD, DTS audio CD and radio broadcasting.
diff --git a/audio/libdca/Makefile b/audio/libdca/Makefile
deleted file mode 100644
index 6e1a7e44686..00000000000
--- a/audio/libdca/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2007/03/08 19:25:32 wiz Exp $
-#
-
-DISTNAME= libdts-0.0.2
-PKGNAME= ${DISTNAME:S/ts/ca/}
-CATEGORIES= audio
-MASTER_SITES= http://debian.unnet.nl/pub/videolan/libdts/0.0.2/ \
- http://download.videolan.org/pub/videolan/libdca/0.0.2/
-
-MAINTAINER= shattered@users.sourceforge.net
-HOMEPAGE= http://developers.videolan.org/libdca.html
-COMMENT= Free DTS Coherent Acoustics decoder
-
-RESTRICTED= Unresolved patent issue
-NO_BIN_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_SRC_ON_FTP= ${RESTRICTED}
-
-GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libdca/PLIST b/audio/libdca/PLIST
deleted file mode 100644
index c70e813b2e2..00000000000
--- a/audio/libdca/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/12/09 17:21:02 salo Exp $
-bin/dtsdec
-bin/extract_dts
-include/dts.h
-lib/libdts.a
-lib/libdts_pic.a
-lib/pkgconfig/libdts.pc
-man/man1/dtsdec.1
-man/man1/extract_dts.1
diff --git a/audio/libdca/buildlink3.mk b/audio/libdca/buildlink3.mk
deleted file mode 100644
index a439b22e97b..00000000000
--- a/audio/libdca/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/12/23 10:28:59 wiz Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBDCA_BUILDLINK3_MK:= ${LIBDCA_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= libdca
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdca}
-BUILDLINK_PACKAGES+= libdca
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdca
-
-.if ${LIBDCA_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.libdca+= libdca>=0.0.2
-BUILDLINK_PKGSRCDIR.libdca?= ../../audio/libdca
-BUILDLINK_DEPMETHOD.libdca?= build
-.endif # LIBDCA_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libdca/distinfo b/audio/libdca/distinfo
deleted file mode 100644
index abfdbe8a36c..00000000000
--- a/audio/libdca/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/12/09 17:21:02 salo Exp $
-
-SHA1 (libdts-0.0.2.tar.gz) = 602fd9d9442453600e425f62972797bf508ea2d3
-RMD160 (libdts-0.0.2.tar.gz) = c7b904465244b887e6b62f997bcf043d241cf2ce
-Size (libdts-0.0.2.tar.gz) = 295185 bytes
diff --git a/audio/libdiscid/DESCR b/audio/libdiscid/DESCR
deleted file mode 100644
index d372b34afa0..00000000000
--- a/audio/libdiscid/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-libdiscid is a library for creating MusicBrainz DiscIDs from audio CDs.
-It reads a CD's table of contents (TOC) and generates an identifier which
-can be used to lookup the CD at MusicBrainz (http://musicbrainz.org).
-Additionally, it provides a submission URL for adding the DiscID to
-the database.
-
-The interface of this library is new, but the DiscID algorithm and the
-operating system dependent CD-ROM/DVD-ROM access code have been ported
-from libmusicbrainz version 2.
diff --git a/audio/libdiscid/Makefile b/audio/libdiscid/Makefile
deleted file mode 100644
index 06a5150d016..00000000000
--- a/audio/libdiscid/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/11/30 18:57:29 joerg Exp $
-
-DISTNAME= libdiscid-0.1.0
-CATEGORIES= audio
-MASTER_SITES= http://users.musicbrainz.org/~matt/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://musicbrainz.org/doc/libdiscid
-COMMENT= Library for creating MusicBrainz DiscIDs
-
-ONLY_FOR_PLATFORM= Darwin-*-* Linux-*-*
-
-# XXX We don't yet have libmusicbrainz, so this could be wrong; it
-# might end up packaged as libmusicbrainz3, for example.
-CONFLICTS= libmusicbrainz>=3.0
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= pkg-config
-
-PKGCONFIG_OVERRIDE+= libdiscid.pc.in
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libdiscid/PLIST b/audio/libdiscid/PLIST
deleted file mode 100644
index 31aef0e51ca..00000000000
--- a/audio/libdiscid/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/10/13 02:31:56 epg Exp $
-include/discid/discid.h
-lib/libdiscid.la
-lib/pkgconfig/libdiscid.pc
-@dirrm include/discid
diff --git a/audio/libdiscid/buildlink3.mk b/audio/libdiscid/buildlink3.mk
deleted file mode 100644
index 69c6df8db8d..00000000000
--- a/audio/libdiscid/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/10/13 02:31:56 epg Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBDISCID_BUILDLINK3_MK:= ${LIBDISCID_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= libdiscid
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdiscid}
-BUILDLINK_PACKAGES+= libdiscid
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdiscid
-
-.if ${LIBDISCID_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.libdiscid+= libdiscid>=0.1.0
-BUILDLINK_PKGSRCDIR.libdiscid?= ../../audio/libdiscid
-.endif # LIBDISCID_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libdiscid/distinfo b/audio/libdiscid/distinfo
deleted file mode 100644
index ab9370edd8d..00000000000
--- a/audio/libdiscid/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/10/13 02:31:56 epg Exp $
-
-SHA1 (libdiscid-0.1.0.tar.gz) = fbd4494155086206a717e0ef94e08d0f2978b317
-RMD160 (libdiscid-0.1.0.tar.gz) = f18b21bdb33eb0f4471b5e68a3b7bff295c70ab7
-Size (libdiscid-0.1.0.tar.gz) = 327716 bytes
diff --git a/audio/libgpod/DESCR b/audio/libgpod/DESCR
deleted file mode 100644
index 0cfe7ddd834..00000000000
--- a/audio/libgpod/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-libgpod is a library for accessing iPod databases and files.
diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile
deleted file mode 100644
index 7c8c2954f51..00000000000
--- a/audio/libgpod/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2007/02/07 22:30:10 drochner Exp $
-
-DISTNAME= libgpod-0.4.2
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkpod/}
-
-MAINTAINER= srp@tworoads.net
-HOMEPAGE= http://www.gtkpod.org/libgpod.html
-COMMENT= Library for accessing iPod onboard databases, playlists, etc.
-
-GNU_CONFIGURE= yes
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake intltool msgfmt pkg-config
-USE_LIBTOOL= yes
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libgpod/PLIST b/audio/libgpod/PLIST
deleted file mode 100644
index 3ac46179285..00000000000
--- a/audio/libgpod/PLIST
+++ /dev/null
@@ -1,36 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/02/07 22:30:10 drochner Exp $
-include/gpod-1.0/gpod/itdb.h
-lib/libgpod.la
-lib/pkgconfig/libgpod-1.0.pc
-share/gtk-doc/html/libgpod/ch01.html
-share/gtk-doc/html/libgpod/home.png
-share/gtk-doc/html/libgpod/index.html
-share/gtk-doc/html/libgpod/index.sgml
-share/gtk-doc/html/libgpod/itunesdb.html
-share/gtk-doc/html/libgpod/left.png
-share/gtk-doc/html/libgpod/libgpod-Artwork.html
-share/gtk-doc/html/libgpod/libgpod-Device.html
-share/gtk-doc/html/libgpod/libgpod-File-handling-functions.html
-share/gtk-doc/html/libgpod/libgpod-Low-level-functions.html
-share/gtk-doc/html/libgpod/libgpod-Photo-database.html
-share/gtk-doc/html/libgpod/libgpod-Playlists.html
-share/gtk-doc/html/libgpod/libgpod-Smart-Playlists.html
-share/gtk-doc/html/libgpod/libgpod-The-Itdb-iTunesDB-structure.html
-share/gtk-doc/html/libgpod/libgpod-Time-handling.html
-share/gtk-doc/html/libgpod/libgpod-Tracks.html
-share/gtk-doc/html/libgpod/libgpod.devhelp
-share/gtk-doc/html/libgpod/libgpod.devhelp2
-share/gtk-doc/html/libgpod/photodb.html
-share/gtk-doc/html/libgpod/right.png
-share/gtk-doc/html/libgpod/style.css
-share/gtk-doc/html/libgpod/up.png
-share/locale/de/LC_MESSAGES/libgpod.mo
-share/locale/es/LC_MESSAGES/libgpod.mo
-share/locale/fr/LC_MESSAGES/libgpod.mo
-share/locale/he/LC_MESSAGES/libgpod.mo
-share/locale/it/LC_MESSAGES/libgpod.mo
-share/locale/ja/LC_MESSAGES/libgpod.mo
-share/locale/sv/LC_MESSAGES/libgpod.mo
-@dirrm share/gtk-doc/html/libgpod
-@dirrm include/gpod-1.0/gpod
-@dirrm include/gpod-1.0
diff --git a/audio/libgpod/buildlink3.mk b/audio/libgpod/buildlink3.mk
deleted file mode 100644
index 89da26c9bd3..00000000000
--- a/audio/libgpod/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/09/06 22:55:05 wiz Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBGPOD_BUILDLINK3_MK:= ${LIBGPOD_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= libgpod
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgpod}
-BUILDLINK_PACKAGES+= libgpod
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgpod
-
-.if ${LIBGPOD_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.libgpod+= libgpod>=0.3.2
-BUILDLINK_PKGSRCDIR.libgpod?= ../../audio/libgpod
-.endif # LIBGPOD_BUILDLINK3_MK
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libgpod/distinfo b/audio/libgpod/distinfo
deleted file mode 100644
index ff62abb90c6..00000000000
--- a/audio/libgpod/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2007/02/07 22:30:10 drochner Exp $
-
-SHA1 (libgpod-0.4.2.tar.gz) = b2aece62a206a5b703c50e6625b173217f1d67a6
-RMD160 (libgpod-0.4.2.tar.gz) = 5f69a0455412771e7bc33e9f4c1996454da9792e
-Size (libgpod-0.4.2.tar.gz) = 768720 bytes
-SHA1 (patch-aa) = 10c09bf41c73667a93667d13f2e2a83478e680f5
diff --git a/audio/libgpod/patches/patch-aa b/audio/libgpod/patches/patch-aa
deleted file mode 100644
index 74f87ec711f..00000000000
--- a/audio/libgpod/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2007/02/07 22:30:11 drochner Exp $
-
---- configure.orig 2007-01-15 16:46:04.000000000 +0100
-+++ configure
-@@ -21991,7 +21991,7 @@ echo $ECHO_N "checking whether to build
- { echo "$as_me:$LINENO: result: $with_python" >&5
- echo "${ECHO_T}$with_python" >&6; }
-
-- if test "X$with_python" == Xyes; then
-+ if test "X$with_python" = Xyes; then
- if test -z "$PYTHON"; then
- # Extract the first word of "python", so it can be a program name with args.
- set dummy python; ac_word=$2
-@@ -22274,7 +22274,7 @@ rm -f conftest.err conftest.$ac_ext
- CPPFLAGS="$save_CPPFLAGS"
-
-
-- if test "X$with_python" == Xyes; then
-+ if test "X$with_python" = Xyes; then
- if test `uname` = Darwin; then
- PYTHON_LDFLAGS="-Wl,-F. -Wl,-F. -bundle"
- if $PYTHON -c 'import sys, string; sys.exit(string.find(sys.prefix,"Framework")+1)'; then
-@@ -22330,7 +22330,7 @@ echo "${ECHO_T}no" >&6; }
- fi
-
-
-- if test "X$with_python" == Xyes; then
-+ if test "X$with_python" = Xyes; then
-
- # Extract the first word of "swig", so it can be a program name with args.
- set dummy swig; ac_word=$2
diff --git a/audio/libhydrogen/DESCR b/audio/libhydrogen/DESCR
deleted file mode 100644
index 7bf1dab8850..00000000000
--- a/audio/libhydrogen/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Shared library for Hydrogen, a simple real-time Drum machine/sequencer
-for CAC (Computer Aided Composition).
diff --git a/audio/libhydrogen/Makefile b/audio/libhydrogen/Makefile
deleted file mode 100644
index ee65d594294..00000000000
--- a/audio/libhydrogen/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2006/07/22 04:46:14 rillig Exp $
-
-DISTNAME= libhydrogen-0.8.0
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hydrogen/}
-
-MAINTAINER= chris.wareham@btinternet.com
-HOMEPAGE= http://hydrogen.sourceforge.net/
-COMMENT= Shared library for the Hydrogen drum machine
-
-NOT_FOR_PLATFORM= Interix-*-*
-
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake
-GNU_CONFIGURE= yes
-
-CONFIGURE_ARGS+= --disable-alsa-seq
-CONFIGURE_ARGS+= --disable-jack-support
-
-CPPFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
-
-.include "../../audio/libaudiofile/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libhydrogen/PLIST b/audio/libhydrogen/PLIST
deleted file mode 100644
index ec858371804..00000000000
--- a/audio/libhydrogen/PLIST
+++ /dev/null
@@ -1,45 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:16 jlam Exp $
-include/hydrogen/AlsaMidiDriver.h
-include/hydrogen/DiskWriterDriver.h
-include/hydrogen/EngineListener.h
-include/hydrogen/GenericDriver.h
-include/hydrogen/Globals.h
-include/hydrogen/Hydrogen.h
-include/hydrogen/JackDriver.h
-include/hydrogen/LocalFileMng.h
-include/hydrogen/NullDriver.h
-include/hydrogen/Object.h
-include/hydrogen/OssDriver.h
-include/hydrogen/PreferencesMng.h
-include/hydrogen/Sample.h
-include/hydrogen/Song.h
-lib/libhydrogen.la
-share/hydrogen/data/DefaultSong.h2song
-share/hydrogen/data/click.wav
-share/hydrogen/data/demo_songs/GM_kit_demo1.h2song
-share/hydrogen/data/demo_songs/GM_kit_demo2.h2song
-share/hydrogen/data/demo_songs/GM_kit_demo3.h2song
-share/hydrogen/data/drumkits/GMkit/clap_Dry_c.wav
-share/hydrogen/data/drumkits/GMkit/cra_Jazz.wav
-share/hydrogen/data/drumkits/GMkit/cra_Rock_a.wav
-share/hydrogen/data/drumkits/GMkit/cym_Jazz.wav
-share/hydrogen/data/drumkits/GMkit/cym_Rock_b.wav
-share/hydrogen/data/drumkits/GMkit/drumkit.xml
-share/hydrogen/data/drumkits/GMkit/hhc_Dry_a.wav
-share/hydrogen/data/drumkits/GMkit/hhc_Rock_b.wav
-share/hydrogen/data/drumkits/GMkit/hhp_Dry_a.wav
-share/hydrogen/data/drumkits/GMkit/kick_Dry_b.wav
-share/hydrogen/data/drumkits/GMkit/misc_Cowbell.wav
-share/hydrogen/data/drumkits/GMkit/sn_Jazz_c.wav
-share/hydrogen/data/drumkits/GMkit/sn_Wet_b.wav
-share/hydrogen/data/drumkits/GMkit/stick_Woody.wav
-share/hydrogen/data/drumkits/GMkit/tom_Rock_hi.wav
-share/hydrogen/data/drumkits/GMkit/tom_Rock_lo.wav
-share/hydrogen/data/drumkits/GMkit/tom_Rock_mid.wav
-share/hydrogen/data/emptySample.wav
-@dirrm share/hydrogen/data/drumkits/GMkit
-@dirrm share/hydrogen/data/drumkits
-@dirrm share/hydrogen/data/demo_songs
-@dirrm share/hydrogen/data
-@dirrm share/hydrogen
-@dirrm include/hydrogen
diff --git a/audio/libhydrogen/buildlink3.mk b/audio/libhydrogen/buildlink3.mk
deleted file mode 100644
index aafb26f1eb9..00000000000
--- a/audio/libhydrogen/buildlink3.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:36 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBHYDROGEN_BUILDLINK3_MK:= ${LIBHYDROGEN_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libhydrogen
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibhydrogen}
-BUILDLINK_PACKAGES+= libhydrogen
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libhydrogen
-
-.if !empty(LIBHYDROGEN_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libhydrogen+= libhydrogen>=0.8.0
-BUILDLINK_ABI_DEPENDS.libhydrogen+= libhydrogen>=0.8.0nb2
-BUILDLINK_PKGSRCDIR.libhydrogen?= ../../audio/libhydrogen
-.endif # LIBHYDROGEN_BUILDLINK3_MK
-
-.include "../../audio/libaudiofile/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libhydrogen/distinfo b/audio/libhydrogen/distinfo
deleted file mode 100644
index 31165dbf17f..00000000000
--- a/audio/libhydrogen/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:47 agc Exp $
-
-SHA1 (libhydrogen-0.8.0.tar.gz) = 4f43b81653144ed4ade9df2e538259cf4289e3db
-RMD160 (libhydrogen-0.8.0.tar.gz) = 45f934f5884fd8dac5ee2c3470ae6caf08936591
-Size (libhydrogen-0.8.0.tar.gz) = 767576 bytes
-SHA1 (patch-aa) = 1ba199707bd50cd75abded457b77cf39a00d5ca1
diff --git a/audio/libhydrogen/patches/patch-aa b/audio/libhydrogen/patches/patch-aa
deleted file mode 100644
index b65bb6cc708..00000000000
--- a/audio/libhydrogen/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/07/06 14:51:17 xtraeme Exp $
-
---- src/OssDriver.h.orig 2003-09-24 14:20:31.000000000 +0200
-+++ src/OssDriver.h 2003-09-24 14:22:34.000000000 +0200
-@@ -51,11 +51,7 @@
- #include "GenericDriver.h"
- #include "PreferencesMng.h"
-
--#ifdef __NetBSD__
-- #define AUDIO_DEVICE "/dev/audio"
--#else
-- #define AUDIO_DEVICE "/dev/dsp"
--#endif
-+#define AUDIO_DEVICE DEVOSSAUDIO
-
- typedef int (*audioProcessCallback)(unsigned long, void *);
-
diff --git a/audio/libid3tag/DESCR b/audio/libid3tag/DESCR
deleted file mode 100644
index 14161e77aff..00000000000
--- a/audio/libid3tag/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-libid3tag is a library for reading and (eventually) writing ID3
-tags, both ID3v1 and the various versions of ID3v2.
diff --git a/audio/libid3tag/Makefile b/audio/libid3tag/Makefile
deleted file mode 100644
index a693c1c0aac..00000000000
--- a/audio/libid3tag/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2005/12/05 20:49:48 rillig Exp $
-#
-
-DISTNAME= libid3tag-0.15.1b
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mad/} \
- ftp://ftp.mars.org/pub/mpeg/
-
-MAINTAINER= simonb@NetBSD.org
-HOMEPAGE= http://sourceforge.net/projects/mad/
-COMMENT= ID3 tag library, part of MAD (MPEG Audio Decoder)
-
-CONFLICTS= mad<0.15
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
-USE_TOOLS+= pkg-config
-
-# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE:Q}
-
-INSTALLATION_DIRS= lib/pkgconfig
-
-post-build:
- ${SED} -e 's,@PREFIX@,${PREFIX},g' \
- -e 's,@VERSION@,${PKGVERSION},g' \
- < ${FILESDIR}/id3tag.pc.in > ${WRKDIR}/id3tag.pc
-
-post-install:
- ${INSTALL_DATA} ${WRKDIR}/id3tag.pc ${PREFIX}/lib/pkgconfig
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libid3tag/PLIST b/audio/libid3tag/PLIST
deleted file mode 100644
index 8da82fab545..00000000000
--- a/audio/libid3tag/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:16 jlam Exp $
-include/id3tag.h
-lib/libid3tag.la
-lib/pkgconfig/id3tag.pc
diff --git a/audio/libid3tag/buildlink3.mk b/audio/libid3tag/buildlink3.mk
deleted file mode 100644
index b2286c3fa36..00000000000
--- a/audio/libid3tag/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:36 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBID3TAG_BUILDLINK3_MK:= ${LIBID3TAG_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libid3tag
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibid3tag}
-BUILDLINK_PACKAGES+= libid3tag
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libid3tag
-
-.if !empty(LIBID3TAG_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libid3tag+= libid3tag>=0.15.0b
-BUILDLINK_ABI_DEPENDS.libid3tag+= libid3tag>=0.15.1bnb1
-BUILDLINK_PKGSRCDIR.libid3tag?= ../../audio/libid3tag
-.endif # LIBID3TAG_BUILDLINK3_MK
-
-.include "../../devel/zlib/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libid3tag/distinfo b/audio/libid3tag/distinfo
deleted file mode 100644
index 596067dd346..00000000000
--- a/audio/libid3tag/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:47 agc Exp $
-
-SHA1 (libid3tag-0.15.1b.tar.gz) = 4d867e8a8436e73cd7762fe0e85958e35f1e4306
-RMD160 (libid3tag-0.15.1b.tar.gz) = 31a69b8ad7684aefdb675acc8ebf89bd6f432095
-Size (libid3tag-0.15.1b.tar.gz) = 338143 bytes
-SHA1 (patch-aa) = 2103523de3b2703479bba578eb002b33ffff88b0
diff --git a/audio/libid3tag/files/id3tag.pc.in b/audio/libid3tag/files/id3tag.pc.in
deleted file mode 100644
index c494d0849ab..00000000000
--- a/audio/libid3tag/files/id3tag.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@PREFIX@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: id3tag
-Description: ID3 tag library
-Requires:
-Version: @VERSION@
-Libs: -Wl,-R${libdir} -L${libdir} -lid3tag -lz
-Cflags: -I${includedir}
diff --git a/audio/libid3tag/patches/patch-aa b/audio/libid3tag/patches/patch-aa
deleted file mode 100644
index fc0c1c9e512..00000000000
--- a/audio/libid3tag/patches/patch-aa
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/07/10 08:33:12 adam Exp $
-
---- configure.orig 2003-07-09 16:33:36.000000000 +0200
-+++ configure 2003-07-09 16:35:16.000000000 +0200
-@@ -7823,33 +7823,6 @@
- while test $# -gt 0
- do
- case "$1" in
-- -Wall)
-- if test "$GCC" = yes
-- then
-- :
-- else
-- CFLAGS="$CFLAGS $1"
-- fi
-- shift
-- ;;
-- -g)
-- debug="-g"
-- shift
-- ;;
-- -mno-cygwin)
-- shift
-- ;;
-- -m*)
-- arch="$arch $1"
-- shift
-- ;;
-- -fomit-frame-pointer)
-- shift
-- ;;
-- -O*|-f*)
-- optimize="$1"
-- shift
-- ;;
- *)
- CFLAGS="$CFLAGS $1"
- shift
diff --git a/audio/libmad/DESCR b/audio/libmad/DESCR
deleted file mode 100644
index b28a8a384fd..00000000000
--- a/audio/libmad/DESCR
+++ /dev/null
@@ -1,21 +0,0 @@
-MAD (libmad) is a high-quality MPEG audio decoder. It currently
-supports MPEG-1 and the MPEG-2 extension to Lower Sampling Frequencies,
-as well as the so-called MPEG 2.5 format. All three audio layers
-(Layer I, Layer II, and Layer III a.k.a. MP3) are fully implemented.
-
-MAD does not yet support MPEG-2 multichannel audio (although it
-should be backward compatible with such streams) nor does it
-currently support AAC.
-
-MAD has the following special features:
-
- - 24-bit PCM output
- - 100% fixed-point (integer) computation
- - completely new implementation based on the ISO/IEC standards
- - distributed under the terms of the GNU General Public License (GPL)
-
-Because MAD provides full 24-bit PCM output, applications using
-MAD are able to produce high quality audio. Even when the output
-device supports only 16-bit PCM, applications can use the extra
-resolution to increase the audible dynamic range through the use
-of dithering or noise shaping.
diff --git a/audio/libmad/Makefile b/audio/libmad/Makefile
deleted file mode 100644
index 72ca9e5620f..00000000000
--- a/audio/libmad/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2006/11/05 17:14:20 joerg Exp $
-#
-
-DISTNAME= libmad-0.15.1b
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mad/} \
- ftp://ftp.mars.org/pub/mpeg/
-
-MAINTAINER= simonb@NetBSD.org
-HOMEPAGE= http://sourceforge.net/projects/mad/
-COMMENT= High-quality MPEG audio decoder
-
-CONFLICTS= mad<0.15
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
-
-GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
-USE_TOOLS+= pkg-config
-
-# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE:Q}
-
-INSTALLATION_DIRS= lib/pkgconfig
-
-post-build:
- ${SED} -e 's,@PREFIX@,${PREFIX},g' \
- -e 's,@VERSION@,${PKGVERSION},g' \
- < ${FILESDIR}/mad.pc.in > ${WRKDIR}/mad.pc
-
-post-install:
- ${INSTALL_DATA} ${WRKDIR}/mad.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libmad/PLIST b/audio/libmad/PLIST
deleted file mode 100644
index d24ceb27824..00000000000
--- a/audio/libmad/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:16 jlam Exp $
-include/mad.h
-lib/libmad.la
-lib/pkgconfig/mad.pc
diff --git a/audio/libmad/buildlink3.mk b/audio/libmad/buildlink3.mk
deleted file mode 100644
index 83cae9d3c02..00000000000
--- a/audio/libmad/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:36 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBMAD_BUILDLINK3_MK:= ${LIBMAD_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libmad
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmad}
-BUILDLINK_PACKAGES+= libmad
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmad
-
-.if !empty(LIBMAD_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libmad+= libmad>=0.15.0b
-BUILDLINK_ABI_DEPENDS.libmad+= libmad>=0.15.1bnb1
-BUILDLINK_PKGSRCDIR.libmad?= ../../audio/libmad
-.endif # LIBMAD_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libmad/distinfo b/audio/libmad/distinfo
deleted file mode 100644
index 7ec5bebf41d..00000000000
--- a/audio/libmad/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:47 agc Exp $
-
-SHA1 (libmad-0.15.1b.tar.gz) = cac19cd00e1a907f3150cc040ccc077783496d76
-RMD160 (libmad-0.15.1b.tar.gz) = 0f3415ee10b188681e282ca69dec74c46ca73b0f
-Size (libmad-0.15.1b.tar.gz) = 502379 bytes
-SHA1 (patch-aa) = 82271980d28d151b6b85987e075ad15dace4ed3b
diff --git a/audio/libmad/files/mad.pc.in b/audio/libmad/files/mad.pc.in
deleted file mode 100644
index c0ba62e10b2..00000000000
--- a/audio/libmad/files/mad.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@PREFIX@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: mad
-Description: MPEG Audio Decoder
-Requires:
-Version: @VERSION@
-Libs: -Wl,-R${libdir} -L${libdir} -lmad -lm
-Cflags: -I${includedir}
diff --git a/audio/libmad/patches/patch-aa b/audio/libmad/patches/patch-aa
deleted file mode 100644
index bade458c4ef..00000000000
--- a/audio/libmad/patches/patch-aa
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/07/10 08:21:44 adam Exp $
-
---- configure.orig 2003-06-05 04:27:29.000000000 +0200
-+++ configure 2003-07-03 14:41:35.000000000 +0200
-@@ -7838,37 +7838,6 @@
- while test $# -gt 0
- do
- case "$1" in
-- -Wall)
-- if test "$GCC" = yes
-- then
-- :
-- else
-- CFLAGS="$CFLAGS $1"
-- fi
-- shift
-- ;;
-- -g)
-- debug="-g"
-- shift
-- ;;
-- -mno-cygwin)
-- shift
-- ;;
-- -m*)
-- arch="$arch $1"
-- shift
-- ;;
-- -O2)
-- optimize="-O"
-- shift
-- ;;
-- -fomit-frame-pointer)
-- shift
-- ;;
-- -O*|-f*)
-- optimize="$optimize $1"
-- shift
-- ;;
- *)
- CFLAGS="$CFLAGS $1"
- shift
diff --git a/audio/libmikmod/DESCR b/audio/libmikmod/DESCR
deleted file mode 100644
index a22dc659800..00000000000
--- a/audio/libmikmod/DESCR
+++ /dev/null
@@ -1,15 +0,0 @@
-The MikMod sound library is an excellent way for a programmer to
-add music and sound effects to an application. It is a powerful
-and flexible library, with a simple and easy-to-learn API.
-
-Besides, the library is very portable and runs under a lot of
-Unices, as well as under OS/2, MacOS and Windows. Third party
-individuals also maintain ports on other systems, including MS-DOS,
-and BeOS.
-
-MikMod is able to play a wide range of module formats, as well as
-digital sound files. It can take advantage of particular features
-of your system, such as sound redirection over the network. And
-due to its modular nature, the library can be extended to support
-more sound or module formats, as well as new hardware or other
-sound output capabilities, as they appear.
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
deleted file mode 100644
index ea870476b8b..00000000000
--- a/audio/libmikmod/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.42 2006/06/08 14:44:21 rillig Exp $
-
-DISTNAME= libmikmod-3.1.11
-PKGNAME= libmikmod-3.1.11.1
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= http://mikmod.raphnet.net/files/
-
-PATCH_SITES= ${MASTER_SITES}
-PATCHFILES= libmikmod-3.1.11-a.diff
-PATCH_DIST_STRIP= -p1
-
-MAINTAINER= kuebart@mathematik.uni-ulm.de
-HOMEPAGE= http://mikmod.raphnet.net/
-COMMENT= MikMod Sound Library
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_TOOLS+= gmake makeinfo
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-INFO_FILES= # PLIST
-
-CONFIGURE_ARGS+= --disable-threads
-
-.include "options.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libmikmod/PLIST b/audio/libmikmod/PLIST
deleted file mode 100644
index 15da99fb0f8..00000000000
--- a/audio/libmikmod/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2006/03/30 03:44:41 jlam Exp $
-bin/libmikmod-config
-include/mikmod.h
-info/mikmod.info
-lib/libmikmod.la
-man/man1/libmikmod-config.1
-share/aclocal/libmikmod.m4
diff --git a/audio/libmikmod/buildlink3.mk b/audio/libmikmod/buildlink3.mk
deleted file mode 100644
index dc07fa6e807..00000000000
--- a/audio/libmikmod/buildlink3.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/12/12 21:52:35 joerg Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBMIKMOD_BUILDLINK3_MK:= ${LIBMIKMOD_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= libmikmod
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmikmod}
-BUILDLINK_PACKAGES+= libmikmod
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmikmod
-
-.if ${LIBMIKMOD_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.libmikmod+= libmikmod>=3.1.9
-BUILDLINK_ABI_DEPENDS.libmikmod+= libmikmod>=3.1.11.1nb2
-BUILDLINK_PKGSRCDIR.libmikmod?= ../../audio/libmikmod
-
-. include "../../mk/bsd.fast.prefs.mk"
-. if !defined(PKG_BUILD_OPTIONS.libmikmod)
-PKG_BUILD_OPTIONS.libmikmod!= cd ${BUILDLINK_PKGSRCDIR.libmikmod} && \
- ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-MAKEFLAGS+= PKG_BUILD_OPTIONS.libmikmod=${PKG_BUILD_OPTIONS.libmikmod:Q}
-. endif
-MAKEVARS+= PKG_BUILD_OPTIONS.libmikmod
-
-# On some platforms, libmikmod dynamically loads esound,
-# so there is no library dependency
-. if !empty(PKG_BUILD_OPTIONS.libmikmod:Mesound) && \
- empty(OPSYS:MNetBSD) && empty(OPSYS:MLinux)
-. include "../../audio/esound/buildlink3.mk"
-. endif
-.endif # LIBMIKMOD_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libmikmod/distinfo b/audio/libmikmod/distinfo
deleted file mode 100644
index 0ed21a0c646..00000000000
--- a/audio/libmikmod/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.11 2006/03/17 22:37:35 jlam Exp $
-
-SHA1 (libmikmod-3.1.11.tar.gz) = ca18fff19348d3bcf3550aa920b129b082c5069a
-RMD160 (libmikmod-3.1.11.tar.gz) = 79b144cce51340b4c9abe09d1110dba2333d7bfb
-Size (libmikmod-3.1.11.tar.gz) = 611590 bytes
-SHA1 (libmikmod-3.1.11-a.diff) = 22c9f0aed6415612ed2b16d2eaed31a22207aeef
-RMD160 (libmikmod-3.1.11-a.diff) = 8a072ea0c8bb778f289554b3f13d653d065713dc
-Size (libmikmod-3.1.11-a.diff) = 67970 bytes
-SHA1 (patch-ab) = afda9a7d29e70e42c037163ac5b2d2742c77daab
-SHA1 (patch-ac) = 97554f00e4a4823e7a90f742679044fb8f887167
-SHA1 (patch-ad) = f2fc607efccd4d883ce6b642ab644f0e7bf747f6
diff --git a/audio/libmikmod/options.mk b/audio/libmikmod/options.mk
deleted file mode 100644
index f9d8ec40f20..00000000000
--- a/audio/libmikmod/options.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2006/03/09 21:04:40 jlam Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.libmikmod
-PKG_SUPPORTED_OPTIONS= esound oss
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mesound)
-.include "../../audio/esound/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-esd
-.endif
-
-.if !empty(PKG_OPTIONS:Moss)
-. include "../../mk/oss.buildlink3.mk"
-.endif
diff --git a/audio/libmikmod/patches/patch-ab b/audio/libmikmod/patches/patch-ab
deleted file mode 100644
index 797398b9085..00000000000
--- a/audio/libmikmod/patches/patch-ab
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2000/04/02 16:07:05 pooka Exp $
-
---- docs/mikmod.texi.orig Tue Feb 15 00:10:21 2000
-+++ docs/mikmod.texi Sun Apr 2 14:47:50 2000
-@@ -78,12 +78,14 @@
- @direntry
- * MikMod: (mikmod). MikMod Sound Library.
- @end direntry
-+@end ifnottex
-
- @c ========================================================== Top node
- @node Top, Introduction, (dir), (dir)
- @top MikMod Sound Library
- @w{This manual documents the MikMod Sound Library, version @value{library-version}.}
-
-+@ifnottex
- @menu
- * Introduction:: What is MikMod ?
- * Tutorial:: Your first steps with MikMod.
-@@ -3117,15 +3119,11 @@
- @end menu
- @end ifnottex
-
--@ifnottex
- @node Function Index, Type and Variable Index, Index, Index
--@end ifnottex
- @unnumbered Function Index
- @printindex fn
-
--@ifnottex
- @node Type and Variable Index, , Function Index, Index
--@end ifnottex
- @unnumbered Type and Variable Index
- @printindex vr
-
diff --git a/audio/libmikmod/patches/patch-ac b/audio/libmikmod/patches/patch-ac
deleted file mode 100644
index c4cd4ffc915..00000000000
--- a/audio/libmikmod/patches/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2002/08/31 03:47:54 wiz Exp $
-
---- configure.orig Tue Jan 22 01:21:19 2002
-+++ configure Thu Jul 11 02:05:35 2002
-@@ -1865,6 +1865,7 @@
- fi
-
-
-+if false ; then
- # Check if makeinfo support html output. If it doesn't, pretend it's missing
- # rather than failing rebuilding the documentation.
- echo $ac_n "checking if makeinfo supports html output""... $ac_c" 1>&6
-@@ -1887,6 +1888,7 @@
- else
- MAKEINFO="$MAKEINFO --no-split"
- fi
-+fi
-
- # ====================
- # Check for libraries.
diff --git a/audio/libmikmod/patches/patch-ad b/audio/libmikmod/patches/patch-ad
deleted file mode 100644
index e6364b0a69e..00000000000
--- a/audio/libmikmod/patches/patch-ad
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2002/11/19 13:04:38 salo Exp $
-
---- drivers/drv_sun.c.orig Sun Jan 13 01:58:57 2002
-+++ drivers/drv_sun.c Tue Nov 19 05:22:18 2002
-@@ -79,12 +79,18 @@
- #endif
-
- /* Sound device to open */
--#ifdef SUNOS4
-+#ifndef SOLARIS /* SunOS, NetBSD */
- #define SOUNDDEVICE "/dev/sound"
--#else /* Solaris, *BSD */
-+#else /* Solaris */
- #define SOUNDDEVICE "/dev/audio"
- #endif
-
-+/* Solaris */
-+#ifdef SOLARIS
-+#define AUDIO_ENCODING_SLINEAR AUDIO_ENCODING_LINEAR
-+#define AUDIO_ENCODING_ULINEAR AUDIO_ENCODING_LINEAR8
-+#endif
-+
- /* Compatibility defines, for old *BSD or SunOS systems */
- #ifndef AUDIO_ENCODING_PCM16
- #define AUDIO_ENCODING_PCM16 AUDIO_ENCODING_LINEAR
diff --git a/audio/libmodplug/DESCR b/audio/libmodplug/DESCR
deleted file mode 100644
index 74e343095da..00000000000
--- a/audio/libmodplug/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Libmodplug is a library for decoding mod-like music formats.
- Based on the ModPlug sound engine by Olivier Lapicque <olivierl@jps.net>
- Placed in the public domain in October, 2001
-
-Olivier Lapicque, author of Modplug, which is arguably the best quality
-MOD-playing software available, has placed his sound rendering code in the
-public domain.
diff --git a/audio/libmodplug/Makefile b/audio/libmodplug/Makefile
deleted file mode 100644
index c56563cb1f5..00000000000
--- a/audio/libmodplug/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2006/12/19 20:08:22 wiz Exp $
-#
-
-DISTNAME= libmodplug-0.8.4
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=modplug-xmms/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://modplug-xmms.sourceforge.net/
-COMMENT= Library for decoding mod-like music formats
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_LANGUAGES= c c++
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libmodplug/PLIST b/audio/libmodplug/PLIST
deleted file mode 100644
index 2f2401c49bc..00000000000
--- a/audio/libmodplug/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:16 jlam Exp $
-include/libmodplug/it_defs.h
-include/libmodplug/modplug.h
-include/libmodplug/sndfile.h
-include/libmodplug/stdafx.h
-lib/libmodplug.la
-lib/pkgconfig/libmodplug.pc
-@dirrm include/libmodplug
diff --git a/audio/libmodplug/buildlink3.mk b/audio/libmodplug/buildlink3.mk
deleted file mode 100644
index 839de556fe1..00000000000
--- a/audio/libmodplug/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:36 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBMODPLUG_BUILDLINK3_MK:= ${LIBMODPLUG_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libmodplug
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmodplug}
-BUILDLINK_PACKAGES+= libmodplug
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmodplug
-
-.if !empty(LIBMODPLUG_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libmodplug+= libmodplug>=0.7
-BUILDLINK_ABI_DEPENDS.libmodplug+= libmodplug>=0.7nb1
-BUILDLINK_PKGSRCDIR.libmodplug?= ../../audio/libmodplug
-.endif # LIBMODPLUG_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libmodplug/distinfo b/audio/libmodplug/distinfo
deleted file mode 100644
index 990e7fbe018..00000000000
--- a/audio/libmodplug/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/12/19 20:08:22 wiz Exp $
-
-SHA1 (libmodplug-0.8.4.tar.gz) = bf21746895d857e6995c9790c223ce1772f39ef0
-RMD160 (libmodplug-0.8.4.tar.gz) = 0c4c179ebc32bf88cecb162c391e91a5d36ad834
-Size (libmodplug-0.8.4.tar.gz) = 510758 bytes
diff --git a/audio/libmpcdec/DESCR b/audio/libmpcdec/DESCR
deleted file mode 100644
index fd32d2ec72a..00000000000
--- a/audio/libmpcdec/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Portable Musepack decoder library.
diff --git a/audio/libmpcdec/Makefile b/audio/libmpcdec/Makefile
deleted file mode 100644
index fca7b63c94a..00000000000
--- a/audio/libmpcdec/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/01/25 19:31:34 drochner Exp $
-#
-
-DISTNAME= libmpcdec-1.2.4
-CATEGORIES= audio
-MASTER_SITES= http://files.musepack.net/source/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.musepack.net/
-COMMENT= Portable Musepack decoder library
-
-GNU_CONFIGURE= yes
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-
-pre-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/include/mpcdec
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libmpcdec/PLIST b/audio/libmpcdec/PLIST
deleted file mode 100644
index ed726ad9221..00000000000
--- a/audio/libmpcdec/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/01/25 19:31:34 drochner Exp $
-include/mpcdec/config_types.h
-include/mpcdec/decoder.h
-include/mpcdec/huffman.h
-include/mpcdec/math.h
-include/mpcdec/mpcdec.h
-include/mpcdec/reader.h
-include/mpcdec/requant.h
-include/mpcdec/streaminfo.h
-lib/libmpcdec.la
-@dirrm include/mpcdec
diff --git a/audio/libmpcdec/buildlink3.mk b/audio/libmpcdec/buildlink3.mk
deleted file mode 100644
index 1eac98e9223..00000000000
--- a/audio/libmpcdec/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/01/25 19:31:34 drochner Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBMPCDEC_BUILDLINK3_MK:= ${LIBMPCDEC_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= libmpcdec
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmpcdec}
-BUILDLINK_PACKAGES+= libmpcdec
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmpcdec
-
-.if ${LIBMPCDEC_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.libmpcdec+= libmpcdec>=1.2.4
-BUILDLINK_PKGSRCDIR.libmpcdec?= ../../audio/libmpcdec
-.endif # LIBMPCDEC_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libmpcdec/distinfo b/audio/libmpcdec/distinfo
deleted file mode 100644
index 8ca580a6264..00000000000
--- a/audio/libmpcdec/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/01/25 19:31:34 drochner Exp $
-
-SHA1 (libmpcdec-1.2.4.tar.bz2) = 2522288ac1baf12854b92c219662bfc9bd88067b
-RMD160 (libmpcdec-1.2.4.tar.bz2) = d2414d1cbfacbdbcd479ce6855e3e439ccb6098a
-Size (libmpcdec-1.2.4.tar.bz2) = 259859 bytes
diff --git a/audio/libmpd/DESCR b/audio/libmpd/DESCR
deleted file mode 100644
index 01b373b4218..00000000000
--- a/audio/libmpd/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-libmpd is trying to provide a easy to use high level, callback
-based access to mpd. It tries to be fast and keep the data transfer
-with mpd to the minimum. To do this it implements queues for deleting
-and adding songs. There is extra functionality added for the ease
-of the programmer.
diff --git a/audio/libmpd/Makefile b/audio/libmpd/Makefile
deleted file mode 100644
index 7255fa24e46..00000000000
--- a/audio/libmpd/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2006/04/08 15:49:16 wiz Exp $
-#
-
-DISTNAME= libmpd-0.12.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= http://download.qballcow.nl/programs/gmpc-0.13/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://cms.qballcow.nl/index.php?page=libmpd
-COMMENT= Library to access mpd (musicpd)
-
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-PKGCONFIG_OVERRIDE= libmpd.pc.in
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libmpd/PLIST b/audio/libmpd/PLIST
deleted file mode 100644
index 8f5090f8c80..00000000000
--- a/audio/libmpd/PLIST
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2006/04/08 15:49:16 wiz Exp $
-include/libmpd/debug_printf.h
-include/libmpd/libmpd.h
-include/libmpd/libmpdclient.h
-include/libmpd/libmpd-database.h
-include/libmpd/libmpd-internal.h
-include/libmpd/libmpd-player.h
-include/libmpd/libmpd-playlist.h
-include/libmpd/libmpd-status.h
-include/libmpd/libmpd-strfsong.h
-lib/libmpd.la
-lib/libmpd.so.0.0.0
-lib/pkgconfig/libmpd.pc
-@dirrm include/libmpd
diff --git a/audio/libmpd/buildlink3.mk b/audio/libmpd/buildlink3.mk
deleted file mode 100644
index d0f9b4796e7..00000000000
--- a/audio/libmpd/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:36 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBMPD_BUILDLINK3_MK:= ${LIBMPD_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libmpd
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmpd}
-BUILDLINK_PACKAGES+= libmpd
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmpd
-
-.if !empty(LIBMPD_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libmpd+= libmpd>=0.12.0
-BUILDLINK_PKGSRCDIR.libmpd?= ../../audio/libmpd
-.endif # LIBMPD_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libmpd/distinfo b/audio/libmpd/distinfo
deleted file mode 100644
index f4c54c99c31..00000000000
--- a/audio/libmpd/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/04/07 17:37:53 rpaulo Exp $
-
-SHA1 (libmpd-0.12.0.tar.gz) = eec09ff8a82a4c408f649a53dc6a1f475e97395a
-RMD160 (libmpd-0.12.0.tar.gz) = 742f68d9c079dc879da7d3f784305bd29eb6d570
-Size (libmpd-0.12.0.tar.gz) = 322359 bytes
-SHA1 (patch-aa) = 4050fa9b8aeed532de3b965ffd13e9522a9c3358
diff --git a/audio/libmpd/patches/patch-aa b/audio/libmpd/patches/patch-aa
deleted file mode 100644
index 195bcb84dbb..00000000000
--- a/audio/libmpd/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/11/22 19:26:08 wiz Exp $
-
---- src/libmpd.c.orig 2005-08-14 20:06:20.000000000 +0200
-+++ src/libmpd.c
-@@ -2729,7 +2729,8 @@ regex_t ** mpd_misc_tokenize(char *strin
- char * temp=NULL;
- result = (regex_t **)realloc(result,(tokens+2)*sizeof(regex_t *));
- result[tokens] = malloc(sizeof(regex_t));
-- temp = (char *)strndup((const char *)&string[bpos], i-bpos);
-+ temp = (char *)strdup((const char *)&string[bpos]);
-+ temp[i-bpos] = '\0';
- if(regcomp(result[tokens], temp, REG_EXTENDED|REG_ICASE|REG_NOSUB))
- {
- result[tokens+1] = NULL;
diff --git a/audio/libmusepack/DESCR b/audio/libmusepack/DESCR
deleted file mode 100644
index 850d102aee0..00000000000
--- a/audio/libmusepack/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Musepack is an audio compression format with a strong emphasis on
-high quality. It's not lossless, but it is designed for transparency,
-so that you won't be able to hear differences between the original
-wave file and the much smaller MPC file.
-
-It is based on the MPEG-1 Layer-2 / MP2 algorithms, but has rapidly
-developed and vastly improved and is now at an advanced stage in
-which it contains heavily optimized and patentless code.
diff --git a/audio/libmusepack/Makefile b/audio/libmusepack/Makefile
deleted file mode 100644
index 7747204e5c7..00000000000
--- a/audio/libmusepack/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2007/02/22 19:01:14 wiz Exp $
-#
-
-DISTNAME= libmusepack-1.0.3
-CATEGORIES= audio
-MASTER_SITES= http://www.saunalahti.fi/grimmel/musepack.net/source/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.musepack.net/
-COMMENT= Portable Musepack decoder library
-
-USE_LANGUAGES= c c++
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libmusepack/PLIST b/audio/libmusepack/PLIST
deleted file mode 100644
index e54db8e19f1..00000000000
--- a/audio/libmusepack/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/02/01 10:21:57 drochner Exp $
-include/musepack/config_types.h
-include/musepack/mpc_dec.h
-include/musepack/mpc_math.h
-include/musepack/requant.h
-include/musepack/stdafx.h
-include/musepack/streaminfo.h
-lib/libmusepack.la
-@dirrm include/musepack
diff --git a/audio/libmusepack/buildlink3.mk b/audio/libmusepack/buildlink3.mk
deleted file mode 100644
index 4bdcbd55108..00000000000
--- a/audio/libmusepack/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.7 2007/02/01 10:21:57 drochner Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBMUSEPACK_BUILDLINK3_MK:= ${LIBMUSEPACK_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libmusepack
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmusepack}
-BUILDLINK_PACKAGES+= libmusepack
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmusepack
-
-.if !empty(LIBMUSEPACK_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libmusepack+= libmusepack>=1.0.3
-BUILDLINK_PKGSRCDIR.libmusepack?= ../../audio/libmusepack
-.endif # LIBMUSEPACK_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libmusepack/distinfo b/audio/libmusepack/distinfo
deleted file mode 100644
index 60b2e411330..00000000000
--- a/audio/libmusepack/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2007/02/01 10:21:58 drochner Exp $
-
-SHA1 (libmusepack-1.0.3.tar.bz2) = 2c2bc15f960c4593bee209fed939829e82ad030c
-RMD160 (libmusepack-1.0.3.tar.bz2) = 532a982c6e4af68d802812661c396a50db523c23
-Size (libmusepack-1.0.3.tar.bz2) = 226099 bytes
-SHA1 (patch-aa) = e4842ead0a8eced96b59cb4ce4062557464e49bb
diff --git a/audio/libmusepack/patches/patch-aa b/audio/libmusepack/patches/patch-aa
deleted file mode 100644
index f98c8fcb846..00000000000
--- a/audio/libmusepack/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2007/02/01 10:21:58 drochner Exp $
-
---- src/Makefile.in.orig 2004-11-29 03:42:18.000000000 +1100
-+++ src/Makefile.in
-@@ -190,7 +190,7 @@ AUTOMAKE_OPTIONS = foreign
- INCLUDES = -I$(top_builddir)/include
- lib_LTLIBRARIES = libmusepack.la
- libmusepack_la_SOURCES = mpc_dec.cpp bitstream.cpp huffsv7.cpp stdafx.cpp synth_filter.cpp huffsv46.cpp idtag.cpp requant.cpp streaminfo.cpp
--libmusepack_la_LDFLAGS = -no-undefined -version-info 1:3:0
-+libmusepack_la_LDFLAGS = -version-info 1:3:0
- sample_SOURCES = sample.cpp
- sample_LDADD = libmusepack.la
- all: all-am
diff --git a/audio/libofa/DESCR b/audio/libofa/DESCR
deleted file mode 100644
index 5d701bda4cc..00000000000
--- a/audio/libofa/DESCR
+++ /dev/null
@@ -1,22 +0,0 @@
-The world is drowning in individual music files astray with corrupt
-metadata, insignificant file names, and no way to identify the
-music.
-
-MusicDNS and the Open Fingerprint Architecture provide a system
-for identifying a piece of music with nothing more than the sound
-of the piece itself.
-
-MusicDNS is the largest single dataset of acoustic fingerprints in
-the world with more than 16 million individual tracks identified
-and growing DAILY! With the Open Fingerprint client-code, tracks
-can be identified consistently against the MusicDNS dataset, and
-new tracks are easily added.
-
-The Open Fingerprint is deployed world-wide--and now the client
-source code is available under Open Source license.
-
-Use the fingerprint code freely, or hook it up to the largest
-repository of fingerprinted tracks on the planet--MusicDNS. Free
-client keys for developers and non-profits are available on the
-website. For commercial deployment, use the low-cost MusicDNS.com
-service from MusicIP.
diff --git a/audio/libofa/Makefile b/audio/libofa/Makefile
deleted file mode 100644
index 7eac2227426..00000000000
--- a/audio/libofa/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/11/19 11:50:24 wiz Exp $
-#
-
-DISTNAME= libofa-0.9.3
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= http://www.musicdns.org/themes/musicdns_org/downloads/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.musicdns.org/
-COMMENT= Open Fingerprint Architecture library
-
-USE_PKGLOCALEDIR= yes
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-USE_TOOLS+= pkg-config
-GNU_CONFIGURE= yes
-
-PKGCONFIG_OVERRIDE+= libofa.pc.in
-
-.include "../../math/fftw/buildlink3.mk"
-# next two only needed for examples
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libofa/PLIST b/audio/libofa/PLIST
deleted file mode 100644
index de156d5c2aa..00000000000
--- a/audio/libofa/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/07/12 13:12:57 wiz Exp $
-include/ofa1/ofa.h
-lib/libofa.la
-lib/pkgconfig/libofa.pc
-@dirrm include/ofa1
diff --git a/audio/libofa/buildlink3.mk b/audio/libofa/buildlink3.mk
deleted file mode 100644
index 3a412d2246f..00000000000
--- a/audio/libofa/buildlink3.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/07/12 13:12:57 wiz Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBOFA_BUILDLINK3_MK:= ${LIBOFA_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= libofa
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibofa}
-BUILDLINK_PACKAGES+= libofa
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libofa
-
-.if ${LIBOFA_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.libofa+= libofa>=0.9.3
-BUILDLINK_PKGSRCDIR.libofa?= ../../audio/libofa
-.endif # LIBOFA_BUILDLINK3_MK
-
-.include "../../math/fftw/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libofa/distinfo b/audio/libofa/distinfo
deleted file mode 100644
index 7ffcb3c1b87..00000000000
--- a/audio/libofa/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/07/18 19:11:15 joerg Exp $
-
-SHA1 (libofa-0.9.3.tar.gz) = 3dec8e1dcea937f74b4165e9ffd4d4f355e4594a
-RMD160 (libofa-0.9.3.tar.gz) = 77f393570bb5356026c4b9c7195236bd96cb9143
-Size (libofa-0.9.3.tar.gz) = 384043 bytes
-SHA1 (patch-aa) = 5873559f25c2dd3ca7cd3beac089167faa1ce49f
-SHA1 (patch-ab) = ee3aa29a18926a1d9b9a29e3a7719b67501462bc
-SHA1 (patch-ac) = 9a40d7472c405b9bdc4b9c008f5a28c3a91fc5c9
diff --git a/audio/libofa/patches/patch-aa b/audio/libofa/patches/patch-aa
deleted file mode 100644
index 4e73408d920..00000000000
--- a/audio/libofa/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/07/12 13:12:57 wiz Exp $
-
---- lib/JAMA/tnt_math_utils.h.orig 2006-05-10 17:58:50.000000000 +0000
-+++ lib/JAMA/tnt_math_utils.h
-@@ -30,7 +30,7 @@ Real hypot(const Real &a, const Real &b)
- {
-
- if (a== 0)
-- return abs(b);
-+ return fabs(b);
- else
- {
- Real c = b/a;
diff --git a/audio/libofa/patches/patch-ab b/audio/libofa/patches/patch-ab
deleted file mode 100644
index f9d0073c506..00000000000
--- a/audio/libofa/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/07/18 19:11:15 joerg Exp $
-
---- examples/uselame.cpp.orig 2006-07-18 19:06:49.000000000 +0000
-+++ examples/uselame.cpp
-@@ -11,6 +11,7 @@
- #include "windows.h"
- #else
- #include <sys/wait.h>
-+#include <unistd.h>
- #endif
-
- AudioData *loadWaveFile(char *file);
diff --git a/audio/libofa/patches/patch-ac b/audio/libofa/patches/patch-ac
deleted file mode 100644
index 3613f6cd66f..00000000000
--- a/audio/libofa/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/07/18 19:11:15 joerg Exp $
-
---- examples/wavefile.cpp.orig 2006-07-18 19:07:25.000000000 +0000
-+++ examples/wavefile.cpp
-@@ -9,6 +9,8 @@
- #include "protocol.h"
- #ifdef WIN32
- #include "io.h"
-+#else
-+#include <unistd.h>
- #endif
- #include <fcntl.h>
-
diff --git a/audio/libopendaap/DESCR b/audio/libopendaap/DESCR
deleted file mode 100644
index e677d5bd24a..00000000000
--- a/audio/libopendaap/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-libopendaap is a library written in C which enables applications to
-discover, and connect to, iTunes(R) music shares.
-
-Unlike all other daap implementations, this library is able to connect
-to recent iTunes shares which require a special authentication
-algorithm.
diff --git a/audio/libopendaap/Makefile b/audio/libopendaap/Makefile
deleted file mode 100644
index 9d496cda6d0..00000000000
--- a/audio/libopendaap/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2006/07/07 15:49:30 jlam Exp $
-
-DISTNAME= libopendaap-0.4.0
-CATEGORIES= audio
-MASTER_SITES= http://craz.net/programs/itunes/files/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://craz.net/programs/itunes/libopendaap.html
-COMMENT= DAAP client library
-
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config
-
-SUBST_CLASSES+= pthread
-SUBST_STAGE.pthread= pre-configure
-SUBST_FILES.pthread= opendaap.pc.in
-SUBST_SED.pthread= -e 's|@@PTHREAD@@|${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}|'
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libopendaap/PLIST b/audio/libopendaap/PLIST
deleted file mode 100644
index 8f9575c812c..00000000000
--- a/audio/libopendaap/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2005/03/07 15:30:44 adam Exp $
-include/daap/client.h
-include/daap/portability.h
-lib/libopendaap.la
-lib/pkgconfig/opendaap.pc
-man/man3/libopendaap.3
-@dirrm include/daap
diff --git a/audio/libopendaap/buildlink3.mk b/audio/libopendaap/buildlink3.mk
deleted file mode 100644
index b04f5ad4fc5..00000000000
--- a/audio/libopendaap/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:36 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBOPENDAAP_BUILDLINK3_MK:= ${LIBOPENDAAP_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libopendaap
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibopendaap}
-BUILDLINK_PACKAGES+= libopendaap
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libopendaap
-
-.if !empty(LIBOPENDAAP_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libopendaap+= libopendaap>=0.2.1
-BUILDLINK_ABI_DEPENDS.libopendaap+= libopendaap>=0.2.1nb1
-BUILDLINK_PKGSRCDIR.libopendaap?= ../../audio/libopendaap
-.endif # LIBOPENDAAP_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libopendaap/distinfo b/audio/libopendaap/distinfo
deleted file mode 100644
index 31be0d3e242..00000000000
--- a/audio/libopendaap/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.11 2005/11/11 18:18:28 joerg Exp $
-
-SHA1 (libopendaap-0.4.0.tar.bz2) = 5fe4382af7ecc97a6cb510ebec87b40d6cf6ef38
-RMD160 (libopendaap-0.4.0.tar.bz2) = ed8732c6c487ef4902ff2d68552a66418cf2760d
-Size (libopendaap-0.4.0.tar.bz2) = 241953 bytes
-SHA1 (patch-aa) = c350abb98a94e21c12d03b585bcad97c9b926f74
-SHA1 (patch-ac) = d723c22d11df6d511290d45ccb54861fbecc178d
-SHA1 (patch-ad) = 88b72f80e4a6ed68f7ae74ace3f3dbf07709c0b1
-SHA1 (patch-ae) = 100264f35782e2ee44cfbbf1fc969c4689bd9593
-SHA1 (patch-af) = ba10291fd391f1f8ba6258924b44b1886b43e98f
-SHA1 (patch-ag) = cad5d2764258f4991491d673ab30f57c7c2b1646
diff --git a/audio/libopendaap/patches/patch-aa b/audio/libopendaap/patches/patch-aa
deleted file mode 100644
index 719a156c811..00000000000
--- a/audio/libopendaap/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2005/10/01 18:13:17 kristerw Exp $
-
-gcc-2.95.3 does not like code intermixed with declarations.
-
---- ioloop.c.orig Sat Oct 1 20:07:03 2005
-+++ ioloop.c Sat Oct 1 20:07:34 2005
-@@ -113,9 +113,9 @@
-
- void fd_event_reset(fd_event *event)
- {
-- event->signalled = 0;
- char buf[1] = {0};
- int flags;
-+ event->signalled = 0;
-
- /* set non-blocking on read pipe */
- flags = fcntl(event->pipe[0], F_GETFL, 0);
diff --git a/audio/libopendaap/patches/patch-ac b/audio/libopendaap/patches/patch-ac
deleted file mode 100644
index c83c96f2091..00000000000
--- a/audio/libopendaap/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2005/03/07 15:30:44 adam Exp $
-
---- http_client.c.orig 2005-03-07 16:25:15.000000000 +0000
-+++ http_client.c
-@@ -36,6 +36,7 @@
- # include <sys/types.h>
- # include <sys/socket.h>
- # include <sys/select.h>
-+# include <netinet/in.h>
- # include <netdb.h>
- # include <fcntl.h>
- #elif defined(SYSTEM_WIN32)
diff --git a/audio/libopendaap/patches/patch-ad b/audio/libopendaap/patches/patch-ad
deleted file mode 100644
index d8e863df209..00000000000
--- a/audio/libopendaap/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2005/03/07 15:30:44 adam Exp $
-
---- threadpool.c.orig 2004-12-14 04:56:23.000000000 +0000
-+++ threadpool.c
-@@ -279,9 +279,10 @@ unsigned int CP_ThreadPool_Release(CP_ST
- void CP_ThreadPool_QueueWorkItem(CP_SThreadPool *pTPThis, CP_TPfnJob pfnCallback,
- void *arg1, void *arg2)
- {
-+ CP_STPJobQueue *pTPJQNewJob;
- ts_mutex_lock(pTPThis->mtJobQueueMutex);
-
-- CP_STPJobQueue *pTPJQNewJob = malloc(sizeof(CP_STPJobQueue));
-+ pTPJQNewJob = malloc(sizeof(CP_STPJobQueue));
-
- pTPJQNewJob->fnJobCallback = pfnCallback;
- pTPJQNewJob->arg1 = arg1;
diff --git a/audio/libopendaap/patches/patch-ae b/audio/libopendaap/patches/patch-ae
deleted file mode 100644
index ae66ee463d9..00000000000
--- a/audio/libopendaap/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2005/11/11 18:18:28 joerg Exp $
-
---- Makefile.in.orig 2005-11-11 17:59:31.000000000 +0000
-+++ Makefile.in
-@@ -150,7 +150,7 @@ libopendaap_la_SOURCES = client.c \
- ioloop.c ioloop.h \
- endian_swap.h
-
--libopendaap_la_LDFLAGS = -version-number 0:1:0 -lpthread
-+libopendaap_la_LDFLAGS = -version-number 0:1:0 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
- libopendaap_la_LIBADD = authentication/libauthentication.la \
- debug/libdebug.la \
- mdnsd/libmdnsd.la
diff --git a/audio/libopendaap/patches/patch-af b/audio/libopendaap/patches/patch-af
deleted file mode 100644
index c075a67ff90..00000000000
--- a/audio/libopendaap/patches/patch-af
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-af,v 1.3 2005/10/01 18:13:17 kristerw Exp $
-
-gcc-2.95.3 does not like code intermixed with declarations.
-
---- client.c.orig Thu May 12 08:46:29 2005
-+++ client.c Sat Oct 1 20:02:09 2005
-@@ -1379,11 +1379,10 @@
- int requestid = 0;
-
- HTTP_Connection *http_connection;
-+ HTTP_GetResult *httpRes;
-
- if (strlen(songformat) > 4) return -1;
-
-- HTTP_GetResult *httpRes;
--
- if (pCHThis->version_major != 3)
- {
- buf = safe_sprintf(songUrl_42, databaseid, songid, songformat,
-@@ -1643,10 +1642,10 @@
- static void AsyncWaitUpdate(void *pv_pCHThis, void *unused)
- {
- DAAP_SClientHost *pCHThis = (DAAP_SClientHost*)pv_pCHThis;
-- TRACE("()\n");
- char hash[33] = {0};
- char updateUrl[] = "/update?session-id=%i&revision-number=%i&delta=%i";
- char *buf;
-+ TRACE("()\n");
-
- buf = safe_sprintf(updateUrl, pCHThis->sessionid, pCHThis->revision_number,
- pCHThis->revision_number);
diff --git a/audio/libopendaap/patches/patch-ag b/audio/libopendaap/patches/patch-ag
deleted file mode 100644
index c3269c18c0f..00000000000
--- a/audio/libopendaap/patches/patch-ag
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2005/11/11 18:18:28 joerg Exp $
-
---- opendaap.pc.in.orig 2005-11-11 18:00:56.000000000 +0000
-+++ opendaap.pc.in
-@@ -7,4 +7,4 @@ Name: opendaap
- Description: Open DAAP library
- Version: @VERSION@
- Cflags: -I${includedir}
--Libs: -L${libdir} -lopendaap -lpthread
-+Libs: -L${libdir} -lopendaap @@PTHREAD@@
diff --git a/audio/libopenspc/DESCR b/audio/libopenspc/DESCR
deleted file mode 100644
index dca98c5c1ba..00000000000
--- a/audio/libopenspc/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-The primary function of this code now is a library
-usable for other projects involving SPC emulation. Specifically, all of the
-functionality you would expect from an SPC emulation is there, without any
-pesky interface.
diff --git a/audio/libopenspc/Makefile b/audio/libopenspc/Makefile
deleted file mode 100644
index a7bee567316..00000000000
--- a/audio/libopenspc/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2007/02/08 15:43:06 tv Exp $
-#
-
-DISTNAME= OpenSPC_snap-20050926
-PKGNAME= libopenspc-0.3.99.20050926
-CATEGORIES= audio
-MASTER_SITES= http://home.comcast.net/~brad.martin1/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://home.comcast.net/~brad.martin1/
-COMMENT= Library and player for SPC sound files
-
-WRKSRC= ${WRKDIR}/libopenspc-0.3.99
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libopenspc/PLIST b/audio/libopenspc/PLIST
deleted file mode 100644
index c3cbbd0f25d..00000000000
--- a/audio/libopenspc/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/01/26 16:44:00 drochner Exp $
-bin/ospcplay
-include/openspc.h
-lib/libopenspc.la
diff --git a/audio/libopenspc/buildlink3.mk b/audio/libopenspc/buildlink3.mk
deleted file mode 100644
index 98870e1b298..00000000000
--- a/audio/libopenspc/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/01/26 16:44:00 drochner Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBOPENSPC_BUILDLINK3_MK:= ${LIBOPENSPC_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= libopenspc
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibopenspc}
-BUILDLINK_PACKAGES+= libopenspc
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libopenspc
-
-.if ${LIBOPENSPC_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.libopenspc+= libopenspc>=0.3.99.20050926
-BUILDLINK_PKGSRCDIR.libopenspc?= ../../audio/libopenspc
-.endif # LIBOPENSPC_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libopenspc/distinfo b/audio/libopenspc/distinfo
deleted file mode 100644
index 4f2473b929c..00000000000
--- a/audio/libopenspc/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/01/26 16:44:00 drochner Exp $
-
-SHA1 (OpenSPC_snap-20050926.tar.bz2) = 5f12938f07612b0f0138557263338ad74f7a83d5
-RMD160 (OpenSPC_snap-20050926.tar.bz2) = e7d64c9209f0acf376978cadf40724328daa038e
-Size (OpenSPC_snap-20050926.tar.bz2) = 240382 bytes
diff --git a/audio/libsamplerate/DESCR b/audio/libsamplerate/DESCR
deleted file mode 100644
index ca745ff16f5..00000000000
--- a/audio/libsamplerate/DESCR
+++ /dev/null
@@ -1,15 +0,0 @@
-Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio.
-One example of where such a thing would be useful is converting audio from
-the CD sample rate of 44.1kHz to the 48kHz sample rate used by DAT players.
-
-SRC is capable of arbitrary and time varying conversions; from downsampling
-by a factor of 12 to upsampling by the same factor. Arbitrary in this case
-means that the ratio of input and output sample rates can be an irrational
-number. The conversion ratio can also vary with time for speeding up and
-slowing down effects.
-
-SRC provides a small set of converters to allow quality to be traded off
-against computation cost. The current best converter provides a
-signal-to-noise ratio of 97dB with -3dB passband extending from DC to 96%
-of the theoretical best bandwidth for a given pair of input and output
-sample rates.
diff --git a/audio/libsamplerate/Makefile b/audio/libsamplerate/Makefile
deleted file mode 100644
index 6f37d9b00bf..00000000000
--- a/audio/libsamplerate/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2007/01/13 07:41:09 wiz Exp $
-#
-
-DISTNAME= libsamplerate-0.1.2
-PKGREVISION= 4
-CATEGORIES= audio
-MASTER_SITES= http://www.mega-nerd.com/SRC/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.mega-nerd.com/SRC/
-COMMENT= Sample rate converter library
-
-GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
-USE_TOOLS+= pkg-config
-PKGCONFIG_OVERRIDE+= ${WRKSRC}/samplerate.pc.in
-
-TEST_TARGET= check
-
-BUILDLINK_API_DEPENDS.libsndfile+= libsndfile>=1.0.2
-
-.include "../../audio/libsndfile/buildlink3.mk"
-.include "../../math/fftw/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libsamplerate/PLIST b/audio/libsamplerate/PLIST
deleted file mode 100644
index 1e25d71ed89..00000000000
--- a/audio/libsamplerate/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:16 jlam Exp $
-bin/sndfile-resample
-include/samplerate.h
-lib/libsamplerate.la
-lib/pkgconfig/samplerate.pc
diff --git a/audio/libsamplerate/buildlink3.mk b/audio/libsamplerate/buildlink3.mk
deleted file mode 100644
index da9ae2fbada..00000000000
--- a/audio/libsamplerate/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.10 2007/01/07 12:25:51 wiz Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBSAMPLERATE_BUILDLINK3_MK:= ${LIBSAMPLERATE_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libsamplerate
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsamplerate}
-BUILDLINK_PACKAGES+= libsamplerate
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsamplerate
-
-.if !empty(LIBSAMPLERATE_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libsamplerate+= libsamplerate>=0.0.13nb1
-BUILDLINK_ABI_DEPENDS.libsamplerate+= libsamplerate>=0.1.2nb3
-BUILDLINK_PKGSRCDIR.libsamplerate?= ../../audio/libsamplerate
-.endif # LIBSAMPLERATE_BUILDLINK3_MK
-
-.include "../../audio/libsndfile/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libsamplerate/distinfo b/audio/libsamplerate/distinfo
deleted file mode 100644
index ed0c321ab97..00000000000
--- a/audio/libsamplerate/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:48 agc Exp $
-
-SHA1 (libsamplerate-0.1.2.tar.gz) = 663ac147d1dfbe686bf687e78143259b5075fc13
-RMD160 (libsamplerate-0.1.2.tar.gz) = 4e5453821b80b17586ad66068e409ed0437cca02
-Size (libsamplerate-0.1.2.tar.gz) = 707867 bytes
diff --git a/audio/libshout/DESCR b/audio/libshout/DESCR
deleted file mode 100644
index b98ae486715..00000000000
--- a/audio/libshout/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-'libshout' allows applications to easily communicate and broadcast to
-an Icecast streaming media server. It handles the socket connections,
-metadata communication, and data streaming for the calling application,
-and lets developers focus on feature sets instead of implementation
-details.
diff --git a/audio/libshout/Makefile b/audio/libshout/Makefile
deleted file mode 100644
index 92e8892a6a3..00000000000
--- a/audio/libshout/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2006/10/04 20:44:19 wiz Exp $
-#
-
-DISTNAME= libshout-2.1
-CATEGORIES= audio
-MASTER_SITES= http://downloads.xiph.org/releases/libshout/
-
-MAINTAINER= kim@tac.nyc.ny.us
-HOMEPAGE= http://directory.fsf.org/audio/ogg/libshout.html
-COMMENT= Connects and sends data to icecast servers
-
-USE_LIBTOOL= YES
-PTHREAD_OPTS+= require
-
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --disable-pkgconfig
-
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../multimedia/libtheora/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libshout/PLIST b/audio/libshout/PLIST
deleted file mode 100644
index 4b9570bd194..00000000000
--- a/audio/libshout/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2005/02/28 02:21:20 kim Exp $
-bin/shout-config
-include/shout/shout.h
-lib/libshout.la
-share/aclocal/shout.m4
-share/doc/libshout/COPYING
-share/doc/libshout/README
-share/doc/libshout/example.c
-share/doc/libshout/nonblocking.c
-@dirrm share/doc/libshout
-@dirrm include/shout
diff --git a/audio/libshout/buildlink3.mk b/audio/libshout/buildlink3.mk
deleted file mode 100644
index f199b9c4dc5..00000000000
--- a/audio/libshout/buildlink3.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:37 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBSHOUT_BUILDLINK3_MK:= ${LIBSHOUT_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libshout
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibshout}
-BUILDLINK_PACKAGES+= libshout
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libshout
-
-.if !empty(LIBSHOUT_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libshout+= libshout>=2.0
-BUILDLINK_ABI_DEPENDS.libshout+=libshout>=2.0nb1
-BUILDLINK_PKGSRCDIR.libshout?= ../../audio/libshout
-.endif # LIBSHOUT_BUILDLINK3_MK
-
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../multimedia/libtheora/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libshout/distinfo b/audio/libshout/distinfo
deleted file mode 100644
index 50a89ccf392..00000000000
--- a/audio/libshout/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/04/05 15:02:44 agc Exp $
-
-SHA1 (libshout-2.1.tar.gz) = c251d0791d807762957235442fa9b777f3f6068c
-RMD160 (libshout-2.1.tar.gz) = edcbf2c8111bd76ce27734513a4c483986ba2e7e
-Size (libshout-2.1.tar.gz) = 455243 bytes
diff --git a/audio/libsidplay/DESCR b/audio/libsidplay/DESCR
deleted file mode 100644
index 00a4e77eecb..00000000000
--- a/audio/libsidplay/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Libsidplay contains the necessary sidtune routines used by the sidplay
-package.
diff --git a/audio/libsidplay/Makefile b/audio/libsidplay/Makefile
deleted file mode 100644
index 44ee6de1ca2..00000000000
--- a/audio/libsidplay/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2006/07/22 04:46:14 rillig Exp $
-#
-
-DISTNAME= libsidplay-1.36.59
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= pooka@NetBSD.org
-HOMEPAGE= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/
-COMMENT= Sidplay Library
-
-CONFLICTS= sidplay-1.36.*
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake
-USE_LANGUAGES= c c++
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libsidplay/PLIST b/audio/libsidplay/PLIST
deleted file mode 100644
index e0fa6a27cca..00000000000
--- a/audio/libsidplay/PLIST
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:16 jlam Exp $
-include/sidplay/compconf.h
-include/sidplay/libcfg.h
-include/sidplay/emucfg.h
-include/sidplay/fformat.h
-include/sidplay/fixpoint.h
-include/sidplay/myendian.h
-include/sidplay/mytypes.h
-include/sidplay/player.h
-include/sidplay/sidtune.h
-include/sidplay/version.h
-lib/libsidplay.la
-@dirrm include/sidplay
diff --git a/audio/libsidplay/buildlink3.mk b/audio/libsidplay/buildlink3.mk
deleted file mode 100644
index c4ae2a838f7..00000000000
--- a/audio/libsidplay/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:37 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBSIDPLAY_BUILDLINK3_MK:= ${LIBSIDPLAY_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libsidplay
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsidplay}
-BUILDLINK_PACKAGES+= libsidplay
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsidplay
-
-.if !empty(LIBSIDPLAY_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libsidplay+= libsidplay>=1.36.38
-BUILDLINK_ABI_DEPENDS.libsidplay+= libsidplay>=1.36.59nb2
-BUILDLINK_PKGSRCDIR.libsidplay?= ../../audio/libsidplay
-.endif # LIBSIDPLAY_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libsidplay/distinfo b/audio/libsidplay/distinfo
deleted file mode 100644
index 766d30b6235..00000000000
--- a/audio/libsidplay/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 20:39:48 agc Exp $
-
-SHA1 (libsidplay-1.36.59.tgz) = 66056b55dc96b9ae1aab542f0260d1e6db158e51
-RMD160 (libsidplay-1.36.59.tgz) = 8dffb19abac64934f00a65a8adc859fbdf39657e
-Size (libsidplay-1.36.59.tgz) = 390097 bytes
diff --git a/audio/libsidplay2/DESCR b/audio/libsidplay2/DESCR
deleted file mode 100644
index 6cb395f548b..00000000000
--- a/audio/libsidplay2/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Libsidplay2 contains the necessary sidtune routines used by the sidplay2
-package.
diff --git a/audio/libsidplay2/Makefile b/audio/libsidplay2/Makefile
deleted file mode 100644
index 8b3c636c663..00000000000
--- a/audio/libsidplay2/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2006/10/08 21:31:31 rillig Exp $
-#
-
-DISTNAME= sidplay-libs-2.1.1
-PKGNAME= libsidplay2-2.1.1
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sidplay2/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://sidplay2.sourceforge.net/
-COMMENT= Sidplay2 Library
-
-OVERRIDE_DIRDEPTH= 3
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake
-USE_LANGUAGES= c c++
-
-CONFIGURE_ARGS+= --includedir=${PREFIX:Q}/include/libsidplay2
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libsidplay2/PLIST b/audio/libsidplay2/PLIST
deleted file mode 100644
index 7a294905723..00000000000
--- a/audio/libsidplay2/PLIST
+++ /dev/null
@@ -1,34 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/04/09 13:12:02 joerg Exp $
-@exec ${MKDIR} %D/include/libsidplay2/resid
-include/libsidplay2/sidplay/Buffer.h
-include/libsidplay2/sidplay/SidTune.h
-include/libsidplay2/sidplay/SmartPtr.h
-include/libsidplay2/sidplay/builders/resid.h
-include/libsidplay2/sidplay/c64env.h
-include/libsidplay2/sidplay/component.h
-include/libsidplay2/sidplay/event.h
-include/libsidplay2/sidplay/sid2types.h
-include/libsidplay2/sidplay/sidbuilder.h
-include/libsidplay2/sidplay/sidconfig.h
-include/libsidplay2/sidplay/sidendian.h
-include/libsidplay2/sidplay/sidint.h
-include/libsidplay2/sidplay/sidplay2.h
-include/libsidplay2/sidplay/sidtypes.h
-include/libsidplay2/sidplay/sidusage.h
-include/libsidplay2/sidplay/utils/SidDatabase.h
-include/libsidplay2/sidplay/utils/SidFilter.h
-include/libsidplay2/sidplay/utils/SidTuneMod.h
-include/libsidplay2/sidplay/utils/SidUsage.h
-include/libsidplay2/sidplay/utils/libini.h
-lib/libsidplay2.la
-lib/libsidutils.la
-lib/pkgconfig/libsidplay2.pc
-lib/pkgconfig/libsidutils.pc
-lib/sidplay/builders/libresid-builder.la
-@dirrm lib/sidplay/builders
-@dirrm lib/sidplay
-@dirrm include/libsidplay2/sidplay/utils
-@dirrm include/libsidplay2/sidplay/builders
-@dirrm include/libsidplay2/sidplay
-@dirrm include/libsidplay2/resid
-@dirrm include/libsidplay2
diff --git a/audio/libsidplay2/PLIST.Linux b/audio/libsidplay2/PLIST.Linux
deleted file mode 100644
index 5c5d7dd0020..00000000000
--- a/audio/libsidplay2/PLIST.Linux
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.1 2006/06/09 15:24:09 minskim Exp $
-include/libsidplay2/sidplay/builders/hardsid.h
-lib/sidplay/builders/libhardsid-builder.la
diff --git a/audio/libsidplay2/buildlink3.mk b/audio/libsidplay2/buildlink3.mk
deleted file mode 100644
index b4b744de157..00000000000
--- a/audio/libsidplay2/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 23:10:37 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBSIDPLAY2_BUILDLINK3_MK:= ${LIBSIDPLAY2_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libsidplay2
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsidplay2}
-BUILDLINK_PACKAGES+= libsidplay2
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsidplay2
-
-.if !empty(LIBSIDPLAY2_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libsidplay2+= libsidplay2>=2.0.9
-BUILDLINK_PKGSRCDIR.libsidplay2?= ../../audio/libsidplay2
-.endif # LIBSIDPLAY2_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libsidplay2/distinfo b/audio/libsidplay2/distinfo
deleted file mode 100644
index dd9d0eadf3d..00000000000
--- a/audio/libsidplay2/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/04/19 16:51:47 joerg Exp $
-
-SHA1 (sidplay-libs-2.1.1.tar.gz) = 8af6350866edc30b0d331e075fa97292f6f645a5
-RMD160 (sidplay-libs-2.1.1.tar.gz) = 1ce4c3cb80470a834c5887b3f3be0b61ca71e4cd
-Size (sidplay-libs-2.1.1.tar.gz) = 1900252 bytes
-SHA1 (patch-aa) = 78d39563d5296070ef4dd7f51df39f488dcc5343
diff --git a/audio/libsidplay2/patches/patch-aa b/audio/libsidplay2/patches/patch-aa
deleted file mode 100644
index bcfe36bd22e..00000000000
--- a/audio/libsidplay2/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/04/19 16:51:47 joerg Exp $
-
---- libsidplay/include/sidplay/SmartPtr.h.orig 2006-04-19 15:53:41.000000000 +0000
-+++ libsidplay/include/sidplay/SmartPtr.h
-@@ -211,16 +211,16 @@ class SmartPtr_sidtt : public SmartPtrBa
- {
- if ( bufferLen >= 1 )
- {
-- pBufCurrent = ( bufBegin = buffer );
-- bufEnd = bufBegin + bufferLen;
-- bufLen = bufferLen;
-- status = true;
-+ this->pBufCurrent = ( this->bufBegin = buffer );
-+ this->bufEnd = this->bufBegin + bufferLen;
-+ this->bufLen = bufferLen;
-+ this->status = true;
- }
- else
- {
-- pBufCurrent = bufBegin = bufEnd = 0;
-- bufLen = 0;
-- status = false;
-+ this->pBufCurrent = this->bufBegin = this->bufEnd = 0;
-+ this->bufLen = 0;
-+ this->status = false;
- }
- }
- };
diff --git a/audio/libsndfile/DESCR b/audio/libsndfile/DESCR
deleted file mode 100644
index df3da1a4c56..00000000000
--- a/audio/libsndfile/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Libsndfile is a C library for reading and writing files containing
-sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format)
-through one standard library interface.
diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
deleted file mode 100644
index 9dbb3059270..00000000000
--- a/audio/libsndfile/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.41 2007/01/07 15:02:16 wiz Exp $
-
-DISTNAME= libsndfile-1.0.17
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= http://www.mega-nerd.com/libsndfile/
-
-PATCHFILES= libsndfile-1.0.17+flac-1.1.3.patch.bz2
-PATCH_SITES= ${MASTER_SITE_GENTOO:=distfiles/}
-PATCH_DIST_STRIP= -p1
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.mega-nerd.com/libsndfile/
-COMMENT= Library for reading and writing audio files
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_LIBTOOL= yes
-PKGCONFIG_OVERRIDE= sndfile.pc.in
-GNU_CONFIGURE= yes
-
-# This package compiles with gcc2, but its configure script doesn't know that
-CONFIGURE_ENV+= ac_cv_c_struct_hack=yes
-# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE:Q}
-
-.include "options.mk"
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-BUILDLINK_PASSTHRU_DIRS+= /Developer
-.endif
-
-.include "../../audio/flac/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libsndfile/PLIST b/audio/libsndfile/PLIST
deleted file mode 100644
index a405db3585e..00000000000
--- a/audio/libsndfile/PLIST
+++ /dev/null
@@ -1,35 +0,0 @@
-@comment $NetBSD: PLIST,v 1.14 2006/09/01 06:02:23 adam Exp $
-bin/sndfile-convert
-bin/sndfile-info
-bin/sndfile-play
-bin/sndfile-regtest
-include/sndfile.h
-include/sndfile.hh
-lib/libsndfile.la
-lib/pkgconfig/sndfile.pc
-man/man1/sndfile-convert.1
-man/man1/sndfile-info.1
-man/man1/sndfile-play.1
-share/doc/libsndfile1-dev/html/FAQ.html
-share/doc/libsndfile1-dev/html/api.html
-share/doc/libsndfile1-dev/html/bugs.html
-share/doc/libsndfile1-dev/html/command.html
-share/doc/libsndfile1-dev/html/dither.html
-share/doc/libsndfile1-dev/html/embedded_files.html
-share/doc/libsndfile1-dev/html/index.html
-share/doc/libsndfile1-dev/html/libsndfile.css
-share/doc/libsndfile1-dev/html/libsndfile.jpg
-share/doc/libsndfile1-dev/html/lists.html
-share/doc/libsndfile1-dev/html/new_file_type.HOWTO
-share/doc/libsndfile1-dev/html/octave.html
-share/doc/libsndfile1-dev/html/pkgconfig.html
-share/doc/libsndfile1-dev/html/sndfile_info.html
-share/doc/libsndfile1-dev/html/win32.html
-share/octave/site/m/sndfile_load.m
-share/octave/site/m/sndfile_play.m
-share/octave/site/m/sndfile_save.m
-@dirrm share/doc/libsndfile1-dev/html
-@dirrm share/doc/libsndfile1-dev
-@dirrm share/octave/site/m
-@dirrm share/octave/site
-@dirrm share/octave
diff --git a/audio/libsndfile/buildlink3.mk b/audio/libsndfile/buildlink3.mk
deleted file mode 100644
index 2d587f888d5..00000000000
--- a/audio/libsndfile/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.11 2007/01/07 12:25:52 wiz Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBSNDFILE_BUILDLINK3_MK:= ${LIBSNDFILE_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libsndfile
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsndfile}
-BUILDLINK_PACKAGES+= libsndfile
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsndfile
-
-.if !empty(LIBSNDFILE_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libsndfile+= libsndfile>=1.0.0
-BUILDLINK_ABI_DEPENDS.libsndfile+= libsndfile>=1.0.17nb1
-BUILDLINK_PKGSRCDIR.libsndfile?= ../../audio/libsndfile
-.endif # LIBSNDFILE_BUILDLINK3_MK
-
-.include "../../audio/flac/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libsndfile/distinfo b/audio/libsndfile/distinfo
deleted file mode 100644
index 0a6c997ea71..00000000000
--- a/audio/libsndfile/distinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.22 2007/01/07 15:02:16 wiz Exp $
-
-SHA1 (libsndfile-1.0.17+flac-1.1.3.patch.bz2) = 10e0d19dfc8cf2a6bf499e0fa0d1ab17dca4c519
-RMD160 (libsndfile-1.0.17+flac-1.1.3.patch.bz2) = fc6e6f03069c1ad8ee43f600f6ac2aa6e97bb1f5
-Size (libsndfile-1.0.17+flac-1.1.3.patch.bz2) = 3127 bytes
-SHA1 (libsndfile-1.0.17.tar.gz) = 2f66798d596a15491fbd1191ded8125ed71ef411
-RMD160 (libsndfile-1.0.17.tar.gz) = ae93822a4c587dcdd7c70d043d2a38ed2fe3a188
-Size (libsndfile-1.0.17.tar.gz) = 819456 bytes
-SHA1 (patch-aa) = a3bb33cc28c10c9aa23a0b066339a512dbd7b0e2
-SHA1 (patch-ab) = 007a93229bc8cbcb1b27e6223e8c10e8a2e3c6eb
-SHA1 (patch-ac) = 7d49a0da2dfa9470d188873133526e8ad851c9a7
-SHA1 (patch-ad) = b730de6bb0716bece5f83c3100f9fc0f8eb2ae7d
-SHA1 (patch-ae) = 628700514d3d2e6e12abb182c697311a233c1bd9
-SHA1 (patch-af) = 9ac0dd446a2f24c2d39e20063489a3b778fcda36
-SHA1 (patch-ag) = 10d0fcda9377fc6afa2dce9e4782f49889a4f4a3
-SHA1 (patch-ah) = 8c936316ca1191f8893579a562ff705c8dde6f92
diff --git a/audio/libsndfile/options.mk b/audio/libsndfile/options.mk
deleted file mode 100644
index 67db7fbf5a6..00000000000
--- a/audio/libsndfile/options.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: options.mk,v 1.3 2006/03/09 21:04:40 jlam Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.libsndfile
-PKG_SUPPORTED_OPTIONS= oss
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Moss)
-.include "../../mk/oss.buildlink3.mk"
-OSS_DEFS= -DDEV_DSP=\"${DEVOSSAUDIO:Q}\" -DUSE_OSS=1
-MAKE_ENV+= AM_CFLAGS=${OSS_DEFS:Q}
-.endif
diff --git a/audio/libsndfile/patches/patch-aa b/audio/libsndfile/patches/patch-aa
deleted file mode 100644
index 59771748172..00000000000
--- a/audio/libsndfile/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.13 2006/09/01 06:02:23 adam Exp $
-
---- src/Makefile.in.orig 2006-08-31 12:55:38.000000000 +0200
-+++ src/Makefile.in
-@@ -864,7 +864,7 @@ cygsndfile.def: create_symbols_file.py
- ./create_symbols_file.py cygwin $(VERSION) > cygsndfile.def
-
- # Fake dependancy to force the creation of these files.
--sndfile.c : Symbols.linux Symbols.darwin libsndfile.def cygsndfile.def
-+sndfile.c :
-
- # Dependancies.
-
diff --git a/audio/libsndfile/patches/patch-ab b/audio/libsndfile/patches/patch-ab
deleted file mode 100644
index 929d3f92133..00000000000
--- a/audio/libsndfile/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2006/01/21 23:04:08 adam Exp $
-
---- src/common.h.orig 2006-01-21 04:53:40.000000000 +0100
-+++ src/common.h
-@@ -152,7 +152,7 @@ typedef struct
-
- #if HAVE_FLEXIBLE_ARRAY
- /* the per channel peak info */
-- PEAK_POS peaks [] ;
-+ PEAK_POS *peaks ;
- #else
- /*
- ** This is not ISO compliant C. It works on some compilers which
diff --git a/audio/libsndfile/patches/patch-ac b/audio/libsndfile/patches/patch-ac
deleted file mode 100644
index 9d2378d4520..00000000000
--- a/audio/libsndfile/patches/patch-ac
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2006/09/01 06:02:23 adam Exp $
-
---- examples/sndfile-play.c.orig 2006-08-31 11:22:07.000000000 +0200
-+++ examples/sndfile-play.c
-@@ -34,16 +34,21 @@
- #include <sys/time.h>
- #endif
-
--#if defined (__linux__)
-+#if defined (__linux__) || defined(USE_OSS)
- #include <fcntl.h>
- #include <sys/ioctl.h>
- #include <sys/soundcard.h>
-
-+ #ifndef DEV_DSP
-+ #define DEV_DSP "/dev/dsp"
-+ #endif
-+
- #elif (defined (__MACH__) && defined (__APPLE__))
- #include <Carbon.h>
- #include <CoreAudio/AudioHardware.h>
-
--#elif (defined (sun) && defined (unix))
-+#elif (defined (sun) && defined (unix)) || \
-+ (defined (__NetBSD__) && !defined(USE_OSS))
- #include <fcntl.h>
- #include <sys/ioctl.h>
- #include <sys/audioio.h>
-@@ -339,7 +344,7 @@ alsa_write_float (snd_pcm_t *alsa_dev, f
- ** Linux/OSS functions for playing a sound.
- */
-
--#if defined (__linux__)
-+#if defined (__linux__) || defined(USE_OSS)
-
- static int linux_open_dsp_device (int channels, int srate) ;
-
-@@ -408,7 +413,7 @@ static int
- linux_open_dsp_device (int channels, int srate)
- { int fd, stereo, fmt ;
-
-- if ((fd = open ("/dev/dsp", O_WRONLY, 0)) == -1 &&
-+ if ((fd = open (DEV_DSP, O_WRONLY, 0)) == -1 &&
- (fd = open ("/dev/sound/dsp", O_WRONLY, 0)) == -1)
- { perror ("linux_open_dsp_device : open ") ;
- exit (1) ;
-@@ -819,7 +824,8 @@ win32_play (int argc, char *argv [])
- ** Solaris.
- */
-
--#if (defined (sun) && defined (unix)) /* ie Solaris */
-+#if (defined (sun) && defined (unix)) || \
-+ (defined (__NetBSD__) && !defined(USE_OSS))
-
- static void
- solaris_play (int argc, char *argv [])
-@@ -926,7 +932,7 @@ main (int argc, char *argv [])
- return 1 ;
- } ;
-
--#if defined (__linux__)
-+#if defined (__linux__) || defined (USE_OSS)
- #if HAVE_ALSA_ASOUNDLIB_H
- if (access ("/proc/asound/cards", R_OK) == 0)
- alsa_play (argc, argv) ;
-@@ -935,7 +941,8 @@ main (int argc, char *argv [])
- linux_play (argc, argv) ;
- #elif (defined (__MACH__) && defined (__APPLE__))
- macosx_play (argc, argv) ;
--#elif (defined (sun) && defined (unix))
-+#elif (defined (sun) && defined (unix)) || \
-+ (defined (__NetBSD__) && !defined(USE_OSS))
- solaris_play (argc, argv) ;
- #elif (OS_IS_WIN32 == 1)
- win32_play (argc, argv) ;
diff --git a/audio/libsndfile/patches/patch-ad b/audio/libsndfile/patches/patch-ad
deleted file mode 100644
index b6dd33c1c27..00000000000
--- a/audio/libsndfile/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.10 2006/09/01 06:02:23 adam Exp $
-
---- examples/Makefile.in.orig 2006-08-31 12:55:32.000000000 +0200
-+++ examples/Makefile.in
-@@ -238,7 +238,7 @@ INCLUDES = -I$(srcdir)/$(SNDFILEDIR) $(O
- sndfile_info_SOURCES = sndfile-info.c
- sndfile_info_LDADD = $(SNDFILEDIR)/libsndfile.la
- sndfile_play_SOURCES = sndfile-play.c
--sndfile_play_LDADD = $(SNDFILEDIR)/libsndfile.la $(OS_SPECIFIC_LINKS) $(ALSA_LIBS)
-+sndfile_play_LDADD = $(SNDFILEDIR)/libsndfile.la $(OS_SPECIFIC_LINKS) $(ALSA_LIBS) $(LIBOSSAUDIO)
- sndfile_convert_SOURCES = sndfile-convert.c
- sndfile_convert_LDADD = $(SNDFILEDIR)/libsndfile.la
- make_sine_SOURCES = make_sine.c
diff --git a/audio/libsndfile/patches/patch-ae b/audio/libsndfile/patches/patch-ae
deleted file mode 100644
index e544ec917cd..00000000000
--- a/audio/libsndfile/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2006/01/21 23:04:08 adam Exp $
-
---- src/ima_adpcm.c.orig 2005-10-28 17:42:36.000000000 +0200
-+++ src/ima_adpcm.c
-@@ -38,7 +38,7 @@ typedef struct IMA_ADPCM_PRIVATE_tag
- unsigned char *block ;
- short *samples ;
- #if HAVE_FLEXIBLE_ARRAY
-- short data [] ; /* ISO C99 struct flexible array. */
-+ short *data ; /* ISO C99 struct flexible array. */
- #else
- short data [0] ; /* This is a hack and might not work. */
- #endif
diff --git a/audio/libsndfile/patches/patch-af b/audio/libsndfile/patches/patch-af
deleted file mode 100644
index 5a260c7a887..00000000000
--- a/audio/libsndfile/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.5 2006/01/21 23:04:08 adam Exp $
-
---- src/ms_adpcm.c.orig 2005-10-28 17:42:36.000000000 +0200
-+++ src/ms_adpcm.c
-@@ -45,7 +45,7 @@ typedef struct
- short *samples ;
- unsigned char *block ;
- #if HAVE_FLEXIBLE_ARRAY
-- short dummydata [] ; /* ISO C99 struct flexible array. */
-+ short *dummydata ; /* ISO C99 struct flexible array. */
- #else
- short dummydata [0] ; /* This is a hack an might not work. */
- #endif
diff --git a/audio/libsndfile/patches/patch-ag b/audio/libsndfile/patches/patch-ag
deleted file mode 100644
index 4465a1a5b83..00000000000
--- a/audio/libsndfile/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2004/06/28 08:14:03 adam Exp $
-
---- src/paf.c.orig 2004-06-16 10:17:04.000000000 +0000
-+++ src/paf.c
-@@ -65,7 +65,7 @@ typedef struct
- int *samples ;
- unsigned char *block ;
- #if HAVE_FLEXIBLE_ARRAY
-- int data [] ; /* ISO C99 struct flexible array. */
-+ int *data ; /* ISO C99 struct flexible array. */
- #else
- int data [1] ; /* This is a hack and may not work. */
- #endif
diff --git a/audio/libsndfile/patches/patch-ah b/audio/libsndfile/patches/patch-ah
deleted file mode 100644
index 1c5d346718f..00000000000
--- a/audio/libsndfile/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/09/01 06:02:23 adam Exp $
-
---- Makefile.in.orig 2006-09-01 07:54:23.000000000 +0200
-+++ Makefile.in
-@@ -209,7 +209,7 @@ target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--SUBDIRS = man doc Win32 Octave src examples regtest tests
-+SUBDIRS = man doc Win32 Octave src examples regtest
- DIST_SUBDIRS = $(SUBDIRS)
- EXTRA_DIST = reconfigure.mk acinclude.m4 libsndfile.spec.in \
- sndfile.pc.in Mingw-make-dist.sh
diff --git a/audio/libtunepimp/DESCR b/audio/libtunepimp/DESCR
deleted file mode 100644
index 4f2832161e1..00000000000
--- a/audio/libtunepimp/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-The TunePimp library serves as a tool to allow developers to create
-MusicBrainz enabled tagging applications.
-
-The TunePimp library is a full featured tagging library that allows
-the developer to open music files for identification/lookup. Once
-files have been identified, it writes new metadata tags to the
-music files and writes the files to a standardized directory
-hierarchy. TunePimp includes the following features:
-
-* Create TRM IDs from WAV, MP3, Ogg/Vorbis and FLAC files
-* Automatically lookup files by TRM or by metadata
-* Read and write metadata from the music files
-* Optionally rename files according to a user specified file mask
-* Optionally move files to a user specified directory hierarchy
diff --git a/audio/libtunepimp/Makefile b/audio/libtunepimp/Makefile
deleted file mode 100644
index 9c1e0fea849..00000000000
--- a/audio/libtunepimp/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2007/02/22 19:01:14 wiz Exp $
-
-DISTNAME= libtunepimp-0.5.3
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.musicbrainz.org/pub/musicbrainz/ \
- http://ftp.musicbrainz.org/pub/musicbrainz/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://musicbrainz.org/doc/libtunepimp
-COMMENT= Library to support MusicBrainz enabled tagging
-
-GNU_CONFIGURE= YES
-USE_LANGUAGES= c c++
-USE_LIBTOOL= YES
-CONFLICTS+= tunepimp-[0-9]* trm-[0-9]*
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-pre-configure:
- ${ECHO} "#define HAVE_STATVFS 1" >> ${WRKSRC}/config.h.in
-.endif
-
-.include "../../audio/flac/buildlink3.mk"
-.include "../../audio/musicbrainz/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/libofa/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/taglib/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
-.include "../../multimedia/libmp4v2/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libtunepimp/PLIST b/audio/libtunepimp/PLIST
deleted file mode 100644
index ba9b09551c0..00000000000
--- a/audio/libtunepimp/PLIST
+++ /dev/null
@@ -1,25 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2006/08/13 22:04:18 wiz Exp $
-bin/puid
-include/tunepimp-0.5/context.h
-include/tunepimp-0.5/decode_plugin.h
-include/tunepimp-0.5/defs.h
-include/tunepimp-0.5/fileio.h
-include/tunepimp-0.5/metadata.h
-include/tunepimp-0.5/metadata_plugin.h
-include/tunepimp-0.5/tp_c.h
-include/tunepimp-0.5/track.h
-include/tunepimp-0.5/tunepimp.h
-lib/libtunepimp.la
-lib/tunepimp/plugins/flac.tpp
-lib/tunepimp/plugins/mp3.tpp
-lib/tunepimp/plugins/mp4.tpp
-lib/tunepimp/plugins/mpc.tpp
-lib/tunepimp/plugins/speex.tpp
-lib/tunepimp/plugins/tta.tpp
-lib/tunepimp/plugins/vorbis.tpp
-lib/tunepimp/plugins/wav.tpp
-lib/tunepimp/plugins/wma.tpp
-lib/tunepimp/plugins/wv.tpp
-@dirrm lib/tunepimp/plugins
-@dirrm lib/tunepimp
-@dirrm include/tunepimp-0.5
diff --git a/audio/libtunepimp/buildlink3.mk b/audio/libtunepimp/buildlink3.mk
deleted file mode 100644
index 88ad6f01b87..00000000000
--- a/audio/libtunepimp/buildlink3.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.8 2007/02/22 16:51:32 drochner Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBTUNEPIMP_BUILDLINK3_MK:= ${LIBTUNEPIMP_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= libtunepimp
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtunepimp}
-BUILDLINK_PACKAGES+= libtunepimp
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtunepimp
-
-.if ${LIBTUNEPIMP_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.libtunepimp+= libtunepimp>=0.5.0
-BUILDLINK_ABI_DEPENDS.libtunepimp?= libtunepimp>=0.5.2nb1
-BUILDLINK_PKGSRCDIR.libtunepimp?= ../../audio/libtunepimp
-.endif # LIBTUNEPIMP_BUILDLINK3_MK
-
-.include "../../audio/musicbrainz/buildlink3.mk"
-.include "../../audio/libofa/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libtunepimp/distinfo b/audio/libtunepimp/distinfo
deleted file mode 100644
index 110f1eddf26..00000000000
--- a/audio/libtunepimp/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.8 2006/12/05 09:01:57 wiz Exp $
-
-SHA1 (libtunepimp-0.5.3.tar.gz) = 1b904cd97ce009588fe57336f40e79b6edf9947e
-RMD160 (libtunepimp-0.5.3.tar.gz) = 6bc312591b98a5b74824fc3103137cbf60d4b012
-Size (libtunepimp-0.5.3.tar.gz) = 1097005 bytes
-SHA1 (patch-ab) = 014fa77e2501bdc799287eaf733ecc8fdcbb9cbe
-SHA1 (patch-ac) = cb5049d1b9e4fdda3088e957ff615ff5d9c30734
-SHA1 (patch-ad) = cc78c69249ff733227320f8ca505e10d17354e26
diff --git a/audio/libtunepimp/patches/patch-ab b/audio/libtunepimp/patches/patch-ab
deleted file mode 100644
index 1cb481dc302..00000000000
--- a/audio/libtunepimp/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2006/12/05 09:01:57 wiz Exp $
-
---- lib/threads/posix/Makefile.in.orig 2006-11-28 20:34:14.000000000 +0000
-+++ lib/threads/posix/Makefile.in
-@@ -217,8 +217,7 @@ target_alias = @target_alias@
- INCLUDES = -I$(top_srcdir)/include/tunepimp-0.5
- noinst_LTLIBRARIES = libtpthread.la
- libtpthread_la_SOURCES = mutex.cpp mutex.h thread.cpp thread.h semaphore.cpp semaphore.h
--@FREEBSD_FALSE@libtpthread_la_LIBADD = -lpthread
--@FREEBSD_TRUE@libtpthread_la_LIBADD = -lthr
-+libtpthread_la_LIBADD = ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
- all: all-am
-
- .SUFFIXES:
diff --git a/audio/libtunepimp/patches/patch-ac b/audio/libtunepimp/patches/patch-ac
deleted file mode 100644
index 16e8467fab6..00000000000
--- a/audio/libtunepimp/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2006/12/05 09:01:57 wiz Exp $
-
---- examples/Makefile.in.orig 2006-11-28 20:34:14.000000000 +0000
-+++ examples/Makefile.in
-@@ -211,7 +211,7 @@ target_alias = @target_alias@
- #
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/threads/posix
- puid_SOURCES = puid.c
--puid_LDADD = $(top_builddir)/lib/libtunepimp.la
-+puid_LDADD = $(top_builddir)/lib/libtunepimp.la ${PTHREAD_LDFLAGS}
- all: all-am
-
- .SUFFIXES:
diff --git a/audio/libtunepimp/patches/patch-ad b/audio/libtunepimp/patches/patch-ad
deleted file mode 100644
index fa496a82ae3..00000000000
--- a/audio/libtunepimp/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2006/12/05 09:01:57 wiz Exp $
-
---- lib/Makefile.in.orig 2006-11-28 20:34:14.000000000 +0000
-+++ lib/Makefile.in
-@@ -274,7 +274,7 @@ EXTRA_DIST = threads/win32/mutex.h threa
- # 4:0:0 - TunePimp implementation for alpha releases of version 0.5.0
- # 5:0:0 - TunePimp implementation for version 0.5.0
- # 5:1:0 - TunePimp implementation for version 0.5.1
--libtunepimp_la_LDFLAGS = -version-info 5:3:0
-+libtunepimp_la_LDFLAGS = -version-info 5:3:0 ${PTHREAD_LDFLAGS}
- libtunepimp_la_LIBADD = threads/posix/libtpthread.la utf8/libutf8.la $(LIBLTDL) -lm
- noinst_LTLIBRARIES = libpluginsupport.la
- libpluginsupport_la_SOURCES = metadata.cpp fileio.cpp
diff --git a/audio/libvisual-bmp/DESCR b/audio/libvisual-bmp/DESCR
deleted file mode 100644
index 0935fcb1cff..00000000000
--- a/audio/libvisual-bmp/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Libvisual plugin for the Beep Media Player.
diff --git a/audio/libvisual-bmp/Makefile b/audio/libvisual-bmp/Makefile
deleted file mode 100644
index 9ce74840090..00000000000
--- a/audio/libvisual-bmp/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2006/07/03 23:32:37 wiz Exp $
-#
-
-DISTNAME= libvisual-bmp-0.2.0
-PKGREVISION= 7
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libvisual/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://localhost.nl/~synap/libvisual/
-COMMENT= Libvisual Beep Media Player plugin
-
-USE_PKGLOCALEDIR= yes
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config msgfmt
-
-post-extract:
- ${MV} ${WRKSRC}/pixmaps/libvisual-xmms-vis.bmp \
- ${WRKSRC}/pixmaps/libvisual-bmp-vis.bmp
- ${MV} ${WRKSRC}/pixmaps/libvisual-xmms-vis.xpm \
- ${WRKSRC}/pixmaps/libvisual-bmp-vis.xpm
-
-.include "../../audio/bmp/buildlink3.mk"
-.include "../../audio/libvisual0.2/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libvisual-bmp/PLIST b/audio/libvisual-bmp/PLIST
deleted file mode 100644
index 2f6cf58e294..00000000000
--- a/audio/libvisual-bmp/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/04/17 07:07:12 jlam Exp $
-lib/bmp/Visualization/libvisual_bmp.la
-share/libvisual-bmp/libvisual-bmp-vis.bmp
-share/libvisual-bmp/libvisual-bmp-vis.xpm
-share/locale/es/LC_MESSAGES/libvisual-bmp.mo
-share/locale/es_AR/LC_MESSAGES/libvisual-bmp.mo
-share/locale/fr/LC_MESSAGES/libvisual-bmp.mo
-share/locale/nl/LC_MESSAGES/libvisual-bmp.mo
-share/locale/pt_BR/LC_MESSAGES/libvisual-bmp.mo
-share/locale/ru/LC_MESSAGES/libvisual-bmp.mo
-@dirrm share/libvisual-bmp
-@comment in bmp: @dirrm lib/bmp/Visualization
diff --git a/audio/libvisual-bmp/distinfo b/audio/libvisual-bmp/distinfo
deleted file mode 100644
index 51bd36b0d39..00000000000
--- a/audio/libvisual-bmp/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:48 agc Exp $
-
-SHA1 (libvisual-bmp-0.2.0.tar.gz) = 42cb4e4f8678d8035721e104f0c9b0f20be798cc
-RMD160 (libvisual-bmp-0.2.0.tar.gz) = 9d37b1c9a7a74a630aa056d9edfdcf654b7b14d3
-Size (libvisual-bmp-0.2.0.tar.gz) = 369063 bytes
-SHA1 (patch-aa) = 4b0f49c1d864364d1c2f6730444d8685f718cef7
-SHA1 (patch-ab) = 0bd7498ca69f1eea34c2489558605360075f8d7b
diff --git a/audio/libvisual-bmp/patches/patch-aa b/audio/libvisual-bmp/patches/patch-aa
deleted file mode 100644
index 516c6512b37..00000000000
--- a/audio/libvisual-bmp/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/11/05 21:12:35 wiz Exp $
-
---- pixmaps/Makefile.in.orig 2004-10-14 12:50:23.000000000 +0200
-+++ pixmaps/Makefile.in
-@@ -175,7 +175,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--pkgdata_DATA = libvisual-xmms-vis.bmp libvisual-xmms-vis.xpm
-+pkgdata_DATA = libvisual-bmp-vis.bmp libvisual-bmp-vis.xpm
- EXTRA_DIST = $(pkgdata_DATA)
- all: all-am
-
diff --git a/audio/libvisual-bmp/patches/patch-ab b/audio/libvisual-bmp/patches/patch-ab
deleted file mode 100644
index 1a96f678725..00000000000
--- a/audio/libvisual-bmp/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/11/12 20:27:23 kristerw Exp $
-
---- src/main.c.orig Fri Nov 12 21:20:40 2004
-+++ src/main.c Fri Nov 12 21:21:07 2004
-@@ -438,14 +438,14 @@
-
- static int visual_render (void *arg)
- {
-- visual_running = 1;
-- visual_stopped = 0;
- long render_time, now;
- long frame_length;
- long idle_time;
- long frames;
- int ret;
-
-+ visual_running = 1;
-+ visual_stopped = 0;
- ret = visual_initialize (options->width, options->height);
- if (ret < 0) {
- visual_log (VISUAL_LOG_CRITICAL, _("Cannot initialize plugin's visual stuff"));
diff --git a/audio/libvisual-plugins/DESCR b/audio/libvisual-plugins/DESCR
deleted file mode 100644
index b8593425d20..00000000000
--- a/audio/libvisual-plugins/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Some plugins for libvisual.
diff --git a/audio/libvisual-plugins/Makefile b/audio/libvisual-plugins/Makefile
deleted file mode 100644
index 7e6295c627e..00000000000
--- a/audio/libvisual-plugins/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2007/01/26 19:55:18 joerg Exp $
-#
-
-DISTNAME= libvisual-plugins-0.4.0
-CATEGORIES= audio graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libvisual/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://localhost.nl/~synap/libvisual/
-COMMENT= Plugins for libvisual
-
-CONFLICTS= libvisual-nebulus-[0-9]* libvisual-gforce-[0-9]*
-
-USE_PKGLOCALEDIR= yes
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config mkdirhier
-
-.include "../../audio/goom/buildlink3.mk"
-.include "../../audio/libvisual/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-# currently not useful, since libgdkpixbuf plugin is not configurable
-#.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libvisual-plugins/PLIST b/audio/libvisual-plugins/PLIST
deleted file mode 100644
index 0bd8b41290a..00000000000
--- a/audio/libvisual-plugins/PLIST
+++ /dev/null
@@ -1,281 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2006/07/03 23:36:05 wiz Exp $
-lib/libvisual-0.4/actor/actor_JESS.la
-lib/libvisual-0.4/actor/actor_bumpscope.la
-lib/libvisual-0.4/actor/actor_corona.la
-lib/libvisual-0.4/actor/actor_flower.la
-lib/libvisual-0.4/actor/actor_gforce.la
-lib/libvisual-0.4/actor/actor_infinite.la
-lib/libvisual-0.4/actor/actor_jakdaw.la
-lib/libvisual-0.4/actor/actor_lv_gltest.la
-lib/libvisual-0.4/actor/actor_lv_scope.la
-lib/libvisual-0.4/actor/actor_madspin.la
-lib/libvisual-0.4/actor/actor_nastyfft.la
-lib/libvisual-0.4/actor/actor_oinksie.la
-lib/libvisual-0.4/input/input_mplayer.la
-lib/libvisual-0.4/morph/morph_alphablend.la
-lib/libvisual-0.4/morph/morph_flash.la
-lib/libvisual-0.4/morph/morph_slide.la
-lib/libvisual-0.4/morph/morph_tentacle.la
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Acid_Gap
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Acid_Gap_2
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Acid_Gap_5
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Acid_Gap_6
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Aqua
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Back_in_the_70s__red-blue_
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Bizarro-ColorWheel
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Bizarro_Mystery_Unveiled
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Blood
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/ColorWheel
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/DT_-_Antarctis
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/DT_-_Glows
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/DT_-_GreenPoison
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/DT_-_Horror
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/DT_-_Lake_of_Fire
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/DT_-_Metal
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/DT_-_Neon_Knights
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/DT_-_November_Rain
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/DT_-_Ocean_Club
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/DT_-_Plastic
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/DT_-_Purple_Haze
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/DT_-_Silver_Machine
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/DT_-_Wild_West_End
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Dali
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Dark_Rainbow
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/DayDream
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/ElectricAcid
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Firestorm
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Green
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Hero
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Ice_Nightshade
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Lust
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Midnight_Dream
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Mononoke
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Muted_Middle
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Mystery_Unveiled
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Mystery_Unveiled_-_Dim
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Mystery_Unveiled_-_Jellyfish
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/New_Acid_Gap_6
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Orange_To_Blue
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Punkin_
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Purple_N_Blues
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Purple_N_Blues_II
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Purty_Acid_Gap
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Scythe
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/SolarWinds
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Strawberry
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/StrawberryDreams
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Sunshine
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/Teal
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps/The_Spectrologist_s_Assistant
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/6_Feet_Under
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Accident
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Claustrophobia
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Collapse_N_Turn
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Collapsing_Star
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Constant_Out
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Contrail
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/DT_-_Boxes
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/DT_-_Chaos
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/DT_-_Horizon
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/DT_-_Swirl
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/DT_-_Tip
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/DT_-_Water
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Dandelion_Psychology
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Diamond
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Directed_Spread
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Directrix_Expand_-_X
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Directrix_Expand_-_Y
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Disco_Ball
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Donut
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Drawn_and_Quartered
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Dreamscape
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Equalateral_Hyperbola
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Expand_N_Turn
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Eyes
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Flamage
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Flamin_Ice_Cubes
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Flee
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Flower_Power
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Fractal_sweetness
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Free_Yourself
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Freezymelt
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Gail_Force_Winds
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Galaxy
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Good_ol_LP
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Gravity
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Gravity_Ball
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/HS101_Mess
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Hip-no-Therapy
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/In_Or_Out__Inner_Turn
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Krabben
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Left_Turn_N_Flow_Out
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Linear_Spread
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Marble
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Nexus-Zero
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Noise
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Nowhere
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Once_Upon_A_Time
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Paint
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Phantom_Mist
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Poinsetta
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Psycho_Disco_Ball
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Psychosis_-_Relapse
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Quantum_Ripple
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Quantum_Theta
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Radial_Breakaway
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Right_Turn
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/SOLs_Base
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/SOLs_Perspective
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/SOLs_Point_and_Hang
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/SOLs_Tinsle
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/SOLs_Torch
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/SOLs_Warp
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/SOLs_Waves
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Scattered_Flow_In
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Scattered_Flow_Out
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Simple_Sine-Sphere
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Sincos
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Sine_Multi-Circ
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Sine_Slide
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Sphere
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Sunburst
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Swirly
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/The_Lake
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/The_MAW
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Theta_Divergence
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Thick_River
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Tiles
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/TimeWarp
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Traffic_Flow
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Tripping_Hard
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Tropic_Of_Capricorn
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Tunnel_Vision
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Twist_of_Fate
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Twister
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Victorian_Corset
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Watery_Ripples
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Wet_Paint
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Wrap_Your_Brain_Around_This
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/Yes
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields/one
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/A_Wounded_Deer
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Airport
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Art__I_Suppose
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Attack
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Brain_Candy
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Centipede
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Converge
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Converge_-_Circle
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Converge_3
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Crosshairs
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Cycling_Dots
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/DT_-_Birds
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/DT_-_Explode
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/DT_-_Galaxy
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/DT_-_Mysko
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/DT_-_Snake
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/DT_-_ZoomPlanet
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Dancing_String
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Darren_Bird
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Dot_Grid
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Explosion_I
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Explosion_II
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Falling_Orbs
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Lizy_s_Starry_Night
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Metors
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Miri_s_Ball
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Moon_N_Sun
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Orbiting_Rods
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Pair
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Pearl
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Pollock_Dots
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Prophesy_SC
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Protozoan_Lovers
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Raining_Oscilliscopes
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Robox
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Snakes
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Solala
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Sparkling_Table_Water
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Spinners
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Spinning_Cube
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Spinning_Plane
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Spinning_Tetra
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Spinning_Tetraeder
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Spiral
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Sprinkles
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Storm_Beat
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Suck_Me_In
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Tango_Particles
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Tosser
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Tri-Cycling_Dots
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles/Warp_Me_Away
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/3D_Cylinder
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Big_N_Banded
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Caffene_Junkie
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/CrossBall
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/DT_-_Birds
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/DT_-_BorderThunder
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/DT_-_Circle_II
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/DT_-_Circle_III
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/DT_-_Sine
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/DT_-_SineDot
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/DT_-_Spectrum
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/DT_-_Wild
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Dancing_days
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Darren_DDoublehelix
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Darren_Doublehelix
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Darren_Quadhelix
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Darren_Scanner
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Darren_Stairway
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Ellipses
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Example_Spectrum
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Father_and_Daughters
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Five
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Flower_Power
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Heart_of_the_Beast
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Horizontal_Corridor
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Horzonal_Sweep
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Hourglass
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Kaleidoscope
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Magnum
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Melt_O_Rama
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Mother_and_Daughters
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Moving
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/NPTU_Squared
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Null
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Parkening_Power
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Particle_Pulse
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Quad-Circle
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Radar_Sweep
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Random_Corridor
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Rotating_Arcs
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Rotating_Bars
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Rotating_Corridor
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Rotating_X
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/SOLs_Vinyl
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Simple_Horizontal
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Simple_Vertical
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Spectagon
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/SpinIt
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/The_Dot_Line
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/The_Eye
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Tri-Cycle
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Tri-Vertical
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Up_Like_A_Cup
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Vertical_Corridor
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Wave
-share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes/Zoomed_Square
-share/libvisual-plugins-0.4/actor/actor_madspin/star1.bmp
-share/libvisual-plugins-0.4/actor/actor_madspin/star2.bmp
-@dirrm share/libvisual-plugins-0.4/actor/actor_madspin
-@dirrm share/libvisual-plugins-0.4/actor/actor_gforce/GForceWaveShapes
-@dirrm share/libvisual-plugins-0.4/actor/actor_gforce/GForceParticles
-@dirrm share/libvisual-plugins-0.4/actor/actor_gforce/GForceDeltaFields
-@dirrm share/libvisual-plugins-0.4/actor/actor_gforce/GForceColorMaps
-@dirrm share/libvisual-plugins-0.4/actor/actor_gforce
-@dirrm share/libvisual-plugins-0.4/actor
-@dirrm share/libvisual-plugins-0.4
-@dirrm lib/libvisual-0.4/morph
-@dirrm lib/libvisual-0.4/input
-@dirrm lib/libvisual-0.4/actor
-@dirrm lib/libvisual-0.4
diff --git a/audio/libvisual-plugins/distinfo b/audio/libvisual-plugins/distinfo
deleted file mode 100644
index 9dfc6edeae3..00000000000
--- a/audio/libvisual-plugins/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.7 2006/07/18 19:02:08 joerg Exp $
-
-SHA1 (libvisual-plugins-0.4.0.tar.gz) = 20490573c282d900ec0bd05133cb3707640254f5
-RMD160 (libvisual-plugins-0.4.0.tar.gz) = f7a82f4a9e4dec3e877833612ece570ffbf2404d
-Size (libvisual-plugins-0.4.0.tar.gz) = 828631 bytes
-SHA1 (patch-aa) = 9c84c7d8af69d603ea8ce4077247a217952c0cb3
-SHA1 (patch-ab) = 31a380ed59ed9eed1e5516c44fec54c1e7dcf25c
-SHA1 (patch-ac) = dea36f303b2b3f8d5aea970b22c06743490d07cc
diff --git a/audio/libvisual-plugins/patches/patch-aa b/audio/libvisual-plugins/patches/patch-aa
deleted file mode 100644
index 226fdfe3ac7..00000000000
--- a/audio/libvisual-plugins/patches/patch-aa
+++ /dev/null
@@ -1,114 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/07/18 19:02:08 joerg Exp $
-
---- plugins/morph/alphablend/morph_alphablend.c.orig 2006-07-18 18:55:47.000000000 +0000
-+++ plugins/morph/alphablend/morph_alphablend.c
-@@ -33,18 +33,18 @@ typedef struct {
- uint16_t b:5, g:6, r:5;
- } _color16;
-
--static inline int alpha_blend_buffer (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, int depth, float alpha);
-+static int alpha_blend_buffer (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, int depth, float alpha);
-
- /* alpha blenders */
--static inline int alpha_blend_8_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
--static inline int alpha_blend_16_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
--static inline int alpha_blend_24_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
--static inline int alpha_blend_32_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
--
--static inline int alpha_blend_8_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
--static inline int alpha_blend_16_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
--static inline int alpha_blend_24_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
--static inline int alpha_blend_32_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
-+static int alpha_blend_8_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
-+static int alpha_blend_16_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
-+static int alpha_blend_24_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
-+static int alpha_blend_32_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
-+
-+static int alpha_blend_8_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
-+static int alpha_blend_16_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
-+static int alpha_blend_24_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
-+static int alpha_blend_32_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
-
- int lv_morph_alpha_init (VisPluginData *plugin);
- int lv_morph_alpha_cleanup (VisPluginData *plugin);
-@@ -109,7 +109,7 @@ int lv_morph_alpha_apply (VisPluginData
- return 0;
- }
-
--static inline int alpha_blend_buffer (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, int depth, float alpha)
-+static int alpha_blend_buffer (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, int depth, float alpha)
- {
-
- if (visual_cpu_get_mmx ()) {
-@@ -149,7 +149,7 @@ static inline int alpha_blend_buffer (ui
- * 32 x x
- */
-
--static inline int alpha_blend_8_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
-+static int alpha_blend_8_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
- {
- uint8_t ialpha = (alpha * 255);
- int i;
-@@ -161,7 +161,7 @@ static inline int alpha_blend_8_c (uint8
- return 0;
- }
-
--static inline int alpha_blend_16_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
-+static int alpha_blend_16_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
- {
- uint8_t ialpha = (alpha * 255);
- _color16 *destr = (_color16 *) dest;
-@@ -178,7 +178,7 @@ static inline int alpha_blend_16_c (uint
- return 0;
- }
-
--static inline int alpha_blend_24_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
-+static int alpha_blend_24_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
- {
- uint8_t ialpha = (alpha * 255);
- int i;
-@@ -190,7 +190,7 @@ static inline int alpha_blend_24_c (uint
- return 0;
- }
-
--static inline int alpha_blend_32_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
-+static int alpha_blend_32_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
- {
- uint8_t ialpha = (alpha * 255);
- int i;
-@@ -202,7 +202,7 @@ static inline int alpha_blend_32_c (uint
- return 0;
- }
-
--static inline int alpha_blend_8_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
-+static int alpha_blend_8_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
- {
- uint32_t aalpha = (alpha * 255);
- uint32_t ialpha = aalpha;
-@@ -247,7 +247,7 @@ static inline int alpha_blend_8_mmx (uin
- return 0;
- }
-
--static inline int alpha_blend_16_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
-+static int alpha_blend_16_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
- {
- uint8_t ialpha = (alpha * 255);
- _color16 *destr = (_color16 *) dest;
-@@ -264,7 +264,7 @@ static inline int alpha_blend_16_mmx (ui
- return 0;
- }
-
--static inline int alpha_blend_24_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
-+static int alpha_blend_24_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
- {
- uint8_t ialpha = (alpha * 255);
- int i;
-@@ -276,7 +276,7 @@ static inline int alpha_blend_24_mmx (ui
- return 0;
- }
-
--static inline int alpha_blend_32_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
-+static int alpha_blend_32_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
- {
- uint32_t ialpha = (alpha * 255);
- int i;
diff --git a/audio/libvisual-plugins/patches/patch-ab b/audio/libvisual-plugins/patches/patch-ab
deleted file mode 100644
index af22a67e9cc..00000000000
--- a/audio/libvisual-plugins/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/06/16 21:19:08 kristerw Exp $
-
---- plugins/actor/pseudotoad_flower/notch.c.orig Thu Jun 16 22:50:58 2005
-+++ plugins/actor/pseudotoad_flower/notch.c Thu Jun 16 22:52:05 2005
-@@ -25,12 +25,13 @@
- #include <stdio.h>
- #include <math.h>
- #include <string.h>
-+#include <stdlib.h>
-
- #include "notch.h"
-
- NOTCH_FILTER * init_notch(float cutoff) {
- NOTCH_FILTER * l=malloc(sizeof(NOTCH_FILTER));
-- float steep = 0.99;;
-+ float steep = 0.99;
- float r = steep * 0.99609375;
- float f = cos(M_PI * cutoff / SAMPLING_RATE);
- l->cutoff = cutoff;
diff --git a/audio/libvisual-plugins/patches/patch-ac b/audio/libvisual-plugins/patches/patch-ac
deleted file mode 100644
index 3f821a9a35a..00000000000
--- a/audio/libvisual-plugins/patches/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/07/03 23:36:05 wiz Exp $
-
---- configure.orig 2006-07-03 22:48:54.000000000 +0000
-+++ configure
-@@ -23466,11 +23466,11 @@ fi
- if test "$HAVE_GTK" = "yes"; then
- build_actor_plugins="$build_actor_plugins gdkpixbuf"
- else
-- { echo "$as_me:$LINENO: WARNING: *** GTK+ >= ${2.0} is not found.
-+ { echo "$as_me:$LINENO: WARNING: *** GTK+ >= 2.0 is not found.
- The libvisual GdkPixbuf image loader plugin won't be build.
- GdkPixbuf is included within gtk-2.0 and newer, which can be
- downloaded at http://www.gtk.org/" >&5
--echo "$as_me: WARNING: *** GTK+ >= ${2.0} is not found.
-+echo "$as_me: WARNING: *** GTK+ >= 2.0 is not found.
- The libvisual GdkPixbuf image loader plugin won't be build.
- GdkPixbuf is included within gtk-2.0 and newer, which can be
- downloaded at http://www.gtk.org/" >&2;}
-@@ -23559,10 +23559,10 @@ fi
- if test "$HAVE_GSTREAMER" = "yes"; then
- build_actor_plugins="$build_actor_plugins gstreamer"
- else
-- { echo "$as_me:$LINENO: WARNING: *** GStreamer >= ${0.8} is not found.
-+ { echo "$as_me:$LINENO: WARNING: *** GStreamer >= 0.8 is not found.
- The libvisual GStreamer viewer plugin won't be build.
- GStreamer can be downloaded from http://www.gstreamer.org/" >&5
--echo "$as_me: WARNING: *** GStreamer >= ${0.8} is not found.
-+echo "$as_me: WARNING: *** GStreamer >= 0.8 is not found.
- The libvisual GStreamer viewer plugin won't be build.
- GStreamer can be downloaded from http://www.gstreamer.org/" >&2;}
- fi
diff --git a/audio/libvisual-xmms/DESCR b/audio/libvisual-xmms/DESCR
deleted file mode 100644
index b6e785cb5ab..00000000000
--- a/audio/libvisual-xmms/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Libvisual is an xmms plugin for the libvisual audio visualisation
-framework.
diff --git a/audio/libvisual-xmms/Makefile b/audio/libvisual-xmms/Makefile
deleted file mode 100644
index b7433059689..00000000000
--- a/audio/libvisual-xmms/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2006/07/03 23:32:37 wiz Exp $
-#
-
-DISTNAME= libvisual-xmms-0.2.0
-PKGREVISION= 5
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libvisual/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://localhost.nl/~synap/libvisual/
-COMMENT= XMMS plugin for libvisual
-
-USE_LIBTOOL= yes
-USE_PKGLOCALEDIR= yes
-GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config msgfmt
-
-.include "../../audio/libvisual0.2/buildlink3.mk"
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libvisual-xmms/PLIST b/audio/libvisual-xmms/PLIST
deleted file mode 100644
index d07240ac299..00000000000
--- a/audio/libvisual-xmms/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/04/17 07:07:12 jlam Exp $
-lib/xmms/Visualization/libvisual_xmms.la
-share/libvisual-xmms/libvisual-xmms-vis.bmp
-share/libvisual-xmms/libvisual-xmms-vis.xpm
-share/locale/es/LC_MESSAGES/libvisual-xmms.mo
-share/locale/es_AR/LC_MESSAGES/libvisual-xmms.mo
-share/locale/fr/LC_MESSAGES/libvisual-xmms.mo
-share/locale/nl/LC_MESSAGES/libvisual-xmms.mo
-share/locale/pt_BR/LC_MESSAGES/libvisual-xmms.mo
-share/locale/ru/LC_MESSAGES/libvisual-xmms.mo
-@dirrm share/libvisual-xmms
diff --git a/audio/libvisual-xmms/distinfo b/audio/libvisual-xmms/distinfo
deleted file mode 100644
index dcc9b9fd3a7..00000000000
--- a/audio/libvisual-xmms/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:48 agc Exp $
-
-SHA1 (libvisual-xmms-0.2.0.tar.gz) = 9e0188dc880ffdb202aea005049c45df7e77d14a
-RMD160 (libvisual-xmms-0.2.0.tar.gz) = 22ed3ba95cf8d72defa80aa306807358c725f475
-Size (libvisual-xmms-0.2.0.tar.gz) = 379314 bytes
-SHA1 (patch-aa) = cc01876e758ebbff13c930514b5f3274fd853461
-SHA1 (patch-ab) = 2a9ddff14a7638ca0589481837a357a88bbc559c
diff --git a/audio/libvisual-xmms/patches/patch-aa b/audio/libvisual-xmms/patches/patch-aa
deleted file mode 100644
index de17631cd91..00000000000
--- a/audio/libvisual-xmms/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/11/05 23:09:21 wiz Exp $
-
---- src/Makefile.in.orig 2004-10-12 19:47:27.000000000 +0200
-+++ src/Makefile.in
-@@ -125,7 +125,7 @@ INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
--LIBS = -L$(top_srcdir)/src -L$(prefix)/lib @XMMS_LIBS@ @SDL_LIBS@ @GTK_LIBS@ @LIBVISUAL_LIBS@ @LTLIBTINTL@
-+LIBS = -L$(top_srcdir)/src -L$(prefix)/lib @XMMS_LIBS@ @SDL_LIBS@ @GTK_LIBS@ @LIBVISUAL_LIBS@
- LIBS_DYNAMIC_LOADER = @LIBS_DYNAMIC_LOADER@
- LIBTOOL = @LIBTOOL@
- LIBVISUAL_CFLAGS = @LIBVISUAL_CFLAGS@
diff --git a/audio/libvisual-xmms/patches/patch-ab b/audio/libvisual-xmms/patches/patch-ab
deleted file mode 100644
index 2d849f82516..00000000000
--- a/audio/libvisual-xmms/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/11/12 20:53:32 kristerw Exp $
-
---- src/main.c.orig Fri Nov 12 21:45:23 2004
-+++ src/main.c Fri Nov 12 21:45:51 2004
-@@ -451,14 +451,14 @@
-
- static int visual_render (void *arg)
- {
-- visual_running = 1;
-- visual_stopped = 0;
- long render_time, now;
- long frame_length;
- long idle_time;
- long frames;
- int ret;
-
-+ visual_running = 1;
-+ visual_stopped = 0;
- /* Alright set up the display stuff, we have to do this in this thread because
- * GL don't like cross threadness */
- ret = visual_initialize (options->width, options->height);
diff --git a/audio/libvisual/DESCR b/audio/libvisual/DESCR
deleted file mode 100644
index ec5a5fa21d3..00000000000
--- a/audio/libvisual/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-Libvisual is an abstraction library that comes between applications
-and audio visualisation plugins.
-
-Often when it comes to audio visualisation plugins or programs that
-create visuals, they depend on a player or something else; basically,
-there is no general framework that enabled application developers
-to easily access cool audio visualisation plugins. Libvisual wants
-to change this by providing an interface towards plugins and
-applications; through this easy to use interface applications can
-easily access plugins and, since the drawing is done by the
-application, it also enables the developer to draw the visual
-anywhere he wants.
-
-The framework also allows you to morph to different plugins and
-mix two at once; all kinds of neat tricks are possible using this
-method.
diff --git a/audio/libvisual/Makefile b/audio/libvisual/Makefile
deleted file mode 100644
index 75760311b82..00000000000
--- a/audio/libvisual/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2007/02/22 19:01:14 wiz Exp $
-#
-
-DISTNAME= libvisual-0.4.0
-PKGREVISION= 1
-CATEGORIES= audio graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libvisual/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://localhost.nl/~synap/libvisual/
-COMMENT= Abstraction library between applications and audio visualisation plugins
-
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-PKGCONFIG_OVERRIDE+= ${WRKSRC}/libvisual.pc.in
-GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../mk/compiler.mk"
-
-.if ${MACHINE_ARCH} == "i386"
-. if !empty(CC_VERSION:Mgcc*)
-CPPFLAGS+= -mmmx
-. endif
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libvisual/PLIST b/audio/libvisual/PLIST
deleted file mode 100644
index cf1d135107f..00000000000
--- a/audio/libvisual/PLIST
+++ /dev/null
@@ -1,50 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2006/07/03 23:33:43 wiz Exp $
-include/libvisual-0.4/libvisual/libvisual.h
-include/libvisual-0.4/libvisual/lv_actor.h
-include/libvisual-0.4/libvisual/lv_audio.h
-include/libvisual-0.4/libvisual/lv_bin.h
-include/libvisual-0.4/libvisual/lv_bits.h
-include/libvisual-0.4/libvisual/lv_bmp.h
-include/libvisual-0.4/libvisual/lv_buffer.h
-include/libvisual-0.4/libvisual/lv_cache.h
-include/libvisual-0.4/libvisual/lv_collection.h
-include/libvisual-0.4/libvisual/lv_color.h
-include/libvisual-0.4/libvisual/lv_common.h
-include/libvisual-0.4/libvisual/lv_config.h
-include/libvisual-0.4/libvisual/lv_cpu.h
-include/libvisual-0.4/libvisual/lv_defines.h
-include/libvisual-0.4/libvisual/lv_error.h
-include/libvisual-0.4/libvisual/lv_event.h
-include/libvisual-0.4/libvisual/lv_fourier.h
-include/libvisual-0.4/libvisual/lv_gl.h
-include/libvisual-0.4/libvisual/lv_hashlist.h
-include/libvisual-0.4/libvisual/lv_hashmap.h
-include/libvisual-0.4/libvisual/lv_input.h
-include/libvisual-0.4/libvisual/lv_keysym.h
-include/libvisual-0.4/libvisual/lv_libvisual.h
-include/libvisual-0.4/libvisual/lv_list.h
-include/libvisual-0.4/libvisual/lv_log.h
-include/libvisual-0.4/libvisual/lv_math.h
-include/libvisual-0.4/libvisual/lv_mem.h
-include/libvisual-0.4/libvisual/lv_morph.h
-include/libvisual-0.4/libvisual/lv_object.h
-include/libvisual-0.4/libvisual/lv_os.h
-include/libvisual-0.4/libvisual/lv_palette.h
-include/libvisual-0.4/libvisual/lv_param.h
-include/libvisual-0.4/libvisual/lv_plugin.h
-include/libvisual-0.4/libvisual/lv_random.h
-include/libvisual-0.4/libvisual/lv_rectangle.h
-include/libvisual-0.4/libvisual/lv_ringbuffer.h
-include/libvisual-0.4/libvisual/lv_songinfo.h
-include/libvisual-0.4/libvisual/lv_thread.h
-include/libvisual-0.4/libvisual/lv_time.h
-include/libvisual-0.4/libvisual/lv_transform.h
-include/libvisual-0.4/libvisual/lv_types.h
-include/libvisual-0.4/libvisual/lv_ui.h
-include/libvisual-0.4/libvisual/lv_utils.h
-include/libvisual-0.4/libvisual/lv_video.h
-include/libvisual-0.4/libvisual/lvconfig.h
-lib/libvisual-0.4.la
-lib/pkgconfig/libvisual-0.4.pc
-@dirrm include/libvisual-0.4/libvisual
-@dirrm include/libvisual-0.4
diff --git a/audio/libvisual/buildlink3.mk b/audio/libvisual/buildlink3.mk
deleted file mode 100644
index eac96854e7d..00000000000
--- a/audio/libvisual/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:37 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBVISUAL_BUILDLINK3_MK:= ${LIBVISUAL_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libvisual
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibvisual}
-BUILDLINK_PACKAGES+= libvisual
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libvisual
-
-.if !empty(LIBVISUAL_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libvisual+= libvisual>=0.4.0
-BUILDLINK_PKGSRCDIR.libvisual?= ../../audio/libvisual
-.endif # LIBVISUAL_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libvisual/distinfo b/audio/libvisual/distinfo
deleted file mode 100644
index d06b208a1c7..00000000000
--- a/audio/libvisual/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.9 2006/10/06 22:04:00 rillig Exp $
-
-SHA1 (libvisual-0.4.0.tar.gz) = bd21d621f1d54134c26138e19eaae46c5aeaec00
-RMD160 (libvisual-0.4.0.tar.gz) = df4fda944e84417def2817f248f587dea5b2d8f1
-Size (libvisual-0.4.0.tar.gz) = 583386 bytes
-SHA1 (patch-ab) = 2493f145d37c6de8dc37beb22e788c628d43342e
-SHA1 (patch-ac) = ad124820a2a20550bf85181be284c1e000114ddd
diff --git a/audio/libvisual/hacks.mk b/audio/libvisual/hacks.mk
deleted file mode 100644
index c11c1b19443..00000000000
--- a/audio/libvisual/hacks.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2006/01/02 12:51:22 jmmv Exp $
-
-.if !defined(LIBVISUAL_HACKS_MK)
-LIBVISUAL_HACKS_MK= # defined
-
-# [ Mon Jan 2 13:49:14 CET 2006 : jmmv ]
-# -funroll-loops breaks the inlined MMX code in libvisual/lv_video_mmx.c.
-# It adds an immediate value to a movd instruction that does not let it
-# compile.
-BUILDLINK_TRANSFORM+= rm:-funroll-loops
-
-.endif
diff --git a/audio/libvisual/patches/patch-ab b/audio/libvisual/patches/patch-ab
deleted file mode 100644
index 31348f20761..00000000000
--- a/audio/libvisual/patches/patch-ab
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2006/10/06 22:04:00 rillig Exp $
-
-gcc-2.95 does not know the i386 MMX registers used in the assembler
-statements, do disable them.
-
---- configure.orig 2006-03-20 19:42:25.000000000 +0100
-+++ configure 2006-10-07 00:03:06.000000000 +0200
-@@ -2053,7 +2053,7 @@ case "$host_os" in
- solaris*) lv_solaris=yes;;
- linux*) lv_linux=yes;;
- *sco*) lv_sco=yes;;
-- freebsd*) lv_freebsd=yes;;
-+ freebsd*|dragonfly*) lv_freebsd=yes;;
- netbsd*) lv_netbsd=yes;;
- openbsd*) lv_openbsd=yes;;
- *darwin*) lv_darwin=yes;;
-@@ -24592,13 +24592,13 @@ echo "$as_me: WARNING: $AIX_COMPILE_INFO
- *)
- LV_THREAD_LIBS=error
- lv_save_LIBS="$LIBS"
-- for thread_lib in "" pthread pthread32 pthreads thread dce; do
-+ for thread_lib in "" -lpthread -lpthread32 -lpthreads -lthread -ldce -pthread; do
- if test x"$thread_lib" = x; then
- add_thread_lib=""
- IN=""
- else
-- add_thread_lib="-l$thread_lib"
-- IN=" in -l$thread_lib"
-+ add_thread_lib="$thread_lib"
-+ IN=" in $thread_lib"
- fi
- if test x"$have_threads" = xposix; then
- defattr=0
-@@ -26430,7 +26430,7 @@ build_subdirs="libvisual"
- VISUAL_PKG_CONFIG_DEP=""
-
- VISUAL_CFLAGS=""
--if test x"$LV_THREAD_CFLAGS" == xgthread2; then
-+if test x"$LV_THREAD_CFLAGS" = xgthread2; then
- VISUAL_PKG_CONFIG_DEP="$VISUAL_PKG_CONFIG_DEP gthread-2.0"
- elif test x"$LV_THREAD_CFLAGS" != x; then
- VISUAL_CFLAGS=$LV_THREAD_CFLAGS
-@@ -28326,7 +28326,11 @@ _______EOF
- if test x$lv_ix86 = xyes ; then
- cat >>$outfile <<_______EOF
-
-+#if defined(__GNUC__) && __GNUC__ <= 2
-+#define VISUAL_ARCH_UNKNOWN
-+#else
- #define VISUAL_ARCH_X86
-+#endif
- _______EOF
- fi
-
diff --git a/audio/libvisual/patches/patch-ac b/audio/libvisual/patches/patch-ac
deleted file mode 100644
index 3438af0cde0..00000000000
--- a/audio/libvisual/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/07/03 23:33:59 wiz Exp $
-
---- Makefile.in.orig 2006-03-20 18:42:30.000000000 +0000
-+++ Makefile.in
-@@ -623,7 +623,7 @@ uninstall-info: uninstall-info-recursive
-
-
- $(PKG_CONFIG_FILE): libvisual.pc
-- cp -f $< $@
-+ cp -f libvisual.pc $(PKG_CONFIG_FILE)
-
- install-exec-local: libvisual/lvconfig.h
- file=$(DESTDIR)$(LIBVISUAL_INCLUDE_DIR)/libvisual/lvconfig.h; \
diff --git a/audio/libvisual0.2-plugins/DESCR b/audio/libvisual0.2-plugins/DESCR
deleted file mode 100644
index da25667ba61..00000000000
--- a/audio/libvisual0.2-plugins/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Some plugins for libvisual (0.2 branch).
diff --git a/audio/libvisual0.2-plugins/Makefile b/audio/libvisual0.2-plugins/Makefile
deleted file mode 100644
index 3d3c58a8446..00000000000
--- a/audio/libvisual0.2-plugins/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2007/01/26 21:04:26 joerg Exp $
-#
-
-DISTNAME= libvisual-plugins-0.2.0
-PKGNAME= libvisual0.2-plugins-0.2.0
-CATEGORIES= audio graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libvisual/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://libvisual.sourceforge.net/
-COMMENT= Plugins for libvisual
-
-CONFLICTS= libvisual-nebulus-[0-9]* libvisual-gforce-[0-9]*
-CONFLICTS+= libvisual-plugins<0.4.0
-
-USE_PKGLOCALEDIR= yes
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config mkdirhier
-
-# sigsegfaults in 0.2.0 because of:
-# sorry, but the bug with strtof has come, please report..
-CONFIGURE_ARGS+= --disable-dancingparticles
-
-# install unnecessarily installed files
-post-install:
- ${RM} ${PREFIX}/share/libvisual-plugins/*/Makefile*
-
-.include "../../audio/goom/buildlink3.mk"
-.include "../../audio/libvisual0.2/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-# currently not useful, since libgdkpixbuf plugin is not configurable
-#.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libvisual0.2-plugins/PLIST b/audio/libvisual0.2-plugins/PLIST
deleted file mode 100644
index 578fe88badb..00000000000
--- a/audio/libvisual0.2-plugins/PLIST
+++ /dev/null
@@ -1,547 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/07/03 23:31:04 wiz Exp $
-lib/libvisual/actor/actor_JESS.la
-lib/libvisual/actor/actor_bumpscope.la
-lib/libvisual/actor/actor_corona.la
-@comment see Makefile for cause: lib/libvisual/actor/actor_dancingparticles.la
-lib/libvisual/actor/actor_flower.la
-lib/libvisual/actor/actor_gforce.la
-lib/libvisual/actor/actor_goom2.la
-lib/libvisual/actor/actor_infinite.la
-lib/libvisual/actor/actor_jakdaw.la
-lib/libvisual/actor/actor_lv_analyzer.la
-lib/libvisual/actor/actor_lv_gltest.la
-lib/libvisual/actor/actor_lv_scope.la
-lib/libvisual/actor/actor_madspin.la
-lib/libvisual/actor/actor_nebulus.la
-lib/libvisual/actor/actor_oinksie.la
-lib/libvisual/actor/actor_plazma.la
-lib/libvisual/input/input_mplayer.la
-lib/libvisual/morph/morph_alphablend.la
-lib/libvisual/morph/morph_flash.la
-lib/libvisual/morph/morph_slide.la
-lib/libvisual/morph/morph_tentacle.la
-share/libvisual-plugins/GForceColorMaps/Acid_Gap
-share/libvisual-plugins/GForceColorMaps/Acid_Gap_2
-share/libvisual-plugins/GForceColorMaps/Acid_Gap_5
-share/libvisual-plugins/GForceColorMaps/Acid_Gap_6
-share/libvisual-plugins/GForceColorMaps/Aqua
-share/libvisual-plugins/GForceColorMaps/Back_in_the_70s__red-blue_
-share/libvisual-plugins/GForceColorMaps/Bizarro-ColorWheel
-share/libvisual-plugins/GForceColorMaps/Bizarro_Mystery_Unveiled
-share/libvisual-plugins/GForceColorMaps/Blood
-share/libvisual-plugins/GForceColorMaps/ColorWheel
-share/libvisual-plugins/GForceColorMaps/DT_-_Antarctis
-share/libvisual-plugins/GForceColorMaps/DT_-_Glows
-share/libvisual-plugins/GForceColorMaps/DT_-_GreenPoison
-share/libvisual-plugins/GForceColorMaps/DT_-_Horror
-share/libvisual-plugins/GForceColorMaps/DT_-_Lake_of_Fire
-share/libvisual-plugins/GForceColorMaps/DT_-_Metal
-share/libvisual-plugins/GForceColorMaps/DT_-_Neon_Knights
-share/libvisual-plugins/GForceColorMaps/DT_-_November_Rain
-share/libvisual-plugins/GForceColorMaps/DT_-_Ocean_Club
-share/libvisual-plugins/GForceColorMaps/DT_-_Plastic
-share/libvisual-plugins/GForceColorMaps/DT_-_Purple_Haze
-share/libvisual-plugins/GForceColorMaps/DT_-_Silver_Machine
-share/libvisual-plugins/GForceColorMaps/DT_-_Wild_West_End
-share/libvisual-plugins/GForceColorMaps/Dali
-share/libvisual-plugins/GForceColorMaps/Dark_Rainbow
-share/libvisual-plugins/GForceColorMaps/DayDream
-share/libvisual-plugins/GForceColorMaps/ElectricAcid
-share/libvisual-plugins/GForceColorMaps/Firestorm
-share/libvisual-plugins/GForceColorMaps/Green
-share/libvisual-plugins/GForceColorMaps/Hero
-share/libvisual-plugins/GForceColorMaps/Ice_Nightshade
-share/libvisual-plugins/GForceColorMaps/Lust
-share/libvisual-plugins/GForceColorMaps/Midnight_Dream
-share/libvisual-plugins/GForceColorMaps/Mononoke
-share/libvisual-plugins/GForceColorMaps/Muted_Middle
-share/libvisual-plugins/GForceColorMaps/Mystery_Unveiled
-share/libvisual-plugins/GForceColorMaps/Mystery_Unveiled_-_Dim
-share/libvisual-plugins/GForceColorMaps/Mystery_Unveiled_-_Jellyfish
-share/libvisual-plugins/GForceColorMaps/New_Acid_Gap_6
-share/libvisual-plugins/GForceColorMaps/Orange_To_Blue
-share/libvisual-plugins/GForceColorMaps/Punkin_
-share/libvisual-plugins/GForceColorMaps/Purple_N_Blues
-share/libvisual-plugins/GForceColorMaps/Purple_N_Blues_II
-share/libvisual-plugins/GForceColorMaps/Purty_Acid_Gap
-share/libvisual-plugins/GForceColorMaps/Scythe
-share/libvisual-plugins/GForceColorMaps/SolarWinds
-share/libvisual-plugins/GForceColorMaps/Strawberry
-share/libvisual-plugins/GForceColorMaps/StrawberryDreams
-share/libvisual-plugins/GForceColorMaps/Sunshine
-share/libvisual-plugins/GForceColorMaps/Teal
-share/libvisual-plugins/GForceColorMaps/The_Spectrologist_s_Assistant
-share/libvisual-plugins/GForceDeltaFields/6_Feet_Under
-share/libvisual-plugins/GForceDeltaFields/Accident
-share/libvisual-plugins/GForceDeltaFields/Claustrophobia
-share/libvisual-plugins/GForceDeltaFields/Collapse_N_Turn
-share/libvisual-plugins/GForceDeltaFields/Collapsing_Star
-share/libvisual-plugins/GForceDeltaFields/Constant_Out
-share/libvisual-plugins/GForceDeltaFields/Contrail
-share/libvisual-plugins/GForceDeltaFields/DT_-_Boxes
-share/libvisual-plugins/GForceDeltaFields/DT_-_Chaos
-share/libvisual-plugins/GForceDeltaFields/DT_-_Horizon
-share/libvisual-plugins/GForceDeltaFields/DT_-_Swirl
-share/libvisual-plugins/GForceDeltaFields/DT_-_Tip
-share/libvisual-plugins/GForceDeltaFields/DT_-_Water
-share/libvisual-plugins/GForceDeltaFields/Dandelion_Psychology
-share/libvisual-plugins/GForceDeltaFields/Diamond
-share/libvisual-plugins/GForceDeltaFields/Directed_Spread
-share/libvisual-plugins/GForceDeltaFields/Directrix_Expand_-_X
-share/libvisual-plugins/GForceDeltaFields/Directrix_Expand_-_Y
-share/libvisual-plugins/GForceDeltaFields/Disco_Ball
-share/libvisual-plugins/GForceDeltaFields/Donut
-share/libvisual-plugins/GForceDeltaFields/Drawn_and_Quartered
-share/libvisual-plugins/GForceDeltaFields/Dreamscape
-share/libvisual-plugins/GForceDeltaFields/Equalateral_Hyperbola
-share/libvisual-plugins/GForceDeltaFields/Expand_N_Turn
-share/libvisual-plugins/GForceDeltaFields/Eyes
-share/libvisual-plugins/GForceDeltaFields/Flamage
-share/libvisual-plugins/GForceDeltaFields/Flamin_Ice_Cubes
-share/libvisual-plugins/GForceDeltaFields/Flee
-share/libvisual-plugins/GForceDeltaFields/Flower_Power
-share/libvisual-plugins/GForceDeltaFields/Fractal_sweetness
-share/libvisual-plugins/GForceDeltaFields/Free_Yourself
-share/libvisual-plugins/GForceDeltaFields/Freezymelt
-share/libvisual-plugins/GForceDeltaFields/Gail_Force_Winds
-share/libvisual-plugins/GForceDeltaFields/Galaxy
-share/libvisual-plugins/GForceDeltaFields/Good_ol_LP
-share/libvisual-plugins/GForceDeltaFields/Gravity
-share/libvisual-plugins/GForceDeltaFields/Gravity_Ball
-share/libvisual-plugins/GForceDeltaFields/HS101_Mess
-share/libvisual-plugins/GForceDeltaFields/Hip-no-Therapy
-share/libvisual-plugins/GForceDeltaFields/In_Or_Out__Inner_Turn
-share/libvisual-plugins/GForceDeltaFields/Krabben
-share/libvisual-plugins/GForceDeltaFields/Left_Turn_N_Flow_Out
-share/libvisual-plugins/GForceDeltaFields/Linear_Spread
-share/libvisual-plugins/GForceDeltaFields/Marble
-share/libvisual-plugins/GForceDeltaFields/Nexus-Zero
-share/libvisual-plugins/GForceDeltaFields/Noise
-share/libvisual-plugins/GForceDeltaFields/Nowhere
-share/libvisual-plugins/GForceDeltaFields/Once_Upon_A_Time
-share/libvisual-plugins/GForceDeltaFields/Paint
-share/libvisual-plugins/GForceDeltaFields/Phantom_Mist
-share/libvisual-plugins/GForceDeltaFields/Poinsetta
-share/libvisual-plugins/GForceDeltaFields/Psycho_Disco_Ball
-share/libvisual-plugins/GForceDeltaFields/Psychosis_-_Relapse
-share/libvisual-plugins/GForceDeltaFields/Quantum_Ripple
-share/libvisual-plugins/GForceDeltaFields/Quantum_Theta
-share/libvisual-plugins/GForceDeltaFields/Radial_Breakaway
-share/libvisual-plugins/GForceDeltaFields/Right_Turn
-share/libvisual-plugins/GForceDeltaFields/SOLs_Base
-share/libvisual-plugins/GForceDeltaFields/SOLs_Perspective
-share/libvisual-plugins/GForceDeltaFields/SOLs_Point_and_Hang
-share/libvisual-plugins/GForceDeltaFields/SOLs_Tinsle
-share/libvisual-plugins/GForceDeltaFields/SOLs_Torch
-share/libvisual-plugins/GForceDeltaFields/SOLs_Warp
-share/libvisual-plugins/GForceDeltaFields/SOLs_Waves
-share/libvisual-plugins/GForceDeltaFields/Scattered_Flow_In
-share/libvisual-plugins/GForceDeltaFields/Scattered_Flow_Out
-share/libvisual-plugins/GForceDeltaFields/Simple_Sine-Sphere
-share/libvisual-plugins/GForceDeltaFields/Sincos
-share/libvisual-plugins/GForceDeltaFields/Sine_Multi-Circ
-share/libvisual-plugins/GForceDeltaFields/Sine_Slide
-share/libvisual-plugins/GForceDeltaFields/Sphere
-share/libvisual-plugins/GForceDeltaFields/Sunburst
-share/libvisual-plugins/GForceDeltaFields/Swirly
-share/libvisual-plugins/GForceDeltaFields/The_Lake
-share/libvisual-plugins/GForceDeltaFields/The_MAW
-share/libvisual-plugins/GForceDeltaFields/Theta_Divergence
-share/libvisual-plugins/GForceDeltaFields/Thick_River
-share/libvisual-plugins/GForceDeltaFields/Tiles
-share/libvisual-plugins/GForceDeltaFields/TimeWarp
-share/libvisual-plugins/GForceDeltaFields/Traffic_Flow
-share/libvisual-plugins/GForceDeltaFields/Tripping_Hard
-share/libvisual-plugins/GForceDeltaFields/Tropic_Of_Capricorn
-share/libvisual-plugins/GForceDeltaFields/Tunnel_Vision
-share/libvisual-plugins/GForceDeltaFields/Twist_of_Fate
-share/libvisual-plugins/GForceDeltaFields/Twister
-share/libvisual-plugins/GForceDeltaFields/Victorian_Corset
-share/libvisual-plugins/GForceDeltaFields/Watery_Ripples
-share/libvisual-plugins/GForceDeltaFields/Wet_Paint
-share/libvisual-plugins/GForceDeltaFields/Wrap_Your_Brain_Around_This
-share/libvisual-plugins/GForceDeltaFields/Yes
-share/libvisual-plugins/GForceDeltaFields/one
-share/libvisual-plugins/GForceParticles/A_Wounded_Deer
-share/libvisual-plugins/GForceParticles/Airport
-share/libvisual-plugins/GForceParticles/Art__I_Suppose
-share/libvisual-plugins/GForceParticles/Attack
-share/libvisual-plugins/GForceParticles/Brain_Candy
-share/libvisual-plugins/GForceParticles/Centipede
-share/libvisual-plugins/GForceParticles/Converge
-share/libvisual-plugins/GForceParticles/Converge_-_Circle
-share/libvisual-plugins/GForceParticles/Converge_3
-share/libvisual-plugins/GForceParticles/Crosshairs
-share/libvisual-plugins/GForceParticles/Cycling_Dots
-share/libvisual-plugins/GForceParticles/DT_-_Birds
-share/libvisual-plugins/GForceParticles/DT_-_Explode
-share/libvisual-plugins/GForceParticles/DT_-_Galaxy
-share/libvisual-plugins/GForceParticles/DT_-_Mysko
-share/libvisual-plugins/GForceParticles/DT_-_Snake
-share/libvisual-plugins/GForceParticles/DT_-_ZoomPlanet
-share/libvisual-plugins/GForceParticles/Dancing_String
-share/libvisual-plugins/GForceParticles/Darren_Bird
-share/libvisual-plugins/GForceParticles/Dot_Grid
-share/libvisual-plugins/GForceParticles/Explosion_I
-share/libvisual-plugins/GForceParticles/Explosion_II
-share/libvisual-plugins/GForceParticles/Falling_Orbs
-share/libvisual-plugins/GForceParticles/Lizy_s_Starry_Night
-share/libvisual-plugins/GForceParticles/Metors
-share/libvisual-plugins/GForceParticles/Miri_s_Ball
-share/libvisual-plugins/GForceParticles/Moon_N_Sun
-share/libvisual-plugins/GForceParticles/Orbiting_Rods
-share/libvisual-plugins/GForceParticles/Pair
-share/libvisual-plugins/GForceParticles/Pearl
-share/libvisual-plugins/GForceParticles/Pollock_Dots
-share/libvisual-plugins/GForceParticles/Prophesy_SC
-share/libvisual-plugins/GForceParticles/Protozoan_Lovers
-share/libvisual-plugins/GForceParticles/Raining_Oscilliscopes
-share/libvisual-plugins/GForceParticles/Robox
-share/libvisual-plugins/GForceParticles/Snakes
-share/libvisual-plugins/GForceParticles/Solala
-share/libvisual-plugins/GForceParticles/Sparkling_Table_Water
-share/libvisual-plugins/GForceParticles/Spinners
-share/libvisual-plugins/GForceParticles/Spinning_Cube
-share/libvisual-plugins/GForceParticles/Spinning_Plane
-share/libvisual-plugins/GForceParticles/Spinning_Tetra
-share/libvisual-plugins/GForceParticles/Spinning_Tetraeder
-share/libvisual-plugins/GForceParticles/Spiral
-share/libvisual-plugins/GForceParticles/Sprinkles
-share/libvisual-plugins/GForceParticles/Storm_Beat
-share/libvisual-plugins/GForceParticles/Suck_Me_In
-share/libvisual-plugins/GForceParticles/Tango_Particles
-share/libvisual-plugins/GForceParticles/Tosser
-share/libvisual-plugins/GForceParticles/Tri-Cycling_Dots
-share/libvisual-plugins/GForceParticles/Warp_Me_Away
-share/libvisual-plugins/GForceWaveShapes/3D_Cylinder
-share/libvisual-plugins/GForceWaveShapes/Big_N_Banded
-share/libvisual-plugins/GForceWaveShapes/Caffene_Junkie
-share/libvisual-plugins/GForceWaveShapes/CrossBall
-share/libvisual-plugins/GForceWaveShapes/DT_-_Birds
-share/libvisual-plugins/GForceWaveShapes/DT_-_BorderThunder
-share/libvisual-plugins/GForceWaveShapes/DT_-_Circle_II
-share/libvisual-plugins/GForceWaveShapes/DT_-_Circle_III
-share/libvisual-plugins/GForceWaveShapes/DT_-_Sine
-share/libvisual-plugins/GForceWaveShapes/DT_-_SineDot
-share/libvisual-plugins/GForceWaveShapes/DT_-_Spectrum
-share/libvisual-plugins/GForceWaveShapes/DT_-_Wild
-share/libvisual-plugins/GForceWaveShapes/Dancing_days
-share/libvisual-plugins/GForceWaveShapes/Darren_DDoublehelix
-share/libvisual-plugins/GForceWaveShapes/Darren_Doublehelix
-share/libvisual-plugins/GForceWaveShapes/Darren_Quadhelix
-share/libvisual-plugins/GForceWaveShapes/Darren_Scanner
-share/libvisual-plugins/GForceWaveShapes/Darren_Stairway
-share/libvisual-plugins/GForceWaveShapes/Ellipses
-share/libvisual-plugins/GForceWaveShapes/Example_Spectrum
-share/libvisual-plugins/GForceWaveShapes/Father_and_Daughters
-share/libvisual-plugins/GForceWaveShapes/Five
-share/libvisual-plugins/GForceWaveShapes/Flower_Power
-share/libvisual-plugins/GForceWaveShapes/Heart_of_the_Beast
-share/libvisual-plugins/GForceWaveShapes/Horizontal_Corridor
-share/libvisual-plugins/GForceWaveShapes/Horzonal_Sweep
-share/libvisual-plugins/GForceWaveShapes/Hourglass
-share/libvisual-plugins/GForceWaveShapes/Kaleidoscope
-share/libvisual-plugins/GForceWaveShapes/Magnum
-share/libvisual-plugins/GForceWaveShapes/Melt_O_Rama
-share/libvisual-plugins/GForceWaveShapes/Mother_and_Daughters
-share/libvisual-plugins/GForceWaveShapes/Moving
-share/libvisual-plugins/GForceWaveShapes/NPTU_Squared
-share/libvisual-plugins/GForceWaveShapes/Null
-share/libvisual-plugins/GForceWaveShapes/Parkening_Power
-share/libvisual-plugins/GForceWaveShapes/Particle_Pulse
-share/libvisual-plugins/GForceWaveShapes/Quad-Circle
-share/libvisual-plugins/GForceWaveShapes/Radar_Sweep
-share/libvisual-plugins/GForceWaveShapes/Random_Corridor
-share/libvisual-plugins/GForceWaveShapes/Rotating_Arcs
-share/libvisual-plugins/GForceWaveShapes/Rotating_Bars
-share/libvisual-plugins/GForceWaveShapes/Rotating_Corridor
-share/libvisual-plugins/GForceWaveShapes/Rotating_X
-share/libvisual-plugins/GForceWaveShapes/SOLs_Vinyl
-share/libvisual-plugins/GForceWaveShapes/Simple_Horizontal
-share/libvisual-plugins/GForceWaveShapes/Simple_Vertical
-share/libvisual-plugins/GForceWaveShapes/Spectagon
-share/libvisual-plugins/GForceWaveShapes/SpinIt
-share/libvisual-plugins/GForceWaveShapes/The_Dot_Line
-share/libvisual-plugins/GForceWaveShapes/The_Eye
-share/libvisual-plugins/GForceWaveShapes/Tri-Cycle
-share/libvisual-plugins/GForceWaveShapes/Tri-Vertical
-share/libvisual-plugins/GForceWaveShapes/Up_Like_A_Cup
-share/libvisual-plugins/GForceWaveShapes/Vertical_Corridor
-share/libvisual-plugins/GForceWaveShapes/Wave
-share/libvisual-plugins/GForceWaveShapes/Zoomed_Square
-share/libvisual-plugins/deffont
-share/libvisual/actor/actor_gforce/GForceColorMaps/Acid_Gap
-share/libvisual/actor/actor_gforce/GForceColorMaps/Acid_Gap_2
-share/libvisual/actor/actor_gforce/GForceColorMaps/Acid_Gap_5
-share/libvisual/actor/actor_gforce/GForceColorMaps/Acid_Gap_6
-share/libvisual/actor/actor_gforce/GForceColorMaps/Aqua
-share/libvisual/actor/actor_gforce/GForceColorMaps/Back_in_the_70s__red-blue_
-share/libvisual/actor/actor_gforce/GForceColorMaps/Bizarro-ColorWheel
-share/libvisual/actor/actor_gforce/GForceColorMaps/Bizarro_Mystery_Unveiled
-share/libvisual/actor/actor_gforce/GForceColorMaps/Blood
-share/libvisual/actor/actor_gforce/GForceColorMaps/ColorWheel
-share/libvisual/actor/actor_gforce/GForceColorMaps/DT_-_Antarctis
-share/libvisual/actor/actor_gforce/GForceColorMaps/DT_-_Glows
-share/libvisual/actor/actor_gforce/GForceColorMaps/DT_-_GreenPoison
-share/libvisual/actor/actor_gforce/GForceColorMaps/DT_-_Horror
-share/libvisual/actor/actor_gforce/GForceColorMaps/DT_-_Lake_of_Fire
-share/libvisual/actor/actor_gforce/GForceColorMaps/DT_-_Metal
-share/libvisual/actor/actor_gforce/GForceColorMaps/DT_-_Neon_Knights
-share/libvisual/actor/actor_gforce/GForceColorMaps/DT_-_November_Rain
-share/libvisual/actor/actor_gforce/GForceColorMaps/DT_-_Ocean_Club
-share/libvisual/actor/actor_gforce/GForceColorMaps/DT_-_Plastic
-share/libvisual/actor/actor_gforce/GForceColorMaps/DT_-_Purple_Haze
-share/libvisual/actor/actor_gforce/GForceColorMaps/DT_-_Silver_Machine
-share/libvisual/actor/actor_gforce/GForceColorMaps/DT_-_Wild_West_End
-share/libvisual/actor/actor_gforce/GForceColorMaps/Dali
-share/libvisual/actor/actor_gforce/GForceColorMaps/Dark_Rainbow
-share/libvisual/actor/actor_gforce/GForceColorMaps/DayDream
-share/libvisual/actor/actor_gforce/GForceColorMaps/ElectricAcid
-share/libvisual/actor/actor_gforce/GForceColorMaps/Firestorm
-share/libvisual/actor/actor_gforce/GForceColorMaps/Green
-share/libvisual/actor/actor_gforce/GForceColorMaps/Hero
-share/libvisual/actor/actor_gforce/GForceColorMaps/Ice_Nightshade
-share/libvisual/actor/actor_gforce/GForceColorMaps/Lust
-share/libvisual/actor/actor_gforce/GForceColorMaps/Midnight_Dream
-share/libvisual/actor/actor_gforce/GForceColorMaps/Mononoke
-share/libvisual/actor/actor_gforce/GForceColorMaps/Muted_Middle
-share/libvisual/actor/actor_gforce/GForceColorMaps/Mystery_Unveiled
-share/libvisual/actor/actor_gforce/GForceColorMaps/Mystery_Unveiled_-_Dim
-share/libvisual/actor/actor_gforce/GForceColorMaps/Mystery_Unveiled_-_Jellyfish
-share/libvisual/actor/actor_gforce/GForceColorMaps/New_Acid_Gap_6
-share/libvisual/actor/actor_gforce/GForceColorMaps/Orange_To_Blue
-share/libvisual/actor/actor_gforce/GForceColorMaps/Punkin_
-share/libvisual/actor/actor_gforce/GForceColorMaps/Purple_N_Blues
-share/libvisual/actor/actor_gforce/GForceColorMaps/Purple_N_Blues_II
-share/libvisual/actor/actor_gforce/GForceColorMaps/Purty_Acid_Gap
-share/libvisual/actor/actor_gforce/GForceColorMaps/Scythe
-share/libvisual/actor/actor_gforce/GForceColorMaps/SolarWinds
-share/libvisual/actor/actor_gforce/GForceColorMaps/Strawberry
-share/libvisual/actor/actor_gforce/GForceColorMaps/StrawberryDreams
-share/libvisual/actor/actor_gforce/GForceColorMaps/Sunshine
-share/libvisual/actor/actor_gforce/GForceColorMaps/Teal
-share/libvisual/actor/actor_gforce/GForceColorMaps/The_Spectrologist_s_Assistant
-share/libvisual/actor/actor_gforce/GForceDeltaFields/6_Feet_Under
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Accident
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Claustrophobia
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Collapse_N_Turn
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Collapsing_Star
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Constant_Out
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Contrail
-share/libvisual/actor/actor_gforce/GForceDeltaFields/DT_-_Boxes
-share/libvisual/actor/actor_gforce/GForceDeltaFields/DT_-_Chaos
-share/libvisual/actor/actor_gforce/GForceDeltaFields/DT_-_Horizon
-share/libvisual/actor/actor_gforce/GForceDeltaFields/DT_-_Swirl
-share/libvisual/actor/actor_gforce/GForceDeltaFields/DT_-_Tip
-share/libvisual/actor/actor_gforce/GForceDeltaFields/DT_-_Water
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Dandelion_Psychology
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Diamond
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Directed_Spread
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Directrix_Expand_-_X
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Directrix_Expand_-_Y
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Disco_Ball
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Donut
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Drawn_and_Quartered
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Dreamscape
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Equalateral_Hyperbola
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Expand_N_Turn
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Eyes
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Flamage
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Flamin_Ice_Cubes
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Flee
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Flower_Power
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Fractal_sweetness
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Free_Yourself
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Freezymelt
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Gail_Force_Winds
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Galaxy
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Good_ol_LP
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Gravity
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Gravity_Ball
-share/libvisual/actor/actor_gforce/GForceDeltaFields/HS101_Mess
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Hip-no-Therapy
-share/libvisual/actor/actor_gforce/GForceDeltaFields/In_Or_Out__Inner_Turn
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Krabben
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Left_Turn_N_Flow_Out
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Linear_Spread
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Marble
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Nexus-Zero
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Noise
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Nowhere
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Once_Upon_A_Time
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Paint
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Phantom_Mist
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Poinsetta
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Psycho_Disco_Ball
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Psychosis_-_Relapse
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Quantum_Ripple
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Quantum_Theta
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Radial_Breakaway
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Right_Turn
-share/libvisual/actor/actor_gforce/GForceDeltaFields/SOLs_Base
-share/libvisual/actor/actor_gforce/GForceDeltaFields/SOLs_Perspective
-share/libvisual/actor/actor_gforce/GForceDeltaFields/SOLs_Point_and_Hang
-share/libvisual/actor/actor_gforce/GForceDeltaFields/SOLs_Tinsle
-share/libvisual/actor/actor_gforce/GForceDeltaFields/SOLs_Torch
-share/libvisual/actor/actor_gforce/GForceDeltaFields/SOLs_Warp
-share/libvisual/actor/actor_gforce/GForceDeltaFields/SOLs_Waves
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Scattered_Flow_In
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Scattered_Flow_Out
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Simple_Sine-Sphere
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Sincos
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Sine_Multi-Circ
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Sine_Slide
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Sphere
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Sunburst
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Swirly
-share/libvisual/actor/actor_gforce/GForceDeltaFields/The_Lake
-share/libvisual/actor/actor_gforce/GForceDeltaFields/The_MAW
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Theta_Divergence
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Thick_River
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Tiles
-share/libvisual/actor/actor_gforce/GForceDeltaFields/TimeWarp
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Traffic_Flow
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Tripping_Hard
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Tropic_Of_Capricorn
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Tunnel_Vision
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Twist_of_Fate
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Twister
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Victorian_Corset
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Watery_Ripples
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Wet_Paint
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Wrap_Your_Brain_Around_This
-share/libvisual/actor/actor_gforce/GForceDeltaFields/Yes
-share/libvisual/actor/actor_gforce/GForceDeltaFields/one
-share/libvisual/actor/actor_gforce/GForceParticles/A_Wounded_Deer
-share/libvisual/actor/actor_gforce/GForceParticles/Airport
-share/libvisual/actor/actor_gforce/GForceParticles/Art__I_Suppose
-share/libvisual/actor/actor_gforce/GForceParticles/Attack
-share/libvisual/actor/actor_gforce/GForceParticles/Brain_Candy
-share/libvisual/actor/actor_gforce/GForceParticles/Centipede
-share/libvisual/actor/actor_gforce/GForceParticles/Converge
-share/libvisual/actor/actor_gforce/GForceParticles/Converge_-_Circle
-share/libvisual/actor/actor_gforce/GForceParticles/Converge_3
-share/libvisual/actor/actor_gforce/GForceParticles/Crosshairs
-share/libvisual/actor/actor_gforce/GForceParticles/Cycling_Dots
-share/libvisual/actor/actor_gforce/GForceParticles/DT_-_Birds
-share/libvisual/actor/actor_gforce/GForceParticles/DT_-_Explode
-share/libvisual/actor/actor_gforce/GForceParticles/DT_-_Galaxy
-share/libvisual/actor/actor_gforce/GForceParticles/DT_-_Mysko
-share/libvisual/actor/actor_gforce/GForceParticles/DT_-_Snake
-share/libvisual/actor/actor_gforce/GForceParticles/DT_-_ZoomPlanet
-share/libvisual/actor/actor_gforce/GForceParticles/Dancing_String
-share/libvisual/actor/actor_gforce/GForceParticles/Darren_Bird
-share/libvisual/actor/actor_gforce/GForceParticles/Dot_Grid
-share/libvisual/actor/actor_gforce/GForceParticles/Explosion_I
-share/libvisual/actor/actor_gforce/GForceParticles/Explosion_II
-share/libvisual/actor/actor_gforce/GForceParticles/Falling_Orbs
-share/libvisual/actor/actor_gforce/GForceParticles/Lizy_s_Starry_Night
-share/libvisual/actor/actor_gforce/GForceParticles/Metors
-share/libvisual/actor/actor_gforce/GForceParticles/Miri_s_Ball
-share/libvisual/actor/actor_gforce/GForceParticles/Moon_N_Sun
-share/libvisual/actor/actor_gforce/GForceParticles/Orbiting_Rods
-share/libvisual/actor/actor_gforce/GForceParticles/Pair
-share/libvisual/actor/actor_gforce/GForceParticles/Pearl
-share/libvisual/actor/actor_gforce/GForceParticles/Pollock_Dots
-share/libvisual/actor/actor_gforce/GForceParticles/Prophesy_SC
-share/libvisual/actor/actor_gforce/GForceParticles/Protozoan_Lovers
-share/libvisual/actor/actor_gforce/GForceParticles/Raining_Oscilliscopes
-share/libvisual/actor/actor_gforce/GForceParticles/Robox
-share/libvisual/actor/actor_gforce/GForceParticles/Snakes
-share/libvisual/actor/actor_gforce/GForceParticles/Solala
-share/libvisual/actor/actor_gforce/GForceParticles/Sparkling_Table_Water
-share/libvisual/actor/actor_gforce/GForceParticles/Spinners
-share/libvisual/actor/actor_gforce/GForceParticles/Spinning_Cube
-share/libvisual/actor/actor_gforce/GForceParticles/Spinning_Plane
-share/libvisual/actor/actor_gforce/GForceParticles/Spinning_Tetra
-share/libvisual/actor/actor_gforce/GForceParticles/Spinning_Tetraeder
-share/libvisual/actor/actor_gforce/GForceParticles/Spiral
-share/libvisual/actor/actor_gforce/GForceParticles/Sprinkles
-share/libvisual/actor/actor_gforce/GForceParticles/Storm_Beat
-share/libvisual/actor/actor_gforce/GForceParticles/Suck_Me_In
-share/libvisual/actor/actor_gforce/GForceParticles/Tango_Particles
-share/libvisual/actor/actor_gforce/GForceParticles/Tosser
-share/libvisual/actor/actor_gforce/GForceParticles/Tri-Cycling_Dots
-share/libvisual/actor/actor_gforce/GForceParticles/Warp_Me_Away
-share/libvisual/actor/actor_gforce/GForceWaveShapes/3D_Cylinder
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Big_N_Banded
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Caffene_Junkie
-share/libvisual/actor/actor_gforce/GForceWaveShapes/CrossBall
-share/libvisual/actor/actor_gforce/GForceWaveShapes/DT_-_Birds
-share/libvisual/actor/actor_gforce/GForceWaveShapes/DT_-_BorderThunder
-share/libvisual/actor/actor_gforce/GForceWaveShapes/DT_-_Circle_II
-share/libvisual/actor/actor_gforce/GForceWaveShapes/DT_-_Circle_III
-share/libvisual/actor/actor_gforce/GForceWaveShapes/DT_-_Sine
-share/libvisual/actor/actor_gforce/GForceWaveShapes/DT_-_SineDot
-share/libvisual/actor/actor_gforce/GForceWaveShapes/DT_-_Spectrum
-share/libvisual/actor/actor_gforce/GForceWaveShapes/DT_-_Wild
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Dancing_days
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Darren_DDoublehelix
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Darren_Doublehelix
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Darren_Quadhelix
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Darren_Scanner
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Darren_Stairway
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Ellipses
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Example_Spectrum
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Father_and_Daughters
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Five
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Flower_Power
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Heart_of_the_Beast
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Horizontal_Corridor
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Horzonal_Sweep
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Hourglass
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Kaleidoscope
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Magnum
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Melt_O_Rama
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Mother_and_Daughters
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Moving
-share/libvisual/actor/actor_gforce/GForceWaveShapes/NPTU_Squared
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Null
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Parkening_Power
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Particle_Pulse
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Quad-Circle
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Radar_Sweep
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Random_Corridor
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Rotating_Arcs
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Rotating_Bars
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Rotating_Corridor
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Rotating_X
-share/libvisual/actor/actor_gforce/GForceWaveShapes/SOLs_Vinyl
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Simple_Horizontal
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Simple_Vertical
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Spectagon
-share/libvisual/actor/actor_gforce/GForceWaveShapes/SpinIt
-share/libvisual/actor/actor_gforce/GForceWaveShapes/The_Dot_Line
-share/libvisual/actor/actor_gforce/GForceWaveShapes/The_Eye
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Tri-Cycle
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Tri-Vertical
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Up_Like_A_Cup
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Vertical_Corridor
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Wave
-share/libvisual/actor/actor_gforce/GForceWaveShapes/Zoomed_Square
-share/libvisual/actor/actor_madspin/star1.bmp
-share/libvisual/actor/actor_madspin/star2.bmp
-share/libvisual/actor/actor_nebulus/background_texture.bmp
-share/libvisual/actor/actor_nebulus/child_texture.bmp
-share/libvisual/actor/actor_nebulus/energy_texture.bmp
-share/libvisual/actor/actor_nebulus/tentacle_texture.bmp
-share/libvisual/actor/actor_nebulus/tunnel_texture.bmp
-share/libvisual/actor/actor_nebulus/twist_texture.bmp
-@dirrm share/libvisual/actor/actor_nebulus
-@dirrm share/libvisual/actor/actor_madspin
-@dirrm share/libvisual/actor/actor_gforce/GForceWaveShapes
-@dirrm share/libvisual/actor/actor_gforce/GForceParticles
-@dirrm share/libvisual/actor/actor_gforce/GForceDeltaFields
-@dirrm share/libvisual/actor/actor_gforce/GForceColorMaps
-@dirrm share/libvisual/actor/actor_gforce
-@dirrm share/libvisual/actor
-@dirrm share/libvisual-plugins/GForceWaveShapes
-@dirrm share/libvisual-plugins/GForceParticles
-@dirrm share/libvisual-plugins/GForceDeltaFields
-@dirrm share/libvisual-plugins/GForceColorMaps
-@dirrm share/libvisual-plugins
-@dirrm share/libvisual
-@dirrm lib/libvisual/morph
-@dirrm lib/libvisual/input
-@dirrm lib/libvisual/actor
-@dirrm lib/libvisual
diff --git a/audio/libvisual0.2-plugins/distinfo b/audio/libvisual0.2-plugins/distinfo
deleted file mode 100644
index caaa84abd8c..00000000000
--- a/audio/libvisual0.2-plugins/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/07/03 23:31:04 wiz Exp $
-
-SHA1 (libvisual-plugins-0.2.0.tar.gz) = bc001f66b1c81b747bc06e3e09aaf71882c47370
-RMD160 (libvisual-plugins-0.2.0.tar.gz) = 3f4835843e3719e6342a3b8f1478f89388423b37
-Size (libvisual-plugins-0.2.0.tar.gz) = 1021051 bytes
-SHA1 (patch-aa) = 68ffdb6261aafa219df0e5c4d313fc7f865ae734
-SHA1 (patch-ab) = 31a380ed59ed9eed1e5516c44fec54c1e7dcf25c
diff --git a/audio/libvisual0.2-plugins/patches/patch-aa b/audio/libvisual0.2-plugins/patches/patch-aa
deleted file mode 100644
index 198df20e9f3..00000000000
--- a/audio/libvisual0.2-plugins/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/07/03 23:31:04 wiz Exp $
-
---- configure.orig 2005-01-24 15:43:45.000000000 +0100
-+++ configure 2005-06-19 19:08:03.000000000 +0200
-@@ -1882,7 +1882,7 @@
- AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
--MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-+MAKEINFO=
-
-
- AMTAR=${AMTAR-"${am_missing_run}tar"}
-@@ -20355,7 +20355,7 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lGL $LIBS"
-+LIBS="-lGL -lXext -lm $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
diff --git a/audio/libvisual0.2-plugins/patches/patch-ab b/audio/libvisual0.2-plugins/patches/patch-ab
deleted file mode 100644
index d1f47b65903..00000000000
--- a/audio/libvisual0.2-plugins/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/07/03 23:31:04 wiz Exp $
-
---- plugins/actor/pseudotoad_flower/notch.c.orig Thu Jun 16 22:50:58 2005
-+++ plugins/actor/pseudotoad_flower/notch.c Thu Jun 16 22:52:05 2005
-@@ -25,12 +25,13 @@
- #include <stdio.h>
- #include <math.h>
- #include <string.h>
-+#include <stdlib.h>
-
- #include "notch.h"
-
- NOTCH_FILTER * init_notch(float cutoff) {
- NOTCH_FILTER * l=malloc(sizeof(NOTCH_FILTER));
-- float steep = 0.99;;
-+ float steep = 0.99;
- float r = steep * 0.99609375;
- float f = cos(M_PI * cutoff / SAMPLING_RATE);
- l->cutoff = cutoff;
diff --git a/audio/libvisual0.2/DESCR b/audio/libvisual0.2/DESCR
deleted file mode 100644
index 8e7e86acf05..00000000000
--- a/audio/libvisual0.2/DESCR
+++ /dev/null
@@ -1,18 +0,0 @@
-Libvisual is an abstraction library that comes between applications
-and audio visualisation plugins.
-
-Often when it comes to audio visualisation plugins or programs that
-create visuals, they depend on a player or something else; basically,
-there is no general framework that enabled application developers
-to easily access cool audio visualisation plugins. Libvisual wants
-to change this by providing an interface towards plugins and
-applications; through this easy to use interface applications can
-easily access plugins and, since the drawing is done by the
-application, it also enables the developer to draw the visual
-anywhere he wants.
-
-The framework also allows you to morph to different plugins and
-mix two at once; all kinds of neat tricks are possible using this
-method.
-
-This package contains the older 0.2 release, for backward compatibility.
diff --git a/audio/libvisual0.2/Makefile b/audio/libvisual0.2/Makefile
deleted file mode 100644
index b48f0251d1e..00000000000
--- a/audio/libvisual0.2/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2007/01/26 20:19:40 joerg Exp $
-#
-
-DISTNAME= libvisual-0.2.0
-PKGNAME= libvisual0.2-0.2.0
-PKGREVISION= 1
-CATEGORIES= audio graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libvisual/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://libvisual.sourceforge.net/
-COMMENT= Abstraction library between applications and audio visualisation plugins (0.2 branch)
-
-CONFLICTS+= libvisual<0.4.0
-
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-PKGCONFIG_OVERRIDE+= ${WRKSRC}/libvisual.pc.in
-GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config
-
-.include "../../mk/compiler.mk"
-
-.if !empty(CC_VERSION:Mgcc*)
-CPPFLAGS+= -mmmx
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libvisual0.2/PLIST b/audio/libvisual0.2/PLIST
deleted file mode 100644
index 2196f24746a..00000000000
--- a/audio/libvisual0.2/PLIST
+++ /dev/null
@@ -1,36 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/07/03 23:29:50 wiz Exp $
-include/libvisual/libvisual.h
-include/libvisual/lv_actor.h
-include/libvisual/lv_audio.h
-include/libvisual/lv_bin.h
-include/libvisual/lv_bmp.h
-include/libvisual/lv_color.h
-include/libvisual/lv_common.h
-include/libvisual/lv_cpu.h
-include/libvisual/lv_endianess.h
-include/libvisual/lv_error.h
-include/libvisual/lv_event.h
-include/libvisual/lv_fft.h
-include/libvisual/lv_input.h
-include/libvisual/lv_keysym.h
-include/libvisual/lv_libvisual.h
-include/libvisual/lv_list.h
-include/libvisual/lv_log.h
-include/libvisual/lv_mem.h
-include/libvisual/lv_morph.h
-include/libvisual/lv_object.h
-include/libvisual/lv_palette.h
-include/libvisual/lv_param.h
-include/libvisual/lv_plugin.h
-include/libvisual/lv_random.h
-include/libvisual/lv_songinfo.h
-include/libvisual/lv_thread.h
-include/libvisual/lv_time.h
-include/libvisual/lv_transform.h
-include/libvisual/lv_types.h
-include/libvisual/lv_ui.h
-include/libvisual/lv_video.h
-include/libvisual/lvconfig.h
-lib/libvisual.la
-lib/pkgconfig/libvisual.pc
-@dirrm include/libvisual
diff --git a/audio/libvisual0.2/buildlink3.mk b/audio/libvisual0.2/buildlink3.mk
deleted file mode 100644
index c172676b10e..00000000000
--- a/audio/libvisual0.2/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:10:37 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBVISUAL0.2_BUILDLINK3_MK:= ${LIBVISUAL0.2_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= libvisual0.2
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibvisual0.2}
-BUILDLINK_PACKAGES+= libvisual0.2
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libvisual0.2
-
-.if ${LIBVISUAL0.2_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.libvisual0.2+= libvisual0.2>=0.2.0
-BUILDLINK_PKGSRCDIR.libvisual0.2?= ../../audio/libvisual0.2
-.endif # LIBVISUAL0.2_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libvisual0.2/distinfo b/audio/libvisual0.2/distinfo
deleted file mode 100644
index 42f0ce821de..00000000000
--- a/audio/libvisual0.2/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/07/03 23:29:50 wiz Exp $
-
-SHA1 (libvisual-0.2.0.tar.gz) = 8867f743c7407890c8cc571acab2fbcab869f3a1
-RMD160 (libvisual-0.2.0.tar.gz) = d933e849ffb8ce8f21d9d58e92fd104b137b718d
-Size (libvisual-0.2.0.tar.gz) = 431141 bytes
-SHA1 (patch-aa) = f7a0b011fa39996813bb7a8fe00aefdfaa680583
-SHA1 (patch-ab) = d4014e06622f59e31f4ee42dd24ce729e27b580d
diff --git a/audio/libvisual0.2/hacks.mk b/audio/libvisual0.2/hacks.mk
deleted file mode 100644
index b8ec7aad46c..00000000000
--- a/audio/libvisual0.2/hacks.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1.1.1 2006/07/03 23:29:50 wiz Exp $
-
-.if !defined(LIBVISUAL_HACKS_MK)
-LIBVISUAL_HACKS_MK= # defined
-
-# [ Mon Jan 2 13:49:14 CET 2006 : jmmv ]
-# -funroll-loops breaks the inlined MMX code in libvisual/lv_video_mmx.c.
-# It adds an immediate value to a movd instruction that does not let it
-# compile.
-BUILDLINK_TRANSFORM+= rm:-funroll-loops
-
-.endif
diff --git a/audio/libvisual0.2/patches/patch-aa b/audio/libvisual0.2/patches/patch-aa
deleted file mode 100644
index 03c11d79232..00000000000
--- a/audio/libvisual0.2/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/07/03 23:29:50 wiz Exp $
-
---- libvisual/lv_cpu.c.orig 2005-02-09 20:20:12.000000000 +0100
-+++ libvisual/lv_cpu.c
-@@ -354,7 +354,7 @@ void visual_cpu_initialize ()
- #endif
-
- /* Count the number of CPUs in system */
--#if !defined(VISUAL_OS_WIN32) && !defined(VISUAL_OS_UNKNOWN)
-+#if !defined(VISUAL_OS_WIN32) && !defined(VISUAL_OS_UNKNOWN) && defined(_SC_NPROCESSORS_ONLN)
- _lv_cpu_caps.nrcpu = sysconf (_SC_NPROCESSORS_ONLN);
- if (_lv_cpu_caps.nrcpu == -1)
- _lv_cpu_caps.nrcpu = 1;
-@@ -423,7 +423,7 @@ void visual_cpu_initialize ()
- #endif
- #endif /* VISUAL_ARCH_X86 */
-
--#if VISUAL_ARCH_POWERPC
-+#if defined(VISUAL_ARCH_POWERPC)
- check_os_altivec_support ();
- #endif /* VISUAL_ARCH_POWERPC */
-
diff --git a/audio/libvisual0.2/patches/patch-ab b/audio/libvisual0.2/patches/patch-ab
deleted file mode 100644
index 8067ce67649..00000000000
--- a/audio/libvisual0.2/patches/patch-ab
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/07/03 23:29:50 wiz Exp $
-
-gcc-2.95 does not know the i386 MMX registers used in the assembler
-statements, do disable them.
-
---- configure.orig Sun Jan 9 23:17:45 2005
-+++ configure Tue Apr 19 17:04:54 2005
-@@ -2046,7 +2046,7 @@ case "$host_os" in
- solaris*) lv_solaris=yes;;
- linux*) lv_linux=yes;;
- *sco*) lv_sco=yes;;
-- freebsd*) lv_freebsd=yes;;
-+ freebsd*|dragonfly*) lv_freebsd=yes;;
- netbsd*) lv_netbsd=yes;;
- openbsd*) lv_openbsd=yes;;
- *darwin*) lv_darwin=yes;;
-@@ -21919,13 +21919,13 @@ echo "$as_me: WARNING: $AIX_COMPILE_INFO
- *)
- LV_THREAD_LIBS=error
- lv_save_LIBS="$LIBS"
-- for thread_lib in "" pthread pthread32 pthreads thread dce; do
-+ for thread_lib in "" -lpthread -lpthread32 -lpthreads -lthread -ldce -pthread; do
- if test x"$thread_lib" = x; then
- add_thread_lib=""
- IN=""
- else
-- add_thread_lib="-l$thread_lib"
-- IN=" in -l$thread_lib"
-+ add_thread_lib="$thread_lib"
-+ IN=" in $thread_lib"
- fi
- if test x"$have_threads" = xposix; then
- defattr=0
-@@ -25450,7 +25450,11 @@ _______EOF
- if test x$lv_ix86 = xyes ; then
- cat >>$outfile <<_______EOF
-
-+#if defined(__GNUC__) && __GNUC__ <= 2
-+#define VISUAL_ARCH_UNKNOWN
-+#else
- #define VISUAL_ARCH_X86
-+#endif
- _______EOF
- fi
-
diff --git a/audio/libvorbis/DESCR b/audio/libvorbis/DESCR
deleted file mode 100644
index c8986ec26bd..00000000000
--- a/audio/libvorbis/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-libvorbis includes the Ogg Vorbis audio encoding format library
-and Vorbis documentation. The Ogg library is in libogg.
-Vorbis is a general purpose audio and music encoding format
-contemporary to MPEG-4's AAC and TwinVQ, the next generation beyond
-MPEG audio layer 3. Unlike the MPEG sponsored formats (and other
-proprietary formats such as RealAudio G2 and Windows' flavor of the
-month), the Vorbis CODEC specification belongs to the public domain.
-All the technical details are published and documented, and any
-software entity may make full use of the format without royalty or
-patent concerns.
-
-This package doesn't install the example executables:
-chaining_example, decoder_example, encoder_example,
-seeking_example, and vorbisfile_example.
-
-This package is libvorbis 1.0
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
deleted file mode 100644
index c0e9cf8227b..00000000000
--- a/audio/libvorbis/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.45 2006/11/02 17:59:37 joerg Exp $
-
-DISTNAME= libvorbis-1.1.2
-CATEGORIES= devel audio
-MASTER_SITES= http://downloads.xiph.org/releases/vorbis/
-
-MAINTAINER= wiz@NetBSD.org
-HOMEPAGE= http://www.xiph.org/vorbis/
-COMMENT= Library for the Ogg Vorbis audio encoding format
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
-
-GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
-
-GCC_REQD+= 2.95.3
-
-# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE:Q}
-
-PKGCONFIG_OVERRIDE+= vorbis.pc.in
-PKGCONFIG_OVERRIDE+= vorbisenc.pc.in
-PKGCONFIG_OVERRIDE+= vorbisfile.pc.in
-
-.include "../../multimedia/libogg/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libvorbis/PLIST b/audio/libvorbis/PLIST
deleted file mode 100644
index f0f2f41b117..00000000000
--- a/audio/libvorbis/PLIST
+++ /dev/null
@@ -1,117 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2004/09/24 13:04:40 wiz Exp $
-include/vorbis/codec.h
-include/vorbis/vorbisenc.h
-include/vorbis/vorbisfile.h
-lib/libvorbis.la
-lib/libvorbisenc.la
-lib/libvorbisfile.la
-lib/pkgconfig/vorbis.pc
-lib/pkgconfig/vorbisenc.pc
-lib/pkgconfig/vorbisfile.pc
-share/aclocal/vorbis.m4
-share/doc/${PKGNAME}/components.png
-share/doc/${PKGNAME}/draft-kerr-avt-vorbis-rtp-03.txt
-share/doc/${PKGNAME}/eightphase.png
-share/doc/${PKGNAME}/evenlsp.png
-share/doc/${PKGNAME}/floor1-1.png
-share/doc/${PKGNAME}/floor1-2.png
-share/doc/${PKGNAME}/floor1-3.png
-share/doc/${PKGNAME}/floor1-4.png
-share/doc/${PKGNAME}/floor1_inverse_dB_table.html
-share/doc/${PKGNAME}/floorval.png
-share/doc/${PKGNAME}/fourphase.png
-share/doc/${PKGNAME}/framing.html
-share/doc/${PKGNAME}/helper.html
-share/doc/${PKGNAME}/hufftree-under.png
-share/doc/${PKGNAME}/hufftree.png
-share/doc/${PKGNAME}/index.html
-share/doc/${PKGNAME}/lspmap.png
-share/doc/${PKGNAME}/oddlsp.png
-share/doc/${PKGNAME}/oggstream.html
-share/doc/${PKGNAME}/programming.html
-share/doc/${PKGNAME}/residue-pack.png
-share/doc/${PKGNAME}/residue2.png
-share/doc/${PKGNAME}/squarepolar.png
-share/doc/${PKGNAME}/stereo.html
-share/doc/${PKGNAME}/stream.png
-share/doc/${PKGNAME}/v-comment.html
-share/doc/${PKGNAME}/vorbis-clip.txt
-share/doc/${PKGNAME}/vorbis-errors.txt
-share/doc/${PKGNAME}/vorbis-fidelity.html
-share/doc/${PKGNAME}/vorbis.html
-share/doc/${PKGNAME}/vorbisenc/index.html
-share/doc/${PKGNAME}/vorbisenc/overview.html
-share/doc/${PKGNAME}/vorbisenc/reference.html
-share/doc/${PKGNAME}/vorbisenc/style.css
-share/doc/${PKGNAME}/vorbisenc/vorbis_encode_ctl.html
-share/doc/${PKGNAME}/vorbisenc/vorbis_encode_init.html
-share/doc/${PKGNAME}/vorbisenc/vorbis_encode_init_vbr.html
-share/doc/${PKGNAME}/vorbisenc/vorbis_info.html
-share/doc/${PKGNAME}/vorbisfile/OggVorbis_File.html
-share/doc/${PKGNAME}/vorbisfile/callbacks.html
-share/doc/${PKGNAME}/vorbisfile/chaining_example_c.html
-share/doc/${PKGNAME}/vorbisfile/chainingexample.html
-share/doc/${PKGNAME}/vorbisfile/crosslap.html
-share/doc/${PKGNAME}/vorbisfile/datastructures.html
-share/doc/${PKGNAME}/vorbisfile/decoding.html
-share/doc/${PKGNAME}/vorbisfile/example.html
-share/doc/${PKGNAME}/vorbisfile/exampleindex.html
-share/doc/${PKGNAME}/vorbisfile/fileinfo.html
-share/doc/${PKGNAME}/vorbisfile/index.html
-share/doc/${PKGNAME}/vorbisfile/initialization.html
-share/doc/${PKGNAME}/vorbisfile/ov_bitrate.html
-share/doc/${PKGNAME}/vorbisfile/ov_bitrate_instant.html
-share/doc/${PKGNAME}/vorbisfile/ov_callbacks.html
-share/doc/${PKGNAME}/vorbisfile/ov_clear.html
-share/doc/${PKGNAME}/vorbisfile/ov_comment.html
-share/doc/${PKGNAME}/vorbisfile/ov_crosslap.html
-share/doc/${PKGNAME}/vorbisfile/ov_info.html
-share/doc/${PKGNAME}/vorbisfile/ov_open.html
-share/doc/${PKGNAME}/vorbisfile/ov_open_callbacks.html
-share/doc/${PKGNAME}/vorbisfile/ov_pcm_seek.html
-share/doc/${PKGNAME}/vorbisfile/ov_pcm_seek_lap.html
-share/doc/${PKGNAME}/vorbisfile/ov_pcm_seek_page.html
-share/doc/${PKGNAME}/vorbisfile/ov_pcm_seek_page_lap.html
-share/doc/${PKGNAME}/vorbisfile/ov_pcm_tell.html
-share/doc/${PKGNAME}/vorbisfile/ov_pcm_total.html
-share/doc/${PKGNAME}/vorbisfile/ov_raw_seek.html
-share/doc/${PKGNAME}/vorbisfile/ov_raw_seek_lap.html
-share/doc/${PKGNAME}/vorbisfile/ov_raw_tell.html
-share/doc/${PKGNAME}/vorbisfile/ov_raw_total.html
-share/doc/${PKGNAME}/vorbisfile/ov_read.html
-share/doc/${PKGNAME}/vorbisfile/ov_read_float.html
-share/doc/${PKGNAME}/vorbisfile/ov_seekable.html
-share/doc/${PKGNAME}/vorbisfile/ov_serialnumber.html
-share/doc/${PKGNAME}/vorbisfile/ov_streams.html
-share/doc/${PKGNAME}/vorbisfile/ov_test.html
-share/doc/${PKGNAME}/vorbisfile/ov_test_callbacks.html
-share/doc/${PKGNAME}/vorbisfile/ov_test_open.html
-share/doc/${PKGNAME}/vorbisfile/ov_time_seek.html
-share/doc/${PKGNAME}/vorbisfile/ov_time_seek_lap.html
-share/doc/${PKGNAME}/vorbisfile/ov_time_seek_page.html
-share/doc/${PKGNAME}/vorbisfile/ov_time_seek_page_lap.html
-share/doc/${PKGNAME}/vorbisfile/ov_time_tell.html
-share/doc/${PKGNAME}/vorbisfile/ov_time_total.html
-share/doc/${PKGNAME}/vorbisfile/overview.html
-share/doc/${PKGNAME}/vorbisfile/reference.html
-share/doc/${PKGNAME}/vorbisfile/return.html
-share/doc/${PKGNAME}/vorbisfile/seekexample.html
-share/doc/${PKGNAME}/vorbisfile/seeking.html
-share/doc/${PKGNAME}/vorbisfile/seeking_example_c.html
-share/doc/${PKGNAME}/vorbisfile/seeking_test_c.html
-share/doc/${PKGNAME}/vorbisfile/seekingexample.html
-share/doc/${PKGNAME}/vorbisfile/style.css
-share/doc/${PKGNAME}/vorbisfile/threads.html
-share/doc/${PKGNAME}/vorbisfile/vorbis_comment.html
-share/doc/${PKGNAME}/vorbisfile/vorbis_info.html
-share/doc/${PKGNAME}/vorbisfile/vorbisfile_example_c.html
-share/doc/${PKGNAME}/vorbisword2.png
-share/doc/${PKGNAME}/wait.png
-share/doc/${PKGNAME}/white-ogg.png
-share/doc/${PKGNAME}/white-xifish.png
-share/doc/${PKGNAME}/window1.png
-share/doc/${PKGNAME}/window2.png
-@dirrm share/doc/${PKGNAME}/vorbisfile
-@dirrm share/doc/${PKGNAME}/vorbisenc
-@dirrm share/doc/${PKGNAME}
-@dirrm include/vorbis
diff --git a/audio/libvorbis/buildlink3.mk b/audio/libvorbis/buildlink3.mk
deleted file mode 100644
index 80f9836c473..00000000000
--- a/audio/libvorbis/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:37 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBVORBIS_BUILDLINK3_MK:= ${LIBVORBIS_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libvorbis
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibvorbis}
-BUILDLINK_PACKAGES+= libvorbis
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libvorbis
-
-.if !empty(LIBVORBIS_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libvorbis+= libvorbis>=1.0.1
-BUILDLINK_ABI_DEPENDS.libvorbis+= libvorbis>=1.1.0nb1
-BUILDLINK_PKGSRCDIR.libvorbis?= ../../audio/libvorbis
-.endif # LIBVORBIS_BUILDLINK3_MK
-
-.include "../../multimedia/libogg/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libvorbis/distinfo b/audio/libvorbis/distinfo
deleted file mode 100644
index bb88c949bb3..00000000000
--- a/audio/libvorbis/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.13 2005/12/07 17:50:37 wiz Exp $
-
-SHA1 (libvorbis-1.1.2.tar.gz) = 26289fc41aa5436b1a277d726bb5cb106d675c35
-RMD160 (libvorbis-1.1.2.tar.gz) = 2f1c59ab8237fe3af28f9979cd96008cfa3567cb
-Size (libvorbis-1.1.2.tar.gz) = 1316434 bytes
diff --git a/audio/liteamp/DESCR b/audio/liteamp/DESCR
deleted file mode 100644
index 615461eb5da..00000000000
--- a/audio/liteamp/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-A light-weight music player for GNOME. Liteamp plays both MP3 and Ogg
-files.
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
deleted file mode 100644
index 07a64148016..00000000000
--- a/audio/liteamp/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2007/03/21 12:05:41 wiz Exp $
-
-DISTNAME= liteamp-0.2.4.2
-PKGREVISION= 9
-CATEGORIES= audio
-MASTER_SITES= http://kldp.net/frs/download.php/1153/
-
-MAINTAINER= minskim@NetBSD.org
-HOMEPAGE= http://kldp.net/projects/liteamp/
-COMMENT= Light-weight Music Player for GNOME2
-
-USE_DIRS+= gnome2-1.5
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake intltool msgfmt perl pkg-config
-USE_PKGLOCALEDIR= yes
-USE_LIBTOOL= yes
-
-CPPFLAGS+= -UGNOME_DISABLE_DEPRECATED
-CPPFLAGS+= -UGTK_DISABLE_DEPRECATED
-
-.include "../../audio/libao/buildlink3.mk"
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/liteamp/PLIST b/audio/liteamp/PLIST
deleted file mode 100644
index 7b81c1f1fb3..00000000000
--- a/audio/liteamp/PLIST
+++ /dev/null
@@ -1,27 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/04/17 07:07:12 jlam Exp $
-bin/liteamp
-man/man1/liteamp.1
-share/application-registry/liteamp.applications
-share/applications/liteamp.desktop
-share/liteamp/pixmaps/adddir.png
-share/liteamp/pixmaps/addfile.png
-share/liteamp/pixmaps/liteamp-logo.png
-share/liteamp/pixmaps/liteamp.png
-share/liteamp/pixmaps/loop.png
-share/liteamp/pixmaps/next.png
-share/liteamp/pixmaps/pause.png
-share/liteamp/pixmaps/playlist.png
-share/liteamp/pixmaps/prev.png
-share/liteamp/pixmaps/shuffle.png
-share/liteamp/pixmaps/start.png
-share/liteamp/pixmaps/stop.png
-share/liteamp/pixmaps/vol.png
-share/liteamp/pixmaps/vol_down.png
-share/liteamp/pixmaps/vol_mute.png
-share/liteamp/pixmaps/vol_up.png
-share/locale/ko/LC_MESSAGES/liteamp.mo
-share/pixmaps/liteamp.png
-@dirrm share/liteamp/pixmaps
-@dirrm share/liteamp
-@comment in gnome2-dirs: @dirrm share/applications
-@comment in gnome2-dirs: @dirrm share/application-registry
diff --git a/audio/liteamp/distinfo b/audio/liteamp/distinfo
deleted file mode 100644
index 1009190136d..00000000000
--- a/audio/liteamp/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 20:39:48 agc Exp $
-
-SHA1 (liteamp-0.2.4.2.tar.gz) = b810ccb6f464d1e4c26223021c7bd571ff62f5cc
-RMD160 (liteamp-0.2.4.2.tar.gz) = 7d8bd665307b65e6596f559378f8f6c636acab9f
-Size (liteamp-0.2.4.2.tar.gz) = 496190 bytes
-SHA1 (patch-ab) = 4cb36325a550686977b3570d8570f068799ec1ee
diff --git a/audio/liteamp/patches/patch-ab b/audio/liteamp/patches/patch-ab
deleted file mode 100644
index 3ec7f918b4d..00000000000
--- a/audio/liteamp/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/03/04 17:53:57 minskim Exp $
-
---- src/decoder.c.orig 2003-07-13 22:20:36.000000000 -0500
-+++ src/decoder.c
-@@ -1,4 +1,6 @@
- /* vim: set ai et ts=4 sw=4: */
-+#include <pthread.h>
-+
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
diff --git a/audio/liveice/DESCR b/audio/liveice/DESCR
deleted file mode 100644
index 0275dcf705d..00000000000
--- a/audio/liveice/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-LiveIce is the source client for Icecast which encodes an mpeg
-stream for broadcast as it is created. Unlike clients such as Shout
-and IceDJ this permits the broadcast of live audio, rather than
-prerecorded mp3's.
-
-To start:
- 0. start icecast
- 1. find $HOME/mp3 -type f >playlist
- 2. liveiceconfigure.tk, save
- 3. In /bin/sh: liveice -M 2>/dev/null
diff --git a/audio/liveice/Makefile b/audio/liveice/Makefile
deleted file mode 100644
index fded23b135e..00000000000
--- a/audio/liveice/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2006/06/17 10:46:45 rillig Exp $
-#
-
-DISTNAME= liveice
-PKGNAME= liveice-0.20001121
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= http://star.arm.ac.uk/~spm/software/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://star.arm.ac.uk/~spm/software/liveice.html
-COMMENT= Source client for Icecast
-
-DEPENDS+= mpg123-0.5*:../../audio/mpg123
-DEPENDS+= lame-3.*:../../audio/lame
-DEPENDS+= tk>=8.0:../../x11/tk
-
-GNU_CONFIGURE= YES
-DIST_SUBDIR= liveice-0.20001121
-LIBS+= ${LIBOSSAUDIO}
-
-INSTALLATION_DIRS= bin
-
-REPLACE_INTERPRETER+= wish
-REPLACE.wish.old= /usr/bin/wish
-REPLACE.wish.new= ${LOCALBASE}/bin/wish
-REPLACE_FILES.wish= liveiceconfigure.tk
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/liveice ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/liveiceconfigure.tk ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/liveice
-.for f in README.frontend README.liveice README.quickstart \
- README.xingmp3enc README_new_mixer.txt
- ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/liveice
-.endfor
-
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/liveice/PLIST b/audio/liveice/PLIST
deleted file mode 100644
index d5726e12679..00000000000
--- a/audio/liveice/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:13 zuntum Exp $
-bin/liveice
-bin/liveiceconfigure.tk
-share/doc/liveice/README.frontend
-share/doc/liveice/README.liveice
-share/doc/liveice/README.quickstart
-share/doc/liveice/README.xingmp3enc
-share/doc/liveice/README_new_mixer.txt
-@dirrm share/doc/liveice
diff --git a/audio/liveice/distinfo b/audio/liveice/distinfo
deleted file mode 100644
index 3eb528780c7..00000000000
--- a/audio/liveice/distinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/12/11 22:24:03 joerg Exp $
-
-SHA1 (liveice-0.20001121/liveice.tar.gz) = 029657129e98d837e3c978885cfb52772d4551c9
-RMD160 (liveice-0.20001121/liveice.tar.gz) = 5739b4e92e17d4d6288573eee257a4fc07a612a8
-Size (liveice-0.20001121/liveice.tar.gz) = 85171 bytes
-SHA1 (patch-aa) = 367d7fa0b9cc20420814dad2db398a0f84b04982
-SHA1 (patch-ab) = 4306e08e1653100ddaa7ef5a7f40446dc1873191
-SHA1 (patch-ac) = 60963cab7c823e81170e64dfaee074845aa8f0cc
-SHA1 (patch-ad) = 0747e01148f1aa5fa72bc3262e3fbbd0c9118dca
-SHA1 (patch-ae) = 1b6655761340f2dc894f5f837e9b07d56584e470
-SHA1 (patch-af) = 1eff5e733457accfeb298eb314cbaf21cbdecde0
-SHA1 (patch-ag) = afd356eb44cbfef37c32a2bc92bc3cea155b0a67
-SHA1 (patch-ah) = 58be03b1970f8ebe2f32936bef9c1989342aed2d
-SHA1 (patch-ai) = a8567695607ea92ad13fb404cb3899deb7330153
-SHA1 (patch-aj) = ac88b733f5a6f894e1a168e8c7930301ccd19fd2
-SHA1 (patch-ak) = 0c3803b0a90a18fa6564c25ee1975d5bafda31cf
diff --git a/audio/liveice/patches/patch-aa b/audio/liveice/patches/patch-aa
deleted file mode 100644
index f7e11c46606..00000000000
--- a/audio/liveice/patches/patch-aa
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2001/05/05 10:05:34 wiz Exp $
-
---- liveice.h.orig Wed May 24 15:49:56 2000
-+++ liveice.h
-@@ -39,11 +39,16 @@
- #include <signal.h>
- #include <netdb.h>
- #include <arpa/inet.h>
-+#ifndef __NetBSD__
- #include <sched.h>
-+#endif
- #include <unistd.h>
- #include <termios.h>
- #include <sys/wait.h>
- #include <ctype.h>
-+#ifdef __NetBSD__
-+#include <sys/audioio.h>
-+#endif
-
- /* curses interface support */
-
-@@ -268,6 +273,10 @@
- char *recording_file;
- char *remote_dumpfile;
- char *sound_input_file; /* the file to read sound input from */
-+#ifdef __NetBSD__
-+ char *netbsd_audio_file;
-+ char *netbsd_audioctl_file;
-+#endif /* __NetBSD__ */
- char *random_content_id;
- char *encoder_args;
- int sound_device; /* set to 1 if the sound file is a device */
-@@ -278,6 +287,10 @@
- int sample_rate;
- int stereo;
- int audio_fd; /* only one soundcard - only one audiofd */
-+#ifdef __NetBSD__
-+ int audioctl_fd;
-+ audio_info_t ctlrestore;
-+#endif /* __NetBSD__ */
- int full_duplex;
- int soundcard; /* Are we using the soundcard? */
- char *decoder_cmd;
diff --git a/audio/liveice/patches/patch-ab b/audio/liveice/patches/patch-ab
deleted file mode 100644
index a6188052954..00000000000
--- a/audio/liveice/patches/patch-ab
+++ /dev/null
@@ -1,144 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/12/11 22:24:03 joerg Exp $
-
---- streams.c.orig 2000-05-23 18:08:00.000000000 +0000
-+++ streams.c
-@@ -36,7 +36,11 @@
- #ifdef HAVE_SYS_SOUNDCARD_H
- #include <sys/soundcard.h>
- #else
-+#ifdef __NetBSD__
-+#include <sys/audioio.h>
-+#else
- #include <machine/soundcard.h>
-+#endif /* __NetBSD__ */
- #endif
- #endif
- #include <sys/ioctl.h>
-@@ -44,8 +48,6 @@
- #define BUF_SIZE BUF_LENGTH*2
- #define BUFLEN 1024*32
-
--extern int errno;
--
- FILE *ds;
-
- /* suggested legal sample rates */
-@@ -77,11 +79,23 @@ void check_soundcard(void)
- {
- int format,stereo,speed,caps;
- #ifdef SOUNDCARD_SUPPORT
-+
-+#ifdef __NetBSD__
-+ audio_info_t ctlinfo;
-+#endif /* __NetBSD__ */
-+
- fprintf(stderr,"Initialising Soundcard\n");
-
-+#ifdef __NetBSD__
-+ if((g_conf.audioctl_fd=open(g_conf.netbsd_audioctl_file,O_RDWR))==-1)
-+ fatal("Failed to open audioctl device");
-+ if((g_conf.audio_fd=open(g_conf.netbsd_audio_file,O_RDONLY))==-1)
-+#else
- if((g_conf.audio_fd=open(g_conf.sound_input_file,O_RDWR))==-1)
-+#endif /* __NetBSD__ */
- fatal("Failed to open sound device");
-
-+#ifndef __NetBSD__
- /* see if the card can do full_duplex */
- if(g_conf.full_duplex){
- ioctl(g_conf.audio_fd, SNDCTL_DSP_GETCAPS, &caps);
-@@ -97,7 +111,33 @@ void check_soundcard(void)
- g_conf.full_duplex=0;
- }
- }
-+#endif /* __NetBSD__ */
-+
-+#ifdef __NetBSD__
-+ if(ioctl(g_conf.audioctl_fd, AUDIO_GETINFO, &(g_conf.ctlrestore)) < 0)
-+ fatal("ioctl(AUDIO_GETINFO) failed");
-+
-+ /* in theory, we should pull ctlrestore.record.buffer_size and use
-+ that to malloc() our audio buffer, but in practice, this has
-+ shown to be unneccesary. This will minimize impact to the
-+ original source and reduce the amount of patching we need.
-+ */
-+
-+ /* somewhere in here, we should be able to check/set full duplex,
-+ but I don't know enough about the internals of this driver yet.
-+ */
-+ g_conf.full_duplex = 0;
-+
-+ AUDIO_INITINFO(&ctlinfo);
-+ ctlinfo.record.sample_rate = g_conf.sample_rate;
-+ ctlinfo.record.channels = (g_conf.stereo ? 2 : 1);
-+ ctlinfo.record.precision = 16;
-+ ctlinfo.record.encoding = AUDIO_ENCODING_SLINEAR_LE;
-+ ctlinfo.mode = AUMODE_RECORD;
-
-+ if(ioctl(g_conf.audioctl_fd, AUDIO_SETINFO, &ctlinfo) < 0)
-+ fatal("ioctl(AUDIO_SETINFO) failed");
-+#else
- ioctl(g_conf.audio_fd, SNDCTL_DSP_GETFMTS, &format);
- if(!(format&AFMT_S16_LE))
- fatal("16bit mode not supported by driver");
-@@ -113,6 +153,7 @@ void check_soundcard(void)
- speed=g_conf.sample_rate;
- if(ioctl(g_conf.audio_fd,SNDCTL_DSP_SPEED,&speed)==-1)
- fatal("Speed Setting failed\n");
-+#endif /* __NetBSD__ */
-
-
- fprintf(stderr,"16Bit %dHz ",g_conf.sample_rate);
-@@ -121,8 +162,10 @@ void check_soundcard(void)
- if(g_conf.full_duplex)
- fprintf(stderr,"Full Duplex ");
- fprintf(stderr,"\n");
-+#ifndef __NetBSD__
- close(g_conf.audio_fd);
- g_conf.audio_fd=0;
-+#endif /* __NetBSD__ */
- #else
- write_message("This executable Doesn't Support Soundcards",0);
- #endif
-@@ -136,9 +179,10 @@ void open_soundcard(int flags){
- #ifdef SOUNDCARD_SUPPORT
- write_message("Opening Soundcard",1);
-
-+#ifndef __NetBSD__
- if((g_conf.audio_fd=open(g_conf.sound_input_file,flags))==-1)
- fatal("Failed to open sound device");
--
-+
- if(g_conf.full_duplex)
- #ifdef HAVE_SYS_SOUNDCARD_H
- ioctl(g_conf.audio_fd, SNDCTL_DSP_SETDUPLEX, 0);
-@@ -157,6 +201,7 @@ void open_soundcard(int flags){
- speed=g_conf.sample_rate;
- if(ioctl(g_conf.audio_fd,SNDCTL_DSP_SPEED,&speed)==-1)
- fatal("Speed Setting failed\n");
-+#endif /* __NetBSD__ */
- #else
- write_message("This executable Doesn't Support Soundcards",0);
- #endif
-@@ -166,8 +211,21 @@ void close_soundcard(void)
- {
- #ifdef SOUNDCARD_SUPPORT
- write_message("Closing Soundcard",1);
-+#ifdef __NetBSD__
-+ close(g_conf.audio_fd);
-+
-+ /* In theory, we should reset the device. In practice, this
-+ segfaults. I haven't figured out why.
-+
-+ if(ioctl(g_conf.audioctl_fd, AUDIO_SETINFO, &(g_conf.ctlrestore)) < 0)
-+ fatal("ioctl(AUDIO_SETINFO) failed");
-+ */
-+
-+ close(g_conf.audioctl_fd);
-+#else
- ioctl(g_conf.audio_fd, SNDCTL_DSP_RESET, 0);
- close(g_conf.audio_fd);
-+#endif /* __NetBSD__ */
- #else
- write_message("This executable Doesn't Support Soundcards",0);
- #endif
diff --git a/audio/liveice/patches/patch-ac b/audio/liveice/patches/patch-ac
deleted file mode 100644
index d0e447e5c4a..00000000000
--- a/audio/liveice/patches/patch-ac
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2001/05/05 10:05:34 wiz Exp $
-
---- README.NetBSD.orig Sat May 5 12:00:35 2001
-+++ README.NetBSD
-@@ -0,0 +1,30 @@
-+I've patched this to handle the NetBSD audio driver natively.
-+
-+Therefore, there are some new config variables which you have to worry
-+about if you intend to use the soundcard-based streaming features.
-+
-+# SOUND_DEVICE /dev/sound
-+
-+SOUND_DEVICE is no longer used when compiling under NetBSD.
-+
-+Instead:
-+
-+NETBSD_AUDIO_FILE /dev/audio0
-+NETBSD_AUDIOCTL_FILE /dev/audioctl0
-+
-+Or something of that nature should be used.
-+
-+=== Last Updated: 09 February 2001
-+=== Andrew Hobgood <chaos@strange.net>
-+
-+This has been tested on NetBSD-current (1.5 cvs 06 Feb 2001) with my SB
-+AWE64 Gold ISA.
-+
-+NetBSD schizo 1.5 NetBSD 1.5 (SCHIZO) #4: Tue Feb 6 13:40:31 EST 2001 root@schizo:/usr/src/sys/arch/alpha/compile/SCHIZO alpha
-+
-+isapnp0: read port 0x203
-+sb0 at isapnp0 port 0x220/16,0x330/2,0x388/4 irq 5 drq 1,5
-+sb0: Creative SB AWE64 Gold Audio: dsp v4.16
-+audio0 at sb0: full duplex, mmap, independent
-+isapnp0: <Creative SB AWE64 Gold, CTL7002, PNPB02F, Game> port 0x200/8 not configured
-+isapnp0: <Creative SB AWE64 Gold, CTL0023, , WaveTable> port 0x620/4 not configured
diff --git a/audio/liveice/patches/patch-ad b/audio/liveice/patches/patch-ad
deleted file mode 100644
index 8c0004387d9..00000000000
--- a/audio/liveice/patches/patch-ad
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/11/21 06:01:49 hubertf Exp $
-
---- configure.orig Tue Nov 21 03:37:00 2000
-+++ configure
-@@ -536,9 +536,9 @@
- LOGDIR="/var/log/icecast"
- else
- echo "FSSTD DISABLED"
-- BINDIR="${prefix}/icecast/bin"
-- ETCDIR="${prefix}/icecast/etc"
-- LOGDIR="${prefix}/icecast/log"
-+ BINDIR="${prefix}/bin"
-+ ETCDIR="${prefix}/etc"
-+ LOGDIR="/var/log/icecast"
- fi
-
-
diff --git a/audio/liveice/patches/patch-ae b/audio/liveice/patches/patch-ae
deleted file mode 100644
index 0b8bd679ffb..00000000000
--- a/audio/liveice/patches/patch-ae
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2001/05/05 10:05:34 wiz Exp $
-
---- setup.c.orig Wed May 24 15:50:02 2000
-+++ setup.c
-@@ -38,7 +38,13 @@
- char default_mountpoint[] = "liveice";
- char default_description[] = "LiveIce";
- char default_pipe_directory[] = ".liveice_temp_files";
-+#ifdef __NetBSD__
-+char default_sound_input_file[] = "/dev/audio";
-+char default_netbsd_audio_file[] = "/dev/audio";
-+char default_netbsd_audioctl_file[] = "/dev/audioctl";
-+#else
- char default_sound_input_file[] = "/dev/dsp";
-+#endif
-
- /* default encoder commands */
- char AJ_encoder_command[] = "encoder";
-@@ -46,7 +52,7 @@
- char MP3ENC_encoder_command[] = "mp3enc";
- char SCREAMER_encoder_command[] = "lamer";
- char XING_encoder_command[] = "xingmp3enc";
--char LAME3_encoder_command[] = "lame3";
-+char LAME3_encoder_command[] = "lame";
- char GOGO_encoder_command[] = "gogo";
-
- static int in_stream_set;
-@@ -244,6 +250,13 @@
- g_conf.sound_input_file=malloc(strlen(default_sound_input_file)+2);
- strcpy(g_conf.sound_input_file,default_sound_input_file);
-
-+#ifdef __NetBSD__
-+ g_conf.netbsd_audio_file=malloc(strlen(default_netbsd_audio_file)+2);
-+ strcpy(g_conf.netbsd_audio_file,default_netbsd_audio_file);
-+
-+ g_conf.netbsd_audioctl_file=malloc(strlen(default_netbsd_audioctl_file)+2);
-+ strcpy(g_conf.netbsd_audioctl_file,default_netbsd_audioctl_file);
-+#endif
-
- g_conf.icy_public=1;
- g_conf.bitrate=BITRATE;
-@@ -407,6 +420,12 @@
- string_copy(&(g_conf.update_script),line);
- } else if(!strcmp(cmd,"URL")) {
- string_copy(&(g_conf.icy_url),line);
-+#ifdef __NetBSD__
-+ } else if(!strcmp(cmd,"NETBSD_AUDIO_FILE")) {
-+ string_copy(&(g_conf.netbsd_audio_file),line);
-+ } else if(!strcmp(cmd,"NETBSD_AUDIOCTL_FILE")) {
-+ string_copy(&(g_conf.netbsd_audioctl_file),line);
-+#endif
- } else if(!strcmp(cmd,"MIXER_CMD")) {
- string_copy(&g_conf.mixer_cmd,line);
- g_conf.mixer=COMMAND_MODE;
diff --git a/audio/liveice/patches/patch-af b/audio/liveice/patches/patch-af
deleted file mode 100644
index 126c0f28286..00000000000
--- a/audio/liveice/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2000/11/21 06:01:49 hubertf Exp $
-
---- liveiceconfigure.tk.orig Tue Nov 21 04:01:33 2000
-+++ liveiceconfigure.tk
-@@ -60,7 +60,7 @@
- L3ENC { .f11.enc insert 0 "l3enc" }
- MP3ENC { .f11.enc insert 0 "mp3enc" }
- SCREAMER { .f11.enc insert 0 "lamer" }
-- LAME3 { .f11.enc insert 0 "lame3" }
-+ LAME3 { .f11.enc insert 0 "lame" }
- XING { .f11.enc insert 0 "xingmp3enc" }
- XING_VBR { .f11.enc insert 0 "xingmp3enc" }
- default { .f11.enc insert 0 "encoder" }
diff --git a/audio/liveice/patches/patch-ag b/audio/liveice/patches/patch-ag
deleted file mode 100644
index 41205d20e8f..00000000000
--- a/audio/liveice/patches/patch-ag
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2000/11/21 06:01:49 hubertf Exp $
-
---- get_local_stream.c.orig Tue Nov 21 04:03:45 2000
-+++ get_local_stream.c
-@@ -77,7 +77,11 @@
- #ifdef SOUNDCARD_SUPPORT
- fprintf(stderr,"Initialising Soundcard\n");
-
-+#ifdef __NetBSD__
-+ if((g_conf.audio_fd=open("/dev/sound",O_RDWR))==-1)
-+#else
- if((g_conf.audio_fd=open("/dev/dsp",O_RDWR))==-1)
-+#endif
- fatal("Failed to open sound device");
-
- /* see if the card can do full_duplex */
-@@ -134,7 +138,11 @@
- #ifdef SOUNDCARD_SUPPORT
- write_message("Opening Soundcard",1);
-
-+#ifdef __NetBSD__
-+ if((g_conf.audio_fd=open("/dev/sound",flags))==-1)
-+#else
- if((g_conf.audio_fd=open("/dev/dsp",flags))==-1)
-+#endif
- fatal("Failed to open sound device");
-
- if(g_conf.full_duplex)
diff --git a/audio/liveice/patches/patch-ah b/audio/liveice/patches/patch-ah
deleted file mode 100644
index 269d01fb2d7..00000000000
--- a/audio/liveice/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2000/11/21 06:01:49 hubertf Exp $
-
---- playlist.c.orig Tue Nov 21 04:43:42 2000
-+++ playlist.c
-@@ -130,6 +130,10 @@
- int i,r_type=MISC_AUDIO;
-
- extn=strrchr(trackname,'.');
-+
-+ if (extn == NULL)
-+ return MISC_AUDIO;
-+
- lcext=malloc(strlen(extn)+2);
- i=0;
- while(extn[i]!=0){
diff --git a/audio/liveice/patches/patch-ai b/audio/liveice/patches/patch-ai
deleted file mode 100644
index 24099d980e4..00000000000
--- a/audio/liveice/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2000/11/21 06:01:49 hubertf Exp $
-
---- mixer.c.orig Tue May 30 13:30:56 2000
-+++ mixer.c
-@@ -70,7 +70,7 @@
- if(*new==NULL){
- sprintf(mesg,"Adding New Channel %s",name);
- write_message(mesg,0);
-- *new=malloc(sizeof(channel));
-+ *new=calloc(1, sizeof(channel));
- strncpy((*new)->name,name,63);
- (*new)->curnt=mixer.t_list;
- (*new)->volume=1.0;
diff --git a/audio/liveice/patches/patch-aj b/audio/liveice/patches/patch-aj
deleted file mode 100644
index ca13a35505c..00000000000
--- a/audio/liveice/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2005/12/11 22:24:03 joerg Exp $
-
---- liveice.c.orig 2005-12-11 22:17:53.000000000 +0000
-+++ liveice.c
-@@ -20,8 +20,6 @@
-
- #include "liveice.h"
-
--extern int errno;
--
- void kill_children(int signo) {
- fprintf(stderr,"Killing children...\n");
- if(killpg(0, SIGTERM) < 0) {
diff --git a/audio/liveice/patches/patch-ak b/audio/liveice/patches/patch-ak
deleted file mode 100644
index 0023dea2ff9..00000000000
--- a/audio/liveice/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2005/12/11 22:24:03 joerg Exp $
-
---- serverlib.c.orig 2005-12-11 22:17:16.000000000 +0000
-+++ serverlib.c
-@@ -24,8 +24,6 @@
- #include "liveice.h"
- #include "serverlib.h"
-
--extern int errno;
--
-
-
- /* Create a new socket which can be bound to a socket later */
diff --git a/audio/lmms/DESCR b/audio/lmms/DESCR
deleted file mode 100644
index 10236c2e854..00000000000
--- a/audio/lmms/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-LMMS aims to be a free alternative to popular (but commercial and
-closed- source) programs like FruityLoops, Cubase and Logic giving you
-the ability of producing music with your computer by
-creating/synthesizing sounds, arranging samples, using effects, playing
-live with keyboard and much more...
-
-LMMS combines the features of a sequencer-program (pattern-/channel-/
-sample-/song-/effect-management) and those of powerful synthesizers and
-samplers in a modern, user-friendly and easy to use graphical
-user-interface.
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
deleted file mode 100644
index 7c3e8a13656..00000000000
--- a/audio/lmms/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2007/01/14 09:25:21 wiz Exp $
-#
-
-DISTNAME= lmms-0.2.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lmms/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= rillig@NetBSD.org
-HOMEPAGE= http://lmms.sourceforge.net/
-COMMENT= Linux MultiMedia Studio
-
-USE_PKGLOCALEDIR= yes
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-USE_LANGUAGES= c c++
-USE_TOOLS+= gmake perl
-
-BUILDLINK_TRANSFORM+= rm:-floop-optimize2 rm:-fgcse-las
-
-# libSDL defines some symbols that are also defined in libX11, which has
-# been fixed in SDL 1.2.11.
-BUILDLINK_ABI_DEPENDS.SDL+= SDL>=1.2.11
-
-.include "../../audio/SDL_mixer/buildlink3.mk"
-.include "../../audio/SDL_sound/buildlink3.mk"
-.include "../../audio/flac/buildlink3.mk"
-.include "../../audio/jack/buildlink3.mk"
-.include "../../audio/libsamplerate/buildlink3.mk"
-.include "../../audio/libsndfile/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../x11/libXfixes/buildlink3.mk"
-.include "../../x11/qt3-libs/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/lmms/PLIST b/audio/lmms/PLIST
deleted file mode 100644
index 32d829a8ac7..00000000000
--- a/audio/lmms/PLIST
+++ /dev/null
@@ -1,813 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/07/23 11:50:25 rillig Exp $
-bin/lmms
-lib/lmms/libaudiofileprocessor.la
-lib/lmms/libbitinvader.la
-lib/lmms/libflpimport.la
-lib/lmms/libmidiimport.la
-lib/lmms/liborganic.la
-lib/lmms/libpluckedstringsynth.la
-lib/lmms/libtripleoscillator.la
-lib/lmms/libvibedstrings.la
-man/man1/lmms.1
-share/lmms/midi-maps/YamahaPSR400.map
-share/lmms/midi-maps/YamahaPSR500.map
-share/lmms/midi-maps/YamahaPSS790.map
-share/lmms/midi-maps/YamahaQY10.map
-share/lmms/midi-maps/gm.map
-share/lmms/presets/AudioFileProcessor/Bass-Mania.cs.xml
-share/lmms/presets/AudioFileProcessor/Fat-Reversed-Kick.cs.xml
-share/lmms/presets/AudioFileProcessor/Kick-4-your-Subwoofer.cs.xml
-share/lmms/presets/BitInvader/alien_strings.cs.xml
-share/lmms/presets/BitInvader/beehive.cs.xml
-share/lmms/presets/BitInvader/bell.cs.xml
-share/lmms/presets/BitInvader/cello.cs.xml
-share/lmms/presets/BitInvader/default.cs.xml
-share/lmms/presets/BitInvader/drama.cs.xml
-share/lmms/presets/BitInvader/epiano.cs.xml
-share/lmms/presets/BitInvader/pluck.cs.xml
-share/lmms/presets/BitInvader/soft_pad.cs.xml
-share/lmms/presets/BitInvader/spacefx.cs.xml
-share/lmms/presets/BitInvader/subbass.cs.xml
-share/lmms/presets/BitInvader/sweep_pad.cs.xml
-share/lmms/presets/BitInvader/toy_piano.cs.xml
-share/lmms/presets/BitInvader/wah_synth.cs.xml
-share/lmms/presets/Organic/default.cs.xml
-share/lmms/presets/Organic/organ_blues.cs.xml
-share/lmms/presets/Organic/organ_risingsun.cs.xml
-share/lmms/presets/Organic/organ_swish.cs.xml
-share/lmms/presets/Organic/pad_ethereal.cs.xml
-share/lmms/presets/Organic/pad_rich.cs.xml
-share/lmms/presets/Organic/pad_sweep.cs.xml
-share/lmms/presets/Organic/puresine.cs.xml
-share/lmms/presets/Organic/sequencer_64.cs.xml
-share/lmms/presets/PluckedStringSynth/Default.cs.xml
-share/lmms/presets/TripleOscillator/AmazingBubbles.cs.xml
-share/lmms/presets/TripleOscillator/AnalogDreamz.cs.xml
-share/lmms/presets/TripleOscillator/AnalogTimes.cs.xml
-share/lmms/presets/TripleOscillator/AnalogTimes2.cs.xml
-share/lmms/presets/TripleOscillator/Analogous.cs.xml
-share/lmms/presets/TripleOscillator/ArpKing.cs.xml
-share/lmms/presets/TripleOscillator/Arpeggio_1.cs.xml
-share/lmms/presets/TripleOscillator/Arpeggio_2.cs.xml
-share/lmms/presets/TripleOscillator/Bass.cs.xml
-share/lmms/presets/TripleOscillator/Beam.cs.xml
-share/lmms/presets/TripleOscillator/Bell.cs.xml
-share/lmms/presets/TripleOscillator/Bell_2.cs.xml
-share/lmms/presets/TripleOscillator/ChurchOrgan.cs.xml
-share/lmms/presets/TripleOscillator/ChurchOrgan_2.cs.xml
-share/lmms/presets/TripleOscillator/Crystallo.cs.xml
-share/lmms/presets/TripleOscillator/Default.cs.xml
-share/lmms/presets/TripleOscillator/Detuned-Synced-FM-Bass.cs.xml
-share/lmms/presets/TripleOscillator/Distorted-FM-Bass.cs.xml
-share/lmms/presets/TripleOscillator/Distorted-FM-Bass_2.cs.xml
-share/lmms/presets/TripleOscillator/Dull-Bell-Arp.cs.xml
-share/lmms/presets/TripleOscillator/E-Organ.cs.xml
-share/lmms/presets/TripleOscillator/E-Piano.cs.xml
-share/lmms/presets/TripleOscillator/EvilHardcore.cs.xml
-share/lmms/presets/TripleOscillator/FM-Wood-Arp.cs.xml
-share/lmms/presets/TripleOscillator/Fat-FMish-Bells.cs.xml
-share/lmms/presets/TripleOscillator/Fat-TB303-Arp.cs.xml
-share/lmms/presets/TripleOscillator/Fat.cs.xml
-share/lmms/presets/TripleOscillator/FatCheese.cs.xml
-share/lmms/presets/TripleOscillator/Fear.cs.xml
-share/lmms/presets/TripleOscillator/Freaky-Bass.cs.xml
-share/lmms/presets/TripleOscillator/FutureBass.cs.xml
-share/lmms/presets/TripleOscillator/Gong.cs.xml
-share/lmms/presets/TripleOscillator/Harmonium.cs.xml
-share/lmms/presets/TripleOscillator/Harp-of-a-Fairy.cs.xml
-share/lmms/presets/TripleOscillator/Harpsichord.cs.xml
-share/lmms/presets/TripleOscillator/HiPad.cs.xml
-share/lmms/presets/TripleOscillator/HorrorBass.cs.xml
-share/lmms/presets/TripleOscillator/Jupiter.cs.xml
-share/lmms/presets/TripleOscillator/Kick.cs.xml
-share/lmms/presets/TripleOscillator/Kick2.cs.xml
-share/lmms/presets/TripleOscillator/LFO-party.cs.xml
-share/lmms/presets/TripleOscillator/LovelyDream.cs.xml
-share/lmms/presets/TripleOscillator/Moog.cs.xml
-share/lmms/presets/TripleOscillator/MoogArpeggio.cs.xml
-share/lmms/presets/TripleOscillator/MoveYourBody.cs.xml
-share/lmms/presets/TripleOscillator/MyComputer.cs.xml
-share/lmms/presets/TripleOscillator/Nice.cs.xml
-share/lmms/presets/TripleOscillator/NostalgicFeelings.cs.xml
-share/lmms/presets/TripleOscillator/Play-some-rock.cs.xml
-share/lmms/presets/TripleOscillator/PluckArpeggio.cs.xml
-share/lmms/presets/TripleOscillator/Plucked.cs.xml
-share/lmms/presets/TripleOscillator/RaveBass.cs.xml
-share/lmms/presets/TripleOscillator/RaveBass_2.cs.xml
-share/lmms/presets/TripleOscillator/Ravemania.cs.xml
-share/lmms/presets/TripleOscillator/ResoBass.cs.xml
-share/lmms/presets/TripleOscillator/ResonantPad.cs.xml
-share/lmms/presets/TripleOscillator/RockOrgan.cs.xml
-share/lmms/presets/TripleOscillator/Rough!.cs.xml
-share/lmms/presets/TripleOscillator/SawReso.cs.xml
-share/lmms/presets/TripleOscillator/Short1.cs.xml
-share/lmms/presets/TripleOscillator/Short2.cs.xml
-share/lmms/presets/TripleOscillator/Short3.cs.xml
-share/lmms/presets/TripleOscillator/Short4.cs.xml
-share/lmms/presets/TripleOscillator/ShortBass.cs.xml
-share/lmms/presets/TripleOscillator/Simple-Acid-Bass.cs.xml
-share/lmms/presets/TripleOscillator/Snare.cs.xml
-share/lmms/presets/TripleOscillator/SoftBass.cs.xml
-share/lmms/presets/TripleOscillator/SoftStrings.cs.xml
-share/lmms/presets/TripleOscillator/SpaceBass.cs.xml
-share/lmms/presets/TripleOscillator/Square.cs.xml
-share/lmms/presets/TripleOscillator/SquareArp.cs.xml
-share/lmms/presets/TripleOscillator/Steel.cs.xml
-share/lmms/presets/TripleOscillator/Stranger.cs.xml
-share/lmms/presets/TripleOscillator/TB303-Arpeggio.cs.xml
-share/lmms/presets/TripleOscillator/TB303.cs.xml
-share/lmms/presets/TripleOscillator/TheFirstOne.cs.xml
-share/lmms/presets/TripleOscillator/TheMaster.cs.xml
-share/lmms/presets/TripleOscillator/TranceLead.cs.xml
-share/lmms/presets/TripleOscillator/Warmth.cs.xml
-share/lmms/presets/TripleOscillator/Weird.cs.xml
-share/lmms/presets/TripleOscillator/Whistle.cs.xml
-share/lmms/presets/TripleOscillator/Xylophon.cs.xml
-share/lmms/presets/VeSTige/Default.cs.xml
-share/lmms/projects/cool_songs/Djeezus-BeatRolls.mmp
-share/lmms/projects/cool_songs/Djeezus-Oscilisous.mmp
-share/lmms/projects/cool_songs/Marfil-MarfilDrum01.mmp
-share/lmms/projects/cool_songs/Mart-Concave_flow.mmp
-share/lmms/projects/cool_songs/Mart-Dirt_Track.mmp
-share/lmms/projects/cool_songs/MaxFellner-Ease.mmp
-share/lmms/projects/cool_songs/SharkyX-DeadManDancing.mmp
-share/lmms/projects/cool_songs/SharkyX-Experiments.mmp
-share/lmms/projects/cool_songs/Siegel-DreamWave.mmp
-share/lmms/projects/cool_songs/TobyDox-Confused.mmp
-share/lmms/projects/cool_songs/TobyDox-Crystallo.mmp
-share/lmms/projects/cool_songs/TobyDox-Psycho.mmp
-share/lmms/projects/cool_songs/TobyDox-TheFourthDimension.mmp
-share/lmms/projects/covers/J.S.Bach-Preludium_and_Fugue_A-Minor.mmp
-share/lmms/projects/demos/basses-demo.mmp
-share/lmms/projects/demos/beat_collection.mmp
-share/lmms/projects/demos/demo1.mmp
-share/lmms/projects/demos/demo2.mmp
-share/lmms/projects/demos/demo3.mmp
-share/lmms/projects/demos/demo4.mmp
-share/lmms/projects/demos/demo5.mmp
-share/lmms/projects/demos/demo6.mmp
-share/lmms/projects/demos/loop_collection.mmp
-share/lmms/projects/demos/some_basslines.mmp
-share/lmms/projects/misc/1st.mmp
-share/lmms/projects/misc/mystic.mmp
-share/lmms/projects/misc/time_machine.mmp
-share/lmms/projects/templates/AcousticDrumset.mpt
-share/lmms/projects/templates/ClubMix.mpt
-share/lmms/projects/tutorials/editing_note_volumes.mmp
-share/lmms/samples/basses/bass01.ogg
-share/lmms/samples/basses/bass_acid01.ogg
-share/lmms/samples/basses/bass_acid02.ogg
-share/lmms/samples/basses/bass_hard01.ogg
-share/lmms/samples/basses/bass_hard02.ogg
-share/lmms/samples/basses/bass_punch01.ogg
-share/lmms/samples/basses/horror_bass01.ogg
-share/lmms/samples/basses/matrix1000_pluck01.ogg
-share/lmms/samples/basses/rave_bass01.ogg
-share/lmms/samples/basses/rave_bass02.ogg
-share/lmms/samples/basses/rave_bass03.ogg
-share/lmms/samples/basses/rave_bass04.ogg
-share/lmms/samples/basses/synth_acid01.ogg
-share/lmms/samples/basses/synth_acid02.ogg
-share/lmms/samples/basses/techno_synth01.ogg
-share/lmms/samples/bassloopes/briff01.ogg
-share/lmms/samples/bassloopes/rave_bass01.ogg
-share/lmms/samples/bassloopes/rave_bass02.ogg
-share/lmms/samples/bassloopes/tb303_01.ogg
-share/lmms/samples/bassloopes/techno_bass01.ogg
-share/lmms/samples/bassloopes/techno_bass02.ogg
-share/lmms/samples/bassloopes/techno_synth01.ogg
-share/lmms/samples/bassloopes/techno_synth02.ogg
-share/lmms/samples/bassloopes/techno_synth03.ogg
-share/lmms/samples/bassloopes/techno_synth04.ogg
-share/lmms/samples/beats/909beat01.ogg
-share/lmms/samples/beats/break01.ogg
-share/lmms/samples/beats/break02.ogg
-share/lmms/samples/beats/break03.ogg
-share/lmms/samples/beats/electro_beat01.ogg
-share/lmms/samples/beats/electro_beat02.ogg
-share/lmms/samples/beats/house_loop01.ogg
-share/lmms/samples/beats/jungle01.ogg
-share/lmms/samples/beats/rave_hihat01.ogg
-share/lmms/samples/beats/rave_hihat02.ogg
-share/lmms/samples/beats/rave_kick01.ogg
-share/lmms/samples/beats/rave_kick02.ogg
-share/lmms/samples/beats/rave_snare01.ogg
-share/lmms/samples/drums/bassdrum01.ogg
-share/lmms/samples/drums/bassdrum02.ogg
-share/lmms/samples/drums/bassdrum03.ogg
-share/lmms/samples/drums/bassdrum04.ogg
-share/lmms/samples/drums/bassdrum_acoustic01.ogg
-share/lmms/samples/drums/bassdrum_acoustic02.ogg
-share/lmms/samples/drums/clap01.ogg
-share/lmms/samples/drums/clap02.ogg
-share/lmms/samples/drums/clap03.ogg
-share/lmms/samples/drums/clap04.ogg
-share/lmms/samples/drums/clav01.ogg
-share/lmms/samples/drums/clav02.ogg
-share/lmms/samples/drums/crash01.ogg
-share/lmms/samples/drums/crash02.ogg
-share/lmms/samples/drums/hihat_closed01.ogg
-share/lmms/samples/drums/hihat_closed02.ogg
-share/lmms/samples/drums/hihat_closed03.ogg
-share/lmms/samples/drums/hihat_closed04.ogg
-share/lmms/samples/drums/hihat_closed05.ogg
-share/lmms/samples/drums/hihat_foot_pedal01.ogg
-share/lmms/samples/drums/hihat_opened01.ogg
-share/lmms/samples/drums/hihat_opened02.ogg
-share/lmms/samples/drums/kick01.ogg
-share/lmms/samples/drums/kick02.ogg
-share/lmms/samples/drums/kick03.ogg
-share/lmms/samples/drums/kick04.ogg
-share/lmms/samples/drums/kick_distorted01.ogg
-share/lmms/samples/drums/kick_hard01.ogg
-share/lmms/samples/drums/kick_hardcore01.ogg
-share/lmms/samples/drums/kick_hiphop01.ogg
-share/lmms/samples/drums/kick_long01.ogg
-share/lmms/samples/drums/kick_soft01.ogg
-share/lmms/samples/drums/kick_soft02.ogg
-share/lmms/samples/drums/ride01.ogg
-share/lmms/samples/drums/shaker01.ogg
-share/lmms/samples/drums/shaker02.ogg
-share/lmms/samples/drums/shaker03.ogg
-share/lmms/samples/drums/sidestick01.ogg
-share/lmms/samples/drums/snare01.ogg
-share/lmms/samples/drums/snare02.ogg
-share/lmms/samples/drums/snare03.ogg
-share/lmms/samples/drums/snare04.ogg
-share/lmms/samples/drums/snare05.ogg
-share/lmms/samples/drums/snare06.ogg
-share/lmms/samples/drums/snare07.ogg
-share/lmms/samples/drums/snare_acoustic01.ogg
-share/lmms/samples/drums/snare_electro01.ogg
-share/lmms/samples/drums/snare_harsh01.ogg
-share/lmms/samples/drums/snare_hiphop01.ogg
-share/lmms/samples/drums/snare_hiphop02.ogg
-share/lmms/samples/drums/snare_muffled01.ogg
-share/lmms/samples/drums/snare_muffled02.ogg
-share/lmms/samples/drums/snare_rim01.ogg
-share/lmms/samples/drums/snare_short01.ogg
-share/lmms/samples/drums/tom01.ogg
-share/lmms/samples/drums/tom02.ogg
-share/lmms/samples/drums/tom03.ogg
-share/lmms/samples/drums/tom04.ogg
-share/lmms/samples/drums/tom05.ogg
-share/lmms/samples/drums/tom_hi01.ogg
-share/lmms/samples/drums/tom_low01.ogg
-share/lmms/samples/drums/tom_mid01.ogg
-share/lmms/samples/drums/wood01.ogg
-share/lmms/samples/drums/zap01.ogg
-share/lmms/samples/drums/zap02.ogg
-share/lmms/samples/drums/zap03.ogg
-share/lmms/samples/effects/chroma_sound_effect01.ogg
-share/lmms/samples/effects/explode01.ogg
-share/lmms/samples/effects/filter_sweep01.ogg
-share/lmms/samples/effects/scratch01.ogg
-share/lmms/samples/effects/start01.ogg
-share/lmms/samples/effects/start02.ogg
-share/lmms/samples/effects/stop01.ogg
-share/lmms/samples/effects/warp01.ogg
-share/lmms/samples/effects/warp02.ogg
-share/lmms/samples/effects/wind_chimes01.ogg
-share/lmms/samples/instruments/bassslap01.ogg
-share/lmms/samples/instruments/bassslap02.ogg
-share/lmms/samples/instruments/cello01.ogg
-share/lmms/samples/instruments/church_organ01.ogg
-share/lmms/samples/instruments/church_organ02.ogg
-share/lmms/samples/instruments/church_organ03.ogg
-share/lmms/samples/instruments/church_organ04.ogg
-share/lmms/samples/instruments/e_organ01.ogg
-share/lmms/samples/instruments/e_piano_accord01.ogg
-share/lmms/samples/instruments/e_piano_accord02.ogg
-share/lmms/samples/instruments/flute01.ogg
-share/lmms/samples/instruments/harpsichord01.ogg
-share/lmms/samples/instruments/piano01.ogg
-share/lmms/samples/instruments/piano02.ogg
-share/lmms/samples/instruments/steel_guitar01.ogg
-share/lmms/samples/instruments/steel_guitar_heavy_distorted01.ogg
-share/lmms/samples/instruments/steel_guitar_medium_distorted01.ogg
-share/lmms/samples/instruments/steel_guitar_slight_distorted01.ogg
-share/lmms/samples/instruments/trumpet01.ogg
-share/lmms/samples/instruments/violin_double_stop01.ogg
-share/lmms/samples/instruments/violin_fingered01.ogg
-share/lmms/samples/instruments/violin_pizzicato01.ogg
-share/lmms/samples/latin/latin_brass01.ogg
-share/lmms/samples/latin/latin_guitar01.ogg
-share/lmms/samples/latin/latin_guitar02.ogg
-share/lmms/samples/latin/latin_guitar03.ogg
-share/lmms/samples/misc/bass!.ogg
-share/lmms/samples/misc/breath01.ogg
-share/lmms/samples/misc/buzz!.ogg
-share/lmms/samples/misc/dong01.ogg
-share/lmms/samples/misc/dong02.ogg
-share/lmms/samples/misc/dong03.ogg
-share/lmms/samples/misc/electric_ping01.ogg
-share/lmms/samples/misc/hit01.ogg
-share/lmms/samples/misc/hit02.ogg
-share/lmms/samples/misc/metalish_dong01.ogg
-share/lmms/samples/misc/metronome01.ogg
-share/lmms/samples/misc/raving_crowd01.ogg
-share/lmms/samples/misc/snaph01.ogg
-share/lmms/samples/misc/undefined01.ogg
-share/lmms/samples/shapes/additive.wav
-share/lmms/samples/shapes/additive2.wav
-share/lmms/samples/shapes/bunglist.wav
-share/lmms/samples/shapes/bunglist2.wav
-share/lmms/samples/shapes/bunglist3.wav
-share/lmms/samples/shapes/bunglist4.wav
-share/lmms/samples/shapes/bunglist5.wav
-share/lmms/samples/shapes/bunglist6.wav
-share/lmms/samples/shapes/bunglist7.wav
-share/lmms/samples/shapes/bunglist8.wav
-share/lmms/samples/shapes/bunglist9.wav
-share/lmms/samples/shapes/harmonics.wav
-share/lmms/samples/shapes/micro.wav
-share/lmms/samples/shapes/moog.wav
-share/lmms/samples/shapes/roundbass.wav
-share/lmms/samples/shapes/roundsaw.ogg
-share/lmms/samples/shapes/saw+sine.wav
-share/lmms/samples/shapes/sine_dist.ogg
-share/lmms/samples/shapes/smooth_inv_saw.ogg
-share/lmms/samples/shapes/smooth_inv_saw2.ogg
-share/lmms/samples/shapes/smooth_inv_saw_dist.ogg
-share/lmms/samples/shapes/technobass.wav
-share/lmms/samples/shapes/technosynth1.wav
-share/lmms/samples/shapes/technosynth2.wav
-share/lmms/samples/shapes/technosynth3.wav
-share/lmms/samples/shapes/technosynth4.wav
-share/lmms/samples/shapes/technosynth5.wav
-share/lmms/samples/shapes/technosynth6.wav
-share/lmms/samples/shapes/vowel_a.wav
-share/lmms/samples/shapes/vowel_u.wav
-share/lmms/samples/stringsnpads/bell_choir01.ogg
-share/lmms/samples/stringsnpads/bell_choir02.ogg
-share/lmms/samples/stringsnpads/chorus01.ogg
-share/lmms/samples/stringsnpads/chorus02.ogg
-share/lmms/samples/stringsnpads/heaven_strings01.ogg
-share/lmms/samples/stringsnpads/juno_pad01.ogg
-share/lmms/samples/stringsnpads/korg_poly6_drone01.ogg
-share/lmms/samples/stringsnpads/nord_ambient01.ogg
-share/lmms/samples/stringsnpads/orion_string01.ogg
-share/lmms/samples/stringsnpads/rave_choir01.ogg
-share/lmms/samples/stringsnpads/space_strings01.ogg
-share/lmms/samples/stringsnpads/space_strings02.ogg
-share/lmms/samples/stringsnpads/space_strings03.ogg
-share/lmms/samples/stringsnpads/strings01.ogg
-share/lmms/themes/blue_scene/add_bb_track.png
-share/lmms/themes/blue_scene/add_sample_track.png
-share/lmms/themes/blue_scene/apply.png
-share/lmms/themes/blue_scene/arp_down_off.png
-share/lmms/themes/blue_scene/arp_down_on.png
-share/lmms/themes/blue_scene/arp_free.png
-share/lmms/themes/blue_scene/arp_random_off.png
-share/lmms/themes/blue_scene/arp_random_on.png
-share/lmms/themes/blue_scene/arp_sort.png
-share/lmms/themes/blue_scene/arp_sync.png
-share/lmms/themes/blue_scene/arp_up_and_down_off.png
-share/lmms/themes/blue_scene/arp_up_and_down_on.png
-share/lmms/themes/blue_scene/arp_up_off.png
-share/lmms/themes/blue_scene/arp_up_on.png
-share/lmms/themes/blue_scene/auto_limit.png
-share/lmms/themes/blue_scene/autoscroll_off.png
-share/lmms/themes/blue_scene/autoscroll_on.png
-share/lmms/themes/blue_scene/back_to_start.png
-share/lmms/themes/blue_scene/back_to_zero.png
-share/lmms/themes/blue_scene/background_artwork.png
-share/lmms/themes/blue_scene/bb_track.png
-share/lmms/themes/blue_scene/black_key.png
-share/lmms/themes/blue_scene/black_key_pressed.png
-share/lmms/themes/blue_scene/cancel.png
-share/lmms/themes/blue_scene/clock.png
-share/lmms/themes/blue_scene/colorize.png
-share/lmms/themes/blue_scene/combobox_arrow.png
-share/lmms/themes/blue_scene/combobox_bg.png
-share/lmms/themes/blue_scene/cpuload_bg.png
-share/lmms/themes/blue_scene/drum.png
-share/lmms/themes/blue_scene/edit_arrow.png
-share/lmms/themes/blue_scene/edit_copy.png
-share/lmms/themes/blue_scene/edit_cut.png
-share/lmms/themes/blue_scene/edit_draw.png
-share/lmms/themes/blue_scene/edit_erase.png
-share/lmms/themes/blue_scene/edit_move.png
-share/lmms/themes/blue_scene/edit_paste.png
-share/lmms/themes/blue_scene/edit_redo.png
-share/lmms/themes/blue_scene/edit_select.png
-share/lmms/themes/blue_scene/edit_undo.png
-share/lmms/themes/blue_scene/effect_board.png
-share/lmms/themes/blue_scene/envelope_graph.png
-share/lmms/themes/blue_scene/error.png
-share/lmms/themes/blue_scene/exit.png
-share/lmms/themes/blue_scene/exp_wave_active.png
-share/lmms/themes/blue_scene/exp_wave_inactive.png
-share/lmms/themes/blue_scene/filter_2lp.png
-share/lmms/themes/blue_scene/filter_ap.png
-share/lmms/themes/blue_scene/filter_bp.png
-share/lmms/themes/blue_scene/filter_hp.png
-share/lmms/themes/blue_scene/filter_lp.png
-share/lmms/themes/blue_scene/filter_notch.png
-share/lmms/themes/blue_scene/folder.png
-share/lmms/themes/blue_scene/folder_locked.png
-share/lmms/themes/blue_scene/folder_opened.png
-share/lmms/themes/blue_scene/freeze.png
-share/lmms/themes/blue_scene/frozen.png
-share/lmms/themes/blue_scene/help.png
-share/lmms/themes/blue_scene/hint.png
-share/lmms/themes/blue_scene/home.png
-share/lmms/themes/blue_scene/hourglass.png
-share/lmms/themes/blue_scene/hq_mode.png
-share/lmms/themes/blue_scene/icon.png
-share/lmms/themes/blue_scene/keep_stop_position.png
-share/lmms/themes/blue_scene/knob01.png
-share/lmms/themes/blue_scene/knob02.png
-share/lmms/themes/blue_scene/knob03.png
-share/lmms/themes/blue_scene/knob04.png
-share/lmms/themes/blue_scene/led_green.png
-share/lmms/themes/blue_scene/led_off.png
-share/lmms/themes/blue_scene/led_yellow.png
-share/lmms/themes/blue_scene/lfo_graph.png
-share/lmms/themes/blue_scene/loop_point.png
-share/lmms/themes/blue_scene/loop_point_disabled.png
-share/lmms/themes/blue_scene/loop_points_off.png
-share/lmms/themes/blue_scene/loop_points_on.png
-share/lmms/themes/blue_scene/main_toolbar_bg.png
-share/lmms/themes/blue_scene/master_pitch.png
-share/lmms/themes/blue_scene/master_volume.png
-share/lmms/themes/blue_scene/midi_file.png
-share/lmms/themes/blue_scene/midi_in.png
-share/lmms/themes/blue_scene/midi_out.png
-share/lmms/themes/blue_scene/moog_saw_wave_active.png
-share/lmms/themes/blue_scene/moog_saw_wave_inactive.png
-share/lmms/themes/blue_scene/mute_off.png
-share/lmms/themes/blue_scene/mute_on.png
-share/lmms/themes/blue_scene/note.png
-share/lmms/themes/blue_scene/note_double_whole.png
-share/lmms/themes/blue_scene/note_eighth.png
-share/lmms/themes/blue_scene/note_half.png
-share/lmms/themes/blue_scene/note_none.png
-share/lmms/themes/blue_scene/note_quarter.png
-share/lmms/themes/blue_scene/note_sixteenth.png
-share/lmms/themes/blue_scene/note_thirtysecond.png
-share/lmms/themes/blue_scene/note_whole.png
-share/lmms/themes/blue_scene/output_graph.png
-share/lmms/themes/blue_scene/pause.png
-share/lmms/themes/blue_scene/piano.png
-share/lmms/themes/blue_scene/play.png
-share/lmms/themes/blue_scene/playpos_marker.png
-share/lmms/themes/blue_scene/plugins.png
-share/lmms/themes/blue_scene/plugins/audiofileprocessor_artwork.png
-share/lmms/themes/blue_scene/plugins/audiofileprocessor_logo.png
-share/lmms/themes/blue_scene/plugins/audiofileprocessor_loop_off.png
-share/lmms/themes/blue_scene/plugins/audiofileprocessor_loop_on.png
-share/lmms/themes/blue_scene/plugins/audiofileprocessor_reverse_off.png
-share/lmms/themes/blue_scene/plugins/audiofileprocessor_reverse_on.png
-share/lmms/themes/blue_scene/plugins/bitinvader_artwork.png
-share/lmms/themes/blue_scene/plugins/bitinvader_logo.png
-share/lmms/themes/blue_scene/plugins/bitinvader_smooth.png
-share/lmms/themes/blue_scene/plugins/bitinvader_wavegraph.png
-share/lmms/themes/blue_scene/plugins/bitinvader_wavegraph3.png
-share/lmms/themes/blue_scene/plugins/pluckedstringsynth_logo.png
-share/lmms/themes/blue_scene/plugins/tripleoscillator_am_active.png
-share/lmms/themes/blue_scene/plugins/tripleoscillator_am_inactive.png
-share/lmms/themes/blue_scene/plugins/tripleoscillator_artwork.png
-share/lmms/themes/blue_scene/plugins/tripleoscillator_btn_mask.png
-share/lmms/themes/blue_scene/plugins/tripleoscillator_fm_active.png
-share/lmms/themes/blue_scene/plugins/tripleoscillator_fm_inactive.png
-share/lmms/themes/blue_scene/plugins/tripleoscillator_mix_active.png
-share/lmms/themes/blue_scene/plugins/tripleoscillator_mix_inactive.png
-share/lmms/themes/blue_scene/plugins/tripleoscillator_sync_active.png
-share/lmms/themes/blue_scene/plugins/tripleoscillator_sync_inactive.png
-share/lmms/themes/blue_scene/plugins/vestige_artwork.png
-share/lmms/themes/blue_scene/plugins/vestige_logo.png
-share/lmms/themes/blue_scene/preset_file.png
-share/lmms/themes/blue_scene/project_export.png
-share/lmms/themes/blue_scene/project_file.png
-share/lmms/themes/blue_scene/project_new.png
-share/lmms/themes/blue_scene/project_notes.png
-share/lmms/themes/blue_scene/project_open.png
-share/lmms/themes/blue_scene/project_open_down.png
-share/lmms/themes/blue_scene/project_save.png
-share/lmms/themes/blue_scene/project_saveas.png
-share/lmms/themes/blue_scene/quantize.png
-share/lmms/themes/blue_scene/record.png
-share/lmms/themes/blue_scene/reload.png
-share/lmms/themes/blue_scene/rename.png
-share/lmms/themes/blue_scene/root.png
-share/lmms/themes/blue_scene/sample_track.png
-share/lmms/themes/blue_scene/saw_wave_active.png
-share/lmms/themes/blue_scene/saw_wave_inactive.png
-share/lmms/themes/blue_scene/setup_audio.png
-share/lmms/themes/blue_scene/setup_directories.png
-share/lmms/themes/blue_scene/setup_general.png
-share/lmms/themes/blue_scene/setup_midi.png
-share/lmms/themes/blue_scene/setup_performance.png
-share/lmms/themes/blue_scene/sin_wave_active.png
-share/lmms/themes/blue_scene/sin_wave_inactive.png
-share/lmms/themes/blue_scene/songeditor.png
-share/lmms/themes/blue_scene/sound_file.png
-share/lmms/themes/blue_scene/splash.png
-share/lmms/themes/blue_scene/square_wave_active.png
-share/lmms/themes/blue_scene/square_wave_inactive.png
-share/lmms/themes/blue_scene/step_btn_add.png
-share/lmms/themes/blue_scene/step_btn_off.png
-share/lmms/themes/blue_scene/step_btn_off_light.png
-share/lmms/themes/blue_scene/step_btn_on.png
-share/lmms/themes/blue_scene/step_btn_on_100.png
-share/lmms/themes/blue_scene/step_btn_on_yellow.png
-share/lmms/themes/blue_scene/step_btn_remove.png
-share/lmms/themes/blue_scene/stop.png
-share/lmms/themes/blue_scene/surround_area.png
-share/lmms/themes/blue_scene/tempo_sync.png
-share/lmms/themes/blue_scene/text_block.png
-share/lmms/themes/blue_scene/text_bold.png
-share/lmms/themes/blue_scene/text_center.png
-share/lmms/themes/blue_scene/text_italic.png
-share/lmms/themes/blue_scene/text_left.png
-share/lmms/themes/blue_scene/text_right.png
-share/lmms/themes/blue_scene/text_under.png
-share/lmms/themes/blue_scene/timeline.png
-share/lmms/themes/blue_scene/toolbar_bg.png
-share/lmms/themes/blue_scene/track_op_grip.png
-share/lmms/themes/blue_scene/track_op_menu.png
-share/lmms/themes/blue_scene/triangle_wave_active.png
-share/lmms/themes/blue_scene/triangle_wave_inactive.png
-share/lmms/themes/blue_scene/unfreeze.png
-share/lmms/themes/blue_scene/unknown_file.png
-share/lmms/themes/blue_scene/usr_wave_active.png
-share/lmms/themes/blue_scene/usr_wave_inactive.png
-share/lmms/themes/blue_scene/whatsthis.png
-share/lmms/themes/blue_scene/white_key.png
-share/lmms/themes/blue_scene/white_key_pressed.png
-share/lmms/themes/blue_scene/white_noise_wave_active.png
-share/lmms/themes/blue_scene/white_noise_wave_inactive.png
-share/lmms/themes/blue_scene/wizard.png
-share/lmms/themes/blue_scene/wizard_files.png
-share/lmms/themes/blue_scene/wizard_intro.png
-share/lmms/themes/blue_scene/wizard_workingdir.png
-share/lmms/themes/blue_scene/zoom.png
-share/lmms/themes/default/add_bb_track.png
-share/lmms/themes/default/add_sample_track.png
-share/lmms/themes/default/apply.png
-share/lmms/themes/default/arp_down_off.png
-share/lmms/themes/default/arp_down_on.png
-share/lmms/themes/default/arp_free.png
-share/lmms/themes/default/arp_random_off.png
-share/lmms/themes/default/arp_random_on.png
-share/lmms/themes/default/arp_sort.png
-share/lmms/themes/default/arp_sync.png
-share/lmms/themes/default/arp_up_and_down_off.png
-share/lmms/themes/default/arp_up_and_down_on.png
-share/lmms/themes/default/arp_up_off.png
-share/lmms/themes/default/arp_up_on.png
-share/lmms/themes/default/auto_limit.png
-share/lmms/themes/default/automation.png
-share/lmms/themes/default/autoscroll_off.png
-share/lmms/themes/default/autoscroll_on.png
-share/lmms/themes/default/back_to_start.png
-share/lmms/themes/default/back_to_zero.png
-share/lmms/themes/default/background_artwork.png
-share/lmms/themes/default/bb_track.png
-share/lmms/themes/default/black_key.png
-share/lmms/themes/default/black_key_pressed.png
-share/lmms/themes/default/cancel.png
-share/lmms/themes/default/clock.png
-share/lmms/themes/default/colorize.png
-share/lmms/themes/default/combobox_arrow.png
-share/lmms/themes/default/combobox_bg.png
-share/lmms/themes/default/cpuload_bg.png
-share/lmms/themes/default/cpuload_leds.png
-share/lmms/themes/default/drum.png
-share/lmms/themes/default/edit_arrow.png
-share/lmms/themes/default/edit_copy.png
-share/lmms/themes/default/edit_cut.png
-share/lmms/themes/default/edit_draw.png
-share/lmms/themes/default/edit_erase.png
-share/lmms/themes/default/edit_move.png
-share/lmms/themes/default/edit_paste.png
-share/lmms/themes/default/edit_redo.png
-share/lmms/themes/default/edit_select.png
-share/lmms/themes/default/edit_undo.png
-share/lmms/themes/default/effect_board.png
-share/lmms/themes/default/envelope_graph.png
-share/lmms/themes/default/error.png
-share/lmms/themes/default/exit.png
-share/lmms/themes/default/exp_wave_active.png
-share/lmms/themes/default/exp_wave_inactive.png
-share/lmms/themes/default/factory_files.png
-share/lmms/themes/default/filter_2lp.png
-share/lmms/themes/default/filter_ap.png
-share/lmms/themes/default/filter_bp.png
-share/lmms/themes/default/filter_hp.png
-share/lmms/themes/default/filter_lp.png
-share/lmms/themes/default/filter_notch.png
-share/lmms/themes/default/folder.png
-share/lmms/themes/default/folder_locked.png
-share/lmms/themes/default/folder_opened.png
-share/lmms/themes/default/freeze.png
-share/lmms/themes/default/frozen.png
-share/lmms/themes/default/groupbox_led_bg.png
-share/lmms/themes/default/help.png
-share/lmms/themes/default/hint.png
-share/lmms/themes/default/home.png
-share/lmms/themes/default/hourglass.png
-share/lmms/themes/default/hq_mode.png
-share/lmms/themes/default/icon.png
-share/lmms/themes/default/keep_stop_position.png
-share/lmms/themes/default/knob01.png
-share/lmms/themes/default/knob02.png
-share/lmms/themes/default/knob03.png
-share/lmms/themes/default/knob04.png
-share/lmms/themes/default/led_green.png
-share/lmms/themes/default/led_off.png
-share/lmms/themes/default/led_yellow.png
-share/lmms/themes/default/lfo_graph.png
-share/lmms/themes/default/loop_point.png
-share/lmms/themes/default/loop_point_disabled.png
-share/lmms/themes/default/loop_points_off.png
-share/lmms/themes/default/loop_points_on.png
-share/lmms/themes/default/main_toolbar_bg.png
-share/lmms/themes/default/master_pitch.png
-share/lmms/themes/default/master_volume.png
-share/lmms/themes/default/midi_file.png
-share/lmms/themes/default/midi_in.png
-share/lmms/themes/default/midi_out.png
-share/lmms/themes/default/moog_saw_wave_active.png
-share/lmms/themes/default/moog_saw_wave_inactive.png
-share/lmms/themes/default/mute_off.png
-share/lmms/themes/default/mute_on.png
-share/lmms/themes/default/muted.png
-share/lmms/themes/default/note.png
-share/lmms/themes/default/note_double_whole.png
-share/lmms/themes/default/note_eighth.png
-share/lmms/themes/default/note_half.png
-share/lmms/themes/default/note_none.png
-share/lmms/themes/default/note_quarter.png
-share/lmms/themes/default/note_sixteenth.png
-share/lmms/themes/default/note_thirtysecond.png
-share/lmms/themes/default/note_whole.png
-share/lmms/themes/default/output_graph.png
-share/lmms/themes/default/pause.png
-share/lmms/themes/default/piano.png
-share/lmms/themes/default/play.png
-share/lmms/themes/default/playpos_marker.png
-share/lmms/themes/default/plugins.png
-share/lmms/themes/default/pr_black_key.png
-share/lmms/themes/default/pr_white_key_big.png
-share/lmms/themes/default/pr_white_key_small.png
-share/lmms/themes/default/preset_file.png
-share/lmms/themes/default/project_export.png
-share/lmms/themes/default/project_file.png
-share/lmms/themes/default/project_new.png
-share/lmms/themes/default/project_notes.png
-share/lmms/themes/default/project_open.png
-share/lmms/themes/default/project_open_down.png
-share/lmms/themes/default/project_save.png
-share/lmms/themes/default/project_saveas.png
-share/lmms/themes/default/quantize.png
-share/lmms/themes/default/record.png
-share/lmms/themes/default/reload.png
-share/lmms/themes/default/rename.png
-share/lmms/themes/default/root.png
-share/lmms/themes/default/sample_track.png
-share/lmms/themes/default/saw_wave_active.png
-share/lmms/themes/default/saw_wave_inactive.png
-share/lmms/themes/default/setup_audio.png
-share/lmms/themes/default/setup_directories.png
-share/lmms/themes/default/setup_general.png
-share/lmms/themes/default/setup_midi.png
-share/lmms/themes/default/setup_performance.png
-share/lmms/themes/default/sin_wave_active.png
-share/lmms/themes/default/sin_wave_inactive.png
-share/lmms/themes/default/songeditor.png
-share/lmms/themes/default/sound_file.png
-share/lmms/themes/default/splash.png
-share/lmms/themes/default/square_wave_active.png
-share/lmms/themes/default/square_wave_inactive.png
-share/lmms/themes/default/step_btn_add.png
-share/lmms/themes/default/step_btn_off.png
-share/lmms/themes/default/step_btn_off_light.png
-share/lmms/themes/default/step_btn_on.png
-share/lmms/themes/default/step_btn_on_100.png
-share/lmms/themes/default/step_btn_on_yellow.png
-share/lmms/themes/default/step_btn_remove.png
-share/lmms/themes/default/stop.png
-share/lmms/themes/default/surround_area.png
-share/lmms/themes/default/tempo_sync.png
-share/lmms/themes/default/text_block.png
-share/lmms/themes/default/text_bold.png
-share/lmms/themes/default/text_center.png
-share/lmms/themes/default/text_italic.png
-share/lmms/themes/default/text_left.png
-share/lmms/themes/default/text_right.png
-share/lmms/themes/default/text_under.png
-share/lmms/themes/default/timeline.png
-share/lmms/themes/default/toolbar_bg.png
-share/lmms/themes/default/track_op_grip.png
-share/lmms/themes/default/track_op_menu.png
-share/lmms/themes/default/triangle_wave_active.png
-share/lmms/themes/default/triangle_wave_inactive.png
-share/lmms/themes/default/unfreeze.png
-share/lmms/themes/default/unknown_file.png
-share/lmms/themes/default/usr_wave_active.png
-share/lmms/themes/default/usr_wave_inactive.png
-share/lmms/themes/default/whatsthis.png
-share/lmms/themes/default/white_key.png
-share/lmms/themes/default/white_key_pressed.png
-share/lmms/themes/default/white_noise_wave_active.png
-share/lmms/themes/default/white_noise_wave_inactive.png
-share/lmms/themes/default/wizard.png
-share/lmms/themes/default/wizard_files.png
-share/lmms/themes/default/wizard_intro.png
-share/lmms/themes/default/wizard_workingdir.png
-share/lmms/themes/default/zoom.png
-share/lmms/themes/default/zoom_x.png
-share/lmms/themes/default/zoom_y.png
-share/lmms/track_icons/african_drum01.png
-share/lmms/track_icons/african_drum02.png
-share/lmms/track_icons/african_drum03.png
-share/lmms/track_icons/african_drum04.png
-share/lmms/track_icons/african_drum05.png
-share/lmms/track_icons/cello01.png
-share/lmms/track_icons/connectors01.png
-share/lmms/track_icons/drumset01_.png
-share/lmms/track_icons/flute01.png
-share/lmms/track_icons/french_horn01.png
-share/lmms/track_icons/gramophone01.png
-share/lmms/track_icons/guitar_accoustic01.png
-share/lmms/track_icons/guitar_accoustic02.png
-share/lmms/track_icons/guitar_accoustic03.png
-share/lmms/track_icons/guitar_bass01.png
-share/lmms/track_icons/guitar_electric01.png
-share/lmms/track_icons/guitar_electric02.png
-share/lmms/track_icons/guitar_electric03.png
-share/lmms/track_icons/guitar_electric04.png
-share/lmms/track_icons/harp01.png
-share/lmms/track_icons/harp02.png
-share/lmms/track_icons/harp03.png
-share/lmms/track_icons/maracas01.png
-share/lmms/track_icons/microphone01.png
-share/lmms/track_icons/microphone02.png
-share/lmms/track_icons/microphone03.png
-share/lmms/track_icons/microphone04.png
-share/lmms/track_icons/mouth01.png
-share/lmms/track_icons/oboe01.png
-share/lmms/track_icons/piano01.png
-share/lmms/track_icons/speaker01.png
-share/lmms/track_icons/trombone01.png
-share/lmms/track_icons/trumpet01.png
-share/lmms/track_icons/trumpet02.png
-share/lmms/track_icons/trumpet03.png
-share/lmms/track_icons/trumpet04.png
-share/lmms/track_icons/violin01.png
-share/lmms/track_icons/violin02.png
-share/lmms/track_icons/xylophone01.png
-share/locale/ca.qm
-share/locale/de.qm
-share/locale/en.qm
-share/locale/es.qm
-share/locale/fr.qm
-share/locale/ir.qm
-share/locale/it.qm
-share/locale/pt_br.qm
-share/locale/qt_ar.qm
-share/locale/qt_cs.qm
-share/locale/qt_de.qm
-share/locale/qt_en.qm
-share/locale/qt_fr.qm
-share/locale/qt_iw.qm
-share/locale/qt_ru.qm
-share/locale/qt_sk.qm
-share/locale/ru.qm
-@dirrm share/lmms/track_icons
-@dirrm share/lmms/themes/default
-@dirrm share/lmms/themes/blue_scene/plugins
-@dirrm share/lmms/themes/blue_scene
-@dirrm share/lmms/themes
-@dirrm share/lmms/samples/stringsnpads
-@dirrm share/lmms/samples/shapes
-@dirrm share/lmms/samples/misc
-@dirrm share/lmms/samples/latin
-@dirrm share/lmms/samples/instruments
-@dirrm share/lmms/samples/effects
-@dirrm share/lmms/samples/drums
-@dirrm share/lmms/samples/beats
-@dirrm share/lmms/samples/bassloopes
-@dirrm share/lmms/samples/basses
-@dirrm share/lmms/samples
-@dirrm share/lmms/projects/tutorials
-@dirrm share/lmms/projects/templates
-@exec ${MKDIR} %D/share/lmms/projects/recorded_loops
-@dirrm share/lmms/projects/recorded_loops
-@dirrm share/lmms/projects/misc
-@dirrm share/lmms/projects/demos
-@dirrm share/lmms/projects/covers
-@dirrm share/lmms/projects/cool_songs
-@dirrm share/lmms/projects
-@dirrm share/lmms/presets/VeSTige
-@dirrm share/lmms/presets/TripleOscillator
-@dirrm share/lmms/presets/PluckedStringSynth
-@dirrm share/lmms/presets/Organic
-@dirrm share/lmms/presets/BitInvader
-@dirrm share/lmms/presets/AudioFileProcessor
-@dirrm share/lmms/presets
-@dirrm share/lmms/midi-maps
-@dirrm share/lmms
-@dirrm lib/lmms
diff --git a/audio/lmms/distinfo b/audio/lmms/distinfo
deleted file mode 100644
index b211961b249..00000000000
--- a/audio/lmms/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/10/10 20:13:48 rillig Exp $
-
-SHA1 (lmms-0.2.0.tar.bz2) = 410647c860d140769ed1c56bb8a794cb2594658b
-RMD160 (lmms-0.2.0.tar.bz2) = c3e44e018303ed40d048542a8f66fbb785ea11f2
-Size (lmms-0.2.0.tar.bz2) = 6718153 bytes
-SHA1 (patch-aa) = ea99645ba74ea80c669e1757fca949541d2b5441
-SHA1 (patch-ab) = 8a598eed529d609272419283e382ad2223dfe4d6
-SHA1 (patch-ac) = f9be78b4c606e80c8b0bad78fafbd8ee07f2e65e
-SHA1 (patch-ad) = b62e49823415530354a01c43fc588338212aaf68
-SHA1 (patch-ae) = de50ed87888b74a0d3ed0158dda3291af54595c9
-SHA1 (patch-af) = c269ade81ba2e9951df18a9a04e2978572376e74
diff --git a/audio/lmms/patches/patch-aa b/audio/lmms/patches/patch-aa
deleted file mode 100644
index f5e1728d5f9..00000000000
--- a/audio/lmms/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/07/23 11:50:25 rillig Exp $
-
-Since some systems (among them NetBSD 3.0) don't have a log2f function,
-precompute the values.
-
---- plugins/organic/organic.cpp.orig 2006-07-03 08:34:22.000000000 +0200
-+++ plugins/organic/organic.cpp 2006-07-23 12:07:40.000000000 +0200
-@@ -106,14 +106,14 @@ organicInstrument::organicInstrument( in
-
- m_osc = new oscillatorData[m_num_oscillators];
-
-- m_osc[0].harmonic = log2f( 0.5f ); // one octave below
-- m_osc[1].harmonic = log2f( 0.75f ); // a fifth below
-- m_osc[2].harmonic = log2f( 1.0f ); // base freq
-- m_osc[3].harmonic = log2f( 2.0f ); // first overtone
-- m_osc[4].harmonic = log2f( 3.0f ); // second overtone
-- m_osc[5].harmonic = log2f( 4.0f ); // .
-- m_osc[6].harmonic = log2f( 5.0f ); // .
-- m_osc[7].harmonic = log2f( 6.0f ); // .
-+ m_osc[0].harmonic = -1.0000000f; // one octave below
-+ m_osc[1].harmonic = -0.4150375f; // a fifth below
-+ m_osc[2].harmonic = 0.0000000f; // base freq
-+ m_osc[3].harmonic = 1.0000000f; // first overtone
-+ m_osc[4].harmonic = 1.5849625f; // second overtone
-+ m_osc[5].harmonic = 2.0000000f; // .
-+ m_osc[6].harmonic = 2.3219281f; // .
-+ m_osc[7].harmonic = 2.5849625f; // .
-
- for (int i=0; i < m_num_oscillators; i++)
- {
diff --git a/audio/lmms/patches/patch-ab b/audio/lmms/patches/patch-ab
deleted file mode 100644
index f66fb27197f..00000000000
--- a/audio/lmms/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/07/23 11:50:25 rillig Exp $
-
---- plugins/vibed/vibrating_string.cpp.orig 2006-07-23 12:20:50.000000000 +0200
-+++ plugins/vibed/vibrating_string.cpp 2006-07-23 13:07:47.000000000 +0200
-@@ -23,6 +23,18 @@
- */
- #include <math.h>
-
-+/* These two headers need to be included very early to work around a
-+ * parse error in g++-3.3.3:
-+ *
-+ * g++/bits/stl_pair.h: In function `bool std::operator<(const std::pair<_T1, _T2>&, const std::pair<_T1, _T2>&)':
-+ * g++/bits/stl_pair.h:103: error: parse error before `)' token
-+ *
-+ * qt3/include/qpair.h: In function `bool operator<(const QPair<T1, T2>&, const QPair<T1, T2>&)':
-+ * qt3/include/qpair.h:80: error: parse error before `)' token
-+ */
-+#include <utility>
-+#include <qpair.h>
-+
- #include "vibrating_string.h"
- #include "templates.h"
- #include "interpolation.h"
diff --git a/audio/lmms/patches/patch-ac b/audio/lmms/patches/patch-ac
deleted file mode 100644
index 4affbc50edc..00000000000
--- a/audio/lmms/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2006/07/23 11:50:25 rillig Exp $
-
-Not every system needs -ldl.
-
---- Makefile.in.orig 2006-07-19 11:47:47.000000000 +0200
-+++ Makefile.in 2006-07-23 13:30:16.000000000 +0200
-@@ -571,7 +571,7 @@ CLEANFILES = $(lmms_MOC) ./embedded_reso
- @HAVE_LIBVORBIS_TRUE@LIB_VORBIS_LDADD = -lvorbis -lvorbisenc -lvorbisfile
- @HAVE_LIBSRC_TRUE@LIB_SRC_LDADD = -lsamplerate
- @HAVE_LIBSF_TRUE@LIB_SF_LDADD = -lsndfile
--lmms_LDADD = $(QT_LDADD) $(LIB_SDL_LDADD) $(LIB_ASOUND_LDADD) $(LIB_JACK_LDADD) $(LIB_SDL_SOUND_LDADD) $(LIB_VORBIS_LDADD) $(LIB_SRC_LDADD) $(LIB_SF_LDADD) $(LIB_FST_LDADD) -ldl
-+lmms_LDADD = $(QT_LDADD) $(LIB_SDL_LDADD) $(LIB_ASOUND_LDADD) $(LIB_JACK_LDADD) $(LIB_SDL_SOUND_LDADD) $(LIB_VORBIS_LDADD) $(LIB_SRC_LDADD) $(LIB_SF_LDADD) $(LIB_FST_LDADD) $(LIBS)
- lmms_LDFLAGS = -rdynamic
- all: $(BUILT_SOURCES) config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/audio/lmms/patches/patch-ad b/audio/lmms/patches/patch-ad
deleted file mode 100644
index 224eb22db80..00000000000
--- a/audio/lmms/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2006/07/23 11:50:25 rillig Exp $
-
---- src/audio/audio_oss.cpp.orig 2006-07-10 09:28:46.000000000 +0200
-+++ src/audio/audio_oss.cpp 2006-07-23 13:46:10.000000000 +0200
-@@ -84,7 +84,7 @@
-
-
- #ifndef _PATH_DEV_DSP
--#ifdef __OpenBSD__
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
- #define _PATH_DEV_DSP "/dev/audio"
- #else
- #define _PATH_DEV_DSP "/dev/dsp"
diff --git a/audio/lmms/patches/patch-ae b/audio/lmms/patches/patch-ae
deleted file mode 100644
index 78f32cda169..00000000000
--- a/audio/lmms/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/08/22 14:29:07 joerg Exp $
-
---- plugins/vestige/Makefile.in.orig 2006-08-22 16:13:41.000000000 +0000
-+++ plugins/vestige/Makefile.in
-@@ -241,7 +241,7 @@ EXTRA_DIST = $(EMBEDDED_RESOURCES)
- pkglib_LTLIBRARIES = libvestige.la
- libvestige_la_SOURCES = vestige.cpp vestige.h lvsl_client.cpp lvsl_client.h
- lvsl_server_SOURCES = lvsl_server.c communication.h
--lvsl_server_LDFLAGS = -mwindows -L/usr/X11R6/lib -lX11 -lpthread -o $(pkglib_PROGRAMS)
-+lvsl_server_LDFLAGS = -mwindows -L/usr/X11R6/lib -lX11 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -o $(pkglib_PROGRAMS)
- lvsl_server_LINK = wineg++
- nobase_pkglib_DATA = $(pkglib_PROGRAMS).exe.so
- CLEANFILES = $(MOC_FILES) ./embedded_resources.h $(nobase_pkglib_DATA)
diff --git a/audio/lmms/patches/patch-af b/audio/lmms/patches/patch-af
deleted file mode 100644
index 5ca03d52c48..00000000000
--- a/audio/lmms/patches/patch-af
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-af,v 1.2 2006/10/10 20:13:48 rillig Exp $
-
---- configure.orig 2006-07-19 10:34:35.000000000 +0200
-+++ configure 2006-10-10 22:12:44.000000000 +0200
-@@ -21822,7 +21822,7 @@ fi
-
- if test x"$QT_IS_MT" = "xyes" ; then
- QT_CXXFLAGS="$QT_CXXFLAGS -D_REENTRANT -DQT_THREAD_SUPPORT"
-- QT_LIBS="$QT_LIBS -lpthread"
-+ QT_LIBS="$QT_LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
- fi
-
- if test x"$QT_TRANSLATIONS" != x ; then
-@@ -24717,7 +24717,7 @@ done
-
-
- OLD_LIBS="$LIBS"
--LIBS="$LIBS -lpthread"
-+LIBS="$LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
-
- # check for SDL-lib
-
-@@ -28912,7 +28912,7 @@ lmmsdatadir="$datadir/$PACKAGE"
-
- #CFLAGS="$CXXFLAGS -g -O2"
- #CXXFLAGS="$CXXFLAGS -g -O2"
--if test $CXX == "g++" ; then
-+if test "$GCC" = "yes" ; then
- CXXFLAGS="$CXXFLAGS -ansi -Wall -fno-exceptions"
- fi
-
diff --git a/audio/mac/DESCR b/audio/mac/DESCR
deleted file mode 100644
index 4b0ca096ad7..00000000000
--- a/audio/mac/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-MAC: short for Monkey's Audio Codec, a lossless audio codec (files
-with the .ape extension).
-
-This is the MAC Linux port. It has autoconf and automake stuff and
-some slight changes to the code.
diff --git a/audio/mac/Makefile b/audio/mac/Makefile
deleted file mode 100644
index 1ba15a211dc..00000000000
--- a/audio/mac/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2007/02/02 16:56:58 joerg Exp $
-#
-
-DISTNAME= mac-3.99-u4-b5
-PKGNAME= mac-3.99u4b5
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mac-port/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://mac-port.sourceforge.net/
-COMMENT= Monkey's Audio support library (for .ape files)
-
-.include "../../mk/bsd.fast.prefs.mk"
-
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-BUILD_DEPENDS+= yasm-[0-9]*:../../devel/yasm
-.endif
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_LANGUAGES= c c++
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mac/PLIST b/audio/mac/PLIST
deleted file mode 100644
index 8bbf2019a06..00000000000
--- a/audio/mac/PLIST
+++ /dev/null
@@ -1,25 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/01/31 21:17:18 wiz Exp $
-bin/mac
-include/mac/APECompress.h
-include/mac/APECompressCore.h
-include/mac/APECompressCreate.h
-include/mac/APEDecompress.h
-include/mac/APEHeader.h
-include/mac/APEInfo.h
-include/mac/APELink.h
-include/mac/APETag.h
-include/mac/All.h
-include/mac/CharacterHelper.h
-include/mac/CircleBuffer.h
-include/mac/GlobalFunctions.h
-include/mac/ID3Genres.h
-include/mac/IO.h
-include/mac/MACLib.h
-include/mac/MACProgressHelper.h
-include/mac/MACUtils.h
-include/mac/NoWindows.h
-include/mac/SmartPtr.h
-include/mac/StdLibFileIO.h
-include/mac/config.h
-lib/libmac.la
-@dirrm include/mac
diff --git a/audio/mac/buildlink3.mk b/audio/mac/buildlink3.mk
deleted file mode 100644
index e05e481e315..00000000000
--- a/audio/mac/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/02/09 21:20:01 drochner Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-MAC_BUILDLINK3_MK:= ${MAC_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= mac
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmac}
-BUILDLINK_PACKAGES+= mac
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mac
-
-.if ${MAC_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.mac+= mac>=3.99u4b5
-BUILDLINK_PKGSRCDIR.mac?= ../../audio/mac
-.endif # MAC_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/mac/distinfo b/audio/mac/distinfo
deleted file mode 100644
index 16c8110ee53..00000000000
--- a/audio/mac/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2007/02/02 16:56:58 joerg Exp $
-
-SHA1 (mac-3.99-u4-b5.tar.gz) = f215c265c2cba719834c989498d5a8d2457b54de
-RMD160 (mac-3.99-u4-b5.tar.gz) = 34b5ba553f7ffa858249258dad9f64c60f0b6ac0
-Size (mac-3.99-u4-b5.tar.gz) = 421234 bytes
-SHA1 (patch-aa) = c65d0be6d3f7cb357cbf20d7a548028d31cb6230
diff --git a/audio/mac/patches/patch-aa b/audio/mac/patches/patch-aa
deleted file mode 100644
index 87857dd5740..00000000000
--- a/audio/mac/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2007/02/02 16:56:58 joerg Exp $
-
---- configure.orig 2007-02-02 16:37:43.000000000 +0000
-+++ configure
-@@ -20607,12 +20607,16 @@ fi
-
-
- case "$host_os" in
-- *bsd*|linux*|beos|irix*|solaris*)
-+ *bsd*|linux*|beos|irix*|solaris*|*dragonfly*)
- YASM_FORMAT="-f elf"
- ;;
- [cC][yY][gG][wW][iI][nN]*|mingw32*|mks*)
- YASM_FORMAT="-f win32"
- ;;
-+ *)
-+ echo "Unknown OS, don't know binary format"
-+ exit 1
-+ ;;
- esac
-
- case "$host" in
diff --git a/audio/mad/DESCR b/audio/mad/DESCR
deleted file mode 100644
index b28a8a384fd..00000000000
--- a/audio/mad/DESCR
+++ /dev/null
@@ -1,21 +0,0 @@
-MAD (libmad) is a high-quality MPEG audio decoder. It currently
-supports MPEG-1 and the MPEG-2 extension to Lower Sampling Frequencies,
-as well as the so-called MPEG 2.5 format. All three audio layers
-(Layer I, Layer II, and Layer III a.k.a. MP3) are fully implemented.
-
-MAD does not yet support MPEG-2 multichannel audio (although it
-should be backward compatible with such streams) nor does it
-currently support AAC.
-
-MAD has the following special features:
-
- - 24-bit PCM output
- - 100% fixed-point (integer) computation
- - completely new implementation based on the ISO/IEC standards
- - distributed under the terms of the GNU General Public License (GPL)
-
-Because MAD provides full 24-bit PCM output, applications using
-MAD are able to produce high quality audio. Even when the output
-device supports only 16-bit PCM, applications can use the extra
-resolution to increase the audible dynamic range through the use
-of dithering or noise shaping.
diff --git a/audio/mad/Makefile b/audio/mad/Makefile
deleted file mode 100644
index 817972f498e..00000000000
--- a/audio/mad/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2006/02/05 23:08:11 joerg Exp $
-#
-
-DISTNAME= mad-0.15.0b
-PKGREVISION= 1
-CATEGORIES= audio meta-pkgs
-MASTER_SITES= # empty
-DISTFILES= # empty
-
-MAINTAINER= simonb@NetBSD.org
-HOMEPAGE= http://sourceforge.net/projects/mad/
-COMMENT= Meta-package for MAD (MPEG Audio Decoder)
-
-DEPENDS+= libmad>=0.15.0:../../audio/libmad
-DEPENDS+= libid3tag>=0.15.0:../../audio/libid3tag
-DEPENDS+= madplay>=0.15.0:../../audio/madplay
-
-EXTRACT_ONLY= # empty
-NO_CHECKSUM= YES
-NO_CONFIGURE= YES
-NO_BUILD= YES
-
-do-install: # empty
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mad/PLIST b/audio/mad/PLIST
deleted file mode 100644
index 27708bdf80c..00000000000
--- a/audio/mad/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2003/07/10 09:06:02 adam Exp $
-@comment this plist intentionally left empty
diff --git a/audio/mad123/DESCR b/audio/mad123/DESCR
deleted file mode 100644
index 0a68308e388..00000000000
--- a/audio/mad123/DESCR
+++ /dev/null
@@ -1,23 +0,0 @@
-mad123 is a simple command line MP3 player using Robert Leslie's
-libmad fixed-point MP3 decoder library.
-
-This is not meant to be a serious replacement for the ubiquitous
-mpg123 program. Instead, this is a merely an experiment in using
-libmad. At the time mad123 was written, a couple of things set it
-apart from the command line MP3 player supplied with libmad (madplay):
-
-1) Supports URL style MP3 pathnames.
-
-2) The audio output is double-buffered. Multiple audio backends
- such as Sun (OSS), aRts, and pcm are supported.
-
-3) Streams can be pre-buffered using read-ahead.
-
-4) Simple keyboard controls.
-
-5) Playlist support.
-
-6) CTRL-C behaves like it does for mpg123.
-
-7) It can be installed setuid-root so it can adjust scheduling
- priority to reduce its susceptibility to jitter.
diff --git a/audio/mad123/Makefile b/audio/mad123/Makefile
deleted file mode 100644
index 7a2c6a90570..00000000000
--- a/audio/mad123/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# $NetBSD: Makefile,v 1.23 2007/01/07 09:13:47 rillig Exp $
-#
-
-DISTNAME= mad123-0.8.5
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= http://www.mctavish.co.uk/mad123/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.mctavish.co.uk/mad123/
-COMMENT= Command-line MPEG audio player
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-.include "../../mk/bsd.prefs.mk"
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.mad123
-PKG_SUPPORTED_OPTIONS= arts oss sun
-PKG_SUGGESTED_OPTIONS+= oss
-.if ${OPSYS} != "DragonFly"
-PKG_SUGGESTED_OPTIONS+= sun
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Marts)
-MAKE_FLAGS+= USE_ARTS=yes
-.include "../../audio/arts/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Moss)
-MAKE_FLAGS+= USE_OSS=yes
-. include "../../mk/oss.buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Msun)
-MAKE_FLAGS+= USE_SUN=yes
-.endif
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/mad123 ${DESTDIR}${PREFIX}/bin/mad123
- ${INSTALL_MAN} ${WRKSRC}/mad123.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
-
-.include "../../audio/taglib/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mad123/PLIST b/audio/mad123/PLIST
deleted file mode 100644
index 0262fa8d571..00000000000
--- a/audio/mad123/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 11:16:35 scw Exp $
-bin/mad123
-man/man1/mad123.1
diff --git a/audio/mad123/distinfo b/audio/mad123/distinfo
deleted file mode 100644
index 5645420b590..00000000000
--- a/audio/mad123/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/11/11 18:58:18 joerg Exp $
-
-SHA1 (mad123-0.8.5.tar.gz) = 97c5d6185a54e2262d52a687ff3a3714ff260af8
-RMD160 (mad123-0.8.5.tar.gz) = bd2bf0b79a3c9d3513583daccdfc182a2d17cc41
-Size (mad123-0.8.5.tar.gz) = 24836 bytes
-SHA1 (patch-aa) = 16aecc1f75178cb62bca7d5012cea4dffe393f9c
-SHA1 (patch-ab) = eea40969ca88bd65666aada085742a3bdd5d9eba
-SHA1 (patch-ac) = 7c150b2f15cbc00876c8619b80ee29c73b0b71df
diff --git a/audio/mad123/patches/patch-aa b/audio/mad123/patches/patch-aa
deleted file mode 100644
index 4d0684a8ab9..00000000000
--- a/audio/mad123/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/11/11 18:58:18 joerg Exp $
-
---- mad123.c.orig 2005-11-11 18:19:59.000000000 +0000
-+++ mad123.c
-@@ -20,6 +20,7 @@
- */
-
- #include <sys/types.h>
-+#include <sys/stat.h>
- #include <sys/time.h>
- #include <sys/resource.h>
- #include <sys/poll.h>
diff --git a/audio/mad123/patches/patch-ab b/audio/mad123/patches/patch-ab
deleted file mode 100644
index 890ac97f398..00000000000
--- a/audio/mad123/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/11/11 18:58:18 joerg Exp $
-
---- audio_dev.c.orig 2004-09-22 09:23:43.000000000 +0000
-+++ audio_dev.c
-@@ -43,6 +43,10 @@
- #undef WORDS_BIGENDIAN
- #endif
-
-+#ifdef __DragonFly__
-+typedef unsigned int nfds_t;
-+#endif
-+
- #define PCM_BUFFSIZE ((sizeof(((struct mad_pcm *)0)->samples) / \
- sizeof(mad_fixed_t)) * 2)
- struct pcm_data {
-@@ -97,8 +101,12 @@ static void audio_convert_dither(unsigne
-
-
- static const struct audio_dev_backend *audio_dev_backends[] = {
-+#ifndef NOSUN
- &audio_dev_sun,
-+#endif
-+#ifndef NOOSS
- &audio_dev_pcm,
-+#endif
- #ifndef NOARTS
- &audio_dev_arts,
- #endif
diff --git a/audio/mad123/patches/patch-ac b/audio/mad123/patches/patch-ac
deleted file mode 100644
index 296c3a4701d..00000000000
--- a/audio/mad123/patches/patch-ac
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/11/11 18:58:18 joerg Exp $
-
---- Makefile.orig 2004-10-21 13:03:25.000000000 +0000
-+++ Makefile
-@@ -19,7 +19,6 @@
-
- PROG= mad123
- SRCS= mad123.c mp3_stream.c audio_dev.c
--SRCS+= audio_dev_sun.c audio_dev_pcm.c
-
- BINDIR?=/usr/local/bin
-
-@@ -29,6 +28,8 @@ USE_CURL?=yes
- USE_TAGLIB?=yes
- USE_ID3LIB?=no
- USE_ARTS?=no
-+USE_SUN?=no
-+USE_OSS?=no
-
- .if ${USE_CURL} != "no"
- CURLLIB= -lcurl
-@@ -50,6 +51,18 @@ CPPFLAGS+= -DNOID3LIB
- .endif
- .endif # USE_TAGLIB
-
-+.if ${USE_SUN} != "no"
-+SRCS += audio_dev_sun.c
-+.else
-+CPPFLAGS+= -DNOSUN
-+.endif
-+
-+.if ${USE_OSS} != "no"
-+SRCS+= audio_dev_pcm.c
-+.else
-+CPPFLAGS+= -DNOOSS
-+.endif
-+
- .if ${USE_ARTS} != "no"
- ARTSLIB= -lartsc
- SRCS+= audio_dev_arts.c
diff --git a/audio/madman/DESCR b/audio/madman/DESCR
deleted file mode 100644
index 488f18cd47c..00000000000
--- a/audio/madman/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Madman administrates digitial music archives nicely: Madman is a powerful
-digital music cataloging tool that is capable of flexible querying, tagging
-and organizing huge amounts of digital music.
diff --git a/audio/madman/MESSAGE b/audio/madman/MESSAGE
deleted file mode 100644
index beccc4f79a3..00000000000
--- a/audio/madman/MESSAGE
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2004/08/27 00:05:19 wiz Exp $
-
-Madman currently uses a lot of memory while saving the database. If you
-have a large collection of audiofiles (several thousands) you might want to
-raise the datasize ulimit (200 MB is a good starting point)
-===========================================================================
diff --git a/audio/madman/Makefile b/audio/madman/Makefile
deleted file mode 100644
index c7afedb955c..00000000000
--- a/audio/madman/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2006/09/19 20:59:30 rillig Exp $
-
-DISTNAME= madman-0.93
-PKGREVISION= 7
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=madman/}
-
-MAINTAINER= ove@elektro-eel.org
-HOMEPAGE= http://madman.sourceforge.net/
-COMMENT= Powerful audio manager for large collections
-
-BUILD_DEPENDS+= scons>=0.96:../../devel/scons
-
-USE_LANGUAGES= c c++
-GCC_REQD+= 3.0
-
-REPLACE_SH+= plugins/*_*
-USE_TOOLS+= sh:run
-INSTALLATION_DIRS= bin
-
-post-extract:
- ${MV} ${WRKSRC}/httpd/make_webdata ${WRKSRC}/httpd/make_webdata.org
- ${SED} -e 's,#! /usr/bin/env python,#!${PYTHONBIN},' ${WRKSRC}/httpd/make_webdata.org > ${WRKSRC}/httpd/make_webdata
- ${CHMOD} 755 ${WRKSRC}/httpd/make_webdata
- ${MV} ${WRKSRC}/main/SConscript ${WRKSRC}/main/SConscript.org
- ${AWK} '{print} NR == 20 {print "myenv.Append(LINKFLAGS = \"${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -Wl,-R${X11BASE}/lib,-R${LOCALBASE}/lib,-R${QTDIR}/lib\")"}' ${WRKSRC}/main/SConscript.org > ${WRKSRC}/main/SConscript
-
-do-build:
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons -C ${WRKSRC} prefix=${PREFIX} \
- qt_directory=${QTDIR} add_c_include_dirs=${LOCALBASE}/include add_c_lib_dirs=${WRKDIR}/lib
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/main/madman ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/madman
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/madman/plugins
- for plugin in burn_to_audio_cd burn_to_data_cd export_m3u move_to_trash; do \
- ${INSTALL_DATA} -m0755 ${WRKSRC}/plugins/$$plugin ${PREFIX}/lib/madman/plugins; \
- done
-
-.include "../../x11/qt3-libs/buildlink3.mk"
-.include "../../x11/qt3-tools/buildlink3.mk"
-.include "../../devel/glib/buildlink3.mk"
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../lang/python/extension.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/madman/PLIST b/audio/madman/PLIST
deleted file mode 100644
index 5a21829824b..00000000000
--- a/audio/madman/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/08/27 00:05:19 wiz Exp $
-bin/madman
-lib/madman/plugins/burn_to_audio_cd
-lib/madman/plugins/burn_to_data_cd
-lib/madman/plugins/export_m3u
-lib/madman/plugins/move_to_trash
-@dirrm lib/madman/plugins
-@dirrm lib/madman
diff --git a/audio/madman/distinfo b/audio/madman/distinfo
deleted file mode 100644
index 311bfb3f81b..00000000000
--- a/audio/madman/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/05/31 10:25:19 joerg Exp $
-
-SHA1 (madman-0.93.tar.gz) = 61eac807b280d301c2bce574cd6c0781611530cd
-RMD160 (madman-0.93.tar.gz) = 699a5be1cf28e9e6374879713673334e2ec98fba
-Size (madman-0.93.tar.gz) = 548497 bytes
-SHA1 (patch-aa) = 0c10ac7f0fa21cb2b1bd458b46278acda17cf031
-SHA1 (patch-ab) = 056252fba05db0f75891181e6093dd3ab6bd5e16
-SHA1 (patch-ac) = 860d323c498b7d01fdf12fc766a50fbc0ceead4e
-SHA1 (patch-ad) = 0e55206095039c012b22053c95064ecbb271ceb3
-SHA1 (patch-ae) = d370197a5a7210bf7fc371365ca489dfca4a1a9e
-SHA1 (patch-af) = 820647180f3444163332ca37eb8408745accb46f
diff --git a/audio/madman/patches/patch-aa b/audio/madman/patches/patch-aa
deleted file mode 100644
index b088592502a..00000000000
--- a/audio/madman/patches/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/08/27 00:05:19 wiz Exp $
-
---- expatconfig.h.org 2004-07-29 17:16:48.000000000 +0200
-+++ expatconfig.h 2004-07-29 17:17:36.000000000 +0200
-@@ -69,16 +69,16 @@
- #define HAVE_STRING_H 1
-
- /* Define if you have strlcat */
--/* #undef HAVE_STRLCAT */
-+#define HAVE_STRLCAT
-
- /* Define if you have the strlcat prototype */
--/* #undef HAVE_STRLCAT_PROTO */
-+#define HAVE_STRLCAT_PROTO
-
- /* Define if you have strlcpy */
--/* #undef HAVE_STRLCPY */
-+#define HAVE_STRLCPY
-
- /* Define if you have the strlcpy prototype */
--/* #undef HAVE_STRLCPY_PROTO */
-+#define HAVE_STRLCPY_PROTO
-
- /* Define to 1 if you have the <sys/stat.h> header file. */
- #define HAVE_SYS_STAT_H 1
diff --git a/audio/madman/patches/patch-ab b/audio/madman/patches/patch-ab
deleted file mode 100644
index 93e27a1ed84..00000000000
--- a/audio/madman/patches/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/11/09 12:37:36 wiz Exp $
-
---- ui/auto_tag.cpp.orig 2004-11-08 19:22:02.000000000 +0100
-+++ ui/auto_tag.cpp 2004-11-08 19:22:23.000000000 +0100
-@@ -654,4 +654,4 @@
-
-
-
--#include "moc_auto_tag.cc"
-+#include "auto_tag.moc"
diff --git a/audio/madman/patches/patch-ac b/audio/madman/patches/patch-ac
deleted file mode 100644
index e13e6bfddb5..00000000000
--- a/audio/madman/patches/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/11/09 12:37:36 wiz Exp $
-
---- ui/prefs_dialog.cpp.orig 2004-11-08 19:22:13.000000000 +0100
-+++ ui/prefs_dialog.cpp 2004-11-08 19:22:36.000000000 +0100
-@@ -498,4 +498,4 @@
- return make_pair(false, false);
- }
-
--#include "moc_prefs_dialog.cc"
-+#include "prefs_dialog.moc"
diff --git a/audio/madman/patches/patch-ad b/audio/madman/patches/patch-ad
deleted file mode 100644
index 0186ca5ddfb..00000000000
--- a/audio/madman/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2006/05/31 10:25:19 joerg Exp $
-
---- SConstruct.orig 2004-05-20 14:03:14.000000000 +0000
-+++ SConstruct
-@@ -1,6 +1,8 @@
- import os
- import glob
-
-+SConsignFile()
-+
- opts = Options( "my_options.py")
-
- opts.Add("qt_directory", "Path to Qt directory", "not specified")
-@@ -112,7 +114,7 @@ def SplitLibs(lstring):
- def CheckForQtAt(context, qtdir):
- context.Message('Checking for Qt at %s... ' % qtdir)
- result = AttemptLinkWithVariables(context,
-- { "LIBS": "qt-mt", "LIBPATH": qtdir + '/lib', "CPPPATH": qtdir + '/include' },
-+ { "LIBS": "qt-mt", "LIBPATH": qtdir + '/lib', "CPPPATH": qtdir + '/include', "LINKFLAGS": os.environ.get("PTHREAD_LDFLAGS","").split() + os.environ.get("PTHREAD_LIBS", "").split()},
- """
- #include <qapplication.h>
- int main(int argc, char **argv) {
diff --git a/audio/madman/patches/patch-ae b/audio/madman/patches/patch-ae
deleted file mode 100644
index 35ebe81c92b..00000000000
--- a/audio/madman/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/01/05 23:21:47 wiz Exp $
-
---- designer/mainwin.ui.orig 2004-05-20 14:03:14.000000000 +0000
-+++ designer/mainwin.ui
-@@ -1039,9 +1039,4 @@
- <slot>fileExitAction_activated()</slot>
- </slots>
- <layoutdefaults spacing="6" margin="2"/>
--<includehints>
-- <includehint>tsonglistview.h</includehint>
-- <includehint>tsetlistview.h</includehint>
-- <includehint>tsonglistview.h</includehint>
--</includehints>
- </UI>
diff --git a/audio/madman/patches/patch-af b/audio/madman/patches/patch-af
deleted file mode 100644
index 0c08025b642..00000000000
--- a/audio/madman/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/05/31 10:25:19 joerg Exp $
-
---- utility/refcnt_ptr.h.orig 2006-05-31 10:09:27.000000000 +0000
-+++ utility/refcnt_ptr.h
-@@ -109,7 +109,7 @@ public:
- refcnt_ptr(const refcnt_ptr<T2>& rhs) throw()
- {
- object = rhs.object;
-- refcnt = rhs.refCnt;
-+ this->refcnt = rhs.refCnt;
- increaseCount();
- }
-
diff --git a/audio/madplay/DESCR b/audio/madplay/DESCR
deleted file mode 100644
index 9f054105053..00000000000
--- a/audio/madplay/DESCR
+++ /dev/null
@@ -1,24 +0,0 @@
-`madplay' is a command-line MPEG audio decoder and player based on the MAD
-library (libmad).
-
-After decoding, `madplay' sends the output to an audio output module. The
-following audio output modules are provided:
-
- - an Open Sound System interface module (for Linux, et al.)
- - a Sun audio interface module (for Solaris, NetBSD, et al.)
- - a Mac OS Carbon audio interface module (for Mac OS X)
- - a Win32 audio interface module (for Windows 95/98/NT/2000, et al.)
- - an ALSA audio interface module
- - a QNX audio interface module
- - an EsounD interface module
- - a CD audio output module (*.cdr, *.cda)
- - an Audio IFF output module (*.aif, *.aiff)
- - a Microsoft RIFF/WAVE file output module (*.wav)
- - a Sun/NeXT audio file output module (*.au, *.snd)
- - a raw PCM output module
- - a hex output module (for debugging and compliance testing)
- - a null module (for timing the decoder)
-
-`madplay' will also read and display ID3 tag information, and further
-supports the relative volume adjustment information (RVA2) in such tags,
-as written by tools like `normalize'.
diff --git a/audio/madplay/Makefile b/audio/madplay/Makefile
deleted file mode 100644
index 2556c1c11f0..00000000000
--- a/audio/madplay/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.30 2006/04/13 18:23:29 jlam Exp $
-#
-
-DISTNAME= madplay-0.15.2b
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mad/} \
- ftp://ftp.mars.org/pub/mpeg/
-
-MAINTAINER= simonb@NetBSD.org
-HOMEPAGE= http://sourceforge.net/projects/mad/
-COMMENT= High-quality MPEG audio decoder
-
-USE_PKGLOCALEDIR= YES
-GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
-USE_TOOLS+= msgfmt
-
-# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE:Q}
-
-.include "options.mk"
-
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/madplay/PLIST b/audio/madplay/PLIST
deleted file mode 100644
index 7b065095fb3..00000000000
--- a/audio/madplay/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/04/17 07:07:12 jlam Exp $
-bin/abxtest
-bin/madplay
-man/man1/abxtest.1
-man/man1/madplay.1
-share/locale/en/LC_MESSAGES/madplay.mo
-share/locale/es/LC_MESSAGES/madplay.mo
-share/locale/fr/LC_MESSAGES/madplay.mo
-share/locale/hr/LC_MESSAGES/madplay.mo
-share/locale/no/LC_MESSAGES/madplay.mo
diff --git a/audio/madplay/distinfo b/audio/madplay/distinfo
deleted file mode 100644
index 77fc378bfba..00000000000
--- a/audio/madplay/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 20:39:48 agc Exp $
-
-SHA1 (madplay-0.15.2b.tar.gz) = 29105eb27c1416aa33c8d1ab3404a8e5f0aecd3f
-RMD160 (madplay-0.15.2b.tar.gz) = 0d3dc164891be5e4f37ce83364f6a40e8049dd3e
-Size (madplay-0.15.2b.tar.gz) = 590929 bytes
-SHA1 (patch-aa) = 0dd6ee05f9b0d58a88fe9b61f52bf847227c51a6
-SHA1 (patch-ab) = 7af616781aa695e6be2c4a4cae23dafc5d056c4f
diff --git a/audio/madplay/options.mk b/audio/madplay/options.mk
deleted file mode 100644
index 282d99befe7..00000000000
--- a/audio/madplay/options.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: options.mk,v 1.3 2007/02/22 19:26:06 wiz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.madplay
-PKG_SUPPORTED_OPTIONS= esound oss
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mesound)
-.include "../../audio/esound/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --without-esd
-.endif
-
-.if !empty(PKG_OPTIONS:Moss)
-.include "../../mk/oss.buildlink3.mk"
-.endif
diff --git a/audio/madplay/patches/patch-aa b/audio/madplay/patches/patch-aa
deleted file mode 100644
index 7a1d663a93b..00000000000
--- a/audio/madplay/patches/patch-aa
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2004/03/01 15:56:58 adam Exp $
-
---- configure.orig 2004-02-23 21:36:21.000000000 +0000
-+++ configure
-@@ -19037,33 +19037,6 @@ fi
- while test $# -gt 0
- do
- case "$1" in
-- -Wall)
-- if test "$GCC" = yes
-- then
-- :
-- else
-- CFLAGS="$CFLAGS $1"
-- fi
-- shift
-- ;;
-- -g)
-- debug="-g"
-- shift
-- ;;
-- -mno-cygwin)
-- shift
-- ;;
-- -m*)
-- arch="$arch $1"
-- shift
-- ;;
-- -fomit-frame-pointer)
-- shift
-- ;;
-- -O*|-f*)
-- optimize="$1"
-- shift
-- ;;
- *)
- CFLAGS="$CFLAGS $1"
- shift
diff --git a/audio/madplay/patches/patch-ab b/audio/madplay/patches/patch-ab
deleted file mode 100644
index d61907d449f..00000000000
--- a/audio/madplay/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2004/06/12 01:37:39 grant Exp $
-
---- audio.c.orig 2004-01-23 20:41:31.000000000 +1100
-+++ audio.c
-@@ -959,7 +959,7 @@ unsigned int audio_pcm_s32be(unsigned ch
- }
- }
-
--static
-+static inline
- unsigned char linear2mulaw(mad_fixed_t sample)
- {
- unsigned int sign, mulaw;
-@@ -1000,7 +1000,7 @@ unsigned char linear2mulaw(mad_fixed_t s
- return mulaw;
- }
-
--static
-+static inline
- mad_fixed_t mulaw2linear(unsigned char mulaw)
- {
- int sign, segment, mantissa, value;
diff --git a/audio/malint/DESCR b/audio/malint/DESCR
deleted file mode 100644
index a235019bc3c..00000000000
--- a/audio/malint/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
- This is malint, an MPEG Audio stream validator.
-
- It parses an MPEG audio stream and prints information about the
-stream and format violations it finds.
-
- Many of the checks (and information outputs) can be enabled or
-disabled via command line switches.
diff --git a/audio/malint/Makefile b/audio/malint/Makefile
deleted file mode 100644
index 885a2f361cd..00000000000
--- a/audio/malint/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:44:54 tv Exp $
-#
-
-DISTNAME= malint-0.2
-CATEGORIES= audio
-MASTER_SITES= http://www.nih.at/malint/
-
-MAINTAINER= dillo@NetBSD.org
-HOMEPAGE= http://www.nih.at/malint/
-COMMENT= MPEG audio stream validator
-
-GNU_CONFIGURE= yes
-TEST_TARGET= check
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/malint/PLIST b/audio/malint/PLIST
deleted file mode 100644
index f2ae84c58aa..00000000000
--- a/audio/malint/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/08/15 01:55:11 wiz Exp $
-bin/malint
diff --git a/audio/malint/distinfo b/audio/malint/distinfo
deleted file mode 100644
index 767efd0c717..00000000000
--- a/audio/malint/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:48 agc Exp $
-
-SHA1 (malint-0.2.tar.gz) = 6aa79cfcaef0764727f87b3ef9c64644f8458dae
-RMD160 (malint-0.2.tar.gz) = 9f9b5176dce068d2151ec9513a3291ed99b15988
-Size (malint-0.2.tar.gz) = 100607 bytes
diff --git a/audio/maplay/DESCR b/audio/maplay/DESCR
deleted file mode 100644
index ba102005b97..00000000000
--- a/audio/maplay/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-maplay version 1.2 is the second release of my MPEG audio
-player/decoder. It decodes layer I and layer II MPEG audio streams
-and plays them using a CD-quality audio device.
-
-The player supports all modes, which are single channel, stereo, joint
-stereo and dual channel, and all bitrates except free mode. The
-missing free mode support should not be a problem for now, because I
-haven't seen such a stream yet.
-
-Besides realtime playing of audio streams, maplay can decode streams
-to stdout for further conversions. The output consists of 16 bit
-signed PCM values. For stereo streams, the values are interleaved,
-which means that a value for the left channel is followed by a value
-for the right channel and so on. If maplay has been compiled for u-law
-output, the output consists of 8 bit u-law samples at a rate of 8 kHz,
-no matter what frequency the stream uses.
diff --git a/audio/maplay/Makefile b/audio/maplay/Makefile
deleted file mode 100644
index 5acc15776c5..00000000000
--- a/audio/maplay/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2007/02/22 19:30:03 wiz Exp $
-
-DISTNAME= maplay1_2
-PKGNAME= maplay-1.2
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.cs.tu-berlin.de/pub/misc/maplay1.2/
-EXTRACT_SUFX= .tar
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= MPEG audio player/decoder for layer I and II MPEG audio streams
-
-WRKSRC= ${WRKDIR}
-
-USE_LANGUAGES= c++
-NOT_FOR_PLATFORM= Interix-*-*
-
-pre-configure:
- cd ${WRKSRC} && ${MAKE} pre-install
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/maplay/PLIST b/audio/maplay/PLIST
deleted file mode 100644
index 956f99863ba..00000000000
--- a/audio/maplay/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:16 zuntum Exp $
-bin/maplay
diff --git a/audio/maplay/distinfo b/audio/maplay/distinfo
deleted file mode 100644
index 7e6a105bc86..00000000000
--- a/audio/maplay/distinfo
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/12/11 22:17:37 joerg Exp $
-
-SHA1 (maplay1_2.tar) = faeac51cfbf011956a17721e2077d0ed11f8d8dd
-RMD160 (maplay1_2.tar) = bc016d4cc8f356d9c2c0a90d4afde5e67c45ba14
-Size (maplay1_2.tar) = 286720 bytes
-SHA1 (patch-aa) = 12dfda39d9c451b4ba197aab637f234cbd255649
-SHA1 (patch-ab) = 92582f6a9b87ca4c61aaf42a1d03349b455997dc
-SHA1 (patch-ac) = 53abb9ca8231cf48c0900fb286c39de768345831
-SHA1 (patch-ad) = 389c418dac740b6959b441439cc4660ed28daee0
-SHA1 (patch-ae) = 4579d1dc9dbae73c0d33f0fc5fe038733640bcef
-SHA1 (patch-af) = 843b8fad21e2feeee07feb3292a34456f88c639f
-SHA1 (patch-ag) = 582bec6631acd1478dacc19feba60e4bed9062ab
-SHA1 (patch-ah) = fa050751a8d88ad247c024ad20a575a03e67e298
-SHA1 (patch-ai) = 2d7cc43f33db4f60549e2be27f388b92c7b0b4a8
-SHA1 (patch-aj) = 9b44b0e3b85adfe24419d8fa4dac9253fbf9c36d
-SHA1 (patch-ak) = 3edf1fb29f243eb5e0507f57fee2e200e9214045
-SHA1 (patch-al) = a59b2f93c01dd9ca83ebd655b63ce0b8327eaa3c
-SHA1 (patch-am) = f517221b15e69e20af1a3868e04870448490a841
-SHA1 (patch-an) = 392078e383d68c290c049e9524904ee6b2010a93
-SHA1 (patch-ao) = 742110dd6e021f86cca5f57634c78d19dd08fb9f
diff --git a/audio/maplay/patches/patch-aa b/audio/maplay/patches/patch-aa
deleted file mode 100644
index 523a6bb8400..00000000000
--- a/audio/maplay/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/06/27 15:52:12 agc Exp $
-
---- Makefile 2002/06/27 15:41:29 1.1
-+++ Makefile 2002/06/27 15:41:40
-@@ -39,7 +39,7 @@
-
- .SUFFIXES: .cc
-
--install:
-+pre-install:
- @./configuration.sh
-
- all: maplay
-@@ -47,6 +47,9 @@
- maplay: $(OBJS)
- $(COMPILER) $(CFLAGS) $(OBJS) -o $@ $(LIBRARIES) -lm
- -strip $@
-+
-+install: all
-+ ${INSTALL} -s -c -m 755 maplay ${PREFIX}/bin
-
- .cc.o:
- $(COMPILER) -c $(CFLAGS) $(INCLUDEDIRS) $*.cc -o $@
diff --git a/audio/maplay/patches/patch-ab b/audio/maplay/patches/patch-ab
deleted file mode 100644
index fe6e6236cd6..00000000000
--- a/audio/maplay/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2002/06/27 15:52:13 agc Exp $
-
---- all.h 2002/06/27 15:41:04 1.1
-+++ all.h 2002/06/27 15:41:40
-@@ -22,7 +22,7 @@
- #define ALL_H
-
- typedef float real; // float should be enough
--typedef short bool;
-+typedef short boolean;
- typedef unsigned uint32; // 32 Bit unsigned integer
- // some compilers may need "typedef unsigned long uint32" instead
- typedef int int32; // 32 Bit signed integer
diff --git a/audio/maplay/patches/patch-ac b/audio/maplay/patches/patch-ac
deleted file mode 100644
index 49f7d4d0560..00000000000
--- a/audio/maplay/patches/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2005/12/11 22:17:37 joerg Exp $
-
---- configuration.sh.orig 1994-06-23 12:14:46.000000000 +0000
-+++ configuration.sh
-@@ -72,6 +72,18 @@ case `uname -sr` in
- INCLUDEDIRS=
- LIBRARIES=
- AUDIO_INCLUDES='#include <sys/audioio.h>' ;;
-+ NetBSD*)
-+ COMPILER=g++
-+ COMPILERFLAGS='-O2 -DNETBSD'
-+ INCLUDEDIRS=
-+ LIBRARIES=
-+ AUDIO_INCLUDES='#include <sys/audioio.h>' ;;
-+ FreeBSD*|DragonFly*)
-+ COMPILER=g++
-+ COMPILERFLAGS='-O2 -m486 -DLINUX -DDAMN_INTEL_BYTE_ORDER'
-+ INCLUDEDIRS=
-+ LIBRARIES=
-+ AUDIO_INCLUDES='#include <machine/soundcard.h>' ;;
- Linux*)
- COMPILER=g++
- COMPILERFLAGS='-O2 -m486 -funroll-loops -DLINUX -DDAMN_INTEL_BYTE_ORDER'
diff --git a/audio/maplay/patches/patch-ad b/audio/maplay/patches/patch-ad
deleted file mode 100644
index 347b3bd8269..00000000000
--- a/audio/maplay/patches/patch-ad
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2002/06/27 15:52:14 agc Exp $
-
---- header.cc 2002/06/27 15:41:04 1.1
-+++ header.cc 2002/06/27 15:44:28
-@@ -36,7 +36,7 @@
- const uint32 Header::frequencies[3] = { 44100, 48000, 32000 };
-
-
--bool Header::read_header (Ibitstream *stream, Crc16 **crcp)
-+boolean Header::read_header (Ibitstream *stream, Crc16 **crcp)
- {
- uint32 headerstring;
-
-@@ -48,8 +48,8 @@
- cerr << "invalid syncword 0x";
- cerr.width (8);
- cerr.fill ('0');
-- cerr << hex << headerstring
-- << " found at fileoffset " << dec
-+ cerr << headerstring
-+ << " found at fileoffset "
- << lseek (stream->filedescriptor (), 0, SEEK_CUR) - 4 << '\n';
- return False;
- }
-@@ -161,7 +161,7 @@
- static const int32 bitrates_layer_2[15] = {
- 0 /*free format*/, 32000, 48000, 56000, 64000, 80000, 96000,
- 112000, 128000, 160000, 192000, 224000, 256000, 320000, 384000 };
-- static const samplefrequencies[3] = { 44100, 48000, 32000 };
-+ static const int32 samplefrequencies[3] = { 44100, 48000, 32000 };
- uint32 framesize;
-
- if (h_layer == 1)
diff --git a/audio/maplay/patches/patch-ae b/audio/maplay/patches/patch-ae
deleted file mode 100644
index 074accdf46a..00000000000
--- a/audio/maplay/patches/patch-ae
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2002/06/27 15:52:15 agc Exp $
-
---- header.h 2002/06/27 15:41:04 1.1
-+++ header.h 2002/06/27 15:41:40
-@@ -39,7 +39,7 @@
- e_mode h_mode;
- e_sample_frequency h_sample_frequency;
- uint32 h_number_of_subbands, h_intensity_stereo_bound;
-- bool h_copyright, h_original;
-+ boolean h_copyright, h_original;
- Crc16 *crc;
- uint16 checksum;
-
-@@ -48,7 +48,7 @@
- public:
- Header (void) { crc = (Crc16 *)0; }
- ~Header (void) { if (crc) delete crc; }
-- bool read_header (Ibitstream *, Crc16 **);
-+ boolean read_header (Ibitstream *, Crc16 **);
- // read a 32-bit header from the bitstream
-
- // functions to query header contents:
-@@ -58,11 +58,11 @@
- uint32 frequency (void) { return frequencies[h_sample_frequency]; }
- static uint32 frequency (e_sample_frequency rate) { return frequencies[rate]; }
- e_mode mode (void) { return h_mode; };
-- bool checksums (void) { return !h_protection_bit; }
-- bool copyright (void) { return h_copyright; }
-- bool original (void) { return h_original; }
-+ boolean checksums (void) { return !h_protection_bit; }
-+ boolean copyright (void) { return h_copyright; }
-+ boolean original (void) { return h_original; }
-
-- bool checksum_ok (void) { return checksum == crc->checksum (); }
-+ boolean checksum_ok (void) { return checksum == crc->checksum (); }
- // compares computed checksum with stream checksum
-
- // functions which return header informations as strings:
diff --git a/audio/maplay/patches/patch-af b/audio/maplay/patches/patch-af
deleted file mode 100644
index 214365f126b..00000000000
--- a/audio/maplay/patches/patch-af
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-af,v 1.1 2002/06/27 15:52:16 agc Exp $
-
---- ibitstream.cc 2002/06/27 15:41:04 1.1
-+++ ibitstream.cc 2002/06/27 15:41:40
-@@ -33,6 +33,12 @@
- #include "all.h"
- #include "ibitstream.h"
-
-+#ifdef NETBSD
-+#include <machine/endian.h>
-+#if BYTE_ORDER == LITTLE_ENDIAN
-+#define DAMN_INTEL_BYTE_ORDER
-+#endif
-+#endif
-
- #define swap_int32(int_32) (((int_32) << 24) | (((int_32) << 8) & 0x00ff0000) | \
- (((int_32) >> 8) & 0x0000ff00) | ((int_32) >> 24))
-@@ -64,7 +70,7 @@
- }
-
-
--bool Ibitstream::get_header (uint32 *headerstring)
-+boolean Ibitstream::get_header (uint32 *headerstring)
- {
- int readvalue;
-
-@@ -102,7 +108,7 @@
- }
-
-
--bool Ibitstream::read_frame (uint32 bytesize)
-+boolean Ibitstream::read_frame (uint32 bytesize)
- {
- int readvalue;
-
diff --git a/audio/maplay/patches/patch-ag b/audio/maplay/patches/patch-ag
deleted file mode 100644
index 7dcf759c2e4..00000000000
--- a/audio/maplay/patches/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2002/06/27 15:52:17 agc Exp $
-
---- ibitstream.h 2002/06/27 15:41:04 1.1
-+++ ibitstream.h 2002/06/27 15:41:40
-@@ -43,10 +43,10 @@
- ~Ibitstream (void);
- int filedescriptor (void) { return fd; };
-
-- bool get_header (uint32 *);
-+ boolean get_header (uint32 *);
- // get next 32 bits from bitstream in an unsigned int,
- // returned value False => end of stream
-- bool read_frame (uint32 bytesize);
-+ boolean read_frame (uint32 bytesize);
- // fill buffer with data from bitstream, returned value False => end of stream
- uint32 get_bits (uint32 number_of_bits);
- // read bits (1 <= number_of_bits <= 16) from buffer into the lower bits
diff --git a/audio/maplay/patches/patch-ah b/audio/maplay/patches/patch-ah
deleted file mode 100644
index 8dc89c3ca30..00000000000
--- a/audio/maplay/patches/patch-ah
+++ /dev/null
@@ -1,99 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2004/01/18 13:59:25 mrauch Exp $
-
---- maplay.cc.orig 1994-06-23 14:14:36.000000000 +0200
-+++ maplay.cc
-@@ -54,14 +54,14 @@
-
- // data extracted from commandline arguments:
- static char *filename;
--static bool verbose_mode = False, filter_check = False;
--static bool stdout_mode = False;
-+static boolean verbose_mode = False, filter_check = False;
-+static boolean stdout_mode = False;
- static enum e_channels which_channels = both;
--static bool use_speaker = False, use_headphone = False, use_line_out = False;
-+static boolean use_speaker = False, use_headphone = False, use_line_out = False;
- #ifdef ULAW
--static bool force_amd = False;
-+static boolean force_amd = False;
- #endif
--static bool use_own_scalefactor = False;
-+static boolean use_own_scalefactor = False;
- static real scalefactor;
-
- // data extracted from header of first frame:
-@@ -93,7 +93,7 @@ static void Exit (int returncode)
- main (int argc, char *argv[])
- {
- int i;
-- bool read_ready = False, write_ready = False;
-+ boolean read_ready = False, write_ready = False;
-
- if (argc < 2 || !strncmp (argv[1], "-h", 2))
- {
-@@ -146,6 +146,9 @@ usage:
- #ifdef Solaris
- "SPARC Solaris 2.x"
- #else
-+#ifdef __FreeBSD__
-+ "FreeBSD"
-+#else
- #ifdef LINUX
- "Linux"
- #else
-@@ -159,6 +162,7 @@ usage:
- #endif
- #endif
- #endif
-+#endif
- " version)\n"
- "@(#) Copyright (C) 1993, 1994 Tobias Bading (bading@cs.tu-berlin.de)\n"
- "@(#) Berlin University of Technology\n"
-@@ -180,10 +184,10 @@ usage:
- stdout_mode = True;
- break;
- case 'l':
-- which_channels = left;
-+ which_channels = maplay_left;
- break;
- case 'r':
-- which_channels = right;
-+ which_channels = maplay_right;
- break;
- #ifdef SPARC
- case 'u':
-@@ -250,7 +254,7 @@ usage:
- // get info from header of first frame:
- layer = header->layer ();
- if ((mode = header->mode ()) == single_channel)
-- which_channels = left;
-+ which_channels = maplay_left;
- sample_frequency = header->sample_frequency ();
-
- // create filter(s):
-@@ -319,6 +323,17 @@ usage:
- Exit (0);
- }
- #else
-+#ifdef NETBSD
-+ {
-+ if (NetBSDObuffer::class_suitable (mode == single_channel || which_channels != both) ? 1 : 2)
-+ if (mode == single_channel || which_channels != both)
-+ buffer = new NetBSDObuffer (1, header);
-+ else
-+ buffer = new NetBSDObuffer (2, header);
-+ else
-+ Exit (0);
-+ }
-+#else
- //#ifdef your_machine
- // {
- // if (mode == single_channel || which_channels != both)
-@@ -333,6 +348,7 @@ usage:
- Exit (0);
- }
- //#endif // !your_machine
-+#endif // !NETBSD
- #endif // !LINUX
- #endif // !SPARC
- #endif // !Indigo
diff --git a/audio/maplay/patches/patch-ai b/audio/maplay/patches/patch-ai
deleted file mode 100644
index f013e2a2b2f..00000000000
--- a/audio/maplay/patches/patch-ai
+++ /dev/null
@@ -1,177 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2002/06/27 15:52:19 agc Exp $
-
---- obuffer.cc 2002/06/27 15:41:04 1.1
-+++ obuffer.cc 2002/06/27 15:41:40
-@@ -217,10 +217,10 @@
- int SparcObuffer::audio_fd = -1;
-
- #ifdef ULAW
--SparcObuffer::SparcObuffer (Header *header, bool use_speaker, bool use_headphone, bool use_line_out)
-+SparcObuffer::SparcObuffer (Header *header, boolean use_speaker, boolean use_headphone, boolean use_line_out)
- #else
- SparcObuffer::SparcObuffer (uint32 number_of_channels, Header *header,
-- bool use_speaker, bool use_headphone, bool use_line_out)
-+ boolean use_speaker, boolean use_headphone, boolean use_line_out)
- #endif
- {
- #ifndef ULAW
-@@ -406,9 +406,9 @@
-
-
- #ifdef ULAW
--bool SparcObuffer::class_suitable (uint32 number_of_channels, bool force_amd)
-+boolean SparcObuffer::class_suitable (uint32 number_of_channels, boolean force_amd)
- #else
--bool SparcObuffer::class_suitable (void)
-+boolean SparcObuffer::class_suitable (void)
- #endif
- {
- #ifdef ULAW
-@@ -537,6 +537,7 @@
- }
-
- // turn NDELAY mode off:
-+#ifndef __FreeBSD__ /* Our /dev/audio doesn't like non-blocking I/O */
- int flags;
- if ((flags = fcntl (fd, F_GETFL, 0)) < 0)
- {
-@@ -549,6 +550,7 @@
- perror ("fcntl F_SETFL on /dev/audio failed");
- exit (1);
- }
-+#endif
- return fd;
- }
-
-@@ -629,7 +631,7 @@
- }
-
-
--bool LinuxObuffer::class_suitable (uint32 number_of_channels)
-+boolean LinuxObuffer::class_suitable (uint32 number_of_channels)
- {
- // open the dsp audio device:
- audio_fd = open_audio_device ();
-@@ -637,3 +639,122 @@
- }
-
- #endif /* LINUX */
-+
-+#ifdef NETBSD
-+int NetBSDObuffer::audio_fd = -1;
-+
-+int NetBSDObuffer::open_audio_device (void)
-+{
-+ int fd;
-+
-+ if ((fd = open ("/dev/audio", O_WRONLY | O_NDELAY, 0)) < 0)
-+ if (errno == EBUSY)
-+ {
-+ cerr << "Sorry, the audio device is busy!\n";
-+ exit (1);
-+ }
-+ else
-+ {
-+ perror ("can't open /dev/audio for writing");
-+ exit (1);
-+ }
-+
-+ int flags;
-+ if ((flags = fcntl (fd, F_GETFL, 0)) < 0)
-+ {
-+ perror ("fcntl F_GETFL on /dev/audio failed");
-+ exit (1);
-+ }
-+ flags &= ~O_NDELAY;
-+ if (fcntl (fd, F_SETFL, flags) < 0)
-+ {
-+ perror ("fcntl F_SETFL on /dev/audio failed");
-+ exit (1);
-+ }
-+ return fd;
-+}
-+
-+
-+NetBSDObuffer::NetBSDObuffer (uint32 number_of_channels, Header *header)
-+{
-+#ifdef DEBUG
-+ if (!number_of_channels || number_of_channels > MAXCHANNELS)
-+ {
-+ cerr << "NetBSDObuffer: 0 < number of channels < " << MAXCHANNELS << "!\n";
-+ exit (1);
-+ }
-+#endif
-+ channels = number_of_channels;
-+ for (int i = 0; i < number_of_channels; ++i)
-+ bufferp[i] = buffer + i;
-+
-+ if (audio_fd < 0)
-+ {
-+ cerr << "Internal error, NetBSDObuffer::audio_fd has to be initialized\n"
-+ "by NetBSDObuffer::class_suitable()!\n";
-+ exit (1);
-+ }
-+
-+ audio_info info;
-+ AUDIO_INITINFO(&info);
-+
-+ // configure the device:
-+ info.play.encoding = AUDIO_ENCODING_SLINEAR;
-+ info.play.precision = 16;
-+ info.play.channels = channels;
-+ info.play.sample_rate = header->frequency ();
-+
-+ if (ioctl (audio_fd, AUDIO_SETINFO, &info))
-+ {
-+ perror ("configuration of /dev/audio failed");
-+ exit (1);
-+ }
-+}
-+
-+
-+NetBSDObuffer::~NetBSDObuffer (void)
-+{
-+ close (audio_fd);
-+}
-+
-+
-+void NetBSDObuffer::append (uint32 channel, int16 value)
-+{
-+#ifdef DEBUG
-+ if (channel >= channels)
-+ {
-+ cerr << "illegal channelnumber in NetBSDObuffer::append()!\n";
-+ exit (1);
-+ }
-+ if (bufferp[channel] - buffer >= OBUFFERSIZE)
-+ {
-+ cerr << "buffer overflow!\n";
-+ exit (1);
-+ }
-+#endif
-+ *bufferp[channel] = value;
-+ bufferp[channel] += channels;
-+}
-+
-+
-+void NetBSDObuffer::write_buffer (int)
-+{
-+ int length = (int)((char *)bufferp[0] - (char *)buffer);
-+ if (write (audio_fd, buffer, length) != length)
-+ {
-+ perror ("write to /dev/audio failed");
-+ exit (1);
-+ }
-+ for (int i = 0; i < channels; ++i)
-+ bufferp[i] = buffer + i;
-+}
-+
-+
-+boolean NetBSDObuffer::class_suitable (uint32 number_of_channels)
-+{
-+ // open the dsp audio device:
-+ audio_fd = open_audio_device ();
-+ return True;
-+}
-+
-+#endif /* NETBSD */
diff --git a/audio/maplay/patches/patch-aj b/audio/maplay/patches/patch-aj
deleted file mode 100644
index cf9d0731cda..00000000000
--- a/audio/maplay/patches/patch-aj
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2002/06/27 15:52:19 agc Exp $
-
---- obuffer.h 2002/06/27 15:41:04 1.1
-+++ obuffer.h 2002/06/27 15:41:40
-@@ -123,20 +123,20 @@
-
- public:
- #ifdef ULAW
-- SparcObuffer (Header *, bool use_speaker, bool use_headphone, bool use_line_out);
-+ SparcObuffer (Header *, boolean use_speaker, boolean use_headphone, boolean use_line_out);
- #else
- SparcObuffer (uint32 number_of_channels, Header *,
-- bool use_speaker, bool use_headphone, bool use_line_out);
-+ boolean use_speaker, boolean use_headphone, boolean use_line_out);
- #endif
- ~SparcObuffer (void);
- void append (uint32 channel, int16 value);
- void write_buffer (int dummy);
-
- #ifdef ULAW
-- static bool class_suitable (uint32 number_of_channels, bool force_amd);
-+ static boolean class_suitable (uint32 number_of_channels, boolean force_amd);
- // returnvalue == False: no u-law output possible (class unsuitable)
- #else
-- static bool class_suitable (void);
-+ static boolean class_suitable (void);
- // returnvalue == False: no 16-bit output possible (class unsuitable)
- #endif
- };
-@@ -159,7 +159,27 @@
- void append (uint32 channel, int16 value);
- void write_buffer (int dummy);
-
-- static bool class_suitable (uint32 number_of_channels);
-+ static boolean class_suitable (uint32 number_of_channels);
-+};
-+#endif // LINUX
-+
-+#ifdef NETBSD
-+class NetBSDObuffer : public Obuffer
-+{
-+ int16 buffer[OBUFFERSIZE];
-+ int16 *bufferp[MAXCHANNELS];
-+ uint32 channels;
-+ static int audio_fd;
-+
-+ static int open_audio_device (void);
-+
-+public:
-+ NetBSDObuffer (uint32 number_of_channels, Header *);
-+ ~NetBSDObuffer (void);
-+ void append (uint32 channel, int16 value);
-+ void write_buffer (int dummy);
-+
-+ static boolean class_suitable (uint32 number_of_channels);
- };
- #endif // LINUX
-
diff --git a/audio/maplay/patches/patch-ak b/audio/maplay/patches/patch-ak
deleted file mode 100644
index 2893a8ce579..00000000000
--- a/audio/maplay/patches/patch-ak
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2004/01/18 13:59:25 mrauch Exp $
-
---- subband.h.orig 1994-06-23 14:14:40.000000000 +0200
-+++ subband.h
-@@ -27,7 +27,7 @@
- #include "synthesis_filter.h"
- #include "crc.h"
-
--enum e_channels { both, left, right };
-+enum e_channels { both, maplay_left, maplay_right };
-
- // abstract base class for subband classes of layer I and II:
- class Subband
-@@ -35,8 +35,8 @@ class Subband
- public:
- virtual void read_allocation (Ibitstream *, Header *, Crc16 *) = 0;
- virtual void read_scalefactor (Ibitstream *, Header *) = 0;
-- virtual bool read_sampledata (Ibitstream *) = 0;
-- virtual bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *) = 0;
-+ virtual boolean read_sampledata (Ibitstream *) = 0;
-+ virtual boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *) = 0;
- };
-
- #endif
diff --git a/audio/maplay/patches/patch-al b/audio/maplay/patches/patch-al
deleted file mode 100644
index 34f2afa2e46..00000000000
--- a/audio/maplay/patches/patch-al
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-al,v 1.2 2004/01/18 13:59:25 mrauch Exp $
-
---- subband_layer_1.cc.orig 1994-06-23 14:14:36.000000000 +0200
-+++ subband_layer_1.cc
-@@ -86,7 +86,7 @@ void SubbandLayer1::read_scalefactor (Ib
- }
-
-
--bool SubbandLayer1::read_sampledata (Ibitstream *stream)
-+boolean SubbandLayer1::read_sampledata (Ibitstream *stream)
- {
- if (allocation)
- {
-@@ -105,10 +105,10 @@ bool SubbandLayer1::read_sampledata (Ibi
- }
-
-
--bool SubbandLayer1::put_next_sample (e_channels channels,
-+boolean SubbandLayer1::put_next_sample (e_channels channels,
- SynthesisFilter *filter1, SynthesisFilter *)
- {
-- if (allocation && channels != right)
-+ if (allocation && channels != maplay_right)
- {
- register real scaled_sample = (sample * factor + offset) * scalefactor;
- #ifdef DEBUG
-@@ -142,7 +142,7 @@ void SubbandLayer1IntensityStereo::read_
- }
-
-
--bool SubbandLayer1IntensityStereo::put_next_sample (e_channels channels,
-+boolean SubbandLayer1IntensityStereo::put_next_sample (e_channels channels,
- SynthesisFilter *filter1, SynthesisFilter *filter2)
- {
- if (allocation)
-@@ -160,7 +160,7 @@ bool SubbandLayer1IntensityStereo::put_n
- filter1->input_sample (sample1, subbandnumber);
- filter2->input_sample (sample2, subbandnumber);
- }
-- else if (channels == left)
-+ else if (channels == maplay_left)
- {
- register real sample1 = sample * scalefactor;
- #ifdef DEBUG
-@@ -231,9 +231,9 @@ void SubbandLayer1Stereo::read_scalefact
- }
-
-
--bool SubbandLayer1Stereo::read_sampledata (Ibitstream *stream)
-+boolean SubbandLayer1Stereo::read_sampledata (Ibitstream *stream)
- {
-- bool returnvalue = SubbandLayer1::read_sampledata (stream);
-+ boolean returnvalue = SubbandLayer1::read_sampledata (stream);
- if (channel2_allocation)
- {
- channel2_sample = real (stream->get_bits (channel2_samplelength));
-@@ -246,11 +246,11 @@ bool SubbandLayer1Stereo::read_sampledat
- }
-
-
--bool SubbandLayer1Stereo::put_next_sample (e_channels channels,
-+boolean SubbandLayer1Stereo::put_next_sample (e_channels channels,
- SynthesisFilter *filter1, SynthesisFilter *filter2)
- {
- SubbandLayer1::put_next_sample (channels, filter1, filter2);
-- if (channel2_allocation && channels != left)
-+ if (channel2_allocation && channels != maplay_left)
- {
- register float sample2 = (channel2_sample * channel2_factor + channel2_offset) *
- channel2_scalefactor;
diff --git a/audio/maplay/patches/patch-am b/audio/maplay/patches/patch-am
deleted file mode 100644
index 5232529bb87..00000000000
--- a/audio/maplay/patches/patch-am
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-am,v 1.1 2002/06/27 15:52:22 agc Exp $
-
---- subband_layer_1.h 2002/06/27 15:41:04 1.1
-+++ subband_layer_1.h 2002/06/27 15:41:40
-@@ -42,8 +42,8 @@
- SubbandLayer1 (uint32 subbandnumber);
- void read_allocation (Ibitstream *, Header *, Crc16 *);
- void read_scalefactor (Ibitstream *, Header *);
-- bool read_sampledata (Ibitstream *);
-- bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *);
-+ boolean read_sampledata (Ibitstream *);
-+ boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *);
- };
-
-
-@@ -60,11 +60,11 @@
- SubbandLayer1::read_allocation (stream, header, crc);
- }
- void read_scalefactor (Ibitstream *, Header *);
-- bool read_sampledata (Ibitstream *stream)
-+ boolean read_sampledata (Ibitstream *stream)
- {
- return SubbandLayer1::read_sampledata (stream);
- }
-- bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *);
-+ boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *);
- };
-
-
-@@ -82,8 +82,8 @@
- SubbandLayer1Stereo (uint32 subbandnumber);
- void read_allocation (Ibitstream *, Header *, Crc16 *);
- void read_scalefactor (Ibitstream *, Header *);
-- bool read_sampledata (Ibitstream *);
-- bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *);
-+ boolean read_sampledata (Ibitstream *);
-+ boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *);
- };
-
- #endif
diff --git a/audio/maplay/patches/patch-an b/audio/maplay/patches/patch-an
deleted file mode 100644
index f280c7a7911..00000000000
--- a/audio/maplay/patches/patch-an
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-an,v 1.2 2004/01/18 13:59:25 mrauch Exp $
-
---- subband_layer_2.cc.orig 1994-06-23 14:14:36.000000000 +0200
-+++ subband_layer_2.cc
-@@ -591,7 +591,7 @@ void SubbandLayer2::read_scalefactor (Ib
- }
-
-
--bool SubbandLayer2::read_sampledata (Ibitstream *stream)
-+boolean SubbandLayer2::read_sampledata (Ibitstream *stream)
- {
- if (allocation)
- if (groupingtable)
-@@ -633,7 +633,7 @@ bool SubbandLayer2::read_sampledata (Ibi
- }
-
-
--bool SubbandLayer2::put_next_sample (e_channels channels,
-+boolean SubbandLayer2::put_next_sample (e_channels channels,
- SynthesisFilter *filter1, SynthesisFilter *)
- {
- #ifdef DEBUG
-@@ -644,7 +644,7 @@ bool SubbandLayer2::put_next_sample (e_c
- exit (1);
- }
- #endif
-- if (allocation && channels != right)
-+ if (allocation && channels != maplay_right)
- {
- register real sample = samples[samplenumber];
-
-@@ -726,7 +726,7 @@ void SubbandLayer2IntensityStereo::read_
- }
-
-
--bool SubbandLayer2IntensityStereo::put_next_sample (e_channels channels,
-+boolean SubbandLayer2IntensityStereo::put_next_sample (e_channels channels,
- SynthesisFilter *filter1, SynthesisFilter *filter2)
- {
- #ifdef DEBUG
-@@ -769,7 +769,7 @@ bool SubbandLayer2IntensityStereo::put_n
- filter1->input_sample (sample, subbandnumber);
- filter2->input_sample (sample2, subbandnumber);
- }
-- else if (channels == left)
-+ else if (channels == maplay_left)
- {
- if (groupnumber <= 4)
- sample *= scalefactor1;
-@@ -880,9 +880,9 @@ void SubbandLayer2Stereo::read_scalefact
- }
-
-
--bool SubbandLayer2Stereo::read_sampledata (Ibitstream *stream)
-+boolean SubbandLayer2Stereo::read_sampledata (Ibitstream *stream)
- {
-- bool returnvalue = SubbandLayer2::read_sampledata (stream);
-+ boolean returnvalue = SubbandLayer2::read_sampledata (stream);
-
- if (channel2_allocation)
- if (channel2_groupingtable)
-@@ -919,11 +919,11 @@ bool SubbandLayer2Stereo::read_sampledat
- }
-
-
--bool SubbandLayer2Stereo::put_next_sample (e_channels channels,
-+boolean SubbandLayer2Stereo::put_next_sample (e_channels channels,
- SynthesisFilter *filter1, SynthesisFilter *filter2)
- {
-- bool returnvalue = SubbandLayer2::put_next_sample (channels, filter1, filter2);
-- if (channel2_allocation && channels != left)
-+ boolean returnvalue = SubbandLayer2::put_next_sample (channels, filter1, filter2);
-+ if (channel2_allocation && channels != maplay_left)
- {
- register real sample = channel2_samples[samplenumber - 1];
-
diff --git a/audio/maplay/patches/patch-ao b/audio/maplay/patches/patch-ao
deleted file mode 100644
index cd96327c8ef..00000000000
--- a/audio/maplay/patches/patch-ao
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2002/06/27 15:52:24 agc Exp $
-
---- subband_layer_2.h 2002/06/27 15:41:04 1.1
-+++ subband_layer_2.h 2002/06/27 15:41:40
-@@ -55,8 +55,8 @@
- void read_allocation (Ibitstream *, Header *, Crc16 *);
- virtual void read_scalefactor_selection (Ibitstream *, Crc16 *);
- void read_scalefactor (Ibitstream *, Header *);
-- bool read_sampledata (Ibitstream *);
-- bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter * = NULL);
-+ boolean read_sampledata (Ibitstream *);
-+ boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter * = NULL);
- };
-
-
-@@ -75,11 +75,11 @@
- }
- void read_scalefactor_selection (Ibitstream *, Crc16 *);
- void read_scalefactor (Ibitstream *, Header *);
-- bool read_sampledata (Ibitstream *stream)
-+ boolean read_sampledata (Ibitstream *stream)
- {
- return SubbandLayer2::read_sampledata (stream);
- }
-- bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *);
-+ boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *);
- };
-
-
-@@ -90,7 +90,7 @@
- uint32 channel2_allocation;
- uint32 channel2_scfsi;
- real channel2_scalefactor1, channel2_scalefactor2, channel2_scalefactor3;
-- bool channel2_grouping;
-+ boolean channel2_grouping;
- uint32 channel2_codelength;
- const real *channel2_groupingtable;
- real channel2_factor;
-@@ -102,8 +102,8 @@
- void read_allocation (Ibitstream *, Header *, Crc16 *);
- void read_scalefactor_selection (Ibitstream *, Crc16 *);
- void read_scalefactor (Ibitstream *, Header *);
-- bool read_sampledata (Ibitstream *);
-- bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *);
-+ boolean read_sampledata (Ibitstream *);
-+ boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *);
- };
-
- #endif
diff --git a/audio/mbrola/DESCR b/audio/mbrola/DESCR
deleted file mode 100644
index a12619882fe..00000000000
--- a/audio/mbrola/DESCR
+++ /dev/null
@@ -1,24 +0,0 @@
-MBROLA is a speech synthesizer based on the concatenation of
-diphones. It takes a list of phonemes as input, together with prosodic
-information (duration of phonemes and a piecewise linear description
-of pitch), and produces speech samples on 16 bits (linear), at the
-sampling frequency of the diphone database.
-
-It is therefore NOT a Text-To-Speech (TTS) synthesizer, since it does
-not accept raw text as input. In order to obtain a full TTS system,
-you need to use this synthesizer in combination with a text processing
-system that produces phonetic and prosodic commands.
-
-This software is the heart of the MBROLA project, the aim of which is
-to obtain a set a speech synthesizers for as many languages as
-possible, free of use for non-commercial applications.
-
-As such, it requires an MBROLA language/voice database to run
-properly. American English, Brazilian Portuguese, Breton, British
-English, Croatian, Dutch, French, German, Greek, Romanian, Spanish and
-Swedish voices are made available. Additional languages and voices
-will be available in the context of the MBROLA project.
-
-Some of these voices are available as mbrolavox-* packages, in the
-NetBSD packages system. For others, please consult the mbrola
-project's home page.
diff --git a/audio/mbrola/Makefile b/audio/mbrola/Makefile
deleted file mode 100644
index eabcd2f5cf0..00000000000
--- a/audio/mbrola/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2006/12/28 11:47:52 wiz Exp $
-
-DISTNAME= mbr301h
-PKGNAME= mbrola-301h
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= http://tcts.fpms.ac.be/synthesis/mbrola/bin/netbsd/ \
- http://www.festvox.org/mbrola/bin/netbsd/
-EXTRACT_SUFX= .zip
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://tcts.fpms.ac.be/synthesis/mbrola/
-COMMENT= MBROLA diphone synthesizer executable
-
-LICENSE= no-commercial-use
-
-WRKSRC= ${WRKDIR}
-DIST_SUBDIR= mbrola-20010717
-NO_BUILD= yes
-
-ONLY_FOR_PLATFORM= NetBSD-*-i386
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ( ${OBJECT_FMT} != "a.out" )
-DEPENDS+= compat14{,-crypto}>=1.4.3:../../emulators/compat14
-.endif
-
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/mbrola-netbsd-i386 ${PREFIX}/bin/mbrola
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mbrola
- ${INSTALL_DATA} ${WRKSRC}/readme.txt ${PREFIX}/share/doc/mbrola
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mbrola/PLIST b/audio/mbrola/PLIST
deleted file mode 100644
index 783b3a4774b..00000000000
--- a/audio/mbrola/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:29 skrll Exp $
-bin/mbrola
-share/doc/mbrola/readme.txt
-@unexec ${RM} -r %D/share/mbrola
-@dirrm share/doc/mbrola
diff --git a/audio/mbrola/distinfo b/audio/mbrola/distinfo
deleted file mode 100644
index 064c868c64e..00000000000
--- a/audio/mbrola/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:48 agc Exp $
-
-SHA1 (mbrola-20010717/mbr301h.zip) = 51cae305b5b39d0858a7bc035e9c113cb66e925e
-RMD160 (mbrola-20010717/mbr301h.zip) = 28f070aba106d3687e287050d7737be9d1690f00
-Size (mbrola-20010717/mbr301h.zip) = 72067 bytes
diff --git a/audio/mbrolavox-en1/DESCR b/audio/mbrolavox-en1/DESCR
deleted file mode 100644
index 1d69f83bc30..00000000000
--- a/audio/mbrolavox-en1/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-British English male voice for MBROLA.
diff --git a/audio/mbrolavox-en1/Makefile b/audio/mbrolavox-en1/Makefile
deleted file mode 100644
index 544ecf12eb9..00000000000
--- a/audio/mbrolavox-en1/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2006/12/28 11:47:52 wiz Exp $
-
-DISTNAME= en1-980910
-PKGNAME= mbrolavox-en1-980910
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/en1/ \
- http://www.festvox.org/mbrola/dba/en1/
-EXTRACT_SUFX= .zip
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://tcts.fpms.ac.be/synthesis/mbrola/
-COMMENT= British English male voice for MBROLA
-
-DEPENDS+= mbrola-301hnb1:../../audio/mbrola
-
-LICENSE= no-commercial-use
-
-WRKSRC= ${WRKDIR}
-NO_BUILD= yes
-
-MHOME= ${PREFIX}/share/mbrola/voices
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
-
-do-install:
- ${INSTALL_DATA_DIR} ${MHOME}
- cd ${WRKSRC} && ${PAX} -rw en1 ${MHOME}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mbrolavox-en1/PLIST b/audio/mbrolavox-en1/PLIST
deleted file mode 100644
index 403e1fbbc13..00000000000
--- a/audio/mbrolavox-en1/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:19 zuntum Exp $
-share/mbrola/voices/en1/en1
-share/mbrola/voices/en1/en1mrpa
-share/mbrola/voices/en1/en1.txt
-share/mbrola/voices/en1/TEST/euler.pho
-share/mbrola/voices/en1/TEST/eulerfr.pho
-share/mbrola/voices/en1/TEST/mbrola.pho
-share/mbrola/voices/en1/TEST/mbrolamr.pho
-share/mbrola/voices/en1/TEST/tobe.pho
-share/mbrola/voices/en1/TEST/mbroli.ini
-@dirrm share/mbrola/voices/en1/TEST
-@dirrm share/mbrola/voices/en1
diff --git a/audio/mbrolavox-en1/distinfo b/audio/mbrolavox-en1/distinfo
deleted file mode 100644
index 0a566362e4c..00000000000
--- a/audio/mbrolavox-en1/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:48 agc Exp $
-
-SHA1 (en1-980910.zip) = 726b440d3bd507b8f2c7663b1a86b7340462d686
-RMD160 (en1-980910.zip) = 98beea6aa090a998c20b7bc699e523f4fd1f678d
-Size (en1-980910.zip) = 5829123 bytes
diff --git a/audio/mbrolavox-us1/DESCR b/audio/mbrolavox-us1/DESCR
deleted file mode 100644
index f894b2d783b..00000000000
--- a/audio/mbrolavox-us1/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-American English female voice for MBROLA.
diff --git a/audio/mbrolavox-us1/Makefile b/audio/mbrolavox-us1/Makefile
deleted file mode 100644
index 00a89bf064e..00000000000
--- a/audio/mbrolavox-us1/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2006/12/28 11:47:52 wiz Exp $
-
-DISTNAME= us1-980512
-PKGNAME= mbrolavox-us1-980512
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/us1/ \
- http://www.festvox.org/mbrola/dba/us1/
-EXTRACT_SUFX= .zip
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://tcts.fpms.ac.be/synthesis/mbrola/
-COMMENT= American English female voice for MBROLA
-
-DEPENDS+= mbrola-301hnb1:../../audio/mbrola
-
-LICENSE= no-commercial-use
-
-WRKSRC= ${WRKDIR}
-NO_BUILD= yes
-
-MHOME= ${PREFIX}/share/mbrola/voices
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
-
-do-install:
- ${INSTALL_DATA_DIR} ${MHOME}
- cd ${WRKSRC} && ${PAX} -rw us1 ${MHOME}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mbrolavox-us1/PLIST b/audio/mbrolavox-us1/PLIST
deleted file mode 100644
index 7d8fc9c0450..00000000000
--- a/audio/mbrolavox-us1/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:20 zuntum Exp $
-share/mbrola/voices/us1/us1
-share/mbrola/voices/us1/us1mrpa
-share/mbrola/voices/us1/us1.txt
-share/mbrola/voices/us1/license.txt
-share/mbrola/voices/us1/TEST/alice.pho
-share/mbrola/voices/us1/TEST/xmas.pho
-share/mbrola/voices/us1/TEST/mbrola.pho
-share/mbrola/voices/us1/TEST/push.pho
-share/mbrola/voices/us1/TEST/mbroli.ini
-@dirrm share/mbrola/voices/us1/TEST
-@dirrm share/mbrola/voices/us1
diff --git a/audio/mbrolavox-us1/distinfo b/audio/mbrolavox-us1/distinfo
deleted file mode 100644
index cd018757577..00000000000
--- a/audio/mbrolavox-us1/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:48 agc Exp $
-
-SHA1 (us1-980512.zip) = 3cf707fc1039cb86c96423e75588119f8b167ce0
-RMD160 (us1-980512.zip) = 32907bc8ba7af50318a32738035f23ba26126a4c
-Size (us1-980512.zip) = 6562915 bytes
diff --git a/audio/mbrolavox-us2/DESCR b/audio/mbrolavox-us2/DESCR
deleted file mode 100644
index 5f8b435f454..00000000000
--- a/audio/mbrolavox-us2/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-American English male voice for MBROLA.
diff --git a/audio/mbrolavox-us2/Makefile b/audio/mbrolavox-us2/Makefile
deleted file mode 100644
index 565870b78eb..00000000000
--- a/audio/mbrolavox-us2/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2006/12/28 11:47:52 wiz Exp $
-
-DISTNAME= us2-980812
-PKGNAME= mbrolavox-${DISTNAME}
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/us2/ \
- http://www.festvox.org/mbrola/dba/us2/
-EXTRACT_SUFX= .zip
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://tcts.fpms.ac.be/synthesis/mbrola/
-COMMENT= American English male voice for MBROLA
-
-DEPENDS+= mbrola-301hnb1:../../audio/mbrola
-
-LICENSE= no-commercial-use
-
-WRKSRC= ${WRKDIR}
-NO_BUILD= yes
-
-MHOME= ${PREFIX}/share/mbrola/voices
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
-
-do-install:
- ${INSTALL_DATA_DIR} ${MHOME}
- cd ${WRKSRC} && ${PAX} -rw us2 ${MHOME}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mbrolavox-us2/PLIST b/audio/mbrolavox-us2/PLIST
deleted file mode 100644
index 0920cce1258..00000000000
--- a/audio/mbrolavox-us2/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:21 zuntum Exp $
-share/mbrola/voices/us2/us2
-share/mbrola/voices/us2/us2.txt
-share/mbrola/voices/us2/license.txt
-share/mbrola/voices/us2/TEST/alice.pho
-share/mbrola/voices/us2/TEST/mbrola.pho
-share/mbrola/voices/us2/TEST/babel.pho
-share/mbrola/voices/us2/TEST/mbroli.ini
-@dirrm share/mbrola/voices/us2/TEST
-@dirrm share/mbrola/voices/us2
diff --git a/audio/mbrolavox-us2/distinfo b/audio/mbrolavox-us2/distinfo
deleted file mode 100644
index 783e3df2745..00000000000
--- a/audio/mbrolavox-us2/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:48 agc Exp $
-
-SHA1 (us2-980812.zip) = 24657341dad89db260d9972350d019c2760e6eaf
-RMD160 (us2-980812.zip) = 9793ab0244f8117de84d19c28caf7eb7d04eabdb
-Size (us2-980812.zip) = 6387442 bytes
diff --git a/audio/mbrolavox-us3/DESCR b/audio/mbrolavox-us3/DESCR
deleted file mode 100644
index 5f8b435f454..00000000000
--- a/audio/mbrolavox-us3/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-American English male voice for MBROLA.
diff --git a/audio/mbrolavox-us3/Makefile b/audio/mbrolavox-us3/Makefile
deleted file mode 100644
index 49ebcdcb9d4..00000000000
--- a/audio/mbrolavox-us3/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2006/12/28 11:47:52 wiz Exp $
-
-DISTNAME= us3-990208
-PKGNAME= mbrolavox-${DISTNAME}
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/us3/ \
- http://www.festvox.org/mbrola/dba/us3/
-EXTRACT_SUFX= .zip
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://tcts.fpms.ac.be/synthesis/mbrola/
-COMMENT= American English male voice for MBROLA
-
-DEPENDS+= mbrola-301hnb1:../../audio/mbrola
-
-LICENSE= no-commercial-use
-
-WRKSRC= ${WRKDIR}
-NO_BUILD= yes
-
-MHOME= ${PREFIX}/share/mbrola/voices
-
-post-extract:
- ${CHMOD} -R a+r ${WRKSRC}
- ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
-
-do-install:
- ${INSTALL_DATA_DIR} ${MHOME}
- cd ${WRKSRC} && ${PAX} -rw us3 ${MHOME}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mbrolavox-us3/PLIST b/audio/mbrolavox-us3/PLIST
deleted file mode 100644
index 3f903089e7e..00000000000
--- a/audio/mbrolavox-us3/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:23 zuntum Exp $
-share/mbrola/voices/us3/us3
-share/mbrola/voices/us3/us3.txt
-share/mbrola/voices/us3/license.txt
-share/mbrola/voices/us3/TEST/mike.pho
-share/mbrola/voices/us3/TEST/diphone.pho
-share/mbrola/voices/us3/TEST/cslu.pho
-share/mbrola/voices/us3/TEST/mbroli.ini
-@dirrm share/mbrola/voices/us3/TEST
-@dirrm share/mbrola/voices/us3
diff --git a/audio/mbrolavox-us3/distinfo b/audio/mbrolavox-us3/distinfo
deleted file mode 100644
index 51a51bb85e2..00000000000
--- a/audio/mbrolavox-us3/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:48 agc Exp $
-
-SHA1 (us3-990208.zip) = 8d9831a0b03789041601cb2389875e446b1f94c7
-RMD160 (us3-990208.zip) = 180c0d76b770d9f022e2066b01da85aa22b2db64
-Size (us3-990208.zip) = 6195800 bytes
diff --git a/audio/mikmod/DESCR b/audio/mikmod/DESCR
deleted file mode 100644
index d1768d7dc67..00000000000
--- a/audio/mikmod/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Mikmod is a MOD player.
-It understands UNI, IT, XM, S3M, MOD, MTM, STM, DSM, MED, FAR, ULT, and
-669 module formats.
-It has features like sample interpolation, random playing, and automatic
-decompression of modules.
diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile
deleted file mode 100644
index c10cc72d8bc..00000000000
--- a/audio/mikmod/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.42 2006/09/03 00:56:28 wiz Exp $
-
-DISTNAME= mikmod-3.2.1
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= http://mikmod.raphnet.net/files/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://mikmod.raphnet.net/
-COMMENT= MOD player for UNI IT XM S3M MOD MTM STM DSM MED FAR ULT 669 files
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_TOOLS+= gmake
-GNU_CONFIGURE= yes
-
-.include "../../audio/libmikmod/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mikmod/PLIST b/audio/mikmod/PLIST
deleted file mode 100644
index 803967700fe..00000000000
--- a/audio/mikmod/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:25 zuntum Exp $
-bin/mikmod
-man/man1/mikmod.1
diff --git a/audio/mikmod/distinfo b/audio/mikmod/distinfo
deleted file mode 100644
index 654dd99a4a0..00000000000
--- a/audio/mikmod/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 20:39:49 agc Exp $
-
-SHA1 (mikmod-3.2.1.tar.gz) = ed759b9c7452f7ca0155483b9245d5f81ad04867
-RMD160 (mikmod-3.2.1.tar.gz) = de1493069874641274a963494f8499dadb8fff61
-Size (mikmod-3.2.1.tar.gz) = 148919 bytes
-SHA1 (patch-aa) = cc86b2ee6e9694abfd97562aafaf347cd1775d93
diff --git a/audio/mikmod/patches/patch-aa b/audio/mikmod/patches/patch-aa
deleted file mode 100644
index d3896ac7abc..00000000000
--- a/audio/mikmod/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2004/11/22 14:40:49 adam Exp $
-
---- src/mikmod.c.orig 2003-10-08 02:08:56.000000000 +0000
-+++ src/mikmod.c
-@@ -590,7 +590,7 @@ int main(int argc,char *argv[])
- #if defined(__OS2__)||defined(__EMX__)
- >=0
- #else
-- !=ERR
-+ !=-1
- #endif
- ) {
- switch (t) {
diff --git a/audio/mixer.app/DESCR b/audio/mixer.app/DESCR
deleted file mode 100644
index b33d311a811..00000000000
--- a/audio/mixer.app/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-A dockapp that controls the mixer for three volumes by default:
- * Master
- * CD
- * PCM
diff --git a/audio/mixer.app/Makefile b/audio/mixer.app/Makefile
deleted file mode 100644
index eef573de614..00000000000
--- a/audio/mixer.app/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:35 joerg Exp $
-#
-
-DISTNAME= Mixer.app-1.8.0
-PKGNAME= mixer.app-1.8.0
-PKGREVISION= 1
-CATEGORIES= audio
-CATEGORIES= audio windowmaker
-MASTER_SITES= http://www.fukt.bth.se/~per/mixer/
-
-MAINTAINER= ptiJo@noos.fr
-HOMEPAGE= http://www.fukt.bth.se/~per/mixer/
-COMMENT= Another mixer intended for the windowmaker dockapp
-
-NOT_FOR_PLATFORM= Interix-*-*
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_LANGUAGES= c++
-
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/Mixer.app ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Mixer.app
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/Mixer.app
-
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mixer.app/PLIST b/audio/mixer.app/PLIST
deleted file mode 100644
index 915756f8453..00000000000
--- a/audio/mixer.app/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/08 02:43:01 wiz Exp $
-bin/Mixer.app
-share/doc/Mixer.app/README
-@dirrm share/doc/Mixer.app
diff --git a/audio/mixer.app/distinfo b/audio/mixer.app/distinfo
deleted file mode 100644
index 93a64c57535..00000000000
--- a/audio/mixer.app/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 20:39:49 agc Exp $
-
-SHA1 (Mixer.app-1.8.0.tar.gz) = 68b644e2b13fe4a89461cf28ab6aebbcaedc0552
-RMD160 (Mixer.app-1.8.0.tar.gz) = ae29a9b6c4a3d37d48f5e2b936ac62b81cc02c52
-Size (Mixer.app-1.8.0.tar.gz) = 37884 bytes
-SHA1 (patch-aa) = 4bbc4735d3d2075f2e890cdbd6ff48d70c8cc7a5
-SHA1 (patch-ab) = 9ca9690364e4e42c64b227f58f913848d5f980a4
diff --git a/audio/mixer.app/patches/patch-aa b/audio/mixer.app/patches/patch-aa
deleted file mode 100644
index a377c0a5aec..00000000000
--- a/audio/mixer.app/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2004/05/03 23:18:21 minskim Exp $
-
---- Makefile.orig 2002-09-15 11:37:33.000000000 -0500
-+++ Makefile
-@@ -6,9 +6,9 @@ DESTDIR =
- GNUSTEP_BINDIR = /usr/local/GNUstep/Apps/Mixer.app
- X11_BINDIR = /usr/X11R6/bin
-
--CXX=c++
--CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -O2 -I/usr/X11R6/include
--LDFLAGS += -L/usr/X11R6/lib -lXpm -lXext -lX11
-+#CXX=c++
-+CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -I${X11BASE}/include
-+LDFLAGS += -Wl,-R${X11BASE}/lib -Wl,-R${X11PREFIX}/lib -L${X11BASE}/lib -lXpm -lXext -lX11 ${LIBOSSAUDIO}
-
- OBJECTS = Main.o Mixer.o Xpm.o
-
diff --git a/audio/mixer.app/patches/patch-ab b/audio/mixer.app/patches/patch-ab
deleted file mode 100644
index fc3cfda7e1e..00000000000
--- a/audio/mixer.app/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2003/06/03 15:43:50 jschauma Exp $
-
---- Mixer.cc.orig Sun Sep 15 12:42:33 2002
-+++ Mixer.cc Tue Jun 3 11:42:48 2003
-@@ -35,7 +35,7 @@
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
- #include <machine/soundcard.h>
--#elif defined(__OpenBSD__)
-+#elif defined(__NetBSD__) || defined(__OpenBSD__)
- #include <soundcard.h>
- #else
- #include <sys/soundcard.h>
diff --git a/audio/mkcdtoc/DESCR b/audio/mkcdtoc/DESCR
deleted file mode 100644
index 85cfe97bd1b..00000000000
--- a/audio/mkcdtoc/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-mkcdtoc is a small and flexible command line utility to create
-toc-files for cdrdao. It reads a list of audio files and outputs a
-toc-file with a track specification for each audio file. Input data
-can be a raw list with one file name on each line, or an m3u play
-list. The program has a modular architecture and can be extended via
-plugins. The distribution includes a few plugins that can retrieve
-meta information from audio files to fill CD-TEXT blocks in the
-generated toc-file. There are plugins to perform audio file to WAVE
-format conversion.
diff --git a/audio/mkcdtoc/Makefile b/audio/mkcdtoc/Makefile
deleted file mode 100644
index f4c8dc15b9a..00000000000
--- a/audio/mkcdtoc/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/07/26 13:20:34 drochner Exp $
-#
-
-DISTNAME= mkcdtoc-1.0
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mkcdtoc/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://sourceforge.net/projects/mkcdtoc/
-COMMENT= Script to create .toc files for cdrdao
-
-USE_TOOLS+= gmake perl
-MAKE_ENV+= PERL=${PERL5}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mkcdtoc/PLIST b/audio/mkcdtoc/PLIST
deleted file mode 100644
index 794fdb43097..00000000000
--- a/audio/mkcdtoc/PLIST
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/07/26 13:20:34 drochner Exp $
-bin/mkcdtoc
-man/man1/mkcdtoc.1
-share/mkcdtoc/plugins/convert-flac
-share/mkcdtoc/plugins/convert-mmurender
-share/mkcdtoc/plugins/convert-mpg321
-share/mkcdtoc/plugins/convert-mplayer
-share/mkcdtoc/plugins/convert-ogg123
-share/mkcdtoc/plugins/convert-oggdec
-share/mkcdtoc/plugins/info-MP3-Info
-share/mkcdtoc/plugins/info-case
-share/mkcdtoc/plugins/info-firstdash
-share/mkcdtoc/plugins/info-id3info
-share/mkcdtoc/plugins/info-mmuinfo
-share/mkcdtoc/plugins/info-ogginfo
-share/mkcdtoc/plugins/info-translit-cyr
-share/mkcdtoc/plugins/input-m3u
-share/mkcdtoc/plugins/input-raw
-@dirrm share/mkcdtoc/plugins
-@dirrm share/mkcdtoc
diff --git a/audio/mkcdtoc/distinfo b/audio/mkcdtoc/distinfo
deleted file mode 100644
index 2f72cdfde75..00000000000
--- a/audio/mkcdtoc/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/07/26 13:20:34 drochner Exp $
-
-SHA1 (mkcdtoc-1.0.tar.bz2) = dbe3f4830024ab25dfa1c92bc94749241f377828
-RMD160 (mkcdtoc-1.0.tar.bz2) = 98bde617dfcd4a7872c978c4c4b4b1f0acaceb06
-Size (mkcdtoc-1.0.tar.bz2) = 18255 bytes
-SHA1 (patch-aa) = 9d301052ec5c04048c76165183a7dd5748a7ae1b
diff --git a/audio/mkcdtoc/patches/patch-aa b/audio/mkcdtoc/patches/patch-aa
deleted file mode 100644
index 43fb4156269..00000000000
--- a/audio/mkcdtoc/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/07/26 13:20:34 drochner Exp $
-
---- include.mak.orig 2006-07-23 13:47:10.000000000 +0200
-+++ include.mak
-@@ -2,12 +2,12 @@ PACKAGE = mkcdtoc
- VERSION = 1.0
- BUGSTO = lostclus@ua.fm
-
--PREFIX=/usr/local
-+#PREFIX=/usr/local
- BINDIR=$(PREFIX)/bin
- DATADIR=$(PREFIX)/share
- MANDIR=$(PREFIX)/man
- DESTDIR=
--PERL=/usr/bin/perl
-+#PERL=/usr/bin/perl
-
- SEDDEPS = $(TOP_DIR)/include.mak
- SEDCMDS = 's|@PACKAGE@|$(PACKAGE)|g; s|@VERSION@|$(VERSION)|g; \
diff --git a/audio/moc/DESCR b/audio/moc/DESCR
deleted file mode 100644
index 83500f474e3..00000000000
--- a/audio/moc/DESCR
+++ /dev/null
@@ -1,17 +0,0 @@
-MOC (music on console) is a console audio player for LINUX/UNIX
-designed to be powerful and easy to use. Noteworthy features
-include:
-
- * By default, files are decoded and played in a background
- process. This allows the user to quit the interface (e.g.,
- if one needs to close the xterm) without affecting
- playback. It also allows attaching multiple interfaces
- (e.g. in multiple xterms) to the same player.
- * Playback should be smooth even under high cpu or I/O load,
- due to the use of output buffering in a separate thread.
- * There are no sound gaps in between files, because the next
- file to be played is precached while playing the current
- file.
-
-Note: To avoid conflicts with Qt's 'moc', the moc binary is
-called 'mocp'.
diff --git a/audio/moc/Makefile b/audio/moc/Makefile
deleted file mode 100644
index b410fa03d22..00000000000
--- a/audio/moc/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2007/01/07 12:25:52 wiz Exp $
-
-DISTNAME= moc-2.4.0
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.daper.net/pub/soft/moc/stable/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= peter.schuller@infidyne.com
-HOMEPAGE= http://moc.daper.net/
-COMMENT= Curses based console audio player
-
-GNU_CONFIGURE= yes
-USE_PKGLOCALEDIR= yes
-USE_LIBTOOL= yes
-USE_NCURSES= yes
-USE_TOOLS+= pkg-config
-
-# We require ncurses because with curses arrow key navigation is buggy
-CONFIGURE_ARGS+= --with-ncurses
-
-SUBST_CLASSES+= oss
-SUBST_STAGE.oss= pre-configure
-SUBST_FILES.oss= config.example options.c
-SUBST_SED.oss= -e s,/dev/dsp,${DEVOSSAUDIO},g
-SUBST_MESSAGE.oss= Fixing hardcoded audio device.
-
-.include "options.mk"
-
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/moc/PLIST b/audio/moc/PLIST
deleted file mode 100644
index 848aa7d665b..00000000000
--- a/audio/moc/PLIST
+++ /dev/null
@@ -1,26 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/02/12 18:35:55 xtraeme Exp $
-bin/mocp
-${FLAC}lib/moc/decoder_plugins/libflac_decoder.la
-lib/moc/decoder_plugins/libmp3_decoder.la
-${VORBIS}lib/moc/decoder_plugins/libvorbis_decoder.la
-${SNDFILE}lib/moc/decoder_plugins/libsndfile_formats_decoder.la
-${SPEEX}lib/moc/decoder_plugins/libspeex_decoder.la
-man/man1/mocp.1
-share/doc/moc/README
-share/doc/moc/THANKS
-share/doc/moc/config.example
-share/doc/moc/keymap.example
-share/moc/themes/black_theme
-share/moc/themes/darkdot_theme
-share/moc/themes/example_theme
-share/moc/themes/green_theme
-share/moc/themes/moca_theme
-share/moc/themes/nightly_theme
-share/moc/themes/red_theme
-share/moc/themes/transparent-background
-share/moc/themes/yellow_red_theme
-@dirrm share/moc/themes
-@dirrm share/moc
-@dirrm share/doc/moc
-@dirrm lib/moc/decoder_plugins
-@dirrm lib/moc
diff --git a/audio/moc/distinfo b/audio/moc/distinfo
deleted file mode 100644
index 7a6b1038892..00000000000
--- a/audio/moc/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2007/01/12 20:26:05 wiz Exp $
-
-SHA1 (moc-2.4.0.tar.bz2) = 4741fd9098af8b1c375b5232ba460da2077a5cb8
-RMD160 (moc-2.4.0.tar.bz2) = 084411d527bbeabd7caaae5acf8a3391a2d07f8f
-Size (moc-2.4.0.tar.bz2) = 419792 bytes
-SHA1 (patch-aa) = a797dc880a550e2acdb3b6f0e362b3a27666bc72
diff --git a/audio/moc/options.mk b/audio/moc/options.mk
deleted file mode 100644
index 0b6eac256c8..00000000000
--- a/audio/moc/options.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2006/02/12 18:35:55 xtraeme Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.moc
-PKG_SUPPORTED_OPTIONS= sndfile flac vorbis speex curl samplerate
-PKG_SUGGESTED_OPTIONS= sndfile flac vorbis curl
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Msndfile)
-PLIST_SUBST+= SNDFILE=
-CONFIGURE_ARGS+= --with-sndfile
-. include "../../audio/libsndfile/buildlink3.mk"
-.else
-PLIST_SUBST+= SNDFILE='@comment '
-CONFIGURE_ARGS+= --without-sndfile
-.endif
-
-.if !empty(PKG_OPTIONS:Mflac)
-PLIST_SUBST+= FLAC=
-CONFIGURE_ARGS+= --with-flac
-. include "../../audio/flac/buildlink3.mk"
-.else
-PLIST_SUBST+= FLAC='@comment '
-CONFIGURE_ARGS+= --without-flac
-.endif
-
-.if !empty(PKG_OPTIONS:Mvorbis)
-PLIST_SUBST+= VORBIS=
-CONFIGURE_ARGS+= --with-vorbis
-. include "../../audio/libvorbis/buildlink3.mk"
-.else
-PLIST_SUBST+= VORBIS='@comment '
-CONFIGURE_ARGS+= --without-vorbis
-.endif
-
-.if !empty(PKG_OPTIONS:Mspeex)
-PLIST_SUBST+= SPEEX=
-CONFIGURE_ARGS+= --with-speex
-. include "../../audio/speex/buildlink3.mk"
-.else
-PLIST_SUBST+= SPEEX='@comment '
-CONFIGURE_ARGS+= --without-speex
-.endif
-
-.if !empty(PKG_OPTIONS:Mcurl)
-CONFIGURE_ARGS+= --with-curl
-. include "../../www/curl/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --without-curl
-.endif
-
-.if !empty(PKG_OPTIONS:Msamplerate)
-CONFIGURE_ARGS+= --with-samplerate
-. include "../../audio/libsamplerate/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --without-samplerate
-.endif
diff --git a/audio/moc/patches/patch-aa b/audio/moc/patches/patch-aa
deleted file mode 100644
index 4d13fe599f8..00000000000
--- a/audio/moc/patches/patch-aa
+++ /dev/null
@@ -1,307 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2007/01/12 20:26:05 wiz Exp $
-
---- decoder_plugins/flac/flac.c.orig 2006-02-12 11:55:10.000000000 +0000
-+++ decoder_plugins/flac/flac.c
-@@ -28,6 +28,13 @@
- #include "log.h"
- #include "io.h"
-
-+/* by LEGACY_FLAC we mean pre-1.1.3, before FLAC__SeekableStreamDecoder was merged into FLAC__StreamDecoder */
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+
- #define MAX_SUPPORTED_CHANNELS 2
-
- #define SAMPLES_PER_WRITE 512
-@@ -35,7 +42,11 @@
-
- struct flac_data
- {
-+#ifdef LEGACY_FLAC
- FLAC__SeekableStreamDecoder *decoder;
-+#else
-+ FLAC__StreamDecoder *decoder;
-+#endif
- struct io_stream *stream;
- int bitrate;
- int abort; /* abort playing (due to an error) */
-@@ -109,7 +120,11 @@ static size_t pack_pcm_signed (FLAC__byt
- }
-
- static FLAC__StreamDecoderWriteStatus write_callback (
-+#ifdef LEGACY_FLAC
- const FLAC__SeekableStreamDecoder *decoder ATTR_UNUSED,
-+#else
-+ const FLAC__StreamDecoder *decoder ATTR_UNUSED,
-+#endif
- const FLAC__Frame *frame,
- const FLAC__int32 * const buffer[], void *client_data)
- {
-@@ -127,7 +142,11 @@ static FLAC__StreamDecoderWriteStatus wr
- }
-
- static void metadata_callback (
-+#ifdef LEGACY_FLAC
- const FLAC__SeekableStreamDecoder *decoder ATTR_UNUSED,
-+#else
-+ const FLAC__StreamDecoder *decoder ATTR_UNUSED,
-+#endif
- const FLAC__StreamMetadata *metadata, void *client_data)
- {
- struct flac_data *data = (struct flac_data *)client_data;
-@@ -147,7 +166,11 @@ static void metadata_callback (
- }
-
- static void error_callback (
-+#ifdef LEGACY_FLAC
- const FLAC__SeekableStreamDecoder *decoder ATTR_UNUSED,
-+#else
-+ const FLAC__StreamDecoder *decoder ATTR_UNUSED,
-+#endif
- FLAC__StreamDecoderErrorStatus status, void *client_data)
- {
- struct flac_data *data = (struct flac_data *)client_data;
-@@ -160,9 +183,15 @@ static void error_callback (
- decoder_error (&data->error, ERROR_FATAL, 0, "FLAC: lost sync");
- }
-
-+#ifdef LEGACY_FLAC
- static FLAC__SeekableStreamDecoderReadStatus read_callback (
- const FLAC__SeekableStreamDecoder *decoder ATTR_UNUSED,
- FLAC__byte buffer[], unsigned *bytes, void *client_data)
-+#else
-+static FLAC__StreamDecoderReadStatus read_callback (
-+ const FLAC__StreamDecoder *decoder ATTR_UNUSED,
-+ FLAC__byte buffer[], size_t *bytes, void *client_data)
-+#endif
- {
- struct flac_data *data = (struct flac_data *)client_data;
- ssize_t res;
-@@ -171,52 +200,97 @@ static FLAC__SeekableStreamDecoderReadSt
-
- if (res > 0) {
- *bytes = res;
-+#ifdef LEGACY_FLAC
-+ return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK;
-+#else
- return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
-+#endif
- }
-
- if (res == 0) {
- *bytes = 0;
-+ /* not sure why this works, but if it ain't broke... */
- return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
- }
-
- error ("read error: %s", io_strerror(data->stream));
-
-+#ifdef LEGACY_FLAC
-+ return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR;
-+#else
- return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
-+#endif
- }
-
-+#ifdef LEGACY_FLAC
- static FLAC__SeekableStreamDecoderSeekStatus seek_callback (
- const FLAC__SeekableStreamDecoder *decoder ATTR_UNUSED,
- FLAC__uint64 absolute_byte_offset, void *client_data)
-+#else
-+static FLAC__StreamDecoderSeekStatus seek_callback (
-+ const FLAC__StreamDecoder *decoder ATTR_UNUSED,
-+ FLAC__uint64 absolute_byte_offset, void *client_data)
-+#endif
- {
- struct flac_data *data = (struct flac_data *)client_data;
-
-+#ifdef LEGACY_FLAC
- return io_seek(data->stream, absolute_byte_offset, SEEK_SET) >= 0
- ? FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK
- : FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR;
-+#else
-+ return io_seek(data->stream, absolute_byte_offset, SEEK_SET) >= 0
-+ ? FLAC__STREAM_DECODER_SEEK_STATUS_OK
-+ : FLAC__STREAM_DECODER_SEEK_STATUS_ERROR;
-+#endif
- }
-
-+#ifdef LEGACY_FLAC
- static FLAC__SeekableStreamDecoderTellStatus tell_callback (
- const FLAC__SeekableStreamDecoder *decoder ATTR_UNUSED,
- FLAC__uint64 *absolute_byte_offset, void *client_data)
-+#else
-+static FLAC__StreamDecoderTellStatus tell_callback (
-+ const FLAC__StreamDecoder *decoder ATTR_UNUSED,
-+ FLAC__uint64 *absolute_byte_offset, void *client_data)
-+#endif
- {
- struct flac_data *data = (struct flac_data *)client_data;
-
- *absolute_byte_offset = io_tell (data->stream);
-+#ifdef LEGACY_FLAC
- return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK;
-+#else
-+ return FLAC__STREAM_DECODER_TELL_STATUS_OK;
-+#endif
- }
-
-+#ifdef LEGACY_FLAC
- static FLAC__SeekableStreamDecoderLengthStatus length_callback (
- const FLAC__SeekableStreamDecoder *decoder ATTR_UNUSED,
- FLAC__uint64 *stream_length, void *client_data)
-+#else
-+static FLAC__StreamDecoderLengthStatus length_callback (
-+ const FLAC__StreamDecoder *decoder ATTR_UNUSED,
-+ FLAC__uint64 *stream_length, void *client_data)
-+#endif
- {
- struct flac_data *data = (struct flac_data *)client_data;
-
- *stream_length = io_file_size (data->stream);
-+#ifdef LEGACY_FLAC
- return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK;
-+#else
-+ return FLAC__STREAM_DECODER_LENGTH_STATUS_OK;
-+#endif
- }
-
- static FLAC__bool eof_callback (
-+#ifdef LEGACY_FLAC
- const FLAC__SeekableStreamDecoder *decoder ATTR_UNUSED,
-+#else
-+ const FLAC__StreamDecoder *decoder ATTR_UNUSED,
-+#endif
- void *client_data)
- {
- struct flac_data *data = (struct flac_data *)client_data;
-@@ -248,6 +322,7 @@ static void *flac_open_internal (const c
-
- data->ok = 1;
-
-+#ifdef LEGACY_FLAC
- if (!(data->decoder = FLAC__seekable_stream_decoder_new())) {
- decoder_error (&data->error, ERROR_FATAL, 0,
- "FLAC__seekable_stream_decoder_new() failed");
-@@ -279,7 +354,7 @@ static void *flac_open_internal (const c
- eof_callback);
-
- if (FLAC__seekable_stream_decoder_init(data->decoder)
-- != FLAC__FILE_DECODER_OK) {
-+ != FLAC__SEEKABLE_STREAM_DECODER_OK) {
- decoder_error (&data->error, ERROR_FATAL, 0,
- "FLAC__seekable_stream_decoder_init() failed");
- data->ok = 0;
-@@ -294,6 +369,36 @@ static void *flac_open_internal (const c
- data->ok = 0;
- return data;
- }
-+#else
-+ if (!(data->decoder = FLAC__stream_decoder_new())) {
-+ decoder_error (&data->error, ERROR_FATAL, 0,
-+ "FLAC__stream_decoder_new() failed");
-+ data->ok = 0;
-+ return data;
-+ }
-+
-+ FLAC__stream_decoder_set_md5_checking (data->decoder, false);
-+
-+ FLAC__stream_decoder_set_metadata_ignore_all (data->decoder);
-+ FLAC__stream_decoder_set_metadata_respond (data->decoder,
-+ FLAC__METADATA_TYPE_STREAMINFO);
-+
-+ if (FLAC__stream_decoder_init_stream(data->decoder, read_callback, seek_callback, tell_callback, length_callback, eof_callback, write_callback, metadata_callback, error_callback, data)
-+ != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
-+ decoder_error (&data->error, ERROR_FATAL, 0,
-+ "FLAC__stream_decoder_init() failed");
-+ data->ok = 0;
-+ return data;
-+ }
-+
-+ if (!FLAC__stream_decoder_process_until_end_of_metadata(data->decoder)) {
-+ decoder_error (&data->error, ERROR_FATAL, 0,
-+ "FLAC__stream_decoder_process_until_end_of_metadata()"
-+ " failed.");
-+ data->ok = 0;
-+ return data;
-+ }
-+#endif
-
- return data;
- }
-@@ -309,8 +414,13 @@ static void flac_close (void *void_data)
-
- if (data->ok) {
- if (data->decoder) {
-+#ifdef LEGACY_FLAC
- FLAC__seekable_stream_decoder_finish (data->decoder);
- FLAC__seekable_stream_decoder_delete (data->decoder);
-+#else
-+ FLAC__stream_decoder_finish (data->decoder);
-+ FLAC__stream_decoder_delete (data->decoder);
-+#endif
- }
- io_close (data->stream);
- }
-@@ -430,11 +540,19 @@ static int flac_seek (void *void_data, i
- target_sample = (FLAC__uint64)((sec/(double)data->length) *
- (double)data->total_samples);
-
-+#ifdef LEGACY_FLAC
- if (FLAC__seekable_stream_decoder_seek_absolute(data->decoder,
- target_sample))
-+#else
-+ if (FLAC__stream_decoder_seek_absolute(data->decoder, target_sample))
-+#endif
- return sec;
- else {
-+#ifdef LEGACY_FLAC
- logit ("FLAC__seekable_stream_decoder_seek_absolute() failed.");
-+#else
-+ logit ("FLAC__stream_decoder_seek_absolute() failed.");
-+#endif
- return -1;
- }
- }
-@@ -469,22 +587,34 @@ static int flac_decode (void *void_data,
- if (!data->sample_buffer_fill) {
- debug ("decoding...");
-
-- if (FLAC__seekable_stream_decoder_get_state(data->decoder)
-- == FLAC__FILE_DECODER_END_OF_FILE) {
-+#ifdef LEGACY_FLAC
-+ if (FLAC__seekable_stream_decoder_get_state(data->decoder) == FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM)
-+#else
-+ if (FLAC__stream_decoder_get_state(data->decoder) == FLAC__STREAM_DECODER_END_OF_STREAM)
-+#endif
-+ {
- logit ("EOF");
- return 0;
- }
-
-- if (!FLAC__seekable_stream_decoder_process_single(
-- data->decoder)) {
-+#ifdef LEGACY_FLAC
-+ if (!FLAC__seekable_stream_decoder_process_single(data->decoder))
-+#else
-+ if (!FLAC__stream_decoder_process_single(data->decoder))
-+#endif
-+ {
- decoder_error (&data->error, ERROR_FATAL, 0,
- "Read error processing frame.");
- return 0;
- }
-
- /* Count the bitrate */
-+#ifdef LEGACY_FLAC
- if(!FLAC__seekable_stream_decoder_get_decode_position(
- data->decoder, &decode_position))
-+#else
-+ if(!FLAC__stream_decoder_get_decode_position(data->decoder, &decode_position))
-+#endif
- decode_position = 0;
- if (decode_position > data->last_decode_position) {
- int bytes_per_sec = bytes_per_sample * data->sample_rate
diff --git a/audio/moss/DESCR b/audio/moss/DESCR
deleted file mode 100644
index 82187f86370..00000000000
--- a/audio/moss/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-MOSS (MP3/OGG Streaming Server) is an HTTP-based streaming server
-written in Python. It supports the web mode where you browse and
-select songs, and the live mode which supports real-time broadcast.
diff --git a/audio/moss/Makefile b/audio/moss/Makefile
deleted file mode 100644
index c99213f5b06..00000000000
--- a/audio/moss/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2006/08/23 10:38:01 minskim Exp $
-
-DISTNAME= moss-0.1.13
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= http://kldp.net/frs/download.php/1580/
-
-MAINTAINER= myunggoni@users.kldp.net
-HOMEPAGE= http://moss.kldp.net/
-COMMENT= MP3/OGG Streaming Server
-
-DEPENDS+= ${PYPKGPREFIX}-ogg>=1.3:../../audio/py-ogg
-DEPENDS+= ${PYPKGPREFIX}-vorbis>=1.3:../../audio/py-vorbis
-
-PYTHON_VERSIONS_INCOMPATIBLE= 20 15
-PYTHON_PATCH_SCRIPTS= ${WRKSRC}/*.py
-
-RCD_SCRIPTS= moss
-CONF_FILES= ${PREFIX}/share/moss/moss.conf.sample \
- ${PKG_SYSCONFDIR}/moss.conf
-
-SUBST_CLASSES+= path
-SUBST_MESSAGE.path= Fixing hardcoded paths.
-SUBST_STAGE.path= post-patch
-SUBST_FILES.path= moss.conf.sample
-SUBST_SED.path= -e 's,$${PREFIX}/var,${VARBASE},g'
-SUBST_SED.path+= -e 's,$${PREFIX}/share,${PREFIX}/share,g'
-
-FILES_SUBST+= INTERPRETER=${PYTHONBIN:Q}
-
-PYDISTUTILSPKG= yes
-
-.include "../../lang/python/extension.mk"
-.include "../../lang/python/application.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/moss/PLIST b/audio/moss/PLIST
deleted file mode 100644
index ff85529e86e..00000000000
--- a/audio/moss/PLIST
+++ /dev/null
@@ -1,39 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2006/05/22 10:01:03 rillig Exp $
-bin/moss
-${PYSITELIB}/moss/__init__.py
-${PYSITELIB}/moss/__init__.pyc
-${PYSITELIB}/moss/__init__.pyo
-${PYSITELIB}/moss/fileinfo.py
-${PYSITELIB}/moss/fileinfo.pyc
-${PYSITELIB}/moss/fileinfo.pyo
-${PYSITELIB}/moss/htmltmpl.py
-${PYSITELIB}/moss/htmltmpl.pyc
-${PYSITELIB}/moss/htmltmpl.pyo
-${PYSITELIB}/moss/live.py
-${PYSITELIB}/moss/live.pyc
-${PYSITELIB}/moss/live.pyo
-${PYSITELIB}/moss/moss.py
-${PYSITELIB}/moss/moss.pyc
-${PYSITELIB}/moss/moss.pyo
-${PYSITELIB}/moss/mkpasswd.py
-${PYSITELIB}/moss/mkpasswd.pyc
-${PYSITELIB}/moss/mkpasswd.pyo
-${PYSITELIB}/moss/template.py
-${PYSITELIB}/moss/template.pyc
-${PYSITELIB}/moss/template.pyo
-${PYSITELIB}/moss/web.py
-${PYSITELIB}/moss/web.pyc
-${PYSITELIB}/moss/web.pyo
-share/examples/rc.d/moss
-share/moss/images/back.gif
-share/moss/images/dir.gif
-share/moss/images/file.gif
-share/moss/images/play.gif
-share/moss/images/root.gif
-share/moss/mkpasswd.py
-share/moss/moss.conf.sample
-share/moss/templates/default.tmpl
-@dirrm share/moss/templates
-@dirrm share/moss/images
-@dirrm share/moss
-@dirrm ${PYSITELIB}/moss
diff --git a/audio/moss/distinfo b/audio/moss/distinfo
deleted file mode 100644
index 6f65e56bbaf..00000000000
--- a/audio/moss/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 20:39:49 agc Exp $
-
-SHA1 (moss-0.1.13.tar.gz) = 238919100168cee55c8405b808d05de0e0658082
-RMD160 (moss-0.1.13.tar.gz) = fb6067ddf5fb404bc846c760c64c679a93ae308e
-Size (moss-0.1.13.tar.gz) = 43581 bytes
-SHA1 (patch-aa) = 31b252c52e4e0010064a1a9dca38dcd53d407d9e
diff --git a/audio/moss/files/moss.sh b/audio/moss/files/moss.sh
deleted file mode 100644
index 5198387b7a7..00000000000
--- a/audio/moss/files/moss.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: moss.sh,v 1.1.1.1 2004/08/10 06:48:21 minskim Exp $
-#
-
-# PROVIDE: moss
-# REQUIRE: DAEMON LOGIN wscons
-# KEYWORD: shutdown
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-name="moss"
-rcvar=$name
-command="@PREFIX@/bin/${name}"
-command_interpreter="@INTERPRETER@"
-pidfile="/var/run/moss.pid"
-required_files="@PREFIX@/etc/moss.conf"
-command_args="-c ${required_files}"
-
-if [ -f /etc/rc.subr ]; then
- load_rc_config $name
- run_rc_command "$1"
-else
- echo -n " ${name}"
- ${command} ${command_args}
-fi
diff --git a/audio/moss/patches/patch-aa b/audio/moss/patches/patch-aa
deleted file mode 100644
index 3aca948b681..00000000000
--- a/audio/moss/patches/patch-aa
+++ /dev/null
@@ -1,99 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2004/11/27 01:22:26 minskim Exp $
-
---- setup.py.orig Sat Oct 23 20:22:42 2004
-+++ setup.py
-@@ -41,50 +41,50 @@ class my_install_data(install_data):
- global installed_lib_dir
- install_data.finalize_options(self)
-
-- if not os.path.isdir(os.path.join(self.install_dir, "etc")):
-- print "creating %s" % os.path.join(self.install_dir, "etc")
-- os.mkdir(os.path.join(self.install_dir, "etc"))
--
-- if not os.path.isfile(os.path.join(self.install_dir, "etc", "moss.conf")):
-- print "creating %s" % os.path.join(self.install_dir, "etc", "moss.conf")
--
-- src = open("moss.conf.sample", "r")
-- dest = open(os.path.join(self.install_dir, "etc", "moss.conf"), "w")
--
-- for line in src.readlines():
-- if line.find("${PREFIX}") != -1:
-- line = line.replace("${PREFIX}", self.install_dir)
--
-- dest.write(line)
--
-- src.close()
-- dest.close()
-- else:
-- if self.force:
-- print "creating %s" % os.path.join(self.install_dir, "etc", "moss.conf")
--
-- src = open("moss.conf.sample", "r")
-- dest = open(os.path.join(self.install_dir, "etc", "moss.conf"), "w")
--
-- for line in src.readlines():
-- if line.find("${PREFIX}") != -1:
-- line = line.replace("${PREFIX}", self.install_dir)
--
-- dest.write(line)
--
-- src.close()
-- dest.close()
--
-- if not os.path.isdir(os.path.join(self.install_dir, "var")):
-- os.mkdir(os.path.join(self.install_dir, "var"))
--
-- if not os.path.isdir(os.path.join(self.install_dir, "var", "log")):
-- print "creating %s" % os.path.join(self.install_dir, "var", "log")
-- os.mkdir(os.path.join(self.install_dir, "var", "log"))
--
-- if not os.path.isdir(os.path.join(self.install_dir, "var", "run")):
-- print "creating %s" % os.path.join(self.install_dir, "var", "run")
-- os.mkdir(os.path.join(self.install_dir, "var", "run"))
-+# if not os.path.isdir(os.path.join(self.install_dir, "etc")):
-+# print "creating %s" % os.path.join(self.install_dir, "etc")
-+# os.mkdir(os.path.join(self.install_dir, "etc"))
-+#
-+# if not os.path.isfile(os.path.join(self.install_dir, "etc", "moss.conf")):
-+# print "creating %s" % os.path.join(self.install_dir, "etc", "moss.conf")
-+#
-+# src = open("moss.conf.sample", "r")
-+# dest = open(os.path.join(self.install_dir, "etc", "moss.conf"), "w")
-+#
-+# for line in src.readlines():
-+# if line.find("${PREFIX}") != -1:
-+# line = line.replace("${PREFIX}", self.install_dir)
-+#
-+# dest.write(line)
-+#
-+# src.close()
-+# dest.close()
-+# else:
-+# if self.force:
-+# print "creating %s" % os.path.join(self.install_dir, "etc", "moss.conf")
-+#
-+# src = open("moss.conf.sample", "r")
-+# dest = open(os.path.join(self.install_dir, "etc", "moss.conf"), "w")
-+#
-+# for line in src.readlines():
-+# if line.find("${PREFIX}") != -1:
-+# line = line.replace("${PREFIX}", self.install_dir)
-+#
-+# dest.write(line)
-+#
-+# src.close()
-+# dest.close()
-+#
-+# if not os.path.isdir(os.path.join(self.install_dir, "var")):
-+# os.mkdir(os.path.join(self.install_dir, "var"))
-+#
-+# if not os.path.isdir(os.path.join(self.install_dir, "var", "log")):
-+# print "creating %s" % os.path.join(self.install_dir, "var", "log")
-+# os.mkdir(os.path.join(self.install_dir, "var", "log"))
-+#
-+# if not os.path.isdir(os.path.join(self.install_dir, "var", "run")):
-+# print "creating %s" % os.path.join(self.install_dir, "var", "run")
-+# os.mkdir(os.path.join(self.install_dir, "var", "run"))
-
- if not os.path.isdir(os.path.join(self.install_dir, "share")):
- os.mkdir(os.path.join(self.install_dir, "share"))
diff --git a/audio/mp32ogg/DESCR b/audio/mp32ogg/DESCR
deleted file mode 100644
index ff021015d38..00000000000
--- a/audio/mp32ogg/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-A perl script to convert MP3 files to Ogg Vorbis files, retaining ID3
-information, bitrate, and optionally renaming the output files, as well
-as deleting the originals.
-
-THIS DEGRADES THE QUALITY, because it goes from one lossy format to
-another.
diff --git a/audio/mp32ogg/Makefile b/audio/mp32ogg/Makefile
deleted file mode 100644
index d127deb8ea8..00000000000
--- a/audio/mp32ogg/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2006/10/04 20:44:19 wiz Exp $
-
-DISTNAME= mp32ogg-0.11
-PKGREVISION= 3
-CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-EXTRACT_SUFX= # empty
-
-MAINTAINER= rxg@NetBSD.org
-HOMEPAGE= http://faceprint.com/code/
-COMMENT= Convert MP3 files to Ogg Vorbis files
-
-DEPENDS+= mpg123>=0.59.18:../../audio/mpg123
-DEPENDS+= vorbis-tools>=1.0.0.7:../../audio/vorbis-tools
-DEPENDS+= p5-MP3-Info>=1.00:../../audio/p5-MP3-Info
-DEPENDS+= p5-String-ShellQuote>=1.00:../../textproc/p5-String-ShellQuote
-
-WRKSRC= ${WRKDIR}
-EXTRACT_ONLY= # empty
-NO_BUILD= yes
-
-USE_TOOLS+= perl:run
-REPLACE_PERL= ${WRKSRC}/${DISTNAME}
-
-INSTALLATION_DIRS= bin
-
-do-extract:
- ${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin/mp32ogg
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mp32ogg/PLIST b/audio/mp32ogg/PLIST
deleted file mode 100644
index bb183502ce7..00000000000
--- a/audio/mp32ogg/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/03/02 02:51:02 rxg Exp $
-bin/mp32ogg
diff --git a/audio/mp32ogg/distinfo b/audio/mp32ogg/distinfo
deleted file mode 100644
index 6340e7316c3..00000000000
--- a/audio/mp32ogg/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:49 agc Exp $
-
-SHA1 (mp32ogg-0.11) = 03ac3955b8ed79233d6f3952152535f6cff48ff5
-RMD160 (mp32ogg-0.11) = 3ae39a86e662e37359d5041533413bd66ea27af4
-Size (mp32ogg-0.11) = 9216 bytes
diff --git a/audio/mp3_check/DESCR b/audio/mp3_check/DESCR
deleted file mode 100644
index 08c8c56c400..00000000000
--- a/audio/mp3_check/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-mp3_check verifies the integrity of mp3 audio files and prints useful
-statistics. This is handy for people who maintain libraries of mp3 files and
-need a way to verify their quality.
diff --git a/audio/mp3_check/Makefile b/audio/mp3_check/Makefile
deleted file mode 100644
index 6e2c24d5922..00000000000
--- a/audio/mp3_check/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:28:57 jlam Exp $
-#
-
-DISTNAME= mp3_check-1.98
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mp3check/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://mp3check.sourceforge.net/
-COMMENT= mp3 file checker
-
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/mp3_check ${PREFIX}/bin
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mp3_check/PLIST b/audio/mp3_check/PLIST
deleted file mode 100644
index 519cb5b143f..00000000000
--- a/audio/mp3_check/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:26 zuntum Exp $
-bin/mp3_check
diff --git a/audio/mp3_check/distinfo b/audio/mp3_check/distinfo
deleted file mode 100644
index 86e7aa3359c..00000000000
--- a/audio/mp3_check/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/10/29 16:26:21 tv Exp $
-
-SHA1 (mp3_check-1.98.tar.gz) = 64f796d9b29fecb34ce05b05d75404aadd8fdb52
-RMD160 (mp3_check-1.98.tar.gz) = d05203fdd1bc7079b6dfb71ed4f3b0ad074256b4
-Size (mp3_check-1.98.tar.gz) = 83098 bytes
-SHA1 (patch-aa) = a58c9a6ff729e9bc41b259146773a18440a41a8e
-SHA1 (patch-ab) = 6c63b7addb3721d392a00d36e8efef8464b66ebd
-SHA1 (patch-ac) = f3e348cbab998e4247f5e6630e55966df8bc6899
diff --git a/audio/mp3_check/patches/patch-aa b/audio/mp3_check/patches/patch-aa
deleted file mode 100644
index 63de5c3ac0d..00000000000
--- a/audio/mp3_check/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/10/29 16:26:21 tv Exp $
-
---- mp3_check.c.orig 2000-07-29 02:51:38.000000000 -0400
-+++ mp3_check.c
-@@ -62,7 +62,6 @@ GOALS: Initially, making a higly accura
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
--#include <getopt.h>
- #include "mp3_check.h"
-
- // FUNCTION PROTOTYPES HAPPEN HERE
diff --git a/audio/mp3_check/patches/patch-ab b/audio/mp3_check/patches/patch-ab
deleted file mode 100644
index 8f9a9f73e3e..00000000000
--- a/audio/mp3_check/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2002/01/21 11:34:57 wiz Exp $
-
---- mp3_check_misc.c.orig Sat Sep 16 05:36:01 2000
-+++ mp3_check_misc.c
-@@ -631,6 +631,8 @@
- int error_count = 0;
- int found_file = FALSE;
-
-+ fp = NULL;
-+ filename = NULL;
-
- do {
- if (*argv) {
diff --git a/audio/mp3_check/patches/patch-ac b/audio/mp3_check/patches/patch-ac
deleted file mode 100644
index 6b7826741ad..00000000000
--- a/audio/mp3_check/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2002/01/21 11:34:57 wiz Exp $
-
---- support_functions.h.orig Sat Jul 29 08:41:38 2000
-+++ support_functions.h
-@@ -680,7 +680,7 @@
- printf("%-20s%d\n", "BitRate", mp3_i->BIT_RATE);
- printf("%-20s%d\n", "SampRate", mp3_i->SAMPLE_FREQ);
- printf("%-20s%s\n", "BinString", mp3_i->BIN_STRING);
-- printf("%-20s%d\n", "BinLen", strlen(mp3_i->BIN_STRING));
-+ printf("%-20s%llu\n", "BinLen", (unsigned long long)strlen(mp3_i->BIN_STRING));
- printf("%-20s%u\n", "IntHeader", mp3_i->INT_HEADER);
- printf("%-20s0x%x\n", "CRC16Value", mp3_i->CRC16_VALUE);
- printf("%-20s0x%x\n", "Correct_CRC16Value", mp3_i->CORRECT_CRC16_VALUE);
diff --git a/audio/mp3asm/DESCR b/audio/mp3asm/DESCR
deleted file mode 100644
index c581c7c6734..00000000000
--- a/audio/mp3asm/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-An mpeg 1/2/2.5 audio layer 1,2,3 frame level editor. Allows for
-cutting, copying, pasting of individual frames, correction of
-common (correctable) errors, removal of bad frames and more.
-Quite useful program for maintaining any mp3 collection.
diff --git a/audio/mp3asm/Makefile b/audio/mp3asm/Makefile
deleted file mode 100644
index ced6ac7d256..00000000000
--- a/audio/mp3asm/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2005/12/05 20:49:49 rillig Exp $
-#
-
-DISTNAME= mp3asm-0.1.3-1
-PKGNAME= mp3asm-0.1.3.1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mp3asm/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= rxg@NetBSD.org
-HOMEPAGE= http://mp3asm.sourceforge.net/
-COMMENT= MPEG 1/2/2.5 audio layer 1,2,3 frame level editor
-
-WRKSRC= ${WRKDIR}/mp3asm-0.1
-GNU_CONFIGURE= yes
-
-post-patch:
- ${SED} "s/getprogname/_getprogname/g" ${WRKSRC}/src/mp3asm.c \
- > ${WRKSRC}/src/mp3asm.c.done
- ${MV} ${WRKSRC}/src/mp3asm.c.done ${WRKSRC}/src/mp3asm.c
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mp3asm
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/mp3asm
-
-.include "../../devel/sysexits/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mp3asm/PLIST b/audio/mp3asm/PLIST
deleted file mode 100644
index f475f5dc2cc..00000000000
--- a/audio/mp3asm/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/04/28 16:51:05 zuntum Exp $
-bin/mp3asm
-share/doc/mp3asm/README
-@dirrm share/doc/mp3asm
diff --git a/audio/mp3asm/distinfo b/audio/mp3asm/distinfo
deleted file mode 100644
index dda5fde9326..00000000000
--- a/audio/mp3asm/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:49 agc Exp $
-
-SHA1 (mp3asm-0.1.3-1.tar.bz2) = 78d70be0a05f4357175a094d39f88ef74e5ccbfc
-RMD160 (mp3asm-0.1.3-1.tar.bz2) = 6f3be47630afd324d4eacf01b71a1d50d541b44d
-Size (mp3asm-0.1.3-1.tar.bz2) = 46530 bytes
-SHA1 (patch-aa) = 3e4f9ca6f746b5664d77b2342dc9b787e601af83
-SHA1 (patch-ab) = f397eafdfe95040104ec33ea3065d22ba05af6cf
diff --git a/audio/mp3asm/patches/patch-aa b/audio/mp3asm/patches/patch-aa
deleted file mode 100644
index 2c9cc6a927c..00000000000
--- a/audio/mp3asm/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/04/28 16:51:05 zuntum Exp $
-
---- src/mp3asm.h.orig Tue Mar 20 09:45:48 2001
-+++ src/mp3asm.h
-@@ -30,7 +30,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sysexits.h>
--#include <argz.h>
- #include <ctype.h>
-
- #define LOGBUFSIZE 4096
diff --git a/audio/mp3asm/patches/patch-ab b/audio/mp3asm/patches/patch-ab
deleted file mode 100644
index 672970604e8..00000000000
--- a/audio/mp3asm/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/04/28 16:51:05 zuntum Exp $
-
---- src/utils.c.orig Sat Aug 18 04:44:09 2001
-+++ src/utils.c
-@@ -25,6 +25,7 @@
- #include "utils.h"
- #include <unistd.h>
- #include <stdio.h>
-+#include <errno.h>
-
- /*
- * tmalloc: mallocs cleanly
diff --git a/audio/mp3blaster/DESCR b/audio/mp3blaster/DESCR
deleted file mode 100644
index 4a8dea61e09..00000000000
--- a/audio/mp3blaster/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-mp3blaster is an interactive text-based mp3player. One of
-the unique features of this player is the ability to divide
-a playlist into groups (albums). Therefore, the play order
-can be adjusted with great flexibility.
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
deleted file mode 100644
index dacc18cb328..00000000000
--- a/audio/mp3blaster/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2006/10/04 20:44:19 wiz Exp $
-
-DISTNAME= mp3blaster-3.2.0
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= http://www.stack.nl/~brama/mp3blaster/src/
-
-MAINTAINER= rxg@NetBSD.org
-HOMEPAGE= http://mp3blaster.sourceforge.net/
-COMMENT= MP3 console curses-based player
-
-PTHREAD_OPTS+= require
-USE_LANGUAGES= c c++
-USE_TOOLS+= gmake
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--with-cxxflags=${CXXFLAGS:Q} \
- --with-curses \
- --with-oggvorbis
-
-.include "../../mk/pthread.buildlink3.mk"
-
-.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
-CONFIGURE_ARGS+= --enable-newthreads
-.endif
-
-post-extract:
- ${MKDIR} ${WRKSRC}/getopt
- ${MV} ${WRKSRC}/nmixer/getopt.h ${WRKSRC}/nmixer/getopt.c \
- ${WRKSRC}/nmixer/getopt1.c ${WRKSRC}/getopt
- ${RM} ${WRKSRC}/src/getopt.h ${WRKSRC}/src/getopt.c \
- ${WRKSRC}/src/getopt1.c
-
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mp3blaster/PLIST b/audio/mp3blaster/PLIST
deleted file mode 100644
index 209a7227b78..00000000000
--- a/audio/mp3blaster/PLIST
+++ /dev/null
@@ -1,17 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2002/11/22 17:02:04 jschauma Exp $
-bin/mp3blaster
-bin/mp3tag
-bin/nmixer
-man/man1/mp3blaster.1
-man/man1/nmixer.1
-share/mp3blaster/charmap/README
-share/mp3blaster/charmap/chargen.c
-share/mp3blaster/charmap/koi8-r
-share/mp3blaster/charmap/makefile.charmap
-share/mp3blaster/charmap/maketbl.c
-share/mp3blaster/charmap/win1251
-share/mp3blaster/charmap/win2koi.tbl
-share/mp3blaster/commands.txt
-share/mp3blaster/sample.mp3blasterrc
-@dirrm share/mp3blaster/charmap
-@dirrm share/mp3blaster
diff --git a/audio/mp3blaster/distinfo b/audio/mp3blaster/distinfo
deleted file mode 100644
index 796802da0fd..00000000000
--- a/audio/mp3blaster/distinfo
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: distinfo,v 1.9 2007/01/08 00:07:59 cbiere Exp $
-
-SHA1 (mp3blaster-3.2.0.tar.gz) = edc4538ad233270dd4b17066c5d2267708f1b5e0
-RMD160 (mp3blaster-3.2.0.tar.gz) = 462c75e27c91ac7473103bd0e08882bea3d0db8d
-Size (mp3blaster-3.2.0.tar.gz) = 312991 bytes
-SHA1 (patch-aa) = d869d2acb66edbf569f39fd8d35e66b4651b4f77
-SHA1 (patch-ab) = f4d2486c915e593c81653df1285d532706e4107b
-SHA1 (patch-ac) = 3ad9344d22e511682ad05ab1e2dfbc057fb6cf96
-SHA1 (patch-ad) = 99a3f363c3c6fb084a6790aceeb7b5ecd45cfb9f
-SHA1 (patch-ae) = 65feb8611cea4b0f6e8de593e56972d676fb64d4
-SHA1 (patch-af) = bc48687a1e08d1884f79d5e0b5835f60435ea0a2
-SHA1 (patch-ag) = 38a3924df2ec474ca82f69d8b6c47a7e9df2bde3
-SHA1 (patch-ah) = 8dfd9c60b113a925187187100b785bb99d5f4722
-SHA1 (patch-ai) = 6a95a0ff24b09e4bc3b13cc5a09336f43a03bcbd
-SHA1 (patch-aj) = db1484dbbb10e951dd88b1b40bedafe3c6ede174
-SHA1 (patch-ak) = 35ec20a47287e0a158b385be3e8fcc133684d40b
-SHA1 (patch-al) = 746d2441b79530f3efa51bcd2bce847f247eec7c
-SHA1 (patch-am) = 14c4dff0bd8d02e5b9a3f3968602c76241905e26
-SHA1 (patch-an) = 7e801e08c2d5e72ff6dd4215c8d3466362fc54b1
-SHA1 (patch-ao) = d3c3fc1c5d51791282e196ee6381fd2f542f695e
-SHA1 (patch-ap) = cbad4001c1d1440150ec738797bc8e5238d019e8
-SHA1 (patch-aq) = a1dd9085c242d9050a1d9a3f70d40615f06a217d
diff --git a/audio/mp3blaster/patches/patch-aa b/audio/mp3blaster/patches/patch-aa
deleted file mode 100644
index 491a44a8a10..00000000000
--- a/audio/mp3blaster/patches/patch-aa
+++ /dev/null
@@ -1,321 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2003/12/03 12:31:36 cube Exp $
-
---- getopt/Makefile.in.orig 2003-11-29 15:26:17.000000000 +0100
-+++ getopt/Makefile.in
-@@ -0,0 +1,316 @@
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+
-+DESTDIR =
-+
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+
-+top_builddir = ..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+transform = @program_transform_name@
-+
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+host_alias = @host_alias@
-+host_triplet = @host@
-+CC = @CC@
-+CXX = @CXX@
-+HAVE_LIB = @HAVE_LIB@
-+LIB = @LIB@
-+LIBGETOPT = @LIBGETOPT@
-+LIBMPEGSOUND = @LIBMPEGSOUND@
-+LIBMYSQL = @LIBMYSQL@
-+LIBNMIXER = @LIBNMIXER@
-+LIRC_LIBS = @LIRC_LIBS@
-+LN_S = @LN_S@
-+LTLIB = @LTLIB@
-+MAKEINFO = @MAKEINFO@
-+MP3B_MODULES = @MP3B_MODULES@
-+NAS_CFLAGS = @NAS_CFLAGS@
-+NAS_LIBS = @NAS_LIBS@
-+NCURSES_LIBS = @NCURSES_LIBS@
-+OGG_LIBS = @OGG_LIBS@
-+PACKAGE = @PACKAGE@
-+RANLIB = @RANLIB@
-+SID_LIBS = @SID_LIBS@
-+SRCDIRS = @SRCDIRS@
-+VERSION = @VERSION@
-+
-+noinst_LIBRARIES = libgetopt.a
-+libgetopt_a_SOURCES = gnugetopt.h getopt.c getopt1.c
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = ../config.h
-+CONFIG_CLEAN_FILES =
-+LIBRARIES = $(noinst_LIBRARIES)
-+
-+
-+DEFS = @DEFS@ -I. -I$(srcdir) -I..
-+CPPFLAGS = @CPPFLAGS@
-+LDFLAGS = @LDFLAGS@
-+LIBS = @LIBS@
-+X_CFLAGS = @X_CFLAGS@
-+X_LIBS = @X_LIBS@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+libgetopt_a_LIBADD =
-+libgetopt_a_OBJECTS = getopt.o getopt1.o
-+AR = ar
-+CFLAGS = @CFLAGS@
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-+DIST_COMMON = Makefile.am Makefile.in
-+
-+
-+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+
-+TAR = tar
-+GZIP_ENV = --best
-+DEP_FILES = .deps/getopt.P .deps/getopt1.P
-+SOURCES = $(libgetopt_a_SOURCES)
-+OBJECTS = $(libgetopt_a_OBJECTS)
-+
-+all: all-redirect
-+.SUFFIXES:
-+.SUFFIXES: .S .c .o .s
-+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+ cd $(top_srcdir) && $(AUTOMAKE) --gnu getopt/Makefile
-+
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
-+ cd $(top_builddir) \
-+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+
-+mostlyclean-noinstLIBRARIES:
-+
-+clean-noinstLIBRARIES:
-+ -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-+
-+distclean-noinstLIBRARIES:
-+
-+maintainer-clean-noinstLIBRARIES:
-+
-+.s.o:
-+ $(COMPILE) -c $<
-+
-+.S.o:
-+ $(COMPILE) -c $<
-+
-+mostlyclean-compile:
-+ -rm -f *.o core *.core
-+
-+clean-compile:
-+
-+distclean-compile:
-+ -rm -f *.tab.c
-+
-+maintainer-clean-compile:
-+
-+libgetopt.a: $(libgetopt_a_OBJECTS) $(libgetopt_a_DEPENDENCIES)
-+ -rm -f libgetopt.a
-+ $(AR) cru libgetopt.a $(libgetopt_a_OBJECTS) $(libgetopt_a_LIBADD)
-+ $(RANLIB) libgetopt.a
-+
-+tags: TAGS
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP)
-+ list='$(SOURCES) $(HEADERS)'; \
-+ unique=`for i in $$list; do echo $$i; done | \
-+ awk ' { files[$$0] = 1; } \
-+ END { for (i in files) print i; }'`; \
-+ here=`pwd` && cd $(srcdir) \
-+ && mkid -f$$here/ID $$unique $(LISP)
-+
-+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
-+ tags=; \
-+ here=`pwd`; \
-+ list='$(SOURCES) $(HEADERS)'; \
-+ unique=`for i in $$list; do echo $$i; done | \
-+ awk ' { files[$$0] = 1; } \
-+ END { for (i in files) print i; }'`; \
-+ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-+ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
-+
-+mostlyclean-tags:
-+
-+clean-tags:
-+
-+distclean-tags:
-+ -rm -f TAGS ID
-+
-+maintainer-clean-tags:
-+
-+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-+
-+subdir = getopt
-+
-+distdir: $(DISTFILES)
-+ here=`cd $(top_builddir) && pwd`; \
-+ top_distdir=`cd $(top_distdir) && pwd`; \
-+ distdir=`cd $(distdir) && pwd`; \
-+ cd $(top_srcdir) \
-+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu getopt/Makefile
-+ @for file in $(DISTFILES); do \
-+ d=$(srcdir); \
-+ if test -d $$d/$$file; then \
-+ cp -pr $$d/$$file $(distdir)/$$file; \
-+ else \
-+ test -f $(distdir)/$$file \
-+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-+ || cp -p $$d/$$file $(distdir)/$$file || :; \
-+ fi; \
-+ done
-+
-+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-+
-+-include $(DEP_FILES)
-+
-+mostlyclean-depend:
-+
-+clean-depend:
-+
-+distclean-depend:
-+ -rm -rf .deps
-+
-+maintainer-clean-depend:
-+
-+%.o: %.c
-+ @echo '$(COMPILE) -c $<'; \
-+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
-+ tr ' ' '\012' < .deps/$(*F).pp \
-+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+ >> .deps/$(*F).P; \
-+ rm .deps/$(*F).pp
-+
-+%.lo: %.c
-+ @echo '$(LTCOMPILE) -c $<'; \
-+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
-+ < .deps/$(*F).pp > .deps/$(*F).P; \
-+ tr ' ' '\012' < .deps/$(*F).pp \
-+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+ >> .deps/$(*F).P; \
-+ rm -f .deps/$(*F).pp
-+info-am:
-+info: info-am
-+dvi-am:
-+dvi: dvi-am
-+check-am: all-am
-+check: check-am
-+installcheck-am:
-+installcheck: installcheck-am
-+install-exec-am:
-+install-exec: install-exec-am
-+
-+install-data-am:
-+install-data: install-data-am
-+
-+install-am: all-am
-+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+install: install-am
-+uninstall-am:
-+uninstall: uninstall-am
-+all-am: Makefile $(LIBRARIES)
-+all-redirect: all-am
-+install-strip:
-+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-+installdirs:
-+
-+
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
-+ -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+
-+maintainer-clean-generic:
-+mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \
-+ mostlyclean-tags mostlyclean-depend mostlyclean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-depend \
-+ clean-generic mostlyclean-am
-+
-+clean: clean-am
-+
-+distclean-am: distclean-noinstLIBRARIES distclean-compile \
-+ distclean-tags distclean-depend distclean-generic \
-+ clean-am
-+
-+distclean: distclean-am
-+
-+maintainer-clean-am: maintainer-clean-noinstLIBRARIES \
-+ maintainer-clean-compile maintainer-clean-tags \
-+ maintainer-clean-depend maintainer-clean-generic \
-+ distclean-am
-+ @echo "This command is intended for maintainers to use;"
-+ @echo "it deletes files that may require special tools to rebuild."
-+
-+maintainer-clean: maintainer-clean-am
-+
-+.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-+clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-+mostlyclean-compile distclean-compile clean-compile \
-+maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
-+distclean-depend clean-depend maintainer-clean-depend info-am info \
-+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-+install-exec install-data-am install-data install-am install \
-+uninstall-am uninstall all-redirect all-am all installdirs \
-+mostlyclean-generic distclean-generic clean-generic \
-+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
diff --git a/audio/mp3blaster/patches/patch-ab b/audio/mp3blaster/patches/patch-ab
deleted file mode 100644
index 017a84388eb..00000000000
--- a/audio/mp3blaster/patches/patch-ab
+++ /dev/null
@@ -1,264 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2003/12/03 12:31:36 cube Exp $
-
---- src/Makefile.in.orig 2003-11-28 21:07:27.000000000 +0100
-+++ src/Makefile.in
-@@ -10,6 +10,8 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
-
-+#bin_PROGRAMS = mp3blaster mp3tag splay
-+
-
- SHELL = @SHELL@
-
-@@ -63,6 +65,7 @@ CC = @CC@
- CXX = @CXX@
- HAVE_LIB = @HAVE_LIB@
- LIB = @LIB@
-+LIBGETOPT = @LIBGETOPT@
- LIBMPEGSOUND = @LIBMPEGSOUND@
- LIBMYSQL = @LIBMYSQL@
- LIBNMIXER = @LIBNMIXER@
-@@ -81,19 +84,15 @@ SID_LIBS = @SID_LIBS@
- SRCDIRS = @SRCDIRS@
- VERSION = @VERSION@
-
--bin_PROGRAMS = mp3blaster mp3tag splay
--#bin_PROGRAMS = mp3blaster mp3tag
--mp3blaster_SOURCES = fileman.cc main.cc scrollwin.cc getopt.c getopt1.c fileman.h genretab.h getopt.h id3parse.cc id3parse.h mp3blaster.h global.cc global.h config.cc scrollwin.h winitem.cc winitem.h mp3win.cc mp3win.h mp3item.cc mp3item.h keybindings.h history.cc history.h getinput.cc getinput.h interface.cc interface.h
--
--splay_SOURCES = splay.cc splay.h splay_common.cc
--splay_DEPENDENCIES = ../mpegsound/libmpegsound.a
--splay_LDADD = @LIBMPEGSOUND@
-+bin_PROGRAMS = mp3blaster mp3tag
-+mp3blaster_SOURCES = fileman.cc main.cc scrollwin.cc fileman.h genretab.h id3parse.cc id3parse.h mp3blaster.h global.cc global.h config.cc scrollwin.h winitem.cc winitem.h mp3win.cc mp3win.h mp3item.cc mp3item.h keybindings.h history.cc history.h getinput.cc getinput.h interface.cc interface.h
-+
- mp3tag_SOURCES = id3parse.cc mp3tag.cc id3parse.h
- mp3tag_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
- mp3tag_LDADD = @LIBMPEGSOUND@ @LIBMYSQL@
--mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
-+mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a ../getopt/libgetopt.a
- INCLUDES = -I$(top_srcdir)/mpegsound -I/usr/include/ncurses -I$(top_srcdir)/nmixer -I$(includedir)
--mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @LIRC_LIBS@ @NCURSES_LIBS@
-+mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @LIBGETOPT@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @LIRC_LIBS@ @NCURSES_LIBS@
- EXTRA_DIST = FILES
- CXXFLAGS = @CXXFLAGS@ @NAS_CFLAGS@ -DMP3BLASTER_DOCDIR=\"${pkgdatadir}\"
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -110,14 +109,11 @@ X_CFLAGS = @X_CFLAGS@
- X_LIBS = @X_LIBS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
--mp3blaster_OBJECTS = fileman.o main.o scrollwin.o getopt.o getopt1.o \
--id3parse.o global.o config.o winitem.o mp3win.o mp3item.o history.o \
--getinput.o interface.o
-+mp3blaster_OBJECTS = fileman.o main.o scrollwin.o id3parse.o global.o \
-+config.o winitem.o mp3win.o mp3item.o history.o getinput.o interface.o
- mp3blaster_LDFLAGS =
- mp3tag_OBJECTS = id3parse.o mp3tag.o
- mp3tag_LDFLAGS =
--splay_OBJECTS = splay.o splay_common.o
--splay_LDFLAGS =
- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
- CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
-@@ -132,16 +128,20 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(
-
- TAR = tar
- GZIP_ENV = --best
--SOURCES = $(mp3blaster_SOURCES) $(mp3tag_SOURCES) $(splay_SOURCES)
--OBJECTS = $(mp3blaster_OBJECTS) $(mp3tag_OBJECTS) $(splay_OBJECTS)
-+DEP_FILES = .deps/config.P .deps/fileman.P .deps/getinput.P \
-+.deps/global.P .deps/history.P .deps/id3parse.P .deps/interface.P \
-+.deps/main.P .deps/mp3item.P .deps/mp3tag.P .deps/mp3win.P \
-+.deps/scrollwin.P .deps/winitem.P
-+SOURCES = $(mp3blaster_SOURCES) $(mp3tag_SOURCES)
-+OBJECTS = $(mp3blaster_OBJECTS) $(mp3tag_OBJECTS)
-
- all: all-redirect
- .SUFFIXES:
- .SUFFIXES: .S .c .cc .o .s
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
-+ cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
-
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-@@ -171,9 +171,6 @@ uninstall-binPROGRAMS:
- rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- done
-
--.c.o:
-- $(COMPILE) -c $<
--
- .s.o:
- $(COMPILE) -c $<
-
-@@ -197,10 +194,6 @@ mp3blaster: $(mp3blaster_OBJECTS) $(mp3b
- mp3tag: $(mp3tag_OBJECTS) $(mp3tag_DEPENDENCIES)
- @rm -f mp3tag
- $(CXXLINK) $(mp3tag_LDFLAGS) $(mp3tag_OBJECTS) $(mp3tag_LDADD) $(LIBS)
--
--splay: $(splay_OBJECTS) $(splay_DEPENDENCIES)
-- @rm -f splay
-- $(CXXLINK) $(splay_LDFLAGS) $(splay_OBJECTS) $(splay_LDADD) $(LIBS)
- .cc.o:
- $(CXXCOMPILE) -c $<
-
-@@ -222,7 +215,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
- awk ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-- || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
-+ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
-
- mostlyclean-tags:
-
-@@ -238,6 +231,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V
- subdir = src
-
- distdir: $(DISTFILES)
-+ here=`cd $(top_builddir) && pwd`; \
-+ top_distdir=`cd $(top_distdir) && pwd`; \
-+ distdir=`cd $(distdir) && pwd`; \
-+ cd $(top_srcdir) \
-+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
- if test -d $$d/$$file; then \
-@@ -248,33 +246,57 @@ distdir: $(DISTFILES)
- || cp -p $$d/$$file $(distdir)/$$file || :; \
- fi; \
- done
--config.o: config.cc mp3blaster.h ../config.h global.h
--fileman.o: fileman.cc mp3blaster.h ../config.h getopt.h fileman.h \
-- scrollwin.h winitem.h global.h
--getinput.o: getinput.cc getinput.h ../config.h
--getopt.o: getopt.c ../config.h
--getopt1.o: getopt1.c ../config.h getopt.h
--global.o: global.cc getopt.h mp3blaster.h ../config.h id3parse.h
--history.o: history.cc ../config.h history.h getopt.h
--id3parse.o: id3parse.cc id3parse.h genretab.h
--interface.o: interface.cc
--main.o: main.cc ../config.h history.h getopt.h mp3blaster.h global.h \
-- scrollwin.h winitem.h mp3win.h fileman.h \
-- ../mpegsound/mpegsound.h ../nmixer/nmixer.h keybindings.h \
-- getinput.h
--mp3item.o: mp3item.cc mp3item.h winitem.h mp3blaster.h ../config.h \
-- mp3win.h scrollwin.h
--mp3tag.o: mp3tag.cc mp3blaster.h ../config.h getopt.h \
-- ../mpegsound/mpegsound.h id3parse.h
--mp3win.o: mp3win.cc mp3win.h scrollwin.h mp3blaster.h ../config.h \
-- winitem.h mp3item.h
--scrollwin.o: scrollwin.cc mp3blaster.h ../config.h global.h scrollwin.h \
-- winitem.h
--splay.o: splay.cc ../config.h getopt.h ../mpegsound/mpegsound.h splay.h
--splay_common.o: splay_common.cc ../config.h ../mpegsound/mpegsound.h \
-- getopt.h splay.h
--winitem.o: winitem.cc mp3blaster.h ../config.h scrollwin.h winitem.h
-
-+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-+
-+-include $(DEP_FILES)
-+
-+mostlyclean-depend:
-+
-+clean-depend:
-+
-+distclean-depend:
-+ -rm -rf .deps
-+
-+maintainer-clean-depend:
-+
-+%.o: %.c
-+ @echo '$(COMPILE) -c $<'; \
-+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
-+ tr ' ' '\012' < .deps/$(*F).pp \
-+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+ >> .deps/$(*F).P; \
-+ rm .deps/$(*F).pp
-+
-+%.lo: %.c
-+ @echo '$(LTCOMPILE) -c $<'; \
-+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
-+ < .deps/$(*F).pp > .deps/$(*F).P; \
-+ tr ' ' '\012' < .deps/$(*F).pp \
-+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+ >> .deps/$(*F).P; \
-+ rm -f .deps/$(*F).pp
-+
-+%.o: %.cc
-+ @echo '$(CXXCOMPILE) -c $<'; \
-+ $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
-+ tr ' ' '\012' < .deps/$(*F).pp \
-+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+ >> .deps/$(*F).P; \
-+ rm .deps/$(*F).pp
-+
-+%.lo: %.cc
-+ @echo '$(LTCXXCOMPILE) -c $<'; \
-+ $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
-+ < .deps/$(*F).pp > .deps/$(*F).P; \
-+ tr ' ' '\012' < .deps/$(*F).pp \
-+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+ >> .deps/$(*F).P; \
-+ rm -f .deps/$(*F).pp
- info-am:
- info: info-am
- dvi-am:
-@@ -312,23 +334,24 @@ distclean-generic:
-
- maintainer-clean-generic:
- mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \
-- mostlyclean-tags mostlyclean-generic
-+ mostlyclean-tags mostlyclean-depend mostlyclean-generic
-
- mostlyclean: mostlyclean-am
-
--clean-am: clean-binPROGRAMS clean-compile clean-tags clean-generic \
-- mostlyclean-am
-+clean-am: clean-binPROGRAMS clean-compile clean-tags clean-depend \
-+ clean-generic mostlyclean-am
-
- clean: clean-am
-
- distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \
-- distclean-generic clean-am
-+ distclean-depend distclean-generic clean-am
-
- distclean: distclean-am
-
- maintainer-clean-am: maintainer-clean-binPROGRAMS \
- maintainer-clean-compile maintainer-clean-tags \
-- maintainer-clean-generic distclean-am
-+ maintainer-clean-depend maintainer-clean-generic \
-+ distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
-
-@@ -338,12 +361,13 @@ maintainer-clean: maintainer-clean-am
- maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
- mostlyclean-compile distclean-compile clean-compile \
- maintainer-clean-compile tags mostlyclean-tags distclean-tags \
--clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
--check-am installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
-+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
-+distclean-depend clean-depend maintainer-clean-depend info-am info \
-+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-+install-exec install-data-am install-data install-am install \
-+uninstall-am uninstall all-redirect all-am all installdirs \
-+mostlyclean-generic distclean-generic clean-generic \
-+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
- @MP3B_MODULES@
-
diff --git a/audio/mp3blaster/patches/patch-ac b/audio/mp3blaster/patches/patch-ac
deleted file mode 100644
index 457254c025c..00000000000
--- a/audio/mp3blaster/patches/patch-ac
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2003/12/03 12:31:36 cube Exp $
-
---- Makefile.in.orig 2003-11-28 21:07:22.000000000 +0100
-+++ Makefile.in
-@@ -63,6 +63,7 @@ CC = @CC@
- CXX = @CXX@
- HAVE_LIB = @HAVE_LIB@
- LIB = @LIB@
-+LIBGETOPT = @LIBGETOPT@
- LIBMPEGSOUND = @LIBMPEGSOUND@
- LIBMYSQL = @LIBMYSQL@
- LIBNMIXER = @LIBNMIXER@
-@@ -81,8 +82,8 @@ SID_LIBS = @SID_LIBS@
- SRCDIRS = @SRCDIRS@
- VERSION = @VERSION@
-
--SUBDIRS = mpegsound nmixer src doc
--man_MANS = mp3blaster.1 nmixer.1 splay.1
-+SUBDIRS = getopt mpegsound nmixer src doc
-+man_MANS = mp3blaster.1 nmixer.1
- EXTRA_DIST = CREDITS TODO FAQ mp3blaster.1 nmixer.1 BUGS splay.1 mp3blaster.list mp3blaster.spec
-
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -106,9 +107,9 @@ GZIP_ENV = --best
- all: all-redirect
- .SUFFIXES:
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
-+ cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
-
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
- cd $(top_builddir) \
- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-@@ -265,7 +266,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
- awk ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
-- || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
-+ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
-
- mostlyclean-tags:
-
-@@ -314,6 +315,11 @@ distdir: $(DISTFILES)
- -rm -rf $(distdir)
- mkdir $(distdir)
- -chmod 777 $(distdir)
-+ here=`cd $(top_builddir) && pwd`; \
-+ top_distdir=`cd $(distdir) && pwd`; \
-+ distdir=`cd $(distdir) && pwd`; \
-+ cd $(top_srcdir) \
-+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
- if test -d $$d/$$file; then \
diff --git a/audio/mp3blaster/patches/patch-ad b/audio/mp3blaster/patches/patch-ad
deleted file mode 100644
index 58565badcdc..00000000000
--- a/audio/mp3blaster/patches/patch-ad
+++ /dev/null
@@ -1,99 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2005/12/11 22:22:37 joerg Exp $
-
---- configure.orig 2003-11-28 20:07:16.000000000 +0000
-+++ configure
-@@ -1591,7 +1591,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional
- fi
- fi
-
--for ac_func in strdup strstr
-+for ac_func in strdup strstr getopt_long_only
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
- echo "configure:1598: checking for $ac_func" >&5
-@@ -1665,7 +1665,14 @@ if test "`uname -s`" = "FreeBSD" ; then
- cat >> confdefs.h <<\EOF
- #define AUDIO_NONBLOCKING 1
- EOF
-+fi
-
-+if test "`uname -s`" = "DragonFly" ; then
-+ echo "DragonFly detected."
-+ DRAGONFLY=1
-+ cat >> confdefs.h <<\EOF
-+#define AUDIO_NONBLOCKING 1
-+EOF
- fi
-
- #For NetBSD, look in /usr/pkg/(lib,include) first. Otherwise, the wrong
-@@ -1987,7 +1994,7 @@ fi
-
-
- if test "$INCLUDEPTHREAD" = 1 ; then
-- if test "$FREEBSD" = 1 -o "$OPENBSD" = 1 ; then
-+ if test "$FREEBSD" = 1 -o "$OPENBSD" = 1 -o "$DRAGONFLY" = 1 ; then
- LDFLAGS="$LDFLAGS -pthread"
- else
- echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6
-@@ -2542,7 +2549,7 @@ else
- fi
- done
-
--for ac_hdr in sys/soundcard.h machine/soundcard.h soundcard.h getopt.h
-+for ac_hdr in sys/soundcard.h machine/soundcard.h soundcard.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -3862,7 +3869,7 @@ EOF
-
-
- if test "$INCLUDEPTHREAD" = 1 ; then
-- if test "$FREEBSD" = 1 -o "$OPENBSD" = 1 ; then
-+ if test "$FREEBSD" = 1 -o "$OPENBSD" = 1 -o "$DRAGONFLY" = 1 ; then
- LDFLAGS="$LDFLAGS -pthread"
- cat >> confdefs.h <<\EOF
- #define _THREAD_SAFE 1
-@@ -3907,13 +3914,15 @@ fi
-
-
-
--LDFLAGS="$LDFLAGS -L../mpegsound -L../nmixer"
-+LDFLAGS="$LDFLAGS -L../mpegsound -L../nmixer -L../getopt"
- LIBMPEGSOUND="-lmpegsound"
- LIBNMIXER="-lnmixer"
-+LIBGETOPT="-lgetopt"
-+
-
-
-
--SRCDIRS="mpegsound nmixer src doc doc/charmap"
-+SRCDIRS="getopt mpegsound nmixer src doc doc/charmap"
-
- trap '' 1 2 15
- cat > confcache <<\EOF
-@@ -4016,7 +4025,7 @@ done
- ac_given_srcdir=$srcdir
- ac_given_INSTALL="$INSTALL"
-
--trap 'rm -fr `echo "src/Makefile mpegsound/Makefile Makefile nmixer/Makefile doc/Makefile doc/charmap/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-+trap 'rm -fr `echo "getopt/Makefile src/Makefile mpegsound/Makefile Makefile nmixer/Makefile doc/Makefile doc/charmap/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
- EOF
- cat >> $CONFIG_STATUS <<EOF
-
-@@ -4079,6 +4088,7 @@ s%@NAS_CFLAGS@%$NAS_CFLAGS%g
- s%@NCURSES_LIBS@%$NCURSES_LIBS%g
- s%@LIBMPEGSOUND@%$LIBMPEGSOUND%g
- s%@LIBNMIXER@%$LIBNMIXER%g
-+s%@LIBGETOPT@%$LIBGETOPT%g
- s%@SRCDIRS@%$SRCDIRS%g
-
- CEOF
-@@ -4121,7 +4131,7 @@ EOF
-
- cat >> $CONFIG_STATUS <<EOF
-
--CONFIG_FILES=\${CONFIG_FILES-"src/Makefile mpegsound/Makefile Makefile nmixer/Makefile doc/Makefile doc/charmap/Makefile"}
-+CONFIG_FILES=\${CONFIG_FILES-"getopt/Makefile src/Makefile mpegsound/Makefile Makefile nmixer/Makefile doc/Makefile doc/charmap/Makefile"}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/audio/mp3blaster/patches/patch-ae b/audio/mp3blaster/patches/patch-ae
deleted file mode 100644
index 780e2986af6..00000000000
--- a/audio/mp3blaster/patches/patch-ae
+++ /dev/null
@@ -1,199 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2003/12/03 12:31:37 cube Exp $
-
---- nmixer/Makefile.in.orig 2003-11-28 21:07:25.000000000 +0100
-+++ nmixer/Makefile.in
-@@ -63,6 +63,7 @@ CC = @CC@
- CXX = @CXX@
- HAVE_LIB = @HAVE_LIB@
- LIB = @LIB@
-+LIBGETOPT = @LIBGETOPT@
- LIBMPEGSOUND = @LIBMPEGSOUND@
- LIBMYSQL = @LIBMYSQL@
- LIBNMIXER = @LIBNMIXER@
-@@ -83,12 +84,11 @@ VERSION = @VERSION@
-
- bin_PROGRAMS = nmixer
- nmixer_SOURCES = main.cc
--nmixer_DEPENDENCIES = @LIBNMIXER@
--LDADD = @LIBNMIXER@ @NCURSES_LIBS@
-+nmixer_DEPENDENCIES = @LIBNMIXER@ ../getopt/libgetopt.a
-+LDADD = @LIBNMIXER@ @NCURSES_LIBS@ @LIBGETOPT@
- INCLUDES = -I/usr/include/ncurses -I$(srcdir) -I$(includedir)
- noinst_LIBRARIES = libnmixer.a
--libnmixer_a_SOURCES = nmixer.cc mixers.cc ossmixer.cc nasmixer.cc nmixer.h getopt.c getopt1.c getopt.h
--
-+libnmixer_a_SOURCES = nmixer.cc mixers.cc ossmixer.cc nasmixer.cc nmixer.h
- CXXFLAGS = @NAS_CFLAGS@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
-@@ -105,8 +105,7 @@ X_LIBS = @X_LIBS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- libnmixer_a_LIBADD =
--libnmixer_a_OBJECTS = nmixer.o mixers.o ossmixer.o nasmixer.o getopt.o \
--getopt1.o
-+libnmixer_a_OBJECTS = nmixer.o mixers.o ossmixer.o nasmixer.o
- AR = ar
- PROGRAMS = $(bin_PROGRAMS)
-
-@@ -128,6 +127,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(
-
- TAR = tar
- GZIP_ENV = --best
-+DEP_FILES = .deps/main.P .deps/mixers.P .deps/nasmixer.P .deps/nmixer.P \
-+.deps/ossmixer.P
- SOURCES = $(libnmixer_a_SOURCES) $(nmixer_SOURCES)
- OBJECTS = $(libnmixer_a_OBJECTS) $(nmixer_OBJECTS)
-
-@@ -135,9 +136,9 @@ all: all-redirect
- .SUFFIXES:
- .SUFFIXES: .S .c .cc .o .s
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps nmixer/Makefile
-+ cd $(top_srcdir) && $(AUTOMAKE) --gnu nmixer/Makefile
-
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-@@ -151,9 +152,6 @@ distclean-noinstLIBRARIES:
-
- maintainer-clean-noinstLIBRARIES:
-
--.c.o:
-- $(COMPILE) -c $<
--
- .s.o:
- $(COMPILE) -c $<
-
-@@ -224,7 +222,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
- awk ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-- || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
-+ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
-
- mostlyclean-tags:
-
-@@ -240,6 +238,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V
- subdir = nmixer
-
- distdir: $(DISTFILES)
-+ here=`cd $(top_builddir) && pwd`; \
-+ top_distdir=`cd $(top_distdir) && pwd`; \
-+ distdir=`cd $(distdir) && pwd`; \
-+ cd $(top_srcdir) \
-+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu nmixer/Makefile
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
- if test -d $$d/$$file; then \
-@@ -250,14 +253,57 @@ distdir: $(DISTFILES)
- || cp -p $$d/$$file $(distdir)/$$file || :; \
- fi; \
- done
--getopt.o: getopt.c ../config.h
--getopt1.o: getopt1.c ../config.h getopt.h
--main.o: main.cc nmixer.h ../config.h getopt.h
--mixers.o: mixers.cc nmixer.h ../config.h getopt.h
--nasmixer.o: nasmixer.cc
--nmixer.o: nmixer.cc nmixer.h ../config.h getopt.h
--ossmixer.o: ossmixer.cc nmixer.h ../config.h getopt.h
-
-+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-+
-+-include $(DEP_FILES)
-+
-+mostlyclean-depend:
-+
-+clean-depend:
-+
-+distclean-depend:
-+ -rm -rf .deps
-+
-+maintainer-clean-depend:
-+
-+%.o: %.c
-+ @echo '$(COMPILE) -c $<'; \
-+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
-+ tr ' ' '\012' < .deps/$(*F).pp \
-+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+ >> .deps/$(*F).P; \
-+ rm .deps/$(*F).pp
-+
-+%.lo: %.c
-+ @echo '$(LTCOMPILE) -c $<'; \
-+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
-+ < .deps/$(*F).pp > .deps/$(*F).P; \
-+ tr ' ' '\012' < .deps/$(*F).pp \
-+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+ >> .deps/$(*F).P; \
-+ rm -f .deps/$(*F).pp
-+
-+%.o: %.cc
-+ @echo '$(CXXCOMPILE) -c $<'; \
-+ $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
-+ tr ' ' '\012' < .deps/$(*F).pp \
-+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+ >> .deps/$(*F).P; \
-+ rm .deps/$(*F).pp
-+
-+%.lo: %.cc
-+ @echo '$(LTCXXCOMPILE) -c $<'; \
-+ $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
-+ < .deps/$(*F).pp > .deps/$(*F).P; \
-+ tr ' ' '\012' < .deps/$(*F).pp \
-+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+ >> .deps/$(*F).P; \
-+ rm -f .deps/$(*F).pp
- info-am:
- info: info-am
- dvi-am:
-@@ -296,25 +342,25 @@ distclean-generic:
- maintainer-clean-generic:
- mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \
- mostlyclean-binPROGRAMS mostlyclean-tags \
-- mostlyclean-generic
-+ mostlyclean-depend mostlyclean-generic
-
- mostlyclean: mostlyclean-am
-
- clean-am: clean-noinstLIBRARIES clean-compile clean-binPROGRAMS \
-- clean-tags clean-generic mostlyclean-am
-+ clean-tags clean-depend clean-generic mostlyclean-am
-
- clean: clean-am
-
- distclean-am: distclean-noinstLIBRARIES distclean-compile \
-- distclean-binPROGRAMS distclean-tags distclean-generic \
-- clean-am
-+ distclean-binPROGRAMS distclean-tags distclean-depend \
-+ distclean-generic clean-am
-
- distclean: distclean-am
-
- maintainer-clean-am: maintainer-clean-noinstLIBRARIES \
- maintainer-clean-compile maintainer-clean-binPROGRAMS \
-- maintainer-clean-tags maintainer-clean-generic \
-- distclean-am
-+ maintainer-clean-tags maintainer-clean-depend \
-+ maintainer-clean-generic distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
-
-@@ -326,8 +372,9 @@ mostlyclean-compile distclean-compile cl
- maintainer-clean-compile mostlyclean-binPROGRAMS distclean-binPROGRAMS \
- clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
- install-binPROGRAMS tags mostlyclean-tags distclean-tags clean-tags \
--maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \
--installcheck-am installcheck install-exec-am install-exec \
-+maintainer-clean-tags distdir mostlyclean-depend distclean-depend \
-+clean-depend maintainer-clean-depend info-am info dvi-am dvi check \
-+check-am installcheck-am installcheck install-exec-am install-exec \
- install-data-am install-data install-am install uninstall-am uninstall \
- all-redirect all-am all installdirs mostlyclean-generic \
- distclean-generic clean-generic maintainer-clean-generic clean \
diff --git a/audio/mp3blaster/patches/patch-af b/audio/mp3blaster/patches/patch-af
deleted file mode 100644
index dca3582003f..00000000000
--- a/audio/mp3blaster/patches/patch-af
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/09/30 09:44:00 cube Exp $
-
---- nmixer/main.cc.orig 2002-10-20 16:12:09.000000000 +0200
-+++ nmixer/main.cc
-@@ -4,10 +4,10 @@
- #include "nmixer.h"
- #include <string.h>
- #include <stdlib.h>
--#ifdef HAVE_GETOPT_H
-+#ifdef HAVE_GETOPT_LONG_ONLY
- # include <getopt.h>
- #else
--# include "getopt.h"
-+# include "../getopt/getopt.h"
- #endif
-
- #ifdef __cplusplus
diff --git a/audio/mp3blaster/patches/patch-ag b/audio/mp3blaster/patches/patch-ag
deleted file mode 100644
index 1fc9d1fdde4..00000000000
--- a/audio/mp3blaster/patches/patch-ag
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ag,v 1.5 2007/01/07 23:53:24 cbiere Exp $
-
---- src/main.cc.orig 2003-09-09 21:22:55.000000000 +0000
-+++ src/main.cc
-@@ -51,10 +51,10 @@
- #include <pth.h>
- #endif
- #include NCURSES
--#ifdef HAVE_GETOPT_H
-+#ifdef HAVE_GETOPT_LONG_ONLY
- #include <getopt.h>
- #else
--#include "getopt.h"
-+#include "../getopt/getopt.h"
- #endif
- #ifdef HAVE_ERRNO_H
- #include <errno.h>
-@@ -2917,7 +2917,7 @@ recsel_files(const char *path, char ***f
- while ( (entry = readdir(dir)) )
- {
- DIR *dir2 = NULL;
-- char *newpath = (char *)malloc((entry->d_reclen + 2 + strlen(path)) *
-+ char *newpath = (char *)malloc((strlen(entry->d_name) + 2 + strlen(path)) *
- sizeof(char));
-
- PTH_YIELD;
diff --git a/audio/mp3blaster/patches/patch-ah b/audio/mp3blaster/patches/patch-ah
deleted file mode 100644
index 965c40b09d1..00000000000
--- a/audio/mp3blaster/patches/patch-ah
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2003/09/30 09:44:00 cube Exp $
-
---- getopt/Makefile.am.orig 2003-09-29 13:47:50.000000000 +0200
-+++ getopt/Makefile.am
-@@ -0,0 +1,2 @@
-+noinst_LIBRARIES= libgetopt.a
-+libgetopt_a_SOURCES= gnugetopt.h getopt.c getopt1.c
diff --git a/audio/mp3blaster/patches/patch-ai b/audio/mp3blaster/patches/patch-ai
deleted file mode 100644
index 9ee90f27c08..00000000000
--- a/audio/mp3blaster/patches/patch-ai
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2003/09/30 09:44:00 cube Exp $
-
---- config.h.in.orig 2003-09-29 13:52:57.000000000 +0200
-+++ config.h.in
-@@ -59,6 +59,9 @@
- /* Define if you have the strstr function. */
- #undef HAVE_STRSTR
-
-+/* Define if you have the getopt_long_only function. */
-+#undef HAVE_GETOPT_LONG_ONLY
-+
- /* Define if you have the <bool.h> header file. */
- #undef HAVE_BOOL_H
-
-@@ -71,9 +74,6 @@
- /* Define if you have the <fcntl.h> header file. */
- #undef HAVE_FCNTL_H
-
--/* Define if you have the <getopt.h> header file. */
--#undef HAVE_GETOPT_H
--
- /* Define if you have the <machine/soundcard.h> header file. */
- #undef HAVE_MACHINE_SOUNDCARD_H
-
diff --git a/audio/mp3blaster/patches/patch-aj b/audio/mp3blaster/patches/patch-aj
deleted file mode 100644
index 18b7672afcc..00000000000
--- a/audio/mp3blaster/patches/patch-aj
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2003/09/30 09:44:00 cube Exp $
-
---- getopt/getopt.h.orig 2003-09-29 14:28:05.000000000 +0200
-+++ getopt/getopt.h
-@@ -97,6 +97,7 @@ struct option
- #define optional_argument 2
-
- #if defined (__STDC__) && __STDC__
-+#if 0
- #ifdef __GNU_LIBRARY__
- /* Many other libraries have conflicting prototypes for getopt, with
- differences in the consts, in stdlib.h. To avoid compilation
-@@ -107,6 +108,7 @@ extern int getopt ();
- #endif /* __GNU_LIBRARY__ */
- extern int getopt_long (int argc, char *const *argv, const char *shortopts,
- const struct option *longopts, int *longind);
-+#endif
- extern int getopt_long_only (int argc, char *const *argv,
- const char *shortopts,
- const struct option *longopts, int *longind);
-@@ -117,8 +119,10 @@ extern int _getopt_internal (int argc, c
- const struct option *longopts, int *longind,
- int long_only);
- #else /* not __STDC__ */
-+#if 0
- extern int getopt ();
- extern int getopt_long ();
-+#endif
- extern int getopt_long_only ();
-
- extern int _getopt_internal ();
diff --git a/audio/mp3blaster/patches/patch-ak b/audio/mp3blaster/patches/patch-ak
deleted file mode 100644
index 8e5d4bb04a1..00000000000
--- a/audio/mp3blaster/patches/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2003/12/03 12:31:37 cube Exp $
-
---- Makefile.am.orig 2002-10-20 16:01:47.000000000 +0200
-+++ Makefile.am
-@@ -1,4 +1,4 @@
--SUBDIRS = mpegsound nmixer src doc
--man_MANS = mp3blaster.1 nmixer.1 splay.1
-+SUBDIRS = getopt mpegsound nmixer src doc
-+man_MANS = mp3blaster.1 nmixer.1
- EXTRA_DIST = CREDITS TODO FAQ mp3blaster.1 nmixer.1 \
- BUGS splay.1 mp3blaster.list mp3blaster.spec
diff --git a/audio/mp3blaster/patches/patch-al b/audio/mp3blaster/patches/patch-al
deleted file mode 100644
index 2bca705120d..00000000000
--- a/audio/mp3blaster/patches/patch-al
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-al,v 1.2 2003/12/03 12:31:37 cube Exp $
-
---- configure.in.orig 2003-10-26 16:40:37.000000000 +0100
-+++ configure.in
-@@ -17,7 +17,7 @@ AC_C_BIGENDIAN
-
- dnl Checks for library functions.
- AC_PROG_GCC_TRADITIONAL
--AC_CHECK_FUNCS(strdup strstr)
-+AC_CHECK_FUNCS(strdup strstr getopt_long_only)
-
- AC_LANG_CPLUSPLUS
-
-@@ -220,7 +220,7 @@ AC_CHECK_HEADERS(fcntl.h malloc.h sys/io
- AC_CHECK_HEADERS(bool.h)
- AC_CHECK_HEADERS(pthread.h pthread/mit/pthread.h pth.h)
- AC_CHECK_HEADERS(curses.h,HAVE_CURSES_H=1)
--AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h soundcard.h getopt.h)
-+AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h soundcard.h)
- AC_CHECK_HEADER(sys/soundcard.h,HAVE_SYS_SOUNDCARD_H=1)
- AC_CHECK_HEADER(machine/soundcard.h,HAVE_MACHINE_SOUNDCARD_H=1)
- AC_CHECK_HEADER(soundcard.h,HAVE_SOUNDCARD_H=1)
-@@ -355,15 +355,17 @@ dnl CXXFLAGS="$CXXFLAGS -D__NO_MATH_INLI
- dnl check for Network Audio System library
-
-
--LDFLAGS="$LDFLAGS -L../mpegsound -L../nmixer"
-+LDFLAGS="$LDFLAGS -L../mpegsound -L../nmixer -L../getopt"
- LIBMPEGSOUND="-lmpegsound"
- LIBNMIXER="-lnmixer"
-+LIBGETOPT="-lgetopt"
- AC_SUBST(LIBMPEGSOUND)
- AC_SUBST(LIBNMIXER)
-+AC_SUBST(LIBGETOPT)
-
--SRCDIRS="mpegsound nmixer src doc doc/charmap"
-+SRCDIRS="getopt mpegsound nmixer src doc doc/charmap"
- AC_SUBST(SRCDIRS)
--AC_OUTPUT(src/Makefile mpegsound/Makefile Makefile nmixer/Makefile doc/Makefile doc/charmap/Makefile)
-+AC_OUTPUT(getopt/Makefile src/Makefile mpegsound/Makefile Makefile nmixer/Makefile doc/Makefile doc/charmap/Makefile)
-
- PTHREADS_OR_PTH="pthreads"
- if test "$HAVE_PTH" = "yes" ; then PTHREADS_OR_PTH="pth" ; fi
diff --git a/audio/mp3blaster/patches/patch-am b/audio/mp3blaster/patches/patch-am
deleted file mode 100644
index c3883b2be65..00000000000
--- a/audio/mp3blaster/patches/patch-am
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-am,v 1.1 2003/09/30 09:44:00 cube Exp $
-
---- nmixer/Makefile.am.orig 2002-10-20 16:11:02.000000000 +0200
-+++ nmixer/Makefile.am
-@@ -1,9 +1,8 @@
- bin_PROGRAMS = nmixer
- nmixer_SOURCES = main.cc
--nmixer_DEPENDENCIES = @LIBNMIXER@
--LDADD = @LIBNMIXER@ @NCURSES_LIBS@
-+nmixer_DEPENDENCIES = @LIBNMIXER@ ../getopt/libgetopt.a
-+LDADD = @LIBNMIXER@ @NCURSES_LIBS@ @LIBGETOPT@
- INCLUDES = -I/usr/include/ncurses -I$(srcdir) -I$(includedir)
- noinst_LIBRARIES = libnmixer.a
--libnmixer_a_SOURCES = nmixer.cc mixers.cc ossmixer.cc nasmixer.cc nmixer.h \
-- getopt.c getopt1.c getopt.h
-+libnmixer_a_SOURCES = nmixer.cc mixers.cc ossmixer.cc nasmixer.cc nmixer.h
- CXXFLAGS = @NAS_CFLAGS@
diff --git a/audio/mp3blaster/patches/patch-an b/audio/mp3blaster/patches/patch-an
deleted file mode 100644
index add85adf719..00000000000
--- a/audio/mp3blaster/patches/patch-an
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-an,v 1.2 2003/12/03 12:31:37 cube Exp $
-
---- src/Makefile.am.orig 2003-09-08 23:48:56.000000000 +0200
-+++ src/Makefile.am
-@@ -1,13 +1,10 @@
--bin_PROGRAMS = mp3blaster mp3tag splay
--#bin_PROGRAMS = mp3blaster mp3tag
-+#bin_PROGRAMS = mp3blaster mp3tag splay
-+bin_PROGRAMS = mp3blaster mp3tag
- mp3blaster_SOURCES = fileman.cc \
- main.cc \
- scrollwin.cc \
-- getopt.c \
-- getopt1.c \
- fileman.h \
- genretab.h \
-- getopt.h \
- id3parse.cc \
- id3parse.h \
- mp3blaster.h \
-@@ -29,14 +26,11 @@ mp3blaster_SOURCES = fileman.cc \
- interface.cc \
- interface.h
- @MP3B_MODULES@
--splay_SOURCES = splay.cc splay.h splay_common.cc
--splay_DEPENDENCIES = ../mpegsound/libmpegsound.a
--splay_LDADD = @LIBMPEGSOUND@
- mp3tag_SOURCES = id3parse.cc mp3tag.cc id3parse.h
- mp3tag_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
- mp3tag_LDADD = @LIBMPEGSOUND@ @LIBMYSQL@
--mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
-+mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a ../getopt/libgetopt.a
- INCLUDES = -I$(top_srcdir)/mpegsound -I/usr/include/ncurses -I$(top_srcdir)/nmixer -I$(includedir)
--mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @LIRC_LIBS@ @NCURSES_LIBS@
-+mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @LIBGETOPT@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @LIRC_LIBS@ @NCURSES_LIBS@
- EXTRA_DIST = FILES
- CXXFLAGS = @CXXFLAGS@ @NAS_CFLAGS@ -DMP3BLASTER_DOCDIR=\"${pkgdatadir}\"
diff --git a/audio/mp3blaster/patches/patch-ao b/audio/mp3blaster/patches/patch-ao
deleted file mode 100644
index 5cb2693ba81..00000000000
--- a/audio/mp3blaster/patches/patch-ao
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2003/09/30 09:44:00 cube Exp $
-
---- getopt/getopt.c.orig 2003-09-29 23:27:50.000000000 +0200
-+++ getopt/getopt.c
-@@ -21,17 +21,17 @@
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
--#ifndef HAVE_GETOPT_H
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#ifndef HAVE_GETOPT_LONG_ONLY
- /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
- Ditto for AIX 3.2 and <stdlib.h>. */
- #ifndef _NO_PROTO
- #define _NO_PROTO
- #endif
-
--#ifdef HAVE_CONFIG_H
--#include <config.h>
--#endif
--
- #if !defined (__STDC__) || !__STDC__
- /* This is a separate conditional since some stdc systems
- reject `defined (const)'. */
diff --git a/audio/mp3blaster/patches/patch-ap b/audio/mp3blaster/patches/patch-ap
deleted file mode 100644
index 0ab9286b869..00000000000
--- a/audio/mp3blaster/patches/patch-ap
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2003/09/30 09:44:00 cube Exp $
-
---- getopt/getopt1.c.orig 2003-09-29 23:28:19.000000000 +0200
-+++ getopt/getopt1.c
-@@ -17,10 +17,10 @@
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
--#ifndef HAVE_GETOPT_H
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
-+#ifndef HAVE_GETOPT_LONG_ONLY
-
- #include "getopt.h"
-
diff --git a/audio/mp3blaster/patches/patch-aq b/audio/mp3blaster/patches/patch-aq
deleted file mode 100644
index 62815a81c1c..00000000000
--- a/audio/mp3blaster/patches/patch-aq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2005/12/11 22:22:37 joerg Exp $
-
---- src/fileman.cc.orig 2005-12-11 22:08:19.000000000 +0000
-+++ src/fileman.cc
-@@ -212,7 +212,7 @@ fileManager::readDir()
- PTH_YIELD;
- entries = (char **)realloc (entries, (++diritems) * sizeof(char *));
-
-- entries[diritems - 1] = (char *)malloc( ((entry->d_reclen) + 1) *
-+ entries[diritems - 1] = (char *)malloc( (sizeof(*entry) + entry->d_namlen + 1) *
- sizeof(char));
- strcpy(entries[diritems - 1], entry->d_name);
- }
diff --git a/audio/mp3check/DESCR b/audio/mp3check/DESCR
deleted file mode 100644
index e8819a50005..00000000000
--- a/audio/mp3check/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Check mp3 files for consistency and print several errors and warnings. List
-stream attributes (color). Layer 1,2,3, mpeg1.0+2.0 are currently supported.
-CRC check for layer 3.
-mp3check is very useful for incomplete mp3 detection as it can be used to scan
-through your mp3 collection and find all mp3s that aren't perfect. Good for use
-with Napster and other bulk downloading of mp3s.
diff --git a/audio/mp3check/Makefile b/audio/mp3check/Makefile
deleted file mode 100644
index f2594ca2e17..00000000000
--- a/audio/mp3check/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2007/01/07 09:13:47 rillig Exp $
-
-DISTNAME= mp3check-0.8.0
-CATEGORIES= audio
-MASTER_SITES= http://jo.ath.cx/soft/mp3check/
-
-MAINTAINER= tron@NetBSD.org
-HOMEPAGE= http://jo.ath.cx/soft/mp3check/
-COMMENT= Check MP3 files for consistency
-
-GNU_CONFIGURE= YES
-USE_LANGUAGES= c c++
-
-BUILD_TARGET= mp3check
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/mp3check ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/mp3check.1 ${PREFIX}/${PKGMANDIR}/man1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mp3check/PLIST b/audio/mp3check/PLIST
deleted file mode 100644
index 2739df1a1b7..00000000000
--- a/audio/mp3check/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:28 zuntum Exp $
-bin/mp3check
-man/man1/mp3check.1
diff --git a/audio/mp3check/distinfo b/audio/mp3check/distinfo
deleted file mode 100644
index 72ce9b51e30..00000000000
--- a/audio/mp3check/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/12/11 22:03:39 joerg Exp $
-
-SHA1 (mp3check-0.8.0.tar.gz) = 3f75bbb59a86dc234acba8db2537cc2f86e52896
-RMD160 (mp3check-0.8.0.tar.gz) = c10fb30c1f0679322e80f92798c117f77e1c6755
-Size (mp3check-0.8.0.tar.gz) = 119644 bytes
-SHA1 (patch-aa) = df47e94ed8a765d58da8fcabaf407df8931843e3
-SHA1 (patch-ab) = 86e1da01f1407f748dbd2fa8436e2d2cdaaf3f4d
-SHA1 (patch-ac) = 9befdd0ac3e96014a389c00180768b709e1ce3a4
-SHA1 (patch-ad) = ca416a54a1b751f7587f977288a99b5da061a12a
-SHA1 (patch-ae) = 02494d79eaf448d9b96f80e29ac22bcac52527c9
-SHA1 (patch-af) = 3b6c2f96b6f372553bdbf8332184c78fe20b2706
-SHA1 (patch-ag) = b29c5b8be30e0f971680381586e80650b3791547
diff --git a/audio/mp3check/patches/patch-aa b/audio/mp3check/patches/patch-aa
deleted file mode 100644
index a55be0e7947..00000000000
--- a/audio/mp3check/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/02/16 23:08:25 abs Exp $
-
---- mp3check.cc.orig Mon Jan 27 23:58:46 2003
-+++ mp3check.cc
-@@ -25,11 +25,11 @@
- #include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include "config.h"
- #include "tappconfig.h"
- #include "crc16.h"
- #include "id3tag.h"
- #include "tfiletools.h"
--#include "config.h"
-
-
-
diff --git a/audio/mp3check/patches/patch-ab b/audio/mp3check/patches/patch-ab
deleted file mode 100644
index be608ac06f9..00000000000
--- a/audio/mp3check/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/02/16 23:08:25 abs Exp $
-
---- tappconfig.cc.orig Thu Jan 16 08:20:34 2003
-+++ tappconfig.cc
-@@ -28,6 +28,7 @@
- #include <sys/stat.h>
- #include <termios.h>
- #include <unistd.h>
-+#include "config.h"
- #include "tappconfig.h"
-
- // config:
diff --git a/audio/mp3check/patches/patch-ac b/audio/mp3check/patches/patch-ac
deleted file mode 100644
index ed109df4656..00000000000
--- a/audio/mp3check/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/02/16 23:08:25 abs Exp $
-
---- texception.h.orig Tue Dec 3 22:00:57 2002
-+++ texception.h
-@@ -57,7 +57,7 @@ class TException {
- va_end(ap);
- }
- #endif
--#if !(defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN_EXTENDED)
-+#ifndef HAVE_STRDUP
- static char *strdup(const char *str) { char *buf; vasprintf(&buf, "%s", str); return buf; }
- #endif
- };
diff --git a/audio/mp3check/patches/patch-ad b/audio/mp3check/patches/patch-ad
deleted file mode 100644
index 703d57bb7c9..00000000000
--- a/audio/mp3check/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/02/16 23:08:25 abs Exp $
-
---- tfiletools.cc.orig Tue Dec 3 22:00:57 2002
-+++ tfiletools.cc
-@@ -21,6 +21,7 @@
-
- #include <sys/types.h>
- #include <dirent.h>
-+#include "config.h"
- #include "tfiletools.h"
-
- #define COUNT_VERBOSE_STEP 1000
diff --git a/audio/mp3check/patches/patch-ae b/audio/mp3check/patches/patch-ae
deleted file mode 100644
index 1da59af9742..00000000000
--- a/audio/mp3check/patches/patch-ae
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2005/12/11 22:03:39 joerg Exp $
-
---- tstring.cc.orig 2003-01-27 21:21:17.000000000 +0000
-+++ tstring.cc
-@@ -27,6 +27,7 @@
- #include <unistd.h>
- #endif
- #include <errno.h>
-+#include "config.h"
- #include "tstring.h"
- #include "texception.h"
-
-@@ -714,12 +715,12 @@ void tstring::truncate(size_t max) {
-
- void tstring::replaceUnprintable(bool only_ascii) {
- for(size_t i = 0; i < rep->len; i++) {
-- unsigned char& c = (unsigned char)(*rep)[i];
-- if(!isprint(c)) {
-- if(c < ' ') {
-- c = '!';
-- } else if(only_ascii || (c < 0xa0)) {
-- c = '?';
-+ unsigned char *c = (unsigned char*)&(*rep)[i];
-+ if(!isprint(*c)) {
-+ if(*c < ' ') {
-+ *c = '!';
-+ } else if(only_ascii || (*c < 0xa0)) {
-+ *c = '?';
- }
- }
- }
diff --git a/audio/mp3check/patches/patch-af b/audio/mp3check/patches/patch-af
deleted file mode 100644
index 261056f00cf..00000000000
--- a/audio/mp3check/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/12/11 22:03:39 joerg Exp $
-
---- tmap.h.orig 2005-12-11 21:46:52.000000000 +0000
-+++ tmap.h
-@@ -54,7 +54,7 @@ class tmap: public tmap_base<K,T> {
- // new functionality
-
- /// return whether an element with key is contained or not
-- bool contains(const K& key) const { return find(key) != end(); }
-+ bool contains(const K& key) const { return find(key) != this->end(); }
- /// access element read only (const)
- // g++ 2.95.2 does not allow this:
- // const T& operator[](const K& key) const { const_iterator i = find(key); if(i != end()) return i->second; else throw TNotFoundException(); } // throw(TNotFoundException)
diff --git a/audio/mp3check/patches/patch-ag b/audio/mp3check/patches/patch-ag
deleted file mode 100644
index bfe5c8f4207..00000000000
--- a/audio/mp3check/patches/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/12/11 22:03:39 joerg Exp $
-
---- tvector.h.orig 2005-12-11 21:47:29.000000000 +0000
-+++ tvector.h
-@@ -60,13 +60,13 @@ class tvector: public tvector_base<T> {
- /// append an element to the end
- const tvector& operator += (const T& a) { push_back(a); return *this; }
- /// append another tvector to the end
-- const tvector& operator += (const tvector& a) { insert(end(), a.begin(), a.end()); return *this; }
-+ const tvector& operator += (const tvector& a) { insert(tvector_base<T>::end(), a.begin(), a.end()); return *this; }
- /// direct read only access, safe
-- const T& operator[](size_t i) const { if(i < size()) return tvector_base<T>::operator[](i); else throw TZeroBasedIndexOutOfRangeException(i, size()); } // throw(TZeroBasedIndexOutOfRangeException);
-+ const T& operator[](size_t i) const { if(i < this->size()) return tvector_base<T>::operator[](i); else throw TZeroBasedIndexOutOfRangeException(i, this->size()); } // throw(TZeroBasedIndexOutOfRangeException);
- /// direct read/write access, automatically create new elements
-- T& operator[](size_t i) { if(i >= size()) operator+=(tvector(i - size() + 1)); return tvector_base<T>::operator[](i); }
-+ T& operator[](size_t i) { if(i >= this->size()) operator+=(tvector(i - this->size() + 1)); return tvector_base<T>::operator[](i); }
- /// clear vector
-- void clear() { erase(begin(), end()); }
-+ void clear() { erase(this->begin(), this->end()); }
- };
-
-
diff --git a/audio/mp3cut/DESCR b/audio/mp3cut/DESCR
deleted file mode 100644
index fc16f8a21d1..00000000000
--- a/audio/mp3cut/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-This package provides three utilities to manipulate MP3 audio files:
-
-* cddb2cue: Creates cue sheets from CDDB files.
-* mp3cat: Concatenates MP3 files.
-* mp3cut: Splits MP3 files according to cue sheets.
diff --git a/audio/mp3cut/Makefile b/audio/mp3cut/Makefile
deleted file mode 100644
index 9662fb407a7..00000000000
--- a/audio/mp3cut/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/08/23 10:39:06 jmmv Exp $
-
-DISTNAME= mp3cut-1.13
-CATEGORIES= audio perl5
-MASTER_SITES= http://search.cpan.org/CPAN/authors/id/J/JV/JV/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://search.cpan.org/~jv/mp3cut/
-COMMENT= Tools to concatenate and split MP3 files
-
-DEPENDS+= p5-CDDB-File>=1.05:../../audio/p5-CDDB-File
-DEPENDS+= p5-MPEG-Audio-Frame>=0.09:../../audio/p5-MPEG-Audio-Frame
-
-USE_TOOLS+= perl:run
-
-PERL5_PACKLIST= auto/mp3cut/.packlist
-
-INSTALLATION_DIRS+= bin
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mp3cut/PLIST b/audio/mp3cut/PLIST
deleted file mode 100644
index 66a59d70970..00000000000
--- a/audio/mp3cut/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/08/23 10:39:06 jmmv Exp $
diff --git a/audio/mp3cut/distinfo b/audio/mp3cut/distinfo
deleted file mode 100644
index fc4ac9ae464..00000000000
--- a/audio/mp3cut/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/08/23 10:39:06 jmmv Exp $
-
-SHA1 (mp3cut-1.13.tar.gz) = f0fe98baadb36f837502ac5e4152da7fab5b15b1
-RMD160 (mp3cut-1.13.tar.gz) = 3577aba41b87a5663a8b0747b0adea6a82c461f4
-Size (mp3cut-1.13.tar.gz) = 58799 bytes
diff --git a/audio/mp3info/DESCR b/audio/mp3info/DESCR
deleted file mode 100644
index 674573774da..00000000000
--- a/audio/mp3info/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-A small utility to read and write TAG info, as well as retrieve the MP3
-Header info and print it all out in a nice format.
-
-Released under GNU GPL.
-
-Features:
- - Get, Set and Wipe MP3 TAG Info.
- - Get MPEG Audio Version 1, 2 and 2.5 (All Layers) Header info.
- - Userdefinable output formatting (rather advanced).
- - Can rename files according to userdefined scheme.
diff --git a/audio/mp3info/Makefile b/audio/mp3info/Makefile
deleted file mode 100644
index b473ac73cf7..00000000000
--- a/audio/mp3info/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2004/10/28 13:31:44 wiz Exp $
-#
-
-DISTNAME= mp3info-0.2.16
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/sound/editors/}
-
-MAINTAINER= simonb@NetBSD.org
-COMMENT= MP3 header and tag information tool
-
-CONFLICTS= gmp3info-[0-9]*
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-GNU_CONFIGURE= YES
-USE_LANGUAGES= c c++
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mp3info/PLIST b/audio/mp3info/PLIST
deleted file mode 100644
index 565d97ef666..00000000000
--- a/audio/mp3info/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:29 zuntum Exp $
-bin/mp3info
-man/man1/mp3info.1
diff --git a/audio/mp3info/distinfo b/audio/mp3info/distinfo
deleted file mode 100644
index 2d444028728..00000000000
--- a/audio/mp3info/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:49 agc Exp $
-
-SHA1 (mp3info-0.2.16.tar.gz) = b4cb7feb0b2c52ce1c2a23b919f4ab3c3012b11f
-RMD160 (mp3info-0.2.16.tar.gz) = 61810736aff11e1e241d78f572acd4890f795851
-Size (mp3info-0.2.16.tar.gz) = 42950 bytes
-SHA1 (patch-aa) = 4b036972514390c517eed0d1a86acf871c7d2730
diff --git a/audio/mp3info/patches/patch-aa b/audio/mp3info/patches/patch-aa
deleted file mode 100644
index 66857b406a7..00000000000
--- a/audio/mp3info/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/06/16 03:25:48 minskim Exp $
-
---- mp3info.cxx.orig 1999-03-19 14:36:34.000000000 -0600
-+++ mp3info.cxx
-@@ -7,6 +7,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
-+#include <time.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/time.h>
diff --git a/audio/mp3splt/DESCR b/audio/mp3splt/DESCR
deleted file mode 100644
index 801be060300..00000000000
--- a/audio/mp3splt/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-Mp3Splt is a command line utility to split mp3 (VBR supported) and
-ogg files selecting a begin and an end time position, without
-decoding. It's very useful to split large mp3/ogg to make smaller
-files or to split entire albums to obtain original tracks. If you
-want to split an album, you can select split points and filenames
-manually or you can get them automatically from CDDB (internet or
-a local file) or from .cue files. Supports also automatic silence
-split, that can be used also to adjust cddb/cue splitpoints.
-Otherwise if you have a file created either with Mp3Wrap or AlbumWrap
-you can extract tracks just in few seconds.
diff --git a/audio/mp3splt/Makefile b/audio/mp3splt/Makefile
deleted file mode 100644
index b3f82a0e1d0..00000000000
--- a/audio/mp3splt/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2006/08/10 16:16:13 wiz Exp $
-#
-
-DISTNAME= mp3splt-2.1c-src
-PKGNAME= ${DISTNAME:S/-src//}
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mp3splt/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://mp3splt.sourceforge.net/
-COMMENT= Command line utility to split MP3 (VBR supported) and OGG files
-
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_PKGLOCALEDIR= yes
-GNU_CONFIGURE= yes
-
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mp3splt/PLIST b/audio/mp3splt/PLIST
deleted file mode 100644
index f96891dfc1f..00000000000
--- a/audio/mp3splt/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/18 14:05:07 wiz Exp $
-bin/mp3splt
-bin/oggsplt
-man/man1/mp3splt.1
diff --git a/audio/mp3splt/distinfo b/audio/mp3splt/distinfo
deleted file mode 100644
index 6da8f3ab4e0..00000000000
--- a/audio/mp3splt/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.7 2006/03/06 14:26:17 joerg Exp $
-
-SHA1 (mp3splt-2.1c-src.tar.gz) = 40962d696c2a687569ab55382600178f5c8fd2b1
-RMD160 (mp3splt-2.1c-src.tar.gz) = 857b225ac4645cc43cc0381e5ecfe908d9c01fb9
-Size (mp3splt-2.1c-src.tar.gz) = 131810 bytes
-SHA1 (patch-aa) = f90ac091d136de06b00daee259dcfadd77b68e30
-SHA1 (patch-ab) = 7572d2a026e328f355675b54b258ba262fab1568
diff --git a/audio/mp3splt/patches/patch-aa b/audio/mp3splt/patches/patch-aa
deleted file mode 100644
index 75ded249249..00000000000
--- a/audio/mp3splt/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/10/31 15:59:14 tv Exp $
-
---- mp3splt.c.orig 2005-03-26 08:51:56.000000000 -0500
-+++ mp3splt.c
-@@ -38,8 +38,6 @@
- #include <vorbis/vorbisfile.h>
- #endif
-
--#include "getopt.h"
--
- #include "mp3.h"
- #include "wrap.h"
- #include "ogg.h"
diff --git a/audio/mp3splt/patches/patch-ab b/audio/mp3splt/patches/patch-ab
deleted file mode 100644
index c66dd65108c..00000000000
--- a/audio/mp3splt/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/03/06 14:26:17 joerg Exp $
-
---- splt.h.orig 2006-03-06 15:13:08.000000000 +0100
-+++ splt.h
-@@ -93,7 +93,7 @@ char *zero_pad (char *s, char *out, int
-
- char *zero_pad_float (float f, char *out);
-
--int parse_outformat(char *s, char format[][], int cddboption);
-+int parse_outformat(char *s, char format[OUTNUM][MAXOLEN], int cddboption);
-
- unsigned char *cleanstring (unsigned char *s);
-
diff --git a/audio/mp3to/DESCR b/audio/mp3to/DESCR
deleted file mode 100644
index 45ddd8f033a..00000000000
--- a/audio/mp3to/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Converts an MP3 file to another audio format. If <outfile> is - or
-missing, stdout is used. <format> may be au, wav, aiff, or any other
-format supported by sox.
diff --git a/audio/mp3to/Makefile b/audio/mp3to/Makefile
deleted file mode 100644
index cc12ec4559b..00000000000
--- a/audio/mp3to/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2006/05/19 16:18:53 rillig Exp $
-
-DISTNAME= mp3to
-PKGNAME= ${DISTNAME}-1.0.1
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-EXTRACT_SUFX= .gz
-
-MAINTAINER= tron@NetBSD.org
-COMMENT= Convert MP3 files to various other audio formats
-
-NO_SRC_ON_FTP= already in MASTER_SITE_LOCAL
-
-DEPENDS+= mpg123-[0-9]*:../../audio/mpg123
-DEPENDS+= gmp3info>=0.8.2:../../audio/gmp3info
-DEPENDS+= sox>=12.17.1:../../audio/sox
-
-NO_BUILD= YES
-
-INSTALLATION_DIRS= bin
-
-do-extract:
- ${MKDIR} ${WRKSRC}
- ${GZCAT} ${DISTDIR}/${DISTFILES} >${WRKSRC}/${DISTFILES:S/.gz//}
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/mp3to ${PREFIX}/bin
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mp3to/PLIST b/audio/mp3to/PLIST
deleted file mode 100644
index d1befe93a1d..00000000000
--- a/audio/mp3to/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:30 zuntum Exp $
-bin/mp3to
diff --git a/audio/mp3to/distinfo b/audio/mp3to/distinfo
deleted file mode 100644
index 431244595f2..00000000000
--- a/audio/mp3to/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:49 agc Exp $
-
-SHA1 (mp3to.gz) = c7c088b5c02a33b86d8ad6e10fef75ceafbef2a5
-RMD160 (mp3to.gz) = 381bbabb143a2d98b98f47ddcf8076f36c3859b0
-Size (mp3to.gz) = 550 bytes
-SHA1 (patch-aa) = 00612b652bfb8a469696381ba8ed9a8379cf730d
diff --git a/audio/mp3to/patches/patch-aa b/audio/mp3to/patches/patch-aa
deleted file mode 100644
index c7f1f313887..00000000000
--- a/audio/mp3to/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/02/19 16:10:24 tron Exp $
-
---- mp3to.orig Mon Feb 19 16:56:43 2001
-+++ mp3to Mon Feb 19 16:57:34 2001
-@@ -17,6 +17,9 @@
- exit 1
- }
-
-+PATH=`dirname $0`:$PATH
-+export PATH
-+
- progname=`basename "$0"`
-
- [ $# -ge 2 -a $# -le 3 ] || fail "usage:
diff --git a/audio/mpc/DESCR b/audio/mpc/DESCR
deleted file mode 100644
index 716b25ecadb..00000000000
--- a/audio/mpc/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-mpc is a command line client for the Music Player Daemon, musicpd.
diff --git a/audio/mpc/Makefile b/audio/mpc/Makefile
deleted file mode 100644
index 62985b2adb1..00000000000
--- a/audio/mpc/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2005/06/01 03:35:21 simonb Exp $
-
-DISTNAME= mpc-0.11.2
-CATEGORIES= audio
-MASTER_SITES= http://mercury.chem.pitt.edu/~shank/
-
-MAINTAINER= simonb@NetBSD.org
-HOMEPAGE= http://musicpd.org/
-COMMENT= Command-line client for musicpd
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mpc/PLIST b/audio/mpc/PLIST
deleted file mode 100644
index 83be0c5ad91..00000000000
--- a/audio/mpc/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/06/29 08:26:38 simonb Exp $
-bin/mpc
-man/man1/mpc.1
-share/doc/mpc/AUTHORS
-share/doc/mpc/README
-share/doc/mpc/m3u-handler.sh
-share/doc/mpc/mpc-bashrc
-share/doc/mpc/pls-handler.sh
-@dirrm share/mpc
-@dirrm share/doc/mpc
diff --git a/audio/mpc/distinfo b/audio/mpc/distinfo
deleted file mode 100644
index af621055721..00000000000
--- a/audio/mpc/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/06/14 01:34:54 kristerw Exp $
-
-SHA1 (mpc-0.11.2.tar.gz) = b318ffdf4d27c14f761070b83dec3a3433612586
-RMD160 (mpc-0.11.2.tar.gz) = 823eca5e82fb4b2f4d219d70b176673575576a14
-Size (mpc-0.11.2.tar.gz) = 103483 bytes
-SHA1 (patch-aa) = c013d21aae786eb2aa2c562f29d9e5a84150995f
-SHA1 (patch-ab) = 9fd058c97c37fac4de1189efe3ba365a1a94ffba
diff --git a/audio/mpc/patches/patch-aa b/audio/mpc/patches/patch-aa
deleted file mode 100644
index 49b30bf0656..00000000000
--- a/audio/mpc/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/06/01 03:35:21 simonb Exp $
-
---- src/main.c.orig 2005-03-11 09:04:35.000000000 +0000
-+++ src/main.c
-@@ -57,6 +57,7 @@ struct _mpc_table {
- {"prev", 0, 0, 0, cmd_prev,"","Play the previous song in the current playlist"},
- {"pause", 0, 0, 0, cmd_pause, "", "Pauses the currently playing song"},
- {"toggle", 0, 0, 0, cmd_toggle, "", "Toggles Play/Pause, plays if stopped"},
-+ {"playpause", 0, 0, 0, cmd_toggle, "", "Pauses if playing, play otherwise"},
- {"stop", 0, 0, 0, cmd_stop,"", "Stop the currently playing playlists"},
- {"seek", 1, 1, 0, cmd_seek,"[+-][HH:MM:SS] or <0-100>%","Seeks to the specified position"},
- {"clear", 0, 0, 0, cmd_clear,"", "Clear the current playlist"},
diff --git a/audio/mpc/patches/patch-ab b/audio/mpc/patches/patch-ab
deleted file mode 100644
index abb385873b7..00000000000
--- a/audio/mpc/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2005/06/14 01:34:54 kristerw Exp $
-
---- src/command.c.orig Tue Jun 14 03:30:30 2005
-+++ src/command.c Tue Jun 14 03:32:26 2005
-@@ -183,10 +183,11 @@
- int cmd_crop( int argc, char ** argv, mpd_Connection * conn )
- {
-
-+ int length;
- mpd_Status *status;
- status = getStatus( conn );
-
-- int length = ( status->playlistLength - 1 );
-+ length = ( status->playlistLength - 1 );
-
- if( status->playlistLength == 0 ) {
-
diff --git a/audio/mpegaudio/DESCR b/audio/mpegaudio/DESCR
deleted file mode 100644
index 63783832e10..00000000000
--- a/audio/mpegaudio/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-mpegaudio is an MPEG/audio Layer 1 and Layer 2 software package.
diff --git a/audio/mpegaudio/Makefile b/audio/mpegaudio/Makefile
deleted file mode 100644
index 336a07c88b8..00000000000
--- a/audio/mpegaudio/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2007/01/07 09:13:47 rillig Exp $
-
-DISTNAME= mpegaudio
-PKGNAME= mpegaudio-3.9
-CATEGORIES= audio
-MASTER_SITES= # empty
-EXTRACT_SUFX= .tar.Z
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= MPEG/audio Layer 1 and Layer 2 encoder/decoder package
-
-post-install:
- ${INSTALL_MAN} ${FILESDIR}/mpeg_musicin.1 ${PREFIX}/${PKGMANDIR}/man1
- ${INSTALL_MAN} ${FILESDIR}/mpeg_musicout.1 ${PREFIX}/${PKGMANDIR}/man1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mpegaudio/PLIST b/audio/mpegaudio/PLIST
deleted file mode 100644
index cd25f37815f..00000000000
--- a/audio/mpegaudio/PLIST
+++ /dev/null
@@ -1,28 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/12 00:54:02 wiz Exp $
-bin/mpeg_musicin
-bin/mpeg_musicout
-lib/mpegaudio/tables/1cb0
-lib/mpegaudio/tables/1cb1
-lib/mpegaudio/tables/1cb2
-lib/mpegaudio/tables/1th0
-lib/mpegaudio/tables/1th1
-lib/mpegaudio/tables/1th2
-lib/mpegaudio/tables/2cb0
-lib/mpegaudio/tables/2cb1
-lib/mpegaudio/tables/2cb2
-lib/mpegaudio/tables/2th0
-lib/mpegaudio/tables/2th1
-lib/mpegaudio/tables/2th2
-lib/mpegaudio/tables/absthr_0
-lib/mpegaudio/tables/absthr_1
-lib/mpegaudio/tables/absthr_2
-lib/mpegaudio/tables/alloc_0
-lib/mpegaudio/tables/alloc_1
-lib/mpegaudio/tables/alloc_2
-lib/mpegaudio/tables/alloc_3
-lib/mpegaudio/tables/dewindow
-lib/mpegaudio/tables/enwindow
-man/man1/mpeg_musicin.1
-man/man1/mpeg_musicout.1
-@dirrm lib/mpegaudio/tables
-@dirrm lib/mpegaudio
diff --git a/audio/mpegaudio/distinfo b/audio/mpegaudio/distinfo
deleted file mode 100644
index 52a5126fe4b..00000000000
--- a/audio/mpegaudio/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/06/09 15:08:08 minskim Exp $
-
-SHA1 (mpegaudio.tar.Z) = 75a801c4aff290b4e0c7cdb2b07991c630955fbf
-RMD160 (mpegaudio.tar.Z) = 3e40fa6629e0bb88046ac882bbfcc263925f7006
-Size (mpegaudio.tar.Z) = 144707 bytes
-SHA1 (patch-aa) = 7b61fd9effe57086d2d2f669fd5b5235a8854e03
-SHA1 (patch-ab) = 67758b144d384aea66509e508e79112a052b8369
-SHA1 (patch-ac) = 389d7973e317362d5927be96ab3222f011410b40
-SHA1 (patch-ad) = f81fb4c7557d9fe96d9164c0df4367389df6b2e4
-SHA1 (patch-ae) = 65bc956b1cc3a97ca3569c3943760d41b63f10e8
-SHA1 (patch-af) = f9dda45daeb250734178fc8c4626c0112d5fefbd
diff --git a/audio/mpegaudio/files/mpeg_musicin.1 b/audio/mpegaudio/files/mpeg_musicin.1
deleted file mode 100644
index 70e00d405ad..00000000000
--- a/audio/mpegaudio/files/mpeg_musicin.1
+++ /dev/null
@@ -1,122 +0,0 @@
-.\" Copyright (c) 1997 Andreas Klemm <andreas@FreeBSD.org>. Neuss.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD: ports/audio/mpegaudio/files/mpeg_musicin.1,v 1.2 1999/08/29 10:56:51 peter Exp $
-.Dd August 17, 1997
-.Dt MPEG_MUSICIN 1
-.Os
-.Sh NAME
-.Nm mpeg_musicin
-.Nd MPEG/audio Layer 1 and Layer 2 decoder
-.Sh SYNOPSIS
-.Nm mpeg_musicin
-queries for all arguments, or
-.br
-.Nm mpeg_musicin
-.Op Fl l Ar lay
-.br
-.Op Fl m Ar mode
-.br
-.Op Fl p Ar psy
-.br
-.Op Fl s Ar sfrq
-.br
-.Op Fl b Ar br
-.br
-.Op Fl d Ar emp
-.br
-.Op Fl c
-.br
-.Op Fl o
-.br
-.Op Fl e
-.br
-inputCM
-.br
-.Op Ar outBS
-.br
-.Sh DESCRIPTION
-The encoder and decoder software are configured to output
-the coded audio bitstreams as a string of hexadecimal ascii
-characters. For greater compression efficiency, compile flag,
-BS_FORMAT, in common.h can be switched to configure the bitstream
-reading and writing routines to process raw binary bitstreams.
-.br
-The decoder program has a very crude implementation of bitstream
-synchword detection. It may not be able to correctly decode valid
-bitstreams which have false synchword patterns in the ancillary data
-portion of the bitstream.
-.Sh RESTRICTIONS
-The software implements levels I and II and psychophysical auditory
-models I and II as described in the ISO 3-11171 rev 1 standard.
-There are future plans to implement level III.
-.br
-The input/output audio data may either be headerless raw 16 bit data
-or alternatively an AIFF formatted file (Audio Interchange File Format)
-with certain limitations.
-.br
-For more information on the AIFF format see the postscript file
-/sgi/aiff-c.9.26.91.ps at the anonymous ftp site FTP.SGI.COM
-(192.48.153.1).
-.br
-The AIFF formatted file is a convenient way for storing sampling rate
-of the audio file.
-.br
-The encoder and decoder software are configured to output the coded
-audio bitstreams as a string of hexadecimal ascii characters.
-For greater compression efficiency, compile flag, BS_FORMAT,
-in common.h can be switched to configure the bitstream reading
-and writing routines to process raw binary bitstreams.
-.br
-This software has been run and verified on a large variety of
-computers and operating systems. In particular UNIX, MS_DOS (with
-MicroSoft C version 6), Macintosh, AIX Platform (RS6000) and Convex.
-.Sh OPTIONS
-.Bl -tag -width Ds
-.It Sy -l lay
-use layer <lay> coding (default: 2)
-.It Sy -m mode
-channel mode : s/d/j/m (default: s)
-.It Sy -p psy
-psychoacoustic model 1/2 (default: 2)
-.It Sy -s sfrq
-input smpl rate in kHz (default: 44.1)
-.It Sy -b br
-total bitrate in kbps (default: 384)
-.It Sy -d emp
-de-emphasis n/5/c (default: n)
-.It Sy -c
-mark as copyright
-.It Sy -o
-mark as original
-.It Sy -e
-add error protection
-.It Sy inputPCM
-input PCM sound file (standard or AIFF)
-.It Sy outBS
-output bit stream of encoded audio (dflt inName+.mpg)
-.Sh SEE ALSO
-.Xr mpeg_musicout 1
-.Sh HISTORY
-Written by Andreas Klemm, August 17, 1997
diff --git a/audio/mpegaudio/files/mpeg_musicout.1 b/audio/mpegaudio/files/mpeg_musicout.1
deleted file mode 100644
index cba817497e6..00000000000
--- a/audio/mpegaudio/files/mpeg_musicout.1
+++ /dev/null
@@ -1,94 +0,0 @@
-.\" Copyright (c) 1997 Andreas Klemm <andreas@FreeBSD.org>. Neuss.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD: ports/audio/mpegaudio/files/mpeg_musicout.1,v 1.2 1999/08/29 10:56:51 peter Exp $
-.Dd August 17, 1997
-.Dt MPEG_MUSICOUT 1
-.Os
-.Sh NAME
-.Nm mpeg_musicout
-.Nd MPEG/audio Layer 1 and Layer 2 encoder
-.Sh SYNOPSIS
-.Nm mpeg_musicout
-queries for all arguments, or
-.br
-.Nm mpeg_musicout
-.Op Fl A
-.br
-.Op Fl s Ar sb
-.br
-inputBS
-.br
-.Op Ar outPCM
-.br
-.Sh DESCRIPTION
-The encoder and decoder software are configured to output
-the coded audio bitstreams as a string of hexadecimal ascii
-characters. For greater compression efficiency, compile flag,
-BS_FORMAT, in common.h can be switched to configure the bitstream
-reading and writing routines to process raw binary bitstreams.
-.br
-The decoder program has a very crude implementation of bitstream
-synchword detection. It may not be able to correctly decode valid
-bitstreams which have false synchword patterns in the ancillary data
-portion of the bitstream.
-.Sh RESTRICTIONS
-The software implements levels I and II and psychophysical auditory
-models I and II as described in the ISO 3-11171 rev 1 standard.
-There are future plans to implement level III.
-.br
-The input/output audio data may either be headerless raw 16 bit data
-or alternatively an AIFF formatted file (Audio Interchange File Format)
-with certain limitations.
-.br
-For more information on the AIFF format see the postscript file
-/sgi/aiff-c.9.26.91.ps at the anonymous ftp site FTP.SGI.COM
-(192.48.153.1).
-.br
-The AIFF formatted file is a convenient way for storing sampling rate
-of the audio file.
-.br
-The encoder and decoder software are configured to output the coded
-audio bitstreams as a string of hexadecimal ascii characters.
-For greater compression efficiency, compile flag, BS_FORMAT,
-in common.h can be switched to configure the bitstream reading
-and writing routines to process raw binary bitstreams.
-.br
-This software has been run and verified on a large variety of
-computers and operating systems. In particular UNIX, MS_DOS (with
-MicroSoft C version 6), Macintosh, AIX Platform (RS6000) and Convex.
-.Sh OPTIONS
-.Bl -tag -width Ds
-.It Sy -A
-write an AIFF output PCM sound file
-.It Sy -s sb
-resynth only up to this sb (debugging only)
-.It Sy inputBS
-input bit stream of encoded audio
-.It Sy outPCM
-output PCM sound file (dflt inName+.dec)
-.Sh SEE ALSO
-.Xr mpeg_musicin 1
-.Sh HISTORY
-Written by Andreas Klemm, August 17, 1997
diff --git a/audio/mpegaudio/patches/patch-aa b/audio/mpegaudio/patches/patch-aa
deleted file mode 100644
index 042c62eb71d..00000000000
--- a/audio/mpegaudio/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/12 00:54:04 wiz Exp $
-
---- Makefile.orig Wed Jan 5 02:47:50 1994
-+++ Makefile
-@@ -1,10 +1,21 @@
- ALL : musicin musicout
-
--CFLAGS = -O2
--LDFLAGS=
-+CFLAGS += -DPREFIX=\"${PREFIX}\"
-+
-+all: musicin musicout
-
- musicin: musicin.o common.o encode.o subs.o psy.o tonal.o
-- cc $(LDFLAGS) -o musicin musicin.o common.o encode.o subs.o psy.o tonal.o -lm
-+ ${CC} -o musicin musicin.o common.o encode.o subs.o psy.o tonal.o -lm
-
- musicout: musicout.o common.o decode.o subs.o
-- cc $(LDFLAGS) musicout.o common.o decode.o subs.o -o musicout -lm
-+ ${CC} musicout.o common.o decode.o subs.o -o musicout -lm
-+
-+clean:
-+ rm -f *.core *.o musicin musicout
-+
-+install:
-+ ${BSD_INSTALL_PROGRAM} musicin ${PREFIX}/bin/mpeg_musicin
-+ ${BSD_INSTALL_PROGRAM} musicout ${PREFIX}/bin/mpeg_musicout
-+ ${BSD_INSTALL_DATA_DIR} ${PREFIX}/lib/mpegaudio/tables
-+ ${BSD_INSTALL_DATA} tables/* ${PREFIX}/lib/mpegaudio/tables/
-+
diff --git a/audio/mpegaudio/patches/patch-ab b/audio/mpegaudio/patches/patch-ab
deleted file mode 100644
index 353648b2b64..00000000000
--- a/audio/mpegaudio/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/12 00:54:04 wiz Exp $
-
---- common.h.orig Wed Jan 5 02:42:00 1994
-+++ common.h
-@@ -73,7 +73,7 @@
- #endif
-
- #ifdef UNIX
--#define TABLES_PATH "tables" /* to find data files */
-+#define TABLES_PATH PREFIX "/lib/mpegaudio/tables" /* to find data files */
- /* name of environment variable holding path of table files */
- #define MPEGTABENV "MPEGTABLES"
- #define PATH_SEPARATOR "/" /* how to build paths */
diff --git a/audio/mpegaudio/patches/patch-ac b/audio/mpegaudio/patches/patch-ac
deleted file mode 100644
index fa690cb02b7..00000000000
--- a/audio/mpegaudio/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2006/06/09 15:08:08 minskim Exp $
-
---- musicin.c.orig 1994-01-05 01:13:44.000000000 +0000
-+++ musicin.c
-@@ -101,12 +101,16 @@ musicin.c
- #include "common.h"
- #include "encoder.h"
-
-+#include <stdlib.h>
-+
- /* Global variable definitions for "musicin.c" */
-
- FILE *musicin;
- Bit_stream_struc bs;
- char *programName;
-
-+static void usage();
-+
- /* Implementations */
-
- /************************************************************************
diff --git a/audio/mpegaudio/patches/patch-ad b/audio/mpegaudio/patches/patch-ad
deleted file mode 100644
index 2c0cdedce63..00000000000
--- a/audio/mpegaudio/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/06/09 15:08:08 minskim Exp $
-
---- musicout.c.orig 1994-01-05 04:39:27.000000000 +0000
-+++ musicout.c
-@@ -58,6 +58,10 @@ musicout.c
- #include "common.h"
- #include "decoder.h"
-
-+#include <stdlib.h>
-+
-+static void usage();
-+
- /********************************************************************
- /*
- /* This part contains the MPEG I decoder for Layers I & II.
diff --git a/audio/mpegaudio/patches/patch-ae b/audio/mpegaudio/patches/patch-ae
deleted file mode 100644
index 697e18d181e..00000000000
--- a/audio/mpegaudio/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/06/09 15:08:08 minskim Exp $
-
---- encoder.h.orig 1994-01-05 01:13:26.000000000 +0000
-+++ encoder.h
-@@ -150,7 +150,6 @@ extern void parse_args(int, char**, fr
- char[MAX_NAME_SIZE], char[MAX_NAME_SIZE]);
- extern void print_config(frame_params*, int*, unsigned long*,
- char[MAX_NAME_SIZE], char[MAX_NAME_SIZE]);
--extern void usage(void);
- extern void aiff_check(char*, IFF_AIFF*);
- #else
- extern void obtain_parameters();
diff --git a/audio/mpegaudio/patches/patch-af b/audio/mpegaudio/patches/patch-af
deleted file mode 100644
index 848c23a4b06..00000000000
--- a/audio/mpegaudio/patches/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/06/09 15:08:08 minskim Exp $
-
---- decoder.h.orig 1994-01-05 01:12:50.000000000 +0000
-+++ decoder.h
-@@ -92,14 +92,6 @@ decoder.h
- *
- ***********************************************************************/
-
--/* The following functions are in the file "musicout.c" */
--
--#ifdef PROTO_ARGS
--extern void usage(void);
--#else
--extern void usage();
--#endif
--
- /* The following functions are in the file "decode.c" */
-
- #ifdef PROTO_ARGS
diff --git a/audio/mpg123-esound/DESCR b/audio/mpg123-esound/DESCR
deleted file mode 100644
index dbff9b1adc8..00000000000
--- a/audio/mpg123-esound/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-mpg123-esound reads one or more files (or standard input if ``-'' is
-specified) or URLs and plays them to the Enlightened Sound Daemon (by
-default) or outputs them to a specified file or to stdout.
-
-File(s) and/or URL contents are assumed to be MPEG-1.0/2.0 audio
-layer 1, 2, or 3 bit streams.
diff --git a/audio/mpg123-esound/Makefile b/audio/mpg123-esound/Makefile
deleted file mode 100644
index aa6f6dc1863..00000000000
--- a/audio/mpg123-esound/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2007/01/07 09:13:47 rillig Exp $
-
-PKGNAME= mpg123-esound-${MPG123_VERSION}
-PKGREVISION= 7
-COMMENT= Command-line player for mpeg layer 1, 2 and 3 audio with EsounD
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-
-TARGET_SUFFIX= -esd
-
-PKG_OPTIONS_VAR=PKG_OPTIONS.mpg123-esound
-.include "../../audio/mpg123/Makefile.common"
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/mpg123 ${PREFIX}/bin/mpg123-esound
- ${INSTALL_MAN} ${WRKSRC}/mpg123.1 ${PREFIX}/${PKGMANDIR}/man1/mpg123-esound.1
-
-.include "../../audio/esound/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mpg123-esound/PLIST b/audio/mpg123-esound/PLIST
deleted file mode 100644
index 2e9c7d74080..00000000000
--- a/audio/mpg123-esound/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/11/28 12:15:49 markd Exp $
-bin/mpg123-esound
-man/man1/mpg123-esound.1
diff --git a/audio/mpg123-nas/DESCR b/audio/mpg123-nas/DESCR
deleted file mode 100644
index 7a9eb80829d..00000000000
--- a/audio/mpg123-nas/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-mpg123 reads one or more files (or standard input if ``-'' is
-specified) or URLs and plays them to the NAS device (default) or
-outputs them to a specified file or to stdout.
-
-File(s) and/or URL contents are assumed to be MPEG-1.0/2.0 audio
-layer 1, 2, or 3 bit streams.
diff --git a/audio/mpg123-nas/Makefile b/audio/mpg123-nas/Makefile
deleted file mode 100644
index a06596b6450..00000000000
--- a/audio/mpg123-nas/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2007/01/26 21:39:00 joerg Exp $
-
-PKGNAME= mpg123${TARGET_SUFFIX}-${MPG123_VERSION}
-PKGREVISION= 10
-COMMENT= Command-line player for mpeg layer 1, 2 and 3 audio with NAS output
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-
-TARGET_SUFFIX= -nas
-
-CONFLICTS+= mpg123-[0-9]*
-
-NOT_FOR_COMPILER= sunpro
-ONLY_FOR_PLATFORM= DragonFly-*-* FreeBSD-*-* Linux-*-* NetBSD-*-* \
- SunOS-*-*
-
-PKG_OPTIONS_VAR=PKG_OPTIONS.mpg123-nas
-
-.include "../../audio/mpg123/Makefile.common"
-
-.include "../../audio/nas/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mpg123-nas/PLIST b/audio/mpg123-nas/PLIST
deleted file mode 100644
index 76569af1a05..00000000000
--- a/audio/mpg123-nas/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/25 06:28:00 rh Exp $
-bin/mpg123
-man/man1/mpg123.1
diff --git a/audio/mpg123/DESCR b/audio/mpg123/DESCR
deleted file mode 100644
index 54b4106faa5..00000000000
--- a/audio/mpg123/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-mpg123 reads one or more files (or standard input if ``-'' is
-specified) or URLs and plays them on the audio device (default) or
-outputs them to stdout. file/URL is assumed to be an MPEG-1/2 audio
-bit stream.
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
deleted file mode 100644
index fb9785e6072..00000000000
--- a/audio/mpg123/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.42 2006/05/26 12:16:13 drochner Exp $
-
-PKGNAME= mpg123-${MPG123_VERSION}
-PKGREVISION= 9
-COMMENT= Command-line player for mpeg layer 1, 2 and 3 audio
-
-CONFLICTS+= mpg123-nas-[0-9]*
-
-PKG_OPTIONS_VAR=PKG_OPTIONS.mpg123
-.include "Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mpg123/Makefile.common b/audio/mpg123/Makefile.common
deleted file mode 100644
index 9367962787c..00000000000
--- a/audio/mpg123/Makefile.common
+++ /dev/null
@@ -1,93 +0,0 @@
-# $NetBSD: Makefile.common,v 1.29 2007/03/22 14:54:38 gdt Exp $
-
-DISTNAME= mpg123-0.59r
-MPG123_VERSION= 0.59.18
-CATEGORIES= audio
-MASTER_SITES= http://www.mpg123.de/mpg123/ \
- http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/
-
-PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/
-PATCHFILES= mpg123-059r-v6-20000713b.diff.gz
-
-MAINTAINER?= tron@NetBSD.org
-HOMEPAGE= http://www.mpg123.de/
-DIST_SUBDIR= mpg123
-PATCHDIR= ${.CURDIR}/../../audio/mpg123/patches
-FILESDIR= ${.CURDIR}/../../audio/mpg123/files
-DISTINFO_FILE= ${.CURDIR}/../../audio/mpg123/distinfo
-
-LICENSE= mpg123-license
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-.include "../../mk/bsd.prefs.mk"
-
-TARGET_SUFFIX?=
-
-# PKG_OPTIONS_VAR must be set in the including Makefile
-PKG_SUPPORTED_OPTIONS= inet6 mpg123-arm-fixed64
-PKG_SUGGESTED_OPTIONS= inet6
-PKG_OPTIONS_LEGACY_VARS+= MPG123_ARM_FIXED64:mpg123-arm-fixed64
-.include "../../mk/bsd.options.mk"
-
-###
-### IPv6 support
-###
-.if !empty(PKG_OPTIONS:Minet6)
-CPPFLAGS+= -DINET6
-.endif
-
-.include "../../mk/compiler.mk"
-.if ${OPSYS} == "SunOS"
-. if !empty(PKGSRC_COMPILER:Msunpro)
-BUILD_TARGET= solaris
-. else
-BUILD_TARGET= solaris-gcc${TARGET_SUFFIX}
-. endif
-.elif ${OPSYS} == "IRIX"
-BUILD_TARGET= sgi
-.elif ${OPSYS} == "Linux"
-. if ${TARGET_SUFFIX} == "-nas"
-BUILD_TARGET= linux-nas
-. elif ${MACHINE_ARCH} == "i386"
-BUILD_TARGET= linux
-. elif ${MACHINE_ARCH} == "powerpc"
-BUILD_TARGET= linux-ppc
-. else
-BUILD_TARGET= ${LOWER_OPSYS}-${MACHINE_ARCH}
-. endif
-.elif ${OPSYS} == "NetBSD"
-. if ${MACHINE_ARCH} == "i386"
-. if ${OBJECT_FMT} == "ELF"
-BUILD_TARGET= netbsd-i386-elf${TARGET_SUFFIX}
-. else
-BUILD_TARGET= netbsd-i386${TARGET_SUFFIX}
-. endif # ELF
-. elif ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-###
-### Optionally enable 64-bit calculations to avoid glitches on ARM.
-###
-. if !empty(PKG_OPTIONS:Mmpg123-arm-fixed64)
-BUILD_TARGET= netbsd-arm-64${TARGET_SUFFIX}
-. else
-BUILD_TARGET= netbsd-arm${TARGET_SUFFIX}
-. endif
-. elif ${MACHINE_ARCH} == "m68k"
-BUILD_TARGET= netbsd-m68k${TARGET_SUFFIX}
-. else
-BUILD_TARGET= netbsd${TARGET_SUFFIX}
-. endif
-.else
-BUILD_TARGET= ${LOWER_OPSYS}${TARGET_SUFFIX}
-.endif
-
-MAKE_FLAGS+= PREFIX=${PREFIX:Q}
-
-pre-patch:
- ${LN} -s . ${WRKSRC}/mpg123
-
-post-patch:
- ${RM} -f ${WRKSRC}/mpg123
- ${CP} ${FILESDIR}/decode_i586_.s ${WRKSRC}
- cd ${WRKSRC} && ${MV} decode_i586.s decode_i586.s.orig; \
- ${SED} -e 's@^/@#/@g' decode_i586.s.orig > decode_i586.s
diff --git a/audio/mpg123/PLIST b/audio/mpg123/PLIST
deleted file mode 100644
index daeb8857cd0..00000000000
--- a/audio/mpg123/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:31 zuntum Exp $
-bin/mpg123
-man/man1/mpg123.1
diff --git a/audio/mpg123/distinfo b/audio/mpg123/distinfo
deleted file mode 100644
index bcb66d4b09a..00000000000
--- a/audio/mpg123/distinfo
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: distinfo,v 1.27 2006/05/26 12:16:13 drochner Exp $
-
-SHA1 (mpg123/mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493
-RMD160 (mpg123/mpg123-0.59r.tar.gz) = 17d47ca04fdcac5e2d71f95ccbd23b61b5ed8b3c
-Size (mpg123/mpg123-0.59r.tar.gz) = 159028 bytes
-SHA1 (mpg123/mpg123-059r-v6-20000713b.diff.gz) = fab11489b6a1ab79d6c29787161f1c05e492dc0b
-RMD160 (mpg123/mpg123-059r-v6-20000713b.diff.gz) = c1942566dcbaf9bd605a1544b5c390e27dc150ca
-Size (mpg123/mpg123-059r-v6-20000713b.diff.gz) = 5600 bytes
-SHA1 (patch-aa) = 89bbd6e349fda3a646813dc6314da72a6dd22ed3
-SHA1 (patch-ab) = ffc387d93f0f2832e49796c80be26e908defa3a7
-SHA1 (patch-ac) = 06a5037e27ddd4cc34e5348c09e702f9740173c5
-SHA1 (patch-ad) = e9b2b874a95a67139c7d48e74492eb64dfa815f0
-SHA1 (patch-ae) = 9ac13c978bdf498cbd5e9fa0777a51559fdb2403
-SHA1 (patch-af) = 309075bc6fd4b689b711f0ae84f2e5c829609452
-SHA1 (patch-ag) = c27b6a441573939dc23268a6937905d038d6a66b
-SHA1 (patch-ah) = e1419bc6d25360d0825041028b6b3f485bcf5f43
-SHA1 (patch-ai) = eff8d2d5602056a052855dc81046642779a61272
-SHA1 (patch-aj) = b828a5e35a03b307d46cd07356624d19b9d56777
-SHA1 (patch-ak) = b30898cff26859eca0d23ea8cfdd461920b978a8
-SHA1 (patch-al) = 88dec640d40e6a3f1828096a4ff7b5a4dbd0a222
-SHA1 (patch-am) = 661c1f95f65145f4e08706eb3f6fe975118a2822
-SHA1 (patch-an) = 08917e1825adcfd870bb2c61ae865339da7c45ef
-SHA1 (patch-ao) = 40961a43cc3dbebf71deee1c240907896d297304
-SHA1 (patch-ap) = b35e7f6739a8b4979412793c7b3f2f7f5a9f15a7
-SHA1 (patch-aq) = 7eb736b995bf35b7ad029ea4d96bdfbaf669e689
-SHA1 (patch-ar) = e81771bf72da97d898f9320fb6c529e5a1151050
-SHA1 (patch-as) = 8765b22c556cdc217f6270f3a5e70b40b36b9229
-SHA1 (patch-at) = 9a64a62f7d1d115e3d36dbb0f08762d4b0eb1e2b
-SHA1 (patch-au) = 02c480cbb6ff8ab904be93eaf319b43f4f02d588
-SHA1 (patch-av) = 9c25c4a82042ca862409284fb2616a613485ff76
-SHA1 (patch-aw) = ba937829caf7f3ca042dca87f5b3f83a0cf2611a
diff --git a/audio/mpg123/files/decode_i586_.s b/audio/mpg123/files/decode_i586_.s
deleted file mode 100644
index a9b2dc7421d..00000000000
--- a/audio/mpg123/files/decode_i586_.s
+++ /dev/null
@@ -1,320 +0,0 @@
-/
-/ synth_1to1 works the same way as the c version of this
-/ file. only two types of changes have been made:
-/ - reordered floating point instructions to
-/ prevent pipline stalls
-/ - made WRITE_SAMPLE use integer instead of
-/ (slower) floating point
-/ all kinds of x86 processors should benefit from these
-/ modifications.
-/
-/ useful sources of information on optimizing x86 code include:
-/
-/ Intel Architecture Optimization Manual
-/ http://www.intel.com/design/pentium/manuals/242816.htm
-/
-/ Cyrix 6x86 Instruction Set Summary
-/ ftp://ftp.cyrix.com/6x86/6x-dbch6.pdf
-/
-/ AMD-K5 Processor Software Development
-/ http://www.amd.com/products/cpg/techdocs/appnotes/20007e.pdf
-/
-/ Stefan Bieschewski <stb@acm.org>
-/
-/ $Id: decode_i586_.s,v 1.2 2005/05/31 22:13:24 rillig Exp $
-/
-.bss
- .comm buffs,4352
-.data
- .align 2
-bo:
- .long 1
-.text
- .align 3
-.LC0:
- .long 0x0,0x40dfffc0
- .align 3
-.LC1:
- .long 0x0,0xc0e00000
-.text
- .align 3
-.globl _synth_1to1_pent
-_synth_1to1_pent:
- subl $12,%esp
- pushl %ebp
- pushl %edi
- pushl %esi
- pushl %ebx
- movl 32(%esp),%eax
- movl 40(%esp),%esi
- xorl %edi,%edi
- movl bo,%ebp
- cmpl %edi,36(%esp)
- jne .L48
- decl %ebp
- andl $15,%ebp
- movl %ebp,bo
- movl $buffs,%ecx
- jmp .L49
-.L48:
- addl $2,%esi
- movl $buffs+2176,%ecx
-.L49:
- testl $1,%ebp
- je .L50
- movl %ecx,%ebx
- movl %ebp,16(%esp)
- pushl %eax
- movl 20(%esp),%edx
- leal (%ebx,%edx,4),%eax
- pushl %eax
- movl 24(%esp),%eax
- incl %eax
- andl $15,%eax
- leal 1088(,%eax,4),%eax
- addl %ebx,%eax
- jmp .L74
-.L50:
- leal 1088(%ecx),%ebx
- leal 1(%ebp),%edx
- movl %edx,16(%esp)
- pushl %eax
- leal 1092(%ecx,%ebp,4),%eax
- pushl %eax
- leal (%ecx,%ebp,4),%eax
-.L74:
- pushl %eax
- call _dct64
- addl $12,%esp
- movl 16(%esp),%edx
- leal 0(,%edx,4),%edx
- movl $_decwin+64,%eax
- movl %eax,%ecx
- subl %edx,%ecx
- movl $16,%ebp
-.L55:
- flds (%ecx)
- fmuls (%ebx)
- flds 4(%ecx)
- fmuls 4(%ebx)
- fxch %st(1)
- flds 8(%ecx)
- fmuls 8(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds 12(%ecx)
- fmuls 12(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 16(%ecx)
- fmuls 16(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds 20(%ecx)
- fmuls 20(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 24(%ecx)
- fmuls 24(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds 28(%ecx)
- fmuls 28(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 32(%ecx)
- fmuls 32(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds 36(%ecx)
- fmuls 36(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 40(%ecx)
- fmuls 40(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds 44(%ecx)
- fmuls 44(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 48(%ecx)
- fmuls 48(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds 52(%ecx)
- fmuls 52(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 56(%ecx)
- fmuls 56(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds 60(%ecx)
- fmuls 60(%ebx)
- fxch %st(2)
- subl $4,%esp
- faddp %st,%st(1)
- fxch %st(1)
- fsubrp %st,%st(1)
- fistpl (%esp)
- popl %eax
- cmpl $32767,%eax
- jg 1f
- cmpl $-32768,%eax
- jl 2f
- movw %ax,(%esi)
- jmp 4f
-1: movw $32767,(%esi)
- jmp 3f
-2: movw $-32768,(%esi)
-3: incl %edi
-4:
-.L54:
- addl $64,%ebx
- subl $-128,%ecx
- addl $4,%esi
- decl %ebp
- jnz .L55
- flds (%ecx)
- fmuls (%ebx)
- flds 8(%ecx)
- fmuls 8(%ebx)
- flds 16(%ecx)
- fmuls 16(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 24(%ecx)
- fmuls 24(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 32(%ecx)
- fmuls 32(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 40(%ecx)
- fmuls 40(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 48(%ecx)
- fmuls 48(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 56(%ecx)
- fmuls 56(%ebx)
- fxch %st(2)
- subl $4,%esp
- faddp %st,%st(1)
- fxch %st(1)
- faddp %st,%st(1)
- fistpl (%esp)
- popl %eax
- cmpl $32767,%eax
- jg 1f
- cmpl $-32768,%eax
- jl 2f
- movw %ax,(%esi)
- jmp 4f
-1: movw $32767,(%esi)
- jmp 3f
-2: movw $-32768,(%esi)
-3: incl %edi
-4:
-.L62:
- addl $-64,%ebx
- addl $4,%esi
- movl 16(%esp),%edx
- leal -128(%ecx,%edx,8),%ecx
- movl $15,%ebp
-.L68:
- flds -4(%ecx)
- fchs
- fmuls (%ebx)
- flds -8(%ecx)
- fmuls 4(%ebx)
- fxch %st(1)
- flds -12(%ecx)
- fmuls 8(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -16(%ecx)
- fmuls 12(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -20(%ecx)
- fmuls 16(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -24(%ecx)
- fmuls 20(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -28(%ecx)
- fmuls 24(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -32(%ecx)
- fmuls 28(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -36(%ecx)
- fmuls 32(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -40(%ecx)
- fmuls 36(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -44(%ecx)
- fmuls 40(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -48(%ecx)
- fmuls 44(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -52(%ecx)
- fmuls 48(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -56(%ecx)
- fmuls 52(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -60(%ecx)
- fmuls 56(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds (%ecx)
- fmuls 60(%ebx)
- fxch %st(2)
- subl $4,%esp
- fsubrp %st,%st(1)
- fxch %st(1)
- fsubrp %st,%st(1)
- fistpl (%esp)
- popl %eax
- cmpl $32767,%eax
- jg 1f
- cmpl $-32768,%eax
- jl 2f
- movw %ax,(%esi)
- jmp 4f
-1: movw $32767,(%esi)
- jmp 3f
-2: movw $-32768,(%esi)
-3: incl %edi
-4:
-.L67:
- addl $-64,%ebx
- addl $-128,%ecx
- addl $4,%esi
- decl %ebp
- jnz .L68
- movl %edi,%eax
- popl %ebx
- popl %esi
- popl %edi
- popl %ebp
- addl $12,%esp
- ret
diff --git a/audio/mpg123/patches/patch-aa b/audio/mpg123/patches/patch-aa
deleted file mode 100644
index edfb340953d..00000000000
--- a/audio/mpg123/patches/patch-aa
+++ /dev/null
@@ -1,288 +0,0 @@
-$NetBSD: patch-aa,v 1.26 2005/12/11 21:59:29 joerg Exp $
-
---- Makefile.orig 2005-12-11 21:33:57.000000000 +0000
-+++ Makefile
-@@ -54,6 +54,23 @@ nothing-specified:
- @echo "make aix-tk3play IBM AIX"
- @echo "make os2 IBM OS/2"
- @echo "make netbsd NetBSD"
-+ @echo "make netbsd-arm NetBSD for strongarm (32bit fixedpoint)"
-+ @echo "make netbsd-arm-64 NetBSD for strongarm (64bit fixedpoint)"
-+ @echo "make netbsd-i386 NetBSD optimized for i386"
-+ @echo "make netbsd-i386-elf NetBSD optimized for i386, ELF format"
-+ @echo "make netbsd-m68k NetBSD optimized for m68k"
-+ @echo "make netbsd-esd NetBSD with EsounD"
-+ @echo "make netbsd-arm-esd NetBSD for strongarm (32bit fixedpoint) with EsounD"
-+ @echo "make netbsd-arm-64-esd NetBSD for strongarm (64bit fixedpoint) with EsounD"
-+ @echo "make netbsd-i386-esd NetBSD optimized for i386 with EsounD"
-+ @echo "make netbsd-i386-elf-esd NetBSD optimized for i386, ELF format with EsounD"
-+ @echo "make netbsd-m68k-esd NetBSD optimized for m68k with EsounD"
-+ @echo "make netbsd-nas NetBSD with NAS"
-+ @echo "make netbsd-arm-nas NetBSD for strongarm (32bit fixedpoint) with NAS"
-+ @echo "make netbsd-arm-64-nas NetBSD for strongarm (64bit fixedpoint) with NAS"
-+ @echo "make netbsd-i386-nas NetBSD optimized for i386 with NAS"
-+ @echo "make netbsd-i386-elf-nas NetBSD optimized for i386, ELF format with NAS"
-+ @echo "make netbsd-m68k-nas NetBSD optimized for m68k with NAS"
- @echo "make bsdos BSDI BSD/OS"
- @echo "make bsdos4 BSDI BSD/OS 4.0"
- @echo "make bsdos-nas BSDI BSD/OS with NAS support"
-@@ -300,7 +317,7 @@ linux-nas:
- #CFLAGS='$(CFLAGS) -DI386_ASSEM -O2 -DREAL_IS_FLOAT -DLINUX -Wall -g'
- #CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -Wall -O2 -m486 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2'
-
--freebsd:
-+dragonfly freebsd:
- $(MAKE) CC=cc LDFLAGS= \
- OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
- CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
-@@ -309,11 +326,11 @@ freebsd:
- -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
- mpg123-make
-
--freebsd-esd:
-+dragonfly-esd freebsd-esd:
- $(MAKE) CC=cc LDFLAGS= \
-- AUDIO_LIB='-lesd -laudiofile' \
-+ AUDIO_LIB="`esd-config --libs`" \
- OBJECTS='decode_i386.o dct64_i386.o $(GETBITS) audio_esd.o' \
-- CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
-+ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
- -funroll-all-loops -ffast-math -DROT_I386 \
- -DREAD_MMAP \
- -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
-@@ -321,7 +338,7 @@ freebsd-esd:
- $(CFLAGS)' \
- mpg123-make
-
--freebsd-frontend:
-+dragonfly-frontend freebsd-frontend:
- $(MAKE) CC=cc LDFLAGS= \
- OBJECTS='decode_i386.o dct64_i386.o audio_oss.o \
- control_sajber.o control_tk3play.o' \
-@@ -398,7 +415,7 @@ solaris-x86-gcc-oss:
-
- solaris-gcc-nas:
- $(MAKE) CC=gcc LDFLAGS='-lsocket -lnsl' \
-- AUDIO_LIB='-L/usr/openwin/lib -laudio -lXau'\
-+ AUDIO_LIB='-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -laudio -lXt -lXau'\
- OBJECTS='decode.o dct64.o audio_nas.o' \
- CFLAGS='$(CFLAGS) -O2 -I/usr/openwin/include -Wall \
- -DSOLARIS -DREAL_IS_FLOAT -DUSE_MMAP \
-@@ -496,18 +513,194 @@ os2:
-
- netbsd:
- $(MAKE) CC=cc LDFLAGS= \
-- OBJECTS='decode.o dct64.o audio_sun.o' \
-+ OBJECTS='decode.o dct64.o audio_sun.o term.o' \
- CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
-- -funroll-all-loops -ffast-math \
-- -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
-+ -funroll-all-loops -ffast-math -DREAD_MMAP \
-+ -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \
- mpg123-make
-
- netbsd-i386:
- $(MAKE) CC=cc LDFLAGS= \
-- OBJECTS='decode_i386.o dct64_i386.o audio_sun.o' \
-- CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
-+ OBJECTS='decode_i386.o dct64_i386.o audio_sun.o term.o' \
-+ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
-+ -funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \
-+ -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \
-+ mpg123-make
-+
-+netbsd-i386-elf:
-+ $(MAKE) CC=cc LDFLAGS= \
-+ OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
-+ audio_sun.o term.o' \
-+ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
- -funroll-all-loops -ffast-math -DROT_I386 \
-- -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
-+ -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \
-+ -DREAD_MMAP -DNETBSD -DTERM_CONTROL' \
-+ mpg123-make
-+
-+netbsd-m68k:
-+ $(MAKE) CC=cc LDFLAGS= \
-+ OBJECTS='decode.o dct64.o audio_sun.o term.o' \
-+ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
-+ -ffast-math -DREAL_IS_FLOAT -DREAD_MMAP \
-+ -DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL' \
-+ mpg123-make
-+
-+netbsd-arm:
-+ $(MAKE) CC=cc LDFLAGS= \
-+ OBJECTS='decode.o dct64.o audio_sun.o term.o' \
-+ CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
-+ -funroll-all-loops -finline-functions -ffast-math \
-+ -march=armv4 -mtune=strongarm -mcpu=strongarm \
-+ -DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \
-+ -DNETBSD' \
-+ mpg123-make
-+
-+netbsd-arm-64:
-+ $(MAKE) CC=cc LDFLAGS= \
-+ OBJECTS='decode.o dct64.o audio_sun.o term.o' \
-+ CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
-+ -funroll-all-loops -finline-functions -ffast-math \
-+ -march=armv4 -mtune=strongarm110 -mcpu=strongarm110 \
-+ -DREAL_IS_FIXED_ARMV4 -DUSE_MMAP -DREAD_MMAP \
-+ -DTERM_CONTROL -DNETBSD' \
-+ mpg123-make
-+
-+netbsd-esd:
-+ $(MAKE) CC=cc LDFLAGS= \
-+ AUDIO_LIB="`esd-config --libs`" \
-+ OBJECTS='decode.o dct64.o audio_esd.o term.o' \
-+ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
-+ -funroll-all-loops -ffast-math -DREAD_MMAP \
-+ -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \
-+ `esd-config --cflags`' \
-+ mpg123-make
-+
-+netbsd-i386-esd:
-+ $(MAKE) CC=cc LDFLAGS= \
-+ AUDIO_LIB="`esd-config --libs`" \
-+ OBJECTS='decode_i386.o dct64_i386.o audio_esd.o term.o' \
-+ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
-+ -funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \
-+ -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \
-+ `esd-config --cflags`' \
-+ mpg123-make
-+
-+netbsd-i386-elf-esd:
-+ $(MAKE) CC=cc LDFLAGS= \
-+ AUDIO_LIB="`esd-config --libs`" \
-+ OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
-+ audio_esd.o term.o' \
-+ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
-+ -funroll-all-loops -ffast-math -DROT_I386 \
-+ -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \
-+ -DREAD_MMAP -DNETBSD -DTERM_CONTROL \
-+ `esd-config --cflags`' \
-+ mpg123-make
-+
-+netbsd-m68k-esd:
-+ $(MAKE) CC=cc LDFLAGS= \
-+ AUDIO_LIB="`esd-config --libs`" \
-+ OBJECTS='decode.o dct64.o audio_esd.o term.o' \
-+ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
-+ -ffast-math -DREAL_IS_FLOAT -DREAD_MMAP \
-+ -DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL \
-+ `esd-config --cflags`' \
-+ mpg123-make
-+
-+netbsd-arm-esd:
-+ $(MAKE) CC=cc LDFLAGS= \
-+ AUDIO_LIB="`esd-config --libs`" \
-+ OBJECTS='decode.o dct64.o audio_esd.o term.o' \
-+ CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
-+ -funroll-all-loops -finline-functions -ffast-math \
-+ -march=armv4 -mtune=strongarm -mcpu=strongarm \
-+ -DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \
-+ -DNETBSD `esd-config --cflags`' \
-+ mpg123-make
-+
-+netbsd-arm-64-esd:
-+ $(MAKE) CC=cc LDFLAGS= \
-+ AUDIO_LIB="`esd-config --libs`" \
-+ OBJECTS='decode.o dct64.o audio_esd.o term.o' \
-+ CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
-+ -funroll-all-loops -finline-functions -ffast-math \
-+ -march=armv4 -mtune=strongarm110 -mcpu=strongarm110 \
-+ -DREAL_IS_FIXED_ARMV4 -DUSE_MMAP -DREAD_MMAP \
-+ -DTERM_CONTROL -DNETBSD `esd-config --cflags`' \
-+ mpg123-make
-+
-+netbsd-nas:
-+ $(MAKE) CC=cc LDFLAGS= \
-+ AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
-+ OBJECTS='decode.o dct64.o audio_nas.o term.o' \
-+ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
-+ -funroll-all-loops -ffast-math -DREAD_MMAP \
-+ -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \
-+ -DNAS' \
-+ mpg123-make
-+
-+dragonfly-nas freebsd-nas:
-+ $(MAKE) CC=cc LDFLAGS= \
-+ AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
-+ OBJECTS='decode_i386.o dct64_i386.o $(GETBITS) audio_nas.o' \
-+ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
-+ -funroll-all-loops -ffast-math -DROT_I386 \
-+ -DREAD_MMAP \
-+ -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNAS' \
-+ mpg123-make
-+
-+netbsd-i386-nas:
-+ $(MAKE) CC=cc LDFLAGS= \
-+ AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
-+ OBJECTS='decode_i386.o dct64_i386.o audio_nas.o term.o' \
-+ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
-+ -funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \
-+ -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \
-+ -DNAS' \
-+ mpg123-make
-+
-+netbsd-i386-elf-nas:
-+ $(MAKE) CC=cc LDFLAGS= \
-+ AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
-+ OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
-+ audio_nas.o term.o' \
-+ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
-+ -funroll-all-loops -ffast-math -DROT_I386 \
-+ -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \
-+ -DREAD_MMAP -DNETBSD -DTERM_CONTROL \
-+ -DNAS' \
-+ mpg123-make
-+
-+netbsd-m68k-nas:
-+ $(MAKE) CC=cc LDFLAGS= \
-+ AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
-+ OBJECTS='decode.o dct64.o audio_nas.o term.o' \
-+ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
-+ -ffast-math -DREAL_IS_FLOAT -DREAD_MMAP \
-+ -DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL \
-+ -DNAS' \
-+ mpg123-make
-+
-+netbsd-arm-nas:
-+ $(MAKE) CC=cc LDFLAGS= \
-+ AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
-+ OBJECTS='decode.o dct64.o audio_nas.o term.o' \
-+ CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
-+ -funroll-all-loops -finline-functions -ffast-math \
-+ -march=armv4 -mtune=strongarm -mcpu=strongarm \
-+ -DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \
-+ -DNETBSD -DNAS' \
-+ mpg123-make
-+
-+netbsd-arm-64-nas:
-+ $(MAKE) CC=cc LDFLAGS= \
-+ AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
-+ OBJECTS='decode.o dct64.o audio_nas.o term.o' \
-+ CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
-+ -funroll-all-loops -finline-functions -ffast-math \
-+ -march=armv4 -mtune=strongarm110 -mcpu=strongarm110 \
-+ -DREAL_IS_FIXED_ARMV4 -DUSE_MMAP -DREAD_MMAP \
-+ -DTERM_CONTROL -DNETBSD -DNAS' \
- mpg123-make
-
- bsdos:
-@@ -556,6 +749,16 @@ generic:
- CFLAGS='$(CFLAGS) -O -DGENERIC -DNOXFERMEM' \
- mpg123-make
-
-+darwin-esd:
-+ $(MAKE) CC=cc LDFLAGS= \
-+ AUDIO_LIB="`esd-config --libs`" \
-+ OBJECTS='decode.o dct64.o audio_esd.o term.o' \
-+ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
-+ -funroll-all-loops -ffast-math -DREAD_MMAP \
-+ -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL \
-+ `esd-config --cflags`' \
-+ mpg123-make
-+
- ###########################################################################
- ###########################################################################
- ###########################################################################
diff --git a/audio/mpg123/patches/patch-ab b/audio/mpg123/patches/patch-ab
deleted file mode 100644
index 63585b91bee..00000000000
--- a/audio/mpg123/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.3 1999/07/18 19:23:55 tron Exp $
-
---- mpg123.c.orig Tue Jun 15 22:21:36 1999
-+++ mpg123.c Sun Jul 18 21:20:19 1999
-@@ -177,6 +177,9 @@
- _exit(0);
- default: /* parent */
- xfermem_init_writer (buffermem);
-+ if (xfermem_block(XF_WRITER, buffermem) == XF_CMD_TERMINATE) {
-+ intflag = TRUE;
-+ }
- param.outmode = DECODE_BUFFER;
- }
- }
-@@ -918,7 +921,7 @@
- {
- const char *term_type;
- term_type = getenv("TERM");
-- if (!strcmp(term_type,"xterm"))
-+ if (term_type && !strcmp(term_type,"xterm"))
- {
- fprintf(stderr, "\033]0;%s\007", filename);
- }
diff --git a/audio/mpg123/patches/patch-ac b/audio/mpg123/patches/patch-ac
deleted file mode 100644
index 42803422ad5..00000000000
--- a/audio/mpg123/patches/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ac,v 1.3 1999/09/27 08:27:46 agc Exp $
-
---- audio_sun.c.orig Thu Feb 4 13:22:34 1999
-+++ audio_sun.c Mon Sep 27 09:17:00 1999
-@@ -17,6 +17,8 @@
-
- #include "mpg123.h"
-
-+extern int outburst;
-+
- #ifndef SPARCLINUX
- #include <sys/filio.h>
- #ifdef SUNOS
-@@ -78,6 +80,17 @@
- }
-
- #ifndef NETBSD
-+ AUDIO_INITINFO(&ainfo);
-+ if(ioctl(ai->fn, AUDIO_GETINFO, &ainfo) == -1)
-+ return -1;
-+#ifdef SOLARIS
-+ outburst = MAXOUTBURST;
-+#else
-+ outburst = ainfo.blocksize;
-+#endif
-+ if(outburst > MAXOUTBURST)
-+ outburst = MAXOUTBURST;
-+
- AUDIO_INITINFO(&ainfo);
-
- if(ai->output > 0)
diff --git a/audio/mpg123/patches/patch-ad b/audio/mpg123/patches/patch-ad
deleted file mode 100644
index 60e5bfc511d..00000000000
--- a/audio/mpg123/patches/patch-ad
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-ad,v 1.3 1999/10/12 04:43:12 simonb Exp $
-
---- dct64.c.orig Sat Sep 20 21:16:04 1997
-+++ dct64.c Thu Aug 12 23:28:33 1999
-@@ -29,7 +29,7 @@
- for(i=15;i>=0;i--)
- *bs++ = (*b1++ + *--b2);
- for(i=15;i>=0;i--)
-- *bs++ = (*--b2 - *b1++) * *--costab;
-+ *bs++ = REAL_MUL((*--b2 - *b1++), *--costab);
-
- b1 = bufs;
- costab = pnts[1]+8;
-@@ -39,13 +39,13 @@
- for(i=7;i>=0;i--)
- *bs++ = (*b1++ + *--b2);
- for(i=7;i>=0;i--)
-- *bs++ = (*--b2 - *b1++) * *--costab;
-+ *bs++ = REAL_MUL((*--b2 - *b1++), *--costab);
- b2 += 32;
- costab += 8;
- for(i=7;i>=0;i--)
- *bs++ = (*b1++ + *--b2);
- for(i=7;i>=0;i--)
-- *bs++ = (*b1++ - *--b2) * *--costab;
-+ *bs++ = REAL_MUL((*b1++ - *--b2), *--costab);
- b2 += 32;
- }
-
-@@ -58,12 +58,12 @@
- for(i=3;i>=0;i--)
- *bs++ = (*b1++ + *--b2);
- for(i=3;i>=0;i--)
-- *bs++ = (*--b2 - *b1++) * costab[i];
-+ *bs++ = REAL_MUL((*--b2 - *b1++), costab[i]);
- b2 += 16;
- for(i=3;i>=0;i--)
- *bs++ = (*b1++ + *--b2);
- for(i=3;i>=0;i--)
-- *bs++ = (*b1++ - *--b2) * costab[i];
-+ *bs++ = REAL_MUL((*b1++ - *--b2), costab[i]);
- b2 += 16;
- }
-
-@@ -75,13 +75,13 @@
- {
- *bs++ = (*b1++ + *--b2);
- *bs++ = (*b1++ + *--b2);
-- *bs++ = (*--b2 - *b1++) * costab[1];
-- *bs++ = (*--b2 - *b1++) * costab[0];
-+ *bs++ = REAL_MUL((*--b2 - *b1++), costab[1]);
-+ *bs++ = REAL_MUL((*--b2 - *b1++), costab[0]);
- b2 += 8;
- *bs++ = (*b1++ + *--b2);
- *bs++ = (*b1++ + *--b2);
-- *bs++ = (*b1++ - *--b2) * costab[1];
-- *bs++ = (*b1++ - *--b2) * costab[0];
-+ *bs++ = REAL_MUL((*b1++ - *--b2), costab[1]);
-+ *bs++ = REAL_MUL((*b1++ - *--b2), costab[0]);
- b2 += 8;
- }
- bs = bufs;
-@@ -92,10 +92,10 @@
- real v0,v1;
- v0=*b1++; v1 = *b1++;
- *bs++ = (v0 + v1);
-- *bs++ = (v0 - v1) * (*costab);
-+ *bs++ = REAL_MUL((v0 - v1), (*costab));
- v0=*b1++; v1 = *b1++;
- *bs++ = (v0 + v1);
-- *bs++ = (v1 - v0) * (*costab);
-+ *bs++ = REAL_MUL((v1 - v0), (*costab));
- }
-
- }
diff --git a/audio/mpg123/patches/patch-ae b/audio/mpg123/patches/patch-ae
deleted file mode 100644
index b7b340d3663..00000000000
--- a/audio/mpg123/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.5 1999/10/12 04:43:13 simonb Exp $
-
---- dct64_i486.c.orig Thu Nov 19 21:42:36 1998
-+++ dct64_i486.c Mon Aug 16 01:49:16 1999
-@@ -47,7 +47,11 @@
- #define SETOUT(out,n,expr) out[FIR_BUFFER_SIZE*(n)]=(expr)
- #define MUL(a,b) (((a)*(b)) >> 15)
- #define MULL(a,b) (((long long)(a)*(long long)(b)) >> 15)
-+#ifdef REAL_IS_FIXED
-+#define TOINT(a) ((a) * 32768 / (int)REAL_FACTOR)
-+#else
- #define TOINT(a) ((int)((a)*32768.0))
-+#endif
-
- void dct64_1_486(int *out0,int *out1,int *b1,int *b2)
- {
diff --git a/audio/mpg123/patches/patch-af b/audio/mpg123/patches/patch-af
deleted file mode 100644
index e0beaa74d3b..00000000000
--- a/audio/mpg123/patches/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-af,v 1.1 1999/04/08 07:35:56 tron Exp $
-
---- audio.c.orig Mon Nov 23 08:16:24 1998
-+++ audio.c Wed Apr 7 16:23:29 1999
-@@ -81,10 +81,14 @@
- k1 = NUM_RATES;
- }
-
-+#ifndef NETBSD
- if(audio_open(&ai1) < 0) {
- perror("audio");
- exit(1);
- }
-+#else
-+ audio_open(&ai1);
-+#endif
-
- for(i=0;i<NUM_CHANNELS;i++) {
- for(j=0;j<NUM_RATES;j++) {
diff --git a/audio/mpg123/patches/patch-ag b/audio/mpg123/patches/patch-ag
deleted file mode 100644
index fc0ebd58545..00000000000
--- a/audio/mpg123/patches/patch-ag
+++ /dev/null
@@ -1,123 +0,0 @@
-$NetBSD: patch-ag,v 1.3 1999/10/12 04:43:13 simonb Exp $
-
---- decode.c.orig Tue Jan 26 23:47:05 1999
-+++ decode.c Tue Oct 12 01:19:18 1999
-@@ -13,9 +13,9 @@
- #include "mpg123.h"
-
- #define WRITE_SAMPLE(samples,sum,clip) \
-- if( (sum) > 32767.0) { *(samples) = 0x7fff; (clip)++; } \
-- else if( (sum) < -32768.0) { *(samples) = -0x8000; (clip)++; } \
-- else { *(samples) = sum; }
-+ if( (sum) > REAL_PLUS_32767) { *(samples) = 0x7fff; (clip)++; } \
-+ else if( (sum) < REAL_MINUS_32768) { *(samples) = -0x8000; (clip)++; } \
-+ else { *(samples) = REAL_TO_SHORT(sum); }
-
- int synth_1to1_8bit(real *bandPtr,int channel,unsigned char *samples,int *pnt)
- {
-@@ -156,36 +156,36 @@
- for (j=16;j;j--,window+=0x10,samples+=step)
- {
- real sum;
-- sum = *window++ * *b0++;
-- sum -= *window++ * *b0++;
-- sum += *window++ * *b0++;
-- sum -= *window++ * *b0++;
-- sum += *window++ * *b0++;
-- sum -= *window++ * *b0++;
-- sum += *window++ * *b0++;
-- sum -= *window++ * *b0++;
-- sum += *window++ * *b0++;
-- sum -= *window++ * *b0++;
-- sum += *window++ * *b0++;
-- sum -= *window++ * *b0++;
-- sum += *window++ * *b0++;
-- sum -= *window++ * *b0++;
-- sum += *window++ * *b0++;
-- sum -= *window++ * *b0++;
-+ sum = REAL_MUL(*window++, *b0++);
-+ sum -= REAL_MUL(*window++, *b0++);
-+ sum += REAL_MUL(*window++, *b0++);
-+ sum -= REAL_MUL(*window++, *b0++);
-+ sum += REAL_MUL(*window++, *b0++);
-+ sum -= REAL_MUL(*window++, *b0++);
-+ sum += REAL_MUL(*window++, *b0++);
-+ sum -= REAL_MUL(*window++, *b0++);
-+ sum += REAL_MUL(*window++, *b0++);
-+ sum -= REAL_MUL(*window++, *b0++);
-+ sum += REAL_MUL(*window++, *b0++);
-+ sum -= REAL_MUL(*window++, *b0++);
-+ sum += REAL_MUL(*window++, *b0++);
-+ sum -= REAL_MUL(*window++, *b0++);
-+ sum += REAL_MUL(*window++, *b0++);
-+ sum -= REAL_MUL(*window++, *b0++);
-
- WRITE_SAMPLE(samples,sum,clip);
- }
-
- {
- real sum;
-- sum = window[0x0] * b0[0x0];
-- sum += window[0x2] * b0[0x2];
-- sum += window[0x4] * b0[0x4];
-- sum += window[0x6] * b0[0x6];
-- sum += window[0x8] * b0[0x8];
-- sum += window[0xA] * b0[0xA];
-- sum += window[0xC] * b0[0xC];
-- sum += window[0xE] * b0[0xE];
-+ sum = REAL_MUL(window[0x0], b0[0x0]);
-+ sum += REAL_MUL(window[0x2], b0[0x2]);
-+ sum += REAL_MUL(window[0x4], b0[0x4]);
-+ sum += REAL_MUL(window[0x6], b0[0x6]);
-+ sum += REAL_MUL(window[0x8], b0[0x8]);
-+ sum += REAL_MUL(window[0xA], b0[0xA]);
-+ sum += REAL_MUL(window[0xC], b0[0xC]);
-+ sum += REAL_MUL(window[0xE], b0[0xE]);
- WRITE_SAMPLE(samples,sum,clip);
- b0-=0x10,window-=0x20,samples+=step;
- }
-@@ -194,22 +194,22 @@
- for (j=15;j;j--,b0-=0x20,window-=0x10,samples+=step)
- {
- real sum;
-- sum = -*(--window) * *b0++;
-- sum -= *(--window) * *b0++;
-- sum -= *(--window) * *b0++;
-- sum -= *(--window) * *b0++;
-- sum -= *(--window) * *b0++;
-- sum -= *(--window) * *b0++;
-- sum -= *(--window) * *b0++;
-- sum -= *(--window) * *b0++;
-- sum -= *(--window) * *b0++;
-- sum -= *(--window) * *b0++;
-- sum -= *(--window) * *b0++;
-- sum -= *(--window) * *b0++;
-- sum -= *(--window) * *b0++;
-- sum -= *(--window) * *b0++;
-- sum -= *(--window) * *b0++;
-- sum -= *(--window) * *b0++;
-+ sum = -REAL_MUL(*(--window), *b0++);
-+ sum -= REAL_MUL(*(--window), *b0++);
-+ sum -= REAL_MUL(*(--window), *b0++);
-+ sum -= REAL_MUL(*(--window), *b0++);
-+ sum -= REAL_MUL(*(--window), *b0++);
-+ sum -= REAL_MUL(*(--window), *b0++);
-+ sum -= REAL_MUL(*(--window), *b0++);
-+ sum -= REAL_MUL(*(--window), *b0++);
-+ sum -= REAL_MUL(*(--window), *b0++);
-+ sum -= REAL_MUL(*(--window), *b0++);
-+ sum -= REAL_MUL(*(--window), *b0++);
-+ sum -= REAL_MUL(*(--window), *b0++);
-+ sum -= REAL_MUL(*(--window), *b0++);
-+ sum -= REAL_MUL(*(--window), *b0++);
-+ sum -= REAL_MUL(*(--window), *b0++);
-+ sum -= REAL_MUL(*(--window), *b0++);
-
- WRITE_SAMPLE(samples,sum,clip);
- }
-@@ -219,5 +219,3 @@
-
- return clip;
- }
--
--
diff --git a/audio/mpg123/patches/patch-ah b/audio/mpg123/patches/patch-ah
deleted file mode 100644
index 755dc0f59f4..00000000000
--- a/audio/mpg123/patches/patch-ah
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ah,v 1.3 1999/10/12 04:43:14 simonb Exp $
-
---- equalizer.c.orig Tue Feb 2 03:47:35 1999
-+++ equalizer.c Mon Aug 16 02:08:31 1999
-@@ -13,7 +13,7 @@
-
- if(equalfile) {
- for(i=0;i<32;i++)
-- bandPtr[i] *= equalizer[channel][i];
-+ bandPtr[i] = REAL_MUL(bandPtr[i], equalizer[channel][i]);
- }
-
- /* if(param.equalizer & 0x2) {
-@@ -28,7 +28,7 @@
- {
- int i;
- for(i=0;i<576;i++) {
-- bandPtr[i] *= equalizerband[channel][i];
-+ bandPtr[i] = REAL_MUL(bandPtr[i], equalizerband[channel][i]);
- }
- }
-
diff --git a/audio/mpg123/patches/patch-ai b/audio/mpg123/patches/patch-ai
deleted file mode 100644
index 6d5ac564f82..00000000000
--- a/audio/mpg123/patches/patch-ai
+++ /dev/null
@@ -1,824 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2006/05/26 12:16:13 drochner Exp $
-
---- layer3.c.orig 1999-04-21 17:25:18.000000000 +0200
-+++ layer3.c
-@@ -109,54 +109,54 @@ void init_layer3(int down_sample_sblimit
- int i,j,k,l;
-
- for(i=-256;i<118+4;i++)
-- gainpow2[i+256] = pow((double)2.0,-0.25 * (double) (i+210) );
-+ gainpow2[i+256] = DOUBLE_TO_REAL(pow((double)2.0,-0.25 * (double) (i+210) ));
-
- for(i=0;i<8207;i++)
-- ispow[i] = pow((double)i,(double)4.0/3.0);
-+ ispow[i] = DOUBLE_TO_REAL(pow((double)i,(double)4.0/3.0));
-
- for (i=0;i<8;i++) {
- static double Ci[8]={-0.6,-0.535,-0.33,-0.185,-0.095,-0.041,-0.0142,-0.0037};
- double sq=sqrt(1.0+Ci[i]*Ci[i]);
-- aa_cs[i] = 1.0/sq;
-- aa_ca[i] = Ci[i]/sq;
-+ aa_cs[i] = DOUBLE_TO_REAL(1.0/sq);
-+ aa_ca[i] = DOUBLE_TO_REAL(Ci[i]/sq);
- }
-
- for(i=0;i<18;i++) {
-- win[0][i] = win[1][i] = 0.5 * sin( M_PI / 72.0 * (double) (2*(i+0) +1) ) / cos ( M_PI * (double) (2*(i+0) +19) / 72.0 );
-- win[0][i+18] = win[3][i+18] = 0.5 * sin( M_PI / 72.0 * (double) (2*(i+18)+1) ) / cos ( M_PI * (double) (2*(i+18)+19) / 72.0 );
-+ win[0][i] = win[1][i] = DOUBLE_TO_REAL(0.5 * sin( M_PI / 72.0 * (double) (2*(i+0) +1) ) / cos ( M_PI * (double) (2*(i+0) +19) / 72.0 ));
-+ win[0][i+18] = win[3][i+18] = DOUBLE_TO_REAL(0.5 * sin( M_PI / 72.0 * (double) (2*(i+18)+1) ) / cos ( M_PI * (double) (2*(i+18)+19) / 72.0 ));
- }
- for(i=0;i<6;i++) {
-- win[1][i+18] = 0.5 / cos ( M_PI * (double) (2*(i+18)+19) / 72.0 );
-- win[3][i+12] = 0.5 / cos ( M_PI * (double) (2*(i+12)+19) / 72.0 );
-- win[1][i+24] = 0.5 * sin( M_PI / 24.0 * (double) (2*i+13) ) / cos ( M_PI * (double) (2*(i+24)+19) / 72.0 );
-- win[1][i+30] = win[3][i] = 0.0;
-- win[3][i+6 ] = 0.5 * sin( M_PI / 24.0 * (double) (2*i+1) ) / cos ( M_PI * (double) (2*(i+6 )+19) / 72.0 );
-+ win[1][i+18] = DOUBLE_TO_REAL(0.5 / cos ( M_PI * (double) (2*(i+18)+19) / 72.0 ));
-+ win[3][i+12] = DOUBLE_TO_REAL(0.5 / cos ( M_PI * (double) (2*(i+12)+19) / 72.0 ));
-+ win[1][i+24] = DOUBLE_TO_REAL(0.5 * sin( M_PI / 24.0 * (double) (2*i+13) ) / cos ( M_PI * (double) (2*(i+24)+19) / 72.0 ));
-+ win[1][i+30] = win[3][i] = DOUBLE_TO_REAL(0.0);
-+ win[3][i+6 ] = DOUBLE_TO_REAL(0.5 * sin( M_PI / 24.0 * (double) (2*i+1) ) / cos ( M_PI * (double) (2*(i+6 )+19) / 72.0 ));
- }
-
- for(i=0;i<9;i++)
-- COS9[i] = cos( M_PI / 18.0 * (double) i);
-+ COS9[i] = DOUBLE_TO_REAL(cos( M_PI / 18.0 * (double) i));
-
- for(i=0;i<9;i++)
-- tfcos36[i] = 0.5 / cos ( M_PI * (double) (i*2+1) / 36.0 );
-+ tfcos36[i] = DOUBLE_TO_REAL(0.5 / cos ( M_PI * (double) (i*2+1) / 36.0 ));
- for(i=0;i<3;i++)
-- tfcos12[i] = 0.5 / cos ( M_PI * (double) (i*2+1) / 12.0 );
-+ tfcos12[i] = DOUBLE_TO_REAL(0.5 / cos ( M_PI * (double) (i*2+1) / 12.0 ));
-
-- COS6_1 = cos( M_PI / 6.0 * (double) 1);
-- COS6_2 = cos( M_PI / 6.0 * (double) 2);
-+ COS6_1 = DOUBLE_TO_REAL(cos( M_PI / 6.0 * (double) 1));
-+ COS6_2 = DOUBLE_TO_REAL(cos( M_PI / 6.0 * (double) 2));
-
- #ifdef NEW_DCT9
-- cos9[0] = cos(1.0*M_PI/9.0);
-- cos9[1] = cos(5.0*M_PI/9.0);
-- cos9[2] = cos(7.0*M_PI/9.0);
-- cos18[0] = cos(1.0*M_PI/18.0);
-- cos18[1] = cos(11.0*M_PI/18.0);
-- cos18[2] = cos(13.0*M_PI/18.0);
-+ cos9[0] = DOUBLE_TO_REAL(cos(1.0*M_PI/9.0));
-+ cos9[1] = DOUBLE_TO_REAL(cos(5.0*M_PI/9.0));
-+ cos9[2] = DOUBLE_TO_REAL(cos(7.0*M_PI/9.0));
-+ cos18[0] = DOUBLE_TO_REAL(cos(1.0*M_PI/18.0));
-+ cos18[1] = DOUBLE_TO_REAL(cos(11.0*M_PI/18.0));
-+ cos18[2] = DOUBLE_TO_REAL(cos(13.0*M_PI/18.0));
- #endif
-
- for(i=0;i<12;i++) {
-- win[2][i] = 0.5 * sin( M_PI / 24.0 * (double) (2*i+1) ) / cos ( M_PI * (double) (2*i+7) / 24.0 );
-+ win[2][i] = DOUBLE_TO_REAL(0.5 * sin( M_PI / 24.0 * (double) (2*i+1) ) / cos ( M_PI * (double) (2*i+7) / 24.0 ));
- for(j=0;j<6;j++)
-- COS1[i][j] = cos( M_PI / 24.0 * (double) ((2*i+7)*(2*j+1)) );
-+ COS1[i][j] = DOUBLE_TO_REAL(cos( M_PI / 24.0 * (double) ((2*i+7)*(2*j+1)) ));
- }
-
- for(j=0;j<4;j++) {
-@@ -169,10 +169,10 @@ void init_layer3(int down_sample_sblimit
-
- for(i=0;i<16;i++) {
- double t = tan( (double) i * M_PI / 12.0 );
-- tan1_1[i] = t / (1.0+t);
-- tan2_1[i] = 1.0 / (1.0 + t);
-- tan1_2[i] = M_SQRT2 * t / (1.0+t);
-- tan2_2[i] = M_SQRT2 / (1.0 + t);
-+ tan1_1[i] = DOUBLE_TO_REAL(t / (1.0+t));
-+ tan2_1[i] = DOUBLE_TO_REAL(1.0 / (1.0 + t));
-+ tan1_2[i] = DOUBLE_TO_REAL(M_SQRT2 * t / (1.0+t));
-+ tan2_2[i] = DOUBLE_TO_REAL(M_SQRT2 / (1.0 + t));
-
- for(j=0;j<2;j++) {
- double base = pow(2.0,-0.25*(j+1.0));
-@@ -183,10 +183,10 @@ void init_layer3(int down_sample_sblimit
- else
- p2 = pow(base,i*0.5);
- }
-- pow1_1[j][i] = p1;
-- pow2_1[j][i] = p2;
-- pow1_2[j][i] = M_SQRT2 * p1;
-- pow2_2[j][i] = M_SQRT2 * p2;
-+ pow1_1[j][i] = DOUBLE_TO_REAL(p1);
-+ pow2_1[j][i] = DOUBLE_TO_REAL(p2);
-+ pow1_2[j][i] = DOUBLE_TO_REAL(M_SQRT2 * p1);
-+ pow2_2[j][i] = DOUBLE_TO_REAL(M_SQRT2 * p2);
- }
- }
-
-@@ -608,7 +608,7 @@ static int pretab2[22] = {0,0,0,0,0,0,0,
- * Dequantize samples (includes huffman decoding)
- */
- /* 24 is enough because tab13 has max. a 19 bit huffvector */
--#define BITSHIFT ((sizeof(long)-1)*8)
-+#define BITSHIFT ((sizeof(int)-1)*8)
- #define REFRESH_MASK \
- while(num < BITSHIFT) { \
- mask |= getbyte()<<(BITSHIFT-num); \
-@@ -625,7 +625,7 @@ static int III_dequantize_sample(real xr
- int *me;
-
- int num=getbitoffset();
-- long mask = (long) getbits(num)<<(BITSHIFT+8-num);
-+ int mask = (int) getbits(num)<<(BITSHIFT+8-num);
- part2remain -= num;
-
- {
-@@ -709,50 +709,50 @@ static int III_dequantize_sample(real xr
- if(x == 15 && h->linbits) {
- max[lwin] = cb;
- REFRESH_MASK;
-- x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
-+ x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
- num -= h->linbits+1;
- mask <<= h->linbits;
- if(mask < 0)
-- *xrpnt = -ispow[x] * v;
-+ *xrpnt = REAL_MUL(-ispow[x], v);
- else
-- *xrpnt = ispow[x] * v;
-+ *xrpnt = REAL_MUL(ispow[x], v);
- mask <<= 1;
- }
- else if(x) {
- max[lwin] = cb;
- if(mask < 0)
-- *xrpnt = -ispow[x] * v;
-+ *xrpnt = REAL_MUL(-ispow[x], v);
- else
-- *xrpnt = ispow[x] * v;
-+ *xrpnt = REAL_MUL(ispow[x], v);
- num--;
- mask <<= 1;
- }
- else
-- *xrpnt = 0.0;
-+ *xrpnt = DOUBLE_TO_REAL(0.0);
- xrpnt += step;
- if(y == 15 && h->linbits) {
- max[lwin] = cb;
- REFRESH_MASK;
-- y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
-+ y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
- num -= h->linbits+1;
- mask <<= h->linbits;
- if(mask < 0)
-- *xrpnt = -ispow[y] * v;
-+ *xrpnt = REAL_MUL(-ispow[y], v);
- else
-- *xrpnt = ispow[y] * v;
-+ *xrpnt = REAL_MUL(ispow[y], v);
- mask <<= 1;
- }
- else if(y) {
- max[lwin] = cb;
- if(mask < 0)
-- *xrpnt = -ispow[y] * v;
-+ *xrpnt = REAL_MUL(-ispow[y], v);
- else
-- *xrpnt = ispow[y] * v;
-+ *xrpnt = REAL_MUL(ispow[y], v);
- num--;
- mask <<= 1;
- }
- else
-- *xrpnt = 0.0;
-+ *xrpnt = DOUBLE_TO_REAL(0.0);
- xrpnt += step;
- }
- }
-@@ -804,7 +804,7 @@ static int III_dequantize_sample(real xr
- mask <<= 1;
- }
- else
-- *xrpnt = 0.0;
-+ *xrpnt = DOUBLE_TO_REAL(0.0);
- xrpnt += step;
- }
- }
-@@ -812,8 +812,8 @@ static int III_dequantize_sample(real xr
- if(lwin < 3) { /* short band? */
- while(1) {
- for(;mc > 0;mc--) {
-- *xrpnt = 0.0; xrpnt += 3; /* short band -> step=3 */
-- *xrpnt = 0.0; xrpnt += 3;
-+ *xrpnt = DOUBLE_TO_REAL(0.0); xrpnt += 3; /* short band -> step=3 */
-+ *xrpnt = DOUBLE_TO_REAL(0.0); xrpnt += 3;
- }
- if(m >= me)
- break;
-@@ -883,50 +883,50 @@ static int III_dequantize_sample(real xr
- if (x == 15 && h->linbits) {
- max = cb;
- REFRESH_MASK;
-- x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
-+ x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
- num -= h->linbits+1;
- mask <<= h->linbits;
- if(mask < 0)
-- *xrpnt++ = -ispow[x] * v;
-+ *xrpnt++ = REAL_MUL(-ispow[x], v);
- else
-- *xrpnt++ = ispow[x] * v;
-+ *xrpnt++ = REAL_MUL(ispow[x], v);
- mask <<= 1;
- }
- else if(x) {
- max = cb;
- if(mask < 0)
-- *xrpnt++ = -ispow[x] * v;
-+ *xrpnt++ = REAL_MUL(-ispow[x], v);
- else
-- *xrpnt++ = ispow[x] * v;
-+ *xrpnt++ = REAL_MUL(ispow[x], v);
- num--;
- mask <<= 1;
- }
- else
-- *xrpnt++ = 0.0;
-+ *xrpnt++ = DOUBLE_TO_REAL(0.0);
-
- if (y == 15 && h->linbits) {
- max = cb;
- REFRESH_MASK;
-- y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
-+ y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
- num -= h->linbits+1;
- mask <<= h->linbits;
- if(mask < 0)
-- *xrpnt++ = -ispow[y] * v;
-+ *xrpnt++ = REAL_MUL(-ispow[y], v);
- else
-- *xrpnt++ = ispow[y] * v;
-+ *xrpnt++ = REAL_MUL(ispow[y], v);
- mask <<= 1;
- }
- else if(y) {
- max = cb;
- if(mask < 0)
-- *xrpnt++ = -ispow[y] * v;
-+ *xrpnt++ = REAL_MUL(-ispow[y], v);
- else
-- *xrpnt++ = ispow[y] * v;
-+ *xrpnt++ = REAL_MUL(ispow[y], v);
- num--;
- mask <<= 1;
- }
- else
-- *xrpnt++ = 0.0;
-+ *xrpnt++ = DOUBLE_TO_REAL(0.0);
- }
- }
-
-@@ -974,7 +974,7 @@ static int III_dequantize_sample(real xr
- mask <<= 1;
- }
- else
-- *xrpnt++ = 0.0;
-+ *xrpnt++ = DOUBLE_TO_REAL(0.0);
- }
- }
-
-@@ -987,7 +987,7 @@ static int III_dequantize_sample(real xr
- num = 0;
-
- while(xrpnt < &xr[SBLIMIT][0])
-- *xrpnt++ = 0.0;
-+ *xrpnt++ = DOUBLE_TO_REAL(0.0);
-
- while( part2remain > 16 ) {
- getbits(16); /* Dismiss stuffing Bits */
-@@ -1065,8 +1065,8 @@ static void III_i_stereo(real xr_buf[2][
- t1 = tab1[is_p]; t2 = tab2[is_p];
- for (; sb > 0; sb--,idx+=3) {
- real v = xr[0][idx];
-- xr[0][idx] = v * t1;
-- xr[1][idx] = v * t2;
-+ xr[0][idx] = REAL_MUL(v, t1);
-+ xr[1][idx] = REAL_MUL(v, t2);
- }
- }
- }
-@@ -1087,8 +1087,8 @@ maybe still wrong??? (copy 12 to 13?) */
- t1 = tab1[is_p]; t2 = tab2[is_p];
- for ( ; sb > 0; sb--,idx+=3 ) {
- real v = xr[0][idx];
-- xr[0][idx] = v * t1;
-- xr[1][idx] = v * t2;
-+ xr[0][idx] = REAL_MUL(v, t1);
-+ xr[1][idx] = REAL_MUL(v, t2);
- }
- }
- } /* end for(lwin; .. ; . ) */
-@@ -1108,8 +1108,8 @@ maybe still wrong??? (copy 12 to 13?) */
- t1 = tab1[is_p]; t2 = tab2[is_p];
- for ( ; sb > 0; sb--,idx++) {
- real v = xr[0][idx];
-- xr[0][idx] = v * t1;
-- xr[1][idx] = v * t2;
-+ xr[0][idx] = REAL_MUL(v, t1);
-+ xr[1][idx] = REAL_MUL(v, t2);
- }
- }
- else
-@@ -1119,7 +1119,10 @@ maybe still wrong??? (copy 12 to 13?) */
- }
- else { /* ((gr_info->block_type != 2)) */
- int sfb = gr_info->maxbandl;
-- int is_p,idx = bi->longIdx[sfb];
-+ int is_p,idx;
-+ if (sfb > 21)
-+ return;
-+ idx = bi->longIdx[sfb];
- for ( ; sfb<21; sfb++) {
- int sb = bi->longDiff[sfb];
- is_p = scalefac[sfb]; /* scale: 0-15 */
-@@ -1128,8 +1131,8 @@ maybe still wrong??? (copy 12 to 13?) */
- t1 = tab1[is_p]; t2 = tab2[is_p];
- for ( ; sb > 0; sb--,idx++) {
- real v = xr[0][idx];
-- xr[0][idx] = v * t1;
-- xr[1][idx] = v * t2;
-+ xr[0][idx] = REAL_MUL(v, t1);
-+ xr[1][idx] = REAL_MUL(v, t2);
- }
- }
- else
-@@ -1143,8 +1146,8 @@ maybe still wrong??? (copy 12 to 13?) */
-
- for ( sb = bi->longDiff[21]; sb > 0; sb--,idx++ ) {
- real v = xr[0][idx];
-- xr[0][idx] = v * t1;
-- xr[1][idx] = v * t2;
-+ xr[0][idx] = REAL_MUL(v, t1);
-+ xr[1][idx] = REAL_MUL(v, t2);
- }
- }
- } /* ... */
-@@ -1177,8 +1180,8 @@ static void III_antialias(real xr[SBLIMI
- for(ss=7;ss>=0;ss--)
- { /* upper and lower butterfly inputs */
- register real bu = *--xr2,bd = *xr1;
-- *xr2 = (bu * (*cs) ) - (bd * (*ca) );
-- *xr1++ = (bd * (*cs++) ) + (bu * (*ca++) );
-+ *xr2 = REAL_MUL(bu, *cs) - REAL_MUL(bd, *ca);
-+ *xr1++ = REAL_MUL(bd, *cs++) + REAL_MUL(bu, *ca++);
- }
- }
- }
-@@ -1252,8 +1255,8 @@ static void dct36(real *inbuf,real *o1,r
- {
- real t0, t1, t2;
-
-- t0 = COS6_2 * (in[8] + in[16] - in[4]);
-- t1 = COS6_2 * in[12];
-+ t0 = REAL_MUL(COS6_2, (in[8] + in[16] - in[4]));
-+ t1 = REAL_MUL(COS6_2, in[12]);
-
- t3 = in[0];
- t2 = t3 - t1 - t1;
-@@ -1261,16 +1264,16 @@ static void dct36(real *inbuf,real *o1,r
- tmp[4] = t2 + t0 + t0;
- t3 += t1;
-
-- t2 = COS6_1 * (in[10] + in[14] - in[2]);
-+ t2 = REAL_MUL(COS6_1, (in[10] + in[14] - in[2]));
- tmp[1] -= t2;
- tmp[7] += t2;
- }
- {
- real t0, t1, t2;
-
-- t0 = cos9[0] * (in[4] + in[8] );
-- t1 = cos9[1] * (in[8] - in[16]);
-- t2 = cos9[2] * (in[4] + in[16]);
-+ t0 = REAL_MUL(cos9[0], (in[4] + in[8] ));
-+ t1 = REAL_MUL(cos9[1], (in[8] - in[16]));
-+ t2 = REAL_MUL(cos9[2], (in[4] + in[16]));
-
- tmp[2] = tmp[6] = t3 - t0 - t2;
- tmp[0] = tmp[8] = t3 + t0 + t1;
-@@ -1280,9 +1283,9 @@ static void dct36(real *inbuf,real *o1,r
- {
- real t1, t2, t3;
-
-- t1 = cos18[0] * (in[2] + in[10]);
-- t2 = cos18[1] * (in[10] - in[14]);
-- t3 = COS6_1 * in[6];
-+ t1 = REAL_MUL(cos18[0], (in[2] + in[10]));
-+ t2 = REAL_MUL(cos18[1], (in[10] - in[14]));
-+ t3 = REAL_MUL(COS6_1, in[6]);
-
- {
- real t0 = t1 + t2 + t3;
-@@ -1293,7 +1296,7 @@ static void dct36(real *inbuf,real *o1,r
- t2 -= t3;
- t1 -= t3;
-
-- t3 = cos18[2] * (in[2] + in[14]);
-+ t3 = REAL_MUL(cos18[2], (in[2] + in[14]));
-
- t1 += t3;
- tmp[3] += t1;
-@@ -1308,35 +1311,35 @@ static void dct36(real *inbuf,real *o1,r
- {
- real t0, t1, t2, t3, t4, t5, t6, t7;
-
-- t1 = COS6_2 * in[12];
-- t2 = COS6_2 * (in[8] + in[16] - in[4]);
-+ t1 = REAL_MUL(COS6_2, in[12]);
-+ t2 = REAL_MUL(COS6_2, (in[8] + in[16] - in[4]));
-
- t3 = in[0] + t1;
- t4 = in[0] - t1 - t1;
- t5 = t4 - t2;
- tmp[4] = t4 + t2 + t2;
-
-- t0 = cos9[0] * (in[4] + in[8]);
-- t1 = cos9[1] * (in[8] - in[16]);
-+ t0 = REAL_MUL(cos9[0], (in[4] + in[8]));
-+ t1 = REAL_MUL(cos9[1], (in[8] - in[16]));
-
-- t2 = cos9[2] * (in[4] + in[16]);
-+ t2 = REAL_MUL(cos9[2], (in[4] + in[16]));
-
- t6 = t3 - t0 - t2;
- t0 += t3 + t1;
- t3 += t2 - t1;
-
-- t2 = cos18[0] * (in[2] + in[10]);
-- t4 = cos18[1] * (in[10] - in[14]);
-- t7 = COS6_1 * in[6];
-+ t2 = REAL_MUL(cos18[0], (in[2] + in[10]));
-+ t4 = REAL_MUL(cos18[1], (in[10] - in[14]));
-+ t7 = REAL_MUL(COS6_1, in[6]);
-
- t1 = t2 + t4 + t7;
- tmp[0] = t0 + t1;
- tmp[8] = t0 - t1;
-- t1 = cos18[2] * (in[2] + in[14]);
-+ t1 = REAL_MUL(cos18[2], (in[2] + in[14]));
- t2 += t1 - t7;
-
- tmp[3] = t3 + t2;
-- t0 = COS6_1 * (in[10] + in[14] - in[2]);
-+ t0 = REAL_MUL(COS6_1, (in[10] + in[14] - in[2]));
- tmp[5] = t3 - t2;
-
- t4 -= t1 + t7;
-@@ -1351,53 +1354,53 @@ static void dct36(real *inbuf,real *o1,r
- {
- real t0, t1, t2, t3, t4, t5, t6, t7;
-
-- t1 = COS6_2 * in[13];
-- t2 = COS6_2 * (in[9] + in[17] - in[5]);
-+ t1 = REAL_MUL(COS6_2, in[13]);
-+ t2 = REAL_MUL(COS6_2, (in[9] + in[17] - in[5]));
-
- t3 = in[1] + t1;
- t4 = in[1] - t1 - t1;
- t5 = t4 - t2;
-
-- t0 = cos9[0] * (in[5] + in[9]);
-- t1 = cos9[1] * (in[9] - in[17]);
-+ t0 = REAL_MUL(cos9[0], (in[5] + in[9]));
-+ t1 = REAL_MUL(cos9[1], (in[9] - in[17]));
-
-- tmp[13] = (t4 + t2 + t2) * tfcos36[17-13];
-- t2 = cos9[2] * (in[5] + in[17]);
-+ tmp[13] = REAL_MUL((t4 + t2 + t2), tfcos36[17-13]);
-+ t2 = REAL_MUL(cos9[2], (in[5] + in[17]));
-
- t6 = t3 - t0 - t2;
- t0 += t3 + t1;
- t3 += t2 - t1;
-
-- t2 = cos18[0] * (in[3] + in[11]);
-- t4 = cos18[1] * (in[11] - in[15]);
-- t7 = COS6_1 * in[7];
-+ t2 = REAL_MUL(cos18[0], (in[3] + in[11]));
-+ t4 = REAL_MUL(cos18[1], (in[11] - in[15]));
-+ t7 = REAL_MUL(COS6_1, in[7]);
-
- t1 = t2 + t4 + t7;
-- tmp[17] = (t0 + t1) * tfcos36[17-17];
-- tmp[9] = (t0 - t1) * tfcos36[17-9];
-- t1 = cos18[2] * (in[3] + in[15]);
-+ tmp[17] = REAL_MUL((t0 + t1), tfcos36[17-17]);
-+ tmp[9] = REAL_MUL((t0 - t1), tfcos36[17-9]);
-+ t1 = REAL_MUL(cos18[2], (in[3] + in[15]));
- t2 += t1 - t7;
-
-- tmp[14] = (t3 + t2) * tfcos36[17-14];
-- t0 = COS6_1 * (in[11] + in[15] - in[3]);
-- tmp[12] = (t3 - t2) * tfcos36[17-12];
-+ tmp[14] = REAL_MUL((t3 + t2), tfcos36[17-14]);
-+ t0 = REAL_MUL(COS6_1, (in[11] + in[15] - in[3]));
-+ tmp[12] = REAL_MUL((t3 - t2), tfcos36[17-12]);
-
- t4 -= t1 + t7;
-
-- tmp[16] = (t5 - t0) * tfcos36[17-16];
-- tmp[10] = (t5 + t0) * tfcos36[17-10];
-- tmp[15] = (t6 + t4) * tfcos36[17-15];
-- tmp[11] = (t6 - t4) * tfcos36[17-11];
-+ tmp[16] = REAL_MUL((t5 - t0), tfcos36[17-16]);
-+ tmp[10] = REAL_MUL((t5 + t0), tfcos36[17-10]);
-+ tmp[15] = REAL_MUL((t6 + t4), tfcos36[17-15]);
-+ tmp[11] = REAL_MUL((t6 - t4), tfcos36[17-11]);
- }
-
- #define MACRO(v) { \
- real tmpval; \
- tmpval = tmp[(v)] + tmp[17-(v)]; \
-- out2[9+(v)] = tmpval * w[27+(v)]; \
-- out2[8-(v)] = tmpval * w[26-(v)]; \
-+ out2[9+(v)] = REAL_MUL(tmpval, w[27+(v)]); \
-+ out2[8-(v)] = REAL_MUL(tmpval, w[26-(v)]); \
- tmpval = tmp[(v)] - tmp[17-(v)]; \
-- ts[SBLIMIT*(8-(v))] = out1[8-(v)] + tmpval * w[8-(v)]; \
-- ts[SBLIMIT*(9+(v))] = out1[9+(v)] + tmpval * w[9+(v)]; }
-+ ts[SBLIMIT*(8-(v))] = out1[8-(v)] + REAL_MUL(tmpval, w[8-(v)]); \
-+ ts[SBLIMIT*(9+(v))] = out1[9+(v)] + REAL_MUL(tmpval, w[9+(v)]); }
-
- {
- register real *out2 = o2;
-@@ -1422,20 +1425,20 @@ static void dct36(real *inbuf,real *o1,r
-
- #define MACRO0(v) { \
- real tmp; \
-- out2[9+(v)] = (tmp = sum0 + sum1) * w[27+(v)]; \
-- out2[8-(v)] = tmp * w[26-(v)]; } \
-+ out2[9+(v)] = REAL_MUL((tmp = sum0 + sum1), w[27+(v)]); \
-+ out2[8-(v)] = REAL_MUL(tmp, w[26-(v)]); } \
- sum0 -= sum1; \
-- ts[SBLIMIT*(8-(v))] = out1[8-(v)] + sum0 * w[8-(v)]; \
-- ts[SBLIMIT*(9+(v))] = out1[9+(v)] + sum0 * w[9+(v)];
-+ ts[SBLIMIT*(8-(v))] = out1[8-(v)] + REAL_MUL(sum0, w[8-(v)]); \
-+ ts[SBLIMIT*(9+(v))] = out1[9+(v)] + REAL_MUL(sum0, w[9+(v)]);
- #define MACRO1(v) { \
- real sum0,sum1; \
- sum0 = tmp1a + tmp2a; \
-- sum1 = (tmp1b + tmp2b) * tfcos36[(v)]; \
-+ sum1 = REAL_MUL((tmp1b + tmp2b), tfcos36[(v)]); \
- MACRO0(v); }
- #define MACRO2(v) { \
- real sum0,sum1; \
- sum0 = tmp2a - tmp1a; \
-- sum1 = (tmp2b - tmp1b) * tfcos36[(v)]; \
-+ sum1 = REAL_MUL((tmp2b - tmp1b), tfcos36[(v)]); \
- MACRO0(v); }
-
- register const real *c = COS9;
-@@ -1446,17 +1449,17 @@ static void dct36(real *inbuf,real *o1,r
-
- real ta33,ta66,tb33,tb66;
-
-- ta33 = in[2*3+0] * c[3];
-- ta66 = in[2*6+0] * c[6] + in[2*0+0];
-- tb33 = in[2*3+1] * c[3];
-- tb66 = in[2*6+1] * c[6] + in[2*0+1];
-+ ta33 = REAL_MUL(in[2*3+0], c[3]);
-+ ta66 = REAL_MUL(in[2*6+0], c[6]);
-+ tb33 = REAL_MUL(in[2*3+1], c[3]);
-+ tb66 = REAL_MUL(in[2*6+1], c[6]);
-
- {
- real tmp1a,tmp2a,tmp1b,tmp2b;
-- tmp1a = in[2*1+0] * c[1] + ta33 + in[2*5+0] * c[5] + in[2*7+0] * c[7];
-- tmp1b = in[2*1+1] * c[1] + tb33 + in[2*5+1] * c[5] + in[2*7+1] * c[7];
-- tmp2a = in[2*2+0] * c[2] + in[2*4+0] * c[4] + ta66 + in[2*8+0] * c[8];
-- tmp2b = in[2*2+1] * c[2] + in[2*4+1] * c[4] + tb66 + in[2*8+1] * c[8];
-+ tmp1a = REAL_MUL(in[2*1+0], c[1]) + ta33 + REAL_MUL(in[2*5+0], c[5]) + REAL_MUL(in[2*7+0], c[7]);
-+ tmp1b = REAL_MUL(in[2*1+1], c[1]) + tb33 + REAL_MUL(in[2*5+1], c[5]) + REAL_MUL(in[2*7+1], c[7]);
-+ tmp2a = REAL_MUL(in[2*2+0], c[2]) + REAL_MUL(in[2*4+0], c[4]) + ta66 + REAL_MUL(in[2*8+0], c[8]);
-+ tmp2b = REAL_MUL(in[2*2+1], c[2]) + REAL_MUL(in[2*4+1], c[4]) + tb66 + REAL_MUL(in[2*8+1], c[8]);
-
- MACRO1(0);
- MACRO2(8);
-@@ -1464,10 +1467,10 @@ static void dct36(real *inbuf,real *o1,r
-
- {
- real tmp1a,tmp2a,tmp1b,tmp2b;
-- tmp1a = ( in[2*1+0] - in[2*5+0] - in[2*7+0] ) * c[3];
-- tmp1b = ( in[2*1+1] - in[2*5+1] - in[2*7+1] ) * c[3];
-- tmp2a = ( in[2*2+0] - in[2*4+0] - in[2*8+0] ) * c[6] - in[2*6+0] + in[2*0+0];
-- tmp2b = ( in[2*2+1] - in[2*4+1] - in[2*8+1] ) * c[6] - in[2*6+1] + in[2*0+1];
-+ tmp1a = REAL_MUL(( in[2*1+0] - in[2*5+0] - in[2*7+0] ), c[3]);
-+ tmp1b = REAL_MUL(( in[2*1+1] - in[2*5+1] - in[2*7+1] ), c[3]);
-+ tmp2a = REAL_MUL(( in[2*2+0] - in[2*4+0] - in[2*8+0] ), c[6]) - in[2*6+0] + in[2*0+0];
-+ tmp2b = REAL_MUL(( in[2*2+1] - in[2*4+1] - in[2*8+1] ), c[6]) - in[2*6+1] + in[2*0+1];
-
- MACRO1(1);
- MACRO2(7);
-@@ -1475,10 +1478,10 @@ static void dct36(real *inbuf,real *o1,r
-
- {
- real tmp1a,tmp2a,tmp1b,tmp2b;
-- tmp1a = in[2*1+0] * c[5] - ta33 - in[2*5+0] * c[7] + in[2*7+0] * c[1];
-- tmp1b = in[2*1+1] * c[5] - tb33 - in[2*5+1] * c[7] + in[2*7+1] * c[1];
-- tmp2a = - in[2*2+0] * c[8] - in[2*4+0] * c[2] + ta66 + in[2*8+0] * c[4];
-- tmp2b = - in[2*2+1] * c[8] - in[2*4+1] * c[2] + tb66 + in[2*8+1] * c[4];
-+ tmp1a = REAL_MUL(in[2*1+0], c[5]) - ta33 - REAL_MUL(in[2*5+0], c[7]) + REAL_MUL(in[2*7+0], c[1]);
-+ tmp1b = REAL_MUL(in[2*1+1], c[5]) - tb33 - REAL_MUL(in[2*5+1], c[7]) + REAL_MUL(in[2*7+1], c[1]);
-+ tmp2a = - REAL_MUL(in[2*2+0], c[8]) - REAL_MUL(in[2*4+0], c[2]) + ta66 + REAL_MUL(in[2*8+0], c[4]);
-+ tmp2b = - REAL_MUL(in[2*2+1], c[8]) - REAL_MUL(in[2*4+1], c[2]) + tb66 + REAL_MUL(in[2*8+1], c[4]);
-
- MACRO1(2);
- MACRO2(6);
-@@ -1486,10 +1489,10 @@ static void dct36(real *inbuf,real *o1,r
-
- {
- real tmp1a,tmp2a,tmp1b,tmp2b;
-- tmp1a = in[2*1+0] * c[7] - ta33 + in[2*5+0] * c[1] - in[2*7+0] * c[5];
-- tmp1b = in[2*1+1] * c[7] - tb33 + in[2*5+1] * c[1] - in[2*7+1] * c[5];
-- tmp2a = - in[2*2+0] * c[4] + in[2*4+0] * c[8] + ta66 - in[2*8+0] * c[2];
-- tmp2b = - in[2*2+1] * c[4] + in[2*4+1] * c[8] + tb66 - in[2*8+1] * c[2];
-+ tmp1a = REAL_MUL(in[2*1+0], c[7]) - ta33 + REAL_MUL(in[2*5+0], c[1]) - REAL_MUL(in[2*7+0], c[5]);
-+ tmp1b = REAL_MUL(in[2*1+1], c[7]) - tb33 + REAL_MUL(in[2*5+1], c[1]) - REAL_MUL(in[2*7+1], c[5]);
-+ tmp2a = - REAL_MUL(in[2*2+0], c[4]) + REAL_MUL(in[2*4+0], c[8]) + ta66 - REAL_MUL(in[2*8+0], c[2]);
-+ tmp2b = - REAL_MUL(in[2*2+1], c[4]) + REAL_MUL(in[2*4+1], c[8]) + tb66 - REAL_MUL(in[2*8+1], c[2]);
-
- MACRO1(3);
- MACRO2(5);
-@@ -1498,7 +1501,7 @@ static void dct36(real *inbuf,real *o1,r
- {
- real sum0,sum1;
- sum0 = in[2*0+0] - in[2*2+0] + in[2*4+0] - in[2*6+0] + in[2*8+0];
-- sum1 = (in[2*0+1] - in[2*2+1] + in[2*4+1] - in[2*6+1] + in[2*8+1] ) * tfcos36[4];
-+ sum1 = REAL_MUL((in[2*0+1] - in[2*2+1] + in[2*4+1] - in[2*6+1] + in[2*8+1] ), tfcos36[4]);
- MACRO0(4);
- }
- }
-@@ -1522,19 +1525,19 @@ static void dct12(real *in,real *rawout1
- \
- in5 += in3; in3 += in1; \
- \
-- in2 *= COS6_1; \
-- in3 *= COS6_1; \
-+ in2 = REAL_MUL(in2, COS6_1); \
-+ in3 = REAL_MUL(in3, COS6_1); \
-
- #define DCT12_PART2 \
-- in0 += in4 * COS6_2; \
-+ in0 += REAL_MUL(in4, COS6_2); \
- \
- in4 = in0 + in2; \
- in0 -= in2; \
- \
-- in1 += in5 * COS6_2; \
-+ in1 += REAL_MUL(in5, COS6_2); \
- \
-- in5 = (in1 + in3) * tfcos12[0]; \
-- in1 = (in1 - in3) * tfcos12[2]; \
-+ in5 = REAL_MUL((in1 + in3), tfcos12[0]); \
-+ in1 = REAL_MUL((in1 - in3), tfcos12[2]); \
- \
- in3 = in4 + in5; \
- in4 -= in5; \
-@@ -1554,27 +1557,27 @@ static void dct12(real *in,real *rawout1
- {
- real tmp0,tmp1 = (in0 - in4);
- {
-- real tmp2 = (in1 - in5) * tfcos12[1];
-+ real tmp2 = REAL_MUL((in1 - in5), tfcos12[1]);
- tmp0 = tmp1 + tmp2;
- tmp1 -= tmp2;
- }
-- ts[(17-1)*SBLIMIT] = out1[17-1] + tmp0 * wi[11-1];
-- ts[(12+1)*SBLIMIT] = out1[12+1] + tmp0 * wi[6+1];
-- ts[(6 +1)*SBLIMIT] = out1[6 +1] + tmp1 * wi[1];
-- ts[(11-1)*SBLIMIT] = out1[11-1] + tmp1 * wi[5-1];
-+ ts[(17-1)*SBLIMIT] = out1[17-1] + REAL_MUL(tmp0, wi[11-1]);
-+ ts[(12+1)*SBLIMIT] = out1[12+1] + REAL_MUL(tmp0, wi[6+1]);
-+ ts[(6 +1)*SBLIMIT] = out1[6 +1] + REAL_MUL(tmp1, wi[1]);
-+ ts[(11-1)*SBLIMIT] = out1[11-1] + REAL_MUL(tmp1, wi[5-1]);
- }
-
- DCT12_PART2
-
-- ts[(17-0)*SBLIMIT] = out1[17-0] + in2 * wi[11-0];
-- ts[(12+0)*SBLIMIT] = out1[12+0] + in2 * wi[6+0];
-- ts[(12+2)*SBLIMIT] = out1[12+2] + in3 * wi[6+2];
-- ts[(17-2)*SBLIMIT] = out1[17-2] + in3 * wi[11-2];
--
-- ts[(6+0)*SBLIMIT] = out1[6+0] + in0 * wi[0];
-- ts[(11-0)*SBLIMIT] = out1[11-0] + in0 * wi[5-0];
-- ts[(6+2)*SBLIMIT] = out1[6+2] + in4 * wi[2];
-- ts[(11-2)*SBLIMIT] = out1[11-2] + in4 * wi[5-2];
-+ ts[(17-0)*SBLIMIT] = out1[17-0] + REAL_MUL(in2, wi[11-0]);
-+ ts[(12+0)*SBLIMIT] = out1[12+0] + REAL_MUL(in2, wi[6+0]);
-+ ts[(12+2)*SBLIMIT] = out1[12+2] + REAL_MUL(in3, wi[6+2]);
-+ ts[(17-2)*SBLIMIT] = out1[17-2] + REAL_MUL(in3, wi[11-2]);
-+
-+ ts[(6 +0)*SBLIMIT] = out1[6+0] + REAL_MUL(in0, wi[0]);
-+ ts[(11-0)*SBLIMIT] = out1[11-0] + REAL_MUL(in0, wi[5-0]);
-+ ts[(6 +2)*SBLIMIT] = out1[6+2] + REAL_MUL(in4, wi[2]);
-+ ts[(11-2)*SBLIMIT] = out1[11-2] + REAL_MUL(in4, wi[5-2]);
- }
-
- in++;
-@@ -1588,27 +1591,27 @@ static void dct12(real *in,real *rawout1
- {
- real tmp0,tmp1 = (in0 - in4);
- {
-- real tmp2 = (in1 - in5) * tfcos12[1];
-+ real tmp2 = REAL_MUL((in1 - in5), tfcos12[1]);
- tmp0 = tmp1 + tmp2;
- tmp1 -= tmp2;
- }
-- out2[5-1] = tmp0 * wi[11-1];
-- out2[0+1] = tmp0 * wi[6+1];
-- ts[(12+1)*SBLIMIT] += tmp1 * wi[1];
-- ts[(17-1)*SBLIMIT] += tmp1 * wi[5-1];
-+ out2[5-1] = REAL_MUL(tmp0, wi[11-1]);
-+ out2[0+1] = REAL_MUL(tmp0, wi[6+1]);
-+ ts[(12+1)*SBLIMIT] += REAL_MUL(tmp1, wi[1]);
-+ ts[(17-1)*SBLIMIT] += REAL_MUL(tmp1, wi[5-1]);
- }
-
- DCT12_PART2
-
-- out2[5-0] = in2 * wi[11-0];
-- out2[0+0] = in2 * wi[6+0];
-- out2[0+2] = in3 * wi[6+2];
-- out2[5-2] = in3 * wi[11-2];
--
-- ts[(12+0)*SBLIMIT] += in0 * wi[0];
-- ts[(17-0)*SBLIMIT] += in0 * wi[5-0];
-- ts[(12+2)*SBLIMIT] += in4 * wi[2];
-- ts[(17-2)*SBLIMIT] += in4 * wi[5-2];
-+ out2[5-0] = REAL_MUL(in2, wi[11-0]);
-+ out2[0+0] = REAL_MUL(in2, wi[6+0]);
-+ out2[0+2] = REAL_MUL(in3, wi[6+2]);
-+ out2[5-2] = REAL_MUL(in3, wi[11-2]);
-+
-+ ts[(12+0)*SBLIMIT] += REAL_MUL(in0, wi[0]);
-+ ts[(17-0)*SBLIMIT] += REAL_MUL(in0, wi[5-0]);
-+ ts[(12+2)*SBLIMIT] += REAL_MUL(in4, wi[2]);
-+ ts[(17-2)*SBLIMIT] += REAL_MUL(in4, wi[5-2]);
- }
-
- in++;
-@@ -1623,27 +1626,27 @@ static void dct12(real *in,real *rawout1
- {
- real tmp0,tmp1 = (in0 - in4);
- {
-- real tmp2 = (in1 - in5) * tfcos12[1];
-+ real tmp2 = REAL_MUL((in1 - in5), tfcos12[1]);
- tmp0 = tmp1 + tmp2;
- tmp1 -= tmp2;
- }
-- out2[11-1] = tmp0 * wi[11-1];
-- out2[6 +1] = tmp0 * wi[6+1];
-- out2[0+1] += tmp1 * wi[1];
-- out2[5-1] += tmp1 * wi[5-1];
-+ out2[11-1] = REAL_MUL(tmp0, wi[11-1]);
-+ out2[6 +1] = REAL_MUL(tmp0, wi[6+1]);
-+ out2[0+1] += REAL_MUL(tmp1, wi[1]);
-+ out2[5-1] += REAL_MUL(tmp1, wi[5-1]);
- }
-
- DCT12_PART2
-
-- out2[11-0] = in2 * wi[11-0];
-- out2[6 +0] = in2 * wi[6+0];
-- out2[6 +2] = in3 * wi[6+2];
-- out2[11-2] = in3 * wi[11-2];
--
-- out2[0+0] += in0 * wi[0];
-- out2[5-0] += in0 * wi[5-0];
-- out2[0+2] += in4 * wi[2];
-- out2[5-2] += in4 * wi[5-2];
-+ out2[11-0] = REAL_MUL(in2, wi[11-0]);
-+ out2[6 +0] = REAL_MUL(in2, wi[6+0]);
-+ out2[6 +2] = REAL_MUL(in3, wi[6+2]);
-+ out2[11-2] = REAL_MUL(in3, wi[11-2]);
-+
-+ out2[0+0] += REAL_MUL(in0, wi[0]);
-+ out2[5-0] += REAL_MUL(in0, wi[5-0]);
-+ out2[0+2] += REAL_MUL(in4, wi[2]);
-+ out2[5-2] += REAL_MUL(in4, wi[5-2]);
- }
- }
-
-@@ -1693,7 +1696,7 @@ static void III_hybrid(real fsIn[SBLIMIT
- int i;
- for(i=0;i<SSLIMIT;i++) {
- tspnt[i*SBLIMIT] = *rawout1++;
-- *rawout2++ = 0.0;
-+ *rawout2++ = DOUBLE_TO_REAL(0.0);
- }
- }
- }
-@@ -1865,5 +1868,3 @@ int do_layer3(struct frame *fr,int outmo
-
- return clip;
- }
--
--
diff --git a/audio/mpg123/patches/patch-aj b/audio/mpg123/patches/patch-aj
deleted file mode 100644
index 15eb00dd41c..00000000000
--- a/audio/mpg123/patches/patch-aj
+++ /dev/null
@@ -1,120 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2002/06/23 08:45:09 kent Exp $
-
---- mpg123.h.orig Fri May 28 23:51:58 1999
-+++ mpg123.h
-@@ -56,8 +56,115 @@
- # define real float
- #elif defined(REAL_IS_LONG_DOUBLE)
- # define real long double
-+#elif defined(REAL_IS_FIXED)
-+# define real long
-+
-+# define REAL_RADIX 15
-+# define REAL_FACTOR (32.0 * 1024.0)
-+
-+# define REAL_PLUS_32767 ( 32767 << REAL_RADIX )
-+# define REAL_MINUS_32768 ( -32768 << REAL_RADIX )
-+
-+# define DOUBLE_TO_REAL(x) ((int)((x) * REAL_FACTOR))
-+# define REAL_TO_SHORT(x) ((x) >> REAL_RADIX)
-+# define REAL_MUL(x, y) (((long long)(x) * (long long)(y)) >> REAL_RADIX)
-+
-+#elif defined(REAL_IS_FIXED_ARMV4)
-+# define REAL_IS_FIXED
-+# define real long long
-+
-+# define REAL_RADIX 32
-+# define REAL_FACTOR (4294967296.0)
-+
-+# define REAL_PLUS_32767 ( 32767LL << REAL_RADIX )
-+# define REAL_MINUS_32768 ( -32768LL << REAL_RADIX )
-+
-+# define DOUBLE_TO_REAL(x) ((long long)((x) * REAL_FACTOR))
-+# define REAL_TO_SHORT(x) ((x) >> REAL_RADIX)
-+
-+/*
-+ * "Reals" are signed, 15 bits before the point, 32 bits after.
-+ * Multiplication is done like so:
-+ *
-+ * if |x| < 2^8, shift x >> 7, else shift x >>15
-+ * if |y| < 2^8, shift y >> 7, else shift y >>15
-+ * multiply x * y (just avoids clipping MSB)
-+ * shift the result >> 2, 10 or 18 bits, to make a total shift of 32 bits
-+ *
-+ * I'd do it in C, but gcc optimises it rather poorly (2K stack
-+ * frames, anyone?). Hence the bit of (ARMv4) asm magic below.
-+ * (Unfortunately, the CLZ opcode, which would make for a much neater
-+ * solution to this, doesn't appear until ARMv5)
-+ *
-+ * (tjd April 2002)
-+ */
-+
-+# define REAL_MUL(x, y) real_mul((x),(y))
-+
-+static __inline__ long long real_mul(long long x, long long y) {
-+ const register long long _x asm("r0") = (x);
-+ const register long long _y asm("r2") = (y);
-+ register long long rv asm("r0");
-+ __asm__ __volatile__ (
-+"@ we'll need to shift the result at least >> 2\n"
-+" mov r4, #2\n"
-+"@ both args >> 7,\n"
-+" mov r0, r0, lsr #7\n"
-+" mov r2, r2, lsr #7\n"
-+" orr r0, r0, r1, lsl #25\n"
-+" orr r2, r2, r3, lsl #25\n"
-+" mov r1, r1, asr #7\n"
-+" mov r3, r3, asr #7\n"
-+"@ check if x needs further shiftage\n"
-+" cmp r1, #0\n"
-+" cmnne r1, #1\n"
-+" addeq r4, r4, #8\n"
-+"@ shift x if needed\n"
-+" movne r0, r0, lsr #8\n"
-+" orrne r0, r0, r1, lsl #24\n"
-+" movne r1, r1, asr #8\n"
-+"@ check if y needs further shiftage\n"
-+" cmp r3, #0\n"
-+" cmnne r3, #1\n"
-+" addeq r4, r4, #8\n"
-+"@ shift y if needed\n"
-+" movne r2, r2, lsr #8\n"
-+" orrne r2, r2, r3, lsl #24\n"
-+" movne r3, r3, asr #8\n"
-+"@ multiply (ignoring overflow)\n"
-+" mul r3, r0, r3\n"
-+" mla r3, r1, r2, r3\n"
-+" umull r0, r1, r2, r0\n"
-+" add r1, r1, r3\n"
-+"@ shift the result the appropriate amount\n"
-+" rsb r3, r4, #32\n"
-+" mov r0, r0, lsr r4\n"
-+" orr r0, r0, r1, lsl r3\n"
-+" mov r1, r1, asr r4\n"
-+ : "=r" (rv)
-+ : "0" (_x), "r" (_y)
-+ : "r1", "r3", "r4", "cc");
-+ return rv;
-+}
-+
- #else
- # define real double
-+#endif
-+
-+#ifndef DOUBLE_TO_REAL
-+# define DOUBLE_TO_REAL(x) (x)
-+#endif
-+#ifndef REAL_TO_SHORT
-+# define REAL_TO_SHORT(x) (x)
-+#endif
-+#ifndef REAL_PLUS_32767
-+# define REAL_PLUS_32767 32767.0
-+#endif
-+#ifndef REAL_MINUS_32768
-+# define REAL_MINUS_32768 -32768.0
-+#endif
-+#ifndef REAL_MUL
-+# define REAL_MUL(x, y) ((x) * (y))
- #endif
-
- #ifdef __GNUC__
diff --git a/audio/mpg123/patches/patch-ak b/audio/mpg123/patches/patch-ak
deleted file mode 100644
index 1442e5fbb80..00000000000
--- a/audio/mpg123/patches/patch-ak
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ak,v 1.1 1999/10/12 04:43:15 simonb Exp $
-
---- tabinit.c.orig Mon Feb 15 23:55:11 1999
-+++ tabinit.c Thu Aug 12 17:31:33 1999
-@@ -56,7 +56,7 @@
- kr=0x10>>i; divv=0x40>>i;
- costab = pnts[i];
- for(k=0;k<kr;k++)
-- costab[k] = 1.0 / (2.0 * cos(M_PI * ((double) k * 2.0 + 1.0) / (double) divv));
-+ costab[k] = DOUBLE_TO_REAL(1.0 / (2.0 * cos(M_PI * ((double) k * 2.0 + 1.0) / (double) divv)));
- #ifdef USE_3DNOW
- for(k=0;k<kr;k++)
- costab[k+kr] = -costab[k];
-@@ -69,7 +69,7 @@
- for(i=0,j=0;i<256;i++,j++,idx+=32)
- {
- if(idx < 512+16)
-- decwin[idx+16] = decwin[idx] = (double) intwinbase[j] / 65536.0 * (double) scaleval;
-+ decwin[idx+16] = decwin[idx] = DOUBLE_TO_REAL((double) intwinbase[j] / 65536.0 * (double) scaleval);
-
- if(i % 32 == 31)
- idx -= 1023;
-@@ -80,7 +80,7 @@
- for( /* i=256 */ ;i<512;i++,j--,idx+=32)
- {
- if(idx < 512+16)
-- decwin[idx+16] = decwin[idx] = (double) intwinbase[j] / 65536.0 * (double) scaleval;
-+ decwin[idx+16] = decwin[idx] = DOUBLE_TO_REAL((double) intwinbase[j] / 65536.0 * (double) scaleval);
-
- if(i % 32 == 31)
- idx -= 1023;
-@@ -91,7 +91,7 @@
- #ifdef USE_3DNOW
- if(!param.down_sample) {
- for(i=0;i<512+32;i++) {
-- decwin[512+31-i] *= 65536.0; /* allows faster clipping in 3dnow code */
-+ decwin[512+31-i] = REAL_MUL(decwin[512+31-i], 65536.0); /* allows faster clipping in 3dnow code */
- decwin[512+32+i] = decwin[512+31-i];
- }
- }
diff --git a/audio/mpg123/patches/patch-al b/audio/mpg123/patches/patch-al
deleted file mode 100644
index 37f3ba7781a..00000000000
--- a/audio/mpg123/patches/patch-al
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-al,v 1.3 2001/05/12 20:21:37 mycroft Exp $
-
---- readers.c.orig Thu Mar 4 11:03:49 1999
-+++ readers.c Sat May 12 20:09:05 2001
-@@ -1,5 +1,9 @@
- #include <stdlib.h>
-
-+#ifdef __NetBSD__
-+#include <sys/param.h>
-+#endif
-+
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-@@ -251,7 +255,12 @@
- return -1;
-
- mapend = mapbuf + len;
--
-+
-+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104030000)
-+ if(madvise(mapbuf, mapend-mapbuf, MADV_SEQUENTIAL) < 0)
-+ fprintf(stderr,"madvise failed, continuing anyways..\n");
-+#endif
-+
- if(param.verbose > 1)
- fprintf(stderr,"Using memory mapped IO for this stream.\n");
-
-@@ -268,6 +276,11 @@
-
- static void mapped_close(struct reader *rds)
- {
-+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104030000)
-+ if(madvise(mapbuf, mapend-mapbuf, MADV_FREE) < 0)
-+ fprintf(stderr,"madvise failed, continuing anyways..\n");
-+#endif
-+
- munmap((void *)mapbuf,mapend-mapbuf);
- if (rds->flags & READER_FD_OPENED)
- close(rds->filept);
diff --git a/audio/mpg123/patches/patch-am b/audio/mpg123/patches/patch-am
deleted file mode 100644
index 84c253e7acc..00000000000
--- a/audio/mpg123/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1 2002/02/27 21:37:40 martin Exp $
-
---- getlopt.h.orig Mon Nov 2 23:58:54 1998
-+++ getlopt.h Wed Feb 27 22:29:14 2002
-@@ -24,7 +24,7 @@
- #define GLO_ARG 1
- #define GLO_CHAR 2
- #define GLO_NUM 0
--#define GLO_LONG GLO_NUM
-+#define GLO_LONG 4 /* int != long !!! */
-
- /* flags:
- * bit 0 = 0 - no argument
diff --git a/audio/mpg123/patches/patch-an b/audio/mpg123/patches/patch-an
deleted file mode 100644
index 510cd68a151..00000000000
--- a/audio/mpg123/patches/patch-an
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-an,v 1.1 2002/02/27 21:37:41 martin Exp $
-
---- getlopt.c.orig Tue Dec 8 10:41:11 1998
-+++ getlopt.c Wed Feb 27 22:29:57 2002
-@@ -45,10 +45,12 @@
-
- if (!(opt->flags & 1)) { /* doesn't take argument */
- if (opt->var) {
-- if (opt->flags & 2) /* var is *char */
-+ if (opt->flags & GLO_CHAR) /* var is *char */
- *((char *) opt->var) = (char) opt->value;
-- else
-+ else if (opt->flags & GLO_LONG) /* var is *long */
- *((long *) opt->var) = opt->value;
-+ else /* var is *int */
-+ *((int *) opt->var) = opt->value;
- }
- else
- result = opt->value ? opt->value : opt->sname;
diff --git a/audio/mpg123/patches/patch-ao b/audio/mpg123/patches/patch-ao
deleted file mode 100644
index 46d3583e69d..00000000000
--- a/audio/mpg123/patches/patch-ao
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2002/06/22 17:56:37 kent Exp $
-
---- audio_esd.c.orig Sat May 29 00:06:29 1999
-+++ audio_esd.c
-@@ -8,6 +8,10 @@
- #include <stropts.h>
- #include <sys/conf.h>
- #endif
-+#ifdef NETBSD
-+#include <sys/ioctl.h>
-+#include <sys/audioio.h>
-+#endif
-
- static unsigned esd_rate = 0, esd_format = 0, esd_channels = 0;
-
-@@ -75,7 +79,7 @@
- else if (ai->rate > esd_rate)
- return -1;
-
-- ai->fn = esd_play_stream_fallback(format, ai->rate, esdserver, "mpg123");
-+ ai->fn = esd_play_stream_fallback(format, ai->rate, NULL/*esdserver*/, "mpg123");
- return (ai->fn);
- }
-
diff --git a/audio/mpg123/patches/patch-ap b/audio/mpg123/patches/patch-ap
deleted file mode 100644
index 043ae956961..00000000000
--- a/audio/mpg123/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2003/10/18 11:27:11 grant Exp $
-
---- audio_oss.c.orig 1998-02-01 01:14:08.000000000 +1100
-+++ audio_oss.c
-@@ -28,7 +28,7 @@ extern int outburst;
- #include <sys/ioctl.h>
- #ifdef LINUX
- #include <linux/soundcard.h>
--#elif defined(__bsdi__)
-+#elif defined(__bsdi__) || defined(__FreeBSD__)
- #include <sys/soundcard.h>
- #else
- #include <machine/soundcard.h>
diff --git a/audio/mpg123/patches/patch-aq b/audio/mpg123/patches/patch-aq
deleted file mode 100644
index 08e50c199fb..00000000000
--- a/audio/mpg123/patches/patch-aq
+++ /dev/null
@@ -1,91 +0,0 @@
-$NetBSD: patch-aq,v 1.3 2005/10/03 15:17:14 joerg Exp $
-
---- httpget.c.orig 2005-10-03 17:03:06.000000000 +0200
-+++ httpget.c 2005-10-03 17:03:06.000000000 +0200
-@@ -18,11 +18,9 @@
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
--#include <sys/errno.h>
-+#include <errno.h>
- #include <ctype.h>
-
--extern int errno;
--
- #include "mpg123.h"
-
- #ifndef INADDR_NONE
-@@ -55,11 +53,10 @@
- #endif
- int pos = 0;
-
-- while(1) {
-+ while(pos < (maxlen - 1)) {
- if( read(fileno(f),string+pos,1) == 1) {
- pos++;
- if(string[pos-1] == '\n') {
-- string[pos] = 0;
- break;
- }
- }
-@@ -78,6 +75,7 @@
- }
- #endif
-
-+ string[pos] = '\0';
- }
-
- void encode64 (char *source,char *destination)
-@@ -111,7 +109,7 @@
- }
-
- /* VERY simple auth-from-URL grabber */
--int getauthfromURL(char *url,char *auth)
-+int getauthfromURL(char *url,char *auth,unsigned long authlen)
- {
- char *pos;
-
-@@ -126,9 +124,13 @@
- if( url[i] == '/' )
- return 0;
- }
-+ if (pos-url >= authlen) {
-+ fprintf (stderr, "Error: authentication data exceeds max. length.\n");
-+ return -1;
-+ }
- strncpy(auth,url,pos-url);
- auth[pos-url] = 0;
-- strcpy(url,pos+1);
-+ memmove(url,pos+1,strlen(pos+1)+1);
- return 1;
- }
- return 0;
-@@ -199,7 +201,7 @@
- strncpy(p0, portptr, stringlength);
- *(p0 + stringlength) = '\0';
-
-- for (p = p0; *p && isdigit(*p); p++)
-+ for (p = p0; *p && isdigit((unsigned char)*p); p++)
- ;
- *p = '\0';
- *port = (char *)p0;
-@@ -265,7 +267,10 @@
- strncpy (purl, url, 1023);
- purl[1023] = '\0';
-
-- getauthfromURL(purl,httpauth1);
-+ if (getauthfromURL(purl,httpauth1,sizeof(httpauth1)) < 0) {
-+ sock = -1;
-+ goto exit;
-+ }
-
- do {
- strcpy (request, "GET ");
-@@ -399,6 +404,7 @@
- fprintf (stderr, "Too many HTTP relocations.\n");
- exit (1);
- }
-+exit:
- free (purl);
- free (request);
- free(host);
diff --git a/audio/mpg123/patches/patch-ar b/audio/mpg123/patches/patch-ar
deleted file mode 100644
index 4517d3bcae9..00000000000
--- a/audio/mpg123/patches/patch-ar
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ar,v 1.2 2005/01/12 11:52:38 drochner Exp $
-
---- layer2.c.orig 1999-02-10 13:13:06.000000000 +0100
-+++ layer2.c
-@@ -240,7 +240,7 @@ static void II_select_table(struct frame
- { alloc_0, alloc_1, alloc_2, alloc_3 , alloc_4 };
- static int sblims[5] = { 27 , 30 , 8, 12 , 30 };
-
-- if(fr->lsf)
-+ if(fr->sampling_frequency >= 3) /* Or equivalent: (fr->lsf == 1) */
- table = 4;
- else
- table = translate[fr->sampling_frequency][2-fr->stereo][fr->bitrate_index];
-@@ -265,6 +265,12 @@ int do_layer2(struct frame *fr,int outmo
- fr->jsbound = (fr->mode == MPG_MD_JOINT_STEREO) ?
- (fr->mode_ext<<2)+4 : fr->II_sblimit;
-
-+ if (fr->jsbound > fr->II_sblimit)
-+ {
-+ fprintf(stderr, "Truncating stereo boundary to sideband limit.\n");
-+ fr->jsbound=fr->II_sblimit;
-+ }
-+
- if(stereo == 1 || single == 3)
- single = 0;
-
diff --git a/audio/mpg123/patches/patch-as b/audio/mpg123/patches/patch-as
deleted file mode 100644
index 458c6881cfd..00000000000
--- a/audio/mpg123/patches/patch-as
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.1 2005/01/07 14:52:13 drochner Exp $
-
---- common.c.orig 1999-06-15 23:24:19.000000000 +0200
-+++ common.c
-@@ -123,7 +123,7 @@ int head_check(unsigned long head)
- return FALSE;
- if(!((head>>17)&3))
- return FALSE;
-- if( ((head>>12)&0xf) == 0xf)
-+ if( ((head>>12)&0xf) == 0xf || ((head>>12)&0xf) == 0)
- return FALSE;
- if( ((head>>10)&0x3) == 0x3 )
- return FALSE;
diff --git a/audio/mpg123/patches/patch-at b/audio/mpg123/patches/patch-at
deleted file mode 100644
index 235fbb0e18d..00000000000
--- a/audio/mpg123/patches/patch-at
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-at,v 1.1 2005/01/07 14:52:13 drochner Exp $
-
---- mpg123.c.orig 2005-01-07 15:18:27.000000000 +0100
-+++ mpg123.c
-@@ -309,9 +309,9 @@ char *find_next_file (int argc, char *ar
- if (line[0]=='\0' || line[0]=='#')
- continue;
- if ((listnamedir) && (line[0]!='/') && (line[0]!='\\')){
-- strcpy (linetmp, listnamedir);
-- strcat (linetmp, line);
-- strcpy (line, linetmp);
-+ strncpy (linetmp, listnamedir, 1023);
-+ strncat (linetmp, line, 1023 - strlen(linetmp));
-+ strncpy (line, linetmp, 1023);
- }
- return (line);
- }
diff --git a/audio/mpg123/patches/patch-au b/audio/mpg123/patches/patch-au
deleted file mode 100644
index e09d2aa28a8..00000000000
--- a/audio/mpg123/patches/patch-au
+++ /dev/null
@@ -1,157 +0,0 @@
-$NetBSD: patch-au,v 1.1 2005/03/28 19:52:21 schwarz Exp $
-
---- audio_sgi.c.orig 2005-03-07 13:54:23.000000000 +0100
-+++ audio_sgi.c 2005-03-07 13:54:27.000000000 +0100
-@@ -6,20 +6,48 @@
-
- #include "mpg123.h"
-
-+#ifdef AL_RESOURCE /* as a test whether we use the "new" IRIX
-+ audio libraries */
-+#define NEW_IRIX_AUDIO
-+#define HAVE_ALGETERRORSTRING
-+#else
-+#define alClosePort(x) ALcloseport(x)
-+#define alFreeConfig(x) ALfreeconfig(x)
-+#define alGetFilled(x) ALgetfilled(x)
-+#define alSetChannels(x,y) ALsetchannels(x,y)
-+#define alSetQueueSize(x,y) ALsetqueuesize(x,y)
-+#define alSetSampFmt(x,y) ALsetsampfmt(x,y)
-+#define alSetWidth(x,y) ALsetwidth(x,y)
-+#define alNewConfig() ALnewconfig()
-+#define alOpenPort(x,y,z) ALopenport(x,y,z)
-+#endif
-
- /* Analog output constant */
- static const char analog_output_res_name[] = ".AnalogOut";
-
-+/* Routine to print a message to stderr; uses alGetErrorString(oserror)
-+ if available */
-+
-+void errormessage(const char *message)
-+{
-+#ifdef HAVE_ALGETERRORSTRING
-+ fprintf(stderr,"%s : %s\n",message,alGetErrorString(oserror()));
-+#else
-+ fprintf(stderr,"%s error\n",message);
-+#endif
-+}
-
- int audio_open(struct audio_info_struct *ai)
- {
-+#ifdef NEW_IRIX_AUDIO
- int dev = AL_DEFAULT_OUTPUT;
-+#endif
-
- ai->config = alNewConfig();
-
- /* Test for correct completion */
- if (ai->config == 0) {
-- fprintf(stderr,"audio_open : %s\n",alGetErrorString(oserror()));
-+ errormessage("audio_open");
- exit(-1);
- }
-
-@@ -33,6 +61,8 @@
- alSetSampFmt(ai->config,AL_SAMPFMT_TWOSCOMP);
- alSetQueueSize(ai->config, 131069);
-
-+#ifdef NEW_IRIX_AUDIO
-+
- /* Setup output device to specified module. If there is no module
- specified in ai structure, use the default four output */
- if ((ai->device) != NULL) {
-@@ -61,15 +91,16 @@
- /* Set the device */
- if (alSetDevice(ai->config,dev) < 0)
- {
-- fprintf(stderr,"audio_open : %s\n",alGetErrorString(oserror()));
-+ errormessage("audio_open");
- exit(-1);
- }
-
-+#endif /* NEW_IRIX_AUDIO */
-+
- /* Open the audio port */
- ai->port = alOpenPort("mpg123-VSC", "w", ai->config);
- if(ai->port == NULL) {
-- fprintf(stderr, "Unable to open audio channel: %s\n",
-- alGetErrorString(oserror()));
-+ errormessage("Unable to open audio channel");
- exit(-1);
- }
-
-@@ -99,22 +130,30 @@
-
- int audio_set_rate(struct audio_info_struct *ai)
- {
-+#ifdef NEW_IRIX_AUDIO
- int dev = alGetDevice(ai->config);
- ALpv params[1];
-+#else
-+ int dev;
-+ long params[2] = {AL_OUTPUT_RATE, AL_RATE_44100};
-+ params[1] = ai->rate;
-+ dev=ALsetparams(AL_DEFAULT_DEVICE, params, 2);
-+#endif
-
- /* Make sure the device is OK */
- if (dev < 0)
- {
-- fprintf(stderr,"audio_set_rate : %s\n",alGetErrorString(oserror()));
-+ errormessage("audio_set_rate");
- return 1;
- }
-
-+#ifdef NEW_IRIX_AUDIO
- params[0].param = AL_OUTPUT_RATE;
- params[0].value.ll = alDoubleToFixed(ai->rate);
-
- if (alSetParams(dev, params,1) < 0)
-- fprintf(stderr,"audio_set_rate : %s\n",alGetErrorString(oserror()));
--
-+ errormessage("audio_set_rate");
-+#endif
- return 0;
- }
-
-@@ -128,7 +167,7 @@
- ret = alSetChannels(ai->config, AL_MONO);
-
- if (ret < 0)
-- fprintf(stderr,"audio_set_channels : %s\n",alGetErrorString(oserror()));
-+ errormessage("audio_set_channels");
-
- return 0;
- }
-@@ -136,10 +175,10 @@
- int audio_set_format(struct audio_info_struct *ai)
- {
- if (alSetSampFmt(ai->config,AL_SAMPFMT_TWOSCOMP) < 0)
-- fprintf(stderr,"audio_set_format : %s\n",alGetErrorString(oserror()));
-+ errormessage("audio_set_format");
-
- if (alSetWidth(ai->config,AL_SAMPLE_16) < 0)
-- fprintf(stderr,"audio_set_format : %s\n",alGetErrorString(oserror()));
-+ errormessage("audio_set_format");
-
- return 0;
- }
-@@ -153,9 +192,17 @@
- int audio_play_samples(struct audio_info_struct *ai,unsigned char *buf,int len)
- {
- if(ai->format == AUDIO_FORMAT_SIGNED_8)
-+#ifdef NEW_IRIX_AUDIO
- alWriteFrames(ai->port, buf, len>>1);
-+#else
-+ ALwritesamps(ai->port, buf, len);
-+#endif
- else
-+#ifdef NEW_IRIX_AUDIO
- alWriteFrames(ai->port, buf, len>>2);
-+#else
-+ ALwritesamps(ai->port, buf, len>>1);
-+#endif
-
- return len;
- }
diff --git a/audio/mpg123/patches/patch-av b/audio/mpg123/patches/patch-av
deleted file mode 100644
index 5a92c4573cc..00000000000
--- a/audio/mpg123/patches/patch-av
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-av,v 1.1 2005/10/03 15:17:14 joerg Exp $
-
---- xfermem.c.orig 2005-07-23 23:42:59.000000000 +0000
-+++ xfermem.c
-@@ -32,8 +32,6 @@
- #include <sys/shm.h>
- #endif
-
--extern int errno;
--
- #if defined (USE_MMAP) && defined(MAP_ANONYMOUS) && !defined(MAP_ANON)
- #define MAP_ANON MAP_ANONYMOUS
- #endif
diff --git a/audio/mpg123/patches/patch-aw b/audio/mpg123/patches/patch-aw
deleted file mode 100644
index d22aebe6368..00000000000
--- a/audio/mpg123/patches/patch-aw
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aw,v 1.1 2005/10/03 15:17:14 joerg Exp $
-
---- term.c.orig 2005-10-03 15:20:10.000000000 +0200
-+++ term.c
-@@ -90,7 +90,7 @@ static long term_handle_input(struct fra
- while(n > 0) {
- fd_set r;
- struct timeval t;
-- char val;
-+ unsigned char val;
-
- t.tv_sec=0;
- t.tv_usec=(do_delay) ? 1000 : 0;
diff --git a/audio/mpg321/DESCR b/audio/mpg321/DESCR
deleted file mode 100644
index f3a74f69ea0..00000000000
--- a/audio/mpg321/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-mpg321 is a Free replacement for mpg123, a very popular command-line mp3
-player. mpg123 is used for frontends, as an mp3 player and as an mp3 to
-wave file decoder (primarily for use with CD-recording software.) In all
-of these capacities, mpg321 can be used as a drop-in replacement for
-mpg123.
-
-mpg321 is a project conceived and written by Joe Drew <hoserhead@woot.net>.
-It uses code from the MAD distribution by Rob Leslie; XMMS; and plaympeg
-from the SMPEG distribution. mpg321 is licensed under the GNU General
-Public License version 2, as documented in the 'COPYING' file.
diff --git a/audio/mpg321/Makefile b/audio/mpg321/Makefile
deleted file mode 100644
index 0e9951fd851..00000000000
--- a/audio/mpg321/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:12 joerg Exp $
-
-DISTNAME= mpg321-0.2.10
-PKGREVISION= 6
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpg321/}
-
-MAINTAINER= rxg@NetBSD.org
-HOMEPAGE= http://mpg321.sourceforge.net/
-COMMENT= Free replacement for mpg123
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --disable-mpg123-symlink
-
-.include "../../audio/libao/buildlink3.mk"
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mpg321/PLIST b/audio/mpg321/PLIST
deleted file mode 100644
index 9a175711f77..00000000000
--- a/audio/mpg321/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/13 09:14:45 rh Exp $
-bin/mpg321
-man/man1/mpg321.1
diff --git a/audio/mpg321/distinfo b/audio/mpg321/distinfo
deleted file mode 100644
index 598dac81673..00000000000
--- a/audio/mpg321/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:49 agc Exp $
-
-SHA1 (mpg321-0.2.10.tar.gz) = 90268d0d187ddd7625d143b95791cb39a1630b79
-RMD160 (mpg321-0.2.10.tar.gz) = c0867e6ca7c0a5e2ff006e0c3aa866d2fde529ba
-Size (mpg321-0.2.10.tar.gz) = 113449 bytes
-SHA1 (patch-aa) = 28b16b6ffe9a4124323bfdbb26d79d79e5e1b8f3
diff --git a/audio/mpg321/patches/patch-aa b/audio/mpg321/patches/patch-aa
deleted file mode 100644
index 448df21b471..00000000000
--- a/audio/mpg321/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/01/07 16:54:12 tron Exp $
-
---- mpg321.c.orig Sun Mar 24 06:49:20 2002
-+++ mpg321.c Wed Jan 7 17:47:33 2004
-@@ -188,7 +188,7 @@
-
- else
- {
-- printf(names[i]);
-+ printf("%s", names[i]);
- free(names[i]);
- }
- }
-@@ -203,7 +203,7 @@
- if (!names[i]) {
- fprintf (stderr, emptystring);
- } else {
-- fprintf (stderr, names[i]);
-+ fprintf (stderr, "%s", names[i]);
- free (names[i]);
- }
- if (i%2) fprintf (stderr, "\n");
diff --git a/audio/mppenc/DESCR b/audio/mppenc/DESCR
deleted file mode 100644
index 098644ddc05..00000000000
--- a/audio/mppenc/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This is the latest StreamVersion7 encoder. It's needed to encode
-Wave files to MPC.
diff --git a/audio/mppenc/Makefile b/audio/mppenc/Makefile
deleted file mode 100644
index 95b6dfa595d..00000000000
--- a/audio/mppenc/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/01/25 19:34:22 drochner Exp $
-#
-
-DISTNAME= mppenc-1.16
-CATEGORIES= audio
-MASTER_SITES= http://files.musepack.net/source/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.musepack.net/
-COMMENT= Musepack encoder
-
-BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake
-
-do-configure:
- (cd ${WRKSRC} && ${LOCALBASE}/bin/cmake \
- -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX})
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mppenc/PLIST b/audio/mppenc/PLIST
deleted file mode 100644
index 5bd274f1e5d..00000000000
--- a/audio/mppenc/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/01/25 19:34:22 drochner Exp $
-bin/mppenc
diff --git a/audio/mppenc/distinfo b/audio/mppenc/distinfo
deleted file mode 100644
index 5768f7088b6..00000000000
--- a/audio/mppenc/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.2 2007/01/29 21:04:22 joerg Exp $
-
-SHA1 (mppenc-1.16.tar.bz2) = f7dc898b14e0bd954941c62435a62c23af89cb8a
-RMD160 (mppenc-1.16.tar.bz2) = 6e97bfc246b9db11532a628afba631883687554d
-Size (mppenc-1.16.tar.bz2) = 105569 bytes
-SHA1 (patch-aa) = 4cc88a533db69fbd8c650358e20f261e162d1049
-SHA1 (patch-ab) = 0aa4c32e90f18f2d2321d69942b087330fb50197
diff --git a/audio/mppenc/patches/patch-aa b/audio/mppenc/patches/patch-aa
deleted file mode 100644
index e01cc0c44c9..00000000000
--- a/audio/mppenc/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/01/25 19:34:22 drochner Exp $
-
---- src/CMakeLists.txt.orig 2007-01-25 16:04:46.000000000 +0100
-+++ src/CMakeLists.txt
-@@ -12,5 +12,8 @@ endif(NOT MSVC)
- if(CMAKE_SYSTEM_NAME STREQUAL OpenBSD)
- target_link_libraries(mppenc ossaudio)
- endif(CMAKE_SYSTEM_NAME STREQUAL OpenBSD)
-+if(CMAKE_SYSTEM_NAME STREQUAL NetBSD)
-+target_link_libraries(mppenc ossaudio)
-+endif(CMAKE_SYSTEM_NAME STREQUAL NetBSD)
-
- install(TARGETS mppenc RUNTIME DESTINATION bin)
diff --git a/audio/mppenc/patches/patch-ab b/audio/mppenc/patches/patch-ab
deleted file mode 100644
index 94fe852b2b1..00000000000
--- a/audio/mppenc/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/01/29 21:04:22 joerg Exp $
-
---- src/mppdec.h.orig 2007-01-29 20:36:43.000000000 +0000
-+++ src/mppdec.h
-@@ -160,7 +160,7 @@
- # include <sys/time.h>
- # if defined __linux__ // the standard is that this file is stored somewhere on the hard disk
- # include <linux/soundcard.h>
--# elif defined __bsdi_ || defined __FreeBSD__
-+# elif defined __bsdi_ || defined __FreeBSD__ || defined(__DragonFly__)
- # include <sys/soundcard.h>
- # elif defined __NetBSD__ || defined __OpenBSD__
- # include <soundcard.h>
diff --git a/audio/mserv-devel/DESCR b/audio/mserv-devel/DESCR
deleted file mode 100644
index 875c8c0bcc1..00000000000
--- a/audio/mserv-devel/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-The main purpose of Mserv is to play songs that those in the room want
-to hear. It works by each user rating the songs they hear - at the
-moment this means they type rate good via telnet or click GOOD via web,
-but hopefully there will be Windows/X clients available soon. Mserv
-uses the ratings, the date the song was last played, the filter
-settings and who is currently logged in. It then compiles a 'top' list
-of songs that are most likely to be played.
diff --git a/audio/mserv-devel/Makefile b/audio/mserv-devel/Makefile
deleted file mode 100644
index 3715125b987..00000000000
--- a/audio/mserv-devel/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2006/06/26 05:45:55 rillig Exp $
-#
-
-DISTNAME= mserv-0.39a
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mserv/}
-
-MAINTAINER= kim@tac.nyc.ny.us
-HOMEPAGE= http://www.mserv.org/
-COMMENT= Local centralised music server environment
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-engine-icecast
-CONFIGURE_ARGS+= --datadir=${PREFIX}/share/mserv
-USE_LIBTOOL= yes
-
-REPLACE_PERL= support/mservedit webclient/main.cgi \
- webclient/margin.cgi webclient/mserv.cgi
-USE_TOOLS+= perl:run
-
-post-configure:
- ${MV} ${WRKSRC}/mserv/soundcard.h ${WRKSRC}/mserv/mservsoundcard.h
-
-post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/support/mservedit ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mserv
- ${INSTALL_DATA} \
- ${WRKSRC}/INSTALL \
- ${WRKSRC}/LICENSE \
- ${PREFIX}/share/doc/mserv
- ${INSTALL_DATA_DIR} ${PREFIX}/share/mserv/webclient
- ${INSTALL_DATA} \
- ${WRKSRC}/webclient/* \
- ${PREFIX}/share/mserv/webclient
-
-.include "../../audio/libshout/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mserv-devel/PLIST b/audio/mserv-devel/PLIST
deleted file mode 100644
index 4d2abd2d0bc..00000000000
--- a/audio/mserv-devel/PLIST
+++ /dev/null
@@ -1,21 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:17 jlam Exp $
-bin/mserv
-bin/mservcmd
-bin/mservedit
-include/mservcli.h
-lib/libmservcli.la
-man/man1/mserv.1
-man/man1/mservcmd.1
-share/doc/mserv/INSTALL
-share/doc/mserv/LICENSE
-share/mserv/english.lang
-share/mserv/webclient/README
-share/mserv/webclient/back.gif
-share/mserv/webclient/index.html
-share/mserv/webclient/main.cgi
-share/mserv/webclient/margin.cgi
-share/mserv/webclient/mserv.cgi
-share/mserv/webclient/mserv7.gif
-@dirrm share/mserv/webclient
-@dirrm share/mserv
-@dirrm share/doc/mserv
diff --git a/audio/mserv-devel/distinfo b/audio/mserv-devel/distinfo
deleted file mode 100644
index 44f4a727f5c..00000000000
--- a/audio/mserv-devel/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:49 agc Exp $
-
-SHA1 (mserv-0.39a.tar.gz) = cb101fe7e4aca8b5fd950eec408938a2b3bf1a1b
-RMD160 (mserv-0.39a.tar.gz) = 5afd2e4573594a7a8526148a61b6b49adce6aa62
-Size (mserv-0.39a.tar.gz) = 333570 bytes
-SHA1 (patch-aa) = 167417f1d0cd15bea6dbef46a3a0e0841d41fa4c
-SHA1 (patch-ab) = f6692d59b1da163a273639347cd53ee7c56ec64b
-SHA1 (patch-ac) = 47ac4716cbba0ff3f2acde1b896e56c309abe102
diff --git a/audio/mserv-devel/patches/patch-aa b/audio/mserv-devel/patches/patch-aa
deleted file mode 100644
index 0c4887a2543..00000000000
--- a/audio/mserv-devel/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/01/12 04:18:18 kim Exp $
-
---- mserv/cmd.c.orig Sun Aug 31 18:51:07 2003
-+++ mserv/cmd.c Tue Oct 14 17:50:28 2003
-@@ -52,7 +52,7 @@
- #include <math.h>
- #include "mserv.h"
- #include "misc.h"
--#include "soundcard.h"
-+#include "mservsoundcard.h"
- #include "acl.h"
- #include "filter.h"
- #include "cmd.h"
diff --git a/audio/mserv-devel/patches/patch-ab b/audio/mserv-devel/patches/patch-ab
deleted file mode 100644
index 4a44e08fe4b..00000000000
--- a/audio/mserv-devel/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/01/12 04:18:18 kim Exp $
-
---- mserv/mserv.c.orig Sun Aug 31 18:52:34 2003
-+++ mserv/mserv.c Tue Oct 14 17:50:57 2003
-@@ -67,7 +67,7 @@
- #include "cmd.h"
- #include "acl.h"
- #include "mp3info.h"
--#include "soundcard.h"
-+#include "mservsoundcard.h"
- #include "defconf.h"
- #include "conf.h"
- #include "opt.h"
diff --git a/audio/mserv-devel/patches/patch-ac b/audio/mserv-devel/patches/patch-ac
deleted file mode 100644
index 34d0878eacd..00000000000
--- a/audio/mserv-devel/patches/patch-ac
+++ /dev/null
@@ -1,107 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/01/12 04:18:18 kim Exp $
-
---- mserv/output-icecast.c.orig Sun Aug 31 18:52:35 2003
-+++ mserv/output-icecast.c Sat Oct 18 23:01:21 2003
-@@ -170,7 +170,7 @@
- *error = "Failed setting Icecast hostname";
- goto failed;
- }
-- if (shout_set_protocol(o->shout, SHOUT_PROTOCOL_HTTP) != SHOUTERR_SUCCESS) {
-+ if (shout_set_protocol(o->shout, SHOUT_PROTOCOL_XAUDIOCAST) != SHOUTERR_SUCCESS) {
- mserv_log("Failed setting Icecast protocol: %s", shout_get_error(o->shout));
- *error = "Failed setting Icecast protocol";
- goto failed;
-@@ -186,8 +186,8 @@
- goto failed;
- }
- if (shout_set_mount(o->shout, mount) != SHOUTERR_SUCCESS) {
-- mserv_log("Failed setting Icecast hostname: %s", shout_get_error(o->shout));
-- *error = "Failed setting Icecast hostname";
-+ mserv_log("Failed setting Icecast mount: %s", shout_get_error(o->shout));
-+ *error = "Failed setting Icecast mount";
- goto failed;
- }
- if (shout_set_user(o->shout, user) != SHOUTERR_SUCCESS) {
-@@ -195,7 +195,7 @@
- *error = "Failed setting Icecast user";
- goto failed;
- }
-- if (shout_set_format(o->shout, SHOUT_FORMAT_VORBIS) != SHOUTERR_SUCCESS) {
-+ if (shout_set_format(o->shout, SHOUT_FORMAT_MP3) != SHOUTERR_SUCCESS) {
- mserv_log("Failed setting Icecast format: %s", shout_get_error(o->shout));
- *error = "Failed setting Icecast format";
- goto failed;
-@@ -209,6 +209,7 @@
- mserv_log("Successfully connected to Icecast host '%s@%s' for mount '%s'",
- host, port, mount);
-
-+#if 0
- vorbis_info_init(&o->vi);
- if (vorbis_encode_init(&o->vi, o->channels, o->samplerate, -1,
- o->bitrate, -1) != 0) {
-@@ -248,6 +249,8 @@
- }
- }
- }
-+#endif
-+
- /*
- if (gettimeofday(&o->lasttime, NULL) == -1) {
- *error = "Failed to gettimeofday()";
-@@ -389,9 +392,11 @@
- }
- o->buffer_ready_bytes = 0;
- }
-+
- /* if we have no ready buffer, and we have a full normal buffer,
- * send it to vorbis */
- if (o->buffer_ready_bytes == 0 && o->buffer_bytes == o->buffer_size) {
-+#if 0
- vorbbuf = vorbis_analysis_buffer(&o->vd,
- o->buffer_size / (o->channels * 2));
- if (mserv_debug)
-@@ -413,7 +418,27 @@
- o->buffer_size / (o->channels * 2));
- vorbis_analysis_wrote(&o->vd, o->buffer_size / (o->channels * 2));
- o->buffer_bytes = 0;
-+#else
-+ reqbufsize = o->buffer_ready_bytes + o->buffer_bytes;
-+ reqbufsize = ((reqbufsize / 8192) + 1) * 8192; /* add granularity */
-+ if (reqbufsize > o->buffer_ready_size) {
-+ newbuf = realloc(o->buffer_ready, reqbufsize);
-+ mserv_log("Extending output buffer size from %d to %d bytes",
-+ o->buffer_ready_size, reqbufsize);
-+ if (newbuf == NULL) {
-+ mserv_log("Out of memory extending output buffer");
-+ exit(1);
-+ }
-+ o->buffer_ready = newbuf;
-+ o->buffer_ready_size = reqbufsize;
-+ }
-+ memcpy(o->buffer_ready + o->buffer_ready_bytes,
-+ o->buffer_float, o->buffer_bytes);
-+ o->buffer_ready_bytes += o->buffer_bytes;
-+ o->buffer_bytes = 0;
-+#endif
- }
-+
- /* if we haven't got a full buffer, read in more from the player */
- while (o->buffer_bytes < o->buffer_size) {
- /* try and read more from the input stream */
-@@ -508,6 +533,8 @@
- }
- }
- }
-+
-+#if 0
- /* does vorbis have anything decoded from what we've already sent it via
- * vorbis_analysis_wrote above? */
- if (mserv_debug)
-@@ -550,6 +577,7 @@
- mserv_log(" done. received %d ogg pages from libvorbis", pages);
- mserv_log(" encoded output buffer now %d bytes", o->buffer_ready_bytes);
- }
-+#endif
- }
-
- /* end of stream: vorbis_analysis_wrote(&o->vd, 0); */
diff --git a/audio/mserv/DESCR b/audio/mserv/DESCR
deleted file mode 100644
index 875c8c0bcc1..00000000000
--- a/audio/mserv/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-The main purpose of Mserv is to play songs that those in the room want
-to hear. It works by each user rating the songs they hear - at the
-moment this means they type rate good via telnet or click GOOD via web,
-but hopefully there will be Windows/X clients available soon. Mserv
-uses the ratings, the date the song was last played, the filter
-settings and who is currently logged in. It then compiles a 'top' list
-of songs that are most likely to be played.
diff --git a/audio/mserv/Makefile b/audio/mserv/Makefile
deleted file mode 100644
index 882e6caf28b..00000000000
--- a/audio/mserv/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# $NetBSD: Makefile,v 1.32 2006/05/14 21:10:28 minskim Exp $
-#
-
-DISTNAME= mserv-0.35
-PKGREVISION= 12
-CATEGORIES= audio
-MASTER_SITES= http://www.mserv.org/download/
-
-MAINTAINER= martin@NetBSD.org
-HOMEPAGE= http://www.mserv.org/
-COMMENT= Local centralised music server environment
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --datadir=${PREFIX}/share/mserv
-CONFIGURE_ENV+= MY_LIBS="-lvorbisfile -lvorbis"
-USE_LIBTOOL= yes
-USE_TOOLS+= perl:run
-
-REPLACE_PERL= support/mservedit webclient/main.cgi \
- webclient/margin.cgi webclient/mserv.cgi
-
-LDFLAGS.SunOS+= -lnsl -lsocket
-
-post-configure:
- ${MV} ${WRKSRC}/mserv/soundcard.h ${WRKSRC}/mserv/mservsoundcard.h
-
-post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/support/mservedit ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mserv
- ${INSTALL_DATA} \
- ${WRKSRC}/INSTALL \
- ${WRKSRC}/LICENSE \
- ${PREFIX}/share/doc/mserv
- ${INSTALL_DATA_DIR} ${PREFIX}/share/mserv/webclient
- ${INSTALL_DATA} \
- ${WRKSRC}/webclient/* \
- ${PREFIX}/share/mserv/webclient
-
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mserv/PLIST b/audio/mserv/PLIST
deleted file mode 100644
index 6274950703e..00000000000
--- a/audio/mserv/PLIST
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/30 03:50:02 tv Exp $
-bin/mserv
-bin/mservcmd
-bin/mservedit
-include/mservcli.h
-lib/libmservcli.la
-man/man1/mserv.1
-man/man1/mservcmd.1
-share/doc/mserv/INSTALL
-share/doc/mserv/LICENSE
-share/mserv/english.lang
-share/mserv/webclient/README
-share/mserv/webclient/back.gif
-share/mserv/webclient/index.html
-share/mserv/webclient/main.cgi
-share/mserv/webclient/margin.cgi
-share/mserv/webclient/mserv.cgi
-share/mserv/webclient/mserv7.gif
-@dirrm share/mserv/webclient
-@dirrm share/mserv
diff --git a/audio/mserv/distinfo b/audio/mserv/distinfo
deleted file mode 100644
index 6190b329ea1..00000000000
--- a/audio/mserv/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: distinfo,v 1.18 2005/02/23 20:39:49 agc Exp $
-
-SHA1 (mserv-0.35.tar.gz) = 850835946e4d5a0deccdd22a18f30170c0a7b57c
-RMD160 (mserv-0.35.tar.gz) = 0665c1b1807da675486b58013715b737b8de606e
-Size (mserv-0.35.tar.gz) = 280299 bytes
-SHA1 (patch-aa) = 3756e6b338ad8501daa258237868e9ef2d96cb49
-SHA1 (patch-ab) = 91d6840eae30182343db97d3f67d23d0c423dbe7
-SHA1 (patch-ac) = 068b14b4a8a0ce4dcb19e0cd28fc6a7296f86dad
-SHA1 (patch-ad) = 105edf313c2101f0961aab8a94022a5a0d07eb22
-SHA1 (patch-ae) = 559f2ecf11bcd25b5ea3423dff4b1a4bf4066b78
-SHA1 (patch-af) = d92f0bf56a04cf3b2f7001c4f68c1bb1b5ea007f
-SHA1 (patch-ag) = 7d5fae48c89db4b9bdccf371528c3b3e890455a9
-SHA1 (patch-ah) = c089ae56f23c83291a1e9b5502b952cd58be4860
-SHA1 (patch-ai) = 2a0adae9f5ad8810960dc4e4fecf1e03633f0421
-SHA1 (patch-aj) = 445d110b1a820909b940b5c036de13a2679b064c
diff --git a/audio/mserv/patches/patch-aa b/audio/mserv/patches/patch-aa
deleted file mode 100644
index 9acaf1bb48e..00000000000
--- a/audio/mserv/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2004/02/20 00:41:16 abs Exp $
-
---- mserv/Makefile.in.orig Sun Aug 3 15:57:19 2003
-+++ mserv/Makefile.in
-@@ -130,7 +130,7 @@ target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
-
--INCLUDES = -I../hdr -DDATADIR=\"${datadir}\"
-+INCLUDES = -I../hdr -DDATADIR=\"${datadir}\" -DBINDIR=\"${prefix}/bin\" -DPARSE_OGG_INFO=1
-
- bin_PROGRAMS = mserv
-
diff --git a/audio/mserv/patches/patch-ab b/audio/mserv/patches/patch-ab
deleted file mode 100644
index bf1740088a3..00000000000
--- a/audio/mserv/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2004/02/20 00:41:16 abs Exp $
-
---- mserv/cmd.c.orig Sat Aug 2 15:26:19 2003
-+++ mserv/cmd.c
-@@ -51,7 +51,7 @@ met:
- #include <math.h>
- #include "mserv.h"
- #include "misc.h"
--#include "soundcard.h"
-+#include "mservsoundcard.h"
- #include "acl.h"
- #include "filter.h"
- #include "cmd.h"
diff --git a/audio/mserv/patches/patch-ac b/audio/mserv/patches/patch-ac
deleted file mode 100644
index 46e750ed320..00000000000
--- a/audio/mserv/patches/patch-ac
+++ /dev/null
@@ -1,108 +0,0 @@
-$NetBSD: patch-ac,v 1.10 2004/02/20 00:41:16 abs Exp $
-
---- mserv/defconf.c.orig Mon Aug 4 19:25:36 2003
-+++ mserv/defconf.c
-@@ -1,54 +1,53 @@
- #include "defines.h"
-
--const char defconf_file[] = "# Mserv configuration file for 0.33 and later\n\
--\n\
--# File locations, / at start is absolute, otherwise relative to mserv root\n\
--path_acl=acl\n\
--path_webacl=webacl\n\
--path_logfile=log\n\
--path_tracks=tracks\n\
--path_trackinfo=trackinfo\n\
--path_playout=player.out\n\
--path_idea=idea\n\
--path_mixer=/dev/mixer\n\
--path_language=" DATADIR "/english.lang\n\
--\n\
--# Define player invokation methods\n\
--# mservplay is our special wrapper, the first parameter is a 'nice' level\n\
--# play is part of sox\n\
--prog_mpg123=/usr/local/bin/mpg123 -b 1024\n\
--prog_freeamp=/usr/local/bin/freeamp -ui mpg123\n\
--prog_mservplay=/usr/local/bin/mservplay 0 mpg123 -b 1024\n\
--prog_play=/usr/local/bin/play\n\
--prog_ogg123=/usr/local/bin/ogg123\n\
--\n\
--# Set players for each file extension we want to support, unknown extensions\n\
--# are ignored by mserv\n\
--player_mp3=prog_mpg123\n\
--player_wav=prog_play\n\
--player_au=prog_play\n\
--player_ogg=prog_ogg\n\
--\n\
--# Set default random mode, either on or off. You must still tell mserv to\n\
--# start playing (PLAY).\n\
--random=off\n\
--\n\
--# Set whether or not you would like play to start as soon as mserv has loaded.\n\
--play=off\n\
--\n\
--# Set default random factor, 0.5 is completely random, 0.6 is less random\n\
--# and takes into account your ratings, 0.4 plays your worst tunes. 0.99 max.\n\
--factor=0.60\n\
--\n\
--# Set default filter, leave blank for off. Example: \"!classical\" to\n\
--# not play classical genre, or \"year>=1980&year<1990\" to only play\n\
--# 80's songs.\n\
--filter=\n\
--\n\
--# Set gap between songs, in seconds. 0 to start the next song as quick as\n\
--# possible.\n\
--gap=1\n\
--\n\
--";
-+const char defconf_file[] = "# Mserv configuration file for 0.33 and later\n"
-+"\n"
-+"# File locations, / at start is absolute, otherwise relative to mserv root\n"
-+"path_acl=acl\n"
-+"path_webacl=webacl\n"
-+"path_logfile=log\n"
-+"path_tracks=tracks\n"
-+"path_trackinfo=trackinfo\n"
-+"path_playout=player.out\n"
-+"path_idea=idea\n"
-+"path_mixer=/dev/mixer\n"
-+"path_language=" DATADIR "/english.lang\n"
-+"\n"
-+"# Define player invokation methods\n"
-+"# mservplay is our special wrapper, the first parameter is a 'nice' level\n"
-+"# play is part of sox\n"
-+"prog_mpg123=" PATH_MPG123 " -b 1024\n"
-+"prog_freeamp=/usr/local/bin/freeamp -ui " PATH_MPG123 "\n"
-+"prog_mservplay=/usr/local/bin/mservplay 0 " PATH_MPG123 " -b 1024\n"
-+"prog_play=/usr/local/bin/play\n"
-+"prog_ogg123=/usr/local/bin/ogg123\n"
-+"\n"
-+"# Set players for each file extension we want to support, unknown extensions\n"
-+"# are ignored by mserv\n"
-+"player_mp3=prog_mpg123\n"
-+"player_wav=prog_play\n"
-+"player_au=prog_play\n"
-+"player_ogg=prog_ogg123\n"
-+"\n"
-+"# Set default random mode, either on or off. You must still tell mserv to\n"
-+"# start playing (PLAY).\n"
-+"random=off\n"
-+"\n"
-+"# Set whether or not you would like play to start as soon as mserv has loaded.\n"
-+"play=off\n"
-+"\n"
-+"# Set default random factor, 0.5 is completely random, 0.6 is less random\n"
-+"# and takes into account your ratings, 0.4 plays your worst tunes. 0.99 max.\n"
-+"factor=0.60\n"
-+"\n"
-+"# Set default filter, leave blank for off. Example: \"!classical\" to\n"
-+"# not play classical genre, or \"year>=1980&year<1990\" to only play\n"
-+"# 80's songs.\n"
-+"filter=\n"
-+"\n"
-+"# Set gap between songs, in seconds. 0 to start the next song as quick as\n"
-+"# possible.\n"
-+"gap=1\n"
-+"\n";
-
- unsigned int defconf_size = sizeof(defconf_file)-1;
diff --git a/audio/mserv/patches/patch-ad b/audio/mserv/patches/patch-ad
deleted file mode 100644
index a9defc157c5..00000000000
--- a/audio/mserv/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2004/02/20 00:41:16 abs Exp $
-
---- mserv/defines.h.orig Sun Aug 3 15:57:20 2003
-+++ mserv/defines.h
-@@ -1,3 +1,7 @@
-+#ifndef PATH_MPG123
-+#define PATH_MPG123 BINDIR "/mpg123"
-+#endif
-+
- /* maximum amount to queue in each output buffer */
- #define OUTBUFLEN 32*1024
-
-@@ -39,7 +43,7 @@
- #define MISCINFOLEN 128
-
- /* maximum number of tracks in each album */
--#define TRACKSPERALBUM 200
-+#define TRACKSPERALBUM 250
-
- /* maximum language line length */
- #define LANGLINELEN 1024
diff --git a/audio/mserv/patches/patch-ae b/audio/mserv/patches/patch-ae
deleted file mode 100644
index 901d5664b02..00000000000
--- a/audio/mserv/patches/patch-ae
+++ /dev/null
@@ -1,88 +0,0 @@
-$NetBSD: patch-ae,v 1.8 2004/02/20 00:41:16 abs Exp $
-
---- mserv/mp3info.c.orig Thu Feb 19 17:46:03 2004
-+++ mserv/mp3info.c
-@@ -27,6 +27,7 @@
- #define h_thing(val) ((val>>20)&0xfff)
-
- #define ID3V2HEADERLEN 10
-+#define min(x,y) ((x)<(y)?(x):(y))
-
- /* mp3 bit rate and sampling frequency tables */
-
-@@ -45,12 +46,14 @@ const int sampling_freq_table[2][3] =
- /* structure of id3 tag in mp3 file */
-
- typedef struct id3tag_disc_str
--{
-- char title[MP3ID3_TITLELEN];
-- char artist[MP3ID3_ARTISTLEN];
-- char album[MP3ID3_ALBUMLEN];
-- char year[MP3ID3_YEARLEN];
-- char comment[MP3ID3_COMMENTLEN];
-+{ /* These are all fixed lengths.
-+ * Avoid #define'd lengths that get get redefined for other uses
-+ */
-+ char title[30];
-+ char artist[30];
-+ char album[30];
-+ char year[4];
-+ char comment[28];
- unsigned char genre;
- } id3tag_disc;
-
-@@ -312,38 +315,44 @@ int mserv_mp3info_readlen(const char *fn
- if (id3tag)
- {
- id3tag_disc tag_disc;
-+ int len;
-
- if (fread(&tag_disc, 1, 125, f) != 125)
- goto error;
-
- id3tag->present = 1;
-
-- memcpy(id3tag->title, tag_disc.title, MP3ID3_TITLELEN);
-- id3tag->title[MP3ID3_TITLELEN] = '\0';
-+ len = min(MP3ID3_TITLELEN, sizeof(tag_disc.title));
-+ memcpy(id3tag->title, tag_disc.title, len);
-+ id3tag->title[len] = '\0';
- e = id3tag->title + strlen(id3tag->title);
- while (e > id3tag->title && *(e-1) == ' ')
- *--e = '\0';
-
-- memcpy(id3tag->artist, tag_disc.artist, MP3ID3_ARTISTLEN);
-- id3tag->artist[MP3ID3_ARTISTLEN] = '\0';
-+ len = min(MP3ID3_ARTISTLEN, sizeof(tag_disc.artist));
-+ memcpy(id3tag->artist, tag_disc.artist, len);
-+ id3tag->artist[len] = '\0';
- e = id3tag->artist + strlen(id3tag->artist);
- while (e > id3tag->artist && *(e-1) == ' ')
- *--e = '\0';
-
-- memcpy(id3tag->album, tag_disc.album, MP3ID3_ALBUMLEN);
-- id3tag->album[MP3ID3_ALBUMLEN] = '\0';
-+ len = min(MP3ID3_ALBUMLEN, sizeof(tag_disc.album));
-+ memcpy(id3tag->album, tag_disc.album, len);
-+ id3tag->album[len] = '\0';
- e = id3tag->album + strlen(id3tag->album);
- while (e > id3tag->album && *(e-1) == ' ')
- *--e = '\0';
-
-- memcpy(id3tag->year, tag_disc.year, MP3ID3_YEARLEN);
-- id3tag->year[MP3ID3_YEARLEN] = '\0';
-+ len = min(MP3ID3_YEARLEN, sizeof(tag_disc.year));
-+ memcpy(id3tag->year, tag_disc.year, len);
-+ id3tag->year[len] = '\0';
- e = id3tag->year + strlen(id3tag->year);
- while (e > id3tag->year && *(e-1) == ' ')
- *--e = '\0';
-
-- memcpy(id3tag->comment, tag_disc.comment, MP3ID3_COMMENTLEN);
-- id3tag->comment[MP3ID3_COMMENTLEN] = '\0';
-+ len = min(MP3ID3_COMMENTLEN, sizeof(tag_disc.comment));
-+ memcpy(id3tag->comment, tag_disc.comment, len);
-+ id3tag->comment[len] = '\0';
- e = id3tag->comment + strlen(id3tag->comment);
- while (e > id3tag->comment && *(e-1) == ' ')
- *--e = '\0';
diff --git a/audio/mserv/patches/patch-af b/audio/mserv/patches/patch-af
deleted file mode 100644
index 561d97edb98..00000000000
--- a/audio/mserv/patches/patch-af
+++ /dev/null
@@ -1,257 +0,0 @@
-$NetBSD: patch-af,v 1.9 2004/09/12 05:08:28 minskim Exp $
-
---- mserv/mserv.c.orig 2003-08-03 09:57:20.000000000 -0500
-+++ mserv/mserv.c
-@@ -62,12 +62,17 @@ met:
- #include <sys/ioctl.h>
- #include <time.h>
-
-+#ifdef PARSE_OGG_INFO
-+#include <vorbis/codec.h>
-+#include <vorbis/vorbisfile.h>
-+#endif
-+
- #include "mserv.h"
- #include "misc.h"
- #include "cmd.h"
- #include "acl.h"
- #include "mp3info.h"
--#include "soundcard.h"
-+#include "mservsoundcard.h"
- #include "defconf.h"
- #include "conf.h"
- #include "opt.h"
-@@ -79,6 +84,10 @@ met:
- # define MIN(X,Y) (((X) < (Y)) ? (X) : (Y))
- #endif
-
-+#ifndef HAVE_STRLCPY
-+#define strlcpy strncpy
-+#endif
-+
- extern char *optarg;
- extern int optind;
- /* extern int getopt(int, char *const *, const char *); */ /* sunos ;( */
-@@ -131,7 +140,8 @@ static void mserv_vresponse(t_client *cl
- static void mserv_scandir(void);
- static void mserv_scandir_recurse(const char *pathname);
- static t_track *mserv_loadtrk(const char *filename);
--static t_album *mserv_loadalbum(const char *filename, int onlyifexists);
-+static t_album *mserv_loadalbum(const char *filename, int onlyifexists,
-+ const char *default_author);
- static int album_insertsort(t_album *album);
- static t_author *mserv_authorlist(void);
- static int author_insertsort(t_author **list, t_author *author);
-@@ -292,7 +302,7 @@ int main(int argc, char *argv[])
- ps->pw_dir[strlen(ps->pw_dir)-1] == '/' ? "" : "/");
- } else {
- /* copy out of environment */
-- if ((m = malloc(strlen(mserv_root))) == NULL) {
-+ if ((m = malloc(strlen(mserv_root)+1)) == NULL) {
- fprintf(stderr, "%s: out of memory\n", progname);
- exit(1);
- }
-@@ -305,7 +315,7 @@ int main(int argc, char *argv[])
- l--;
- mserv_root[l] = '\0';
- if (!mserv_conf) {
-- if ((m = malloc(strlen(mserv_root)+sizeof("/config"))) == NULL) {
-+ if ((m = malloc(strlen(mserv_root)+sizeof("/config")+1)) == NULL) {
- fprintf(stderr, "%s: out of memory\n", progname);
- exit(1);
- }
-@@ -1624,6 +1634,7 @@ static void mserv_scandir_recurse(const
- int i;
- t_album *album;
- int flag = 0;
-+ const char *default_author = 0;
-
- /* pathname is "" or "directory/" or "directory/directory/..." */
-
-@@ -1686,22 +1697,32 @@ static void mserv_scandir_recurse(const
- toomany = 1;
- break;
- }
-+
- if (mserv_verbose)
- mserv_log("Track file: %s", fullpath);
- if ((tracks[tnum] = mserv_loadtrk(filename)) == NULL) {
- mserv_log("Unable to add track '%s'", fullpath);
- } else {
-+
-+ if (default_author == 0)
-+ default_author = tracks[tnum]->author;
-+ else if (default_author != (const char *)-1 && strcmp(default_author,
-+ tracks[tnum]->author))
-+ default_author = (const char *)-1;
-+
- tracks[tnum]->id = mserv_nextid_track++;
- tracks[tnum]->n_album = mserv_nextid_album;
- tracks[tnum]->n_track = tnum+1;
- tracks[tnum]->next = mserv_tracks;
- mserv_tracks = tracks[tnum++];
- }
-+
- flag = 1; /* there is at least one track in this directory */
- }
- closedir(dir);
- /* load album, but only if there is an album file or flag is set */
-- if ((album = mserv_loadalbum(pathname, flag ? 0 : 1)) == NULL)
-+ if ((album = mserv_loadalbum(pathname, flag ? 0 : 1,
-+ (default_author == (const char *)-1) ?0 :default_author)) == NULL)
- return;
- qsort(tracks, TRACKSPERALBUM, sizeof(t_track *),
- mserv_trackcompare_filename);
-@@ -1815,7 +1836,7 @@ static int mserv_trackcompare_rating(con
- }
- }
-
--static t_album *mserv_loadalbum(const char *filename, int onlyifexists)
-+static t_album *mserv_loadalbum(const char *filename, int onlyifexists, const char *default_author)
- {
- FILE *fd;
- char fullpath[MAXFNAME];
-@@ -1899,8 +1920,13 @@ static t_album *mserv_loadalbum(const ch
- return NULL;
- mtime = time(NULL);
- }
-- if (!*author)
-- strcpy(author, "!-Unindexed");
-+ if (!*author) {
-+ if (default_author)
-+ strcpy(author, default_author);
-+ else
-+ strcpy(author, "!-Unindexed");
-+ }
-+
- if (!*name) {
- if (!*filename || !*(filename+1)) {
- strcpy(name, "rootdir");
-@@ -2019,11 +2045,13 @@ static t_track *mserv_loadtrk(const char
- alen = strlen(buffer);
- if (buffer[alen-1] != '\n') {
- mserv_log("Line %d too long in '%s'", line, fullpath_trk);
-+ fclose(fd);
- return NULL;
- }
- buffer[--alen] = '\0';
- if (!(l = strcspn(buffer, "=")) || l >= 64) {
- mserv_log("Invalid track line %d in '%s'", line, fullpath_trk);
-+ fclose(fd);
- return NULL;
- }
- strncpy(token, buffer, l);
-@@ -2059,6 +2087,7 @@ static t_track *mserv_loadtrk(const char
- }
- if ((arate = malloc(sizeof(t_rating)+strlen(token)+1)) == NULL) {
- mserv_log("Out of memory creating ratings for '%s'", fullpath_trk);
-+ fclose(fd);
- return NULL;
- }
- memset(arate, 0, sizeof(t_rating));
-@@ -2082,15 +2111,18 @@ static t_track *mserv_loadtrk(const char
- }
- if (!*author) {
- mserv_log("No author specified in '%s'", fullpath_trk);
-+ fclose(fd);
- return NULL;
- }
- if (!*name) {
- mserv_log("No name specified in '%s'", fullpath_trk);
-+ fclose(fd);
- return NULL;
- }
- if (fstat(fileno(fd), &buf) == -1) {
- perror("fstat");
- mserv_log("Unable to stat '%s': %s", filename, strerror(errno));
-+ fclose(fd);
- return NULL;
- }
- mtime = buf.st_mtime;
-@@ -2098,8 +2130,17 @@ static t_track *mserv_loadtrk(const char
- }
- if (duration == 0 && !*miscinfo) {
- len = strlen(fullpath_file);
-+#ifdef PARSE_OGG_INFO
-+ if (len > 4 && !stricmp(".mp3", fullpath_file+len-4) ||
-+ !stricmp(".ogg", fullpath_file+len-4)) {
-+ if (!stricmp(".mp3", fullpath_file+len-4))
-+ duration = mserv_mp3info_readlen(fullpath_file, &bitrate, &id3tag);
-+ else
-+ duration = mserv_ogginfo_readlen(fullpath_file, &bitrate, &id3tag);
-+#else
- if (len > 4 && !stricmp(".mp3", fullpath_file+len-4)) {
- duration = mserv_mp3info_readlen(fullpath_file, &bitrate, &id3tag);
-+#endif
- if (duration == -1) {
- mserv_log("Unable to determine details of mp3 '%s': %s",
- filename, strerror(errno));
-@@ -2719,7 +2760,7 @@ t_album *mserv_checkdisk_album(t_album *
- }
- if (buf.st_mtime == album->mtime)
- return album;
-- if ((newalbum = mserv_loadalbum(album->filename, 1)) == NULL) {
-+ if ((newalbum = mserv_loadalbum(album->filename, 1, 0)) == NULL) {
- mserv_log("Unable to re-load '%s'", album->filename);
- return album;
- }
-@@ -3430,3 +3471,59 @@ int mserv_setmixer(t_client *cl, int wha
- }
-
- #endif
-+
-+#ifdef PARSE_OGG_INFO
-+int mserv_ogginfo_readlen(const char *fname, int *bitrate_ret,
-+ t_id3tag *id3tag)
-+{
-+ OggVorbis_File vf;
-+ FILE *f;
-+ ogg_sync_state sync;
-+ vorbis_info *vi;
-+ vorbis_comment *vc;
-+ char **comment;
-+ double duration;
-+
-+ if (id3tag)
-+ memset(id3tag, 0, sizeof(*id3tag));
-+
-+ if ((f = fopen(fname, "rb")) == NULL)
-+ return -1;
-+
-+ if (ov_open(f, &vf, NULL, 0) < 0) {
-+ fclose(f);
-+ return -1;
-+ }
-+
-+ if ( !(vi = ov_info(&vf, -1)) || !(vc = ov_comment(&vf, -1))) {
-+ ov_clear(&vf);
-+ fclose(f);
-+ return -1;
-+ }
-+
-+ if (bitrate_ret)
-+ *bitrate_ret = vi->bitrate_nominal/1024;
-+
-+ for (comment = vc->user_comments ; *comment ; ++comment) {
-+ if (strncasecmp(*comment, "title=", 6) == 0) {
-+ strlcpy(id3tag->title, *comment + 6, MP3ID3_TITLELEN+1);
-+ id3tag->present = 1;
-+ }
-+ else if (strncasecmp(*comment, "artist=", 7) == 0)
-+ strlcpy(id3tag->artist, *comment + 7, MP3ID3_ARTISTLEN+1);
-+ else if (strncasecmp(*comment, "album=", 6) == 0)
-+ strlcpy(id3tag->album, *comment + 6, MP3ID3_ALBUMLEN+1);
-+ else if (strncasecmp(*comment, "date=", 5) == 0)
-+ strlcpy(id3tag->year, *comment + 5, MP3ID3_YEARLEN+1);
-+ else if (strncasecmp(*comment, "genre=", 6) == 0)
-+ strlcpy(id3tag->genre, *comment + 6, 31);
-+ /* tracknumber ignored */
-+ }
-+
-+ duration = ov_time_total(&vf, -1);
-+ ov_clear(&vf);
-+ fclose(f);
-+ return (int)duration * 100;
-+}
-+
-+#endif
diff --git a/audio/mserv/patches/patch-ag b/audio/mserv/patches/patch-ag
deleted file mode 100644
index 5b3188778e7..00000000000
--- a/audio/mserv/patches/patch-ag
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ag,v 1.6 2004/02/20 00:41:16 abs Exp $
-
---- mserv/opt.c.orig Sun Aug 3 15:57:20 2003
-+++ mserv/opt.c
-@@ -115,7 +115,7 @@ int opt_read(const char *root)
- sprintf(m, "%s/%s", root, val);
- } else {
- /* value is absolute path */
-- if ((m = malloc(strlen(val))) == NULL) {
-+ if ((m = malloc(strlen(val)+1)) == NULL) {
- fprintf(stderr, "%s: out of memory building path\n", progname);
- return -1;
- }
-@@ -164,8 +164,8 @@ int opt_read(const char *root)
- /* special case - player variable is an indirected to another variable */
- if ((val = conf_getvalue("player")) == NULL) {
- if (mserv_verbose)
-- printf("No player specified, defaulting to /usr/local/bin/mpg123\n");
-- opt_player = "/usr/local/bin/mpg123";
-+ printf("No player specified, defaulting to " PATH_MPG123 "\n");
-+ opt_player = PATH_MPG123;
- } else {
- if ((opt_player = conf_getvalue(val)) == NULL) {
- fprintf(stderr, "%s: player setting '%s' not found\n", progname,
diff --git a/audio/mserv/patches/patch-ah b/audio/mserv/patches/patch-ah
deleted file mode 100644
index e4dc0f88853..00000000000
--- a/audio/mserv/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.6 2004/09/12 05:08:28 minskim Exp $
-
---- configure.ac.orig 2003-08-03 09:57:19.000000000 -0500
-+++ configure.ac
-@@ -90,7 +90,7 @@ dnl Checks for typedefs, structures, and
-
- dnl Checks for functions
-
-- AC_CHECK_FUNCS(strsep)
-+ AC_CHECK_FUNCS(strsep strlcpy)
-
- dnl Engine selection
-
diff --git a/audio/mserv/patches/patch-ai b/audio/mserv/patches/patch-ai
deleted file mode 100644
index 12b4f594a49..00000000000
--- a/audio/mserv/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.5 2004/09/12 05:08:28 minskim Exp $
-
---- configure.orig 2003-08-03 09:57:19.000000000 -0500
-+++ configure
-@@ -9316,7 +9316,7 @@ esac
-
-
-
--for ac_func in strsep
-+for ac_func in strsep strlcpy
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_func" >&5
diff --git a/audio/mserv/patches/patch-aj b/audio/mserv/patches/patch-aj
deleted file mode 100644
index 8aea4276206..00000000000
--- a/audio/mserv/patches/patch-aj
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aj,v 1.5 2004/09/12 05:08:28 minskim Exp $
-
---- config.h.in.orig 2003-08-03 09:57:19.000000000 -0500
-+++ config.h.in
-@@ -27,6 +27,9 @@
- /* Define to 1 if you have the `strsep' function. */
- #undef HAVE_STRSEP
-
-+/* Define to 1 if you have the `strlcpy' function. */
-+#undef HAVE_STRLCPY
-+
- /* Define to 1 if you have the <sys/soundcard.h> header file. */
- #undef HAVE_SYS_SOUNDCARD_H
-
diff --git a/audio/mserv_irman/DESCR b/audio/mserv_irman/DESCR
deleted file mode 100644
index 205489f08b0..00000000000
--- a/audio/mserv_irman/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-mserv_irman allows easy control of the 'mserv' mp3 jukebox program
-using ordinary remote controls and irman receivers from evation.com.
-
-mserv already allows rating of tracks to allow the system to pick
-tracks appropriate to who is currently connected. mserv_irman works
-with this to permit relatively peaceful sharing of an mp3 jukebox
-in an office of widely disparate tastes.
diff --git a/audio/mserv_irman/Makefile b/audio/mserv_irman/Makefile
deleted file mode 100644
index 0af399053dd..00000000000
--- a/audio/mserv_irman/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:06 wiz Exp $
-#
-
-DISTNAME= mserv_irman-0.20
-CATEGORIES= audio
-MASTER_SITES= http://www.mono.org/abs/tools/mserv_irman/
-EXTRACT_SUFX= .tbz
-
-MAINTAINER= abs@NetBSD.org
-HOMEPAGE= http://www.mono.org/abs/tools/mserv_irman/
-COMMENT= Control mserv mp3 jukebox program via infra-red remote
-
-DEPENDS+= mserv-[0-9]*:../../audio/mserv
-DEPENDS+= libirman>=0.4.1.2nb3:../../sysutils/libirman
-DEPENDS+= p5-Time-HiRes-[0-9]*:../../time/p5-Time-HiRes
-DEPENDS+= p5-Config-IniFiles-[0-9]*:../../devel/p5-Config-IniFiles
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_TOOLS+= perl:run
-REPLACE_PERL= mserv_irman.pl
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mserv_irman/PLIST b/audio/mserv_irman/PLIST
deleted file mode 100644
index 7b3283d941d..00000000000
--- a/audio/mserv_irman/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/09/18 16:33:47 abs Exp $
-bin/mserv_irman
-man/man1/mserv_irman.1
diff --git a/audio/mserv_irman/distinfo b/audio/mserv_irman/distinfo
deleted file mode 100644
index 2e7d73447ee..00000000000
--- a/audio/mserv_irman/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 20:39:49 agc Exp $
-
-SHA1 (mserv_irman-0.20.tbz) = 7b1c85988ee57b83418a2fc4f5fc90889401711e
-RMD160 (mserv_irman-0.20.tbz) = 260639a34d088764b8b4750dec62213a2f98b912
-Size (mserv_irman-0.20.tbz) = 9204 bytes
diff --git a/audio/mstream/DESCR b/audio/mstream/DESCR
deleted file mode 100644
index d8512d014ef..00000000000
--- a/audio/mstream/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Mstream is an mserv player package for queueing tracks to an IceS MP3
-stream source. It consists of a player script for mserv and a playlist
-handler module for IceS. It supports the NEXT and STOP commands in
-mserv. It also supports title streaming with metadata from your mserv
-database.
diff --git a/audio/mstream/Makefile b/audio/mstream/Makefile
deleted file mode 100644
index f83cf2b1bb6..00000000000
--- a/audio/mstream/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2006/06/06 18:58:30 kim Exp $
-#
-
-DISTNAME= mstream-1.1
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.gw.com/pub/people/kim/
-
-MAINTAINER= kim@tac.nyc.ny.us
-HOMEPAGE= http://kimmo.suominen.com/gwradio/
-COMMENT= Mserv player package to queue tracks to IceS
-
-DEPENDS+= ices-mp3>=0.3:../../audio/ices-mp3
-DEPENDS+= p5-MP3-Info>=1.0:../../audio/p5-MP3-Info
-
-NO_CONFIGURE= yes
-USE_TOOLS+= perl:run
-
-MODDIR= ${LOCALBASE}/share/ices-mp3
-
-MAKE_FLAGS+= PREFIX=${PREFIX:Q}
-MAKE_FLAGS+= MODDIR=${MODDIR:Q}
-MAKE_FLAGS+= PERL=${PERL5:Q}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mstream/PLIST b/audio/mstream/PLIST
deleted file mode 100644
index a8e0addae08..00000000000
--- a/audio/mstream/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/25 00:33:15 kim Exp $
-bin/mstream-play
-man/man1/mstream-play.1
-share/ices-mp3/mstream.pm
diff --git a/audio/mstream/distinfo b/audio/mstream/distinfo
deleted file mode 100644
index f328c9b5ac8..00000000000
--- a/audio/mstream/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/06/06 18:58:30 kim Exp $
-
-SHA1 (mstream-1.1.tar.gz) = bd5aef21a9addf7db7495f6ec9c83e8b5d180202
-RMD160 (mstream-1.1.tar.gz) = 75fa2ab0c43b999c1d62a6d60602a00dfd7d7ddd
-Size (mstream-1.1.tar.gz) = 4030 bytes
diff --git a/audio/mt-daapd/DESCR b/audio/mt-daapd/DESCR
deleted file mode 100644
index 748f0bd528a..00000000000
--- a/audio/mt-daapd/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-mt-daapd is a program which acts as an iTunes (DAAP) server for Linux
-and other POSIX unixes. It may eventually support Win32 as well.
-
-Some random features that it supports:
-Supports the Roku SoundBridge (query/browse/index support)
-Supports periodic rescans of the database
-Can advertise shoutcast streams
-Supports password-protected shares
-Is web-configurable and managable
-Support dynamic playlists, like iTunes "Smart playlists"
-Probably other things I've forgotten
-
-All is not perfect, however. Currently, there are several drawbacks to it:
-database is indexed by inode, so all music must be on one filesystem
-browse by artist is slow on Roku, times out (with large databases ~10K songs)
-Probably other things I've forgotten
diff --git a/audio/mt-daapd/Makefile b/audio/mt-daapd/Makefile
deleted file mode 100644
index 1827ed77080..00000000000
--- a/audio/mt-daapd/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2007/02/17 16:39:23 adrianp Exp $
-
-DISTNAME= mt-daapd-0.2.4
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mt-daapd/}
-
-MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://www.mt-daapd.org/
-COMMENT= Server for DAAP (iTunes)
-
-USE_LANGUAGES= c
-USE_TOOLS+= gmake
-
-GNU_CONFIGURE= yes
-
-.include "../../mk/bsd.prefs.mk"
-
-RCD_SCRIPTS= mtdaapd
-EGDIR= ${PREFIX}/share/examples/${PKGBASE}
-MTDAAPD_USER?= mtdaapd
-MTDAAPD_GROUP?= mtdaapd
-PKG_USERS= ${MTDAAPD_USER}:${MTDAAPD_GROUP}
-PKG_GROUPS= ${MTDAAPD_GROUP}
-BUILD_DEFS+= VARBASE MTDAAPD_USER
-
-CONF_FILES_PERMS= ${EGDIR}/mt-daapd.conf ${PKG_SYSCONFDIR}/mt-daapd.conf \
- ${MTDAAPD_USER} ${MTDAAPD_GROUP} 0660
-
-OWN_DIRS_PERMS= ${VARBASE}/cache/mt-daapd \
- ${MTDAAPD_USER} ${MTDAAPD_GROUP} 0750
-
-SUBST_CLASSES+= conf
-SUBST_STAGE.conf= post-patch
-SUBST_FILES.conf= contrib/mt-daapd.conf
-SUBST_SED.conf= -e "s,@PREFIX@,${PREFIX},"
-SUBST_SED.conf+= -e "s,@VARBASE@,${VARBASE},g"
-SUBST_SED.conf+= -e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},"
-SUBST_SED.conf+= -e "s,@MTDAAPD_USER@,${MTDAAPD_USER},"
-
-SUBST_CLASSES+= paths
-SUBST_MESSAGE.paths= Fixing hardcoded paths.
-SUBST_STAGE.paths= post-patch
-SUBST_FILES.paths= src/main.c
-SUBST_SED.paths= -e "s,/etc,${PKG_SYSCONFDIR},"
-SUBST_SED.paths+= -e "s,/var,${VARBASE},"
-
-post-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/contrib/mt-daapd.conf ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/contrib/mt-daapd.playlist ${EGDIR}
-
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../databases/gdbm/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mt-daapd/PLIST b/audio/mt-daapd/PLIST
deleted file mode 100644
index dc7e724ceb5..00000000000
--- a/audio/mt-daapd/PLIST
+++ /dev/null
@@ -1,26 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/10/20 20:28:28 adrianp Exp $
-sbin/mt-daapd
-share/examples/mt-daapd/mt-daapd.conf
-share/examples/mt-daapd/mt-daapd.playlist
-share/examples/rc.d/mtdaapd
-share/mt-daapd/admin-root/aspl-license.html
-share/mt-daapd/admin-root/aspl-license.txt
-share/mt-daapd/admin-root/config-update.html
-share/mt-daapd/admin-root/config.html
-share/mt-daapd/admin-root/feedback.html
-share/mt-daapd/admin-root/ftr.html
-share/mt-daapd/admin-root/gpl-license.html
-share/mt-daapd/admin-root/gpl-license.txt
-share/mt-daapd/admin-root/hdr.html
-share/mt-daapd/admin-root/index.html
-share/mt-daapd/admin-root/linkOpaque.gif
-share/mt-daapd/admin-root/linkTransparent.gif
-share/mt-daapd/admin-root/mt-daapd.css
-share/mt-daapd/admin-root/mt-daapd.png
-share/mt-daapd/admin-root/required.gif
-share/mt-daapd/admin-root/status.html
-share/mt-daapd/admin-root/thanks.html
-@dirrm share/mt-daapd/admin-root
-@dirrm share/mt-daapd
-@exec ${MKDIR} %D/share/examples/mt-daapd
-@dirrm share/examples/mt-daapd
diff --git a/audio/mt-daapd/distinfo b/audio/mt-daapd/distinfo
deleted file mode 100644
index 71eec2e8e90..00000000000
--- a/audio/mt-daapd/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.3 2007/02/05 22:23:06 tron Exp $
-
-SHA1 (mt-daapd-0.2.4.tar.gz) = b8c242e5fd5d2d97010d5e09b9f02ccf9def13ab
-RMD160 (mt-daapd-0.2.4.tar.gz) = babb3f98a254aa4a014b5e7adb96276fafc84fac
-Size (mt-daapd-0.2.4.tar.gz) = 405168 bytes
-SHA1 (patch-aa) = e177bb33c19badb1da8638af61a3c3bfddf2a2ad
-SHA1 (patch-ab) = be78b7f5089d3283e0cb9ee3c64a4a53360899d7
-SHA1 (patch-ac) = 820fe55a2cefb7471133ea2e9bc7bb5ddc84cbf0
-SHA1 (patch-ad) = c556f5b3aa69779c30957e3e873563be2cb8ef32
diff --git a/audio/mt-daapd/files/mtdaapd.sh b/audio/mt-daapd/files/mtdaapd.sh
deleted file mode 100644
index 4cf618b1285..00000000000
--- a/audio/mt-daapd/files/mtdaapd.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: mtdaapd.sh,v 1.1.1.1 2006/10/20 20:28:28 adrianp Exp $
-#
-
-# PROVIDE: mtdaapd
-# REQUIRE: DAEMON LOGIN
-
-. /etc/rc.subr
-
-name="mtdaapd"
-rcvar=$name
-command="@PREFIX@/sbin/mt-daapd"
-required_files="@PKG_SYSCONFDIR@/mt-daapd.conf"
-command_args="</dev/null >/dev/null 2>&1 &"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/audio/mt-daapd/patches/patch-aa b/audio/mt-daapd/patches/patch-aa
deleted file mode 100644
index 0cdd9aa6d45..00000000000
--- a/audio/mt-daapd/patches/patch-aa
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/10/20 20:28:28 adrianp Exp $
-
---- contrib/mt-daapd.conf.orig 2004-12-29 06:20:26.000000000 +0000
-+++ contrib/mt-daapd.conf
-@@ -23,7 +23,7 @@
- # path is probably /usr/local/share/mt-daapd/admin-root.
- #
-
--web_root /usr/share/mt-daapd/admin-root
-+web_root @PREFIX@/share/mt-daapd/admin-root
-
- #
- # port (required)
-@@ -51,7 +51,7 @@ admin_pw mt-daapd
- # exists. If not, then YOU MUST CREATE THIS DIRECTORY!
- #
-
--db_dir /var/cache/mt-daapd
-+db_dir @VARBASE@/cache/mt-daapd
-
- #
- # mp3_dir (required)
-@@ -83,7 +83,7 @@ servername mt-daapd
- # as root or not.
- #
-
--runas nobody
-+runas @MTDAAPD_USER@
-
- #
- # playlist (optional)
-@@ -98,7 +98,7 @@ runas nobody
- # below.
- #
-
--playlist /etc/mt-daapd.playlist
-+playlist @PKG_SYSCONFDIR@/mt-daapd.playlist
-
- #
- # password (optional)
-@@ -136,7 +136,7 @@ extensions .mp3,.m4a,.m4p
- # will vary the amount of logging you get.
- #
-
--#logfile /var/log/mt-daapd.log
-+#logfile @VARBASE@/log/mt-daapd.log
-
- #
- # art_filename (optional)
diff --git a/audio/mt-daapd/patches/patch-ab b/audio/mt-daapd/patches/patch-ab
deleted file mode 100644
index 15264da6234..00000000000
--- a/audio/mt-daapd/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/12/06 16:41:26 joerg Exp $
-
---- src/mp3-scanner.c.orig 2006-12-06 16:35:37.000000000 +0000
-+++ src/mp3-scanner.c
-@@ -378,7 +378,7 @@ int scan_init(char *path) {
- */
- int scan_path(char *path) {
- DIR *current_dir;
-- char de[sizeof(struct dirent) + MAXNAMLEN + 1]; /* overcommit for solaris */
-+ char de[sizeof(struct dirent) + NAME_MAX + 1]; /* overcommit for solaris */
- struct dirent *pde;
- int err;
- char mp3_path[PATH_MAX];
diff --git a/audio/mt-daapd/patches/patch-ac b/audio/mt-daapd/patches/patch-ac
deleted file mode 100644
index 1712055aec0..00000000000
--- a/audio/mt-daapd/patches/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/12/06 16:41:26 joerg Exp $
-
---- configure.orig 2006-12-06 16:37:22.000000000 +0000
-+++ configure
-@@ -3236,13 +3236,13 @@ if test $ac_cv_lib_c_r_pthread_creat = y
- LDFLAGS="${LDFLAGS} -lc_r"
- else
-
-- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+ echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -3301,7 +3301,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
- echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
- if test $ac_cv_lib_pthread_pthread_create = yes; then
-- LDFLAGS="${LDFLAGS} -lpthread"
-+ LDFLAGS="${LDFLAGS} ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
- fi
-
- fi
diff --git a/audio/mt-daapd/patches/patch-ad b/audio/mt-daapd/patches/patch-ad
deleted file mode 100644
index b21c03d1020..00000000000
--- a/audio/mt-daapd/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/02/05 22:23:06 tron Exp $
-
---- src/mDNSUNP.c.orig 2005-09-11 20:13:48.000000000 +0100
-+++ src/mDNSUNP.c 2007-02-05 22:16:56.000000000 +0000
-@@ -168,7 +168,7 @@
- * have the apple mDNS included, I guess it's a
- * small price to pay.
- */
--#ifdef FREEBSD
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- ptr += sizeof(ifr->ifr_name) + len; /* for next one in buffer */
- // ptr += sizeof(*ifr);
- #else
diff --git a/audio/muse/DESCR b/audio/muse/DESCR
deleted file mode 100644
index f584cbdd469..00000000000
--- a/audio/muse/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-MuSE is an application for the mixing, encoding, and network streaming of
-sound. MuSE can simultaneously mix up to 6 encoded audio bitstreams (from
-files or network) plus a soundcard input signal. The resulting stream can
-be played locally on the sound card and/or encoded as an mp3 bitstream sent
-to a broadcast server. MuSE offers an intuitive interface to be operated
-realtime and can run in "slick" mode from command line.
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
deleted file mode 100644
index ccc1ff581f6..00000000000
--- a/audio/muse/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.22 2007/01/07 12:25:52 wiz Exp $
-#
-
-DISTNAME= MuSE-0.9
-PKGNAME= ${DISTNAME:S/MuSE/muse/}
-PKGREVISION= 7
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.dyne.org/muse/releases/ \
- http://www.ljudmila.org/~jaromil/muse/releases/ \
- ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://muse.dyne.org/
-COMMENT= Multiple Streaming Engine
-
-GNU_CONFIGURE= yes
-USE_LANGUAGES= c c++
-USE_TOOLS+= gmake pkg-config msgfmt
-USE_PKGLOCALEDIR= yes
-
-CONFIGURE_ARGS+= --disable-ncurses
-CONFIGURE_ARGS+= --disable-lubrify
-CONFIGURE_ARGS+= --enable-gtk2
-LIBS+= ${LIBOSSAUDIO}
-MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
-MAKE_FLAGS+= docsdir=${PREFIX:Q}/share/doc/MuSE
-
-SUBST_CLASSES+= dsp
-SUBST_STAGE.dsp= post-patch
-SUBST_FILES.dsp= src/jmixer.cpp src/libmpeg/fileplayer.cc
-SUBST_SED.dsp= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
-SUBST_MESSAGE.dsp= Fixing hardcoded audio device.
-
-.include "../../audio/lame/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/libsndfile/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/muse/PLIST b/audio/muse/PLIST
deleted file mode 100644
index 77c796268a0..00000000000
--- a/audio/muse/PLIST
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2006/04/17 07:07:12 jlam Exp $
-bin/muse
-man/man1/muse.1
-share/doc/MuSE/AUTHORS
-share/doc/MuSE/COPYING
-share/doc/MuSE/ChangeLog
-share/doc/MuSE/KNOWN-BUGS
-share/doc/MuSE/NEWS
-share/doc/MuSE/README
-share/doc/MuSE/TODO
-share/doc/MuSE/USAGE
-share/locale/es/LC_MESSAGES/muse.mo
-share/locale/it/LC_MESSAGES/muse.mo
-@dirrm share/doc/MuSE
diff --git a/audio/muse/distinfo b/audio/muse/distinfo
deleted file mode 100644
index aa5318c912d..00000000000
--- a/audio/muse/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.6 2006/10/23 23:48:45 rillig Exp $
-
-SHA1 (MuSE-0.9.tar.gz) = c73dfe6cf5a8da3430864a76d0bc8d9f2cb7d118
-RMD160 (MuSE-0.9.tar.gz) = 53eb653a0488ae3a5ef9486d8b2a9006fdba619d
-Size (MuSE-0.9.tar.gz) = 1363091 bytes
-SHA1 (patch-aa) = a30a5f2a76081b188c2859d5b77185a26e95fc7e
-SHA1 (patch-ab) = 26d87f65078e45aec187ed4436b5ffce289247b3
-SHA1 (patch-ac) = fcf1efbbd99d70e055c903c41431a1630ca381fa
-SHA1 (patch-ad) = 5f2322a1c9c3c9ee4e4dbe3aa810c0f2c5d999fd
-SHA1 (patch-ae) = 1097b09eb842fe1d90ec28913ad511e515f55a8a
-SHA1 (patch-af) = 20b68a9758ec109b3dec37b5898076a0cff5bfcc
-SHA1 (patch-ag) = 65515e3a2e8947a1ac1b01e5585a1ca04513bd70
diff --git a/audio/muse/patches/patch-aa b/audio/muse/patches/patch-aa
deleted file mode 100644
index f74a9384229..00000000000
--- a/audio/muse/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/05/02 22:59:16 xtraeme Exp $
-
---- src/shout/sock.h.orig 2004-04-30 01:49:50.000000000 +0200
-+++ src/shout/sock.h 2004-04-30 01:50:10.000000000 +0200
-@@ -31,7 +31,7 @@
- #include <unistd.h>
- #endif
-
--#ifdef HAVE_SYS_UIO_H
-+#if defined(HAVE_SYS_UIO_H) || defined(__NetBSD__)
- #include <sys/uio.h>
- #else
- #ifndef _SYS_UIO_H
diff --git a/audio/muse/patches/patch-ab b/audio/muse/patches/patch-ab
deleted file mode 100644
index 9e7e15df92f..00000000000
--- a/audio/muse/patches/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/12/11 23:44:40 joerg Exp $
-
---- src/jmixer.cpp.orig 2004-04-09 17:50:43.000000000 +0000
-+++ src/jmixer.cpp
-@@ -98,7 +98,7 @@ Stream_mixer::Stream_mixer() {
- error("error initializing POSIX thread mutex");
- if(pthread_cond_init (&_cond, NULL) == -1)
- error("error initializing POSIX thread condtition");
-- unlock();
-+ //unlock();
- }
-
- Stream_mixer::~Stream_mixer() {
-@@ -627,7 +627,11 @@ bool Stream_mixer::set_playmode(int ch,
- /* this is the function selecting files for the scandir
- on freebsd systems you should change the following line to:
- int selector(struct dirent *dir) { */
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
-+int selector(struct dirent *dir) {
-+#else
- int selector(const struct dirent *dir) {
-+#endif
- if( strncasecmp(dir->d_name+strlen(dir->d_name)-4,".mp3",4)==0
- #ifdef HAVE_VORBIS
- || strncasecmp(dir->d_name+strlen(dir->d_name)-4,".ogg",4)==0
diff --git a/audio/muse/patches/patch-ac b/audio/muse/patches/patch-ac
deleted file mode 100644
index a46422ceb63..00000000000
--- a/audio/muse/patches/patch-ac
+++ /dev/null
@@ -1,136 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/12/11 23:44:40 joerg Exp $
-
---- src/pipe.cpp.orig 2003-12-08 12:20:33.000000000 +0000
-+++ src/pipe.cpp
-@@ -26,6 +26,7 @@ Boston, MA 02111-1307, USA.
-
- #include <iostream>
- #include <stdlib.h>
-+#include <errno.h>
- #include <audioproc.h>
- #include <pipe.h>
- #include <jutils.h>
-@@ -61,7 +62,7 @@ Pipe::Pipe(int size) {
- end=start=buffer;
- blocking = true;
- _thread_init();
-- unlock();
-+ //unlock();
- }
-
- Pipe::~Pipe() {
-@@ -118,9 +119,9 @@ int Pipe::read_float_intl(int samples, f
- }
- /* --- */
-
-- (char*)start += currentBlockSize;
-+ start = (char*)start + currentBlockSize;
- len -= currentBlockSize;
-- (char*)pp += currentBlockSize;
-+ pp = (float *)((char*)pp + currentBlockSize);
- length -= currentBlockSize;
- if ((end!=buffer) && (start==bufferEnd))
- start = buffer;
-@@ -146,8 +147,8 @@ int Pipe::read_float_intl(int samples, f
- }
- /* --- */
-
-- (char*)pp += len;
-- (char*)start += len;
-+ pp = (float *)((char*)pp + len);
-+ start = (char*)start + len;
- length -= len;
- if ((end!=buffer) && (start==bufferEnd))
- start = buffer;
-@@ -224,9 +225,9 @@ int Pipe::read_float_bidi(int samples, f
- }
- /* --- */
-
-- (char*)start += currentBlockSize;
-+ start = (char*)start + currentBlockSize;
- len -= currentBlockSize;
-- (char*)pp += currentBlockSize;
-+ pp = (float **)((char*)pp + currentBlockSize);
- length -= currentBlockSize;
- if ((end!=buffer) && (start==bufferEnd))
- start = buffer;
-@@ -253,8 +254,8 @@ int Pipe::read_float_bidi(int samples, f
- }
- /* --- */
-
-- (char*)pp += len;
-- (char*)start += len;
-+ pp = (float **)((char*)pp + len);
-+ start = (char*)start + len;
- length -= len;
- if ((end!=buffer) && (start==bufferEnd))
- start = buffer;
-@@ -309,9 +310,9 @@ int Pipe::mix16stereo(int samples, int32
- pp[c] += (int32_t) ((IN_DATATYPE*)start)[c];
- /* --- */
-
-- (char*)start += currentBlockSize;
-+ start = (char*)start + currentBlockSize;
- len -= currentBlockSize;
-- (char*)pp += currentBlockSize;
-+ pp = (int32_t *)((char*)pp + currentBlockSize);
- length -= currentBlockSize;
- if ((end!=buffer) && (start==bufferEnd))
- start = buffer;
-@@ -324,8 +325,8 @@ int Pipe::mix16stereo(int samples, int32
- pp[c] += (int) ((IN_DATATYPE*)start)[c];
- /* --- */
-
-- (char*)pp += len;
-- (char*)start += len;
-+ pp = (int32_t *)((char*)pp + len);
-+ start = (char*)start + len;
- length -= len;
- if ((end!=buffer) && (start==bufferEnd))
- start = buffer;
-@@ -372,17 +373,17 @@ int Pipe::read(int length, void *data) {
- /* fill */
- memcpy(data, start, currentBlockSize);
-
-- (char*)start += currentBlockSize;
-+ start = (char*)start + currentBlockSize;
- len -= currentBlockSize;
-- (char*)data += currentBlockSize;
-+ data = (char*)data + currentBlockSize;
- length -= currentBlockSize;
- if ((end!=buffer) && (start==bufferEnd))
- start = buffer;
-
- if (len) { /* short circuit */
- memcpy(data, start, len);
-- (char*)data += len;
-- (char*)start += len;
-+ data = (char*)data + len;
-+ start = (char*)start + len;
- length -= len;
- if ((end!=buffer) && (start==bufferEnd))
- start = buffer;
-@@ -418,19 +419,19 @@ int Pipe::write(int length, void *data)
- currentBlockSize=MIN(currentBlockSize, len);
- ::memcpy(end, data, currentBlockSize);
-
-- (char*)end += currentBlockSize;
-+ end = (char*)end + currentBlockSize;
-
- len -= currentBlockSize;
-
-- (char*)data += currentBlockSize;
-+ data = (char*)data + currentBlockSize;
- length -= currentBlockSize;
- if ((start!=buffer) && (end==bufferEnd))
- end = buffer;
-
- if (len) { // short circuit
- ::memcpy(end, data, len);
-- (char*)data += len;
-- (char*)end += len;
-+ data = (char*)data + len;
-+ end = (char*)end + len;
- length -= len;
-
- if ((start!=buffer) && (end==bufferEnd))
diff --git a/audio/muse/patches/patch-ad b/audio/muse/patches/patch-ad
deleted file mode 100644
index d928e1ec9de..00000000000
--- a/audio/muse/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/05/02 22:59:16 xtraeme Exp $
-
---- src/gtkgui2/gtk2_gui.cpp.orig 2004-05-03 00:51:21.000000000 +0200
-+++ src/gtkgui2/gtk2_gui.cpp 2004-05-03 00:51:33.000000000 +0200
-@@ -47,6 +47,7 @@
- _mix->quit = true;
- } else {
- int i;
-+ lock();
- wait();
-
- /* update channels */
diff --git a/audio/muse/patches/patch-ae b/audio/muse/patches/patch-ae
deleted file mode 100644
index 322073a3afc..00000000000
--- a/audio/muse/patches/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/05/09 17:27:53 minskim Exp $
-
---- po/Makefile.orig 2004-04-14 17:52:44.000000000 -0500
-+++ po/Makefile
-@@ -1,5 +1,5 @@
- INSTALL= /usr/bin/install -c
--INSTALLNLSDIR=$(BASEDIR)/usr/local/share/locale
-+INSTALLNLSDIR=$(BASEDIR)${PREFIX}/${PKGLOCALEDIR}/locale
-
- PACKAGE = muse
-
diff --git a/audio/muse/patches/patch-af b/audio/muse/patches/patch-af
deleted file mode 100644
index d6efad56c2a..00000000000
--- a/audio/muse/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/12/11 23:44:40 joerg Exp $
-
---- src/Makefile.in.orig 2005-12-11 23:32:28.000000000 +0000
-+++ src/Makefile.in
-@@ -207,7 +207,7 @@ muse_DEPENDENCIES = @GUI_DEPS@ resample/
- muse_LDADD = \
- $(top_srcdir)/src/resample/libresample.a \
- $(top_srcdir)/src/libmpeg/libmpeg.a \
-- -lpthread \
-+ ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} \
- @LIBSHOUT_LIB@ \
- @M_LIBS@ \
- @LAME_LIBS@ \
diff --git a/audio/muse/patches/patch-ag b/audio/muse/patches/patch-ag
deleted file mode 100644
index ba6a52633fe..00000000000
--- a/audio/muse/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/10/23 23:48:45 rillig Exp $
-
---- utils/rami.orig 2003-12-08 13:20:33.000000000 +0100
-+++ utils/rami 2006-10-24 01:45:59.000000000 +0200
-@@ -66,8 +66,7 @@ FORMAT=$DEFAULT_FORMAT
- RATE=22050
- QUALITY=3
- CHANNELS=2
--VUMETER="`which vumeter 2> /dev/null`"
--if [ $? == 1 ]; then VUMETER=""; fi
-+VUMETER="`which vumeter 2> /dev/null`" || VUMETER=""
-
-
- OPTS=`getopt -o hvQr:f:q:c:o:e: --long help,version,quiet,rate:,format:,quality:,channels:,output:,effect: \
diff --git a/audio/musicbox/DESCR b/audio/musicbox/DESCR
deleted file mode 100644
index 4d8b3ca0a9f..00000000000
--- a/audio/musicbox/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Music Box is a GUI under X-window. It invokes mpg123 to play mp3 files.
-Music Box is a freeware. Please remain the original ANNOUNCEMENT when you
-distribute it. This program was developed under FreeBSD. If you have any
-problem and suggestion, mail to mills@iim.nctu.edu.tw
diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile
deleted file mode 100644
index 559224d6cae..00000000000
--- a/audio/musicbox/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2006/10/04 20:44:19 wiz Exp $
-
-DISTNAME= musicbox-1.01p2
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= rxg@NetBSD.org
-COMMENT= X11 front-interface for mpg123
-
-DEPENDS+= mpg123>=0.59.18:../../audio/mpg123
-
-USE_LANGUAGES= c++
-
-WRKSRC= ${WRKDIR}/musicbox-1.01
-CFLAGS+= -D${OPSYS}
-MAKE_ENV+= QT1DIR=${QT1DIR:Q}
-
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/musicbox ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/musicbox
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/musicbox/README
-
-.include "../../x11/qt1/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/musicbox/PLIST b/audio/musicbox/PLIST
deleted file mode 100644
index 03be590ce50..00000000000
--- a/audio/musicbox/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:33 zuntum Exp $
-bin/musicbox
-share/doc/musicbox/README
-@dirrm share/doc/musicbox
diff --git a/audio/musicbox/distinfo b/audio/musicbox/distinfo
deleted file mode 100644
index f9c6e6f1e5d..00000000000
--- a/audio/musicbox/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.9 2005/12/12 15:03:45 joerg Exp $
-
-SHA1 (musicbox-1.01p2.tgz) = 7dd8b192349783746918b0d3074bec11f3aaf9d8
-RMD160 (musicbox-1.01p2.tgz) = d203bc9ef749ad425785ce5bf667fc204dccdebd
-Size (musicbox-1.01p2.tgz) = 44119 bytes
-SHA1 (patch-aa) = f1d397ac8e83a8fd9a2da17a088c545cff1b458a
-SHA1 (patch-ab) = 7ec8774288810e824d65a910bb2794c107b5eff7
-SHA1 (patch-ac) = 3341b7bb5f265f5df000e3593a2a0493d32edec1
-SHA1 (patch-ad) = 890faa63701b85766320cf654d1d858c03227a41
-SHA1 (patch-ae) = c8c6c17dad38c705eba931f11cbbb1a515def9f0
-SHA1 (patch-af) = 70626b572bbd26e668df4d6bfe3ac05c59277328
-SHA1 (patch-ag) = 9c0ae398487111920f74a5db219f26b67658ae61
-SHA1 (patch-ah) = 0dc0f917f47379bc2d273d1604fde3376ce75989
-SHA1 (patch-ai) = c3939613576c93c011976be4d80ed76c74c56151
diff --git a/audio/musicbox/patches/patch-aa b/audio/musicbox/patches/patch-aa
deleted file mode 100644
index 3a84af5f812..00000000000
--- a/audio/musicbox/patches/patch-aa
+++ /dev/null
@@ -1,115 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2005/12/12 15:03:45 joerg Exp $
-
---- Makefile.orig 1997-11-12 20:01:58.000000000 +0100
-+++ Makefile
-@@ -1,15 +1,19 @@
- # change following for your environment
--INC = /usr/X11R6/include/X11/qt
--LIB = /usr/X11R6/lib
--MOC = moc
-+#INC = /usr/X11R6/include/X11/qt
-+INC = -I${X11BASE}/include -I${QT1DIR}/include
-+LIB = -L${QT1DIR}/lib -Wl,-R${QT1DIR}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
-+MOC = ${QT1DIR}/bin/moc
-
- # if you use freebsd
--CFLAGS = -DFreeBSD
-+#CFLAGS = -DFreeBSD
-
- #if you use linux
- #CFLAGS = -DLinux
-
--GCC = gcc
-+# if you use netbsd
-+#CFLAGS = -DNetBSD
-+
-+GCC = ${CXX}
-
- ALL = mplayer.o player.o ListView.o clock.o mclock.o mListView.o \
- filebrowse.o mfilebrowse.o qktstreelist.o mqktstreelist.o \
-@@ -18,69 +22,69 @@ ALL = mplayer.o player.o ListView.o cloc
- PKG = musicbox
-
- all: ${ALL}
-- ${GCC} ${ALL} -o ${PKG} -L${LIB} -I${INC} -lqt
-+ ${GCC} ${ALL} -o ${PKG} ${LIB} -lqt -lX11 -lXext ${LIBOSSAUDIO}
-
--player.o:
-- ${GCC} -c player.cpp -o player.o ${CFLAGS} -L${LIB} -I${INC}
-+player.o: player.cpp
-+ ${GCC} -c player.cpp -o player.o ${CFLAGS} ${INC}
-
- mplayer.o: mplayer.cpp
-- ${GCC} -c mplayer.cpp -o mplayer.o ${CFLAGS} -L${LIB} -I${INC}
-+ ${GCC} -c mplayer.cpp -o mplayer.o ${CFLAGS} ${INC}
-
- mplayer.cpp:
- ${MOC} player.h -o mplayer.cpp
-
- ListView.o:
-- ${GCC} -c ListView.cpp -o ListView.o ${CFLAGS} -L${LIB} -I${INC}
-+ ${GCC} -c ListView.cpp -o ListView.o ${CFLAGS} ${INC}
-
- mListView.o: mListView.cpp
-- ${GCC} -c mListView.cpp -o mListView.o ${CFLAGS} -L${LIB} -I${INC}
-+ ${GCC} -c mListView.cpp -o mListView.o ${CFLAGS} ${INC}
-
- mListView.cpp:
- ${MOC} ListView.h -o mListView.cpp
- clock.o:
-- ${GCC} -c clock.cpp -o clock.o -L${LIB} -I${INC}
-+ ${GCC} -c clock.cpp -o clock.o ${INC}
-
- mclock.cpp:
- ${MOC} clock.h -o mclock.cpp
-
- mclock.o: mclock.cpp
-- ${GCC} -c mclock.cpp -o mclock.o -L${LIB} -I${INC}
-+ ${GCC} -c mclock.cpp -o mclock.o ${INC}
-
- mfilebrowse.cpp:
- ${MOC} filebrowse.h -o mfilebrowse.cpp
-
- filebrowse.o :
-- ${GCC} -c filebrowse.cpp -o filebrowse.o -L${LIB} -I${INC}
-+ ${GCC} -c filebrowse.cpp -o filebrowse.o ${INC}
-
- mfilebrowse.o: mfilebrowse.cpp
-- ${GCC} -c mfilebrowse.cpp -o mfilebrowse.o -L${LIB} -I${INC}
-+ ${GCC} -c mfilebrowse.cpp -o mfilebrowse.o ${INC}
-
- diskbrowse.o:
-- ${GCC} -c diskbrowse.cpp -o $@ -L${LIB} -I${INC}
-+ ${GCC} -c diskbrowse.cpp -o $@ ${INC}
-
- mdiskbrowse.o: mdiskbrowse.cpp
-- ${GCC} -c mdiskbrowse.cpp -o $@ -L${LIB} -I${INC}
-+ ${GCC} -c mdiskbrowse.cpp -o $@ ${INC}
-
- mdiskbrowse.cpp:
- ${MOC} diskbrowse.h -o $@
-
- qktstreelist.o:
-- ${GCC} -c qktstreelist.cpp -o $@ -L${LIB} -I${INC}
-+ ${GCC} -c qktstreelist.cpp -o $@ ${INC}
-
- mqktstreelist.o: mqktstreelist.cpp
-- ${GCC} -c mqktstreelist.cpp -o $@ -L${LIB} -I${INC}
-+ ${GCC} -c mqktstreelist.cpp -o $@ ${INC}
-
- mqktstreelist.cpp:
- ${MOC} qktstreelist.h -o $@
-
- MultiListBox.o:
-- ${GCC} -c MultiListBox.cpp -o $@ -L${LIB} -I${INC}
-+ ${GCC} -c MultiListBox.cpp -o $@ ${INC}
-
- mMultiListBox.cpp:
- ${MOC} MultiListBox.h -o $@
-
- mMultiListBox.o: mMultiListBox.cpp
-- ${GCC} -c mMultiListBox.cpp -o $@ -L${LIB} -I${INC}
-+ ${GCC} -c mMultiListBox.cpp -o $@ ${INC}
-
- clean:
- rm -f player mplayer.cpp *.o mclock.cpp mListView.cpp mfilebrowse.cpp \
diff --git a/audio/musicbox/patches/patch-ab b/audio/musicbox/patches/patch-ab
deleted file mode 100644
index 4edb1ac38f0..00000000000
--- a/audio/musicbox/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/12/12 15:03:45 joerg Exp $
-
---- ListView.h.orig 1997-11-16 13:56:31.000000000 +0000
-+++ ListView.h
-@@ -12,12 +12,16 @@
- #include <qdialog.h>
- #include "MultiListBox.h"
-
--#ifdef FreeBSD
-+#if defined(FreeBSD) || defined(__DragonFly__)
- #include <machine/soundcard.h>
- #endif
- #ifdef Linux
- #include <sys/soundcard.h>
- #endif
-+#ifdef NetBSD
-+#include <sys/ioctl.h>
-+#include <soundcard.h>
-+#endif
-
- #define DEVICE 0
- #define MIXER "/dev/mixer"
diff --git a/audio/musicbox/patches/patch-ac b/audio/musicbox/patches/patch-ac
deleted file mode 100644
index 145d5f96177..00000000000
--- a/audio/musicbox/patches/patch-ac
+++ /dev/null
@@ -1,148 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/01/02 11:30:03 jmmv Exp $
-
---- player.cpp.orig 1998-10-01 10:00:23.000000000 +0200
-+++ player.cpp
-@@ -72,7 +72,7 @@ PlayerWidget::PlayerWidget( QWidget *par
- options = new QPopupMenu;
- AutoPlayID = options->insertItem( "&Auto Play", this, SLOT(AutoPlay()) );
- options->setItemChecked( AutoPlayID, isAutoPlay );
-- RepeatID = options->insertItem( "Re&peat", this, SLOT(RepeatPlay()) );
-+ RepeatID = options->insertItem( "&Repeat", this, SLOT(RepeatPlay()) );
- options->setCheckable(TRUE);
- menubar->insertItem( "&Options",options );
- menubar->insertSeparator();
-@@ -150,7 +150,7 @@ PlayerWidget::PlayerWidget( QWidget *par
-
- QLabel *label;
- label = new QLabel( this );
-- label->setText("ºq¬P:");
-+ label->setText("Artist:");
- label->setGeometry(5,133,125,30);
-
- edtName = new QLabel( this );
-@@ -158,7 +158,7 @@ PlayerWidget::PlayerWidget( QWidget *par
- edtName->setGeometry(83,136,100,25);
-
- label = new QLabel( this );
-- label->setText("±M¿è¦WºÙ:");
-+ label->setText("Album:");
- label->setGeometry(5,173,125,30);
-
- edtAlbum = new QLabel( this );
-@@ -166,7 +166,7 @@ PlayerWidget::PlayerWidget( QWidget *par
- edtAlbum->setGeometry(83,176,100,25);
-
- label = new QLabel( this );
-- label->setText("µo¦æ¤½¥q:");
-+ label->setText("Company:");
- label->setGeometry(5,213,125,30);
-
- edtPub = new QLabel( this );
-@@ -242,15 +242,13 @@ void PlayerWidget::GoPlay()
- song->setText(SongBox->text(SongBox->currentItem()));
- dclock->Start(SongBox->currentItem());
- if ((mp3_pid = fork()) == 0 ){
-- char **argv;
-- int i;
-- argv[0]=MP3_PLAYER;
-- argv[1]="-q";
-- argv[2]=(char *)LocBox->text(SongBox->currentItem());
-- argv[3]=NULL;
-- execvp(MP3_PLAYER,argv);
-+ execlp(MP3_PLAYER,
-+ MP3_PLAYER,
-+ "-q",
-+ (char *)LocBox->text(SongBox->currentItem()),
-+ NULL);
- QMessageBox::warning(this,"error","can't exec mpg123\n");
-- exit(1);
-+ _exit(1);
- }
- }
- }
-@@ -359,46 +357,45 @@ void PlayerWidget::OpenFiles()
-
- void PlayerWidget::Usage()
- {
-- char help_txt[] = "
--1. Menu:\n
--1.1 File\n
-- New Album
-- Create an new Album for playing later.
-- Open Files
-- Select some mp3 files you like, and play them
-- in sequence.
-- Save
-- Save all album in the right frame to file.
-- Quit
-- Quit MusicBox.\n
--1.2 View\n
-- Small Panel
-- view controls only.
-- Normal Panel
-- view controls and song list.
-- Completed Panel
-- view all frames.\n
--1.3 Options\n
-- Auto Play
-- Auto Play songs after choosing an album or files.
-- Repeat
-- Rewind, and play them again.\n
--1.4 Help\n
-- Some information about music box\n
--2. Albums:\n
-- Album is a set of songs, you can add name of song to
-- relative file, and singer, album name, and publisher.
-- Make it more readable.\n
-- You can choose an icon to represent an album.GIF,
-- XPM,BMP is supported, The size 48x48 is prefered.\n
-- If you want to edit album information, click mouse
-- right-button and click edit.\n
--3. Usage:\n
-- You can choose files to play or play album.\n
--*Important*\n
-- \"mpg123\" package must be installed first before using
-- MusicBox.
--";
-+ char help_txt[] =
-+"1. Menu:\n\n"
-+"1.1 File\n\n"
-+" New Album\n"
-+" Create an new Album for playing later.\n"
-+" Open Files\n"
-+" Select some mp3 files you like, and play them\n"
-+" in sequence.\n"
-+" Save\n"
-+" Save all album in the right frame to file.\n"
-+" Quit\n"
-+" Quit MusicBox.\n\n"
-+"1.2 View\n\n"
-+" Small Panel\n"
-+" view controls only.\n"
-+" Normal Panel\n"
-+" view controls and song list.\n"
-+" Completed Panel\n"
-+" view all frames.\n\n"
-+"1.3 Options\n\n"
-+" Auto Play\n"
-+" Auto Play songs after choosing an album or files.\n"
-+" Repeat\n"
-+" Rewind, and play them again.\n\n"
-+"1.4 Help\n\n"
-+" Some information about music box\n\n"
-+"2. Albums:\n\n"
-+" Album is a set of songs, you can add name of song to\n"
-+" relative file, and singer, album name, and publisher.\n"
-+" Make it more readable.\n\n"
-+" You can choose an icon to represent an album.GIF,\n"
-+" XPM,BMP is supported, The size 48x48 is prefered.\n\n"
-+" If you want to edit album information, click mouse\n"
-+" right-button and click edit.\n\n"
-+"3. Usage:\n\n"
-+" You can choose files to play or play album.\n\n"
-+"*Important*\n\n"
-+" \"mpg123\" package must be installed first before using\n"
-+" MusicBox.\n";
-
- help = new QWidget (0,"help");
- QVBoxLayout *toplayout = new QVBoxLayout(help,5);
diff --git a/audio/musicbox/patches/patch-ad b/audio/musicbox/patches/patch-ad
deleted file mode 100644
index 155edb45a97..00000000000
--- a/audio/musicbox/patches/patch-ad
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2004/01/02 11:30:03 jmmv Exp $
-
---- ListView.cpp.orig 1997-11-16 14:58:42.000000000 +0100
-+++ ListView.cpp
-@@ -67,7 +67,7 @@ AlbumItem& AlbumItem::operator=(const Al
- return *this;
- }
-
--AlbumListBox::AlbumListBox(QWidget* parent=0, const char* name=0)
-+AlbumListBox::AlbumListBox(QWidget* parent, const char* name)
- :MultiListBox(parent,(char *)name)
- {
- ptr.setAutoDelete(TRUE);
-@@ -365,7 +365,7 @@ int Mixer::Set(int l)
- return(1);
- }
-
--AlbumInfoView::AlbumInfoView(AlbumItem *item,int i,QWidget *parent=0)
-+AlbumInfoView::AlbumInfoView(AlbumItem *item,int i,QWidget *parent)
- :QDialog(parent,"Info",TRUE)
- {
- QLabel *lbl;
-@@ -383,11 +383,11 @@ AlbumInfoView::AlbumInfoView(AlbumItem *
- if (item != NULL)
- temp = item;
-
-- lbl = new QLabel("ºq¬P:",this);
-+ lbl = new QLabel("Artist:",this);
- topLayout->addWidget(lbl,0,0);
-- lbl = new QLabel("±M¿è¦WºÙ:",this);
-+ lbl = new QLabel("Album:",this);
- topLayout->addWidget(lbl,1,0);
-- lbl = new QLabel("µo¦æ¤½¥q:",this);
-+ lbl = new QLabel("Company:",this);
- topLayout->addWidget(lbl,2,0);
-
- Title = new QLabel(this);
-@@ -412,7 +412,7 @@ AlbumInfoView::AlbumInfoView(AlbumItem *
- connect(btn,SIGNAL(clicked()),this,SLOT(RemoveSong()));
- topLayout->addWidget(btn,4,1);
-
-- lbl = new QLabel("ºq¦±¦WºÙ:",this);
-+ lbl = new QLabel("Title:",this);
- topLayout->addWidget(lbl,4,2);
-
- edtSinger = new QLineEdit(this);
diff --git a/audio/musicbox/patches/patch-ae b/audio/musicbox/patches/patch-ae
deleted file mode 100644
index d3ffcfef087..00000000000
--- a/audio/musicbox/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/06/08 23:07:11 tron Exp $
-
---- qktstreelist.cpp.orig Mon Nov 10 18:10:02 1997
-+++ qktstreelist.cpp Wed Jun 9 00:15:13 1999
-@@ -834,7 +834,7 @@
- QktsItemSearchInfo searchInfo;
- searchInfo.index = index;
- searchInfo.count = -1;
-- forEveryVisibleItem(QktsTreeList::findItemAt, &searchInfo);
-+ forEveryVisibleItem(&QktsTreeList::findItemAt, &searchInfo);
- return searchInfo.foundItem;
- }
-
-@@ -1340,7 +1340,7 @@
- QktsTreeListItem *item = treeRoot->getChild();
- do {
- while(item) {
-- if((func)(item, user)) return;
-+ if((this->*func)(item, user)) return;
- if(item->hasChild() && item->isExpanded()) {
- stack.push(item);
- item = item->getChild();
diff --git a/audio/musicbox/patches/patch-af b/audio/musicbox/patches/patch-af
deleted file mode 100644
index 531fbd5a5cd..00000000000
--- a/audio/musicbox/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/10/15 06:59:05 tron Exp $
-
---- MultiListBox.h.orig Wed Nov 12 19:57:00 1997
-+++ MultiListBox.h Mon Oct 15 08:57:34 2001
-@@ -16,7 +16,7 @@
- Pic = i->Pic;
- Text = i->Text;
- }
-- setPixmap(QPixmap& p) {Pic = p;}
-+ void setPixmap(QPixmap& p) {Pic = p;}
- int Width(MultiListBox *box);
- int Height(MultiListBox *box,int max_w);
- void Paint(QPainter *p,int w,int h,int flag=0);
diff --git a/audio/musicbox/patches/patch-ag b/audio/musicbox/patches/patch-ag
deleted file mode 100644
index 027fa224468..00000000000
--- a/audio/musicbox/patches/patch-ag
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2004/01/02 11:30:03 jmmv Exp $
-
---- filebrowse.cpp.orig 1998-10-01 09:51:07.000000000 +0200
-+++ filebrowse.cpp
-@@ -5,7 +5,7 @@
- #include <qtooltip.h>
- #include "filebrowse.h"
-
--FileBrowseView::FileBrowseView(QWidget *parent=0,char *filter="*.mp3",char *name=0)
-+FileBrowseView::FileBrowseView(QWidget *parent,char *filter,char *name)
- :QDialog(parent,"browse",TRUE)
- {
- setCaption("Browse Files");
-@@ -99,12 +99,12 @@ QStrList FileBrowseView::GetSongList()
- return NULL;
- }
-
--MyOpenFile::MyOpenFile(QWidget *parent=0,char *name=0)
-+MyOpenFile::MyOpenFile(QWidget *parent,char *name)
- :QDialog(parent,"open",TRUE)
- {
- }
-
--QString MyOpenFile::getOpenFileName(QWidget *parent=0,char *filter="*.*")
-+QString MyOpenFile::getOpenFileName(QWidget *parent,char *filter)
- {
- QDialog *dg = new QDialog(parent,"open",TRUE);
- dg->setCaption("Open File");
diff --git a/audio/musicbox/patches/patch-ah b/audio/musicbox/patches/patch-ah
deleted file mode 100644
index 00addae00a9..00000000000
--- a/audio/musicbox/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2004/01/02 11:30:03 jmmv Exp $
-
---- diskbrowse.cpp.orig 1998-08-15 17:31:22.000000000 +0200
-+++ diskbrowse.cpp
-@@ -2,7 +2,7 @@
- #include "diskbrowse.res"
-
- DiskBrowser::DiskBrowser(QWidget *parent,
-- const char *filter="*",
-+ const char *filter,
- const char *name,
- WFlags f) :
- QWidget(parent, name, f)
diff --git a/audio/musicbox/patches/patch-ai b/audio/musicbox/patches/patch-ai
deleted file mode 100644
index 38efdb29179..00000000000
--- a/audio/musicbox/patches/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2004/01/02 11:30:03 jmmv Exp $
-
---- MultiListBox.cpp.orig 1997-11-14 06:15:56.000000000 +0100
-+++ MultiListBox.cpp
-@@ -6,7 +6,7 @@
- // MultiListBox Implement
- // written by mills
-
--MultiListBox::MultiListBox(QWidget *parent=0,char *name=0,int numCols=4)
-+MultiListBox::MultiListBox(QWidget *parent,char *name,int numCols)
- :QTableView(parent,name)
- {
- ItemList.setAutoDelete(TRUE);
-@@ -230,7 +230,7 @@ int MultiListBoxItem::Height(MultiListBo
- return result + 20 ;
- }
-
--void MultiListBoxItem::Paint(QPainter *p, int max_w, int max_h,int flag=0)
-+void MultiListBoxItem::Paint(QPainter *p, int max_w, int max_h,int flag)
- {
- int base_h = Pic.height();
- int pos_x,pos_y;
diff --git a/audio/musicbrainz/DESCR b/audio/musicbrainz/DESCR
deleted file mode 100644
index 797cc314b3e..00000000000
--- a/audio/musicbrainz/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-MusicBrainz is the second generation incarnation of the CD Index.
-This server is designed to enable Audio CD and MP3/Vorbis players
-to download metadata about the music they are playing. All of the
-data collected on the Musicbrainz server is made available to the
-public under the OpenContent license.
diff --git a/audio/musicbrainz/Makefile b/audio/musicbrainz/Makefile
deleted file mode 100644
index 72bf47d041f..00000000000
--- a/audio/musicbrainz/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2006/08/30 10:44:46 tron Exp $
-
-DISTNAME= libmusicbrainz-2.1.4
-PKGNAME= ${DISTNAME:S/lib//}
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.musicbrainz.org/pub/musicbrainz/
-
-MAINTAINER= rxg@NetBSD.org
-HOMEPAGE= http://musicbrainz.org/doc/libmusicbrainz
-COMMENT= Second generation incarnation of the CD Index
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_TOOLS+= gmake pkg-config
-GNU_CONFIGURE= YES
-USE_LANGUAGES= c c++
-USE_LIBTOOL= YES
-PKGCONFIG_OVERRIDE= libmusicbrainz.pc.in
-
-CONFIGURE_ARGS+= --enable-cpp-headers
-
-.include "../../mk/compiler.mk"
-
-.if empty(CC_VERSION:Mgcc*)
-BUILDLINK_TRANSFORM+= rm:-lstdc++
-.endif
-
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/musicbrainz/PLIST b/audio/musicbrainz/PLIST
deleted file mode 100644
index 3e51e2dd7a4..00000000000
--- a/audio/musicbrainz/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:17 jlam Exp $
-include/musicbrainz/browser.h
-include/musicbrainz/errors.h
-include/musicbrainz/mb_c.h
-include/musicbrainz/musicbrainz.h
-include/musicbrainz/queries.h
-lib/libmusicbrainz.la
-lib/pkgconfig/libmusicbrainz.pc
-@dirrm include/musicbrainz
diff --git a/audio/musicbrainz/buildlink3.mk b/audio/musicbrainz/buildlink3.mk
deleted file mode 100644
index b45c617f7cb..00000000000
--- a/audio/musicbrainz/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:37 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-MUSICBRAINZ_BUILDLINK3_MK:= ${MUSICBRAINZ_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= musicbrainz
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmusicbrainz}
-BUILDLINK_PACKAGES+= musicbrainz
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}musicbrainz
-
-.if !empty(MUSICBRAINZ_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.musicbrainz+= musicbrainz>=2.0.2
-BUILDLINK_ABI_DEPENDS.musicbrainz+= musicbrainz>=2.1.2nb2
-BUILDLINK_PKGSRCDIR.musicbrainz?= ../../audio/musicbrainz
-.endif # MUSICBRAINZ_BUILDLINK3_MK
-
-.include "../../textproc/expat/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/musicbrainz/distinfo b/audio/musicbrainz/distinfo
deleted file mode 100644
index 983005bc811..00000000000
--- a/audio/musicbrainz/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.12 2006/08/30 09:12:30 drochner Exp $
-
-SHA1 (libmusicbrainz-2.1.4.tar.gz) = 611c9e9404e5aac110173da0b3a03941d2a04d0c
-RMD160 (libmusicbrainz-2.1.4.tar.gz) = 494ee9dac2cc571bb817519ce365ac89365aede6
-Size (libmusicbrainz-2.1.4.tar.gz) = 520569 bytes
-SHA1 (patch-ac) = dcf113aed1c15ac3656e92a2493af6263cf4bdb1
diff --git a/audio/musicbrainz/patches/patch-ac b/audio/musicbrainz/patches/patch-ac
deleted file mode 100644
index 404dddce869..00000000000
--- a/audio/musicbrainz/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/10/10 14:23:53 joerg Exp $
-
---- configure.orig 2005-07-22 16:31:16.000000000 +0000
-+++ configure
-@@ -2006,7 +2006,7 @@ host_os=`echo $ac_cv_host | sed 's/^\([^
- case "${host_cpu}-${host_os}" in
- *-beos*) os=beos; LIBS='-lbe -lroot' ;;
- *-cygwin*) os=cygwin; LIBS='-lwinmm' ;;
-- *-freebsd*) os=freebsd ;;
-+ *-freebsd* | *-dragonfly*) os=freebsd ;;
- *-darwin*) os=darwin ;;
- *-irix*) os=irix; CXXFLAGS="$CFLAGS -fsquangle";
- LIBS='-lcdaudio -lmediad -lds' ;;
diff --git a/audio/musicpd/DESCR b/audio/musicpd/DESCR
deleted file mode 100644
index 1f058711381..00000000000
--- a/audio/musicpd/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Music Player Daemon allows remote access for playing music (MP3s, Ogg
-Vorbis files, Flacs and AAC files) and managing playlists. It is
-designed for integrating a computer into a stereo system that provides
-control for music playback over a local network. It is also makes a
-great desktop music player, especially if you're a console junkie,
-like frontend options, or restart X often.
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
deleted file mode 100644
index 682d70d731b..00000000000
--- a/audio/musicpd/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# $NetBSD: Makefile,v 1.27 2007/01/09 23:19:26 wiz Exp $
-
-DISTNAME= mpd-0.12.1
-PKGNAME= ${DISTNAME:S/mpd/musicpd/}
-CATEGORIES= audio
-MASTER_SITES= http://musicpd.org/uploads/files/
-EXTRACT_SUFX= .tar.bz2
-
-CONFLICTS= mpd-[0-9]*
-
-MAINTAINER= simonb@NetBSD.org
-HOMEPAGE= http://musicpd.org/
-COMMENT= Remote controllable audio player
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-
-.include "options.mk"
-
-EGDIR= ${PREFIX}/share/examples/mpd
-RCD_SCRIPTS= mpd
-
-FILES_SUBST+= DEVOSSAUDIO=${DEVOSSAUDIO:Q}
-LDFLAGS+= ${LIBOSSAUDIO}
-
-SUBST_CLASSES+= config paths
-SUBST_STAGE.config= pre-configure
-SUBST_FILES.config= src/main.c
-SUBST_SED.config= -e s,/etc/mpd.conf,${PKG_SYSCONFDIR}/mpd.conf,
-SUBST_STAGE.paths= post-patch
-SUBST_FILES.paths= mpd.conf
-SUBST_SED.paths= -e 's,@DEVOSSAUDIO@,${DEVOSSAUDIO},'
-
-post-extract:
- ${CP} ${FILESDIR}/mpd.conf ${WRKSRC}/mpd.conf
-
-post-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/mpd.conf ${EGDIR}
-
-.include "../../audio/libao/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/musicpd/PLIST b/audio/musicpd/PLIST
deleted file mode 100644
index 2eee0ece19a..00000000000
--- a/audio/musicpd/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/01/09 23:19:26 wiz Exp $
-bin/mpd
-man/man1/mpd.1
-man/man5/mpd.conf.5
-share/doc/mpd/COMMANDS
-share/doc/mpd/README
-share/doc/mpd/UPGRADING
-share/doc/mpd/mpdconf.example
-share/examples/mpd/mpd.conf
-share/examples/rc.d/mpd
-@dirrm share/examples/mpd
-@dirrm share/doc/mpd
diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo
deleted file mode 100644
index 4f05c7fd335..00000000000
--- a/audio/musicpd/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.11 2007/01/09 23:19:26 wiz Exp $
-
-SHA1 (mpd-0.12.1.tar.bz2) = 8b124bfcf4b1b2c23abd40661bd0ad0b33fadbfe
-RMD160 (mpd-0.12.1.tar.bz2) = 3352e60ead352bac0b4776f4b784c9f9505bc9bc
-Size (mpd-0.12.1.tar.bz2) = 397761 bytes
-SHA1 (patch-aa) = 246424791365a3a9a29c2efe36bbbcd40416ae48
-SHA1 (patch-ab) = 3ddd0f23a9d796d4e4c428819657f9a66cf624ba
-SHA1 (patch-ac) = f6876c403c1357e99534878b01044e4a22ed0a97
-SHA1 (patch-ad) = 5ba01e9b2b7f1ecca9565e0809021e47df0c4145
diff --git a/audio/musicpd/files/mpd.conf b/audio/musicpd/files/mpd.conf
deleted file mode 100644
index 66a18d23ef1..00000000000
--- a/audio/musicpd/files/mpd.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: mpd.conf,v 1.3 2004/05/02 06:28:50 grant Exp $
-
-# required
-port "2100"
-music_directory "/mp3"
-playlist_directory "/mp3"
-log_file "/var/log/mpd.log"
-error_file "/var/log/mpd.error"
-
-# optional
-max_connections "5"
-max_command_list_size "2048"
-max_output_buffer_size "2048"
-connection_timeout "60"
-db_file "/mp3/.mpddb"
-state_file "/mp3/.mpdstate"
-save_absolute_paths_in_playlists "no"
-
-max_playlist_length "4096"
-buffer_before_play "25%"
-bind_to_address "any"
-
-mixer_type "oss"
-mixer_device "/dev/mixer"
-# mixer_control defaults to the master volume control. uncomment the
-# following line to have mpd's volume control modify the "PCM"
-# volume instead:
-# mixer_control "Pcm"
-
-ao_driver "oss"
-ao_driver_options "dsp=@DEVOSSAUDIO@"
-audio_write_size "1024"
-
-#user "mp3"
-
-# log_level can be "default", "secure", "verbose"
-log_level "default"
-#password "password@read,add,control,admin"
-#default_permissions "read,add,control,admin"
-#filesystem_charset "UTF-8"
diff --git a/audio/musicpd/files/mpd.sh b/audio/musicpd/files/mpd.sh
deleted file mode 100644
index 5b2a8b765d4..00000000000
--- a/audio/musicpd/files/mpd.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: mpd.sh,v 1.2 2004/11/11 03:15:41 simonb Exp $
-#
-
-# PROVIDE: mpd
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name="mpd"
-rcvar=$name
-command="@PREFIX@/bin/${name}"
-required_files="@PKG_SYSCONFDIR@/mpd.conf"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/audio/musicpd/options.mk b/audio/musicpd/options.mk
deleted file mode 100644
index 99a7ea80a56..00000000000
--- a/audio/musicpd/options.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-# $NetBSD: options.mk,v 1.7 2007/02/01 14:52:43 cbiere Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.musicpd
-PKG_SUPPORTED_OPTIONS= aac audiofile flac iconv id3 libmikmod musepack ogg
-PKG_SUGGESTED_OPTIONS= aac audiofile flac iconv id3 libmikmod musepack ogg
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Maac)
-. include "../../audio/faad2/buildlink3.mk"
-CONFIGURE_ARGS+= --with-faad=${BUILDLINK_PREFIX.faad2}
-.else
-CONFIGURE_ARGS+= --disable-aac
-.endif
-
-.if !empty(PKG_OPTIONS:Maudiofile)
-. include "../../audio/libaudiofile/buildlink3.mk"
-CONFIGURE_ARGS+= --with-audiofile=${BUILDLINK_PREFIX.audiofile}
-CONFIGURE_ENV+= ac_cv_lib_iconv_iconv_open=yes
-.else
-CONFIGURE_ARGS+= --disable-audiofile
-.endif
-
-.if !empty(PKG_OPTIONS:Mflac)
-. include "../../audio/flac/buildlink3.mk"
-CONFIGURE_ARGS+= --with-flac=${BUILDLINK_PREFIX.flac}
-.else
-CONFIGURE_ARGS+= --disable-flac
-.endif
-
-.if !empty(PKG_OPTIONS:Miconv)
-. include "../../converters/libiconv/buildlink3.mk"
-CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv}
-.else
-CONFIGURE_ARGS+= --disable-iconv
-.endif
-
-.if !empty(PKG_OPTIONS:Mid3)
-. include "../../audio/libid3tag/buildlink3.mk"
-CONFIGURE_ARGS+= --with-id3tag=${BUILDLINK_PREFIX.libid3tag}
-.else
-CONFIGURE_ARGS+= --disable-id3
-.endif
-
-.if !empty(PKG_OPTIONS:Mlibmikmod)
-. include "../../audio/libmikmod/buildlink3.mk"
-CONFIGURE_ARGS+= --with-libmikmod=${BUILDLINK_PREFIX.libmikmod}
-.else
-CONFIGURE_ARGS+= --disable-libmikmod
-.endif
-
-.if !empty(PKG_OPTIONS:Mmusepack)
-. include "../../audio/libmpcdec/buildlink3.mk"
-CONFIGURE_ENV+= mpcdec_prefix=${BUILDLINK_PREFIX.libmpcdec}
-CONFIGURE_ARGS+= --enable-mpc
-.else
-CONFIGURE_ARGS+= --disable-mpc
-.endif
-
-.if !empty(PKG_OPTIONS:Mogg)
-. include "../../audio/libvorbis/buildlink3.mk"
-CONFIGURE_ARGS+= --with-ogg=${BUILDLINK_PREFIX.libvorbis}
-.else
-CONFIGURE_ARGS+= --disable-ogg
-.endif
-
-# when IPv6 support is enabled, mpd doesn't listen on an IPv4 address.
-#.if !empty(PKG_OPTIONS:Minet6)
-#CONFIGURE_ARGS+= --enable-ipv6
-#.else
-CONFIGURE_ARGS+= --disable-ipv6
-#.endif
diff --git a/audio/musicpd/patches/patch-aa b/audio/musicpd/patches/patch-aa
deleted file mode 100644
index b2f4e0512fe..00000000000
--- a/audio/musicpd/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2007/01/09 23:19:26 wiz Exp $
-
-http://www.musicpd.org/mantis/view.php?id=1379
-
-setenv() doesn't exist on all systems (e.g. solaris 9)
-
---- src/main.c.orig 2006-10-10 23:56:58.000000000 +0000
-+++ src/main.c
-@@ -279,7 +279,14 @@ static void changeToUser(void)
-
- /* this is needed by libs such as arts */
- if (userpwd->pw_dir) {
-- setenv("HOME", userpwd->pw_dir, 1);
-+ char *tmps;
-+ /* HOME=%s so we need 5 for HOME= and 1 for the terminating \0 */
-+ tmps = (char *) malloc (strlen(userpwd->pw_dir) + 6);
-+ if (tmps != NULL) {
-+ sprintf (tmps, "HOME=%s", userpwd->pw_dir);
-+ putenv (tmps);
-+ free (tmps);
-+ }
- }
- }
- }
diff --git a/audio/musicpd/patches/patch-ab b/audio/musicpd/patches/patch-ab
deleted file mode 100644
index 453ceab45b5..00000000000
--- a/audio/musicpd/patches/patch-ab
+++ /dev/null
@@ -1,120 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/01/09 23:19:26 wiz Exp $
-
---- src/inputPlugins/_flac_common.h.orig 2006-10-10 23:56:55.000000000 +0000
-+++ src/inputPlugins/_flac_common.h
-@@ -30,7 +30,114 @@
- #include "../inputStream.h"
- #include "../outputBuffer.h"
- #include "../decode.h"
--#include <FLAC/seekable_stream_decoder.h>
-+#include <FLAC/export.h>
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
-+# include <FLAC/seekable_stream_decoder.h>
-+# define flac_decoder FLAC__SeekableStreamDecoder
-+# define flac_new(x) FLAC__seekable_stream_decoder_new(x)
-+
-+# define flac_ogg_init(a,b,c,d,e,f,g,h,i,j) (0)
-+
-+# define flac_get_decode_position(x,y) \
-+ FLAC__seekable_stream_decoder_get_decode_position(x,y)
-+# define flac_get_state(x) FLAC__seekable_stream_decoder_get_state(x)
-+# define flac_process_single(x) FLAC__seekable_stream_decoder_process_single(x)
-+# define flac_process_metadata(x) \
-+ FLAC__seekable_stream_decoder_process_until_end_of_metadata(x)
-+# define flac_seek_absolute(x,y) \
-+ FLAC__seekable_stream_decoder_seek_absolute(x,y)
-+# define flac_finish(x) FLAC__seekable_stream_decoder_finish(x)
-+# define flac_delete(x) FLAC__seekable_stream_decoder_delete(x)
-+
-+# define flac_decoder_eof FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM
-+
-+# define flac_read_status FLAC__SeekableStreamDecoderReadStatus
-+# define flac_read_status_continue \
-+ FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK
-+# define flac_read_status_eof FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK
-+# define flac_read_status_abort \
-+ FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR
-+
-+# define flac_seek_status FLAC__SeekableStreamDecoderSeekStatus
-+# define flac_seek_status_ok FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK
-+# define flac_seek_status_error FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR
-+
-+# define flac_tell_status FLAC__SeekableStreamDecoderTellStatus
-+# define flac_tell_status_ok FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK
-+# define flac_tell_status_error \
-+ FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR
-+# define flac_tell_status_unsupported \
-+ FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR
-+
-+# define flac_length_status FLAC__SeekableStreamDecoderLengthStatus
-+# define flac_length_status_ok FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK
-+# define flac_length_status_error \
-+ FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR
-+# define flac_length_status_unsupported \
-+ FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR
-+
-+# ifdef HAVE_OGGFLAC
-+# include <OggFLAC/seekable_stream_decoder.h>
-+# endif
-+#else /* FLAC_API_VERSION_CURRENT >= 7 */
-+
-+ /* OggFLAC support is handled by our flac_plugin already, and
-+ * thus we *can* always have it if libFLAC was compiled with it */
-+# ifndef HAVE_OGGFLAC
-+# define HAVE_OGGFLAC 1
-+# endif
-+# include "_ogg_common.h"
-+# undef HAVE_OGGFLAC /* we don't need this defined anymore */
-+
-+# include <FLAC/stream_decoder.h>
-+# define flac_decoder FLAC__StreamDecoder
-+# define flac_new(x) FLAC__stream_decoder_new(x)
-+
-+# define flac_init(a,b,c,d,e,f,g,h,i,j) \
-+ (FLAC__stream_decoder_init_stream(a,b,c,d,e,f,g,h,i,j) \
-+ == FLAC__STREAM_DECODER_INIT_STATUS_OK)
-+# define flac_ogg_init(a,b,c,d,e,f,g,h,i,j) \
-+ (FLAC__stream_decoder_init_ogg_stream(a,b,c,d,e,f,g,h,i,j) \
-+ == FLAC__STREAM_DECODER_INIT_STATUS_OK)
-+
-+# define flac_get_decode_position(x,y) \
-+ FLAC__stream_decoder_get_decode_position(x,y)
-+# define flac_get_state(x) FLAC__stream_decoder_get_state(x)
-+# define flac_process_single(x) FLAC__stream_decoder_process_single(x)
-+# define flac_process_metadata(x) \
-+ FLAC__stream_decoder_process_until_end_of_metadata(x)
-+# define flac_seek_absolute(x,y) FLAC__stream_decoder_seek_absolute(x,y)
-+# define flac_finish(x) FLAC__stream_decoder_finish(x)
-+# define flac_delete(x) FLAC__stream_decoder_delete(x)
-+
-+# define flac_decoder_eof FLAC__STREAM_DECODER_END_OF_STREAM
-+
-+# define flac_read_status FLAC__StreamDecoderReadStatus
-+# define flac_read_status_continue \
-+ FLAC__STREAM_DECODER_READ_STATUS_CONTINUE
-+# define flac_read_status_eof FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM
-+# define flac_read_status_abort FLAC__STREAM_DECODER_READ_STATUS_ABORT
-+
-+# define flac_seek_status FLAC__StreamDecoderSeekStatus
-+# define flac_seek_status_ok FLAC__STREAM_DECODER_SEEK_STATUS_OK
-+# define flac_seek_status_error FLAC__STREAM_DECODER_SEEK_STATUS_ERROR
-+# define flac_seek_status_unsupported \
-+ FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED
-+
-+# define flac_tell_status FLAC__StreamDecoderTellStatus
-+# define flac_tell_status_ok FLAC__STREAM_DECODER_TELL_STATUS_OK
-+# define flac_tell_status_error FLAC__STREAM_DECODER_TELL_STATUS_ERROR
-+# define flac_tell_status_unsupported \
-+ FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED
-+
-+# define flac_length_status FLAC__StreamDecoderLengthStatus
-+# define flac_length_status_ok FLAC__STREAM_DECODER_LENGTH_STATUS_OK
-+# define flac_length_status_error FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR
-+# define flac_length_status_unsupported \
-+ FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED
-+
-+#endif /* FLAC_API_VERSION_CURRENT >= 7 */
-+
- #include <FLAC/metadata.h>
-
- #define FLAC_CHUNK_SIZE 4080
diff --git a/audio/musicpd/patches/patch-ac b/audio/musicpd/patches/patch-ac
deleted file mode 100644
index 4b304abff16..00000000000
--- a/audio/musicpd/patches/patch-ac
+++ /dev/null
@@ -1,581 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/01/09 23:19:26 wiz Exp $
-
---- src/inputPlugins/flac_plugin.c.orig 2006-10-10 23:56:56.000000000 +0000
-+++ src/inputPlugins/flac_plugin.c
-@@ -16,12 +16,10 @@
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
--#include "../inputPlugin.h"
-+#include "_flac_common.h"
-
- #ifdef HAVE_FLAC
-
--#include "_flac_common.h"
--
- #include "../utils.h"
- #include "../log.h"
- #include "../pcm_utils.h"
-@@ -33,166 +31,14 @@
- #include <stdio.h>
- #include <string.h>
- #include <unistd.h>
--#include <FLAC/seekable_stream_decoder.h>
--#include <FLAC/metadata.h>
-+#include <assert.h>
-
--/* this code is based on flac123, from flac-tools */
-+/* this code was based on flac123, from flac-tools */
-
--static void flacError(const FLAC__SeekableStreamDecoder *,
-- FLAC__StreamDecoderErrorStatus, void *);
--static void flacPrintErroredState(FLAC__SeekableStreamDecoderState state);
--static void flacMetadata(const FLAC__SeekableStreamDecoder *,
-- const FLAC__StreamMetadata *, void *);
--static FLAC__StreamDecoderWriteStatus flacWrite(const
-- FLAC__SeekableStreamDecoder *,
-- const FLAC__Frame *,
-- const FLAC__int32 * const buf[],
-- void *);
--static FLAC__SeekableStreamDecoderReadStatus flacRead(const
-- FLAC__SeekableStreamDecoder
-- *, FLAC__byte buf[],
-- unsigned *, void *);
--static FLAC__SeekableStreamDecoderSeekStatus flacSeek(const
-- FLAC__SeekableStreamDecoder
-- *, FLAC__uint64, void *);
--static FLAC__SeekableStreamDecoderTellStatus flacTell(const
-- FLAC__SeekableStreamDecoder
-- *, FLAC__uint64 *,
-- void *);
--static FLAC__SeekableStreamDecoderLengthStatus flacLength(const
-- FLAC__SeekableStreamDecoder
-- *, FLAC__uint64 *,
-- void *);
--static FLAC__bool flacEOF(const FLAC__SeekableStreamDecoder *, void *);
--
--static int flac_decode(OutputBuffer * cb, DecoderControl * dc,
-- InputStream * inStream)
--{
-- FLAC__SeekableStreamDecoder *flacDec = NULL;
-- FlacData data;
-- int status = 1;
-- int ret = 0;
--
-- init_FlacData(&data, cb, dc, inStream);
--
-- if (!(flacDec = FLAC__seekable_stream_decoder_new())) {
-- ret = -1;
-- goto fail;
-- }
-- /*status&=FLAC__file_decoder_set_md5_checking(flacDec,1); */
-- status &= FLAC__seekable_stream_decoder_set_read_callback(flacDec,
-- flacRead);
-- status &= FLAC__seekable_stream_decoder_set_seek_callback(flacDec,
-- flacSeek);
-- status &= FLAC__seekable_stream_decoder_set_tell_callback(flacDec,
-- flacTell);
-- status &= FLAC__seekable_stream_decoder_set_length_callback(flacDec,
-- flacLength);
-- status &=
-- FLAC__seekable_stream_decoder_set_eof_callback(flacDec, flacEOF);
-- status &=
-- FLAC__seekable_stream_decoder_set_write_callback(flacDec,
-- flacWrite);
-- status &=
-- FLAC__seekable_stream_decoder_set_metadata_callback(flacDec,
-- flacMetadata);
-- status &=
-- FLAC__seekable_stream_decoder_set_metadata_respond(flacDec,
-- FLAC__METADATA_TYPE_VORBIS_COMMENT);
-- status &=
-- FLAC__seekable_stream_decoder_set_error_callback(flacDec,
-- flacError);
-- status &=
-- FLAC__seekable_stream_decoder_set_client_data(flacDec,
-- (void *)&data);
-- if (!status) {
-- ERROR("flac problem before init()\n");
-- flacPrintErroredState(FLAC__seekable_stream_decoder_get_state
-- (flacDec));
-- ret = -1;
-- goto fail;
-- }
--
-- if (FLAC__seekable_stream_decoder_init(flacDec) !=
-- FLAC__SEEKABLE_STREAM_DECODER_OK) {
-- ERROR("flac problem doing init()\n");
-- flacPrintErroredState(FLAC__seekable_stream_decoder_get_state
-- (flacDec));
-- ret = -1;
-- goto fail;
-- }
--
-- if (!FLAC__seekable_stream_decoder_process_until_end_of_metadata
-- (flacDec)) {
-- ERROR("flac problem reading metadata\n");
-- flacPrintErroredState(FLAC__seekable_stream_decoder_get_state
-- (flacDec));
-- ret = -1;
-- goto fail;
-- }
--
-- dc->state = DECODE_STATE_DECODE;
--
-- while (1) {
-- FLAC__seekable_stream_decoder_process_single(flacDec);
-- if (FLAC__seekable_stream_decoder_get_state(flacDec) !=
-- FLAC__SEEKABLE_STREAM_DECODER_OK) {
-- break;
-- }
-- if (dc->seek) {
-- FLAC__uint64 sampleToSeek = dc->seekWhere *
-- dc->audioFormat.sampleRate + 0.5;
-- if (FLAC__seekable_stream_decoder_seek_absolute(flacDec,
-- sampleToSeek))
-- {
-- clearOutputBuffer(cb);
-- data.time = ((float)sampleToSeek) /
-- dc->audioFormat.sampleRate;
-- data.position = 0;
-- } else
-- dc->seekError = 1;
-- dc->seek = 0;
-- }
-- }
-- /* I don't think we need this bit here! -shank */
-- /*FLAC__file_decoder_process_until_end_of_file(flacDec); */
-- if (!dc->stop) {
-- flacPrintErroredState(FLAC__seekable_stream_decoder_get_state
-- (flacDec));
-- FLAC__seekable_stream_decoder_finish(flacDec);
-- }
-- /* send last little bit */
-- if (data.chunk_length > 0 && !dc->stop) {
-- flacSendChunk(&data);
-- flushOutputBuffer(data.cb);
-- }
--
-- /*if(dc->seek) {
-- dc->seekError = 1;
-- dc->seek = 0;
-- } */
--
-- dc->state = DECODE_STATE_STOP;
-- dc->stop = 0;
--
--fail:
-- if (data.replayGainInfo)
-- freeReplayGainInfo(data.replayGainInfo);
--
-- if (flacDec)
-- FLAC__seekable_stream_decoder_delete(flacDec);
--
-- closeInputStream(inStream);
--
-- return ret;
--}
--
--static FLAC__SeekableStreamDecoderReadStatus flacRead(const
-- FLAC__SeekableStreamDecoder
-- * flacDec,
-- FLAC__byte buf[],
-- unsigned *bytes,
-- void *fdata)
-+static flac_read_status flacRead(const flac_decoder * flacDec,
-+ FLAC__byte buf[],
-+ unsigned *bytes,
-+ void *fdata)
- {
- FlacData *data = (FlacData *) fdata;
- size_t r;
-@@ -207,55 +53,51 @@ static FLAC__SeekableStreamDecoderReadSt
- }
- *bytes = r;
-
-- if (*bytes == 0 && !inputStreamAtEOF(data->inStream) && !data->dc->stop)
-- return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR;
--
-- return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK;
-+ if (r == 0 && !data->dc->stop) {
-+ if (inputStreamAtEOF(data->inStream))
-+ return flac_read_status_eof;
-+ else
-+ return flac_read_status_abort;
-+ }
-+ return flac_read_status_continue;
- }
-
--static FLAC__SeekableStreamDecoderSeekStatus flacSeek(const
-- FLAC__SeekableStreamDecoder
-- * flacDec,
-- FLAC__uint64 offset,
-- void *fdata)
-+static flac_seek_status flacSeek(const flac_decoder * flacDec,
-+ FLAC__uint64 offset,
-+ void *fdata)
- {
- FlacData *data = (FlacData *) fdata;
-
- if (seekInputStream(data->inStream, offset, SEEK_SET) < 0) {
-- return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR;
-+ return flac_seek_status_error;
- }
-
-- return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK;
-+ return flac_tell_status_ok;
- }
-
--static FLAC__SeekableStreamDecoderTellStatus flacTell(const
-- FLAC__SeekableStreamDecoder
-- * flacDec,
-- FLAC__uint64 * offset,
-- void *fdata)
-+static flac_tell_status flacTell(const flac_decoder * flacDec,
-+ FLAC__uint64 * offset,
-+ void *fdata)
- {
- FlacData *data = (FlacData *) fdata;
-
- *offset = (long)(data->inStream->offset);
-
-- return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK;
-+ return flac_tell_status_ok;
- }
-
--static FLAC__SeekableStreamDecoderLengthStatus flacLength(const
-- FLAC__SeekableStreamDecoder
-- * flacDec,
-- FLAC__uint64 * length,
-- void *fdata)
-+static flac_length_status flacLength(const flac_decoder * flacDec,
-+ FLAC__uint64 * length,
-+ void *fdata)
- {
- FlacData *data = (FlacData *) fdata;
-
- *length = (size_t) (data->inStream->size);
-
-- return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK;
-+ return flac_length_status_ok;
- }
-
--static FLAC__bool flacEOF(const FLAC__SeekableStreamDecoder * flacDec,
-- void *fdata)
-+static FLAC__bool flacEOF(const flac_decoder * flacDec, void *fdata)
- {
- FlacData *data = (FlacData *) fdata;
-
-@@ -264,52 +106,112 @@ static FLAC__bool flacEOF(const FLAC__Se
- return false;
- }
-
--static void flacError(const FLAC__SeekableStreamDecoder * dec,
-+static void flacError(const flac_decoder *dec,
- FLAC__StreamDecoderErrorStatus status, void *fdata)
- {
- flac_error_common_cb("flac", status, (FlacData *) fdata);
- }
-
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
- static void flacPrintErroredState(FLAC__SeekableStreamDecoderState state)
- {
-+ const char *str = ""; /* "" to silence compiler warning */
- switch (state) {
-+ case FLAC__SEEKABLE_STREAM_DECODER_OK:
-+ case FLAC__SEEKABLE_STREAM_DECODER_SEEKING:
-+ case FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM:
-+ return;
- case FLAC__SEEKABLE_STREAM_DECODER_MEMORY_ALLOCATION_ERROR:
-- ERROR("flac allocation error\n");
-+ str = "allocation error";
- break;
- case FLAC__SEEKABLE_STREAM_DECODER_READ_ERROR:
-- ERROR("flac read error\n");
-+ str = "read error";
- break;
- case FLAC__SEEKABLE_STREAM_DECODER_SEEK_ERROR:
-- ERROR("flac seek error\n");
-+ str = "seek error";
- break;
- case FLAC__SEEKABLE_STREAM_DECODER_STREAM_DECODER_ERROR:
-- ERROR("flac seekable stream error\n");
-+ str = "seekable stream error";
- break;
- case FLAC__SEEKABLE_STREAM_DECODER_ALREADY_INITIALIZED:
-- ERROR("flac decoder already initialized\n");
-+ str = "decoder already initialized";
- break;
- case FLAC__SEEKABLE_STREAM_DECODER_INVALID_CALLBACK:
-- ERROR("invalid flac callback\n");
-+ str = "invalid callback";
- break;
- case FLAC__SEEKABLE_STREAM_DECODER_UNINITIALIZED:
-- ERROR("flac decoder uninitialized\n");
-+ str = "decoder uninitialized";
-+ }
-+ ERROR("flac %s\n", str);
-+}
-+
-+static int flac_init(FLAC__SeekableStreamDecoder *dec,
-+ FLAC__SeekableStreamDecoderReadCallback read_cb,
-+ FLAC__SeekableStreamDecoderSeekCallback seek_cb,
-+ FLAC__SeekableStreamDecoderTellCallback tell_cb,
-+ FLAC__SeekableStreamDecoderLengthCallback length_cb,
-+ FLAC__SeekableStreamDecoderEofCallback eof_cb,
-+ FLAC__SeekableStreamDecoderWriteCallback write_cb,
-+ FLAC__SeekableStreamDecoderMetadataCallback metadata_cb,
-+ FLAC__SeekableStreamDecoderErrorCallback error_cb,
-+ void *data)
-+{
-+ int s = 1;
-+ s &= FLAC__seekable_stream_decoder_set_read_callback(dec, read_cb);
-+ s &= FLAC__seekable_stream_decoder_set_seek_callback(dec, seek_cb);
-+ s &= FLAC__seekable_stream_decoder_set_tell_callback(dec, tell_cb);
-+ s &= FLAC__seekable_stream_decoder_set_length_callback(dec, length_cb);
-+ s &= FLAC__seekable_stream_decoder_set_eof_callback(dec, eof_cb);
-+ s &= FLAC__seekable_stream_decoder_set_write_callback(dec, write_cb);
-+ s &= FLAC__seekable_stream_decoder_set_metadata_callback(dec,
-+ metadata_cb);
-+ s &= FLAC__seekable_stream_decoder_set_metadata_respond(dec,
-+ FLAC__METADATA_TYPE_VORBIS_COMMENT);
-+ s &= FLAC__seekable_stream_decoder_set_error_callback(dec, error_cb);
-+ s &= FLAC__seekable_stream_decoder_set_client_data(dec, data);
-+ if (!s || (FLAC__seekable_stream_decoder_init(dec) !=
-+ FLAC__SEEKABLE_STREAM_DECODER_OK))
-+ return 0;
-+ return 1;
-+}
-+#else /* FLAC_API_VERSION_CURRENT >= 7 */
-+static void flacPrintErroredState(FLAC__StreamDecoderState state)
-+{
-+ const char *str = ""; /* "" to silence compiler warning */
-+ switch (state) {
-+ case FLAC__STREAM_DECODER_SEARCH_FOR_METADATA:
-+ case FLAC__STREAM_DECODER_READ_METADATA:
-+ case FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC:
-+ case FLAC__STREAM_DECODER_READ_FRAME:
-+ case FLAC__STREAM_DECODER_END_OF_STREAM:
-+ return;
-+ case FLAC__STREAM_DECODER_OGG_ERROR:
-+ str = "error in the Ogg layer";
- break;
-- case FLAC__SEEKABLE_STREAM_DECODER_OK:
-- case FLAC__SEEKABLE_STREAM_DECODER_SEEKING:
-- case FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM:
-+ case FLAC__STREAM_DECODER_SEEK_ERROR:
-+ str = "seek error";
-+ break;
-+ case FLAC__STREAM_DECODER_ABORTED:
-+ str = "decoder aborted by read";
-+ break;
-+ case FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR:
-+ str = "allocation error";
- break;
-+ case FLAC__STREAM_DECODER_UNINITIALIZED:
-+ str = "decoder uninitialized";
- }
-+ ERROR("flac %s\n", str);
- }
-+#endif /* FLAC_API_VERSION_CURRENT >= 7 */
-
--static void flacMetadata(const FLAC__SeekableStreamDecoder * dec,
-+static void flacMetadata(const flac_decoder * dec,
- const FLAC__StreamMetadata * block, void *vdata)
- {
- flac_metadata_common_cb(block, (FlacData *) vdata);
- }
-
--static FLAC__StreamDecoderWriteStatus flacWrite(const
-- FLAC__SeekableStreamDecoder *
-- dec, const FLAC__Frame * frame,
-+static FLAC__StreamDecoderWriteStatus flacWrite(const flac_decoder *dec,
-+ const FLAC__Frame * frame,
- const FLAC__int32 * const buf[],
- void *vdata)
- {
-@@ -325,7 +227,7 @@ static FLAC__StreamDecoderWriteStatus fl
- timeChange = ((float)samples) / frame->header.sample_rate;
- data->time += timeChange;
-
-- FLAC__seekable_stream_decoder_get_decode_position(dec, &newPosition);
-+ flac_get_decode_position(dec, &newPosition);
- if (data->position) {
- data->bitRate =
- ((newPosition - data->position) * 8.0 / timeChange)
-@@ -438,12 +340,174 @@ static MpdTag *flacTagDup(char *file)
- return ret;
- }
-
-+static int flac_decode_internal(OutputBuffer * cb, DecoderControl * dc,
-+ InputStream * inStream, int is_ogg)
-+{
-+ flac_decoder *flacDec;
-+ FlacData data;
-+ const char *err = NULL;
-+
-+ if (!(flacDec = flac_new()))
-+ return -1;
-+ init_FlacData(&data, cb, dc, inStream);
-+ if (is_ogg) {
-+ if (!flac_ogg_init(flacDec, flacRead, flacSeek, flacTell,
-+ flacLength, flacEOF, flacWrite, flacMetadata,
-+ flacError, (void *)&data)) {
-+ err = "doing Ogg init()";
-+ goto fail;
-+ }
-+ } else {
-+ if (!flac_init(flacDec, flacRead, flacSeek, flacTell,
-+ flacLength, flacEOF, flacWrite, flacMetadata,
-+ flacError, (void *)&data)) {
-+ err = "doing init()";
-+ goto fail;
-+ }
-+ if (!flac_process_metadata(flacDec)) {
-+ err = "problem reading metadata";
-+ goto fail;
-+ }
-+ }
-+
-+ dc->state = DECODE_STATE_DECODE;
-+
-+ while (1) {
-+ if (!flac_process_single(flacDec))
-+ break;
-+ if (flac_get_state(flacDec) == flac_decoder_eof)
-+ break;
-+ if (dc->seek) {
-+ FLAC__uint64 sampleToSeek = dc->seekWhere *
-+ dc->audioFormat.sampleRate + 0.5;
-+ if (flac_seek_absolute(flacDec, sampleToSeek)) {
-+ clearOutputBuffer(cb);
-+ data.time = ((float)sampleToSeek) /
-+ dc->audioFormat.sampleRate;
-+ data.position = 0;
-+ } else
-+ dc->seekError = 1;
-+ dc->seek = 0;
-+ }
-+ }
-+ if (!dc->stop) {
-+ flacPrintErroredState(flac_get_state(flacDec));
-+ flac_finish(flacDec);
-+ }
-+ /* send last little bit */
-+ if (data.chunk_length > 0 && !dc->stop) {
-+ flacSendChunk(&data);
-+ flushOutputBuffer(data.cb);
-+ }
-+
-+ /*if(dc->seek) {
-+ dc->seekError = 1;
-+ dc->seek = 0;
-+ } */
-+
-+ dc->state = DECODE_STATE_STOP;
-+ dc->stop = 0;
-+
-+fail:
-+ if (data.replayGainInfo)
-+ freeReplayGainInfo(data.replayGainInfo);
-+
-+ if (flacDec)
-+ flac_delete(flacDec);
-+
-+ closeInputStream(inStream);
-+
-+ if (err) {
-+ ERROR("flac %s\n", err);
-+ return -1;
-+ }
-+ return 0;
-+}
-+
-+static int flac_decode(OutputBuffer * cb, DecoderControl * dc,
-+ InputStream * inStream)
-+{
-+ return flac_decode_internal(cb, dc, inStream, 0);
-+}
-+
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
-+# define flac_plugin_init NULL
-+#else /* FLAC_API_VERSION_CURRENT >= 7 */
-+/* some of this stuff is duplicated from oggflac_plugin.c */
-+extern InputPlugin oggflacPlugin;
-+
-+static MpdTag *oggflac_tag_dup(char *file)
-+{
-+ MpdTag *ret = NULL;
-+ FLAC__Metadata_Iterator *it;
-+ FLAC__StreamMetadata *block;
-+ FLAC__Metadata_Chain *chain = FLAC__metadata_chain_new();
-+
-+ if (!(FLAC__metadata_chain_read_ogg(chain, file)))
-+ goto out;
-+ it = FLAC__metadata_iterator_new();
-+ FLAC__metadata_iterator_init(it, chain);
-+ do {
-+ if (!(block = FLAC__metadata_iterator_get_block(it)))
-+ break;
-+ if (block->type == FLAC__METADATA_TYPE_VORBIS_COMMENT) {
-+ ret = copyVorbisCommentBlockToMpdTag(block, ret);
-+ } else if (block->type == FLAC__METADATA_TYPE_STREAMINFO) {
-+ if (!ret)
-+ ret = newMpdTag();
-+ ret->time = ((float)block->data.stream_info.
-+ total_samples) /
-+ block->data.stream_info.sample_rate + 0.5;
-+ }
-+ } while (FLAC__metadata_iterator_next(it));
-+ FLAC__metadata_iterator_delete(it);
-+out:
-+ FLAC__metadata_chain_delete(chain);
-+ return ret;
-+}
-+
-+static int oggflac_decode(OutputBuffer * cb, DecoderControl * dc,
-+ InputStream * inStream)
-+{
-+ return flac_decode_internal(cb, dc, inStream, 1);
-+}
-+
-+static unsigned int oggflac_try_decode(InputStream * inStream)
-+{
-+ return (ogg_stream_type_detect(inStream) == FLAC) ? 1 : 0;
-+}
-+
-+static char *oggflac_suffixes[] = { "ogg", NULL };
-+static char *oggflac_mime_types[] = { "application/ogg", NULL };
-+
-+static int flac_plugin_init(void)
-+{
-+ if (!FLAC_API_SUPPORTS_OGG_FLAC) {
-+ DEBUG("libFLAC does not support OggFLAC\n");
-+ return 1;
-+ }
-+ DEBUG("libFLAC supports OggFLAC, initializing OggFLAC support\n");
-+ assert(oggflacPlugin.name == NULL);
-+ oggflacPlugin.name = "oggflac";
-+ oggflacPlugin.tryDecodeFunc = oggflac_try_decode;
-+ oggflacPlugin.streamDecodeFunc = oggflac_decode;
-+ oggflacPlugin.tagDupFunc = oggflac_tag_dup;
-+ oggflacPlugin.streamTypes = INPUT_PLUGIN_STREAM_URL |
-+ INPUT_PLUGIN_STREAM_FILE;
-+ oggflacPlugin.suffixes = oggflac_suffixes;
-+ oggflacPlugin.mimeTypes = oggflac_mime_types;
-+ loadInputPlugin(&oggflacPlugin);
-+ return 1;
-+}
-+
-+#endif /* FLAC_API_VERSION_CURRENT >= 7 */
-+
- static char *flacSuffixes[] = { "flac", NULL };
- static char *flac_mime_types[] = { "application/x-flac", NULL };
-
- InputPlugin flacPlugin = {
- "flac",
-- NULL,
-+ flac_plugin_init,
- NULL,
- NULL,
- flac_decode,
diff --git a/audio/musicpd/patches/patch-ad b/audio/musicpd/patches/patch-ad
deleted file mode 100644
index f99a8fcc250..00000000000
--- a/audio/musicpd/patches/patch-ad
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/01/09 23:19:26 wiz Exp $
-
---- src/inputPlugins/oggflac_plugin.c.orig 2006-10-10 23:56:55.000000000 +0000
-+++ src/inputPlugins/oggflac_plugin.c
-@@ -19,11 +19,10 @@
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
--#include "../inputPlugin.h"
-+#include "_flac_common.h"
-
- #ifdef HAVE_OGGFLAC
-
--#include "_flac_common.h"
- #include "_ogg_common.h"
-
- #include "../utils.h"
-@@ -37,8 +36,6 @@
- #include <stdio.h>
- #include <string.h>
- #include <unistd.h>
--#include <OggFLAC/seekable_stream_decoder.h>
--#include <FLAC/metadata.h>
-
- static void oggflac_cleanup(InputStream * inStream,
- FlacData * data,
diff --git a/audio/nas/DESCR b/audio/nas/DESCR
deleted file mode 100644
index b9995404fe7..00000000000
--- a/audio/nas/DESCR
+++ /dev/null
@@ -1,15 +0,0 @@
-The Network Audio System is designed for playing, recording, and
-manipulating audio data over a network. Like the X Window System, it
-uses the client/server model to separate applications from the
-specific drivers that control audio input and output devices.
-
-Key features of the Network Audio System include:
-
- o Device-independent audio over the network
- o Lots of audio file and data formats
- o Can store sounds in server for rapid replay
- o Extensive mixing, separating, and manipulation of audio data
- o Simultaneous use of audio devices by multiple applications
- o Use by a growing number of ISVs
- o Small size
- o Free! No obnoxious licensing terms
diff --git a/audio/nas/Makefile b/audio/nas/Makefile
deleted file mode 100644
index d29e5556ed8..00000000000
--- a/audio/nas/Makefile
+++ /dev/null
@@ -1,98 +0,0 @@
-# $NetBSD: Makefile,v 1.72 2007/01/28 20:18:30 tron Exp $
-
-DISTNAME= nas-1.8.src
-PKGNAME= ${DISTNAME:S/.src//}
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= http://nas.codebrilliance.com/nas/ \
- ftp://ftp.uni-duisburg.de/Sound/NAS/
-
-MAINTAINER= markd@NetBSD.org
-HOMEPAGE= http://radscan.com/nas.html
-COMMENT= Network Audio System
-
-DEPENDS+= p5-perl-headers-${OS_VERSION}{,nb*}:../../devel/p5-perl-headers
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_TOOLS+= gmake perl:run
-USE_IMAKE= yes
-
-PKG_SYSCONFSUBDIR= nas
-
-REPLACE_PERL+= clients/audio/auscope/auscope
-
-SUBST_CLASSES+= sysconf
-SUBST_STAGE.sysconf= pre-configure
-SUBST_FILES.sysconf= config/NetAudio.def
-SUBST_SED.sysconf= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
-
-SUBST_CLASSES+= ossaudio
-SUBST_STAGE.ossaudio= pre-configure
-SUBST_FILES.ossaudio= server/nasd.conf.eg server/dda/voxware/auvoxware.c
-SUBST_SED.ossaudio= -e "s|@DEVOSSAUDIO@|${DEVOSSAUDIO}|g"
-
-SUBST_CLASSES+= mungeman
-SUBST_STAGE.mungeman= pre-configure
-SUBST_FILES.mungeman= config/mungeman
-SUBST_SED.mungeman= -e 's|^ *\#|\#|g'
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(UNPRIVILEGED) && !empty(UNPRIVILEGED:M[Yy][Ee][Ss])
-SUBST_CLASSES+= owngrp
-SUBST_MESSAGE.owngrp= Fixing hardcoded owner/group.
-SUBST_STAGE.owngrp= post-configure
-SUBST_FILES.owngrp= clients/audio/auconvert/Makefile \
- clients/audio/auctl/Makefile \
- clients/audio/audemo/Makefile \
- clients/audio/audial/Makefile \
- clients/audio/auedit/Makefile \
- clients/audio/auinfo/Makefile \
- clients/audio/aupanel/Makefile \
- clients/audio/auphone/Makefile \
- clients/audio/auplay/Makefile \
- clients/audio/aurecord/Makefile \
- clients/audio/auscope/Makefile \
- clients/audio/autool/Makefile \
- clients/audio/auwave/Makefile \
- clients/audio/examples/Makefile \
- clients/audio/util/Makefile \
- clients/audio/widgets/Makefile \
- clients/audio/Makefile \
- clients/Makefile config/Makefile doc/Makefile \
- doc/man/lib/Makefile doc/man/Makefile \
- include/audio/Makefile include/Makefile \
- lib/Makefile lib/audio/Makefile \
- Makefile server/Makefile
-SUBST_SED.owngrp= -e 's/-c -o root -g wheel/-c -o ${UNPRIVILEGED_USER} -g ${UNPRIVILEGED_GROUP}/g'
-.endif
-
-.if ${OPSYS} == "SunOS"
-post-install:
- ${LN} -s ${PREFIX}/lib/libaudio.so.2.4 ${PREFIX}/lib/libaudio.so.2
-.endif
-
-PLIST_SRC= ${PKGDIR}/PLIST.clients
-
-.if ${OPSYS} != "Darwin" && ${OPSYS} != "Interix"
-PLIST_SRC+= ${PKGDIR}/PLIST.server
-EGDIR= ${PREFIX}/share/examples/nas
-CONF_FILES= ${EGDIR}/nasd.conf.eg ${PKG_SYSCONFDIR}/nasd.conf
-
-. if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || \
- ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || ${OPSYS} == "UnixWare"
-. include "../../mk/oss.buildlink3.mk"
-PLIST_SRC+= ${PKGDIR}/PLIST.voxware
-. endif
-.endif
-
-pre-configure:
- cd ${WRKSRC}/config && ${SETENV} ${CONFIGURE_ENV} ./configure
-
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/nas/PLIST.clients b/audio/nas/PLIST.clients
deleted file mode 100644
index f7d8436b37e..00000000000
--- a/audio/nas/PLIST.clients
+++ /dev/null
@@ -1,195 +0,0 @@
-@comment $NetBSD: PLIST.clients,v 1.7 2006/06/17 11:47:47 markd Exp $
-bin/auconvert
-bin/auctl
-bin/audemo
-bin/audial
-bin/auedit
-bin/auinfo
-bin/aupanel
-bin/auphone
-bin/auplay
-bin/aurecord
-bin/auscope
-bin/autool
-bin/auwave
-bin/checkmail
-bin/issndfile
-bin/playbucket
-bin/soundtoh
-include/audio/8svx.h
-include/audio/Afuncproto.h
-include/audio/Afuncs.h
-include/audio/Alibint.h
-include/audio/Alibnet.h
-include/audio/Amd.h
-include/audio/Aos.h
-include/audio/Aosdefs.h
-include/audio/Aproto.h
-include/audio/Astreams.h
-include/audio/Xtutil.h
-include/audio/aiff.h
-include/audio/audio.h
-include/audio/audiolib.h
-include/audio/audioutil.h
-include/audio/fileutil.h
-include/audio/mutex.h
-include/audio/release.h
-include/audio/snd.h
-include/audio/sound.h
-include/audio/soundlib.h
-include/audio/voc.h
-include/audio/wave.h
-lib/X11/AuErrorDB
-lib/libaudio.a
-lib/libaudio.so
-lib/libaudio.so.2
-lib/libaudio.so.2.4
-${IMAKE_MAN_DIR}/auconvert.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/auctl.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/audemo.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/audial.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/auedit.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/auinfo.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/aupanel.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/auphone.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/auplay.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/aurecord.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/auscope.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/autool.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/auwave.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/checkmail.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/issndfile.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/nas.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/playbucket.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/soundtoh.${IMAKE_MANNEWSUFFIX}
-${IMAKE_LIBMAN_DIR}/AuAnyEvent.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuBucketAttributes.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuCloseServer.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuConvertDataToShort.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuConvertShortToData.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuCreateBucket.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuCreateFlow.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuDataFormats.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuDataTypes.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuDefineToFormat.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuDestroyBucket.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuDestroyFlow.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuDeviceAttributes.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuDispatchEvent.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuElement.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuElementNotifyEvent.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuElementParameters.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuElementState.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuErrorEvent.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuEvent.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuEventsQueued.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuFileFormats.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuFixedPointFractionalAddend.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuFixedPointFromFraction.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuFixedPointFromSum.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuFixedPointIntegralAddend.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuFixedPointRoundDown.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuFixedPointRoundUp.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuFlush.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuFormatToDefine.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuFormatToString.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuFreeBucketAttributes.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuFreeDeviceAttributes.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuFreeElementStates.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuFreeElements.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuGetBucketAttributes.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuGetCloseDownMode.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuGetDeviceAttributes.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuGetElementParameters.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuGetElementStates.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuGetElements.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuGetErrorDatabaseText.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuGetErrorText.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuGetScratchFlow.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuGetScratchFlowFromBucket.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuGetScratchFlowToBucket.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuGetServerTime.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuGrabNotifyEvent.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuHandleEvents.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuIDOfEvent.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuInputTrack.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuKillClient.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuListBuckets.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuListDevices.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuLookupEventHandler.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuMakeChangeStateAction.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuMakeElementAddConstant.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuMakeElementBundle.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuMakeElementExportBucket.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuMakeElementExportClient.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuMakeElementExportDevice.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuMakeElementExportMonitor.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuMakeElementImportBucket.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuMakeElementImportClient.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuMakeElementImportDevice.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuMakeElementImportWaveForm.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuMakeElementMultiplyConstant.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuMakeElementState.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuMakeElementSum.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuMakeInputTrack.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuMakeNoopAction.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuMakeSendNotifyAction.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuMonitorDevice.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuMonitorNotifyEvent.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuNextEvent.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuOpenServer.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuPauseFlow.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuReadElement.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuRegisterEventHandler.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuReleaseScratchFlow.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuRequeueEvent.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuScanEvents.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuScanForTypedEvent.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuServer.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuServerName.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuSetBucketAttributes.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuSetCloseDownMode.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuSetDeviceAttributes.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuSetElementParameters.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuSetElementStates.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuSetElements.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuSetErrorHandler.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuSetIOErrorHandler.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuSetString.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuSoundCreateBucketFromData.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuSoundCreateBucketFromFile.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuSoundCreateDataFromBucket.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuSoundCreateFileFromBucket.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuSoundPlay.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuSoundPlayFromBucket.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuSoundPlayFromData.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuSoundPlayFromFile.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuSoundPlaySynchronousFromFile.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuSoundRecord.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuSoundRecordToBucket.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuSoundRecordToData.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuSoundRecordToFile.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuSoundRecordToFileN.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuStartFlow.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuStopFlow.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuStringToFormat.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuStringToWaveForm.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuSync.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuSynchronize.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuUnregisterEventHandler.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuWaveFormToString.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/AuWriteElement.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/Sound.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/SoundAbbrevToFileFormat.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/SoundCloseFile.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/SoundCreate.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/SoundFlushFile.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/SoundOpenFileForReading.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/SoundOpenFileForWriting.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/SoundReadFile.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/SoundRewindFile.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/SoundSeekFile.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/SoundStringToFileFormat.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/SoundTellFile.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/SoundWriteFile.${IMAKE_LIBMAN_SUFFIX}
-@dirrm include/audio
diff --git a/audio/nas/PLIST.server b/audio/nas/PLIST.server
deleted file mode 100644
index 901f10d27dd..00000000000
--- a/audio/nas/PLIST.server
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST.server,v 1.1 2005/06/04 23:43:51 markd Exp $
-bin/nasd
-${IMAKE_MAN_DIR}/nasd.${IMAKE_MANNEWSUFFIX}
-${IMAKE_FILEMAN_DIR}/nasd.conf.${IMAKE_FILEMAN_SUFFIX}
-share/examples/nas/nasd.conf.eg
-@dirrm share/examples/nas
diff --git a/audio/nas/PLIST.voxware b/audio/nas/PLIST.voxware
deleted file mode 100644
index 674939779a4..00000000000
--- a/audio/nas/PLIST.voxware
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.voxware,v 1.3 2005/06/04 23:43:51 markd Exp $
-${IMAKE_MAN_DIR}/auvoxware.${IMAKE_MANNEWSUFFIX}
diff --git a/audio/nas/buildlink3.mk b/audio/nas/buildlink3.mk
deleted file mode 100644
index 75533db0d59..00000000000
--- a/audio/nas/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/12 17:21:52 rillig Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-NAS_BUILDLINK3_MK:= ${NAS_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= nas
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnas}
-BUILDLINK_PACKAGES+= nas
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}nas
-
-.if !empty(NAS_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.nas+= nas>=1.4.2
-BUILDLINK_ABI_DEPENDS.nas+= nas>=1.7bnb2
-BUILDLINK_PKGSRCDIR.nas?= ../../audio/nas
-.endif # NAS_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/nas/distinfo b/audio/nas/distinfo
deleted file mode 100644
index 1a3f5a6200f..00000000000
--- a/audio/nas/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.18 2006/07/08 00:27:56 minskim Exp $
-
-SHA1 (nas-1.8.src.tar.gz) = 6752861196f0b11db93572d935dc87bc6c0da348
-RMD160 (nas-1.8.src.tar.gz) = c7c99d7c3f66d8255bd5708325bd5c71c73b0a47
-Size (nas-1.8.src.tar.gz) = 1290578 bytes
-SHA1 (patch-aa) = 4026d90594cf31b15624a3c8cb72316978224113
-SHA1 (patch-ab) = f86037dc3a52cff543ee077d7f0d0a97cf24d9ff
-SHA1 (patch-ac) = 36f8ee0ec494e9d6a7994780c608c7a5fbf2114d
-SHA1 (patch-ad) = 5918e8188c8400fc7133c3ae4016d99c7c7594fa
-SHA1 (patch-ae) = f8ec2cb1809937aa7366ab65bee294e8affce543
-SHA1 (patch-af) = 3dfd09dad97549c69e44aac042ed971534926cca
-SHA1 (patch-ag) = fe8e2eed681f94499aaa1bbd19b158d2047a29fd
diff --git a/audio/nas/patches/patch-aa b/audio/nas/patches/patch-aa
deleted file mode 100644
index 6e0075d1526..00000000000
--- a/audio/nas/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2006/07/08 00:27:56 minskim Exp $
-
---- lib/audio/Imakefile.orig 2005-06-04 13:08:54.000000000 -0700
-+++ lib/audio/Imakefile
-@@ -159,6 +159,10 @@ REQUIREDLIBS = $(LDPRELIB) $(XAUTHLIB) $
- STD_INCLUDES = -I/usr/include
- #endif
-
-+#if defined(DarwinArchitecture)
-+REQUIREDLIBS = -L$(USRLIBDIR) -lXt $(XAULIB)
-+#endif
-+
-
- #if DoSharedLib
- #if DoNormalLib
diff --git a/audio/nas/patches/patch-ab b/audio/nas/patches/patch-ab
deleted file mode 100644
index 8ebe6cb88b2..00000000000
--- a/audio/nas/patches/patch-ab
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ab,v 1.12 2006/01/11 11:32:38 markd Exp $
-
---- server/Imakefile.orig 2005-06-04 16:40:58.000000000 +1200
-+++ server/Imakefile
-@@ -61,7 +61,7 @@ XCOMM $NCDId: @(#)Imakefile,v 1.17 1995/
- #endif
-
- #ifdef NetBSDArchitecture
-- SYSLIBS = -lossaudio
-+ SYSLIBS = $(LIBOSSAUDIO)
- #endif
-
- CBRT =
-@@ -96,7 +96,7 @@ ALL1 = nasd
- #endif
-
-
--#if defined(i386SVR4Architecture) || defined(__FreeBSD__) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__)
-+#if defined(i386SVR4Architecture) || defined(__FreeBSD__) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__)
- # define CanBuildAuServer YES
-
- # if defined(cygwinArchitecture)
-@@ -213,14 +213,19 @@ clean::
- $(RM) $(ALL)
-
- ETCDIR = NasConfigSearchPath
-+ EGDIR = ${PREFIX}/share/examples/nas
-
- InstallManPage(nasd,$(MANDIR))
- #ifdef InstallGenManPage
- InstallGenManPage(nasd.conf,$(FILEMANDIR),$(FILEMANSUFFIX))
- #else
-+#ifdef InstallNamedTarget
-+InstallNamedTarget(install.man,nasd.conf.man,$(INSTMANFLAGS),$(FILEMANDIR),nasd.conf.$(FILEMANSUFFIX))
-+#else
- InstallManPage(nasd.conf,$(FILEMANDIR))
- #endif
--InstallNonExecFile(nasd.conf.eg,$(ETCDIR))
-+#endif
-+InstallNonExecFile(nasd.conf.eg,$(EGDIR))
-
- #else /* CanBuildAuServer */
-
diff --git a/audio/nas/patches/patch-ac b/audio/nas/patches/patch-ac
deleted file mode 100644
index 8db4843c54f..00000000000
--- a/audio/nas/patches/patch-ac
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2002/11/28 11:40:46 markd Exp $
-
---- server/nasd.conf.eg.orig Tue Oct 8 16:08:02 2002
-+++ server/nasd.conf.eg
-@@ -29,8 +29,8 @@
-
- inputsection
-
-- device "/dev/dsp1" # The input device, usually
-- mixer "/dev/mixer1" # mixer device
-+ device "@DEVOSSAUDIO@" # The input device, usually
-+ mixer "/dev/mixer" # mixer device
- gain 50 # default input gain (0-100)
- maxrate 44100
- minrate 4000 # Kind of redundant
-@@ -47,7 +47,7 @@
-
- # These are used by voxware only for now.
- outputsection
-- device "/dev/dsp" # The output device, usually
-+ device "@DEVOSSAUDIO@" # The output device, usually
- mixer "/dev/mixer" # mixer device
- gain 50 # default output gain (0-100)
- maxrate 44100 # CD quality.
-@@ -73,7 +73,7 @@
- #
- #
- #outputsection
--# device "/dev/pcaudio"
-+# device "/dev/speaker"
- # maxrate 8000
- # minrate 8000
- # wordsize 8
diff --git a/audio/nas/patches/patch-ad b/audio/nas/patches/patch-ad
deleted file mode 100644
index a5d14f63795..00000000000
--- a/audio/nas/patches/patch-ad
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ad,v 1.10 2004/11/23 08:50:24 adam Exp $
-
---- server/dda/voxware/auvoxware.c.orig 2004-10-22 21:44:47.000000000 +0000
-+++ server/dda/voxware/auvoxware.c
-@@ -242,8 +242,13 @@ SndStat sndStatIn =
- 256, /* fragSize */
- 3, /* minFrags */
- 32, /* maxFrags */
-+#if defined(__NetBSD__)
-+ "@DEVOSSAUDIO@", /* device */
-+ "/dev/mixer", /* mixer */
-+#else
- "/dev/dsp1", /* device */
- "/dev/mixer1", /* mixer */
-+#endif
- #if defined(__CYGWIN__)
- O_RDONLY, /* howToOpen */
- #else
-@@ -264,7 +269,11 @@ SndStat sndStatIn =
- 256, /* fragSize */
- 3, /* minFrags */
- 32, /* maxFrags */
-+#if defined(__NetBSD__)
-+ "@DEVOSSAUDIO@", /* device */
-+#else
- "/dev/dsp", /* device */
-+#endif
- "/dev/mixer", /* mixer */
- #if defined(__CYGWIN__)
- O_WRONLY, /* howToOpen */
diff --git a/audio/nas/patches/patch-ae b/audio/nas/patches/patch-ae
deleted file mode 100644
index 9fe58616703..00000000000
--- a/audio/nas/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2002/11/28 11:40:46 markd Exp $
-
---- config/NetAudio.def.orig Sun Feb 24 17:39:08 2002
-+++ config/NetAudio.def
-@@ -8,6 +8,6 @@
-
- XCOMM Directory where NAS will look for it's config file(s)
- #ifndef NasConfigSearchPath
--#define NasConfigSearchPath /etc/nas/
-+#define NasConfigSearchPath @PKG_SYSCONFDIR@/
- #endif
-
diff --git a/audio/nas/patches/patch-af b/audio/nas/patches/patch-af
deleted file mode 100644
index ffb85003fdd..00000000000
--- a/audio/nas/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/07/13 10:42:31 wulf Exp $
-
---- clients/audio/auscope/auscope.orig 2003-07-13 20:03:00.000000000 +0930
-+++ clients/audio/auscope/auscope 2003-07-13 20:03:10.000000000 +0930
-@@ -31,7 +31,7 @@
- require "getopts.pl";
- require "sys/socket.ph";
-
--$disableTimestamp = !defined($t = eval 'require "syscall.ph"');
-+$disableTimestamp = !defined($t = eval 'require "sys/syscall.ph"');
- print "Warning: time stamping disabled due to $@" if $disableTimestamp;
-
- @errorStrings = ('Success', 'BadRequest', 'BadValue', 'BadDevice', 'BadBucket',
diff --git a/audio/nas/patches/patch-ag b/audio/nas/patches/patch-ag
deleted file mode 100644
index 6a82b3b512b..00000000000
--- a/audio/nas/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2006/01/11 11:32:38 markd Exp $
-
---- config/NetAudio.tmpl.orig 2006-01-11 23:44:25.000000000 +1300
-+++ config/NetAudio.tmpl
-@@ -287,6 +287,8 @@ AuComplexProgramTarget(program)
- release.h: $(TOP)/RELEASE @@\
- @echo "static char *release = \"@(#)`cat $(TOP)/RELEASE`\";" > $@ @@\
- @@\
-+includes:: release.h @@\
-+ @@\
- depend:: release.h @@\
- @@\
- clean:: @@\
diff --git a/audio/ncmpc/DESCR b/audio/ncmpc/DESCR
deleted file mode 100644
index 27ced55ff6e..00000000000
--- a/audio/ncmpc/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-ncmpc is a curses client for MPD, the Music Player Daemon with an
-interface is inspired by cplay.
diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile
deleted file mode 100644
index 7f7fe615fee..00000000000
--- a/audio/ncmpc/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2006/06/07 12:37:38 joerg Exp $
-
-DISTNAME= ncmpc-0.11.1
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= http://hem.bredband.net/kaw/ncmpc/files/ \
- http://mercury.chem.pitt.edu/~shank/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://hem.bredband.net/kaw/ncmpc/
-COMMENT= Curses client for Music Player Daemon
-
-GNU_CONFIGURE= yes
-USE_PKGLOCALEDIR= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= pkg-config msgfmt
-
-INCOMPAT_CURSES= NetBSD-1.4*-* NetBSD-1.5*-*
-INCOMPAT_CURSES+= NetBSD-1.6.*-* NetBSD-1.6_*-*
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/ncmpc/PLIST b/audio/ncmpc/PLIST
deleted file mode 100644
index b4b08e2a0bc..00000000000
--- a/audio/ncmpc/PLIST
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2006/04/17 07:07:12 jlam Exp $
-bin/ncmpc
-man/man1/ncmpc.1
-share/doc/ncmpc/AUTHORS
-share/doc/ncmpc/NEWS
-share/doc/ncmpc/README
-share/doc/ncmpc/config.sample
-share/doc/ncmpc/keys.sample
-share/doc/ncmpc/ncmpc.lirc
-share/locale/de/LC_MESSAGES/ncmpc.mo
-share/locale/es/LC_MESSAGES/ncmpc.mo
-share/locale/fr/LC_MESSAGES/ncmpc.mo
-share/locale/ru/LC_MESSAGES/ncmpc.mo
-share/locale/sv/LC_MESSAGES/ncmpc.mo
-@dirrm share/ncmpc
-@dirrm share/doc/ncmpc
diff --git a/audio/ncmpc/distinfo b/audio/ncmpc/distinfo
deleted file mode 100644
index d2bad7053c1..00000000000
--- a/audio/ncmpc/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/03/19 16:54:51 wiz Exp $
-
-SHA1 (ncmpc-0.11.1.tar.gz) = f1998f1d245386eb103ae12c50cf1bf0f5985ed7
-RMD160 (ncmpc-0.11.1.tar.gz) = a47e2850f165306e95c0966ac9e862e75cf876f7
-Size (ncmpc-0.11.1.tar.gz) = 273489 bytes
-SHA1 (patch-aa) = 3288d2b41ed02791639478aec9ac30fe2ee6eef0
-SHA1 (patch-ab) = 4a8e9191b797f4a8954e1b3b1b725f8255fa7fd8
diff --git a/audio/ncmpc/patches/patch-aa b/audio/ncmpc/patches/patch-aa
deleted file mode 100644
index 5e4ea962330..00000000000
--- a/audio/ncmpc/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/07/14 10:47:57 grant Exp $
-
---- src/screen_play.c.orig 2004-07-09 17:49:39.000000000 +1000
-+++ src/screen_play.c
-@@ -23,7 +23,8 @@
- #include <string.h>
- #include <glib.h>
- #include <ncurses.h>
--#include <panel.h>
-+/* not needed */
-+/* #include <panel.h> */
-
- #include "config.h"
- #include "ncmpc.h"
diff --git a/audio/ncmpc/patches/patch-ab b/audio/ncmpc/patches/patch-ab
deleted file mode 100644
index b1e5efbf149..00000000000
--- a/audio/ncmpc/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/03/19 16:54:51 wiz Exp $
-
---- src/screen.c.orig 2005-01-23 18:37:42.000000000 +0100
-+++ src/screen.c
-@@ -293,7 +293,7 @@ paint_status_window(mpdclient_t *c)
- if( c->song && seek_id == c->song->id )
- elapsedTime = seek_target_time;
- g_snprintf(screen->buf, screen->buf_size,
-- " [%i:%02i/%i:%02i]",
-+ " [%i:%02i/%i:%02i] ",
- elapsedTime/60, elapsedTime%60,
- status->totalTime/60, status->totalTime%60 );
- }
diff --git a/audio/normalize/DESCR b/audio/normalize/DESCR
deleted file mode 100644
index bef7ad61c70..00000000000
--- a/audio/normalize/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-normalize is a tool for adjusting the volume of WAV files to a
-standard level. This is useful for things like creating mixed CD's
-and mp3 collections, where different recording levels on different
-albums can cause the volume to vary greatly from song to song.
diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile
deleted file mode 100644
index a2cd6754e33..00000000000
--- a/audio/normalize/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2006/10/22 16:36:35 adam Exp $
-
-DISTNAME= normalize-0.7.7
-CATEGORIES= audio
-MASTER_SITES= http://www1.cs.columbia.edu/~cvaill/normalize/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www1.cs.columbia.edu/~cvaill/normalize/
-COMMENT= Audio file volume normalizer (wav,mp3,ogg)
-
-USE_TOOLS+= perl
-USE_LIBTOOL= yes
-USE_PKGLOCALEDIR= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-audiofile
-CONFIGURE_ARGS+= --with-mad
-
-REPLACE_PERL= src/normalize-mp3
-
-.include "options.mk"
-
-.include "../../audio/libaudiofile/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/normalize/PLIST b/audio/normalize/PLIST
deleted file mode 100644
index b73cfec2311..00000000000
--- a/audio/normalize/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2006/04/21 09:28:47 adam Exp $
-bin/normalize
-bin/normalize-mp3
-bin/normalize-ogg
-${XMMS_PLUGIN}lib/xmms/Effect/librva.la
-man/man1/normalize-mp3.1
-man/man1/normalize.1
-share/locale/en_GB/LC_MESSAGES/normalize.mo
-share/locale/fr/LC_MESSAGES/normalize.mo
diff --git a/audio/normalize/distinfo b/audio/normalize/distinfo
deleted file mode 100644
index 6e9f3c9b85d..00000000000
--- a/audio/normalize/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.6 2006/04/21 09:28:47 adam Exp $
-
-SHA1 (normalize-0.7.7.tar.bz2) = 1d84a9e1cd50b24ebb99428452604dd1fb78be9d
-RMD160 (normalize-0.7.7.tar.bz2) = cfb47808816da4196b7d87033921716bf13f212d
-Size (normalize-0.7.7.tar.bz2) = 388777 bytes
-SHA1 (patch-aa) = 1a19b511ac51b7b052507c795af3273ca688c7b8
diff --git a/audio/normalize/options.mk b/audio/normalize/options.mk
deleted file mode 100644
index 060d1e27adc..00000000000
--- a/audio/normalize/options.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2006/04/21 09:28:47 adam Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.normalize
-PKG_SUPPORTED_OPTIONS= xmms
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mxmms)
-PLIST_SUBST+= XMMS_PLUGIN=
-.include "../../audio/xmms/buildlink3.mk"
-.else
-PLIST_SUBST+= XMMS_PLUGIN="@comment "
-.endif
diff --git a/audio/normalize/patches/patch-aa b/audio/normalize/patches/patch-aa
deleted file mode 100644
index 7d9b987afbb..00000000000
--- a/audio/normalize/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2006/04/21 09:28:47 adam Exp $
-
---- src/mpegvolume.c.orig 2005-09-09 22:24:26.000000000 +0200
-+++ src/mpegvolume.c
-@@ -306,6 +306,7 @@ decode_output(void *dat, struct mad_head
- */
- ds->si->bits_per_sample = 16;
- ds->sums[0] = ds->sums[1] = 0;
-+ ds->maxpow = 0;
-
- /* set up smoothing window buffer */
- for (c = 0; c < 2; c++) {
diff --git a/audio/nosefart/DESCR b/audio/nosefart/DESCR
deleted file mode 100644
index f68ad8826ab..00000000000
--- a/audio/nosefart/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Nosefart is an NSF (NES (8-bit Nintendo) Sound Format) player.
diff --git a/audio/nosefart/Makefile b/audio/nosefart/Makefile
deleted file mode 100644
index eaf2ab4c170..00000000000
--- a/audio/nosefart/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2006/04/22 09:22:06 rillig Exp $
-
-DISTNAME= nosefart-2.3-mls
-PKGNAME= ${DISTNAME:S/-mls//}
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nosefart/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= dgriffi@cs.csubak.edu
-HOMEPAGE= http://nosefart.sourceforge.net/
-COMMENT= Player for NES Sound Format (NSF) files
-
-NOT_FOR_PLATFORM= Interix-*-*
-
-USE_TOOLS+= gmake
-NO_CONFIGURE= YES
-
-SUBST_CLASSES+= ossaudio
-SUBST_STAGE.ossaudio= pre-build
-SUBST_MESSAGE.ossaudio= Fixing audio device.
-SUBST_FILES.ossaudio= src/linux/main_linux.c
-SUBST_SED.ossaudio= -e 's|/dev/dsp|${DEVOSSSOUND}|'
-
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/nsfobj/nosefart ${PREFIX}/bin
-
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/nosefart/PLIST b/audio/nosefart/PLIST
deleted file mode 100644
index 725703bfcc7..00000000000
--- a/audio/nosefart/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/27 02:58:06 snj Exp $
-bin/nosefart
diff --git a/audio/nosefart/distinfo b/audio/nosefart/distinfo
deleted file mode 100644
index ed26fcf1116..00000000000
--- a/audio/nosefart/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:50 agc Exp $
-
-SHA1 (nosefart-2.3-mls.tar.bz2) = ab5755674adefa3f6f63e0772245831e7c0be2f7
-RMD160 (nosefart-2.3-mls.tar.bz2) = 54365aaf542d76f726a9b9ebb0d93a7a219c2e5e
-Size (nosefart-2.3-mls.tar.bz2) = 531605 bytes
-SHA1 (patch-aa) = 0ccefb7d1e9cfa7ca147624ac117c9570f012609
-SHA1 (patch-ab) = 325c4038a865ec686a33d440540be16a46445564
diff --git a/audio/nosefart/patches/patch-aa b/audio/nosefart/patches/patch-aa
deleted file mode 100644
index cf2aa96dab6..00000000000
--- a/audio/nosefart/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/12/03 13:02:18 wiz Exp $
-
---- Makefile.orig Thu Aug 12 17:19:33 2004
-+++ Makefile Thu Dec 2 00:52:22 2004
-@@ -1,9 +1,9 @@
- ################################
- # Configuration
-
--CC = gcc
--CFLAGS =
--LDFLAGS = -lm
-+#CC = gcc
-+#CFLAGS =
-+LDFLAGS += -lm ${LIBOSSAUDIO}
- PREFIX = /usr
- WANT_DEBUG=TRUE
-
diff --git a/audio/nosefart/patches/patch-ab b/audio/nosefart/patches/patch-ab
deleted file mode 100644
index a1c4df2da95..00000000000
--- a/audio/nosefart/patches/patch-ab
+++ /dev/null
@@ -1,89 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/12/03 13:02:18 wiz Exp $
-
---- src/linux/main_linux.c.orig Sat May 1 16:53:54 2004
-+++ src/linux/main_linux.c Thu Dec 2 01:58:01 2004
-@@ -3,6 +3,7 @@
- UNIX systems */
-
- #include <ctype.h>
-+#include <signal.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -342,12 +343,59 @@
- static void printsonginfo(int current_frame, int total_frames, int limited)
- {
- /*Why not printf directly? Our termios hijinks for input kills the output*/
-+
-+ /*
-+ * Once again, the termios hijinks cause trouble for NetBSD. \r
-+ * sometimes doesn't get printed. Following is a mostly complete
-+ * rewrite of the text output section as presented in my NetBSD
-+ * pkgsrc package for version 1.92i-mls. The fix was suggested by
-+ * Bruce J.A. Nourish. I'm David Griffith.
-+ */
-+
- char *hi = (char *)malloc(255);
- char blank[82];
- memset(blank, ' ', 80);
- blank[80] = '\r';
- blank[81] = '\0';
-
-+ if (total_frames !=0) {
-+ if (limited) {
-+ snprintf(hi, 254, "\rPlaying track %d of %d, channels %c%c%c%c%c%c, %d/%d seconds, %d/%d frames\r",
-+ nsf->current_song, nsf->num_songs,
-+ enabled[0]?'1':'-', enabled[1]?'2':'-',
-+ enabled[2]?'3':'-', enabled[3]?'4':'-',
-+ enabled[4]?'5':'-', enabled[5]?'6':'-',
-+ (int)((float)(current_frame + nsf->playback_rate - 1)/(float)nsf->playback_rate),
-+ (int)((float)(total_frames + nsf->playback_rate - 1)/(float)nsf->playback_rate),
-+ current_frame,
-+ total_frames);
-+ } else {
-+ snprintf(hi, 254, "\rPlaying track %d of %d, channels %c%c%c%c%c%c, %d/? seconds, %d/? frames\r",
-+ nsf->current_song, nsf->num_songs,
-+ enabled[0]?'1':'-', enabled[1]?'2':'-',
-+ enabled[2]?'3':'-', enabled[3]?'4':'-',
-+ enabled[4]?'5':'-', enabled[5]?'6':'-',
-+ (int)((float)(current_frame + nsf->playback_rate - 1)/(float)nsf->playback_rate),
-+ current_frame);
-+ }
-+ } else {
-+ snprintf(hi, 254, "\rPlaying track %d of %d, channels %c%c%c%c%c%c, %d seconds, %d frames\r",
-+ nsf->current_song, nsf->num_songs,
-+ enabled[0]?'1':'-', enabled[1]?'2':'-',
-+ enabled[2]?'3':'-', enabled[3]?'4':'-',
-+ enabled[4]?'5':'-', enabled[5]?'6':'-',
-+ (int)((float)(current_frame + nsf->playback_rate - 1)/(float)nsf->playback_rate),
-+ current_frame);
-+ }
-+
-+
-+/*
-+ * Not only does the following section do funny things to terminals,
-+ * it's a good example of how to use the trinary operator to make your
-+ * code very hard to understand. Please don't use the trinary operator
-+ * when if-then-else will do.
-+ */
-+#ifdef __REALLY_BIG_COMMENT__
- snprintf(hi, 254,
- total_frames != 0 ?
- "Playing track %d/%d, channels %c%c%c%c%c%c, %d/%d sec, %d/%d frames\r":
-@@ -363,9 +411,16 @@
- current_frame,
- total_frames
- );
-+#endif /* __REALLY_BIG_COMMENT__ */
-+
-
-+/*
-+ * I'm not sure what this is supposed to do. Under NetBSD it garbles
-+ * the screen, but not to the degree as the above commented-out code.
-+/*
- if(!(current_frame%10))
- write(STDOUT_FILENO, (void *)blank, strlen(blank));
-+*/
-
- write(STDOUT_FILENO, (void *)hi, strlen(hi));
- free(hi);
diff --git a/audio/nspmod/DESCR b/audio/nspmod/DESCR
deleted file mode 100644
index 68a08b0e93f..00000000000
--- a/audio/nspmod/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-NSPmod is a MOD (Protracker module and some of its extensions) / S3M
-(Scream Tracker 3 module) / MTM (Multitracker module) music player.
-This program uses a technology called No Signal Processor (NSP), which
-enables your PC play MODs without DSP such as Gravis UltraSound (GUS)
-GF1.
-
-This program requires VoxWare v2.90 compatible 8bit DAC device.
-
-I, John-Mark Gurney, have added support for output in 16bits. The
-volume level is slightly less than the 8bit version though.
diff --git a/audio/nspmod/Makefile b/audio/nspmod/Makefile
deleted file mode 100644
index 07263b1710f..00000000000
--- a/audio/nspmod/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2007/01/07 09:13:47 rillig Exp $
-#
-
-DISTNAME= nspmod-0.1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/sound/players/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-#HOMEPAGE= http://www.jeton.or.jp/users/toru/www/orgsoft/index.html
-COMMENT= MOD/S3M/MTM tracker that does its own DSP, uses VoxWare v2.90+
-
-NOT_FOR_PLATFORM= Interix-*-*
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/nspmod ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/nspmod.1 ${PREFIX}/${PKGMANDIR}/man1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/nspmod/PLIST b/audio/nspmod/PLIST
deleted file mode 100644
index 340381b16e6..00000000000
--- a/audio/nspmod/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:37 zuntum Exp $
-bin/nspmod
-man/man1/nspmod.1
diff --git a/audio/nspmod/distinfo b/audio/nspmod/distinfo
deleted file mode 100644
index 1e132a57e8d..00000000000
--- a/audio/nspmod/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/01/12 16:46:21 joerg Exp $
-
-SHA1 (nspmod-0.1.tar.gz) = 3409323d6dbf13e3236a85eb1b8ff9e51ee4de0c
-RMD160 (nspmod-0.1.tar.gz) = c5cd4e77066d1ea23d52e4ed7f10d82f30ed4d36
-Size (nspmod-0.1.tar.gz) = 32579 bytes
-SHA1 (patch-ac) = e116d9701c1f0fc9e7c4a441d332ad22aee4be24
-SHA1 (patch-ad) = a1a6f68bcaffe0ace1f5e32acb21a1c6bc2a2e47
-SHA1 (patch-ae) = 2788fd634fb11f667038089fd356e14f9d19ff6c
-SHA1 (patch-ba) = 247e147d3086fc499b333f90be3d427a12a8ef0f
-SHA1 (patch-bb) = fa08fafe222c41eb336b226d2f335dc22e934bc9
diff --git a/audio/nspmod/patches/patch-ac b/audio/nspmod/patches/patch-ac
deleted file mode 100644
index b5eb62b1e83..00000000000
--- a/audio/nspmod/patches/patch-ac
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-ac,v 1.3 1998/08/07 10:36:05 agc Exp $
-
-*** nspmod.c.orig Sat Sep 16 04:10:37 1995
---- nspmod.c Sat Mar 7 04:43:55 1998
-***************
-*** 1,4 ****
---- 1,5 ----
- #include <stdio.h> /*(perror)*/
-+ #include <sys/types.h>
- #include <sys/mman.h> /*PROT_READ,MAP_xxx*/
- #include <fcntl.h> /*O_RDONLY*/
- #include <sys/stat.h> /*stat*/
-***************
-*** 35,40 ****
---- 36,42 ----
- printf("NSPmod version " LIT(VERSION_MAJOR) "." LIT(VERSION_MINOR) "\n");
- printf("Usage: %s [options] modfile\n", argv0);
- printf("Options:\n");
-+ printf(" -b # number of bits to output (8 or 16)\n");
- printf(" -c # play only the channel\n");
- printf(" -e show events\n");
- printf(" -f # output sample rate\n");
-***************
-*** 59,69 ****
- static OptInfo oi;
- int optChar;
-
- oi.outRate = DEF_OUTRATE;
- oi.ovsFreq = -1;
- /*oi.repLimit = 1;*/
-! while ((optChar = getopt(argc, argv, "c:ef:il:mo:rs:v:")) > 0) {
- switch (optChar) {
- case 'c': oi.onlyCh = (i15x)strtol(optarg, NULL, 0) | 0x100; break;
- case 'e': oi.showEvents++; break;
- case 'f': oi.outRate = (u16x)strtol(optarg, NULL, 0); break;
---- 61,73 ----
- static OptInfo oi;
- int optChar;
-
-+ oi.bits = 8;
- oi.outRate = DEF_OUTRATE;
- oi.ovsFreq = -1;
- /*oi.repLimit = 1;*/
-! while ((optChar = getopt(argc, argv, "b:c:ef:il:mo:rs:v:")) > 0) {
- switch (optChar) {
-+ case 'b': oi.bits = (i15x)strtol(optarg, NULL, 0); break;
- case 'c': oi.onlyCh = (i15x)strtol(optarg, NULL, 0) | 0x100; break;
- case 'e': oi.showEvents++; break;
- case 'f': oi.outRate = (u16x)strtol(optarg, NULL, 0); break;
-***************
-*** 116,121 ****
---- 120,126 ----
-
- lookOverFile(p, statbuf.st_size);
- dacioInit();
-+ dci.bits = oi.bits;
- dci.speed = oi.outRate;
- dci.stereo = !oi.mono;
- dacioConf(&dci);
diff --git a/audio/nspmod/patches/patch-ad b/audio/nspmod/patches/patch-ad
deleted file mode 100644
index 0a0ed6ed3f5..00000000000
--- a/audio/nspmod/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 10:36:05 agc Exp $
-
-*** dacio.h.orig Wed Sep 3 14:58:39 1997
---- dacio.h Wed Sep 3 13:49:32 1997
-***************
-*** 3,8 ****
---- 3,9 ----
- #endif
-
- typedef struct {
-+ int bits;
- int speed;
- int stereo;
- } DacioConfInfo;
diff --git a/audio/nspmod/patches/patch-ae b/audio/nspmod/patches/patch-ae
deleted file mode 100644
index 87f473b2580..00000000000
--- a/audio/nspmod/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 10:36:06 agc Exp $
-
-*** nspmod.h.orig Wed Sep 3 14:58:53 1997
---- nspmod.h Wed Sep 3 13:47:40 1997
-***************
-*** 3,8 ****
---- 3,9 ----
- #endif
-
- typedef struct {
-+ i15x bits; /* -b # */
- i15x onlyCh; /* -c # */
- i15x showEvents; /* -e, -ee */
- u16x outRate; /* -f # */
diff --git a/audio/nspmod/patches/patch-ba b/audio/nspmod/patches/patch-ba
deleted file mode 100644
index acc39b05f8f..00000000000
--- a/audio/nspmod/patches/patch-ba
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ba,v 1.5 2006/01/12 16:46:21 joerg Exp $
-
---- Makefile.orig 1995-09-17 13:18:20.000000000 +0000
-+++ Makefile
-@@ -5,14 +5,14 @@ LIBS_EXT =
- #{ OS specific part
-
- ## Linux
--CFLAGS_OS = -Wall
-+#CFLAGS_OS = -Wall
- #CFLAGS_OS += -DDAC_DEV=\"/dev/dsp2\"
- #CFLAGS_OS += -pedantic
--CFLAGS_OPT = -g
--CFLAGS_HIOPT = -O2 -funroll-loops
--LDFLAGS_OS =
--LIBS_OS =
--DACIO_ARCH = dacio-linux.c
-+#CFLAGS_OPT = -g
-+#CFLAGS_HIOPT = -O2 -funroll-loops
-+#LDFLAGS_OS =
-+#LIBS_OS =
-+#DACIO_ARCH = dacio-linux.c
-
- ## A certain SVR4.2 based OS
- #CC = /usr/abiccs/bin/cc
-@@ -23,6 +23,20 @@ DACIO_ARCH = dacio-linux.c
- #LIBS_OS =
- #DACIO_ARCH = dacio-ews48.c
-
-+## NetBSD
-+CFLAGS_OS = -Wall
-+CFLAGS_OS += -pedantic
-+CFLAGS_OPT = -O2
-+CFLAGS_HIOPT = -O2 -funroll-loops
-+LDFLAGS_OS =
-+LIBS_OS =
-+CFLAGS_OS += -DDAC_DEV=\"/dev/audio\"
-+.if ${OPSYS} == "DragonFly"
-+DACIO_ARCH = dacio-linux.c
-+.else
-+DACIO_ARCH = dacio-netbsd.c
-+.endif
-+
- #}
-
- CFLAGS = $(CFLAGS_OS) $(CFLAGS_OPT) $(CFLAGS_EXT)
diff --git a/audio/nspmod/patches/patch-bb b/audio/nspmod/patches/patch-bb
deleted file mode 100644
index 2c2f94fa18a..00000000000
--- a/audio/nspmod/patches/patch-bb
+++ /dev/null
@@ -1,285 +0,0 @@
-$NetBSD: patch-bb,v 1.2 1998/08/07 10:36:06 agc Exp $
-
-*** /dev/null Fri Mar 6 05:54:22 1998
---- dacio-netbsd.c Fri Mar 6 06:51:04 1998
-***************
-*** 0 ****
---- 1,278 ----
-+ #include <stdio.h> /*(perror)*/
-+ #include <fcntl.h> /*O_WRONLY*/
-+ #include <sys/ioctl.h> /*(ioctl)*/
-+ #include <string.h> /*(memset)*/
-+ #include <unistd.h> /*(write)*/
-+ #include <sys/audioio.h> /*SNDCTL_XXX*/
-+ #include <errno.h> /*EINTR*/
-+ #include "defs.h" /*u8,u16*/
-+ #include "dacio.h" /*(dacioXXX)*/
-+ #include "mem.h" /*(memPerm)*/
-+
-+ #if 0
-+ #define LIM_SIZE (32 * 256) /* 32ch * 8bit */
-+
-+ static u8 *lim;
-+
-+ static void
-+ makeLim(void)
-+ {
-+ u8 *p;
-+ i15x i;
-+
-+ lim = (u8 *)memPerm(LIM_SIZE) + LIM_SIZE/2;
-+ p = lim-128;
-+ for (i = 0; i < 256; i++, p++) *p = i;
-+ for (; p < lim + LIM_SIZE/2; p++) *p = 255;
-+ }
-+ #endif
-+
-+ static int fd;
-+
-+ #ifndef DAC_DEV
-+ #define DAC_DEV "/dev/audio"
-+ #endif
-+
-+ void
-+ dacioInit(void)
-+ {
-+ fd = open(DAC_DEV, O_WRONLY);
-+ if (fd < 0) {
-+ perror("dacioInit");
-+ exit(1);
-+ }
-+ /*makeLim();*/
-+ }
-+
-+ static struct {
-+ union {
-+ u8 *p8;
-+ i15 *p16;
-+ } p;
-+ u8 *top;
-+ u8 *bot;
-+ int size;
-+ int shift;
-+ } buf;
-+
-+ #define bufRest() ((buf.bot - buf.p.p8) >> buf.shift)
-+
-+ static DacioConfInfo dci;
-+
-+ void
-+ dacioConf(DacioConfInfo *dcp)
-+ {
-+ audio_info_t info;
-+
-+ #if 0
-+ if (ioctl(fd, AUDIO_FLUSH, 0) < 0) {
-+ perror("dacioConf");
-+ exit(1);
-+ }
-+ #endif
-+ AUDIO_INITINFO(&info);
-+ info.play.encoding = AUDIO_ENCODING_LINEAR;
-+ info.play.precision = dcp->bits;
-+ info.play.channels = dcp->stereo ? 2 : 1;
-+ info.play.sample_rate = dcp->speed;
-+ if (ioctl(fd, AUDIO_SETINFO, &info) < 0) {
-+ perror("dacioConf");
-+ exit(1);
-+ }
-+ /*fprintf(stderr, "fmt = 0x%x\n", tmp);*/
-+
-+ if (ioctl(fd, AUDIO_GETINFO, &info) < 0) {
-+ perror("dacioConf");
-+ exit(1);
-+ }
-+ buf.size = info.play.buffer_size;
-+ /*fprintf(stderr, "buffer size = 0x%x\n", buf.size);*/
-+ dci = *dcp;
-+ /*if (buf.top != NULL) free(buf.top);*/
-+ buf.top = memPerm(buf.size);
-+ buf.p.p8 = buf.top;
-+ buf.bot = buf.top + buf.size;
-+ buf.shift = dci.stereo + ffs(dci.bits / 8) - 1;
-+ }
-+
-+ void
-+ dacioSync(void)
-+ {
-+ if (ioctl(fd, AUDIO_DRAIN, 0) < 0) {
-+ perror("dacioSync");
-+ exit(1);
-+ }
-+ }
-+
-+ /* OS independent part (?) */
-+
-+ void
-+ dacioFlush(void)
-+ {
-+ i15x n;
-+ u8 *u8p;
-+ i15 *i15p;
-+ int s;
-+
-+ if (buf.p.p8 <= buf.top) return;
-+
-+ n = bufRest() << dci.stereo;
-+ switch (dci.bits) {
-+ case 8:
-+ u8p = buf.p.p8;
-+ for (; n > 0; n--)
-+ *u8p++ = 128;
-+ buf.p.p8 = u8p;
-+ break;
-+ case 16:
-+ i15p = buf.p.p16;
-+ for (; n > 0; n--)
-+ *i15p++ = 0;
-+ buf.p.p16 = i15p;
-+ break;
-+ }
-+
-+ RETRY:
-+ s = write(fd, buf.top, buf.size);
-+ if (s < buf.size) {
-+ if (s < 0) {
-+ if (errno == EINTR) goto RETRY;
-+ perror("dacioFlush");
-+ } else fprintf(stderr, "wrote only %d bytes\n", s);
-+ exit(1);
-+ }
-+ buf.p.p8 = buf.top;
-+ }
-+
-+ static struct {
-+ const i31 *p0;
-+ const i31 *p;
-+ i15x len;
-+ } inbuf;
-+
-+ void
-+ dacioIncomingBuf(const i31 *bp)
-+ {
-+ inbuf.p0 = bp;
-+ }
-+
-+ void
-+ dacioIncomingBufLen(i15x len)
-+ {
-+ inbuf.len = len;
-+ }
-+
-+ static i15x gv = 0x40*0x40; /* default g.v = m.v = 64 */
-+
-+ /* gv = 0(min)..64*128(max) */
-+ void
-+ dacioGlobalVol(i15x v)
-+ {
-+ gv = v;
-+ }
-+
-+ #define VOL_MAX (64*64*128) /* vol max * g.v max * m.v max */
-+ #define VOL_MAX_LOG ( 6+ 6+ 7) /* 1 << VOL_MAX_LOG == VOL_MAX */
-+ #define LEV_MAX (128*VOL_MAX)
-+
-+ #if 0
-+ #define to8bit(x, /*i31x*/tmpvar) \
-+ ( tmpvar = (x) * gv, \
-+ (tmpvar >= LEV_MAX) ? 255 : \
-+ (tmpvar < -LEV_MAX) ? 0 : \
-+ (u32x)tmpvar/VOL_MAX ^ 128 )
-+ /* ^^^^^^ see asm output w/o this */
-+ #define to8bit(x, /*i31x*/tmpvar) \
-+ ( tmpvar = (x) * gv + LEV_MAX, \
-+ (tmpvar & ~(LEV_MAX*2-1)) ? \
-+ ((tmpvar < 0)? 0 : 255) : \
-+ (u32x)tmpvar/VOL_MAX)
-+ #define to8bit(x, /*i31x*/tmpvar) lim[(x) * gv >> VOL_MAX_LOG]
-+ #else
-+ /* almost the same CPU usage as lim[] table mathod */
-+ #define to8bit(x, /*i31x*/tmpvar) \
-+ ( tmpvar = ((x) * gv + LEV_MAX) >> VOL_MAX_LOG, \
-+ (tmpvar & ~255)? ~tmpvar >> 16 : tmpvar ) /* 16 will be OK */
-+ /* ~(tmpvar >> 16) makes longer asm */
-+ #endif
-+ #define to16bit(x) \
-+ ( ((x) * gv) >> 12 )
-+
-+ /* stereo */
-+ static void
-+ dacioOutHirevS(i15x n)
-+ {
-+ const i31 *inbufp = inbuf.p;
-+ u8 *u8p;
-+ i15 *i15p;
-+
-+ switch (dci.bits) {
-+ case 8:
-+ u8p = buf.p.p8;
-+ for (; n > 0; n--) {
-+ i31x tmp;
-+ *u8p++ = to8bit(*inbufp++, tmp); /* L */
-+ *u8p++ = to8bit(*inbufp++, tmp); /* R */
-+ }
-+ buf.p.p8 = u8p;
-+ break;
-+ case 16:
-+ i15p = buf.p.p16;
-+ for (; n > 0; n--) {
-+ *i15p++ = to16bit(*inbufp++); /* L */
-+ *i15p++ = to16bit(*inbufp++); /* R */
-+ }
-+ buf.p.p16 = i15p;
-+ break;
-+ }
-+ inbuf.p = inbufp;
-+ }
-+
-+ /* mono */
-+ static void
-+ dacioOutHirevM(i15x n)
-+ {
-+ const i31 *inbufp = inbuf.p;
-+ u8 *u8p;
-+ i15 *i15p;
-+
-+ switch (dci.bits) {
-+ case 8:
-+ u8p = buf.p.p8;
-+ for (; n > 0; n--) {
-+ i31x tmp;
-+ *u8p++ = to8bit(*inbufp, tmp);
-+ inbufp += 2;
-+ }
-+ buf.p.p8 = u8p;
-+ break;
-+ case 16:
-+ i15p = buf.p.p16;
-+ for (; n > 0; n--) {
-+ *i15p++ = to16bit(*inbufp);
-+ inbufp += 2;
-+ }
-+ buf.p.p16 = i15p;
-+ break;
-+ }
-+ inbuf.p = inbufp;
-+ }
-+
-+ #define dacioOutHirev(x) \
-+ if (dci.stereo) dacioOutHirevS(x); else dacioOutHirevM(x)
-+
-+ void
-+ dacioOut(void)
-+ {
-+ i31x iLen;
-+ i31x oLen;
-+
-+ inbuf.p = inbuf.p0;
-+ iLen = inbuf.len;
-+ while ((oLen = bufRest()) <= iLen) {
-+ iLen -= oLen;
-+ dacioOutHirev(oLen);
-+ dacioFlush();
-+ }
-+ dacioOutHirev(iLen);
-+ }
diff --git a/audio/oggasm/DESCR b/audio/oggasm/DESCR
deleted file mode 100644
index 574c49858eb..00000000000
--- a/audio/oggasm/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Oggasm is a program that makes converting your mp3 collection into oggs
-at all but painless process. Using oggenc and mpg321(or mpg123), with perl
-glueing it all together, oggasm is able to go through an entire collection,
-identify id3 tags and then convert those mp3s into oggs while keeping
-the id3 tags intact.
diff --git a/audio/oggasm/Makefile b/audio/oggasm/Makefile
deleted file mode 100644
index 901ec4f10ad..00000000000
--- a/audio/oggasm/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2007/01/07 09:13:47 rillig Exp $
-#
-
-DISTNAME= oggasm_1.4.0
-PKGNAME= ${DISTNAME:S/_/-/}
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-
-MAINTAINER= rxg@NetBSD.org
-# HOMEPAGE= http://oggasm.sourceforge.net/
-# but see http://us.geocities.com/pvachusk/programs/index.html
-COMMENT= Perform batch conversion of mp3s into oggs
-
-DEPENDS+= mpg123>=0.59.18:../../audio/mpg123
-DEPENDS+= vorbis-tools>=1.0.0.7:../../audio/vorbis-tools
-DEPENDS+= p5-MP3-Info>=1.00:../../audio/p5-MP3-Info
-
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_TOOLS+= perl:run
-REPLACE_PERL= oggasm
-
-NO_BUILD= yes
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/oggasm ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/oggasm.1 ${PREFIX}/${PKGMANDIR}/man1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/oggasm/PLIST b/audio/oggasm/PLIST
deleted file mode 100644
index d92fc5b11c7..00000000000
--- a/audio/oggasm/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/22 12:26:16 zuntum Exp $
-bin/oggasm
-man/man1/oggasm.1
diff --git a/audio/oggasm/distinfo b/audio/oggasm/distinfo
deleted file mode 100644
index fdd957b390b..00000000000
--- a/audio/oggasm/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:50 agc Exp $
-
-SHA1 (oggasm_1.4.0.tar.gz) = 3a418b63b2b681a42ec1198a0c94b0f2209d1374
-RMD160 (oggasm_1.4.0.tar.gz) = e5704c10d4666a8165d9c0247e0e33f71352fba4
-Size (oggasm_1.4.0.tar.gz) = 35042 bytes
diff --git a/audio/openal/DESCR b/audio/openal/DESCR
deleted file mode 100644
index e8b108e896b..00000000000
--- a/audio/openal/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-OpenAL is a 3D positional spatialized sound library analogous to OpenGL:
-instead of micromanaging each aspect of sound playback and effect, the
-application writer may limit himself to placing sounds in the scene and
-letting the native OpenAL implementation determine the correct amount of
-pitch alteration, gain attenuation, phase shift, etc., required to render
-the sounds correctly.
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
deleted file mode 100644
index 74da5025414..00000000000
--- a/audio/openal/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2007/01/03 07:03:15 wiz Exp $
-
-DISTNAME= openal-0.0.8
-CATEGORIES= audio
-MASTER_SITES= http://www.openal.org/openal_webstf/downloads/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.openal.org/
-COMMENT= 3D positional spatialized sound library
-
-USE_TOOLS+= gmake makeinfo
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-
-INFO_FILES= # PLIST
-INSTALLATION_DIRS= ${PKGINFODIR} include/AL
-PKGCONFIG_OVERRIDE= admin/pkgconfig/openal.pc.in
-LIBS+= ${LIBOSSAUDIO}
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/openal/PLIST b/audio/openal/PLIST
deleted file mode 100644
index a500465bbd4..00000000000
--- a/audio/openal/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2007/01/03 07:03:15 wiz Exp $
-bin/openal-config
-include/AL/al.h
-include/AL/alc.h
-include/AL/alext.h
-lib/libopenal.la
-lib/pkgconfig/openal.pc
-@dirrm include/AL
diff --git a/audio/openal/buildlink3.mk b/audio/openal/buildlink3.mk
deleted file mode 100644
index 7544145a4c5..00000000000
--- a/audio/openal/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.7 2007/01/03 07:03:15 wiz Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-OPENAL_BUILDLINK3_MK:= ${OPENAL_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= openal
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenal}
-BUILDLINK_PACKAGES+= openal
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openal
-
-.if !empty(OPENAL_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.openal+= openal>=0.0.8
-BUILDLINK_PKGSRCDIR.openal?= ../../audio/openal
-.endif # OPENAL_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/openal/distinfo b/audio/openal/distinfo
deleted file mode 100644
index 62b04f3e2f4..00000000000
--- a/audio/openal/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.7 2007/01/03 07:03:15 wiz Exp $
-
-SHA1 (openal-0.0.8.tar.gz) = 31aaedc18bd26759bd51f4fa495bc4ccb08acb3e
-RMD160 (openal-0.0.8.tar.gz) = 29368dbceea7cfd8b5c520b9e0f0cfdc7324e265
-Size (openal-0.0.8.tar.gz) = 870671 bytes
-SHA1 (patch-aa) = fbd752704cabc991b634c830c427d69dc29e80a5
-SHA1 (patch-ab) = e0bfe865021fa54fe276e1c5da312f6d3747102b
diff --git a/audio/openal/patches/patch-aa b/audio/openal/patches/patch-aa
deleted file mode 100644
index 6e8a606bfae..00000000000
--- a/audio/openal/patches/patch-aa
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2007/01/03 07:03:15 wiz Exp $
-
---- src/backends/alc_backend_bsd.c.orig 2006-01-05 15:11:20.000000000 +0000
-+++ src/backends/alc_backend_bsd.c
-@@ -10,14 +10,22 @@
- #include "al_siteconfig.h"
-
- #include <AL/al.h>
-+#include <AL/alext.h>
- #include <assert.h>
- #include <fcntl.h>
-+#if defined(__FreeBSD__)
-+#include <machine/soundcard.h>
-+#elif defined(__NetBSD__) || defined(__OpenBSD__)
-+#include <soundcard.h>
-+#else
- #include <sys/soundcard.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
-+#include <sys/select.h>
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <sys/types.h>
-@@ -210,7 +218,11 @@ void release_native(void *handle) {
-
- handle_fd = *(int *) handle;
-
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
-+ if(ioctl(handle_fd, SNDCTL_DSP_RESET, NULL) < 0) {
-+#else
- if(ioctl(handle_fd, SNDCTL_DSP_RESET) < 0) {
-+#endif
- #ifdef DEBUG_MAXIMUS
- fprintf(stderr, "Couldn't reset dsp\n");
- #endif
diff --git a/audio/openal/patches/patch-ab b/audio/openal/patches/patch-ab
deleted file mode 100644
index b013fbc3b9a..00000000000
--- a/audio/openal/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2007/01/03 07:03:15 wiz Exp $
-
---- admin/pkgconfig/openal-config.in.orig 2006-02-11 09:36:55.000000000 +0000
-+++ admin/pkgconfig/openal-config.in
-@@ -165,7 +165,7 @@ if test "$echo_libs" = "yes"; then
- if test "${libdir}" = "/usr/lib" ; then
- libpathflag=""
- else
-- libpathflag="-L${libdir}"
-+ libpathflag="-Wl,-R${libdir} -L${libdir}"
- fi
- if test "${static_libs}" = "yes"; then
- ldflags="${openal_static_ldflags}"
diff --git a/audio/p5-Audio-CD/DESCR b/audio/p5-Audio-CD/DESCR
deleted file mode 100644
index c9a8abd216c..00000000000
--- a/audio/p5-Audio-CD/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Audio-CD perl module for use with disc-cover
diff --git a/audio/p5-Audio-CD/Makefile b/audio/p5-Audio-CD/Makefile
deleted file mode 100644
index d29c8137d69..00000000000
--- a/audio/p5-Audio-CD/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2005/10/16 15:29:13 wiz Exp $
-#
-
-DISTNAME= Audio-CD-0.05
-PKGNAME= p5-${DISTNAME}
-PKGREVISION= 3
-SVR4_PKGNAME= p5acd
-CATEGORIES= audio perl5
-MASTER_SITES= http://www.vanhemert.co.uk/files/
-
-MAINTAINER= drochner@NetBSD.org
-HOMEPAGE= http://www.vanhemert.co.uk/disc-cover.html
-COMMENT= Audio-CD perl module for use with disc-cover
-
-PERL5_PACKLIST= auto/Audio/CD/.packlist
-
-.include "../../audio/libcdaudio/buildlink3.mk"
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/p5-Audio-CD/PLIST b/audio/p5-Audio-CD/PLIST
deleted file mode 100644
index fb6c1e9b76c..00000000000
--- a/audio/p5-Audio-CD/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2002/08/31 03:37:33 wiz Exp $
diff --git a/audio/p5-Audio-CD/distinfo b/audio/p5-Audio-CD/distinfo
deleted file mode 100644
index 3a35956ba38..00000000000
--- a/audio/p5-Audio-CD/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:50 agc Exp $
-
-SHA1 (Audio-CD-0.05.tar.gz) = c2d9ff549021af6023cb6aa494fb8664beb79ee4
-RMD160 (Audio-CD-0.05.tar.gz) = ff57cc3bae982771eb2f519e179eecc73a7e8786
-Size (Audio-CD-0.05.tar.gz) = 10417 bytes
diff --git a/audio/p5-Audio-Wav/DESCR b/audio/p5-Audio-Wav/DESCR
deleted file mode 100644
index c5f836a1771..00000000000
--- a/audio/p5-Audio-Wav/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Perl modules for reading & writing Microsoft WAV files.
diff --git a/audio/p5-Audio-Wav/Makefile b/audio/p5-Audio-Wav/Makefile
deleted file mode 100644
index 3ed8d27db70..00000000000
--- a/audio/p5-Audio-Wav/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2007/02/27 08:53:44 wiz Exp $
-#
-
-DISTNAME= Audio-Wav-0.06
-PKGNAME= p5-${DISTNAME}
-CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Audio/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://search.cpan.org/dist/Audio-Wav/
-COMMENT= Perl modules for reading & writing Microsoft WAV files
-
-PERL5_PACKLIST= auto/Audio/Wav/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/p5-Audio-Wav/PLIST b/audio/p5-Audio-Wav/PLIST
deleted file mode 100644
index 0367520e811..00000000000
--- a/audio/p5-Audio-Wav/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/08/26 01:46:41 grant Exp $
diff --git a/audio/p5-Audio-Wav/distinfo b/audio/p5-Audio-Wav/distinfo
deleted file mode 100644
index 979c17e036a..00000000000
--- a/audio/p5-Audio-Wav/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2007/02/27 08:53:44 wiz Exp $
-
-SHA1 (Audio-Wav-0.06.tar.gz) = 2a95f42bd9ec80c564f479f2384a12fef4ecf038
-RMD160 (Audio-Wav-0.06.tar.gz) = 7b79802e114c91e47a484f14804f9e01167ab069
-Size (Audio-Wav-0.06.tar.gz) = 18201 bytes
diff --git a/audio/p5-CDDB-File/DESCR b/audio/p5-CDDB-File/DESCR
deleted file mode 100644
index 7b3f611d9bc..00000000000
--- a/audio/p5-CDDB-File/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This module provides an interface for extracting data from CDDB-format data
-files, as used by freedb. It does not read data from your CD nor submits
-information to freedb.
diff --git a/audio/p5-CDDB-File/Makefile b/audio/p5-CDDB-File/Makefile
deleted file mode 100644
index 14199ffa06b..00000000000
--- a/audio/p5-CDDB-File/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/08/23 10:38:10 jmmv Exp $
-
-DISTNAME= CDDB-File-1.05
-PKGNAME= p5-${DISTNAME}
-CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=CDDB/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://search.cpan.org/dist/CDDB-File/
-COMMENT= Parses a CDDB/freedb data file
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-PERL5_PACKLIST= auto/CDDB/File/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/p5-CDDB-File/PLIST b/audio/p5-CDDB-File/PLIST
deleted file mode 100644
index 1ba5fc308be..00000000000
--- a/audio/p5-CDDB-File/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/08/23 10:38:10 jmmv Exp $
diff --git a/audio/p5-CDDB-File/distinfo b/audio/p5-CDDB-File/distinfo
deleted file mode 100644
index 3d5b94b69f5..00000000000
--- a/audio/p5-CDDB-File/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/08/23 10:38:10 jmmv Exp $
-
-SHA1 (CDDB-File-1.05.tar.gz) = 84617e7a91541fc3f56438bd4d0eaca61fe37acb
-RMD160 (CDDB-File-1.05.tar.gz) = 0c0a060ec2526b01809780b0d7e2f769d001a8f7
-Size (CDDB-File-1.05.tar.gz) = 6481 bytes
diff --git a/audio/p5-CDDB/DESCR b/audio/p5-CDDB/DESCR
deleted file mode 100644
index 4dfd1e11ea7..00000000000
--- a/audio/p5-CDDB/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-The CDDB module implements a Perl class for communicating with an
-audio compact disc database through the CDDBP protocol. It allows
-querying the database and submitting new entries to it via e-mail (the
-Mail::Internet and Mail::Header modules are required for submitting,
-but their absence won't affect other functions). Unlike its analogs,
-CDDB.pm doesn't try to read a disc in your CD-ROM by itself, but
-relies on the main program supplying disc data. Therefore, it is
-particularly useful for developing software that deals with
-alternative media, such as MPEG audio files.
diff --git a/audio/p5-CDDB/Makefile b/audio/p5-CDDB/Makefile
deleted file mode 100644
index 661beb74283..00000000000
--- a/audio/p5-CDDB/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2007/02/27 08:54:46 wiz Exp $
-#
-
-DISTNAME= CDDB-1.17
-CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../by-authors/id/R/RC/RCAPUTO/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://search.cpan.org/dist/CDDB/
-COMMENT= High-level interface to the Compact Disc Database
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-PERL5_PACKLIST= auto/CDDB/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/p5-CDDB/PLIST b/audio/p5-CDDB/PLIST
deleted file mode 100644
index 93531c28df9..00000000000
--- a/audio/p5-CDDB/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/05/10 01:48:06 minskim Exp $
diff --git a/audio/p5-CDDB/distinfo b/audio/p5-CDDB/distinfo
deleted file mode 100644
index e517064f71c..00000000000
--- a/audio/p5-CDDB/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2007/01/05 15:29:56 chuck Exp $
-
-SHA1 (CDDB-1.17.tar.gz) = 015dd613f9bb37d2b820a377423d65fd8237092b
-RMD160 (CDDB-1.17.tar.gz) = 231dbff91171f8dc82c12269608420bb457a42e7
-Size (CDDB-1.17.tar.gz) = 23047 bytes
diff --git a/audio/p5-CDDB_get/DESCR b/audio/p5-CDDB_get/DESCR
deleted file mode 100644
index 0f5cccbd5ba..00000000000
--- a/audio/p5-CDDB_get/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-The CDDB_get module fetches the CDDB info for an audio cd.
diff --git a/audio/p5-CDDB_get/Makefile b/audio/p5-CDDB_get/Makefile
deleted file mode 100644
index 03b8f1d6b56..00000000000
--- a/audio/p5-CDDB_get/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2006/06/18 11:11:11 rillig Exp $
-#
-
-DISTNAME= CDDB_get-2.25
-PKGNAME= p5-${DISTNAME}
-PKGREVISION= 1
-CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../by-authors/id/F/FO/FONKIE/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://armin.emx.at/cddb/
-COMMENT= Perl interface to query for CDDB information
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-PERL5_PACKLIST= auto/CDDB_get/.packlist
-
-REPLACE_PERL+= cddb.pl
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/p5-CDDB_get/PLIST b/audio/p5-CDDB_get/PLIST
deleted file mode 100644
index 265a9372af8..00000000000
--- a/audio/p5-CDDB_get/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/10/18 03:44:05 ben Exp $
diff --git a/audio/p5-CDDB_get/distinfo b/audio/p5-CDDB_get/distinfo
deleted file mode 100644
index b154d400ec0..00000000000
--- a/audio/p5-CDDB_get/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/11/07 17:23:44 reed Exp $
-
-SHA1 (CDDB_get-2.25.tar.gz) = 45cb9202e4b052232e5beb4b961971a69c10c6ef
-RMD160 (CDDB_get-2.25.tar.gz) = f4af6162d3aa7c2d109e623487c48bb3c6540ccf
-Size (CDDB_get-2.25.tar.gz) = 21425 bytes
diff --git a/audio/p5-MP3-Info/DESCR b/audio/p5-MP3-Info/DESCR
deleted file mode 100644
index ce681767ca9..00000000000
--- a/audio/p5-MP3-Info/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-This is MP3::Info, for getting info out of and into MP3 files.
-
-This release has two small bugfixes, one for better rendering of ID3v2
-data in get_mp3tag, and one for dealing with some possibly broken MP3s.
-
-A wrapper module is included so scripts calling MPEG::MP3Info (the
-old name) will still work.
diff --git a/audio/p5-MP3-Info/Makefile b/audio/p5-MP3-Info/Makefile
deleted file mode 100644
index f1680dfc464..00000000000
--- a/audio/p5-MP3-Info/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2007/02/27 09:21:26 wiz Exp $
-
-DISTNAME= MP3-Info-1.21
-PKGNAME= p5-${DISTNAME}
-CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=MP3/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://search.cpan.org/dist/MP3-Info/
-COMMENT= Manipulate/fetch info from MP3 audio files
-
-PERL5_PACKLIST= auto/MP3/Info/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/p5-MP3-Info/PLIST b/audio/p5-MP3-Info/PLIST
deleted file mode 100644
index e13b5ef5764..00000000000
--- a/audio/p5-MP3-Info/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/03/02 02:30:34 rxg Exp $
diff --git a/audio/p5-MP3-Info/distinfo b/audio/p5-MP3-Info/distinfo
deleted file mode 100644
index 60a78450394..00000000000
--- a/audio/p5-MP3-Info/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.5 2007/02/27 09:21:26 wiz Exp $
-
-SHA1 (MP3-Info-1.21.tar.gz) = a9fc2682cce1dae25eb16bcf324106f3d636f07b
-RMD160 (MP3-Info-1.21.tar.gz) = d8a0f5e871bcb355c21613369df8f399a18c44f6
-Size (MP3-Info-1.21.tar.gz) = 124581 bytes
diff --git a/audio/p5-MP3-Tag/DESCR b/audio/p5-MP3-Tag/DESCR
deleted file mode 100644
index 8603e63c2ea..00000000000
--- a/audio/p5-MP3-Tag/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-This is a perl module to read/write ID3v1, ID3v1.1 and ID3v2.3
-tags of mp3-files. (Other tags hopefully to follow).
-
-In the directory examples, you find 2 examples, how to use
-the module. You can also read the documentation of this
-module with
-
-man MP3::Tag
-man MP3::Tag::ID3v1
-man MP3::Tag::ID3v2
-man MP3::Tag::ID3v2-Data
-
-More information about this project, new releases and so on, can
-be found at:
-
-http://tagged.sourceforge.net
diff --git a/audio/p5-MP3-Tag/Makefile b/audio/p5-MP3-Tag/Makefile
deleted file mode 100644
index 16141a1dc2b..00000000000
--- a/audio/p5-MP3-Tag/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2007/02/02 22:48:32 wiz Exp $
-
-DISTNAME= tagged-0.40
-PKGNAME= p5-MP3-Tag-0.40
-SVR4_PKGNAME= p5mp3
-PKGREVISION= 2
-CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=MP3/}
-
-MAINTAINER= damon@brodiefamily.org
-HOMEPAGE= http://tagged.sourceforge.net/
-COMMENT= This is a perl module to read/write tags of mp3-files
-
-DEPENDS+= p5-Compress-Zlib>=1.0:../../devel/p5-Compress-Zlib
-
-PERL5_PACKLIST= auto/MP3/Tag/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/p5-MP3-Tag/PLIST b/audio/p5-MP3-Tag/PLIST
deleted file mode 100644
index 3c7de882d92..00000000000
--- a/audio/p5-MP3-Tag/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:40 zuntum Exp $
diff --git a/audio/p5-MP3-Tag/distinfo b/audio/p5-MP3-Tag/distinfo
deleted file mode 100644
index d5d98f0ae1f..00000000000
--- a/audio/p5-MP3-Tag/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:50 agc Exp $
-
-SHA1 (tagged-0.40.tar.gz) = 7869212ef8347fc0d8adb31e10c7418a97c2dafa
-RMD160 (tagged-0.40.tar.gz) = 33b41d0976e7a9120a68c47de355751746c1760b
-Size (tagged-0.40.tar.gz) = 41163 bytes
diff --git a/audio/p5-MPEG-Audio-Frame/DESCR b/audio/p5-MPEG-Audio-Frame/DESCR
deleted file mode 100644
index 45f0d33cc52..00000000000
--- a/audio/p5-MPEG-Audio-Frame/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-A very simple, pure Perl module which allows parsing out data from MP3 files
-or streams and chunking them up into different frames. You can use this to
-accurately determine the length of an MP3, filter non-audio data, or chunk up
-the file for streaming via datagram. Virtually anything is possible.
-
-This module supports MPEG-1, MPEG-2 Multichannel, MPEG-2 LSF and MPEG-2.5.
diff --git a/audio/p5-MPEG-Audio-Frame/Makefile b/audio/p5-MPEG-Audio-Frame/Makefile
deleted file mode 100644
index 18167e3322a..00000000000
--- a/audio/p5-MPEG-Audio-Frame/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/08/23 10:37:36 jmmv Exp $
-
-DISTNAME= MPEG-Audio-Frame-0.09
-PKGNAME= p5-${DISTNAME}
-CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=MPEG/NUFFIN/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://search.cpan.org/dist/MPEG-Audio-Frame/
-COMMENT= Class for weeding out MPEG audio frames out of a file handle
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-PERL5_PACKLIST= auto/MPEG/Audio/Frame/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/p5-MPEG-Audio-Frame/PLIST b/audio/p5-MPEG-Audio-Frame/PLIST
deleted file mode 100644
index dfc20539d3a..00000000000
--- a/audio/p5-MPEG-Audio-Frame/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/08/23 10:37:36 jmmv Exp $
diff --git a/audio/p5-MPEG-Audio-Frame/distinfo b/audio/p5-MPEG-Audio-Frame/distinfo
deleted file mode 100644
index d537a869374..00000000000
--- a/audio/p5-MPEG-Audio-Frame/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/08/23 10:37:36 jmmv Exp $
-
-SHA1 (MPEG-Audio-Frame-0.09.tar.gz) = b3dc17ce3328518bcedae671aa6ef44894c65810
-RMD160 (MPEG-Audio-Frame-0.09.tar.gz) = effb9ca3d13f66191766c81f6b0e079898e66a96
-Size (MPEG-Audio-Frame-0.09.tar.gz) = 365714 bytes
diff --git a/audio/p5-MusicBrainz-Client/DESCR b/audio/p5-MusicBrainz-Client/DESCR
deleted file mode 100644
index c3270a68a5a..00000000000
--- a/audio/p5-MusicBrainz-Client/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-This module provides access to the libmusicbrainz client library
-from perl.
-
-For more information about the MusicBrainz project visit the projects
-website at http://www.musicbrainz.org/
diff --git a/audio/p5-MusicBrainz-Client/Makefile b/audio/p5-MusicBrainz-Client/Makefile
deleted file mode 100644
index 93ac2cca0f1..00000000000
--- a/audio/p5-MusicBrainz-Client/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:28:57 jlam Exp $
-#
-
-DISTNAME= MusicBrainz-Client-0.09
-PKGNAME= p5-${DISTNAME}
-PKGREVISION= 3
-CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=MusicBrainz/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.musicbrainz.org/
-COMMENT= Provide access to the libmusicbrainz client library
-
-DEPENDS+= p5-MusicBrainz-Queries>=0.07:../../audio/p5-MusicBrainz-Queries
-
-PERL5_PACKLIST= auto/MusicBrainz/Client/.packlist
-
-.include "../../audio/musicbrainz/buildlink3.mk"
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/p5-MusicBrainz-Client/PLIST b/audio/p5-MusicBrainz-Client/PLIST
deleted file mode 100644
index 84727587470..00000000000
--- a/audio/p5-MusicBrainz-Client/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/08/29 21:54:27 epg Exp $
diff --git a/audio/p5-MusicBrainz-Client/distinfo b/audio/p5-MusicBrainz-Client/distinfo
deleted file mode 100644
index 37a07c4be4c..00000000000
--- a/audio/p5-MusicBrainz-Client/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/06/26 19:48:54 epg Exp $
-
-SHA1 (MusicBrainz-Client-0.09.tar.gz) = 9fa6fd74c4ad5c5c7b3696a2ac94bd386d0bb70b
-RMD160 (MusicBrainz-Client-0.09.tar.gz) = 56e7c518e85af0be625d07316b44e7be9916090d
-Size (MusicBrainz-Client-0.09.tar.gz) = 23719 bytes
diff --git a/audio/p5-MusicBrainz-Queries/DESCR b/audio/p5-MusicBrainz-Queries/DESCR
deleted file mode 100644
index 6788abb3c9f..00000000000
--- a/audio/p5-MusicBrainz-Queries/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-This module provides access to the Music Brainz RDF Query Constants
-from perl.
-
-For more information about the Music Brainz project visit the
-projects website at http://www.musicbrainz.org/
diff --git a/audio/p5-MusicBrainz-Queries/Makefile b/audio/p5-MusicBrainz-Queries/Makefile
deleted file mode 100644
index 23b4eacc3b9..00000000000
--- a/audio/p5-MusicBrainz-Queries/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:28:57 jlam Exp $
-#
-
-DISTNAME= MusicBrainz-Queries-0.07
-PKGNAME= p5-${DISTNAME}
-PKGREVISION= 5
-CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=MusicBrainz/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.musicbrainz.org/
-COMMENT= Provide access to the Music Brainz RDF Query Constants
-
-PERL5_PACKLIST= auto/MusicBrainz/Queries/.packlist
-
-.include "../../audio/musicbrainz/buildlink3.mk"
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/p5-MusicBrainz-Queries/PLIST b/audio/p5-MusicBrainz-Queries/PLIST
deleted file mode 100644
index 08b48b4e52d..00000000000
--- a/audio/p5-MusicBrainz-Queries/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/08/29 21:53:25 epg Exp $
diff --git a/audio/p5-MusicBrainz-Queries/distinfo b/audio/p5-MusicBrainz-Queries/distinfo
deleted file mode 100644
index b17ae3c21e5..00000000000
--- a/audio/p5-MusicBrainz-Queries/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:50 agc Exp $
-
-SHA1 (MusicBrainz-Queries-0.07.tar.gz) = 2bdb8958927c768ef6dc5b060aca8f2e9404d164
-RMD160 (MusicBrainz-Queries-0.07.tar.gz) = bda322d5ee46afb5273c0c7008d7b23944165e9b
-Size (MusicBrainz-Queries-0.07.tar.gz) = 17645 bytes
diff --git a/audio/portaudio-devel/DESCR b/audio/portaudio-devel/DESCR
deleted file mode 100644
index ea9b3c87917..00000000000
--- a/audio/portaudio-devel/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-PortAudio is a free, cross platform, open-source, audio I/O library. It
-lets you write simple audio programs in 'C' that will compile and run on
-many platforms including Windows, Macintosh (8,9,X), Unix (OSS), SGI, and
-BeOS. PortAudio is intended to promote the exchange of audio synthesis
-software between developers on different platforms, and was recently
-selected as the audio component of a larger PortMusic project that includes
-MIDI and sound file support.
-
-PortAudio provides a very simple API for recording and/or playing sound
-using a simple callback function. Example programs are included that
-synthesize sine waves and pink noise, perform fuzz distortion on a guitar,
-list available audio devices, etc.
diff --git a/audio/portaudio-devel/Makefile b/audio/portaudio-devel/Makefile
deleted file mode 100644
index 204d96772f6..00000000000
--- a/audio/portaudio-devel/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2007/01/08 21:42:41 rillig Exp $
-
-DISTNAME= pa_snapshot_v19
-PKGNAME= portaudio-devel-20060521
-CATEGORIES= audio
-MASTER_SITES= http://www.portaudio.com/archives/
-DIST_SUBDIR= ${PKGNAME_NOREV}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.portaudio.com/
-COMMENT= Portable cross-platform Audio API
-
-NOT_FOR_PLATFORM= Interix-*-*
-
-USE_TOOLS+= gmake pkg-config
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/portaudio2
-CONFIGURE_ARGS+= --includedir=${PREFIX}/include/portaudio2
-CONFIGURE_ARGS+= --without-alsa
-LDFLAGS+= ${LIBOSSAUDIO}
-WRKSRC= ${WRKDIR}/portaudio
-
-INSTALLATION_DIRS= include/portaudio2 lib/portaudio2
-
-post-patch:
- touch ${WRKSRC}/libtool #, so that it gets replaced later
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/portaudio-devel/PLIST b/audio/portaudio-devel/PLIST
deleted file mode 100644
index 593fe6e7678..00000000000
--- a/audio/portaudio-devel/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2007/01/08 21:42:41 rillig Exp $
-include/portaudio2/portaudio.h
-lib/pkgconfig/portaudio-2.0.pc
-lib/portaudio2/libportaudio.la
-@dirrm include/portaudio2
-@dirrm lib/portaudio2
diff --git a/audio/portaudio-devel/buildlink3.mk b/audio/portaudio-devel/buildlink3.mk
deleted file mode 100644
index 3f022c50421..00000000000
--- a/audio/portaudio-devel/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:10:37 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-PORTAUDIO_DEVEL_BUILDLINK3_MK:= ${PORTAUDIO_DEVEL_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= portaudio-devel
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nportaudio-devel}
-BUILDLINK_PACKAGES+= portaudio-devel
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}portaudio-devel
-
-.if ${PORTAUDIO_DEVEL_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.portaudio-devel+= portaudio-devel>=20060521
-BUILDLINK_PKGSRCDIR.portaudio-devel?= ../../audio/portaudio-devel
-BUILDLINK_INCDIRS.portaudio-devel?= include/portaudio2
-BUILDLINK_LIBDIRS.portaudio-devel?= lib/portaudio2
-BUILDLINK_CPPFLAGS.portaudio-devel?= -I${BUILDLINK_PREFIX.portaudio-devel}/include/portaudio2
-.endif # PORTAUDIO_DEVEL_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/portaudio-devel/distinfo b/audio/portaudio-devel/distinfo
deleted file mode 100644
index afa34466cb1..00000000000
--- a/audio/portaudio-devel/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/06/08 09:50:40 joerg Exp $
-
-SHA1 (portaudio-devel-20060521/pa_snapshot_v19.tar.gz) = 05c35c7add9f95c79491fbacb80b057be339ed6f
-RMD160 (portaudio-devel-20060521/pa_snapshot_v19.tar.gz) = dea1e921189bd788815c3012498fc035f3df8bad
-Size (portaudio-devel-20060521/pa_snapshot_v19.tar.gz) = 722148 bytes
-SHA1 (patch-aa) = b29699d78e1216bb3d129f1736e8c7b56e8c322b
-SHA1 (patch-ac) = ec80d2277ae00885f2a881f83b0e7766f43193e3
diff --git a/audio/portaudio-devel/patches/patch-aa b/audio/portaudio-devel/patches/patch-aa
deleted file mode 100644
index 0346646e0ab..00000000000
--- a/audio/portaudio-devel/patches/patch-aa
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/06/06 15:48:34 joerg Exp $
-
---- configure.orig 2006-05-19 16:20:07.000000000 +0000
-+++ configure
-@@ -18957,7 +18957,7 @@ fi
-
-
-
--PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
-+have_jack=no
-
-
- echo "$as_me:$LINENO: checking for short" >&5
-@@ -20503,13 +20503,13 @@ _ACEOF
-
- irix* )
-
--echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -20572,7 +20572,7 @@ if test $ac_cv_lib_pthread_pthread_creat
- #define HAVE_LIBPTHREAD 1
- _ACEOF
-
-- LIBS="-lpthread $LIBS"
-+ LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
-
- else
- { { echo "$as_me:$LINENO: error: IRIX posix thread library not found!" >&5
-@@ -20746,20 +20746,20 @@ _ACEOF
-
- OTHER_OBJS="pa_sgi/pa_sgi.o src/os/unix/pa_unix_hostapis.o src/os/unix/pa_unix_util.o";
-
-- LIBS="-lm -ldmedia -laudio -lpthread";
-+ LIBS="-lm -ldmedia -laudio ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}";
- PADLL="libportaudio.so";
- SHARED_FLAGS="";
- ;;
-
- *)
-
-- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+ echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -20854,8 +20854,8 @@ _ACEOF
-
- fi
- THREAD_CFLAGS="-pthread"
-- DLL_LIBS="$DLL_LIBS -lm -lpthread";
-- LIBS="$LIBS -lm -lpthread";
-+ DLL_LIBS="$DLL_LIBS -lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}";
-+ LIBS="$LIBS -lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}";
- PADLL="libportaudio.so";
- SHARED_FLAGS="-shared -fPIC";
-
diff --git a/audio/portaudio-devel/patches/patch-ac b/audio/portaudio-devel/patches/patch-ac
deleted file mode 100644
index 35c845bab4c..00000000000
--- a/audio/portaudio-devel/patches/patch-ac
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2006/06/06 15:48:34 joerg Exp $
-
---- src/hostapi/oss/pa_unix_oss.c.orig 2006-05-17 08:02:24.000000000 +0000
-+++ src/hostapi/oss/pa_unix_oss.c
-@@ -42,7 +42,9 @@
- #include <sys/ioctl.h>
- #include <unistd.h>
- #include <pthread.h>
-+#if !defined(__NetBSD__) && !defined(__DragonFly__)
- #include <alloca.h>
-+#endif
- #include <malloc.h>
- #include <assert.h>
- #include <errno.h>
-@@ -52,12 +54,15 @@
- #include <limits.h>
- #include <semaphore.h>
-
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- # include <sys/soundcard.h>
- # define DEVICE_NAME_BASE "/dev/dsp"
- #elif defined __linux__
- # include <linux/soundcard.h>
- # define DEVICE_NAME_BASE "/dev/dsp"
-+#elif defined(__NetBSD__)
-+# include <soundcard.h>
-+# define DEVICE_NAME_BASE "/dev/audio"
- #else
- # include <machine/soundcard.h> /* JH20010905 */
- # define DEVICE_NAME_BASE "/dev/audio"
-@@ -1916,8 +1921,10 @@ static signed long GetStreamWriteAvailab
- PaOssStream *stream = (PaOssStream*)s;
- int delay = 0;
-
-+#if !defined(__NetBSD__)
- if( ioctl( stream->playback->fd, SNDCTL_DSP_GETODELAY, &delay ) < 0 )
- return paUnanticipatedHostError;
-+#endif
-
- return (PaOssStreamComponent_BufferSize( stream->playback ) - delay) / PaOssStreamComponent_FrameSize( stream->playback );
- }
diff --git a/audio/portaudio/DESCR b/audio/portaudio/DESCR
deleted file mode 100644
index ea9b3c87917..00000000000
--- a/audio/portaudio/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-PortAudio is a free, cross platform, open-source, audio I/O library. It
-lets you write simple audio programs in 'C' that will compile and run on
-many platforms including Windows, Macintosh (8,9,X), Unix (OSS), SGI, and
-BeOS. PortAudio is intended to promote the exchange of audio synthesis
-software between developers on different platforms, and was recently
-selected as the audio component of a larger PortMusic project that includes
-MIDI and sound file support.
-
-PortAudio provides a very simple API for recording and/or playing sound
-using a simple callback function. Example programs are included that
-synthesize sine waves and pink noise, perform fuzz distortion on a guitar,
-list available audio devices, etc.
diff --git a/audio/portaudio/Makefile b/audio/portaudio/Makefile
deleted file mode 100644
index 633c0f11508..00000000000
--- a/audio/portaudio/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2006/05/16 08:09:42 minskim Exp $
-
-DISTNAME= portaudio_v18_1
-PKGNAME= portaudio-18.1
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= http://www.portaudio.com/archives/
-EXTRACT_SUFX= .zip
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.portaudio.com/
-COMMENT= Portable cross-platform Audio API
-
-NOT_FOR_PLATFORM= Interix-*-*
-
-USE_TOOLS+= gmake
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-
-CFLAGS.Darwin= -Ipablio
-
-EXTRACT_OPTS_ZIP= -aqo
-
-pre-configure:
- ${CHMOD} 755 ${WRKSRC}/configure
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/portaudio/PLIST b/audio/portaudio/PLIST
deleted file mode 100644
index aae15336917..00000000000
--- a/audio/portaudio/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/10/05 03:53:15 ben Exp $
-include/portaudio.h
-lib/libportaudio.la
diff --git a/audio/portaudio/buildlink3.mk b/audio/portaudio/buildlink3.mk
deleted file mode 100644
index 5cba1b3d5ce..00000000000
--- a/audio/portaudio/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:37 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-PORTAUDIO_BUILDLINK3_MK:= ${PORTAUDIO_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= portaudio
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nportaudio}
-BUILDLINK_PACKAGES+= portaudio
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}portaudio
-
-.if !empty(PORTAUDIO_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.portaudio+= portaudio>=18.1
-BUILDLINK_ABI_DEPENDS.portaudio?= portaudio>=18.1nb2
-BUILDLINK_PKGSRCDIR.portaudio?= ../../audio/portaudio
-.endif # PORTAUDIO_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/portaudio/distinfo b/audio/portaudio/distinfo
deleted file mode 100644
index 888b51f3530..00000000000
--- a/audio/portaudio/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.7 2006/08/27 20:29:26 ben Exp $
-
-SHA1 (portaudio_v18_1.zip) = a460ac5484137d77df17a95ce844ff7f178305b1
-RMD160 (portaudio_v18_1.zip) = 3352d70225a81aae80eefabc3701658da0c750c2
-Size (portaudio_v18_1.zip) = 550130 bytes
-SHA1 (patch-aa) = e522bfbf7f69d6f15fd0a32e01a480db922acc56
-SHA1 (patch-ac) = bc8133f418cc062bae1513d5aeea7107c4bb1843
-SHA1 (patch-ad) = 5a343e721ae183facc58195026c7e5c49536632a
-SHA1 (patch-ae) = c2744f10d80a478ad571fcce82bf301d6c50cb59
-SHA1 (patch-af) = da42578e66137f95edbbb86bde724af32e398d57
-SHA1 (patch-ag) = 8aadcd18189dd1c8ae64885dbd209e5d7eae63a1
diff --git a/audio/portaudio/patches/patch-aa b/audio/portaudio/patches/patch-aa
deleted file mode 100644
index a123a0da2f6..00000000000
--- a/audio/portaudio/patches/patch-aa
+++ /dev/null
@@ -1,99 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/04/20 17:52:48 ben Exp $
-
---- pa_unix_oss/pa_unix.c.orig Sat Nov 22 17:06:46 2003
-+++ pa_unix_oss/pa_unix.c Sat Nov 22 17:13:50 2003
-@@ -375,7 +375,11 @@
- * and the watchdog will detect it.
- */
-
--#define SCHEDULER_POLICY SCHED_RR
-+#ifndef _POSIX_THREAD_IS_GNU_PTH
-+# define SCHEDULER_POLICY SCHED_RR
-+#else
-+# define SCHEDULER_POLICY 0
-+#endif
- #define WATCHDOG_MAX_SECONDS (3)
- #define WATCHDOG_INTERVAL_USEC (1000000)
-
-@@ -411,13 +415,16 @@
-
- static PaError PaHost_WatchDogProc( PaHostSoundControl *pahsc )
- {
-+#ifndef _POSIX_THREAD_IS_GNU_PTH
- struct sched_param schp = { 0 };
-+#endif
- int maxPri;
-
- #ifdef GNUSTEP
- GSRegisterCurrentThread(); /* SB20010904 */
- #endif
-
-+#ifndef _POSIX_THREAD_IS_GNU_PTH
- /* Run at a priority level above audio thread so we can still run if it hangs. */
- /* Rise more than 1 because of rumored off-by-one scheduler bugs. */
- schp.sched_priority = pahsc->pahsc_AudioPriority + 4;
-@@ -429,7 +436,7 @@
- ERR_RPT(("PaHost_WatchDogProc: cannot set watch dog priority!\n"));
- goto killAudio;
- }
--
-+#endif
- /* Compare watchdog time with audio and canary thread times. */
- /* Sleep for a while or until thread cancelled. */
- while( pahsc->pahsc_WatchDogRun )
-@@ -465,7 +472,8 @@
- return 0;
-
- lowerAudio:
-- {
-+#ifndef _POSIX_THREAD_IS_GNU_PTH
-+ {
- struct sched_param schat = { 0 };
- if( sched_setscheduler(pahsc->pahsc_AudioThreadPID, SCHED_OTHER, &schat) != 0)
- {
-@@ -478,7 +486,9 @@
- goto cleanup;
- }
- }
--
-+#else
-+ goto cleanup;
-+#endif
- killAudio:
- ERR_RPT(("PaHost_WatchDogProc: killing hung audio thread!\n"));
- pthread_kill( pahsc->pahsc_AudioThread, SIGKILL );
-@@ -574,18 +584,19 @@
- {
- PaHostSoundControl *pahsc;
- PaError result = paNoError;
-+#ifndef _POSIX_THREAD_IS_GNU_PTH
- struct sched_param schp = { 0 };
--
-+#endif
- pahsc = (PaHostSoundControl *) past->past_DeviceData;
- if( pahsc == NULL ) return paInternalError;
-
- pahsc->pahsc_AudioThreadPID = getpid();
- DBUG(("PaHost_BoostPriority: audio PID = %d\n", pahsc->pahsc_AudioThreadPID ));
--
-+#ifndef _POSIX_THREAD_IS_GNU_PTH
- /* Choose a priority in the middle of the range. */
- pahsc->pahsc_AudioPriority = (sched_get_priority_max(SCHEDULER_POLICY) -
- sched_get_priority_min(SCHEDULER_POLICY)) / 2;
-- schp.sched_priority = pahsc->pahsc_AudioPriority;
-+ schp.sched_priority = pahsc->pahsc_AudioPriority;
-
- if (sched_setscheduler(0, SCHEDULER_POLICY, &schp) != 0)
- {
-@@ -597,7 +608,10 @@
- /* We are running at high priority so we should have a watchdog in case audio goes wild. */
- result = PaHost_StartWatchDog( pahsc );
- }
--
-+#else
-+ DBUG(("PortAudio: audio callback priority set to level %d - call ignored with GNU Pth\n", schp.sched_priority));
-+ result = PaHost_StartWatchDog( pahsc );
-+#endif
- return result;
- }
-
diff --git a/audio/portaudio/patches/patch-ac b/audio/portaudio/patches/patch-ac
deleted file mode 100644
index a726e762c33..00000000000
--- a/audio/portaudio/patches/patch-ac
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2004/10/05 04:06:30 ben Exp $
-
---- Makefile.in.orig Tue Feb 11 23:24:56 2003
-+++ Makefile.in
-@@ -5,14 +5,14 @@
- #
-
- PREFIX = @prefix@
--CC = @CC@
-+CC = ${LIBTOOL} --mode=compile @CC@
- CFLAGS = @CFLAGS@ -Ipa_common
--LIBS = @LIBS@
-+LIBS = ${LIBOSSAUDIO} -L@prefix@/lib ${COMPILER_RPATH_FLAG}@prefix@/lib @LIBS@
- AR = @AR@
- RANLIB = @RANLIB@
- INSTALL = @INSTALL@
- SHARED_FLAGS = @SHARED_FLAGS@
--DLL_LIBS = @DLL_LIBS@
-+DLL_LIBS = @DLL_LIBS@ ${LIBOSSAUDIO}
-
- OTHER_OBJS = @OTHER_OBJS@
-
-@@ -57,18 +57,15 @@ all: lib/$(PALIB) lib/$(PADLLV) tests
- tests: bin/ $(TESTS)
-
- lib/$(PALIB): lib/ $(OBJS) Makefile $(PAINC)
-- $(AR) ruv lib/$(PALIB) $(OBJS)
-- $(RANLIB) lib/$(PALIB)
-+ ${LIBTOOL} --mode=link @CC@ -o lib/${PALIB:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 0:18:0 $(DLL_LIBS)
-
- lib/$(PADLLV): lib/ $(OBJS) Makefile $(PAINC)
-- $(CC) $(SHARED_FLAGS) -o lib/$(PADLLV) $(OBJS) $(DLL_LIBS)
-
- $(TESTS): bin/%: lib/$(PALIB) Makefile $(PAINC) pa_tests/%.c
-- $(CC) -o $@ $(CFLAGS) pa_tests/$*.c lib/$(PALIB) $(LIBS)
-+ ${LIBTOOL} --mode=link @CC@ -o $@ $(CFLAGS) pa_tests/$*.c lib/${PALIB:.a=.la} $(LIBS)
-
- install: lib/$(PALIB) lib/$(PADLLV)
-- $(INSTALL) -m 644 lib/$(PADLLV) $(PREFIX)/lib/$(PADLLV)
-- $(INSTALL) -m 644 lib/$(PALIB) $(PREFIX)/lib/$(PALIB)
-+ ${LIBTOOL} --mode=install $(INSTALL) -m 644 lib/${PALIB:.a=.la} $(PREFIX)/lib/
- cd $(PREFIX)/lib && rm -f $(PADLL) && ln -s $(PADLLV) $(PADLL)
- $(INSTALL) -m 644 pa_common/portaudio.h $(PREFIX)/include/portaudio.h
- @echo ""
diff --git a/audio/portaudio/patches/patch-ad b/audio/portaudio/patches/patch-ad
deleted file mode 100644
index 5c79ebe52b1..00000000000
--- a/audio/portaudio/patches/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/04/20 17:52:48 ben Exp $
-
---- pa_tests/patest_record.c.orig Sat Nov 22 17:26:48 2003
-+++ pa_tests/patest_record.c Sat Nov 22 17:27:12 2003
-@@ -133,6 +133,7 @@
- unsigned long framesPerBuffer,
- PaTimestamp outTime, void *userData )
- {
-+ int framesToPlay, samplesToPlay, samplesPerBuffer;
- paTestData *data = (paTestData*)userData;
- SAMPLE *rptr = &data->recordedSamples[data->frameIndex * NUM_CHANNELS];
- SAMPLE *wptr = (SAMPLE*)outputBuffer;
-@@ -141,7 +142,6 @@
- unsigned int framesLeft = data->maxFrameIndex - data->frameIndex;
- (void) inputBuffer; /* Prevent unused variable warnings. */
- (void) outTime;
-- int framesToPlay, samplesToPlay, samplesPerBuffer;
-
- if( framesLeft < framesPerBuffer )
- {
diff --git a/audio/portaudio/patches/patch-ae b/audio/portaudio/patches/patch-ae
deleted file mode 100644
index 94259bbded4..00000000000
--- a/audio/portaudio/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/04/20 17:52:49 ben Exp $
-
---- pa_tests/patest_wire.c.orig Sat Nov 22 17:27:23 2003
-+++ pa_tests/patest_wire.c Sat Nov 22 17:27:54 2003
-@@ -74,9 +74,9 @@
- SAMPLE *out = (SAMPLE*)outputBuffer;
- SAMPLE *in = (SAMPLE*)inputBuffer;
- unsigned int i;
-- (void) outTime;
- int samplesPerFrame;
- int numSamples;
-+ (void) outTime;
-
- samplesPerFrame = (int) userData;
- numSamples = framesPerBuffer * samplesPerFrame;
diff --git a/audio/portaudio/patches/patch-af b/audio/portaudio/patches/patch-af
deleted file mode 100644
index 285ca1fd79e..00000000000
--- a/audio/portaudio/patches/patch-af
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/04/20 17:52:49 ben Exp $
-
---- pa_unix_oss/pa_unix_oss.c~ Mon Jun 30 11:05:50 2003
-+++ pa_unix_oss/pa_unix_oss.c Wed Nov 26 02:40:25 2003
-@@ -47,6 +47,9 @@
- #include <machine/soundcard.h> /* JH20010905 */
- #endif
-
-+#ifdef __NetBSD__
-+#include <sys/audioio.h>
-+#endif
-
- #ifndef AFMT_S16_NE
- #define AFMT_S16_NE Get_AFMT_S16_NE()
-@@ -236,7 +239,11 @@
- ERR_RPT(("Pa_SetupDeviceFormat: HW does not support AFMT_S16_NE\n" ));
- return paHostError;
- }
--
-+#ifdef __NetBSD__
-+ tmp = 1;
-+ ioctl(devHandle, AUDIO_SETFD, &tmp); /* set full-duplex operations,
-+ * ignore the output on non-fd cards */
-+#endif
-
- /* Set number of channels. */
- tmp = numChannels;
diff --git a/audio/portaudio/patches/patch-ag b/audio/portaudio/patches/patch-ag
deleted file mode 100644
index 4a3e5ae29dd..00000000000
--- a/audio/portaudio/patches/patch-ag
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2006/08/27 20:29:26 ben Exp $
-
---- configure.orig 2003-02-11 23:24:56.000000000 -0800
-+++ configure
-@@ -1883,7 +1883,7 @@ host_os=`echo $ac_cv_host | sed 's/^\([^
- case "${host_os}" in
- darwin* )
-
-- OTHER_OBJS="pa_mac_core/pa_mac_core.o";
-+ OTHER_OBJS="pablio/ringbuffer.o pa_mac_core/pa_mac_core.o";
- LIBS="-framework CoreAudio -lm";
- PADLL="libportaudio.dylib";
- SHARED_FLAGS="-framework CoreAudio -dynamiclib";
-@@ -1909,13 +1909,13 @@ case "${host_os}" in
-
- *)
-
--echo "$as_me:1912: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+echo "$as_me:1912: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line 1920 "configure"
- #include "confdefs.h"
-@@ -1963,7 +1963,7 @@ if test $ac_cv_lib_pthread_pthread_creat
- #define HAVE_LIBPTHREAD 1
- EOF
-
-- LIBS="-lpthread $LIBS"
-+ LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
-
- else
- { { echo "$as_me:1969: error: libpthread not found!" >&5
-@@ -1972,7 +1972,7 @@ echo "$as_me: error: libpthread not foun
- fi
-
- OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
-- LIBS="-lm -lpthread";
-+ LIBS="-lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}";
- PADLL="libportaudio.so";
- SHARED_FLAGS="-shared";
- esac
diff --git a/audio/py-ao/DESCR b/audio/py-ao/DESCR
deleted file mode 100644
index dff79409661..00000000000
--- a/audio/py-ao/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Python bindings for libao. See audio/libao for details.
diff --git a/audio/py-ao/Makefile b/audio/py-ao/Makefile
deleted file mode 100644
index b9d0c13af6d..00000000000
--- a/audio/py-ao/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2007/03/17 20:43:23 rillig Exp $
-#
-
-DISTNAME= pyao-0.81
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION= 3
-CATEGORIES= audio python
-MASTER_SITES= http://vorbis.com/files/1.0.1/unix/py/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://vorbis.com/
-COMMENT= Python bindings for libao
-
-PY_PATCHPLIST= yes
-PYDISTUTILSPKG= yes
-
-HAS_CONFIGURE= yes
-CONFIG_SHELL= ${PYTHONBIN}
-CONFIGURE_SCRIPT= config_unix.py
-CONFIGURE_ARGS+= --prefix ${PREFIX}
-
-.include "../../audio/libao/buildlink3.mk"
-.include "../../lang/python/extension.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/py-ao/PLIST b/audio/py-ao/PLIST
deleted file mode 100644
index 35082d21b8b..00000000000
--- a/audio/py-ao/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/15 21:50:47 minskim Exp $
-${PYSITELIB}/aomodule.so
diff --git a/audio/py-ao/distinfo b/audio/py-ao/distinfo
deleted file mode 100644
index 7f842942841..00000000000
--- a/audio/py-ao/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:50 agc Exp $
-
-SHA1 (pyao-0.81.tar.gz) = 56b453fdf6d628ccb283a2c9ffa4fced96afc32c
-RMD160 (pyao-0.81.tar.gz) = f171e3ed06184e79671ef9c3e2736b56c218d5c8
-Size (pyao-0.81.tar.gz) = 15302 bytes
diff --git a/audio/py-cddb/DESCR b/audio/py-cddb/DESCR
deleted file mode 100644
index c5cf1aa2721..00000000000
--- a/audio/py-cddb/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-The dynamic duo of CDDB.py and DiscID.py, along with their side-kick C
-module cdrommodule.so, provide an easy way for Python programs to
-fetch information on audio CDs from CDDB (http://www.cddb.com/) -- a
-very large online database of track listings and other information on
-audio CDs.
-Note that for CDDB.py version 1.3 and later, the default CDDB servers
-have changed to FreeDB, as GraceNote, the owners of the
-previously-free CDDB archives, have become unreasonably restrictive
-with access to their database. See http://www.freedb.org/ for more
-information on FreeDB.
diff --git a/audio/py-cddb/Makefile b/audio/py-cddb/Makefile
deleted file mode 100644
index 036caaa40ac..00000000000
--- a/audio/py-cddb/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:13 joerg Exp $
-#
-
-DISTNAME= CDDB-1.4
-PKGNAME= ${PYPKGPREFIX}-cddb-1.4
-PKGREVISION= 1
-CATEGORIES= audio python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cddb-py/}
-
-MAINTAINER= drochner@NetBSD.org
-HOMEPAGE= http://cddb-py.sourceforge.net/
-COMMENT= Python module to access the CDDB online database
-
-PYDISTUTILSPKG= yes
-PYBINMODULE= yes
-
-.include "../../lang/python/extension.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/py-cddb/PLIST b/audio/py-cddb/PLIST
deleted file mode 100644
index 39d83d4d2a7..00000000000
--- a/audio/py-cddb/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2003/09/14 16:43:46 recht Exp $
-${PYSITELIB}/CDDB.py
-${PYSITELIB}/CDDB.pyc
-${PYSITELIB}/CDDB.pyo
-${PYSITELIB}/DiscID.py
-${PYSITELIB}/DiscID.pyc
-${PYSITELIB}/DiscID.pyo
-${PYSITELIB}/cdrom.so
diff --git a/audio/py-cddb/distinfo b/audio/py-cddb/distinfo
deleted file mode 100644
index 4279c5916e3..00000000000
--- a/audio/py-cddb/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/12/11 21:28:14 joerg Exp $
-
-SHA1 (CDDB-1.4.tar.gz) = 4b101ff3a0a5895385dffac8ab807400f682a195
-RMD160 (CDDB-1.4.tar.gz) = 9418e53382b1ac06363a22122bb72cc3fb518327
-Size (CDDB-1.4.tar.gz) = 39562 bytes
-SHA1 (patch-aa) = c492b5d562095677cea89b73a38cfee12cbd0853
diff --git a/audio/py-cddb/patches/patch-aa b/audio/py-cddb/patches/patch-aa
deleted file mode 100644
index ed8eb9869f8..00000000000
--- a/audio/py-cddb/patches/patch-aa
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/12/11 21:28:14 joerg Exp $
-
---- unix/cdrommodule.c.orig 2003-08-31 23:24:30.000000000 +0000
-+++ unix/cdrommodule.c
-@@ -29,7 +29,7 @@
- #include <linux/cdrom.h>
- #endif
-
--#if defined(sun) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(sun) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- #include <sys/cdio.h>
- #endif
-
-@@ -45,7 +45,7 @@
- * so that we don't have to repeat the code.
- */
-
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
-
- #define CDDB_TOC_HEADER_STRUCT ioc_toc_header
- #define CDDB_STARTING_TRACK_FIELD starting_track
-@@ -61,7 +61,7 @@
- #define CDDB_DEFAULT_CDROM_DEVICE "/dev/cdrom"
- #define CDDB_DEFAULT_CDROM_FLAGS 0
-
--#elif defined(__OpenBSD__)
-+#elif defined(__OpenBSD__) || defined(__NetBSD__)
-
- #define CDDB_TOC_HEADER_STRUCT ioc_toc_header
- #define CDDB_STARTING_TRACK_FIELD starting_track
-@@ -151,7 +151,7 @@ static PyObject *cdrom_toc_entry(PyObjec
- int cdrom_fd;
- unsigned char track;
-
--#if defined(__OpenBSD__)
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
- struct cd_toc_entry data;
- #elif defined(__APPLE__)
- dk_cd_read_track_info_t trackInfoParams;
-@@ -184,7 +184,7 @@ static PyObject *cdrom_toc_entry(PyObjec
- entry.CDDB_TRACK_FIELD = track;
- entry.CDDB_FORMAT_FIELD = CDDB_MSF_FORMAT;
-
--#if defined(__OpenBSD__)
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
- entry.data = &data;
- entry.data_len = sizeof(data);
- #endif
-@@ -206,7 +206,7 @@ static PyObject *cdrom_leadout(PyObject
- PyObject *cdrom_fileobj;
- int cdrom_fd;
-
--#if defined(__OpenBSD__)
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
- struct cd_toc_entry data;
- #elif defined(__APPLE__)
- struct CDDB_TOC_HEADER_STRUCT hdr;
-@@ -250,7 +250,7 @@ static PyObject *cdrom_leadout(PyObject
- entry.CDDB_TRACK_FIELD = CDDB_CDROM_LEADOUT;
- entry.CDDB_FORMAT_FIELD = CDDB_MSF_FORMAT;
-
--#if defined(__OpenBSD__)
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
- entry.data = &data;
- entry.data_len = sizeof(data);
- #endif
diff --git a/audio/py-karaoke/DESCR b/audio/py-karaoke/DESCR
deleted file mode 100644
index a1d8fbe7001..00000000000
--- a/audio/py-karaoke/DESCR
+++ /dev/null
@@ -1,19 +0,0 @@
-PyKaraoke is a free karaoke player for Linux, FreeBSD, Windows and
-GP2X.
-
-You can use this program to play your collection of CDG, MIDI and
-MPEG karaoke songs. No songs are provided, you must obtain these
-from elsewhere.
-
-In short, CDG is the format of professional karaoke CDs. These CDs
-can be ripped to your hard disk, and turned into a .mp3 file together
-with a .cdg file. This player gives you the ability to play those
-mp3+cdg files. PyKaraoke Features:
-
- * CDG (MP3+G, OGG+G) playback - Play standard CDG karaoke files
- * MIDI (.MID/.KAR) playback - Play MIDI format karaoke files
- * MPEG playback - Play karaoke songs and movies in MPEG format
- * Playlist - Queue up songs, sit back and enjoy
- * Searchable song database - Easily find your songs from the main screen
- * Search inside ZIP files - Play MP3+G/MIDI files wrapped in ZIP files
- * Cross-platform - Runs on Windows, Linux, FreeBSD and GP2X
diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
deleted file mode 100644
index d03c5552b96..00000000000
--- a/audio/py-karaoke/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2007/02/15 14:30:19 joerg Exp $
-#
-
-DISTNAME= pykaraoke-0.5
-PKGNAME= ${PYPKGPREFIX}-karaoke-0.5
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pykaraoke/}
-EXTRACT_SUFX= .zip
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://pykaraoke.sourceforge.net/
-COMMENT= Free Python-based karaoke player
-
-# for .kar files, untested for lack of files
-#DEPENDS+= timidity-[0-9]*:../../audio/timidity
-
-PYTHON_VERSIONS_ACCEPTED= 24
-PYDISTUTILSPKG= yes
-
-# supposedly needed, but I couldn't find out why
-#.include "../../audio/SDL_mixer/buildlink3.mk"
-#.include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/py-game/buildlink3.mk"
-.include "../../lang/python/extension.mk"
-.include "../../math/py-Numeric/buildlink3.mk"
-.include "../../x11/py-wxWidgets/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/py-karaoke/PLIST b/audio/py-karaoke/PLIST
deleted file mode 100644
index 6baab1ebce2..00000000000
--- a/audio/py-karaoke/PLIST
+++ /dev/null
@@ -1,57 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/02/06 00:12:27 wiz Exp $
-bin/pycdg
-bin/pykar
-bin/pykaraoke
-bin/pykaraoke_mini
-bin/pympg
-${PYSITELIB}/_pycdgAux.so
-${PYSITELIB}/pycdg.py
-${PYSITELIB}/pycdg.pyc
-${PYSITELIB}/pycdg.pyo
-${PYSITELIB}/pycdgAux.py
-${PYSITELIB}/pycdgAux.pyc
-${PYSITELIB}/pycdgAux.pyo
-${PYSITELIB}/pykar.py
-${PYSITELIB}/pykar.pyc
-${PYSITELIB}/pykar.pyo
-${PYSITELIB}/pykaraoke.py
-${PYSITELIB}/pykaraoke.pyc
-${PYSITELIB}/pykaraoke.pyo
-${PYSITELIB}/pykaraoke_mini.py
-${PYSITELIB}/pykaraoke_mini.pyc
-${PYSITELIB}/pykaraoke_mini.pyo
-${PYSITELIB}/pykconstants.py
-${PYSITELIB}/pykconstants.pyc
-${PYSITELIB}/pykconstants.pyo
-${PYSITELIB}/pykdb.py
-${PYSITELIB}/pykdb.pyc
-${PYSITELIB}/pykdb.pyo
-${PYSITELIB}/pykenv.py
-${PYSITELIB}/pykenv.pyc
-${PYSITELIB}/pykenv.pyo
-${PYSITELIB}/pykmanager.py
-${PYSITELIB}/pykmanager.pyc
-${PYSITELIB}/pykmanager.pyo
-${PYSITELIB}/pykplayer.py
-${PYSITELIB}/pykplayer.pyc
-${PYSITELIB}/pykplayer.pyo
-${PYSITELIB}/pykversion.py
-${PYSITELIB}/pykversion.pyc
-${PYSITELIB}/pykversion.pyo
-${PYSITELIB}/pympg.py
-${PYSITELIB}/pympg.pyc
-${PYSITELIB}/pympg.pyo
-share/applications/pykaraoke.desktop
-share/applications/pykaraoke_mini.desktop
-share/pykaraoke/fonts/DejaVuSans.ttf
-share/pykaraoke/fonts/DejaVuSansCondensed-Bold.ttf
-share/pykaraoke/fonts/DejaVuSansCondensed.ttf
-share/pykaraoke/icons/audio_16.png
-share/pykaraoke/icons/folder_close_16.png
-share/pykaraoke/icons/folder_open_16.png
-share/pykaraoke/icons/microphone.ico
-share/pykaraoke/icons/pykaraoke.xpm
-share/pykaraoke/icons/splash.jpg
-@dirrm share/pykaraoke/icons
-@dirrm share/pykaraoke/fonts
-@dirrm share/pykaraoke
diff --git a/audio/py-karaoke/distinfo b/audio/py-karaoke/distinfo
deleted file mode 100644
index f1a2cfc2d55..00000000000
--- a/audio/py-karaoke/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/02/06 00:12:27 wiz Exp $
-
-SHA1 (pykaraoke-0.5.zip) = e8f232fe45aa248c7adaa9ce853b1fa6f3d9da73
-RMD160 (pykaraoke-0.5.zip) = c20fa1eda3be04213cee2ad1c25c3d5558131f5a
-Size (pykaraoke-0.5.zip) = 817895 bytes
diff --git a/audio/py-mad/DESCR b/audio/py-mad/DESCR
deleted file mode 100644
index 6b9fb268d39..00000000000
--- a/audio/py-mad/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Python bindings for libmad. See audio/libmad for details.
diff --git a/audio/py-mad/Makefile b/audio/py-mad/Makefile
deleted file mode 100644
index 9d12b9fe596..00000000000
--- a/audio/py-mad/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2007/03/17 20:43:23 rillig Exp $
-#
-
-DISTNAME= pymad-0.5.4
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
-CATEGORIES= audio python
-MASTER_SITES= http://spacepants.org/src/pymad/download/
-
-MAINTAINER= froz@icix.org
-HOMEPAGE= http://spacepants.org/src/pymad/
-COMMENT= Python bindings for libmad
-
-PY_PATCHPLIST= yes
-PYDISTUTILSPKG= yes
-
-HAS_CONFIGURE= yes
-CONFIG_SHELL= ${PYTHONBIN}
-CONFIGURE_SCRIPT= config_unix.py
-CONFIGURE_ARGS+= --prefix ${PREFIX}
-
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../lang/python/extension.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/py-mad/PLIST b/audio/py-mad/PLIST
deleted file mode 100644
index 04cf09547c4..00000000000
--- a/audio/py-mad/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/15 22:26:05 minskim Exp $
-${PYSITELIB}/madmodule.so
diff --git a/audio/py-mad/distinfo b/audio/py-mad/distinfo
deleted file mode 100644
index ad0212b30eb..00000000000
--- a/audio/py-mad/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/07/24 20:25:31 drochner Exp $
-
-SHA1 (pymad-0.5.4.tar.gz) = 7f3cbee9b3272ff22a40655dd7237ad84f8c58b2
-RMD160 (pymad-0.5.4.tar.gz) = 3d9bac96eff98424d0aaa5cbab1c1d7eac8f00e6
-Size (pymad-0.5.4.tar.gz) = 21626 bytes
-SHA1 (patch-aa) = daaae1d8c57796841be10c6dad24b589fe928694
diff --git a/audio/py-mad/patches/patch-aa b/audio/py-mad/patches/patch-aa
deleted file mode 100644
index f48162d355e..00000000000
--- a/audio/py-mad/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/02/15 22:26:05 minskim Exp $
-
---- src/pymadfile.c~ Mon Oct 6 16:23:05 2003
-+++ src/pymadfile.c Sun Jan 11 13:35:13 2004
-@@ -47,7 +47,9 @@
-
- #include <Python.h>
- #include <stdio.h>
-+#ifndef __FreeBSD__
- #include <stdint.h>
-+#endif
- #include <errno.h>
- #include <string.h>
- #include <sys/stat.h>
diff --git a/audio/py-musicbrainz/DESCR b/audio/py-musicbrainz/DESCR
deleted file mode 100644
index 2dc8d24f0a2..00000000000
--- a/audio/py-musicbrainz/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-python-musicbrainz2 contains various modules for accessing the MusicBrainz
-web service, as well as parsing the MusicBrainz Metadata XML (MMD),
-or calculating DiscIDs from Audio CDs.
-
-The MusicBrainz Project (see http://musicbrainz.org) collects music
-metadata and is maintained by its large and constantly growing user
-community.
diff --git a/audio/py-musicbrainz/Makefile b/audio/py-musicbrainz/Makefile
deleted file mode 100644
index b52e2483911..00000000000
--- a/audio/py-musicbrainz/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/12/07 14:37:28 joerg Exp $
-
-DISTNAME= python-musicbrainz2-0.4.0
-PKGNAME= ${DISTNAME:S/python/${PYPKGPREFIX}/}
-CATEGORIES= audio python
-MASTER_SITES= http://musicbrainz.org/~matt/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://musicbrainz.org/doc/PythonMusicBrainz2
-COMMENT= Python interface to the MusicBrainz XML web service
-
-PYTHON_VERSIONS_ACCEPTED= 24 23
-PYDISTUTILSPKG= yes
-
-DEPENDS+= ${PYPKGPREFIX}-ctypes>=1.0.0:../../devel/py-ctypes
-DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-
-.include "../../audio/libdiscid/buildlink3.mk"
-.include "../../lang/python/extension.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/py-musicbrainz/PLIST b/audio/py-musicbrainz/PLIST
deleted file mode 100644
index 9644d8090cf..00000000000
--- a/audio/py-musicbrainz/PLIST
+++ /dev/null
@@ -1,37 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/10/13 02:32:45 epg Exp $
-bin/mb-submit-disc
-${PYSITELIB}/musicbrainz2/__init__.py
-${PYSITELIB}/musicbrainz2/__init__.pyc
-${PYSITELIB}/musicbrainz2/__init__.pyo
-${PYSITELIB}/musicbrainz2/data/__init__.py
-${PYSITELIB}/musicbrainz2/data/__init__.pyc
-${PYSITELIB}/musicbrainz2/data/__init__.pyo
-${PYSITELIB}/musicbrainz2/data/countrynames.py
-${PYSITELIB}/musicbrainz2/data/countrynames.pyc
-${PYSITELIB}/musicbrainz2/data/countrynames.pyo
-${PYSITELIB}/musicbrainz2/data/languagenames.py
-${PYSITELIB}/musicbrainz2/data/languagenames.pyc
-${PYSITELIB}/musicbrainz2/data/languagenames.pyo
-${PYSITELIB}/musicbrainz2/data/releasetypenames.py
-${PYSITELIB}/musicbrainz2/data/releasetypenames.pyc
-${PYSITELIB}/musicbrainz2/data/releasetypenames.pyo
-${PYSITELIB}/musicbrainz2/data/scriptnames.py
-${PYSITELIB}/musicbrainz2/data/scriptnames.pyc
-${PYSITELIB}/musicbrainz2/data/scriptnames.pyo
-${PYSITELIB}/musicbrainz2/disc.py
-${PYSITELIB}/musicbrainz2/disc.pyc
-${PYSITELIB}/musicbrainz2/disc.pyo
-${PYSITELIB}/musicbrainz2/model.py
-${PYSITELIB}/musicbrainz2/model.pyc
-${PYSITELIB}/musicbrainz2/model.pyo
-${PYSITELIB}/musicbrainz2/utils.py
-${PYSITELIB}/musicbrainz2/utils.pyc
-${PYSITELIB}/musicbrainz2/utils.pyo
-${PYSITELIB}/musicbrainz2/webservice.py
-${PYSITELIB}/musicbrainz2/webservice.pyc
-${PYSITELIB}/musicbrainz2/webservice.pyo
-${PYSITELIB}/musicbrainz2/wsxml.py
-${PYSITELIB}/musicbrainz2/wsxml.pyc
-${PYSITELIB}/musicbrainz2/wsxml.pyo
-@dirrm ${PYSITELIB}/musicbrainz2/data
-@dirrm ${PYSITELIB}/musicbrainz2
diff --git a/audio/py-musicbrainz/distinfo b/audio/py-musicbrainz/distinfo
deleted file mode 100644
index 4204de0adec..00000000000
--- a/audio/py-musicbrainz/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/10/13 02:32:45 epg Exp $
-
-SHA1 (python-musicbrainz2-0.4.0.tar.gz) = 19c5c68190a0b3923788cdafbd18f7296f053d13
-RMD160 (python-musicbrainz2-0.4.0.tar.gz) = f27d83f8be98c38eff5ce8aa8d069fac960c1b78
-Size (python-musicbrainz2-0.4.0.tar.gz) = 56557 bytes
diff --git a/audio/py-musique/DESCR b/audio/py-musique/DESCR
deleted file mode 100644
index 3e35185493a..00000000000
--- a/audio/py-musique/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-The fair interface to the iTunes Music Store.
-
-Features:
- * Preview songs
- * Signup for an account
- * Buy songs
- * Redownload songs that were bought with PyMusique
diff --git a/audio/py-musique/Makefile b/audio/py-musique/Makefile
deleted file mode 100644
index 0f17ba0ac31..00000000000
--- a/audio/py-musique/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:06 wiz Exp $
-#
-
-DISTNAME= pymusique-0.5
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION= 4
-CATEGORIES= audio
-MASTER_SITES= http://www.pyronecrophilia.com/content/pymusique/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.pyronecrophilia.com/content/pymusique/
-COMMENT= Interface to the iTunes Music Store
-
-RESTRICTED= Possible legal problems due to iTunes access
-NO_SRC_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-
-DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
-DEPENDS+= ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL
-DEPENDS+= ${PYPKGPREFIX}-mcrypt-[0-9]*:../../security/py-mcrypt
-DEPENDS+= ${PYPKGPREFIX}-libxml2-[0-9]*:../../textproc/py-libxml2
-DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-
-PYTHON_VERSIONS_ACCEPTED= 24 23
-
-PYDISTUTILSPKG= yes
-
-.include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
-.include "../../x11/py-gtk2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/py-musique/PLIST b/audio/py-musique/PLIST
deleted file mode 100644
index 3371221513d..00000000000
--- a/audio/py-musique/PLIST
+++ /dev/null
@@ -1,18 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2005/05/21 23:20:24 augustss Exp $
-bin/pymusique
-lib/pymusique/config.py
-lib/pymusique/debug.py
-lib/pymusique/dedrms.py
-lib/pymusique/player.py
-lib/pymusique/qtstream.py
-lib/pymusique/scramble.py
-lib/pymusique/store.py
-lib/pymusique/storebase.py
-share/applications/pymusique.desktop
-share/doc/pymusique/AUTHORS
-share/doc/pymusique/COPYING
-share/doc/pymusique/ChangeLog
-share/doc/pymusique/README
-share/pixmaps/pymusique.png
-@dirrm lib/pymusique
-@dirrm share/doc/pymusique
diff --git a/audio/py-musique/distinfo b/audio/py-musique/distinfo
deleted file mode 100644
index af36d094b1f..00000000000
--- a/audio/py-musique/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1 2005/05/21 23:20:24 augustss Exp $
-
-SHA1 (pymusique-0.5.tar.gz) = 7e6ca4fb4845bf74d44dbc8fa38a20646ae1fdac
-RMD160 (pymusique-0.5.tar.gz) = a152f4bbd196805a6b8022e9f2e822bbe727906f
-Size (pymusique-0.5.tar.gz) = 40386 bytes
-SHA1 (patch-aa) = b5cffe2a490fdc0b673e6ec5af37e46af8bb2043
diff --git a/audio/py-musique/patches/patch-aa b/audio/py-musique/patches/patch-aa
deleted file mode 100644
index e9517443bf0..00000000000
--- a/audio/py-musique/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/05/21 23:20:24 augustss Exp $
---- bin/pymusique.orig 2005-04-10 22:57:54.000000000 +0200
-+++ bin/pymusique 2005-05-20 20:17:36.000000000 +0200
-@@ -460,7 +460,13 @@
- if not os.path.isdir(self.config['songdir']):
- os.mkdir(self.config['songdir'])
- metadata = self.download['metaData']
-- filename = metadata['playlistArtistName'] + ' - ' + metadata['playlistName'] + ' - ' + metadata['songName']
-+ trackNo = ''
-+ if 'trackNumber' in metadata:
-+ trackNo = metadata['trackNumber']
-+ if len(trackNo) < 2:
-+ trackNo = '0' + trackNo
-+ trackNo = trackNo + ' - '
-+ filename = metadata['playlistArtistName'] + ' - ' + metadata['playlistName'] + ' - ' + trackNo + metadata['songName']
- filename = os.path.join(self.config['songdir'], filename.replace('/', '-') + '.m4a')
- file(filename, 'wb').write(data)
- try:
diff --git a/audio/py-mutagen/DESCR b/audio/py-mutagen/DESCR
deleted file mode 100644
index 199885b78b8..00000000000
--- a/audio/py-mutagen/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Mutagen is a Python module to handle audio metadata. It supports FLAC,
-M4A, Monkey's Audio, MP3, Musepack, Ogg FLAC, Ogg Speex, Ogg Theora, Ogg
-Vorbis, True Audio, WavPack and OptimFROG audio files. All versions of
-ID3v2 are supported, and all standard ID3v2.4 frames are parsed. It can
-read Xing headers to accurately calculate the bitrate and length of
-MP3s. ID3 and APEv2 tags can be edited regardless of audio format. It
-can also manipulate Ogg streams on an individual packet/page level.
diff --git a/audio/py-mutagen/Makefile b/audio/py-mutagen/Makefile
deleted file mode 100644
index d4871147d6d..00000000000
--- a/audio/py-mutagen/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2007/01/25 23:33:19 wiz Exp $
-#
-
-DISTNAME= mutagen-1.10
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES= audio
-MASTER_SITES= http://www.sacredchao.net/~piman/software/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.sacredchao.net/quodlibet/wiki/Development/Mutagen
-COMMENT= Audio metadata handling for Python
-
-USE_LANGUAGES= # none
-PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23
-
-.include "../../lang/python/extension.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/py-mutagen/PLIST b/audio/py-mutagen/PLIST
deleted file mode 100644
index d44a05caf25..00000000000
--- a/audio/py-mutagen/PLIST
+++ /dev/null
@@ -1,68 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2007/01/25 23:33:19 wiz Exp $
-${PYSITELIB}/mutagen/__init__.py
-${PYSITELIB}/mutagen/__init__.pyc
-${PYSITELIB}/mutagen/__init__.pyo
-${PYSITELIB}/mutagen/_constants.py
-${PYSITELIB}/mutagen/_constants.pyc
-${PYSITELIB}/mutagen/_constants.pyo
-${PYSITELIB}/mutagen/_util.py
-${PYSITELIB}/mutagen/_util.pyc
-${PYSITELIB}/mutagen/_util.pyo
-${PYSITELIB}/mutagen/_vorbis.py
-${PYSITELIB}/mutagen/_vorbis.pyc
-${PYSITELIB}/mutagen/_vorbis.pyo
-${PYSITELIB}/mutagen/apev2.py
-${PYSITELIB}/mutagen/apev2.pyc
-${PYSITELIB}/mutagen/apev2.pyo
-${PYSITELIB}/mutagen/asf.py
-${PYSITELIB}/mutagen/asf.pyc
-${PYSITELIB}/mutagen/asf.pyo
-${PYSITELIB}/mutagen/easyid3.py
-${PYSITELIB}/mutagen/easyid3.pyc
-${PYSITELIB}/mutagen/easyid3.pyo
-${PYSITELIB}/mutagen/flac.py
-${PYSITELIB}/mutagen/flac.pyc
-${PYSITELIB}/mutagen/flac.pyo
-${PYSITELIB}/mutagen/id3.py
-${PYSITELIB}/mutagen/id3.pyc
-${PYSITELIB}/mutagen/id3.pyo
-${PYSITELIB}/mutagen/m4a.py
-${PYSITELIB}/mutagen/m4a.pyc
-${PYSITELIB}/mutagen/m4a.pyo
-${PYSITELIB}/mutagen/monkeysaudio.py
-${PYSITELIB}/mutagen/monkeysaudio.pyc
-${PYSITELIB}/mutagen/monkeysaudio.pyo
-${PYSITELIB}/mutagen/mp3.py
-${PYSITELIB}/mutagen/mp3.pyc
-${PYSITELIB}/mutagen/mp3.pyo
-${PYSITELIB}/mutagen/mp4.py
-${PYSITELIB}/mutagen/mp4.pyc
-${PYSITELIB}/mutagen/mp4.pyo
-${PYSITELIB}/mutagen/musepack.py
-${PYSITELIB}/mutagen/musepack.pyc
-${PYSITELIB}/mutagen/musepack.pyo
-${PYSITELIB}/mutagen/ogg.py
-${PYSITELIB}/mutagen/ogg.pyc
-${PYSITELIB}/mutagen/ogg.pyo
-${PYSITELIB}/mutagen/oggflac.py
-${PYSITELIB}/mutagen/oggflac.pyc
-${PYSITELIB}/mutagen/oggflac.pyo
-${PYSITELIB}/mutagen/oggspeex.py
-${PYSITELIB}/mutagen/oggspeex.pyc
-${PYSITELIB}/mutagen/oggspeex.pyo
-${PYSITELIB}/mutagen/oggtheora.py
-${PYSITELIB}/mutagen/oggtheora.pyc
-${PYSITELIB}/mutagen/oggtheora.pyo
-${PYSITELIB}/mutagen/oggvorbis.py
-${PYSITELIB}/mutagen/oggvorbis.pyc
-${PYSITELIB}/mutagen/oggvorbis.pyo
-${PYSITELIB}/mutagen/optimfrog.py
-${PYSITELIB}/mutagen/optimfrog.pyc
-${PYSITELIB}/mutagen/optimfrog.pyo
-${PYSITELIB}/mutagen/trueaudio.py
-${PYSITELIB}/mutagen/trueaudio.pyc
-${PYSITELIB}/mutagen/trueaudio.pyo
-${PYSITELIB}/mutagen/wavpack.py
-${PYSITELIB}/mutagen/wavpack.pyc
-${PYSITELIB}/mutagen/wavpack.pyo
-@dirrm ${PYSITELIB}/mutagen
diff --git a/audio/py-mutagen/buildlink3.mk b/audio/py-mutagen/buildlink3.mk
deleted file mode 100644
index f19f561c900..00000000000
--- a/audio/py-mutagen/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/01/15 03:03:47 rillig Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-PY_MUTAGEN_BUILDLINK3_MK:= ${PY_MUTAGEN_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= py-mutagen
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-mutagen}
-BUILDLINK_PACKAGES+= py-mutagen
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-mutagen
-
-.if ${PY_MUTAGEN_BUILDLINK3_MK} == "+"
-. include "../../lang/python/pyversion.mk"
-BUILDLINK_API_DEPENDS.py-mutagen+= ${PYPKGPREFIX}-mutagen>=1.9
-BUILDLINK_PKGSRCDIR.py-mutagen?= ../../audio/py-mutagen
-.endif # PY_MUTAGEN_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/py-mutagen/distinfo b/audio/py-mutagen/distinfo
deleted file mode 100644
index 81f4a2703bf..00000000000
--- a/audio/py-mutagen/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2007/01/25 23:33:19 wiz Exp $
-
-SHA1 (mutagen-1.10.tar.gz) = 7afacb4aafdbab3e93984727565221fce8ed7036
-RMD160 (mutagen-1.10.tar.gz) = 375044c6173807383ebca197154628b85f0c2203
-Size (mutagen-1.10.tar.gz) = 504463 bytes
-SHA1 (patch-aa) = e1c7c4a562862f0bc7842961cc4c7ff423a5847f
diff --git a/audio/py-mutagen/patches/patch-aa b/audio/py-mutagen/patches/patch-aa
deleted file mode 100644
index 52a0b7a5b43..00000000000
--- a/audio/py-mutagen/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/01/10 10:21:25 drochner Exp $
-
---- setup.py.orig 2007-01-08 14:40:50.000000000 +0100
-+++ setup.py
-@@ -199,8 +199,8 @@ if __name__ == "__main__":
- author_email="quodlibet@lists.sacredchao.net",
- license="GNU GPL v2",
- packages=["mutagen"],
-- data_files=data_files,
-- scripts=glob.glob("tools/m*[!~]"),
-+# data_files=data_files,
-+# scripts=glob.glob("tools/m*[!~]"),
- long_description="""\
- Mutagen is a Python module to handle audio metadata. It supports FLAC,
- M4A, Monkey's Audio, MP3, Musepack, Ogg FLAC, Ogg Speex, Ogg Theora, Ogg
diff --git a/audio/py-ogg/DESCR b/audio/py-ogg/DESCR
deleted file mode 100644
index 1fa692eb659..00000000000
--- a/audio/py-ogg/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Libogg bindings for Python. See multimedia/libogg for details.
diff --git a/audio/py-ogg/Makefile b/audio/py-ogg/Makefile
deleted file mode 100644
index 449462bd0e9..00000000000
--- a/audio/py-ogg/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2007/03/17 20:43:23 rillig Exp $
-#
-
-DISTNAME= pyogg-1.3
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION= 2
-CATEGORIES= audio python
-MASTER_SITES= http://vorbis.com/files/1.0.1/unix/py/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://vorbis.com/
-COMMENT= Python bindings for OGG library
-
-PYDISTUTILSPKG= yes
-PY_PATCHPLIST= yes
-
-HAS_CONFIGURE= yes
-CONFIG_SHELL= ${PYTHONBIN}
-CONFIGURE_SCRIPT= config_unix.py
-CONFIGURE_ARGS+= --prefix ${PREFIX}
-
-.include "../../lang/python/extension.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/py-ogg/PLIST b/audio/py-ogg/PLIST
deleted file mode 100644
index 64fa44ffa1a..00000000000
--- a/audio/py-ogg/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/15 01:49:15 minskim Exp $
-${PYINC}/pyogg/pyogg.h
-${PYSITELIB}/ogg/__init__.py
-${PYSITELIB}/ogg/__init__.pyc
-${PYSITELIB}/ogg/__init__.pyo
-${PYSITELIB}/ogg/_ogg.so
-@dirrm ${PYSITELIB}/ogg
-@dirrm ${PYINC}/pyogg
diff --git a/audio/py-ogg/buildlink3.mk b/audio/py-ogg/buildlink3.mk
deleted file mode 100644
index 85aea411101..00000000000
--- a/audio/py-ogg/buildlink3.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:10:37 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-PY_OGG_BUILDLINK3_MK:= ${PY_OGG_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= pyogg
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyogg}
-BUILDLINK_PACKAGES+= pyogg
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyogg
-
-.if !empty(PY_OGG_BUILDLINK3_MK:M+)
-.include "../../lang/python/pyversion.mk"
-BUILDLINK_API_DEPENDS.pyogg+= ${PYPKGPREFIX}-ogg>=1.3
-BUILDLINK_ABI_DEPENDS.pyogg?= ${PYPKGPREFIX}-ogg>=1.3nb2
-BUILDLINK_PKGSRCDIR.pyogg?= ../../audio/py-ogg
-.endif # PY_OGG_BUILDLINK3_MK
-
-.include "../../multimedia/libogg/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/py-ogg/distinfo b/audio/py-ogg/distinfo
deleted file mode 100644
index f277e72f3f8..00000000000
--- a/audio/py-ogg/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:51 agc Exp $
-
-SHA1 (pyogg-1.3.tar.gz) = d68682bf7fa405784c47137c04ed6a5c6355064f
-RMD160 (pyogg-1.3.tar.gz) = d7673a9caf845a4ee39e16d6fe39cef623519dd6
-Size (pyogg-1.3.tar.gz) = 23871 bytes
diff --git a/audio/py-vorbis/DESCR b/audio/py-vorbis/DESCR
deleted file mode 100644
index 5fea2332439..00000000000
--- a/audio/py-vorbis/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Vorbis bindings for Python; see vorbis for details.
diff --git a/audio/py-vorbis/Makefile b/audio/py-vorbis/Makefile
deleted file mode 100644
index 1b88c038037..00000000000
--- a/audio/py-vorbis/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2007/03/17 20:43:23 rillig Exp $
-#
-
-DISTNAME= pyvorbis-1.3
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION= 2
-CATEGORIES= audio python
-MASTER_SITES= http://vorbis.com/files/1.0.1/unix/py/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://vorbis.com/
-COMMENT= Python bindings for Vorbis library
-
-PY_PATCHPLIST= yes
-PYDISTUTILSPKG= yes
-
-HAS_CONFIGURE= yes
-CONFIG_SHELL= ${PYTHONBIN}
-CONFIGURE_SCRIPT= config_unix.py
-CONFIGURE_ARGS+= --prefix ${PREFIX}
-
-.include "../../audio/py-ogg/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../lang/python/extension.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/py-vorbis/PLIST b/audio/py-vorbis/PLIST
deleted file mode 100644
index a3fca10af14..00000000000
--- a/audio/py-vorbis/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/15 15:47:29 minskim Exp $
-${PYSITELIB}/ogg/vorbis.so
diff --git a/audio/py-vorbis/distinfo b/audio/py-vorbis/distinfo
deleted file mode 100644
index 9551843b91d..00000000000
--- a/audio/py-vorbis/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:51 agc Exp $
-
-SHA1 (pyvorbis-1.3.tar.gz) = 589bbb35a43532d59311fdfef3d5f32255432367
-RMD160 (pyvorbis-1.3.tar.gz) = 66df9ad937ecabc8f1de46111d13e813461ba537
-Size (pyvorbis-1.3.tar.gz) = 38075 bytes
-SHA1 (patch-aa) = d698a2e6000882d8ec512b8549f1e35f88f10127
diff --git a/audio/py-vorbis/patches/patch-aa b/audio/py-vorbis/patches/patch-aa
deleted file mode 100644
index b6ac518b977..00000000000
--- a/audio/py-vorbis/patches/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/02/15 15:47:29 minskim Exp $
-
---- src/pyvorbisfile.c.foo Tue Sep 9 05:40:48 2003
-+++ src/pyvorbisfile.c Sat Nov 22 15:03:35 2003
-@@ -178,10 +178,12 @@
- static void
- py_ov_file_dealloc(PyObject *self)
- {
-+ py_vorbisfile *py_self;
-+
- if (PY_VORBISFILE(self))
- ov_clear(PY_VORBISFILE(self));
-
-- py_vorbisfile *py_self = (py_vorbisfile *) self;
-+ py_self = (py_vorbisfile *) self;
- if (py_self->py_file) {
- /* If file was opened from a file object, decref it, so it can
- close */
-@@ -221,6 +223,7 @@
- PyErr_Clear(); /* clear first failure */
- if (PyArg_ParseTuple(args, "O!|sl", &PyFile_Type, &fobject,
- &initial, &ibytes)) {
-+ int orig_fd, new_fd;
-
- fname = NULL;
- file = PyFile_AsFile(fobject);
-@@ -234,7 +237,6 @@
- Really, you shouldn't be passing in files anymore, but in the
- interest of backwards compatibility it'll stay.
- */
-- int orig_fd, new_fd;
- orig_fd = fileno(file);
- new_fd = dup(orig_fd);
- file = fdopen(new_fd, "r");
diff --git a/audio/py-xmms/DESCR b/audio/py-xmms/DESCR
deleted file mode 100644
index fd392c34f92..00000000000
--- a/audio/py-xmms/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-PyXMMS is a Python interface to XMMS, a multimedia player written for
-the X Window System. PyXMMS can be used to control XMMS or manage its
-main configuration file from a program written in Python.
diff --git a/audio/py-xmms/Makefile b/audio/py-xmms/Makefile
deleted file mode 100644
index aa2dc0594fa..00000000000
--- a/audio/py-xmms/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2006/10/04 20:44:19 wiz Exp $
-
-DISTNAME= pyxmms-2.02
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION= 2
-CATEGORIES= audio python
-MASTER_SITES= http://people.via.ecp.fr/~flo/2002/PyXMMS/dist/
-
-MAINTAINER= minskim@NetBSD.org
-HOMEPAGE= http://people.via.ecp.fr/~flo/index.en.xhtml\#PyXMMS_and_PyXMMS-remote
-COMMENT= Python interface to XMMS
-
-PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
-NO_CONFIGURE= yes
-
-SUBST_CLASSES+= paths
-SUBST_MESSAGE.paths= Fixing hardcoded paths.
-SUBST_STAGE.paths= post-patch
-SUBST_FILES.paths= setup.cfg
-SUBST_SED.paths= -e 's,/usr/local,${PREFIX}/,g'
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../lang/python/extension.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/py-xmms/PLIST b/audio/py-xmms/PLIST
deleted file mode 100644
index 4f6ad5a7c22..00000000000
--- a/audio/py-xmms/PLIST
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/17 19:54:19 minskim Exp $
-${PYSITELIB}/xmms/__init__.py
-${PYSITELIB}/xmms/__init__.pyc
-${PYSITELIB}/xmms/__init__.pyo
-${PYSITELIB}/xmms/_xmmsconfig.so
-${PYSITELIB}/xmms/_xmmscontrol.so
-${PYSITELIB}/xmms/common.py
-${PYSITELIB}/xmms/common.pyc
-${PYSITELIB}/xmms/common.pyo
-${PYSITELIB}/xmms/config.py
-${PYSITELIB}/xmms/config.pyc
-${PYSITELIB}/xmms/config.pyo
-${PYSITELIB}/xmms/control.py
-${PYSITELIB}/xmms/control.pyc
-${PYSITELIB}/xmms/control.pyo
-@dirrm ${PYSITELIB}/xmms
diff --git a/audio/py-xmms/distinfo b/audio/py-xmms/distinfo
deleted file mode 100644
index ecd52cacf49..00000000000
--- a/audio/py-xmms/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:51 agc Exp $
-
-SHA1 (pyxmms-2.02.tar.gz) = 04ea7186d71158b28b283ed02a160dd2bab4eb7a
-RMD160 (pyxmms-2.02.tar.gz) = de057b689a9803987648f8c84dfd1fd221794597
-Size (pyxmms-2.02.tar.gz) = 44020 bytes
diff --git a/audio/qsynth/DESCR b/audio/qsynth/DESCR
deleted file mode 100644
index c73110a7b08..00000000000
--- a/audio/qsynth/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Qsynth is a fluidsynth GUI front-end application written in C++ around the Qt3
-toolkit using Qt Designer. Eventually it may evolve into a softsynth management
-application allowing the user to control and manage a variety of command line
-softsynths but for the moment it wraps the excellent FluidSynth.
diff --git a/audio/qsynth/Makefile b/audio/qsynth/Makefile
deleted file mode 100644
index 63774bda95e..00000000000
--- a/audio/qsynth/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2006/05/28 11:56:04 joerg Exp $
-
-DISTNAME= qsynth-0.2.4
-PKGREVISION= 4
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qsynth/}
-
-MAINTAINER= adam@NetBSD.org
-HOMEPAGE= http://qsynth.sourceforge.net/
-COMMENT= Qt GUI Interface to FluidSynth
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-
-PTHREAD_AUTO_VARS= yes
-
-# a fix for qt-3.3.5, please remove if qt-3.3.6 (or newer) solves the problem
-SUBST_CLASSES+= hints
-SUBST_STAGE.hints= post-patch
-SUBST_MESSAGE.hints= Fix includehints.
-SUBST_FILES.hints= src/*.ui
-SUBST_FILTER_CMD.hints= ${GREP} -v includehint
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/qsynth ${PREFIX}/bin/
- ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/
- ${INSTALL_DATA} ${WRKSRC}/icons/qsynth.png ${PREFIX}/share/icons/
-
-.include "../../audio/fluidsynth/buildlink3.mk"
-.include "../../x11/qt3-tools/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/qsynth/PLIST b/audio/qsynth/PLIST
deleted file mode 100644
index 055df4e3ecd..00000000000
--- a/audio/qsynth/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/19 15:13:38 adam Exp $
-bin/qsynth
-share/icons/qsynth.png
diff --git a/audio/qsynth/distinfo b/audio/qsynth/distinfo
deleted file mode 100644
index e0b356b8fb6..00000000000
--- a/audio/qsynth/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/19 15:13:38 adam Exp $
-
-SHA1 (qsynth-0.2.4.tar.gz) = 280ce73c6f3d3f127dd14201eb190edfb7eabcaf
-RMD160 (qsynth-0.2.4.tar.gz) = eb048cb1a8d46cdb4c2ac44a30803f9b2067fa20
-Size (qsynth-0.2.4.tar.gz) = 127895 bytes
diff --git a/audio/rexima/DESCR b/audio/rexima/DESCR
deleted file mode 100644
index 3a79c871f08..00000000000
--- a/audio/rexima/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-rexima is a curses-based interactive mixer which can also be used
-from the command-line. It runs on any terminal with a screen size
-of 80x24 or greater. It's intended to be a simple, general, usable
-mixer without all the chrome usually present in other mixers.
diff --git a/audio/rexima/Makefile b/audio/rexima/Makefile
deleted file mode 100644
index 81e38d10b70..00000000000
--- a/audio/rexima/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2006/03/09 21:04:41 jlam Exp $
-#
-
-DISTNAME= rexima-1.4
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.ibiblio.org/pub/Linux/apps/sound/mixers/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://rus.members.beeb.net/rexima.html
-COMMENT= Curses-based interactive mixer
-
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/rexima/PLIST b/audio/rexima/PLIST
deleted file mode 100644
index 395bd2b0c69..00000000000
--- a/audio/rexima/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/10/23 09:24:54 wiz Exp $
-bin/rexima
-man/man1/rexima.1
diff --git a/audio/rexima/distinfo b/audio/rexima/distinfo
deleted file mode 100644
index c6322b13db4..00000000000
--- a/audio/rexima/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:51 agc Exp $
-
-SHA1 (rexima-1.4.tar.gz) = 86dc739e1a14074c89b06ce5ac668d13ef824948
-RMD160 (rexima-1.4.tar.gz) = 08251ac47f9ce6db01d2bb41d7b0c01c36c096d9
-Size (rexima-1.4.tar.gz) = 15903 bytes
-SHA1 (patch-aa) = ec9c0ebcbc85553dfc69535b8da19339e4db548b
diff --git a/audio/rexima/patches/patch-aa b/audio/rexima/patches/patch-aa
deleted file mode 100644
index 639aa35f51d..00000000000
--- a/audio/rexima/patches/patch-aa
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/10/23 09:24:55 wiz Exp $
-
---- Makefile.orig 2003-06-30 14:45:27.000000000 +0200
-+++ Makefile
-@@ -1,13 +1,13 @@
- # Makefile - makefile for rexima
-
--CC=gcc
--CFLAGS=-O -Wall
-+#CC=gcc
-+#CFLAGS=-O -Wall
-
- # Set BINDIR to directory for binary,
- # MANDIR to directory for man page.
- # Usually it will be simpler to just set PREFIX.
- #
--PREFIX=/usr/local
-+#PREFIX=/usr/local
- BINDIR=$(PREFIX)/bin
- MANDIR=$(PREFIX)/man/man1
-
-@@ -17,14 +17,14 @@ MANDIR=$(PREFIX)/man/man1
- all: rexima
-
- rexima: rexima.o
-- $(CC) $(CFLAGS) -o rexima rexima.o -lncurses
-+ $(CC) $(CFLAGS) -o rexima rexima.o -lncurses ${LIBOSSAUDIO}
-
- installdirs:
- /bin/sh ./mkinstalldirs $(BINDIR) $(MANDIR)
-
- install: rexima installdirs
-- install -s -m 755 rexima $(BINDIR)
-- install -m 644 rexima.1 $(MANDIR)
-+ ${BSD_INSTALL_PROGRAM} rexima $(BINDIR)
-+ ${BSD_INSTALL_DATA} rexima.1 $(MANDIR)
-
- uninstall:
- $(RM) $(BINDIR)/rexima $(MANDIR)/rexima.1
diff --git a/audio/rhythmbox/DESCR b/audio/rhythmbox/DESCR
deleted file mode 100644
index 770d0d722a0..00000000000
--- a/audio/rhythmbox/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-Rhythmbox is an integrated music management application, originally inspired
-by Apple's iTunes. It is free software, designed to work well under the GNOME
-Desktop, and is based on the powerful GStreamer media framework.
-
-Rhythmbox has a number of features, including:
-* Easy to use music browser.
-* Searching and sorting.
-* Comprehensive audio format support through GStreamer.
-* Internet Radio support.
-* Playlists.
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
deleted file mode 100644
index 3e500b1dd6b..00000000000
--- a/audio/rhythmbox/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# $NetBSD: Makefile,v 1.46 2007/03/21 12:05:41 wiz Exp $
-#
-
-DISTNAME= rhythmbox-0.9.6
-PKGREVISION= 1
-CATEGORIES= audio gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/rhythmbox/0.9/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.rhythmbox.org/
-COMMENT= Music management application for GNOME
-
-GNU_CONFIGURE= YES
-USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake intltool msgfmt pkg-config
-USE_LIBTOOL= YES
-USE_PKGLOCALEDIR= YES
-
-CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ARGS+= --without-bonobo
-CONFIGURE_ARGS+= --without-hal
-CONFIGURE_ARGS+= --without-ipod
-CONFIGURE_ARGS+= --disable-python
-
-GCONF2_SCHEMAS= rhythmbox.schemas
-
-BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0
-BUILDLINK_API_DEPENDS.musicbrainz+= musicbrainz>=2.1.0
-BUILDLINK_API_DEPENDS.totem+= {totem,totem-xine}>=1.1.5
-
-.include "../../audio/musicbrainz/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/libsexy/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../multimedia/gstreamer0.10/buildlink3.mk"
-.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
-.include "../../multimedia/totem/buildlink3.mk"
-.include "../../net/libsoup-devel/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
-.include "../../sysutils/libnotify/buildlink3.mk"
-.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/rhythmbox/PLIST b/audio/rhythmbox/PLIST
deleted file mode 100644
index 3f9f642fad2..00000000000
--- a/audio/rhythmbox/PLIST
+++ /dev/null
@@ -1,300 +0,0 @@
-@comment $NetBSD: PLIST,v 1.13 2006/10/17 16:45:07 drochner Exp $
-bin/rhythmbox
-bin/rhythmbox-client
-lib/rhythmbox/plugins/audiocd.rb-plugin
-lib/rhythmbox/plugins/audioscrobbler/audioscrobbler.rb-plugin
-lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.la
-lib/rhythmbox/plugins/cd-recorder/cd-recorder.rb-plugin
-lib/rhythmbox/plugins/cd-recorder/libcd-recorder.la
-lib/rhythmbox/plugins/generic-player/generic-player.rb-plugin
-lib/rhythmbox/plugins/generic-player/libgeneric-player.la
-lib/rhythmbox/plugins/libaudiocd.la
-libexec/rhythmbox-metadata
-share/applications/rhythmbox.desktop
-share/dbus-1/services/org.gnome.Rhythmbox.service
-share/doc/rhythmbox/ch01.html
-share/doc/rhythmbox/ch02.html
-share/doc/rhythmbox/ch03.html
-share/doc/rhythmbox/ch04.html
-share/doc/rhythmbox/ch05.html
-share/doc/rhythmbox/ch06.html
-share/doc/rhythmbox/ch07.html
-share/doc/rhythmbox/ch08.html
-share/doc/rhythmbox/home.png
-share/doc/rhythmbox/index.html
-share/doc/rhythmbox/index.sgml
-share/doc/rhythmbox/left.png
-share/doc/rhythmbox/rhythmbox-RBCellRendererPixbuf.html
-share/doc/rhythmbox/rhythmbox-RBSource.html
-share/doc/rhythmbox/rhythmbox-eel-gconf-extensions.html
-share/doc/rhythmbox/rhythmbox-rb-cell-renderer-rating.html
-share/doc/rhythmbox/rhythmbox-rb-debug.html
-share/doc/rhythmbox/rhythmbox-rb-dialog.html
-share/doc/rhythmbox/rhythmbox-rb-druid.html
-share/doc/rhythmbox/rhythmbox-rb-entry-view.html
-share/doc/rhythmbox/rhythmbox-rb-enums.html
-share/doc/rhythmbox/rhythmbox-rb-file-helpers.html
-share/doc/rhythmbox/rhythmbox-rb-glade-helpers.html
-share/doc/rhythmbox/rhythmbox-rb-header.html
-share/doc/rhythmbox/rhythmbox-rb-history.html
-share/doc/rhythmbox/rhythmbox-rb-iradio-source.html
-share/doc/rhythmbox/rhythmbox-rb-library-source.html
-share/doc/rhythmbox/rhythmbox-rb-load-failure-dialog.html
-share/doc/rhythmbox/rhythmbox-rb-metadata.html
-share/doc/rhythmbox/rhythmbox-rb-new-station-dialog.html
-share/doc/rhythmbox/rhythmbox-rb-play-order-linear-loop.html
-share/doc/rhythmbox/rhythmbox-rb-play-order-linear.html
-share/doc/rhythmbox/rhythmbox-rb-play-order-random-by-age-and-rating.html
-share/doc/rhythmbox/rhythmbox-rb-play-order-random-by-age.html
-share/doc/rhythmbox/rhythmbox-rb-play-order-random-by-rating.html
-share/doc/rhythmbox/rhythmbox-rb-play-order-random-equal-weights.html
-share/doc/rhythmbox/rhythmbox-rb-play-order-random.html
-share/doc/rhythmbox/rhythmbox-rb-play-order-shuffle.html
-share/doc/rhythmbox/rhythmbox-rb-play-order.html
-share/doc/rhythmbox/rhythmbox-rb-player.html
-share/doc/rhythmbox/rhythmbox-rb-playlist-manager.html
-share/doc/rhythmbox/rhythmbox-rb-playlist-source-recorder.html
-share/doc/rhythmbox/rhythmbox-rb-playlist-source.html
-share/doc/rhythmbox/rhythmbox-rb-preferences.html
-share/doc/rhythmbox/rhythmbox-rb-property-view.html
-share/doc/rhythmbox/rhythmbox-rb-query-creator.html
-share/doc/rhythmbox/rhythmbox-rb-rating-helper.html
-share/doc/rhythmbox/rhythmbox-rb-rating.html
-share/doc/rhythmbox/rhythmbox-rb-recorder.html
-share/doc/rhythmbox/rhythmbox-rb-search-entry.html
-share/doc/rhythmbox/rhythmbox-rb-shell-clipboard.html
-share/doc/rhythmbox/rhythmbox-rb-shell-player.html
-share/doc/rhythmbox/rhythmbox-rb-shell-preferences.html
-share/doc/rhythmbox/rhythmbox-rb-shell.html
-share/doc/rhythmbox/rhythmbox-rb-song-display-box.html
-share/doc/rhythmbox/rhythmbox-rb-song-info.html
-share/doc/rhythmbox/rhythmbox-rb-source-header.html
-share/doc/rhythmbox/rhythmbox-rb-sourcelist-model.html
-share/doc/rhythmbox/rhythmbox-rb-sourcelist.html
-share/doc/rhythmbox/rhythmbox-rb-station-properties-dialog.html
-share/doc/rhythmbox/rhythmbox-rb-statusbar.html
-share/doc/rhythmbox/rhythmbox-rb-stock-icons.html
-share/doc/rhythmbox/rhythmbox-rb-string-helpers.html
-share/doc/rhythmbox/rhythmbox-rb-tray-icon.html
-share/doc/rhythmbox/rhythmbox-rb-tree-dnd.html
-share/doc/rhythmbox/rhythmbox-rb-tree-model-sort.html
-share/doc/rhythmbox/rhythmbox-rb-util.html
-share/doc/rhythmbox/rhythmbox-rhythmdb-property-model.html
-share/doc/rhythmbox/rhythmbox-rhythmdb-query-model.html
-share/doc/rhythmbox/rhythmbox-rhythmdb-tree.html
-share/doc/rhythmbox/rhythmbox-rhythmdb.html
-share/doc/rhythmbox/rhythmbox.devhelp
-share/doc/rhythmbox/rhythmbox.devhelp2
-share/doc/rhythmbox/right.png
-share/doc/rhythmbox/style.css
-share/doc/rhythmbox/up.png
-share/gconf/schemas/rhythmbox.schemas
-share/gnome/help/rhythmbox/C/fdl-appendix.xml
-share/gnome/help/rhythmbox/C/figures/rb-iradio-main.png
-share/gnome/help/rhythmbox/C/figures/rb-notification-area-menu.png
-share/gnome/help/rhythmbox/C/figures/rb-notification-window.png
-share/gnome/help/rhythmbox/C/figures/rb-notification-zone.png
-share/gnome/help/rhythmbox/C/figures/rb-podcast-main.png
-share/gnome/help/rhythmbox/C/figures/rb-statusbar.png
-share/gnome/help/rhythmbox/C/figures/rb-toolbar-prevplaynext.png
-share/gnome/help/rhythmbox/C/figures/rb-toolbar-repeat.png
-share/gnome/help/rhythmbox/C/figures/rb-toolbar-shuffle.png
-share/gnome/help/rhythmbox/C/figures/rb-toolbar.png
-share/gnome/help/rhythmbox/C/figures/rb-volume-changer.png
-share/gnome/help/rhythmbox/C/figures/rb-window-small.png
-share/gnome/help/rhythmbox/C/figures/rb-window.png
-share/gnome/help/rhythmbox/C/legal.xml
-share/gnome/help/rhythmbox/C/rhythmbox.xml
-share/gnome/help/rhythmbox/es/figures/rb-iradio-main.png
-share/gnome/help/rhythmbox/es/figures/rb-notification-area-menu.png
-share/gnome/help/rhythmbox/es/figures/rb-notification-window.png
-share/gnome/help/rhythmbox/es/figures/rb-notification-zone.png
-share/gnome/help/rhythmbox/es/figures/rb-podcast-main.png
-share/gnome/help/rhythmbox/es/figures/rb-statusbar.png
-share/gnome/help/rhythmbox/es/figures/rb-toolbar-prevplaynext.png
-share/gnome/help/rhythmbox/es/figures/rb-toolbar-repeat.png
-share/gnome/help/rhythmbox/es/figures/rb-toolbar-shuffle.png
-share/gnome/help/rhythmbox/es/figures/rb-toolbar.png
-share/gnome/help/rhythmbox/es/figures/rb-volume-changer.png
-share/gnome/help/rhythmbox/es/figures/rb-window-small.png
-share/gnome/help/rhythmbox/es/figures/rb-window.png
-share/gnome/help/rhythmbox/es/rhythmbox.xml
-share/gnome/help/rhythmbox/fr/figures/rb-iradio-main.png
-share/gnome/help/rhythmbox/fr/figures/rb-notification-area-menu.png
-share/gnome/help/rhythmbox/fr/figures/rb-notification-window.png
-share/gnome/help/rhythmbox/fr/figures/rb-notification-zone.png
-share/gnome/help/rhythmbox/fr/figures/rb-podcast-main.png
-share/gnome/help/rhythmbox/fr/figures/rb-statusbar.png
-share/gnome/help/rhythmbox/fr/figures/rb-toolbar-prevplaynext.png
-share/gnome/help/rhythmbox/fr/figures/rb-toolbar-repeat.png
-share/gnome/help/rhythmbox/fr/figures/rb-toolbar-shuffle.png
-share/gnome/help/rhythmbox/fr/figures/rb-toolbar.png
-share/gnome/help/rhythmbox/fr/figures/rb-volume-changer.png
-share/gnome/help/rhythmbox/fr/figures/rb-window-small.png
-share/gnome/help/rhythmbox/fr/figures/rb-window.png
-share/gnome/help/rhythmbox/fr/rhythmbox.xml
-share/gnome/help/rhythmbox/ru/figures/rb-iradio-main.png
-share/gnome/help/rhythmbox/ru/figures/rb-notification-area-menu.png
-share/gnome/help/rhythmbox/ru/figures/rb-notification-window.png
-share/gnome/help/rhythmbox/ru/figures/rb-notification-zone.png
-share/gnome/help/rhythmbox/ru/figures/rb-podcast-main.png
-share/gnome/help/rhythmbox/ru/figures/rb-statusbar.png
-share/gnome/help/rhythmbox/ru/figures/rb-toolbar-prevplaynext.png
-share/gnome/help/rhythmbox/ru/figures/rb-toolbar-repeat.png
-share/gnome/help/rhythmbox/ru/figures/rb-toolbar-shuffle.png
-share/gnome/help/rhythmbox/ru/figures/rb-toolbar.png
-share/gnome/help/rhythmbox/ru/figures/rb-volume-changer.png
-share/gnome/help/rhythmbox/ru/figures/rb-window-small.png
-share/gnome/help/rhythmbox/ru/figures/rb-window.png
-share/gnome/help/rhythmbox/ru/rhythmbox.xml
-share/gnome/help/rhythmbox/sv/figures/rb-iradio-main.png
-share/gnome/help/rhythmbox/sv/figures/rb-notification-area-menu.png
-share/gnome/help/rhythmbox/sv/figures/rb-notification-window.png
-share/gnome/help/rhythmbox/sv/figures/rb-notification-zone.png
-share/gnome/help/rhythmbox/sv/figures/rb-podcast-main.png
-share/gnome/help/rhythmbox/sv/figures/rb-statusbar.png
-share/gnome/help/rhythmbox/sv/figures/rb-toolbar-prevplaynext.png
-share/gnome/help/rhythmbox/sv/figures/rb-toolbar-repeat.png
-share/gnome/help/rhythmbox/sv/figures/rb-toolbar-shuffle.png
-share/gnome/help/rhythmbox/sv/figures/rb-toolbar.png
-share/gnome/help/rhythmbox/sv/figures/rb-volume-changer.png
-share/gnome/help/rhythmbox/sv/figures/rb-window-small.png
-share/gnome/help/rhythmbox/sv/figures/rb-window.png
-share/gnome/help/rhythmbox/sv/rhythmbox.xml
-share/gnome/help/rhythmbox/zh_CN/figures/rb-iradio-main.png
-share/gnome/help/rhythmbox/zh_CN/figures/rb-notification-area-menu.png
-share/gnome/help/rhythmbox/zh_CN/figures/rb-notification-window.png
-share/gnome/help/rhythmbox/zh_CN/figures/rb-notification-zone.png
-share/gnome/help/rhythmbox/zh_CN/figures/rb-podcast-main.png
-share/gnome/help/rhythmbox/zh_CN/figures/rb-statusbar.png
-share/gnome/help/rhythmbox/zh_CN/figures/rb-toolbar-prevplaynext.png
-share/gnome/help/rhythmbox/zh_CN/figures/rb-toolbar-repeat.png
-share/gnome/help/rhythmbox/zh_CN/figures/rb-toolbar-shuffle.png
-share/gnome/help/rhythmbox/zh_CN/figures/rb-toolbar.png
-share/gnome/help/rhythmbox/zh_CN/figures/rb-volume-changer.png
-share/gnome/help/rhythmbox/zh_CN/figures/rb-window-small.png
-share/gnome/help/rhythmbox/zh_CN/figures/rb-window.png
-share/gnome/help/rhythmbox/zh_CN/rhythmbox.xml
-share/icons/hicolor/48x48/apps/rhythmbox.png
-share/locale/am/LC_MESSAGES/rhythmbox.mo
-share/locale/ar/LC_MESSAGES/rhythmbox.mo
-share/locale/az/LC_MESSAGES/rhythmbox.mo
-share/locale/be/LC_MESSAGES/rhythmbox.mo
-share/locale/bg/LC_MESSAGES/rhythmbox.mo
-share/locale/ca/LC_MESSAGES/rhythmbox.mo
-share/locale/cs/LC_MESSAGES/rhythmbox.mo
-share/locale/cy/LC_MESSAGES/rhythmbox.mo
-share/locale/da/LC_MESSAGES/rhythmbox.mo
-share/locale/de/LC_MESSAGES/rhythmbox.mo
-share/locale/el/LC_MESSAGES/rhythmbox.mo
-share/locale/en_CA/LC_MESSAGES/rhythmbox.mo
-share/locale/en_GB/LC_MESSAGES/rhythmbox.mo
-share/locale/es/LC_MESSAGES/rhythmbox.mo
-share/locale/et/LC_MESSAGES/rhythmbox.mo
-share/locale/eu/LC_MESSAGES/rhythmbox.mo
-share/locale/fi/LC_MESSAGES/rhythmbox.mo
-share/locale/fr/LC_MESSAGES/rhythmbox.mo
-share/locale/ga/LC_MESSAGES/rhythmbox.mo
-share/locale/gl/LC_MESSAGES/rhythmbox.mo
-share/locale/he/LC_MESSAGES/rhythmbox.mo
-share/locale/hr/LC_MESSAGES/rhythmbox.mo
-share/locale/hu/LC_MESSAGES/rhythmbox.mo
-share/locale/id/LC_MESSAGES/rhythmbox.mo
-share/locale/is/LC_MESSAGES/rhythmbox.mo
-share/locale/it/LC_MESSAGES/rhythmbox.mo
-share/locale/ja/LC_MESSAGES/rhythmbox.mo
-share/locale/ko/LC_MESSAGES/rhythmbox.mo
-share/locale/lt/LC_MESSAGES/rhythmbox.mo
-share/locale/lv/LC_MESSAGES/rhythmbox.mo
-share/locale/mk/LC_MESSAGES/rhythmbox.mo
-share/locale/ml/LC_MESSAGES/rhythmbox.mo
-share/locale/mn/LC_MESSAGES/rhythmbox.mo
-share/locale/ms/LC_MESSAGES/rhythmbox.mo
-share/locale/nb/LC_MESSAGES/rhythmbox.mo
-share/locale/ne/LC_MESSAGES/rhythmbox.mo
-share/locale/nl/LC_MESSAGES/rhythmbox.mo
-share/locale/pa/LC_MESSAGES/rhythmbox.mo
-share/locale/pl/LC_MESSAGES/rhythmbox.mo
-share/locale/pt/LC_MESSAGES/rhythmbox.mo
-share/locale/pt_BR/LC_MESSAGES/rhythmbox.mo
-share/locale/ro/LC_MESSAGES/rhythmbox.mo
-share/locale/ru/LC_MESSAGES/rhythmbox.mo
-share/locale/rw/LC_MESSAGES/rhythmbox.mo
-share/locale/sk/LC_MESSAGES/rhythmbox.mo
-share/locale/sr/LC_MESSAGES/rhythmbox.mo
-share/locale/sr@Latn/LC_MESSAGES/rhythmbox.mo
-share/locale/sv/LC_MESSAGES/rhythmbox.mo
-share/locale/th/LC_MESSAGES/rhythmbox.mo
-share/locale/tr/LC_MESSAGES/rhythmbox.mo
-share/locale/uk/LC_MESSAGES/rhythmbox.mo
-share/locale/vi/LC_MESSAGES/rhythmbox.mo
-share/locale/zh_CN/LC_MESSAGES/rhythmbox.mo
-share/locale/zh_HK/LC_MESSAGES/rhythmbox.mo
-share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
-share/omf/rhythmbox/rhythmbox-C.omf
-share/omf/rhythmbox/rhythmbox-es.omf
-share/omf/rhythmbox/rhythmbox-fr.omf
-share/omf/rhythmbox/rhythmbox-ru.omf
-share/omf/rhythmbox/rhythmbox-sv.omf
-share/omf/rhythmbox/rhythmbox-zh_CN.omf
-share/rhythmbox/art/about-logo.png
-share/rhythmbox/art/media-eject.png
-share/rhythmbox/art/rhythmbox-no-star.png
-share/rhythmbox/art/rhythmbox-podcast.png
-share/rhythmbox/art/rhythmbox-set-star.png
-share/rhythmbox/art/rhythmbox-tray-icon.png
-share/rhythmbox/art/rhythmbox-unset-star.png
-share/rhythmbox/daap-ui.xml
-share/rhythmbox/generic-player-ui.xml
-share/rhythmbox/glade/audioscrobbler-prefs.glade
-share/rhythmbox/glade/create-playlist.glade
-share/rhythmbox/glade/daap-prefs.glade
-share/rhythmbox/glade/druid.glade
-share/rhythmbox/glade/general-prefs.glade
-share/rhythmbox/glade/library-prefs.glade
-share/rhythmbox/glade/playlist-save.glade
-share/rhythmbox/glade/plugins.glade
-share/rhythmbox/glade/podcast-feed-properties.glade
-share/rhythmbox/glade/podcast-new.glade
-share/rhythmbox/glade/podcast-prefs.glade
-share/rhythmbox/glade/podcast-properties.glade
-share/rhythmbox/glade/recorder.glade
-share/rhythmbox/glade/song-info-multiple.glade
-share/rhythmbox/glade/song-info.glade
-share/rhythmbox/glade/station-new.glade
-share/rhythmbox/glade/station-properties.glade
-share/rhythmbox/glade/uri.glade
-share/rhythmbox/ipod-ui.xml
-share/rhythmbox/iradio-initial.pls
-share/rhythmbox/playlists.xml
-share/rhythmbox/rhythmbox-ui.xml
-@dirrm share/rhythmbox/glade
-@dirrm share/rhythmbox/art
-@dirrm share/rhythmbox
-@dirrm share/omf/rhythmbox
-@comment in scrollkeeper: @dirrm share/omf
-@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
-@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
-@dirrm share/gnome/help/rhythmbox/zh_CN/figures
-@dirrm share/gnome/help/rhythmbox/zh_CN
-@dirrm share/gnome/help/rhythmbox/sv/figures
-@dirrm share/gnome/help/rhythmbox/sv
-@dirrm share/gnome/help/rhythmbox/ru/figures
-@dirrm share/gnome/help/rhythmbox/ru
-@dirrm share/gnome/help/rhythmbox/fr/figures
-@dirrm share/gnome/help/rhythmbox/fr
-@dirrm share/gnome/help/rhythmbox/es/figures
-@dirrm share/gnome/help/rhythmbox/es
-@dirrm share/gnome/help/rhythmbox/C/figures
-@dirrm share/gnome/help/rhythmbox/C
-@dirrm share/gnome/help/rhythmbox
-@comment in gnome2-dirs: @dirrm share/gnome/help
-@comment in GConf2: @dirrm share/gconf/schemas
-@dirrm share/doc/rhythmbox
-@comment in dbus: @dirrm share/dbus-1/services
-@comment in xdg-dirs: @dirrm share/applications
-@dirrm lib/rhythmbox/plugins/generic-player
-@dirrm lib/rhythmbox/plugins/cd-recorder
-@dirrm lib/rhythmbox/plugins/audioscrobbler
-@dirrm lib/rhythmbox/plugins
-@dirrm lib/rhythmbox
diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo
deleted file mode 100644
index 7e04bd278e4..00000000000
--- a/audio/rhythmbox/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.19 2006/10/17 16:45:07 drochner Exp $
-
-SHA1 (rhythmbox-0.9.6.tar.bz2) = 1ef250dbf64613abdfd7665a37e8ee9d0693eb4a
-RMD160 (rhythmbox-0.9.6.tar.bz2) = ce6c711ab06e19ced45bce0b3c445643e351c841
-Size (rhythmbox-0.9.6.tar.bz2) = 3129839 bytes
-SHA1 (patch-aa) = dcadca60a960d44651e1ccc5deba55d97a460af9
-SHA1 (patch-ab) = 3b4e391036f0f9e854b25952a0f63d81dfb07c5b
-SHA1 (patch-ac) = 4666fd4e5d33d98c03907fba9e8c7f18942c5487
-SHA1 (patch-ae) = 1be3a5dc5a879a64b65a26efba133fe3958ea712
-SHA1 (patch-af) = c240903bfcf720493f8aad768b2693484d2de665
-SHA1 (patch-ag) = 65069bcdfa6f73e617ca0afd5283653bcfe79026
diff --git a/audio/rhythmbox/patches/patch-aa b/audio/rhythmbox/patches/patch-aa
deleted file mode 100644
index b4e89a205f8..00000000000
--- a/audio/rhythmbox/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2006/07/02 11:32:40 drochner Exp $
-
---- player/rb-recorder-gst.c.orig 2006-01-18 05:22:11.000000000 +0100
-+++ player/rb-recorder-gst.c
-@@ -25,7 +25,9 @@
- #include <string.h>
- #include <math.h>
- #include <time.h>
-+#ifdef __linux__
- #include <sys/vfs.h>
-+#endif
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
diff --git a/audio/rhythmbox/patches/patch-ab b/audio/rhythmbox/patches/patch-ab
deleted file mode 100644
index 2bd4e645f68..00000000000
--- a/audio/rhythmbox/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2006/07/02 11:32:40 drochner Exp $
-
---- daapsharing/rb-daap-src.c.orig 2006-01-21 10:17:03.000000000 +0100
-+++ daapsharing/rb-daap-src.c
-@@ -54,6 +54,10 @@
-
- #define RESPONSE_BUFFER_SIZE (4096)
-
-+#ifndef MSG_NOSIGNAL
-+#define MSG_NOSIGNAL 0
-+#endif
-+
- #ifdef HAVE_GSTREAMER_0_8
- typedef enum {
- RB_DAAP_SRC_OPEN = GST_ELEMENT_FLAG_LAST,
diff --git a/audio/rhythmbox/patches/patch-ac b/audio/rhythmbox/patches/patch-ac
deleted file mode 100644
index 41609f63919..00000000000
--- a/audio/rhythmbox/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/10/17 16:45:07 drochner Exp $
-
---- metadata/rb-metadata-dbus-client.c.orig 2006-08-12 11:25:47.000000000 +0200
-+++ metadata/rb-metadata-dbus-client.c
-@@ -52,7 +52,7 @@
-
- #include <unistd.h>
- #include <sys/types.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/wait.h>
- #include <string.h>
- #include <stdlib.h>
diff --git a/audio/rhythmbox/patches/patch-ae b/audio/rhythmbox/patches/patch-ae
deleted file mode 100644
index b87cbe9b3a6..00000000000
--- a/audio/rhythmbox/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/07/02 11:32:40 drochner Exp $
-
---- shell/main.c.orig 2006-05-30 16:44:01.000000000 +0200
-+++ shell/main.c
-@@ -372,7 +372,9 @@ main (int argc, char **argv)
- } else {
-
- rb_profile_start ("mainloop");
-+ GDK_THREADS_ENTER ();
- gtk_main ();
-+ GDK_THREADS_LEAVE ();
- rb_profile_end ("mainloop");
-
- rb_debug ("out of toplevel loop");
diff --git a/audio/rhythmbox/patches/patch-af b/audio/rhythmbox/patches/patch-af
deleted file mode 100644
index f60f8c9d512..00000000000
--- a/audio/rhythmbox/patches/patch-af
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/07/02 11:32:40 drochner Exp $
-
---- shell/rb-shell-player.c.orig 2006-04-22 12:44:25.000000000 +0200
-+++ shell/rb-shell-player.c
-@@ -903,10 +903,8 @@ rb_shell_player_open_playlist_url (RBShe
- rb_player_play (player->priv->mmplayer, &error);
-
- if (error) {
-- GDK_THREADS_ENTER ();
- rb_shell_player_error (player, TRUE, error);
- g_error_free (error);
-- GDK_THREADS_LEAVE ();
- }
- g_idle_add ((GSourceFunc) notify_playing_idle, player);
- }
-@@ -958,13 +956,17 @@ open_location_thread (OpenLocationThread
-
- location = g_queue_pop_head (data->player->priv->playlist_urls);
- rb_debug ("playing first stream url %s", data->location);
-+ GDK_THREADS_ENTER ();
- rb_shell_player_open_playlist_url (data->player, location);
-+ GDK_THREADS_LEAVE ();
- g_free (location);
- }
- } else {
- /* if we can't parse it as a playlist, just try playing it */
- rb_debug ("playlist parser failed, playing %s directly", data->location);
-+ GDK_THREADS_ENTER ();
- rb_shell_player_open_playlist_url (data->player, data->location);
-+ GDK_THREADS_LEAVE ();
- }
-
- g_free (data);
diff --git a/audio/rhythmbox/patches/patch-ag b/audio/rhythmbox/patches/patch-ag
deleted file mode 100644
index ae3cda47599..00000000000
--- a/audio/rhythmbox/patches/patch-ag
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/07/08 13:01:39 drochner Exp $
-
---- data/iradio-initial.pls.orig 2006-03-31 04:34:01.000000000 +0200
-+++ data/iradio-initial.pls
-@@ -3,10 +3,10 @@ numberofentries=25
- file1=http://www.somafm.com/groovesalad.pls
- title1=Groove Salad
- genre1=Ambient
--file2=http://www.di.fm/mp3/trance128k.pls
-+file2=http://www.di.fm/mp3/trance.pls
- title2=Digitally Imported
- genre2=Trance
--file3=http://www.digitallyimported.com/mp3/trance96k.pls
-+file3=http://www.digitallyimported.com/mp3/trance.pls
- title3=Digitally Imported - Trance
- genre3=Trance
- file4=http://www.digitallyimported.com/mp3/progressive96k.pls
-@@ -60,7 +60,7 @@ genre19=House/Dance
- file20=http://philosomatika.com/Philosomatika.pls
- title20=Philosomatika
- genre20=Goa
--file21=http://www.mostlyclassical.com/mp3/classical96k.pls
-+file21=http://www.sky.fm/mp3/classical.pls
- title21=Mostly Classical
- genre21=Classical
- file22=http://stream.mth-house.de:8500/listen.pls
diff --git a/audio/rio/DESCR b/audio/rio/DESCR
deleted file mode 100644
index 69f29499f44..00000000000
--- a/audio/rio/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-'rio' is a simple command line utility which allows you to display and
-manage files on your Diamond Rio portable music player.
-
-At present the Rio utility supports the Diamond Rio PMP300 with 32M
-internal flash memory. Additional external flash memory is now
-supported thanks to the work done by Guido March
-(march@pc40.mpier.uni-frankfurt.de).
diff --git a/audio/rio/Makefile b/audio/rio/Makefile
deleted file mode 100644
index 7ef8434e415..00000000000
--- a/audio/rio/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2007/02/22 19:26:07 wiz Exp $
-#
-
-DISTNAME= rio007
-PKGNAME= rio-1.07
-CATEGORIES= audio
-MASTER_SITES= http://www.world.co.uk/sba/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.world.co.uk/sba/rio.html
-COMMENT= Utility to display and manage files on the Diamond Rio PMP300
-
-ONLY_FOR_PLATFORM= NetBSD-*-i386
-
-WRKSRC= ${WRKDIR}/rio107
-MAKE_FILE= makefile
-USE_LANGUAGES= c++
-LIBS.NetBSD= -li386
-
-INSTALLATION_DIRS= bin
-SPECIAL_PERMS= bin/rio ${SETUID_ROOT_PERMS}
-
-do-build:
- cd ${WRKSRC} && ${CXX} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} ${LIBS} app.cpp rio.cpp -o rio
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/rio ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/rio
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/rio
- ${SED} -e 's|@AWK@|${AWK}|g' ${FILESDIR}/find-lpt-port > ${PREFIX}/bin/find-lpt-port
- ${CHMOD} 755 ${PREFIX}/bin/find-lpt-port
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/rio/PLIST b/audio/rio/PLIST
deleted file mode 100644
index 375e530ca9e..00000000000
--- a/audio/rio/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:45 zuntum Exp $
-bin/rio
-bin/find-lpt-port
-share/rio/README
-@dirrm share/rio
diff --git a/audio/rio/distinfo b/audio/rio/distinfo
deleted file mode 100644
index 35a4a3518f4..00000000000
--- a/audio/rio/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:51 agc Exp $
-
-SHA1 (rio007.tgz) = d7abbcd9619ff6528be31c38d55445bebb44e9f0
-RMD160 (rio007.tgz) = 82528f4877e3339c407b6e5dea9393123d44f72d
-Size (rio007.tgz) = 28953 bytes
-SHA1 (patch-aa) = eeaa99fba0c9c8fc53d9ea4639b81494a448cf2d
-SHA1 (patch-ab) = d3698fc8e76b264276f1809e96eb0675e9840b12
-SHA1 (patch-ac) = 4f490e55a906891f2c0488e9bdb78f5a26c7f073
diff --git a/audio/rio/files/find-lpt-port b/audio/rio/files/find-lpt-port
deleted file mode 100644
index 72e0ef8b74a..00000000000
--- a/audio/rio/files/find-lpt-port
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-# $NetBSD: find-lpt-port,v 1.1 2000/01/11 11:32:11 agc Exp $
-#
-# Small shell script to find the lpt port easily
-
-if [ -e /var/run/dmesg.boot ]; then
- bootfile="/var/run/dmesg.boot"
-else
- bootfile='`dmesg`'
-fi
-@AWK@ '/^lp[at][0-9]+/ { gsub("\-.*", "", $5); print $5 }' < $bootfile
-exit 0
diff --git a/audio/rio/patches/patch-aa b/audio/rio/patches/patch-aa
deleted file mode 100644
index dac038a66a4..00000000000
--- a/audio/rio/patches/patch-aa
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2000/01/11 11:31:19 agc Exp $
-
-Add support for NetBSD and Solaris
-Make sure the program is being run by effective uid 0
-
---- app.cpp 1999/12/17 17:39:52 1.1
-+++ app.cpp 1999/12/17 17:41:47
-@@ -67,6 +67,20 @@
- #define SIZE_MAXPATH MAXPATH
- #define DELETEARRAY delete
-
-+#elif defined(__NetBSD__)
-+ // NetBSD g++
-+ #include <unistd.h>
-+ #include <sys/syslimits.h>
-+ #define SIZE_MAXPATH PATH_MAX
-+ #define DELETEARRAY delete[]
-+
-+#elif defined(__sun__) && defined(__svr4__)
-+ // Solaris 2.x g++
-+ #include <unistd.h>
-+ #include <limits.h>
-+ #define SIZE_MAXPATH PATH_MAX
-+ #define DELETEARRAY delete[]
-+
- #else
- // not supported
- #error ! ! compiler/platform not supported ! !
-@@ -519,6 +533,13 @@
- Help();
- CLEANUP_RETURN( FALSE );
- }
-+#if defined(__NetBSD__)
-+ if (geteuid() != 0) {
-+ ERRORSTR("You need to be root to run this program,\n");
-+ ERRORSTR("because access is made to the parallel port directly.\n");
-+ CLEANUP_RETURN(FALSE);
-+ }
-+#endif
- for( int iA=1; iA<iCountArg; ++iA )
- {
- // check for display directory request
diff --git a/audio/rio/patches/patch-ab b/audio/rio/patches/patch-ab
deleted file mode 100644
index 9f103fdae13..00000000000
--- a/audio/rio/patches/patch-ab
+++ /dev/null
@@ -1,98 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2000/01/11 11:31:19 agc Exp $
-
-Add NetBSD and Solaris platforms
-Add inb() and outb() from XFree86 sources.
-
---- rio.cpp 1999/12/17 17:42:31 1.1
-+++ rio.cpp 1999/12/17 17:44:25
-+++ rio.cpp Fri Jan 7 12:43:45 2000
-@@ -109,9 +109,89 @@
- #define CLOCK_SECOND ((int)CLOCKS_PER_SEC)
- #define DELETEARRAY delete
-
-+#elif defined(__NetBSD__)
-+ // NetBSD/i386 g++
-+ #include <fcntl.h>
-+ #include <unistd.h>
-+ #include <machine/sysarch.h>
-+ #include <machine/cpufunc.h>
-+ #define OUTPORT(p,v) outb( p, v )
-+ #define INPORT(p) inb( p )
-+ #define CLOCK_SECOND CLOCKS_PER_SEC
-+ #define DELETEARRAY delete[]
-+
-+#elif defined(__sun__) && defined(__svr4__)
-+ // Solaris/i386 g++
-+ #include <fcntl.h>
-+ #include <unistd.h>
-+ #include <sys/cpupart.h>
-+ #include <sys/cpuvar.h>
-+ #include <sys/ddi.h>
-+ #include <sys/sunddi.h>
-+ #define OUTPORT(p,v) outb( p, v )
-+ #define INPORT(p) inb( p )
-+ #define CLOCK_SECOND CLOCKS_PER_SEC
-+ #define DELETEARRAY delete[]
-+
- #else
- // not supported
- #error ! ! compiler/platform not supported ! !
-+#endif
-+
-+#if defined(__NetBSD__)
-+/* copied from the XFree86 sources */
-+/* xc/programs/Xserver/hw/xfree86/common/compiler.h */
-+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 3.24.2.4 1998/10/18 20:42:10 hohndel Exp $ */
-+/*
-+ * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Thomas Roell not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission. Thomas Roell makes no representations
-+ * about the suitability of this software for any purpose. It is provided
-+ * "as is" without express or implied warranty.
-+ *
-+ * THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL THOMAS ROELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+ * PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ */
-+/* $XConsortium: compiler.h /main/16 1996/10/25 15:38:34 kaleb $ */
-+/* also hacked by agc to do i386_iopl */
-+static int ports_enabled;
-+
-+static __inline__ unsigned int
-+inb(unsigned short int port)
-+{
-+ unsigned char ret;
-+
-+ if (!ports_enabled) {
-+ i386_iopl(1);
-+ ports_enabled = 1;
-+ }
-+ __asm__ __volatile__("inb %1,%0" :
-+ "=a" (ret) :
-+ "d" (port));
-+ return ret;
-+}
-+
-+static __inline__ void
-+outb(unsigned short int port, unsigned char val)
-+{
-+ if (!ports_enabled) {
-+ i386_iopl(1);
-+ ports_enabled = 1;
-+ }
-+ __asm__ __volatile__("outb %0,%1" : :"a" (val), "d" (port));
-+}
- #endif
-
- // port offset constants
diff --git a/audio/rio/patches/patch-ac b/audio/rio/patches/patch-ac
deleted file mode 100644
index 8ec3a82ba84..00000000000
--- a/audio/rio/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2000/01/11 11:32:12 agc Exp $
-
---- makefile 2000/01/07 14:53:24 1.1
-+++ makefile 2000/01/07 14:53:54
-@@ -9,7 +9,7 @@
- all: rio
-
- rio: app.cpp rio.cpp
-- g++ -O1 -o rio app.cpp rio.cpp
-+ g++ -O1 -o rio app.cpp rio.cpp -li386
- chmod +s rio
-
- clean:
diff --git a/audio/rio500/DESCR b/audio/rio500/DESCR
deleted file mode 100644
index 6e74bfc9d82..00000000000
--- a/audio/rio500/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Utilities to upload files and manage folders for Diamond Rio 500 MP3 player.
-Requires USB support and the urio(4) driver configured in the kernel.
diff --git a/audio/rio500/Makefile b/audio/rio500/Makefile
deleted file mode 100644
index a8b4ca9bf71..00000000000
--- a/audio/rio500/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:28:58 jlam Exp $
-#
-
-DISTNAME= rio500-0.7
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rio500/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://rio500.sourceforge.net/
-COMMENT= Utilities to manage your Diamond Rio 500 MP3 player
-
-NOT_FOR_PLATFORM= Interix-*-*
-
-USE_TOOLS+= gmake
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-devicepath=/dev
-CONFIGURE_ARGS+= --with-deviceentry=urio0
-
-.include "../../devel/glib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/rio500/PLIST b/audio/rio500/PLIST
deleted file mode 100644
index 0514dc2614d..00000000000
--- a/audio/rio500/PLIST
+++ /dev/null
@@ -1,49 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:46 zuntum Exp $
-bin/rio_add_directory
-bin/rio_add_folder
-bin/rio_add_song
-bin/rio_del_song
-bin/rio_font_info
-bin/rio_format
-bin/rio_get_song
-bin/rio_stat
-include/libfon.h
-include/libpsf.h
-include/librio500.h
-include/librio500_api.h
-lib/librio500.a
-lib/librio500_api.a
-share/rio500/fonts/6581.fon
-share/rio500/fonts/Readme.txt
-share/rio500/fonts/amiga.fon
-share/rio500/fonts/amplitud.fon
-share/rio500/fonts/atopaz.fon
-share/rio500/fonts/blackout.fon
-share/rio500/fonts/camels.fon
-share/rio500/fonts/cbm64.fon
-share/rio500/fonts/ce.fon
-share/rio500/fonts/ck.nfo
-share/rio500/fonts/defjam.fon
-share/rio500/fonts/dynamic.fon
-share/rio500/fonts/flt.fon
-share/rio500/fonts/font-bitmaps.psf
-share/rio500/fonts/future.fon
-share/rio500/fonts/genesis.fon
-share/rio500/fonts/heretic2.fon
-share/rio500/fonts/hl1.fon
-share/rio500/fonts/hl2.fon
-share/rio500/fonts/icoin.fon
-share/rio500/fonts/kung_fu.fon
-share/rio500/fonts/noname.fon
-share/rio500/fonts/phont.fon
-share/rio500/fonts/q1c.fon
-share/rio500/fonts/q2c.fon
-share/rio500/fonts/qu.fon
-share/rio500/fonts/sac.fon
-share/rio500/fonts/shylock.fon
-share/rio500/fonts/sin.fon
-share/rio500/fonts/star.fon
-share/rio500/fonts/trek.fon
-share/rio500/fonts/triangle.fon
-@dirrm share/rio500/fonts
-@dirrm share/rio500
diff --git a/audio/rio500/distinfo b/audio/rio500/distinfo
deleted file mode 100644
index cd50b9f4e90..00000000000
--- a/audio/rio500/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/12/11 21:13:44 joerg Exp $
-
-SHA1 (rio500-0.7.tar.gz) = f22237d3e13222da69d7b7a09f7e27e2aff8e1b8
-RMD160 (rio500-0.7.tar.gz) = 59f56abb5f5ca16d6a8a7792dd227417bcd66709
-Size (rio500-0.7.tar.gz) = 169143 bytes
-SHA1 (patch-aa) = 037b0b5b0aaf5ba107dde56fadc1d613a94966ab
-SHA1 (patch-ab) = 668eca0fcdc2a3c55c12f8fe1a8c59c8e7ee0ba2
-SHA1 (patch-ac) = 6dcf08fcfb89177844b311bffb07a4eb9683d131
-SHA1 (patch-ad) = 04fa62f4246d7dfe7208a5424505676b0cb7b5d8
-SHA1 (patch-ae) = 57a64b9b9cb9301d9a183786510019bf7f618a50
-SHA1 (patch-af) = 99f19db26f6f8dc5825dabd1db4e17c8dba25658
diff --git a/audio/rio500/patches/patch-aa b/audio/rio500/patches/patch-aa
deleted file mode 100644
index c0523dbeb76..00000000000
--- a/audio/rio500/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2002/03/05 18:05:40 skrll Exp $
-
---- include/Makefile.in.orig Tue Mar 5 09:53:07 2002
-+++ include/Makefile.in
-@@ -86,7 +86,7 @@
- fontpath = @fontpath@
- psffont = @psffont@
-
--include_HEADERS = libfon.h libpsf.h librio500.h librio500_api.h getopt.h
-+include_HEADERS = libfon.h libpsf.h librio500.h librio500_api.h
- extra_DIST = usbdevice_fs.h usbdevfs.h usbdrv.h rio500_usb.h
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
diff --git a/audio/rio500/patches/patch-ab b/audio/rio500/patches/patch-ab
deleted file mode 100644
index 7145b6bec9a..00000000000
--- a/audio/rio500/patches/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2000/08/22 13:35:05 dmcmahill Exp $
-
---- include/libfon.h.orig Sun May 21 19:01:46 2000
-+++ include/libfon.h Tue Aug 22 09:16:46 2000
-@@ -25,4 +25,5 @@
-
- #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#include <sys/inttypes.h>
- #include <sys/param.h>
- #else
diff --git a/audio/rio500/patches/patch-ac b/audio/rio500/patches/patch-ac
deleted file mode 100644
index b3b7ef2eb63..00000000000
--- a/audio/rio500/patches/patch-ac
+++ /dev/null
@@ -1,114 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2000/08/22 15:40:12 dmcmahill Exp $
-
---- lib/librio500.c.orig Tue Aug 22 14:52:30 2000
-+++ lib/librio500.c Tue Aug 22 14:55:42 2000
-@@ -24,7 +24,7 @@
- #include "libfon.h"
-
- #ifdef WORDS_BIGENDIAN
--#include <byteswap.h>
-+#include <machine/bswap.h>
- #endif
-
- void
-@@ -55,9 +55,9 @@
- need to byteswap to get to le */
-
- #ifdef WORDS_BIGENDIAN
-- location.offset = bswap_16(location.offset);
-- location.bytes = bswap_16(location.bytes);
-- location.folder_num = bswap_16(location.folder_num);
-+ location.offset = bswap16(location.offset);
-+ location.bytes = bswap16(location.bytes);
-+ location.folder_num = bswap16(location.folder_num);
- #endif
-
- rio_ctl_msg (fd, RIO_DIR_OUT, 0x56, 0, 0,
-@@ -87,13 +87,13 @@
- to read correctly */
-
- #ifdef WORDS_BIGENDIAN
-- status.dunno1 = bswap_16(status.dunno1);
-- status.block_size = bswap_16(status.block_size);
-- status.num_blocks = bswap_16(status.num_blocks);
-- status.first_free_block = bswap_16(status.first_free_block);
-- status.num_unused_blocks = bswap_16(status.num_unused_blocks);
-- status.dunno2 = bswap_32(status.dunno2);
-- status.dunno3 = bswap_32(status.dunno3);
-+ status.dunno1 = bswap16(status.dunno1);
-+ status.block_size = bswap16(status.block_size);
-+ status.num_blocks = bswap16(status.num_blocks);
-+ status.first_free_block = bswap16(status.first_free_block);
-+ status.num_unused_blocks = bswap16(status.num_unused_blocks);
-+ status.dunno2 = bswap32(status.dunno2);
-+ status.dunno3 = bswap32(status.dunno3);
- #endif
-
- return &status;
-@@ -476,25 +476,25 @@
- void
- bswap_folder_entry (folder_entry *fe)
- {
-- fe->offset = bswap_16(fe->offset);
-- fe->dunno1 = bswap_16(fe->dunno1);
-- fe->fst_free_entry_off = bswap_16(fe->fst_free_entry_off);
-- fe->dunno2 = bswap_16(fe->dunno2);
-- fe->dunno3 = bswap_32(fe->dunno3);
-- fe->dunno4 = bswap_32(fe->dunno4);
-- fe->time = bswap_32(fe->time);
-+ fe->offset = bswap16(fe->offset);
-+ fe->dunno1 = bswap16(fe->dunno1);
-+ fe->fst_free_entry_off = bswap16(fe->fst_free_entry_off);
-+ fe->dunno2 = bswap16(fe->dunno2);
-+ fe->dunno3 = bswap32(fe->dunno3);
-+ fe->dunno4 = bswap32(fe->dunno4);
-+ fe->time = bswap32(fe->time);
- }
-
- void
- bswap_song_entry (song_entry *se)
- {
-- se->offset = bswap_16(se->offset);
-- se->dunno1 = bswap_16(se->dunno1);
-- se->length = bswap_32(se->length);
-- se->dunno2 = bswap_16(se->dunno2);
-- se->dunno3 = bswap_16(se->dunno3);
-- se->mp3sig = bswap_32(se->mp3sig);
-- se->time = bswap_32(se->time);
-+ se->offset = bswap16(se->offset);
-+ se->dunno1 = bswap16(se->dunno1);
-+ se->length = bswap32(se->length);
-+ se->dunno2 = bswap16(se->dunno2);
-+ se->dunno3 = bswap16(se->dunno3);
-+ se->mp3sig = bswap32(se->mp3sig);
-+ se->time = bswap32(se->time);
- }
-
-
-@@ -662,7 +662,7 @@
- rio_ctl_msg (fd, RIO_DIR_IN, req, val, idx, 4, (BYTE*)&status);
-
- #ifdef WORDS_BIGENDIAN
-- status = bswap_32 (status);
-+ status = bswap32 (status);
- #endif
-
- return status;
-@@ -740,7 +740,7 @@
- /* on big_endian platforms, need to byteswap num_blocks to write to le rio */
-
- #ifdef WORDS_BIGENDIAN
-- new_smiley->num_blocks = bswap_16(new_smiley->num_blocks);
-+ new_smiley->num_blocks = bswap16(new_smiley->num_blocks);
- #endif
-
- return new_smiley;
-@@ -802,7 +802,7 @@
- transfer to rio */
-
- #ifdef WORDS_BIGENDIAN
-- new_bitmap->num_blocks = bswap_16(new_bitmap->num_blocks);
-+ new_bitmap->num_blocks = bswap16(new_bitmap->num_blocks);
- #endif
-
- return new_bitmap;
diff --git a/audio/rio500/patches/patch-ad b/audio/rio500/patches/patch-ad
deleted file mode 100644
index de74399870b..00000000000
--- a/audio/rio500/patches/patch-ad
+++ /dev/null
@@ -1,85 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2000/08/22 15:40:12 dmcmahill Exp $
-
---- lib/libfon.c.orig Tue Aug 22 14:54:21 2000
-+++ lib/libfon.c Tue Aug 22 14:54:35 2000
-@@ -23,7 +23,7 @@
- #include "libfon.h"
-
- #ifdef WORDS_BIGENDIAN
--#include <byteswap.h>
-+#include <machine/bswap.h>
- #endif
-
- struct fon_font *
-@@ -61,9 +61,9 @@
- fread (&MZ_hdr, sizeof (MZ_Header), 1, fp);
-
- #ifdef WORDS_BIGENDIAN
-- MZ_hdr.magic = bswap_16(MZ_hdr.magic);
-- MZ_hdr.dummy[29] = bswap_16(MZ_hdr.dummy[29]);
-- //MZ_hdr.ne_location = bswap_16(MZ_hdr.ne_location);
-+ MZ_hdr.magic = bswap16(MZ_hdr.magic);
-+ MZ_hdr.dummy[29] = bswap16(MZ_hdr.dummy[29]);
-+ //MZ_hdr.ne_location = bswap16(MZ_hdr.ne_location);
- #endif
-
- /* ne_location is a 16bit quantity,l_e. It appears fseek below wants
-@@ -82,15 +82,15 @@
- fread (&NE_hdr, sizeof (NE_Header), 1, fp);
-
- #ifdef WORDS_BIGENDIAN
-- NE_hdr.magic = bswap_16(NE_hdr.magic);
-- NE_hdr.dummy1[15] = bswap_16(NE_hdr.dummy1[15]);
-+ NE_hdr.magic = bswap16(NE_hdr.magic);
-+ NE_hdr.dummy1[15] = bswap16(NE_hdr.dummy1[15]);
-
-- //NE_hdr.nonres_name_length = bswap_16(NE_hdr.nonres_name_length);
-+ //NE_hdr.nonres_name_length = bswap16(NE_hdr.nonres_name_length);
- /* fseek seems to like l_e quantities */
-
- /* Ok . . I'm an idiot, nonres_name_start was 32bit, can use bswap */
-
-- NE_hdr.nonres_name_start=bswap_32(NE_hdr.nonres_name_start);
-+ NE_hdr.nonres_name_start=bswap32(NE_hdr.nonres_name_start);
- #endif
-
- if (NE_hdr.magic != NE_HEADER_MAGIC ) {
-@@ -119,7 +119,7 @@
- fread(&number_of_fonts, 2, 1, fp);
-
- #ifdef WORDS_BIGENDIAN
-- number_of_fonts = bswap_32(number_of_fonts);
-+ number_of_fonts = bswap32(number_of_fonts);
- #endif
- /* font info stored in 32bit 32bit 32bit l_e format for win fonts */
- /* need to swap to use on ppc */
-@@ -181,13 +181,13 @@
- /* Do any sort of byte swapping necessary for big endian after reading data */
-
- #ifdef WORDS_BIGENDIAN
-- font->Header[i].Windows_version = bswap_16(font->Header[i].Windows_version);
-- font->Header[i].Bytes_per_char_cell = bswap_16(font->Header[i].Bytes_per_char_cell);
-- font->Header[i].File_sizeH = bswap_16(font->Header[i].File_sizeH);
-- font->Header[i].File_sizeL = bswap_16(font->Header[i].File_sizeL);
-- font->Header[i].Nominal_point_size = bswap_16(font->Header[i].Nominal_point_size);
-- font->Header[i].Vertical_resolution = bswap_16(font->Header[i].Vertical_resolution);
-- font->Header[i].Horizontal_resolution = bswap_16(font->Header[i].Horizontal_resolution);
-+ font->Header[i].Windows_version = bswap16(font->Header[i].Windows_version);
-+ font->Header[i].Bytes_per_char_cell = bswap16(font->Header[i].Bytes_per_char_cell);
-+ font->Header[i].File_sizeH = bswap16(font->Header[i].File_sizeH);
-+ font->Header[i].File_sizeL = bswap16(font->Header[i].File_sizeL);
-+ font->Header[i].Nominal_point_size = bswap16(font->Header[i].Nominal_point_size);
-+ font->Header[i].Vertical_resolution = bswap16(font->Header[i].Vertical_resolution);
-+ font->Header[i].Horizontal_resolution = bswap16(font->Header[i].Horizontal_resolution);
- #endif
-
- }
-@@ -231,7 +231,7 @@
- (void)fread(&bitmap_start_offset, 2, 1, fp);
-
- #ifdef WORDS_BIGENDIAN
-- bitmap_start_offset = bswap_32(bitmap_start_offset);
-+ bitmap_start_offset = bswap32(bitmap_start_offset);
- #endif
-
- /* b_s_off comes out of .fon in l_e, need to convert */
diff --git a/audio/rio500/patches/patch-ae b/audio/rio500/patches/patch-ae
deleted file mode 100644
index 07a5456d2e2..00000000000
--- a/audio/rio500/patches/patch-ae
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2000/08/22 15:40:12 dmcmahill Exp $
-
---- lib/usbdrvlinux.c.orig Tue Aug 22 14:58:45 2000
-+++ lib/usbdrvlinux.c Tue Aug 22 14:59:00 2000
-@@ -54,7 +54,7 @@
- #include <dirent.h>
-
- #ifdef WORDS_BIGENDIAN
--# include <byteswap.h>
-+# include <machine/bswap.h>
- #endif
-
- #if TIME_WITH_SYS_TIME
-@@ -200,8 +200,8 @@
- pid = desc.idProduct[0] | (desc.idProduct[1] << 8);
-
- #ifdef WORDS_BIGENDIAN
-- vid = bswap_16(vid);
-- pid = bswap_16(pid);
-+ vid = bswap16(vid);
-+ pid = bswap16(pid);
- #endif
-
- if ((vid != vendorid && vendorid == -1) ||
-@@ -270,8 +270,8 @@
- pid = desc.idProduct[0] | (desc.idProduct[1] << 8);
-
- #ifdef WORDS_BIGENDIAN
-- vid = bswap_16(vid);
-- pid = bswap_16(pid);
-+ vid = bswap16(vid);
-+ pid = bswap16(pid);
- #endif
-
- if ((vid == vendorid || vendorid == 0xffff) &&
diff --git a/audio/rio500/patches/patch-af b/audio/rio500/patches/patch-af
deleted file mode 100644
index 243739319fd..00000000000
--- a/audio/rio500/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/12/11 21:13:45 joerg Exp $
-
---- src/rio_add_song.c.orig 2005-12-11 21:01:42.000000000 +0000
-+++ src/rio_add_song.c
-@@ -325,6 +325,7 @@ main(int argc, char *argv[])
- send_command (rio_dev, 0x58, 0x0, card_number);
-
- try_next:
-+ ;
- } /* end of add file loop */
-
- /* Close device */
diff --git a/audio/rioutil/DESCR b/audio/rioutil/DESCR
deleted file mode 100644
index bab64eb553b..00000000000
--- a/audio/rioutil/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-A utility designed for the use of interfacing with Rio's third,
-fourth, and fifth generations of portable mp3 players: Rio
-600/800/900/S-Series/Riot/psa[play/Fuse.
diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile
deleted file mode 100644
index 608ef07f386..00000000000
--- a/audio/rioutil/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2007/01/06 04:21:24 schmonz Exp $
-#
-
-DISTNAME= rioutil-1.5.0
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rioutil/}
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://rioutil.sourceforge.net/
-COMMENT= Program and library to interface with Rio 600, 800, Nike psa[play
-
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-libusb
-
-ONLY_FOR_PLATFORM= Darwin-*-* Linux-*-* NetBSD-1.6*-* NetBSD-[2-9]*-*
-# depends on -r1.6 of sys/dev/usb/urio.c
-ONLY_FOR_PLATFORM+= NetBSD-1.5Z-* NetBSD-1.5Z[A-Z]-*
-ONLY_FOR_PLATFORM+= DragonFly-*-* FreeBSD-*-* OpenBSD-*-*
-
-.include "../../audio/id3lib/buildlink3.mk"
-.include "../../devel/libusb/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/rioutil/PLIST b/audio/rioutil/PLIST
deleted file mode 100644
index 6056e5c7749..00000000000
--- a/audio/rioutil/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:17 jlam Exp $
-bin/rioutil
-include/rio.h
-lib/librioutil.la
-man/man1/rioutil.1
diff --git a/audio/rioutil/distinfo b/audio/rioutil/distinfo
deleted file mode 100644
index 3f7eede1e2c..00000000000
--- a/audio/rioutil/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.11 2007/02/02 15:58:58 joerg Exp $
-
-SHA1 (rioutil-1.5.0.tar.gz) = f775bab0ed7ec456dd5d2826083ca8a5075aa4ec
-RMD160 (rioutil-1.5.0.tar.gz) = 2f1db9eb36501aecdb388278d5f7c1876bfebf19
-Size (rioutil-1.5.0.tar.gz) = 401244 bytes
-SHA1 (patch-aa) = 4783194bc911fc9c9b1ebd9f03a92180cd7a8f77
-SHA1 (patch-ab) = d5a206224a24bf9dfd651c003b621dc5cea90a58
-SHA1 (patch-ac) = 2ea2f01308a3d3e92fc0fb1b652c1df50dddef01
-SHA1 (patch-ae) = d5428a2e3e5edfe367e5afaecf944830f7187342
diff --git a/audio/rioutil/patches/patch-aa b/audio/rioutil/patches/patch-aa
deleted file mode 100644
index 53f66f9cc9b..00000000000
--- a/audio/rioutil/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2007/01/06 04:21:24 schmonz Exp $
-
---- src/main.c.orig 2006-08-08 12:23:08.000000000 -0400
-+++ src/main.c
-@@ -730,10 +730,10 @@ static void usage (void) {
- printf(" -d, --delete=<int> delete a track(s)\n\n");
-
- printf(" options:\n");
--#if !defined(__FreeBSD__) || !defined(__NetBSD__)
-- printf(" -o, --device=<int> minor number of rio (assigned by driver), /dev/usb/rio?\n");
--#else
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- printf(" -o, --device=<int> minor number of rio (assigned by driver), /dev/urio?\n");
-+#else
-+ printf(" -o, --device=<int> minor number of rio (assigned by driver), /dev/usb/rio?\n");
- #endif
- printf(" -k, --nocolor supress ansi color\n");
- printf(" -m, --memory=<int> memory unit to upload/download/delete/format to/from\n");
diff --git a/audio/rioutil/patches/patch-ab b/audio/rioutil/patches/patch-ab
deleted file mode 100644
index b259415274f..00000000000
--- a/audio/rioutil/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2007/01/06 04:21:24 schmonz Exp $
-
---- linux_driver/rio_usb.h.orig 2006-08-07 11:47:28.000000000 -0400
-+++ linux_driver/rio_usb.h
-@@ -61,7 +61,7 @@ struct RioCommand {
- int timeout;
- };
-
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #define RIO_SEND_COMMAND _IOWR('U', 200, struct RioCommand)
- #define RIO_RECV_COMMAND _IOWR('U', 201, struct RioCommand)
- #else
diff --git a/audio/rioutil/patches/patch-ac b/audio/rioutil/patches/patch-ac
deleted file mode 100644
index 4f7bf234250..00000000000
--- a/audio/rioutil/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2007/01/06 04:21:24 schmonz Exp $
-
---- librioutil/driver_file.c.orig 2006-08-07 11:47:28.000000000 -0400
-+++ librioutil/driver_file.c
-@@ -32,7 +32,7 @@
- char driver_method[] = "device file";
-
- /* Duplicated from rio_usb.h */
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #define RIO_RECV_COMMAND _IOWR('U', 201, struct RioCommand)
- #else
- #define RIO_RECV_COMMAND 0x2
-@@ -42,7 +42,7 @@ char driver_method[] = "device file";
- #ifdef linux
- #include <linux/usb.h>
- #define RIODEVICE "/dev/usb/rio"
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- #define RIODEVICE "/dev/urio"
- #elif defined(__NetBSD__)
- #define RIODEVICE "/dev/urio"
diff --git a/audio/rioutil/patches/patch-ae b/audio/rioutil/patches/patch-ae
deleted file mode 100644
index 674102213fc..00000000000
--- a/audio/rioutil/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2007/02/02 15:58:58 joerg Exp $
-
---- include/rioi.h.orig 2006-08-04 22:40:49.000000000 +0000
-+++ include/rioi.h
-@@ -190,7 +190,8 @@ Group ID 0x7c ????
- #define bswap_32(x) NXSwapLong(x)
- #define bswap_16(x) NXSwapShort(x)
-
--#elif defined (__NetBSD__)
-+#elif defined (__NetBSD__) || defined(__DragonFly__)
-+#include <sys/endian.h>
-
- #define bswap_64(x) bswap64(x)
- #define bswap_32(x) bswap32(x)
diff --git a/audio/rip/DESCR b/audio/rip/DESCR
deleted file mode 100644
index 0e7a1e4ad08..00000000000
--- a/audio/rip/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-rip is a wrapper for rippers and encoders which provides a common
-interface for ripping any CD audio track and encoding it into
-MP3, Ogg Vorbis, or FLAC. Manual and CDDB based renaming schemes
-are available for naming and tagging your ripped tracks.
diff --git a/audio/rip/MESSAGE b/audio/rip/MESSAGE
deleted file mode 100644
index c9b2b29f427..00000000000
--- a/audio/rip/MESSAGE
+++ /dev/null
@@ -1,17 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2006/01/05 23:29:04 wiz Exp $
-
-To actually use rip, you need to install at least one of the
-following rippers and encoders:
-
-Rippers:
- - audio/cdparanoia
- - sysutils/cdrtools (includes cdda2wav)
-
-Encoders:
- - audio/bladeenc
- - audio/flac
- - audio/gogo
- - audio/lame
- - audio/vorbis-tools (includes oggenc)
-===========================================================================
diff --git a/audio/rip/Makefile b/audio/rip/Makefile
deleted file mode 100644
index 877695ae4d6..00000000000
--- a/audio/rip/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:28:58 jlam Exp $
-#
-
-DISTNAME= rip-1.07
-CATEGORIES= audio perl5
-MASTER_SITES= http://rip.sourceforge.net/download/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://rip.sourceforge.net/
-COMMENT= Command-line based audio CD ripper and encoder
-
-DEPENDS+= p5-CDDB_get>=2.23:../../audio/p5-CDDB_get
-DEPENDS+= p5-MP3-Info>=1.00:../../audio/p5-MP3-Info
-
-NO_BUILD= yes
-USE_TOOLS+= perl:run
-REPLACE_PERL= rip
-
-DOCFILES= BUGS CHANGELOG COPYING FAQ INSTALLING README
-DOCDIR= ${PREFIX}/share/doc/rip
-
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/rip ${PREFIX}/bin/rip
- ${INSTALL_DATA_DIR} ${DOCDIR}
- for i in ${DOCFILES}; do \
- ${INSTALL_DATA} ${WRKSRC}/$$i ${DOCDIR}; \
- done
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/rip/PLIST b/audio/rip/PLIST
deleted file mode 100644
index 65d8a374ef7..00000000000
--- a/audio/rip/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/10/19 03:13:11 ben Exp $
-bin/rip
-share/doc/rip/BUGS
-share/doc/rip/CHANGELOG
-share/doc/rip/COPYING
-share/doc/rip/FAQ
-share/doc/rip/INSTALLING
-share/doc/rip/README
-@dirrm share/doc/rip
diff --git a/audio/rip/distinfo b/audio/rip/distinfo
deleted file mode 100644
index 4eba6c222b8..00000000000
--- a/audio/rip/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:51 agc Exp $
-
-SHA1 (rip-1.07.tar.gz) = a7b60dbc5dbaf5ca0d24c9e554fa3e5885bbccb1
-RMD160 (rip-1.07.tar.gz) = 4c181d7032e89d3f9cba952242d23c19b69cfdcb
-Size (rip-1.07.tar.gz) = 110261 bytes
-SHA1 (patch-aa) = bb98665178ed40baebb08b087551d690a549b09b
diff --git a/audio/rip/patches/patch-aa b/audio/rip/patches/patch-aa
deleted file mode 100644
index a5345d0ced8..00000000000
--- a/audio/rip/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/10/19 03:13:11 ben Exp $
-
---- rip.orig 2004-10-08 17:11:28.000000000 +0000
-+++ rip 2004-10-08 17:12:08.000000000 +0000
-@@ -128,7 +128,7 @@
-
-
- my %config; # Configuration passed to CDDB/CDDB_get
--my $dev = "/dev/cdrom"; # CDROM device to read (used by -d/--dev)
-+my $dev = "/dev/rcd0d"; # CDROM device to read (used by -d/--dev)
- $config{CD_DEVICE} = $dev; # Device that has the audio CD
- $config{CDDB_HOST} = "freedb.freedb.org"; # CDDB host to find the server on
- $config{CDDB_PORT} = 888; # CDDB port the CDDB server is using
-@@ -343,7 +343,7 @@
- print rcFile "# Only when debug is set to \"\" is the errorFile removed after each rip.\n";
- print rcFile "debug = \"\"\n\n";
- print rcFile "# The default device to find the CD in.\n";
-- print rcFile "dev = \"/dev/cdrom\"\n\n";
-+ print rcFile "dev = \"/dev/rcd0d\"\n\n";
-
- close( rcFile );
- }
diff --git a/audio/rosegarden/DESCR b/audio/rosegarden/DESCR
deleted file mode 100644
index 89f572892fa..00000000000
--- a/audio/rosegarden/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Decent Notation and MIDI `piano roll' editor
-
-Caveats: I use only the notation editor. I've never gotten MIDI of any sort
-up on my machines, so I have no idea if the MIDI player works.
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
deleted file mode 100644
index 5d0e7fc6277..00000000000
--- a/audio/rosegarden/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2007/01/26 20:15:09 joerg Exp $
-
-DISTNAME= rosegarden-2.1pl4
-PKGNAME= rosegarden-2.1.4
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= http://www.cannam.demon.co.uk/rosegarden/distribution/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.rosegardenmusic.com/
-COMMENT= Notation editor & MIDI sequencer
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-GNU_CONFIGURE= YES
-USE_TOOLS+= gmake makedepend
-MAKE_ENV+= GCC=yes
-
-INSTALLATION_DIRS+= bin lib/X11/app-defaults
-
-post-extract:
- cd ${WRKSRC} && ${MV} Rosegarden Rosegarden.in
-
-.include "../../x11/libXaw/buildlink3.mk"
-.include "../../lang/tcl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/rosegarden/PLIST b/audio/rosegarden/PLIST
deleted file mode 100644
index 5728bab13ce..00000000000
--- a/audio/rosegarden/PLIST
+++ /dev/null
@@ -1,23 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/28 21:24:22 wiz Exp $
-bin/rosegarden
-lib/X11/app-defaults/Rosegarden
-lib/rosegarden/bin/editor
-lib/rosegarden/bin/sequencer
-lib/rosegarden/example/glazunov.rose
-lib/rosegarden/help/rosehelp.hnx
-lib/rosegarden/help/rosehelp.info
-lib/rosegarden/petal/Petal.tcl
-lib/rosegarden/petal/PetalEditor.tcl
-lib/rosegarden/petal/PetalMidi.tcl
-lib/rosegarden/petal/pkgIndex.tcl
-lib/rosegarden/rosepetal-filters/harmonizer.tcl
-lib/rosegarden/rosepetal-filters/pattern.tcl
-lib/rosegarden/synth-patches/drums.sb
-lib/rosegarden/synth-patches/std.sb
-@dirrm lib/rosegarden/synth-patches
-@dirrm lib/rosegarden/rosepetal-filters
-@dirrm lib/rosegarden/petal
-@dirrm lib/rosegarden/help
-@dirrm lib/rosegarden/example
-@dirrm lib/rosegarden/bin
-@dirrm lib/rosegarden
diff --git a/audio/rosegarden/distinfo b/audio/rosegarden/distinfo
deleted file mode 100644
index 9a3261580f7..00000000000
--- a/audio/rosegarden/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 20:39:51 agc Exp $
-
-SHA1 (rosegarden-2.1pl4.tar.gz) = 5a6e293eb38a7090ba6929fec23104ffef587533
-RMD160 (rosegarden-2.1pl4.tar.gz) = 94604241c8e4101520d8b79544a16839d98436e5
-Size (rosegarden-2.1pl4.tar.gz) = 587134 bytes
-SHA1 (patch-aa) = 4c45840c9a7d0b3ee43ddb300de55a442df0f7da
-SHA1 (patch-ab) = 3319061b197bd135c4267c39ddd9fd92709347e1
-SHA1 (patch-ac) = 3f4f3ed849d037d3371b9ab786cb547d6e1c8daa
-SHA1 (patch-ad) = 22b2a1a060e8b2b3f7dda5d7c7189fc96b99c1a0
-SHA1 (patch-ae) = b6fb9815ee6918dbc5b28fd1fec6bca1d42cf028
-SHA1 (patch-af) = f3c99ccf142420255ae10f19bed37933ee24c744
-SHA1 (patch-ag) = f572f2ecee63bee1e62a9363c14bb468e4539937
diff --git a/audio/rosegarden/patches/patch-aa b/audio/rosegarden/patches/patch-aa
deleted file mode 100644
index 51bbbf4eab8..00000000000
--- a/audio/rosegarden/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2002/03/19 12:21:07 wiz Exp $
-
---- Makefile.in.orig Fri Dec 21 15:12:43 2001
-+++ Makefile.in
-@@ -43,7 +43,7 @@
-
-
- # Compile defines
--DEFINES = @defines@
-+DEFINES = '-DRGLIBDIR=\"${RGLIBDIR}\"' @defines@
-
- # Name of the compiler, plus any flags common to both compile
- # and link stages; also exported
-@@ -197,3 +197,9 @@
- chmod +x $(ROSEGARDEN)/scripts/make-structure.sh
- $(ROSEGARDEN)/scripts/make-structure.sh $(ROSEGARDEN)
-
-+prefix=@prefix@
-+iBINDIR=${prefix}/bin
-+iLIBDIR=${prefix}/lib
-+RGLIBDIR=${iLIBDIR}/rosegarden
-+install: do-install
-+ (echo ${iBINDIR}; echo ${iLIBDIR})|/bin/sh do-install
diff --git a/audio/rosegarden/patches/patch-ab b/audio/rosegarden/patches/patch-ab
deleted file mode 100644
index eb63397af2d..00000000000
--- a/audio/rosegarden/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/03/19 12:21:07 wiz Exp $
-
---- editor/src/Filter.c.orig Mon Jul 2 09:10:49 2001
-+++ editor/src/Filter.c
-@@ -597,7 +597,7 @@
- char path[3000];
- fprintf(stderr, "Rosegarden: Environment variable TCLLIBPATH is not set; "
- "guessing!\n");
-- sprintf(path, "TCLLIBPATH=%s %s /usr/local/lib/rosegarden/petal",
-+ sprintf(path, "TCLLIBPATH=%s %s "RGLIBDIR"/petal",
- homeFilterDir, appData.filtersDirectory);
- putenv(path);
- }
diff --git a/audio/rosegarden/patches/patch-ac b/audio/rosegarden/patches/patch-ac
deleted file mode 100644
index 925be5846f9..00000000000
--- a/audio/rosegarden/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2002/03/19 12:21:07 wiz Exp $
-
---- editor/src/Resources.h.orig Fri Oct 10 06:22:00 1997
-+++ editor/src/Resources.h
-@@ -118,7 +118,7 @@
- sizeof(char *),
- XtOffset(AppDataPtr, filtersDirectory),
- XtRImmediate,
-- (XtPointer)"/usr/local/lib/rosegarden/rosepetal-filters",
-+ (XtPointer)RGLIBDIR"/rosepetal-filters",
- },
- {
- XtNmusicDirectory,
diff --git a/audio/rosegarden/patches/patch-ad b/audio/rosegarden/patches/patch-ad
deleted file mode 100644
index 8fb3757e45d..00000000000
--- a/audio/rosegarden/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2002/03/19 12:21:07 wiz Exp $
-
---- sequencer/src/Filter.c.orig Mon Jul 2 08:59:48 2001
-+++ sequencer/src/Filter.c
-@@ -347,7 +347,7 @@
- char path[3000];
- fprintf(stderr, "Rosegarden: Environment variable TCLLIBPATH is not set; "
- "guessing!\n");
-- sprintf(path, "TCLLIBPATH=%s %s /usr/local/lib/rosegarden/petal",
-+ sprintf(path, "TCLLIBPATH=%s %s "RGLIBDIR"/petal",
- homeFilterDir, appData.filtersDirectory);
- putenv(path);
- }
diff --git a/audio/rosegarden/patches/patch-ae b/audio/rosegarden/patches/patch-ae
deleted file mode 100644
index c68c022ce3a..00000000000
--- a/audio/rosegarden/patches/patch-ae
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2002/03/19 12:21:07 wiz Exp $
-
---- sequencer/src/Resources.h.orig Fri Oct 10 06:21:47 1997
-+++ sequencer/src/Resources.h
-@@ -135,7 +135,7 @@
- sizeof(String),
- XtOffset(AppDataPtr, midiFmPatchFile),
- XtRImmediate,
-- (XtPointer)"/usr/local/lib/rosegarden/std.sb",
-+ (XtPointer)RGLIBDIR"/std.sb",
- },
- {
- XtNmidiFmDrumPFile,
-@@ -144,7 +144,7 @@
- sizeof(String),
- XtOffset(AppDataPtr, midiFmDrumPFile),
- XtRImmediate,
-- (XtPointer)"/usr/local/lib/rosegarden/drums.sb",
-+ (XtPointer)RGLIBDIR"/drums.sb",
- },
- {
- XtNscorePlayTracking,
-@@ -162,7 +162,7 @@
- sizeof(char *),
- XtOffset(AppDataPtr, filtersDirectory),
- XtRImmediate,
-- (XtPointer)"/usr/local/lib/rosegarden/rosepetal-filters",
-+ (XtPointer)RGLIBDIR"/rosepetal-filters",
- }
-
- };
diff --git a/audio/rosegarden/patches/patch-af b/audio/rosegarden/patches/patch-af
deleted file mode 100644
index 0534317f76f..00000000000
--- a/audio/rosegarden/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 2002/03/19 12:21:07 wiz Exp $
-
---- topbox/src/Resources.h.orig Fri Oct 10 06:22:12 1997
-+++ topbox/src/Resources.h
-@@ -61,7 +61,7 @@
- sizeof(char *),
- XtOffset(AppDataPtr,helpFile),
- XtRImmediate,
-- "/usr/local/lib/rosegarden/rosehelp.info",
-+ RGLIBDIR"/help/rosehelp.info",
- },
- {
- XtNhelpTextFont,
diff --git a/audio/rosegarden/patches/patch-ag b/audio/rosegarden/patches/patch-ag
deleted file mode 100644
index 91f04a45679..00000000000
--- a/audio/rosegarden/patches/patch-ag
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2002/03/19 12:21:08 wiz Exp $
-
---- do-install.orig Tue Oct 21 18:20:43 1997
-+++ do-install
-@@ -57,9 +57,10 @@
- $install -c ./petal/harmonizer.tcl $ROSELIBDIR/rosepetal-filters
- $install -c ./petal/pattern.tcl $ROSELIBDIR/rosepetal-filters
-
--test -d $HOME/.. || exit 0 # not set
--test -f $HOME/Rosegarden && mv $HOME/Rosegarden $HOME/Rosegarden.SAVED
--$install -c -m 644 Rosegarden $HOME
-+ADDIR=$LIBDIR/X11/app-defaults
-+test -d $ADDIR &&\
-+ sed -e s:/usr/local/lib:$LIBDIR: -e s:/usr/local/bin:$BINDIR: Rosegarden.in >Rosegarden &&\
-+ $install -c -m 644 Rosegarden $ADDIR
-
- )
-
diff --git a/audio/rplay/DESCR b/audio/rplay/DESCR
deleted file mode 100644
index 5505cedf57b..00000000000
--- a/audio/rplay/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-rplay is a flexible network audio system that allows sounds to be played to
-and from local and remote systems.
-
-* 8-bit & 16-bit audio input and output.
-
-* .au, .snd, .aiff, .wav, .voc, .ub, .ul, G.721 4-bit, G.723 3-bit, and
- G.723 5-bit audio files.
-
-* Stereo input and output. (2 channels)
-
-* Sounds can be played at any sample rate.
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
deleted file mode 100644
index 6e170b4d9d3..00000000000
--- a/audio/rplay/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# $NetBSD: Makefile,v 1.56 2007/01/06 17:41:00 veego Exp $
-#
-
-DISTNAME= rplay-3.3.2
-PKGREVISION= 4
-CATEGORIES= audio
-MASTER_SITES= ftp://rplay.doit.org/pub/rplay/ \
- http://rplay.doit.org/dist/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://rplay.doit.org/
-COMMENT= Network audio player
-
-USE_TOOLS+= makeinfo
-USE_LIBTOOL= YES
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+= --build=BUILD
-
-INFO_FILES= # PLIST
-RCD_SCRIPTS= rplayd
-EGDIR= ${PREFIX}/share/examples/rplay
-
-pre-configure:
- cd ${WRKSRC}/doc; for manpage in *.[0-9]; do \
- ${SED} -e "s|/usr/local/etc|${PKG_SYSCONFDIR}|g" \
- -e "s|/usr/local|${PREFIX}|g" \
- -e "s|/etc/rplay|${PKG_SYSCONFDIR}|g" \
- $${manpage} > $${manpage}.pdone; \
- ${MV} -f $${manpage}.pdone $${manpage}; \
- done
-
-post-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
-.for f in rplay.conf rplay.helpers rplay.hosts rplay.servers
- ${INSTALL_DATA} ${WRKSRC}/etc/${f} ${EGDIR}
-.endfor
-
-.include "../../audio/gsm/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
-.include "../../devel/rx/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/rplay/PLIST b/audio/rplay/PLIST
deleted file mode 100644
index 16523c6c9f3..00000000000
--- a/audio/rplay/PLIST
+++ /dev/null
@@ -1,23 +0,0 @@
-@comment $NetBSD: PLIST,v 1.9 2006/03/30 03:44:41 jlam Exp $
-bin/rplay
-bin/rptp
-include/rplay.h
-info/RPLAY.info
-info/RPTP.info
-info/librplay.info
-info/rplay.info
-lib/librplay.la
-man/man1/rplay.1
-man/man1/rptp.1
-man/man5/rplay.conf.5
-man/man5/rplay.helpers.5
-man/man5/rplay.hosts.5
-man/man5/rplay.servers.5
-man/man8/rplayd.8
-sbin/rplayd
-share/examples/rc.d/rplayd
-share/examples/rplay/rplay.conf
-share/examples/rplay/rplay.helpers
-share/examples/rplay/rplay.hosts
-share/examples/rplay/rplay.servers
-@dirrm share/examples/rplay
diff --git a/audio/rplay/buildlink3.mk b/audio/rplay/buildlink3.mk
deleted file mode 100644
index 3140e76be74..00000000000
--- a/audio/rplay/buildlink3.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:37 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-RPLAY_BUILDLINK3_MK:= ${RPLAY_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= rplay
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrplay}
-BUILDLINK_PACKAGES+= rplay
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rplay
-
-.if !empty(RPLAY_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.rplay+= rplay>=3.3.2nb1
-BUILDLINK_ABI_DEPENDS.rplay+= rplay>=3.3.2nb2
-BUILDLINK_PKGSRCDIR.rplay?= ../../audio/rplay
-.endif # RPLAY_BUILDLINK3_MK
-
-.include "../../audio/gsm/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
-.include "../../devel/rx/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/rplay/distinfo b/audio/rplay/distinfo
deleted file mode 100644
index eedb0c6d8f7..00000000000
--- a/audio/rplay/distinfo
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: distinfo,v 1.11 2007/01/06 17:41:00 veego Exp $
-
-SHA1 (rplay-3.3.2.tar.gz) = 80b8001998a6f9837773f26285afffd609df2662
-RMD160 (rplay-3.3.2.tar.gz) = e5c740eade2cc770ea78c8f53020fa6d78f59861
-Size (rplay-3.3.2.tar.gz) = 480015 bytes
-SHA1 (patch-aa) = 1487cc793f5485945436b070054d0ada8538b74c
-SHA1 (patch-ab) = 4f2b26f96e431ebec8169c7ecd9187e0d9196b73
-SHA1 (patch-ac) = 89ccb3b33b245710b5349899c6539c004c9bade2
-SHA1 (patch-ad) = 395048f6f0d0c579dfe81a0a2a0556651305e07b
-SHA1 (patch-ae) = 5095335425d16e24831ee8bcaacc60b0ec4d00ee
-SHA1 (patch-af) = 12f6bc02de7fceb44b6390178429654ef85dcc5d
-SHA1 (patch-ag) = ce19208502a150b7b9808c8f1755d116c978a506
-SHA1 (patch-ai) = b95f7af868a2dcf4a46f8b0294cef97c277d1933
-SHA1 (patch-aj) = 47535315d2edecd578a0e5c59cdfdf9f2e9a9a4a
-SHA1 (patch-ak) = 283d43624c6aa6b8577fae84763fd7e7611259df
-SHA1 (patch-al) = d1ba256801fe89606be00e61062156814cf5de6e
-SHA1 (patch-am) = cdea095456b089284ce4da9152cce0958bbc9c0f
-SHA1 (patch-an) = c59d49c738596943b6e4fbef19130d3a38fe4ad2
-SHA1 (patch-ao) = 01316da024026f526dd5389c3a6c2eaf89814546
-SHA1 (patch-ap) = 46e7e7fc0fb3b7d5228bf81877ac186eda1be00f
-SHA1 (patch-aq) = 41e6f83bb5c8a1223fc9d9cd8a21fee36012965f
-SHA1 (patch-ar) = 2428398a2d00e3db937d3692cfedf9cdd7691db8
-SHA1 (patch-as) = 64d31c1bc4d1659a18e9bfb922550f4a390f15bd
-SHA1 (patch-at) = d3f20f7693c0d4401c393a1bbcb766dee722a1d0
-SHA1 (patch-au) = 7451e5ba18e21c3787869cf9a1d55433d9d488fc
-SHA1 (patch-av) = 6eaa0294af7d559b7e0b74e22e93aecc42db1a9a
-SHA1 (patch-aw) = 82de8a6a58f0e3db1d52f97bcaff7f4ad643bb73
-SHA1 (patch-ax) = 7b2ce8d34bca784df1fcaa53fe081c89ca882b58
-SHA1 (patch-ca) = d5ffe7a8e0f2112adf0d11b5661d565e5a57dec8
-SHA1 (patch-cb) = 24c810e43d6735c24908ba429ede32a49cff36e8
-SHA1 (patch-cc) = 824d7c70282d24e489c7c041982018da13ac70ce
diff --git a/audio/rplay/files/rplayd.sh b/audio/rplay/files/rplayd.sh
deleted file mode 100644
index a5588b245c7..00000000000
--- a/audio/rplay/files/rplayd.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: rplayd.sh,v 1.6 2002/09/20 02:01:54 grant Exp $
-#
-# PROVIDE: rplayd
-# REQUIRE: DAEMON
-
-if [ -f /etc/rc.subr ]
-then
- . /etc/rc.subr
-fi
-
-name="rplayd"
-rcvar=$name
-command="@PREFIX@/sbin/${name}"
-required_files="@PKG_SYSCONFDIR@/rplay.conf"
-
-if [ -f /etc/rc.subr ]
-then
- load_rc_config $name
- run_rc_command "$1"
-else
- @ECHO@ -n ' ${name}'
- ${command} ${rplayd_flags} ${command_args}
-fi
diff --git a/audio/rplay/patches/patch-aa b/audio/rplay/patches/patch-aa
deleted file mode 100644
index 9133b2170b0..00000000000
--- a/audio/rplay/patches/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/03/20 03:53:27 jlam Exp $
-
---- Makefile.config.in.orig 1998-08-13 02:12:59.000000000 -0400
-+++ Makefile.config.in
-@@ -11,10 +11,10 @@ exec_prefix= @exec_prefix@
- bindir= $(exec_prefix)/bin
- sbindir= $(exec_prefix)/sbin
- libdir= $(exec_prefix)/lib
--mandir= $(prefix)/man
-+mandir= @mandir@
- etcdir= $(prefix)/etc
- includedir= $(prefix)/include
--infodir= $(prefix)/info
-+infodir= @infodir@
- tmpdir= /tmp
- debiandir= @srcdir@/../debian
-
-@@ -43,6 +43,7 @@ CFLAGS= @CFLAGS@
- #CC_OPTIONS= -O -cckr # SGI
- #CC_OPTIONS= -O # generic
- #CC_OPTIONS= -g # debug
-+CC_OPTIONS= @CPPFLAGS@ # hack to add CPPFLAGS
-
- ##
- ## Extra linker options.
-@@ -53,7 +54,7 @@ CFLAGS= @CFLAGS@
- ##
- ## Name of the rplay library to build.
- ##
--LIBRPLAY_NAME= librplay.a
-+LIBRPLAY_NAME= librplay.la
- #LIBRPLAY_NAME= librplay.sl # HP-UX
-
- ##
diff --git a/audio/rplay/patches/patch-ab b/audio/rplay/patches/patch-ab
deleted file mode 100644
index 62dc4d07cc4..00000000000
--- a/audio/rplay/patches/patch-ab
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2005/05/23 08:44:37 rillig Exp $
-
---- configure.in.orig Wed Jun 9 02:26:28 1999
-+++ configure.in Tue Jan 18 16:20:01 2000
-@@ -59,6 +59,7 @@
- AC_HEADER_TIME
- dnl AC_PATH_XTRA
- AC_CHECK_HEADERS(fcntl.h sys/file.h sys/ioctl.h sys/time.h stdlib.h unistd.h memory.h string.h strings.h utime.h limits.h gsm.h gsm/gsm.h rxposix.h rx/rxposix.h)
-+AC_CHECK_HEADERS(readline.h history.h readline/readline.h readline/history.h)
- AC_HEADER_SYS_WAIT
-
- dnl Check for typedefs, structures, and compiler characteristics.
-@@ -74,7 +75,20 @@
- AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])
- AC_CHECK_LIB(nsl, t_accept, [LIBS="$LIBS -lnsl"])
-
--AC_CHECK_LIB(readline, readline, [RL_LIBS="-lreadline"])
-+if test "$ac_cv_header_readline_h" = "yes" ||
-+ test "$ac_cv_header_readline_readline_h" = "yes"; then
-+ AC_CHECK_LIB(termcap, tputs,
-+ [AC_CHECK_LIB(edit, readline,
-+ [AC_DEFINE(HAVE_LIBEDIT)
-+ AC_DEFINE(HAVE_READLINE)
-+ RL_LIBS="-ledit -ltermcap"],
-+ [AC_CHECK_LIB(readline, readline,
-+ [AC_DEFINE(HAVE_LIBREADLINE)
-+ AC_DEFINE(HAVE_READLINE)
-+ RL_LIBS="-ledit -ltermcap"], -ltermcap)
-+ ], -ltermcap)
-+ ])
-+fi
- AC_SUBST(RL_LIBS)
-
- AC_CHECK_LIB(gsm, gsm_decode, [HAVE_GSM="yes"])
-@@ -209,6 +223,24 @@
- AC_MSG_RESULT($is_freebsd)
- if test $is_freebsd = "yes"; then
- RPLAY_TARGET="FreeBSD"
-+fi
-+fi
-+
-+
-+dnl
-+dnl Check for NetBSD
-+dnl
-+if test -z "$RPLAY_TARGET"; then
-+AC_MSG_CHECKING(for NetBSD)
-+AC_EGREP_CPP(yes,
-+[
-+#ifdef __NetBSD__
-+ yes
-+#endif
-+], is_netbsd=yes, is_netbsd=no)
-+AC_MSG_RESULT($is_netbsd)
-+if test $is_netbsd = "yes"; then
-+ RPLAY_TARGET="NetBSD"
- fi
- fi
diff --git a/audio/rplay/patches/patch-ac b/audio/rplay/patches/patch-ac
deleted file mode 100644
index 7805e90640f..00000000000
--- a/audio/rplay/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2000/01/26 22:11:36 jlam Exp $
-
---- doc/Makefile.in.orig Tue Jul 14 18:35:23 1998
-+++ doc/Makefile.in Tue Jan 18 16:15:32 2000
-@@ -23,7 +23,7 @@
- .texi.html:
- $(TEXI2HTML) $(TEXI2HTML_FLAGS) $<
-
--all:
-+all: info
-
- info: RPLAY.info RPTP.info librplay.info rplay.info
-
diff --git a/audio/rplay/patches/patch-ad b/audio/rplay/patches/patch-ad
deleted file mode 100644
index 23bde85378a..00000000000
--- a/audio/rplay/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2000/01/26 22:11:36 jlam Exp $
-
---- doc/RPLAY.texi.orig Tue Jul 14 18:35:23 1998
-+++ doc/RPLAY.texi Tue Jan 18 16:15:32 2000
-@@ -2,6 +2,10 @@
- @c %**start of header
- @setfilename RPLAY.info
- @settitle The RPLAY Protocol
-+@dircategory Network Audio Systems
-+@direntry
-+* RPLAY Protocol: (RPLAY) The RPLAY Protocol
-+@end direntry
- @iftex
- @finalout
- @end iftex
diff --git a/audio/rplay/patches/patch-ae b/audio/rplay/patches/patch-ae
deleted file mode 100644
index 353499b8991..00000000000
--- a/audio/rplay/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2000/01/26 22:11:36 jlam Exp $
-
---- doc/RPTP.texi.orig Tue Jul 14 18:35:23 1998
-+++ doc/RPTP.texi Tue Jan 18 16:15:32 2000
-@@ -2,6 +2,10 @@
- @c %**start of header
- @setfilename RPTP.info
- @settitle The RPTP Protocol
-+@dircategory Network Audio Systems
-+@direntry
-+* RPTP: (RPTP) RPTP Protocol
-+@end direntry
- @defindex ev
- @iftex
- @finalout
diff --git a/audio/rplay/patches/patch-af b/audio/rplay/patches/patch-af
deleted file mode 100644
index 119ac326eb3..00000000000
--- a/audio/rplay/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.3 2000/01/26 22:11:36 jlam Exp $
-
---- doc/librplay.texi.orig Tue Jul 14 18:35:23 1998
-+++ doc/librplay.texi Tue Jan 18 16:15:33 2000
-@@ -2,6 +2,10 @@
- @c %**start of header
- @setfilename librplay.info
- @settitle The rplay Programmer's Manual
-+@dircategory Network Audio Systems
-+@direntry
-+* librplay: (librplay) The rplay Programmer's Manual
-+@end direntry
- @iftex
- @finalout
- @end iftex
diff --git a/audio/rplay/patches/patch-ag b/audio/rplay/patches/patch-ag
deleted file mode 100644
index 44ca54c72f7..00000000000
--- a/audio/rplay/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2000/01/26 22:11:36 jlam Exp $
-
---- doc/rplay.texi.orig Tue Jul 14 18:35:23 1998
-+++ doc/rplay.texi Tue Jan 18 16:15:33 2000
-@@ -2,6 +2,10 @@
- @c %**start of header
- @setfilename rplay.info
- @settitle rplay
-+@dircategory Network Audio Systems
-+@direntry
-+* rplay: (rplay) RPlay
-+@end direntry
- @iftex
- @finalout
- @end iftex
diff --git a/audio/rplay/patches/patch-ai b/audio/rplay/patches/patch-ai
deleted file mode 100644
index 77bca25f758..00000000000
--- a/audio/rplay/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2000/01/26 22:11:36 jlam Exp $
-
---- include/config.h.in.orig Wed Jun 9 02:25:20 1999
-+++ include/config.h.in Tue Jan 18 16:15:33 2000
-@@ -189,6 +189,8 @@
- #undef HAVE_WAITPID
- #undef HAVE_SNPRINTF
- #undef HAVE_VSNPRINTF
-+#undef HAVE_READLINE
-+#undef HAVE_LIBEDIT
- #undef HAVE_LIBREADLINE
- #undef HAVE_RANDOM
- #undef HAVE_SRANDOM
diff --git a/audio/rplay/patches/patch-aj b/audio/rplay/patches/patch-aj
deleted file mode 100644
index 1f46bde726e..00000000000
--- a/audio/rplay/patches/patch-aj
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2000/01/26 22:11:37 jlam Exp $
-
---- librplay/Makefile.in.orig Mon Mar 22 21:38:38 1999
-+++ librplay/Makefile.in Tue Jan 18 16:15:33 2000
-@@ -9,28 +9,25 @@
- MKINSTALLDIRS= @srcdir@/../mkinstalldirs
-
- CPPFLAGS= $(CC_OPTIONS) -I. -I../include -I@srcdir@/../include @DEFS@
--LDFLAGS= $(LD_OPTIONS) -shared @LDFLAGS@
--
--.c.o:
-- $(CC) -c $(CPPFLAGS) $(CFLAGS) $<
-+LDFLAGS= $(LD_OPTIONS) @LDFLAGS@
-
- .SUFFIXES: .lo
- .c.lo:
-- $(CC) -c -fPIC $(CPPFLAGS) $(CFLAGS) -o $@ $<
-+ $(LIBTOOL) $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
-
- TARGET= $(LIBRPLAY_NAME)
- SRCS= rplay.c rptp.c async.c
- OBJS= rplay.o rptp.o async.o
- SHAREDOBJS= rplay.lo rptp.lo async.lo
-
--all: $(TARGET) librplay.so
-+all: $(TARGET)
-
- #
- # Use the following for SunOS 4.1.x, Solaris 2.x, Linux, NetBSD
- #
--$(TARGET): $(OBJS)
-- $(AR) rcv $@ $?
-- $(RANLIB) $@
-+$(TARGET): $(SHAREDOBJS)
-+ $(LIBTOOL) $(CC) $(LDFLAGS) -o $@ $? \
-+ -rpath $(libdir) -version-info 0:0
-
- librplay.so: $(SHAREDOBJS)
- $(CC) -o $@ $(SHAREDOBJS) $(LDFLAGS)
-@@ -49,15 +46,13 @@
-
- install: all
- $(MKINSTALLDIRS) $(libdir)
-- $(INSTALL_DATA) $(TARGET) $(libdir)
-- $(INSTALL_DATA) librplay.so $(libdir)
-+ $(LIBTOOL) $(INSTALL_DATA) $(TARGET) $(libdir)
-
- uninstall:
-- $(RM) $(libdir)/$(TARGET)
-- $(RM) $(libdir)/librplay.so
-+ $(LIBTOOL) $(RM) $(libdir)/$(TARGET)
-
- clean:
-- $(RM) $(OBJS) $(SHAREDOBJS) $(TARGET) librplay.so a.out core *~ *.bak *.orig TAGS
-+ $(LIBTOOL) $(RM) $(OBJS) $(SHAREDOBJS) $(TARGET) librplay.so a.out core *~ *.bak *.orig TAGS
-
- distclean: clean
- $(RM) Makefile
diff --git a/audio/rplay/patches/patch-ak b/audio/rplay/patches/patch-ak
deleted file mode 100644
index 37de480e83f..00000000000
--- a/audio/rplay/patches/patch-ak
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2000/01/26 22:11:37 jlam Exp $
-
---- rplay/Makefile.in.orig Sat Mar 20 19:44:57 1999
-+++ rplay/Makefile.in Tue Jan 18 16:15:33 2000
-@@ -13,7 +13,7 @@
- .c.o:
- $(CC) -c $(CPPFLAGS) $(CFLAGS) $<
-
--LDFLAGS= $(LD_OPTIONS) -L../librplay -lrplay -L../lib -lrp @LDFLAGS@ @LIBS@
-+LDFLAGS= $(LD_OPTIONS) ../librplay/$(LIBRPLAY_NAME) ../lib/librp.a @LDFLAGS@ @LIBS@
-
- TARGET= rplay
- SRCS= rplay.c
-@@ -22,7 +22,7 @@
- all: $(TARGET)
-
- $(TARGET): $(OBJS) ../librplay/$(LIBRPLAY_NAME) ../lib/librp.a
-- $(CC) -o $@ $(OBJS) $(LDFLAGS)
-+ $(LIBTOOL) $(CC) -o $@ $(OBJS) $(LDFLAGS)
-
- ../librplay/$(LIBRPLAY_NAME):
- (cd ../librplay; $(MAKE) $(MFLAGS))
-@@ -32,13 +32,13 @@
-
- install: all
- $(MKINSTALLDIRS) $(bindir)
-- $(INSTALL_PROGRAM) $(TARGET) $(bindir)/$(TARGET)
-+ $(LIBTOOL) $(INSTALL_PROGRAM) $(TARGET) $(bindir)/$(TARGET)
-
- uninstall:
-- $(RM) $(bindir)/$(TARGET)
-+ $(LIBTOOL) $(RM) $(bindir)/$(TARGET)
-
- clean:
-- $(RM) $(OBJS) $(TARGET) a.out core *~ *.bak *.orig TAGS
-+ $(LIBTOOL) $(RM) $(OBJS) $(TARGET) a.out core *~ *.bak *.orig TAGS
-
- distclean: clean
- $(RM) Makefile
diff --git a/audio/rplay/patches/patch-al b/audio/rplay/patches/patch-al
deleted file mode 100644
index eec81268add..00000000000
--- a/audio/rplay/patches/patch-al
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-al,v 1.1 2000/01/26 22:11:37 jlam Exp $
-
---- rplayd/Makefile.in.orig Wed Jun 9 02:27:43 1999
-+++ rplayd/Makefile.in Wed Jan 26 17:03:44 2000
-@@ -24,8 +24,8 @@
- .c.o:
- $(CC) -c $(CPPFLAGS) $(CFLAGS) $<
-
--LDFLAGS= $(LD_OPTIONS) -L../librplay -lrplay -L../lib -lrp \
-- -L../adpcm -ladpcm @GSM_LIBS@ -L../rx -lrx @LDFLAGS@ @LIBS@ -lm
-+LDFLAGS= $(LD_OPTIONS) ../librplay/$(LIBRPLAY_NAME) ../lib/librp.a \
-+ ../adpcm/libadpcm.a @GSM_LIBS@ @RX_LIBS@ @LDFLAGS@ @LIBS@ -lm
-
- TARGET= rplayd
-
-@@ -40,7 +40,7 @@
- all: $(TARGET)
-
- $(TARGET): $(OBJS) ../librplay/$(LIBRPLAY_NAME) ../lib/librp.a ../adpcm/libadpcm.a
-- $(CC) -o $@ $(OBJS) $(LDFLAGS)
-+ $(LIBTOOL) $(CC) -o $@ $(OBJS) $(LDFLAGS)
-
- ../librplay/$(LIBRPLAY_NAME):
- (cd ../librplay; $(MAKE) $(MFLAGS))
-@@ -53,14 +53,13 @@
-
- install: all
- $(MKINSTALLDIRS) $(sbindir)
-- $(INSTALL_PROGRAM) $(TARGET) $(sbindir)/$(TARGET)
-- @test -x $(bindir)/$(TARGET) && echo "" && echo " Note: Consider removing $(bindir)/$(TARGET)" && echo ""
-+ $(LIBTOOL) $(INSTALL_PROGRAM) $(TARGET) $(sbindir)/$(TARGET)
-
- uninstall:
-- $(RM) $(bindir)/$(TARGET)
-+ $(LIBTOOL) $(RM) $(bindir)/$(TARGET)
-
- clean:
-- $(RM) $(OBJS) $(TARGET) a.out core *~ *.bak *.orig TAGS
-+ $(LIBTOOL) $(RM) $(OBJS) $(TARGET) a.out core *~ *.bak *.orig TAGS
- cd audio; $(RM) *~ *.bak *.orig
-
- distclean: clean
diff --git a/audio/rplay/patches/patch-am b/audio/rplay/patches/patch-am
deleted file mode 100644
index 783d6531728..00000000000
--- a/audio/rplay/patches/patch-am
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-am,v 1.1 2000/01/26 22:11:37 jlam Exp $
-
---- rplayd/sound.h.orig Wed Jun 9 02:27:44 1999
-+++ rplayd/sound.h Tue Jan 18 16:15:33 2000
-@@ -170,9 +170,9 @@
- int gsm_bit_frame_bytes; /* Number of bytes in gsm_bit_frame */
- int gsm_fixed_buffer_size;
- #endif /* HAVE_GSM */
--#ifdef HAVE_CDROM
-+#if defined(HAVE_CDROM) || defined(HAVE_HELPERS)
- int pid;
--#endif /* HAVE_CDROM */
-+#endif /* HAVE_CDROM || HAVE_HELPERS */
- }
- SINDEX;
-
diff --git a/audio/rplay/patches/patch-an b/audio/rplay/patches/patch-an
deleted file mode 100644
index 6287617ebb5..00000000000
--- a/audio/rplay/patches/patch-an
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-an,v 1.1 2000/01/26 22:11:37 jlam Exp $
-
---- rplayd/spool.c.orig Wed Mar 10 16:14:38 1999
-+++ rplayd/spool.c Tue Jan 18 16:15:33 2000
-@@ -1127,8 +1127,8 @@
- spool_flow_pause(sp);
- }
- }
--#endif /* HAVE_CDROM */
- }
-+#endif /* HAVE_CDROM */
- }
- else
- {
diff --git a/audio/rplay/patches/patch-ao b/audio/rplay/patches/patch-ao
deleted file mode 100644
index ac3e00628e8..00000000000
--- a/audio/rplay/patches/patch-ao
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2000/01/26 22:11:37 jlam Exp $
-
---- rplayd/timer.h.orig Wed Mar 10 02:58:04 1999
-+++ rplayd/timer.h Tue Jan 18 16:15:34 2000
-@@ -30,6 +30,7 @@
- #include "config.h"
- #endif
-
-+#include <signal.h>
- #include <sys/types.h>
-
- extern double timer_rate;
diff --git a/audio/rplay/patches/patch-ap b/audio/rplay/patches/patch-ap
deleted file mode 100644
index 860abc068b8..00000000000
--- a/audio/rplay/patches/patch-ap
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2000/01/26 22:11:37 jlam Exp $
-
---- rptp/Makefile.in.orig Wed Jun 9 02:27:48 1999
-+++ rptp/Makefile.in Tue Jan 18 16:15:34 2000
-@@ -13,7 +13,7 @@
- .c.o:
- $(CC) -c $(CPPFLAGS) $(CFLAGS) $<
-
--LDFLAGS= $(LD_OPTIONS) -L../librplay -lrplay -L../lib -lrp @LDFLAGS@ @RL_LIBS@ @LIBS@
-+LDFLAGS= $(LD_OPTIONS) ../librplay/$(LIBRPLAY_NAME) ../lib/librp.a @LDFLAGS@ @RL_LIBS@ @LIBS@
-
- TARGET= rptp
-
-@@ -24,7 +24,7 @@
- all: $(TARGET)
-
- $(TARGET): $(OBJS) ../librplay/$(LIBRPLAY_NAME) ../lib/librp.a
-- $(CC) -o $@ $(OBJS) $(LDFLAGS)
-+ $(LIBTOOL) $(CC) -o $@ $(OBJS) $(LDFLAGS)
-
- ../librplay/$(LIBRPLAY_NAME):
- (cd ../librplay; $(MAKE) $(MFLAGS))
-@@ -34,13 +34,13 @@
-
- install: all
- $(MKINSTALLDIRS) $(bindir)
-- $(INSTALL_PROGRAM) $(TARGET) $(bindir)/$(TARGET)
-+ $(LIBTOOL) $(INSTALL_PROGRAM) $(TARGET) $(bindir)/$(TARGET)
-
- uninstall:
-- $(RM) $(bindir)/$(TARGET)
-+ $(LIBTOOL) $(RM) $(bindir)/$(TARGET)
-
- clean:
-- $(RM) $(OBJS) $(TARGET) a.out core *~ *.bak *.orig TAGS
-+ $(LIBTOOL) $(RM) $(OBJS) $(TARGET) a.out core *~ *.bak *.orig TAGS
-
- distclean: clean
- $(RM) Makefile
diff --git a/audio/rplay/patches/patch-aq b/audio/rplay/patches/patch-aq
deleted file mode 100644
index 3020511e2ac..00000000000
--- a/audio/rplay/patches/patch-aq
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2000/01/26 22:11:37 jlam Exp $
-
---- rptp/rptp.c.orig Sat Mar 20 19:45:08 1999
-+++ rptp/rptp.c Tue Jan 18 16:15:34 2000
-@@ -31,10 +31,23 @@
- #ifdef HAVE_STRING_H
- #include <string.h>
- #endif
--#ifdef HAVE_LIBREADLINE
--#include <readline/readline.h>
--#include <readline/history.h>
--#endif /* HAVE_LIBREADLINE */
-+
-+#ifdef HAVE_READLINE
-+# ifdef HAVE_READLINE_H
-+# include <readline.h>
-+# ifdef HAVE_HISTORY_H
-+# include <history.h>
-+# endif
-+# elif defined(HAVE_READLINE_READLINE_H)
-+# include <readline/readline.h>
-+# ifdef HAVE_READLINE_HISTORY_H
-+# include <readline/history.h>
-+# endif
-+# else
-+# undef HAVE_READLINE
-+# endif
-+#endif /* HAVE_READLINE */
-+
- #include "rplay.h"
- #include "getopt.h"
-
-@@ -249,7 +262,7 @@
- {
- if (!raw)
- {
--#ifdef HAVE_LIBREADLINE
-+#ifdef HAVE_READLINE
- p = readline(prompt);
- if (!p)
- {
-@@ -263,7 +276,7 @@
- #endif
- }
-
--#ifndef HAVE_LIBREADLINE
-+#ifndef HAVE_READLINE
- if (fgets(buf, sizeof(buf), stdin) == NULL)
- {
- done(0);
diff --git a/audio/rplay/patches/patch-ar b/audio/rplay/patches/patch-ar
deleted file mode 100644
index 3363c5c543c..00000000000
--- a/audio/rplay/patches/patch-ar
+++ /dev/null
@@ -1,9413 +0,0 @@
-$NetBSD: patch-ar,v 1.3 2005/10/10 15:13:58 joerg Exp $
-
---- configure.orig 1999-06-09 06:26:19.000000000 +0000
-+++ configure
-@@ -1,30 +1,326 @@
- #! /bin/sh
--
- # Guess values for system-dependent variables and create Makefiles.
--# Generated automatically using autoconf version 2.13
--# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-+# Generated by GNU Autoconf 2.59.
- #
-+# Copyright (C) 2003 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
-+## --------------------- ##
-+## M4sh Initialization. ##
-+## --------------------- ##
-+
-+# Be Bourne compatible
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '${1+"$@"}'='"$@"'
-+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-+ set -o posix
-+fi
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
-+# Support unset when possible.
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+ as_unset=unset
-+else
-+ as_unset=false
-+fi
-+
-+
-+# Work around bugs in pre-3.0 UWIN ksh.
-+$as_unset ENV MAIL MAILPATH
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
-+do
-+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ eval $as_var=C; export $as_var
-+ else
-+ $as_unset $as_var
-+ fi
-+done
-+
-+# Required to use basename.
-+if expr a : '\(a\)' >/dev/null 2>&1; then
-+ as_expr=expr
-+else
-+ as_expr=false
-+fi
-+
-+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+ as_basename=basename
-+else
-+ as_basename=false
-+fi
-+
-+
-+# Name of the executable.
-+as_me=`$as_basename "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+ X"$0" : 'X\(//\)$' \| \
-+ X"$0" : 'X\(/\)$' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X/"$0" |
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-+ /^X\/\(\/\/\)$/{ s//\1/; q; }
-+ /^X\/\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+
-+
-+# PATH needs CR, and LINENO needs CR and PATH.
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+ PATH_SEPARATOR=';'
-+ else
-+ PATH_SEPARATOR=:
-+ fi
-+ rm -f conf$$.sh
-+fi
-+
-+
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x$as_lineno_3" = "x$as_lineno_2" || {
-+ # Find who we are. Look in the path if we contain no path at all
-+ # relative or not.
-+ case $0 in
-+ *[\\/]* ) as_myself=$0 ;;
-+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+
-+ ;;
-+ esac
-+ # We did not find ourselves, most probably we were run as `sh COMMAND'
-+ # in which case we are not to be found in the path.
-+ if test "x$as_myself" = x; then
-+ as_myself=$0
-+ fi
-+ if test ! -f "$as_myself"; then
-+ { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-+ { (exit 1); exit 1; }; }
-+ fi
-+ case $CONFIG_SHELL in
-+ '')
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for as_base in sh bash ksh sh5; do
-+ case $as_dir in
-+ /*)
-+ if ("$as_dir/$as_base" -c '
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
-+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-+ CONFIG_SHELL=$as_dir/$as_base
-+ export CONFIG_SHELL
-+ exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-+ fi;;
-+ esac
-+ done
-+done
-+;;
-+ esac
-+
-+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-+ # uniformly replaced by the line number. The first 'sed' inserts a
-+ # line-number line before each line; the second 'sed' does the real
-+ # work. The second script uses 'N' to pair each line-number line
-+ # with the numbered line, and appends trailing '-' during
-+ # substitution so that $LINENO is not a special case at line end.
-+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-+ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
-+ sed '=' <$as_myself |
-+ sed '
-+ N
-+ s,$,-,
-+ : loop
-+ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+ t loop
-+ s,-$,,
-+ s,^['$as_cr_digits']*\n,,
-+ ' >$as_me.lineno &&
-+ chmod +x $as_me.lineno ||
-+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+ { (exit 1); exit 1; }; }
-+
-+ # Don't try to exec as it changes $[0], causing all sort of problems
-+ # (the dirname of $[0] is not the place where we might find the
-+ # original and so on. Autoconf is especially sensible to this).
-+ . ./$as_me.lineno
-+ # Exit status is that of the last command.
-+ exit
-+}
-+
-+
-+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-+ *c*,-n*) ECHO_N= ECHO_C='
-+' ECHO_T=' ' ;;
-+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-+ *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+esac
-+
-+if expr a : '\(a\)' >/dev/null 2>&1; then
-+ as_expr=expr
-+else
-+ as_expr=false
-+fi
-+
-+rm -f conf$$ conf$$.exe conf$$.file
-+echo >conf$$.file
-+if ln -s conf$$.file conf$$ 2>/dev/null; then
-+ # We could just check for DJGPP; but this test a) works b) is more generic
-+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-+ if test -f conf$$.exe; then
-+ # Don't use ln at all; we don't have any links
-+ as_ln_s='cp -p'
-+ else
-+ as_ln_s='ln -s'
-+ fi
-+elif ln conf$$.file conf$$ 2>/dev/null; then
-+ as_ln_s=ln
-+else
-+ as_ln_s='cp -p'
-+fi
-+rm -f conf$$ conf$$.exe conf$$.file
-+
-+if mkdir -p . 2>/dev/null; then
-+ as_mkdir_p=:
-+else
-+ test -d ./-p && rmdir ./-p
-+ as_mkdir_p=false
-+fi
-+
-+as_executable_p="test -f"
-+
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-+
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order.
-+as_nl='
-+'
-+IFS=" $as_nl"
-+
-+# CDPATH.
-+$as_unset CDPATH
-+
-+
-+# Name of the host.
-+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-+# so uname gets run too.
-+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-+
-+exec 6>&1
-
--# Defaults:
--ac_help=
-+#
-+# Initializations.
-+#
- ac_default_prefix=/usr/local
--# Any additions from configure.in:
--ac_help="$ac_help
-- --enable-rplayd-user=USER"
--ac_help="$ac_help
-- --enable-rplayd-group=GROUP"
-+ac_config_libobj_dir=.
-+cross_compiling=no
-+subdirs=
-+MFLAGS=
-+MAKEFLAGS=
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+# Maximum number of lines to put in a shell here document.
-+# This variable seems obsolete. It should probably be removed, and
-+# only ac_max_sed_lines should be used.
-+: ${ac_max_here_lines=38}
-+
-+# Identity of this package.
-+PACKAGE_NAME=
-+PACKAGE_TARNAME=
-+PACKAGE_VERSION=
-+PACKAGE_STRING=
-+PACKAGE_BUGREPORT=
-+
-+ac_unique_file="rplayd/rplayd.c"
-+# Factoring default headers for most tests.
-+ac_includes_default="\
-+#include <stdio.h>
-+#if HAVE_SYS_TYPES_H
-+# include <sys/types.h>
-+#endif
-+#if HAVE_SYS_STAT_H
-+# include <sys/stat.h>
-+#endif
-+#if STDC_HEADERS
-+# include <stdlib.h>
-+# include <stddef.h>
-+#else
-+# if HAVE_STDLIB_H
-+# include <stdlib.h>
-+# endif
-+#endif
-+#if HAVE_STRING_H
-+# if !STDC_HEADERS && HAVE_MEMORY_H
-+# include <memory.h>
-+# endif
-+# include <string.h>
-+#endif
-+#if HAVE_STRINGS_H
-+# include <strings.h>
-+#endif
-+#if HAVE_INTTYPES_H
-+# include <inttypes.h>
-+#else
-+# if HAVE_STDINT_H
-+# include <stdint.h>
-+# endif
-+#endif
-+#if HAVE_UNISTD_H
-+# include <unistd.h>
-+#endif"
-+
-+ac_subdirs_all="$ac_subdirs_all rx"
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS RPLAY_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB ETAGS MAKEDEPEND MAKEINFO TEXI2DVI TEXI2HTML DVIPS EGREP LIBOBJS RL_LIBS GSM_LIBS GSM_INCS RX_LIBS RX_INCS RPLAY_TOP RPLAY_TARGET subdirs BUILD_TARGETS LTLIBOBJS'
-+ac_subst_files=''
-
- # Initialize some variables set by options.
-+ac_init_help=
-+ac_init_version=false
- # The variables have the same names as the options, with
- # dashes changed to underlines.
--build=NONE
--cache_file=./config.cache
-+cache_file=/dev/null
- exec_prefix=NONE
--host=NONE
- no_create=
--nonopt=NONE
- no_recursion=
- prefix=NONE
- program_prefix=NONE
-@@ -33,10 +329,15 @@ program_transform_name=s,x,x,
- silent=
- site=
- srcdir=
--target=NONE
- verbose=
- x_includes=NONE
- x_libraries=NONE
-+
-+# Installation directory options.
-+# These are left unexpanded so users can "make install exec_prefix=/foo"
-+# and all the variables that are supposed to be based on exec_prefix
-+# by default will actually change.
-+# Use braces instead of parens because sh, perl, etc. also accept them.
- bindir='${exec_prefix}/bin'
- sbindir='${exec_prefix}/sbin'
- libexecdir='${exec_prefix}/libexec'
-@@ -50,17 +351,9 @@ oldincludedir='/usr/include'
- infodir='${prefix}/info'
- mandir='${prefix}/man'
-
--# Initialize some other variables.
--subdirs=
--MFLAGS= MAKEFLAGS=
--SHELL=${CONFIG_SHELL-/bin/sh}
--# Maximum number of lines to put in a shell here document.
--ac_max_here_lines=12
--
- ac_prev=
- for ac_option
- do
--
- # If the previous option needs an argument, assign it.
- if test -n "$ac_prev"; then
- eval "$ac_prev=\$ac_option"
-@@ -68,59 +361,59 @@ do
- continue
- fi
-
-- case "$ac_option" in
-- -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-- *) ac_optarg= ;;
-- esac
-+ ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
- # Accept the important Cygnus configure options, so we can diagnose typos.
-
-- case "$ac_option" in
-+ case $ac_option in
-
- -bindir | --bindir | --bindi | --bind | --bin | --bi)
- ac_prev=bindir ;;
- -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-- bindir="$ac_optarg" ;;
-+ bindir=$ac_optarg ;;
-
- -build | --build | --buil | --bui | --bu)
-- ac_prev=build ;;
-+ ac_prev=build_alias ;;
- -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-- build="$ac_optarg" ;;
-+ build_alias=$ac_optarg ;;
-
- -cache-file | --cache-file | --cache-fil | --cache-fi \
- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
- ac_prev=cache_file ;;
- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-- cache_file="$ac_optarg" ;;
-+ cache_file=$ac_optarg ;;
-+
-+ --config-cache | -C)
-+ cache_file=config.cache ;;
-
- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
- ac_prev=datadir ;;
- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
- | --da=*)
-- datadir="$ac_optarg" ;;
-+ datadir=$ac_optarg ;;
-
- -disable-* | --disable-*)
-- ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-+ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
- # Reject names that are not valid shell variable names.
-- if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-- fi
-- ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-- eval "enable_${ac_feature}=no" ;;
-+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+ { (exit 1); exit 1; }; }
-+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-+ eval "enable_$ac_feature=no" ;;
-
- -enable-* | --enable-*)
-- ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-+ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
-- if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-- fi
-- ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-- case "$ac_option" in
-- *=*) ;;
-+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+ { (exit 1); exit 1; }; }
-+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-+ case $ac_option in
-+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
- *) ac_optarg=yes ;;
- esac
-- eval "enable_${ac_feature}='$ac_optarg'" ;;
-+ eval "enable_$ac_feature='$ac_optarg'" ;;
-
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -129,95 +422,47 @@ do
- -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
- | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
- | --exec=* | --exe=* | --ex=*)
-- exec_prefix="$ac_optarg" ;;
-+ exec_prefix=$ac_optarg ;;
-
- -gas | --gas | --ga | --g)
- # Obsolete; use --with-gas.
- with_gas=yes ;;
-
-- -help | --help | --hel | --he)
-- # Omit some internal or obsolete options to make the list less imposing.
-- # This message is too long to be a string in the A/UX 3.1 sh.
-- cat << EOF
--Usage: configure [options] [host]
--Options: [defaults in brackets after descriptions]
--Configuration:
-- --cache-file=FILE cache test results in FILE
-- --help print this message
-- --no-create do not create output files
-- --quiet, --silent do not print \`checking...' messages
-- --version print the version of autoconf that created configure
--Directory and file names:
-- --prefix=PREFIX install architecture-independent files in PREFIX
-- [$ac_default_prefix]
-- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
-- [same as prefix]
-- --bindir=DIR user executables in DIR [EPREFIX/bin]
-- --sbindir=DIR system admin executables in DIR [EPREFIX/sbin]
-- --libexecdir=DIR program executables in DIR [EPREFIX/libexec]
-- --datadir=DIR read-only architecture-independent data in DIR
-- [PREFIX/share]
-- --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc]
-- --sharedstatedir=DIR modifiable architecture-independent data in DIR
-- [PREFIX/com]
-- --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var]
-- --libdir=DIR object code libraries in DIR [EPREFIX/lib]
-- --includedir=DIR C header files in DIR [PREFIX/include]
-- --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include]
-- --infodir=DIR info documentation in DIR [PREFIX/info]
-- --mandir=DIR man documentation in DIR [PREFIX/man]
-- --srcdir=DIR find the sources in DIR [configure dir or ..]
-- --program-prefix=PREFIX prepend PREFIX to installed program names
-- --program-suffix=SUFFIX append SUFFIX to installed program names
-- --program-transform-name=PROGRAM
-- run sed PROGRAM on installed program names
--EOF
-- cat << EOF
--Host type:
-- --build=BUILD configure for building on BUILD [BUILD=HOST]
-- --host=HOST configure for HOST [guessed]
-- --target=TARGET configure for TARGET [TARGET=HOST]
--Features and packages:
-- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
-- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
-- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
-- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
-- --x-includes=DIR X include files are in DIR
-- --x-libraries=DIR X library files are in DIR
--EOF
-- if test -n "$ac_help"; then
-- echo "--enable and --with options recognized:$ac_help"
-- fi
-- exit 0 ;;
-+ -help | --help | --hel | --he | -h)
-+ ac_init_help=long ;;
-+ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-+ ac_init_help=recursive ;;
-+ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-+ ac_init_help=short ;;
-
- -host | --host | --hos | --ho)
-- ac_prev=host ;;
-+ ac_prev=host_alias ;;
- -host=* | --host=* | --hos=* | --ho=*)
-- host="$ac_optarg" ;;
-+ host_alias=$ac_optarg ;;
-
- -includedir | --includedir | --includedi | --included | --include \
- | --includ | --inclu | --incl | --inc)
- ac_prev=includedir ;;
- -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
- | --includ=* | --inclu=* | --incl=* | --inc=*)
-- includedir="$ac_optarg" ;;
-+ includedir=$ac_optarg ;;
-
- -infodir | --infodir | --infodi | --infod | --info | --inf)
- ac_prev=infodir ;;
- -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-- infodir="$ac_optarg" ;;
-+ infodir=$ac_optarg ;;
-
- -libdir | --libdir | --libdi | --libd)
- ac_prev=libdir ;;
- -libdir=* | --libdir=* | --libdi=* | --libd=*)
-- libdir="$ac_optarg" ;;
-+ libdir=$ac_optarg ;;
-
- -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
- | --libexe | --libex | --libe)
- ac_prev=libexecdir ;;
- -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
- | --libexe=* | --libex=* | --libe=*)
-- libexecdir="$ac_optarg" ;;
-+ libexecdir=$ac_optarg ;;
-
- -localstatedir | --localstatedir | --localstatedi | --localstated \
- | --localstate | --localstat | --localsta | --localst \
-@@ -226,19 +471,19 @@ EOF
- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-- localstatedir="$ac_optarg" ;;
-+ localstatedir=$ac_optarg ;;
-
- -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
- ac_prev=mandir ;;
- -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-- mandir="$ac_optarg" ;;
-+ mandir=$ac_optarg ;;
-
- -nfp | --nfp | --nf)
- # Obsolete; use --without-fp.
- with_fp=no ;;
-
- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-- | --no-cr | --no-c)
-+ | --no-cr | --no-c | -n)
- no_create=yes ;;
-
- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-@@ -252,26 +497,26 @@ EOF
- -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
- | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
- | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-- oldincludedir="$ac_optarg" ;;
-+ oldincludedir=$ac_optarg ;;
-
- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
- ac_prev=prefix ;;
- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-- prefix="$ac_optarg" ;;
-+ prefix=$ac_optarg ;;
-
- -program-prefix | --program-prefix | --program-prefi | --program-pref \
- | --program-pre | --program-pr | --program-p)
- ac_prev=program_prefix ;;
- -program-prefix=* | --program-prefix=* | --program-prefi=* \
- | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-- program_prefix="$ac_optarg" ;;
-+ program_prefix=$ac_optarg ;;
-
- -program-suffix | --program-suffix | --program-suffi | --program-suff \
- | --program-suf | --program-su | --program-s)
- ac_prev=program_suffix ;;
- -program-suffix=* | --program-suffix=* | --program-suffi=* \
- | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-- program_suffix="$ac_optarg" ;;
-+ program_suffix=$ac_optarg ;;
-
- -program-transform-name | --program-transform-name \
- | --program-transform-nam | --program-transform-na \
-@@ -288,7 +533,7 @@ EOF
- | --program-transfo=* | --program-transf=* \
- | --program-trans=* | --program-tran=* \
- | --progr-tra=* | --program-tr=* | --program-t=*)
-- program_transform_name="$ac_optarg" ;;
-+ program_transform_name=$ac_optarg ;;
-
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
-@@ -298,7 +543,7 @@ EOF
- ac_prev=sbindir ;;
- -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
- | --sbi=* | --sb=*)
-- sbindir="$ac_optarg" ;;
-+ sbindir=$ac_optarg ;;
-
- -sharedstatedir | --sharedstatedir | --sharedstatedi \
- | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-@@ -309,58 +554,57 @@ EOF
- | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
- | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
- | --sha=* | --sh=*)
-- sharedstatedir="$ac_optarg" ;;
-+ sharedstatedir=$ac_optarg ;;
-
- -site | --site | --sit)
- ac_prev=site ;;
- -site=* | --site=* | --sit=*)
-- site="$ac_optarg" ;;
-+ site=$ac_optarg ;;
-
- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
- ac_prev=srcdir ;;
- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-- srcdir="$ac_optarg" ;;
-+ srcdir=$ac_optarg ;;
-
- -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
- | --syscon | --sysco | --sysc | --sys | --sy)
- ac_prev=sysconfdir ;;
- -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
- | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-- sysconfdir="$ac_optarg" ;;
-+ sysconfdir=$ac_optarg ;;
-
- -target | --target | --targe | --targ | --tar | --ta | --t)
-- ac_prev=target ;;
-+ ac_prev=target_alias ;;
- -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-- target="$ac_optarg" ;;
-+ target_alias=$ac_optarg ;;
-
- -v | -verbose | --verbose | --verbos | --verbo | --verb)
- verbose=yes ;;
-
-- -version | --version | --versio | --versi | --vers)
-- echo "configure generated by autoconf version 2.13"
-- exit 0 ;;
-+ -version | --version | --versio | --versi | --vers | -V)
-+ ac_init_version=: ;;
-
- -with-* | --with-*)
-- ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-+ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
-- if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-- fi
-+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid package name: $ac_package" >&2
-+ { (exit 1); exit 1; }; }
- ac_package=`echo $ac_package| sed 's/-/_/g'`
-- case "$ac_option" in
-- *=*) ;;
-+ case $ac_option in
-+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
- *) ac_optarg=yes ;;
- esac
-- eval "with_${ac_package}='$ac_optarg'" ;;
-+ eval "with_$ac_package='$ac_optarg'" ;;
-
- -without-* | --without-*)
-- ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-+ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
- # Reject names that are not valid shell variable names.
-- if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-- fi
-- ac_package=`echo $ac_package| sed 's/-/_/g'`
-- eval "with_${ac_package}=no" ;;
-+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid package name: $ac_package" >&2
-+ { (exit 1); exit 1; }; }
-+ ac_package=`echo $ac_package | sed 's/-/_/g'`
-+ eval "with_$ac_package=no" ;;
-
- --x)
- # Obsolete; use --with-x.
-@@ -371,99 +615,110 @@ EOF
- ac_prev=x_includes ;;
- -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
- | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-- x_includes="$ac_optarg" ;;
-+ x_includes=$ac_optarg ;;
-
- -x-libraries | --x-libraries | --x-librarie | --x-librari \
- | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
- ac_prev=x_libraries ;;
- -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-- x_libraries="$ac_optarg" ;;
-+ x_libraries=$ac_optarg ;;
-
-- -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-+ -*) { echo "$as_me: error: unrecognized option: $ac_option
-+Try \`$0 --help' for more information." >&2
-+ { (exit 1); exit 1; }; }
- ;;
-
-+ *=*)
-+ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-+ # Reject names that are not valid shell variable names.
-+ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-+ { (exit 1); exit 1; }; }
-+ ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-+ eval "$ac_envvar='$ac_optarg'"
-+ export $ac_envvar ;;
-+
- *)
-- if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-- echo "configure: warning: $ac_option: invalid host type" 1>&2
-- fi
-- if test "x$nonopt" != xNONE; then
-- { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-- fi
-- nonopt="$ac_option"
-+ # FIXME: should be removed in autoconf 3.0.
-+ echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
- ;;
-
- esac
- done
-
- if test -n "$ac_prev"; then
-- { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
--fi
--
--trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
--
--# File descriptor usage:
--# 0 standard input
--# 1 file creation
--# 2 errors and warnings
--# 3 some systems may open it to /dev/tty
--# 4 used on the Kubota Titan
--# 6 checking for... messages and results
--# 5 compiler messages saved in config.log
--if test "$silent" = yes; then
-- exec 6>/dev/null
--else
-- exec 6>&1
-+ ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-+ { echo "$as_me: error: missing argument to $ac_option" >&2
-+ { (exit 1); exit 1; }; }
- fi
--exec 5>./config.log
-
--echo "\
--This file contains any messages produced by compilers while
--running configure, to aid debugging if configure makes a mistake.
--" 1>&5
-+# Be sure to have absolute paths.
-+for ac_var in exec_prefix prefix
-+do
-+ eval ac_val=$`echo $ac_var`
-+ case $ac_val in
-+ [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+ { (exit 1); exit 1; }; };;
-+ esac
-+done
-
--# Strip out --no-create and --no-recursion so they do not pile up.
--# Also quote any args containing shell metacharacters.
--ac_configure_args=
--for ac_arg
-+# Be sure to have absolute paths.
-+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-+ localstatedir libdir includedir oldincludedir infodir mandir
- do
-- case "$ac_arg" in
-- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-- | --no-cr | --no-c) ;;
-- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-- ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-- *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-+ eval ac_val=$`echo $ac_var`
-+ case $ac_val in
-+ [\\/$]* | ?:[\\/]* ) ;;
-+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+ { (exit 1); exit 1; }; };;
- esac
- done
-
--# NLS nuisances.
--# Only set these to C if already set. These must not be set unconditionally
--# because not all systems understand e.g. LANG=C (notably SCO).
--# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
--# Non-C LC_CTYPE values break the ctype check.
--if test "${LANG+set}" = set; then LANG=C; export LANG; fi
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
--if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
--if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
-+# There might be people who depend on the old broken behavior: `$host'
-+# used to hold the argument of --host etc.
-+# FIXME: To remove some day.
-+build=$build_alias
-+host=$host_alias
-+target=$target_alias
-+
-+# FIXME: To remove some day.
-+if test "x$host_alias" != x; then
-+ if test "x$build_alias" = x; then
-+ cross_compiling=maybe
-+ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-+ If a cross compiler is detected then cross compile mode will be used." >&2
-+ elif test "x$build_alias" != "x$host_alias"; then
-+ cross_compiling=yes
-+ fi
-+fi
-
--# confdefs.h avoids OS command line length limits that DEFS can exceed.
--rm -rf conftest* confdefs.h
--# AIX cpp loses on an empty file, so make sure it contains at least a newline.
--echo > confdefs.h
-+ac_tool_prefix=
-+test -n "$host_alias" && ac_tool_prefix=$host_alias-
-+
-+test "$silent" = yes && exec 6>/dev/null
-
--# A filename unique to this package, relative to the directory that
--# configure is in, which we can look for to find out if srcdir is correct.
--ac_unique_file=rplayd/rplayd.c
-
- # Find the source files, if location was not specified.
- if test -z "$srcdir"; then
- ac_srcdir_defaulted=yes
- # Try the directory containing this script, then its parent.
-- ac_prog=$0
-- ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-- test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-+ ac_confdir=`(dirname "$0") 2>/dev/null ||
-+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$0" : 'X\(//\)[^/]' \| \
-+ X"$0" : 'X\(//\)$' \| \
-+ X"$0" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$0" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
- srcdir=$ac_confdir
- if test ! -r $srcdir/$ac_unique_file; then
- srcdir=..
-@@ -473,13 +728,460 @@ else
- fi
- if test ! -r $srcdir/$ac_unique_file; then
- if test "$ac_srcdir_defaulted" = yes; then
-- { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-+ { (exit 1); exit 1; }; }
- else
-- { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-+ { (exit 1); exit 1; }; }
- fi
- fi
--srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-+ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-+ { (exit 1); exit 1; }; }
-+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-+ac_env_build_alias_set=${build_alias+set}
-+ac_env_build_alias_value=$build_alias
-+ac_cv_env_build_alias_set=${build_alias+set}
-+ac_cv_env_build_alias_value=$build_alias
-+ac_env_host_alias_set=${host_alias+set}
-+ac_env_host_alias_value=$host_alias
-+ac_cv_env_host_alias_set=${host_alias+set}
-+ac_cv_env_host_alias_value=$host_alias
-+ac_env_target_alias_set=${target_alias+set}
-+ac_env_target_alias_value=$target_alias
-+ac_cv_env_target_alias_set=${target_alias+set}
-+ac_cv_env_target_alias_value=$target_alias
-+ac_env_CC_set=${CC+set}
-+ac_env_CC_value=$CC
-+ac_cv_env_CC_set=${CC+set}
-+ac_cv_env_CC_value=$CC
-+ac_env_CFLAGS_set=${CFLAGS+set}
-+ac_env_CFLAGS_value=$CFLAGS
-+ac_cv_env_CFLAGS_set=${CFLAGS+set}
-+ac_cv_env_CFLAGS_value=$CFLAGS
-+ac_env_LDFLAGS_set=${LDFLAGS+set}
-+ac_env_LDFLAGS_value=$LDFLAGS
-+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-+ac_cv_env_LDFLAGS_value=$LDFLAGS
-+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-+ac_env_CPPFLAGS_value=$CPPFLAGS
-+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-+ac_env_CPP_set=${CPP+set}
-+ac_env_CPP_value=$CPP
-+ac_cv_env_CPP_set=${CPP+set}
-+ac_cv_env_CPP_value=$CPP
-+
-+#
-+# Report the --help message.
-+#
-+if test "$ac_init_help" = "long"; then
-+ # Omit some internal or obsolete options to make the list less imposing.
-+ # This message is too long to be a string in the A/UX 3.1 sh.
-+ cat <<_ACEOF
-+\`configure' configures this package to adapt to many kinds of systems.
-+
-+Usage: $0 [OPTION]... [VAR=VALUE]...
-+
-+To assign environment variables (e.g., CC, CFLAGS...), specify them as
-+VAR=VALUE. See below for descriptions of some of the useful variables.
-+
-+Defaults for the options are specified in brackets.
-+
-+Configuration:
-+ -h, --help display this help and exit
-+ --help=short display options specific to this package
-+ --help=recursive display the short help of all the included packages
-+ -V, --version display version information and exit
-+ -q, --quiet, --silent do not print \`checking...' messages
-+ --cache-file=FILE cache test results in FILE [disabled]
-+ -C, --config-cache alias for \`--cache-file=config.cache'
-+ -n, --no-create do not create output files
-+ --srcdir=DIR find the sources in DIR [configure dir or \`..']
-+
-+_ACEOF
-+
-+ cat <<_ACEOF
-+Installation directories:
-+ --prefix=PREFIX install architecture-independent files in PREFIX
-+ [$ac_default_prefix]
-+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
-+ [PREFIX]
-+
-+By default, \`make install' will install all the files in
-+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
-+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-+for instance \`--prefix=\$HOME'.
-+
-+For better control, use the options below.
-+
-+Fine tuning of the installation directories:
-+ --bindir=DIR user executables [EPREFIX/bin]
-+ --sbindir=DIR system admin executables [EPREFIX/sbin]
-+ --libexecdir=DIR program executables [EPREFIX/libexec]
-+ --datadir=DIR read-only architecture-independent data [PREFIX/share]
-+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
-+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
-+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
-+ --libdir=DIR object code libraries [EPREFIX/lib]
-+ --includedir=DIR C header files [PREFIX/include]
-+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
-+ --infodir=DIR info documentation [PREFIX/info]
-+ --mandir=DIR man documentation [PREFIX/man]
-+_ACEOF
-+
-+ cat <<\_ACEOF
-+_ACEOF
-+fi
-+
-+if test -n "$ac_init_help"; then
-+
-+ cat <<\_ACEOF
-+
-+Optional Features:
-+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
-+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
-+ --enable-rplayd-user=USER
-+ --enable-rplayd-group=GROUP
-+
-+Some influential environment variables:
-+ CC C compiler command
-+ CFLAGS C compiler flags
-+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
-+ nonstandard directory <lib dir>
-+ CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
-+ headers in a nonstandard directory <include dir>
-+ CPP C preprocessor
-+
-+Use these variables to override the choices made by `configure' or to help
-+it to find libraries and programs with nonstandard names/locations.
-+
-+_ACEOF
-+fi
-+
-+if test "$ac_init_help" = "recursive"; then
-+ # If there are subdirs, report their specific --help.
-+ ac_popdir=`pwd`
-+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-+ test -d $ac_dir || continue
-+ ac_builddir=.
-+
-+if test "$ac_dir" != .; then
-+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+ # A "../" for each directory in $ac_dir_suffix.
-+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-+else
-+ ac_dir_suffix= ac_top_builddir=
-+fi
-+
-+case $srcdir in
-+ .) # No --srcdir option. We are building in place.
-+ ac_srcdir=.
-+ if test -z "$ac_top_builddir"; then
-+ ac_top_srcdir=.
-+ else
-+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-+ fi ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute path.
-+ ac_srcdir=$srcdir$ac_dir_suffix;
-+ ac_top_srcdir=$srcdir ;;
-+ *) # Relative path.
-+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+esac
-+
-+# Do not use `cd foo && pwd` to compute absolute paths, because
-+# the directories may not exist.
-+case `pwd` in
-+.) ac_abs_builddir="$ac_dir";;
-+*)
-+ case "$ac_dir" in
-+ .) ac_abs_builddir=`pwd`;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_builddir=${ac_top_builddir}.;;
-+*)
-+ case ${ac_top_builddir}. in
-+ .) ac_abs_top_builddir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_srcdir=$ac_srcdir;;
-+*)
-+ case $ac_srcdir in
-+ .) ac_abs_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_srcdir=$ac_top_srcdir;;
-+*)
-+ case $ac_top_srcdir in
-+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+ esac;;
-+esac
-+
-+ cd $ac_dir
-+ # Check for guested configure; otherwise get Cygnus style configure.
-+ if test -f $ac_srcdir/configure.gnu; then
-+ echo
-+ $SHELL $ac_srcdir/configure.gnu --help=recursive
-+ elif test -f $ac_srcdir/configure; then
-+ echo
-+ $SHELL $ac_srcdir/configure --help=recursive
-+ elif test -f $ac_srcdir/configure.ac ||
-+ test -f $ac_srcdir/configure.in; then
-+ echo
-+ $ac_configure --help
-+ else
-+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-+ fi
-+ cd $ac_popdir
-+ done
-+fi
-+
-+test -n "$ac_init_help" && exit 0
-+if $ac_init_version; then
-+ cat <<\_ACEOF
-+
-+Copyright (C) 2003 Free Software Foundation, Inc.
-+This configure script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it.
-+_ACEOF
-+ exit 0
-+fi
-+exec 5>config.log
-+cat >&5 <<_ACEOF
-+This file contains any messages produced by compilers while
-+running configure, to aid debugging if configure makes a mistake.
-+
-+It was created by $as_me, which was
-+generated by GNU Autoconf 2.59. Invocation command line was
-+
-+ $ $0 $@
-+
-+_ACEOF
-+{
-+cat <<_ASUNAME
-+## --------- ##
-+## Platform. ##
-+## --------- ##
-+
-+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-+uname -m = `(uname -m) 2>/dev/null || echo unknown`
-+uname -r = `(uname -r) 2>/dev/null || echo unknown`
-+uname -s = `(uname -s) 2>/dev/null || echo unknown`
-+uname -v = `(uname -v) 2>/dev/null || echo unknown`
-+
-+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
-+
-+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
-+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
-+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-+hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
-+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
-+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
-+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
-+
-+_ASUNAME
-+
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ echo "PATH: $as_dir"
-+done
-+
-+} >&5
-+
-+cat >&5 <<_ACEOF
-+
-+
-+## ----------- ##
-+## Core tests. ##
-+## ----------- ##
-+
-+_ACEOF
-+
-+
-+# Keep a trace of the command line.
-+# Strip out --no-create and --no-recursion so they do not pile up.
-+# Strip out --silent because we don't want to record it for future runs.
-+# Also quote any args containing shell meta-characters.
-+# Make two passes to allow for proper duplicate-argument suppression.
-+ac_configure_args=
-+ac_configure_args0=
-+ac_configure_args1=
-+ac_sep=
-+ac_must_keep_next=false
-+for ac_pass in 1 2
-+do
-+ for ac_arg
-+ do
-+ case $ac_arg in
-+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+ | -silent | --silent | --silen | --sile | --sil)
-+ continue ;;
-+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+ esac
-+ case $ac_pass in
-+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-+ 2)
-+ ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-+ if test $ac_must_keep_next = true; then
-+ ac_must_keep_next=false # Got value, back to normal.
-+ else
-+ case $ac_arg in
-+ *=* | --config-cache | -C | -disable-* | --disable-* \
-+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-+ | -with-* | --with-* | -without-* | --without-* | --x)
-+ case "$ac_configure_args0 " in
-+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-+ esac
-+ ;;
-+ -* ) ac_must_keep_next=true ;;
-+ esac
-+ fi
-+ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-+ # Get rid of the leading space.
-+ ac_sep=" "
-+ ;;
-+ esac
-+ done
-+done
-+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-+
-+# When interrupted or exit'd, cleanup temporary files, and complete
-+# config.log. We remove comments because anyway the quotes in there
-+# would cause problems or look ugly.
-+# WARNING: Be sure not to use single quotes in there, as some shells,
-+# such as our DU 5.0 friend, will then `close' the trap.
-+trap 'exit_status=$?
-+ # Save into config.log some information that might help in debugging.
-+ {
-+ echo
-+
-+ cat <<\_ASBOX
-+## ---------------- ##
-+## Cache variables. ##
-+## ---------------- ##
-+_ASBOX
-+ echo
-+ # The following way of writing the cache mishandles newlines in values,
-+{
-+ (set) 2>&1 |
-+ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-+ *ac_space=\ *)
-+ sed -n \
-+ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-+ ;;
-+ *)
-+ sed -n \
-+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+ ;;
-+ esac;
-+}
-+ echo
-+
-+ cat <<\_ASBOX
-+## ----------------- ##
-+## Output variables. ##
-+## ----------------- ##
-+_ASBOX
-+ echo
-+ for ac_var in $ac_subst_vars
-+ do
-+ eval ac_val=$`echo $ac_var`
-+ echo "$ac_var='"'"'$ac_val'"'"'"
-+ done | sort
-+ echo
-+
-+ if test -n "$ac_subst_files"; then
-+ cat <<\_ASBOX
-+## ------------- ##
-+## Output files. ##
-+## ------------- ##
-+_ASBOX
-+ echo
-+ for ac_var in $ac_subst_files
-+ do
-+ eval ac_val=$`echo $ac_var`
-+ echo "$ac_var='"'"'$ac_val'"'"'"
-+ done | sort
-+ echo
-+ fi
-+
-+ if test -s confdefs.h; then
-+ cat <<\_ASBOX
-+## ----------- ##
-+## confdefs.h. ##
-+## ----------- ##
-+_ASBOX
-+ echo
-+ sed "/^$/d" confdefs.h | sort
-+ echo
-+ fi
-+ test "$ac_signal" != 0 &&
-+ echo "$as_me: caught signal $ac_signal"
-+ echo "$as_me: exit $exit_status"
-+ } >&5
-+ rm -f core *.core &&
-+ rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-+ exit $exit_status
-+ ' 0
-+for ac_signal in 1 2 13 15; do
-+ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-+done
-+ac_signal=0
-+
-+# confdefs.h avoids OS command line length limits that DEFS can exceed.
-+rm -rf conftest* confdefs.h
-+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-+echo >confdefs.h
-+
-+# Predefined preprocessor variables.
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_NAME "$PACKAGE_NAME"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_VERSION "$PACKAGE_VERSION"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_STRING "$PACKAGE_STRING"
-+_ACEOF
-
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-+_ACEOF
-+
-+
-+# Let the site file select an alternate cache file if it wants to.
- # Prefer explicitly selected file to automatically selected ones.
- if test -z "$CONFIG_SITE"; then
- if test "x$prefix" != xNONE; then
-@@ -490,41 +1192,106 @@ if test -z "$CONFIG_SITE"; then
- fi
- for ac_site_file in $CONFIG_SITE; do
- if test -r "$ac_site_file"; then
-- echo "loading site script $ac_site_file"
-+ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-+echo "$as_me: loading site script $ac_site_file" >&6;}
-+ sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file"
- fi
- done
-
- if test -r "$cache_file"; then
-- echo "loading cache $cache_file"
-- . $cache_file
-+ # Some versions of bash will fail to source /dev/null (special
-+ # files actually), so we avoid doing that.
-+ if test -f "$cache_file"; then
-+ { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-+echo "$as_me: loading cache $cache_file" >&6;}
-+ case $cache_file in
-+ [\\/]* | ?:[\\/]* ) . $cache_file;;
-+ *) . ./$cache_file;;
-+ esac
-+ fi
- else
-- echo "creating cache $cache_file"
-- > $cache_file
-+ { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-+echo "$as_me: creating cache $cache_file" >&6;}
-+ >$cache_file
-+fi
-+
-+# Check that the precious variables saved in the cache have kept the same
-+# value.
-+ac_cache_corrupted=false
-+for ac_var in `(set) 2>&1 |
-+ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-+ eval ac_old_set=\$ac_cv_env_${ac_var}_set
-+ eval ac_new_set=\$ac_env_${ac_var}_set
-+ eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-+ eval ac_new_val="\$ac_env_${ac_var}_value"
-+ case $ac_old_set,$ac_new_set in
-+ set,)
-+ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-+ ac_cache_corrupted=: ;;
-+ ,set)
-+ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-+ ac_cache_corrupted=: ;;
-+ ,);;
-+ *)
-+ if test "x$ac_old_val" != "x$ac_new_val"; then
-+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
-+echo "$as_me: former value: $ac_old_val" >&2;}
-+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
-+echo "$as_me: current value: $ac_new_val" >&2;}
-+ ac_cache_corrupted=:
-+ fi;;
-+ esac
-+ # Pass precious variables to config.status.
-+ if test "$ac_new_set" = set; then
-+ case $ac_new_val in
-+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-+ ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+ *) ac_arg=$ac_var=$ac_new_val ;;
-+ esac
-+ case " $ac_configure_args " in
-+ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
-+ *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-+ esac
-+ fi
-+done
-+if $ac_cache_corrupted; then
-+ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-+ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-+ { (exit 1); exit 1; }; }
- fi
-
- ac_ext=c
--# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
--ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cc_cross
--
--ac_exeext=
--ac_objext=o
--if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-- # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-- if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-- ac_n= ac_c='
--' ac_t=' '
-- else
-- ac_n=-n ac_c= ac_t=
-- fi
--else
-- ac_n= ac_c='\c' ac_t=
--fi
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-+ ac_config_headers="$ac_config_headers include/config.h"
-
-
-
-@@ -533,222 +1300,667 @@ RPLAY_VERSION=`$srcdir/version`
-
- echo configuring rplay version $RPLAY_VERSION
-
--cat >> confdefs.h <<EOF
-+cat >>confdefs.h <<_ACEOF
- #define RPLAY_VERSION "$RPLAY_VERSION"
--EOF
-+_ACEOF
-
-
- # We want these before the checks, so the checks can modify their values.
- test -z "$CFLAGS" && CFLAGS=-g auto_cflags=1
-
--# Extract the first word of "gcc", so it can be a program name with args.
--set dummy gcc; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:548: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}gcc; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_CC="gcc"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
- fi
- fi
--CC="$ac_cv_prog_CC"
-+CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$ac_t""$CC" 1>&6
-+ echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+fi
-+if test -z "$ac_cv_prog_CC"; then
-+ ac_ct_CC=$CC
-+ # Extract the first word of "gcc", so it can be a program name with args.
-+set dummy gcc; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_CC"; then
-+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
- else
-- echo "$ac_t""no" 1>&6
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_ac_ct_CC="gcc"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ CC=$ac_ct_CC
-+else
-+ CC="$ac_cv_prog_CC"
- fi
-
- if test -z "$CC"; then
-- # Extract the first word of "cc", so it can be a program name with args.
--set dummy cc; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:578: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+ if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}cc; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_prog_rejected=no
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-- ac_prog_rejected=yes
-- continue
-- fi
-- ac_cv_prog_CC="cc"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_CC="${ac_tool_prefix}cc"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+ echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+fi
-+if test -z "$ac_cv_prog_CC"; then
-+ ac_ct_CC=$CC
-+ # Extract the first word of "cc", so it can be a program name with args.
-+set dummy cc; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_CC"; then
-+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_ac_ct_CC="cc"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ CC=$ac_ct_CC
-+else
-+ CC="$ac_cv_prog_CC"
-+fi
-+
-+fi
-+if test -z "$CC"; then
-+ # Extract the first word of "cc", so it can be a program name with args.
-+set dummy cc; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+ ac_prog_rejected=no
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-+ ac_prog_rejected=yes
-+ continue
-+ fi
-+ ac_cv_prog_CC="cc"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
- if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
- set dummy $ac_cv_prog_CC
- shift
-- if test $# -gt 0; then
-+ if test $# != 0; then
- # We chose a different compiler from the bogus one.
- # However, it has the same basename, so the bogon will be chosen
- # first if we set CC to just the basename; use the full file name.
- shift
-- set dummy "$ac_dir/$ac_word" "$@"
-- shift
-- ac_cv_prog_CC="$@"
-+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
- fi
- fi
- fi
- fi
--CC="$ac_cv_prog_CC"
-+CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$ac_t""$CC" 1>&6
-+ echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
-- if test -z "$CC"; then
-- case "`uname -s`" in
-- *win32* | *WIN32*)
-- # Extract the first word of "cl", so it can be a program name with args.
--set dummy cl; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:629: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+fi
-+if test -z "$CC"; then
-+ if test -n "$ac_tool_prefix"; then
-+ for ac_prog in cl
-+ do
-+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_CC="cl"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
- fi
- fi
--CC="$ac_cv_prog_CC"
-+CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$ac_t""$CC" 1>&6
-+ echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-- ;;
-- esac
-+
-+ test -n "$CC" && break
-+ done
-+fi
-+if test -z "$CC"; then
-+ ac_ct_CC=$CC
-+ for ac_prog in cl
-+do
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_CC"; then
-+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_ac_ct_CC="$ac_prog"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
- fi
-- test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-+done
-+done
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:661: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+ test -n "$ac_ct_CC" && break
-+done
-
--ac_ext=c
--# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cc_cross
-+ CC=$ac_ct_CC
-+fi
-+
-+fi
-
--cat > conftest.$ac_ext << EOF
-
--#line 672 "configure"
--#include "confdefs.h"
-+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+# Provide some information about the compiler.
-+echo "$as_me:$LINENO:" \
-+ "checking for C compiler version" >&5
-+ac_compiler=`set X $ac_compile; echo $2`
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-+ (eval $ac_compiler --version </dev/null >&5) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-+ (eval $ac_compiler -v </dev/null >&5) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-+ (eval $ac_compiler -V </dev/null >&5) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--main(){return(0);}
--EOF
--if { (eval echo configure:677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- ac_cv_prog_cc_works=yes
-- # If we can't run a trivial program, we are probably using a cross compiler.
-- if (./conftest; exit) 2>/dev/null; then
-- ac_cv_prog_cc_cross=no
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files a.out a.exe b.out"
-+# Try to create an executable without -o first, disregard a.out.
-+# It will help us diagnose broken compilers, and finding out an intuition
-+# of exeext.
-+echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-+if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-+ (eval $ac_link_default) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ # Find the output, starting from the most likely. This scheme is
-+# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-+# resort.
-+
-+# Be careful to initialize this variable, since it used to be cached.
-+# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-+ac_cv_exeext=
-+# b.out is created by i960 compilers.
-+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-+do
-+ test -f "$ac_file" || continue
-+ case $ac_file in
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-+ ;;
-+ conftest.$ac_ext )
-+ # This is the source file.
-+ ;;
-+ [ab].out )
-+ # We found the default executable, but exeext='' is most
-+ # certainly right.
-+ break;;
-+ *.* )
-+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+ # FIXME: I believe we export ac_cv_exeext for Libtool,
-+ # but it would be cool to find out if it's true. Does anybody
-+ # maintain Libtool? --akim.
-+ export ac_cv_exeext
-+ break;;
-+ * )
-+ break;;
-+ esac
-+done
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: C compiler cannot create executables
-+See \`config.log' for more details." >&2;}
-+ { (exit 77); exit 77; }; }
-+fi
-+
-+ac_exeext=$ac_cv_exeext
-+echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6
-+
-+# Check the compiler produces executables we can run. If not, either
-+# the compiler is broken, or we cross compile.
-+echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-+# If not cross compiling, check that we can run a simple program.
-+if test "$cross_compiling" != yes; then
-+ if { ac_try='./$ac_file'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ cross_compiling=no
- else
-- ac_cv_prog_cc_cross=yes
-+ if test "$cross_compiling" = maybe; then
-+ cross_compiling=yes
-+ else
-+ { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
- fi
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- ac_cv_prog_cc_works=no
- fi
--rm -fr conftest*
--ac_ext=c
--# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cc_cross
-+echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-
--echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
--if test $ac_cv_prog_cc_works = no; then
-- { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
--fi
--echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:703: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
--echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
--cross_compiling=$ac_cv_prog_cc_cross
-+rm -f a.out a.exe conftest$ac_cv_exeext b.out
-+ac_clean_files=$ac_clean_files_save
-+# Check the compiler produces executables we can run. If not, either
-+# the compiler is broken, or we cross compile.
-+echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-+echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+echo "${ECHO_T}$cross_compiling" >&6
-+
-+echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ # If both `conftest.exe' and `conftest' are `present' (well, observable)
-+# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
-+# work properly (i.e., refer to `conftest.exe'), while it won't with
-+# `rm'.
-+for ac_file in conftest.exe conftest conftest.*; do
-+ test -f "$ac_file" || continue
-+ case $ac_file in
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+ export ac_cv_exeext
-+ break;;
-+ * ) break;;
-+ esac
-+done
-+else
-+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+rm -f conftest$ac_cv_exeext
-+echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+echo "${ECHO_T}$ac_cv_exeext" >&6
-+
-+rm -f conftest.$ac_ext
-+EXEEXT=$ac_cv_exeext
-+ac_exeext=$EXEEXT
-+echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-+if test "${ac_cv_objext+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-
--echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:708: checking whether we are using GNU C" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.o conftest.obj
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-+ case $ac_file in
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-+ break;;
-+ esac
-+done
- else
-- cat > conftest.c <<EOF
--#ifdef __GNUC__
-- yes;
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+rm -f conftest.$ac_cv_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+echo "${ECHO_T}$ac_cv_objext" >&6
-+OBJEXT=$ac_cv_objext
-+ac_objext=$OBJEXT
-+echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+ choke me
- #endif
--EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-- ac_cv_prog_gcc=yes
--else
-- ac_cv_prog_gcc=no
--fi
--fi
-
--echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_compiler_gnu=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_compiler_gnu=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_cv_c_compiler_gnu=$ac_compiler_gnu
-+
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-+GCC=`test $ac_compiler_gnu = yes && echo yes`
-+ac_test_CFLAGS=${CFLAGS+set}
-+ac_save_CFLAGS=$CFLAGS
-+CFLAGS="-g"
-+echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-+if test "${ac_cv_prog_cc_g+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--if test $ac_cv_prog_gcc = yes; then
-- GCC=yes
--else
-- GCC=
--fi
-+int
-+main ()
-+{
-
--ac_test_CFLAGS="${CFLAGS+set}"
--ac_save_CFLAGS="$CFLAGS"
--CFLAGS=
--echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:736: checking whether ${CC-cc} accepts -g" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- echo 'void f(){}' > conftest.c
--if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_prog_cc_g=yes
- else
-- ac_cv_prog_cc_g=no
--fi
--rm -f conftest*
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+ac_cv_prog_cc_g=no
- fi
--
--echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
- if test "$ac_test_CFLAGS" = set; then
-- CFLAGS="$ac_save_CFLAGS"
-+ CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
- CFLAGS="-g -O2"
-@@ -762,6 +1974,269 @@ else
- CFLAGS=
- fi
- fi
-+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-+if test "${ac_cv_prog_cc_stdc+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_prog_cc_stdc=no
-+ac_save_CC=$CC
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+ char **p;
-+ int i;
-+{
-+ return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+ char *s;
-+ va_list v;
-+ va_start (v,p);
-+ s = g (p, va_arg (v,int));
-+ va_end (v);
-+ return s;
-+}
-+
-+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
-+ function prototypes and stuff, but not '\xHH' hex character constants.
-+ These don't provoke an error unfortunately, instead are silently treated
-+ as 'x'. The following induces an error, until -std1 is added to get
-+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
-+ array size at least. It's necessary to write '\x00'==0 to get something
-+ that's true only with -std1. */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
-+int
-+main ()
-+{
-+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+# Don't try gcc -ansi; that turns off useful extensions and
-+# breaks some systems' header files.
-+# AIX -qlanglvl=ansi
-+# Ultrix and OSF/1 -std1
-+# HP-UX 10.20 and later -Ae
-+# HP-UX older versions -Aa -D_HPUX_SOURCE
-+# SVR4 -Xc -D__EXTENSIONS__
-+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+do
-+ CC="$ac_save_CC $ac_arg"
-+ rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_prog_cc_stdc=$ac_arg
-+break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext
-+done
-+rm -f conftest.$ac_ext conftest.$ac_objext
-+CC=$ac_save_CC
-+
-+fi
-+
-+case "x$ac_cv_prog_cc_stdc" in
-+ x|xno)
-+ echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6 ;;
-+ *)
-+ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-+ CC="$CC $ac_cv_prog_cc_stdc" ;;
-+esac
-+
-+# Some people use a C++ compiler to compile C. Since we use `exit',
-+# in C++ we need to declare it. In case someone uses the same compiler
-+# for both compiling C and C++ we need to have the C++ compiler decide
-+# the declaration of exit, since it's the most demanding environment.
-+cat >conftest.$ac_ext <<_ACEOF
-+#ifndef __cplusplus
-+ choke me
-+#endif
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ for ac_declaration in \
-+ '' \
-+ 'extern "C" void std::exit (int) throw (); using std::exit;' \
-+ 'extern "C" void std::exit (int); using std::exit;' \
-+ 'extern "C" void exit (int) throw ();' \
-+ 'extern "C" void exit (int);' \
-+ 'void exit (int);'
-+do
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_declaration
-+#include <stdlib.h>
-+int
-+main ()
-+{
-+exit (42);
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_declaration
-+int
-+main ()
-+{
-+exit (42);
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+rm -f conftest*
-+if test -n "$ac_declaration"; then
-+ echo '#ifdef __cplusplus' >>confdefs.h
-+ echo $ac_declaration >>confdefs.h
-+ echo '#endif' >>confdefs.h
-+fi
-+
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- # If we're using gcc and the user hasn't specified CFLAGS, add -O to CFLAGS.
-@@ -772,130 +2247,388 @@ test -n "$GCC" && test -n "$auto_cflags"
- if test "${enable_rplayd_user+set}" = set; then
- enableval="$enable_rplayd_user"
- RPLAYD_USER=$enableval
--fi
--
-+fi;
- # Check whether --enable-rplayd-group or --disable-rplayd-group was given.
- if test "${enable_rplayd_group+set}" = set; then
- enableval="$enable_rplayd_group"
- RPLAYD_GROUP=$enableval
--fi
--
-+fi;
- if test -n "$RPLAYD_USER"
- then
--cat >> confdefs.h <<EOF
-+cat >>confdefs.h <<_ACEOF
- #define RPLAYD_USER "$RPLAYD_USER"
--EOF
-+_ACEOF
-
- fi
- if test -n "$RPLAYD_GROUP"
- then
--cat >> confdefs.h <<EOF
-+cat >>confdefs.h <<_ACEOF
- #define RPLAYD_GROUP "$RPLAYD_GROUP"
--EOF
-+_ACEOF
-
- fi
-
-
--echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
--echo "configure:801: checking for POSIXized ISC" >&5
--if test -d /etc/conf/kconfig.d &&
-- grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
--then
-- echo "$ac_t""yes" 1>&6
-- ISC=yes # If later tests want to check for ISC.
-- cat >> confdefs.h <<\EOF
--#define _POSIX_SOURCE 1
--EOF
-
-- if test "$GCC" = yes; then
-- CC="$CC -posix"
-- else
-- CC="$CC -Xp"
-- fi
-+echo "$as_me:$LINENO: checking for library containing strerror" >&5
-+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
-+if test "${ac_cv_search_strerror+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- echo "$ac_t""no" 1>&6
-- ISC=
-+ ac_func_search_save_LIBS=$LIBS
-+ac_cv_search_strerror=no
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char strerror ();
-+int
-+main ()
-+{
-+strerror ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_search_strerror="none required"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search_strerror" = no; then
-+ for ac_lib in cposix; do
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char strerror ();
-+int
-+main ()
-+{
-+strerror ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_search_strerror="-l$ac_lib"
-+break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+ done
-+fi
-+LIBS=$ac_func_search_save_LIBS
- fi
-+echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-+echo "${ECHO_T}$ac_cv_search_strerror" >&6
-+if test "$ac_cv_search_strerror" != no; then
-+ test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
-
--echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:822: checking how to run the C preprocessor" >&5
-+fi
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
- CPP=
- fi
- if test -z "$CPP"; then
--if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+ if test "${ac_cv_prog_CPP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- # This must be in double quotes, not single quotes, because CPP may get
-- # substituted into the Makefile and "${CC-cc}" will confuse make.
-- CPP="${CC-cc} -E"
-+ # Double quotes because CPP needs to be expanded
-+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-+ do
-+ ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+ # Use a header file that comes with gcc, so configuring glibc
-+ # with a fresh cross-compiler works.
-+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
-- # not just through cpp.
-- cat > conftest.$ac_ext <<EOF
--#line 837 "configure"
--#include "confdefs.h"
--#include <assert.h>
--Syntax Error
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
-- :
-+ # not just through cpp. "Syntax error" is here to catch this case.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+ Syntax error
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
- else
-- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- CPP="${CC-cc} -E -traditional-cpp"
-- cat > conftest.$ac_ext <<EOF
--#line 854 "configure"
--#include "confdefs.h"
--#include <assert.h>
--Syntax Error
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
- :
- else
-- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- CPP="${CC-cc} -nologo -E"
-- cat > conftest.$ac_ext <<EOF
--#line 871 "configure"
--#include "confdefs.h"
--#include <assert.h>
--Syntax Error
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:877: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
-- :
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+ # OK, works on sane cases. Now check whether non-existent headers
-+ # can be detected and how.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <ac_nonexistent.h>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
- else
-- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- CPP=/lib/cpp
-+ ac_cpp_err=yes
- fi
--rm -f conftest*
-+if test -z "$ac_cpp_err"; then
-+ # Broken: success on invalid input.
-+continue
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ # Passes both tests.
-+ac_preproc_ok=:
-+break
- fi
--rm -f conftest*
-+rm -f conftest.err conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then
-+ break
- fi
--rm -f conftest*
-- ac_cv_prog_CPP="$CPP"
-+
-+ done
-+ ac_cv_prog_CPP=$CPP
-+
-+fi
-+ CPP=$ac_cv_prog_CPP
-+else
-+ ac_cv_prog_CPP=$CPP
-+fi
-+echo "$as_me:$LINENO: result: $CPP" >&5
-+echo "${ECHO_T}$CPP" >&6
-+ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+ # Use a header file that comes with gcc, so configuring glibc
-+ # with a fresh cross-compiler works.
-+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ # <limits.h> exists even on freestanding compilers.
-+ # On the NeXT, cc -E runs the code through the compiler's parser,
-+ # not just through cpp. "Syntax error" is here to catch this case.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+ Syntax error
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ # Broken: fails on valid input.
-+continue
- fi
-- CPP="$ac_cv_prog_CPP"
-+rm -f conftest.err conftest.$ac_ext
-+
-+ # OK, works on sane cases. Now check whether non-existent headers
-+ # can be detected and how.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <ac_nonexistent.h>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
- else
-- ac_cv_prog_CPP="$CPP"
-+ ac_cpp_err=yes
- fi
--echo "$ac_t""$CPP" 1>&6
-+if test -z "$ac_cpp_err"; then
-+ # Broken: success on invalid input.
-+continue
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then
-+ :
-+else
-+ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- ac_aux_dir=
- for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-@@ -907,14 +2640,20 @@ for ac_dir in $srcdir $srcdir/.. $srcdir
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
-+ elif test -f $ac_dir/shtool; then
-+ ac_aux_dir=$ac_dir
-+ ac_install_sh="$ac_aux_dir/shtool install -c"
-+ break
- fi
- done
- if test -z "$ac_aux_dir"; then
-- { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
--fi
--ac_config_guess=$ac_aux_dir/config.guess
--ac_config_sub=$ac_aux_dir/config.sub
--ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-+echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
- # Find a good install program. We prefer a C program (faster),
- # so one script is as good as another. But avoid the broken or
-@@ -923,490 +2662,832 @@ ac_configure=$ac_aux_dir/configure # Thi
- # SunOS /usr/etc/install
- # IRIX /sbin/install
- # AIX /bin/install
-+# AmigaOS /C/install, which installs bootblocks on floppy discs
- # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-+# OS/2's system install, which has a completely different semantic
- # ./install, which can be erroneously created by make from ./install.sh.
--echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:932: checking for a BSD compatible install" >&5
-+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
- if test -z "$INSTALL"; then
--if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+if test "${ac_cv_path_install+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
-- for ac_dir in $PATH; do
-- # Account for people who put trailing slashes in PATH elements.
-- case "$ac_dir/" in
-- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-- *)
-- # OSF1 and SCO ODT 3.0 have their own names for install.
-- # Don't use installbsd from OSF since it installs stuff as root
-- # by default.
-- for ac_prog in ginstall scoinst install; do
-- if test -f $ac_dir/$ac_prog; then
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ # Account for people who put trailing slashes in PATH elements.
-+case $as_dir/ in
-+ ./ | .// | /cC/* | \
-+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-+ /usr/ucb/* ) ;;
-+ *)
-+ # OSF1 and SCO ODT 3.0 have their own names for install.
-+ # Don't use installbsd from OSF since it installs stuff as root
-+ # by default.
-+ for ac_prog in ginstall scoinst install; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
- if test $ac_prog = install &&
-- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
- :
-+ elif test $ac_prog = install &&
-+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+ # program-specific install script used by HP pwplus--don't use.
-+ :
- else
-- ac_cv_path_install="$ac_dir/$ac_prog -c"
-- break 2
-+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+ break 3
- fi
- fi
- done
-- ;;
-- esac
-- done
-- IFS="$ac_save_IFS"
-+ done
-+ ;;
-+esac
-+done
-+
-
- fi
- if test "${ac_cv_path_install+set}" = set; then
-- INSTALL="$ac_cv_path_install"
-+ INSTALL=$ac_cv_path_install
- else
- # As a last resort, use the slow shell script. We don't cache a
- # path for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the path is relative.
-- INSTALL="$ac_install_sh"
-+ INSTALL=$ac_install_sh
- fi
- fi
--echo "$ac_t""$INSTALL" 1>&6
-+echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6
-
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
--echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
--echo "configure:985: checking whether ln -s works" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking whether ln -s works" >&5
-+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
-+LN_S=$as_ln_s
-+if test "$LN_S" = "ln -s"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+else
-+ echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-+echo "${ECHO_T}no, using $LN_S" >&6
-+fi
-+
-+if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_RANLIB+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- rm -f conftestdata
--if ln -s X conftestdata 2>/dev/null
--then
-- rm -f conftestdata
-- ac_cv_prog_LN_S="ln -s"
-+ if test -n "$RANLIB"; then
-+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
- else
-- ac_cv_prog_LN_S=ln
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
- fi
- fi
--LN_S="$ac_cv_prog_LN_S"
--if test "$ac_cv_prog_LN_S" = "ln -s"; then
-- echo "$ac_t""yes" 1>&6
-+RANLIB=$ac_cv_prog_RANLIB
-+if test -n "$RANLIB"; then
-+ echo "$as_me:$LINENO: result: $RANLIB" >&5
-+echo "${ECHO_T}$RANLIB" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--# Extract the first word of "ranlib", so it can be a program name with args.
-+fi
-+if test -z "$ac_cv_prog_RANLIB"; then
-+ ac_ct_RANLIB=$RANLIB
-+ # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1008: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if test -n "$RANLIB"; then
-- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-+ if test -n "$ac_ct_RANLIB"; then
-+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_RANLIB="ranlib"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-- test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_ac_ct_RANLIB="ranlib"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+ test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
- fi
- fi
--RANLIB="$ac_cv_prog_RANLIB"
--if test -n "$RANLIB"; then
-- echo "$ac_t""$RANLIB" 1>&6
-+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-+if test -n "$ac_ct_RANLIB"; then
-+ echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+echo "${ECHO_T}$ac_ct_RANLIB" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ RANLIB=$ac_ct_RANLIB
-+else
-+ RANLIB="$ac_cv_prog_RANLIB"
- fi
-
- for ac_prog in etags
- do
--# Extract the first word of "$ac_prog", so it can be a program name with args.
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1040: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_ETAGS'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ETAGS+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ETAGS"; then
- ac_cv_prog_ETAGS="$ETAGS" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_ETAGS="$ac_prog"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_ETAGS="$ac_prog"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
- fi
- fi
--ETAGS="$ac_cv_prog_ETAGS"
-+ETAGS=$ac_cv_prog_ETAGS
- if test -n "$ETAGS"; then
-- echo "$ac_t""$ETAGS" 1>&6
-+ echo "$as_me:$LINENO: result: $ETAGS" >&5
-+echo "${ECHO_T}$ETAGS" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--test -n "$ETAGS" && break
-+ test -n "$ETAGS" && break
- done
- test -n "$ETAGS" || ETAGS="true"
-
- for ac_prog in makedepend
- do
--# Extract the first word of "$ac_prog", so it can be a program name with args.
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1075: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_MAKEDEPEND'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_MAKEDEPEND+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$MAKEDEPEND"; then
- ac_cv_prog_MAKEDEPEND="$MAKEDEPEND" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_MAKEDEPEND="$ac_prog"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_MAKEDEPEND="$ac_prog"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
- fi
- fi
--MAKEDEPEND="$ac_cv_prog_MAKEDEPEND"
-+MAKEDEPEND=$ac_cv_prog_MAKEDEPEND
- if test -n "$MAKEDEPEND"; then
-- echo "$ac_t""$MAKEDEPEND" 1>&6
-+ echo "$as_me:$LINENO: result: $MAKEDEPEND" >&5
-+echo "${ECHO_T}$MAKEDEPEND" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--test -n "$MAKEDEPEND" && break
-+ test -n "$MAKEDEPEND" && break
- done
- test -n "$MAKEDEPEND" || MAKEDEPEND="true"
-
- for ac_prog in makeinfo
- do
--# Extract the first word of "$ac_prog", so it can be a program name with args.
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1110: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_MAKEINFO+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$MAKEINFO"; then
- ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_MAKEINFO="$ac_prog"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_MAKEINFO="$ac_prog"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
- fi
- fi
--MAKEINFO="$ac_cv_prog_MAKEINFO"
-+MAKEINFO=$ac_cv_prog_MAKEINFO
- if test -n "$MAKEINFO"; then
-- echo "$ac_t""$MAKEINFO" 1>&6
-+ echo "$as_me:$LINENO: result: $MAKEINFO" >&5
-+echo "${ECHO_T}$MAKEINFO" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--test -n "$MAKEINFO" && break
-+ test -n "$MAKEINFO" && break
- done
- test -n "$MAKEINFO" || MAKEINFO="true"
-
- for ac_prog in texi2dvi
- do
--# Extract the first word of "$ac_prog", so it can be a program name with args.
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1145: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_TEXI2DVI'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_TEXI2DVI+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$TEXI2DVI"; then
- ac_cv_prog_TEXI2DVI="$TEXI2DVI" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_TEXI2DVI="$ac_prog"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_TEXI2DVI="$ac_prog"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
- fi
- fi
--TEXI2DVI="$ac_cv_prog_TEXI2DVI"
-+TEXI2DVI=$ac_cv_prog_TEXI2DVI
- if test -n "$TEXI2DVI"; then
-- echo "$ac_t""$TEXI2DVI" 1>&6
-+ echo "$as_me:$LINENO: result: $TEXI2DVI" >&5
-+echo "${ECHO_T}$TEXI2DVI" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--test -n "$TEXI2DVI" && break
-+ test -n "$TEXI2DVI" && break
- done
- test -n "$TEXI2DVI" || TEXI2DVI="true"
-
- for ac_prog in texi2html
- do
--# Extract the first word of "$ac_prog", so it can be a program name with args.
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1180: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_TEXI2HTML'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_TEXI2HTML+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$TEXI2HTML"; then
- ac_cv_prog_TEXI2HTML="$TEXI2HTML" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_TEXI2HTML="$ac_prog"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_TEXI2HTML="$ac_prog"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
- fi
- fi
--TEXI2HTML="$ac_cv_prog_TEXI2HTML"
-+TEXI2HTML=$ac_cv_prog_TEXI2HTML
- if test -n "$TEXI2HTML"; then
-- echo "$ac_t""$TEXI2HTML" 1>&6
-+ echo "$as_me:$LINENO: result: $TEXI2HTML" >&5
-+echo "${ECHO_T}$TEXI2HTML" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--test -n "$TEXI2HTML" && break
-+ test -n "$TEXI2HTML" && break
- done
- test -n "$TEXI2HTML" || TEXI2HTML="true"
-
- for ac_prog in dvips
- do
--# Extract the first word of "$ac_prog", so it can be a program name with args.
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1215: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_DVIPS'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_DVIPS+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$DVIPS"; then
- ac_cv_prog_DVIPS="$DVIPS" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_DVIPS="$ac_prog"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_DVIPS="$ac_prog"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
- fi
- fi
--DVIPS="$ac_cv_prog_DVIPS"
-+DVIPS=$ac_cv_prog_DVIPS
- if test -n "$DVIPS"; then
-- echo "$ac_t""$DVIPS" 1>&6
-+ echo "$as_me:$LINENO: result: $DVIPS" >&5
-+echo "${ECHO_T}$DVIPS" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--test -n "$DVIPS" && break
-+ test -n "$DVIPS" && break
- done
- test -n "$DVIPS" || DVIPS="true"
-
-
-+
-+
-+
-+
-+
- ac_header_dirent=no
--for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
--do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
--echo "configure:1251: checking for $ac_hdr that defines DIR" >&5
--if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 1256 "configure"
--#include "confdefs.h"
-+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-+ as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-+echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <sys/types.h>
- #include <$ac_hdr>
--int main() {
--DIR *dirp = 0;
--; return 0; }
--EOF
--if { (eval echo configure:1264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
-- eval "ac_cv_header_dirent_$ac_safe=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_header_dirent_$ac_safe=no"
--fi
--rm -f conftest*
--fi
--if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-- cat >> confdefs.h <<EOF
--#define $ac_tr_hdr 1
--EOF
-- ac_header_dirent=$ac_hdr; break
--else
-- echo "$ac_t""no" 1>&6
-+
-+int
-+main ()
-+{
-+if ((DIR *) 0)
-+return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ eval "$as_ac_Header=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_Header=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-+_ACEOF
-+
-+ac_header_dirent=$ac_hdr; break
- fi
-+
- done
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
--echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
--echo "configure:1289: checking for opendir in -ldir" >&5
--ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- ac_save_LIBS="$LIBS"
--LIBS="-ldir $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 1297 "configure"
--#include "confdefs.h"
-+ echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-+if test "${ac_cv_search_opendir+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+ac_cv_search_opendir=no
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char opendir();
-+ builtin and then its argument prototype would still apply. */
-+char opendir ();
-+int
-+main ()
-+{
-+opendir ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_search_opendir="none required"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search_opendir" = no; then
-+ for ac_lib in dir; do
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--int main() {
--opendir()
--; return 0; }
--EOF
--if { (eval echo configure:1308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char opendir ();
-+int
-+main ()
-+{
-+opendir ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_search_opendir="-l$ac_lib"
-+break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- LIBS="$LIBS -ldir"
--else
-- echo "$ac_t""no" 1>&6
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+ done
-+fi
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6
-+if test "$ac_cv_search_opendir" != no; then
-+ test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
-+
- fi
-
- else
--echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
--echo "configure:1330: checking for opendir in -lx" >&5
--ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+ echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-+if test "${ac_cv_search_opendir+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_save_LIBS="$LIBS"
--LIBS="-lx $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 1338 "configure"
--#include "confdefs.h"
-+ ac_func_search_save_LIBS=$LIBS
-+ac_cv_search_opendir=no
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char opendir ();
-+int
-+main ()
-+{
-+opendir ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_search_opendir="none required"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search_opendir" = no; then
-+ for ac_lib in x; do
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char opendir();
-+ builtin and then its argument prototype would still apply. */
-+char opendir ();
-+int
-+main ()
-+{
-+opendir ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_search_opendir="-l$ac_lib"
-+break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--int main() {
--opendir()
--; return 0; }
--EOF
--if { (eval echo configure:1349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
- fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+ done
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- LIBS="$LIBS -lx"
--else
-- echo "$ac_t""no" 1>&6
-+LIBS=$ac_func_search_save_LIBS
- fi
-+echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6
-+if test "$ac_cv_search_opendir" != no; then
-+ test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
-
- fi
-
--echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:1372: checking for ANSI C header files" >&5
--if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+fi
-+
-+
-+echo "$as_me:$LINENO: checking for egrep" >&5
-+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-+if test "${ac_cv_prog_egrep+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat > conftest.$ac_ext <<EOF
--#line 1377 "configure"
--#include "confdefs.h"
-+ if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-+ then ac_cv_prog_egrep='grep -E'
-+ else ac_cv_prog_egrep='egrep'
-+ fi
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-+echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-+ EGREP=$ac_cv_prog_egrep
-+
-+
-+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-+if test "${ac_cv_header_stdc+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <stdlib.h>
- #include <stdarg.h>
- #include <string.h>
- #include <float.h>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
-- rm -rf conftest*
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_header_stdc=yes
- else
-- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- ac_cv_header_stdc=no
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_header_stdc=no
- fi
--rm -f conftest*
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
- if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
--cat > conftest.$ac_ext <<EOF
--#line 1402 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <string.h>
--EOF
-+
-+_ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- egrep "memchr" >/dev/null 2>&1; then
-+ $EGREP "memchr" >/dev/null 2>&1; then
- :
- else
-- rm -rf conftest*
- ac_cv_header_stdc=no
- fi
- rm -f conftest*
-@@ -1415,16 +3496,19 @@ fi
-
- if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
--cat > conftest.$ac_ext <<EOF
--#line 1420 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <stdlib.h>
--EOF
-+
-+_ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- egrep "free" >/dev/null 2>&1; then
-+ $EGREP "free" >/dev/null 2>&1; then
- :
- else
-- rm -rf conftest*
- ac_cv_header_stdc=no
- fi
- rm -f conftest*
-@@ -1433,377 +3517,1043 @@ fi
-
- if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
--if test "$cross_compiling" = yes; then
-+ if test "$cross_compiling" = yes; then
- :
- else
-- cat > conftest.$ac_ext <<EOF
--#line 1441 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <ctype.h>
--#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
--#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
--#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
--int main () { int i; for (i = 0; i < 256; i++)
--if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
--exit (0); }
-+#if ((' ' & 0x0FF) == 0x020)
-+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-+#else
-+# define ISLOWER(c) \
-+ (('a' <= (c) && (c) <= 'i') \
-+ || ('j' <= (c) && (c) <= 'r') \
-+ || ('s' <= (c) && (c) <= 'z'))
-+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-+#endif
-
--EOF
--if { (eval echo configure:1452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
-+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-+int
-+main ()
-+{
-+ int i;
-+ for (i = 0; i < 256; i++)
-+ if (XOR (islower (i), ISLOWER (i))
-+ || toupper (i) != TOUPPER (i))
-+ exit(2);
-+ exit (0);
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- :
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -fr conftest*
-- ac_cv_header_stdc=no
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+ac_cv_header_stdc=no
- fi
--rm -fr conftest*
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
- fi
- fi
--
--echo "$ac_t""$ac_cv_header_stdc" 1>&6
-+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
-- cat >> confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\_ACEOF
- #define STDC_HEADERS 1
--EOF
-+_ACEOF
-
- fi
-
--echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
--echo "configure:1476: checking whether time.h and sys/time.h may both be included" >&5
--if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-+echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
-+if test "${ac_cv_header_time+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat > conftest.$ac_ext <<EOF
--#line 1481 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <sys/types.h>
- #include <sys/time.h>
- #include <time.h>
--int main() {
--struct tm *tp;
--; return 0; }
--EOF
--if { (eval echo configure:1490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
-+
-+int
-+main ()
-+{
-+if ((struct tm *) 0)
-+return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_header_time=yes
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- ac_cv_header_time=no
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_header_time=no
- fi
--rm -f conftest*
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
--echo "$ac_t""$ac_cv_header_time" 1>&6
-+echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-+echo "${ECHO_T}$ac_cv_header_time" >&6
- if test $ac_cv_header_time = yes; then
-- cat >> confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\_ACEOF
- #define TIME_WITH_SYS_TIME 1
--EOF
-+_ACEOF
-
- fi
-
--for ac_hdr in fcntl.h sys/file.h sys/ioctl.h sys/time.h stdlib.h unistd.h memory.h string.h strings.h utime.h limits.h gsm.h gsm/gsm.h rxposix.h rx/rxposix.h
-+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+ inttypes.h stdint.h unistd.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1514: checking for $ac_hdr" >&5
--if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ eval "$as_ac_Header=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_Header=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+for ac_header in fcntl.h sys/file.h sys/ioctl.h sys/time.h stdlib.h unistd.h memory.h string.h strings.h utime.h limits.h gsm.h gsm/gsm.h rxposix.h rx/rxposix.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <$ac_header>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
- else
-- cat > conftest.$ac_ext <<EOF
--#line 1519 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1524: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
-- rm -rf conftest*
-- eval "ac_cv_header_$ac_safe=yes"
--else
-- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_header_$ac_safe=no"
-+ ac_cpp_err=yes
- fi
--rm -f conftest*
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
- fi
--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-- cat >> confdefs.h <<EOF
--#define $ac_tr_hdr 1
--EOF
--
--else
-- echo "$ac_t""no" 1>&6
-+
-+done
-+
-+
-+
-+
-+
-+for ac_header in readline.h history.h readline/readline.h readline/history.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <$ac_header>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
- fi
-+
- done
-
--echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
--echo "configure:1551: checking for sys/wait.h that is POSIX.1 compatible" >&5
--if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 1556 "configure"
--#include "confdefs.h"
-+echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
-+echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
-+if test "${ac_cv_header_sys_wait_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <sys/types.h>
- #include <sys/wait.h>
- #ifndef WEXITSTATUS
--#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
-+# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
- #endif
- #ifndef WIFEXITED
--#define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-+# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
- #endif
--int main() {
--int s;
--wait (&s);
--s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
--; return 0; }
--EOF
--if { (eval echo configure:1572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
-+
-+int
-+main ()
-+{
-+ int s;
-+ wait (&s);
-+ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_header_sys_wait_h=yes
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- ac_cv_header_sys_wait_h=no
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_header_sys_wait_h=no
- fi
--rm -f conftest*
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
--echo "$ac_t""$ac_cv_header_sys_wait_h" 1>&6
-+echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
- if test $ac_cv_header_sys_wait_h = yes; then
-- cat >> confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_SYS_WAIT_H 1
--EOF
-+_ACEOF
-
- fi
-
-
--echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:1594: checking for working const" >&5
--if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 1599 "configure"
--#include "confdefs.h"
--
--int main() {
--
--/* Ultrix mips cc rejects this. */
--typedef int charset[2]; const charset x;
--/* SunOS 4.1.1 cc rejects this. */
--char const *const *ccp;
--char **p;
--/* NEC SVR4.0.2 mips cc rejects this. */
--struct point {int x, y;};
--static struct point const zero = {0,0};
--/* AIX XL C 1.02.0.0 rejects this.
-- It does not let you subtract one const X* pointer from another in an arm
-- of an if-expression whose if-part is not a constant expression */
--const char *g = "string";
--ccp = &g + (g ? g-g : 0);
--/* HPUX 7.0 cc rejects these. */
--++ccp;
--p = (char**) ccp;
--ccp = (char const *const *) p;
--{ /* SCO 3.2v4 cc rejects this. */
-- char *t;
-- char const *s = 0 ? (char *) 0 : (char const *) 0;
--
-- *t++ = 0;
--}
--{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
-- int x[] = {25, 17};
-- const int *foo = &x[0];
-- ++foo;
--}
--{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-- typedef const int *iptr;
-- iptr p = 0;
-- ++p;
--}
--{ /* AIX XL C 1.02.0.0 rejects this saying
-- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-- struct s { int j; const int *ap[3]; };
-- struct s *b; b->j = 5;
--}
--{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-- const int foo = 10;
--}
--
--; return 0; }
--EOF
--if { (eval echo configure:1648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
-+echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-+if test "${ac_cv_c_const+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+/* FIXME: Include the comments suggested by Paul. */
-+#ifndef __cplusplus
-+ /* Ultrix mips cc rejects this. */
-+ typedef int charset[2];
-+ const charset x;
-+ /* SunOS 4.1.1 cc rejects this. */
-+ char const *const *ccp;
-+ char **p;
-+ /* NEC SVR4.0.2 mips cc rejects this. */
-+ struct point {int x, y;};
-+ static struct point const zero = {0,0};
-+ /* AIX XL C 1.02.0.0 rejects this.
-+ It does not let you subtract one const X* pointer from another in
-+ an arm of an if-expression whose if-part is not a constant
-+ expression */
-+ const char *g = "string";
-+ ccp = &g + (g ? g-g : 0);
-+ /* HPUX 7.0 cc rejects these. */
-+ ++ccp;
-+ p = (char**) ccp;
-+ ccp = (char const *const *) p;
-+ { /* SCO 3.2v4 cc rejects this. */
-+ char *t;
-+ char const *s = 0 ? (char *) 0 : (char const *) 0;
-+
-+ *t++ = 0;
-+ }
-+ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
-+ int x[] = {25, 17};
-+ const int *foo = &x[0];
-+ ++foo;
-+ }
-+ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-+ typedef const int *iptr;
-+ iptr p = 0;
-+ ++p;
-+ }
-+ { /* AIX XL C 1.02.0.0 rejects this saying
-+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-+ struct s { int j; const int *ap[3]; };
-+ struct s *b; b->j = 5;
-+ }
-+ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-+ const int foo = 10;
-+ }
-+#endif
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_c_const=yes
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- ac_cv_c_const=no
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_c_const=no
- fi
--rm -f conftest*
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
--echo "$ac_t""$ac_cv_c_const" 1>&6
-+echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-+echo "${ECHO_T}$ac_cv_c_const" >&6
- if test $ac_cv_c_const = no; then
-- cat >> confdefs.h <<\EOF
--#define const
--EOF
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define const
-+_ACEOF
-
- fi
-
--echo $ac_n "checking for size_t""... $ac_c" 1>&6
--echo "configure:1669: checking for size_t" >&5
--if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 1674 "configure"
--#include "confdefs.h"
--#include <sys/types.h>
--#if STDC_HEADERS
--#include <stdlib.h>
--#include <stddef.h>
--#endif
--EOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-- rm -rf conftest*
-+echo "$as_me:$LINENO: checking for size_t" >&5
-+echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-+if test "${ac_cv_type_size_t+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+if ((size_t *) 0)
-+ return 0;
-+if (sizeof (size_t))
-+ return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_type_size_t=yes
- else
-- rm -rf conftest*
-- ac_cv_type_size_t=no
--fi
--rm -f conftest*
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+ac_cv_type_size_t=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$ac_t""$ac_cv_type_size_t" 1>&6
--if test $ac_cv_type_size_t = no; then
-- cat >> confdefs.h <<\EOF
-+echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-+echo "${ECHO_T}$ac_cv_type_size_t" >&6
-+if test $ac_cv_type_size_t = yes; then
-+ :
-+else
-+
-+cat >>confdefs.h <<_ACEOF
- #define size_t unsigned
--EOF
-+_ACEOF
-
- fi
-
-
--for ac_hdr in unistd.h
-+
-+
-+for ac_header in stdlib.h unistd.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1706: checking for $ac_hdr" >&5
--if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <$ac_header>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
- else
-- cat > conftest.$ac_ext <<EOF
--#line 1711 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
-- rm -rf conftest*
-- eval "ac_cv_header_$ac_safe=yes"
--else
-- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_header_$ac_safe=no"
-+ ac_cpp_err=yes
- fi
--rm -f conftest*
--fi
--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-- cat >> confdefs.h <<EOF
--#define $ac_tr_hdr 1
--EOF
--
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
- fi
-+
- done
-
-+
- for ac_func in getpagesize
- do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1745: checking for $ac_func" >&5
--if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 1750 "configure"
--#include "confdefs.h"
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func(); below. */
--#include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char $ac_func();
-+ which can conflict with char $ac_func (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-
--int main() {
-+#undef $ac_func
-
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+{
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
- choke me
- #else
--$ac_func();
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
--; return 0; }
--EOF
--if { (eval echo configure:1773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_func_$ac_func=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_func_$ac_func=no"
--fi
--rm -f conftest*
--fi
-+int
-+main ()
-+{
-+return f != $ac_func;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ eval "$as_ac_var=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-
--if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-- cat >> confdefs.h <<EOF
--#define $ac_tr_func 1
--EOF
--
--else
-- echo "$ac_t""no" 1>&6
- fi
- done
-
--echo $ac_n "checking for working mmap""... $ac_c" 1>&6
--echo "configure:1798: checking for working mmap" >&5
--if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for working mmap" >&5
-+echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
-+if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test "$cross_compiling" = yes; then
- ac_cv_func_mmap_fixed_mapped=no
- else
-- cat > conftest.$ac_ext <<EOF
--#line 1806 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+/* malloc might have been renamed as rpl_malloc. */
-+#undef malloc
-
- /* Thanks to Mike Haertel and Jim Avera for this test.
- Here is a matrix of mmap possibilities:
-@@ -1817,34 +4567,34 @@ else
- back from the file, nor mmap's back from the file at a different
- address. (There have been systems where private was not correctly
- implemented like the infamous i386 svr4.0, and systems where the
-- VM page cache was not coherent with the filesystem buffer cache
-+ VM page cache was not coherent with the file system buffer cache
- like early versions of FreeBSD and possibly contemporary NetBSD.)
- For shared mappings, we should conversely verify that changes get
-- propogated back to all the places they're supposed to be.
-+ propagated back to all the places they're supposed to be.
-
- Grep wants private fixed already mapped.
- The main things grep needs to know about mmap are:
- * does it exist and is it safe to write into the mmap'd area
- * how to use it (BSD variants) */
--#include <sys/types.h>
-+
- #include <fcntl.h>
- #include <sys/mman.h>
-
--/* This mess was copied from the GNU getpagesize.h. */
--#ifndef HAVE_GETPAGESIZE
--# ifdef HAVE_UNISTD_H
--# include <unistd.h>
--# endif
-+#if !STDC_HEADERS && !HAVE_STDLIB_H
-+char *malloc ();
-+#endif
-
-+/* This mess was copied from the GNU getpagesize.h. */
-+#if !HAVE_GETPAGESIZE
- /* Assume that all systems that can run configure have sys/param.h. */
--# ifndef HAVE_SYS_PARAM_H
-+# if !HAVE_SYS_PARAM_H
- # define HAVE_SYS_PARAM_H 1
- # endif
-
- # ifdef _SC_PAGESIZE
- # define getpagesize() sysconf(_SC_PAGESIZE)
- # else /* no _SC_PAGESIZE */
--# ifdef HAVE_SYS_PARAM_H
-+# if HAVE_SYS_PARAM_H
- # include <sys/param.h>
- # ifdef EXEC_PAGESIZE
- # define getpagesize() EXEC_PAGESIZE
-@@ -1871,252 +4621,394 @@ else
-
- #endif /* no HAVE_GETPAGESIZE */
-
--#ifdef __cplusplus
--extern "C" { void *malloc(unsigned); }
--#else
--char *malloc();
--#endif
--
- int
--main()
-+main ()
- {
-- char *data, *data2, *data3;
-- int i, pagesize;
-- int fd;
--
-- pagesize = getpagesize();
--
-- /*
-- * First, make a file with some known garbage in it.
-- */
-- data = malloc(pagesize);
-- if (!data)
-- exit(1);
-- for (i = 0; i < pagesize; ++i)
-- *(data + i) = rand();
-- umask(0);
-- fd = creat("conftestmmap", 0600);
-- if (fd < 0)
-- exit(1);
-- if (write(fd, data, pagesize) != pagesize)
-- exit(1);
-- close(fd);
--
-- /*
-- * Next, try to mmap the file at a fixed address which
-- * already has something else allocated at it. If we can,
-- * also make sure that we see the same garbage.
-- */
-- fd = open("conftestmmap", O_RDWR);
-- if (fd < 0)
-- exit(1);
-- data2 = malloc(2 * pagesize);
-- if (!data2)
-- exit(1);
-- data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);
-- if (data2 != mmap(data2, pagesize, PROT_READ | PROT_WRITE,
-- MAP_PRIVATE | MAP_FIXED, fd, 0L))
-- exit(1);
-- for (i = 0; i < pagesize; ++i)
-- if (*(data + i) != *(data2 + i))
-- exit(1);
--
-- /*
-- * Finally, make sure that changes to the mapped area
-- * do not percolate back to the file as seen by read().
-- * (This is a bug on some variants of i386 svr4.0.)
-- */
-- for (i = 0; i < pagesize; ++i)
-- *(data2 + i) = *(data2 + i) + 1;
-- data3 = malloc(pagesize);
-- if (!data3)
-- exit(1);
-- if (read(fd, data3, pagesize) != pagesize)
-- exit(1);
-- for (i = 0; i < pagesize; ++i)
-- if (*(data + i) != *(data3 + i))
-- exit(1);
-- close(fd);
-- unlink("conftestmmap");
-- exit(0);
-+ char *data, *data2, *data3;
-+ int i, pagesize;
-+ int fd;
-+
-+ pagesize = getpagesize ();
-+
-+ /* First, make a file with some known garbage in it. */
-+ data = (char *) malloc (pagesize);
-+ if (!data)
-+ exit (1);
-+ for (i = 0; i < pagesize; ++i)
-+ *(data + i) = rand ();
-+ umask (0);
-+ fd = creat ("conftest.mmap", 0600);
-+ if (fd < 0)
-+ exit (1);
-+ if (write (fd, data, pagesize) != pagesize)
-+ exit (1);
-+ close (fd);
-+
-+ /* Next, try to mmap the file at a fixed address which already has
-+ something else allocated at it. If we can, also make sure that
-+ we see the same garbage. */
-+ fd = open ("conftest.mmap", O_RDWR);
-+ if (fd < 0)
-+ exit (1);
-+ data2 = (char *) malloc (2 * pagesize);
-+ if (!data2)
-+ exit (1);
-+ data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1);
-+ if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
-+ MAP_PRIVATE | MAP_FIXED, fd, 0L))
-+ exit (1);
-+ for (i = 0; i < pagesize; ++i)
-+ if (*(data + i) != *(data2 + i))
-+ exit (1);
-+
-+ /* Finally, make sure that changes to the mapped area do not
-+ percolate back to the file as seen by read(). (This is a bug on
-+ some variants of i386 svr4.0.) */
-+ for (i = 0; i < pagesize; ++i)
-+ *(data2 + i) = *(data2 + i) + 1;
-+ data3 = (char *) malloc (pagesize);
-+ if (!data3)
-+ exit (1);
-+ if (read (fd, data3, pagesize) != pagesize)
-+ exit (1);
-+ for (i = 0; i < pagesize; ++i)
-+ if (*(data + i) != *(data3 + i))
-+ exit (1);
-+ close (fd);
-+ exit (0);
- }
--
--EOF
--if { (eval echo configure:1946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_func_mmap_fixed_mapped=yes
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -fr conftest*
-- ac_cv_func_mmap_fixed_mapped=no
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+ac_cv_func_mmap_fixed_mapped=no
- fi
--rm -fr conftest*
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
- fi
--
--echo "$ac_t""$ac_cv_func_mmap_fixed_mapped" 1>&6
-+echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
-+echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
- if test $ac_cv_func_mmap_fixed_mapped = yes; then
-- cat >> confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_MMAP 1
--EOF
-+_ACEOF
-
- fi
-+rm -f conftest.mmap
-
--echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
--echo "configure:1969: checking for 8-bit clean memcmp" >&5
--if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for working memcmp" >&5
-+echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6
-+if test "${ac_cv_func_memcmp_working+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test "$cross_compiling" = yes; then
-- ac_cv_func_memcmp_clean=no
-+ ac_cv_func_memcmp_working=no
- else
-- cat > conftest.$ac_ext <<EOF
--#line 1977 "configure"
--#include "confdefs.h"
--
--main()
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
- {
-+
-+ /* Some versions of memcmp are not 8-bit clean. */
- char c0 = 0x40, c1 = 0x80, c2 = 0x81;
-- exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1);
-+ if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
-+ exit (1);
-+
-+ /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
-+ or more and with at least one buffer not starting on a 4-byte boundary.
-+ William Lewis provided this test program. */
-+ {
-+ char foo[21];
-+ char bar[21];
-+ int i;
-+ for (i = 0; i < 4; i++)
-+ {
-+ char *a = foo + i;
-+ char *b = bar + i;
-+ strcpy (a, "--------01111111");
-+ strcpy (b, "--------10000000");
-+ if (memcmp (a, b, 16) >= 0)
-+ exit (1);
-+ }
-+ exit (0);
-+ }
-+
-+ ;
-+ return 0;
- }
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_func_memcmp_working=yes
-+else
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+ac_cv_func_memcmp_working=no
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
-+echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6
-+test $ac_cv_func_memcmp_working = no && case $LIBOBJS in
-+ "memcmp.$ac_objext" | \
-+ *" memcmp.$ac_objext" | \
-+ "memcmp.$ac_objext "* | \
-+ *" memcmp.$ac_objext "* ) ;;
-+ *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" ;;
-+esac
-
--EOF
--if { (eval echo configure:1987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
-- ac_cv_func_memcmp_clean=yes
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -fr conftest*
-- ac_cv_func_memcmp_clean=no
--fi
--rm -fr conftest*
--fi
-
--fi
-
--echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
--test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
-+for ac_func in vprintf
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-
--echo $ac_n "checking for vprintf""... $ac_c" 1>&6
--echo "configure:2005: checking for vprintf" >&5
--if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 2010 "configure"
--#include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char vprintf(); below. */
--#include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char vprintf();
-+ which can conflict with char $ac_func (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-
--int main() {
-+#undef $ac_func
-
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+{
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_vprintf) || defined (__stub___vprintf)
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
- choke me
- #else
--vprintf();
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
--; return 0; }
--EOF
--if { (eval echo configure:2033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_func_vprintf=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_func_vprintf=no"
--fi
--rm -f conftest*
--fi
-+int
-+main ()
-+{
-+return f != $ac_func;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ eval "$as_ac_var=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+echo "$as_me:$LINENO: checking for _doprnt" >&5
-+echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6
-+if test "${ac_cv_func__doprnt+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define _doprnt innocuous__doprnt
-
--if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- cat >> confdefs.h <<\EOF
--#define HAVE_VPRINTF 1
--EOF
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char _doprnt (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-
--else
-- echo "$ac_t""no" 1>&6
--fi
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef _doprnt
-
--if test "$ac_cv_func_vprintf" != yes; then
--echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
--echo "configure:2057: checking for _doprnt" >&5
--if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 2062 "configure"
--#include "confdefs.h"
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char _doprnt(); below. */
--#include <assert.h>
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+{
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char _doprnt();
--
--int main() {
--
-+ builtin and then its argument prototype would still apply. */
-+char _doprnt ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub__doprnt) || defined (__stub____doprnt)
- choke me
- #else
--_doprnt();
-+char (*f) () = _doprnt;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
--; return 0; }
--EOF
--if { (eval echo configure:2085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_func__doprnt=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_func__doprnt=no"
--fi
--rm -f conftest*
--fi
-+int
-+main ()
-+{
-+return f != _doprnt;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_func__doprnt=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func__doprnt=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
-+echo "${ECHO_T}$ac_cv_func__doprnt" >&6
-+if test $ac_cv_func__doprnt = yes; then
-
--if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- cat >> confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_DOPRNT 1
--EOF
-+_ACEOF
-
--else
-- echo "$ac_t""no" 1>&6
- fi
-
- fi
-+done
-
--echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
--echo "configure:2110: checking return type of signal handlers" >&5
--if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 2115 "configure"
--#include "confdefs.h"
-+
-+echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-+echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
-+if test "${ac_cv_type_signal+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <sys/types.h>
- #include <signal.h>
- #ifdef signal
--#undef signal
-+# undef signal
- #endif
- #ifdef __cplusplus
- extern "C" void (*signal (int, void (*)(int)))(int);
-@@ -2124,244 +5016,608 @@ extern "C" void (*signal (int, void (*)(
- void (*signal ()) ();
- #endif
-
--int main() {
-+int
-+main ()
-+{
- int i;
--; return 0; }
--EOF
--if { (eval echo configure:2132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_type_signal=void
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- ac_cv_type_signal=int
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_type_signal=int
- fi
--rm -f conftest*
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-+echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-+echo "${ECHO_T}$ac_cv_type_signal" >&6
-
--echo "$ac_t""$ac_cv_type_signal" 1>&6
--cat >> confdefs.h <<EOF
-+cat >>confdefs.h <<_ACEOF
- #define RETSIGTYPE $ac_cv_type_signal
--EOF
-+_ACEOF
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
- for ac_func in getcwd gethostname mkdir re_comp regcomp select snprintf socket strdup strerror strstr fstat fchmod fchown utime utimes memmove sigset vsnprintf waitpid random srandom
- do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2153: checking for $ac_func" >&5
--if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 2158 "configure"
--#include "confdefs.h"
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func(); below. */
--#include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char $ac_func();
-+ which can conflict with char $ac_func (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-
--int main() {
-+#undef $ac_func
-
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+{
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
- choke me
- #else
--$ac_func();
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
--; return 0; }
--EOF
--if { (eval echo configure:2181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_func_$ac_func=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_func_$ac_func=no"
--fi
--rm -f conftest*
--fi
-+int
-+main ()
-+{
-+return f != $ac_func;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ eval "$as_ac_var=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-
--if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-- cat >> confdefs.h <<EOF
--#define $ac_tr_func 1
--EOF
--
--else
-- echo "$ac_t""no" 1>&6
- fi
- done
-
--echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
--echo "configure:2206: checking for socket in -lsocket" >&5
--ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
-+echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
-+if test "${ac_cv_lib_socket_socket+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 2214 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char socket();
--
--int main() {
--socket()
--; return 0; }
--EOF
--if { (eval echo configure:2225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+ builtin and then its argument prototype would still apply. */
-+char socket ();
-+int
-+main ()
-+{
-+socket ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_socket_socket=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_socket_socket=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
-+if test $ac_cv_lib_socket_socket = yes; then
- LIBS="$LIBS -lsocket"
--else
-- echo "$ac_t""no" 1>&6
- fi
-
--echo $ac_n "checking for t_accept in -lnsl""... $ac_c" 1>&6
--echo "configure:2246: checking for t_accept in -lnsl" >&5
--ac_lib_var=`echo nsl'_'t_accept | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for t_accept in -lnsl" >&5
-+echo $ECHO_N "checking for t_accept in -lnsl... $ECHO_C" >&6
-+if test "${ac_cv_lib_nsl_t_accept+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-lnsl $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 2254 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char t_accept();
--
--int main() {
--t_accept()
--; return 0; }
--EOF
--if { (eval echo configure:2265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+ builtin and then its argument prototype would still apply. */
-+char t_accept ();
-+int
-+main ()
-+{
-+t_accept ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_nsl_t_accept=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_nsl_t_accept=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_t_accept" >&5
-+echo "${ECHO_T}$ac_cv_lib_nsl_t_accept" >&6
-+if test $ac_cv_lib_nsl_t_accept = yes; then
- LIBS="$LIBS -lnsl"
--else
-- echo "$ac_t""no" 1>&6
- fi
-
-
--echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
--echo "configure:2287: checking for readline in -lreadline" >&5
--ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+if test "$ac_cv_header_readline_h" = "yes" ||
-+ test "$ac_cv_header_readline_readline_h" = "yes"; then
-+ echo "$as_me:$LINENO: checking for tputs in -ltermcap" >&5
-+echo $ECHO_N "checking for tputs in -ltermcap... $ECHO_C" >&6
-+if test "${ac_cv_lib_termcap_tputs+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ltermcap $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char tputs ();
-+int
-+main ()
-+{
-+tputs ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_termcap_tputs=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_termcap_tputs=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tputs" >&5
-+echo "${ECHO_T}$ac_cv_lib_termcap_tputs" >&6
-+if test $ac_cv_lib_termcap_tputs = yes; then
-+ echo "$as_me:$LINENO: checking for readline in -ledit" >&5
-+echo $ECHO_N "checking for readline in -ledit... $ECHO_C" >&6
-+if test "${ac_cv_lib_edit_readline+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ledit -ltermcap $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char readline ();
-+int
-+main ()
-+{
-+readline ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_edit_readline=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_edit_readline=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_edit_readline" >&5
-+echo "${ECHO_T}$ac_cv_lib_edit_readline" >&6
-+if test $ac_cv_lib_edit_readline = yes; then
-+ cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LIBEDIT 1
-+_ACEOF
-+
-+ cat >>confdefs.h <<\_ACEOF
-+#define HAVE_READLINE 1
-+_ACEOF
-+
-+ RL_LIBS="-ledit -ltermcap"
-+else
-+ echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
-+echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6
-+if test "${ac_cv_lib_readline_readline+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-lreadline $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 2295 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char readline();
-+ builtin and then its argument prototype would still apply. */
-+char readline ();
-+int
-+main ()
-+{
-+readline ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_readline_readline=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--int main() {
--readline()
--; return 0; }
--EOF
--if { (eval echo configure:2306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
-+ac_cv_lib_readline_readline=no
- fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- RL_LIBS="-lreadline"
-+echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
-+echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6
-+if test $ac_cv_lib_readline_readline = yes; then
-+ cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LIBREADLINE 1
-+_ACEOF
-+
-+ cat >>confdefs.h <<\_ACEOF
-+#define HAVE_READLINE 1
-+_ACEOF
-+
-+ RL_LIBS="-ledit -ltermcap"
- else
-- echo "$ac_t""no" 1>&6
-+ -ltermcap
- fi
-
-
-+fi
-
--echo $ac_n "checking for gsm_decode in -lgsm""... $ac_c" 1>&6
--echo "configure:2329: checking for gsm_decode in -lgsm" >&5
--ac_lib_var=`echo gsm'_'gsm_decode | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- ac_save_LIBS="$LIBS"
--LIBS="-lgsm $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 2337 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char gsm_decode();
-
--int main() {
--gsm_decode()
--; return 0; }
--EOF
--if { (eval echo configure:2348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
- fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
-
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- HAVE_GSM="yes"
-+
-+
-+echo "$as_me:$LINENO: checking for gsm_decode in -lgsm" >&5
-+echo $ECHO_N "checking for gsm_decode in -lgsm... $ECHO_C" >&6
-+if test "${ac_cv_lib_gsm_gsm_decode+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lgsm $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char gsm_decode ();
-+int
-+main ()
-+{
-+gsm_decode ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_gsm_gsm_decode=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_gsm_gsm_decode=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_gsm_gsm_decode" >&5
-+echo "${ECHO_T}$ac_cv_lib_gsm_gsm_decode" >&6
-+if test $ac_cv_lib_gsm_gsm_decode = yes; then
-+ HAVE_GSM="yes"
- fi
-
- if test "$HAVE_GSM" = "yes"; then
-@@ -2374,44 +5630,72 @@ fi
-
-
-
--echo $ac_n "checking for regncomp in -lrx""... $ac_c" 1>&6
--echo "configure:2379: checking for regncomp in -lrx" >&5
--ac_lib_var=`echo rx'_'regncomp | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for regncomp in -lrx" >&5
-+echo $ECHO_N "checking for regncomp in -lrx... $ECHO_C" >&6
-+if test "${ac_cv_lib_rx_regncomp+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-lrx $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 2387 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char regncomp();
--
--int main() {
--regncomp()
--; return 0; }
--EOF
--if { (eval echo configure:2398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char regncomp ();
-+int
-+main ()
-+{
-+regncomp ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_rx_regncomp=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_rx_regncomp=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_rx_regncomp" >&5
-+echo "${ECHO_T}$ac_cv_lib_rx_regncomp" >&6
-+if test $ac_cv_lib_rx_regncomp = yes; then
- HAVE_RX="yes"
--else
-- echo "$ac_t""no" 1>&6
- fi
-
- if test "$HAVE_RX" = "yes"; then
-@@ -2433,165 +5717,284 @@ if test -n "$target" -a "$target" != "NO
- fi
-
- if test -z "$RPLAY_TARGET"; then
--echo $ac_n "checking for sun""... $ac_c" 1>&6
--echo "configure:2438: checking for sun" >&5
--cat > conftest.$ac_ext <<EOF
--#line 2440 "configure"
--#include "confdefs.h"
-+echo "$as_me:$LINENO: checking for sun" >&5
-+echo $ECHO_N "checking for sun... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #ifdef sun
- yes
- #endif
-
--EOF
-+_ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- egrep "yes" >/dev/null 2>&1; then
-- rm -rf conftest*
-+ $EGREP "yes" >/dev/null 2>&1; then
- is_sun=yes
- else
-- rm -rf conftest*
- is_sun=no
- fi
- rm -f conftest*
-
--echo "$ac_t""$is_sun" 1>&6
-+echo "$as_me:$LINENO: result: $is_sun" >&5
-+echo "${ECHO_T}$is_sun" >&6
- if test $is_sun = "yes"; then
- RPLAY_TARGET="sun"
- fi
- if test "$RPLAY_TARGET"; then
-- echo $ac_n "checking for solaris""... $ac_c" 1>&6
--echo "configure:2464: checking for solaris" >&5
-+ echo "$as_me:$LINENO: checking for solaris" >&5
-+echo $ECHO_N "checking for solaris... $ECHO_C" >&6
- if test ! -f /vmunix; then
- is_solaris=yes
- RPLAY_TARGET="solaris"
- else
- is_solaris=no
- fi
-- echo "$ac_t""$is_solaris" 1>&6
-+ echo "$as_me:$LINENO: result: $is_solaris" >&5
-+echo "${ECHO_T}$is_solaris" >&6
- fi
- fi
-
- if test -z "$RPLAY_TARGET"; then
--echo $ac_n "checking for linux""... $ac_c" 1>&6
--echo "configure:2477: checking for linux" >&5
--cat > conftest.$ac_ext <<EOF
--#line 2479 "configure"
--#include "confdefs.h"
-+echo "$as_me:$LINENO: checking for linux" >&5
-+echo $ECHO_N "checking for linux... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #ifdef linux
- yes
- #endif
-
--EOF
-+_ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- egrep "yes" >/dev/null 2>&1; then
-- rm -rf conftest*
-+ $EGREP "yes" >/dev/null 2>&1; then
- is_linux=yes
- else
-- rm -rf conftest*
- is_linux=no
- fi
- rm -f conftest*
-
--echo "$ac_t""$is_linux" 1>&6
-+echo "$as_me:$LINENO: result: $is_linux" >&5
-+echo "${ECHO_T}$is_linux" >&6
- if test $is_linux = "yes"; then
- RPLAY_TARGET="oss"
- fi
- fi
-
- if test -z "$RPLAY_TARGET"; then
--echo $ac_n "checking for hpux""... $ac_c" 1>&6
--echo "configure:2505: checking for hpux" >&5
--cat > conftest.$ac_ext <<EOF
--#line 2507 "configure"
--#include "confdefs.h"
-+echo "$as_me:$LINENO: checking for hpux" >&5
-+echo $ECHO_N "checking for hpux... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #ifdef __hpux
- yes
- #endif
-
--EOF
-+_ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- egrep "yes" >/dev/null 2>&1; then
-- rm -rf conftest*
-+ $EGREP "yes" >/dev/null 2>&1; then
- is_hpux=yes
- else
-- rm -rf conftest*
- is_hpux=no
- fi
- rm -f conftest*
-
--echo "$ac_t""$is_hpux" 1>&6
-+echo "$as_me:$LINENO: result: $is_hpux" >&5
-+echo "${ECHO_T}$is_hpux" >&6
- if test $is_hpux = "yes"; then
- RPLAY_TARGET="hpux"
- fi
- fi
-
- if test -z "$RPLAY_TARGET"; then
--echo $ac_n "checking for sgi""... $ac_c" 1>&6
--echo "configure:2533: checking for sgi" >&5
--cat > conftest.$ac_ext <<EOF
--#line 2535 "configure"
--#include "confdefs.h"
-+echo "$as_me:$LINENO: checking for sgi" >&5
-+echo $ECHO_N "checking for sgi... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #ifdef sgi
- yes
- #endif
-
--EOF
-+_ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- egrep "yes" >/dev/null 2>&1; then
-- rm -rf conftest*
-+ $EGREP "yes" >/dev/null 2>&1; then
- is_sgi=yes
- else
-- rm -rf conftest*
- is_sgi=no
- fi
- rm -f conftest*
-
--echo "$ac_t""$is_sgi" 1>&6
-+echo "$as_me:$LINENO: result: $is_sgi" >&5
-+echo "${ECHO_T}$is_sgi" >&6
- if test $is_sgi = "yes"; then
- RPLAY_TARGET="sgi"
-- echo $ac_n "checking for multimedia development kit""... $ac_c" 1>&6
--echo "configure:2557: checking for multimedia development kit" >&5
-- for ac_hdr in audio.h
--do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2562: checking for $ac_hdr" >&5
--if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 2567 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2572: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
-- rm -rf conftest*
-- eval "ac_cv_header_$ac_safe=yes"
--else
-- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_header_$ac_safe=no"
--fi
--rm -f conftest*
-+ echo "$as_me:$LINENO: checking for multimedia development kit" >&5
-+echo $ECHO_N "checking for multimedia development kit... $ECHO_C" >&6
-+
-+for ac_header in audio.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <$ac_header>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
- fi
--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-- cat >> confdefs.h <<EOF
--#define $ac_tr_hdr 1
--EOF
--
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
- fi
-+
- done
-
- if test $ac_cv_header_audio_h = "no"; then
-@@ -2603,28 +6006,30 @@ fi
- fi
-
- if test -z "$RPLAY_TARGET"; then
--echo $ac_n "checking for FreeBSD""... $ac_c" 1>&6
--echo "configure:2608: checking for FreeBSD" >&5
--cat > conftest.$ac_ext <<EOF
--#line 2610 "configure"
--#include "confdefs.h"
-+echo "$as_me:$LINENO: checking for FreeBSD" >&5
-+echo $ECHO_N "checking for FreeBSD... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- yes
- #endif
-
--EOF
-+_ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- egrep "yes" >/dev/null 2>&1; then
-- rm -rf conftest*
-+ $EGREP "yes" >/dev/null 2>&1; then
- is_freebsd=yes
- else
-- rm -rf conftest*
- is_freebsd=no
- fi
- rm -f conftest*
-
--echo "$ac_t""$is_freebsd" 1>&6
-+echo "$as_me:$LINENO: result: $is_freebsd" >&5
-+echo "${ECHO_T}$is_freebsd" >&6
- if test $is_freebsd = "yes"; then
- RPLAY_TARGET="FreeBSD"
- fi
-@@ -2632,6 +6037,37 @@ fi
-
-
- if test -z "$RPLAY_TARGET"; then
-+echo "$as_me:$LINENO: checking for NetBSD" >&5
-+echo $ECHO_N "checking for NetBSD... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#ifdef __NetBSD__
-+ yes
-+#endif
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "yes" >/dev/null 2>&1; then
-+ is_netbsd=yes
-+else
-+ is_netbsd=no
-+fi
-+rm -f conftest*
-+
-+echo "$as_me:$LINENO: result: $is_netbsd" >&5
-+echo "${ECHO_T}$is_netbsd" >&6
-+if test $is_netbsd = "yes"; then
-+ RPLAY_TARGET="NetBSD"
-+fi
-+fi
-+
-+
-+if test -z "$RPLAY_TARGET"; then
- echo 'Sorry, I could not figure out what type of system you have.'
- echo -n 'Would you like to try the generic configuration? '
- read ans
-@@ -2644,12 +6080,20 @@ fi
- echo "using $RPLAY_TARGET configuration"
-
-
-+ac_sources="rplayd/audio/audio_${RPLAY_TARGET}.c rplayd/audio/audio_${RPLAY_TARGET}.h"
-+ac_dests="rplayd/audio.c rplayd/audio.h"
-+while test -n "$ac_sources"; do
-+ set $ac_dests; ac_dest=$1; shift; ac_dests=$*
-+ set $ac_sources; ac_source=$1; shift; ac_sources=$*
-+ ac_config_links_1="$ac_config_links_1 $ac_dest:$ac_source"
-+done
-+ ac_config_links="$ac_config_links $ac_config_links_1"
-
-
- if test $RPLAY_TARGET = "solaris"; then
-- cat >> confdefs.h <<\EOF
-+ cat >>confdefs.h <<\_ACEOF
- #define SVR4 1
--EOF
-+_ACEOF
-
- fi
-
-@@ -2662,7 +6106,9 @@ fi
- BUILD_TARGETS="include lib adpcm"
- if test "$HAVE_RX" != "yes"; then
- BUILD_TARGETS="$BUILD_TARGETS rx"
-- subdirs="rx"
-+
-+
-+subdirs="$subdirs rx"
-
- fi
- if test "$HAVE_GSM" != "yes"; then
-@@ -2677,427 +6123,1299 @@ fi
-
-
-
--trap '' 1 2 15
--cat > confcache <<\EOF
-+ ac_config_files="$ac_config_files Makefile.config Makefile include/Makefile lib/Makefile adpcm/Makefile gsm/Makefile librplay/Makefile rplayd/Makefile rplay/Makefile rptp/Makefile doc/Makefile devrplay/Makefile"
-+cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
--# scripts and configure runs. It is not useful on other systems.
--# If it contains results you don't want to keep, you may remove or edit it.
-+# scripts and configure runs, see configure's option --config-cache.
-+# It is not useful on other systems. If it contains results you don't
-+# want to keep, you may remove or edit it.
- #
--# By default, configure uses ./config.cache as the cache file,
--# creating it if it does not exist already. You can give configure
--# the --cache-file=FILE option to use a different cache file; that is
--# what configure does when it calls configure scripts in
--# subdirectories, so they share the cache.
--# Giving --cache-file=/dev/null disables caching, for debugging configure.
--# config.status only pays attention to the cache file if you give it the
--# --recheck option to rerun configure.
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
- #
--EOF
-+# `ac_cv_env_foo' variables (set or unset) will be overridden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
-+
-+_ACEOF
-+
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
- # So, don't put newlines in cache variables' values.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--(set) 2>&1 |
-- case `(ac_space=' '; set | grep ac_space) 2>&1` in
-- *ac_space=\ *)
-- # `set' does not quote correctly, so add quotes (double-quote substitution
-- # turns \\\\ into \\, and sed turns \\ into \).
-- sed -n \
-- -e "s/'/'\\\\''/g" \
-- -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-- ;;
-- *)
-- # `set' quotes correctly as required by POSIX, so do not add quotes.
-- sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-- ;;
-- esac >> confcache
--if cmp -s $cache_file confcache; then
-- :
--else
-+{
-+ (set) 2>&1 |
-+ case `(ac_space=' '; set | grep ac_space) 2>&1` in
-+ *ac_space=\ *)
-+ # `set' does not quote correctly, so add quotes (double-quote
-+ # substitution turns \\\\ into \\, and sed turns \\ into \).
-+ sed -n \
-+ "s/'/'\\\\''/g;
-+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-+ ;;
-+ *)
-+ # `set' quotes correctly as required by POSIX, so do not add quotes.
-+ sed -n \
-+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+ ;;
-+ esac;
-+} |
-+ sed '
-+ t clear
-+ : clear
-+ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-+ t end
-+ /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+ : end' >>confcache
-+if diff $cache_file confcache >/dev/null 2>&1; then :; else
- if test -w $cache_file; then
-- echo "updating cache $cache_file"
-- cat confcache > $cache_file
-+ test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+ cat confcache >$cache_file
- else
- echo "not updating unwritable cache $cache_file"
- fi
- fi
- rm -f confcache
-
--trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
--
- test "x$prefix" = xNONE && prefix=$ac_default_prefix
- # Let make expand exec_prefix.
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
--# Any assignment to VPATH causes Sun make to only execute
--# the first set of double-colon rules, so remove it if not needed.
--# If there is a colon in the path, we need to keep it.
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-+# trailing colons and then remove the whole line if VPATH becomes empty
-+# (actually we leave an empty line to preserve line numbers).
- if test "x$srcdir" = x.; then
-- ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d'
-+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
-+s/:*\$(srcdir):*/:/;
-+s/:*\${srcdir}:*/:/;
-+s/:*@srcdir@:*/:/;
-+s/^\([^=]*=[ ]*\):*/\1/;
-+s/:*$//;
-+s/^[^=]*=[ ]*$//;
-+}'
- fi
-
--trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
--
- DEFS=-DHAVE_CONFIG_H
-
--# Without the "./", some shells look in PATH for config.status.
--: ${CONFIG_STATUS=./config.status}
-+ac_libobjs=
-+ac_ltlibobjs=
-+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-+ # 1. Remove the extension, and $U if already installed.
-+ ac_i=`echo "$ac_i" |
-+ sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-+ # 2. Add them.
-+ ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-+ ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-+done
-+LIBOBJS=$ac_libobjs
-
--echo creating $CONFIG_STATUS
--rm -f $CONFIG_STATUS
--cat > $CONFIG_STATUS <<EOF
--#! /bin/sh
--# Generated automatically by configure.
-+LTLIBOBJS=$ac_ltlibobjs
-+
-+
-+
-+: ${CONFIG_STATUS=./config.status}
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-+echo "$as_me: creating $CONFIG_STATUS" >&6;}
-+cat >$CONFIG_STATUS <<_ACEOF
-+#! $SHELL
-+# Generated by $as_me.
- # Run this file to recreate the current configuration.
--# This directory was configured as follows,
--# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
--#
--# $0 $ac_configure_args
--#
- # Compiler output produced by configure, useful for debugging
--# configure, is in ./config.log if it exists.
-+# configure, is in config.log if it exists.
-
--ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
--for ac_option
-+debug=false
-+ac_cs_recheck=false
-+ac_cs_silent=false
-+SHELL=\${CONFIG_SHELL-$SHELL}
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+## --------------------- ##
-+## M4sh Initialization. ##
-+## --------------------- ##
-+
-+# Be Bourne compatible
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '${1+"$@"}'='"$@"'
-+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-+ set -o posix
-+fi
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
-+# Support unset when possible.
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+ as_unset=unset
-+else
-+ as_unset=false
-+fi
-+
-+
-+# Work around bugs in pre-3.0 UWIN ksh.
-+$as_unset ENV MAIL MAILPATH
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
-+do
-+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ eval $as_var=C; export $as_var
-+ else
-+ $as_unset $as_var
-+ fi
-+done
-+
-+# Required to use basename.
-+if expr a : '\(a\)' >/dev/null 2>&1; then
-+ as_expr=expr
-+else
-+ as_expr=false
-+fi
-+
-+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+ as_basename=basename
-+else
-+ as_basename=false
-+fi
-+
-+
-+# Name of the executable.
-+as_me=`$as_basename "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+ X"$0" : 'X\(//\)$' \| \
-+ X"$0" : 'X\(/\)$' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X/"$0" |
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-+ /^X\/\(\/\/\)$/{ s//\1/; q; }
-+ /^X\/\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+
-+
-+# PATH needs CR, and LINENO needs CR and PATH.
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+ PATH_SEPARATOR=';'
-+ else
-+ PATH_SEPARATOR=:
-+ fi
-+ rm -f conf$$.sh
-+fi
-+
-+
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x$as_lineno_3" = "x$as_lineno_2" || {
-+ # Find who we are. Look in the path if we contain no path at all
-+ # relative or not.
-+ case $0 in
-+ *[\\/]* ) as_myself=$0 ;;
-+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+
-+ ;;
-+ esac
-+ # We did not find ourselves, most probably we were run as `sh COMMAND'
-+ # in which case we are not to be found in the path.
-+ if test "x$as_myself" = x; then
-+ as_myself=$0
-+ fi
-+ if test ! -f "$as_myself"; then
-+ { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-+echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+ case $CONFIG_SHELL in
-+ '')
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for as_base in sh bash ksh sh5; do
-+ case $as_dir in
-+ /*)
-+ if ("$as_dir/$as_base" -c '
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
-+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-+ CONFIG_SHELL=$as_dir/$as_base
-+ export CONFIG_SHELL
-+ exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-+ fi;;
-+ esac
-+ done
-+done
-+;;
-+ esac
-+
-+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-+ # uniformly replaced by the line number. The first 'sed' inserts a
-+ # line-number line before each line; the second 'sed' does the real
-+ # work. The second script uses 'N' to pair each line-number line
-+ # with the numbered line, and appends trailing '-' during
-+ # substitution so that $LINENO is not a special case at line end.
-+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-+ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
-+ sed '=' <$as_myself |
-+ sed '
-+ N
-+ s,$,-,
-+ : loop
-+ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+ t loop
-+ s,-$,,
-+ s,^['$as_cr_digits']*\n,,
-+ ' >$as_me.lineno &&
-+ chmod +x $as_me.lineno ||
-+ { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-+echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+ # Don't try to exec as it changes $[0], causing all sort of problems
-+ # (the dirname of $[0] is not the place where we might find the
-+ # original and so on. Autoconf is especially sensible to this).
-+ . ./$as_me.lineno
-+ # Exit status is that of the last command.
-+ exit
-+}
-+
-+
-+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-+ *c*,-n*) ECHO_N= ECHO_C='
-+' ECHO_T=' ' ;;
-+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-+ *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+esac
-+
-+if expr a : '\(a\)' >/dev/null 2>&1; then
-+ as_expr=expr
-+else
-+ as_expr=false
-+fi
-+
-+rm -f conf$$ conf$$.exe conf$$.file
-+echo >conf$$.file
-+if ln -s conf$$.file conf$$ 2>/dev/null; then
-+ # We could just check for DJGPP; but this test a) works b) is more generic
-+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-+ if test -f conf$$.exe; then
-+ # Don't use ln at all; we don't have any links
-+ as_ln_s='cp -p'
-+ else
-+ as_ln_s='ln -s'
-+ fi
-+elif ln conf$$.file conf$$ 2>/dev/null; then
-+ as_ln_s=ln
-+else
-+ as_ln_s='cp -p'
-+fi
-+rm -f conf$$ conf$$.exe conf$$.file
-+
-+if mkdir -p . 2>/dev/null; then
-+ as_mkdir_p=:
-+else
-+ test -d ./-p && rmdir ./-p
-+ as_mkdir_p=false
-+fi
-+
-+as_executable_p="test -f"
-+
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-+
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order.
-+as_nl='
-+'
-+IFS=" $as_nl"
-+
-+# CDPATH.
-+$as_unset CDPATH
-+
-+exec 6>&1
-+
-+# Open the log real soon, to keep \$[0] and so on meaningful, and to
-+# report actual input values of CONFIG_FILES etc. instead of their
-+# values after options handling. Logging --version etc. is OK.
-+exec 5>>config.log
-+{
-+ echo
-+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-+## Running $as_me. ##
-+_ASBOX
-+} >&5
-+cat >&5 <<_CSEOF
-+
-+This file was extended by $as_me, which was
-+generated by GNU Autoconf 2.59. Invocation command line was
-+
-+ CONFIG_FILES = $CONFIG_FILES
-+ CONFIG_HEADERS = $CONFIG_HEADERS
-+ CONFIG_LINKS = $CONFIG_LINKS
-+ CONFIG_COMMANDS = $CONFIG_COMMANDS
-+ $ $0 $@
-+
-+_CSEOF
-+echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-+echo >&5
-+_ACEOF
-+
-+# Files that config.status was made for.
-+if test -n "$ac_config_files"; then
-+ echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-+fi
-+
-+if test -n "$ac_config_headers"; then
-+ echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-+fi
-+
-+if test -n "$ac_config_links"; then
-+ echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-+fi
-+
-+if test -n "$ac_config_commands"; then
-+ echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-+fi
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+ac_cs_usage="\
-+\`$as_me' instantiates files from templates according to the
-+current configuration.
-+
-+Usage: $0 [OPTIONS] [FILE]...
-+
-+ -h, --help print this help, then exit
-+ -V, --version print version number, then exit
-+ -q, --quiet do not print progress messages
-+ -d, --debug don't remove temporary files
-+ --recheck update $as_me by reconfiguring in the same conditions
-+ --file=FILE[:TEMPLATE]
-+ instantiate the configuration file FILE
-+ --header=FILE[:TEMPLATE]
-+ instantiate the configuration header FILE
-+
-+Configuration files:
-+$config_files
-+
-+Configuration headers:
-+$config_headers
-+
-+Configuration links:
-+$config_links
-+
-+Report bugs to <bug-autoconf@gnu.org>."
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+ac_cs_version="\\
-+config.status
-+configured by $0, generated by GNU Autoconf 2.59,
-+ with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+
-+Copyright (C) 2003 Free Software Foundation, Inc.
-+This config.status script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it."
-+srcdir=$srcdir
-+INSTALL="$INSTALL"
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If no file are specified by the user, then we need to provide default
-+# value. By we need to know if files were specified by the user.
-+ac_need_defaults=:
-+while test $# != 0
- do
-- case "\$ac_option" in
-+ case $1 in
-+ --*=*)
-+ ac_option=`expr "x$1" : 'x\([^=]*\)='`
-+ ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-+ ac_shift=:
-+ ;;
-+ -*)
-+ ac_option=$1
-+ ac_optarg=$2
-+ ac_shift=shift
-+ ;;
-+ *) # This is not an option, so the user has probably given explicit
-+ # arguments.
-+ ac_option=$1
-+ ac_need_defaults=false;;
-+ esac
-+
-+ case $ac_option in
-+ # Handling of the options.
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-- exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-- -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-- echo "$CONFIG_STATUS generated by autoconf version 2.13"
-- exit 0 ;;
-- -help | --help | --hel | --he | --h)
-- echo "\$ac_cs_usage"; exit 0 ;;
-- *) echo "\$ac_cs_usage"; exit 1 ;;
-+ ac_cs_recheck=: ;;
-+ --version | --vers* | -V )
-+ echo "$ac_cs_version"; exit 0 ;;
-+ --he | --h)
-+ # Conflict between --help and --header
-+ { { echo "$as_me:$LINENO: error: ambiguous option: $1
-+Try \`$0 --help' for more information." >&5
-+echo "$as_me: error: ambiguous option: $1
-+Try \`$0 --help' for more information." >&2;}
-+ { (exit 1); exit 1; }; };;
-+ --help | --hel | -h )
-+ echo "$ac_cs_usage"; exit 0 ;;
-+ --debug | --d* | -d )
-+ debug=: ;;
-+ --file | --fil | --fi | --f )
-+ $ac_shift
-+ CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-+ ac_need_defaults=false;;
-+ --header | --heade | --head | --hea )
-+ $ac_shift
-+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-+ ac_need_defaults=false;;
-+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+ | -silent | --silent | --silen | --sile | --sil | --si | --s)
-+ ac_cs_silent=: ;;
-+
-+ # This is an error.
-+ -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-+Try \`$0 --help' for more information." >&5
-+echo "$as_me: error: unrecognized option: $1
-+Try \`$0 --help' for more information." >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+
-+ *) ac_config_targets="$ac_config_targets $1" ;;
-+
- esac
-+ shift
- done
-
--ac_given_srcdir=$srcdir
--ac_given_INSTALL="$INSTALL"
-+ac_configure_extra_args=
-
--trap 'rm -fr `echo "Makefile.config Makefile include/Makefile lib/Makefile adpcm/Makefile gsm/Makefile librplay/Makefile rplayd/Makefile rplay/Makefile rptp/Makefile doc/Makefile devrplay/Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
--EOF
--cat >> $CONFIG_STATUS <<EOF
--
--# Protect against being on the right side of a sed subst in config.status.
--sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
-- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
--$ac_vpsub
--$extrasub
--s%@SHELL@%$SHELL%g
--s%@CFLAGS@%$CFLAGS%g
--s%@CPPFLAGS@%$CPPFLAGS%g
--s%@CXXFLAGS@%$CXXFLAGS%g
--s%@FFLAGS@%$FFLAGS%g
--s%@DEFS@%$DEFS%g
--s%@LDFLAGS@%$LDFLAGS%g
--s%@LIBS@%$LIBS%g
--s%@exec_prefix@%$exec_prefix%g
--s%@prefix@%$prefix%g
--s%@program_transform_name@%$program_transform_name%g
--s%@bindir@%$bindir%g
--s%@sbindir@%$sbindir%g
--s%@libexecdir@%$libexecdir%g
--s%@datadir@%$datadir%g
--s%@sysconfdir@%$sysconfdir%g
--s%@sharedstatedir@%$sharedstatedir%g
--s%@localstatedir@%$localstatedir%g
--s%@libdir@%$libdir%g
--s%@includedir@%$includedir%g
--s%@oldincludedir@%$oldincludedir%g
--s%@infodir@%$infodir%g
--s%@mandir@%$mandir%g
--s%@RPLAY_VERSION@%$RPLAY_VERSION%g
--s%@CC@%$CC%g
--s%@CPP@%$CPP%g
--s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
--s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
--s%@INSTALL_DATA@%$INSTALL_DATA%g
--s%@LN_S@%$LN_S%g
--s%@RANLIB@%$RANLIB%g
--s%@ETAGS@%$ETAGS%g
--s%@MAKEDEPEND@%$MAKEDEPEND%g
--s%@MAKEINFO@%$MAKEINFO%g
--s%@TEXI2DVI@%$TEXI2DVI%g
--s%@TEXI2HTML@%$TEXI2HTML%g
--s%@DVIPS@%$DVIPS%g
--s%@LIBOBJS@%$LIBOBJS%g
--s%@RL_LIBS@%$RL_LIBS%g
--s%@GSM_LIBS@%$GSM_LIBS%g
--s%@GSM_INCS@%$GSM_INCS%g
--s%@RX_LIBS@%$RX_LIBS%g
--s%@RX_INCS@%$RX_INCS%g
--s%@RPLAY_TOP@%$RPLAY_TOP%g
--s%@RPLAY_TARGET@%$RPLAY_TARGET%g
--s%@subdirs@%$subdirs%g
--s%@BUILD_TARGETS@%$BUILD_TARGETS%g
-+if $ac_cs_silent; then
-+ exec 6>/dev/null
-+ ac_configure_extra_args="$ac_configure_extra_args --silent"
-+fi
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+if \$ac_cs_recheck; then
-+ echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+ exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+fi
-+
-+_ACEOF
-+
-+
-+
-+
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+for ac_config_target in $ac_config_targets
-+do
-+ case "$ac_config_target" in
-+ # Handling of arguments.
-+ "Makefile.config" ) CONFIG_FILES="$CONFIG_FILES Makefile.config" ;;
-+ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+ "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
-+ "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
-+ "adpcm/Makefile" ) CONFIG_FILES="$CONFIG_FILES adpcm/Makefile" ;;
-+ "gsm/Makefile" ) CONFIG_FILES="$CONFIG_FILES gsm/Makefile" ;;
-+ "librplay/Makefile" ) CONFIG_FILES="$CONFIG_FILES librplay/Makefile" ;;
-+ "rplayd/Makefile" ) CONFIG_FILES="$CONFIG_FILES rplayd/Makefile" ;;
-+ "rplay/Makefile" ) CONFIG_FILES="$CONFIG_FILES rplay/Makefile" ;;
-+ "rptp/Makefile" ) CONFIG_FILES="$CONFIG_FILES rptp/Makefile" ;;
-+ "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-+ "devrplay/Makefile" ) CONFIG_FILES="$CONFIG_FILES devrplay/Makefile" ;;
-+ "$ac_config_links_1" ) CONFIG_LINKS="$CONFIG_LINKS $ac_config_links_1" ;;
-+ "include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;;
-+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-+ { (exit 1); exit 1; }; };;
-+ esac
-+done
-+
-+# If the user did not use the arguments to specify the items to instantiate,
-+# then the envvar interface is used. Set only those that are not.
-+# We use the long form for the default assignment because of an extremely
-+# bizarre bug on SunOS 4.1.3.
-+if $ac_need_defaults; then
-+ test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-+ test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-+ test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links
-+fi
-+
-+# Have a temporary directory for convenience. Make it in the build tree
-+# simply because there is no reason to put it here, and in addition,
-+# creating and moving files from /tmp can sometimes cause problems.
-+# Create a temporary directory, and hook for its removal unless debugging.
-+$debug ||
-+{
-+ trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-+ trap '{ (exit 1); exit 1; }' 1 2 13 15
-+}
-+
-+# Create a (secure) tmp directory for tmp files.
-+
-+{
-+ tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-+ test -n "$tmp" && test -d "$tmp"
-+} ||
-+{
-+ tmp=./confstat$$-$RANDOM
-+ (umask 077 && mkdir $tmp)
-+} ||
-+{
-+ echo "$me: cannot create a temporary directory in ." >&2
-+ { (exit 1); exit 1; }
-+}
-
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+
-+#
-+# CONFIG_FILES section.
-+#
-+
-+# No need to generate the scripts if there are no CONFIG_FILES.
-+# This happens for instance when ./config.status config.h
-+if test -n "\$CONFIG_FILES"; then
-+ # Protect against being on the right side of a sed subst in config.status.
-+ sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-+ s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-+s,@SHELL@,$SHELL,;t t
-+s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-+s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-+s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-+s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-+s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-+s,@exec_prefix@,$exec_prefix,;t t
-+s,@prefix@,$prefix,;t t
-+s,@program_transform_name@,$program_transform_name,;t t
-+s,@bindir@,$bindir,;t t
-+s,@sbindir@,$sbindir,;t t
-+s,@libexecdir@,$libexecdir,;t t
-+s,@datadir@,$datadir,;t t
-+s,@sysconfdir@,$sysconfdir,;t t
-+s,@sharedstatedir@,$sharedstatedir,;t t
-+s,@localstatedir@,$localstatedir,;t t
-+s,@libdir@,$libdir,;t t
-+s,@includedir@,$includedir,;t t
-+s,@oldincludedir@,$oldincludedir,;t t
-+s,@infodir@,$infodir,;t t
-+s,@mandir@,$mandir,;t t
-+s,@build_alias@,$build_alias,;t t
-+s,@host_alias@,$host_alias,;t t
-+s,@target_alias@,$target_alias,;t t
-+s,@DEFS@,$DEFS,;t t
-+s,@ECHO_C@,$ECHO_C,;t t
-+s,@ECHO_N@,$ECHO_N,;t t
-+s,@ECHO_T@,$ECHO_T,;t t
-+s,@LIBS@,$LIBS,;t t
-+s,@RPLAY_VERSION@,$RPLAY_VERSION,;t t
-+s,@CC@,$CC,;t t
-+s,@CFLAGS@,$CFLAGS,;t t
-+s,@LDFLAGS@,$LDFLAGS,;t t
-+s,@CPPFLAGS@,$CPPFLAGS,;t t
-+s,@ac_ct_CC@,$ac_ct_CC,;t t
-+s,@EXEEXT@,$EXEEXT,;t t
-+s,@OBJEXT@,$OBJEXT,;t t
-+s,@CPP@,$CPP,;t t
-+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-+s,@LN_S@,$LN_S,;t t
-+s,@RANLIB@,$RANLIB,;t t
-+s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-+s,@ETAGS@,$ETAGS,;t t
-+s,@MAKEDEPEND@,$MAKEDEPEND,;t t
-+s,@MAKEINFO@,$MAKEINFO,;t t
-+s,@TEXI2DVI@,$TEXI2DVI,;t t
-+s,@TEXI2HTML@,$TEXI2HTML,;t t
-+s,@DVIPS@,$DVIPS,;t t
-+s,@EGREP@,$EGREP,;t t
-+s,@LIBOBJS@,$LIBOBJS,;t t
-+s,@RL_LIBS@,$RL_LIBS,;t t
-+s,@GSM_LIBS@,$GSM_LIBS,;t t
-+s,@GSM_INCS@,$GSM_INCS,;t t
-+s,@RX_LIBS@,$RX_LIBS,;t t
-+s,@RX_INCS@,$RX_INCS,;t t
-+s,@RPLAY_TOP@,$RPLAY_TOP,;t t
-+s,@RPLAY_TARGET@,$RPLAY_TARGET,;t t
-+s,@subdirs@,$subdirs,;t t
-+s,@BUILD_TARGETS@,$BUILD_TARGETS,;t t
-+s,@LTLIBOBJS@,$LTLIBOBJS,;t t
- CEOF
--EOF
-
--cat >> $CONFIG_STATUS <<\EOF
-+_ACEOF
-
--# Split the substitutions into bite-sized pieces for seds with
--# small command number limits, like on Digital OSF/1 and HP-UX.
--ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
--ac_file=1 # Number of current file.
--ac_beg=1 # First line for current file.
--ac_end=$ac_max_sed_cmds # Line after last line for current file.
--ac_more_lines=:
--ac_sed_cmds=""
--while $ac_more_lines; do
-- if test $ac_beg -gt 1; then
-- sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-- else
-- sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-- fi
-- if test ! -s conftest.s$ac_file; then
-- ac_more_lines=false
-- rm -f conftest.s$ac_file
-- else
-- if test -z "$ac_sed_cmds"; then
-- ac_sed_cmds="sed -f conftest.s$ac_file"
-+ cat >>$CONFIG_STATUS <<\_ACEOF
-+ # Split the substitutions into bite-sized pieces for seds with
-+ # small command number limits, like on Digital OSF/1 and HP-UX.
-+ ac_max_sed_lines=48
-+ ac_sed_frag=1 # Number of current file.
-+ ac_beg=1 # First line for current file.
-+ ac_end=$ac_max_sed_lines # Line after last line for current file.
-+ ac_more_lines=:
-+ ac_sed_cmds=
-+ while $ac_more_lines; do
-+ if test $ac_beg -gt 1; then
-+ sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-+ else
-+ sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-+ fi
-+ if test ! -s $tmp/subs.frag; then
-+ ac_more_lines=false
- else
-- ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-+ # The purpose of the label and of the branching condition is to
-+ # speed up the sed processing (if there are no `@' at all, there
-+ # is no need to browse any of the substitutions).
-+ # These are the two extra sed commands mentioned above.
-+ (echo ':t
-+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-+ if test -z "$ac_sed_cmds"; then
-+ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-+ else
-+ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-+ fi
-+ ac_sed_frag=`expr $ac_sed_frag + 1`
-+ ac_beg=$ac_end
-+ ac_end=`expr $ac_end + $ac_max_sed_lines`
- fi
-- ac_file=`expr $ac_file + 1`
-- ac_beg=$ac_end
-- ac_end=`expr $ac_end + $ac_max_sed_cmds`
-+ done
-+ if test -z "$ac_sed_cmds"; then
-+ ac_sed_cmds=cat
- fi
--done
--if test -z "$ac_sed_cmds"; then
-- ac_sed_cmds=cat
--fi
--EOF
--
--cat >> $CONFIG_STATUS <<EOF
-+fi # test -n "$CONFIG_FILES"
-
--CONFIG_FILES=\${CONFIG_FILES-"Makefile.config Makefile include/Makefile lib/Makefile adpcm/Makefile gsm/Makefile librplay/Makefile rplayd/Makefile rplay/Makefile rptp/Makefile doc/Makefile devrplay/Makefile"}
--EOF
--cat >> $CONFIG_STATUS <<\EOF
--for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-- case "$ac_file" in
-- *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-- ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-- *) ac_file_in="${ac_file}.in" ;;
-+ case $ac_file in
-+ - | *:- | *:-:* ) # input from stdin
-+ cat >$tmp/stdin
-+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+ *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+ * ) ac_file_in=$ac_file.in ;;
- esac
-
-- # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
--
-- # Remove last slash and all that follows it. Not all systems have dirname.
-- ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-- # The file is in a subdirectory.
-- test ! -d "$ac_dir" && mkdir "$ac_dir"
-- ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-- # A "../" for each directory in $ac_dir_suffix.
-- ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-- else
-- ac_dir_suffix= ac_dots=
-- fi
--
-- case "$ac_given_srcdir" in
-- .) srcdir=.
-- if test -z "$ac_dots"; then top_srcdir=.
-- else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-- /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-+ # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-+ ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$ac_file" : 'X\(//\)[^/]' \| \
-+ X"$ac_file" : 'X\(//\)$' \| \
-+ X"$ac_file" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$ac_file" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+ { if $as_mkdir_p; then
-+ mkdir -p "$ac_dir"
-+ else
-+ as_dir="$ac_dir"
-+ as_dirs=
-+ while test ! -d "$as_dir"; do
-+ as_dirs="$as_dir $as_dirs"
-+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$as_dir" : 'X\(//\)[^/]' \| \
-+ X"$as_dir" : 'X\(//\)$' \| \
-+ X"$as_dir" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$as_dir" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+ done
-+ test ! -n "$as_dirs" || mkdir $as_dirs
-+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+ { (exit 1); exit 1; }; }; }
-+
-+ ac_builddir=.
-+
-+if test "$ac_dir" != .; then
-+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+ # A "../" for each directory in $ac_dir_suffix.
-+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-+else
-+ ac_dir_suffix= ac_top_builddir=
-+fi
-+
-+case $srcdir in
-+ .) # No --srcdir option. We are building in place.
-+ ac_srcdir=.
-+ if test -z "$ac_top_builddir"; then
-+ ac_top_srcdir=.
-+ else
-+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-+ fi ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute path.
-+ ac_srcdir=$srcdir$ac_dir_suffix;
-+ ac_top_srcdir=$srcdir ;;
- *) # Relative path.
-- srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-- top_srcdir="$ac_dots$ac_given_srcdir" ;;
-+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+esac
-+
-+# Do not use `cd foo && pwd` to compute absolute paths, because
-+# the directories may not exist.
-+case `pwd` in
-+.) ac_abs_builddir="$ac_dir";;
-+*)
-+ case "$ac_dir" in
-+ .) ac_abs_builddir=`pwd`;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_builddir=${ac_top_builddir}.;;
-+*)
-+ case ${ac_top_builddir}. in
-+ .) ac_abs_top_builddir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_srcdir=$ac_srcdir;;
-+*)
-+ case $ac_srcdir in
-+ .) ac_abs_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_srcdir=$ac_top_srcdir;;
-+*)
-+ case $ac_top_srcdir in
-+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+ esac;;
-+esac
-+
-+
-+ case $INSTALL in
-+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-+ *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
- esac
-
-- case "$ac_given_INSTALL" in
-- [/$]*) INSTALL="$ac_given_INSTALL" ;;
-- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-- esac
-+ if test x"$ac_file" != x-; then
-+ { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+ rm -f "$ac_file"
-+ fi
-+ # Let's still pretend it is `configure' which instantiates (i.e., don't
-+ # use $as_me), people would be surprised to read:
-+ # /* config.h. Generated by config.status. */
-+ if test x"$ac_file" = x-; then
-+ configure_input=
-+ else
-+ configure_input="$ac_file. "
-+ fi
-+ configure_input=$configure_input"Generated from `echo $ac_file_in |
-+ sed 's,.*/,,'` by configure."
-
-- echo creating "$ac_file"
-- rm -f "$ac_file"
-- configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-- case "$ac_file" in
-- *Makefile*) ac_comsub="1i\\
--# $configure_input" ;;
-- *) ac_comsub= ;;
-- esac
-+ # First look for the input files in the build tree, otherwise in the
-+ # src tree.
-+ ac_file_inputs=`IFS=:
-+ for f in $ac_file_in; do
-+ case $f in
-+ -) echo $tmp/stdin ;;
-+ [\\/$]*)
-+ # Absolute (can't be DOS-style, as IFS=:)
-+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+echo "$as_me: error: cannot find input file: $f" >&2;}
-+ { (exit 1); exit 1; }; }
-+ echo "$f";;
-+ *) # Relative
-+ if test -f "$f"; then
-+ # Build tree
-+ echo "$f"
-+ elif test -f "$srcdir/$f"; then
-+ # Source tree
-+ echo "$srcdir/$f"
-+ else
-+ # /dev/null tree
-+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+echo "$as_me: error: cannot find input file: $f" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi;;
-+ esac
-+ done` || { (exit 1); exit 1; }
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+ sed "$ac_vpsub
-+$extrasub
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+:t
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+s,@configure_input@,$configure_input,;t t
-+s,@srcdir@,$ac_srcdir,;t t
-+s,@abs_srcdir@,$ac_abs_srcdir,;t t
-+s,@top_srcdir@,$ac_top_srcdir,;t t
-+s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-+s,@builddir@,$ac_builddir,;t t
-+s,@abs_builddir@,$ac_abs_builddir,;t t
-+s,@top_builddir@,$ac_top_builddir,;t t
-+s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-+s,@INSTALL@,$ac_INSTALL,;t t
-+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-+ rm -f $tmp/stdin
-+ if test x"$ac_file" != x-; then
-+ mv $tmp/out $ac_file
-+ else
-+ cat $tmp/out
-+ rm -f $tmp/out
-+ fi
-+
-+done
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-
-- ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-- sed -e "$ac_comsub
--s%@configure_input@%$configure_input%g
--s%@srcdir@%$srcdir%g
--s%@top_srcdir@%$top_srcdir%g
--s%@INSTALL@%$INSTALL%g
--" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
--fi; done
--rm -f conftest.s*
-+#
-+# CONFIG_HEADER section.
-+#
-
- # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
- # NAME is the cpp macro being defined and VALUE is the value it is being given.
- #
- # ac_d sets the value in "#define NAME VALUE" lines.
--ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)'
--ac_dB='\([ ][ ]*\)[^ ]*%\1#\2'
--ac_dC='\3'
--ac_dD='%g'
--# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
--ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
--ac_uB='\([ ]\)%\1#\2define\3'
-+ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
-+ac_dB='[ ].*$,\1#\2'
-+ac_dC=' '
-+ac_dD=',;t'
-+# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-+ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
-+ac_uB='$,\1#\2define\3'
- ac_uC=' '
--ac_uD='\4%g'
--# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
--ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
--ac_eB='$%\1#\2define\3'
--ac_eC=' '
--ac_eD='%g'
--
--if test "${CONFIG_HEADERS+set}" != set; then
--EOF
--cat >> $CONFIG_STATUS <<EOF
-- CONFIG_HEADERS="include/config.h"
--EOF
--cat >> $CONFIG_STATUS <<\EOF
--fi
--for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
-+ac_uD=',;t'
-+
-+for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-- case "$ac_file" in
-- *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-- ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-- *) ac_file_in="${ac_file}.in" ;;
-+ case $ac_file in
-+ - | *:- | *:-:* ) # input from stdin
-+ cat >$tmp/stdin
-+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+ *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+ * ) ac_file_in=$ac_file.in ;;
- esac
-
-- echo creating $ac_file
-+ test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-
-- rm -f conftest.frag conftest.in conftest.out
-- ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-- cat $ac_file_inputs > conftest.in
--
--EOF
--
--# Transform confdefs.h into a sed script conftest.vals that substitutes
--# the proper values into config.h.in to produce config.h. And first:
--# Protect against being on the right side of a sed subst in config.status.
--# Protect against being in an unquoted here document in config.status.
--rm -f conftest.vals
--cat > conftest.hdr <<\EOF
--s/[\\&%]/\\&/g
--s%[\\$`]%\\&%g
--s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
--s%ac_d%ac_u%gp
--s%ac_u%ac_e%gp
--EOF
--sed -n -f conftest.hdr confdefs.h > conftest.vals
--rm -f conftest.hdr
-+ # First look for the input files in the build tree, otherwise in the
-+ # src tree.
-+ ac_file_inputs=`IFS=:
-+ for f in $ac_file_in; do
-+ case $f in
-+ -) echo $tmp/stdin ;;
-+ [\\/$]*)
-+ # Absolute (can't be DOS-style, as IFS=:)
-+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+echo "$as_me: error: cannot find input file: $f" >&2;}
-+ { (exit 1); exit 1; }; }
-+ # Do quote $f, to prevent DOS paths from being IFS'd.
-+ echo "$f";;
-+ *) # Relative
-+ if test -f "$f"; then
-+ # Build tree
-+ echo "$f"
-+ elif test -f "$srcdir/$f"; then
-+ # Source tree
-+ echo "$srcdir/$f"
-+ else
-+ # /dev/null tree
-+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+echo "$as_me: error: cannot find input file: $f" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi;;
-+ esac
-+ done` || { (exit 1); exit 1; }
-+ # Remove the trailing spaces.
-+ sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
-+
-+_ACEOF
-+
-+# Transform confdefs.h into two sed scripts, `conftest.defines' and
-+# `conftest.undefs', that substitutes the proper values into
-+# config.h.in to produce config.h. The first handles `#define'
-+# templates, and the second `#undef' templates.
-+# And first: Protect against being on the right side of a sed subst in
-+# config.status. Protect against being in an unquoted here document
-+# in config.status.
-+rm -f conftest.defines conftest.undefs
-+# Using a here document instead of a string reduces the quoting nightmare.
-+# Putting comments in sed scripts is not portable.
-+#
-+# `end' is used to avoid that the second main sed command (meant for
-+# 0-ary CPP macros) applies to n-ary macro definitions.
-+# See the Autoconf documentation for `clear'.
-+cat >confdef2sed.sed <<\_ACEOF
-+s/[\\&,]/\\&/g
-+s,[\\$`],\\&,g
-+t clear
-+: clear
-+s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-+t end
-+s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-+: end
-+_ACEOF
-+# If some macros were called several times there might be several times
-+# the same #defines, which is useless. Nevertheless, we may not want to
-+# sort them, since we want the *last* AC-DEFINE to be honored.
-+uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-+sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-+rm -f confdef2sed.sed
-
- # This sed command replaces #undef with comments. This is necessary, for
- # example, in the case of _POSIX_SOURCE, which is predefined and required
- # on some systems where configure will not decide to define it.
--cat >> conftest.vals <<\EOF
--s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
--EOF
--
--# Break up conftest.vals because some shells have a limit on
--# the size of here documents, and old seds have small limits too.
--
-+cat >>conftest.undefs <<\_ACEOF
-+s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-+_ACEOF
-+
-+# Break up conftest.defines because some shells have a limit on the size
-+# of here documents, and old seds have small limits too (100 cmds).
-+echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-+echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-+echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-+echo ' :' >>$CONFIG_STATUS
- rm -f conftest.tail
--while :
-+while grep . conftest.defines >/dev/null
- do
-- ac_lines=`grep -c . conftest.vals`
-- # grep -c gives empty output for an empty file on some AIX systems.
-- if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
-- # Write a limited-size here document to conftest.frag.
-- echo ' cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
-- sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
-+ # Write a limited-size here document to $tmp/defines.sed.
-+ echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-+ # Speed up: don't consider the non `#define' lines.
-+ echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
-+ # Work around the forget-to-reset-the-flag bug.
-+ echo 't clr' >>$CONFIG_STATUS
-+ echo ': clr' >>$CONFIG_STATUS
-+ sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
- echo 'CEOF
-- sed -f conftest.frag conftest.in > conftest.out
-- rm -f conftest.in
-- mv conftest.out conftest.in
--' >> $CONFIG_STATUS
-- sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
-- rm -f conftest.vals
-- mv conftest.tail conftest.vals
--done
--rm -f conftest.vals
--
--cat >> $CONFIG_STATUS <<\EOF
-- rm -f conftest.frag conftest.h
-- echo "/* $ac_file. Generated automatically by configure. */" > conftest.h
-- cat conftest.in >> conftest.h
-- rm -f conftest.in
-- if cmp -s $ac_file conftest.h 2>/dev/null; then
-- echo "$ac_file is unchanged"
-- rm -f conftest.h
-- else
-- # Remove last slash and all that follows it. Not all systems have dirname.
-- ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-- # The file is in a subdirectory.
-- test ! -d "$ac_dir" && mkdir "$ac_dir"
-- fi
-- rm -f $ac_file
-- mv conftest.h $ac_file
-+ sed -f $tmp/defines.sed $tmp/in >$tmp/out
-+ rm -f $tmp/in
-+ mv $tmp/out $tmp/in
-+' >>$CONFIG_STATUS
-+ sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
-+ rm -f conftest.defines
-+ mv conftest.tail conftest.defines
-+done
-+rm -f conftest.defines
-+echo ' fi # grep' >>$CONFIG_STATUS
-+echo >>$CONFIG_STATUS
-+
-+# Break up conftest.undefs because some shells have a limit on the size
-+# of here documents, and old seds have small limits too (100 cmds).
-+echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
-+rm -f conftest.tail
-+while grep . conftest.undefs >/dev/null
-+do
-+ # Write a limited-size here document to $tmp/undefs.sed.
-+ echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-+ # Speed up: don't consider the non `#undef'
-+ echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
-+ # Work around the forget-to-reset-the-flag bug.
-+ echo 't clr' >>$CONFIG_STATUS
-+ echo ': clr' >>$CONFIG_STATUS
-+ sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
-+ echo 'CEOF
-+ sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-+ rm -f $tmp/in
-+ mv $tmp/out $tmp/in
-+' >>$CONFIG_STATUS
-+ sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-+ rm -f conftest.undefs
-+ mv conftest.tail conftest.undefs
-+done
-+rm -f conftest.undefs
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+ # Let's still pretend it is `configure' which instantiates (i.e., don't
-+ # use $as_me), people would be surprised to read:
-+ # /* config.h. Generated by config.status. */
-+ if test x"$ac_file" = x-; then
-+ echo "/* Generated by configure. */" >$tmp/config.h
-+ else
-+ echo "/* $ac_file. Generated by configure. */" >$tmp/config.h
- fi
--fi; done
-+ cat $tmp/in >>$tmp/config.h
-+ rm -f $tmp/in
-+ if test x"$ac_file" != x-; then
-+ if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-+ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-+echo "$as_me: $ac_file is unchanged" >&6;}
-+ else
-+ ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$ac_file" : 'X\(//\)[^/]' \| \
-+ X"$ac_file" : 'X\(//\)$' \| \
-+ X"$ac_file" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$ac_file" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+ { if $as_mkdir_p; then
-+ mkdir -p "$ac_dir"
-+ else
-+ as_dir="$ac_dir"
-+ as_dirs=
-+ while test ! -d "$as_dir"; do
-+ as_dirs="$as_dir $as_dirs"
-+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$as_dir" : 'X\(//\)[^/]' \| \
-+ X"$as_dir" : 'X\(//\)$' \| \
-+ X"$as_dir" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$as_dir" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+ done
-+ test ! -n "$as_dirs" || mkdir $as_dirs
-+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+ { (exit 1); exit 1; }; }; }
-
--EOF
-+ rm -f $ac_file
-+ mv $tmp/config.h $ac_file
-+ fi
-+ else
-+ cat $tmp/config.h
-+ rm -f $tmp/config.h
-+ fi
-+done
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-
--cat >> $CONFIG_STATUS <<EOF
--ac_sources="rplayd/audio/audio_${RPLAY_TARGET}.c rplayd/audio/audio_${RPLAY_TARGET}.h"
--ac_dests="rplayd/audio.c rplayd/audio.h"
--EOF
-+#
-+# CONFIG_LINKS section.
-+#
-
--cat >> $CONFIG_STATUS <<\EOF
--srcdir=$ac_given_srcdir
--while test -n "$ac_sources"; do
-- set $ac_dests; ac_dest=$1; shift; ac_dests=$*
-- set $ac_sources; ac_source=$1; shift; ac_sources=$*
-+for ac_file in : $CONFIG_LINKS; do test "x$ac_file" = x: && continue
-+ ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-+ ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-
-- echo "linking $srcdir/$ac_source to $ac_dest"
-+ { echo "$as_me:$LINENO: linking $srcdir/$ac_source to $ac_dest" >&5
-+echo "$as_me: linking $srcdir/$ac_source to $ac_dest" >&6;}
-
- if test ! -r $srcdir/$ac_source; then
-- { echo "configure: error: $srcdir/$ac_source: File not found" 1>&2; exit 1; }
-+ { { echo "$as_me:$LINENO: error: $srcdir/$ac_source: file not found" >&5
-+echo "$as_me: error: $srcdir/$ac_source: file not found" >&2;}
-+ { (exit 1); exit 1; }; }
- fi
- rm -f $ac_dest
-
- # Make relative symlinks.
-- # Remove last slash and all that follows it. Not all systems have dirname.
-- ac_dest_dir=`echo $ac_dest|sed 's%/[^/][^/]*$%%'`
-- if test "$ac_dest_dir" != "$ac_dest" && test "$ac_dest_dir" != .; then
-- # The dest file is in a subdirectory.
-- test ! -d "$ac_dest_dir" && mkdir "$ac_dest_dir"
-- ac_dest_dir_suffix="/`echo $ac_dest_dir|sed 's%^\./%%'`"
-- # A "../" for each directory in $ac_dest_dir_suffix.
-- ac_dots=`echo $ac_dest_dir_suffix|sed 's%/[^/]*%../%g'`
-- else
-- ac_dest_dir_suffix= ac_dots=
-- fi
--
-- case "$srcdir" in
-- [/$]*) ac_rel_source="$srcdir/$ac_source" ;;
-- *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;;
-+ ac_dest_dir=`(dirname "$ac_dest") 2>/dev/null ||
-+$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$ac_dest" : 'X\(//\)[^/]' \| \
-+ X"$ac_dest" : 'X\(//\)$' \| \
-+ X"$ac_dest" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$ac_dest" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+ { if $as_mkdir_p; then
-+ mkdir -p "$ac_dest_dir"
-+ else
-+ as_dir="$ac_dest_dir"
-+ as_dirs=
-+ while test ! -d "$as_dir"; do
-+ as_dirs="$as_dir $as_dirs"
-+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$as_dir" : 'X\(//\)[^/]' \| \
-+ X"$as_dir" : 'X\(//\)$' \| \
-+ X"$as_dir" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$as_dir" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+ done
-+ test ! -n "$as_dirs" || mkdir $as_dirs
-+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dest_dir\"" >&5
-+echo "$as_me: error: cannot create directory \"$ac_dest_dir\"" >&2;}
-+ { (exit 1); exit 1; }; }; }
-+
-+ ac_builddir=.
-+
-+if test "$ac_dest_dir" != .; then
-+ ac_dir_suffix=/`echo "$ac_dest_dir" | sed 's,^\.[\\/],,'`
-+ # A "../" for each directory in $ac_dir_suffix.
-+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-+else
-+ ac_dir_suffix= ac_top_builddir=
-+fi
-+
-+case $srcdir in
-+ .) # No --srcdir option. We are building in place.
-+ ac_srcdir=.
-+ if test -z "$ac_top_builddir"; then
-+ ac_top_srcdir=.
-+ else
-+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-+ fi ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute path.
-+ ac_srcdir=$srcdir$ac_dir_suffix;
-+ ac_top_srcdir=$srcdir ;;
-+ *) # Relative path.
-+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+esac
-+
-+# Do not use `cd foo && pwd` to compute absolute paths, because
-+# the directories may not exist.
-+case `pwd` in
-+.) ac_abs_builddir="$ac_dest_dir";;
-+*)
-+ case "$ac_dest_dir" in
-+ .) ac_abs_builddir=`pwd`;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dest_dir";;
-+ *) ac_abs_builddir=`pwd`/"$ac_dest_dir";;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_builddir=${ac_top_builddir}.;;
-+*)
-+ case ${ac_top_builddir}. in
-+ .) ac_abs_top_builddir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_srcdir=$ac_srcdir;;
-+*)
-+ case $ac_srcdir in
-+ .) ac_abs_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_srcdir=$ac_top_srcdir;;
-+*)
-+ case $ac_top_srcdir in
-+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+ esac;;
-+esac
-+
-+
-+ case $srcdir in
-+ [\\/$]* | ?:[\\/]* ) ac_rel_source=$srcdir/$ac_source ;;
-+ *) ac_rel_source=$ac_top_builddir$srcdir/$ac_source ;;
- esac
-
-- # Make a symlink if possible; otherwise try a hard link.
-- if ln -s $ac_rel_source $ac_dest 2>/dev/null ||
-- ln $srcdir/$ac_source $ac_dest; then :
-- else
-- { echo "configure: error: can not link $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; }
-- fi
-+ # Try a symlink, then a hard link, then a copy.
-+ ln -s $ac_rel_source $ac_dest 2>/dev/null ||
-+ ln $srcdir/$ac_source $ac_dest 2>/dev/null ||
-+ cp -p $srcdir/$ac_source $ac_dest ||
-+ { { echo "$as_me:$LINENO: error: cannot link or copy $srcdir/$ac_source to $ac_dest" >&5
-+echo "$as_me: error: cannot link or copy $srcdir/$ac_source to $ac_dest" >&2;}
-+ { (exit 1); exit 1; }; }
- done
--EOF
--cat >> $CONFIG_STATUS <<EOF
-+_ACEOF
-
--EOF
--cat >> $CONFIG_STATUS <<\EOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-
--exit 0
--EOF
-+{ (exit 0); exit 0; }
-+_ACEOF
- chmod +x $CONFIG_STATUS
--rm -fr confdefs* $ac_clean_files
--test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-+ac_clean_files=$ac_clean_files_save
-
-+
-+# configure is writing to config.log, and then calls config.status.
-+# config.status does its own redirection, appending to config.log.
-+# Unfortunately, on DOS this fails, as config.log is still kept open
-+# by configure, so config.status won't be able to write to it; its
-+# output is simply discarded. So we exec the FD to /dev/null,
-+# effectively closing config.log, so it can be properly (re)opened and
-+# appended to by config.status. When coming back to configure, we
-+# need to make the FD available again.
-+if test "$no_create" != yes; then
-+ ac_cs_success=:
-+ ac_config_status_args=
-+ test "$silent" = yes &&
-+ ac_config_status_args="$ac_config_status_args --quiet"
-+ exec 5>/dev/null
-+ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-+ exec 5>>config.log
-+ # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-+ # would make configure fail if this is the last instruction.
-+ $ac_cs_success || { (exit 1); exit 1; }
-+fi
-+
-+#
-+# CONFIG_SUBDIRS section.
-+#
- if test "$no_recursion" != yes; then
-
- # Remove --cache-file and --srcdir arguments so they do not pile up.
-@@ -3108,87 +7426,164 @@ if test "$no_recursion" != yes; then
- ac_prev=
- continue
- fi
-- case "$ac_arg" in
-+ case $ac_arg in
- -cache-file | --cache-file | --cache-fil | --cache-fi \
- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
- ac_prev=cache_file ;;
- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-+ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
-+ | --c=*)
-+ ;;
-+ --config-cache | -C)
- ;;
- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
- ac_prev=srcdir ;;
- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
- ;;
-+ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-+ ac_prev=prefix ;;
-+ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-+ ;;
- *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
- esac
- done
-
-- for ac_config_dir in rx; do
-+ # Always prepend --prefix to ensure using the same prefix
-+ # in subdir configurations.
-+ ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args"
-+
-+ ac_popdir=`pwd`
-+ for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
-
- # Do not complain, so a configure script can configure whichever
- # parts of a large source tree are present.
-- if test ! -d $srcdir/$ac_config_dir; then
-- continue
-- fi
--
-- echo configuring in $ac_config_dir
--
-- case "$srcdir" in
-- .) ;;
-- *)
-- if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :;
-- else
-- { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; }
-- fi
-- ;;
-- esac
-+ test -d $srcdir/$ac_dir || continue
-
-- ac_popdir=`pwd`
-- cd $ac_config_dir
-+ { echo "$as_me:$LINENO: configuring in $ac_dir" >&5
-+echo "$as_me: configuring in $ac_dir" >&6;}
-+ { if $as_mkdir_p; then
-+ mkdir -p "$ac_dir"
-+ else
-+ as_dir="$ac_dir"
-+ as_dirs=
-+ while test ! -d "$as_dir"; do
-+ as_dirs="$as_dir $as_dirs"
-+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$as_dir" : 'X\(//\)[^/]' \| \
-+ X"$as_dir" : 'X\(//\)$' \| \
-+ X"$as_dir" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$as_dir" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+ done
-+ test ! -n "$as_dirs" || mkdir $as_dirs
-+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+ { (exit 1); exit 1; }; }; }
-+
-+ ac_builddir=.
-+
-+if test "$ac_dir" != .; then
-+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+ # A "../" for each directory in $ac_dir_suffix.
-+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-+else
-+ ac_dir_suffix= ac_top_builddir=
-+fi
-+
-+case $srcdir in
-+ .) # No --srcdir option. We are building in place.
-+ ac_srcdir=.
-+ if test -z "$ac_top_builddir"; then
-+ ac_top_srcdir=.
-+ else
-+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-+ fi ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute path.
-+ ac_srcdir=$srcdir$ac_dir_suffix;
-+ ac_top_srcdir=$srcdir ;;
-+ *) # Relative path.
-+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+esac
-+
-+# Do not use `cd foo && pwd` to compute absolute paths, because
-+# the directories may not exist.
-+case `pwd` in
-+.) ac_abs_builddir="$ac_dir";;
-+*)
-+ case "$ac_dir" in
-+ .) ac_abs_builddir=`pwd`;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_builddir=${ac_top_builddir}.;;
-+*)
-+ case ${ac_top_builddir}. in
-+ .) ac_abs_top_builddir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_srcdir=$ac_srcdir;;
-+*)
-+ case $ac_srcdir in
-+ .) ac_abs_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_srcdir=$ac_top_srcdir;;
-+*)
-+ case $ac_top_srcdir in
-+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+ esac;;
-+esac
-
-- # A "../" for each directory in /$ac_config_dir.
-- ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
-
-- case "$srcdir" in
-- .) # No --srcdir option. We are building in place.
-- ac_sub_srcdir=$srcdir ;;
-- /*) # Absolute path.
-- ac_sub_srcdir=$srcdir/$ac_config_dir ;;
-- *) # Relative path.
-- ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;;
-- esac
-+ cd $ac_dir
-
- # Check for guested configure; otherwise get Cygnus style configure.
-- if test -f $ac_sub_srcdir/configure; then
-- ac_sub_configure=$ac_sub_srcdir/configure
-- elif test -f $ac_sub_srcdir/configure.in; then
-+ if test -f $ac_srcdir/configure.gnu; then
-+ ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'"
-+ elif test -f $ac_srcdir/configure; then
-+ ac_sub_configure="$SHELL '$ac_srcdir/configure'"
-+ elif test -f $ac_srcdir/configure.in; then
- ac_sub_configure=$ac_configure
- else
-- echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2
-+ { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
-+echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
- ac_sub_configure=
- fi
-
- # The recursion is here.
- if test -n "$ac_sub_configure"; then
--
- # Make the cache file name correct relative to the subdirectory.
-- case "$cache_file" in
-- /*) ac_sub_cache_file=$cache_file ;;
-+ case $cache_file in
-+ [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
- *) # Relative path.
-- ac_sub_cache_file="$ac_dots$cache_file" ;;
-+ ac_sub_cache_file=$ac_top_builddir$cache_file ;;
- esac
-- case "$ac_given_INSTALL" in
-- [/$]*) INSTALL="$ac_given_INSTALL" ;;
-- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-- esac
-
-- echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-+ { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-+echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
- # The eval makes quoting arguments work.
-- if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
-- then :
-- else
-- { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
-- fi
-+ eval $ac_sub_configure $ac_sub_configure_args \
-+ --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir ||
-+ { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
-+echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
-+ { (exit 1); exit 1; }; }
- fi
-
- cd $ac_popdir
diff --git a/audio/rplay/patches/patch-as b/audio/rplay/patches/patch-as
deleted file mode 100644
index 6f3740eb259..00000000000
--- a/audio/rplay/patches/patch-as
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: patch-as,v 1.1 2004/05/07 01:42:28 danw Exp $
-
---- include/malloc.h.orig Thu May 6 21:37:16 2004
-+++ include/malloc.h
-@@ -0,0 +1 @@
-+#include <stdlib.h>
diff --git a/audio/rplay/patches/patch-at b/audio/rplay/patches/patch-at
deleted file mode 100644
index 84bcd4e7f97..00000000000
--- a/audio/rplay/patches/patch-at
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-at,v 1.2 2007/01/06 17:41:00 veego Exp $
-
---- rplayd/rplayd.h.orig 1999-03-10 08:58:04.000000000 +0100
-+++ rplayd/rplayd.h 2007-01-06 18:33:05.000000000 +0100
-@@ -73,7 +73,6 @@
- extern fd_set read_mask;
- extern fd_set write_mask;
- extern int debug;
--extern int inetd;
- extern int rptp_timeout;
- extern char hostname[];
- extern char *hostaddr;
-@@ -133,8 +132,6 @@
- extern int monitor_count;
- extern BUFFER *monitor_buffers;
-
--extern int errno;
--
- #ifdef __STDC__
- extern void usage ();
- extern void done (int exit_value);
diff --git a/audio/rplay/patches/patch-au b/audio/rplay/patches/patch-au
deleted file mode 100644
index 3a93596b45c..00000000000
--- a/audio/rplay/patches/patch-au
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-au,v 1.1 2005/10/10 15:13:58 joerg Exp $
-
---- rplayd/misc.c.orig 2005-08-04 22:36:40.000000000 +0000
-+++ rplayd/misc.c
-@@ -31,6 +31,7 @@
- #include <sys/file.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <errno.h>
- #ifdef ultrix
- #include <fcntl.h>
- #else
diff --git a/audio/rplay/patches/patch-av b/audio/rplay/patches/patch-av
deleted file mode 100644
index 4b8714f950e..00000000000
--- a/audio/rplay/patches/patch-av
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-av,v 1.1 2005/10/10 15:13:58 joerg Exp $
-
---- rplayd/timer.c.orig 2005-08-04 22:38:22.000000000 +0000
-+++ rplayd/timer.c
-@@ -27,6 +27,7 @@
- #include <sys/types.h>
- #include <sys/time.h>
- #include <sys/signal.h>
-+#include <errno.h>
- #include <stdio.h>
- #include <unistd.h>
- #include "rplayd.h"
diff --git a/audio/rplay/patches/patch-aw b/audio/rplay/patches/patch-aw
deleted file mode 100644
index d731c45721e..00000000000
--- a/audio/rplay/patches/patch-aw
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aw,v 1.1 2005/10/10 15:13:58 joerg Exp $
-
---- rplayd/cache.c.orig 2005-10-10 16:54:10.000000000 +0200
-+++ rplayd/cache.c
-@@ -38,6 +38,7 @@
- #endif
- #include <unistd.h>
- #include <stdio.h>
-+#include <errno.h>
- #ifdef HAVE_STRING_H
- #include <string.h>
- #endif
diff --git a/audio/rplay/patches/patch-ax b/audio/rplay/patches/patch-ax
deleted file mode 100644
index 1ea0c763ad0..00000000000
--- a/audio/rplay/patches/patch-ax
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ax,v 1.1 2005/10/10 15:13:58 joerg Exp $
-
---- rplayd/sound.c.orig 2005-10-10 16:55:19.000000000 +0200
-+++ rplayd/sound.c
-@@ -28,7 +28,7 @@
- #include <sys/uio.h>
- #include <sys/stat.h>
- #include <sys/file.h>
--#include <sys/errno.h>
-+#include <errno.h>
- #include <sys/signal.h>
- #include <sys/ioctl.h>
- #ifdef ultrix
diff --git a/audio/rplay/patches/patch-ca b/audio/rplay/patches/patch-ca
deleted file mode 100644
index a84befcc821..00000000000
--- a/audio/rplay/patches/patch-ca
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ca,v 1.1 2004/12/22 16:19:34 ben Exp $
---- rplayd/audio/audio_NetBSD.h.orig Thu Nov 18 22:37:44 2004
-+++ rplayd/audio/audio_NetBSD.h Thu Nov 18 22:46:15 2004
-@@ -0,0 +1,40 @@
-+/* #Id: audio_NetBSD.h, # */
-+
-+/*
-+ *
-+ * This file is part of rplay.
-+ *
-+ * rplay is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * rplay is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with rplay; see the file COPYING. If not, write to the
-+ * Free Software Foundation, Inc.,
-+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-+ */
-+
-+
-+
-+#ifndef _audio_NetBSD_h
-+#define _audio_NetBSD_h
-+
-+#include "rplay.h"
-+
-+#define RPLAY_AUDIO_DEVICE "/dev/sound"
-+#define RPLAY_MIXER_DEVICE "/dev/mixer"
-+#define RPLAY_AUDIO_TIMEOUT 3
-+#define RPLAY_AUDIO_FLUSH_TIMEOUT -1
-+#define RPLAY_AUDIO_RATE 49
-+#if BYTE_ORDER == BIG_ENDIAN
-+#define RPLAY_AUDIO_BYTE_ORDER RPLAY_BIG_ENDIAN
-+#else
-+#define RPLAY_AUDIO_BYTE_ORDER RPLAY_LITTLE_ENDIAN
-+#endif
-+#endif /* _audio_NetBSD_h */
diff --git a/audio/rplay/patches/patch-cb b/audio/rplay/patches/patch-cb
deleted file mode 100644
index 279ab37ffb8..00000000000
--- a/audio/rplay/patches/patch-cb
+++ /dev/null
@@ -1,602 +0,0 @@
-$NetBSD: patch-cb,v 1.1 2004/12/22 16:19:34 ben Exp $
---- rplayd/audio/audio_NetBSD.c.orig Sat Dec 18 17:40:37 2004
-+++ rplayd/audio/audio_NetBSD.c Sat Dec 18 18:19:18 2004
-@@ -0,0 +1,598 @@
-+/* #Id: audio_NetBSD 0.02 2004/12/18 OHt # */
-+
-+/*
-+ *
-+ * This file is part of rplay.
-+ *
-+ * rplay is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * rplay is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with rplay; see the file COPYING. If not, write to the
-+ * Free Software Foundation, Inc.,
-+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-+ */
-+
-+
-+
-+#include "rplayd.h"
-+
-+/*
-+ * System audio include files:
-+ */
-+#include <sys/types.h>
-+#include <sys/file.h>
-+#include <sys/ioctl.h>
-+#include <sys/fcntl.h>
-+#include <sys/errno.h>
-+#include <sys/audioio.h>
-+#include <errno.h>
-+
-+/*
-+ * External variables:
-+ */
-+extern char *rplay_audio_device;
-+extern int rplay_audio_sample_rate;
-+extern int rplay_audio_channels;
-+extern int rplay_audio_precision;
-+extern int rplay_audio_format;
-+extern int rplay_audio_port;
-+extern int optional_sample_rate;
-+extern int optional_precision;
-+extern int optional_channels;
-+extern int optional_format;
-+extern int optional_port;
-+
-+/*
-+ * Internal variables:
-+ */
-+static int rplay_audio_fd = -1;
-+static RPLAY_AUDIO_TABLE generic_table[] =
-+{
-+ {44100, RPLAY_FORMAT_LINEAR_16, 16, 2},
-+ {0, 0, 0, 0}
-+};
-+
-+static RPLAY_AUDIO_TABLE NetBSD_table[50 * AUDIO_ENCODING_MPEG_L2_SYSTEM];
-+ int enc_table[20];
-+ int i;
-+
-+
-+ const int sratetab[]=
-+ { 6615,
-+ 8000,
-+ 9600,
-+ 11025,
-+ 16000,
-+ 22050,
-+ 32000,
-+ 44100,
-+ 48000
-+ };
-+
-+
-+char *encoding_name;
-+audio_encoding_t enc_st;
-+audio_info_t prinfo;
-+int n =1;
-+
-+
-+char *soundbuff;
-+audio_info_t a;
-+
-+/*
-+ * Initialize the audio device.
-+ * This routine must set the following external variables:
-+ * rplay_audio_sample_rate
-+ * rplay_audio_precision
-+ * rplay_audio_channels
-+ * rplay_audio_format
-+ * rplay_audio_port
-+ *
-+ * and may use the following optional parameters:
-+ * optional_sample_rate
-+ * optional_precision
-+ * optional_channels
-+ * optional_format
-+ * optional_port
-+ *
-+ * optional_* variables with values of zero should be ignored.
-+ *
-+ * Return 0 on success and -1 on error.
-+ */
-+int
-+rplay_audio_init()
-+{
-+
-+ audio_info_t a;
-+ audio_device_t d;
-+ int enc_table[20];
-+ int i;
-+ int j;
-+
-+ report(REPORT_DEBUG,"rplay_audio_init()- rplay_audio_fd : %d \n", rplay_audio_fd );
-+
-+ if (rplay_audio_fd == -1)
-+ {
-+ rplay_audio_open();
-+ if (rplay_audio_fd == -1)
-+ {
-+ report(REPORT_ERROR, "rplay_audio_init: cannot open %s\n",
-+ rplay_audio_device);
-+ return -1;
-+ }
-+ }
-+
-+ if (ioctl(rplay_audio_fd, AUDIO_GETINFO, &a) < 0)
-+ {
-+ report(REPORT_ERROR, "rplay_audio_init: failed to get audio info%s\n",
-+ rplay_audio_device);
-+ return -1;
-+ }
-+
-+
-+ if (ioctl(rplay_audio_fd, AUDIO_GETDEV, &d) < 0)
-+ {
-+ report(REPORT_ERROR, "rplay_audio_init: AUDIO_GETDEV: %s\n",
-+ sys_err_str(errno));
-+ return -1;
-+ }
-+ for (i = AUDIO_ENCODING_NONE ; i < AUDIO_ENCODING_MPEG_L2_SYSTEM; ++i)
-+ {
-+ enc_st.index = i;
-+ if (ioctl(rplay_audio_fd, AUDIO_GETENC, &enc_st) == -1)
-+ {
-+ asprintf(&encoding_name, "%d", prinfo.play.encoding);
-+ }
-+ else
-+ {
-+ switch (enc_st.encoding)
-+ {
-+ case AUDIO_ENCODING_ULAW:
-+ enc_table[i] = RPLAY_FORMAT_ULAW;
-+ break;
-+ case AUDIO_ENCODING_SLINEAR:
-+ enc_table[i]= RPLAY_FORMAT_LINEAR_8;
-+ break;
-+ case AUDIO_ENCODING_ULINEAR:
-+ enc_table[i] = RPLAY_FORMAT_ULINEAR_8;
-+ break;
-+ case AUDIO_ENCODING_SLINEAR_LE:
-+ enc_table[i] =RPLAY_FORMAT_LINEAR_16;
-+ break;
-+ case AUDIO_ENCODING_ULINEAR_LE:
-+ enc_table[i]= RPLAY_FORMAT_ULINEAR_16;
-+ break;
-+ default:
-+ enc_table[i] = RPLAY_FORMAT_NONE;
-+ break;
-+
-+ }
-+ }
-+ }
-+ for (j = 1 ; j < 7 ; j++)
-+ {
-+ prinfo.play.sample_rate = sratetab[j];
-+
-+ for (i = AUDIO_ENCODING_NONE ; i <= AUDIO_ENCODING_MPEG_L2_SYSTEM; i++)
-+ {
-+ if (enc_table[i] != RPLAY_FORMAT_NONE)
-+ {
-+
-+ int k;
-+ enc_st.index = i;
-+ prinfo.play.encoding = i;
-+ AUDIO_INITINFO (&prinfo) ;
-+ /* for (j = 1 ; j < 7 ; j++)
-+ {
-+ int k;
-+ prinfo.play.sample_rate = sratetab[j];*/
-+ for (k = 1 ; k < 5 ; k++)
-+ {
-+ switch (k)
-+ {
-+ case 1:
-+ prinfo.play.precision = 8;
-+ prinfo.play.channels = 1;
-+ break;
-+ case 2:
-+ prinfo.play.precision = 16;
-+ prinfo.play.channels = 1;
-+ break;
-+ case 3:
-+ prinfo.play.precision = 8;
-+ prinfo.play.channels = 2;
-+ break;
-+ case 4:
-+ prinfo.play.precision = 16;
-+ prinfo.play.channels = 2;
-+ break;
-+ }
-+ if (ioctl(rplay_audio_fd, AUDIO_SETINFO, &prinfo) != -1)
-+ {
-+ NetBSD_table[n].format = enc_table[i];
-+ NetBSD_table[n].sample_rate = prinfo.play.sample_rate;
-+ NetBSD_table[n].bits = prinfo.play.precision;
-+ NetBSD_table[n].channels = prinfo.play.channels;
-+ n++;
-+ }
-+ }
-+ }
-+ }
-+ }
-+ report(REPORT_DEBUG," rplay_audio_bufsize: %d \n", rplay_audio_bufsize);
-+ report(REPORT_DEBUG," rplay_audio_rate: %d \n", rplay_audio_rate);
-+
-+ {
-+ NetBSD_table[n].format = RPLAY_FORMAT_NONE ;
-+ NetBSD_table[n].sample_rate = 0;
-+ NetBSD_table[n].bits = 0;
-+ NetBSD_table[n].channels = 0 ;
-+ }
-+
-+ n = 1;
-+
-+ rplay_audio_sample_rate = optional_sample_rate ? optional_sample_rate : 44100;
-+ rplay_audio_precision = optional_precision ? optional_precision : 16;
-+ rplay_audio_channels = optional_channels ? optional_channels : 2;
-+ rplay_audio_format = optional_format ? optional_format :
-+ rplay_audio_precision == 16 ? RPLAY_FORMAT_LINEAR_16 : RPLAY_FORMAT_LINEAR_8;
-+ rplay_audio_table =( RPLAY_AUDIO_TABLE *) NetBSD_table ;
-+ report(REPORT_DEBUG, "%s device detected\n", d.name);
-+
-+
-+
-+ /* Verify the precision and format. */
-+ switch (rplay_audio_precision)
-+ {
-+ case 8:
-+ if (rplay_audio_format != RPLAY_FORMAT_ULAW
-+ && rplay_audio_format != RPLAY_FORMAT_LINEAR_8 && rplay_audio_format != RPLAY_FORMAT_ULINEAR_8)
-+ {
-+ report(REPORT_ERROR, "rplay_audio_init: can't use %d bits with format=%d\n",
-+ rplay_audio_precision, rplay_audio_format);
-+ return -1;
-+ }
-+ break;
-+
-+ case 16:
-+ if (rplay_audio_format != RPLAY_FORMAT_LINEAR_16)
-+ {
-+ report(REPORT_ERROR, "rplay_audio_init: can't use %d bits with format=%d\n",
-+ rplay_audio_precision, rplay_audio_format);
-+ return -1;
-+ }
-+ break;
-+
-+ default:
-+ report(REPORT_ERROR, "rplay_audio_init: `%d' unsupported audio precision\n",
-+ rplay_audio_precision);
-+ return -1;
-+ }
-+
-+ AUDIO_INITINFO(&a);
-+
-+ switch (rplay_audio_format)
-+ {
-+ case RPLAY_FORMAT_ULAW:
-+ a.play.encoding = AUDIO_ENCODING_ULAW;
-+ break;
-+
-+ case RPLAY_FORMAT_LINEAR_8:
-+ a.play.encoding = AUDIO_ENCODING_SLINEAR;
-+ break;
-+ case RPLAY_FORMAT_LINEAR_16:
-+ a.play.encoding = AUDIO_ENCODING_SLINEAR_LE;
-+ break;
-+
-+ default:
-+ report(REPORT_ERROR, "rplay_audio_init: unsupported audio format `%d'\n",
-+ rplay_audio_format);
-+ return -1;
-+ }
-+
-+
-+ a.play.sample_rate = rplay_audio_sample_rate;
-+ a.play.precision = rplay_audio_precision;
-+ a.play.channels = rplay_audio_channels;
-+
-+ if (ioctl(rplay_audio_fd, AUDIO_SETINFO, &a) < 0)
-+ {
-+ report(REPORT_DEBUG, "rplay_audio_init: AUDIO_SETINFO: %s\n", sys_err_str(errno));
-+ report(REPORT_ERROR, "rplay_audio_init: AUDIO_SETINFO: %s\n", sys_err_str(errno));
-+ return -1;
-+ }
-+
-+ return 0;
-+}
-+
-+/***************************************************************/
-+/*
-+ * Open the audio device.
-+ *
-+ * Return 0 on success and -1 on error.
-+ */
-+
-+
-+int
-+rplay_audio_open()
-+{
-+ int flags;
-+
-+ rplay_audio_fd = open(rplay_audio_device, O_WRONLY | O_NDELAY, 0);
-+ report(REPORT_DEBUG,"rplay_audio_open()- rplay_audio_fd : %d \n", rplay_audio_fd );
-+
-+
-+ if (rplay_audio_fd < 0)
-+ {
-+ report(REPORT_ERROR,"rplay_audio_open: rplay_audio_fd %d < 0, \n", rplay_audio_fd );
-+ return -1;
-+ }
-+
-+ if (fcntl(rplay_audio_fd, F_SETFD, 1) < 0)
-+ {
-+ report(REPORT_ERROR,
-+ "rplay_audio_open: close-on-exec %d\n",
-+ sys_err_str(errno));
-+ /* return -1; */
-+ }
-+
-+ if (rplay_audio_init() < 0)
-+ {
-+ return -1;
-+ }
-+
-+ /*
-+ * Make sure the audio device writes are non-blocking.
-+ */
-+ flags = fcntl(rplay_audio_fd, F_GETFL, 0);
-+ if (flags < 0)
-+ {
-+ return -1;
-+ }
-+ flags |= FNDELAY;
-+ if (fcntl(rplay_audio_fd, F_SETFL, flags) < 0)
-+ {
-+ return -1;
-+ }
-+ soundbuff = malloc( a.play.buffer_size);
-+ return 0;
-+}
-+
-+/*
-+ * Is the audio device open?
-+ *
-+ * Return 1 for true and 0 for false.
-+ */
-+int
-+rplay_audio_isopen()
-+{
-+ if (rplay_audio_fd > 0)
-+ {
-+ return 1;
-+ }
-+ else
-+ {
-+ report(REPORT_DEBUG,"rplay_audio_isopen()- rplay_audio_fd : %d \n", rplay_audio_fd );
-+ return 0;
-+ }
-+ /*return rplay_audio_fd != -1;*/
-+}
-+
-+/*
-+ * Flush the audio device.
-+ *
-+ * Return 0 on success and -1 on error.
-+ */
-+int
-+rplay_audio_flush()
-+{
-+ audio_info_t info;
-+ report(REPORT_DEBUG,"rplay_audio_flush()- rplay_audio_fd : %d \n", rplay_audio_fd );
-+
-+ if (rplay_audio_fd != -1)
-+ {
-+ ioctl(rplay_audio_fd, AUDIO_GETINFO, &info);
-+ /* ioctl(rplay_audio_fd, AUDIO_DRAIN, 0);*/
-+ ioctl(rplay_audio_fd , AUDIO_FLUSH, NULL);
-+ if ((ioctl(rplay_audio_fd, AUDIO_DRAIN)) < 0)
-+ {
-+ report(REPORT_DEBUG,"audio drain ioctl failed- rplay_audio_fd : %d \n",rplay_audio_fd ) ;
-+ return -1;
-+ }
-+ }
-+ ioctl(rplay_audio_fd , AUDIO_SETINFO, &info);
-+ return 0;
-+}
-+
-+
-+/************************************************************************/
-+/*
-+ * Write nbytes from buf to the audio device.
-+ *
-+ * Return the number of bytes written on success and -1 on error.
-+ */
-+
-+#ifdef __STDC__
-+int
-+rplay_audio_write(char *buf, int nbytes)
-+#else
-+int
-+rplay_audio_write(buf, nbytes)
-+ char *buf;
-+ int nbytes;
-+#endif
-+{
-+ int n, nleft, nwritten;
-+ char *p;
-+ audio_info_t a;
-+
-+ nleft = nbytes;
-+ nwritten = 0;
-+
-+
-+ if (ioctl(rplay_audio_fd, AUDIO_GETINFO, &a) < 0)
-+ {
-+ report(REPORT_ERROR, "rplay_audio_init: failed to get audio info%s\n",
-+ rplay_audio_device);
-+ return -1;
-+ }
-+
-+
-+ for (p = buf; nleft > 0; nleft -= n, p += n)
-+ {
-+ n = write(rplay_audio_fd, p, nleft);
-+ if (n < 0)
-+ {
-+ if (errno == EWOULDBLOCK)
-+ {
-+ return nwritten;
-+ }
-+ else if (errno != EINTR)
-+ {
-+ return -1;
-+ }
-+ n = 0;
-+ }
-+ else
-+ {
-+ nwritten += n;
-+ }
-+ }
-+
-+
-+
-+
-+
-+ return nwritten;
-+}
-+
-+/*
-+ * Close the audio device.
-+ *
-+ * Return 0 on success and -1 on error.
-+ */
-+int
-+rplay_audio_close()
-+{
-+ report(REPORT_DEBUG," 1 rplay_audio_close()- rplay_audio_fd : %d \n", rplay_audio_fd );
-+
-+ if (rplay_audio_fd != -1)
-+ {
-+ if (close(rplay_audio_fd) == 0)
-+ {
-+ rplay_audio_fd = -1;
-+ return 0;
-+ }
-+ else
-+ {
-+ report(REPORT_DEBUG," 2 rplay_audio_close()- rplay_audio_fd : %d \n", rplay_audio_fd );
-+ return -1;
-+ }
-+ }
-+
-+
-+
-+ /* return 0;*/
-+}
-+
-+/*
-+ * Return the volume of the audio device.
-+ *
-+ * Return 0-255 or -1 on error.
-+ */
-+int
-+rplay_audio_get_volume()
-+{
-+#ifdef FAKE_VOLUME
-+ report(REPORT_DEBUG,"rplay_audio_get_volume() fake - rplay_audio_volume : %d \n",rplay_audio_volume );
-+
-+ return rplay_audio_volume;
-+#else /* not FAKE_VOLUME */
-+ audio_info_t a;
-+
-+ if (rplay_audio_fd < 0)
-+ {
-+ rplay_audio_open();
-+ }
-+ if (rplay_audio_fd < 0)
-+ {
-+ return -1;
-+ }
-+ if (ioctl(rplay_audio_fd, AUDIO_GETINFO, &a) < 0)
-+ {
-+ return -1;
-+ }
-+ else
-+ {
-+ report(REPORT_DEBUG,"rplay_audio_get_volume()- a.play.gain : %d \n",a.play.gain );
-+
-+ return a.play.gain;
-+ }
-+#endif /* not FAKE_VOLUME */
-+}
-+
-+/*
-+ * Set the volume of the audio device.
-+ * Input should be 0-255.
-+ *
-+ * Return the volume of the audio device 0-255 or -1.
-+ */
-+#ifdef __STDC__
-+int
-+rplay_audio_set_volume(int volume)
-+#else
-+int
-+rplay_audio_set_volume(volume)
-+ int volume;
-+#endif
-+{
-+#ifdef FAKE_VOLUME
-+ if (volume < RPLAY_MIN_VOLUME)
-+ {
-+ volume = RPLAY_MIN_VOLUME;
-+ }
-+ else if (volume > RPLAY_MAX_VOLUME)
-+ {
-+ volume = RPLAY_MAX_VOLUME;
-+ }
-+ rplay_audio_volume = volume;
-+ report(REPORT_DEBUG,"rplay_audio_set_volume()- rplay_audio_volume : %d \n", rplay_audio_volume );
-+
-+
-+ return rplay_audio_volume;
-+#else /* not FAKE_VOLUME */
-+ audio_info_t a;
-+
-+ rplay_audio_volume = 0;
-+
-+ if (rplay_audio_fd < 0)
-+ {
-+ rplay_audio_open();
-+ }
-+ if (rplay_audio_fd < 0)
-+ {
-+ return -1;
-+ }
-+
-+ AUDIO_INITINFO(&a);
-+ a.play.gain = volume;
-+ report(REPORT_DEBUG,"rplay_audio_set_volume()- a.play.gain : %d \n",a.play.gain );
-+
-+ if (ioctl(rplay_audio_fd, AUDIO_SETINFO, &a) < 0)
-+ {
-+ return -1;
-+ }
-+
-+ rplay_audio_volume = rplay_audio_get_volume();
-+
-+ return rplay_audio_volume;
-+#endif /* not FAKE_VOLUME */
-+}
diff --git a/audio/rplay/patches/patch-cc b/audio/rplay/patches/patch-cc
deleted file mode 100644
index d6b62353018..00000000000
--- a/audio/rplay/patches/patch-cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-cc,v 1.1 2004/12/22 16:19:34 ben Exp $
-
---- adpcm/g72x.h.orig Tue Jul 14 15:35:23 1998
-+++ adpcm/g72x.h
-@@ -32,11 +32,16 @@
- */
- #ifndef _G72X_H
- #define _G72X_H
-+#ifdef __NetBSD__
-
-+
-+#include <sys/types.h>
-+#include <sys/audioio.h>
-+#else
- #define AUDIO_ENCODING_ULAW (1) /* ISDN u-law */
- #define AUDIO_ENCODING_ALAW (2) /* ISDN A-law */
- #define AUDIO_ENCODING_LINEAR (3) /* PCM 2's-complement (0-center) */
--
-+#endif
- /*
- * The following is the definition of the state structure
- * used by the G.721/G.723 encoder and decoder to preserve their internal
diff --git a/audio/rsynth/DESCR b/audio/rsynth/DESCR
deleted file mode 100644
index 743aa8f6111..00000000000
--- a/audio/rsynth/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-This is a text to speech system produced by integrating various pieces
-of code and tables of data, which are all (I believe) in the public domain.
-
-The Oxford Text Archive has for several years maintained copies of several
-machine-readable dictionaries along with its extensive (if
-unsystematic) collections of other machine-readable texts. This document
-gives some further details of the various dictionaries available, and
-summarises the conditions under which copies of them are currently
-distributed.
-
-The Oxford Text Archive Shortlist (available on request via electronic
-mail and by FTP) gives up to date brief details of all texts held in
-the Archive. Send electronic mail to ARCHIVE@VAX.OXFORD.AC.UK. For
-anonymous FTP, look in the directory ota on ota.ox.ac.uk (129.67.1.165)
diff --git a/audio/rsynth/Makefile b/audio/rsynth/Makefile
deleted file mode 100644
index 4b052a2ca71..00000000000
--- a/audio/rsynth/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2007/01/26 21:49:45 joerg Exp $
-
-DISTNAME= rsynth-2.0
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= ftp://svr-ftp.eng.cam.ac.uk/pub/comp.speech/synthesis/ \
- ftp://svr-ftp.eng.cam.ac.uk/pub/comp.speech/dictionaries/cmudict/
-DISTFILES= rsynth-2.0.tar.gz ${DICT_FILES}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= ftp://svr-ftp.eng.cam.ac.uk/pub/comp.speech/FAQ-complete
-COMMENT= Public Domain Speech Synthesis System
-
-DICT_FILES+= README cmudict.0.4.Z cmulex.0.4.Z phoneset.0.4
-EXTRACT_ONLY= rsynth-2.0.tar.gz
-
-DIST_SUBDIR= rsynth
-GNU_CONFIGURE= YES
-CONFIGURE_HAS_MANDIR= NO
-
-CONFIGURE_ARGS+=--with-aDict="${WRKDIR}/cmudict.0.4"
-CONFIGURE_ARGS+=--without-bDict
-CONFIGURE_ENV+= ac_cv_lib_audio=yes XLIBS=-lXt
-
-pre-configure:
- ${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/cmudict.0.4.Z > ${WRKDIR}/cmudict.0.4
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/rsynth/
- cd ${DISTDIR}/${DIST_SUBDIR} && \
- ${INSTALL_DATA} ${DICT_FILES} ${PREFIX}/share/rsynth/
-
-.include "../../audio/nas/buildlink3.mk"
-.include "../../databases/gdbm/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/rsynth/PLIST b/audio/rsynth/PLIST
deleted file mode 100644
index ec202921b04..00000000000
--- a/audio/rsynth/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/12/22 04:11:39 fredb Exp $
-bin/dlookup
-bin/mkdictdb
-bin/say
-libdata/rsynth/aDict.db
-share/rsynth/README
-share/rsynth/cmudict.0.4.Z
-share/rsynth/cmulex.0.4.Z
-share/rsynth/phoneset.0.4
-@dirrm libdata/rsynth
-@dirrm share/rsynth
diff --git a/audio/rsynth/distinfo b/audio/rsynth/distinfo
deleted file mode 100644
index 7adda9c827c..00000000000
--- a/audio/rsynth/distinfo
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/12/11 21:10:29 joerg Exp $
-
-SHA1 (rsynth/rsynth-2.0.tar.gz) = 50693c68eb74cf82405c7d402d31d3c811ad4515
-RMD160 (rsynth/rsynth-2.0.tar.gz) = 02efbf2e3db504c5c8fb76e8e21253c48900fbfb
-Size (rsynth/rsynth-2.0.tar.gz) = 110319 bytes
-SHA1 (rsynth/README) = 80539b75a807d4b042e63def6507fef30ba99af2
-RMD160 (rsynth/README) = b124502f148751869c03718dca74d61d0ec4a9dd
-Size (rsynth/README) = 3247 bytes
-SHA1 (rsynth/cmudict.0.4.Z) = af82175ee86ddd6fe160a2cdd60f10b7115259ed
-RMD160 (rsynth/cmudict.0.4.Z) = 9fb75f0625d91ee15d552f886fd9282a51c7474c
-Size (rsynth/cmudict.0.4.Z) = 1069362 bytes
-SHA1 (rsynth/cmulex.0.4.Z) = 33ac72b29cc82e7d896a90bd34fb6db3917f3724
-RMD160 (rsynth/cmulex.0.4.Z) = e43326e44219feb386f54ed4a147d14cb9d31b3d
-Size (rsynth/cmulex.0.4.Z) = 430761 bytes
-SHA1 (rsynth/phoneset.0.4) = 8c7e386dbaf33a4e16debd4c538a154a247c1e97
-RMD160 (rsynth/phoneset.0.4) = 9565dcb4db24fc0b0cfd16ea31f45994f24e2753
-Size (rsynth/phoneset.0.4) = 629 bytes
-SHA1 (patch-aa) = 59b0b765461adec5140a8867c7a668cd87d71281
-SHA1 (patch-ab) = 9305005ff26bdb309d2ca8c10e4713fb21d9c0d6
diff --git a/audio/rsynth/patches/patch-aa b/audio/rsynth/patches/patch-aa
deleted file mode 100644
index b6890174c05..00000000000
--- a/audio/rsynth/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2001/12/22 04:11:40 fredb Exp $
-
---- Makefile.in.orig Tue Nov 8 07:30:52 1994
-+++ Makefile.in
-@@ -5,7 +5,7 @@
- CC = @CC@
- PREFIX = @prefix@
- BIN_DIR = $(PREFIX)/bin
--LIB_DIR = $(PREFIX)/lib/dict
-+LIB_DIR = $(PREFIX)/libdata/rsynth
- LDLIBS = @LIBS@
- XLIBS = @XLIBS@
- CFLAGS = @CFLAGS@
-@@ -58,7 +58,7 @@
- hplay.o : hplay.c proto.h getargs.h hplay.h
-
- aDict.db : $(ADICT) mkdictdb
-- mkdictdb $(ADICT) aDict.db
-+ ./mkdictdb $(ADICT) aDict.db
-
- bDict.db : $(BDICT) mkdictdb
- mkdictdb $(BDICT) bDict.db
diff --git a/audio/rsynth/patches/patch-ab b/audio/rsynth/patches/patch-ab
deleted file mode 100644
index 06122892925..00000000000
--- a/audio/rsynth/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/12/11 21:10:29 joerg Exp $
-
---- configure.orig 2005-12-11 20:56:09.000000000 +0000
-+++ configure
-@@ -1329,9 +1329,10 @@ cat > conftest.$ac_ext <<EOF
- #line 1330 "configure"
- #include "confdefs.h"
-
-+double val;
- int main() { return 0; }
- int t() {
--atan()
-+atan(val)
- ; return 0; }
- EOF
- if eval $ac_link; then
-@@ -1368,9 +1369,10 @@ cat > conftest.$ac_ext <<EOF
- #line 1369 "configure"
- #include "confdefs.h"
-
-+double val;
- int main() { return 0; }
- int t() {
--atan()
-+atan(val)
- ; return 0; }
- EOF
- if eval $ac_link; then
diff --git a/audio/shntool/DESCR b/audio/shntool/DESCR
deleted file mode 100644
index 62c87e5e8ca..00000000000
--- a/audio/shntool/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-shntool is a multi-purpose WAVE data processing and reporting utility.
-File formats are abstracted from its core, so it can process any file
-that contains WAVE data, compressed or not - provided there exists a
-format module to handle that particular file type.
-
-shntool has native support for .wav files. If you want it to work with
-other formats, you must have the appropriate helper program installed.
-The "Helper programs" section below contains links to helper programs
-for each format that shntool supports.
diff --git a/audio/shntool/Makefile b/audio/shntool/Makefile
deleted file mode 100644
index 0fc9a86c376..00000000000
--- a/audio/shntool/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2006/09/02 20:13:58 rillig Exp $
-#
-
-DISTNAME= shntool-2.0.3
-PKGREVISION= 1
-CATEGORIES= audio archivers
-MASTER_SITES= http://www.etree.org/shnutils/shntool/source/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.etree.org/shnutils/shntool/
-COMMENT= Lossless audio compressor wrapper tool
-
-LICENSE= no-commercial-use
-
-GNU_CONFIGURE= YES
-
-# could also support: "WV" (is this not wav?), OFR, LPAC and APE.
-DEPENDS+= shorten>=3.6.0:../../audio/shorten
-DEPENDS+= flac>=1.1.0:../../audio/flac
-DEPENDS+= sox>=12.17.4:../../audio/sox
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/shntool/PLIST b/audio/shntool/PLIST
deleted file mode 100644
index e9beef94079..00000000000
--- a/audio/shntool/PLIST
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/09/02 20:13:58 rillig Exp $
-bin/shncat
-bin/shncmp
-bin/shnconv
-bin/shncue
-bin/shnfix
-bin/shninfo
-bin/shnjoin
-bin/shnlen
-bin/shnmd5
-bin/shnpad
-bin/shnsplit
-bin/shnstrip
-bin/shntool
-man/man1/shntool.1
diff --git a/audio/shntool/distinfo b/audio/shntool/distinfo
deleted file mode 100644
index 8fae764ebff..00000000000
--- a/audio/shntool/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/08/18 21:38:23 mrg Exp $
-
-SHA1 (shntool-2.0.3.tar.gz) = 1d52d349759a7c12407e2399105f00f6d23f4a55
-RMD160 (shntool-2.0.3.tar.gz) = ecd7d4114e2582ba165e152f77d98c1a82e4f502
-Size (shntool-2.0.3.tar.gz) = 189583 bytes
diff --git a/audio/shorten/DESCR b/audio/shorten/DESCR
deleted file mode 100644
index 8e1026e0e38..00000000000
--- a/audio/shorten/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Shorten is a lossless compressing tool specialized for Audio files where
-it usually performs better than gzip/bzip2.
diff --git a/audio/shorten/Makefile b/audio/shorten/Makefile
deleted file mode 100644
index 16e7c157003..00000000000
--- a/audio/shorten/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2006/12/15 14:34:19 wiz Exp $
-#
-
-DISTNAME= shorten-3.6.0
-CATEGORIES= audio archivers
-MASTER_SITES= http://www.etree.org/shnutils/shorten/source/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.etree.org/shnutils/shorten/
-COMMENT= Lossless audio compressor
-
-LICENSE= no-commercial-use
-
-GNU_CONFIGURE= YES
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/shorten
- ${INSTALL_DATA} ${WRKSRC}/doc/tr156.tex ${PREFIX}/share/doc/shorten
- ${INSTALL_DATA} ${WRKSRC}/doc/tr156.ps ${PREFIX}/share/doc/shorten
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/shorten/PLIST b/audio/shorten/PLIST
deleted file mode 100644
index 58b2f58b3c7..00000000000
--- a/audio/shorten/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:52 zuntum Exp $
-bin/shorten
-man/man1/shorten.1
-share/doc/shorten/tr156.tex
-share/doc/shorten/tr156.ps
-@dirrm share/doc/shorten
diff --git a/audio/shorten/distinfo b/audio/shorten/distinfo
deleted file mode 100644
index 116bfc7dcfa..00000000000
--- a/audio/shorten/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 20:39:51 agc Exp $
-
-SHA1 (shorten-3.6.0.tar.gz) = 8d4a0f793acb23ecd29af68bcd9df272b5520b44
-RMD160 (shorten-3.6.0.tar.gz) = f9c98a683c3baa834b22e99ebbeef9fde2206390
-Size (shorten-3.6.0.tar.gz) = 584183 bytes
diff --git a/audio/sidplay/DESCR b/audio/sidplay/DESCR
deleted file mode 100644
index 0093a31df98..00000000000
--- a/audio/sidplay/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Basically, SIDPLAY is just an ordinary music player software. More
-specifically, SIDPLAY emulates the Sound Interface Device chip (MOS 6581,
-commonly called SID) and the Micro Processor Unit (MOS 6510) of the
-Commodore 64 on your computer. It is a platform independent software
-emulating these hardware components. Therefore it is able to load and
-execute C64 machine code programs which produce music or sound. In general
-these are independent fragments of code and data which have been ripped
-from games and demonstration programs and have been transferred directly
-from the C64.
diff --git a/audio/sidplay/Makefile b/audio/sidplay/Makefile
deleted file mode 100644
index 523182d699f..00000000000
--- a/audio/sidplay/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:13 joerg Exp $
-#
-
-DISTNAME= sidplay-base-1.0.9
-PKGNAME= sidplay-1.0.9
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= pooka@NetBSD.org
-HOMEPAGE= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/
-COMMENT= Tools for playing sidtunes
-
-NOT_FOR_PLATFORM= Interix-*-*
-
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
-USE_LANGUAGES= c c++
-
-.include "../../audio/libsidplay/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/sidplay/PLIST b/audio/sidplay/PLIST
deleted file mode 100644
index bd7e5e49ab0..00000000000
--- a/audio/sidplay/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:53 zuntum Exp $
-bin/sidplay
-bin/sid2wav
-bin/sidcon
diff --git a/audio/sidplay/distinfo b/audio/sidplay/distinfo
deleted file mode 100644
index 1a1767333e0..00000000000
--- a/audio/sidplay/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/12/11 21:00:57 joerg Exp $
-
-SHA1 (sidplay-base-1.0.9.tgz) = 0a159a9710fd82c942fe011a0d2ac70fb01be29c
-RMD160 (sidplay-base-1.0.9.tgz) = 4a96d5ebc5510d2b348bc837c184912c7f16789a
-Size (sidplay-base-1.0.9.tgz) = 71969 bytes
-SHA1 (patch-aa) = 19152c74918debf52578407b3b08331f969ad8d8
diff --git a/audio/sidplay/patches/patch-aa b/audio/sidplay/patches/patch-aa
deleted file mode 100644
index d991a3229bf..00000000000
--- a/audio/sidplay/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2005/12/11 21:00:57 joerg Exp $
-
---- configure.orig 2005-12-11 20:52:28.000000000 +0000
-+++ configure
-@@ -1541,7 +1541,7 @@ EOF
- $CP audio/oss/* .
- echo "$ac_t""oss" 1>&6
- ;;
-- *freebsd*) cat >> confdefs.h <<\EOF
-+ *freebsd* | *dragonfly*) cat >> confdefs.h <<\EOF
- #define HAVE_FREEBSD 1
- EOF
-
diff --git a/audio/sidplay2/DESCR b/audio/sidplay2/DESCR
deleted file mode 100644
index 198364c947c..00000000000
--- a/audio/sidplay2/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Sidplay2 is an updated version of Sidplay, which is a Commodore 64 music
-file player. This version plays more SIDs and is capable of more, than the
-previous Sidplay is.
diff --git a/audio/sidplay2/Makefile b/audio/sidplay2/Makefile
deleted file mode 100644
index 681970c7ca2..00000000000
--- a/audio/sidplay2/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/04/09 13:13:38 joerg Exp $
-#
-
-DISTNAME= sidplay-2.0.9
-PKGNAME= sidplay2-2.0.9
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sidplay2/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://sidplay2.sourceforge.net/
-COMMENT= Tool for playing sidtunes
-
-NOT_FOR_PLATFORM= Interix-*-*
-
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake pkg-config
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-
-LDFLAGS+= ${LIBOSSAUDIO}
-
-.include "../../audio/libsidplay2/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/sidplay2/PLIST b/audio/sidplay2/PLIST
deleted file mode 100644
index e3a33cbccee..00000000000
--- a/audio/sidplay2/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/04/09 13:13:38 joerg Exp $
-bin/sidplay2
-man/man1/sidplay2.1
diff --git a/audio/sidplay2/distinfo b/audio/sidplay2/distinfo
deleted file mode 100644
index e8aac182fd8..00000000000
--- a/audio/sidplay2/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/04/20 14:14:15 joerg Exp $
-
-SHA1 (sidplay-2.0.9.tar.gz) = 2e4589cc59b3d2d37f38b98d7a0a0ba37b82da7a
-RMD160 (sidplay-2.0.9.tar.gz) = 9d7d2cbcb472ab413093e85827de2c7099782e47
-Size (sidplay-2.0.9.tar.gz) = 362140 bytes
-SHA1 (patch-aa) = 12e236e42f2cbf311e5d9ed7b25c262089f57a27
diff --git a/audio/sidplay2/patches/patch-aa b/audio/sidplay2/patches/patch-aa
deleted file mode 100644
index aba7d9fcd55..00000000000
--- a/audio/sidplay2/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/04/20 14:14:15 joerg Exp $
-
---- configure.orig 2006-04-20 14:10:40.000000000 +0000
-+++ configure
-@@ -19696,7 +19696,7 @@ echo "${ECHO_T}mmsystem" >&6
- AUDIO_LDADD=-lwinmm
-
- ;;
-- *freebsd*) cat >>confdefs.h <<\_ACEOF
-+ *freebsd* | *dragonfly*) cat >>confdefs.h <<\_ACEOF
- #define HAVE_OSS 1
- _ACEOF
-
diff --git a/audio/snd/DESCR b/audio/snd/DESCR
deleted file mode 100644
index 85aafe1ffbc..00000000000
--- a/audio/snd/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Snd is a sound editor modelled loosely after Emacs and an old,
-sorely-missed PDP-10 sound editor named Dpysnd. It can accommodate
-any number of sounds each with any number of channels, and can be
-customized and extended using either Guile or Ruby. Snd is free.
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
deleted file mode 100644
index 78a2df74cbc..00000000000
--- a/audio/snd/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.51 2007/02/27 07:37:59 wiz Exp $
-#
-
-DISTNAME= snd-8.8
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=snd/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://ccrma.stanford.edu/software/snd/
-COMMENT= X based sound editor
-
-DEPENDS+= flac-[0-9]*:../../audio/flac
-DEPENDS+= speex-[0-9]*:../../audio/speex
-DEPENDS+= vorbis-tools-[0-9]*:../../audio/vorbis-tools
-
-USE_PKGLOCALEDIR= yes
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake msgfmt pkg-config
-
-BUILD_TARGET= snd
-MAKE_FILE= makefile
-WRKSRC= ${WRKDIR}/snd-8
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/po/de.gmo \
- ${PREFIX}/${PKGLOCALEDIR}/locale/de/LC_MESSAGES/snd.mo
-
-.include "options.mk"
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../math/gsl/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/snd/PLIST b/audio/snd/PLIST
deleted file mode 100644
index c4b783aea4b..00000000000
--- a/audio/snd/PLIST
+++ /dev/null
@@ -1,171 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2007/02/23 00:34:53 wiz Exp $
-bin/snd
-man/man1/snd.1
-share/locale/de/LC_MESSAGES/snd.mo
-share/snd/analog-filter.rb
-share/snd/analog-filter.scm
-share/snd/autosave.scm
-share/snd/bess.rb
-share/snd/bess.scm
-share/snd/bess1.rb
-share/snd/bess1.scm
-share/snd/bird.fsm
-share/snd/bird.rb
-share/snd/bird.scm
-share/snd/clm-ins.fs
-share/snd/clm-ins.rb
-share/snd/clm-ins.scm
-share/snd/clm.fs
-share/snd/clm23.scm
-share/snd/debug.scm
-share/snd/dlocsig.rb
-share/snd/dlocsig.scm
-share/snd/draw.fs
-share/snd/draw.rb
-share/snd/draw.scm
-share/snd/dsp.fs
-share/snd/dsp.rb
-share/snd/dsp.scm
-share/snd/edit-menu.scm
-share/snd/edit123.scm
-share/snd/effects-utils.scm
-share/snd/effects.fs
-share/snd/effects.rb
-share/snd/env.fs
-share/snd/env.rb
-share/snd/env.scm
-share/snd/enved.fs
-share/snd/enved.scm
-share/snd/eval-c.scm
-share/snd/event.scm
-share/snd/examp.fs
-share/snd/examp.rb
-share/snd/examp.scm
-share/snd/extensions.fs
-share/snd/extensions.rb
-share/snd/extensions.scm
-share/snd/fade.scm
-share/snd/fft-menu.scm
-share/snd/fix-optargs.scm
-share/snd/fmv.scm
-share/snd/frame.scm
-share/snd/freeverb.rb
-share/snd/freeverb.scm
-share/snd/gauche-format.scm
-share/snd/gauche-optargs.scm
-share/snd/grani.scm
-share/snd/green.scm
-share/snd/gtk-effects-utils.scm
-share/snd/gtk-effects.scm
-share/snd/gtk-popup.scm
-share/snd/gui.scm
-share/snd/hooks.fs
-share/snd/hooks.rb
-share/snd/hooks.scm
-share/snd/index.rb
-share/snd/index.scm
-share/snd/jcrev.scm
-share/snd/kmenu.scm
-share/snd/ladspa-help.scm
-share/snd/ladspa.scm
-share/snd/maraca.rb
-share/snd/maraca.scm
-share/snd/marks-menu.scm
-share/snd/marks.fs
-share/snd/marks.rb
-share/snd/marks.scm
-share/snd/maxf.rb
-share/snd/maxf.scm
-share/snd/misc.scm
-share/snd/mix-menu.scm
-share/snd/mix.fs
-share/snd/mix.rb
-share/snd/mix.scm
-share/snd/mixer.scm
-share/snd/moog.scm
-share/snd/musglyphs.rb
-share/snd/musglyphs.scm
-share/snd/nb.rb
-share/snd/nb.scm
-share/snd/new-backgrounds.scm
-share/snd/new-buttons.scm
-share/snd/new-effects.scm
-share/snd/noise.rb
-share/snd/noise.scm
-share/snd/oo.scm
-share/snd/oscope.scm
-share/snd/panic.scm
-share/snd/pd-add.scm
-share/snd/pd-any.scm
-share/snd/pd-fm.scm
-share/snd/pd-global.scm
-share/snd/pd-inout.scm
-share/snd/pd-local.scm
-share/snd/pd-mozilla.scm
-share/snd/pd-send_receive.scm
-share/snd/pd-stochastic.scm
-share/snd/peak-env.fs
-share/snd/peak-env.scm
-share/snd/piano.rb
-share/snd/piano.scm
-share/snd/play.rb
-share/snd/play.scm
-share/snd/poly.rb
-share/snd/poly.scm
-share/snd/popup.fs
-share/snd/popup.rb
-share/snd/popup.scm
-share/snd/prc95.rb
-share/snd/prc95.scm
-share/snd/pvoc.rb
-share/snd/pvoc.scm
-share/snd/rgb.fs
-share/snd/rgb.rb
-share/snd/rgb.scm
-share/snd/rt-compiler.scm
-share/snd/rt-engine.scm
-share/snd/rt-examples.scm
-share/snd/rt-player.scm
-share/snd/rtio.rb
-share/snd/rtio.scm
-share/snd/rubber.fs
-share/snd/rubber.rb
-share/snd/rubber.scm
-share/snd/singer.rb
-share/snd/singer.scm
-share/snd/snd-forth-init.fs
-share/snd/snd-gl.scm
-share/snd/snd-gtk.scm
-share/snd/snd-hobbit.scm
-share/snd/snd-motif.scm
-share/snd/snd-test.fs
-share/snd/snd-test.rb
-share/snd/snd-test.scm
-share/snd/snd-xm.fs
-share/snd/snd-xm.rb
-share/snd/snd4.scm
-share/snd/snd5.scm
-share/snd/snd6.scm
-share/snd/snd7.scm
-share/snd/snd8.scm
-share/snd/snd_conffile.scm
-share/snd/sndwarp.scm
-share/snd/special-menu.scm
-share/snd/spectr.fs
-share/snd/spectr.rb
-share/snd/spectr.scm
-share/snd/stochastic.scm
-share/snd/strad.rb
-share/snd/strad.scm
-share/snd/toolbar.scm
-share/snd/track-colors.scm
-share/snd/v.rb
-share/snd/v.scm
-share/snd/ws.rb
-share/snd/ws.scm
-share/snd/xm-enved.fs
-share/snd/xm-enved.rb
-share/snd/xm-enved.scm
-share/snd/zip.rb
-share/snd/zip.scm
-@dirrm share/snd
diff --git a/audio/snd/distinfo b/audio/snd/distinfo
deleted file mode 100644
index 6b8ef5c457a..00000000000
--- a/audio/snd/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.14 2007/02/23 00:34:53 wiz Exp $
-
-SHA1 (snd-8.8.tar.gz) = 8aa73ec7bbbb84b97c4325b05769f3388e6f0680
-RMD160 (snd-8.8.tar.gz) = 33a2a5f196a501c0cfb0fba623fa6f37c489def2
-Size (snd-8.8.tar.gz) = 8580035 bytes
-SHA1 (patch-aa) = c0940f37c8455e7dcfac64d528c9baf545ba14b7
diff --git a/audio/snd/options.mk b/audio/snd/options.mk
deleted file mode 100644
index 32f3f1cdbcb..00000000000
--- a/audio/snd/options.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2005/11/23 22:39:12 wiz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.snd
-PKG_SUPPORTED_OPTIONS= esound guile
-# fftw2 fftw3 ladspa gamin/fam mpg123 timidity
-PKG_OPTIONS_REQUIRED_GROUPS= frontend
-PKG_OPTIONS_GROUP.frontend= gtk motif
-PKG_SUGGESTED_OPTIONS= gtk
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mesound)
-CONFIGURE_ARGS+= --with-esd
-.include "../../audio/esound/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --without-esd
-.endif
-
-.if !empty(PKG_OPTIONS:Mgtk)
-CONFIGURE_ARGS+= --with-gtk
-.include "../../x11/gtk2/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --without-gtk
-.endif
-
-.if !empty(PKG_OPTIONS:Mguile)
-CONFIGURE_ARGS+= --with-guile
-.include "../../lang/guile/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --without-guile
-.endif
-
-.if !empty(PKG_OPTIONS:Mmotif)
-CONFIGURE_ARGS+= --with-motif
-.include "../../x11/openmotif/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --without-motif
-.endif
diff --git a/audio/snd/patches/patch-aa b/audio/snd/patches/patch-aa
deleted file mode 100644
index 19f18647977..00000000000
--- a/audio/snd/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/12/20 00:35:10 joerg Exp $
-
---- configure.orig 2006-12-20 00:09:04.000000000 +0000
-+++ configure
-@@ -25671,7 +25671,7 @@ fi
- if test "$ac_snd_have_extension_language" = no ; then
- if test "$ac_snd_have_gui" = no ; then
- if test "$ac_cv_header_dlfcn_h" = yes ; then
-- LDFLAGS="$LDFLAGS -ldl"
-+ LDFLAGS="$LDFLAGS ${DL_LDFLAGS} ${DL_LIBS}"
- fi
- { echo "$as_me:$LINENO: WARNING: Snd needs either an extension language (Guile or Ruby), or a graphics toolkit (Gtk or Motif), or preferably both. All four packages are available free, normally prepackaged and ready-to-use. As currently configured, this version of Snd is useless." >&5
- echo "$as_me: WARNING: Snd needs either an extension language (Guile or Ruby), or a graphics toolkit (Gtk or Motif), or preferably both. All four packages are available free, normally prepackaged and ready-to-use. As currently configured, this version of Snd is useless." >&2;}
diff --git a/audio/solfege/DESCR b/audio/solfege/DESCR
deleted file mode 100644
index cab1786e610..00000000000
--- a/audio/solfege/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-GNU Solfege is a computer program written to help you practice ear
-training. It can be useful when practicing the simple and mechanical
-exercises. These are the exercises written so far:
-
-* Recognise melodic and harmonic intervals
-* Compare interval sizes
-* Sing the intervals the computer asks for
-* Identify chords
-* Sing chords
-* Scales
-* Dictation
-* Remembering rhythmic patterns
diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
deleted file mode 100644
index da21f3a019c..00000000000
--- a/audio/solfege/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2006/06/21 13:22:27 joerg Exp $
-#
-
-DISTNAME= solfege-3.0.7
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=solfege/}
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://www.solfege.org/
-COMMENT= Practice several musical ear training exercises
-
-USE_DIRS+= xdg-1.2
-USE_PKGLOCALEDIR= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+= --disable-oss-sound
-
-USE_TOOLS+= gmake gm4 makeinfo pkg-config msgfmt
-
-PYTHON_VERSIONS_ACCEPTED= 24 23
-PYTHON_PATCH_SCRIPTS= *.py *.py.in */*.py */*.py.in
-
-EGDIR= ${PREFIX}/share/examples/solfege
-CONF_FILES+= ${EGDIR}/${PKGBASE}/solfege ${PKG_SYSCONFDIR}/solfege
-INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
-
-INSTALLATION_DIRS= ${EGDIR}
-
-.include "../../lang/python/application.mk"
-.include "../../x11/py-gtk2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/solfege/PLIST b/audio/solfege/PLIST
deleted file mode 100644
index 9e3080f1c13..00000000000
--- a/audio/solfege/PLIST
+++ /dev/null
@@ -1,520 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2006/04/17 07:07:12 jlam Exp $
-bin/lessonfile_editor
-bin/solfege
-man/man1/lessonfile_editor.1
-man/man1/solfege.1
-share/applications/solfege.desktop
-share/examples/solfege/solfege
-share/locale/cs/LC_MESSAGES/solfege.mo
-share/locale/da/LC_MESSAGES/solfege.mo
-share/locale/de/LC_MESSAGES/solfege.mo
-share/locale/es/LC_MESSAGES/solfege.mo
-share/locale/es_MX/LC_MESSAGES/solfege.mo
-share/locale/fr/LC_MESSAGES/solfege.mo
-share/locale/hu/LC_MESSAGES/solfege.mo
-share/locale/it/LC_MESSAGES/solfege.mo
-share/locale/nl/LC_MESSAGES/solfege.mo
-share/locale/no/LC_MESSAGES/solfege.mo
-share/locale/ru/LC_MESSAGES/solfege.mo
-share/locale/sv/LC_MESSAGES/solfege.mo
-share/locale/tr/LC_MESSAGES/solfege.mo
-share/pixmaps/solfege.png
-share/solfege/default.config
-share/solfege/example-lesson-files/chord-satb
-share/solfege/example-lesson-files/harmonic-progression-dictation
-share/solfege/example-lesson-files/id-by-name-1
-share/solfege/example-lesson-files/id-by-name-2
-share/solfege/example-lesson-files/learn-min-major-1
-share/solfege/example-lesson-files/learn-min-major-2
-share/solfege/example-lesson-files/learn-min-major-3
-share/solfege/example-lesson-files/sing-chord
-share/solfege/example-lesson-files/very-easy-scale
-share/solfege/example-lesson-files/very-easy-scale2
-share/solfege/feta/feta20-accidentals--1.xpm
-share/solfege/feta/feta20-accidentals--2.xpm
-share/solfege/feta/feta20-accidentals-0.xpm
-share/solfege/feta/feta20-accidentals-1.xpm
-share/solfege/feta/feta20-accidentals-2.xpm
-share/solfege/feta/feta20-clefs-C.xpm
-share/solfege/feta/feta20-clefs-F.xpm
-share/solfege/feta/feta20-clefs-G.xpm
-share/solfege/feta/feta20-dots-dot.xpm
-share/solfege/feta/feta20-flags-d3.xpm
-share/solfege/feta/feta20-flags-d4.xpm
-share/solfege/feta/feta20-flags-d5.xpm
-share/solfege/feta/feta20-flags-d6.xpm
-share/solfege/feta/feta20-flags-u3.xpm
-share/solfege/feta/feta20-flags-u4.xpm
-share/solfege/feta/feta20-flags-u5.xpm
-share/solfege/feta/feta20-flags-u6.xpm
-share/solfege/feta/feta20-noteheads-0.xpm
-share/solfege/feta/feta20-noteheads-1.xpm
-share/solfege/feta/feta20-noteheads-2.xpm
-share/solfege/feta/feta20-number-0.xpm
-share/solfege/feta/feta20-number-1.xpm
-share/solfege/feta/feta20-number-2.xpm
-share/solfege/feta/feta20-number-3.xpm
-share/solfege/feta/feta20-number-4.xpm
-share/solfege/feta/feta20-number-5.xpm
-share/solfege/feta/feta20-number-6.xpm
-share/solfege/feta/feta20-number-7.xpm
-share/solfege/feta/feta20-number-8.xpm
-share/solfege/feta/feta20-number-9.xpm
-share/solfege/feta/feta20-rests--1.xpm
-share/solfege/feta/feta20-rests--2.xpm
-share/solfege/feta/feta20-rests--4.xpm
-share/solfege/feta/feta20-rests-0.xpm
-share/solfege/feta/feta20-rests-0o.xpm
-share/solfege/feta/feta20-rests-1.xpm
-share/solfege/feta/feta20-rests-1o.xpm
-share/solfege/feta/feta20-rests-2.xpm
-share/solfege/feta/feta20-rests-3.xpm
-share/solfege/feta/feta20-rests-4.xpm
-share/solfege/feta/feta20-rests-5.xpm
-share/solfege/feta/feta20-rests-6.xpm
-share/solfege/feta/feta20-rests-7.xpm
-share/solfege/gnomeemu/gnome/__init__.py
-share/solfege/gnomeemu/gnome/canvas.py
-share/solfege/gnomeemu/gnome/ui.py
-share/solfege/gnomeemu/gnome/uiconsts.py
-share/solfege/graphics/chord-voicing.png
-share/solfege/graphics/chord.png
-share/solfege/graphics/compare-intervals.png
-share/solfege/graphics/dictation.png
-share/solfege/graphics/double-flat.png
-share/solfege/graphics/double-flat.svg
-share/solfege/graphics/double-sharp.png
-share/solfege/graphics/double-sharp.svg
-share/solfege/graphics/erase.png
-share/solfege/graphics/erase.svg
-share/solfege/graphics/flat.png
-share/solfege/graphics/flat.svg
-share/solfege/graphics/happyface.png
-share/solfege/graphics/harmonic-interval.png
-share/solfege/graphics/harmonic-progression-dictation.png
-share/solfege/graphics/holder.png
-share/solfege/graphics/id-by-name.png
-share/solfege/graphics/id-tone.png
-share/solfege/graphics/identify-bpm.png
-share/solfege/graphics/identify-chord.png
-share/solfege/graphics/identify-scale.png
-share/solfege/graphics/image-not-found.png
-share/solfege/graphics/melodic-interval.png
-share/solfege/graphics/natural.png
-share/solfege/graphics/natural.svg
-share/solfege/graphics/notehead.png
-share/solfege/graphics/notehead.svg
-share/solfege/graphics/rhythm-c12c12c12.png
-share/solfege/graphics/rhythm-c12c12r12.png
-share/solfege/graphics/rhythm-c12r12c12.png
-share/solfege/graphics/rhythm-c16c16c16c16.png
-share/solfege/graphics/rhythm-c16c16c8.png
-share/solfege/graphics/rhythm-c16c8..png
-share/solfege/graphics/rhythm-c16c8c16.png
-share/solfege/graphics/rhythm-c4.png
-share/solfege/graphics/rhythm-c8.c16.png
-share/solfege/graphics/rhythm-c8c16c16.png
-share/solfege/graphics/rhythm-c8c8.png
-share/solfege/graphics/rhythm-r12c12c12.png
-share/solfege/graphics/rhythm-r12c12r12.png
-share/solfege/graphics/rhythm-r12r12c12.png
-share/solfege/graphics/rhythm-r16c16c16c16.png
-share/solfege/graphics/rhythm-r16c16c8.png
-share/solfege/graphics/rhythm-r16c8..png
-share/solfege/graphics/rhythm-r16c8c16.png
-share/solfege/graphics/rhythm-r4.png
-share/solfege/graphics/rhythm-r8c16c16.png
-share/solfege/graphics/rhythm-r8c8.png
-share/solfege/graphics/rhythm-r8r16c16.png
-share/solfege/graphics/rhythm-wrong.png
-share/solfege/graphics/rhythm.png
-share/solfege/graphics/sadface.png
-share/solfege/graphics/sharp.png
-share/solfege/graphics/sharp.svg
-share/solfege/graphics/sing-chord.png
-share/solfege/graphics/sing-interval.png
-share/solfege/graphics/solfege.png
-share/solfege/graphics/solfege.xpm
-share/solfege/graphics/test-sound.png
-share/solfege/graphics/twelve-tone.png
-share/solfege/learningtree.txt
-share/solfege/lesson-files/altered-1
-share/solfege/lesson-files/altered-2
-share/solfege/lesson-files/barnesanger
-share/solfege/lesson-files/besifring
-share/solfege/lesson-files/bin/csound-play-harmonic-interval.sh
-share/solfege/lesson-files/bpm
-share/solfege/lesson-files/chord-7b9-maj79
-share/solfege/lesson-files/chord-all
-share/solfege/lesson-files/chord-all-inv
-share/solfege/lesson-files/chord-dim-aug
-share/solfege/lesson-files/chord-dim-aug-min-major
-share/solfege/lesson-files/chord-m7-7
-share/solfege/lesson-files/chord-m7-7-inv
-share/solfege/lesson-files/chord-m7-7-inv-not
-share/solfege/lesson-files/chord-m7-7-maj7-m7b5-dim7
-share/solfege/lesson-files/chord-m9-9
-share/solfege/lesson-files/chord-m9-9-7b9-maj79
-share/solfege/lesson-files/chord-maj7-m7b5-dim7
-share/solfege/lesson-files/chord-min-major
-share/solfege/lesson-files/chord-min-major-7
-share/solfege/lesson-files/chord-min-major-close-open
-share/solfege/lesson-files/chord-min-major-inv
-share/solfege/lesson-files/chord-min-major-inv-not
-share/solfege/lesson-files/chord-voicing-test
-share/solfege/lesson-files/compare-intervals
-share/solfege/lesson-files/csound-fifth-0.97
-share/solfege/lesson-files/csound-fifth-0.98
-share/solfege/lesson-files/csound-fifth-0.99
-share/solfege/lesson-files/csound-fifth-0.995
-share/solfege/lesson-files/csound-fifth-0.996
-share/solfege/lesson-files/csound-fifth-0.997
-share/solfege/lesson-files/csound-fifth-0.998
-share/solfege/lesson-files/diatonic-1
-share/solfege/lesson-files/diatonic-2
-share/solfege/lesson-files/durmoll
-share/solfege/lesson-files/fifth-small-pure-0.99
-share/solfege/lesson-files/harmonic-intervals
-share/solfege/lesson-files/harmonic-intervals-10
-share/solfege/lesson-files/harmonic-intervals-2
-share/solfege/lesson-files/harmonic-intervals-2-3
-share/solfege/lesson-files/harmonic-intervals-3
-share/solfege/lesson-files/harmonic-intervals-4-5
-share/solfege/lesson-files/harmonic-intervals-4-5-8
-share/solfege/lesson-files/harmonic-intervals-6
-share/solfege/lesson-files/harmonic-intervals-6-7
-share/solfege/lesson-files/harmonic-intervals-7
-share/solfege/lesson-files/harmonic-intervals-7-9
-share/solfege/lesson-files/harmonic-intervals-9
-share/solfege/lesson-files/harmonic-intervals-self-config
-share/solfege/lesson-files/harmonic-intervals-tritonus-7
-share/solfege/lesson-files/id-tone
-share/solfege/lesson-files/id-tone-cde-10
-share/solfege/lesson-files/id-tone-cde-11
-share/solfege/lesson-files/id-tone-cde-12
-share/solfege/lesson-files/id-tone-cde-3
-share/solfege/lesson-files/id-tone-cde-4
-share/solfege/lesson-files/id-tone-cde-5
-share/solfege/lesson-files/id-tone-cde-6
-share/solfege/lesson-files/id-tone-cde-7
-share/solfege/lesson-files/id-tone-cde-8
-share/solfege/lesson-files/id-tone-cde-9
-share/solfege/lesson-files/jsb-inventions
-share/solfege/lesson-files/melodic-intervals
-share/solfege/lesson-files/melodic-intervals-10
-share/solfege/lesson-files/melodic-intervals-2
-share/solfege/lesson-files/melodic-intervals-2-3
-share/solfege/lesson-files/melodic-intervals-2int-2-3
-share/solfege/lesson-files/melodic-intervals-3
-share/solfege/lesson-files/melodic-intervals-4-5
-share/solfege/lesson-files/melodic-intervals-4-5-8
-share/solfege/lesson-files/melodic-intervals-6
-share/solfege/lesson-files/melodic-intervals-6-7
-share/solfege/lesson-files/melodic-intervals-7
-share/solfege/lesson-files/melodic-intervals-7-9
-share/solfege/lesson-files/melodic-intervals-9
-share/solfege/lesson-files/melodic-intervals-self-config
-share/solfege/lesson-files/melodic-intervals-tritonus-7
-share/solfege/lesson-files/progression-1
-share/solfege/lesson-files/progression-2
-share/solfege/lesson-files/progression-atte
-share/solfege/lesson-files/progression-x
-share/solfege/lesson-files/rhythm-all
-share/solfege/lesson-files/rhythm-easy
-share/solfege/lesson-files/rhythm-mid
-share/solfege/lesson-files/rhythm-self-config
-share/solfege/lesson-files/scales
-share/solfege/lesson-files/scales-all
-share/solfege/lesson-files/scales-bebop
-share/solfege/lesson-files/scales-thirds
-share/solfege/lesson-files/share/fanfare.midi
-share/solfege/lesson-files/share/fifth-pure-220.00.wav
-share/solfege/lesson-files/share/fifth-pure-247.5.wav
-share/solfege/lesson-files/share/fifth-pure-293.33.wav
-share/solfege/lesson-files/share/fifth-small-220.00.wav
-share/solfege/lesson-files/share/fifth-small-247.5.wav
-share/solfege/lesson-files/share/fifth-small-293.33.wav
-share/solfege/lesson-files/share/fil1.orc
-share/solfege/lesson-files/share/fil1.sco
-share/solfege/lesson-files/sing-chord-tone
-share/solfege/lesson-files/sing-intervals
-share/solfege/lesson-files/sing-intervals-10
-share/solfege/lesson-files/sing-intervals-2
-share/solfege/lesson-files/sing-intervals-2-3
-share/solfege/lesson-files/sing-intervals-3
-share/solfege/lesson-files/sing-intervals-4-5
-share/solfege/lesson-files/sing-intervals-4-5-8
-share/solfege/lesson-files/sing-intervals-6
-share/solfege/lesson-files/sing-intervals-6-7
-share/solfege/lesson-files/sing-intervals-7
-share/solfege/lesson-files/sing-intervals-7-9
-share/solfege/lesson-files/sing-intervals-9
-share/solfege/lesson-files/sing-intervals-self-config
-share/solfege/lesson-files/sing-intervals-tritonus-7
-share/solfege/lesson-files/sing-the-fifth
-share/solfege/lesson-files/sing-the-root
-share/solfege/lesson-files/sing-the-seventh
-share/solfege/lesson-files/sing-the-third
-share/solfege/lesson-files/singchord-1
-share/solfege/lesson-files/singchord-2
-share/solfege/lesson-files/singchord-3
-share/solfege/lesson-files/singchord-4
-share/solfege/lesson-files/singchord-5
-share/solfege/lesson-files/singchord-6
-share/solfege/lesson-files/singchord-all
-share/solfege/lesson-files/three-prog-root
-share/solfege/lesson-files/twelvetone
-share/solfege/lesson-files/two-prog-root
-share/solfege/lesson-files/volkslieder1
-share/solfege/lesson-files/volkslieder2
-share/solfege/mpd/__init__.py
-share/solfege/mpd/_exceptions.py
-share/solfege/mpd/const.py
-share/solfege/mpd/duration.py
-share/solfege/mpd/engravers.py
-share/solfege/mpd/interval.py
-share/solfege/mpd/mpdutils.py
-share/solfege/mpd/musicalpitch.py
-share/solfege/mpd/musicdisplayer.py
-share/solfege/mpd/parser.py
-share/solfege/mpd/requests.py
-share/solfege/mpd/testsetup.py
-share/solfege/online-docs/C/bug-reporting.html
-share/solfege/online-docs/C/chord-help.html
-share/solfege/online-docs/C/chord-names.html
-share/solfege/online-docs/C/chordvoicing-help.html
-share/solfege/online-docs/C/compareintervals-help.html
-share/solfege/online-docs/C/copyright.html
-share/solfege/online-docs/C/dictation-help.html
-share/solfege/online-docs/C/fdl.html
-share/solfege/online-docs/C/gpl.html
-share/solfege/online-docs/C/harmonicinterval-help.html
-share/solfege/online-docs/C/harmonicprogressiondictation-help.html
-share/solfege/online-docs/C/helpfile-format.html
-share/solfege/online-docs/C/idbyname-help.html
-share/solfege/online-docs/C/identifybpm-help.html
-share/solfege/online-docs/C/idtone-help.html
-share/solfege/online-docs/C/lessonfiles.html
-share/solfege/online-docs/C/melodicinterval-help.html
-share/solfege/online-docs/C/missing-helpfile.html
-share/solfege/online-docs/C/music-format.html
-share/solfege/online-docs/C/online-resources.html
-share/solfege/online-docs/C/preferences-window.html
-share/solfege/online-docs/C/rhythm-help.html
-share/solfege/online-docs/C/singanswer-help.html
-share/solfege/online-docs/C/singchord-help.html
-share/solfege/online-docs/C/singinterval-help.html
-share/solfege/online-docs/C/theory-intervals.html
-share/solfege/online-docs/C/toc.html
-share/solfege/online-docs/C/translating-solfege.html
-share/solfege/online-docs/C/twelvetone-help.html
-share/solfege/online-docs/C/ui.html
-share/solfege/online-docs/C/welcome.html
-share/solfege/online-docs/es/theory-intervals.html
-share/solfege/online-docs/es/toc.html
-share/solfege/online-docs/es/welcome.html
-share/solfege/online-docs/es_MX/toc.html
-share/solfege/online-docs/es_MX/welcome.html
-share/solfege/online-docs/fr/bug-reporting.html
-share/solfege/online-docs/fr/chord-help.html
-share/solfege/online-docs/fr/chord-names.html
-share/solfege/online-docs/fr/chordvoicing-help.html
-share/solfege/online-docs/fr/compareintervals-help.html
-share/solfege/online-docs/fr/dictation-help.html
-share/solfege/online-docs/fr/harmonicinterval-help.html
-share/solfege/online-docs/fr/harmonicprogressiondictation-help.html
-share/solfege/online-docs/fr/helpfile-format.html
-share/solfege/online-docs/fr/idbyname-help.html
-share/solfege/online-docs/fr/identifybpm-help.html
-share/solfege/online-docs/fr/idtone-help.html
-share/solfege/online-docs/fr/lessonfiles.html
-share/solfege/online-docs/fr/melodicinterval-help.html
-share/solfege/online-docs/fr/missing-helpfile.html
-share/solfege/online-docs/fr/music-format.html
-share/solfege/online-docs/fr/online-resources.html
-share/solfege/online-docs/fr/preferences-window.html
-share/solfege/online-docs/fr/rhythm-help.html
-share/solfege/online-docs/fr/singanswer-help.html
-share/solfege/online-docs/fr/singchord-help.html
-share/solfege/online-docs/fr/singinterval-help.html
-share/solfege/online-docs/fr/theory-intervals.html
-share/solfege/online-docs/fr/toc.html
-share/solfege/online-docs/fr/translating-solfege.html
-share/solfege/online-docs/fr/twelvetone-help.html
-share/solfege/online-docs/fr/ui.html
-share/solfege/online-docs/fr/welcome.html
-share/solfege/online-docs/midi/Theory-intervals-1.midi
-share/solfege/online-docs/midi/Theory-intervals-2.midi
-share/solfege/online-docs/midi/Theory-intervals-3.midi
-share/solfege/online-docs/midi/Theory-intervals-4.midi
-share/solfege/online-docs/nl/bug-reporting.html
-share/solfege/online-docs/nl/chord-help.html
-share/solfege/online-docs/nl/chord-names.html
-share/solfege/online-docs/nl/chordvoicing-help.html
-share/solfege/online-docs/nl/compareintervals-help.html
-share/solfege/online-docs/nl/dictation-help.html
-share/solfege/online-docs/nl/harmonicinterval-help.html
-share/solfege/online-docs/nl/idbyname-help.html
-share/solfege/online-docs/nl/identifybpm-help.html
-share/solfege/online-docs/nl/idtone-help.html
-share/solfege/online-docs/nl/melodicinterval-help.html
-share/solfege/online-docs/nl/missing-helpfile.html
-share/solfege/online-docs/nl/online-resources.html
-share/solfege/online-docs/nl/preferences-window.html
-share/solfege/online-docs/nl/rhythm-help.html
-share/solfege/online-docs/nl/singanswer-help.html
-share/solfege/online-docs/nl/singchord-help.html
-share/solfege/online-docs/nl/singinterval-help.html
-share/solfege/online-docs/nl/theory-intervals.html
-share/solfege/online-docs/nl/toc.html
-share/solfege/online-docs/nl/twelvetone-help.html
-share/solfege/online-docs/nl/ui.html
-share/solfege/online-docs/nl/welcome.html
-share/solfege/online-docs/no/chord-help.html
-share/solfege/online-docs/no/chordvoicing-help.html
-share/solfege/online-docs/no/compareintervals-help.html
-share/solfege/online-docs/no/dictation-help.html
-share/solfege/online-docs/no/harmonicinterval-help.html
-share/solfege/online-docs/no/harmonicprogressiondictation-help.html
-share/solfege/online-docs/no/idbyname-help.html
-share/solfege/online-docs/no/identifybpm-help.html
-share/solfege/online-docs/no/idtone-help.html
-share/solfege/online-docs/no/melodicinterval-help.html
-share/solfege/online-docs/no/online-resources.html
-share/solfege/online-docs/no/rhythm-help.html
-share/solfege/online-docs/no/singchord-help.html
-share/solfege/online-docs/no/singinterval-help.html
-share/solfege/online-docs/no/toc.html
-share/solfege/online-docs/no/twelvetone-help.html
-share/solfege/online-docs/no/welcome.html
-share/solfege/online-docs/png/Theory-intervals-1-fr.png
-share/solfege/online-docs/png/Theory-intervals-1-nl.png
-share/solfege/online-docs/png/Theory-intervals-1.png
-share/solfege/online-docs/png/Theory-intervals-2-fr.png
-share/solfege/online-docs/png/Theory-intervals-2-nl.png
-share/solfege/online-docs/png/Theory-intervals-2.png
-share/solfege/online-docs/png/Theory-intervals-3-fr.png
-share/solfege/online-docs/png/Theory-intervals-3-nl.png
-share/solfege/online-docs/png/Theory-intervals-3.png
-share/solfege/online-docs/png/Theory-intervals-4-fr.png
-share/solfege/online-docs/png/Theory-intervals-4-nl.png
-share/solfege/online-docs/png/Theory-intervals-4.png
-share/solfege/online-docs/png/addvoice.png
-share/solfege/online-docs/png/ceg-relative.png
-share/solfege/online-docs/png/ceg.png
-share/solfege/online-docs/png/clef.png
-share/solfege/online-docs/png/fist.png
-share/solfege/online-docs/png/mainwin-fr.png
-share/solfege/online-docs/png/mainwin.png
-share/solfege/online-docs/png/simple.png
-share/solfege/online-docs/png/skip.png
-share/solfege/online-docs/png/test.png
-share/solfege/online-docs/png/tie.png
-share/solfege/online-docs/png/tuple.png
-share/solfege/online-docs/ru/bug-reporting.html
-share/solfege/online-docs/ru/toc.html
-share/solfege/online-docs/ru/welcome.html
-share/solfege/solfege.gtkrc
-share/solfege/soundcard/__init__.py
-share/solfege/soundcard/fakesynth.py
-share/solfege/soundcard/mfutils.py
-share/solfege/soundcard/midifilesynth.py
-share/solfege/soundcard/oss_common.py
-share/solfege/soundcard/oss_sequencer.py
-share/solfege/soundcard/oss_sequencer2.py
-share/solfege/soundcard/rat.py
-share/solfege/soundcard/solfege_c_midi.py
-share/solfege/soundcard/soundcardexceptions.py
-share/solfege/soundcard/track.py
-share/solfege/soundcard/winsynth.py
-share/solfege/src/__init__.py
-share/solfege/src/abstract.py
-share/solfege/src/app.py
-share/solfege/src/cfg.py
-share/solfege/src/chord.py
-share/solfege/src/chordvoicing.py
-share/solfege/src/compareintervals.py
-share/solfege/src/configureoutput.py
-share/solfege/src/configwindow.py
-share/solfege/src/const.py
-share/solfege/src/dataparser.py
-share/solfege/src/dictation.py
-share/solfege/src/example.py
-share/solfege/src/gethomedir.py
-share/solfege/src/gu.py
-share/solfege/src/harmonicinterval.py
-share/solfege/src/harmonicprogressiondictation.py
-share/solfege/src/history.py
-share/solfege/src/htmlwidget.py
-share/solfege/src/i18n.py
-share/solfege/src/idbyname.py
-share/solfege/src/identifybpm.py
-share/solfege/src/idtone.py
-share/solfege/src/inputwidgets.py
-share/solfege/src/instrumentselector.py
-share/solfege/src/languages.py
-share/solfege/src/learning_tree_editor.py
-share/solfege/src/lessonfile.py
-share/solfege/src/lessonfile_editor_main.py
-share/solfege/src/mainwin.py
-share/solfege/src/melodicinterval.py
-share/solfege/src/multipleintervalconfigwidget.py
-share/solfege/src/notenamespinbutton.py
-share/solfege/src/osutils.py
-share/solfege/src/pmwiki.py
-share/solfege/src/reportbug.py
-share/solfege/src/rhythm.py
-share/solfege/src/runtime.py
-share/solfege/src/singanswer.py
-share/solfege/src/singchord.py
-share/solfege/src/singinterval.py
-share/solfege/src/specialwidgets.py
-share/solfege/src/statistics.py
-share/solfege/src/statisticsviewer.py
-share/solfege/src/stock.py
-share/solfege/src/testsetup.py
-share/solfege/src/tracebackwindow.py
-share/solfege/src/tuner.py
-share/solfege/src/twelvetone.py
-share/solfege/src/utils.py
-share/solfege/src/uuid.py
-share/solfege/src/xrandom.py
-share/solfege/themes/svg/chord-voicing.svg
-share/solfege/themes/svg/chord.svg
-share/solfege/themes/svg/happyface.svg
-share/solfege/themes/svg/harmonic-interval.svg
-share/solfege/themes/svg/id-by-name.svg
-share/solfege/themes/svg/mal.svg
-share/solfege/themes/svg/melodic-interval.svg
-share/solfege/themes/svg/sadface.svg
-share/solfege/themes/svg/sing-chord.svg
-share/solfege/themes/svg/sing-interval.svg
-share/solfege/themes/svg/solfege.svg
-share/solfege/ui.xml
-@dirrm share/solfege/themes/svg
-@dirrm share/solfege/themes
-@dirrm share/solfege/src
-@dirrm share/solfege/soundcard
-@dirrm share/solfege/online-docs/ru
-@dirrm share/solfege/online-docs/png
-@dirrm share/solfege/online-docs/no
-@dirrm share/solfege/online-docs/nl
-@dirrm share/solfege/online-docs/midi
-@dirrm share/solfege/online-docs/fr
-@dirrm share/solfege/online-docs/es_MX
-@dirrm share/solfege/online-docs/es
-@dirrm share/solfege/online-docs/C
-@dirrm share/solfege/online-docs
-@dirrm share/solfege/mpd
-@dirrm share/solfege/lesson-files/share
-@dirrm share/solfege/lesson-files/bin
-@dirrm share/solfege/lesson-files
-@dirrm share/solfege/graphics
-@dirrm share/solfege/gnomeemu/gnome
-@dirrm share/solfege/gnomeemu
-@dirrm share/solfege/feta
-@dirrm share/solfege/example-lesson-files
-@dirrm share/solfege
-@comment in xdg-dirs: @dirrm share/pixmaps
-@dirrm share/examples/solfege
-@comment in xdg-dirs: @dirrm share/applications
diff --git a/audio/solfege/distinfo b/audio/solfege/distinfo
deleted file mode 100644
index db6f6e68ee0..00000000000
--- a/audio/solfege/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/03/02 00:48:31 schmonz Exp $
-
-SHA1 (solfege-3.0.7.tar.gz) = 66bb51dd9bc1b19b894c4e4911b30d0809812cd3
-RMD160 (solfege-3.0.7.tar.gz) = 7d943defd6bb4ba24498d68614f91259c09ab8d8
-Size (solfege-3.0.7.tar.gz) = 847152 bytes
-SHA1 (patch-aa) = aed03ee233649212f28bd928742fedd8bdb41ded
diff --git a/audio/solfege/patches/patch-aa b/audio/solfege/patches/patch-aa
deleted file mode 100644
index 90a2ca8ff9b..00000000000
--- a/audio/solfege/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/12/28 02:08:19 schmonz Exp $
-
---- default.config.orig 2005-12-07 15:25:15.000000000 -0500
-+++ default.config
-@@ -40,11 +40,11 @@ history_forward_ak=<alt>Right
- history_reload_ak=<ctrl>r
-
- [sound]
--type=sequencer-device
--device_file=/dev/sequencer2
-+type=external-midiplayer
-+device_file=/dev/music
- synth_number=2
--wav_player=/usr/bin/aplay
--midi_player=/usr/bin/timidity -idqq %s
-+wav_player=/usr/bin/audioplay
-+midi_player=/usr/bin/midiplay
-
- [config]
- preferred_instrument=0
diff --git a/audio/sound-juicer/DESCR b/audio/sound-juicer/DESCR
deleted file mode 100644
index 2d0bec725b0..00000000000
--- a/audio/sound-juicer/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Sound Juicer is a simple and clean CD ripping tool. It allows you
-to extract the audio from audio compact discs and convert them into audio
-files that your computer can understand and play. Sound Juicer can also
-play the audio tracks directly from the CD, allowing you to preview the
-CD before ripping it.
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
deleted file mode 100644
index 2f5ff57992f..00000000000
--- a/audio/sound-juicer/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2007/03/21 12:05:41 wiz Exp $
-#
-
-DISTNAME= sound-juicer-2.14.5
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= http://www.burtonini.com/computing/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.burtonini.com/computing/
-COMMENT= CD ripping tool
-
-USE_PKGLOCALEDIR= yes
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake pkg-config intltool msgfmt
-USE_LANGUAGES= c c++
-
-CONFIGURE_ENV+= GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
-MAKE_ENV+= GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
-CONFIGURE_ENV+= GST_INSPECT="${LOCALBASE}/bin/gst-inspect-0.10"
-
-GCONF2_SCHEMAS+= sound-juicer.schemas
-
-BUILDLINK_API_DEPENDS.gstreamer0.10+= gstreamer0.10>=0.10.3
-
-.include "../../devel/GConf2/schemas.mk"
-.include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
-.include "../../multimedia/gstreamer0.10/buildlink3.mk"
-.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
-.include "../../multimedia/gnome2-media/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
-.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../audio/musicbrainz/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/sound-juicer/PLIST b/audio/sound-juicer/PLIST
deleted file mode 100644
index 8284ad53c9c..00000000000
--- a/audio/sound-juicer/PLIST
+++ /dev/null
@@ -1,107 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/11/28 22:28:27 drochner Exp $
-bin/sound-juicer
-share/applications/sound-juicer.desktop
-share/gconf/schemas/sound-juicer.schemas
-share/gnome/help/sound-juicer/C/fdl-appendix.xml
-share/gnome/help/sound-juicer/C/figures/prefs.png
-share/gnome/help/sound-juicer/C/figures/startup.png
-share/gnome/help/sound-juicer/C/legal.xml
-share/gnome/help/sound-juicer/C/sound-juicer.xml
-share/gnome/help/sound-juicer/es/fdl-appendix.xml
-share/gnome/help/sound-juicer/es/figures/prefs.png
-share/gnome/help/sound-juicer/es/figures/startup.png
-share/gnome/help/sound-juicer/es/legal.xml
-share/gnome/help/sound-juicer/es/sound-juicer.xml
-share/gnome/help/sound-juicer/nl/fdl-appendix.xml
-share/gnome/help/sound-juicer/nl/figures/prefs.png
-share/gnome/help/sound-juicer/nl/figures/startup.png
-share/gnome/help/sound-juicer/nl/legal.xml
-share/gnome/help/sound-juicer/nl/sound-juicer.xml
-share/gnome/help/sound-juicer/uk/fdl-appendix.xml
-share/gnome/help/sound-juicer/uk/figures/prefs.png
-share/gnome/help/sound-juicer/uk/figures/startup.png
-share/gnome/help/sound-juicer/uk/legal.xml
-share/gnome/help/sound-juicer/uk/sound-juicer.xml
-share/icons/hicolor/16x16/apps/sound-juicer.png
-share/icons/hicolor/22x22/apps/sound-juicer.png
-share/icons/hicolor/24x24/apps/sound-juicer.png
-share/icons/hicolor/scalable/apps/sound-juicer.svg
-share/locale/ar/LC_MESSAGES/sound-juicer.mo
-share/locale/az/LC_MESSAGES/sound-juicer.mo
-share/locale/be/LC_MESSAGES/sound-juicer.mo
-share/locale/bg/LC_MESSAGES/sound-juicer.mo
-share/locale/bn/LC_MESSAGES/sound-juicer.mo
-share/locale/br/LC_MESSAGES/sound-juicer.mo
-share/locale/ca/LC_MESSAGES/sound-juicer.mo
-share/locale/cs/LC_MESSAGES/sound-juicer.mo
-share/locale/cy/LC_MESSAGES/sound-juicer.mo
-share/locale/da/LC_MESSAGES/sound-juicer.mo
-share/locale/de/LC_MESSAGES/sound-juicer.mo
-share/locale/el/LC_MESSAGES/sound-juicer.mo
-share/locale/en_CA/LC_MESSAGES/sound-juicer.mo
-share/locale/en_GB/LC_MESSAGES/sound-juicer.mo
-share/locale/es/LC_MESSAGES/sound-juicer.mo
-share/locale/et/LC_MESSAGES/sound-juicer.mo
-share/locale/eu/LC_MESSAGES/sound-juicer.mo
-share/locale/fa/LC_MESSAGES/sound-juicer.mo
-share/locale/fi/LC_MESSAGES/sound-juicer.mo
-share/locale/fr/LC_MESSAGES/sound-juicer.mo
-share/locale/gl/LC_MESSAGES/sound-juicer.mo
-share/locale/gu/LC_MESSAGES/sound-juicer.mo
-share/locale/hi/LC_MESSAGES/sound-juicer.mo
-share/locale/hr/LC_MESSAGES/sound-juicer.mo
-share/locale/hu/LC_MESSAGES/sound-juicer.mo
-share/locale/id/LC_MESSAGES/sound-juicer.mo
-share/locale/it/LC_MESSAGES/sound-juicer.mo
-share/locale/ja/LC_MESSAGES/sound-juicer.mo
-share/locale/ka/LC_MESSAGES/sound-juicer.mo
-share/locale/ko/LC_MESSAGES/sound-juicer.mo
-share/locale/lt/LC_MESSAGES/sound-juicer.mo
-share/locale/lv/LC_MESSAGES/sound-juicer.mo
-share/locale/mk/LC_MESSAGES/sound-juicer.mo
-share/locale/ml/LC_MESSAGES/sound-juicer.mo
-share/locale/ms/LC_MESSAGES/sound-juicer.mo
-share/locale/nb/LC_MESSAGES/sound-juicer.mo
-share/locale/ne/LC_MESSAGES/sound-juicer.mo
-share/locale/nl/LC_MESSAGES/sound-juicer.mo
-share/locale/no/LC_MESSAGES/sound-juicer.mo
-share/locale/pa/LC_MESSAGES/sound-juicer.mo
-share/locale/pl/LC_MESSAGES/sound-juicer.mo
-share/locale/pt/LC_MESSAGES/sound-juicer.mo
-share/locale/pt_BR/LC_MESSAGES/sound-juicer.mo
-share/locale/ro/LC_MESSAGES/sound-juicer.mo
-share/locale/ru/LC_MESSAGES/sound-juicer.mo
-share/locale/rw/LC_MESSAGES/sound-juicer.mo
-share/locale/sk/LC_MESSAGES/sound-juicer.mo
-share/locale/sq/LC_MESSAGES/sound-juicer.mo
-share/locale/sr/LC_MESSAGES/sound-juicer.mo
-share/locale/sr@Latn/LC_MESSAGES/sound-juicer.mo
-share/locale/sv/LC_MESSAGES/sound-juicer.mo
-share/locale/ta/LC_MESSAGES/sound-juicer.mo
-share/locale/th/LC_MESSAGES/sound-juicer.mo
-share/locale/tr/LC_MESSAGES/sound-juicer.mo
-share/locale/ug/LC_MESSAGES/sound-juicer.mo
-share/locale/uk/LC_MESSAGES/sound-juicer.mo
-share/locale/vi/LC_MESSAGES/sound-juicer.mo
-share/locale/xh/LC_MESSAGES/sound-juicer.mo
-share/locale/zh_CN/LC_MESSAGES/sound-juicer.mo
-share/locale/zh_HK/LC_MESSAGES/sound-juicer.mo
-share/locale/zh_TW/LC_MESSAGES/sound-juicer.mo
-share/omf/sound-juicer/sound-juicer-C.omf
-share/omf/sound-juicer/sound-juicer-es.omf
-share/omf/sound-juicer/sound-juicer-nl.omf
-share/omf/sound-juicer/sound-juicer-uk.omf
-share/sound-juicer/sj-play.png
-share/sound-juicer/sj-record.png
-share/sound-juicer/sound-juicer.glade
-@dirrm share/sound-juicer
-@dirrm share/omf/sound-juicer
-@dirrm share/gnome/help/sound-juicer/uk/figures
-@dirrm share/gnome/help/sound-juicer/uk
-@dirrm share/gnome/help/sound-juicer/nl/figures
-@dirrm share/gnome/help/sound-juicer/nl
-@dirrm share/gnome/help/sound-juicer/es/figures
-@dirrm share/gnome/help/sound-juicer/es
-@dirrm share/gnome/help/sound-juicer/C/figures
-@dirrm share/gnome/help/sound-juicer/C
-@dirrm share/gnome/help/sound-juicer
diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo
deleted file mode 100644
index 03764316482..00000000000
--- a/audio/sound-juicer/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/11/28 22:28:27 drochner Exp $
-
-SHA1 (sound-juicer-2.14.5.tar.gz) = b5403e12dcd0351ced9d6d0abe10a1849ce57aa9
-RMD160 (sound-juicer-2.14.5.tar.gz) = aa085a4b50b5316f87bdd6598e4cd6075890bbfe
-Size (sound-juicer-2.14.5.tar.gz) = 1155007 bytes
-SHA1 (patch-aa) = 58a5bf0a8d0e6f2f9a794180b1670a8f3d628641
-SHA1 (patch-ab) = 79f1ca7a198180789ee4c41ab54a3d9b1ecd197e
diff --git a/audio/sound-juicer/patches/patch-aa b/audio/sound-juicer/patches/patch-aa
deleted file mode 100644
index 2d45299c340..00000000000
--- a/audio/sound-juicer/patches/patch-aa
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/07/07 18:00:03 drochner Exp $
-
---- configure.orig 2006-07-07 18:50:16.000000000 +0200
-+++ configure
-@@ -23432,7 +23432,7 @@ fi
-
- # Find the GStreamer elements we use, and warn if they are not present.
-
-- if test "x$GST_INSPECT" == "x"; then
-+ if test "x$GST_INSPECT" = "x"; then
- # Extract the first word of "gst-inspect", so it can be a program name with args.
- set dummy gst-inspect; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -23486,7 +23486,7 @@ echo "$as_me: WARNING: The 'cdparanoia'
- fi
-
-
-- if test "x$GST_INSPECT" == "x"; then
-+ if test "x$GST_INSPECT" = "x"; then
- # Extract the first word of "gst-inspect", so it can be a program name with args.
- set dummy gst-inspect; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -23540,7 +23540,7 @@ echo "$as_me: WARNING: The 'vorbisenc' e
- fi
-
-
-- if test "x$GST_INSPECT" == "x"; then
-+ if test "x$GST_INSPECT" = "x"; then
- # Extract the first word of "gst-inspect", so it can be a program name with args.
- set dummy gst-inspect; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -23594,7 +23594,7 @@ echo "$as_me: WARNING: The 'flacenc' ele
- fi
-
-
-- if test "x$GST_INSPECT" == "x"; then
-+ if test "x$GST_INSPECT" = "x"; then
- # Extract the first word of "gst-inspect", so it can be a program name with args.
- set dummy gst-inspect; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -23648,7 +23648,7 @@ echo "$as_me: WARNING: The 'wavenc' elem
- fi
-
-
-- if test "x$GST_INSPECT" == "x"; then
-+ if test "x$GST_INSPECT" = "x"; then
- # Extract the first word of "gst-inspect", so it can be a program name with args.
- set dummy gst-inspect; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
diff --git a/audio/sound-juicer/patches/patch-ab b/audio/sound-juicer/patches/patch-ab
deleted file mode 100644
index 22fe2b1b933..00000000000
--- a/audio/sound-juicer/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/07/07 18:00:03 drochner Exp $
-
---- data/Makefile.in.orig 2006-04-28 21:42:55.000000000 +0200
-+++ data/Makefile.in
-@@ -484,7 +484,7 @@ uninstall-am: uninstall-desktopDATA unin
-
- install-icons:
- # This sucks
-- for size in 16x16 22x22 24x24 scalable; do mkdir --parents $(DESTDIR)/$(datadir)/icons/hicolor/$$size/apps; done
-+ for size in 16x16 22x22 24x24 scalable; do $(mkdir_p) $(DESTDIR)/$(datadir)/icons/hicolor/$$size/apps; done
- install -m 644 $(srcdir)/sound-juicer-16.png $(DESTDIR)/$(datadir)/icons/hicolor/16x16/apps/sound-juicer.png
- install -m 644 $(srcdir)/sound-juicer-22.png $(DESTDIR)/$(datadir)/icons/hicolor/22x22/apps/sound-juicer.png
- install -m 644 $(srcdir)/sound-juicer-24.png $(DESTDIR)/$(datadir)/icons/hicolor/24x24/apps/sound-juicer.png
diff --git a/audio/sox/DESCR b/audio/sox/DESCR
deleted file mode 100644
index 02fe2c3b27d..00000000000
--- a/audio/sox/DESCR
+++ /dev/null
@@ -1,15 +0,0 @@
-sox translates sound samples between different file formats,
-and performs various sound effects.
-
-This release understands "raw" files in various binary formats,
-raw textual data,
-Sound Blaster .VOC files, IRCAM SoundFile files, SUN Sparcstation
-.au files, mutant DEC .au files, Apple/SGI AIFF files,
-CD-R (music CD format), Macintosh HCOM files, Sounder files,
-NeXT .snd files, SUN ADPCM (compressed) .au files,
-and Soundtool (DOS) files.
-
-The sound effects include changing the sample rate, adding echo
-delay lines, applying low-, high, and band-pass filtering,
-reversing a sample in order to search for Satanic messages,
-and the infamous Fender Vibro effect.
diff --git a/audio/sox/Makefile b/audio/sox/Makefile
deleted file mode 100644
index 38309922656..00000000000
--- a/audio/sox/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# $NetBSD: Makefile,v 1.42 2007/03/06 23:55:07 gdt Exp $
-
-DISTNAME= sox-13.0.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sox/} \
- http://www.cnpbagwell.com/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://sox.sourceforge.net/
-COMMENT= SOund eXchange - universal sound sample translator
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= pkg-config
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.sox
-PKG_SUPPORTED_OPTIONS= lame
-# lame has LICENSE= issues and thus should not be SUGGESTED.
-PKG_SUGGESTED_OPTIONS=
-.include "../../mk/bsd.options.mk"
-
-SUBST_CLASSES+= lrf
-SUBST_FILES.lrf= src/libst-config.in
-SUBST_SED.lrf= -e "s!@LRF@!"${LINKER_RPATH_FLAG}"!"
-SUBST_STAGE.lrf= pre-configure
-
-SUBST_CLASSES+= gsm
-SUBST_FILES.gsm= configure src/gsm.c src/wav.c
-SUBST_SED.gsm= -e "s!gsm/gsm.h!gsm.h!"
-SUBST_STAGE.gsm= pre-configure
-
-# needs obsolete FLAC API
-#.include "../../audio/flac/buildlink3.mk"
-.include "../../audio/gsm/buildlink3.mk"
-.if !empty(PKG_OPTIONS:Mlame)
-# This is an option due to LICENSE= issues.
-.include "../../audio/lame/buildlink3.mk"
-.endif
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/libsndfile/buildlink3.mk"
-.include "../../audio/libsamplerate/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/sox/PLIST b/audio/sox/PLIST
deleted file mode 100644
index 114bb1facff..00000000000
--- a/audio/sox/PLIST
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2007/02/22 23:23:03 wiz Exp $
-bin/libst-config
-bin/play
-bin/rec
-bin/sox
-include/st.h
-include/ststdint.h
-lib/libst.la
-man/man1/play.1
-man/man1/rec.1
-man/man1/sox.1
-man/man3/libst.3
-man/man7/soxexam.7
diff --git a/audio/sox/distinfo b/audio/sox/distinfo
deleted file mode 100644
index f7197f87ac3..00000000000
--- a/audio/sox/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.16 2007/02/22 23:34:42 wiz Exp $
-
-SHA1 (sox-13.0.0.tar.gz) = db0e6a7356b8fcbc72cf0dca1d81782fc3fa48f4
-RMD160 (sox-13.0.0.tar.gz) = 84e7c8dea4f3a9145f9b42f7f03ac2329f3b83f2
-Size (sox-13.0.0.tar.gz) = 725259 bytes
-SHA1 (patch-aa) = c21bd9f1b9ba2440abd47b4aacc9721d0a2a6589
-SHA1 (patch-ab) = 3973227e19b0a1128b8faa4ab88074dcf51e100d
-SHA1 (patch-ac) = 53aee94b525c7856c49c8c948377c88973f2e651
-SHA1 (patch-ad) = efe2df76606544754a2c6d44bd9488e359a8caa8
diff --git a/audio/sox/patches/patch-aa b/audio/sox/patches/patch-aa
deleted file mode 100644
index 80ff3baeb8c..00000000000
--- a/audio/sox/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2007/02/22 23:23:04 wiz Exp $
-
---- configure.orig 2007-02-22 22:45:00.000000000 +0000
-+++ configure
-@@ -20972,6 +20972,7 @@ fi
-
- done
-
-+with_oss=no
- if test "$with_oss" = yes; then
-
- cat >>confdefs.h <<\_ACEOF
diff --git a/audio/sox/patches/patch-ab b/audio/sox/patches/patch-ab
deleted file mode 100644
index c9fd9805b7e..00000000000
--- a/audio/sox/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.11 2007/02/22 23:23:04 wiz Exp $
-
---- src/Makefile.in.orig 2007-02-11 19:49:58.000000000 +0000
-+++ src/Makefile.in
-@@ -164,6 +164,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
- RANLIB = @RANLIB@
-+RM = rm -f
- SAMPLERATE_CFLAGS = @SAMPLERATE_CFLAGS@
- SAMPLERATE_LIBS = @SAMPLERATE_LIBS@
- SED = @SED@
diff --git a/audio/sox/patches/patch-ac b/audio/sox/patches/patch-ac
deleted file mode 100644
index f46b460d3c9..00000000000
--- a/audio/sox/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.10 2007/02/22 23:23:04 wiz Exp $
-
---- Makefile.in.orig 2007-02-11 19:48:39.000000000 +0000
-+++ Makefile.in
-@@ -136,6 +136,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
- RANLIB = @RANLIB@
-+RM = rm -f
- SAMPLERATE_CFLAGS = @SAMPLERATE_CFLAGS@
- SAMPLERATE_LIBS = @SAMPLERATE_LIBS@
- SED = @SED@
diff --git a/audio/sox/patches/patch-ad b/audio/sox/patches/patch-ad
deleted file mode 100644
index 85de06c618e..00000000000
--- a/audio/sox/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2007/02/22 23:34:43 wiz Exp $
-
---- src/libst-config.in.orig 2004-09-01 19:49:24.000000000 +0000
-+++ src/libst-config.in
-@@ -17,9 +17,9 @@ case "$1" in
- --libdir)
- echo $libdir;;
- --libs)
-- echo $libs;;
-+ echo "@LRF@'$libdir' -L'$libdir' $libs";;
- --cflags)
-- echo "-L'$libdir' -I'$includedir'";;
-+ echo -I$includedir;;
- *)
- echo "Usage: $0 [--prefix|--includedir|--libdir|--cflags|--libs]"
- exit 1;;
diff --git a/audio/speex/DESCR b/audio/speex/DESCR
deleted file mode 100644
index 8b557db62ae..00000000000
--- a/audio/speex/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-The Speex project aims to build an open-source, patent-free voice
-codec. Unlike other codecs like MP3 and Ogg Vorbis, Speex is
-specially designed for compressing voice at low bitrates in the
-8-32 kbps/channel range. Possible applications include Voice over
-IP (VoIP), internet audio streaming, archiving of speech data (e.g.
-voice mail), and audio books. In some sense, it is meant to be
-complementary to the Ogg Vorbis codec.
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
deleted file mode 100644
index c1ebaa1bf3e..00000000000
--- a/audio/speex/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2007/02/22 19:26:07 wiz Exp $
-#
-
-DISTNAME= speex-1.0.5
-CATEGORIES= audio
-MASTER_SITES= http://downloads.us.xiph.org/releases/speex/
-
-MAINTAINER= wiz@NetBSD.org
-HOMEPAGE= http://www.speex.org/
-COMMENT= Open-source, patent-free voice codec
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-USE_LIBTOOL= YES
-GNU_CONFIGURE= YES
-PKGCONFIG_OVERRIDE= speex.pc.in
-USE_TOOLS+= pkg-config
-
-# previous versions of the package were called Speex
-CONFLICTS= Speex-[0-9]*
-
-CONFIGURE_ARGS+= --with-ogg-dir="${BUILDLINK_PREFIX.libogg}"
-
-# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE:Q}
-
-BUILDLINK_TRANSFORM+= l:gnugetopt:getopt
-
-.include "../../devel/libgetopt/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/speex/PLIST b/audio/speex/PLIST
deleted file mode 100644
index 7f2a375554f..00000000000
--- a/audio/speex/PLIST
+++ /dev/null
@@ -1,21 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2004/09/22 08:09:17 jlam Exp $
-bin/speexdec
-bin/speexenc
-include/speex.h
-include/speex/speex.h
-include/speex/speex_bits.h
-include/speex/speex_callbacks.h
-include/speex/speex_header.h
-include/speex/speex_stereo.h
-include/speex_bits.h
-include/speex_callbacks.h
-include/speex_header.h
-include/speex_stereo.h
-lib/libspeex.la
-lib/pkgconfig/speex.pc
-man/man1/speexdec.1
-man/man1/speexenc.1
-share/aclocal/speex.m4
-share/doc/speex-${PKGVERSION}/manual.pdf
-@dirrm share/doc/speex-${PKGVERSION}
-@dirrm include/speex
diff --git a/audio/speex/buildlink3.mk b/audio/speex/buildlink3.mk
deleted file mode 100644
index 6d0775f05b7..00000000000
--- a/audio/speex/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:37 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-SPEEX_BUILDLINK3_MK:= ${SPEEX_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= speex
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nspeex}
-BUILDLINK_PACKAGES+= speex
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}speex
-
-.if !empty(SPEEX_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.speex+= speex>=1.0.4
-BUILDLINK_ABI_DEPENDS.speex+= speex>=1.0.4nb1
-BUILDLINK_PKGSRCDIR.speex?= ../../audio/speex
-.endif # SPEEX_BUILDLINK3_MK
-
-.include "../../multimedia/libogg/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/speex/distinfo b/audio/speex/distinfo
deleted file mode 100644
index 5bce560804c..00000000000
--- a/audio/speex/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.10 2006/03/11 03:14:43 reed Exp $
-
-SHA1 (speex-1.0.5.tar.gz) = a8f34f80e5f84a47aee7e70088632d4958fe75fd
-RMD160 (speex-1.0.5.tar.gz) = 6ceed29438912647ef1d2d7299822fdaaf5509f9
-Size (speex-1.0.5.tar.gz) = 546872 bytes
-SHA1 (patch-aa) = 675bbd2696852002d73fc778a3c1125435eb0fc6
-SHA1 (patch-ab) = b88dfafc1464aed7c5f38f39a270d16338335418
diff --git a/audio/speex/patches/patch-aa b/audio/speex/patches/patch-aa
deleted file mode 100644
index 00e0ba54608..00000000000
--- a/audio/speex/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/04/27 09:13:07 wiz Exp $
-
---- speex.m4.orig 2004-07-14 07:29:08.000000000 +0200
-+++ speex.m4
-@@ -7,7 +7,7 @@
- dnl XIPH_PATH_SPEEX([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
- dnl Test for libspeex, and define SPEEX_CFLAGS and SPEEX_LIBS
- dnl
--AC_DEFUN(XIPH_PATH_SPEEX,
-+AC_DEFUN([XIPH_PATH_SPEEX],
- [dnl
- dnl Get the cflags and libraries
- dnl
diff --git a/audio/speex/patches/patch-ab b/audio/speex/patches/patch-ab
deleted file mode 100644
index 01ff9dbf783..00000000000
--- a/audio/speex/patches/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2006/03/11 03:14:43 reed Exp $
-
---- src/Makefile.in.orig 2004-07-15 00:25:20.000000000 -0700
-+++ src/Makefile.in
-@@ -183,7 +183,7 @@ install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
--mandir = $(prefix)/share/man
-+mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
-@@ -199,9 +199,9 @@ EXTRA_DIST = $(man_MANS) getopt_win.h ge
- include_HEADERS =
- noinst_HEADERS = wav_io.h
- speexenc_SOURCES = speexenc.c wav_io.c
--speexenc_LDADD = $(top_builddir)/libspeex/libspeex.la $(OGG_LDFLAGS) $(OGG_LIBS)
-+speexenc_LDADD = $(top_builddir)/libspeex/libspeex.la $(OGG_LDFLAGS) $(OGG_LIBS) $(LIBOSSAUDIO)
- speexdec_SOURCES = speexdec.c wav_io.c
--speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la $(OGG_LDFLAGS) $(OGG_LIBS)
-+speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la $(OGG_LDFLAGS) $(OGG_LIBS) $(LIBOSSAUDIO)
- all: all-am
-
- .SUFFIXES:
diff --git a/audio/spiralloops/DESCR b/audio/spiralloops/DESCR
deleted file mode 100644
index 3a6552d63da..00000000000
--- a/audio/spiralloops/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-SpiralLoops is an experimental loop based sampler for Linux or BSD.
-
-The idea of SpiralLoops is to provide a simple, visual tool for looping and
-layering of sounds; which can be sourced from either wav files on disk, or
-from sound generating plugins.
-
-SpiralLoops allows you to create loop based compositions with the minimum
-feedback time between the decisions you make and your ears. The looping
-mechanism is very flexible, you can lock the timing of loops together, or
-offset them for creating complex sequences, such as polyrhythms.
diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile
deleted file mode 100644
index a3ba440ff59..00000000000
--- a/audio/spiralloops/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.28 2006/12/15 14:34:19 wiz Exp $
-#
-
-DISTNAME= SpiralLoops-2.0.0
-PKGNAME= spiralloops-2.0.0
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= http://www.pawfal.org/Software/SpiralLoops/dload/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.pawfal.org/Software/SpiralLoops/
-COMMENT= Loop based sampler
-
-# only runs correctly on little-endian machines
-ONLY_FOR_PLATFORM= *-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \
- *-*-hpcmips *-*-hpcsh *-*-i386 *-*-pc532 *-*-pmax \
- *-*-vax
-
-USE_LANGUAGES= c c++
-USE_TOOLS+= gmake
-GNU_CONFIGURE= yes
-MAKE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q}
-CXXFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
-CXXFLAGS+= -DFLTK_1_0_COMPAT
-
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/SpiralLoops ${PREFIX}/bin
-
-.include "../../x11/fltk/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/spiralloops/PLIST b/audio/spiralloops/PLIST
deleted file mode 100644
index 0638ca00fc9..00000000000
--- a/audio/spiralloops/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:57 zuntum Exp $
-bin/SpiralLoops
diff --git a/audio/spiralloops/distinfo b/audio/spiralloops/distinfo
deleted file mode 100644
index 992edffd773..00000000000
--- a/audio/spiralloops/distinfo
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: distinfo,v 1.9 2006/01/05 15:35:07 joerg Exp $
-
-SHA1 (SpiralLoops-2.0.0.tar.gz) = 47d9caa17f20827abef7708bff212bb3fad58a72
-RMD160 (SpiralLoops-2.0.0.tar.gz) = b164bacf6d18128111959dbca079883b7fde8d85
-Size (SpiralLoops-2.0.0.tar.gz) = 85458 bytes
-SHA1 (patch-aa) = 6dcc532e44e03a7f4d9b2d1f3e2062308b2854be
-SHA1 (patch-ab) = 9b276f356d2da5eda3b0ed49e58f1bde6cc87de6
-SHA1 (patch-ac) = 04946ad637a6e0a371e604ffaadd15c119f796da
-SHA1 (patch-ad) = 09c1734e875335dae92afef7bbbd4fdc6821eb1f
-SHA1 (patch-ae) = 757ca5ca1c4f50a7848c947962efbc0148f1ccdc
-SHA1 (patch-af) = 188cbce0dfad25fe617811000487821950f78d54
-SHA1 (patch-ag) = 1ad208ec5e7eeeee91ab1e5acb359f24858c4d39
-SHA1 (patch-ah) = f57d79b3467df16b4e6e0776f3457f97e5570210
-SHA1 (patch-ai) = 6329de61c54ee353540a48b5b5d7e6bdc5b6e44b
-SHA1 (patch-aj) = 19c1d640a0c9ec3f6f873cd203c9c61e89eb824a
-SHA1 (patch-ak) = 94e4650bc10a7073718a83b27ab47e217cf15f85
-SHA1 (patch-al) = 2189bef16fa9099497667fdfd7b5e54c4fc4bb48
-SHA1 (patch-am) = 25fdb4422dd007d7ebee50a3fb2e2accc72b275b
-SHA1 (patch-an) = f86cb89933e7c1a57d696283e398a40a579c04f1
-SHA1 (patch-ao) = fb30e505afb754536a07f0537109ceaeb343a5e4
-SHA1 (patch-ap) = adde17445fa15afa122dc1addf0c06f6504bef0c
-SHA1 (patch-aq) = 3f21e84fcbc911ebaf3bb60009f7f0b4b60c801a
diff --git a/audio/spiralloops/patches/patch-aa b/audio/spiralloops/patches/patch-aa
deleted file mode 100644
index 81ef35eb5ae..00000000000
--- a/audio/spiralloops/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2003/07/22 20:36:37 jmmv Exp $
-
---- Makefile.in.orig Mon May 7 14:42:59 2001
-+++ Makefile.in
-@@ -9,12 +9,12 @@
-
- CC = gcc
- CXX = g++
--CFLAGS = -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused
--CXXFLAGS= -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused
--INCPATH = -I/usr/X11R6/include
--LINK = g++
-+CFLAGS += -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused
-+CXXFLAGS+= -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused
-+INCPATH =
-+LINK = g++ ${LDFLAGS}
- LFLAGS =
--LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
-+LIBS = -lfltk -lGL -lXext -lX11 -lm ${LIBOSSAUDIO}
- MOC = moc
- UIC =
- TAR = tar -cf
diff --git a/audio/spiralloops/patches/patch-ab b/audio/spiralloops/patches/patch-ab
deleted file mode 100644
index ce630115fc2..00000000000
--- a/audio/spiralloops/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/07/22 20:36:37 jmmv Exp $
-
---- SpiralLoopsInfo.C.orig Thu Apr 19 13:48:19 2001
-+++ SpiralLoopsInfo.C
-@@ -24,7 +24,7 @@
- float SpiralInfo::VALUECONV = 1.0f/MAXSAMPLE;
- bool SpiralInfo::WANTMIDI = false;
- int SpiralInfo::FILTERGRAN = 50;
--string SpiralInfo::OUTPUTFILE = "/dev/dsp";
-+string SpiralInfo::OUTPUTFILE = DEVOSSAUDIO;
- string SpiralInfo::MIDIFILE = "/dev/midi";
- int SpiralInfo::POLY = 1;
- bool SpiralInfo::REALTIMEOUT = true;
diff --git a/audio/spiralloops/patches/patch-ac b/audio/spiralloops/patches/patch-ac
deleted file mode 100644
index ce23fbdf2ec..00000000000
--- a/audio/spiralloops/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2003/07/22 20:36:37 jmmv Exp $
-
---- SpiralInfo.C.orig Thu Apr 19 13:48:08 2001
-+++ SpiralInfo.C
-@@ -33,7 +33,7 @@
- float SpiralInfo::VALUECONV = 1.0f/MAXSAMPLE;
- bool SpiralInfo::WANTMIDI = true;
- int SpiralInfo::FILTERGRAN = 50;
--string SpiralInfo::OUTPUTFILE = "/dev/dsp";
-+string SpiralInfo::OUTPUTFILE = DEVOSSAUDIO;
- string SpiralInfo::MIDIFILE = "/dev/midi";
- int SpiralInfo::POLY = 2;
- bool SpiralInfo::REALTIMEOUT = true;
diff --git a/audio/spiralloops/patches/patch-ad b/audio/spiralloops/patches/patch-ad
deleted file mode 100644
index 0627031e79f..00000000000
--- a/audio/spiralloops/patches/patch-ad
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/08/12 22:27:05 zuntum Exp $
-
---- SpiralSound/Output.h.orig Thu Apr 19 13:48:12 2001
-+++ SpiralSound/Output.h
-@@ -16,6 +16,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#include <sys/ioctl.h>
- #include <sys/types.h>
- #include <stdio.h>
- #include <fcntl.h>
-@@ -25,12 +26,10 @@
- #else
- #if defined (__NetBSD__) || defined (__OpenBSD__)
- #include <soundcard.h> /* OSS emulation */
--#undef ioctl
- #else /* BSDI, Linux, Solaris */
- #include <sys/soundcard.h>
- #endif /* __NetBSD__ or __OpenBSD__ */
- #endif /* __FreeBSD__ */
--#include <sys/ioctl.h>
- #include <limits.h>
-
- #include "SpiralInfo.h"
diff --git a/audio/spiralloops/patches/patch-ae b/audio/spiralloops/patches/patch-ae
deleted file mode 100644
index 85f24d69809..00000000000
--- a/audio/spiralloops/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/08/12 22:27:05 zuntum Exp $
-
---- SpiralLoops.C.orig Thu Apr 19 13:48:11 2001
-+++ SpiralLoops.C
-@@ -48,6 +48,7 @@
- m_PluginLinked(false),
- m_PluginPaused(false),
- m_PluginWindow(NULL),
-+m_PluginBuffer(NULL),
- m_DelayGUI(&m_Delay),
- m_ReverbGUI(&m_Reverb),
- m_Out(2),
diff --git a/audio/spiralloops/patches/patch-af b/audio/spiralloops/patches/patch-af
deleted file mode 100644
index a73dd4fc0d2..00000000000
--- a/audio/spiralloops/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/12/19 16:37:54 ben Exp $
-
---- SpiralSound/SpiralInfo.h.orig 2001-04-19 13:48:12.000000000 -0700
-+++ SpiralSound/SpiralInfo.h
-@@ -16,6 +16,8 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+using namespace std;
-+
- #include <iostream.h>
- #include <string>
- #include <stdlib.h>
diff --git a/audio/spiralloops/patches/patch-ag b/audio/spiralloops/patches/patch-ag
deleted file mode 100644
index afa0e55429f..00000000000
--- a/audio/spiralloops/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2003/12/19 16:37:54 ben Exp $
-
---- SpiralSound/Sample.C.orig 2001-04-19 13:48:13.000000000 -0700
-+++ SpiralSound/Sample.C
-@@ -20,7 +20,7 @@
- #include "Sample.h"
- #include "iostream.h"
-
--Sample::Sample(int Len=0) :
-+Sample::Sample(int Len) :
- m_Data(NULL),
- m_Length(0)
- {
diff --git a/audio/spiralloops/patches/patch-ah b/audio/spiralloops/patches/patch-ah
deleted file mode 100644
index 2b97fdbdc07..00000000000
--- a/audio/spiralloops/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2003/12/19 16:37:54 ben Exp $
-
---- SpiralSound/SpiralInfo.C.orig 2001-04-19 13:48:13.000000000 -0700
-+++ SpiralSound/SpiralInfo.C
-@@ -22,7 +22,7 @@
-
- #include "SpiralInfo.h"
-
--float RandFloat(float s=0.0f, float e=1.0f)
-+float RandFloat(float s, float e)
- {
- return s+((rand()%10000/10000.0)*(e-s));
- }
diff --git a/audio/spiralloops/patches/patch-ai b/audio/spiralloops/patches/patch-ai
deleted file mode 100644
index da97fd00e10..00000000000
--- a/audio/spiralloops/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2003/12/19 16:37:54 ben Exp $
-
---- SpiralSound/Output.C.orig 2001-04-19 13:48:12.000000000 -0700
-+++ SpiralSound/Output.C
-@@ -29,7 +29,7 @@ m_Channels(Channels)
- m_Buffer.Zero();
- }
-
--void Output::Send(Sample &data, float LeftVolume=1, float RightVolume=1)
-+void Output::Send(Sample &data, float LeftVolume, float RightVolume)
- {
- long temp;
- int on=0;
diff --git a/audio/spiralloops/patches/patch-aj b/audio/spiralloops/patches/patch-aj
deleted file mode 100644
index 3f132588210..00000000000
--- a/audio/spiralloops/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2003/12/19 16:37:54 ben Exp $
-
---- SpiralSound/RiffWav.C.orig 2001-04-19 13:48:12.000000000 -0700
-+++ SpiralSound/RiffWav.C
-@@ -55,7 +55,7 @@ WavFile::HeaderInfo::HeaderInfo() : Riff
- #endif
- }
-
--int WavFile::Open(string FileName, Mode mode, Channels channels=MONO)
-+int WavFile::Open(string FileName, Mode mode, Channels channels)
- {
- if (m_Stream!=NULL)
- {
diff --git a/audio/spiralloops/patches/patch-ak b/audio/spiralloops/patches/patch-ak
deleted file mode 100644
index a2d5b0fc762..00000000000
--- a/audio/spiralloops/patches/patch-ak
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2003/12/19 16:37:54 ben Exp $
-
---- GUI/ScopeGUI.C.orig 2001-04-19 13:48:11.000000000 -0700
-+++ GUI/ScopeGUI.C
-@@ -23,7 +23,7 @@
-
- #include <FL/fl_draw.H>
-
--ScopeWidget::ScopeWidget(int x,int y,int w,int h,const char *l=0) :
-+ScopeWidget::ScopeWidget(int x,int y,int w,int h,const char *l) :
- Fl_Widget(x,y,w,h,l),
- m_Channels(1)
- {
-@@ -69,7 +69,7 @@ void ScopeGUI::Display(const short *data
- if (!m_Bypass) m_Scope->redraw();
- }
-
--void ScopeGUI::CreateGUI(int xoff=0, int yoff=0, char *name)
-+void ScopeGUI::CreateGUI(int xoff, int yoff, char *name)
- {
- Fl_Group* o = GUIScopeGroup = new Fl_Group(xoff, yoff, 225, 110, name);
- o->type(1);
diff --git a/audio/spiralloops/patches/patch-al b/audio/spiralloops/patches/patch-al
deleted file mode 100644
index ca70e0ff316..00000000000
--- a/audio/spiralloops/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1 2003/12/19 16:37:54 ben Exp $
-
---- GUI/OutputGUI.C.orig 2001-04-19 13:48:10.000000000 -0700
-+++ GUI/OutputGUI.C
-@@ -26,7 +26,7 @@ OutputGUI::OutputGUI(Output *o)
- if (!m_out) cerr<<"WARNING: Output not correctly set up"<<endl;
- }
-
--void OutputGUI::CreateGUI(int xoff=0, int yoff=0, char *name)
-+void OutputGUI::CreateGUI(int xoff, int yoff, char *name)
- {
- Fl_Group* o = GUIMixGroup = new Fl_Group(xoff, yoff, 85, 110, name);
- o->type(1);
diff --git a/audio/spiralloops/patches/patch-am b/audio/spiralloops/patches/patch-am
deleted file mode 100644
index 392f9d15f58..00000000000
--- a/audio/spiralloops/patches/patch-am
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-am,v 1.2 2004/02/15 05:13:53 ben Exp $
-
---- GUI/Widgets/Fl_Knob.cxx.orig 2001-04-19 13:48:10.000000000 -0700
-+++ GUI/Widgets/Fl_Knob.cxx
-@@ -4,7 +4,7 @@
- #include <FL/fl_draw.H>
- #include <math.h>
-
--Fl_Knob::Fl_Knob(int xx,int yy,int ww,int hh,const char *l=0): Fl_Valuator(xx,yy,ww,hh,l) {
-+Fl_Knob::Fl_Knob(int xx,int yy,int ww,int hh,const char *l): Fl_Valuator(xx,yy,ww,hh,l) {
- a1 = 35;
- a2 = 325;
- _type = DOTLIN;
-@@ -40,7 +40,7 @@ unsigned char rr,gg,bb;
- int dam = damage();
- if (dam & FL_DAMAGE_ALL)
- {
-- int col = parent()->color();
-+ int col = color();
- fl_color(col);
- fl_rectf(ox,oy,side,side);
- Fl::get_color((Fl_Color)col,rr,gg,bb);
diff --git a/audio/spiralloops/patches/patch-an b/audio/spiralloops/patches/patch-an
deleted file mode 100644
index ff074dbbc12..00000000000
--- a/audio/spiralloops/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1 2003/12/19 16:37:54 ben Exp $
-
---- GUI/Widgets/Fl_Loop.C.orig 2001-04-19 13:48:10.000000000 -0700
-+++ GUI/Widgets/Fl_Loop.C
-@@ -30,7 +30,7 @@ static const float RADCONV = 0.017453292
- static const int INDW = 3; // indicator width
- static const int UPDATECYCLES = 4;
-
--Fl_Loop::Fl_Loop(int x, int y, int w, int h, const char* label=0) :
-+Fl_Loop::Fl_Loop(int x, int y, int w, int h, const char* label) :
- Fl_Double_Window(x,y,w,h,label),
- m_data(NULL),
- m_MainWin(NULL),
diff --git a/audio/spiralloops/patches/patch-ao b/audio/spiralloops/patches/patch-ao
deleted file mode 100644
index 540fe2da57a..00000000000
--- a/audio/spiralloops/patches/patch-ao
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ao,v 1.3 2004/02/15 06:09:45 ben Exp $
-
---- GUI/Widgets/Fl_LED_Button.cxx.orig 2001-04-19 13:48:11.000000000 -0700
-+++ GUI/Widgets/Fl_LED_Button.cxx
-@@ -3,7 +3,7 @@
- #include "Fl_LED_Button.H"
- #include <FL/fl_draw.H>
-
--Fl_LED_Button::Fl_LED_Button(int x, int y, int w, int h, const char* l=0):Fl_Light_Button(x,y,w,h,l) {
-+Fl_LED_Button::Fl_LED_Button(int x, int y, int w, int h, const char* l):Fl_Light_Button(x,y,w,h,l) {
- box(FL_NO_BOX);
- down_box(FL_ROUND_DOWN_BOX);
- selection_color(FL_RED);
-@@ -25,7 +25,7 @@ void Fl_LED_Button::draw() {
- int y1 = y()+d+3;
- int ww = W-2*d-6;
- int hh = W-2*d-6;
-- Fl::get_color(parent()->color(),r,g,b);
-+ Fl::get_color(color(),r,g,b);
- modulate(-90,r,g,b);
- fl_pie(x1-1,y1-1,ww+2,hh+2,0,360);
- Fl::get_color((Fl_Color)selection_color(),r,g,b);
diff --git a/audio/spiralloops/patches/patch-ap b/audio/spiralloops/patches/patch-ap
deleted file mode 100644
index 28101b979be..00000000000
--- a/audio/spiralloops/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2003/12/19 16:37:54 ben Exp $
-
---- GUI/Widgets/Fl_Trigger.C.orig 2001-05-07 13:43:34.000000000 -0700
-+++ GUI/Widgets/Fl_Trigger.C
-@@ -27,7 +27,7 @@
-
- static const float RADCONV = 0.017453292;
-
--Fl_Trigger::Fl_Trigger(int x, int y, int w, int h, const char* label=0) :
-+Fl_Trigger::Fl_Trigger(int x, int y, int w, int h, const char* label) :
- Fl_Widget(x,y,w,h,label),
- m_CentreX(0),
- m_CentreY(0),
diff --git a/audio/spiralloops/patches/patch-aq b/audio/spiralloops/patches/patch-aq
deleted file mode 100644
index ef151892d74..00000000000
--- a/audio/spiralloops/patches/patch-aq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2006/01/05 15:35:44 joerg Exp $
-
---- SpiralLoops.h.orig 2006-01-05 15:31:41.000000000 +0000
-+++ SpiralLoops.h
-@@ -89,7 +89,7 @@ private:
- Sample*(*Run)(void);
- void (*Destroy)(void);
- void *handle;
-- char *error;
-+ const char *error;
- Sample *m_PluginBuffer;
- bool m_PluginOpen;
- bool m_PluginLinked;
diff --git a/audio/spiralsynth/DESCR b/audio/spiralsynth/DESCR
deleted file mode 100644
index 13428e2e94a..00000000000
--- a/audio/spiralsynth/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Spiral Synth is a physically modelled polyphonic analogue synthesizer for
-Linux or BSD. It is capable of creating the kind of sounds made by
-hardware analogue synths, the noises used in electronic music. You can
-also use it to make stranger sounds too. Midi is supported, including
-velocity detection, mapped to the volume of the oscillators (But you can
-also use the PC keyboard to play the synth).
diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile
deleted file mode 100644
index 778511ffd3d..00000000000
--- a/audio/spiralsynth/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2006/12/15 14:34:19 wiz Exp $
-#
-
-DISTNAME= SpiralSynth-2.0.0
-PKGNAME= spiralsynth-2.0.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= http://www.pawfal.org/Software/SpiralSynth/dload/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.pawfal.org/Software/SpiralSynth/
-COMMENT= Polyphonic analogue softsynth
-
-# only runs correctly on little-endian machines
-ONLY_FOR_PLATFORM= *-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \
- *-*-hpcmips *-*-hpcsh *-*-i386 *-*-pc532 *-*-pmax \
- *-*-vax
-
-USE_LANGUAGES= c c++
-USE_TOOLS+= gmake
-GNU_CONFIGURE= yes
-MAKE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q}
-CXXFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
-
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/SpiralSynth ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/spiralsynth
- ${INSTALL_DATA} ${WRKSRC}/.SpiralPatches.bank \
- ${WRKSRC}/.Spiralrc ${PREFIX}/share/spiralsynth
-
-.include "../../x11/fltk/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/spiralsynth/PLIST b/audio/spiralsynth/PLIST
deleted file mode 100644
index 2e2d898ec7a..00000000000
--- a/audio/spiralsynth/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/26 01:14:26 rh Exp $
-bin/SpiralSynth
-share/spiralsynth/.SpiralPatches.bank
-share/spiralsynth/.Spiralrc
-@dirrm share/spiralsynth
diff --git a/audio/spiralsynth/distinfo b/audio/spiralsynth/distinfo
deleted file mode 100644
index 2bc881b1a39..00000000000
--- a/audio/spiralsynth/distinfo
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: distinfo,v 1.11 2006/01/05 15:33:00 joerg Exp $
-
-SHA1 (SpiralSynth-2.0.0.tar.gz) = ea42c5b7710237139f5281cf0c4ca155c184c4cd
-RMD160 (SpiralSynth-2.0.0.tar.gz) = c05f38a9ae8b8b87f520c11854631e6dfa00c034
-Size (SpiralSynth-2.0.0.tar.gz) = 66263 bytes
-SHA1 (patch-aa) = 01e4f4348761ca5c3e7e7c9dce0e13fa0b2b986f
-SHA1 (patch-ab) = 49ea69a000b68c3c6ec07fefa9f1e2a415abb0f0
-SHA1 (patch-ad) = 235afa6618c5ec5aef2ca3448388f11757918832
-SHA1 (patch-ae) = b0c36c839504ecef6c781609ebd9fef266249645
-SHA1 (patch-af) = 88d1a457ad82184a1d5f34e3f56de2d8fb7daf89
-SHA1 (patch-ag) = fab78772ee8b451f60b69597c9844e7c6aae465c
-SHA1 (patch-ah) = d2ff3c4ddd4da9c96a74c3f898aa3429dcc51bb9
-SHA1 (patch-ai) = e21a111e3e52fc3c24433f248fa1bfdf566e72dd
-SHA1 (patch-aj) = 7e3e29fbfd38428d68f195db8a7f5007c1417c88
-SHA1 (patch-ak) = 67643c5abea0498f8ea046c5abd52f2d328a5538
-SHA1 (patch-al) = 7436bce933cbddcd4f869ab2cbbe27762d4273e5
-SHA1 (patch-am) = 4899c78015028a6e8047e5527362646e40a10708
-SHA1 (patch-an) = 2bafb1a9a959816af43a858fdb4a9df5586a91e9
-SHA1 (patch-ao) = 138f58bd7fae0226690747efcb8daf472e3a5337
diff --git a/audio/spiralsynth/patches/patch-aa b/audio/spiralsynth/patches/patch-aa
deleted file mode 100644
index 3a66e7869e3..00000000000
--- a/audio/spiralsynth/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2006/01/05 15:33:00 joerg Exp $
-
---- Makefile.in.orig Thu Jun 13 14:56:01 2002
-+++ Makefile.in
-@@ -9,12 +9,12 @@
-
- CC = gcc
- CXX = g++
--CFLAGS = -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused -g
--CXXFLAGS= -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused -g
--INCPATH = -I/usr/X11R6/include
--LINK = g++
-+CFLAGS+= -pipe -Wall -DNO_DEBUG -Wno-unused -g
-+CXXFLAGS+= -pipe -Wall -DNO_DEBUG -Wno-unused -g
-+INCPATH =
-+LINK = g++ ${LDFLAGS}
- LFLAGS =
--LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -lpthread
-+LIBS = -lfltk -lGL -lXext -lX11 -lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} ${LIBOSSAUDIO}
- MOC = moc
- UIC =
-
diff --git a/audio/spiralsynth/patches/patch-ab b/audio/spiralsynth/patches/patch-ab
deleted file mode 100644
index 2a1faa5055e..00000000000
--- a/audio/spiralsynth/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2004/11/25 17:24:27 ben Exp $
-
---- SpiralInfo.C.orig Sun Jun 2 08:44:31 2002
-+++ SpiralInfo.C
-@@ -22,7 +22,7 @@
-
- #include "SpiralSound/SpiralInfo.h"
-
--float RandFloat(float s=0.0f, float e=1.0f)
-+float RandFloat(float s, float e)
- {
- return s+((rand()%10000/10000.0)*(e-s));
- }
-@@ -42,7 +42,7 @@ int SpiralInfo::SAMPLERATE = 44100;
- float SpiralInfo::MAXSAMPLE = 1.0f;
- bool SpiralInfo::WANTMIDI = true;
- int SpiralInfo::FILTERGRAN = 50;
--string SpiralInfo::OUTPUTFILE = "/dev/dsp";
-+string SpiralInfo::OUTPUTFILE = DEVOSSAUDIO;
- string SpiralInfo::MIDIFILE = "/dev/midi";
- int SpiralInfo::POLY = 2;
- bool SpiralInfo::REALTIMEOUT = true;
diff --git a/audio/spiralsynth/patches/patch-ad b/audio/spiralsynth/patches/patch-ad
deleted file mode 100644
index a9774e10a9e..00000000000
--- a/audio/spiralsynth/patches/patch-ad
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2004/11/25 17:24:27 ben Exp $
-
---- SpiralSound/Output.h.orig Sun Jun 2 03:39:03 2002
-+++ SpiralSound/Output.h
-@@ -16,6 +16,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#include <sys/ioctl.h>
- #include <sys/types.h>
- #include <stdio.h>
- #include <fcntl.h>
-@@ -25,12 +26,10 @@
- #else
- #if defined (__NetBSD__) || defined (__OpenBSD__)
- #include <soundcard.h> /* OSS emulation */
--#undef ioctl
- #else /* BSDI, Linux, Solaris */
- #include <sys/soundcard.h>
- #endif /* __NetBSD__ or __OpenBSD__ */
- #endif /* __FreeBSD__ */
--#include <sys/ioctl.h>
- #include <limits.h>
-
- #include "Sample.h"
diff --git a/audio/spiralsynth/patches/patch-ae b/audio/spiralsynth/patches/patch-ae
deleted file mode 100644
index 9fb8a323f8d..00000000000
--- a/audio/spiralsynth/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2003/12/19 16:48:06 ben Exp $
-
---- SpiralSound/SpiralInfo.h.orig 2000-11-26 07:52:46.000000000 -0800
-+++ SpiralSound/SpiralInfo.h
-@@ -16,6 +16,8 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+using namespace std;
-+
- #include <iostream.h>
- #include <string>
- #include <stdlib.h>
diff --git a/audio/spiralsynth/patches/patch-af b/audio/spiralsynth/patches/patch-af
deleted file mode 100644
index 9879f910b79..00000000000
--- a/audio/spiralsynth/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.2 2004/11/25 17:24:27 ben Exp $
-
---- GUI/ScopeGUI.C.orig Tue Jun 4 06:27:30 2002
-+++ GUI/ScopeGUI.C
-@@ -22,7 +22,7 @@
-
- #include <FL/fl_draw.H>
-
--ScopeWidget::ScopeWidget(int x,int y,int w,int h,const char *l=0) :
-+ScopeWidget::ScopeWidget(int x,int y,int w,int h,const char *l) :
- Fl_Widget(x,y,w,h,l),
- m_Data(NULL)
- {
-@@ -54,7 +54,7 @@ void ScopeGUI::Display(short *data)
- if (!m_Bypass) m_Scope->redraw();
- }
-
--void ScopeGUI::CreateGUI(int xoff=0, int yoff=0, char *name)
-+void ScopeGUI::CreateGUI(int xoff, int yoff, char *name)
- {
- Fl_Group* o = GUIScopeGroup = new Fl_Group(xoff, yoff, 220, 110, name);
- o->type(1);
diff --git a/audio/spiralsynth/patches/patch-ag b/audio/spiralsynth/patches/patch-ag
deleted file mode 100644
index b2996615ec4..00000000000
--- a/audio/spiralsynth/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2004/11/25 17:24:27 ben Exp $
-
---- GUI/OutputGUI.C.orig Sun Jun 2 14:36:16 2002
-+++ GUI/OutputGUI.C
-@@ -26,7 +26,7 @@ OutputGUI::OutputGUI(OSSOutput *o)
- if (!m_out) cerr<<"WARNING: Output not correctly set up"<<endl;
- }
-
--void OutputGUI::CreateGUI(int xoff=0, int yoff=0, char *name)
-+void OutputGUI::CreateGUI(int xoff, int yoff, char *name)
- {
- Fl_Group* o = GUIMixGroup = new Fl_Group(xoff, yoff, 85, 110, name);
- o->type(1);
diff --git a/audio/spiralsynth/patches/patch-ah b/audio/spiralsynth/patches/patch-ah
deleted file mode 100644
index 6f70e7a4942..00000000000
--- a/audio/spiralsynth/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2004/11/25 17:24:27 ben Exp $
-
---- GUI/Widgets/Fl_Knob.cxx.orig Sun Jun 2 03:23:34 2002
-+++ GUI/Widgets/Fl_Knob.cxx
-@@ -41,7 +41,7 @@ unsigned char rr,gg,bb;
- int dam = damage();
- if (dam & FL_DAMAGE_ALL)
- {
-- int col = parent()->color();
-+ int col = color();
- fl_color(col);
- fl_rectf(ox,oy,side,side);
- Fl::get_color((Fl_Color)col,rr,gg,bb);
diff --git a/audio/spiralsynth/patches/patch-ai b/audio/spiralsynth/patches/patch-ai
deleted file mode 100644
index 244d892ea41..00000000000
--- a/audio/spiralsynth/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2003/12/19 16:48:06 ben Exp $
-
---- SpiralSound/RiffWav.h.orig 2000-11-26 07:52:45.000000000 -0800
-+++ SpiralSound/RiffWav.h
-@@ -16,6 +16,8 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+using namespace std;
-+
- #include <string>
-
- #ifndef WAVFILE
diff --git a/audio/spiralsynth/patches/patch-aj b/audio/spiralsynth/patches/patch-aj
deleted file mode 100644
index 141a3cdfec5..00000000000
--- a/audio/spiralsynth/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2003/12/19 16:48:06 ben Exp $
-
---- GUI/MixerGUI.C.orig 2000-11-26 07:52:40.000000000 -0800
-+++ GUI/MixerGUI.C
-@@ -24,7 +24,7 @@ MixerGUI::MixerGUI(Mixer *o)
- if (!m_mix) cerr<<"WARNING: Mixer not correctly set up"<<endl;
- }
-
--void MixerGUI::CreateGUI(int xoff=0, int yoff=0, char *name)
-+void MixerGUI::CreateGUI(int xoff, int yoff, char *name)
- {
- Fl_Group* o = GUIMixGroup = new Fl_Group(xoff, yoff, 100, 110, name);
- o->type(1);
diff --git a/audio/spiralsynth/patches/patch-ak b/audio/spiralsynth/patches/patch-ak
deleted file mode 100644
index 021867633f8..00000000000
--- a/audio/spiralsynth/patches/patch-ak
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2004/11/25 17:24:27 ben Exp $
-
---- SpiralSound/Oscillator.C.orig Wed Jun 5 15:44:40 2002
-+++ SpiralSound/Oscillator.C
-@@ -39,7 +39,8 @@ m_SHModBuf(NULL)
- m_Note=new int[SpiralInfo::POLY];
- m_LastFreq=new float[SpiralInfo::POLY];
- m_Volume=new float[SpiralInfo::POLY];
--
-+ m_FreqModBuf = 0; /* initialize to avoid risk of coredump */
-+ m_PulseWidthModBuf = 0; /* initialize to avoid risk of coredump */
-
- for (int n=0; n<SpiralInfo::POLY; n++)
- {
diff --git a/audio/spiralsynth/patches/patch-al b/audio/spiralsynth/patches/patch-al
deleted file mode 100644
index e5eddc1018d..00000000000
--- a/audio/spiralsynth/patches/patch-al
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-al,v 1.1 2004/11/25 17:24:27 ben Exp $
-
---- SpiralSound/Midi.h.orig Sun Jun 2 03:28:09 2002
-+++ SpiralSound/Midi.h
-@@ -24,6 +24,7 @@
- #include <limits.h>
- #include <queue>
- #include <string>
-+#include <pthread.h>
-
- #ifndef MIDI
- #define MIDI
diff --git a/audio/spiralsynth/patches/patch-am b/audio/spiralsynth/patches/patch-am
deleted file mode 100644
index 4b6610bbf5c..00000000000
--- a/audio/spiralsynth/patches/patch-am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-am,v 1.1 2004/11/25 17:24:27 ben Exp $
-
---- SpiralSound/Output.C.orig Sun Jun 2 13:58:06 2002
-+++ SpiralSound/Output.C
-@@ -20,6 +20,9 @@
- #define _ISOC99_SOURCE 1
- #include <math.h>
- #include "Output.h"
-+#ifndef lrintf
-+#define lrintf(x) ((long)rintf(x))
-+#endif
-
- #define CHECK_AND_REPORT_ERROR if (result<0) \
- { \
diff --git a/audio/spiralsynth/patches/patch-an b/audio/spiralsynth/patches/patch-an
deleted file mode 100644
index 1b533c75090..00000000000
--- a/audio/spiralsynth/patches/patch-an
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-an,v 1.3 2006/01/05 15:33:00 joerg Exp $
-
---- SpiralSound/Midi.C.orig 2002-06-11 22:08:56.000000000 +0000
-+++ SpiralSound/Midi.C
-@@ -27,6 +27,10 @@
- #include <FL/Fl.h>
- #endif
-
-+#if defined(__DragonFly__) && !defined(O_SYNC)
-+#define O_SYNC O_FSYNC
-+#endif
-+
- static const int MIDI_SCANBUFSIZE=256;
- static const int MIDI_KEYOFFSET=0;
-
-@@ -76,12 +80,12 @@ MidiDevice::~MidiDevice()
- void MidiDevice::Close()
- {
- pthread_mutex_lock(m_Mutex);
-- pthread_cancel(m_MidiReader);
-+ if (m_MidiReader != NULL)
-+ pthread_cancel(m_MidiReader);
- pthread_mutex_unlock(m_Mutex);
- pthread_mutex_destroy(m_Mutex);
-
- close(m_MidiFd);
-- close(m_MidiWrFd);
- cerr<<"Closed midi device"<<endl;
- }
-
-@@ -90,24 +94,19 @@ void MidiDevice::Open()
- {
- //if (!SpiralInfo::WANTMIDI) return;
-
-- m_MidiFd = open(m_DeviceName.c_str(),O_RDONLY|O_SYNC);
-- if (!m_MidiFd)
-- {
-- cerr<<"Couldn't open midi for reading ["<<m_DeviceName<<"]"<<endl;
-- return;
-- }
--
-- m_MidiWrFd = open(m_DeviceName.c_str(),O_WRONLY);
-- if (!m_MidiWrFd)
-+ m_Mutex = new pthread_mutex_t;
-+ pthread_mutex_init(m_Mutex, NULL);
-+ m_MidiReader = NULL;
-+
-+ m_MidiWrFd = m_MidiFd = open(m_DeviceName.c_str(),O_RDWR|O_SYNC);
-+ if (m_MidiFd == -1)
- {
-- cerr<<"Couldn't open midi for writing ["<<m_DeviceName<<"]"<<endl;
-+ cerr<<"Couldn't open midi ["<<m_DeviceName<<"]"<<endl;
- return;
- }
-
- cerr<<"Opened midi device ["<<m_DeviceName<<"]"<<endl;
-
-- m_Mutex = new pthread_mutex_t;
-- pthread_mutex_init(m_Mutex, NULL);
- int ret=pthread_create(&m_MidiReader,NULL,(void*(*)(void*))MidiDevice::MidiReaderCallback,(void*)this);
- }
-
diff --git a/audio/spiralsynth/patches/patch-ao b/audio/spiralsynth/patches/patch-ao
deleted file mode 100644
index b11ec53c73f..00000000000
--- a/audio/spiralsynth/patches/patch-ao
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2005/04/24 03:29:11 ben Exp $
-
---- Synth.C.orig 2002-06-11 15:09:42.000000000 -0700
-+++ Synth.C
-@@ -82,6 +82,7 @@ m_OutGUI(OSSOutput::Get())
- LoadPatch(1);
-
- MidiDevice::Get()->SetDeviceName(SpiralInfo::MIDIFILE);
-+ MidiDevice::Get()->PackUpAndGoHome();
- }
-
- Synth::~Synth()
diff --git a/audio/splay/DESCR b/audio/splay/DESCR
deleted file mode 100644
index fc1fb8d9702..00000000000
--- a/audio/splay/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-splay-0.3
----------
-
-Splay program uses the MPEG/Wave Sound library to play sound files in
-several formats, notably the MPEG audio and Wave format. This early version
-has only limited functionally and a simplistic user interface.
-
-This program have NO WARRANTY.
-You can use this program under GPL.
-You can use these libraries under Library GPL.
-
-* This version of splay was not compiled with pthread library.
diff --git a/audio/splay/Makefile b/audio/splay/Makefile
deleted file mode 100644
index 8701c23ac41..00000000000
--- a/audio/splay/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.22 2006/07/22 05:54:52 rillig Exp $
-#
-
-DISTNAME= splay-0.8.2
-CATEGORIES= audio
-MASTER_SITES= # empty
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://splay.sourceforge.net/
-COMMENT= Audio player/decoder that decodes MPEG Layer I,II,III and WAV files
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_LANGUAGES= c c++
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --without-xsplay
-CONFIGURE_ARGS+= --without-pthread
-LIBS+= ${LIBOSSAUDIO}
-
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/splay/PLIST b/audio/splay/PLIST
deleted file mode 100644
index 2c7fa95cd65..00000000000
--- a/audio/splay/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:59 zuntum Exp $
-bin/splay
-man/man1/splay.1
-man/man1/xsplay.1
diff --git a/audio/splay/distinfo b/audio/splay/distinfo
deleted file mode 100644
index c2ff7b08037..00000000000
--- a/audio/splay/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 20:39:52 agc Exp $
-
-SHA1 (splay-0.8.2.tar.gz) = 25288afa1b52bf25be8f9c4ceb44325c50fa00c8
-RMD160 (splay-0.8.2.tar.gz) = f1a99ad9e7e70f5e0000aede05966cc5a0b36ad3
-Size (splay-0.8.2.tar.gz) = 109060 bytes
-SHA1 (patch-aa) = a1c7edc9939454e437a6ad301cd5955f59612ed5
-SHA1 (patch-ab) = 9fc28c320ad90922dd0aa583904acd58f4cf3ba1
-SHA1 (patch-ac) = f90b0e93ed4e72d20926e1bbe7dd5d21f4b39770
-SHA1 (patch-ad) = 5d52e0878eb313a7d7684a6505daa4ece3add746
-SHA1 (patch-ae) = 6b343541593d1d6ca8dd641ebb299a95d3bdc067
-SHA1 (patch-ai) = 9ac8c7aa7a7d341585e57dec4ddba4e285db7b34
diff --git a/audio/splay/patches/patch-aa b/audio/splay/patches/patch-aa
deleted file mode 100644
index ccbd3218f88..00000000000
--- a/audio/splay/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.3 1999/03/28 20:08:08 rh Exp $
-
---- mpegsound/rawplayer.cc.orig Fri Mar 6 18:43:55 1998
-+++ mpegsound/rawplayer.cc Sun Mar 28 19:44:54 1999
-@@ -13,7 +13,11 @@
- #include <fcntl.h>
- #include <unistd.h>
- #include <sys/ioctl.h>
-+#ifdef __NetBSD__
-+#include <soundcard.h>
-+#else
- #include <sys/soundcard.h>
-+#endif
-
- #include "mpegsound.h"
-
-@@ -24,7 +28,11 @@
- #define IOCTL(a,b,c) (c = ioctl(a,b,c) )
- #endif
-
-+#ifdef __NetBSD__
-+char *Rawplayer::defaultdevice="/dev/audio";
-+#else
- char *Rawplayer::defaultdevice="/dev/dsp";
-+#endif
-
- /* Volume */
- int Rawplayer::setvolume(int volume)
diff --git a/audio/splay/patches/patch-ab b/audio/splay/patches/patch-ab
deleted file mode 100644
index 1e438a50646..00000000000
--- a/audio/splay/patches/patch-ab
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2004/06/09 12:53:46 minskim Exp $
-
---- mpegsound/mpegsound.h.orig 1998-03-06 11:43:55.000000000 -0600
-+++ mpegsound/mpegsound.h
-@@ -11,6 +11,11 @@
- /************************************/
- #include <stdio.h>
- #include <sys/types.h>
-+#ifdef __linux__
-+#include <endian.h>
-+#else
-+#include <machine/endian.h>
-+#endif
-
- #ifdef PTHREADEDMPEG
- #ifdef HAVE_PTHREAD_H
-@@ -90,6 +95,8 @@
- /*******************************************/
- /* Define values for Microsoft WAVE format */
- /*******************************************/
-+#if defined(BYTE_ORDER) && (BYTE_ORDER == LITTLE_ENDIAN )
-+
- #define RIFF 0x46464952
- #define WAVE 0x45564157
- #define FMT 0x20746D66
-@@ -101,6 +108,21 @@
- #define MODE_MONO 0
- #define MODE_STEREO 1
-
-+#else
-+
-+#define RIFF 0x52494646
-+#define WAVE 0x57415645
-+#define FMT 0x666D7420
-+#define DATA 0x64617461
-+#define PCM_CODE (1 << 8)
-+#define WAVE_MONO (1 << 8)
-+#define WAVE_STEREO (2 << 8)
-+
-+#define MODE_MONO 0
-+#define MODE_STEREO 1
-+
-+#endif
-+
- /********************/
- /* Type definitions */
- /********************/
diff --git a/audio/splay/patches/patch-ac b/audio/splay/patches/patch-ac
deleted file mode 100644
index 15964c05790..00000000000
--- a/audio/splay/patches/patch-ac
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2002/08/05 17:39:18 wiz Exp $
-
---- mpegsound/mpeglayer3.cc.orig Fri Mar 6 18:43:55 1998
-+++ mpegsound/mpeglayer3.cc
-@@ -21,6 +21,7 @@
- #include "mpegsound.h"
- #include "mpegsound_locals.h"
-
-+
- inline void Mpegbitwindow::wrap(void)
- {
- int p=bitindex>>3;
-@@ -45,18 +46,9 @@
- inline int Mpegbitwindow::getbits9(int bits)
- {
- register unsigned short a;
-+ int offset=bitindex>>3;
-
--#ifndef WORDS_BIGENDIAN
-- {
-- // int offset=(bitindex>>3)&(WINDOWSIZE-1);
-- int offset=bitindex>>3;
--
-- a=(((unsigned char)buffer[offset])<<8) | ((unsigned char)buffer[offset+1]);
-- }
--#else
-- // a=((unsigned short *)(buffer+((bixindex>>3)&(WINDOWSIZE-1))));
-- a=((unsigned short *)(buffer+((bixindex>>3))));
--#endif
-+ a=(((unsigned char)buffer[offset])<<8) | ((unsigned char)buffer[offset+1]);
-
- a<<=(bitindex&7);
- bitindex+=bits;
-@@ -769,7 +761,7 @@
- for(i=0;i<e;)
- {
- const HUFFMANCODETABLE *h;
-- register end;
-+ register int end;
-
- if (i<region1Start)
- {
-@@ -971,7 +963,15 @@
- }
- }
- {
-- int t_index=(index-cb_begin)/cb_width;
-+ int t_index = 0;
-+ if (cb_width)
-+ {
-+ t_index=(index-cb_begin)/cb_width;
-+ if (t_index > 2)
-+ t_index = 0;
-+ }
-+ else
-+ fprintf(stderr, "Very bad mp3 data\n");
- out[0][index]*=layer3twopow2_1(gi->subblock_gain[t_index],
- gi->scalefac_scale,
- scalefactors[ch].s[t_index][cb]);
-@@ -1392,7 +1392,7 @@
- {
- if(gi->mixed_block_flag)
- {
-- fprintf(stderr,"Notchecked!");
-+ fprintf(stderr, "Mpegtoraw::layer3reorderandantialias:Not checked!");
- layer3reorder_1 (version,frequency,in,out); // Not checked...
- layer3antialias_1(out);
- }
diff --git a/audio/splay/patches/patch-ad b/audio/splay/patches/patch-ad
deleted file mode 100644
index 17ff7e42692..00000000000
--- a/audio/splay/patches/patch-ad
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2002/08/05 17:39:18 wiz Exp $
-
---- mpegsound/mpegsound_locals.h.orig Fri Mar 6 18:43:55 1998
-+++ mpegsound/mpegsound_locals.h
-@@ -20,15 +21,9 @@
- inline int Mpegtoraw::getbits9(int bits)
- {
- register unsigned short a;
--#ifndef WORDS_BIGENDIAN
-- {
-- int offset=bitindex>>3;
--
-- a=(((unsigned char)buffer[offset])<<8) | ((unsigned char)buffer[offset+1]);
-- }
--#else
-- a=((unsigned short *)(buffer+((bixindex>>3))));
--#endif
-+ int offset=bitindex>>3;
-+
-+ a=(((unsigned char)buffer[offset])<<8) | ((unsigned char)buffer[offset+1]);
-
- a<<=(bitindex&7);
- bitindex+=bits;
-@@ -38,16 +33,9 @@
- inline int Mpegtoraw::getbits8(void)
- {
- register unsigned short a;
-+ int offset=bitindex>>3;
-
--#ifndef WORDS_BIGENDIAN
-- {
-- int offset=bitindex>>3;
--
-- a=(((unsigned char)buffer[offset])<<8) | ((unsigned char)buffer[offset+1]);
-- }
--#else
-- a=((unsigned short *)(buffer+((bixindex>>3))));
--#endif
-+ a=(((unsigned char)buffer[offset])<<8) | ((unsigned char)buffer[offset+1]);
-
- a<<=(bitindex&7);
- bitindex+=8;
diff --git a/audio/splay/patches/patch-ae b/audio/splay/patches/patch-ae
deleted file mode 100644
index cd2e3adaff1..00000000000
--- a/audio/splay/patches/patch-ae
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2004/06/09 12:53:46 minskim Exp $
-
---- mpegsound/mpegtoraw.cc.orig 1998-03-06 11:43:55.000000000 -0600
-+++ mpegsound/mpegtoraw.cc
-@@ -15,6 +15,7 @@
-
- #include "mpegsound.h"
- #include "mpegsound_locals.h"
-+#include <sys/soundcard.h>
-
- #define MY_PI 3.14159265358979323846
-
-@@ -618,7 +619,7 @@ bool Mpegtoraw::run(int frames)
- if(frames<0)
- {
- frames=-frames;
-- player->setsoundtype(outputstereo,16,
-+ player->setsoundtype(outputstereo,AFMT_S16_NE,
- frequencies[version][frequency]>>downfrequency);
- }
-
diff --git a/audio/splay/patches/patch-ai b/audio/splay/patches/patch-ai
deleted file mode 100644
index 710eb34af43..00000000000
--- a/audio/splay/patches/patch-ai
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ai,v 1.1 1999/03/28 20:08:09 rh Exp $
-
---- mpegsound/httpinput.cc.orig Fri Mar 6 18:43:55 1998
-+++ mpegsound/httpinput.cc Sun Mar 28 19:53:12 1999
-@@ -24,6 +24,7 @@
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-+#include <errno.h>
-
- #ifndef INADDR_NONE
- #define INADDR_NONE 0xffffffff
diff --git a/audio/streamripper/DESCR b/audio/streamripper/DESCR
deleted file mode 100644
index 2f66da98f24..00000000000
--- a/audio/streamripper/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Using information which a SHOUTcast server can optionally send, this program
-breaks an audio stream into "tracks," stores them in separate files as they
-arrive, and names the files by appending ".mp3" to the name of the track.
-The tracks can be listened to at the user's leisure with an MPEG Layer 3
-audio player.
diff --git a/audio/streamripper/Makefile b/audio/streamripper/Makefile
deleted file mode 100644
index 204012d8fa5..00000000000
--- a/audio/streamripper/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2006/12/14 08:09:16 minskim Exp $
-#
-
-DISTNAME= streamripper-1.61.27
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=streamripper/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://streamripper.sourceforge.net/
-COMMENT= Splits SHOUTcast stream into tracks
-
-GNU_CONFIGURE= yes
-
-PTHREAD_OPTS+= require
-
-.include "options.mk"
-
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/streamripper/PLIST b/audio/streamripper/PLIST
deleted file mode 100644
index e8b6d4b6e5d..00000000000
--- a/audio/streamripper/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/20 19:55:49 xtraeme Exp $
-bin/streamripper
-man/man1/streamripper.1
diff --git a/audio/streamripper/distinfo b/audio/streamripper/distinfo
deleted file mode 100644
index 26b2130eaee..00000000000
--- a/audio/streamripper/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/12/12 20:27:15 wiz Exp $
-
-SHA1 (streamripper-1.61.27.tar.gz) = bdbf0e301c3c783e1f13c2977508afd5076328ad
-RMD160 (streamripper-1.61.27.tar.gz) = 14b55b91e3b995515d6978383f9fc618fe92bbcb
-Size (streamripper-1.61.27.tar.gz) = 1227559 bytes
-SHA1 (patch-aa) = 1150430aa345f78c58d7a207433947a4241ecf29
diff --git a/audio/streamripper/options.mk b/audio/streamripper/options.mk
deleted file mode 100644
index 87017aca970..00000000000
--- a/audio/streamripper/options.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: options.mk,v 1.1.1.1 2005/10/20 19:55:49 xtraeme Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.streamripper
-PKG_SUPPORTED_OPTIONS= ogg
-PKG_SUGGESTED_OPTIONS= ogg
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mogg)
-. include "../../audio/libvorbis/buildlink3.mk"
-CONFIGURE_ARGS+= --with-ogg=${BUILDLINK_PREFIX.libvorbis}
-.else
-CONFIGURE_ARGS+= --disable-ogg
-.endif
diff --git a/audio/streamripper/patches/patch-aa b/audio/streamripper/patches/patch-aa
deleted file mode 100644
index 192ec281dcb..00000000000
--- a/audio/streamripper/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/12/12 20:27:15 wiz Exp $
-
---- configure.orig 2006-09-09 16:48:21.000000000 +0000
-+++ configure
-@@ -3613,7 +3613,7 @@ else
- enable_oggtest=yes
- fi;
-
-- if test "x$ogg_prefix" == "xno" ; then
-+ if test "x$ogg_prefix" = "xno" ; then
- no_ogg="yes"
- else
- if test "x$ogg_libraries" != "x" ; then
diff --git a/audio/streamtuner/DESCR b/audio/streamtuner/DESCR
deleted file mode 100644
index 37f5fe0667e..00000000000
--- a/audio/streamtuner/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Streamtuner is a stream directory browser. It offers an intuitive and unified
-interface to various streaming directories through the use of a plugin system.
-Streamtuner implements a GTK+ 2.0 graphical user interface, and the official
-distribution ships with the SHOUTcast plugin.
diff --git a/audio/streamtuner/MESSAGE b/audio/streamtuner/MESSAGE
deleted file mode 100644
index d18c44778e1..00000000000
--- a/audio/streamtuner/MESSAGE
+++ /dev/null
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2003/03/04 14:41:16 salo Exp $
-
-You may wish to install a MP3 player to listen to streams from streamtuner
-(if you don't have one already). You can try one of the following packages:
-
- audio/amp another mp3 player
- audio/mp3blaster MP3 console curses-based player
- audio/mpg123 Command-line player for mpeg layer 1, 2 and 3 audio
- audio/mpg321 Free replacement for mpg123
- audio/splay Audio player/decoder that decodes MPEG Layer I,II,III
- and WAV files
- audio/xmms X Multimedia System - An audio player with a Winamp GUI
-===========================================================================
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
deleted file mode 100644
index 33f6a20b926..00000000000
--- a/audio/streamtuner/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.36 2006/11/19 11:50:23 wiz Exp $
-#
-
-DISTNAME= streamtuner-0.99.99
-PKGREVISION= 5
-CATEGORIES= audio www
-MASTER_SITES= http://savannah.nongnu.org/download/streamtuner/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.nongnu.org/streamtuner/
-COMMENT= Stream directory browser
-
-BUILD_DEPENDS+= hicolor-icon-theme-[0-9]*:../../graphics/hicolor-icon-theme
-
-USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake msgfmt pkg-config intltool
-USE_LIBTOOL= yes
-USE_PKGLOCALEDIR= yes
-GNU_CONFIGURE= yes
-
-PKGCONFIG_OVERRIDE= extras/streamtuner.pc.in
-
-CONFIGURE_ARGS+= --disable-gtk-doc
-CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
-
-.include "options.mk"
-
-.include "../../textproc/scrollkeeper/omf.mk"
-.include "../../www/curl/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/streamtuner/PLIST b/audio/streamtuner/PLIST
deleted file mode 100644
index 4244f750f6a..00000000000
--- a/audio/streamtuner/PLIST
+++ /dev/null
@@ -1,110 +0,0 @@
-@comment $NetBSD: PLIST,v 1.10 2006/04/17 07:07:12 jlam Exp $
-bin/streamtuner
-include/streamtuner/st-action-api.h
-include/streamtuner/st-category-api.h
-include/streamtuner/st-dialog-api.h
-include/streamtuner/st-handler-api.h
-include/streamtuner/st-handler-field-api.h
-include/streamtuner/st-handlers-api.h
-include/streamtuner/st-m3u-api.h
-include/streamtuner/st-pls-api.h
-include/streamtuner/st-plugin-api.h
-include/streamtuner/st-programs-api.h
-include/streamtuner/st-re-api.h
-include/streamtuner/st-settings-api.h
-include/streamtuner/st-sgml-ref-api.h
-include/streamtuner/st-state-api.h
-include/streamtuner/st-stream-api.h
-include/streamtuner/st-transfer-api.h
-include/streamtuner/st-util-api.h
-include/streamtuner/st-version-api.h
-include/streamtuner/streamtuner.h
-lib/pkgconfig/streamtuner.pc
-lib/streamtuner/plugins/live365.la
-${LOCAL_PLUGIN}lib/streamtuner/plugins/local.la
-${PYTHON_PLUGIN}lib/streamtuner/plugins/python.la
-lib/streamtuner/plugins/shoutcast.la
-${XIPH_PLUGIN}lib/streamtuner/plugins/xiph.la
-share/applications/streamtuner.desktop
-share/doc/streamtuner/api-reference.html
-share/doc/streamtuner/ch01s02.html
-share/doc/streamtuner/home.png
-share/doc/streamtuner/index.html
-share/doc/streamtuner/index.sgml
-share/doc/streamtuner/ix01.html
-share/doc/streamtuner/left.png
-share/doc/streamtuner/overview.html
-share/doc/streamtuner/right.png
-share/doc/streamtuner/streamtuner-STHandler.html
-share/doc/streamtuner/streamtuner-STPlugin.html
-share/doc/streamtuner/streamtuner-st-action-api.html
-share/doc/streamtuner/streamtuner-st-category-api.html
-share/doc/streamtuner/streamtuner-st-dialog-api.html
-share/doc/streamtuner/streamtuner-st-handler-field-api.html
-share/doc/streamtuner/streamtuner-st-handlers-api.html
-share/doc/streamtuner/streamtuner-st-m3u-api.html
-share/doc/streamtuner/streamtuner-st-pls-api.html
-share/doc/streamtuner/streamtuner-st-programs-api.html
-share/doc/streamtuner/streamtuner-st-re-api.html
-share/doc/streamtuner/streamtuner-st-settings-api.html
-share/doc/streamtuner/streamtuner-st-sgml-ref-api.html
-share/doc/streamtuner/streamtuner-st-state-api.html
-share/doc/streamtuner/streamtuner-st-stream-api.html
-share/doc/streamtuner/streamtuner-st-transfer-api.html
-share/doc/streamtuner/streamtuner-st-util-api.html
-share/doc/streamtuner/streamtuner-st-version-api.html
-share/doc/streamtuner/streamtuner.devhelp
-share/doc/streamtuner/up.png
-share/help/streamtuner/C/documentation-license.xml
-share/help/streamtuner/C/figures/main-window.png
-share/help/streamtuner/C/software-license.xml
-share/help/streamtuner/C/streamtuner.xml
-share/locale/de/LC_MESSAGES/streamtuner.mo
-share/locale/fr/LC_MESSAGES/streamtuner.mo
-share/locale/hu/LC_MESSAGES/streamtuner.mo
-share/locale/ja/LC_MESSAGES/streamtuner.mo
-share/locale/pt/LC_MESSAGES/streamtuner.mo
-share/omf/streamtuner/streamtuner-C.omf
-share/pixmaps/streamtuner.png
-${PYTHON_PLUGIN}share/streamtuner/python/icons/basic.ch.png
-${PYTHON_PLUGIN}share/streamtuner/python/icons/google-stations.png
-${PYTHON_PLUGIN}share/streamtuner/python/icons/punkcast.com.png
-${PYTHON_PLUGIN}share/streamtuner/python/scripts/basic.ch.py
-${PYTHON_PLUGIN}share/streamtuner/python/scripts/google-stations.py
-${PYTHON_PLUGIN}share/streamtuner/python/scripts/punkcast.com.py
-share/streamtuner/ui/applications.png
-share/streamtuner/ui/bookmarks.png
-share/streamtuner/ui/browse.png
-share/streamtuner/ui/category-open-running.png
-share/streamtuner/ui/category-open.png
-share/streamtuner/ui/category-running.png
-share/streamtuner/ui/category.png
-share/streamtuner/ui/live365.png
-share/streamtuner/ui/local.png
-share/streamtuner/ui/logo.png
-share/streamtuner/ui/main-category-running.png
-share/streamtuner/ui/main-category.png
-${PYTHON_PLUGIN}share/streamtuner/ui/python.png
-share/streamtuner/ui/preselections.png
-share/streamtuner/ui/record.png
-share/streamtuner/ui/search-category-running.png
-share/streamtuner/ui/search-category.png
-share/streamtuner/ui/search.png
-share/streamtuner/ui/shoutcast.png
-share/streamtuner/ui/streamtuner.png
-share/streamtuner/ui/tune-in.png
-share/streamtuner/ui/xiph.png
-@dirrm share/streamtuner/ui
-${PYTHON_PLUGIN}@dirrm share/streamtuner/python/scripts
-${PYTHON_PLUGIN}@dirrm share/streamtuner/python/icons
-${PYTHON_PLUGIN}@dirrm share/streamtuner/python
-@dirrm share/streamtuner
-@comment in xdg-dirs: @dirrm share/pixmaps
-@dirrm share/omf/streamtuner
-@comment in scrollkeeper: @dirrm share/omf
-@dirrm share/help/streamtuner/C/figures
-@dirrm share/doc/streamtuner
-@comment in xdg-dirs: @dirrm share/applications
-@dirrm lib/streamtuner/plugins
-@dirrm lib/streamtuner
-@dirrm include/streamtuner
diff --git a/audio/streamtuner/buildlink3.mk b/audio/streamtuner/buildlink3.mk
deleted file mode 100644
index 7e78b367850..00000000000
--- a/audio/streamtuner/buildlink3.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/11/19 11:50:23 wiz Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-STREAMTUNER_BUILDLINK3_MK:= ${STREAMTUNER_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= streamtuner
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nstreamtuner}
-BUILDLINK_PACKAGES+= streamtuner
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}streamtuner
-
-.if !empty(STREAMTUNER_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.streamtuner+= streamtuner>=0.99
-BUILDLINK_ABI_DEPENDS.streamtuner?= streamtuner>=0.99.99nb5
-BUILDLINK_PKGSRCDIR.streamtuner?= ../../audio/streamtuner
-.endif # STREAMTUNER_BUILDLINK3_MK
-
-.include "../../www/curl/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/streamtuner/distinfo b/audio/streamtuner/distinfo
deleted file mode 100644
index ebce6bbbaaa..00000000000
--- a/audio/streamtuner/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.10 2005/12/12 00:34:41 joerg Exp $
-
-SHA1 (streamtuner-0.99.99.tar.gz) = d912dbe1741ba9d14342ab6d9d818f06e97f6b59
-RMD160 (streamtuner-0.99.99.tar.gz) = b2f7dbc47a148e4c195f85b8f5e77bb843bb7d4e
-Size (streamtuner-0.99.99.tar.gz) = 948075 bytes
-SHA1 (patch-aa) = 5f5605d8724f40c97156d492dd12aed3260f4e3f
diff --git a/audio/streamtuner/options.mk b/audio/streamtuner/options.mk
deleted file mode 100644
index b7a93ede259..00000000000
--- a/audio/streamtuner/options.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2005/10/19 09:45:09 xtraeme Exp $
-#
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.streamtuner
-PKG_SUPPORTED_OPTIONS= streamtuner-local streamtuner-xiph python
-PKG_SUGGESTED_OPTIONS= streamtuner-local streamtuner-xiph
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mstreamtuner-local)
-PLIST_SUBST+= LOCAL_PLUGIN=
-CONFIGURE_ARGS+= --enable-local
-. include "../../audio/taglib/buildlink3.mk"
-.else
-PLIST_SUBST+= LOCAL_PLUGIN='@comment '
-CONFIGURE_ARGS+= --disable-local
-.endif
-
-.if !empty(PKG_OPTIONS:Mstreamtuner-xiph)
-PLIST_SUBST+= XIPH_PLUGIN=
-CONFIGURE_ARGS+= --enable-xiph
-. include "../../textproc/libxml2/buildlink3.mk"
-.else
-PLIST_SUBST+= XIPH_PLUGIN='@comment '
-CONFIGURE_ARGS+= --disable-xiph
-.endif
-
-.if !empty(PKG_OPTIONS:Mpython)
-PLIST_SUBST+= PYTHON_PLUGIN=
-CONFIGURE_ARGS+= --enable-python
-. include "../../x11/py-gtk2/buildlink3.mk"
-.else
-PLIST_SUBST+= PYTHON_PLUGIN='@comment '
-CONFIGURE_ARGS+= --disable-python
-.endif
diff --git a/audio/streamtuner/patches/patch-aa b/audio/streamtuner/patches/patch-aa
deleted file mode 100644
index c6bd950d62f..00000000000
--- a/audio/streamtuner/patches/patch-aa
+++ /dev/null
@@ -1,110 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/12/12 00:34:41 joerg Exp $
-
---- configure.orig 2005-12-12 00:20:39.000000000 +0000
-+++ configure
-@@ -3652,13 +3652,13 @@ darwin* | rhapsody*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--freebsd* | kfreebsd*-gnu)
-+freebsd* | kfreebsd*-gnu | dragonfly*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- case $host_cpu in
- i*86 )
- # Not sure whether the presence of OpenBSD here was a mistake.
- # Let's accept both of them until this is cleared up.
-- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-+ lt_cv_deplibs_check_method='file_magic (DragonFly|FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- ;;
-@@ -5589,7 +5589,7 @@ else
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
-- netbsd* | freebsd* | openbsd* | darwin* )
-+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
- # This has been around since 386BSD, at least. Likely further.
- if test -x /sbin/sysctl; then
- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-@@ -7368,7 +7368,7 @@ if test -z "$aix_libpath"; then aix_libp
- ;;
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd* | kfreebsd*-gnu)
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
-@@ -7947,7 +7947,7 @@ kfreebsd*-gnu)
- dynamic_linker='GNU ld.so'
- ;;
-
--freebsd*)
-+freebsd* | dragonfly*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
- version_type=freebsd-$objformat
- case $version_type in
-@@ -10304,7 +10304,7 @@ if test -z "$aix_libpath"; then aix_libp
- freebsd-elf*)
- archive_cmds_need_lc_CXX=no
- ;;
-- freebsd* | kfreebsd*-gnu)
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
- # conventions
- ld_shlibs_CXX=yes
-@@ -11048,7 +11048,7 @@ echo $ECHO_N "checking for $compiler opt
- ;;
- esac
- ;;
-- freebsd* | kfreebsd*-gnu)
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
- # FreeBSD uses GNU C++
- ;;
- hpux9* | hpux10* | hpux11*)
-@@ -11659,7 +11659,7 @@ kfreebsd*-gnu)
- dynamic_linker='GNU ld.so'
- ;;
-
--freebsd*)
-+freebsd* | dragonfly*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
- version_type=freebsd-$objformat
- case $version_type in
-@@ -14240,7 +14240,7 @@ if test -z "$aix_libpath"; then aix_libp
- ;;
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd* | kfreebsd*-gnu)
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
- archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec_F77='-R$libdir'
- hardcode_direct_F77=yes
-@@ -14819,7 +14819,7 @@ kfreebsd*-gnu)
- dynamic_linker='GNU ld.so'
- ;;
-
--freebsd*)
-+freebsd* | dragonfly*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
- version_type=freebsd-$objformat
- case $version_type in
-@@ -16598,7 +16598,7 @@ if test -z "$aix_libpath"; then aix_libp
- ;;
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd* | kfreebsd*-gnu)
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
- archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec_GCJ='-R$libdir'
- hardcode_direct_GCJ=yes
-@@ -17177,7 +17177,7 @@ kfreebsd*-gnu)
- dynamic_linker='GNU ld.so'
- ;;
-
--freebsd*)
-+freebsd* | dragonfly*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
- version_type=freebsd-$objformat
- case $version_type in
diff --git a/audio/sweep/DESCR b/audio/sweep/DESCR
deleted file mode 100644
index 367465bdf3c..00000000000
--- a/audio/sweep/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Sweep is a sound wave editor, and it is also generally useful as a
-flexible recording and playback tool. Inside lives a pesky little
-virtual stylus called Scrubby who enjoys mixing around in your files.
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
deleted file mode 100644
index 5b7545c8426..00000000000
--- a/audio/sweep/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile,v 1.37 2007/02/07 20:18:41 drochner Exp $
-#
-
-DISTNAME= sweep-0.9.2
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sweep/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.metadecks.org/software/sweep/
-COMMENT= Full-featured digital sound editor
-
-USE_DIRS+= xdg-1.1
-USE_LIBTOOL= YES
-USE_TOOLS+= gmake msgfmt pkg-config
-USE_PKGLOCALEDIR= YES
-
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --disable-oggtest
-CONFIGURE_ARGS+= --disable-vorbistest
-# XXX this doesn't work
-#CONFIGURE_ARGS+= --disable-alsa
-
-CPPFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
-MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q}
-
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/libsamplerate/buildlink3.mk"
-.include "../../audio/libsndfile/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/speex/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../databases/tdb/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/sweep/PLIST b/audio/sweep/PLIST
deleted file mode 100644
index 7c0ec9f740d..00000000000
--- a/audio/sweep/PLIST
+++ /dev/null
@@ -1,36 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2007/02/07 20:18:41 drochner Exp $
-bin/sweep
-include/sweep/sweep.h
-include/sweep/sweep_filter.h
-include/sweep/sweep_i18n.h
-include/sweep/sweep_sample.h
-include/sweep/sweep_selection.h
-include/sweep/sweep_sounddata.h
-include/sweep/sweep_typeconvert.h
-include/sweep/sweep_types.h
-include/sweep/sweep_undo.h
-include/sweep/sweep_version.h
-lib/sweep/libbyenergy.so
-lib/sweep/libecho.so
-lib/sweep/libfade.so
-lib/sweep/libladspameta.so
-lib/sweep/libnormalise.so
-lib/sweep/libreverse.so
-man/man1/sweep.1
-share/applications/sweep.desktop
-share/locale/de/LC_MESSAGES/sweep.mo
-share/locale/el/LC_MESSAGES/sweep.mo
-share/locale/en_AU/LC_MESSAGES/sweep.mo
-share/locale/es_ES/LC_MESSAGES/sweep.mo
-share/locale/fr/LC_MESSAGES/sweep.mo
-share/locale/hu/LC_MESSAGES/sweep.mo
-share/locale/it/LC_MESSAGES/sweep.mo
-share/locale/pl/LC_MESSAGES/sweep.mo
-share/locale/ru/LC_MESSAGES/sweep.mo
-share/pixmaps/sweep.svg
-share/sweep/sweep_splash.png
-@dirrm share/sweep
-@comment in xdg-dirs: @dirrm share/pixmaps
-@comment in xdg-dirs: @dirrm share/applications
-@dirrm lib/sweep
-@dirrm include/sweep
diff --git a/audio/sweep/buildlink3.mk b/audio/sweep/buildlink3.mk
deleted file mode 100644
index 4d450f29fb7..00000000000
--- a/audio/sweep/buildlink3.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.11 2007/02/07 20:18:41 drochner Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-SWEEP_BUILDLINK3_MK:= ${SWEEP_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= sweep
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsweep}
-BUILDLINK_PACKAGES+= sweep
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sweep
-
-.if !empty(SWEEP_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.sweep+= sweep>=0.8.2nb6
-BUILDLINK_ABI_DEPENDS.sweep+= sweep>=0.8.3nb4
-BUILDLINK_PKGSRCDIR.sweep?= ../../audio/sweep
-.endif # SWEEP_BUILDLINK3_MK
-
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/libsamplerate/buildlink3.mk"
-.include "../../audio/libsndfile/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/speex/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../databases/tdb/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/sweep/distinfo b/audio/sweep/distinfo
deleted file mode 100644
index f2513e094c1..00000000000
--- a/audio/sweep/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.6 2007/02/07 20:18:41 drochner Exp $
-
-SHA1 (sweep-0.9.2.tar.gz) = 688075a645d5782584e5fd6e9f1a1062aeee3599
-RMD160 (sweep-0.9.2.tar.gz) = f44a27c0ce050c7871c8b6c6b32c116c968273b0
-Size (sweep-0.9.2.tar.gz) = 1177803 bytes
-SHA1 (patch-aa) = fb4f123c1abcef93a53530961ad07bb67354aa2f
-SHA1 (patch-ab) = 42d6d165a55c19cd046672dbd91775517f79372f
diff --git a/audio/sweep/patches/patch-aa b/audio/sweep/patches/patch-aa
deleted file mode 100644
index bc4c4d09915..00000000000
--- a/audio/sweep/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/04/30 17:13:02 jmmv Exp $
-
---- src/driver_oss.c.orig 2003-04-27 07:37:14.000000000 +0200
-+++ src/driver_oss.c
-@@ -85,6 +85,7 @@ oss_get_names (void)
- {
- GList * names = NULL;
-
-+ names = g_list_append (names, DEVOSSAUDIO);
- names = g_list_append (names, "/dev/dsp");
- names = g_list_append (names, "/dev/dsp1");
- names = g_list_append (names, "/dev/sound/dsp");
-@@ -212,6 +213,7 @@ setup_dev_dsp (sw_handle * handle, sw_fo
- exit (1) ;
- }
-
-+#if 0
- fmt = AFMT_QUERY;
- if ((error = ioctl (dev_dsp, SOUND_PCM_SETFMT, &fmt)) != 0) {
- perror ("open_dsp_device 8") ;
-@@ -229,6 +231,7 @@ setup_dev_dsp (sw_handle * handle, sw_fo
- handle->custom_data = GINT_TO_POINTER(1);
- }
- #endif
-+#endif
-
- #ifdef DEBUG
- {
diff --git a/audio/sweep/patches/patch-ab b/audio/sweep/patches/patch-ab
deleted file mode 100644
index 81a026ab066..00000000000
--- a/audio/sweep/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/02/07 20:18:41 drochner Exp $
-
---- configure.orig 2007-02-07 14:49:41.000000000 +0100
-+++ configure
-@@ -33858,7 +33858,7 @@ fi
-
-
-
--ac_enable_alsa=yes
-+ac_enable_alsa=no
- # Check whether --enable-alsa was given.
- if test "${enable_alsa+set}" = set; then
- enableval=$enable_alsa; ac_enable_alsa=yes
diff --git a/audio/taglib/DESCR b/audio/taglib/DESCR
deleted file mode 100644
index 84d62429110..00000000000
--- a/audio/taglib/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-TagLib is a library for reading and editing the meta-data of several popular
-audio formats. Currently it supports both ID3v1 and ID3v2 for MP3 files, Ogg
-Vorbis comments and ID3 tags and Vorbis comments in FLAC files.
diff --git a/audio/taglib/Makefile b/audio/taglib/Makefile
deleted file mode 100644
index 952e78a375f..00000000000
--- a/audio/taglib/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2007/02/22 19:01:14 wiz Exp $
-#
-
-DISTNAME= taglib-1.4
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= http://ktown.kde.org/~wheeler/files/src/
-
-MAINTAINER= chris@NetBSD.org
-HOMEPAGE= http://ktown.kde.org/~wheeler/taglib/
-COMMENT= Library for accessing id tags in mp3 and ogg files
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-USE_LANGUAGES= c c++
-
-GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
-
-pre-build:
- cp ${FILESDIR}/id3lib_strings.h ${WRKSRC}/taglib/toolkit/.
-
-post-install:
- ${INSTALL_DATA} ${FILESDIR}/id3lib_strings.h ${DESTDIR}${PREFIX}/include/taglib/.
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/taglib/PLIST b/audio/taglib/PLIST
deleted file mode 100644
index 24237a486be..00000000000
--- a/audio/taglib/PLIST
+++ /dev/null
@@ -1,54 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2005/08/29 20:51:14 seb Exp $
-bin/taglib-config
-include/taglib/apefooter.h
-include/taglib/apeitem.h
-include/taglib/apetag.h
-include/taglib/attachedpictureframe.h
-include/taglib/audioproperties.h
-include/taglib/commentsframe.h
-include/taglib/fileref.h
-include/taglib/flacfile.h
-include/taglib/flacproperties.h
-include/taglib/id3lib_strings.h
-include/taglib/id3v1genres.h
-include/taglib/id3v1tag.h
-include/taglib/id3v2extendedheader.h
-include/taglib/id3v2footer.h
-include/taglib/id3v2frame.h
-include/taglib/id3v2framefactory.h
-include/taglib/id3v2header.h
-include/taglib/id3v2synchdata.h
-include/taglib/id3v2tag.h
-include/taglib/mpcfile.h
-include/taglib/mpcproperties.h
-include/taglib/mpegfile.h
-include/taglib/mpegheader.h
-include/taglib/mpegproperties.h
-include/taglib/oggfile.h
-include/taglib/oggflacfile.h
-include/taglib/oggpage.h
-include/taglib/oggpageheader.h
-include/taglib/relativevolumeframe.h
-include/taglib/tag.h
-include/taglib/tag_c.h
-include/taglib/taglib.h
-include/taglib/tbytevector.h
-include/taglib/tbytevectorlist.h
-include/taglib/textidentificationframe.h
-include/taglib/tfile.h
-include/taglib/tlist.h
-include/taglib/tlist.tcc
-include/taglib/tmap.h
-include/taglib/tmap.tcc
-include/taglib/tstring.h
-include/taglib/tstringlist.h
-include/taglib/uniquefileidentifierframe.h
-include/taglib/unknownframe.h
-include/taglib/vorbisfile.h
-include/taglib/vorbisproperties.h
-include/taglib/xingheader.h
-include/taglib/xiphcomment.h
-lib/libtag.la
-lib/libtag_c.la
-lib/pkgconfig/taglib.pc
-@dirrm include/taglib
diff --git a/audio/taglib/buildlink3.mk b/audio/taglib/buildlink3.mk
deleted file mode 100644
index 9f9231dca59..00000000000
--- a/audio/taglib/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:37 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-TAGLIB_BUILDLINK3_MK:= ${TAGLIB_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= taglib
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntaglib}
-BUILDLINK_PACKAGES+= taglib
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}taglib
-
-.if !empty(TAGLIB_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.taglib+= taglib>=1.0
-BUILDLINK_ABI_DEPENDS.taglib+= taglib>=1.3
-BUILDLINK_PKGSRCDIR.taglib?= ../../audio/taglib
-.endif # TAGLIB_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/taglib/distinfo b/audio/taglib/distinfo
deleted file mode 100644
index b34945d6442..00000000000
--- a/audio/taglib/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/08/29 20:51:14 seb Exp $
-
-SHA1 (taglib-1.4.tar.gz) = 9830aed2e8d4e0d5da399e2e6b0c5d5db3a0c270
-RMD160 (taglib-1.4.tar.gz) = 447055f5bc03dd8869e95205690cadd437372b21
-Size (taglib-1.4.tar.gz) = 732938 bytes
-SHA1 (patch-aa) = 541795a7c2a551bde2ee2492b56e4b4a9335967c
diff --git a/audio/taglib/files/id3lib_strings.h b/audio/taglib/files/id3lib_strings.h
deleted file mode 100644
index b16eb256132..00000000000
--- a/audio/taglib/files/id3lib_strings.h
+++ /dev/null
@@ -1,204 +0,0 @@
-// -*- C++ -*-
-// $Id: id3lib_strings.h,v 1.4 2006/09/23 13:26:24 wiz Exp $
-
-// id3lib: a software library for creating and manipulating id3v1/v2 tags
-// Copyright 1999, 2000 Scott Thomas Haug
-// Copyright 2002 Thijmen Klok (thijmen@id3lib.org)
-
-// This library is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Library General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or (at your
-// option) any later version.
-//
-// This library is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
-// License for more details.
-//
-// You should have received a copy of the GNU Library General Public License
-// along with this library; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-// The id3lib authors encourage improvements and optimisations to be sent to
-// the id3lib coordinator. Please see the README file for details on where to
-// send such submissions. See the AUTHORS file for a list of people who have
-// contributed to id3lib. See the ChangeLog file for a list of changes to
-// id3lib. These files are distributed with id3lib at
-// http://download.sourceforge.net/id3lib/
-
-#ifndef _ID3LIB_STRINGS_H_
-#define _ID3LIB_STRINGS_H_
-
-#include <string>
-
-#if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
-namespace std
-{
- template<>
- struct char_traits<unsigned char>
- {
- typedef unsigned char char_type;
- // Unsigned as wint_t in unsigned.
- typedef unsigned long int_type;
- typedef streampos pos_type;
- typedef streamoff off_type;
- typedef mbstate_t state_type;
-
- static void
- assign(char_type& __c1, const char_type& __c2)
- { __c1 = __c2; }
-
- static bool
- eq(const char_type& __c1, const char_type& __c2)
- { return __c1 == __c2; }
-
- static bool
- lt(const char_type& __c1, const char_type& __c2)
- { return __c1 < __c2; }
-
- static int
- compare(const char_type* __s1, const char_type* __s2, size_t __n)
- {
- for (size_t __i = 0; __i < __n; ++__i)
- if (!eq(__s1[__i], __s2[__i]))
- return lt(__s1[__i], __s2[__i]) ? -1 : 1;
- return 0;
- }
-
- static size_t
- length(const char_type* __s)
- {
- const char_type* __p = __s;
- while (__p)
- ++__p;
- return (__p - __s);
- }
-
- static const char_type*
- find(const char_type* __s, size_t __n, const char_type& __a)
- {
- for (const char_type* __p = __s; size_t(__p - __s) < __n; ++__p)
- if (*__p == __a) return __p;
- return 0;
- }
-
- static char_type*
- move(char_type* __s1, const char_type* __s2, size_t __n)
- { return (char_type*) memmove(__s1, __s2, __n * sizeof(char_type)); }
-
- static char_type*
- copy(char_type* __s1, const char_type* __s2, size_t __n)
- { return (char_type*) memcpy(__s1, __s2, __n * sizeof(char_type)); }
-
- static char_type*
- assign(char_type* __s, size_t __n, char_type __a)
- {
- for (char_type* __p = __s; __p < __s + __n; ++__p)
- assign(*__p, __a);
- return __s;
- }
-
- static char_type
- to_char_type(const int_type& __c)
- { return char_type(__c); }
-
- static int_type
- to_int_type(const char_type& __c) { return int_type(__c); }
-
- static bool
- eq_int_type(const int_type& __c1, const int_type& __c2)
- { return __c1 == __c2; }
-
- static int_type
- eof() { return static_cast<int_type>(-1); }
-
- static int_type
- not_eof(const int_type& __c)
- { return eq_int_type(__c, eof()) ? int_type(0) : __c; }
- };
-
-/* gcc-3.4 defines _GLIBCXX_USE_WCHAR_T instead of _GLIBCPP_USE_WCHAR_T */
-#if !defined(_GLIBCPP_USE_WCHAR_T) && !defined(_GLIBCXX_USE_WCHAR_T)
-#if (defined(ID3_NEED_WCHAR_TEMPLATE))
- template<>
- struct char_traits<wchar_t>
- {
- typedef wchar_t char_type;
- typedef wint_t int_type;
- typedef streamoff off_type;
- typedef streampos pos_type;
- typedef mbstate_t state_type;
-
- static void
- assign(char_type& __c1, const char_type& __c2)
- { __c1 = __c2; }
-
- static bool
- eq(const char_type& __c1, const char_type& __c2)
- { return __c1 == __c2; }
-
- static bool
- lt(const char_type& __c1, const char_type& __c2)
- { return __c1 < __c2; }
-
- static int
- compare(const char_type* __s1, const char_type* __s2, size_t __n)
- { return wmemcmp(__s1, __s2, __n); }
-
- static size_t
- length(const char_type* __s)
- { return wcslen(__s); }
-
- static const char_type*
- find(const char_type* __s, size_t __n, const char_type& __a)
- { return wmemchr(__s, __a, __n); }
-
- static char_type*
- move(char_type* __s1, const char_type* __s2, int_type __n)
- { return wmemmove(__s1, __s2, __n); }
-
- static char_type*
- copy(char_type* __s1, const char_type* __s2, size_t __n)
- { return wmemcpy(__s1, __s2, __n); }
-
- static char_type*
- assign(char_type* __s, size_t __n, char_type __a)
- { return wmemset(__s, __a, __n); }
-
- static char_type
- to_char_type(const int_type& __c) { return char_type(__c); }
-
- static int_type
- to_int_type(const char_type& __c) { return int_type(__c); }
-
- static bool
- eq_int_type(const int_type& __c1, const int_type& __c2)
- { return __c1 == __c2; }
-
- static state_type
- _S_get_state(const pos_type& __pos) { return __pos.state(); }
-
- static int_type
- eof() { return static_cast<int_type>(WEOF); }
-
- static int_type
- _S_eos() { return char_type(); }
-
- static int_type
- not_eof(const int_type& __c)
- { return eq_int_type(__c, eof()) ? 0 : __c; }
- };
-#endif
-#endif
-} // namespace std
-#endif
-
-namespace dami
-{
- typedef std::basic_string<char> String;
- typedef std::basic_string<unsigned char> BString;
- typedef std::basic_string<wchar_t> WString;
-};
-
-#endif /* _ID3LIB_STRINGS_H_ */
-
diff --git a/audio/taglib/patches/patch-aa b/audio/taglib/patches/patch-aa
deleted file mode 100644
index 5dadf3c691e..00000000000
--- a/audio/taglib/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/02/09 00:30:25 chris Exp $
-
---- taglib/toolkit/taglib.h.orig 2004-02-08 16:24:42.000000000 +0000
-+++ taglib/toolkit/taglib.h 2004-02-08 16:26:01.000000000 +0000
-@@ -29,6 +29,13 @@
-
- //! A namespace for all TagLib related classes and functions
-
-+/*
-+ * not all C++ compilers provide char_traits for wchar
-+ * so we borrow a file from id3lib as it has the relevant bits
-+ */
-+#define ID3_NEED_WCHAR_TEMPLATE 1
-+#include "id3lib_strings.h"
-+
- /*!
- * This namespace contains everything in TagLib. For projects working with
- * TagLib extensively it may be conveniten to add a
diff --git a/audio/tcd/DESCR b/audio/tcd/DESCR
deleted file mode 100644
index a14685bd3e6..00000000000
--- a/audio/tcd/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Tcd is a tiny audio CD player using ncurses. It can play CDs and manage
-a little CD database in cddb format.
diff --git a/audio/tcd/Makefile b/audio/tcd/Makefile
deleted file mode 100644
index 738fa48f0ac..00000000000
--- a/audio/tcd/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2006/10/04 20:44:19 wiz Exp $
-#
-
-DISTNAME= tcd-2.2.0
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= http://download.savannah.gnu.org/releases/tcd/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= roland.illig@gmx.de
-HOMEPAGE= http://www.nongnu.org/tcd/
-COMMENT= Audio CD player using ncurses and SDL
-
-USE_PKGLOCALEDIR= yes
-GNU_CONFIGURE= yes
-INCOMPAT_CURSES+= NetBSD-1.6*-*
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/tcd/PLIST b/audio/tcd/PLIST
deleted file mode 100644
index daede1f5fef..00000000000
--- a/audio/tcd/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/11/20 08:45:09 rillig Exp $
-bin/tcd
-man/man1/tcd.1
diff --git a/audio/tcd/distinfo b/audio/tcd/distinfo
deleted file mode 100644
index 1ed829cc21c..00000000000
--- a/audio/tcd/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/11/20 08:45:09 rillig Exp $
-
-SHA1 (tcd-2.2.0.tar.bz2) = 8ad1b9201d94554fe4d96b60da1cab577eae77cf
-RMD160 (tcd-2.2.0.tar.bz2) = f00702cfe496f85248534e155dc1d58ae88213b5
-Size (tcd-2.2.0.tar.bz2) = 90157 bytes
diff --git a/audio/tcl-snack/DESCR b/audio/tcl-snack/DESCR
deleted file mode 100644
index e9b69ad3653..00000000000
--- a/audio/tcl-snack/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-The Snack Sound Toolkit is designed to be used with a scripting
-language such as Tcl/Tk or Python. Using Snack you can create powerful
-multi-platform audio applications with just a few lines of code. Snack
-has commands for basic sound handling, e.g. sound card and disk
-I/O. Snack also has primitives for sound visualization, e.g. waveforms
-and spectrograms. It was developed mainly to handle digital recordings
-of speech, but is just as useful for general audio. Snack has also
-successfully been applied to other one-dimensional signals.
diff --git a/audio/tcl-snack/Makefile b/audio/tcl-snack/Makefile
deleted file mode 100644
index 53f38dec5cc..00000000000
--- a/audio/tcl-snack/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2007/02/22 19:26:07 wiz Exp $
-
-DISTNAME= snack2.2.8
-PKGNAME= tcl-snack-2.2.8
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= http://www.speech.kth.se/~kare/
-
-MAINTAINER= gson@NetBSD.org
-HOMEPAGE= http://www.speech.kth.se/snack/
-COMMENT= The Snack Sound Toolkit
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-WRKSRC= ${WRKDIR}/${DISTNAME}/unix
-GNU_CONFIGURE= YES
-
-CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib
-CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk}/lib
-
-INSTALLATION_DIRS= lib
-
-.include "../../lang/tcl/buildlink3.mk"
-.include "../../x11/tk/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/tcl-snack/PLIST b/audio/tcl-snack/PLIST
deleted file mode 100644
index d2d55bbc1d1..00000000000
--- a/audio/tcl-snack/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/08/25 18:34:39 gson Exp $
-lib/libsnackstub2.2.a
-lib/snack2.2/libsnack.so
-lib/snack2.2/libsound.so
-lib/snack2.2/pkgIndex.tcl
-lib/snack2.2/snack.tcl
-@dirrm lib/snack2.2
diff --git a/audio/tcl-snack/distinfo b/audio/tcl-snack/distinfo
deleted file mode 100644
index 0ef43869c88..00000000000
--- a/audio/tcl-snack/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 20:39:52 agc Exp $
-
-SHA1 (snack2.2.8.tar.gz) = 86394100e155818e9864a0a215c90102f324c825
-RMD160 (snack2.2.8.tar.gz) = dd0fbe841e66a83bc2b0713e34520563c423c7f8
-Size (snack2.2.8.tar.gz) = 1791575 bytes
-SHA1 (patch-aa) = 297f046897c9cba1d0919a69874dceeeb2d56808
-SHA1 (patch-ab) = 060757edac59c5c27443466f0c3b0bc55d50364e
-SHA1 (patch-ac) = ec3bac6a58a8d62c646201518f719ec065e98d72
-SHA1 (patch-ad) = e6868638722219bf18a345563d8ae2e3436bec81
diff --git a/audio/tcl-snack/patches/patch-aa b/audio/tcl-snack/patches/patch-aa
deleted file mode 100644
index 7db5c1989a0..00000000000
--- a/audio/tcl-snack/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/11/27 10:48:51 gson Exp $
-
---- Makefile.in.orig 2004-02-10 03:10:42.000000000 -0800
-+++ Makefile.in
-@@ -1,10 +1,13 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+
- # The path to the tcl.h header file
-
--TCL_INCPATH = @TCL_SRC_DIR@/generic
-+TCL_INCPATH = @TCL_PREFIX@/include
-
- # The path to the tk.h header file
-
--TK_INCPATH = @TK_SRC_DIR@/generic
-+TK_INCPATH = @TK_PREFIX@/include
-
- # The path to the X11 include files
-
-@@ -28,6 +31,7 @@
- TCL_VERSION = @TCLVER@
-
- CC = @CC@
-+TCL_CC = ${CC}
-
- INCLUDES = ${XINCLUDES} @TCL_INCLUDE_SPEC@ -I${TCL_INCPATH} -I${TK_INCPATH} @AINC@ @NISTINC@
-
diff --git a/audio/tcl-snack/patches/patch-ab b/audio/tcl-snack/patches/patch-ab
deleted file mode 100644
index 334c84ac671..00000000000
--- a/audio/tcl-snack/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/11/27 10:48:51 gson Exp $
-
---- configure.in.orig 2004-04-08 21:05:33.000000000 -0700
-+++ configure.in
-@@ -224,10 +224,12 @@
- AC_SUBST(SHLIB_SUFFIX)
- AC_SUBST(XINCLUDES)
- AC_SUBST(TCL_INCLUDE_SPEC)
-+AC_SUBST(TCL_PREFIX)
- AC_SUBST(TCL_LIB_SPEC)
- AC_SUBST(TK_LIB_SPEC)
- AC_SUBST(TCL_SRC_DIR)
- AC_SUBST(TK_SRC_DIR)
-+AC_SUBST(TK_PREFIX)
- AC_SUBST(TK_LIBS)
- AC_SUBST(SNACK_INSTALL_PATH)
- AC_SUBST(SNACK_HINSTALL_PATH)
diff --git a/audio/tcl-snack/patches/patch-ac b/audio/tcl-snack/patches/patch-ac
deleted file mode 100644
index 755d3927b6b..00000000000
--- a/audio/tcl-snack/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/11/27 10:48:51 gson Exp $
-
---- configure.orig 2004-04-08 21:07:42.000000000 -0700
-+++ configure
-@@ -2302,10 +2302,12 @@
- s,@SHLIB_LD@,$SHLIB_LD,;t t
- s,@SHLIB_SUFFIX@,$SHLIB_SUFFIX,;t t
- s,@XINCLUDES@,$XINCLUDES,;t t
-+s,@TCL_PREFIX@,$TCL_PREFIX,;t t
- s,@TCL_INCLUDE_SPEC@,$TCL_INCLUDE_SPEC,;t t
- s,@TCL_LIB_SPEC@,$TCL_LIB_SPEC,;t t
- s,@TK_LIB_SPEC@,$TK_LIB_SPEC,;t t
- s,@TCL_SRC_DIR@,$TCL_SRC_DIR,;t t
-+s,@TK_PREFIX@,$TK_PREFIX,;t t
- s,@TK_SRC_DIR@,$TK_SRC_DIR,;t t
- s,@TK_LIBS@,$TK_LIBS,;t t
- s,@SNACK_INSTALL_PATH@,$SNACK_INSTALL_PATH,;t t
diff --git a/audio/tcl-snack/patches/patch-ad b/audio/tcl-snack/patches/patch-ad
deleted file mode 100644
index aa7459ee8ae..00000000000
--- a/audio/tcl-snack/patches/patch-ad
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2002/08/27 04:36:20 gson Exp $
-
---- jkAudIO_oss.c.orig Wed Jul 17 04:03:15 2002
-+++ jkAudIO_oss.c
-@@ -35,7 +35,11 @@
- #include <ctype.h>
- #include <stdlib.h>
- #include <glob.h>
-+#ifdef __NetBSD__
-+#define DEVICE_NAME "/dev/sound"
-+#else
- #define DEVICE_NAME "/dev/dsp"
-+#endif
- #define MIXER_NAME "/dev/mixer"
- static char *defaultDeviceName = DEVICE_NAME;
- extern void Snack_WriteLog(char *s);
-@@ -971,11 +975,15 @@
- {
- int i, j = 0;
- glob_t globt;
--
-+
-+#ifdef __NetBSD__
-+ glob("/dev/sound*", 0, NULL, &globt);
-+#else
- glob("/dev/dsp*", 0, NULL, &globt);
- glob("/dev/audio*", GLOB_APPEND, NULL, &globt);
- glob("/dev/sound/dsp*", GLOB_APPEND, NULL, &globt);
- glob("/dev/sound/audio*", GLOB_APPEND, NULL, &globt);
-+#endif
-
- for (i = 0; i < globt.gl_pathc; i++) {
- if (j < n) {
diff --git a/audio/terminatorx/DESCR b/audio/terminatorx/DESCR
deleted file mode 100644
index 19cd513e99d..00000000000
--- a/audio/terminatorx/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-terminatorX is a realtime audio synthesizer that allows you to "scratch"
-on digitally sampled audio data (*.wav, *.au, *.ogg, *.mp3, etc.) the way
-hiphop-DJs scratch on vinyl records. It features multiple turntables,
-realtime effects (buit-in as well as LADSPA plugin effects), a sequencer
-and MIDI interface - all accessible through an easy-to-use gtk+ GUI.
diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
deleted file mode 100644
index 3824d45170b..00000000000
--- a/audio/terminatorx/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:35 joerg Exp $
-#
-
-DISTNAME= terminatorX-3.82
-PKGNAME= ${DISTNAME:S/X/x/}
-PKGREVISION= 4
-CATEGORIES= audio
-MASTER_SITES= http://terminatorx.cx/dist/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://terminatorx.cx/
-COMMENT= Realtime audio synthesizer
-
-DEPENDS+= mpg123-[0-9]*:../../audio/mpg123
-DEPENDS+= sox-[0-9]*:../../audio/sox
-DEPENDS+= vorbis-tools-[0-9]*:../../audio/vorbis-tools
-
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-USE_TOOLS+= pkg-config
-GNU_CONFIGURE= yes
-
-LIBS+= ${LIBOSSAUDIO}
-CONFIGURE_ARGS+= --disable-alsa
-
-SUBST_CLASSES+= oss
-SUBST_STAGE.oss= post-patch
-SUBST_FILES.oss= src/tX_global.c
-SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
-SUBST_MESSAGE.oss= Fixing hardcoded audio device.
-
-.include "../../audio/ladspa/buildlink3.mk"
-.include "../../audio/libaudiofile/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libXxf86dga/buildlink3.mk"
-
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/terminatorx/PLIST b/audio/terminatorx/PLIST
deleted file mode 100644
index 422c541d29a..00000000000
--- a/audio/terminatorx/PLIST
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/01/12 13:59:43 xtraeme Exp $
-bin/terminatorX
-man/man1/terminatorX.1
-share/omf/terminatorX/terminatorX-manual-C.omf
-share/terminatorX/doc/terminatorX-manual/C/figures/signalflow.png
-share/terminatorX/doc/terminatorX-manual/C/terminatorX-manual.xml
-@dirrm share/terminatorX/doc/terminatorX-manual/C/figures
-@dirrm share/terminatorX/doc/terminatorX-manual/C
-@dirrm share/terminatorX/doc/terminatorX-manual
-@dirrm share/terminatorX/doc
-@dirrm share/terminatorX
-@dirrm share/omf/terminatorX
-@comment in scrollkeeper: @dirrm share/omf
diff --git a/audio/terminatorx/distinfo b/audio/terminatorx/distinfo
deleted file mode 100644
index 12e103de7b8..00000000000
--- a/audio/terminatorx/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/12/12 00:26:36 joerg Exp $
-
-SHA1 (terminatorX-3.82.tar.bz2) = 8d492fc759ffb77c2549190081077e12f765233f
-RMD160 (terminatorX-3.82.tar.bz2) = b70c688101844a07eddcd3e090cd6e805e93f066
-Size (terminatorX-3.82.tar.bz2) = 395755 bytes
-SHA1 (patch-aa) = c313aed6ec7bba657a3941ddc5586ad7b7c734eb
diff --git a/audio/terminatorx/patches/patch-aa b/audio/terminatorx/patches/patch-aa
deleted file mode 100644
index ad7efdf0501..00000000000
--- a/audio/terminatorx/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/12/12 00:26:36 joerg Exp $
-
---- src/tX_dialog.cc.orig 2005-12-12 00:13:12.000000000 +0000
-+++ src/tX_dialog.cc
-@@ -252,7 +252,11 @@ GList *get_alsa_device_list() {
- #ifdef USE_OSS
- static GList *oss_devices=NULL;
-
-+#if defined(__DragonFly__) || defined(__FreeBSD__)
-+int oss_select_dsp_only(struct dirent *entry){
-+#else
- int oss_select_dsp_only(const struct dirent *entry){
-+#endif
- return (strstr(entry->d_name, "dsp")!=0);
- }
-
diff --git a/audio/tfmxplay/DESCR b/audio/tfmxplay/DESCR
deleted file mode 100644
index 7c3efe79d89..00000000000
--- a/audio/tfmxplay/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-TFMX (The Final Musicsystem eXtended) is an Amiga game music format
-developed by Chris Huelsbeck. It is rather unlike the various "Module"
-formats (Protracker et al.). Some of the few players for this format
-are:
- * the original TFMX editor (Amiga)
- * EaglePlayer (Amiga)
- * TFMX-Play and its numerous derivatives (originally ST, now Linux and Win32)
- * the SUN-Project PMS-player (DOS, used for the PC-Version of Turrican 2)
-
-The original editor is extremely rare, but it is available from the
-ExoticA! site. The SUN-Project player is not that great (partly
-because of DOS, partly because it has never been finished).
-And TFMX-Play is what you're looking at right now.
diff --git a/audio/tfmxplay/Makefile b/audio/tfmxplay/Makefile
deleted file mode 100644
index cb04a6446ff..00000000000
--- a/audio/tfmxplay/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2006/03/09 21:04:41 jlam Exp $
-#
-
-DISTNAME= tfmxplay-0.6
-CATEGORIES= audio
-MASTER_SITES= http://darkstar.tabu.uni-bonn.de/~neo/tfmx/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://darkstar.tabu.uni-bonn.de/~neo/audio.html
-COMMENT= Console TFMX (amiga games sound file format) player
-
-NOT_FOR_PLATFORM= Interix-*-*
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/tfmx-play ${PREFIX}/bin/tfmxplay
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tfmxplay
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/tfmxplay/
-
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/tfmxplay/PLIST b/audio/tfmxplay/PLIST
deleted file mode 100644
index d04d9016830..00000000000
--- a/audio/tfmxplay/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:18:00 zuntum Exp $
-bin/tfmxplay
-share/doc/tfmxplay/README
-@dirrm share/doc/tfmxplay
diff --git a/audio/tfmxplay/distinfo b/audio/tfmxplay/distinfo
deleted file mode 100644
index 8b3d1806636..00000000000
--- a/audio/tfmxplay/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.8 2005/11/10 19:51:23 joerg Exp $
-
-SHA1 (tfmxplay-0.6.tgz) = 8028a03d4198da0733fa297e9e6ada864f0c782a
-RMD160 (tfmxplay-0.6.tgz) = 52c31309588b4a8073bf0987f0237ca9d6274b35
-Size (tfmxplay-0.6.tgz) = 24271 bytes
-SHA1 (patch-aa) = 38bf1771c8773e7e12dbd1a563fa30ec9ae43c0f
-SHA1 (patch-ab) = 0e18cc967b397e48857f47bc231ae5a5eeb0e8dc
-SHA1 (patch-ac) = 5796904e2b50e538973deec598ec69728e48e8d5
-SHA1 (patch-ad) = 1b3456f95f94b3a665899bbd84a97d44157e32cb
diff --git a/audio/tfmxplay/patches/patch-aa b/audio/tfmxplay/patches/patch-aa
deleted file mode 100644
index 925951d4f77..00000000000
--- a/audio/tfmxplay/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/05/13 18:21:04 minskim Exp $
-
---- Makefile.orig Sat Jun 23 13:33:05 2001
-+++ Makefile
-@@ -28,8 +28,8 @@
-
- OBJS=player.o tfmx.o audio.o
-
--CFLAGS=$(PROFLAGS) -O -fno-strength-reduce $(SCHEDFLAGS) $(DEBUGFLAGS)
--LDFLAGS=$(PROFLAGS) $(DEBUGFLAGS)
-+#CFLAGS=$(PROFLAGS) -O -fno-strength-reduce $(SCHEDFLAGS) $(DEBUGFLAGS)
-+LDFLAGS=$(PROFLAGS) $(DEBUGFLAGS) ${LIBOSSAUDIO}
-
-
- BINARY=tfmx-play
-@@ -42,7 +42,7 @@
- audio.c: player.h
-
- audio.o: audio.c
-- $(CC) $(CFLAGS) -O3 -fno-strength-reduce -c audio.c -o audio.o $(ALSADEF)
-+ $(CC) $(CFLAGS) -c audio.c -o audio.o $(ALSADEF)
-
- clean:
- rm -rf *.o $(BINARY)
diff --git a/audio/tfmxplay/patches/patch-ab b/audio/tfmxplay/patches/patch-ab
deleted file mode 100644
index 2e99a3414d6..00000000000
--- a/audio/tfmxplay/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2003/03/01 10:54:40 jmc Exp $
-
---- player.c.orig Sat Mar 1 10:51:04 2003
-+++ player.c Sat Mar 1 10:51:31 2003
-@@ -5,6 +5,7 @@
- */
-
- #include <stdio.h>
-+#include <sys/types.h>
- #include "player.h"
- #include "tfmxsong.h"
-
diff --git a/audio/tfmxplay/patches/patch-ac b/audio/tfmxplay/patches/patch-ac
deleted file mode 100644
index 5f27c187b42..00000000000
--- a/audio/tfmxplay/patches/patch-ac
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2004/03/23 02:08:37 minskim Exp $
-
---- tfmx.c.orig 2001-08-02 13:49:40.000000000 -0500
-+++ tfmx.c
-@@ -46,24 +46,22 @@ extern int blend,filt,over;
-
- usage(char *x)
- {
-- fprintf(stderr,"tfmxplay v0.6 by Jon Pickard <marxmarv@antigates.com>,
--Neochrome <David.Banz@smail.inf.fh-rhein-sieg.de> and others.
--Copyright 1996-2001, see accompanying README for details.
--
--This release is dedicated to the memory of Martin Requart.
--
--Usage: %s [options] mdat-file [smpl-file]
--where options is one or more of:
---b mode set stereo mode (0=mono, default 1=headphone, 2=stereo)
---8 generate 8-bit output
---p num subsong to play (default 0)
---f freq suggest playback rate in samples/sec (default 44100)
---o file write audio output to file (default /dev/dsp)
---i print info about the module (text, subsong, etc.)
---w num set low-pass filter frequency (0=none, 3=lowest, default 0)
---l num set number of loops through (default 0=infinite, 1=no repeat)
---v disable oversampling (=linear interpolation)
--",x
-+ fprintf(stderr,"tfmxplay v0.6 by Jon Pickard <marxmarv@antigates.com>,\n"
-+"Neochrome <David.Banz@smail.inf.fh-rhein-sieg.de> and others.\n"
-+"Copyright 1996-2001, see accompanying README for details.\n\n"
-+"This release is dedicated to the memory of Martin Requart.\n\n"
-+"Usage: %s [options] mdat-file [smpl-file]\n"
-+"where options is one or more of:\n"
-+"-b mode set stereo mode (0=mono, default 1=headphone, 2=stereo)\n"
-+"-8 generate 8-bit output\n"
-+"-p num subsong to play (default 0)\n"
-+"-f freq suggest playback rate in samples/sec (default 44100)\n"
-+"-o file write audio output to file (default /dev/dsp)\n"
-+"-i print info about the module (text, subsong, etc.)\n"
-+"-w num set low-pass filter frequency (0=none, 3=lowest, default 0)\n"
-+"-l num set number of loops through (default 0=infinite, 1=no repeat)\n"
-+"-v disable oversampling (=linear interpolation)\n"
-+,x
- );
-
- }
diff --git a/audio/tfmxplay/patches/patch-ad b/audio/tfmxplay/patches/patch-ad
deleted file mode 100644
index d0c450a55c4..00000000000
--- a/audio/tfmxplay/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/11/10 19:51:23 joerg Exp $
-
---- audio.c.orig 2001-08-02 11:06:48.000000000 +0000
-+++ audio.c
-@@ -5,8 +5,10 @@
- */
-
-
--#ifdef __NetBSD__
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
- #include <soundcard.h>
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+#include <sys/soundcard.h>
- #else
- #include <linux/soundcard.h>
- #endif
diff --git a/audio/timidity/DESCR b/audio/timidity/DESCR
deleted file mode 100644
index 6439b25c129..00000000000
--- a/audio/timidity/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-TiMidity is a MIDI to WAVE converter using Gravis
-Ultrasound-compatible patch files to generate digital audio data from
-General MIDI files. The data can be stored in a file for processing,
-or played in real time through an audio device.
diff --git a/audio/timidity/MESSAGE b/audio/timidity/MESSAGE
deleted file mode 100644
index e1bd1fa9975..00000000000
--- a/audio/timidity/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.5 2006/10/27 17:20:52 wiz Exp $
-
- To use this program, you'll have to install one of the following:
- * pkgsrc/audio/eawpatches
- * pkgsrc/audio/freepats
- * pkgsrc/audio/guspatches
-
-===========================================================================
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
deleted file mode 100644
index 0f4b0b2af60..00000000000
--- a/audio/timidity/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# $NetBSD: Makefile,v 1.60 2007/01/11 00:27:37 wiz Exp $
-
-DISTNAME= TiMidity++-2.13.2
-PKGNAME= ${DISTNAME:S/TiMidity++/timidity/}
-PKGREVISION= 6
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=timidity/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= wiz@NetBSD.org
-HOMEPAGE= http://timidity.sourceforge.net/
-COMMENT= MIDI to WAV renderer and player
-
-CONFLICTS= kdemultimedia-2.[0-9]*
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --enable-vt100
-CONFIGURE_ARGS+= --enable-gtk --enable-wrd --enable-xaw --enable-ncurses
-CONFIGURE_ARGS+= --with-ogg="${BUILDLINK_DIR}/include"
-CONFIGURE_ARGS+= --with-vorbis="${BUILDLINK_DIR}/include"
-CONFIGURE_ARGS+= --with-default-path=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+= --enable-audio=${TIMIDITY_NATIVE_AUDIO},vorbis,speex
-# flac disabled since there is currently (20070111) no patch available
-# that adapts timidity for the flac-1.1.3 API
-#CONFIGURE_ARGS+= --enable-audio=${TIMIDITY_NATIVE_AUDIO},vorbis,flac,speex
-#CONFIGURE_ARGS+= --with-libFLAC="${BUILDLINK_DIR}/include"
-
-SUBST_CLASSES+= confdir
-SUBST_MESSAGE.confdir= Configuring to use PKG_SYSCONFDIR.
-SUBST_STAGE.confdir= post-patch
-SUBST_FILES.confdir= doc/C/timidity.cfg.5 doc/ja_JP.eucJP/timidity.cfg.5
-SUBST_SED.confdir= -e 's,/usr/local/share/timidity,${PKG_SYSCONFDIR},g'
-
-.include "../../mk/bsd.prefs.mk"
-
-TIMIDITY_NATIVE_AUDIO= # empty
-
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
-TIMIDITY_NATIVE_AUDIO= sun
-.elif ${OPSYS} == "Linux"
-TIMIDITY_NATIVE_AUDIO= oss
-.elif ${OPSYS} == "Darwin"
-TIMIDITY_NATIVE_AUDIO= darwin
-.endif
-
-# see above for reason this is not included
-#.include "../../audio/flac/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/speex/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
-.include "../../mk/xaw.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/timidity/PLIST b/audio/timidity/PLIST
deleted file mode 100644
index 95911894814..00000000000
--- a/audio/timidity/PLIST
+++ /dev/null
@@ -1,17 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/02/21 15:43:58 mycroft Exp $
-bin/timidity
-lib/timidity/bitmaps/back.xbm
-lib/timidity/bitmaps/fwrd.xbm
-lib/timidity/bitmaps/next.xbm
-lib/timidity/bitmaps/pause.xbm
-lib/timidity/bitmaps/play.xbm
-lib/timidity/bitmaps/prev.xbm
-lib/timidity/bitmaps/quit.xbm
-lib/timidity/bitmaps/random.xbm
-lib/timidity/bitmaps/repeat.xbm
-lib/timidity/bitmaps/stop.xbm
-lib/timidity/bitmaps/timidity.xbm
-man/man1/timidity.1
-man/man5/timidity.cfg.5
-@dirrm lib/timidity/bitmaps
-@dirrm lib/timidity
diff --git a/audio/timidity/distinfo b/audio/timidity/distinfo
deleted file mode 100644
index 7179f8ddc69..00000000000
--- a/audio/timidity/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.12 2005/12/11 19:40:16 joerg Exp $
-
-SHA1 (TiMidity++-2.13.2.tar.bz2) = 8e603146e1164335303a5ac5dff291f369241b4e
-RMD160 (TiMidity++-2.13.2.tar.bz2) = 0156221846a88abef9312700a050972d85084fd8
-Size (TiMidity++-2.13.2.tar.bz2) = 1581230 bytes
-SHA1 (patch-aa) = 3e006fe39bcc2644b7cea30ffce318091e1b8915
-SHA1 (patch-ab) = 6c4938e1b31dc066354aebd364c848bb88b20eb4
-SHA1 (patch-ac) = 56e738ef60dc8040d27bb50722ed5e0294d343e4
-SHA1 (patch-ae) = 3f55ea58e91bd97ff42fbe67e8c89514c29aa2e9
diff --git a/audio/timidity/patches/patch-aa b/audio/timidity/patches/patch-aa
deleted file mode 100644
index 62b47231fa2..00000000000
--- a/audio/timidity/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2004/04/14 14:41:34 adam Exp $
-
---- timidity/sun_a.c.orig 2002-07-19 00:43:58.000000000 +0000
-+++ timidity/sun_a.c
-@@ -70,7 +70,11 @@
- #define SUNAUDIO_AENC_SIGWORD AENC_SIGWORDB
- #endif
-
-+#ifndef __NetBSD__
- #define AUDIO_DEV "/dev/audio"
-+#else
-+#define AUDIO_DEV "/dev/sound"
-+#endif
- #define AUDIO_CTLDEV "/dev/audioctl"
-
-
diff --git a/audio/timidity/patches/patch-ab b/audio/timidity/patches/patch-ab
deleted file mode 100644
index 9db395e5d12..00000000000
--- a/audio/timidity/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.13 2005/11/19 21:21:23 kristerw Exp $
-
---- interface/xaw_i.c.orig 2005-11-19 21:56:48.000000000 +0100
-+++ interface/xaw_i.c 2005-11-19 21:58:44.000000000 +0100
-@@ -261,7 +261,7 @@
- String bitmapdir = XAW_BITMAP_DIR;
- Boolean arrangetitle,savelist;
- static char **current_flist = NULL;
--static int voices = 0, last_voice = 0, voices_num_width;
-+static int xvoices = 0, last_voice = 0, voices_num_width;
- static int maxentry_on_a_menu = 0,submenu_n = 0;
- #define OPTIONS_WINDOW 1
- #define FLIST_WINDOW 2
-@@ -1329,7 +1329,7 @@
- c= *(local_buf+1);
- n= atoi(local_buf+2);
- if(c == 'L')
-- voices = n;
-+ xvoices = n;
- else
- last_voice = n;
- if(IsTracePlaying()) drawVoices();
-@@ -2070,7 +2070,7 @@
- XSetForeground(disp, gct, tracecolor);
- XFillRectangle(disp,XtWindow(trace),gct,voices_num_width +4,
- MAX_XAW_MIDI_CHANNELS*BAR_SPACE+TRACEV_OFS+1,VOICENUM_WIDTH,TRACE_FOOT);
-- sprintf(local_buf, "%3d/%d", last_voice, voices);
-+ sprintf(local_buf, "%3d/%d", last_voice, xvoices);
- XSetForeground(disp, gct, capcolor);
- XDrawString(disp, XtWindow(trace),gct,voices_num_width+6,
- MAX_XAW_MIDI_CHANNELS*BAR_SPACE+TRACEV_OFS+16,local_buf,strlen(local_buf));
diff --git a/audio/timidity/patches/patch-ac b/audio/timidity/patches/patch-ac
deleted file mode 100644
index a4be53542aa..00000000000
--- a/audio/timidity/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2005/12/11 19:40:16 joerg Exp $
-
---- timidity/timidity.h.orig 2005-12-07 19:35:02.000000000 +0000
-+++ timidity/timidity.h
-@@ -449,10 +449,7 @@ typedef double FLOAT_T;
-
- #include <stdio.h>
-
--#ifdef HAVE_ERRNO_H
- #include <errno.h>
--#endif /* HAVE_ERRNO_H */
--extern int errno;
-
- #ifdef HAVE_MACHINE_ENDIAN_H
- #include <machine/endian.h> /* for __byte_swap_*() */
diff --git a/audio/timidity/patches/patch-ae b/audio/timidity/patches/patch-ae
deleted file mode 100644
index 3c849265b65..00000000000
--- a/audio/timidity/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2004/04/14 14:41:34 adam Exp $
-
---- timidity/output.c.orig 2004-02-11 16:08:15.000000000 +0000
-+++ timidity/output.c
-@@ -25,6 +25,7 @@
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif /* HAVE_CONFIG_H */
-+#include <stdlib.h>
- #ifdef STDC_HEADERS
- #include <string.h>
- #include <ctype.h>
diff --git a/audio/toolame/DESCR b/audio/toolame/DESCR
deleted file mode 100644
index e2de32254ac..00000000000
--- a/audio/toolame/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-tooLAME is an optimized MPEG Audio 1/2 Layer 2 encoder. It is based heavily on
- - the ISO dist10 code
- - improvement to algorithms as part of the LAME project: www.sulaco.org/mp3
- - work by Michael Cheng and other contributors (see CONTRIBUTORS)
diff --git a/audio/toolame/Makefile b/audio/toolame/Makefile
deleted file mode 100644
index ea2c6409772..00000000000
--- a/audio/toolame/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:28:58 jlam Exp $
-#
-
-DISTNAME= toolame-02l
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=toolame/}
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://sourceforge.net/projects/toolame/
-COMMENT= Optimized MPEG 1/2 layer 2 audio encoder
-
-USE_TOOLS+= gmake
-
-TOOLAME_ARCH?=
-
-MAKE_ENV+= CC=${CC:Q} CFLAGS=${CFLAGS:M*:Q} ARCH=${TOOLAME_ARCH:Q}
-BUILD_TARGET= toolame
-
-INSTALLATION_DIRS= bin
-
-TOOLAME_HTMLFILES= changes.html default.html psycho.html readme.html vbr.html
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/toolame
- cd ${WRKSRC}/html; ${INSTALL_DATA} ${TOOLAME_HTMLFILES} \
- ${PREFIX}/share/doc/html/toolame
- ${INSTALL_PROGRAM} ${WRKSRC}/toolame ${PREFIX}/bin
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/toolame/PLIST b/audio/toolame/PLIST
deleted file mode 100644
index 3502a9a9fe3..00000000000
--- a/audio/toolame/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/10/26 17:30:31 joerg Exp $
-bin/toolame
-share/doc/html/toolame/changes.html
-share/doc/html/toolame/default.html
-share/doc/html/toolame/psycho.html
-share/doc/html/toolame/readme.html
-share/doc/html/toolame/vbr.html
-@dirrm share/doc/html/toolame
diff --git a/audio/toolame/distinfo b/audio/toolame/distinfo
deleted file mode 100644
index cecbd698e94..00000000000
--- a/audio/toolame/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/07/30 11:30:03 grant Exp $
-
-SHA1 (toolame-02l.tgz) = 9f58345ec5d552f49a9ad598e6eb2dc126cb10b4
-RMD160 (toolame-02l.tgz) = 65ff0757f48080093df9e1932b5952199d03f5c6
-Size (toolame-02l.tgz) = 127493 bytes
-SHA1 (patch-aa) = 44633513f0ad2768ad1531ab41e059659d661630
-SHA1 (patch-ab) = 3dae25436a931eea5fe33aa0dcca16c46e529ed7
-SHA1 (patch-ac) = 6a4df822e31858a52203a62ce8d5d1f20931dbbb
-SHA1 (patch-ad) = 9b3f8fc15012714da8b1c701103b5aa2ed77ac87
diff --git a/audio/toolame/patches/patch-aa b/audio/toolame/patches/patch-aa
deleted file mode 100644
index e5099f35ad9..00000000000
--- a/audio/toolame/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/07/30 11:30:03 grant Exp $
-
-these patches correct invalid C code that declares variables after statements.
-
---- psycho_3.c.orig 2003-03-01 20:35:14.000000000 +1100
-+++ psycho_3.c
-@@ -22,7 +22,7 @@
-
- /* Keep a table to fudge the adding of dB */
- #define DBTAB 1000
--static double dbtable[DBTAB];
-+double dbtable[DBTAB];
-
- #define CRITBANDMAX 32 /* this is much higher than it needs to be. really only about 24 */
- int cbands=0; /* How many critical bands there really are */
-@@ -133,8 +133,8 @@ void psycho_3_fft(FLOAT sample[BLKSIZE],
- static FLOAT *window;
-
- if (!init) { /* calculate window function for the Fourier transform */
-- window = (FLOAT *) mem_alloc (sizeof (DFFT), "window");
- register FLOAT sqrt_8_over_3 = pow (8.0 / 3.0, 0.5);
-+ window = (FLOAT *) mem_alloc (sizeof (DFFT), "window");
- for (i = 0; i < BLKSIZE; i++) {
- window[i] = sqrt_8_over_3 * 0.5 * (1 - cos (2.0 * PI * i / (BLKSIZE))) / BLKSIZE;
- }
-@@ -441,12 +441,14 @@ void psycho_3_init(options *glopts) {
- psycho_3_init_add_db();
-
- /* For each spectral line calculate the bark and the ATH (in dB) */
-+ {
- FLOAT sfreq = (FLOAT) s_freq[header->version][header->sampling_frequency] * 1000;
- for (i=1;i<HBLKSIZE; i++) {
- FLOAT freq = i * sfreq/BLKSIZE;
- bark[i] = freq2bark(freq);
- ath[i] = ATH_dB(freq,glopts->athlevel);
- }
-+ }
-
- { /* Work out the critical bands
- Starting from line 0, all lines within 1 bark of the starting
diff --git a/audio/toolame/patches/patch-ab b/audio/toolame/patches/patch-ab
deleted file mode 100644
index 3dbe44b8288..00000000000
--- a/audio/toolame/patches/patch-ab
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/07/30 11:30:03 grant Exp $
-
-these patches correct invalid C code that declares variables after statements.
-
---- psycho_4.c.orig 2003-03-02 11:50:48.000000000 +1100
-+++ psycho_4.c
-@@ -83,8 +83,8 @@ static F2HBLK *r, *phi_sav;
-
- #define TRIGTABLESIZE 3142
- #define TRIGTABLESCALE 1000.0
--static FLOAT cos_table[TRIGTABLESIZE];
--static FLOAT sin_table[TRIGTABLESIZE];
-+FLOAT cos_table[TRIGTABLESIZE];
-+FLOAT sin_table[TRIGTABLESIZE];
- void psycho_4_trigtable_init(void) {
-
- int i;
-@@ -361,6 +361,7 @@ void psycho_4_init (double sfreq, option
- }
-
-
-+ {
- /* Work out the partitions
- Starting from line 0, all lines within 0.33 of the starting
- bark are added to the same partition. When a line is greater
-@@ -381,6 +382,7 @@ void psycho_4_init (double sfreq, option
- /* keep a count of how many frequency lines are in each partition */
- numlines[partition_count]++;
- }
-+ }
-
- /* For each partition within the frequency space,
- calculate the average bark value - cbval [central bark value] */
diff --git a/audio/toolame/patches/patch-ac b/audio/toolame/patches/patch-ac
deleted file mode 100644
index 0303ef52528..00000000000
--- a/audio/toolame/patches/patch-ac
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2005/07/30 11:30:03 grant Exp $
-
---- Makefile.orig 2003-03-02 18:07:02.000000000 +1100
-+++ Makefile
-@@ -1,5 +1,5 @@
-
--CC = gcc
-+#CC = gcc
-
- c_sources = \
- common.c \
-@@ -28,7 +28,7 @@ OBJ = $(c_sources:.c=.o)
-
- #Uncomment this if you want to do some profiling/debugging
- #PG = -g -pg
--PG = -fomit-frame-pointer
-+#PG = -fomit-frame-pointer
-
- # Optimize flag. 3 is about as high as you can sanely go with GCC3.2.
- OPTIM = -O3
-@@ -37,7 +37,7 @@ OPTIM = -O3
- REQUIRED = -DNDEBUG -DINLINE=inline
-
- #pick your architecture
--ARCH = -march=pentium
-+#ARCH = -march=pentium
- #Possible x86 architectures
- #gcc3.2 => i386, i486, i586, i686, pentium, pentium-mmx
- # pentiumpro, pentium2, pentium3, pentium4, k6, k6-2, k6-3,
-@@ -51,8 +51,8 @@ ARCH = -march=pentium
- # -fschedule-insns2 -fno-strength-reduce
-
- #Set a stack of warnings to overcome my atrocious coding style . MFC.
--WARNINGS = -Wall
--WARNINGS2 = -Wstrict-prototypes -Wmissing-prototypes -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-variable -Wunused-value -Wredundant-decls
-+#WARNINGS = -Wall
-+#WARNINGS2 = -Wstrict-prototypes -Wmissing-prototypes -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-variable -Wunused-value -Wredundant-decls
-
- NEW_02L_FIXES = -DNEWENCODE -DNEWATAN
-
diff --git a/audio/toolame/patches/patch-ad b/audio/toolame/patches/patch-ad
deleted file mode 100644
index a5f16215ccd..00000000000
--- a/audio/toolame/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/08/24 02:28:22 grant Exp $
-
---- fft.c.orig 2003-03-02 18:14:45.000000000 +1100
-+++ fft.c
-@@ -1187,7 +1187,7 @@ static void fht (FLOAT * fz)
- #ifdef NEWATAN
- #define ATANSIZE 2000
- #define ATANSCALE 50.0
-- static FLOAT atan_t[ATANSIZE];
-+ FLOAT atan_t[ATANSIZE];
-
- INLINE FLOAT atan_table(FLOAT y, FLOAT x) {
- int index;
diff --git a/audio/tosha/DESCR b/audio/tosha/DESCR
deleted file mode 100644
index f950230cac3..00000000000
--- a/audio/tosha/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-"tosha" reads one or more CD-DA (digital audio) tracks or absolute
-sectors and writes them into a single or multiple files, or to the
-standard output.
-
-The digital audio data is read through the SCSI bus; thus tosha
-does NOT work with IDE/ATAPI CD-ROM drives nor with proprietary
-interfaces.
diff --git a/audio/tosha/Makefile b/audio/tosha/Makefile
deleted file mode 100644
index c688823412a..00000000000
--- a/audio/tosha/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2007/01/07 09:13:47 rillig Exp $
-
-DISTNAME= tosha-0.05
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-# author's homepage is at http://www.secnetix.de/~olli/, but tosha isn't mentioned
-COMMENT= Read CD digital audio data through the SCSI bus
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-CPPFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-.include "../../devel/libscsi/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/tosha/PLIST b/audio/tosha/PLIST
deleted file mode 100644
index 35d18419edb..00000000000
--- a/audio/tosha/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:18:04 zuntum Exp $
-bin/tosha
-bin/pcmplay
-bin/pcmfade
-man/man1/tosha.1
-man/man1/pcmplay.1
-man/man1/pcmfade.1
diff --git a/audio/tosha/distinfo b/audio/tosha/distinfo
deleted file mode 100644
index 3c62f4118f2..00000000000
--- a/audio/tosha/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/06/24 08:37:40 rillig Exp $
-
-SHA1 (tosha-0.05.tar.gz) = b567f452843b544b082c88403d74ad1ca07f6820
-RMD160 (tosha-0.05.tar.gz) = 21ed9253b020efba1035febe86080a2bd8cc04da
-Size (tosha-0.05.tar.gz) = 17859 bytes
-SHA1 (patch-aa) = 10e3bff1ce1859e0389f39e4042960c0a61ca2b7
-SHA1 (patch-ab) = 9b4b43d6cb0fe2871cfd0e7e76ffdbd19123573a
-SHA1 (patch-ac) = 26feb1151d4fb02c5831762447c7bb264517f4d6
-SHA1 (patch-af) = 4a1debd7dec8eaa6e2cae2dc33c8ec1aecbfc736
diff --git a/audio/tosha/patches/patch-aa b/audio/tosha/patches/patch-aa
deleted file mode 100644
index 4f61fed67bd..00000000000
--- a/audio/tosha/patches/patch-aa
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2006/06/24 08:37:40 rillig Exp $
-
---- Makefile.orig 1997-05-21 01:57:17.000000000 +0200
-+++ Makefile 2006-06-24 10:36:24.000000000 +0200
-@@ -5,7 +5,6 @@
- # Wed May 21 01:51:37 MET DST 1997
- #
-
--PREFIX=/usr/local
- BINDIR=$(PREFIX)/bin
- MANDIR=$(PREFIX)/man
- SECTION=1
-@@ -16,7 +15,7 @@ SECTION=1
- ###### ######
- ###################################################
-
--CFLAGS=-O2 -Wall -ansi
-+# CFLAGS=-O2 -Wall -ansi
- # CFLAGS=-g -Wall -ansi -pedantic
-
- all: tosha pcmplay pcmfade
-@@ -28,21 +27,17 @@ pcmplay.o: pcmplay.c utils.h getlopt.h
- pcmfade.o: pcmfade.c utils.h
-
- tosha: tosha.o utils.o getlopt.o
-- $(CC) $(CFLAGS) -o tosha -lscsi tosha.o utils.o getlopt.o
-+ $(CC) $(CFLAGS) -o tosha tosha.o utils.o getlopt.o ${LDFLAGS} -lscsi -lutil
-
- pcmplay: pcmplay.o utils.o getlopt.o
-- $(CC) $(CFLAGS) -o pcmplay pcmplay.o utils.o getlopt.o
-+ $(CC) $(CFLAGS) -o pcmplay pcmplay.o utils.o getlopt.o ${LDFLAGS} ${LIBOSSAUDIO}
-
- pcmfade: pcmfade.o utils.o
-- $(CC) $(CFLAGS) -o pcmfade pcmfade.o utils.o
-+ $(CC) $(CFLAGS) -o pcmfade pcmfade.o utils.o ${LDFLAGS}
-
- install: tosha pcmplay pcmfade
-- install -s -g bin -o bin -m 755 tosha pcmplay pcmfade $(BINDIR)
-- install -c -g bin -o bin -m 644 tosha.1 pcmplay.1 pcmfade.1 \
-- $(MANDIR)/man$(SECTION)
-- gzip -f -9 $(MANDIR)/man$(SECTION)/tosha.1 \
-- $(MANDIR)/man$(SECTION)/pcmplay.1 \
-- $(MANDIR)/man$(SECTION)/pcmfade.1
-+ ${BSD_INSTALL_PROGRAM} tosha pcmplay pcmfade $(BINDIR)
-+ ${BSD_INSTALL_MAN} tosha.1 pcmplay.1 pcmfade.1 $(MANDIR)/man$(SECTION)
-
- clean:
- rm -f *.o *~ *core tosha pcmplay pcmfade
diff --git a/audio/tosha/patches/patch-ab b/audio/tosha/patches/patch-ab
deleted file mode 100644
index a51f05eb680..00000000000
--- a/audio/tosha/patches/patch-ab
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2000/11/19 12:34:23 fvdl Exp $
-
---- tosha.c.orig Wed May 21 02:11:49 1997
-+++ tosha.c Sun Nov 19 13:01:03 2000
-@@ -49,7 +49,8 @@
- #include <sys/uio.h>
- #include <sys/scsiio.h>
- #include <unistd.h>
--#include <scsi.h>
-+#include <util.h>
-+#include "scsi.h"
- extern int errno;
-
- /*
-@@ -93,7 +94,7 @@
- #include "getlopt.h"
-
- typedef unsigned char byte;
--typedef unsigned long ulong;
-+/*typedef unsigned long ulong;*/
-
- struct scsireq *sreq; /* SCSI device request structure */
- int scsifd; /* SCSI device file descriptor */
-@@ -127,8 +128,8 @@
- int result;
-
- scsireq_reset (sreq);
-- sreq->timeout = 10000;
- scsireq_build (sreq, size, (char *) buf, flags, cmd);
-+ sreq->timeout = 10000;
- result = scsireq_enter (scsifd, sreq);
- #ifndef DEBUG
- if (SCSIREQ_ERROR (sreq))
-@@ -182,7 +183,8 @@
-
- char *tracklstr = "1-100";
- char *outname = "track%02d.pcm";
--char *device = "/dev/cd0c";
-+char device_store[256];
-+char *device = device_store;
- int indexonly = FALSE;
- int quiet = FALSE;
- int verbose = FALSE;
-@@ -387,7 +389,6 @@
- if ((secread = framesperbuf) > endpp - sec)
- secread = endpp - sec;
- scsireq_reset (sreq);
-- sreq->timeout = 10000;
- if (readcmd == 0xd8)
- scsireq_build (sreq, FRAMESIZE * secread,
- (char *) buf, SCCMD_READ,
-@@ -398,6 +399,7 @@
- (char *) buf, SCCMD_READ,
- "v 0 0 v:i3 0 0 v 0", readcmd,
- sec, secread);
-+ sreq->timeout = 10000;
- result = scsireq_enter (scsifd, sreq);
- #ifndef DEBUG
- if (SCSIREQ_ERROR (sreq))
-@@ -464,6 +466,8 @@
- int singlefile = FALSE;
- int modechange = TRUE, denschange = 0;
-
-+ (void) snprintf(device, 256, "/dev/rcd0%c", getrawpartition() + 'a');
-+
- utils_init (argv[0]);
- #ifdef DEBUG
- fprintf (stderr, "%s: DEBUG mode is ON.\n", me);
-@@ -647,7 +651,8 @@
- fprintf (stderr, " Reading ...\r");
- }
- else {
-- asprintf (&ofname, outname, i+1);
-+ ofname = malloc(1000); /* XXX */
-+ sprintf (ofname, outname, i+1);
- if (!quiet)
- fprintf (stderr, verbose ?
- " (output file: %s)\n" :
diff --git a/audio/tosha/patches/patch-ac b/audio/tosha/patches/patch-ac
deleted file mode 100644
index bf2d26a55a9..00000000000
--- a/audio/tosha/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1998/10/28 05:43:20 garbled Exp $
---- tosha.1.orig Tue Oct 27 22:38:26 1998
-+++ tosha.1 Tue Oct 27 22:40:02 1998
-@@ -152,7 +152,10 @@
- (raw), 44.1 kHz, signed 16 bit stereo. If you need a
- different format, use
- .BR sox (1)
--to convert it.
-+to convert it. Output data is in little-endian format,
-+regardless of the endianess of the machine you are running
-+.BR tosha
-+on.
- .P
- Not all SCSI drives work with
- .BR tosha ,
diff --git a/audio/tosha/patches/patch-af b/audio/tosha/patches/patch-af
deleted file mode 100644
index 914c442b620..00000000000
--- a/audio/tosha/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.3 2004/05/31 17:35:15 minskim Exp $
-
---- pcmplay.c.orig 1997-05-20 19:11:13.000000000 -0500
-+++ pcmplay.c
-@@ -46,7 +46,7 @@
- #include "utils.h"
- #include "getlopt.h"
-
--char *audevice = "/dev/dsp";
-+char *audevice = DEVOSSAUDIO;
- int buffersize = 32;
- int dsp_samplesize = 16;
- int dsp_channels = 2;
diff --git a/audio/tracker/DESCR b/audio/tracker/DESCR
deleted file mode 100644
index bddfc1deb35..00000000000
--- a/audio/tracker/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Tracker plays soundtracker music modules on a Unix machine.
-Soundtracker modules originated on the amiga, where several composing
-playing programs are available, that give results mostly compatible
-with each other. tracker just plays the specified files in sequence
-according with the current options.
diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile
deleted file mode 100644
index d62afe39985..00000000000
--- a/audio/tracker/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# $NetBSD: Makefile,v 1.42 2006/04/13 23:31:19 rillig Exp $
-
-DISTNAME= tracker-5.3
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= # empty
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= MOD player
-
-RESTRICTED= No commercial redistribution
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-NO_SRC_ON_CDROM= ${RESTRICTED}
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-WRKSRC= ${WRKDIR}/tracker
-MAKE_FLAGS+= MACHINE=${LOWER_OPSYS:Q} INSTALL=${INSTALL:Q} \
- INST_BIN_OPT="-c -s -m ${BINMODE} -o ${BINOWN} -g ${BINGRP}" \
- INST_MAN_OPT="-c -m 644 -o ${BINOWN} -g ${BINGRP}" \
- COMPRESSION_FILE=${PKG_SYSCONFDIR}/compression_methods \
- COMPRESSION_FILE_EG=${EGDIR}/compression_methods
-
-EGDIR= ${PREFIX}/share/examples/tracker
-CONF_FILES= ${EGDIR}/compression_methods ${PKG_SYSCONFDIR}/compression_methods
-
-USE_TOOLS+= makeinfo
-INFO_FILES= # PLIST
-
-INSTALLATION_DIRS= bin ${PKGINFODIR} ${EGDIR}
-
-.include "../../mk/oss.buildlink3.mk"
-
-post-build:
- cd ${WRKSRC}/Docs && \
- ${MAKEINFO} tracker.texinfo && \
- ${MV} -f tracker.info* ${WRKDIR} && \
- ${RM} *.orig
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tracker
- ${CP} -R ${WRKSRC}/Docs/* ${PREFIX}/share/doc/tracker
- ${INSTALL_DATA} ${WRKDIR}/tracker.info* ${PREFIX}/${PKGINFODIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/tracker/PLIST b/audio/tracker/PLIST
deleted file mode 100644
index b52fdaeac38..00000000000
--- a/audio/tracker/PLIST
+++ /dev/null
@@ -1,92 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2006/04/13 23:31:19 rillig Exp $
-bin/randomize
-bin/tracker
-info/tracker.info
-share/doc/tracker/FAQ
-share/doc/tracker/Html/Accessing_Aminet_on_the_Internet.html
-share/doc/tracker/Html/Accessing_Aminet_without_Internet.html
-share/doc/tracker/Html/Aix.html
-share/doc/tracker/Html/Amiga.html
-share/doc/tracker/Html/Amiga_audio_hardware.html
-share/doc/tracker/Html/Amiga_implementation.html
-share/doc/tracker/Html/Architecture_dependent_problems.html
-share/doc/tracker/Html/Arpeggio.html
-share/doc/tracker/Html/Availability.html
-share/doc/tracker/Html/Background_information.html
-share/doc/tracker/Html/Base_effects.html
-share/doc/tracker/Html/Concept_Index.html
-share/doc/tracker/Html/Configure_tracker.html
-share/doc/tracker/Html/Copyright_status_and_disclaimer.html
-share/doc/tracker/Html/Credits.html
-share/doc/tracker/Html/Cut_note.html
-share/doc/tracker/Html/DECstation.html
-share/doc/tracker/Html/Decoding_pattern_information.html
-share/doc/tracker/Html/Delay_note.html
-share/doc/tracker/Html/Delay_pattern.html
-share/doc/tracker/Html/Far_jump.html
-share/doc/tracker/Html/Finding_a_specific_file.html
-share/doc/tracker/Html/Fine_portamento_down.html
-share/doc/tracker/Html/Fine_portamento_up.html
-share/doc/tracker/Html/Fine_volume_slide_down.html
-share/doc/tracker/Html/Fine_volume_slide_up.html
-share/doc/tracker/Html/Generic_problems.html
-share/doc/tracker/Html/Glissando_control.html
-share/doc/tracker/Html/HP$2fUX.html
-share/doc/tracker/Html/History.html
-share/doc/tracker/Html/Installation.html
-share/doc/tracker/Html/Introduction.html
-share/doc/tracker/Html/Invert_loop.html
-share/doc/tracker/Html/Linux$2fFreeBSD.html
-share/doc/tracker/Html/Loop_pattern.html
-share/doc/tracker/Html/MM1$2fOS9.html
-share/doc/tracker/Html/Mirror_sites_of_Aminet.html
-share/doc/tracker/Html/NAS.html
-share/doc/tracker/Html/NeXtStep.html
-share/doc/tracker/Html/NextStep.html
-share/doc/tracker/Html/OS$2f2.html
-share/doc/tracker/Html/Pattern_break.html
-share/doc/tracker/Html/Performance_issues.html
-share/doc/tracker/Html/Portamento_down.html
-share/doc/tracker/Html/Portamento_up.html
-share/doc/tracker/Html/Porting_tracker.html
-share/doc/tracker/Html/Protracker_extended_effects.html
-share/doc/tracker/Html/Protracker_finetunes.html
-share/doc/tracker/Html/Registration.html
-share/doc/tracker/Html/Reporting_bugs.html
-share/doc/tracker/Html/Resampling_details.html
-share/doc/tracker/Html/Retrig_note.html
-share/doc/tracker/Html/Sample_numbers_and_note_periods.html
-share/doc/tracker/Html/Set_filter.html
-share/doc/tracker/Html/Set_finetune.html
-share/doc/tracker/Html/Set_sample_offset.html
-share/doc/tracker/Html/Set_tempo.html
-share/doc/tracker/Html/Set_tremolo_waveform.html
-share/doc/tracker/Html/Set_vibrato_waveform.html
-share/doc/tracker/Html/Set_volume.html
-share/doc/tracker/Html/Silicon_Graphics.html
-share/doc/tracker/Html/Slide_volume.html
-share/doc/tracker/Html/Soundtracker_and_Protracker_tempo.html
-share/doc/tracker/Html/Sparc.html
-share/doc/tracker/Html/Technical_Information.html
-share/doc/tracker/Html/The_Protracker_file_format.html
-share/doc/tracker/Html/The_Protracker_format.html
-share/doc/tracker/Html/Tone_portamento.html
-share/doc/tracker/Html/Tone_portamento_$2b_Volume_slide.html
-share/doc/tracker/Html/Top.html
-share/doc/tracker/Html/Tracker_memory_consumption.html
-share/doc/tracker/Html/Tremolo.html
-share/doc/tracker/Html/Usage.html
-share/doc/tracker/Html/Vibrato.html
-share/doc/tracker/Html/Vibrato_$2b_Volume_slide.html
-share/doc/tracker/Html/aminet.html
-share/doc/tracker/protracker.fmt
-share/doc/tracker/readme
-share/doc/tracker/splitmod.readme
-share/doc/tracker/tracker.doc
-share/doc/tracker/tracker.guide
-share/doc/tracker/tracker.readme
-share/doc/tracker/tracker.texinfo
-share/examples/tracker/compression_methods
-@dirrm share/examples/tracker
-@dirrm share/doc/tracker/Html
-@dirrm share/doc/tracker
diff --git a/audio/tracker/distinfo b/audio/tracker/distinfo
deleted file mode 100644
index ae21ac5ee5d..00000000000
--- a/audio/tracker/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.9 2006/03/17 08:04:15 jlam Exp $
-
-SHA1 (tracker-5.3.tgz) = b0973d6a9c363caebd3a71547412f42b0681f323
-RMD160 (tracker-5.3.tgz) = d089f514ace6f64dcb90866542121b51ab5f154c
-Size (tracker-5.3.tgz) = 454803 bytes
-SHA1 (patch-aa) = da8fa5ecf7ec2a1981e642963d147c8e293d4ad8
-SHA1 (patch-ab) = 4acd7c74548754b4d640be784aa904e24066568d
-SHA1 (patch-ac) = 76ec86b6132e4f954acefa71be30b2c702114a5c
-SHA1 (patch-ae) = 85a1d61b5adedcf378fbed90f5337610b30c365b
diff --git a/audio/tracker/patches/patch-aa b/audio/tracker/patches/patch-aa
deleted file mode 100644
index c9f1ee394e5..00000000000
--- a/audio/tracker/patches/patch-aa
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2005/11/10 20:07:17 joerg Exp $
-
---- Makefile.orig 1996-05-07 15:20:50.000000000 +0000
-+++ Makefile
-@@ -20,7 +20,7 @@ CC = gcc
-
- OPTS=-c
-
--PREFIX=/users/algo/espie/pub
-+PREFIX?=/users/algo/espie/pub
- # Destination directory for tracker binaries and manpage.
- #
- # If you don't wish to use the 'make install' and 'make install.man'
-@@ -166,7 +166,7 @@ EXE_linux =
- UI_linux = Unix/
- SHELL_linux = /bin/sh
-
--CFLAGS_freebsd = -O2 -funroll-loops -finline-functions -fno-strength-reduce
-+CFLAGS_freebsd = -O2 -funroll-loops -finline-functions
- LIBS_freebsd = -lm
- AUDIODIR_freebsd=PCux/
- CONFIG_freebsd = PCux/freebsd_
-@@ -175,6 +175,24 @@ EXE_freebsd =
- UI_freebsd = Unix/
- SHELL_freebsd = /bin/sh
-
-+CFLAGS_dragonfly = -O2 -funroll-loops -finline-functions
-+LIBS_dragonfly = -lm
-+AUDIODIR_dragonfly = PCux/
-+CONFIG_dragonfly = PCux/freebsd_
-+O_dragonfly = .o
-+EXE_dragonfly =
-+UI_dragonfly = Unix/
-+SHELL_dragonfly = /bin/sh
-+
-+CFLAGS_netbsd = -O2 -funroll-loops -finline-functions
-+LIBS_netbsd = -lm
-+AUDIODIR_netbsd=PCux/
-+CONFIG_netbsd = PCux/netbsd_
-+O_netbsd = .o
-+EXE_netbsd =
-+UI_netbsd = Unix/
-+SHELL_netbsd = /bin/sh
-+
- CFLAGS_aix = -O
- LIBS_aix = -lm
- AUDIODIR_aix = Aix/
-@@ -220,9 +238,9 @@ EXE_sbos2 = .exe
- UI_sbos2 = OS2/./
- SHELL_sbos2 = /bin/sh
-
--CFLAGS = $(CFLAGS_${MACHINE})
-+CFLAGS = $(CFLAGS_${MACHINE}) -DDEVOSSAUDIO=\"${DEVOSSAUDIO}\"
- COPTS = $(OPTS) $(CFLAGS)
--LIBS = $(LIBS_${MACHINE})
-+LIBS = $(LIBS_${MACHINE}) ${LIBOSSAUDIO}
- CONFIG = Arch/$(CONFIG_${MACHINE})
- AUDIODIR = Arch/$(AUDIODIR_${MACHINE})
- AUDIONAME = $(AUDIONAME_${MACHINE})
-@@ -250,7 +268,7 @@ OBJ_SPLITMOD = split$O time$O st_read$O
- display$O prefs$O autoinit$O $(UI)ui$O empty$O color$O version$O \
- st_virt$O automaton$O
-
--all: tracker${EXE} randomize${EXE} splitmod${EXE} Docs/tracker.text
-+all: tracker${EXE} randomize${EXE}
-
- config.h: $(CONFIG)config.h
- rm -f config.h
-@@ -272,9 +290,8 @@ version.c: Makefile
- install:
- $(INSTALL) $(INST_BIN_OPT) tracker $(BIN_DIR)
- $(INSTALL) $(INST_BIN_OPT) randomize $(BIN_DIR)
-- $(INSTALL) $(INST_BIN_OPT) splitmod $(BIN_DIR)
-- [ -f ${COMPRESSION_FILE} ] || \
-- $(INSTALL) $(INST_MAN_OPT) compression_methods ${COMPRESSION_FILE}
-+ [ -f ${COMPRESSION_FILE_EG} ] || \
-+ $(INSTALL) $(INST_MAN_OPT) Lib/compression_methods ${COMPRESSION_FILE_EG}
-
- # no manpage available, use the texinfo manual.
- install.man:
diff --git a/audio/tracker/patches/patch-ab b/audio/tracker/patches/patch-ab
deleted file mode 100644
index 335a698bf66..00000000000
--- a/audio/tracker/patches/patch-ab
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/03/17 08:04:15 jlam Exp $
-
---- Docs/tracker.texinfo.orig 1996-04-11 13:21:05.000000000 -0400
-+++ Docs/tracker.texinfo
-@@ -3,6 +3,11 @@
- @setfilename tracker.info
- @set VERSION 4.44
- @settitle Tracker @value{VERSION}
-+@dircategory Miscellaneous
-+@direntry
-+* tracker: (tracker). MOD player.
-+@end direntry
-+
- @c End of header
- @set EMAIL Marc.Espie@@ens.fr
- @set POSTAL Marc Espie@*60 rue du 4 septembre@*87100 Limoges@*France
-@@ -979,14 +984,14 @@ filter for obvious reasons.
- * Other Architectures: Porting tracker.
- @end menu
-
--@node Aix, Amiga, Architecture dependent problems, Architecture Dependent problems
-+@node Aix, Amiga, Architecture dependent problems, Architecture dependent problems
- @subsection Aix
-
- The Aix port is slightly outdated and won't run with most recent versions of
- Aix. There is nothing I can do about it until somebody sends me an up-to-date
- version as I don't have access to Aix machines.
-
--@node Amiga, DECstation, Architecture dependent problems, Architecture dependent problems
-+@node Amiga, DECstation, Aix, Architecture dependent problems
- @subsection Amiga
-
- There is currently one Amiga version running under AmigaDos.
diff --git a/audio/tracker/patches/patch-ac b/audio/tracker/patches/patch-ac
deleted file mode 100644
index d8b85310ab5..00000000000
--- a/audio/tracker/patches/patch-ac
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2005/11/10 20:07:17 joerg Exp $
-
---- Arch/PCux/audio.c.orig 1996-04-12 16:30:37.000000000 +0000
-+++ Arch/PCux/audio.c
-@@ -9,6 +9,9 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include "extern.h"
-+#include "prefs.h"
-+#include "autoinit.h"
-+#include "watched_var.h"
-
- struct options_set *port_options=0;
-
-@@ -50,7 +53,7 @@ unsigned long open_audio(unsigned long f
- int buf_max;
- unsigned long possible, current;
-
-- audio = open("/dev/dsp", O_WRONLY, 0);
-+ audio = open(DEVOSSAUDIO, O_WRONLY, 0);
- if (audio == -1)
- end_all("Error opening audio device");
-
-@@ -116,6 +119,7 @@ unsigned long open_audio(unsigned long f
- }
- samples_max = buf_max / dsize;
- current_freq = f;
-+ set_watched_scalar(FREQUENCY, f);
- total = 0;
- return f;
- }
-@@ -145,6 +149,7 @@ void output_samples(long left, long righ
- add_samples8(left, right, n);
- break;
- default: /* should not happen */
-+ break;
- }
- }
-
diff --git a/audio/tracker/patches/patch-ae b/audio/tracker/patches/patch-ae
deleted file mode 100644
index 5722a84a666..00000000000
--- a/audio/tracker/patches/patch-ae
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 10:36:18 agc Exp $
-
---- /dev/null Thu Oct 30 01:04:49 1997
-+++ Arch/PCux/netbsd_config.h Thu Oct 30 01:05:59 1997
-@@ -0,0 +1,19 @@
-+/* config.h
-+ vi:ts=3 sw=3:
-+ */
-+
-+/* Configuration for FreeBSD Unix (i386 platform) */
-+
-+#define IS_POSIX
-+#define USE_TERMIOS
-+#define USE_AT_EXIT
-+#define SCO_ANSI_COLOR
-+
-+typedef void *GENERIC;
-+
-+#define P(args) args
-+
-+/* #define ID(x) */
-+#define ID(x) LOCAL char id[]= x ;
-+
-+#define stricmp strcasecmp
diff --git a/audio/tremor-tools/DESCR b/audio/tremor-tools/DESCR
deleted file mode 100644
index 3fbc15c29b9..00000000000
--- a/audio/tremor-tools/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-tremor-tools contains an Ogg Vorbis command-line player, it uses the tremor
-library as a backend.
-
-Note that igg123 is the only installed binary, it is identical in behaviour as
-ogg123.
diff --git a/audio/tremor-tools/MESSAGE b/audio/tremor-tools/MESSAGE
deleted file mode 100644
index c427dde167d..00000000000
--- a/audio/tremor-tools/MESSAGE
+++ /dev/null
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/11/19 20:56:19 chris Exp $
-
-By default, igg123 will decode to the OSS audio device.
-
-Alternatively you can use libao's "sun" (SUN audio/NetBSD
-audio) device. To setup your personal libao configuration so it
-uses "sun" do:
-
- echo "default_driver=sun" > ~/.libao
-
-Read the igg123(1) manual page for further information.
-
-===========================================================================
diff --git a/audio/tremor-tools/Makefile b/audio/tremor-tools/Makefile
deleted file mode 100644
index c92dcd35c97..00000000000
--- a/audio/tremor-tools/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2006/11/19 11:50:24 wiz Exp $
-
-DISTNAME= vorbis-tools-1.0
-PKGNAME= tremor-tools-1.0.0.8
-PKGREVISION= 8
-CATEGORIES= audio
-MASTER_SITES= http://www.vorbis.com/files/1.0/unix/
-
-MAINTAINER= chris@NetBSD.org
-HOMEPAGE= http://www.vorbis.com/
-COMMENT= Ogg Vorbis encoder and player
-
-# list it into IPv6-ready packages
-BUILD_DEFS+= USE_INET6
-
-CONFLICTS= vorbis-[0-9]*
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= automake14 gmake
-CONFIGURE_ARGS+= --with-ogg-prefix=${BUILDLINK_PREFIX.libogg} \
- --with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis} \
- --with-ao-prefix=${BUILDLINK_PREFIX.libao}
-
-PLIST_SUBST+= DISTNAME=${DISTNAME:Q}
-
-PTHREAD_OPTS+= require
-
-pre-configure:
- cd ${WRKSRC} && automake && autoconf
-
-.include "../../audio/libao/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/tremor/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/tremor-tools/PLIST b/audio/tremor-tools/PLIST
deleted file mode 100644
index 6c8a942559b..00000000000
--- a/audio/tremor-tools/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/09/24 09:35:15 chris Exp $
-bin/igg123
diff --git a/audio/tremor-tools/distinfo b/audio/tremor-tools/distinfo
deleted file mode 100644
index 81bf4e47854..00000000000
--- a/audio/tremor-tools/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/12/06 19:52:55 joerg Exp $
-
-SHA1 (vorbis-tools-1.0.tar.gz) = 5c2508786cf6a2a270c697d3debe66ee83df376d
-RMD160 (vorbis-tools-1.0.tar.gz) = 2f3874699be904fdf64c6edf09e21ccb8f0eee28
-Size (vorbis-tools-1.0.tar.gz) = 425404 bytes
-SHA1 (patch-aa) = c2104ab110674452a440d3992158627db89b9eba
-SHA1 (patch-ab) = 67987002621dd1aedddc39177d3e8267cd8aa930
-SHA1 (patch-ac) = c38abc6647d990c89258e14a959db80cd4656db7
-SHA1 (patch-ad) = 81beeaa3f8ae918fa30df26f06c92a45914ccb99
-SHA1 (patch-ae) = 37b3128b58fd6dcaf303930c64ac7bf6df9fa043
-SHA1 (patch-af) = 4bdf3edbd80ffdeacdc260fe172468ec2b0b3efb
-SHA1 (patch-ag) = 729ca84168ee781335429840ee54a2b894b82f54
-SHA1 (patch-ah) = d865a74020d7c1ee6e24c6394f4a1336773fa87a
diff --git a/audio/tremor-tools/patches/patch-aa b/audio/tremor-tools/patches/patch-aa
deleted file mode 100644
index a5ecee74003..00000000000
--- a/audio/tremor-tools/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/09/24 09:35:17 chris Exp $
-
---- Makefile.am.orig Thu Jul 11 04:26:50 2002
-+++ Makefile.am Sat Sep 14 21:12:15 2002
-@@ -2,9 +2,7 @@
-
- AUTOMAKE_OPTIONS = foreign dist-zip
-
--SUBDIRS = po intl include share oggenc ogg123 vorbiscomment vcut oggdec ogginfo debian win32
--
--EXTRA_DIST = README AUTHORS COPYING vorbis-tools.spec acinclude.m4 config.h
-+SUBDIRS = include share ogg123
-
- debug:
- $(MAKE) all CFLAGS="@DEBUG@"
diff --git a/audio/tremor-tools/patches/patch-ab b/audio/tremor-tools/patches/patch-ab
deleted file mode 100644
index b90359c21a5..00000000000
--- a/audio/tremor-tools/patches/patch-ab
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/09/24 09:35:17 chris Exp $
-
---- ogg123/oggvorbis_format.c.orig Sat Sep 14 18:43:49 2002
-+++ ogg123/oggvorbis_format.c Sat Sep 14 18:45:10 2002
-@@ -19,8 +19,8 @@
- #include <string.h>
- #include <ctype.h>
- #include <ogg/ogg.h>
--#include <vorbis/codec.h>
--#include <vorbis/vorbisfile.h>
-+#include <tremor/ivorbiscodec.h>
-+#include <tremor/ivorbisfile.h>
- #include "transport.h"
- #include "format.h"
- #include "utf8.h"
-@@ -150,8 +150,7 @@
- while (nbytes > 0) {
-
- old_section = priv->current_section;
-- ret = ov_read(&priv->vf, ptr, nbytes, audio_fmt->big_endian,
-- audio_fmt->word_size, audio_fmt->signed_sample,
-+ ret = ov_read(&priv->vf, ptr, nbytes,
- &priv->current_section);
-
- if (ret == 0) {
-@@ -193,15 +192,17 @@
- }
-
-
--int ovf_seek (decoder_t *decoder, double offset, int whence)
-+int ovf_seek (decoder_t *decoder, double aoffset, int whence)
- {
- ovf_private_t *priv = decoder->private;
- int ret;
-- double cur;
-+ ogg_int64_t cur;
-+ ogg_int64_t offset = (aoffset * 1000);
-+
-
- if (whence == DECODER_SEEK_CUR) {
- cur = ov_time_tell(&priv->vf);
-- if (cur >= 0.0)
-+ if (cur >= 0)
- offset += cur;
- else
- return 0;
diff --git a/audio/tremor-tools/patches/patch-ac b/audio/tremor-tools/patches/patch-ac
deleted file mode 100644
index 44d2d59f14a..00000000000
--- a/audio/tremor-tools/patches/patch-ac
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/09/24 09:35:17 chris Exp $
-
---- ogg123/Makefile.am.orig Sat Sep 14 19:28:28 2002
-+++ ogg123/Makefile.am Sat Sep 14 19:29:02 2002
-@@ -2,9 +2,7 @@
-
- AUTOMAKE_OPTIONS = foreign
-
--mans = ogg123.1
--docs = ogg123rc-example
--ogg123sources = audio.c buffer.c callbacks.c \
-+igg123sources = audio.c buffer.c callbacks.c \
- cfgfile_options.c cmdline_options.c \
- file_transport.c format.c http_transport.c \
- ogg123.c oggvorbis_format.c playlist.c \
-@@ -21,26 +19,23 @@
- localedir = $(datadir)/locale
- DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-
--bin_PROGRAMS = ogg123
-+bin_PROGRAMS = igg123
- docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
- mandir = @MANDIR@
-
- INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AO_CFLAGS@ @CURL_CFLAGS@ \
- @PTHREAD_CFLAGS@ @SHARE_CFLAGS@ @I18N_CFLAGS@
-
--ogg123_LDADD = @SHARE_LIBS@ \
-- @VORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @AO_LIBS@ \
-+igg123_LDADD = @SHARE_LIBS@ \
-+ @IVORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @AO_LIBS@ \
- @SOCKET_LIBS@ @LIBICONV@ @CURL_LIBS@ @PTHREAD_CFLAGS@ \
- @PTHREAD_LIBS@ @I18N_LIBS@
--ogg123_DEPENDENCIES = @SHARE_LIBS@
--ogg123_SOURCES = $(ogg123sources)
--
--man_MANS = $(mans)
--doc_DATA = $(docs)
-+igg123_DEPENDENCIES = @SHARE_LIBS@
-+igg123_SOURCES = $(igg123sources)
-
- endif
-
--EXTRA_DIST = $(ogg123sources) $(mans) $(docs)
-+EXTRA_DIST = $(igg123sources)
-
-
- debug:
diff --git a/audio/tremor-tools/patches/patch-ad b/audio/tremor-tools/patches/patch-ad
deleted file mode 100644
index 3bff9ac41c7..00000000000
--- a/audio/tremor-tools/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/09/24 09:35:17 chris Exp $
-
---- ogg123/ogg123.c.orig Sat Jul 6 20:12:18 2002
-+++ ogg123/ogg123.c Sat Sep 14 19:05:37 2002
-@@ -453,6 +453,16 @@
- return;
- }
-
-+ if ((new_audio_fmt.big_endian != (BYTE_ORDER == BIG_ENDIAN)) ||
-+ new_audio_fmt.signed_sample != 1 ||
-+ new_audio_fmt.word_size != 2)
-+ {
-+ /* Tremor can only do big_endian, signed, 16 bit samples */
-+ status_error(_("Error, Tremor can only decode signed 16 bit PCM "
-+ "host endian.\n"));
-+ return;
-+ }
-+
- /* Decide which statistics are valid */
- select_stats(stat_format, &options, source, decoder, audio_buffer);
-
diff --git a/audio/tremor-tools/patches/patch-ae b/audio/tremor-tools/patches/patch-ae
deleted file mode 100644
index 02836ac29a1..00000000000
--- a/audio/tremor-tools/patches/patch-ae
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/09/24 09:35:17 chris Exp $
-
---- aclocal.m4.orig Fri Jul 19 15:18:51 2002
-+++ aclocal.m4 Sat Sep 14 18:28:40 2002
-@@ -139,6 +139,7 @@
- fi
-
- VORBISFILE_LIBS="$VORBIS_LIBS -lvorbisfile"
-+ IVORBISFILE_LIBS="$VORBIS_LIBS -lvorbisidec"
- VORBISENC_LIBS="$VORBIS_LIBS -lvorbisenc"
- VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm"
-
-@@ -194,7 +195,7 @@
- LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS"
- AC_TRY_LINK([
- #include <stdio.h>
--#include <vorbis/codec.h>
-+#include <tremor/ivorbiscodec.h>
- ], [ return 0; ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding Vorbis or finding the wrong"
-@@ -214,12 +215,14 @@
- VORBIS_CFLAGS=""
- VORBIS_LIBS=""
- VORBISFILE_LIBS=""
-+ IVORBISFILE_LIBS=""
- VORBISENC_LIBS=""
- ifelse([$2], , :, [$2])
- fi
- AC_SUBST(VORBIS_CFLAGS)
- AC_SUBST(VORBIS_LIBS)
- AC_SUBST(VORBISFILE_LIBS)
-+ AC_SUBST(IVORBISFILE_LIBS)
- AC_SUBST(VORBISENC_LIBS)
- rm -f conf.vorbistest
- ])
diff --git a/audio/tremor-tools/patches/patch-af b/audio/tremor-tools/patches/patch-af
deleted file mode 100644
index d697091f43a..00000000000
--- a/audio/tremor-tools/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/09/24 09:35:17 chris Exp $
-
---- configure.in.orig Sat Sep 14 20:21:06 2002
-+++ configure.in Sat Sep 14 20:23:40 2002
-@@ -19,9 +19,6 @@
-
- AM_PROG_LIBTOOL
-
--ALL_LINGUAS="fr nl sv"
--AM_GNU_GETTEXT
--
- dnl --------------------------------------------------
- dnl Set build flags based on environment
- dnl --------------------------------------------------
diff --git a/audio/tremor-tools/patches/patch-ag b/audio/tremor-tools/patches/patch-ag
deleted file mode 100644
index b1a4a9cc434..00000000000
--- a/audio/tremor-tools/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/11/02 19:02:53 joerg Exp $
-
---- ogg123/playlist.c.orig 2005-08-17 20:03:15.000000000 +0000
-+++ ogg123/playlist.c
-@@ -19,6 +19,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
-+#include <limits.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
diff --git a/audio/tremor-tools/patches/patch-ah b/audio/tremor-tools/patches/patch-ah
deleted file mode 100644
index a53e0a02fcc..00000000000
--- a/audio/tremor-tools/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/12/06 19:52:55 joerg Exp $
-
---- ogg123/http_transport.c.orig 2006-12-06 19:46:55.000000000 +0000
-+++ ogg123/http_transport.c
-@@ -112,7 +112,6 @@ void set_curl_opts (http_private_t *priv
- if (inputOpts.ProxyTunnel)
- curl_easy_setopt (handle, CURLOPT_HTTPPROXYTUNNEL, inputOpts.ProxyTunnel);
- */
-- curl_easy_setopt(handle, CURLOPT_MUTE, 1);
- curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, private->error);
- curl_easy_setopt(handle, CURLOPT_PROGRESSFUNCTION, progress_callback);
- curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, private);
diff --git a/audio/tremor/DESCR b/audio/tremor/DESCR
deleted file mode 100644
index 6c6ffa6d53a..00000000000
--- a/audio/tremor/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Tremor is an fixed point implementation of ogg vorbis, as such it is nearly
-compatible with libvorbis, it does have some minor differences.
-
-I would recommend anyone wishing to use this package reads the documentation,
-which currently is not installed.
diff --git a/audio/tremor/Makefile b/audio/tremor/Makefile
deleted file mode 100644
index b09ff850327..00000000000
--- a/audio/tremor/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2007/02/22 19:26:07 wiz Exp $
-
-DISTNAME= tremor_snapshot_030406
-PKGNAME= tremor-1.0.2
-PKGREVISION= 5
-CATEGORIES= devel audio
-MASTER_SITES= http://www.xiph.org/ogg/vorbis/download/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= chris@NetBSD.org
-HOMEPAGE= http://www.xiph.org/vorbis/
-COMMENT= Fixed point decoding library for the Ogg Vorbis audio encoding format
-
-WRKSRC= ${WRKDIR}/Tremor
-AUTOCONF_REQD= 2.50
-GNU_CONFIGURE= yes
-USE_TOOLS+= automake14 gmake
-USE_LIBTOOL= yes
-
-PLIST_SUBST+= DISTNAME=${DISTNAME:Q}
-
-pre-configure:
- cd ${WRKSRC} && aclocal
- cd ${WRKSRC} && ${LOCALBASE}/bin/libtoolize --automake
- cd ${WRKSRC} && automake --add-missing
- cd ${WRKSRC} && autoconf
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/tremor/PLIST b/audio/tremor/PLIST
deleted file mode 100644
index a4b07d01a7e..00000000000
--- a/audio/tremor/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:17 jlam Exp $
-include/tremor/ivorbiscodec.h
-include/tremor/ivorbisfile.h
-include/tremor/ogg.h
-include/tremor/os_types.h
-include/tremor/config_types.h
-lib/libvorbisidec.la
-@dirrm include/tremor
diff --git a/audio/tremor/buildlink3.mk b/audio/tremor/buildlink3.mk
deleted file mode 100644
index dbd49bb8143..00000000000
--- a/audio/tremor/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:37 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-TREMOR_BUILDLINK3_MK:= ${TREMOR_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= tremor
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntremor}
-BUILDLINK_PACKAGES+= tremor
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tremor
-
-.if !empty(TREMOR_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.tremor+= tremor>=1.0.2
-BUILDLINK_ABI_DEPENDS.tremor+= tremor>=1.0.2nb5
-BUILDLINK_PKGSRCDIR.tremor?= ../../audio/tremor
-.endif # TREMOR_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/tremor/distinfo b/audio/tremor/distinfo
deleted file mode 100644
index 9a75f11e648..00000000000
--- a/audio/tremor/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 20:39:52 agc Exp $
-
-SHA1 (tremor_snapshot_030406.tgz) = f0df8d70e2aad9a345716b551ead826434134f39
-RMD160 (tremor_snapshot_030406.tgz) = 34eebdf9a74f729ae0319c9e8d8b707642f5d002
-Size (tremor_snapshot_030406.tgz) = 151981 bytes
diff --git a/audio/trm/DESCR b/audio/trm/DESCR
deleted file mode 100644
index 13ae5bd6998..00000000000
--- a/audio/trm/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-The TRM Generator is a small test application that generates Relatable TRM
-acoustic fingerprints. This tool is mainly designed as a test/debugging tool
-for software developers, and is both an application and a developer library.
-The developer library provides developers with the functionality to generate
-TRM ids from Wav, MP3, and Ogg Vorbis files.
diff --git a/audio/trm/Makefile b/audio/trm/Makefile
deleted file mode 100644
index 56f24c5434f..00000000000
--- a/audio/trm/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2006/06/08 16:03:51 joerg Exp $
-#
-
-DISTNAME= trm-0.2.1
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.musicbrainz.org/pub/musicbrainz/
-
-MAINTAINER= chris@NetBSD.org
-HOMEPAGE= http://www.musicbrainz.org/products/trmgen/download.html
-COMMENT= Acoustic signature generator
-
-CONFLICTS= tunepimp-[0-9]*
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-GNU_CONFIGURE= YES
-USE_LANGUAGES= c c++
-
-.include "../../audio/id3lib/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/musicbrainz/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/trm/PLIST b/audio/trm/PLIST
deleted file mode 100644
index eb96903b55f..00000000000
--- a/audio/trm/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/09 00:17:06 chris Exp $
-bin/trm
diff --git a/audio/trm/distinfo b/audio/trm/distinfo
deleted file mode 100644
index 11b4a82c098..00000000000
--- a/audio/trm/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:53 agc Exp $
-
-SHA1 (trm-0.2.1.tar.gz) = ea032c38ca83266026e0c10919749814282994e9
-RMD160 (trm-0.2.1.tar.gz) = fb74d692920af62a7fcbbacfb32cd0e277e56126
-Size (trm-0.2.1.tar.gz) = 131349 bytes
-SHA1 (patch-aa) = 1480923a665709778abd63af37cd85ff5f492e1e
diff --git a/audio/trm/patches/patch-aa b/audio/trm/patches/patch-aa
deleted file mode 100644
index 59e6909ba42..00000000000
--- a/audio/trm/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/02/09 00:17:06 chris Exp $
-
---- configure.orig 2004-02-07 22:39:42.000000000 +0000
-+++ configure 2004-02-07 22:39:57.000000000 +0000
-@@ -3192,7 +3192,7 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lmusicbrainz -ldl $LIBS"
-+LIBS="-lmusicbrainz $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
diff --git a/audio/tunesbrowser/DESCR b/audio/tunesbrowser/DESCR
deleted file mode 100644
index 35e186bd3a4..00000000000
--- a/audio/tunesbrowser/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-TunesBrowser is a simple music player, capable of playing music found
-on iTunes(TM) shares.
-
-TunesBrowser can connect to the latest iTunes applications (as of
-April 29 2004) and is implemented on top of libopendaap
-
-TunesBrowser's interface is quite similar to that of iTunes.
-
-TunesBrowser was written with the purpose of being a prototype
-front-end for libopendaap. I intend to integrate libopendaap with
-other, more mature, players.
diff --git a/audio/tunesbrowser/Makefile b/audio/tunesbrowser/Makefile
deleted file mode 100644
index 87be2ff9729..00000000000
--- a/audio/tunesbrowser/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2007/03/21 12:05:41 wiz Exp $
-#
-
-DISTNAME= tunesbrowser-0.3.0
-PKGREVISION= 8
-CATEGORIES= audio
-MASTER_SITES= http://craz.net/programs/itunes/files/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://craz.net/programs/itunes/libopendaap.html
-COMMENT= Front-end for DAAP client
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= pkg-config
-
-CONFIGURE_ARGS+= --datadir=${PREFIX}/share/tunesbrowser
-DEPENDS+= gst-plugins0.8-esound>=0.8.1:../../audio/gst-plugins0.8-esound
-DEPENDS+= gst-plugins0.8-mad>=0.8.1:../../audio/gst-plugins0.8-mad
-
-BUILDLINK_API_DEPENDS.libopendaap+= libopendaap>=0.4.0
-
-.include "../../multimedia/gst-plugins0.8/buildlink3.mk"
-.include "../../audio/libopendaap/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
-.include "../../multimedia/gstreamer0.8/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../sysutils/gst-plugins0.8-gnomevfs/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/tunesbrowser/PLIST b/audio/tunesbrowser/PLIST
deleted file mode 100644
index 1f8e2604468..00000000000
--- a/audio/tunesbrowser/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2005/08/05 12:58:49 tonio Exp $
-bin/tunesbrowser
-man/man1/tunesbrowser.1
-share/tunesbrowser/comp.blue.png
-share/tunesbrowser/comp.red.png
-share/tunesbrowser/sound1.png
-share/tunesbrowser/sound2.png
-share/tunesbrowser/soundfile.png
-share/tunesbrowser/tips.txt
-share/tunesbrowser/tunesbrowser.glade
-@dirrm share/tunesbrowser
diff --git a/audio/tunesbrowser/distinfo b/audio/tunesbrowser/distinfo
deleted file mode 100644
index f1e1020b826..00000000000
--- a/audio/tunesbrowser/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/08/05 12:58:49 tonio Exp $
-
-SHA1 (tunesbrowser-0.3.0.tar.bz2) = d1b543347af523d9da375019dc8a17c08f1cb27c
-RMD160 (tunesbrowser-0.3.0.tar.bz2) = a3be956f34ec7e0817a637a7d3d9dbd4df64bc60
-Size (tunesbrowser-0.3.0.tar.bz2) = 222593 bytes
-SHA1 (patch-ab) = 1b5719009ebfb659e5adb62e4c2cdf6b351d2c11
-SHA1 (patch-ad) = d8db8a91f0208aa211356389a5fcd5adb6d8f900
diff --git a/audio/tunesbrowser/patches/patch-ab b/audio/tunesbrowser/patches/patch-ab
deleted file mode 100644
index 2020cea52b8..00000000000
--- a/audio/tunesbrowser/patches/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2005/08/05 12:58:49 tonio Exp $
-
---- audioplayer.c.orig 2005-08-04 11:07:43.000000000 +0200
-+++ audioplayer.c 2005-08-04 11:10:48.000000000 +0200
-@@ -167,11 +167,11 @@
-
- static void cb_error (__UNUSED__ GstElement *gstelement,
- __UNUSED__ GstElement *arg1,
-- __UNUSED__ gpointer arg2,
-- gchar *arg3,
-+ GError *err,
-+ gchar *dbg_msg,
- __UNUSED__ gpointer user_data)
- {
-- fprintf(stderr, "an error occured:\n%s\n\n", arg3);
-+ fprintf(stderr, "an error occured:\n%s (%s)\n\n", err->message, dbg_msg);
- }
-
- static void cb_iterate(GstBin *bin, __UNUSED__ gpointer data)
-@@ -197,6 +197,7 @@
- /* remove the source and decoder from the pipeline */
- gst_bin_remove_many (GST_BIN (pipeline_thread), srcelem, decoder, NULL);
-
-+ gst_element_set_state(pipeline_thread, GST_STATE_NULL);
- gst_object_unref(GST_OBJECT(pipeline_thread));
- }
-
diff --git a/audio/tunesbrowser/patches/patch-ad b/audio/tunesbrowser/patches/patch-ad
deleted file mode 100644
index 3f4e9007e16..00000000000
--- a/audio/tunesbrowser/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2005/08/05 12:58:49 tonio Exp $
-
---- misc_ui.c.orig 2005-08-04 11:06:21.000000000 +0200
-+++ misc_ui.c 2005-08-04 11:06:42.000000000 +0200
-@@ -233,9 +233,9 @@
-
- if (seconds >= 0)
- {
-+ char bufstr[11] = {0};
- int minutes = seconds / 60;
- seconds -= minutes * 60;
-- char bufstr[11] = {0};
-
- snprintf(bufstr, 10, "%i:%02i",
- minutes, seconds);
diff --git a/audio/twolame/DESCR b/audio/twolame/DESCR
deleted file mode 100644
index 9f11c6ad82d..00000000000
--- a/audio/twolame/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on
-tooLAME by Mike Cheng, which in turn is based upon the ISO dist10
-code and portions of LAME.
-
-Features added to TwoLAME:
-
- * Fully thread-safe
- * Static and shared library (libtwolame)
- * API very similar to LAME's (for easy porting)
- * Frontend supports wider range of input files (using libsndfile)
- * automake/libtool/pkgconfig based build system
- * C99 compliant
diff --git a/audio/twolame/Makefile b/audio/twolame/Makefile
deleted file mode 100644
index 583409d4238..00000000000
--- a/audio/twolame/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2007/01/07 12:25:53 wiz Exp $
-#
-
-DISTNAME= twolame-0.3.7
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= http://www.ecs.soton.ac.uk/~njh/twolame/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.twolame.org/
-COMMENT= Optimised MPEG Audio Layer 2 (MP2) encoder based on tooLAME
-
-USE_LIBTOOL= yes
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= pkg-config
-GNU_CONFIGURE= yes
-
-PKGCONFIG_OVERRIDE+= twolame.pc.in
-
-.include "../../audio/libsndfile/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/twolame/PLIST b/audio/twolame/PLIST
deleted file mode 100644
index 1057eb1d162..00000000000
--- a/audio/twolame/PLIST
+++ /dev/null
@@ -1,27 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/21 10:16:55 xtraeme Exp $
-bin/twolame
-include/twolame.h
-lib/libtwolame.la
-lib/pkgconfig/twolame.pc
-man/man1/twolame.1
-share/doc/twolame/api.txt
-share/doc/twolame/html/api.html
-share/doc/twolame/html/authors.html
-share/doc/twolame/html/changelog.html
-share/doc/twolame/html/doxygen.css
-share/doc/twolame/html/doxygen.png
-share/doc/twolame/html/index.html
-share/doc/twolame/html/psycho.html
-share/doc/twolame/html/readme.html
-share/doc/twolame/html/todo.html
-share/doc/twolame/html/twolame-manpage.css
-share/doc/twolame/html/twolame-quirks.css
-share/doc/twolame/html/twolame.1.html
-share/doc/twolame/html/twolame.css
-share/doc/twolame/html/twolame_8h-source.html
-share/doc/twolame/html/twolame_8h.html
-share/doc/twolame/html/vbr.html
-share/doc/twolame/psycho.txt
-share/doc/twolame/vbr.txt
-@dirrm share/doc/twolame/html
-@dirrm share/doc/twolame
diff --git a/audio/twolame/buildlink3.mk b/audio/twolame/buildlink3.mk
deleted file mode 100644
index fb16554aa06..00000000000
--- a/audio/twolame/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.4 2007/01/07 12:25:53 wiz Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-TWOLAME_BUILDLINK3_MK:= ${TWOLAME_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= twolame
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntwolame}
-BUILDLINK_PACKAGES+= twolame
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}twolame
-
-.if ${TWOLAME_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.twolame+= twolame>=0.3.7
-BUILDLINK_ABI_DEPENDS.twolame?= twolame>=0.3.7nb1
-BUILDLINK_PKGSRCDIR.twolame?= ../../audio/twolame
-.endif # TWOLAME_BUILDLINK3_MK
-
-.include "../../audio/libsndfile/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/twolame/distinfo b/audio/twolame/distinfo
deleted file mode 100644
index 0035ca7cce2..00000000000
--- a/audio/twolame/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/21 10:16:55 xtraeme Exp $
-
-SHA1 (twolame-0.3.7.tar.gz) = 8f970592955cab5358f272c56ef4713fbb3405dd
-RMD160 (twolame-0.3.7.tar.gz) = 32ee504d9f37c4cd68f547972ae3273428a458a4
-Size (twolame-0.3.7.tar.gz) = 465187 bytes
diff --git a/audio/ubs/DESCR b/audio/ubs/DESCR
deleted file mode 100644
index 0881962fbb1..00000000000
--- a/audio/ubs/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-The Uninterrupted Broadcasting System (UBS) is a program designed to run the
-operations of a radio station when a DJ isn't in house. This includes playing
-station ID's, public service announcements, and songs. This program is
-similar in function (but not design nor implementation) to DRS 2006.
-
-The UBS was not intended to be used for webcasting, but it could presumably
-be adapted for this purpose. The intended audience of the UBS is smaller
-college/high school/commercial radio stations which wish to do unattended
-broadcasting via a stable and reliable computer daemon.
diff --git a/audio/ubs/Makefile b/audio/ubs/Makefile
deleted file mode 100644
index 41d52c3bad3..00000000000
--- a/audio/ubs/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:07 wiz Exp $
-#
-
-DISTNAME= ubs-0.17
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-# author's new home may be at http://www.teragon.org
-# HOMEPAGE= http://aboleo.net/software/ubs/
-COMMENT= Uninterrupted Broadcasting System
-
-GNU_CONFIGURE= yes
-
-RCD_SCRIPTS= ubs
-PKG_SYSCONFSUBDIR= ubs
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILD_DEFS+= UBS_BASEDIR UBS_USER UBS_GROUP
-
-UBS_BASEDIR?= /var/spool/ubs
-UBS_USER?= ubs
-UBS_GROUP?= ubs
-
-PKG_GROUPS= ${UBS_GROUP}
-PKG_USERS= ${UBS_USER}:${UBS_GROUP}
-FILES_SUBST+= PREFIX=${PREFIX:Q}
-FILES_SUBST+= UBS_USER=${UBS_USER:Q}
-FILES_SUBST+= UBS_GROUP=${UBS_GROUP:Q}
-
-OWN_DIRS_PERMS= ${UBS_BASEDIR} ${UBS_USER} ${UBS_GROUP} 0750
-OWN_DIRS_PERMS+= ${UBS_BASEDIR}/var ${UBS_USER} ${UBS_GROUP} 0750
-OWN_DIRS_PERMS+= ${UBS_BASEDIR}/log ${UBS_USER} ${UBS_GROUP} 0750
-
-EGDIR= ${PREFIX}/share/examples/ubs
-CONF_FILES= ${EGDIR}/help.conf ${PKG_SYSCONFDIR}/help.conf
-CONF_FILES+= ${EGDIR}/ubs.conf.default ${PKG_SYSCONFDIR}/ubs.conf
-
-SUBST_CLASSES+= ubsconf
-SUBST_STAGE.ubsconf= pre-configure
-SUBST_MESSAGE.ubsconf= Fixing path to ubs.conf.
-SUBST_FILES.ubsconf= include/defaults.h
-SUBST_SED.ubsconf= -e 's,"etc/ubs.conf","${PKG_SYSCONFDIR}/ubs.conf",'
-
-post-extract:
- ${MV} ${WRKSRC}/config/ubs.conf.default \
- ${WRKSRC}/config/ubs.conf.default.in
-
-pre-configure:
- ${SED} -e "s,@UBS_BASEDIR@,${UBS_BASEDIR},g" \
- ${WRKSRC}/config/ubs.conf.default.in > \
- ${WRKSRC}/config/ubs.conf.default
-
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/ubs/PLIST b/audio/ubs/PLIST
deleted file mode 100644
index b87ba4f5712..00000000000
--- a/audio/ubs/PLIST
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/02 20:33:57 reed Exp $
-bin/ubs
-bin/ubs-event
-bin/ubs-play
-bin/ubs-sched
-include/defaults.h
-include/ubs-event.h
-include/ubs-main.h
-include/ubs-play.h
-include/ubs-sched.h
-include/ubs.h
-lib/libubs.a
-share/examples/rc.d/ubs
-share/examples/ubs/help.conf
-share/examples/ubs/ubs.conf.default
-@dirrm share/examples/ubs
diff --git a/audio/ubs/distinfo b/audio/ubs/distinfo
deleted file mode 100644
index 2abcc92de2e..00000000000
--- a/audio/ubs/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/07/02 09:53:00 rillig Exp $
-
-SHA1 (ubs-0.17.tar.gz) = f0f67d437e4c5c7026b2f05d1aaff53688eb3253
-RMD160 (ubs-0.17.tar.gz) = 4e0e46bb8346f0c86989b0b33973000bbb86f1aa
-Size (ubs-0.17.tar.gz) = 372222 bytes
-SHA1 (patch-aa) = 4a5690fa3e7a8dc1dc50329bf844199575a09319
-SHA1 (patch-ab) = 88d06fca850e7bf2d38ad587021e4352c96cc89b
-SHA1 (patch-ac) = af22e0ca907b22eedb86e79ce2e81e4fb87283e9
diff --git a/audio/ubs/files/ubs.sh b/audio/ubs/files/ubs.sh
deleted file mode 100755
index 27edd42c58a..00000000000
--- a/audio/ubs/files/ubs.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: ubs.sh,v 1.1.1.1 2004/04/05 11:46:11 xtraeme Exp $
-#
-
-# PROVIDE: ubs
-# REQUIRE: DAEMON LOGIN
-
-. /etc/rc.subr
-
-name="ubs"
-rcvar=$name
-command="@PREFIX@/bin/${name}"
-required_files="@PKG_SYSCONFDIR@/ubs.conf"
-ubs_user="@UBS_USER@"
-ubs_group="@UBS_GROUP@"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/audio/ubs/patches/patch-aa b/audio/ubs/patches/patch-aa
deleted file mode 100644
index f849cf94d5e..00000000000
--- a/audio/ubs/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/04/05 11:46:11 xtraeme Exp $
-
---- Makefile.in.orig 2003-10-31 05:49:58.000000000 +0100
-+++ Makefile.in 2003-10-31 05:50:52.000000000 +0100
-@@ -517,14 +517,11 @@
-
-
- install-data-local:
-- $(mkinstalldirs) $(prefix)/etc
- $(mkinstalldirs) $(prefix)/include
-- $(mkinstalldirs) $(prefix)/log
-- $(mkinstalldirs) $(prefix)/tmp
-- $(mkinstalldirs) $(prefix)/var
-+ $(mkinstalldirs) $(datadir)/examples/ubs
-
-- $(INSTALL_DATA) config/help.conf $(prefix)/etc
-- $(INSTALL_DATA) config/ubs.conf.default $(prefix)/etc
-+ $(INSTALL_DATA) config/help.conf $(datadir)/examples/ubs
-+ $(INSTALL_DATA) config/ubs.conf.default $(datadir)/examples/ubs
-
- $(INSTALL_DATA) include/*.h $(prefix)/include
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/audio/ubs/patches/patch-ab b/audio/ubs/patches/patch-ab
deleted file mode 100644
index 810c4eab6f0..00000000000
--- a/audio/ubs/patches/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/04/05 11:46:11 xtraeme Exp $
-
---- config/ubs.conf.default.in.orig 2003-10-31 06:22:19.000000000 +0100
-+++ config/ubs.conf.default.in 2003-10-31 06:22:44.000000000 +0100
-@@ -22,16 +22,16 @@
- ## These settings are parsed by all UBS daemons
-
- # Where the UBS filetree is located
--# global.prefix = "/usr/local/ubs"
-+global.prefix = "@UBS_BASEDIR@"
-
- # The default location to queue to
--# global.queue = "var/queue"
-+global.queue = "var/queue"
-
- # Location of the error log
--# global.errorlog = "log/error.log"
-+global.errorlog = "log/error.log"
-
- # Location of the playlist log
--# global.songlog = "log/playlist.log"
-+global.songlog = "log/playlist.log"
-
- # Amount of information to put in the UBS logs. The scale is:
- # 0 -> Emergency information only
diff --git a/audio/ubs/patches/patch-ac b/audio/ubs/patches/patch-ac
deleted file mode 100644
index fa1f21e51a7..00000000000
--- a/audio/ubs/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/07/02 09:53:00 rillig Exp $
-
-Fixed the way the pathname of the configuration file is built up.
-
---- lib/read_config.c.orig 2003-10-26 04:36:51.000000000 +0100
-+++ lib/read_config.c 2006-07-02 09:02:07.000000000 +0200
-@@ -52,8 +52,8 @@ int read_config(char *fname, char *secti
- int bad = NO, line_ct = 0, res;
-
- if(fname == NULL) {
-- snprintf(buf, STRBUF, "%s/%s", ubs_table_data(&GLOBAL, "prefix"), DEF_CONFIG);
-- if((config_fp = fopen(buf, "r")) == NULL) {
-+ fname = DEF_CONFIG;
-+ if((config_fp = fopen(fname, "r")) == NULL) {
- return NO_FILE;
- }
- }
diff --git a/audio/vorbis-tools/DESCR b/audio/vorbis-tools/DESCR
deleted file mode 100644
index 73f8a8c7961..00000000000
--- a/audio/vorbis-tools/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-vorbis-tools contains an Ogg Vorbis command-line encoder,
-decoder/player and a tool for changing .ogg file comments. Ogg
-Vorbis is a audio encoding format; its technology is patent-free and
-players and encoders are available on a variety of operating
-systems.
- * oggenc encodes audio into the Ogg Vorbis format
- * ogg123 plays Ogg Vorbis files or URLs streamed via HTTP
- * vorbiscomment can list or set comments in an .ogg file
diff --git a/audio/vorbis-tools/MESSAGE b/audio/vorbis-tools/MESSAGE
deleted file mode 100644
index 993fdfff671..00000000000
--- a/audio/vorbis-tools/MESSAGE
+++ /dev/null
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/11/11 19:50:57 heinz Exp $
-
-By default, ogg123 will decode to the OSS audio device.
-
-Alternatively you can use libao's "sun" (SUN audio/NetBSD
-audio) device. To setup your personal libao configuration so it
-uses "sun" do:
-
- echo "default_driver=sun" > ~/.libao
-
-Read the ogg123(1) manual page for further information.
-
-===========================================================================
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
deleted file mode 100644
index b4ec4ff7f42..00000000000
--- a/audio/vorbis-tools/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# $NetBSD: Makefile,v 1.45 2007/01/13 15:35:52 wiz Exp $
-
-DISTNAME= vorbis-tools-1.1.1
-PKGREVISION= 4
-CATEGORIES= audio
-MASTER_SITES= http://downloads.xiph.org/releases/vorbis/
-
-MAINTAINER= wiz@NetBSD.org
-HOMEPAGE= http://www.vorbis.com/
-COMMENT= Ogg Vorbis encoder and player
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-# list it into IPv6-ready packages
-BUILD_DEFS+= USE_INET6
-
-CONFLICTS= vorbis-[0-9]*
-
-USE_PKGLOCALEDIR= yes
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-CONFIGURE_ARGS+= --with-ogg-prefix=${BUILDLINK_PREFIX.libogg} \
- --with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis} \
- --with-ao-prefix=${BUILDLINK_PREFIX.libao}
-
-PLIST_SUBST+= DISTNAME=${DISTNAME:Q}
-
-PTHREAD_OPTS+= require
-
-.include "../../audio/flac/buildlink3.mk"
-.include "../../audio/libao/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/speex/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/vorbis-tools/PLIST b/audio/vorbis-tools/PLIST
deleted file mode 100644
index 00e42e29e80..00000000000
--- a/audio/vorbis-tools/PLIST
+++ /dev/null
@@ -1,25 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2006/04/17 07:07:12 jlam Exp $
-bin/ogg123
-bin/oggdec
-bin/oggenc
-bin/ogginfo
-bin/vorbiscomment
-man/man1/ogg123.1
-man/man1/oggdec.1
-man/man1/oggenc.1
-man/man1/ogginfo.1
-man/man1/vorbiscomment.1
-share/doc/${DISTNAME}/ogg123rc-example
-share/locale/be/LC_MESSAGES/vorbis-tools.mo
-share/locale/cs/LC_MESSAGES/vorbis-tools.mo
-share/locale/da/LC_MESSAGES/vorbis-tools.mo
-share/locale/es/LC_MESSAGES/vorbis-tools.mo
-share/locale/fr/LC_MESSAGES/vorbis-tools.mo
-share/locale/hr/LC_MESSAGES/vorbis-tools.mo
-share/locale/hu/LC_MESSAGES/vorbis-tools.mo
-share/locale/nl/LC_MESSAGES/vorbis-tools.mo
-share/locale/ro/LC_MESSAGES/vorbis-tools.mo
-share/locale/ru/LC_MESSAGES/vorbis-tools.mo
-share/locale/sv/LC_MESSAGES/vorbis-tools.mo
-share/locale/uk/LC_MESSAGES/vorbis-tools.mo
-@dirrm share/doc/${DISTNAME}
diff --git a/audio/vorbis-tools/distinfo b/audio/vorbis-tools/distinfo
deleted file mode 100644
index cf1377681f2..00000000000
--- a/audio/vorbis-tools/distinfo
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: distinfo,v 1.19 2007/01/13 15:35:52 wiz Exp $
-
-SHA1 (vorbis-tools-1.1.1.tar.gz) = a1394b39905b389d72f12c2a9f0c86a33d07a487
-RMD160 (vorbis-tools-1.1.1.tar.gz) = ed38929b8a81f833f726e489e55e9f62d5ed69ec
-Size (vorbis-tools-1.1.1.tar.gz) = 948837 bytes
-SHA1 (patch-aa) = 2adc912765d58b19c1285c12ac0935b860b7da34
-SHA1 (patch-ab) = b706ae0bc9e13c5ccff689aa1451efc782e340e9
-SHA1 (patch-ac) = 65e07de0f0e4de30b6fed374146535adebba5ed6
-SHA1 (patch-ad) = 729ca84168ee781335429840ee54a2b894b82f54
-SHA1 (patch-ae) = 67bda1581c18dec0e43846f4c39aba35a7b2223e
-SHA1 (patch-af) = eafb75d8b9aade62b9862e3df1380f15eba80f47
-SHA1 (patch-ag) = af25e010e1eb350a8614398d312dd0842a207060
-SHA1 (patch-ah) = fa01e42b339fe2cbd5d98c150e0bb618b43fd4a1
-SHA1 (patch-ai) = c44c9b0bec99b0e8a3883c0ef388f6d0856fa11a
-SHA1 (patch-aj) = 8cfa93518f71feb1e85f4db784d5e5c158dcf11e
-SHA1 (patch-ak) = fb0e11d1aff4753fbb3ee9088e6faeb5bcd58ef1
-SHA1 (patch-an) = a6a1aa59f2bf87b2217e827e6309233515d162c2
-SHA1 (patch-ao) = f509dde919b93ddfba0105189cb645c2667ba0e4
-SHA1 (patch-ap) = 4da7c1a2b92dad4a05322b05451a1ac4c34ce2fb
-SHA1 (patch-aq) = 237bbcb6c4d895dcd01f42cae5a48f11d2a695b1
diff --git a/audio/vorbis-tools/patches/patch-aa b/audio/vorbis-tools/patches/patch-aa
deleted file mode 100644
index 2b81ed75bcc..00000000000
--- a/audio/vorbis-tools/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2003/12/08 14:43:48 wiz Exp $
-
---- ogg123/buffer.c.orig Mon Sep 1 22:15:19 2003
-+++ ogg123/buffer.c
-@@ -412,7 +412,9 @@ void buffer_reset (buf_t *buf)
-
- /* Cleanup pthread variables */
- pthread_mutex_destroy(&buf->mutex);
-+ COND_SIGNAL(buf->write_cond);
- pthread_cond_destroy(&buf->write_cond);
-+ COND_SIGNAL(buf->playback_cond);
- pthread_cond_destroy(&buf->playback_cond);
-
- /* Reinit pthread variables */
diff --git a/audio/vorbis-tools/patches/patch-ab b/audio/vorbis-tools/patches/patch-ab
deleted file mode 100644
index cee43285ede..00000000000
--- a/audio/vorbis-tools/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2007/01/13 15:35:52 wiz Exp $
-
---- ogg123/ogg123.c.orig 2005-06-03 10:15:09.000000000 +0000
-+++ ogg123/ogg123.c
-@@ -610,7 +610,13 @@ void play (char *source_string)
-
- format->cleanup(decoder);
- transport->close(source);
-+#if 0
-+ /*
-+ * XXX: should be done properly with pthread_cleanup_push instead,
-+ * if at all.
-+ */
- status_reset_output_lock(); /* In case we were killed mid-output */
-+#endif
-
- status_message(1, _("Done."));
-
diff --git a/audio/vorbis-tools/patches/patch-ac b/audio/vorbis-tools/patches/patch-ac
deleted file mode 100644
index 2b59c61f8ad..00000000000
--- a/audio/vorbis-tools/patches/patch-ac
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2007/01/13 15:35:52 wiz Exp $
-
---- oggenc/oggenc.c.orig 2005-06-03 10:15:10.000000000 +0000
-+++ oggenc/oggenc.c
-@@ -659,6 +659,8 @@ static void parse_options(int argc, char
-
- break;
- case 'a':
-+ if (strlen(optarg) == 0)
-+ break;
- opt->artist = realloc(opt->artist, (++opt->artist_count)*sizeof(char *));
- opt->artist[opt->artist_count - 1] = strdup(optarg);
- break;
-@@ -671,10 +673,14 @@ static void parse_options(int argc, char
- opt->comments[opt->comment_count - 1] = strdup(optarg);
- break;
- case 'd':
-+ if (strlen(optarg) == 0)
-+ break;
- opt->dates = realloc(opt->dates, (++opt->date_count)*sizeof(char *));
- opt->dates[opt->date_count - 1] = strdup(optarg);
- break;
- case 'G':
-+ if (strlen(optarg) == 0)
-+ break;
- opt->genre = realloc(opt->genre, (++opt->genre_count)*sizeof(char *));
- opt->genre[opt->genre_count - 1] = strdup(optarg);
- break;
-@@ -683,6 +689,8 @@ static void parse_options(int argc, char
- exit(0);
- break;
- case 'l':
-+ if (strlen(optarg) == 0)
-+ break;
- opt->album = realloc(opt->album, (++opt->album_count)*sizeof(char *));
- opt->album[opt->album_count - 1] = strdup(optarg);
- break;
-@@ -693,6 +701,8 @@ static void parse_options(int argc, char
- opt->serial = 0; /* Failed, so just set to zero */
- break;
- case 't':
-+ if (strlen(optarg) == 0)
-+ break;
- opt->title = realloc(opt->title, (++opt->title_count)*sizeof(char *));
- opt->title[opt->title_count - 1] = strdup(optarg);
- break;
diff --git a/audio/vorbis-tools/patches/patch-ad b/audio/vorbis-tools/patches/patch-ad
deleted file mode 100644
index d3616a9f0e3..00000000000
--- a/audio/vorbis-tools/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/10/03 15:59:13 joerg Exp $
-
---- ogg123/playlist.c.orig 2005-08-17 20:03:15.000000000 +0000
-+++ ogg123/playlist.c
-@@ -19,6 +19,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
-+#include <limits.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
diff --git a/audio/vorbis-tools/patches/patch-ae b/audio/vorbis-tools/patches/patch-ae
deleted file mode 100644
index 57d938c5963..00000000000
--- a/audio/vorbis-tools/patches/patch-ae
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/10/20 20:08:59 rillig Exp $
-
-ISO-C90 fix.
-
---- oggenc/encode.c.orig Fri Jun 3 12:15:10 2005
-+++ oggenc/encode.c Thu Oct 20 22:06:18 2005
-@@ -160,6 +160,8 @@ int oe_encode(oe_enc_opt *opt)
- /* do we have optional hard bitrate restrictions? */
- if(opt->max_bitrate > 0 || opt->min_bitrate > 0){
- struct ovectl_ratemanage2_arg ai;
-+ long bitrate;
-+
- vorbis_encode_ctl(&vi, OV_ECTL_RATEMANAGE2_GET, &ai);
-
- /* libvorbis 1.1 (and current svn) doesn't actually fill this in,
-@@ -173,7 +175,6 @@ int oe_encode(oe_enc_opt *opt)
- Also, note that this won't work correctly unless you have a very
- recent (2005/03/04 or later) version of libvorbis from svn).
- */
-- long bitrate;
-
- {
- vorbis_info vi2;
diff --git a/audio/vorbis-tools/patches/patch-af b/audio/vorbis-tools/patches/patch-af
deleted file mode 100644
index 47b3b51b19e..00000000000
--- a/audio/vorbis-tools/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/11/02 07:57:56 wiz Exp $
-
---- ogg123/http_transport.c.orig 2005-06-13 13:11:44.000000000 +0000
-+++ ogg123/http_transport.c
-@@ -116,7 +116,6 @@ void set_curl_opts (http_private_t *priv
- if (inputOpts.ProxyTunnel)
- curl_easy_setopt (handle, CURLOPT_HTTPPROXYTUNNEL, inputOpts.ProxyTunnel);
- */
-- curl_easy_setopt(handle, CURLOPT_MUTE, 1);
- curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, private->error);
- curl_easy_setopt(handle, CURLOPT_PROGRESSFUNCTION, progress_callback);
- curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, private);
diff --git a/audio/vorbis-tools/patches/patch-ag b/audio/vorbis-tools/patches/patch-ag
deleted file mode 100644
index 25cc4975623..00000000000
--- a/audio/vorbis-tools/patches/patch-ag
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2007/01/13 15:35:52 wiz Exp $
-
---- configure.ac.orig 2005-06-27 09:25:51.000000000 +0000
-+++ configure.ac
-@@ -171,13 +171,8 @@ FLAC_LIBS=""
- if test "x$build_flac" = xyes; then
- AC_CHECK_LIB(m,log,FLAC_LIBS="-lm")
- AC_CHECK_LIB(FLAC, [FLAC__stream_decoder_process_single],
-- [have_libFLAC=yes; FLAC_LIBS="-lFLAC $FLAC_LIBS"],
-+ [have_libFLAC=yes; FLAC_LIBS="-lFLAC $FLAC_LIBS $OGG_LIBS"],
- AC_MSG_WARN([libFLAC missing])
-- have_libFLAC=no, [$FLAC_LIBS]
-- )
-- AC_CHECK_LIB(OggFLAC, [OggFLAC__stream_decoder_new],
-- [FLAC_LIBS="-lOggFLAC $FLAC_LIBS $OGG_LIBS"],
-- AC_MSG_WARN([libOggFLAC missing])
- have_libFLAC=no, [$FLAC_LIBS $OGG_LIBS]
- )
- AC_CHECK_HEADER(FLAC/stream_decoder.h,,
diff --git a/audio/vorbis-tools/patches/patch-ah b/audio/vorbis-tools/patches/patch-ah
deleted file mode 100644
index 6fab9e5426d..00000000000
--- a/audio/vorbis-tools/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2007/01/13 15:35:52 wiz Exp $
-
---- ogg123/Makefile.am.orig 2005-06-13 13:11:44.000000000 +0000
-+++ ogg123/Makefile.am
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- if HAVE_LIBFLAC
--flac_sources = flac_format.c easyflac.c easyflac.h
-+flac_sources = flac_format.c
- else
- flac_sources =
- endif
diff --git a/audio/vorbis-tools/patches/patch-ai b/audio/vorbis-tools/patches/patch-ai
deleted file mode 100644
index 9ec1366902f..00000000000
--- a/audio/vorbis-tools/patches/patch-ai
+++ /dev/null
@@ -1,208 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2007/01/13 15:35:52 wiz Exp $
-
---- ogg123/flac_format.c.orig 2005-06-03 10:15:09.000000000 +0000
-+++ ogg123/flac_format.c
-@@ -25,13 +25,23 @@
- #include "audio.h"
- #include "format.h"
- #include "i18n.h"
-+#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8)
-+#define NEED_EASYFLAC 1
-+#endif
-+#if NEED_EASYFLAC
- #include "easyflac.h"
-+#else
-+#include <FLAC/stream_decoder.h>
-+#endif
- #include "vorbis_comments.h"
-
--#define DEFAULT_FLAC_FRAME_SIZE 4608
--
- typedef struct {
-+#if NEED_EASYFLAC
- EasyFLAC__StreamDecoder *decoder;
-+#else
-+ FLAC__StreamDecoder *decoder;
-+ int is_oggflac;
-+#endif
- short channels;
- int rate;
- int bits_per_sample;
-@@ -67,10 +77,18 @@ format_t oggflac_format;
-
-
- /* Private functions declarations */
--FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
--FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
--void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
--void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-+#if NEED_EASYFLAC
-+static FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
-+static FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
-+static void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
-+static void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-+#else
-+static FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data);
-+static FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
-+static void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
-+static void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-+static FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data);
-+#endif
-
- void resize_buffer(flac_private_t *flac, int newchannels, int newsamples);
- /*void copy_comments (vorbis_comment *v_comments, FLAC__StreamMetadata_VorbisComment *f_comments);*/
-@@ -155,6 +173,7 @@ decoder_t* flac_init (data_source_t *sou
- private->buf_start = 0;
-
- /* Setup FLAC decoder */
-+#if NEED_EASYFLAC
- if (oggflac_can_decode(source)) {
- decoder->format = &oggflac_format;
- private->decoder = EasyFLAC__stream_decoder_new(1);
-@@ -172,13 +191,39 @@ decoder_t* flac_init (data_source_t *sou
- EasyFLAC__set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_STREAMINFO);
- EasyFLAC__set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
- EasyFLAC__init(private->decoder);
-+#else
-+ if (oggflac_can_decode(source)) {
-+ private->is_oggflac = 1;
-+ decoder->format = &oggflac_format;
-+ } else {
-+ private->is_oggflac = 0;
-+ decoder->format = &flac_format;
-+ }
-+ private->decoder = FLAC__stream_decoder_new();
-+
-+ FLAC__stream_decoder_set_md5_checking(private->decoder, false);
-+ FLAC__stream_decoder_set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_STREAMINFO);
-+ FLAC__stream_decoder_set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
-+ if(private->is_oggflac)
-+ FLAC__stream_decoder_init_ogg_stream(private->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, decoder);
-+ else
-+ FLAC__stream_decoder_init_stream(private->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, decoder);
-+#endif
-
- /* Callback will set the total samples and sample rate */
-+#if NEED_EASYFLAC
- EasyFLAC__process_until_end_of_metadata(private->decoder);
-+#else
-+ FLAC__stream_decoder_process_until_end_of_metadata(private->decoder);
-+#endif
-
- /* Callback will set the number of channels and resize the
- audio buffer */
-+#if NEED_EASYFLAC
- EasyFLAC__process_single(private->decoder);
-+#else
-+ FLAC__stream_decoder_process_single(private->decoder);
-+#endif
-
- /* FLAC API returns signed samples on all streams */
- decoder->actual_fmt.signed_sample = 1;
-@@ -241,11 +286,19 @@ int flac_read (decoder_t *decoder, void
- realsamples += copy;
- }
- else if (!priv->eos) {
-+#if NEED_EASYFLAC
- ret = EasyFLAC__process_single(priv->decoder);
- if (!ret ||
- EasyFLAC__get_state(priv->decoder)
- == FLAC__STREAM_DECODER_END_OF_STREAM)
- priv->eos = 1; /* Bail out! */
-+#else
-+ ret = FLAC__stream_decoder_process_single(priv->decoder);
-+ if (!ret ||
-+ FLAC__stream_decoder_get_state(priv->decoder)
-+ == FLAC__STREAM_DECODER_END_OF_STREAM)
-+ priv->eos = 1; /* Bail out! */
-+#endif
- } else
- break;
- }
-@@ -311,8 +364,13 @@ void flac_cleanup (decoder_t *decoder)
- free(priv->buf[i]);
-
- free(priv->buf);
-+#if NEED_EASYFLAC
- EasyFLAC__finish(priv->decoder);
- EasyFLAC__stream_decoder_delete(priv->decoder);
-+#else
-+ FLAC__stream_decoder_finish(priv->decoder);
-+ FLAC__stream_decoder_delete(priv->decoder);
-+#endif
-
- free(decoder->private);
- free(decoder);
-@@ -342,7 +400,11 @@ format_t oggflac_format = {
-
-
-
-+#if NEED_EASYFLAC
- FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data)
-+#else
-+FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
-+#endif
- {
- decoder_t *e_decoder = client_data;
- flac_private_t *priv = e_decoder->private;
-@@ -363,7 +425,11 @@ FLAC__StreamDecoderReadStatus easyflac_r
- }
-
-
-+#if NEED_EASYFLAC
- FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
-+#else
-+FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
-+#endif
- {
- decoder_t *e_decoder = client_data;
- flac_private_t *priv = e_decoder->private;
-@@ -389,7 +455,11 @@ FLAC__StreamDecoderWriteStatus easyflac_
- }
-
-
-+#if NEED_EASYFLAC
- void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
-+#else
-+void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
-+#endif
- {
- decoder_t *e_decoder = client_data;
- flac_private_t *priv = e_decoder->private;
-@@ -409,12 +479,24 @@ void easyflac_metadata_callback(const Ea
- }
-
-
-+#if NEED_EASYFLAC
- void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
-+#else
-+void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
-+#endif
- {
-
-
- }
-
-+#if !NEED_EASYFLAC
-+FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data)
-+{
-+ // can't get this info from the data source, so we'll let the read callback handle it
-+ return false;
-+}
-+#endif
-+
-
- void resize_buffer(flac_private_t *flac, int newchannels, int newsamples)
- {
-@@ -457,7 +539,11 @@ void print_flac_stream_info (decoder_t *
-
-
-
-+#if NEED_EASYFLAC
- if (EasyFLAC__is_oggflac(priv->decoder))
-+#else
-+ if (priv->is_oggflac)
-+#endif
- cb->printf_metadata(decoder->callback_arg, 2,
- _("Ogg FLAC stream: %d bits, %d channel, %ld Hz"),
- priv->bits_per_sample,
diff --git a/audio/vorbis-tools/patches/patch-aj b/audio/vorbis-tools/patches/patch-aj
deleted file mode 100644
index 6f8e2996163..00000000000
--- a/audio/vorbis-tools/patches/patch-aj
+++ /dev/null
@@ -1,171 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2007/01/13 15:35:52 wiz Exp $
-
---- oggenc/flac.c.orig 2005-06-03 10:15:10.000000000 +0000
-+++ oggenc/flac.c
-@@ -20,15 +20,21 @@
- #include "platform.h"
- #include "resample.h"
-
--#define DEFAULT_FLAC_FRAME_SIZE 4608
-+#if NEED_EASYFLAC
-+static FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
-+static FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
-+static void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
-+static void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-+#else
-+static FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data);
-+static FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
-+static void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
-+static void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-+static FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data);
-+#endif
-
--FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
--FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
--void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
--void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
--
--void resize_buffer(flacfile *flac, int newchannels, int newsamples);
--void copy_comments (vorbis_comment *v_comments, FLAC__StreamMetadata_VorbisComment *f_comments);
-+static void resize_buffer(flacfile *flac, int newchannels, int newsamples);
-+static void copy_comments (vorbis_comment *v_comments, FLAC__StreamMetadata_VorbisComment *f_comments);
-
-
- int flac_id(unsigned char *buf, int len)
-@@ -76,6 +82,7 @@ int flac_open(FILE *in, oe_enc_opt *opt,
- flac->in = in;
-
- /* Setup FLAC decoder */
-+#if NEED_EASYFLAC
- flac->decoder = EasyFLAC__stream_decoder_new(oggflac_id(oldbuf, buflen));
- EasyFLAC__set_client_data(flac->decoder, flac);
- EasyFLAC__set_read_callback(flac->decoder, &easyflac_read_callback);
-@@ -85,13 +92,31 @@ int flac_open(FILE *in, oe_enc_opt *opt,
- EasyFLAC__set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_STREAMINFO);
- EasyFLAC__set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
- EasyFLAC__init(flac->decoder);
-+#else
-+ flac->decoder = FLAC__stream_decoder_new();
-+ FLAC__stream_decoder_set_md5_checking(flac->decoder, false);
-+ FLAC__stream_decoder_set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_STREAMINFO);
-+ FLAC__stream_decoder_set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
-+ if(oggflac_id(oldbuf, buflen))
-+ FLAC__stream_decoder_init_ogg_stream(flac->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, flac);
-+ else
-+ FLAC__stream_decoder_init_stream(flac->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, flac);
-+#endif
-
- /* Callback will set the total samples and sample rate */
-+#if NEED_EASYFLAC
- EasyFLAC__process_until_end_of_metadata(flac->decoder);
-+#else
-+ FLAC__stream_decoder_process_until_end_of_metadata(flac->decoder);
-+#endif
-
- /* Callback will set the number of channels and resize the
- audio buffer */
-+#if NEED_EASYFLAC
- EasyFLAC__process_single(flac->decoder);
-+#else
-+ FLAC__stream_decoder_process_single(flac->decoder);
-+#endif
-
- /* Copy format info for caller */
- opt->rate = flac->rate;
-@@ -133,11 +158,19 @@ long flac_read(void *in, float **buffer,
- }
- else if (!flac->eos)
- {
-+#if NEED_EASYFLAC
- ret = EasyFLAC__process_single(flac->decoder);
- if (!ret ||
- EasyFLAC__get_state(flac->decoder)
- == FLAC__STREAM_DECODER_END_OF_STREAM)
- flac->eos = 1; /* Bail out! */
-+#else
-+ ret = FLAC__stream_decoder_process_single(flac->decoder);
-+ if (!ret ||
-+ FLAC__stream_decoder_get_state(flac->decoder)
-+ == FLAC__STREAM_DECODER_END_OF_STREAM)
-+ flac->eos = 1; /* Bail out! */
-+#endif
- } else
- break;
- }
-@@ -157,13 +190,22 @@ void flac_close(void *info)
- free(flac->buf);
- free(flac->oldbuf);
- free(flac->comments);
-+#if NEED_EASYFLAC
- EasyFLAC__finish(flac->decoder);
- EasyFLAC__stream_decoder_delete(flac->decoder);
-+#else
-+ FLAC__stream_decoder_finish(flac->decoder);
-+ FLAC__stream_decoder_delete(flac->decoder);
-+#endif
- free(flac);
- }
-
-
-+#if NEED_EASYFLAC
- FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data)
-+#else
-+FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
-+#endif
- {
- flacfile *flac = (flacfile *) client_data;
- int i = 0;
-@@ -200,7 +242,11 @@ FLAC__StreamDecoderReadStatus easyflac_r
- return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
- }
-
-+#if NEED_EASYFLAC
- FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
-+#else
-+FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
-+#endif
- {
- flacfile *flac = (flacfile *) client_data;
- int samples = frame->header.blocksize;
-@@ -221,7 +267,11 @@ FLAC__StreamDecoderWriteStatus easyflac_
- return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
- }
-
-+#if NEED_EASYFLAC
- void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
-+#else
-+void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
-+#endif
- {
- flacfile *flac = (flacfile *) client_data;
-
-@@ -240,11 +290,24 @@ void easyflac_metadata_callback(const Ea
- }
- }
-
-+#if NEED_EASYFLAC
- void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
-+#else
-+void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
-+#endif
-+{
-+ flacfile *flac = (flacfile *) client_data;
-+
-+}
-+
-+#if !NEED_EASYFLAC
-+FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data)
- {
- flacfile *flac = (flacfile *) client_data;
-
-+ return feof(flac->in)? true : false;
- }
-+#endif
-
-
- void resize_buffer(flacfile *flac, int newchannels, int newsamples)
-@@ -292,4 +355,3 @@ void copy_comments (vorbis_comment *v_co
- free(comment);
- }
- }
--
diff --git a/audio/vorbis-tools/patches/patch-ak b/audio/vorbis-tools/patches/patch-ak
deleted file mode 100644
index f8d61697901..00000000000
--- a/audio/vorbis-tools/patches/patch-ak
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2007/01/13 15:35:52 wiz Exp $
-
---- oggenc/flac.h.orig 2005-06-03 10:15:10.000000000 +0000
-+++ oggenc/flac.h
-@@ -5,10 +5,21 @@
- #include "encode.h"
- #include "audio.h"
- #include <stdio.h>
-+#include <FLAC/stream_decoder.h>
-+#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8)
-+#include <OggFLAC/stream_decoder.h>
-+#define NEED_EASYFLAC 1
-+#endif
-+#if NEED_EASYFLAC
- #include "easyflac.h"
-+#endif
-
- typedef struct {
-+#if NEED_EASYFLAC
- EasyFLAC__StreamDecoder *decoder;
-+#else
-+ FLAC__StreamDecoder *decoder;
-+#endif
- short channels;
- int rate;
- long totalsamples; /* per channel, of course */
diff --git a/audio/vorbis-tools/patches/patch-an b/audio/vorbis-tools/patches/patch-an
deleted file mode 100644
index 87ed9fdf0d8..00000000000
--- a/audio/vorbis-tools/patches/patch-an
+++ /dev/null
@@ -1,83 +0,0 @@
-$NetBSD: patch-an,v 1.1 2007/01/13 15:35:52 wiz Exp $
-
---- configure.orig 2005-06-27 09:29:29.000000000 +0000
-+++ configure
-@@ -27521,78 +27521,6 @@ echo "$as_me: WARNING: libFLAC missing"
- have_libFLAC=no
- fi
-
-- echo "$as_me:$LINENO: checking for OggFLAC__stream_decoder_new in -lOggFLAC" >&5
--echo $ECHO_N "checking for OggFLAC__stream_decoder_new in -lOggFLAC... $ECHO_C" >&6
--if test "${ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_new+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lOggFLAC $FLAC_LIBS $OGG_LIBS
-- $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char OggFLAC__stream_decoder_new ();
--int
--main ()
--{
--OggFLAC__stream_decoder_new ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_new=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_new=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_new" >&5
--echo "${ECHO_T}$ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_new" >&6
--if test $ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_new = yes; then
-- FLAC_LIBS="-lOggFLAC $FLAC_LIBS $OGG_LIBS"
--else
-- { echo "$as_me:$LINENO: WARNING: libOggFLAC missing" >&5
--echo "$as_me: WARNING: libOggFLAC missing" >&2;}
-- have_libFLAC=no
--fi
--
- echo "$as_me:$LINENO: checking for FLAC/stream_decoder.h" >&5
- echo $ECHO_N "checking for FLAC/stream_decoder.h... $ECHO_C" >&6
- if test "${ac_cv_header_FLAC_stream_decoder_h+set}" = set; then
diff --git a/audio/vorbis-tools/patches/patch-ao b/audio/vorbis-tools/patches/patch-ao
deleted file mode 100644
index c214aff9031..00000000000
--- a/audio/vorbis-tools/patches/patch-ao
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2007/01/13 15:35:52 wiz Exp $
-
---- ogg123/Makefile.in.orig 2005-06-27 09:29:11.000000000 +0000
-+++ ogg123/Makefile.in
-@@ -63,8 +63,8 @@ am__ogg123_SOURCES_DIST = audio.c buffer
- format.h ogg123.h playlist.h status.h transport.h \
- vorbis_comments.h flac_format.c easyflac.c easyflac.h \
- speex_format.c
--@HAVE_LIBFLAC_TRUE@am__objects_1 = flac_format.$(OBJEXT) \
--@HAVE_LIBFLAC_TRUE@ easyflac.$(OBJEXT)
-+@HAVE_LIBFLAC_TRUE@am__objects_1 = \
-+@HAVE_LIBFLAC_TRUE@ flac_format.$(OBJEXT)
- @HAVE_LIBSPEEX_TRUE@am__objects_2 = speex_format.$(OBJEXT)
- am_ogg123_OBJECTS = audio.$(OBJEXT) buffer.$(OBJEXT) \
- callbacks.$(OBJEXT) cfgfile_options.$(OBJEXT) \
diff --git a/audio/vorbis-tools/patches/patch-ap b/audio/vorbis-tools/patches/patch-ap
deleted file mode 100644
index c4faf2d0e93..00000000000
--- a/audio/vorbis-tools/patches/patch-ap
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2007/01/13 15:35:52 wiz Exp $
-
---- oggenc/Makefile.am.orig 2005-06-13 13:11:44.000000000 +0000
-+++ oggenc/Makefile.am
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- if HAVE_LIBFLAC
--flac_sources = flac.c flac.h easyflac.c easyflac.h
-+flac_sources = flac.c flac.h
- else
- flac_sources =
- endif
diff --git a/audio/vorbis-tools/patches/patch-aq b/audio/vorbis-tools/patches/patch-aq
deleted file mode 100644
index f748cf261f2..00000000000
--- a/audio/vorbis-tools/patches/patch-aq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2007/01/13 15:35:52 wiz Exp $
-
---- oggenc/Makefile.in.orig 2005-06-27 09:29:13.000000000 +0000
-+++ oggenc/Makefile.in
-@@ -56,7 +56,7 @@ PROGRAMS = $(bin_PROGRAMS)
- am__oggenc_SOURCES_DIST = flac.c flac.h easyflac.c easyflac.h oggenc.c \
- audio.c encode.c platform.c audio.h encode.h platform.h \
- resample.c resample.h
--@HAVE_LIBFLAC_TRUE@am__objects_1 = flac.$(OBJEXT) easyflac.$(OBJEXT)
-+@HAVE_LIBFLAC_TRUE@am__objects_1 = flac.$(OBJEXT)
- am_oggenc_OBJECTS = $(am__objects_1) oggenc.$(OBJEXT) audio.$(OBJEXT) \
- encode.$(OBJEXT) platform.$(OBJEXT) resample.$(OBJEXT)
- oggenc_OBJECTS = $(am_oggenc_OBJECTS)
diff --git a/audio/vorbisgain/DESCR b/audio/vorbisgain/DESCR
deleted file mode 100644
index 8d7506b1419..00000000000
--- a/audio/vorbisgain/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Vorbisgain calculates a perceived sound level of an Ogg Vorbis file using the
-ReplayGain algorithm. VorbisGain then stores in the comments (tags) in the
-file a suggestion on how the volume should be changed during playback, to get
-a uniform sound level.
diff --git a/audio/vorbisgain/Makefile b/audio/vorbisgain/Makefile
deleted file mode 100644
index b3a7bebf414..00000000000
--- a/audio/vorbisgain/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:08:14 joerg Exp $
-
-DISTNAME= vorbisgain-0.37
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= http://sjeng.org/ftp/vorbis/
-
-MAINTAINER= rpaulo@NetBSD.org
-HOMEPAGE= http://sjeng.org/vorbisgain.html
-COMMENT= ReplayGain technology for Vorbis
-
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
-
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/vorbisgain/PLIST b/audio/vorbisgain/PLIST
deleted file mode 100644
index 2052a882513..00000000000
--- a/audio/vorbisgain/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/08/22 13:48:43 rpaulo Exp $
-bin/vorbisgain
-man/man1/vorbisgain.1
diff --git a/audio/vorbisgain/distinfo b/audio/vorbisgain/distinfo
deleted file mode 100644
index da55c78d32f..00000000000
--- a/audio/vorbisgain/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/08/22 13:48:43 rpaulo Exp $
-
-SHA1 (vorbisgain-0.37.tar.gz) = bd79764a83a8ee327df85c538ec798a6d3f240be
-RMD160 (vorbisgain-0.37.tar.gz) = 01de9516a7571c2ecdb3e4645c6c8e7ba8ce80cc
-Size (vorbisgain-0.37.tar.gz) = 208977 bytes
diff --git a/audio/wavesurfer/DESCR b/audio/wavesurfer/DESCR
deleted file mode 100644
index a7069600d4f..00000000000
--- a/audio/wavesurfer/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-WaveSurfer is an Open Source tool for sound visualization and
-manipulation. It has been designed to suit both novice and advanced
-users. WaveSurfer has a simple and logical user interface that
-provides functionality in an intuitive way and which can be adapted to
-different tasks. It can be used as a stand-alone tool for a wide range
-of tasks in speech research and education. Typical applications are
-speech/sound analysis and sound annotation/transcription. WaveSurfer
-can also serve as a platform for more advanced/specialized
-applications. This is accomplished either through extending the
-WaveSurfer application with new custom plug-ins or by embedding
-WaveSurfer visualization components in other applications.
diff --git a/audio/wavesurfer/Makefile b/audio/wavesurfer/Makefile
deleted file mode 100644
index 8a2710f1494..00000000000
--- a/audio/wavesurfer/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2007/02/22 19:01:14 wiz Exp $
-
-DISTNAME= wavesurfer-1.7.4
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= http://www.speech.kth.se/wavesurfer/
-
-MAINTAINER= gson@NetBSD.org
-HOMEPAGE= http://www.speech.kth.se/wavesurfer/
-COMMENT= Tool for sound visualization and manipulation
-
-DEPENDS+= tcl-snack-[0-9]*:../../audio/tcl-snack
-DEPENDS+= tk-[0-9]*:../../x11/tk
-
-NO_CONFIGURE= yes
-NO_BUILD= yes
-USE_LANGUAGES= # empty
-
-SUBST_CLASSES+= wish
-SUBST_MESSAGE.wish= Fixing hardcoded command names.
-SUBST_STAGE.wish= post-patch
-SUBST_FILES.wish= wavesurfer.tcl
-SUBST_SED.wish= -e 's,wish8.4,wish,g'
-
-INSTALLATION_DIRS= bin lib
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/wavesurfer.tcl ${PREFIX}/bin/wavesurfer
- cd ${WRKSRC} && pax -wr -pm wsurf1.7 ${PREFIX}/lib/
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/wavesurfer/PLIST b/audio/wavesurfer/PLIST
deleted file mode 100644
index 9c72fcb7478..00000000000
--- a/audio/wavesurfer/PLIST
+++ /dev/null
@@ -1,38 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2004/11/27 10:52:06 gson Exp $
-bin/wavesurfer
-lib/wsurf1.7/cmdline.tcl
-lib/wsurf1.7/combobox.tcl
-lib/wsurf1.7/configurations/Demonstration.conf
-lib/wsurf1.7/configurations/HTK transcription.conf
-lib/wsurf1.7/configurations/IPA transcription.conf
-lib/wsurf1.7/configurations/Spectrogram.conf
-lib/wsurf1.7/configurations/Speech analysis.conf
-lib/wsurf1.7/configurations/TIMIT phones-words.conf
-lib/wsurf1.7/configurations/TIMIT transcription.conf
-lib/wsurf1.7/configurations/Transcription.conf
-lib/wsurf1.7/configurations/WAVES transcription.conf
-lib/wsurf1.7/configurations/Waveform.conf
-lib/wsurf1.7/configurations/n-waveforms.conf
-lib/wsurf1.7/htmllib.tcl
-lib/wsurf1.7/messagebar.tcl
-lib/wsurf1.7/notebook.tcl
-lib/wsurf1.7/pkgIndex.tcl
-lib/wsurf1.7/plugins/analysis.plug
-lib/wsurf1.7/plugins/dataplot.plug
-lib/wsurf1.7/plugins/timeaxis.plug
-lib/wsurf1.7/plugins/transcription.plug
-lib/wsurf1.7/plugins/transcription_format_htk.plug
-lib/wsurf1.7/plugins/transcription_format_isis.plug
-lib/wsurf1.7/plugins/transcription_format_phondat.plug
-lib/wsurf1.7/plugins/transcription_format_timit.plug
-lib/wsurf1.7/plugins/transcription_format_waves.plug
-lib/wsurf1.7/plugins/transcription_format_ws.plug
-lib/wsurf1.7/resizer.tcl
-lib/wsurf1.7/surfutil.tcl
-lib/wsurf1.7/tkcon.tcl
-lib/wsurf1.7/vtcanvas.tcl
-lib/wsurf1.7/wavebar.tcl
-lib/wsurf1.7/wsurf.tcl
-@dirrm lib/wsurf1.7/plugins
-@dirrm lib/wsurf1.7/configurations
-@dirrm lib/wsurf1.7
diff --git a/audio/wavesurfer/distinfo b/audio/wavesurfer/distinfo
deleted file mode 100644
index d7d4d262528..00000000000
--- a/audio/wavesurfer/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 20:39:53 agc Exp $
-
-SHA1 (wavesurfer-1.7.4.tar.gz) = 3c6c138f6346f75b9ec97c089cec91b6c2ed0b2f
-RMD160 (wavesurfer-1.7.4.tar.gz) = 04bda7c474501769ea2214a4fd4283f65036747b
-Size (wavesurfer-1.7.4.tar.gz) = 275598 bytes
diff --git a/audio/wavpack/DESCR b/audio/wavpack/DESCR
deleted file mode 100644
index 7dabc39d03c..00000000000
--- a/audio/wavpack/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-WavPack is a completely open audio compression format providing lossless,
-high-quality lossy, and a unique hybrid compression mode.
-The compression ratio depends on the source material, but generally is
-between 30% and 70%.
-
-The hybrid mode provides all the advantages of lossless compression with
-an additional bonus. Instead of creating a single file, this mode creates
-both a relatively small, high-quality lossy file that can be used all by
-itself, and a "correction" file that (when combined with the lossy file)
-provides full lossless restoration. For some users this means never having
-to choose between lossless and lossy compression.
diff --git a/audio/wavpack/Makefile b/audio/wavpack/Makefile
deleted file mode 100644
index 2fbb15bacff..00000000000
--- a/audio/wavpack/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/02/01 16:52:28 drochner Exp $
-
-DISTNAME= wavpack-4.40.0
-CATEGORIES= audio
-MASTER_SITES= http://www.wavpack.com/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= tnn+nbsd@nygren.pp.se
-HOMEPAGE= http://www.wavpack.com/
-COMMENT= Audio codec for lossless, lossy and hybrid compression
-
-GNU_CONFIGURE= YES
-PKGCONFIG_OVERRIDE= wavpack.pc.in
-USE_LIBTOOL= YES
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/wavpack/PLIST b/audio/wavpack/PLIST
deleted file mode 100644
index 464d7f49232..00000000000
--- a/audio/wavpack/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/02/01 16:52:28 drochner Exp $
-bin/wavpack
-bin/wvgain
-bin/wvunpack
-include/wavpack/wavpack.h
-lib/libwavpack.la
-lib/pkgconfig/wavpack.pc
-@dirrm include/wavpack
diff --git a/audio/wavpack/buildlink3.mk b/audio/wavpack/buildlink3.mk
deleted file mode 100644
index e9cd98026b8..00000000000
--- a/audio/wavpack/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/02/01 16:52:28 drochner Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-WAVPACK_BUILDLINK3_MK:= ${WAVPACK_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= wavpack
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwavpack}
-BUILDLINK_PACKAGES+= wavpack
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wavpack
-
-.if ${WAVPACK_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.wavpack+= wavpack>=4.40.0
-BUILDLINK_PKGSRCDIR.wavpack?= ../../audio/wavpack
-.endif # WAVPACK_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/wavpack/distinfo b/audio/wavpack/distinfo
deleted file mode 100644
index 61b4d9025b2..00000000000
--- a/audio/wavpack/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/02/01 16:52:28 drochner Exp $
-
-SHA1 (wavpack-4.40.0.tar.bz2) = dc679e8c06fcf19f25c944b95a0afe4cf7d6f5fd
-RMD160 (wavpack-4.40.0.tar.bz2) = a9bb0bd6611e411f0e82c1e03c950c8bb14f01de
-Size (wavpack-4.40.0.tar.bz2) = 320445 bytes
diff --git a/audio/wmmixer/DESCR b/audio/wmmixer/DESCR
deleted file mode 100644
index 9d5fc7538d7..00000000000
--- a/audio/wmmixer/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-You can access all the channels on your soundcard's mixer with wmmixer. Most
-common channels are identified with an appropriate icon.
-Controls include a stereo (mono where appropriate) volume control and a
-recording source toggle button.
-
-Press the "<" and ">" arrow buttons to select a channel.
-The icon identifies the current channel (a volume symbol with a question mark
-represents an unrecognised channel).
-Click and/or drag the volume display to set channel volume.
-There is a also a button to set recording sources.
diff --git a/audio/wmmixer/Makefile b/audio/wmmixer/Makefile
deleted file mode 100644
index a18ef8fed2f..00000000000
--- a/audio/wmmixer/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:35 joerg Exp $
-#
-
-DISTNAME= wmmixer-1.0-beta1
-PKGNAME= wmmixer-1.0
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= http://www.geocities.com/SiliconValley/Vista/2471/files/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= pr@alles.prima.de
-HOMEPAGE= http://www.geocities.com/SiliconValley/Vista/2471/
-COMMENT= Mixer designed for WindowMaker (dockapp)
-
-NOT_FOR_PLATFORM= Interix-*-*
-
-WRKSRC= ${WRKDIR}/wmmixer
-USE_IMAKE= YES
-USE_LANGUAGES= c c++
-NO_INSTALL_MANPAGES= YES
-
-pre-build:
- ${TOUCH} ${WRKSRC}/wmmixer.man
-
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/wmmixer/PLIST b/audio/wmmixer/PLIST
deleted file mode 100644
index 8a402b9e486..00000000000
--- a/audio/wmmixer/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:18:09 zuntum Exp $
-bin/wmmixer
diff --git a/audio/wmmixer/distinfo b/audio/wmmixer/distinfo
deleted file mode 100644
index 96a1e6cf4ef..00000000000
--- a/audio/wmmixer/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/12/11 20:52:34 joerg Exp $
-
-SHA1 (wmmixer-1.0-beta1.tgz) = b8695455e1a7364aa337feb924f059db9a5856fe
-RMD160 (wmmixer-1.0-beta1.tgz) = 5edea21f2154ebce018b7c34d9f05892acab16d4
-Size (wmmixer-1.0-beta1.tgz) = 18801 bytes
-SHA1 (patch-aa) = 4ee2ac096da6ee07a5e917242a6066c842dfa4d4
-SHA1 (patch-ab) = 7fd4f67cd2bf121fd33d6cbefc1067172644da14
-SHA1 (patch-ac) = 05278709a52394e8f573e54bfcc77e7eacd40168
diff --git a/audio/wmmixer/patches/patch-aa b/audio/wmmixer/patches/patch-aa
deleted file mode 100644
index 921c05e1705..00000000000
--- a/audio/wmmixer/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2003/09/28 14:52:55 tron Exp $
-
---- wmmixer.cc.orig 1998-09-05 17:11:33.000000000 +0200
-+++ wmmixer.cc 2003-09-28 16:45:37.000000000 +0200
-@@ -503,7 +503,7 @@
- }
- }
-
--void checkVol(bool forced=true){
-+void checkVol(bool forced){
- mixctl->readVol(channel[curchannel], true);
- int nl=mixctl->readLeft(channel[curchannel]);
- int nr=mixctl->readRight(channel[curchannel]);
diff --git a/audio/wmmixer/patches/patch-ab b/audio/wmmixer/patches/patch-ab
deleted file mode 100644
index 1ecc72f341c..00000000000
--- a/audio/wmmixer/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/10/18 13:20:32 cjep Exp $
---- Imakefile.orig 1998-09-05 17:11:33.000000000 +0200
-+++ Imakefile 2003-09-28 16:50:51.000000000 +0200
-@@ -7,7 +7,4 @@
- DEPLIBS = $(DEPXLIB)
- LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) $(OSSAUDIO)
-
--SRCS = wmmixer.cc
--OBJS = wmmixer.o
--
--ComplexProgramTarget(wmmixer)
-+SimpleCplusplusProgramTarget(wmmixer)
diff --git a/audio/wmmixer/patches/patch-ac b/audio/wmmixer/patches/patch-ac
deleted file mode 100644
index c32cdf2b61d..00000000000
--- a/audio/wmmixer/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/12/11 20:52:34 joerg Exp $
-
---- mixctl.h.orig 2005-12-11 20:47:51.000000000 +0000
-+++ mixctl.h
-@@ -18,7 +18,7 @@
- #ifdef __NetBSD__
- #include <soundcard.h>
- #endif
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #include <machine/soundcard.h>
- #endif
- #ifdef __linux__
diff --git a/audio/wmmp/DESCR b/audio/wmmp/DESCR
deleted file mode 100644
index 711aa9aa3a5..00000000000
--- a/audio/wmmp/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-A little app in the style of wmusic and wmapmload/wmcpuload. It represents
-a fairly complete interface to MPD.
diff --git a/audio/wmmp/Makefile b/audio/wmmp/Makefile
deleted file mode 100644
index 55dba1ff9c6..00000000000
--- a/audio/wmmp/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2007/02/22 19:26:08 wiz Exp $
-
-DISTNAME= WMmp-0.10.0
-CATEGORIES= audio
-MASTER_SITES= http://mercury.chem.pitt.edu/~shank/
-
-MAINTAINER= rpaulo@NetBSD.org
-HOMEPAGE= http://musicpd.org/WMmp.shtml
-COMMENT= Window Maker dock app for interfacing MPD
-
-USE_TOOLS+= gmake
-GNU_CONFIGURE= yes
-
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/wmmp/PLIST b/audio/wmmp/PLIST
deleted file mode 100644
index a71006f44f5..00000000000
--- a/audio/wmmp/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/02/23 23:34:29 rpaulo Exp $
-bin/WMmp
-man/man1/WMmp.1
diff --git a/audio/wmmp/distinfo b/audio/wmmp/distinfo
deleted file mode 100644
index 80a7e2b6602..00000000000
--- a/audio/wmmp/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/03/22 21:13:42 rpaulo Exp $
-
-SHA1 (WMmp-0.10.0.tar.gz) = 588d6e3c228adb6a8f41b6b1fb4ff90335942f77
-RMD160 (WMmp-0.10.0.tar.gz) = 771e69b3f6caac06698dbad37e11ddf08391b8e4
-Size (WMmp-0.10.0.tar.gz) = 228560 bytes
-SHA1 (patch-aa) = 0f84a36c72013eb3a2bd1b822f2f3f6049f11df2
-SHA1 (patch-ab) = bf480efaf6cf92f7b554c871e0ab0a9ae9746690
diff --git a/audio/wmmp/patches/patch-aa b/audio/wmmp/patches/patch-aa
deleted file mode 100644
index c2eb54c2092..00000000000
--- a/audio/wmmp/patches/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/03/17 23:24:28 minskim Exp $
-
---- configure.orig 2004-03-02 04:51:17.000000000 -0800
-+++ configure
-@@ -10007,6 +10007,9 @@ linux*)
- ignore_buffers=yes
- ignore_cached=yes
- ;;
-+dragonfly*)
-+ OS=dragonfly
-+ ;;
- freebsd*)
- OS=freebsd
- ignore_wired=yes
-@@ -10020,6 +10023,12 @@ openbsd*)
- solaris*)
- OS=solaris
- ;;
-+netbsd*)
-+ OS=netbsd
-+ ;;
-+darwin*)
-+ OS=darwin
-+ ;;
- *)
- echo ""
- echo "Sorry, ${host_os} is not supported yet"
diff --git a/audio/wmmp/patches/patch-ab b/audio/wmmp/patches/patch-ab
deleted file mode 100644
index 8b5ebe21f6a..00000000000
--- a/audio/wmmp/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/02/23 23:34:29 rpaulo Exp $
-
---- src/Makefile.in 2004-03-02 12:51:16.000000000 +0000
-+++ src/Makefile.in.new 2006-02-23 23:28:30.000000000 +0000
-@@ -71,7 +71,6 @@ INSTALL_PROGRAM = \
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-
--LDFLAGS =
- LIBOBJS = @LIBOBJS@
- LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@
- LIBS = @LIBS@
diff --git a/audio/wmmp3/DESCR b/audio/wmmp3/DESCR
deleted file mode 100644
index acfb417b7bf..00000000000
--- a/audio/wmmp3/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-wmmp3 is an mpg123 frontend. It is a small X application that will also
-work as a windowmaker dock app.
-
-All user options are contained in a config file, ~/.wmmp3 . There is a
-sample.wmmp3 file in the distribution that can be used as an
-example/template.
diff --git a/audio/wmmp3/Makefile b/audio/wmmp3/Makefile
deleted file mode 100644
index c098a1ed2fe..00000000000
--- a/audio/wmmp3/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2007/02/22 19:26:08 wiz Exp $
-
-DISTNAME= wmmp3-0.12
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= http://www.dotfiles.com/software/wmmp3/
-
-MAINTAINER= rxg@NetBSD.org
-# HOMEPAGE= http://www.dotfiles.com/software/wmmp3/
-COMMENT= Front-end for mpg123 in a Window Maker dockapp
-
-DEPENDS+= mpg123>=0.59.18:../../audio/mpg123
-
-GNU_CONFIGURE= yes
-
-post-patch:
- ${MV} ${WRKSRC}/sample.wmmp3 ${WRKSRC}/sample.wmmp3.orig
- ${SED} -e 's:/usr/local:'${LOCALBASE}':g' \
- ${WRKSRC}/sample.wmmp3.orig > ${WRKSRC}/sample.wmmp3
-
-post-install:
- @${ECHO} "===> Installing sample.wmmp3 in ${PREFIX}/share/examples"
- ${INSTALL_DATA} ${WRKSRC}/sample.wmmp3 ${PREFIX}/share/examples
-
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/wmmp3/PLIST b/audio/wmmp3/PLIST
deleted file mode 100644
index 9ddbd47349a..00000000000
--- a/audio/wmmp3/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/13 09:42:44 rh Exp $
-bin/wmmp3
-share/examples/sample.wmmp3
diff --git a/audio/wmmp3/distinfo b/audio/wmmp3/distinfo
deleted file mode 100644
index 64097b6f0f2..00000000000
--- a/audio/wmmp3/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:53 agc Exp $
-
-SHA1 (wmmp3-0.12.tar.gz) = 439e19550c58fe31db8c1bcf2985c56f62d7bc1f
-RMD160 (wmmp3-0.12.tar.gz) = 14fe7a9725449d179e09912e1dc6e34a37c0222b
-Size (wmmp3-0.12.tar.gz) = 43977 bytes
diff --git a/audio/wmsmixer/DESCR b/audio/wmsmixer/DESCR
deleted file mode 100644
index 90fae2baf0e..00000000000
--- a/audio/wmsmixer/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-WMsmixer is a hack to wmmixer which makes some changes to the
-display and adds a few new features, most notably scrollwheel
-support. It also includes a numeric volume indicator.
diff --git a/audio/wmsmixer/Makefile b/audio/wmsmixer/Makefile
deleted file mode 100644
index 54b6831b72b..00000000000
--- a/audio/wmsmixer/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:35 joerg Exp $
-#
-
-DISTNAME= wmsmixer-0.5.1
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= http://www.hibernaculum.net/download/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.hibernaculum.net/wmsmixer/
-COMMENT= Another mixer designed for WindowMaker (dockapp)
-
-NOT_FOR_PLATFORM= Interix-*-*
-
-USE_IMAKE= YES
-USE_LANGUAGES= c++
-NO_INSTALL_MANPAGES= YES
-
-pre-build:
- ${TOUCH} ${WRKSRC}/wmsmixer.man
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmsmixer
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/wmsmixer
- ${INSTALL_DATA} ${WRKSRC}/home.wmsmixer \
- ${PREFIX}/share/examples/wmsmixer
- ${INSTALL_DATA} ${WRKSRC}/README.wmmixer \
- ${PREFIX}/share/doc/wmsmixer/README.wmsmixer
-
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/wmsmixer/PLIST b/audio/wmsmixer/PLIST
deleted file mode 100644
index b3bc87c7993..00000000000
--- a/audio/wmsmixer/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/21 15:33:55 agc Exp $
-bin/wmsmixer
-share/examples/wmsmixer/home.wmsmixer
-share/doc/wmsmixer/README.wmsmixer
-@dirrm share/examples/wmsmixer
-@dirrm share/doc/wmsmixer
diff --git a/audio/wmsmixer/distinfo b/audio/wmsmixer/distinfo
deleted file mode 100644
index da9877360d8..00000000000
--- a/audio/wmsmixer/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/12/11 20:51:07 joerg Exp $
-
-SHA1 (wmsmixer-0.5.1.tar.gz) = 32473bf99b7c0dfa4a2b7d0d850288354aebde58
-RMD160 (wmsmixer-0.5.1.tar.gz) = 2f8ab0bf8571b9ea1e111f5e22c3df8ea017dec7
-Size (wmsmixer-0.5.1.tar.gz) = 33350 bytes
-SHA1 (patch-aa) = 0db2abe3d917778545e420fe61e4cefce03ce0c6
-SHA1 (patch-ab) = 78ede51033648a4a79d884ebb3d5c6b0b5e9ba86
diff --git a/audio/wmsmixer/patches/patch-aa b/audio/wmsmixer/patches/patch-aa
deleted file mode 100644
index 417bd7c14a2..00000000000
--- a/audio/wmsmixer/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/05/24 10:27:26 kristerw Exp $
-
---- Imakefile.orig 2004-05-24 12:19:53.000000000 +0200
-+++ Imakefile 2004-05-24 12:23:06.000000000 +0200
-@@ -6,8 +6,7 @@
-
- DEPLIBS = $(DEPXLIB)
- LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) $(OSSAUDIO)
--CC = c++ -m32
--LD = c++ -m32 -nostdlib
-+CCLINK = $(CXXLINK)
-
- SRCS = wmsmixer.cc
- OBJS = wmsmixer.o
diff --git a/audio/wmsmixer/patches/patch-ab b/audio/wmsmixer/patches/patch-ab
deleted file mode 100644
index d743287caa5..00000000000
--- a/audio/wmsmixer/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/12/11 20:51:07 joerg Exp $
-
---- mixctl.h.orig 2005-12-11 20:44:55.000000000 +0000
-+++ mixctl.h
-@@ -18,7 +18,7 @@
- #ifdef __NetBSD__
- #include <soundcard.h>
- #endif
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #include <machine/soundcard.h>
- #endif
- #ifdef __linux__
diff --git a/audio/wmusic/DESCR b/audio/wmusic/DESCR
deleted file mode 100644
index dabb0350db0..00000000000
--- a/audio/wmusic/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-wmusic is a dockapp that remote-controls XMMS. Features include
-VCR-style controls, Time and Playlist display, supa style rotating
-arrow, hiding of the xmms windows and reactive interface.
diff --git a/audio/wmusic/Makefile b/audio/wmusic/Makefile
deleted file mode 100644
index 3a63d3742bb..00000000000
--- a/audio/wmusic/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2007/01/15 16:36:47 joerg Exp $
-
-DISTNAME= wmusic-1.5.0
-PKGREVISION= 2
-CATEGORIES= audio windowmaker
-MASTER_SITES= http://home.jtan.com/~john/wmusic/
-
-MAINTAINER= joel@carnat.net
-HOMEPAGE= http://home.jtan.com/~john/wmusic/
-COMMENT= WindowMaker dockable remote for XMMS
-
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
-
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/src/wmusic ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmusic
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wmusic
- ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/wmusic
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/wmusic/PLIST b/audio/wmusic/PLIST
deleted file mode 100644
index fe2be393d57..00000000000
--- a/audio/wmusic/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/03/07 23:47:06 snj Exp $
-bin/wmusic
-share/doc/wmusic/COPYING
-share/doc/wmusic/README
-@dirrm share/doc/wmusic
diff --git a/audio/wmusic/distinfo b/audio/wmusic/distinfo
deleted file mode 100644
index 156636cee6f..00000000000
--- a/audio/wmusic/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:53 agc Exp $
-
-SHA1 (wmusic-1.5.0.tar.gz) = 7cbf62e23b200a7e07ea458034144f44cfae256a
-RMD160 (wmusic-1.5.0.tar.gz) = 282d31623e1c3e612444cf8276005327f92cc557
-Size (wmusic-1.5.0.tar.gz) = 46276 bytes
-SHA1 (patch-aa) = 3c23078841f0c7dffde427050ac1cfcfa67f53cd
diff --git a/audio/wmusic/patches/patch-aa b/audio/wmusic/patches/patch-aa
deleted file mode 100644
index c548eccf9bb..00000000000
--- a/audio/wmusic/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/09/01 15:00:59 reed Exp $
---- src/Makefile.in.orig 2004-02-27 03:53:10.000000000 +0100
-+++ src/Makefile.in 2004-08-31 21:18:09.000000000 +0200
-@@ -10,8 +10,8 @@
- OBJS = $(SRCS:.c=.o)
-
--CFLAGS = -Wall -g -O2 -I. -I../libdockapp `@PATH_GTKCONFIG@ --cflags` \
-+CFLAGS += -Wall -g -O2 -I. -I../libdockapp `@PATH_GTKCONFIG@ --cflags` \
- `@PATH_XMMSCONFIG@ --cflags` \
- -DDATA_DIR=\"`@PATH_XMMSCONFIG@ --data-dir`\"
--LDFLAGS = @LIBS@ -lXpm `@PATH_GTKCONFIG@ --libs` `@PATH_XMMSCONFIG@ --libs` \
-+LDFLAGS += @LIBS@ -lXpm `@PATH_GTKCONFIG@ --libs` `@PATH_XMMSCONFIG@ --libs` \
- @DGA_LIBS@ @VM_LIBS@
-
diff --git a/audio/wsoundprefs/DESCR b/audio/wsoundprefs/DESCR
deleted file mode 100644
index 9a165e58a76..00000000000
--- a/audio/wsoundprefs/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-WSoundPrefs is a configuration utility for the Window Maker Sound Server.
-It's based on Alfredo K. Kojima's WPrefs.
diff --git a/audio/wsoundprefs/Makefile b/audio/wsoundprefs/Makefile
deleted file mode 100644
index 8e6503d3fc9..00000000000
--- a/audio/wsoundprefs/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.30 2007/02/06 12:45:02 joerg Exp $
-
-DISTNAME= WSoundPrefs-1.1.1
-PKGNAME= wsoundprefs-1.1.1
-PKGREVISION= 7
-CATEGORIES= audio wm windowmaker
-MASTER_SITES= ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://shadowmere.student.utwente.nl/
-COMMENT= WSoundServer configuration utility
-
-USE_IMAKE= yes
-BROKEN_GETTEXT_DETECTION= yes
-
-.include "../../audio/wsoundserver/buildlink3.mk"
-.include "../../wm/windowmaker/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/wsoundprefs/PLIST b/audio/wsoundprefs/PLIST
deleted file mode 100644
index 70588a68b1f..00000000000
--- a/audio/wsoundprefs/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:18:10 zuntum Exp $
-GNUstep/Apps/WSoundPrefs.app/WSoundPrefs
-GNUstep/Apps/WSoundPrefs.app/WSoundPrefs.tiff
-GNUstep/Apps/WSoundPrefs.app/WSoundPrefs.xpm
-GNUstep/Apps/WSoundPrefs.app/tiff/loadset.tiff
-GNUstep/Apps/WSoundPrefs.app/tiff/saveset.tiff
-GNUstep/Apps/WSoundPrefs.app/xpm/loadset.xpm
-GNUstep/Apps/WSoundPrefs.app/xpm/saveset.xpm
-@dirrm GNUstep/Apps/WSoundPrefs.app/tiff
-@dirrm GNUstep/Apps/WSoundPrefs.app/xpm
-@dirrm GNUstep/Apps/WSoundPrefs.app
diff --git a/audio/wsoundprefs/distinfo b/audio/wsoundprefs/distinfo
deleted file mode 100644
index 4ed08098ed2..00000000000
--- a/audio/wsoundprefs/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 20:39:53 agc Exp $
-
-SHA1 (WSoundPrefs-1.1.1.tar.gz) = 444571543e7a076cc49ee484dbcfd0aefc184316
-RMD160 (WSoundPrefs-1.1.1.tar.gz) = c9793dd9c6b100f9de3fa9b2771c684ac890016e
-Size (WSoundPrefs-1.1.1.tar.gz) = 32042 bytes
-SHA1 (patch-aa) = 8ae650bc0a79ee02dbbefc5519eff735a02a722b
-SHA1 (patch-ab) = 8daeb7657ba5518d730ec88ff73da5a577fd5710
-SHA1 (patch-ac) = 592155f98fa0b51690e766eb75bde69531313533
-SHA1 (patch-ad) = 5d37585aea3950f2d01d66333cbd6fd59d3a42c8
-SHA1 (patch-ae) = 675b6b8039016f99b7bdb744eb01747f5f5f8c31
-SHA1 (patch-af) = 9b60b779af703075058f8a88669cae70a5eecddb
-SHA1 (patch-ag) = ec0c1a3c2223b9728fa69f85547cce6b12177c06
diff --git a/audio/wsoundprefs/patches/patch-aa b/audio/wsoundprefs/patches/patch-aa
deleted file mode 100644
index 67520551a16..00000000000
--- a/audio/wsoundprefs/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2001/03/12 21:19:10 wiz Exp $
-
---- Imakefile.orig Fri Mar 31 16:16:47 2000
-+++ Imakefile
-@@ -6,15 +6,16 @@
- XCOMM Installation Path: $(PREFIX)/Apps/WSoundPrefs.app
- XCOMM -------------------------------------------------
- XCOMM PREFIX = /usr/GNUstep/Local
--PREFIX = /usr/local/GNUstep
-+XCOMM PREFIX = /usr/local/GNUstep
-
-
- XCOMM CDEBUGFLAGS = -Wall -ggdb -DDEBUG
--CDEBUGFLAGS ?= -O2 -m486
-+XCOMM CDEBUGFLAGS ?= -O2 -m486
-+CDEBUGFLAGS = -DPREFIX=\\\"$(PREFIX)\\\"
-
- SUBDIRS = src
-
--DESTDIR = $(PREFIX)
-+DESTDIR = $(PREFIX)/GNUstep
-
- MakeSubdirs($(SUBDIRS))
- DependSubdirs($(SUBDIRS))
diff --git a/audio/wsoundprefs/patches/patch-ab b/audio/wsoundprefs/patches/patch-ab
deleted file mode 100644
index 8446c456446..00000000000
--- a/audio/wsoundprefs/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2002/08/31 03:08:59 wiz Exp $
-
---- src/Imakefile.orig Mon Oct 18 01:35:58 1999
-+++ src/Imakefile
-@@ -30,7 +30,7 @@
- SRCS = PLFunctions.c SoundEvents.c SoundPaths.c SystemInfo.c WSoundPrefs.c main.c
- OBJS = PLFunctions.o SoundEvents.o SoundPaths.o SystemInfo.o WSoundPrefs.o main.o
-
--ComplexProgramTarget(WSoundPrefs)
-+ComplexProgramTargetNoMan(WSoundPrefs)
-
- InstallMultiple($(ICONS),$(BINDIR))
-
diff --git a/audio/wsoundprefs/patches/patch-ac b/audio/wsoundprefs/patches/patch-ac
deleted file mode 100644
index 0812144a406..00000000000
--- a/audio/wsoundprefs/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2001/03/12 21:19:10 wiz Exp $
-
---- src/SoundPaths.c.orig Mon Jun 14 09:28:21 1999
-+++ src/SoundPaths.c
-@@ -70,7 +70,7 @@
- if (array)
- wwarning(_("bad value in option SoundPath. Using default path list"));
- addPathToList(panel->sndL, -1, "~/GNUstep/Library/WindowMaker/Sounds");
-- addPathToList(panel->sndL, -1, "/usr/local/share/WindowMaker/Sounds");
-+ addPathToList(panel->sndL, -1, PREFIX "/share/WindowMaker/Sounds");
- } else {
- for (i=0; i<PLGetNumberOfElements(array); i++) {
- val = PLGetArrayElement(array, i);
-@@ -90,7 +90,7 @@
- if (array)
- wwarning(_("bad value in option SoundSetPath. Using default path list"));
- addPathToList(panel->sndsetL, -1, "~/GNUstep/Library/WindowMaker/SoundSets");
-- addPathToList(panel->sndsetL, -1, "/usr/local/share/WindowMaker/SoundSets");
-+ addPathToList(panel->sndsetL, -1, PREFIX "/share/WindowMaker/SoundSets");
- } else {
- for (i=0; i<PLGetNumberOfElements(array); i++) {
- val = PLGetArrayElement(array, i);
diff --git a/audio/wsoundprefs/patches/patch-ad b/audio/wsoundprefs/patches/patch-ad
deleted file mode 100644
index 4dc90cb3b9a..00000000000
--- a/audio/wsoundprefs/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2001/03/12 21:19:10 wiz Exp $
-
---- src/SystemInfo.c.orig Wed Jun 16 11:53:35 1999
-+++ src/SystemInfo.c
-@@ -32,8 +32,8 @@
- #include <sys/types.h>
- #include <sys/utsname.h>
- #include <pwd.h>
--#include <WINGs.h>
--#include <WUtil.h>
-+#include <WINGs/WINGs.h>
-+#include <WINGs/WUtil.h>
-
- #include "WSoundPrefs.h"
- #include "SystemInfo.h"
diff --git a/audio/wsoundprefs/patches/patch-ae b/audio/wsoundprefs/patches/patch-ae
deleted file mode 100644
index 895d4cd80dd..00000000000
--- a/audio/wsoundprefs/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2001/03/12 21:19:10 wiz Exp $
-
---- src/WSoundPrefs.h.orig Thu Nov 18 10:57:21 1999
-+++ src/WSoundPrefs.h
-@@ -42,8 +42,8 @@
-
- #include <wraster.h>
-
--#include <WINGs.h>
--#include <WUtil.h>
-+#include <WINGs/WINGs.h>
-+#include <WINGs/WUtil.h>
-
- #include <wsound.h>
-
diff --git a/audio/wsoundprefs/patches/patch-af b/audio/wsoundprefs/patches/patch-af
deleted file mode 100644
index 614ddb43299..00000000000
--- a/audio/wsoundprefs/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/11/25 13:14:02 adam Exp $
-
---- src/main.c.orig 2004-11-25 13:43:01.000000000 +0000
-+++ src/main.c
-@@ -109,7 +109,7 @@ main(int argc, char **argv)
- wwarning(_("could not load image file %s:%s"), path, RMessageForError(RErrorCode));
- else {
- icon = WMCreatePixmapFromRImage(scr, tmp, 0);
-- RDestroyImage(tmp);
-+ RReleaseImage(tmp);
- if (icon) {
- WMSetApplicationIconImage(scr, icon);
- WMReleasePixmap(icon);
diff --git a/audio/wsoundprefs/patches/patch-ag b/audio/wsoundprefs/patches/patch-ag
deleted file mode 100644
index e3c18fb476d..00000000000
--- a/audio/wsoundprefs/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2004/11/25 13:14:02 adam Exp $
-
---- src/WSoundPrefs.c.orig 2004-11-25 13:48:33.000000000 +0000
-+++ src/WSoundPrefs.c
-@@ -407,7 +407,7 @@ Initialize(WMScreen *scr)
- WMResizeWidget(panel->copyrightL, 448, 20);
- WMMoveWidget(panel->copyrightL, 8, 178);
- WMSetLabelTextAlignment(panel->copyrightL, WACenter);
-- font = WMCreateNormalFont(scr, "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*");
-+ font = WMCreateFont(scr, "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*");
- if (font)
- WMSetLabelText(panel->copyrightL, "Copyright \xa9 1999 The Az\xe5rg-r\xfbh");
- else {
diff --git a/audio/wsoundserver/DESCR b/audio/wsoundserver/DESCR
deleted file mode 100644
index 77c63470d85..00000000000
--- a/audio/wsoundserver/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-WSoundServer is a dockapp which interprets WindowMaker events (such as
-shading a window or minimizing an application) and plays a sound associated
-with that event. Since it's dockable, you can have it automatically launch
-on startup, or "kill" it off if it becomes too noisy.
-
-You can find a partial soundset for it at
-http://wm.current.nu/files/wmsdefault.tar.gz
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
deleted file mode 100644
index b6eb3f17694..00000000000
--- a/audio/wsoundserver/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-# $NetBSD: Makefile,v 1.34 2007/02/02 15:09:18 joerg Exp $
-#
-
-DISTNAME= WSoundServer-0.4.0
-PKGNAME= wsoundserver-0.4.0
-PKGREVISION= 8
-CATEGORIES= audio wm windowmaker
-MASTER_SITES= ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://shadowmere.student.utwente.nl/
-COMMENT= Sound server for windowmaker
-
-USE_X11BASE= YES
-GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
-
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} # not really needed
-PKG_SYSCONFSUBDIR= WindowMaker
-EGDIR= ${PREFIX}/share/examples/wsoundserver
-CONF_FILES= ${EGDIR:Q}/WMSound ${PKG_SYSCONFDIR:Q}/WMSound
-
-SUBST_CLASSES+= 1x
-SUBST_STAGE.1x= post-patch
-SUBST_MESSAGE.1x= Changing the man page category from 1x to 1.
-SUBST_FILES.1x= doc/*
-SUBST_SED.1x= -e s,1x,1,g
-
-post-patch:
- set -e; \
- cd ${WRKSRC:Q}/doc; \
- for f in get-wsound-flags getsoundset setsoundset wsoundplay \
- wsoundserver; do \
- g=`${ECHO} $$f | ${SED} "s/x$$//"`; \
- ${MV} "$$f".1x "$$f".1; \
- done
- ${SED} -e "s|@PREFIX@|${PREFIX}|g" \
- ${FILESDIR:Q}/WMSound > ${WRKSRC:Q}/WMSound
-
-post-install:
- ${INSTALL_DATA_DIR} ${EGDIR:Q}
- ${INSTALL_DATA} ${WRKSRC:Q}/WMSound ${EGDIR:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Interix"
-. include "../../audio/esound/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-esound
-.else
-. include "../../mk/oss.buildlink3.mk"
-.endif
-
-BUILDLINK_DEPMETHOD.libXt?= build
-
-.include "../../audio/libaudiofile/buildlink3.mk"
-.include "../../devel/libdockapp/buildlink3.mk"
-.include "../../devel/libproplist/buildlink3.mk"
-.include "../../wm/windowmaker/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/wsoundserver/PLIST b/audio/wsoundserver/PLIST
deleted file mode 100644
index 23bfa433051..00000000000
--- a/audio/wsoundserver/PLIST
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:17 jlam Exp $
-bin/get-wsound-flags
-bin/getsoundset
-bin/setsoundset
-bin/wsoundplay
-bin/wsoundserver
-include/wsound.h
-lib/libwsound.la
-man/man1/get-wsound-flags.1
-man/man1/getsoundset.1
-man/man1/setsoundset.1
-man/man1/wsoundplay.1
-man/man1/wsoundserver.1
-share/examples/wsoundserver/WMSound
-@dirrm share/examples/wsoundserver
diff --git a/audio/wsoundserver/buildlink3.mk b/audio/wsoundserver/buildlink3.mk
deleted file mode 100644
index 436dae90b8b..00000000000
--- a/audio/wsoundserver/buildlink3.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:37 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-WSOUNDSERVER_BUILDLINK3_MK:= ${WSOUNDSERVER_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= wsoundserver
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwsoundserver}
-BUILDLINK_PACKAGES+= wsoundserver
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wsoundserver
-
-.if !empty(WSOUNDSERVER_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.wsoundserver+= wsoundserver>=0.4.0nb4
-BUILDLINK_ABI_DEPENDS.wsoundserver+= wsoundserver>=0.4.0nb8
-BUILDLINK_PKGSRCDIR.wsoundserver?= ../../audio/wsoundserver
-.endif # WSOUNDSERVER_BUILDLINK3_MK
-
-.include "../../audio/libaudiofile/buildlink3.mk"
-.include "../../devel/libdockapp/buildlink3.mk"
-.include "../../devel/libproplist/buildlink3.mk"
-.include "../../wm/windowmaker/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/wsoundserver/distinfo b/audio/wsoundserver/distinfo
deleted file mode 100644
index f9b0ed3fd74..00000000000
--- a/audio/wsoundserver/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 20:39:53 agc Exp $
-
-SHA1 (WSoundServer-0.4.0.tar.gz) = b414025f0f19e66cd9146546ecf634564941b1e4
-RMD160 (WSoundServer-0.4.0.tar.gz) = ac58045fbe7f2c327b0c87514b06cb0941518b25
-Size (WSoundServer-0.4.0.tar.gz) = 147044 bytes
-SHA1 (patch-ac) = 8595912bdc913dae46c82bc3a59fc96318350982
-SHA1 (patch-ad) = 998cc4b2f87c4bce4d8c32e42aa9c06134633252
-SHA1 (patch-ae) = 3a008dc50f6e78070ceb78b1f564d7c94be2dfea
-SHA1 (patch-af) = 1ea20d0e00d19a2c23bb8e07cdf182e43db28ca8
diff --git a/audio/wsoundserver/files/WMSound b/audio/wsoundserver/files/WMSound
deleted file mode 100644
index c604556f195..00000000000
--- a/audio/wsoundserver/files/WMSound
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- SoundPath = (
- "~/GNUstep/Library/WindowMaker/Sounds",
- "@PREFIX@/share/WindowMaker/Sounds"
- );
- SoundSetPath = (
- "~/GNUstep/Library/WindowMaker/SoundSets",
- "@PREFIX@/share/WindowMaker/SoundSets"
- );
- Device = "/dev/audio";
- AppExit = appexit.wav;
- AppStart = appstart.wav;
- DeIconify = deiconify.wav;
- Dock = dock.wav;
- Hide = hide.wav;
- Iconify = iconify.wav;
- Kaboom = kaboom.wav;
- Maximize = maximize.wav;
- Shade = shade.wav;
- Shutdown = shutdown.wav;
- Startup = startup.wav;
- UnDock = undock.wav;
- UnHide = unhide.wav;
- UnMaximize = unmaximize.wav;
- UnShade = unshade.wav;
- UserDefined = replaceme.wav;
-}
diff --git a/audio/wsoundserver/patches/patch-ac b/audio/wsoundserver/patches/patch-ac
deleted file mode 100644
index 40a70bb48f9..00000000000
--- a/audio/wsoundserver/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2001/08/29 22:41:02 jlam Exp $
-
---- wslib/Makefile.in.orig Fri Mar 31 22:10:25 2000
-+++ wslib/Makefile.in
-@@ -227,7 +227,7 @@
- maintainer-clean-libtool:
-
- libwsound.la: $(libwsound_la_OBJECTS) $(libwsound_la_DEPENDENCIES)
-- $(LINK) -rpath $(libdir) $(libwsound_la_LDFLAGS) $(libwsound_la_OBJECTS) $(libwsound_la_LIBADD) $(LIBS)
-+ $(LINK) -rpath $(libdir) $(libwsound_la_LDFLAGS) $(libwsound_la_OBJECTS) $(libwsound_la_LIBADD) $(LIBS) ${LIBOSSAUDIO}
-
- mostlyclean-noinstPROGRAMS:
-
diff --git a/audio/wsoundserver/patches/patch-ad b/audio/wsoundserver/patches/patch-ad
deleted file mode 100644
index 33b12344616..00000000000
--- a/audio/wsoundserver/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/03/12 21:10:25 wiz Exp $
-
---- wslib/audio_voxware.c.orig Fri Mar 31 22:14:40 2000
-+++ wslib/audio_voxware.c
-@@ -106,7 +106,7 @@
- {
- assert(audiofd > 0);
-
-- if (ioctl(audiofd, SNDCTL_DSP_RESET) == -1) {
-+ if (ioctl(audiofd, SNDCTL_DSP_RESET, NULL) == -1) {
- perror("SNDCTL_DSP_RESET");
- SErrorCode = SERR_DEVRESET;
- return -1;
diff --git a/audio/wsoundserver/patches/patch-ae b/audio/wsoundserver/patches/patch-ae
deleted file mode 100644
index 308ad5983f6..00000000000
--- a/audio/wsoundserver/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/03/12 21:10:25 wiz Exp $
-
---- wslib/config.c.orig Fri Mar 31 22:10:25 2000
-+++ wslib/config.c
-@@ -37,7 +37,7 @@
- #include <limits.h>
- #include "wsound.h"
-
--#include <WUtil.h>
-+#include <WINGs/WUtil.h>
- #include <assert.h>
-
-
diff --git a/audio/wsoundserver/patches/patch-af b/audio/wsoundserver/patches/patch-af
deleted file mode 100644
index 77bf4b7531a..00000000000
--- a/audio/wsoundserver/patches/patch-af
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/03/12 21:10:25 wiz Exp $
-
---- wslib/info.c.orig Fri Mar 31 22:10:25 2000
-+++ wslib/info.c
-@@ -138,12 +138,6 @@
- case AF_COMPRESSION_APPLE_MAC6:
- fprintf(stderr, "Apple MAC6\n");
- break;
-- case AF_COMPRESSION_MPEG1:
-- fprintf(stderr, "MPEG 1\n");
-- break;
-- case AF_COMPRESSION_AWARE_MULTIRATE:
-- fprintf(stderr, "Aware MultiRate\n");
-- break;
- case AF_COMPRESSION_G726:
- fprintf(stderr, "G726\n");
- break;
-@@ -158,18 +152,6 @@
- break;
- case AF_COMPRESSION_FS1016:
- fprintf(stderr, "FS1016\n");
-- break;
-- case AF_COMPRESSION_DEFAULT_MPEG_I:
-- fprintf(stderr, "MPEG 1 Layer 1\n");
-- break;
-- case AF_COMPRESSION_DEFAULT_MPEG_II:
-- fprintf(stderr, "MPEG 1 Layer 2\n");
-- break;
-- case AF_COMPRESSION_DEFAULT_MULTIRATE:
-- fprintf(stderr, "MultiRate\n");
-- break;
-- case AF_COMPRESSION_DEFAULT_LOSSLESS:
-- fprintf(stderr, "Lossless\n");
- break;
- default:
- fprintf(stderr, "Unknown\n");
diff --git a/audio/xamp/DESCR b/audio/xamp/DESCR
deleted file mode 100644
index bd252c389b8..00000000000
--- a/audio/xamp/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-Xamp is a version of amp with graphical interface provided by
-qt toolkit. It comes with the amp-0.7.6 as the core player, as
-well as two album management tools: Playlist Editor and ID3 Tag
-Editor, and is able to change the background on the fly.
-
-Although it's not as nifty as x11amp is, hopefully it takes less
-CPU time and doesn't require OSS sound driver to run.
-
-The program pretty much speaks for itself. You may consult the
-man page or the document in the "About Xamp" panel for more
-detail.
diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile
deleted file mode 100644
index d2dd004a799..00000000000
--- a/audio/xamp/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2007/01/07 09:13:47 rillig Exp $
-
-DISTNAME= xamp-0.8-10
-PKGNAME= xamp-0.8.10
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_BACKUP}
-EXTRACT_SUFX= .tgz
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${SKIN_DATA}
-
-MAINTAINER= rxg@NetBSD.org
-HOMEPAGE= # http://andrej.co.ru/~andrej/programs/xamp/
-COMMENT= Version of amp (stands for `Audio Mpeg Player') plus a Qt GUI
-
-WRKSRC= ${WRKDIR}/xamp-0.8/xamp-0.8g
-DIST_SUBDIR= xamp
-GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CXXFLAGS=${CFLAGS:M*:Q}
-USE_TOOLS+= gmake
-USE_LANGUAGES= c c++
-
-CONFIGURE_ARGS+= --with-qt-dir=${BUILDLINK_PREFIX.qt1:Q}/qt1
-
-CONFIGURE_ENV+= QTDIR=${QT1DIR:Q}
-MAKE_ENV+= QT1DIR=${QT1DIR:Q}
-
-SKIN_DATA= bfamp.tar.gz chrome.tar.gz mmxamp.tar.gz
-SKIN_DIR= ${PREFIX}/lib/X11/xamp
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-post-patch:
- for f in about.cpp aboutData.cpp readmex.h; do \
- ${MV} ${WRKSRC}/$$f ${WRKSRC}/$$f.tmp; \
- ${SED} -e 's:/usr/X11R6:'${PREFIX}':g' < ${WRKSRC}/$$f.tmp > \
- ${WRKSRC}/$$f; \
- done
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/xamp ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/xamp.1 ${PREFIX}/${PKGMANDIR}/man1
- @${INSTALL_DATA_DIR} ${SKIN_DIR}/bfamp-xamp
- ${INSTALL_DATA} ${WRKDIR}/bfamp-xamp/*.bmp ${SKIN_DIR}/bfamp-xamp
- @${INSTALL_DATA_DIR} ${SKIN_DIR}/chrome-xamp
- ${INSTALL_DATA} ${WRKDIR}/chrome-xamp/*.bmp ${SKIN_DIR}/chrome-xamp
- @${INSTALL_DATA_DIR} ${SKIN_DIR}/mmxxamp-xamp
- ${INSTALL_DATA} ${WRKDIR}/mmxxamp-xamp/*.bmp ${SKIN_DIR}/mmxxamp-xamp
-
-.include "../../x11/qt1/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xamp/PLIST b/audio/xamp/PLIST
deleted file mode 100644
index 60feaacfec0..00000000000
--- a/audio/xamp/PLIST
+++ /dev/null
@@ -1,70 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:18:13 zuntum Exp $
-bin/xamp
-man/man1/xamp.1
-lib/X11/xamp/bfamp-xamp/ff.bmp
-lib/X11/xamp/bfamp-xamp/load.bmp
-lib/X11/xamp/bfamp-xamp/main.bmp
-lib/X11/xamp/bfamp-xamp/mono.bmp
-lib/X11/xamp/bfamp-xamp/mpause.bmp
-lib/X11/xamp/bfamp-xamp/mplay.bmp
-lib/X11/xamp/bfamp-xamp/mstop.bmp
-lib/X11/xamp/bfamp-xamp/pause.bmp
-lib/X11/xamp/bfamp-xamp/pl.bmp
-lib/X11/xamp/bfamp-xamp/play.bmp
-lib/X11/xamp/bfamp-xamp/posbar.bmp
-lib/X11/xamp/bfamp-xamp/posbut.bmp
-lib/X11/xamp/bfamp-xamp/rep.bmp
-lib/X11/xamp/bfamp-xamp/repc.bmp
-lib/X11/xamp/bfamp-xamp/rew.bmp
-lib/X11/xamp/bfamp-xamp/shuffle.bmp
-lib/X11/xamp/bfamp-xamp/shufflen.bmp
-lib/X11/xamp/bfamp-xamp/stereo.bmp
-lib/X11/xamp/bfamp-xamp/stop.bmp
-lib/X11/xamp/bfamp-xamp/vol.bmp
-lib/X11/xamp/bfamp-xamp/xopy.bmp
-lib/X11/xamp/chrome-xamp/ff.bmp
-lib/X11/xamp/chrome-xamp/load.bmp
-lib/X11/xamp/chrome-xamp/main.bmp
-lib/X11/xamp/chrome-xamp/mono.bmp
-lib/X11/xamp/chrome-xamp/mpause.bmp
-lib/X11/xamp/chrome-xamp/mplay.bmp
-lib/X11/xamp/chrome-xamp/mstop.bmp
-lib/X11/xamp/chrome-xamp/pause.bmp
-lib/X11/xamp/chrome-xamp/pl.bmp
-lib/X11/xamp/chrome-xamp/play.bmp
-lib/X11/xamp/chrome-xamp/posbar.bmp
-lib/X11/xamp/chrome-xamp/posbut.bmp
-lib/X11/xamp/chrome-xamp/rep.bmp
-lib/X11/xamp/chrome-xamp/repc.bmp
-lib/X11/xamp/chrome-xamp/rew.bmp
-lib/X11/xamp/chrome-xamp/shuffle.bmp
-lib/X11/xamp/chrome-xamp/shufflen.bmp
-lib/X11/xamp/chrome-xamp/stereo.bmp
-lib/X11/xamp/chrome-xamp/stop.bmp
-lib/X11/xamp/chrome-xamp/vol.bmp
-lib/X11/xamp/chrome-xamp/xopy.bmp
-lib/X11/xamp/mmxxamp-xamp/ff.bmp
-lib/X11/xamp/mmxxamp-xamp/load.bmp
-lib/X11/xamp/mmxxamp-xamp/main.bmp
-lib/X11/xamp/mmxxamp-xamp/mono.bmp
-lib/X11/xamp/mmxxamp-xamp/mpause.bmp
-lib/X11/xamp/mmxxamp-xamp/mplay.bmp
-lib/X11/xamp/mmxxamp-xamp/mstop.bmp
-lib/X11/xamp/mmxxamp-xamp/pause.bmp
-lib/X11/xamp/mmxxamp-xamp/pl.bmp
-lib/X11/xamp/mmxxamp-xamp/play.bmp
-lib/X11/xamp/mmxxamp-xamp/posbar.bmp
-lib/X11/xamp/mmxxamp-xamp/posbut.bmp
-lib/X11/xamp/mmxxamp-xamp/rep.bmp
-lib/X11/xamp/mmxxamp-xamp/repc.bmp
-lib/X11/xamp/mmxxamp-xamp/rew.bmp
-lib/X11/xamp/mmxxamp-xamp/shuffle.bmp
-lib/X11/xamp/mmxxamp-xamp/shufflen.bmp
-lib/X11/xamp/mmxxamp-xamp/stereo.bmp
-lib/X11/xamp/mmxxamp-xamp/stop.bmp
-lib/X11/xamp/mmxxamp-xamp/vol.bmp
-lib/X11/xamp/mmxxamp-xamp/xopy.bmp
-@dirrm lib/X11/xamp/mmxxamp-xamp
-@dirrm lib/X11/xamp/chrome-xamp
-@dirrm lib/X11/xamp/bfamp-xamp
-@dirrm lib/X11/xamp
diff --git a/audio/xamp/distinfo b/audio/xamp/distinfo
deleted file mode 100644
index f18660d1d2f..00000000000
--- a/audio/xamp/distinfo
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/12/12 15:32:56 joerg Exp $
-
-SHA1 (xamp/xamp-0.8-10.tgz) = 65f83c41091184432d64baf1d74aef880733fbd5
-RMD160 (xamp/xamp-0.8-10.tgz) = 9141bbcbfae0d7ea2a04939b4fee7edfd1403d04
-Size (xamp/xamp-0.8-10.tgz) = 239024 bytes
-SHA1 (xamp/bfamp.tar.gz) = a5249fc728b7ae10bb44d363d7d30b6d31182735
-RMD160 (xamp/bfamp.tar.gz) = 71545c432020e551f820192ce3a8a0c206320d72
-Size (xamp/bfamp.tar.gz) = 23533 bytes
-SHA1 (xamp/chrome.tar.gz) = 039762b34489d8ec83c2947ca80e2ec4b5013c19
-RMD160 (xamp/chrome.tar.gz) = f06d34ed27eeda43970bda2e06226f7f047b471c
-Size (xamp/chrome.tar.gz) = 32636 bytes
-SHA1 (xamp/mmxamp.tar.gz) = f703dfe3040bd72db35bb05e26a8eb7841b54887
-RMD160 (xamp/mmxamp.tar.gz) = a4a509ecf2c36e65369e70364281486ab491b8e3
-Size (xamp/mmxamp.tar.gz) = 41405 bytes
-SHA1 (patch-aa) = 50574884e35679ad425b25c5886ef96661288964
-SHA1 (patch-ab) = 96c0e3db7637c035345cbf2df7d2ee195b538bcb
-SHA1 (patch-ac) = de83b1fd7b170438f818d76d025838f8aa07c752
-SHA1 (patch-ad) = 3595460ae4f848b60d1c829ebfecff92cd2a8e58
-SHA1 (patch-ae) = 348aff7b4cef04198359c4ea5d7e06cc2b63fd08
-SHA1 (patch-af) = 45568633714f7fbea443001b0af252e6d3310223
-SHA1 (patch-ag) = c17579b095485510bc5dc99d0c22da2f44e152b8
-SHA1 (patch-ah) = 2460dd3cc32f18847f99cdc3f5cefa87601a4c85
-SHA1 (patch-ai) = cea0ed01b293457d5660cf6ecff95e616f608eb5
-SHA1 (patch-aj) = ab841128854cdacceb54b6c7726d07e5f4fb1140
-SHA1 (patch-ak) = 0d32700aad4cdf232bc1c48376ddcbd762b41852
-SHA1 (patch-al) = 38760f05d5ca7b4557c6d8ddfb0b08cbc4b0dd9b
-SHA1 (patch-am) = 6930ab1879789ee4c762da345d5bccb862f06c8a
-SHA1 (patch-an) = 19fdd266a633afccf7ec4de18a8fc5aa7975354f
-SHA1 (patch-ao) = c3d125d0498052c1f37ce3a3597ca50827779aca
-SHA1 (patch-ap) = 4b4429e3c4a9e8324808cf7b1443db4dddc14cb9
-SHA1 (patch-aq) = f454b488a1b726318080900efd1f23f2d788022f
-SHA1 (patch-ar) = b788d9ed2c1230c37548c21180a0dcf756a93398
-SHA1 (patch-as) = 7e37cf1558ec35e1d19dee520cb6f721a20933b9
-SHA1 (patch-at) = 79ea079c5ad71a382a449879473097d8dbc81be5
-SHA1 (patch-au) = 7d149711f4ba72ab792a6336e87a641aaac931e4
-SHA1 (patch-av) = aa9541f86a3688156d6944dcf88dbc1bb59ceb33
-SHA1 (patch-aw) = 3933c2414cb6e56e1b12d4798dc08b93c4e3e98f
-SHA1 (patch-ax) = 5b4892631e770a4f433d3656384916c1dc715998
-SHA1 (patch-ay) = 18d7aa563176b92a7810a46d7365db59df336e30
diff --git a/audio/xamp/patches/patch-aa b/audio/xamp/patches/patch-aa
deleted file mode 100644
index 14c15fd39c4..00000000000
--- a/audio/xamp/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2005/12/12 15:32:56 joerg Exp $
-
---- ../audioIO.c.orig 1997-05-31 15:47:58.000000000 +0000
-+++ ../audioIO.c
-@@ -6,10 +6,18 @@
- #include "audioIO_Linux.c"
- #endif
-
-+#ifdef OS_NetBSD
-+ #include "audioIO_NetBSD.c"
-+#endif
-+
- #ifdef OS_BSD
- #include "audioIO_Linux.c"
- #endif
-
-+#ifdef OS_DragonFly
-+ #include "audioIO_Linux.c"
-+#endif
-+
- #if defined(OS_IRIX) || defined(OS_IRIX64)
- #include "audioIO_IRIX.c"
- #endif
diff --git a/audio/xamp/patches/patch-ab b/audio/xamp/patches/patch-ab
deleted file mode 100644
index 2b5760454ce..00000000000
--- a/audio/xamp/patches/patch-ab
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/05/11 12:18:37 wiz Exp $
-
---- ../guicontrol.c.orig 1998-02-20 20:44:16.000000000 +0100
-+++ ../guicontrol.c
-@@ -312,6 +312,14 @@ void gui_control(void)
- if (quit_flag)
- {
- /* fprintf(stderr, "quit_flag is true\n"); */
-+
-+ if((flags = fcntl(STDOUT_FILENO, F_GETFL, 0)) < 0)
-+ perror("fcntl");
-+ flags &= ~O_NONBLOCK;
-+
-+ if(fcntl(STDOUT_FILENO, F_SETFL, flags) < 0)
-+ perror("fcntl");
-+
- exit(0);
- }
- while(GUI_FD_TO_PLAY != -1)
-@@ -334,7 +342,7 @@ void gui_control(void)
-
- if((flags = fcntl(STDIN_FILENO, F_GETFL, 0)) < 0)
- perror("fcntl");
-- flags ^= O_NONBLOCK;
-+ flags &= ~O_NONBLOCK;
-
- if(fcntl(STDIN_FILENO, F_SETFL, flags) < 0)
- perror("fcntl");
-@@ -395,7 +403,7 @@ int decodeMPEG_2(int inFilefd)
- /* Set stdin to blocking */
- if((flags = fcntl(STDIN_FILENO, F_GETFL, 0)) < 0)
- perror("fcntl");
-- flags ^= O_NONBLOCK;
-+ flags &= ~O_NONBLOCK;
- if(fcntl(STDIN_FILENO, F_SETFL, flags) < 0)
- perror("fcntl");
- }
diff --git a/audio/xamp/patches/patch-ac b/audio/xamp/patches/patch-ac
deleted file mode 100644
index 45b92d7a280..00000000000
--- a/audio/xamp/patches/patch-ac
+++ /dev/null
@@ -1,81 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2000/10/18 11:22:44 rh Exp $
-
---- QtAMP.cpp.orig Fri Jul 31 22:29:58 1998
-+++ QtAMP.cpp Tue Oct 17 17:48:13 2000
-@@ -24,10 +24,12 @@
-
- #include <sys/types.h>
- #include <sys/stat.h>
-+#ifndef OS_NetBSD
- #include <sched.h>
-+#include <sys/soundcard.h>
-+#endif
- #include <sys/socket.h>
- #include <sys/ioctl.h>
--#include <sys/soundcard.h>
- #include <sys/time.h>
- #include <sys/resource.h>
- #include <errno.h>
-@@ -89,7 +91,11 @@
- if ((mixer = open("/dev/mixer", O_RDWR)) < 0)
- die("Error opening /dev/mixer, exiting\n");
- ioctl(mixer, SOUND_MIXER_READ_PCM, &v);
--#endif OS_Linux
-+#endif
-+
-+#ifdef OS_NetBSD
-+ audioSetMixer();
-+#endif
-
- /* where mine resource file is located */
- char home[500];
-@@ -428,6 +434,13 @@
- int x = (tv*256 + tvl);
- ioctl(mixer, SOUND_MIXER_WRITE_PCM, &x);
- #endif
-+
-+#ifdef OS_NetBSD
-+ if (tvr == 0)
-+ audioSetVolume(vr);
-+ else
-+ audioSetBalance(vr, tvr);
-+#endif
- }
-
- void QtAMP::bal_slider_moved(int bal)
-@@ -437,6 +450,10 @@
- sprintf(volum,"Balance: %d",tvr);
- vol_slider_moved(vr);
- playLabel->setText( volum );
-+
-+#ifdef OS_NetBSD
-+ audioSetBalance(vr, tvr);
-+#endif
- }
-
- void QtAMP::bal_slider_released()
-@@ -1077,12 +1094,24 @@
- int x = (tv*256 + tvl);
- ioctl(mixer, SOUND_MIXER_WRITE_PCM, &x);
- #endif
-+
-+#ifdef OS_NetBSD
-+ int vr = 0;
-+ audioSetVolume(vr);
-+#endif
- }
- if (mute == 0)
- {
- #ifdef OS_Linux
- int x = (7*256 + 7);
- ioctl(mixer, SOUND_MIXER_WRITE_PCM, &x);
-+#endif
-+
-+#ifdef OS_NetBSD
-+ if (tvr == 0)
-+ audioSetVolume(vr);
-+ else
-+ audioSetBalance(vr, tvr);
- #endif
- }
- mute=!mute;
diff --git a/audio/xamp/patches/patch-ad b/audio/xamp/patches/patch-ad
deleted file mode 100644
index c3ca0bbda43..00000000000
--- a/audio/xamp/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/09/17 00:48:27 hubertf Exp $
-
---- plDlg.cpp Wed Feb 11 07:01:12 1998
-+++ plDlg.cpp Wed Jul 29 23:59:01 1998
-@@ -87,6 +87,8 @@
- void plDlg::id3_clicked()
- {
- strcpy(ime,listEditor->text(listEditor->currentItem()));
-+ if(!ime[0]) //to prevent from seg-fault on id3 editor at empty playlist
-+ return;
- id3Dialog = new id3();
- id3Dialog->show();
- }
diff --git a/audio/xamp/patches/patch-ae b/audio/xamp/patches/patch-ae
deleted file mode 100644
index 233ffa4bd1d..00000000000
--- a/audio/xamp/patches/patch-ae
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2004/05/11 12:18:37 wiz Exp $
-
---- Makefile.in.orig Fri Jul 31 01:48:02 1998
-+++ Makefile.in Mon Oct 16 16:22:20 2000
-@@ -15,8 +15,8 @@
- DEFINES = -DOS_@OS_TYPE@ -DARCH_@ARCH_TYPE@
- CFLAGS = @CFLAGS@ ${DEFINES} ${DEBUG} ${BACK} -Wall
- LDFLAGS = @LDFLAGS@
--INSTALL= @INSTALL@
--DESTDIR= ${prefix}/bin
-+INSTALL= @INSTALL@ -s
-+DESTDIR= ${PREFIX}/bin
-
- #
- # uncomment both of these if you want profiling support
-@@ -38,7 +38,7 @@
- mabout.o maboutData.o dirDlg.o mdirDlg.o dirDlgData.o mdirDlgData.o \
- id3.o id3Data.o QLayer.o mid3.o mid3Data.o pixmaps/pixmaps.o
-
--LIBS = @QT_LDFLAGS@ -lm -lqt
-+LIBS = @QT_LDFLAGS@ -lm -lqt -L${QT1DIR}/lib -Wl,-R${QT1DIR}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lX11 -lXext
-
- all: xamp
-
-@@ -58,7 +58,7 @@
- cd pixmaps ; make
-
- xamp: images $(OBJ)
-- $(CC) -o xamp $(OBJ) $(LDFLAGS) $(LIBS)
-+ $(CXX) -o xamp $(OBJ) $(LDFLAGS) $(LIBS)
-
- install:
- $(INSTALL) -m 755 xamp $(DESTDIR)/xamp
diff --git a/audio/xamp/patches/patch-af b/audio/xamp/patches/patch-af
deleted file mode 100644
index 0104b46e8d1..00000000000
--- a/audio/xamp/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.4 2005/12/12 15:32:56 joerg Exp $
-
---- ../audioIO.h.orig 1997-05-31 15:47:58.000000000 +0000
-+++ ../audioIO.h
-@@ -7,7 +7,7 @@
- #define AUSIZ 32768
- #endif
-
--#ifdef OS_Linux
-+#if defined(OS_Linux) || defined(OS_NetBSD) || defined(OS_DragonFly)
- extern int AUSIZ;
- #endif
-
diff --git a/audio/xamp/patches/patch-ag b/audio/xamp/patches/patch-ag
deleted file mode 100644
index 6a358130155..00000000000
--- a/audio/xamp/patches/patch-ag
+++ /dev/null
@@ -1,245 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2000/10/18 11:22:44 rh Exp $
-
---- ../audioIO_NetBSD.c.orig Tue Oct 17 17:50:54 2000
-+++ ../audioIO_NetBSD.c Tue Oct 17 20:01:20 2000
-@@ -0,0 +1,240 @@
-+/* this file is a part of amp software, (C) tomislav uzelac 1996,1997
-+
-+ Origional code by: tomislav uzelac
-+ Modified by:
-+ * Dan Nelson - BSD mods.
-+ * Andrew Richards - moved code from audio.c and added mixer support etc
-+ * Brett Lymn - NetBSD support & 8bit mode.
-+ * Rui-Xiang Guo - NetBSD native API support.
-+ */
-+
-+/* Support for NetBSD sound devices */
-+
-+#include "amp.h"
-+#include "audioIO.h"
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <stdio.h>
-+#include <errno.h>
-+#include <string.h>
-+#include <malloc.h>
-+#include <stdlib.h>
-+#include <signal.h>
-+#include <sys/audioio.h>
-+#include <sys/param.h>
-+#include <sys/filio.h>
-+#include <sys/param.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <sys/ioctl.h>
-+
-+/* optimal fragment size - if this is set too high you will get clicks
-+ * in the audio output, below is near the upper limit for the sb sound driver
-+ * on my machine (Toshiba 400CDT laptop).
-+ */
-+
-+int AUSIZ = 20480;
-+
-+/* declare these static to effectively isolate the audio device */
-+
-+static int audio_fd;
-+static int mixer_fd;
-+
-+static char *reduce;
-+
-+/* audioOpen() */
-+/* should open the audio device, perform any special initialization */
-+/* Set the frequency, no of channels and volume. Volume is only set if */
-+/* it is not -1 */
-+
-+void
-+audioOpen(int frequency, int stereo, int volume)
-+{
-+ audio_info_t audio_dev;
-+
-+ if ((audio_fd = open ("/dev/audio", O_WRONLY, 0)) == -1)
-+ die("Unable to open the audio device\n");
-+ DB(audio, msg("Audio device opened on %d\n", audio_fd));
-+
-+ ioctl(audio_fd, AUDIO_GETINFO, &audio_dev); /* get current settings */
-+ AUDIO_INITINFO(&audio_dev);
-+
-+ /* Set 1 or 2 channels */
-+ audio_dev.play.channels = (stereo ? 2 : 1);
-+
-+ /* Set the output frequency */
-+ DB(audio, msg("Setting freq to %d Hz\n", frequency));
-+ audio_dev.play.sample_rate = frequency;
-+
-+ if (volume != -1)
-+ audioSetVolume(volume);
-+
-+ audio_dev.blocksize = AUSIZ;
-+ audio_dev.play.encoding = AUDIO_ENCODING_SLINEAR;
-+ audio_dev.hiwat = 20;
-+ audio_dev.lowat = 1;
-+ audio_dev.mode = AUMODE_PLAY;
-+
-+ if (ioctl(audio_fd, AUDIO_SETINFO, &audio_dev) < 0)
-+ die("AUDIO_SETINFO failed\n");
-+
-+ /* ok - try running the sound system at 16 bits, if that does not
-+ * work then try 8 bits, if that does not work, give up.
-+ */
-+ reduce = NULL;
-+ audio_dev.play.precision = 16;
-+ if (ioctl(audio_fd, AUDIO_SETINFO, &audio_dev) < 0) {
-+ DB(audio,
-+ msg("AUDIO_SETINFO for 16 bits failed, try 8 bits\n"));
-+ if ((reduce = (char *) malloc(AUSIZ * sizeof(char))) == NULL)
-+ die("Cannot malloc reduce buffer\n");
-+ audio_dev.play.precision = 8;
-+ if (ioctl(audio_fd, AUDIO_SETINFO, &audio_dev) < 0)
-+ die("AUDIO_SETINFO failed both 16bit and 8bit\n");
-+ AUSIZ = AUSIZ * sizeof(short);
-+ }
-+}
-+
-+
-+/* audioSetVolume - only code this if your system can change the volume while playing */
-+/* sets the output volume 0-100 */
-+
-+int device_id = 3;
-+char *mixer_device;
-+mixer_ctrl_t *values;
-+mixer_devinfo_t *infos;
-+
-+void
-+audioSetMixer()
-+{
-+ int i, ndev;
-+ mixer_devinfo_t dinfo;
-+
-+ mixer_device = getenv("MIXERDEVICE");
-+ if (mixer_device == NULL)
-+ mixer_device = "/dev/mixer0";
-+
-+ if ((mixer_fd = open(mixer_device, O_RDWR)) < 0)
-+ warn("Unable to open mixer device\n");
-+ DB(audio, msg("Mixer device opened on %d\n", mixer_fd));
-+
-+ for (ndev = 0; ; ndev++) {
-+ dinfo.index = ndev;
-+ if (ioctl(mixer_fd, AUDIO_MIXER_DEVINFO, &dinfo) < 0)
-+ break;
-+ }
-+ infos = calloc(ndev, sizeof *infos);
-+ values = calloc(ndev, sizeof *values);
-+
-+ for (i = 0; i < ndev; i++) {
-+ infos[i].index = i;
-+ ioctl(mixer_fd, AUDIO_MIXER_DEVINFO, &infos[i]);
-+ }
-+
-+ for (i = 0; i < ndev; i++) {
-+ if (infos[i].type == AUDIO_MIXER_VALUE) {
-+ values[i].dev = i;
-+ values[i].type = infos[i].type;
-+ }
-+ }
-+
-+ values[device_id].un.value.num_channels = 2;
-+}
-+
-+void
-+audioSetVolume(int volume)
-+{
-+ mixer_ctrl_t *m;
-+
-+ DB(audio, msg("Setting volume to: %d\n", volume));
-+ m = &values[device_id];
-+
-+ if (ioctl(mixer_fd, AUDIO_MIXER_WRITE, m) < 0)
-+ warn("Unable to set sound volume\n");
-+
-+ m->un.value.level[0] = m->un.value.level[1] = volume * AUDIO_MAX_GAIN / 100;
-+}
-+
-+void
-+audioSetBalance(int volume, int balance)
-+{
-+ mixer_ctrl_t *m;
-+
-+ DB(audio, msg("Setting volume to: %d\n", volume));
-+ DB(audio, msg("Setting balance to: %d\n", balance));
-+ m = &values[device_id];
-+
-+ if (ioctl(mixer_fd, AUDIO_MIXER_WRITE, m) < 0)
-+ warn("Unable to set sound volume\n");
-+
-+ if (balance < 0) {
-+ m->un.value.level[0] = volume * AUDIO_MAX_GAIN / 100;
-+ m->un.value.level[1] = m->un.value.level[0] * (20 + balance) / 20;
-+ }
-+ else {
-+ m->un.value.level[1] = volume * AUDIO_MAX_GAIN / 100;
-+ m->un.value.level[0] = m->un.value.level[1] * (20 - balance) / 20;
-+ }
-+}
-+
-+/* audioFlush() */
-+/* should flush the audio device */
-+
-+inline void
-+audioFlush()
-+{
-+ DB(audio, msg("audio: flush %d\n", audio_fd));
-+}
-+
-+
-+/* audioClose() */
-+/* should close the audio device and perform any special shutdown */
-+
-+void
-+audioClose()
-+{
-+ close(audio_fd);
-+ if (mixer_fd != -1)
-+ close(mixer_fd);
-+ DB(audio, msg("audio: closed %d\n", audio_fd));
-+}
-+
-+/* audioWrite */
-+/* writes count bytes from buffer to the audio device */
-+/* returns the number of bytes actually written */
-+
-+inline int
-+audioWrite(char *buffer, int count)
-+{
-+ int i;
-+ short *cast;
-+
-+ DB(audio, msg("audio: Writing %d bytes to audio descriptor %d\n",count,
-+ getAudioFd()));
-+
-+ /* if the reduce buffer is allocated we need to do 8bit writes
-+ * so munge the data buffer appropriately.
-+ */
-+ if (reduce != NULL) {
-+ cast = (short *) buffer;
-+
-+ for (i=0; i < count/sizeof(short); i++) {
-+ reduce[i] = cast[i] >> 8;
-+ }
-+ return (sizeof(short) * write(audio_fd, reduce,
-+ count/sizeof(short)));
-+ } else {
-+ return (write(audio_fd,buffer,count));
-+ }
-+}
-+
-+/* Let buffer.c have the audio descriptor so it can select on it. This means */
-+/* that the program is dependent on a file descriptor to work. Should really */
-+/* move the select's etc (with inlines of course) in here so that this is the */
-+/* ONLY file which has hardware dependent audio stuff in it */
-+
-+int
-+getAudioFd()
-+{
-+ return (audio_fd);
-+}
diff --git a/audio/xamp/patches/patch-ah b/audio/xamp/patches/patch-ah
deleted file mode 100644
index 256edeae599..00000000000
--- a/audio/xamp/patches/patch-ah
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ah,v 1.5 2004/05/11 12:18:37 wiz Exp $
-
---- configure.in.orig Sun Oct 5 22:42:34 1997
-+++ configure.in Mon Oct 16 21:08:33 2000
-@@ -71,6 +71,11 @@
- CFLAGS="-O6 -ffast-math -fomit-frame-pointer -DNO_BYTE_SWAPPING ${CFLAGS_ARCH}"
- ;;
-
-+ NetBSD)
-+ CC="gcc"
-+ CFLAGS="${CFLAGS} -DNO_BYTE_SWAPPING"
-+ ;;
-+
- SunOS)
- if test "$CC" = "gcc"; then
- CFLAGS="-O6"
diff --git a/audio/xamp/patches/patch-ai b/audio/xamp/patches/patch-ai
deleted file mode 100644
index ea9f5b216b4..00000000000
--- a/audio/xamp/patches/patch-ai
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ai,v 1.6 2005/12/12 15:32:56 joerg Exp $
-
---- configure.orig 1997-10-26 14:55:34.000000000 +0000
-+++ configure
-@@ -970,7 +970,7 @@ fi
- #try to guess qt locations
-
- qt_incdirs="/usr/lib/qt/include /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt $x_includes $QTINC"
--test -n "$QTDIR" && qt_incdirs="$QTDIR/include $QTDIR $qt_incdirs"
-+test -n "$QTDIR" && qt_incdirs="$QTDIR/include $QTDIR/include/qt $QTDIR $qt_incdirs"
-
- qt_incdir=NO
- for i in $qt_incdirs;
-@@ -1700,7 +1700,7 @@ case "$OS_TYPE" in
- CFLAGS="-O3 -ffast-math -funroll-loops"
- ;;
-
-- Linux|FreeBSD)
-+ Linux|FreeBSD|DragonFly)
- CC="gcc"
- if test "$ARCH_TYPE" = "i486" ; then
- CFLAGS_ARCH="-m486"
-@@ -1714,6 +1714,11 @@ case "$OS_TYPE" in
- CFLAGS="-O6 -ffast-math -fomit-frame-pointer -DNO_BYTE_SWAPPING ${CFLAGS_ARCH}"
- ;;
-
-+ NetBSD)
-+ CC="gcc"
-+ CFLAGS="${CFLAGS} -DNO_BYTE_SWAPPING"
-+ ;;
-+
- SunOS)
- if test "$CC" = "gcc"; then
- CFLAGS="-O6"
diff --git a/audio/xamp/patches/patch-aj b/audio/xamp/patches/patch-aj
deleted file mode 100644
index f0e294595e7..00000000000
--- a/audio/xamp/patches/patch-aj
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2000/10/18 11:22:44 rh Exp $
-
---- ../amp.h.orig Tue Aug 19 05:33:30 1997
-+++ ../amp.h Sun Oct 1 15:47:56 2000
-@@ -13,10 +13,17 @@
- #define MINOR 7
- #define PATCH 6
-
-+#ifdef OS_NetBSD
-+#include <sys/param.h>
-+#endif
-+
-+#ifndef OS_NetBSD
- #define MAX(a,b) ((a) > (b) ? (a) : (b))
-+#endif
- #define MAX3(a,b,c) ((a) > (b) ? MAX(a, c) : MAX(b, c))
-+#ifndef OS_NetBSD
- #define MIN(a,b) ((a) < (b) ? (a) : (b))
--
-+#endif
-
- /* Debugging flags */
-
diff --git a/audio/xamp/patches/patch-ak b/audio/xamp/patches/patch-ak
deleted file mode 100644
index 04ef374fcac..00000000000
--- a/audio/xamp/patches/patch-ak
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2000/10/18 11:22:44 rh Exp $
-
---- ../buffer.c.orig Sat Dec 13 06:58:08 1997
-+++ ../buffer.c Sun Oct 1 15:47:56 2000
-@@ -226,7 +226,17 @@
-
- percentFull=100*bufferSize(&audioBuffer)/AUDIO_BUFFER_SIZE;
- #if defined(DEBUG)
-- if ((cntr++ % (16/(AUSIZ/4096)))==0) msg("\rBuffer (%2d%%) %6d",percentFull,bufferSize(&audioBuffer));
-+ if (AUSIZ >= 4096) {
-+ if ((cntr++ % (16/(AUSIZ/4096)))==0)
-+ msg("\nBuffer(%2d%%) %6d\n",
-+ percentFull,
-+ bufferSize(&audioBuffer));
-+ } else {
-+ if ((cntr++ % (16 * AUSIZ)) == 0)
-+ msg("\nBuffer(%2d%%) %6d\n",
-+ percentFull,
-+ bufferSize(&audioBuffer));
-+ }
- #endif
- if (AUSIZ>bytesToEnd) {
- cnt = audioWrite(audioBuffer.bufferPtr + audioBuffer.outPos, bytesToEnd);
diff --git a/audio/xamp/patches/patch-al b/audio/xamp/patches/patch-al
deleted file mode 100644
index fad8e834a22..00000000000
--- a/audio/xamp/patches/patch-al
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-al,v 1.3 2004/05/11 12:18:37 wiz Exp $
-
---- ../configure.in.orig Sat Aug 23 17:35:40 1997
-+++ ../configure.in Mon Oct 16 21:12:37 2000
-@@ -73,6 +73,11 @@
- DEFINES="-DNO_BYTE_SWAPPING -DOS_$OS_TYPE -DARCH_$ARCH_TYPE"
- ;;
-
-+ NetBSD)
-+ CC="gcc"
-+ DEFINES="-DNO_BYTE_SWAPPING -DOS_$OS_TYPE -DARCH_$ARCH_TYPE"
-+ ;;
-+
- SunOS)
- if test "$CC" = "gcc"; then
- CFLAGS="-O6 -Dinline= "
diff --git a/audio/xamp/patches/patch-am b/audio/xamp/patches/patch-am
deleted file mode 100644
index bd2dcbf00b0..00000000000
--- a/audio/xamp/patches/patch-am
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-am,v 1.4 2005/12/12 15:32:56 joerg Exp $
-
---- ../configure.orig 1997-08-23 09:11:24.000000000 +0000
-+++ ../configure
-@@ -1398,7 +1398,7 @@ case "$OS_TYPE" in
- DEFINES="-DOS_$OS_TYPE -DARCH_$ARCH_TYPE"
- ;;
-
-- Linux|FreeBSD)
-+ Linux|FreeBSD|DragonFly)
- CC="gcc"
- if test "$ARCH_TYPE" = "i486" ; then
- CFLAGS_ARCH="-m486"
-@@ -1413,6 +1413,11 @@ case "$OS_TYPE" in
- DEFINES="-DNO_BYTE_SWAPPING -DOS_$OS_TYPE -DARCH_$ARCH_TYPE"
- ;;
-
-+ NetBSD)
-+ CC="gcc"
-+ DEFINES="-DNO_BYTE_SWAPPING -DOS_$OS_TYPE -DARCH_$ARCH_TYPE"
-+ ;;
-+
- SunOS)
- if test "$CC" = "gcc"; then
- CFLAGS="-O6 -Dinline= "
diff --git a/audio/xamp/patches/patch-an b/audio/xamp/patches/patch-an
deleted file mode 100644
index ee6a39975f3..00000000000
--- a/audio/xamp/patches/patch-an
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-an,v 1.1 2000/10/18 11:22:44 rh Exp $
-
---- ../proto.h.orig Sat May 31 23:47:58 1997
-+++ ../proto.h Tue Oct 17 16:23:23 2000
-@@ -6,6 +6,10 @@
- void debugOptions();
-
- /* From: audioIO_<OSTYPE>.c */
-+#ifdef OS_NetBSD
-+void audioSetMixer();
-+void audioSetBalance(int, int);
-+#endif
- void audioOpen(int frequency, int stereo, int volume);
- void audioSetVolume(int);
- void audioFlush();
diff --git a/audio/xamp/patches/patch-ao b/audio/xamp/patches/patch-ao
deleted file mode 100644
index a0bcca9e0cd..00000000000
--- a/audio/xamp/patches/patch-ao
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2000/10/18 11:22:44 rh Exp $
-
---- plDlgData.cpp.orig Mon Feb 2 14:16:06 1998
-+++ plDlgData.cpp Tue Jan 25 01:34:41 2000
-@@ -18,6 +18,9 @@
- #include <qlabel.h>
- #include <qkeycode.h>
-
-+#define QColor(i) (QColor)(i)
-+#define QRgb(i) (QRgb)(i)
-+
- plDlgData::plDlgData
- (
- QWidget* parent,
diff --git a/audio/xamp/patches/patch-ap b/audio/xamp/patches/patch-ap
deleted file mode 100644
index a89b03e8355..00000000000
--- a/audio/xamp/patches/patch-ap
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2000/10/18 11:22:45 rh Exp $
-
---- QtAMPData.cpp.orig Tue Jan 25 01.35.30 2000
-+++ QtAMPData.cpp Tue Jan 25 01:35:55 2000
-@@ -19,6 +19,9 @@
- #include <qkeycode.h>
- #include <qtooltip.h>
-
-+#define QColor(i) (QColor)(i)
-+#define QRgb(i) (QRgb)(i)
-+
- QtAMPData::QtAMPData
- (
- QWidget* parent,
diff --git a/audio/xamp/patches/patch-aq b/audio/xamp/patches/patch-aq
deleted file mode 100644
index ed782c206b2..00000000000
--- a/audio/xamp/patches/patch-aq
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2000/10/18 11:22:45 rh Exp $
-
---- dirDlgData.cpp.orig Tue Jan 25 01:36:16 2000
-+++ dirDlgData.cpp Tue Jan 25 01:36:43 2000
-@@ -6,6 +6,9 @@
- #include <qframe.h>
- #include <qlabel.h>
-
-+#define QColor(i) (QColor)(i)
-+#define QRgb(i) (QRgb)(i)
-+
- dirDlgData::dirDlgData
- (
- QWidget* parent,
diff --git a/audio/xamp/patches/patch-ar b/audio/xamp/patches/patch-ar
deleted file mode 100644
index e494e8a4c91..00000000000
--- a/audio/xamp/patches/patch-ar
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2000/10/18 11:22:45 rh Exp $
-
---- id3Data.cpp.orig Tue Jan 25 01:37:13 2000
-+++ id3Data.cpp Tue Jan 25 01:37:40 2000
-@@ -17,6 +17,9 @@
- #include <qframe.h>
- #include <qlabel.h>
-
-+#define QColor(i) (QColor)(i)
-+#define QRgb(i) (QRgb)(i)
-+
- id3Data::id3Data
- (
- QWidget* parent,
diff --git a/audio/xamp/patches/patch-as b/audio/xamp/patches/patch-as
deleted file mode 100644
index 39e31314c40..00000000000
--- a/audio/xamp/patches/patch-as
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-as,v 1.1 2004/05/11 12:18:37 wiz Exp $
-
---- main.cpp.orig 1997-12-14 21:35:38.000000000 +0100
-+++ main.cpp
-@@ -1,4 +1,5 @@
- #include <qapp.h>
-+#include <stdlib.h>
- #include "QtAMP.h"
- extern "C" {
- #define AUDIO
diff --git a/audio/xamp/patches/patch-at b/audio/xamp/patches/patch-at
deleted file mode 100644
index e3621998f0e..00000000000
--- a/audio/xamp/patches/patch-at
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-at,v 1.1 2004/05/11 12:18:37 wiz Exp $
-
---- QScrLabel.cpp.orig 1998-02-10 22:04:28.000000000 +0100
-+++ QScrLabel.cpp
-@@ -5,14 +5,14 @@
- #include "QScrLabel.h"
- #include "id3.h"
-
--QScrLabel::QScrLabel(QWidget* parent=0, const char* name=0, WFlags f=0) : QLabel(parent, name, f) {
-+QScrLabel::QScrLabel(QWidget* parent, const char* name, WFlags f) : QLabel(parent, name, f) {
- string = new QString;
- timer = new QTimer(this);
- connect(timer, SIGNAL(timeout()), this, SLOT(scroll()));
- dir = 1;
- }
-
--QScrLabel::QScrLabel(const char* text, QWidget* parent=0, const char* name=0, WFlags f = 0)
-+QScrLabel::QScrLabel(const char* text, QWidget* parent, const char* name, WFlags f)
- {
- QScrLabel(parent, name, f);
- setLabel(text);
diff --git a/audio/xamp/patches/patch-au b/audio/xamp/patches/patch-au
deleted file mode 100644
index ce616a437c1..00000000000
--- a/audio/xamp/patches/patch-au
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-au,v 1.1 2004/05/11 12:18:37 wiz Exp $
-
---- aboutData.cpp.orig 2004-05-11 13:53:23.000000000 +0200
-+++ aboutData.cpp
-@@ -50,11 +50,11 @@ aboutData::aboutData
- l = new QLabel( w );
- b->addWidget( l, 1, 0 );
- l->setAlignment( 268 );
-- l->setText( "You can get Xamp at http://elan.rulez.org/~xopy/
--and from mirrors at
--http://xopy.rulz.org/linux/xamp/ - in Slovenia
--and http://edu.lahti.fi/xamp/ - in Finland\n
--QtAMP is at http://www.xs4all.nl/~lodewijk/qtamp.html\n
-+ l->setText( "You can get Xamp at http://elan.rulez.org/~xopy/\n\
-+and from mirrors at\n\
-+http://xopy.rulz.org/linux/xamp/ - in Slovenia\n\
-+and http://edu.lahti.fi/xamp/ - in Finland\n\
-+QtAMP is at http://www.xs4all.nl/~lodewijk/qtamp.html\n\
- and amp at ftp://ftp.rasip.fer.hr/pub/mpeg/");
-
- addTab( w, "Xamp" );
diff --git a/audio/xamp/patches/patch-av b/audio/xamp/patches/patch-av
deleted file mode 100644
index 5a76748cdd9..00000000000
--- a/audio/xamp/patches/patch-av
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-av,v 1.1 2004/05/11 12:18:37 wiz Exp $
-
---- ../args.c.orig 1998-07-30 15:53:01.000000000 +0200
-+++ ../args.c
-@@ -51,7 +51,7 @@ usage: amp [options] [ MPEG audio stream
- (for use with xmpeg3 or similar GUIs)\n\
- -w wav output\n\
- -downmix downmix stereo streams to one channel\n\
-- -die play the playlist and quit\n
-+ -die play the playlist and quit\n\
- -nobuffer do not use an audio buffer\n\
- -volume <vol> set the volume to <vol> (0-100)\n\
- -debug <opts..> When compiled in debug <opt, opt2,...> code sections\n\
diff --git a/audio/xamp/patches/patch-aw b/audio/xamp/patches/patch-aw
deleted file mode 100644
index 4710903f73b..00000000000
--- a/audio/xamp/patches/patch-aw
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aw,v 1.1 2004/05/11 12:18:37 wiz Exp $
-
---- QMyListBox.cpp.orig 1997-08-30 18:08:16.000000000 +0200
-+++ QMyListBox.cpp
-@@ -6,7 +6,7 @@
- */
- #include "QMyListBox.h"
-
--QMyListBox::QMyListBox(QWidget *parent=0, const char *name=0, WFlags f=0)
-+QMyListBox::QMyListBox(QWidget *parent, const char *name, WFlags f)
- : QListBox(parent, name, f) {
- }
-
diff --git a/audio/xamp/patches/patch-ax b/audio/xamp/patches/patch-ax
deleted file mode 100644
index 2730637e2bb..00000000000
--- a/audio/xamp/patches/patch-ax
+++ /dev/null
@@ -1,270 +0,0 @@
-$NetBSD: patch-ax,v 1.1 2004/05/11 12:18:37 wiz Exp $
-
---- readme.h.orig 1997-10-05 16:18:16.000000000 +0200
-+++ readme.h
-@@ -1,133 +1,133 @@
--#define strim "
--amp MPEG audio decoder readme file (version 0.7.6)
--(C) Tomislav Uzelac 1996,1997
--
--amp is free software and can be _used_ freely by anyone. If you want to
--do anything else with it, be sure to check the Legal section of this
--document for legal issues.
--
--THERE IS NO WARRANTY FOR THIS PROGRAM. Please check out the Legal section
--of this document.
--
--1. Introduction
--2. Installation
--3. Running
--4. Feedback
--5. Contributing
--6. Legal
--
--
--1. Introduction
--
--amp (Audio Mpeg Player) is an MPEG audio decoder which I originally started
--putting together as a side project of the MPEG hardware design project at
--FER/Zagreb - just to confirm my knowledge of the standard. It works with
--both MPEG1 and MPEG2 audio streams (except for the multichannel extensions
--defined in MPEG2), layers 2 and 3.
--
--There is a gui for amp, written in Tcl/Tk by Edouard Lafargue. It is
--available at the amp home site ftp://ftp.rasip.fer.hr
--
--Another gui supported is the Sajber Jukebox, written by Joel Lindholm
--<wizball@kewl.campus.luth.se>
--
--The following people contributed their time and knowledge to amp:
--Karl Anders Oygard, Ilkka Karvinen, Lutz Vieweg, Dan Nelson,
--Edouard Lafargue, Andrew Richards, George Colouris,
--Dmitry Boldyrev, Andy Lo A Foe, Thomas Sailer
--
--amp home location is
-- ftp://ftp.rasip.fer.hr/pub/mpeg/
--
--and the mailing list: send 'HELP' in the body of the message to:
-- multimedia@rasip.fer.hr
--
--If you want to find out more about MPEG, best places to start are
-- http://www.mpeg.org
-- http://www.mpeg2.de
--
--
--2. Installation
--
--Installation should be simple enough if amp was ported to your system,
--just do a
--
--./configure
--make
--
--You can edit the makefile further to suit your system. If configure fails
--to make a usable Makefile, you'll _have_ to edit it yourself.
--
--Linux users should try real-time playing support, as described
--in doc/realtime.txt. Some people that might pass on this feature are
--those with slower machines (i.e. 486's), or SMP systems (see the
--doc/linuxrealtime.txt file).
--Some versions of the linux C library produce an error when compiling
--amp with realtime support. A quick fix is to edit /usr/include/sched.h
--and replace _P in the offending line with __P.
--
--./configure --enable-realtime
--make
--chown root.root amp
--chmod u+s amp
--
--
--3. Running:
--
--'amp -h' gives you usage & options. If your computer is on the slower
--side, direct playback might not work, but you can decode it
--to .wav or raw pcm and play it later.
--
--
--4. Feedback
--
--Send in your makefiles, opinions, bugreports, fixes; anything related to this
--program. You can also send me unlimited amounts of money, sugar, milk, etc.
--
--If you find any mpeg audio files that amp has trouble decoding, please tell
--me about this via e-mail <tuzelac@rasip.fer.hr>.
--
--
--5. Contributing
--
--Please contribute to amp. If you want to know what is going on in amp
--development, you can join the developers mailing list
--
-- mpeg_audio_developers@rasip.fer.hr
--
--There are certain debugging facilities that I made in amp, but are disabled
--in the current release (they are neither nice nor user-friendly). If anyone
--enhances them (they are in dump.c) to the point that they're actually
--usable I'll be happy to include the changes in the release. I think this
--kind of debug output would be very useful to people studying these audio
--algorithms.
--
--
--6. Legal
--
--This software can be used freely for any purpose. It can be distributed
--freely, as long as it is not sold commercially without permission from
--Tomislav Uzelac <tuzelac@rasip.fer.hr>. However, including this software
--on CD_ROMs containing other free software is explicitly permitted even
--when a modest distribution fee is charged for the CD, as long as this
--software is not a primary selling argument for the CD.
--
--Building derived versions of this software is permitted, as long as they
--are not sold commercially without permission from Tomislav Uzelac
--<tuzelac@rasip.fer.hr>. Any derived versions must be clearly marked as
--such, and must be called by a name other than amp. Any derived versions
--must retain this copyright notice.
--
--/* This license is itself copied from Tatu Ylonen's ssh package. It does
-- * not mention being copyrighted itself :)
-- */
--
--THERE IS NO WARRANTY FOR THIS PROGRAM - whatsoever. You use it entirely
--at your risk, and neither Tomislav Uzelac, nor FER will be liable for
--any damages that might occur to your computer, software, etc. in
--consequence of you using this freeware program.
--
--
--Tomislav Uzelac
--<tuzelac@rasip.fer.hr>
-+#define strim "\
-+amp MPEG audio decoder readme file (version 0.7.6)\n\
-+(C) Tomislav Uzelac 1996,1997\n\
-+\n\
-+amp is free software and can be _used_ freely by anyone. If you want to\n\
-+do anything else with it, be sure to check the Legal section of this\n\
-+document for legal issues.\n\
-+\n\
-+THERE IS NO WARRANTY FOR THIS PROGRAM. Please check out the Legal section\n\
-+of this document.\n\
-+\n\
-+1. Introduction\n\
-+2. Installation\n\
-+3. Running\n\
-+4. Feedback\n\
-+5. Contributing\n\
-+6. Legal\n\
-+\n\
-+\n\
-+1. Introduction\n\
-+\n\
-+amp (Audio Mpeg Player) is an MPEG audio decoder which I originally started \n\
-+putting together as a side project of the MPEG hardware design project at \n\
-+FER/Zagreb - just to confirm my knowledge of the standard. It works with\n\
-+both MPEG1 and MPEG2 audio streams (except for the multichannel extensions\n\
-+defined in MPEG2), layers 2 and 3. \n\
-+\n\
-+There is a gui for amp, written in Tcl/Tk by Edouard Lafargue. It is \n\
-+available at the amp home site ftp://ftp.rasip.fer.hr\n\
-+\n\
-+Another gui supported is the Sajber Jukebox, written by Joel Lindholm \n\
-+<wizball@kewl.campus.luth.se>\n\
-+\n\
-+The following people contributed their time and knowledge to amp:\n\
-+Karl Anders Oygard, Ilkka Karvinen, Lutz Vieweg, Dan Nelson,\n\
-+Edouard Lafargue, Andrew Richards, George Colouris,\n\
-+Dmitry Boldyrev, Andy Lo A Foe, Thomas Sailer\n\
-+\n\
-+amp home location is\n\
-+ ftp://ftp.rasip.fer.hr/pub/mpeg/\n\
-+\n\
-+and the mailing list: send 'HELP' in the body of the message to:\n\
-+ multimedia@rasip.fer.hr\n\
-+\n\
-+If you want to find out more about MPEG, best places to start are\n\
-+ http://www.mpeg.org\n\
-+ http://www.mpeg2.de \n\
-+\n\
-+\n\
-+2. Installation\n\
-+\n\
-+Installation should be simple enough if amp was ported to your system,\n\
-+just do a \n\
-+\n\
-+./configure\n\
-+make \n\
-+\n\
-+You can edit the makefile further to suit your system. If configure fails \n\
-+to make a usable Makefile, you'll _have_ to edit it yourself.\n\
-+\n\
-+Linux users should try real-time playing support, as described\n\
-+in doc/realtime.txt. Some people that might pass on this feature are\n\
-+those with slower machines (i.e. 486's), or SMP systems (see the\n\
-+doc/linuxrealtime.txt file). \n\
-+Some versions of the linux C library produce an error when compiling\n\
-+amp with realtime support. A quick fix is to edit /usr/include/sched.h\n\
-+and replace _P in the offending line with __P.\n\
-+\n\
-+./configure --enable-realtime\n\
-+make\n\
-+chown root.root amp\n\
-+chmod u+s amp\n\
-+\n\
-+\n\
-+3. Running:\n\
-+\n\
-+'amp -h' gives you usage & options. If your computer is on the slower\n\
-+side, direct playback might not work, but you can decode it\n\
-+to .wav or raw pcm and play it later.\n\
-+\n\
-+\n\
-+4. Feedback\n\
-+\n\
-+Send in your makefiles, opinions, bugreports, fixes; anything related to this\n\
-+program. You can also send me unlimited amounts of money, sugar, milk, etc.\n\
-+\n\
-+If you find any mpeg audio files that amp has trouble decoding, please tell\n\
-+me about this via e-mail <tuzelac@rasip.fer.hr>.\n\
-+\n\
-+\n\
-+5. Contributing\n\
-+\n\
-+Please contribute to amp. If you want to know what is going on in amp \n\
-+development, you can join the developers mailing list\n\
-+\n\
-+ mpeg_audio_developers@rasip.fer.hr\n\
-+\n\
-+There are certain debugging facilities that I made in amp, but are disabled\n\
-+in the current release (they are neither nice nor user-friendly). If anyone\n\
-+enhances them (they are in dump.c) to the point that they're actually\n\
-+usable I'll be happy to include the changes in the release. I think this\n\
-+kind of debug output would be very useful to people studying these audio\n\
-+algorithms.\n\
-+\n\
-+\n\
-+6. Legal\n\
-+\n\
-+This software can be used freely for any purpose. It can be distributed\n\
-+freely, as long as it is not sold commercially without permission from\n\
-+Tomislav Uzelac <tuzelac@rasip.fer.hr>. However, including this software\n\
-+on CD_ROMs containing other free software is explicitly permitted even \n\
-+when a modest distribution fee is charged for the CD, as long as this\n\
-+software is not a primary selling argument for the CD.\n\
-+\n\
-+Building derived versions of this software is permitted, as long as they\n\
-+are not sold commercially without permission from Tomislav Uzelac \n\
-+<tuzelac@rasip.fer.hr>. Any derived versions must be clearly marked as\n\
-+such, and must be called by a name other than amp. Any derived versions\n\
-+must retain this copyright notice.\n\
-+\n\
-+/* This license is itself copied from Tatu Ylonen's ssh package. It does \n\
-+ * not mention being copyrighted itself :)\n\
-+ */\n\
-+\n\
-+THERE IS NO WARRANTY FOR THIS PROGRAM - whatsoever. You use it entirely\n\
-+at your risk, and neither Tomislav Uzelac, nor FER will be liable for\n\
-+any damages that might occur to your computer, software, etc. in\n\
-+consequence of you using this freeware program.\n\
-+\n\
-+\n\
-+Tomislav Uzelac\n\
-+<tuzelac@rasip.fer.hr>\n\
- "
diff --git a/audio/xamp/patches/patch-ay b/audio/xamp/patches/patch-ay
deleted file mode 100644
index 67c6eff7aae..00000000000
--- a/audio/xamp/patches/patch-ay
+++ /dev/null
@@ -1,284 +0,0 @@
-$NetBSD: patch-ay,v 1.1 2004/05/11 12:18:37 wiz Exp $
-
---- readmex.h.orig 1998-02-10 22:33:22.000000000 +0100
-+++ readmex.h
-@@ -1,140 +1,140 @@
--#define strimx "
--WHAT IS IT?
--
--Xamp is a version of amp plus a gui. Read the regular README on info about
--amp. It was developed on an cx86 running Linux, so it should be pretty
--portable. It doesn't take much cpu time; if your computer can run regular
--amp, it'll probably run Xamp.
--
--INSTALLING
--
--You'll need Qt (+include files), libX11 (+include files), a properly set up
--X server somewhere and a properly configured sound driver.
--
--$ tar xzvvf xamp-0.8.tgz
--# be carefull here. You need to enter the xamp-0.8/ directory again otherwise
--# you will get just the command line amp.
--$ cd xamp-0.8/xamp-0.8/
--$ ./configure
--
--should take care of most configuration issues. I don't know autoconf very
--well, but I think what I added to amp's script works pretty well. Then just
--run make and you will get a binary called xamp. Just execute that and have
--fun with Xamp.
--
--DEBIAN USERS INSTALL (i386 only)
--
--You can get a deb packet insted of the source or binary to install on a
--debian linux system. The install from here it is really easy. All you need
--is that you have installed qt properly and then just as root type
--
--# dpkg -i xamp_0.8-1_i386.deb
--
--the filaname can be different, depends on the Xamp version.
--
--REDHAT USERS INSTALL (i386 only)
--
--There is a rpm of the package as well. For those with RedHat just get the
--xamp binary in the rpm format and execute as root
--
--# rpm -ivh xamp-0.8-1.i386.rpm
--
--the filaname can be different, depends on the Xamp version.
--
--RUNNING
--
--The program pretty much speaks for itself. There is a playlist from which
--the player plays. you can specify the initial list on the commandline (eg.
--$ xamp ~/mp3s/TypeO*mp3) or start empty. Click on the 'LOAD' button to get
--to the playlist editor. You can add new files, delete them and move items
--around by dragging. You can save the playlist to a flat textfile (one line
--per item) and you can load such files. Doubleclick on an item to make the
--player play that item.
--
--The main screen has regular previous, play/pause, stop and next
--buttons. there's also a shuffle and repeat togglebutton. You'll figure it out.
--
--There is an option added now that you can put a background in
--/usr/X11R6/lib/X11/xamp/ as a file back.bmp (i did tested it just with
--bitmaps, but it should work with pixmaps as well..). The one and only
--problem is that the filename must be in that exact path with name back.bmp
--
--SHORTCUTS
--
--In new versions of Xamp there are shortcuts for all the main functions that
--Xamp supports.
--
--Here are the shortcuts and the description for the command
-- Z - Rewind
-- X - Play/Pause
-- C - Stop
-- V - Fast forward
-- N - Mono/Stero adjustments
-- M - Mute
-- S - Shuffle mode playing
-- R - Repeat the song
-- UpKey - Incrase volume
-- DownKey - Decrase volume
-- LeftKey - Balance to left
-- RightKey - Balance to right
-- A - About dialog
-- ALT + Q - Quit
--
-- Double click on the song label opens the id3 tag editor
--
--There are some in the playlist editor, but those shortcuts characters are
--underlined and you can connect with ALT+key.
--
--PROBLEMS
--
--if it dumps core, please send a patch or a detailed bugreport (don't attach
--the mp3!). this version seems pretty solid compared to the last, but I know
--I'm not a very good tester.
--
--xamp will refuse to play some weird (but compliant, according to the
--standard) mp3's, like ones that change bitrates halfway through or strange
--bitrates I couldn't reproduce here. the problem is that the function that
--gets called after you pull the slider needs to calculate where it should go
--in the mp3 stream. there are some magic values involved that calculation. I
--can't find out those values for weird bitrates I can't reproduce here, and I
--don't even want to think about the bitrate-switching streams.
--
--it was either keeping tabs on offsets while playing (slow & irritating,
--especially when seeking forward) or an ugly seeking function with a lot of
--magic values. the ugly function does seem to work for most cases, so I stuck
--with it. _if_ you should encounter an mp3 xamp won't play, email me.
--(andrej.bagon@uni-mb.si)
--
--BUGS
--
--I know about that quit bug. If somebody does solve that thing please
--just report to me how I should get rid of it.. Thanx.
--The playlist Length thing.. I dont know for now how to implement that length
--of the playlist, so I consider it a bug.
--Other bug reports are welcome!
--As a ID3 TAG editor was added.. you might encounter some problems.. not
--yet fully tested.
--
--TODO
--
-- - stuff warnings (and errors?) into a messagebox
-- - multiple selection in the playlist editor
-- - some sort of bouncy fft or osciloscope graph.
--
--THANKS TO
--
-- - Tomislav & the rest for making amp.
-- - Adnans for BeMP, providing an idea on how to go about this.
-- - Lodewijk Voge for his port in the Xwindow system.
-- - the makers of the underlying system (dlgedit, Qt, etc down to the silicon)
--
--Legal addendum to the amp README:
--
--everything in this package that is not in the original amp package this
--version is based on, is released under the GNU General Public License. you
--make a derivative version -> you release the source, you mark your changes and
--you give credit where credit is due. clearly.
--
--Lodewijk V\"oge <lvoge@cs.vu.nl> and
--for Xamp Andrej Bagon <andrej.bagon@uni-mb.si>
-+#define strimx "\
-+WHAT IS IT?\n\
-+\n\
-+Xamp is a version of amp plus a gui. Read the regular README on info about\n\
-+amp. It was developed on an cx86 running Linux, so it should be pretty\n\
-+portable. It doesn't take much cpu time; if your computer can run regular\n\
-+amp, it'll probably run Xamp.\n\
-+\n\
-+INSTALLING\n\
-+\n\
-+You'll need Qt (+include files), libX11 (+include files), a properly set up\n\
-+X server somewhere and a properly configured sound driver.\n\
-+\n\
-+$ tar xzvvf xamp-0.8.tgz\n\
-+# be carefull here. You need to enter the xamp-0.8/ directory again otherwise \n\
-+# you will get just the command line amp.\n\
-+$ cd xamp-0.8/xamp-0.8/\n\
-+$ ./configure\n\
-+\n\
-+should take care of most configuration issues. I don't know autoconf very\n\
-+well, but I think what I added to amp's script works pretty well. Then just\n\
-+run make and you will get a binary called xamp. Just execute that and have\n\
-+fun with Xamp.\n\
-+\n\
-+DEBIAN USERS INSTALL (i386 only)\n\
-+ \n\
-+You can get a deb packet insted of the source or binary to install on a\n\
-+debian linux system. The install from here it is really easy. All you need\n\
-+is that you have installed qt properly and then just as root type\n\
-+\n\
-+# dpkg -i xamp_0.8-1_i386.deb\n\
-+ \n\
-+the filaname can be different, depends on the Xamp version.\n\
-+ \n\
-+REDHAT USERS INSTALL (i386 only)\n\
-+ \n\
-+There is a rpm of the package as well. For those with RedHat just get the\n\
-+xamp binary in the rpm format and execute as root\n\
-+\n\
-+# rpm -ivh xamp-0.8-1.i386.rpm\n\
-+\n\
-+the filaname can be different, depends on the Xamp version.\n\
-+\n\
-+RUNNING\n\
-+\n\
-+The program pretty much speaks for itself. There is a playlist from which\n\
-+the player plays. you can specify the initial list on the commandline (eg.\n\
-+$ xamp ~/mp3s/TypeO*mp3) or start empty. Click on the 'LOAD' button to get\n\
-+to the playlist editor. You can add new files, delete them and move items\n\
-+around by dragging. You can save the playlist to a flat textfile (one line\n\
-+per item) and you can load such files. Doubleclick on an item to make the\n\
-+player play that item.\n\
-+\n\
-+The main screen has regular previous, play/pause, stop and next\n\
-+buttons. there's also a shuffle and repeat togglebutton. You'll figure it out.\n\
-+\n\
-+There is an option added now that you can put a background in\n\
-+/usr/X11R6/lib/X11/xamp/ as a file back.bmp (i did tested it just with\n\
-+bitmaps, but it should work with pixmaps as well..). The one and only\n\
-+problem is that the filename must be in that exact path with name back.bmp\n\
-+ \n\
-+SHORTCUTS\n\
-+ \n\
-+In new versions of Xamp there are shortcuts for all the main functions that\n\
-+Xamp supports.\n\
-+ \n\
-+Here are the shortcuts and the description for the command\n\
-+ Z - Rewind\n\
-+ X - Play/Pause\n\
-+ C - Stop\n\
-+ V - Fast forward\n\
-+ N - Mono/Stero adjustments\n\
-+ M - Mute\n\
-+ S - Shuffle mode playing\n\
-+ R - Repeat the song\n\
-+ UpKey - Incrase volume\n\
-+ DownKey - Decrase volume\n\
-+ LeftKey - Balance to left\n\
-+ RightKey - Balance to right\n\
-+ A - About dialog\n\
-+ ALT + Q - Quit\n\
-+\n\
-+ Double click on the song label opens the id3 tag editor\n\
-+ \n\
-+There are some in the playlist editor, but those shortcuts characters are\n\
-+underlined and you can connect with ALT+key.\n\
-+\n\
-+PROBLEMS\n\
-+\n\
-+if it dumps core, please send a patch or a detailed bugreport (don't attach\n\
-+the mp3!). this version seems pretty solid compared to the last, but I know\n\
-+I'm not a very good tester.\n\
-+\n\
-+xamp will refuse to play some weird (but compliant, according to the\n\
-+standard) mp3's, like ones that change bitrates halfway through or strange\n\
-+bitrates I couldn't reproduce here. the problem is that the function that\n\
-+gets called after you pull the slider needs to calculate where it should go\n\
-+in the mp3 stream. there are some magic values involved that calculation. I\n\
-+can't find out those values for weird bitrates I can't reproduce here, and I\n\
-+don't even want to think about the bitrate-switching streams.\n\
-+\n\
-+it was either keeping tabs on offsets while playing (slow & irritating,\n\
-+especially when seeking forward) or an ugly seeking function with a lot of\n\
-+magic values. the ugly function does seem to work for most cases, so I stuck\n\
-+with it. _if_ you should encounter an mp3 xamp won't play, email me.\n\
-+(andrej.bagon@uni-mb.si)\n\
-+\n\
-+BUGS\n\
-+\n\
-+I know about that quit bug. If somebody does solve that thing please\n\
-+just report to me how I should get rid of it.. Thanx.\n\
-+The playlist Length thing.. I dont know for now how to implement that length\n\
-+of the playlist, so I consider it a bug.\n\
-+Other bug reports are welcome!\n\
-+As a ID3 TAG editor was added.. you might encounter some problems.. not\n\
-+yet fully tested.\n\
-+ \n\
-+TODO\n\
-+\n\
-+ - stuff warnings (and errors?) into a messagebox\n\
-+ - multiple selection in the playlist editor\n\
-+ - some sort of bouncy fft or osciloscope graph.\n\
-+\n\
-+THANKS TO\n\
-+\n\
-+ - Tomislav & the rest for making amp.\n\
-+ - Adnans for BeMP, providing an idea on how to go about this.\n\
-+ - Lodewijk Voge for his port in the Xwindow system.\n\
-+ - the makers of the underlying system (dlgedit, Qt, etc down to the silicon)\n\
-+\n\
-+Legal addendum to the amp README:\n\
-+\n\
-+everything in this package that is not in the original amp package this\n\
-+version is based on, is released under the GNU General Public License. you\n\
-+make a derivative version -> you release the source, you mark your changes and\n\
-+you give credit where credit is due. clearly.\n\
-+\n\
-+Lodewijk V\"oge <lvoge@cs.vu.nl> and\n\
-+for Xamp Andrej Bagon <andrej.bagon@uni-mb.si>\n\
- "
diff --git a/audio/xanalyser/DESCR b/audio/xanalyser/DESCR
deleted file mode 100644
index e49ccff237b..00000000000
--- a/audio/xanalyser/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-The frequency analyser showes the frequency spectrum of the source,
-either separately for both channels or together. Roughly speaking
-the XY scope draws a plots where the left channel is used for the
-x axis and the right channel for the y axis. Thus a audio signal
-only present on the left channel produces a horizontal line, whereas
-a audio signal only present on the right channel produces a vertical
-line. Can be used as a PC-Based RTA.
diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile
deleted file mode 100644
index 6bbc4d508d5..00000000000
--- a/audio/xanalyser/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2007/02/22 19:01:14 wiz Exp $
-#
-
-DISTNAME= xanalyser-1.24
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= http://arvin.schnell-web.net/xanalyser/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= root@garbled.net
-HOMEPAGE= http://arvin.schnell-web.net/xanalyser/
-COMMENT= Frequency spectrum analyser for X
-
-USE_LANGUAGES= c c++
-GNU_CONFIGURE= yes
-
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../mk/motif.buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xanalyser/PLIST b/audio/xanalyser/PLIST
deleted file mode 100644
index ccbb72fcf1f..00000000000
--- a/audio/xanalyser/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/05/12 14:47:11 schmonz Exp $
-bin/xanalyser
-lib/X11/app-defaults/XAnalyser
-man/man1/xanalyser.1
diff --git a/audio/xanalyser/distinfo b/audio/xanalyser/distinfo
deleted file mode 100644
index 1c0166498af..00000000000
--- a/audio/xanalyser/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.9 2005/12/11 20:46:50 joerg Exp $
-
-SHA1 (xanalyser-1.24.tar.bz2) = 0b261568b8573d81b7e99980c2ffede6be683bdb
-RMD160 (xanalyser-1.24.tar.bz2) = 9fa7c1ae489be127ca8e519168eb7b48bbabab24
-Size (xanalyser-1.24.tar.bz2) = 73451 bytes
-SHA1 (patch-aa) = c0504392de44bcde7235bf6e5617764ae34b1ec4
-SHA1 (patch-ab) = 505f9814afdad9aa558ccf980321805f66d8c9e3
-SHA1 (patch-ad) = 46d15c6ff4ddc236de7d424dee667088dd693062
diff --git a/audio/xanalyser/patches/patch-aa b/audio/xanalyser/patches/patch-aa
deleted file mode 100644
index 632ffd3a373..00000000000
--- a/audio/xanalyser/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/12/11 20:46:50 joerg Exp $
-
---- src/pcm.cc.orig 2005-12-11 20:35:40.000000000 +0000
-+++ src/pcm.cc
-@@ -9,6 +9,8 @@
- #include <stdlib.h>
- #ifdef __NetBSD__
- # include <machine/byte_swap.h>
-+#elif defined(__DragonFly__)
-+# include <sys/endian.h>
- #else
- # include <byteswap.h>
- #endif
-@@ -122,7 +124,7 @@ PCM::swap_buffer (void* buffer, int fram
- case S16: {
- int16_t* tmp_buffer = (int16_t*) buffer;
- for (int i = n; i != 0; i--) {
--#ifdef __NetBSD__
-+#if defined(__NetBSD__) || defined(__DragonFly__)
- *tmp_buffer = bswap16 (*tmp_buffer);
- #else
- *tmp_buffer = bswap_16 (*tmp_buffer);
-@@ -134,7 +136,7 @@ PCM::swap_buffer (void* buffer, int fram
- case S32: {
- int32_t* tmp_buffer = (int32_t*) buffer;
- for (int i = n; i != 0; i--) {
--#ifdef __NetBSD__
-+#if defined(__NetBSD__) || defined(__DragonFly__)
- *tmp_buffer = bswap32 (*tmp_buffer);
- #else
- *tmp_buffer = bswap_32 (*tmp_buffer);
diff --git a/audio/xanalyser/patches/patch-ab b/audio/xanalyser/patches/patch-ab
deleted file mode 100644
index d0f2d1d011f..00000000000
--- a/audio/xanalyser/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2005/12/11 20:46:50 joerg Exp $
-
---- src/Sample.cc.orig 2005-12-11 20:37:17.000000000 +0000
-+++ src/Sample.cc
-@@ -12,6 +12,8 @@
- #include <errno.h>
- #ifdef __NetBSD__
- # include <machine/endian.h>
-+#elif defined(__DragonFly__)
-+# include <sys/endian.h>
- #else
- # include <endian.h>
- #endif
diff --git a/audio/xanalyser/patches/patch-ad b/audio/xanalyser/patches/patch-ad
deleted file mode 100644
index 2f10dc84114..00000000000
--- a/audio/xanalyser/patches/patch-ad
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2005/01/09 08:37:48 schmonz Exp $
-
---- src/Makefile.in.orig 2004-08-28 17:06:57.000000000 -0400
-+++ src/Makefile.in
-@@ -107,7 +107,7 @@ xanalyser_SOURCES = \
-
-
- xanalyser_LDADD = -lXext -lXm -lXt -lSM -lICE -lXmu -lXpm -lX11 \
-- $(FFTWLDADD) $(ALSALDADD)
-+ ${LIBOSSAUDIO} $(FFTWLDADD) $(ALSALDADD)
-
-
- EXTRA_DIST = XAnalyser.ad help.txt *.xpm
-@@ -375,8 +375,8 @@ uninstall-am: uninstall-binPROGRAMS unin
-
- main.cc: XAnalyser.ad.h
-
--XAnalyser.ad.h: XAnalyser.ad
-- ad2c XAnalyser.ad > XAnalyser.ad.h
-+#XAnalyser.ad.h: XAnalyser.ad
-+# ad2c XAnalyser.ad > XAnalyser.ad.h
-
- help.cc: help.txt.h
-
-@@ -384,8 +384,8 @@ help.txt.h: help.txt
- txt2c help.txt > help.txt.h
-
- install-data-hook:
-- mkdir -p $(DESTDIR)/usr/X11R6/lib/X11/app-defaults
-- cp XAnalyser.ad $(DESTDIR)/usr/X11R6/lib/X11/app-defaults/XAnalyser
-+ mkdir -p $(DESTDIR)$(prefix)/lib/X11/app-defaults
-+ cp XAnalyser.ad $(DESTDIR)$(prefix)/lib/X11/app-defaults/XAnalyser
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/audio/xcdplayer/DESCR b/audio/xcdplayer/DESCR
deleted file mode 100644
index bd79aee41d4..00000000000
--- a/audio/xcdplayer/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-XCdplayer 2.2
-
-XCdplayer is a graphical user interface for controlling the CD-ROM
-drive under the X Window System. It provides visual feedback and
-gives the user facilities for mode selection, device control,
-scanning, and programming.
diff --git a/audio/xcdplayer/Makefile b/audio/xcdplayer/Makefile
deleted file mode 100644
index a1da3ffeabf..00000000000
--- a/audio/xcdplayer/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2007/02/22 19:26:08 wiz Exp $
-
-DISTNAME= xcdplayer-2.2
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.x.org/R5contrib/ \
- ftp://ftp.cdrom.com/pub/X11/R5contrib/
-EXTRACT_SUFX= .tar.Z
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= CD player for X
-
-NOT_FOR_PLATFORM= Interix-*-*
-
-USE_IMAKE= yes
-
-pre-configure:
- ${CP} ${FILESDIR}/cdrom_freebsd.c ${WRKSRC}
- ${CP} ${FILESDIR}/cdrom_freebsd.h ${WRKSRC}
- ${CP} ${WRKSRC}/xcdplayer.1 ${WRKSRC}/xcdplayer.man
-
-.include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xbitmaps/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xcdplayer/PLIST b/audio/xcdplayer/PLIST
deleted file mode 100644
index 3115f425767..00000000000
--- a/audio/xcdplayer/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/02/25 02:22:29 jschauma Exp $
-bin/xcdplayer
-lib/X11/app-defaults/XCdplayer
-${IMAKE_MAN_DIR}/xcdplayer.${IMAKE_MANNEWSUFFIX}.gz
diff --git a/audio/xcdplayer/distinfo b/audio/xcdplayer/distinfo
deleted file mode 100644
index 0b95a162b77..00000000000
--- a/audio/xcdplayer/distinfo
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: distinfo,v 1.6 2006/08/12 14:51:39 darcy Exp $
-
-SHA1 (xcdplayer-2.2.tar.Z) = e518f2df9fcc5e21e1123fe6f5b1193f232b76ef
-RMD160 (xcdplayer-2.2.tar.Z) = ba34fe8092aa96d6370320b20fa46b0b0d043176
-Size (xcdplayer-2.2.tar.Z) = 89435 bytes
-SHA1 (patch-aa) = a22f9ef4d86f62c0ca86637938b72a612f42b645
-SHA1 (patch-ab) = 6712998794fdb968e297605c380fa2d94c26a8e6
-SHA1 (patch-ac) = 4e3b501bd16f14183fa0e8970f8b1666ed524a45
-SHA1 (patch-ad) = 7a8956993438fe592aa36f6452222b6aa29ca911
-SHA1 (patch-ae) = 19d0222e673f41efe2733277062e56991960a9ed
-SHA1 (patch-af) = 54c96ac87764c222e48e0dcf4267a93cdd966843
-SHA1 (patch-ag) = cb787b19c00d8bda99367eb71dc5e234857a4539
-SHA1 (patch-ah) = 1cb1b6cbe95a0b921cd4dc0ac62dadd5d17e0735
-SHA1 (patch-ai) = 1bf094380473d4a88c61378ff6172a90df510541
-SHA1 (patch-aj) = 9e463da2b79dee2ff7d52d519da85800dc6ac0bc
-SHA1 (patch-ak) = 25ee2b3ce20201ee586c414302685654cbc334e4
-SHA1 (patch-al) = 3a39ae09e981650e9d271d8db8caaf3fe41f016e
-SHA1 (patch-am) = 16347fa0157de6ecca0c8c6c946cbb3a1c406ecb
diff --git a/audio/xcdplayer/files/cdrom_freebsd.c b/audio/xcdplayer/files/cdrom_freebsd.c
deleted file mode 100644
index 62b523e1844..00000000000
--- a/audio/xcdplayer/files/cdrom_freebsd.c
+++ /dev/null
@@ -1,611 +0,0 @@
-/* $NetBSD: cdrom_freebsd.c,v 1.6 2005/12/11 20:48:46 joerg Exp $ */
-/*
- * Copyright (C) 1990 Regents of the University of California.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and that
- * both that copyright notice and this permission notice appear in
- * supporting documentation, and that the name of the University of
- * California not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission. the University of California makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- */
-
-static int c;
-
-# include <stdio.h>
-# include <sys/file.h>
-# include <sys/types.h>
-# include <sys/param.h>
-# include <sys/stat.h>
-# include <string.h>
-#ifndef __DragonFly__
-# include <sys/buf.h>
-#endif
-# include <sys/time.h>
-
-#include <sys/ioctl.h>
-#include <sys/disklabel.h>
-#include <sys/cdio.h>
-
-# include "debug.h"
-# include "cdrom_freebsd.h"
-# include "app.h"
-
-#ifdef __NetBSD__
-static char cdrom[] = "/dev/rcd0d";
-static char cdrom1[] = "/dev/rmcd0d";
-#else
-static char cdrom[] = "/dev/rcd0c";
-static char cdrom1[] = "/dev/rmcd0c";
-#endif
-
-cdrom_info cdi;
-char info_filename[256];
-FILE *disc_info = NULL;
-
-static int cdrom_fd = -1;
-
-extern AppData app_data;
-
-get_stored_info()
-{
- int i,n;
- char line[100];
- char *title;
-
- if(disc_info) {
- fclose(disc_info);
- disc_info = NULL;
- }
-
- if ( cdi.maxtrack == 0) {
- return(0);
- }
- for (i = 0, n = 0; i < cdi.maxtrack; i++)
- n = n + ((i+1) * cdi.times[i]);
- n = n / cdi.maxtrack;
-
- disc_title = NULL;
- if (app_data.cdInfoDir != NULL)
- sprintf(info_filename, "%s/cd.%d", app_data.cdInfoDir, n);
- else
- sprintf(info_filename, "cd.%d", n);
-
- if ((disc_info = fopen(info_filename, "r")) != NULL)
- {
- fgets(line, 100, disc_info);
- title = strchr(line, ':');
- if (title != NULL)
- {
- *(strchr(title, '\n')) = '\0';
- disc_title = strdup(title + 1);
- }
- fgets(line, 100, disc_info);
- sscanf(line, "Program: %s", program_str);
- }
- else {
- disc_title = strdup(NOTITLESTR);
- program_str[0] = 0;
- }
- if (disc_title == NULL) {
- disc_title = strdup(NOTITLESTR);
- }
-}
-
-int
-cdrom_open() {
- int n;
- extern void update_title();
-
- if (cdrom_fd != -1)
- return(cdi.curtrack);
-
- if (app_data.device != NULL) {
- if ((cdrom_fd = open(app_data.device, O_RDONLY)) == -1) {
- perror(app_data.device);
- return(-1);
- }
- } else {
- if ( (cdrom_fd = open(cdrom, O_RDONLY)) == -1
- && (cdrom_fd = open(cdrom1, O_RDONLY)) == -1
- ) {
- perror("open: ");
- return(-1);
- }
- }
-
- if (cdrom_get_times() == -1) {
- cdrom_close();
- return(-1);
- }
-
- if ((n = cdrom_get_curtrack()) == -1)
- return(-1);
-
- get_stored_info();
-
- update_title();
-
- if (cdi.state & CDROM_STATE_PLAY)
- cdi.curtrack = n;
-
- if (cdi.state & CDROM_STATE_SHUFFLE)
- shuffle_setup();
-
- return(cdi.curtrack);
-}
-
-void
-cdrom_close() {
- if (cdrom_fd == -1)
- return;
-
- if (cdi.times != NULL) {
- free((char *) cdi.times);
- free((char *) cdi.addrs);
- cdi.times = NULL;
- cdi.addrs = NULL;
- }
-
- (void) close(cdrom_fd);
- cdrom_fd = -1;
-}
-
-
-int
-cdrom_start() {
- if (cdrom_fd == -1)
- return(-1);
-
- if (ioctl(cdrom_fd, CDIOCSTART) == -1) {
- perror("ioctl(cdromstart)");
- return(-1);
- }
-
- return(0);
-}
-
-int
-cdrom_stop() {
- if (cdrom_fd == -1)
- return(-1);
-
- if (ioctl(cdrom_fd, CDIOCSTOP) == -1) {
- perror("ioctl(cdromstop)");
- return(-1);
- }
-
- return(0);
-}
-
-int
-cdrom_eject() {
- if (cdrom_fd == -1)
- return(-1);
-
- if (ioctl(cdrom_fd, CDIOCALLOW) == -1) {
- perror("ioctl(cdromallow)");
- return(-1);
- }
-
- if (ioctl(cdrom_fd, CDIOCEJECT) == -1) {
- perror("ioctl(cdromeject)");
- return(-1);
- }
-
- return(0);
-}
-
-int
-cdrom_pause() {
- if (cdrom_fd == -1)
- return(-1);
-
- if (ioctl(cdrom_fd, CDIOCPAUSE) == -1) {
- perror("ioctl(cdrompause)");
- return(-1);
- }
-
- return(0);
-}
-
-int
-cdrom_resume() {
- if (cdrom_fd == -1)
- return(-1);
-
- if (ioctl(cdrom_fd, CDIOCRESUME) == -1) {
- perror("ioctl(cdromresume)");
- return(-1);
- }
-
- return(0);
-}
-
-int
-cdrom_volume(left_vol, right_vol)
- int left_vol;
- int right_vol;
-{
- struct ioc_vol vol;
-
- if (cdrom_fd == -1)
- return(-1);
-
- vol.vol[0] = left_vol;
- vol.vol[1] = right_vol;
- vol.vol[2] = 0;
- vol.vol[3] = 0;
-
- if (ioctl(cdrom_fd, CDIOCSETVOL, &vol) == -1) {
- perror("ioctl(cdromvolctrl)");
- return(-1);
- }
-
- return(0);
-}
-
-int
-cdrom_get_times() {
- struct ioc_toc_header tochdr;
- extern unsigned short *ushort_malloc();
- extern struct msf *msf_malloc();
- unsigned long trk, trk_total, otime;
- struct msf msf;
-
- if (cdrom_read_tochdr(&tochdr) == -1)
- return(-1);
-
- cdi.mintrack = tochdr.starting_track;
- cdi.maxtrack = tochdr.ending_track;
-
- if (cdi.times != NULL)
- {
- free((char *) cdi.times);
- free((char *) cdi.addrs);
- cdi.times = NULL;
- cdi.addrs = NULL;
- }
-
- cdi.times = ushort_malloc(cdi.maxtrack - cdi.mintrack + 1);
- cdi.addrs = msf_malloc(cdi.maxtrack - cdi.mintrack + 2);
-
- otime = 0;
-
- for (trk = cdi.mintrack; trk <= cdi.maxtrack; trk++) {
- if (cdrom_get_msf(trk, &msf, &trk_total) == -1)
- return(-1);
-
- /* record start address for each track (track 1 starts at 0)*/
- cdi.addrs[trk - cdi.mintrack] = msf;
-
- trk_total -= otime;
-
- /* use start time of next track as length of previous */
- if (otime != 0)
- {
- cdi.times[trk - cdi.mintrack - 1] = trk_total;
- }
-
- otime += trk_total;
-
- }
-
- /* find start of leadout to get length of last track */
- if (cdrom_get_msf(CDROM_LEADOUT, &msf, &trk_total) == -1)
- return(-1);
-
- /* recode leadout start address */
- cdi.addrs[trk - cdi.mintrack] = msf;
- trk_total -= otime;
- otime += trk_total;
-
- cdi.times[trk - cdi.mintrack - 1] = trk_total;
- return(0);
-}
-
-int
-cdrom_get_curtrack() {
- struct cd_sub_channel_info data;
-
- if (cdrom_read_subchannel(&data) == -1)
- return(-1);
-
- switch (data.header.audio_status) {
- case CD_AS_AUDIO_INVALID:
- return(-1);
-
- /* playing track subchnl.cdsc_trk */
- case CD_AS_PLAY_IN_PROGRESS:
- return((int) data.what.position.track_number);
-
- /* paused on track subchnl.cdsc_trk */
- case CD_AS_PLAY_PAUSED:
- return((int) data.what.position.track_number);
-
- /* punt */
- case CD_AS_PLAY_COMPLETED:
- return(0);
-
- case CD_AS_PLAY_ERROR:
- return(-1);
-
- /* punt */
- case CD_AS_NO_STATUS:
- debug_printf(1, "cdrom_get_curtrack: no status\n");
- return(0);
- }
-
- /* bad value in cdsc_audiostatus */
- return(-1);
-}
-
-int
-cdrom_get_msf(track, msf, length)
- unsigned long track;
- struct msf *msf;
- unsigned long *length;
-{
- struct cd_toc_entry data;
-
- if (cdrom_read_tocentry(track, &data, sizeof(data)) == -1)
- return(-1);
-
- msf->minute = data.addr.msf.minute;
- msf->second = data.addr.msf.second;
- msf->frame = data.addr.msf.frame;
- *length = (((unsigned int) msf->minute) * 60) + (unsigned int) msf->second;
- return(0);
-}
-
-int
-cdrom_get_curmsf(msf)
- struct msf *msf;
-{
- struct cd_sub_channel_info data;
-
- if (cdrom_read_subchannel(&data) == -1)
- return(-1);
-
- msf->minute = data.what.position.absaddr.msf.minute;
- msf->second = data.what.position.absaddr.msf.second;
- msf->frame = data.what.position.absaddr.msf.frame;
- return (0);
-}
-
-int
-cdrom_play_track(start_track, end_track)
- unsigned char start_track;
- unsigned char end_track;
-{
- struct ioc_play_track ti;
- struct ioc_play_msf play_addr;
- char *addr;
-
- if (cdrom_fd == -1)
- return(-1);
-
- play_addr.start_m = cdi.addrs[start_track - cdi.mintrack].minute;
- play_addr.start_s = cdi.addrs[start_track - cdi.mintrack].second;
- play_addr.start_f = cdi.addrs[start_track - cdi.mintrack].frame;
- play_addr.end_m = cdi.addrs[end_track - cdi.mintrack + 1].minute;
- play_addr.end_s = cdi.addrs[end_track - cdi.mintrack + 1].second;
- play_addr.end_f = cdi.addrs[end_track - cdi.mintrack + 1].frame - 1;
-
- if(play_addr.end_f >= 75) {
- play_addr.end_f = 74;
- play_addr.end_s--;
- }
- if(play_addr.end_s >= 60) {
- play_addr.end_s = 59;
- play_addr.end_m--;
- }
- addr = (char *)&play_addr;
- if (ioctl(cdrom_fd, CDIOCPLAYMSF, &play_addr) == -1) {
- perror("ioctl(cdromplaymsftrk)");
- return(-1);
- }
-
- return(0);
-}
-
-int
-cdrom_play_msf(start_msf, end_msf)
- struct msf *start_msf;
- struct msf *end_msf;
-{
- struct ioc_play_msf play_addr;
-
- if (cdrom_fd == -1)
- return(-1);
-
- play_addr.start_m = start_msf->minute;
- play_addr.start_s = start_msf->second;
- play_addr.start_f = start_msf->frame;
- play_addr.end_m = end_msf->minute;
- play_addr.end_s = end_msf->second;
- play_addr.end_f = end_msf->frame;
-
- if (ioctl(cdrom_fd, CDIOCPLAYMSF, &play_addr) == -1) {
- perror("ioctl(cdromplaymsf)");
- return(-1);
- }
-
- return(0);
-}
-
-
-int
-cdrom_read_subchannel(data)
- struct cd_sub_channel_info *data;
-{
- struct ioc_read_subchannel subchnl;
-
- if (cdrom_fd == -1)
- return(-1);
-
- subchnl.address_format = CD_MSF_FORMAT;
- subchnl.data_format = CD_CURRENT_POSITION;
- subchnl.data_len = /* sizeof(struct cd_sub_channel_info)*/ 16;
- subchnl.track = 0;
- subchnl.data = data;
-
- if (ioctl(cdrom_fd, CDIOCREADSUBCHANNEL, (char *) &subchnl) == -1) {
- fprintf(stderr, "ioctl(cdromsubchnl): ");
- perror(cdrom);
- return(-1);
- }
-
- return(0);
-}
-
-int
-cdrom_read_track(track, data)
- unsigned int track;
- struct cd_sub_channel_info *data;
-{
- struct ioc_read_subchannel subchnl;
-
- if (cdrom_fd == -1)
- return(-1);
-
- subchnl.address_format = CD_MSF_FORMAT;
- subchnl.data_format = CD_TRACK_INFO;
- subchnl.data_len = /* sizeof(struct cd_sub_channel_info)*/ 24;
- subchnl.track = track;
- subchnl.data = data;
-
- if (ioctl(cdrom_fd, CDIOCREADSUBCHANNEL, (char *) &subchnl) == -1) {
- fprintf(stderr, "ioctl(cdromsubchnltrk): ");
- perror(cdrom);
- return(-1);
- }
-
- return(0);
-}
-
-int
-cdrom_read_tocentry(track, data, size)
- unsigned int track;
- struct cd_toc_entry *data;
- int size;
-{
- struct ioc_read_toc_entry tocentry;
-
- if (cdrom_fd == -1)
- return(-1);
-
- tocentry.starting_track = (unsigned char)track;
- tocentry.address_format = CD_MSF_FORMAT;
- tocentry.data_len = /* sizeof(struct cd_toc_entry)*/ size;
- tocentry.data = data;
-
- if (ioctl(cdrom_fd, CDIOREADTOCENTRYS, (char *) &tocentry) == -1) {
- perror("ioctl(cdromreadtocentry)");
- return(-1);
- }
-
- return(0);
-}
-
-int
-cdrom_read_tochdr(tochdr)
- struct ioc_toc_header *tochdr;
-{
- if (cdrom_fd == -1)
- return(-1);
-
- if (ioctl(cdrom_fd, CDIOREADTOCHEADER, (char *) tochdr) == -1) {
- perror("ioctl(cdromreadtochdr): ");
- return(-1);
- }
-
- return(0);
-}
-
-int
-cdrom_status() {
- struct cd_sub_channel_info data;
-
- if (cdrom_read_subchannel(&data) == -1)
- return(-1);
-
- switch (data.header.audio_status) {
- case CD_AS_AUDIO_INVALID:
- return(CDROM_INVALID);
-
- case CD_AS_PLAY_IN_PROGRESS:
- return(CDROM_PLAYING);
-
- case CD_AS_PLAY_PAUSED:
- return(CDROM_PAUSED);
-
- case CD_AS_PLAY_COMPLETED:
- return(CDROM_COMPLETED);
-
- case CD_AS_PLAY_ERROR:
- return(CDROM_ERROR);
-
- case CD_AS_NO_STATUS:
- return(CDROM_NO_STATUS);
- }
-
- return(-1);
-}
-
-unsigned short *
-ushort_malloc(n)
- int n;
-{
- extern char *calloc();
- unsigned short *ptr;
-
- ptr = (unsigned short *) calloc(n, sizeof(unsigned short));
- if (ptr == NULL) {
- perror("calloc");
- exit(1);
- }
-
- return(ptr);
-}
-
-struct msf *
-msf_malloc(n)
- int n;
-{
- extern char *calloc();
- struct msf *ptr;
-
- ptr = (struct msf *) calloc(n, sizeof(struct msf));
- if (ptr == NULL) {
- perror("calloc");
- exit(1);
- }
-
- return(ptr);
-}
-
-int
-cdrom_disp_cdi() {
- int trk;
-
- fprintf(stderr,"CDI structure:\n");
- fprintf(stderr,"\tcurtrack: %d\n",cdi.curtrack);
- fprintf(stderr,"\tmin: %d max: %d total: %d\n",
- cdi.mintrack, cdi.maxtrack, cdi.ntracks);
- fprintf(stderr,"\tdur: %d state: %2x\n",cdi.duration, cdi.state);
- fprintf(stderr,"\tcurrand: %d lastprog: %d\n",
- cdi.currand, cdi.lastprog);
- fprintf(stderr,"\n\tTracklist:\n");
- if (cdi.maxtrack != cdi.mintrack) {
- for (trk=0; trk<=cdi.maxtrack-cdi.mintrack+1; trk++) {
- fprintf(stderr,"\t%3d: %d %02d:%02d %d\n",trk,cdi.times[trk],
- cdi.addrs[trk].minute,cdi.addrs[trk].second,
- cdi.addrs[trk].frame);
- }
- }
-}
diff --git a/audio/xcdplayer/files/cdrom_freebsd.h b/audio/xcdplayer/files/cdrom_freebsd.h
deleted file mode 100644
index 570349e2dc6..00000000000
--- a/audio/xcdplayer/files/cdrom_freebsd.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* $NetBSD: cdrom_freebsd.h,v 1.4 1998/09/07 18:56:54 garbled Exp $ */
-/*
- * Copyright (C) 1990 Regents of the University of California.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and that
- * both that copyright notice and this permission notice appear in
- * supporting documentation, and that the name of the University of
- * California not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission. the University of California makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- */
-
-# include <X11/Intrinsic.h>
-
-# define NOTITLESTR "No Title"
-# define NODISCSTR "No Disc"
-
-# define bit(n) (1 << (n))
-
-/* bits for cdrom_state */
-# define CDROM_STATE_PLAY bit(0)
-# define CDROM_STATE_PAUSE bit(1)
-# define CDROM_STATE_STOP bit(2)
-# define CDROM_STATE_EJECTED bit(3)
-# define CDROM_STATE_CYCLE bit(4)
-# define CDROM_STATE_SHUFFLE bit(5)
-# define CDROM_STATE_PROGRAM bit(6)
-
-/* return codes from cdrom_status() */
-# define CDROM_INVALID 1
-# define CDROM_PLAYING 2
-# define CDROM_PAUSED 3
-# define CDROM_COMPLETED 4
-# define CDROM_ERROR 5
-# define CDROM_NO_STATUS 6
-
-#define STILL_MOUNTED 1
-#define UNMOUNTED 0
-#define CDROM_LEADOUT 0xAA
-#define CDROM_MSF 0x02
-
-struct msf {
- unsigned char minute;
- unsigned char second;
- unsigned char frame;
-};
-
-struct prognode {
- unsigned char track;
- Widget button;
- struct prognode *next;
- struct prognode *prev;
-};
-
-typedef struct _cdrom_info {
- unsigned char curtrack; /* current track playing */
- unsigned char mintrack; /* first audio track */
- unsigned char maxtrack; /* last audio track */
- unsigned char ntracks; /* size of random track list */
- int duration; /* seconds played so far */
- int state; /* state of cd-rom drive */
- short currand; /* index into random track list */
- short lastprog; /* number of selections in prog.*/
- unsigned short *times; /* duration of each track */
- struct msf *addrs; /* starting minute/second/frames*/
- struct prognode *selection; /* currently selected prog. trk */
- struct prognode *program; /* list of programmed tracks */
-} cdrom_info;
-
-extern int cdrom_open();
-extern void cdrom_close();
-extern int cdrom_start();
-extern int cdrom_stop();
-extern int cdrom_eject();
-extern int cdrom_pause();
-extern int cdrom_resume();
-extern int cdrom_volume();
-extern int cdrom_get_times();
-extern int cdrom_get_curtrack();
-extern int cdrom_get_msf();
-extern int cdrom_get_curmsf();
-extern int cdrom_play_track();
-extern int cdrom_play_msf();
-extern int cdrom_read_tocentry();
-extern int cdrom_read_tochdr();
-extern int cdrom_status();
-
-extern cdrom_info cdi;
-extern char *disc_title;
-extern char program_str[];
-extern char *cdInfoDir;
-
diff --git a/audio/xcdplayer/patches/patch-aa b/audio/xcdplayer/patches/patch-aa
deleted file mode 100644
index c3ebb78e8a9..00000000000
--- a/audio/xcdplayer/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.5 1999/09/06 16:37:42 tron Exp $
-
---- Imakefile.orig Tue Jan 12 19:59:29 1993
-+++ Imakefile Mon Sep 6 18:37:04 1999
-@@ -15,6 +15,11 @@
-
- LOCAL_LIBRARIES = XawClientLibs
- LINTLIBS = -lXaw -lXt -lX11
-+ SRCS = main.c top_setup.c logo_setup.c button_setup.c cdrom_callb.c\
-+ cdrom_freebsd.c internals.c shuffle.c program.c leds.c debug.c
-+
-+ OBJS = main.o top_setup.o logo_setup.o button_setup.o cdrom_callb.o\
-+ cdrom_freebsd.o internals.o shuffle.o program.o leds.o debug.o
- #ifdef SunArchitecture
- SRCS = main.c top_setup.c logo_setup.c button_setup.c cdrom_callb.c\
- cdrom_sun.c internals.c shuffle.c program.c leds.c debug.c
diff --git a/audio/xcdplayer/patches/patch-ab b/audio/xcdplayer/patches/patch-ab
deleted file mode 100644
index c63dd7b6462..00000000000
--- a/audio/xcdplayer/patches/patch-ab
+++ /dev/null
@@ -1,91 +0,0 @@
-$NetBSD: patch-ab,v 1.5 1999/09/06 16:37:42 tron Exp $
-
---- XCdplayer.ad.orig Tue Jan 12 19:59:41 1993
-+++ XCdplayer.ad Mon Sep 6 18:37:04 1999
-@@ -19,11 +19,10 @@
-
- XCdplayer*logoLabel.foreground: Gold
- XCdplayer*logoLabel.background: Black
--XCdplayer*icon*foreground: Gold
-
- XCdplayer*versionLabel.Font: -misc-fixed-medium-r-normal--8-*
- XCdplayer*versionLabel.foreground: Black
--XCdplayer*versionLabel.width: 130
-+XCdplayer*versionLabel.width: 110
- XCdplayer*versionLabel.fromHoriz: logoLabel
-
- ! replayThreshold is the number of seconds that must be played before the
-@@ -33,16 +32,16 @@
-
- ! scanSkipInterval is the number of seconds skipped at each fast-forward or
- ! reverse.
--XCdplayer*scanSkipInterval: 3
-+XCdplayer*scanSkipInterval: 5
- ! pauseSkipInterval is the number of seconds skipped at each fast-forward or
- ! reverse if the CD is paused.
--XCdplayer*pauseSkipInterval: 15
-+XCdplayer*pauseSkipInterval: 20
-
- ! scanPauseInterval is the number of seconds between each fast_forward or
- ! reverse while holding down the buttons. (Sun CDs have a dreadfully long
- ! start-up time for the audio to actually become audible, so "hearing the
- ! track" while scanning isn't very feasible.)
--XCdplayer*scanPauseInterval: 0.062
-+XCdplayer*scanPauseInterval: 0.25
- ! pausePauseInterval does the same thing when the disc is paused.
- XCdplayer*pausePauseInterval: 0.5
-
-@@ -56,7 +55,7 @@
- XCdplayer*Viewport.allowHoriz: True
- XCdplayer*Viewport.useBottom: True
- XCdplayer*Viewport.forceBars: False
--XCdplayer*Viewport.width: 188
-+XCdplayer*Viewport.width: 160
- XCdplayer*Viewport.height: 30
- XCdplayer*Viewport*thickness: 8
- XCdplayer*Viewport.resizable: False
-@@ -88,11 +87,11 @@
- XCdplayer*Toggle.right: ChainLeft
- XCdplayer*Toggle.background: Ivory
-
--XCdplayer*ledsLabel.horizDistance: 20
-+XCdplayer*ledsLabel.horizDistance: 4
- XCdplayer*ledsLabel.fromVert: versionLabel
- XCdplayer*ledsLabel.fromHoriz: logoLabel
-
--XCdplayer*trackButton.horizDistance: 8
-+XCdplayer*trackButton.horizDistance: 4
- XCdplayer*trackButton.fromVert: versionLabel
- XCdplayer*trackButton.fromHoriz: ledsLabel
- XCdplayer*trackButton.borderWidth: 2
-@@ -108,27 +107,22 @@
- XCdplayer*timerButton.left: ChainRight
- XCdplayer*timerButton.right: ChainRight
-
--XCdplayer*volumeScrollbar.horizDistance:8
-+XCdplayer*volumeScrollbar.horizDistance:4
- XCdplayer*volumeScrollbar.fromHoriz: logoLabel
- XCdplayer*volumeScrollbar.fromVert: trackButton
- XCdplayer*volumeScrollbar.orientation: horizontal
--XCdplayer*volumeScrollbar.length: 120
-+XCdplayer*volumeScrollbar.length: 93
- XCdplayer*volumeScrollbar.right: ChainRight
- XCdplayer*volumeScrollbar.left: ChainRight
- XCdplayer*volumeScrollbar.background: green
- XCdplayer*volumeScrollbar.foreground: white
--XCdplayer*volumeScrollbar.thumb: black
-+XCdplayer*volumeScrollbar.thumb: black
-
- XCdplayer*titleBarViewport.fromVert: volumeScrollbar
--XCdplayer*titleBarViewport.forceBars: true
- XCdplayer*titleBar.borderwidth: 0
- XCdplayer*titleBar.highlightThickness: 1
- XCdplayer*titleBar.foreground: Red
- XCdplayer*titleBar.background: Ivory
--
--XCdplayer*titleDialog.Text.translations:#override\
-- <Key>Return: done()
--
- XCdplayer*buttonsForm.fromVert: logoForm
- XCdplayer*buttonsForm.borderWidth: 1
-
diff --git a/audio/xcdplayer/patches/patch-ac b/audio/xcdplayer/patches/patch-ac
deleted file mode 100644
index eafde120e1f..00000000000
--- a/audio/xcdplayer/patches/patch-ac
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ac,v 1.3 1999/09/06 16:37:42 tron Exp $
-
---- app.h.orig Mon Sep 6 18:37:04 1999
-+++ app.h Mon Sep 6 18:37:04 1999
-@@ -0,0 +1,29 @@
-+/*
-+ * Copyright (C) 1990 Regents of the University of California.
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and
-+ * its documentation for any purpose is hereby granted without fee,
-+ * provided that the above copyright notice appear in all copies and that
-+ * both that copyright notice and this permission notice appear in
-+ * supporting documentation, and that the name of the University of
-+ * California not be used in advertising or publicity pertaining to
-+ * distribution of the software without specific, written prior
-+ * permission. the University of California makes no representations
-+ * about the suitability of this software for any purpose. It is provided
-+ * "as is" without express or implied warranty.
-+ */
-+
-+typedef struct {
-+ char *file;
-+ char *device;
-+ Boolean debug;
-+ Boolean display_timer;
-+ float volbase;
-+ float volpcent;
-+ int replayThreshold;
-+ int pauseSkipInterval;
-+ int scanSkipInterval;
-+ float scanPauseInterval;
-+ float pausePauseInterval;
-+ char *cdInfoDir;
-+} AppData;
diff --git a/audio/xcdplayer/patches/patch-ad b/audio/xcdplayer/patches/patch-ad
deleted file mode 100644
index cd8767f700f..00000000000
--- a/audio/xcdplayer/patches/patch-ad
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2005/12/11 20:48:46 joerg Exp $
-
---- button_setup.c.orig Tue Jan 12 19:59:47 1993
-+++ button_setup.c Mon Sep 6 18:37:05 1999
-@@ -20,6 +20,9 @@
- # include <X11/Xaw/Toggle.h>
-
- # include "cdrom_globs.h"
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-+# include "cdrom_freebsd.h"
-+#endif
- #ifdef sun
- # include "cdrom_sun.h"
- #endif
-@@ -44,6 +47,23 @@
- # include "ff.xbm"
- # include "pgm.xbm"
-
-+void title_dialog_setup();
-+static void play_button_setup();
-+static void stop_button_setup();
-+static void pause_button_setup();
-+static void prev_button_setup();
-+static void next_button_setup();
-+static void eject_button_setup();
-+#ifdef sgi
-+void audio_button_setup();
-+#endif
-+static void quit_button_setup();
-+static void cycle_button_setup();
-+static void shuffle_button_setup();
-+static void rew_button_setup();
-+static void ff_button_setup();
-+static void pgm_button_setup();
-+void buttons_reset();
-
- static Widget buttons_form_widget;
- static Widget play_button_widget;
-@@ -71,25 +91,6 @@
- Widget parent_widget;
- {
- Arg args[1];
--
-- extern void title_dialog_setup();
-- extern void play_button_setup();
-- extern void stop_button_setup();
-- extern void pause_button_setup();
-- extern void prev_button_setup();
-- extern void next_button_setup();
-- extern void eject_button_setup();
--#ifdef sgi
-- extern void audio_button_setup();
--#endif
-- extern void quit_button_setup();
-- extern void cycle_button_setup();
-- extern void shuffle_button_setup();
-- extern void rew_button_setup();
-- extern void ff_button_setup();
-- extern void pgm_button_setup();
-- extern void buttons_reset();
--
-
- buttons_form_widget = XtCreateManagedWidget("buttonsForm",
- formWidgetClass,
diff --git a/audio/xcdplayer/patches/patch-ae b/audio/xcdplayer/patches/patch-ae
deleted file mode 100644
index 962f59aad9a..00000000000
--- a/audio/xcdplayer/patches/patch-ae
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2005/12/11 20:48:46 joerg Exp $
-
---- cdrom_callb.c.orig Tue Jan 12 19:59:48 1993
-+++ cdrom_callb.c Mon Sep 6 18:37:05 1999
-@@ -22,6 +22,9 @@
-
- # include "debug.h"
- # include "cdrom_globs.h"
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-+# include "cdrom_freebsd.h"
-+#endif
- #ifdef sun
- # include "cdrom_sun.h"
- #endif
-@@ -29,6 +32,8 @@
- # include "cdrom_sgi.h"
- #endif
-
-+extern AppData app_data;
-+
- void cdrom_new_disc();
-
- /*
-@@ -287,7 +292,7 @@
- * if playing less than replayThreshold seconds, back up to
- * previous track; otherwise start at beginning of current track:
- */
-- if (cdi.duration < replayThreshold)
-+ if (cdi.duration < app_data.replayThreshold)
- {
- if ((cdi.program != NULL) &&
- (cdi.state & CDROM_STATE_PLAY) &&
diff --git a/audio/xcdplayer/patches/patch-af b/audio/xcdplayer/patches/patch-af
deleted file mode 100644
index 9b1744abf07..00000000000
--- a/audio/xcdplayer/patches/patch-af
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-af,v 1.3 1999/09/06 16:37:42 tron Exp $
-
---- cdrom_globs.h.orig Tue Jan 12 19:59:31 1993
-+++ cdrom_globs.h Mon Sep 6 18:37:05 1999
-@@ -99,22 +99,10 @@
- extern int cdrom_open();
- extern int cdrom_init();
-
--
--extern Boolean display_timer;
--
- extern XtAppContext appc;
-
--extern char *file;
--extern char *device;
-+#include "app.h"
-+
- extern char info_filename[];
- extern char *disc_title;
- extern unsigned int timer_fsecs;
--
--
--extern float volbase;
--extern float volpcent;
--extern int replayThreshold;
--extern float scanPauseInterval;
--extern int scanSkipInterval;
--extern float pausePauseInterval;
--extern int pauseSkipInterval;
diff --git a/audio/xcdplayer/patches/patch-ag b/audio/xcdplayer/patches/patch-ag
deleted file mode 100644
index 2e9644818e8..00000000000
--- a/audio/xcdplayer/patches/patch-ag
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2004/01/23 09:02:15 agc Exp $
-
---- debug.c.orig Tue Jan 12 19:59:35 1993
-+++ debug.c Mon Sep 6 18:37:05 1999
-@@ -15,31 +15,28 @@
-
- # include <X11/Intrinsic.h>
-
--# include <varargs.h>
-+# include <stdarg.h>
- # include <stdio.h>
-
- # include "debug.h"
-
-+#include "app.h"
-+
-+extern AppData app_data;
-+
- /* VARARGS */
- void
--debug_printf(va_alist)
-- va_dcl
-+debug_printf(int p, char *fmt, ...)
- {
- va_list args;
-- char *fmt;
--
-- va_start(args);
-
-- /*
-- * first arg is whether or not to print.
-- */
-- if ((va_arg(args, int) == 0) || (debug == False))
-+ if (p == 0 || app_data.debug == False) {
- return;
--
-- fmt = va_arg(args, char *);
-+ }
-+ va_start(args, fmt);
- vfprintf(stdout, fmt, args);
-+ va_end(args);
-
- fflush(stdout);
-
-- va_end(args);
- }
diff --git a/audio/xcdplayer/patches/patch-ah b/audio/xcdplayer/patches/patch-ah
deleted file mode 100644
index 5bbbe22f79f..00000000000
--- a/audio/xcdplayer/patches/patch-ah
+++ /dev/null
@@ -1,514 +0,0 @@
-$NetBSD: patch-ah,v 1.5 2006/08/12 14:51:39 darcy Exp $
-
---- internals.c.orig Tue Jan 12 19:59:45 1993
-+++ internals.c
-@@ -22,6 +22,9 @@
-
- # include "debug.h"
- # include "cdrom_globs.h"
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-+# include "cdrom_freebsd.h"
-+#endif
- #ifdef sun
- # include "cdrom_sun.h"
- #endif
-@@ -29,13 +32,14 @@
- # include "cdrom_sgi.h"
- #endif
-
--
-+static void scan_update();
- static XtIntervalId ivid = -1;
- static XtIntervalId scanivid = -1;
- static XtIntervalId stativid = -1;
- static unsigned int timer_mod = 1000 / TIMER_PERIOD;
- unsigned int timer_fsecs;
-
-+extern AppData app_data;
-
- int
- cdrom_get_curtime() {
-@@ -76,6 +80,170 @@ cdrom_get_curtime() {
- }
- }
-
-+/*
-+ * called by update_track when the cd has hit
-+ * the end of the track or the disc.
-+ */
-+static void
-+cdrom_atend() {
-+ cdrom_timer_off();
-+ leds_stop();
-+ debug_printf(1, "cdrom_atend: at end\n");
-+
-+#ifdef sgi
-+ /* Force a stop to kill the child (if any).
-+ * This is due to some sort of weirdness when the SGI runs off the
-+ * disc during a CDreadda().
-+ */
-+ if (cdi.scsi_audio) {
-+ cdrom_stop();
-+ }
-+#endif
-+ if (cdi.state & CDROM_STATE_SHUFFLE) {
-+
-+ if (cdi.currand == cdi.ntracks) {
-+ if ((cdi.state & CDROM_STATE_CYCLE) == 0) {
-+ debug_printf(1, "cdrom_atend: shuffle done\n");
-+
-+ cdrom_reset();
-+ return;
-+ }
-+
-+ debug_printf(1, "cdrom_atend: shuffle cycling\n");
-+ shuffle_setup();
-+ }
-+
-+ cdi.curtrack = shuffle_next_track();
-+ }
-+ else if (cdi.state & CDROM_STATE_PROGRAM) {
-+ if ((cdi.curtrack = program_goto_next_track()) == 0)
-+ {
-+ if (cdi.state & CDROM_STATE_CYCLE)
-+ {
-+ debug_printf(1, "cdrom_atend: cycling program\n");
-+ cdi.curtrack = program_resume();
-+ timer_fsecs = 0;
-+ cdi.duration = 0;
-+ timer_button_update();
-+
-+ (void) cdrom_play();
-+ }
-+ else
-+ {
-+ debug_printf(1, "cdrom_atend: all done\n");
-+ cdrom_reset();
-+ }
-+ return;
-+ }
-+ }
-+
-+ else if ((cdi.curtrack < cdi.maxtrack) && (cdi.curtrack != 0)) {
-+ debug_printf(1, "cdrom_atend: continuing\n");
-+ cdi.curtrack++;
-+ }
-+ else if (cdi.state & CDROM_STATE_CYCLE) {
-+ debug_printf(1, "cdrom_atend: cycling\n");
-+ cdi.curtrack = cdi.mintrack;
-+ }
-+ else {
-+ debug_printf(1, "cdrom_atend: all done\n");
-+ buttons_reset();
-+ cdrom_reset();
-+ return;
-+ }
-+
-+ timer_fsecs = 0;
-+ cdi.duration = 0;
-+ timer_button_update();
-+
-+ (void) cdrom_play();
-+}
-+
-+/*
-+ * update_track is called when the timeout fires; it updates curtrack and
-+ * calls the label update routine.
-+ */
-+/*ARGSUSED*/
-+static void
-+update_track(data, id)
-+ XtPointer *data;
-+ XtIntervalId *id;
-+{
-+ unsigned int curtrack;
-+ Arg args[1];
-+ Boolean state;
-+
-+ extern Widget rew_button_widget;
-+ extern Widget ff_button_widget;
-+#ifdef sgi
-+
-+ int vol;
-+#endif
-+
-+ if ((curtrack = cdrom_get_curtrack()) != cdi.curtrack) {
-+ if (curtrack == 0) {
-+ cdrom_atend();
-+
-+ return;
-+ }
-+
-+ timer_fsecs = 0;
-+ cdi.duration = 0;
-+ timer_button_update();
-+
-+ cdi.curtrack = curtrack;
-+ track_button_update();
-+ }
-+
-+#ifdef sgi
-+ /* Update the volume control */
-+ if ((vol = cdrom_get_volume()) != 0) {
-+ set_volume(vol);
-+ }
-+#endif
-+
-+ XtSetArg(args[0], XtNstate, &state);
-+ XtGetValues(rew_button_widget, args, 1);
-+ if (state == True)
-+ {
-+ cdrom_rewind();
-+ leds_update(BACKWARDS);
-+ if (cdi.state & CDROM_STATE_PAUSE) {
-+ if (cdrom_pause() != -1)
-+ cdi.state &= ~CDROM_STATE_STOP;
-+ }
-+ ivid = XtAppAddTimeOut(appc,
-+ (int)(app_data.scanPauseInterval * 1000.0),
-+ update_track, NULL);
-+ }
-+ else
-+ {
-+ leds_update(FORWARDS);
-+ XtSetArg(args[0], XtNstate, &state);
-+ XtGetValues(ff_button_widget, args, 1);
-+ if (state == True)
-+ {
-+ cdrom_ff();
-+ if (cdi.state & CDROM_STATE_PAUSE) {
-+ if (cdrom_pause() != -1)
-+ cdi.state &= ~CDROM_STATE_STOP;
-+ }
-+
-+ ivid = XtAppAddTimeOut(appc,
-+ (int)(app_data.scanPauseInterval * 1000.0),
-+ update_track, NULL);
-+ }
-+ else
-+ {
-+ if ((timer_fsecs++ % timer_mod) == 0) {
-+ timer_button_update();
-+ }
-+ ivid = XtAppAddTimeOut(appc, TIMER_PERIOD,
-+ update_track, NULL);
-+ }
-+ }
-+}
-+
-
- /*
- * we poll the cd-rom drive every TIMER_PERIOD milliseconds to see where
-@@ -83,8 +251,6 @@ cdrom_get_curtime() {
- */
- void
- cdrom_timer_on() {
-- static void update_track();
--
- if (cdi.state & CDROM_STATE_PLAY)
- ivid = XtAppAddTimeOut(appc, TIMER_PERIOD, update_track, NULL);
- }
-@@ -170,7 +336,6 @@ cdrom_rewind () {
- struct msf track_start;
- struct msf start_addr, end_addr;
- int curtrack;
-- extern void scan_update();
-
- if (cdrom_get_curmsf(&start_addr) == -1) {
- debug_printf(1, "rew: error reading location\n");
-@@ -196,11 +361,11 @@ cdrom_rewind () {
- if (((cdi.state & CDROM_STATE_PLAY) &&
- ((track_start.minute * 60) + track_start.second) >=
- ((start_addr.minute * 60) + start_addr.second -
-- scanSkipInterval)) ||
-+ app_data.scanSkipInterval)) ||
- ((cdi.state & CDROM_STATE_PAUSE) &&
- ((track_start.minute * 60) + track_start.second) >=
- ((start_addr.minute * 60) + start_addr.second -
-- pauseSkipInterval)))
-+ app_data.pauseSkipInterval)))
- {
- start_addr = track_start;
- start_addr.second++; /* guarantee we never back up too far */
-@@ -208,9 +373,9 @@ cdrom_rewind () {
- else
- {
- if (cdi.state & CDROM_STATE_PAUSE) {
-- start_addr.second -= pauseSkipInterval;
-+ start_addr.second -= app_data.pauseSkipInterval;
- } else if (cdi.state & CDROM_STATE_PLAY) {
-- start_addr.second -= scanSkipInterval;
-+ start_addr.second -= app_data.scanSkipInterval;
- }
- if ((char) start_addr.second < 0)
- {
-@@ -223,9 +388,9 @@ cdrom_rewind () {
- else /* normal case */
- {
- if (cdi.state & CDROM_STATE_PAUSE) {
-- start_addr.second -= pauseSkipInterval;
-+ start_addr.second -= app_data.pauseSkipInterval;
- } else if (cdi.state & CDROM_STATE_PLAY) {
-- start_addr.second -= scanSkipInterval;
-+ start_addr.second -= app_data.scanSkipInterval;
- }
- if ((char) start_addr.second < 0)
- {
-@@ -274,7 +439,7 @@ cdrom_rewind () {
- {
- if (scanivid == -1)
- scanivid = XtAppAddTimeOut(appc,
-- (int)(pausePauseInterval * 1000.0),
-+ (int)(app_data.pausePauseInterval * 1000.0),
- scan_update, NULL);
-
- cdi.state &= ~CDROM_STATE_PAUSE; /* allow timer to change */
-@@ -304,7 +469,6 @@ cdrom_ff () {
- struct msf start_addr, end_addr, next_start;
- char t;
- int curtrack;
-- extern void scan_update();
-
- if (cdrom_get_curmsf(&start_addr) == -1) {
- debug_printf(1, "ff: error reading location\n");
-@@ -332,11 +496,11 @@ cdrom_ff () {
- if (((cdi.state & CDROM_STATE_PLAY) &&
- ((next_start.minute * 60) + next_start.second) <=
- ((start_addr.minute * 60) + start_addr.second +
-- scanSkipInterval)) ||
-+ app_data.scanSkipInterval)) ||
- ((cdi.state & CDROM_STATE_PAUSE) &&
- ((next_start.minute * 60) + next_start.second) <=
- ((start_addr.minute * 60) + start_addr.second +
-- pauseSkipInterval)))
-+ app_data.pauseSkipInterval)))
- {
-
- /* start at end of current track */
-@@ -346,9 +510,9 @@ cdrom_ff () {
- else
- {
- if (cdi.state & CDROM_STATE_PAUSE) {
-- start_addr.second += pauseSkipInterval;
-+ start_addr.second += app_data.pauseSkipInterval;
- } else if (cdi.state & CDROM_STATE_PLAY) {
-- start_addr.second += scanSkipInterval;
-+ start_addr.second += app_data.scanSkipInterval;
- }
- if (start_addr.second >= 60)
- {
-@@ -360,9 +524,9 @@ cdrom_ff () {
- else
- {
- if (cdi.state & CDROM_STATE_PAUSE) {
-- start_addr.second += pauseSkipInterval;
-+ start_addr.second += app_data.pauseSkipInterval;
- } else if (cdi.state & CDROM_STATE_PLAY) {
-- start_addr.second += scanSkipInterval;
-+ start_addr.second += app_data.scanSkipInterval;
- }
- if (start_addr.second >= 60)
- {
-@@ -413,7 +577,7 @@ cdrom_ff () {
- {
- if (scanivid == -1)
- scanivid = XtAppAddTimeOut(appc,
-- (int)(pausePauseInterval * 1000.0),
-+ (int)(app_data.pausePauseInterval * 1000.0),
- scan_update, NULL);
-
- cdi.state &= ~CDROM_STATE_PAUSE; /* allow timer to change */
-@@ -435,85 +599,6 @@ cdrom_ff () {
-
-
- /*
-- * called by update_track when the cd has hit
-- * the end of the track or the disc.
-- */
--static void
--cdrom_atend() {
-- cdrom_timer_off();
-- leds_stop();
-- debug_printf(1, "cdrom_atend: at end\n");
--
--#ifdef sgi
-- /* Force a stop to kill the child (if any).
-- * This is due to some sort of weirdness when the SGI runs off the
-- * disc during a CDreadda().
-- */
-- if (cdi.scsi_audio) {
-- cdrom_stop();
-- }
--#endif
-- if (cdi.state & CDROM_STATE_SHUFFLE) {
--
-- if (cdi.currand == cdi.ntracks) {
-- if ((cdi.state & CDROM_STATE_CYCLE) == 0) {
-- debug_printf(1, "cdrom_atend: shuffle done\n");
--
-- cdrom_reset();
-- return;
-- }
--
-- debug_printf(1, "cdrom_atend: shuffle cycling\n");
-- shuffle_setup();
-- }
--
-- cdi.curtrack = shuffle_next_track();
-- }
-- else if (cdi.state & CDROM_STATE_PROGRAM) {
-- if ((cdi.curtrack = program_goto_next_track()) == 0)
-- {
-- if (cdi.state & CDROM_STATE_CYCLE)
-- {
-- debug_printf(1, "cdrom_atend: cycling program\n");
-- cdi.curtrack = program_resume();
-- timer_fsecs = 0;
-- cdi.duration = 0;
-- timer_button_update();
--
-- (void) cdrom_play();
-- }
-- else
-- {
-- debug_printf(1, "cdrom_atend: all done\n");
-- cdrom_reset();
-- }
-- return;
-- }
-- }
--
-- else if ((cdi.curtrack < cdi.maxtrack) && (cdi.curtrack != 0)) {
-- debug_printf(1, "cdrom_atend: continuing\n");
-- cdi.curtrack++;
-- }
-- else if (cdi.state & CDROM_STATE_CYCLE) {
-- debug_printf(1, "cdrom_atend: cycling\n");
-- cdi.curtrack = cdi.mintrack;
-- }
-- else {
-- debug_printf(1, "cdrom_atend: all done\n");
-- buttons_reset();
-- cdrom_reset();
-- return;
-- }
--
-- timer_fsecs = 0;
-- cdi.duration = 0;
-- timer_button_update();
--
-- (void) cdrom_play();
--}
--
--/*
- * scan_update is called when the scan timeout fires; it updates the timer
- * and calls the label update routine.
- */
-@@ -557,7 +642,7 @@ scan_update(data, id)
- cdi.state &= ~CDROM_STATE_STOP;
- }
- ivid = XtAppAddTimeOut(appc,
-- (int)(scanPauseInterval * 1000.0),
-+ (int)(app_data.scanPauseInterval * 1000.0),
- scan_update, NULL);
- }
- else
-@@ -574,7 +659,7 @@ scan_update(data, id)
- }
-
- ivid = XtAppAddTimeOut(appc,
-- (int)(scanPauseInterval * 1000.0),
-+ (int)(app_data.scanPauseInterval * 1000.0),
- scan_update, NULL);
- }
- else if (scanivid != -1) {
-@@ -607,89 +692,3 @@ update_status(data, id)
- /* Reset timer */
- stativid = XtAppAddTimeOut(appc, 1000, update_status, NULL);
- }
--
--/*
-- * update_track is called when the timeout fires; it updates curtrack and
-- * calls the label update routine.
-- */
--/*ARGSUSED*/
--static void
--update_track(data, id)
-- XtPointer *data;
-- XtIntervalId *id;
--{
-- unsigned int curtrack;
-- Arg args[1];
-- Boolean state;
--
-- extern Widget rew_button_widget;
-- extern Widget ff_button_widget;
--#ifdef sgi
--
-- int vol;
--#endif
--
-- if ((curtrack = cdrom_get_curtrack()) != cdi.curtrack) {
-- if (curtrack == 0) {
-- cdrom_atend();
--
-- return;
-- }
--
-- timer_fsecs = 0;
-- cdi.duration = 0;
-- timer_button_update();
--
-- cdi.curtrack = curtrack;
-- track_button_update();
-- }
--
--#ifdef sgi
-- /* Update the volume control */
-- if ((vol = cdrom_get_volume()) != 0) {
-- set_volume(vol);
-- }
--#endif
--
-- XtSetArg(args[0], XtNstate, &state);
-- XtGetValues(rew_button_widget, args, 1);
-- if (state == True)
-- {
-- cdrom_rewind();
-- leds_update(BACKWARDS);
-- if (cdi.state & CDROM_STATE_PAUSE) {
-- if (cdrom_pause() != -1)
-- cdi.state &= ~CDROM_STATE_STOP;
-- }
-- ivid = XtAppAddTimeOut(appc,
-- (int)(scanPauseInterval * 1000.0),
-- update_track, NULL);
-- }
-- else
-- {
-- leds_update(FORWARDS);
-- XtSetArg(args[0], XtNstate, &state);
-- XtGetValues(ff_button_widget, args, 1);
-- if (state == True)
-- {
-- cdrom_ff();
-- if (cdi.state & CDROM_STATE_PAUSE) {
-- if (cdrom_pause() != -1)
-- cdi.state &= ~CDROM_STATE_STOP;
-- }
--
-- ivid = XtAppAddTimeOut(appc,
-- (int)(scanPauseInterval * 1000.0),
-- update_track, NULL);
-- }
-- else
-- {
-- if ((timer_fsecs++ % timer_mod) == 0) {
-- timer_button_update();
-- }
-- ivid = XtAppAddTimeOut(appc, TIMER_PERIOD,
-- update_track, NULL);
-- }
-- }
--}
--
diff --git a/audio/xcdplayer/patches/patch-ai b/audio/xcdplayer/patches/patch-ai
deleted file mode 100644
index 4e08d14d639..00000000000
--- a/audio/xcdplayer/patches/patch-ai
+++ /dev/null
@@ -1,103 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2005/12/11 20:48:46 joerg Exp $
-
---- logo_setup.c.orig Tue Jan 12 19:59:46 1993
-+++ logo_setup.c Mon Sep 6 18:37:05 1999
-@@ -28,6 +28,9 @@
- # include <stdio.h>
-
- # include "cdrom_globs.h"
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-+# include "cdrom_freebsd.h"
-+#endif
- #ifdef sun
- # include "cdrom_sun.h"
- #endif
-@@ -43,6 +46,8 @@
-
- void Done();
-
-+extern AppData app_data;
-+
- static Widget track_button_widget;
- static Widget timer_button_widget;
- static Widget volume_scroll_widget;
-@@ -55,19 +60,19 @@
- Widget title_done_widget;
-
- static int vol;
-+extern void leds_label_setup();
-+static void cb_track_button();
-+static void cb_timer_button();
-+static void volume_jump_proc();
-+static void volume_scroll_proc();
-+static void popup_title_dialog();
-+static void popdown_title_dialog();
-+
-
- void
- logo_setup(parent_widget)
- Widget parent_widget;
- {
-- extern void leds_label_setup();
-- extern void cb_track_button();
-- extern void cb_timer_button();
-- extern void volume_jump_proc();
-- extern void volume_scroll_proc();
-- extern void popup_title_dialog();
-- extern void popdown_title_dialog();
--
- Widget version_label_widget;
- char version_string[80];
-
-@@ -126,15 +131,16 @@
-
- track_button_update();
-
-- if (display_timer == True)
-+ if (app_data.display_timer == True) {
- timer_button_widget = XtCreateManagedWidget("timerButton",
- toggleWidgetClass,
- logo_form_widget,
- (ArgList) NULL, 0);
-
-- XtAddCallback(timer_button_widget, XtNcallback, cb_timer_button, 0);
--
-- timer_button_update();
-+ XtAddCallback(timer_button_widget, XtNcallback,
-+ cb_timer_button, 0);
-+ timer_button_update();
-+ }
- thumb_pixmap = XCreateBitmapFromData(XtDisplay(logo_form_widget),
- rootwin(logo_form_widget),
- thumb_bits,
-@@ -171,10 +177,10 @@
-
- #ifdef sgi
- if ((vol = cdrom_get_volume()) == 0) {
-- vol = (int) ((MAXVOL - volbase) * 0.75) + volbase;
-+ vol = (int) ((MAXVOL - app_data.volbase) * 0.75) + app_data.volbase;
- }
- #else
-- vol = (int) ((MAXVOL - volbase) * 0.75) + volbase;
-+ vol = (int) ((MAXVOL - app_data.volbase) * 0.75) + app_data.volbase;
- #endif
- cdrom_volume(vol, vol);
- #ifdef sgi
-@@ -356,7 +362,7 @@
- Arg args[1];
- Boolean state;
-
-- if (display_timer == False)
-+ if (app_data.display_timer == False)
- return;
-
- if ((cdi.state & CDROM_STATE_PAUSE) == 0)
-@@ -413,7 +419,7 @@
- vol = PCT2VAL(*(float *)percent);
- #else
- vol = (*(float *) percent) * MAXVOL;
-- vol = (vol * volpcent) + volbase;
-+ vol = (vol * app_data.volpcent) + app_data.volbase;
- #endif
-
- if (vol > MAXVOL)
diff --git a/audio/xcdplayer/patches/patch-aj b/audio/xcdplayer/patches/patch-aj
deleted file mode 100644
index 88268226210..00000000000
--- a/audio/xcdplayer/patches/patch-aj
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-aj,v 1.4 2006/08/12 14:51:39 darcy Exp $
-
---- main.c.orig Tue Jan 12 19:59:36 1993
-+++ main.c
-@@ -23,13 +23,36 @@
-
- Widget top_form;
-
-+extern AppData app_data;
-+
-+static void
-+chk_debug(argc, argv)
-+ int argc;
-+ char **argv;
-+{
-+ int i;
-+
-+ /* ugly hack */
-+ for (i = 1; i < argc; i++) {
-+ if (strcmp(argv[i], "-debug") == 0) {
-+ app_data.debug = True;
-+ break;
-+ }
-+ }
-+}
-+
-+void
-+usage() {
-+ (void) fprintf(stderr, "usage: xcdplayer [-debug]\n");
-+
-+ exit(1);
-+}
-+
- void
- main(argc, argv)
- int argc;
- char **argv;
- {
-- static void chk_debug();
--
- chk_debug(argc, argv);
-
- /* gets resources, & creates main form */
-@@ -55,26 +78,3 @@ main(argc, argv)
-
- exit(0);
- }
--
--static void
--chk_debug(argc, argv)
-- int argc;
-- char **argv;
--{
-- int i;
--
-- /* ugly hack */
-- for (i = 1; i < argc; i++) {
-- if (strcmp(argv[i], "-debug") == 0) {
-- debug = True;
-- break;
-- }
-- }
--}
--
--void
--usage() {
-- (void) fprintf(stderr, "usage: xcdplayer [-debug]\n");
--
-- exit(1);
--}
diff --git a/audio/xcdplayer/patches/patch-ak b/audio/xcdplayer/patches/patch-ak
deleted file mode 100644
index d53d6603d75..00000000000
--- a/audio/xcdplayer/patches/patch-ak
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-ak,v 1.4 2005/12/11 20:48:46 joerg Exp $
-
---- program.c.orig Tue Jan 12 19:59:49 1993
-+++ program.c Mon Sep 6 18:37:05 1999
-@@ -27,10 +27,13 @@
-
- # include <stdio.h>
- # include <string.h>
--# include <malloc.h>
-+# include <sys/malloc.h>
-
- # include "debug.h"
- # include "cdrom_globs.h"
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-+# include "cdrom_freebsd.h"
-+#endif
- #ifdef sun
- # include "cdrom_sun.h"
- #endif
-@@ -52,6 +55,15 @@
- static Boolean adding_to_new_track = False;
- static struct prognode *current_node = NULL;
-
-+static void cb_move_program_ptr();
-+static void cb_clear_program();
-+static void cb_cancel_program();
-+static void cb_save_program();
-+static void cb_trackbuttons();
-+static void cb_add_10();
-+static void cb_new_track();
-+static void cb_program_all();
-+
- void
- program_form_setup (parent_widget)
- Widget parent_widget;
-@@ -66,15 +78,6 @@
- Widget cancel_button;
- Widget save_button;
- Widget all_button;
--
-- extern void cb_move_program_ptr();
-- extern void cb_clear_program();
-- extern void cb_cancel_program();
-- extern void cb_save_program();
-- extern void cb_trackbuttons();
-- extern void cb_add_10();
-- extern void cb_new_track();
-- extern void cb_program_all();
-
- /*
- * create program form as a non-managed widget, because this
diff --git a/audio/xcdplayer/patches/patch-al b/audio/xcdplayer/patches/patch-al
deleted file mode 100644
index 2247a9d4df7..00000000000
--- a/audio/xcdplayer/patches/patch-al
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-al,v 1.4 2005/12/11 20:48:46 joerg Exp $
-
---- shuffle.c.orig Tue Jan 12 19:59:38 1993
-+++ shuffle.c Mon Sep 6 18:37:05 1999
-@@ -18,6 +18,9 @@
-
- # include "debug.h"
- # include "cdrom_globs.h"
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-+# include "cdrom_freebsd.h"
-+#endif
- #ifdef sun
- # include "cdrom_sun.h"
- #endif
-@@ -29,6 +32,8 @@
-
- static unsigned char *random_tracks;
-
-+extern AppData app_data;
-+
- void
- shuffle_setup() {
- extern char *malloc();
-@@ -97,7 +102,7 @@
- random_tracks[i] = try;
- }
-
-- if (debug == True) {
-+ if (app_data.debug == True) {
- debug_printf(1, "shuffle_setup: ");
- for (i = 0; i < cdi.ntracks; i++)
- debug_printf(1, "%d ", random_tracks[i]);
diff --git a/audio/xcdplayer/patches/patch-am b/audio/xcdplayer/patches/patch-am
deleted file mode 100644
index b81f1b1bd02..00000000000
--- a/audio/xcdplayer/patches/patch-am
+++ /dev/null
@@ -1,118 +0,0 @@
-$NetBSD: patch-am,v 1.4 1999/09/06 16:52:51 tron Exp $
-
---- top_setup.c.orig Mon Sep 6 18:49:30 1999
-+++ top_setup.c Mon Sep 6 18:49:39 1999
-@@ -26,18 +26,8 @@
- # include "logo.xbm"
-
- XtAppContext appc;
--char *file;
--char *device;
--Boolean debug = False;
--Boolean display_timer = True;
--float volbase = 187.0;
--float volpcent = .267;
--int replayThreshold = 4;
--int pauseSkipInterval = 15;
--int scanSkipInterval = 1;
--float scanPauseInterval = .062;
--float pausePauseInterval = .500;
--char *cdInfoDir = NULL;
-+
-+AppData app_data;
-
- extern char *getenv();
-
-@@ -55,36 +45,36 @@
- };
-
- static XtResource resources[] = {
-- { "file", "File", XtRString, sizeof(String), (Cardinal) &file,
-+ { "file", "File", XtRString, sizeof(String), XtOffsetOf(AppData,file),
- XtRString, (caddr_t) NULL },
-- { "device", "Device", XtRString, sizeof(String), (Cardinal) &device,
-+ { "device", "Device", XtRString, sizeof(String), XtOffsetOf(AppData,device),
- XtRString, (caddr_t) NULL },
-- { "debug", "Debug", XtRBoolean, sizeof(Boolean), (Cardinal) &debug,
-- XtRBoolean, (caddr_t) &debug },
-+ { "debug", "Debug", XtRBoolean, sizeof(Boolean), XtOffsetOf(AppData,debug),
-+ XtRBoolean, &app_data.debug },
- { "displayTimer", "DisplayTimer", XtRBoolean, sizeof(Boolean),
-- (Cardinal) &display_timer, XtRBoolean,
-- (caddr_t) &display_timer },
-+ XtOffsetOf(AppData,display_timer), XtRBoolean,
-+ &app_data.display_timer },
- { "volBase", "VolBase", XtRFloat, sizeof(float),
-- (Cardinal) &volbase, XtRFloat, (caddr_t) &volbase },
-+ XtOffsetOf(AppData,volbase), XtRFloat, &app_data.volbase },
- { "volPcent", "VolPcent", XtRFloat, sizeof(float),
-- (Cardinal) &volpcent, XtRFloat, (caddr_t) &volpcent },
-+ XtOffsetOf(AppData,volpcent), XtRFloat, &app_data.volpcent },
- { "replayThreshold", "replayThreshold", XtRInt, sizeof(int),
-- (Cardinal) &replayThreshold, XtRInt,
-- (caddr_t) &replayThreshold },
-+ XtOffsetOf(AppData,replayThreshold), XtRInt,
-+ &app_data.replayThreshold },
- { "scanSkipInterval", "scanSkipInterval", XtRInt, sizeof(int),
-- (Cardinal) &scanSkipInterval, XtRInt,
-- (caddr_t) &scanSkipInterval },
-+ XtOffsetOf(AppData,scanSkipInterval), XtRInt,
-+ &app_data.scanSkipInterval },
- { "scanPauseInterval", "scanPauseInterval", XtRFloat, sizeof(float),
-- (Cardinal) &scanPauseInterval, XtRFloat,
-- (caddr_t) &scanPauseInterval },
-+ XtOffsetOf(AppData,scanPauseInterval), XtRFloat,
-+ &app_data.scanPauseInterval },
- { "pauseSkipInterval", "pauseSkipInterval", XtRInt, sizeof(int),
-- (Cardinal) &pauseSkipInterval, XtRInt,
-- (caddr_t) &pauseSkipInterval },
-+ XtOffsetOf(AppData,pauseSkipInterval), XtRInt,
-+ &app_data.pauseSkipInterval },
- { "pausePauseInterval", "pausePauseInterval", XtRFloat, sizeof(float),
-- (Cardinal) &pausePauseInterval, XtRFloat,
-- (caddr_t) &pausePauseInterval },
-+ XtOffsetOf(AppData,pausePauseInterval), XtRFloat,
-+ &app_data.scanPauseInterval },
- { "cdInfoDir", "cdInfoDir", XtRString, sizeof(String),
-- (Cardinal) &cdInfoDir, XtRString, (caddr_t) NULL },
-+ XtOffsetOf(AppData,cdInfoDir), XtRString, (caddr_t) NULL },
- };
-
- Widget
-@@ -98,6 +88,20 @@
- Arg arg;
- char *s;
-
-+ /*
-+ * set default values
-+ */
-+
-+ app_data.debug = False;
-+ app_data.display_timer = True;
-+ app_data.volbase = 187.0;
-+ app_data.volpcent = 0.267;
-+ app_data.replayThreshold = 4;
-+ app_data.pauseSkipInterval = 15;
-+ app_data.scanSkipInterval = 1;
-+ app_data.scanPauseInterval = 0.062;
-+ app_data.pausePauseInterval = 0.500;
-+
- XtToolkitInitialize();
-
- appc = XtCreateApplicationContext();
-@@ -123,12 +127,12 @@
- XtSetValues(top_shell, &arg, 1);
-
-
-- (void) XtGetApplicationResources(top_shell, (caddr_t) NULL,
-+ (void) XtGetApplicationResources(top_shell, (caddr_t) &app_data,
- resources, XtNumber(resources),
- (ArgList) NULL, 0);
-
-- if ((cdInfoDir == NULL) && ((s=getenv("XCDINFODIR")) != NULL))
-- cdInfoDir = strdup(s);
-+ if ((app_data.cdInfoDir == NULL) && ((s=getenv("XCDINFODIR")) != NULL))
-+ app_data.cdInfoDir = strdup(s);
-
- top_form_widget = XtCreateWidget("mainForm", formWidgetClass,
- top_shell,
diff --git a/audio/xfce4-mixer/DESCR b/audio/xfce4-mixer/DESCR
deleted file mode 100644
index e16d767993b..00000000000
--- a/audio/xfce4-mixer/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Mixer plugin for Xfce.
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
deleted file mode 100644
index 44fa5cc9118..00000000000
--- a/audio/xfce4-mixer/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2007/01/23 11:53:46 martti Exp $
-
-.include "../../meta-pkgs/xfce4/Makefile.common"
-
-DISTNAME= xfce4-mixer-${XFCE4_VERSION}
-#PKGREVISION= 1
-CATEGORIES= audio
-COMMENT= Xfce mixer plugin
-
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xfce4-mixer/PLIST b/audio/xfce4-mixer/PLIST
deleted file mode 100644
index a5da2074e79..00000000000
--- a/audio/xfce4-mixer/PLIST
+++ /dev/null
@@ -1,56 +0,0 @@
-@comment $NetBSD: PLIST,v 1.14 2007/01/23 11:53:46 martti Exp $
-bin/xfce4-mixer
-lib/xfce4/mcs-plugins/sound_settings.la
-lib/xfce4/modules/libxfce4mixer.la
-lib/xfce4/panel-plugins/libmixer.la
-share/applications/xfce-mixer-settings.desktop
-share/icons/hicolor/48x48/apps/xfce4-mixer.png
-share/locale/af/LC_MESSAGES/xfce4-mixer.mo
-share/locale/ar/LC_MESSAGES/xfce4-mixer.mo
-share/locale/az/LC_MESSAGES/xfce4-mixer.mo
-share/locale/be/LC_MESSAGES/xfce4-mixer.mo
-share/locale/bg/LC_MESSAGES/xfce4-mixer.mo
-share/locale/bn_IN/LC_MESSAGES/xfce4-mixer.mo
-share/locale/ca/LC_MESSAGES/xfce4-mixer.mo
-share/locale/cs/LC_MESSAGES/xfce4-mixer.mo
-share/locale/da/LC_MESSAGES/xfce4-mixer.mo
-share/locale/de/LC_MESSAGES/xfce4-mixer.mo
-share/locale/el/LC_MESSAGES/xfce4-mixer.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-mixer.mo
-share/locale/es/LC_MESSAGES/xfce4-mixer.mo
-share/locale/es_MX/LC_MESSAGES/xfce4-mixer.mo
-share/locale/et/LC_MESSAGES/xfce4-mixer.mo
-share/locale/eu/LC_MESSAGES/xfce4-mixer.mo
-share/locale/fa/LC_MESSAGES/xfce4-mixer.mo
-share/locale/fi/LC_MESSAGES/xfce4-mixer.mo
-share/locale/fr/LC_MESSAGES/xfce4-mixer.mo
-share/locale/gu/LC_MESSAGES/xfce4-mixer.mo
-share/locale/he/LC_MESSAGES/xfce4-mixer.mo
-share/locale/hi/LC_MESSAGES/xfce4-mixer.mo
-share/locale/hu/LC_MESSAGES/xfce4-mixer.mo
-share/locale/hy/LC_MESSAGES/xfce4-mixer.mo
-share/locale/it/LC_MESSAGES/xfce4-mixer.mo
-share/locale/ja/LC_MESSAGES/xfce4-mixer.mo
-share/locale/ko/LC_MESSAGES/xfce4-mixer.mo
-share/locale/ku/LC_MESSAGES/xfce4-mixer.mo
-share/locale/lt/LC_MESSAGES/xfce4-mixer.mo
-share/locale/mr/LC_MESSAGES/xfce4-mixer.mo
-share/locale/ms/LC_MESSAGES/xfce4-mixer.mo
-share/locale/nb_NO/LC_MESSAGES/xfce4-mixer.mo
-share/locale/nl/LC_MESSAGES/xfce4-mixer.mo
-share/locale/pa/LC_MESSAGES/xfce4-mixer.mo
-share/locale/pl/LC_MESSAGES/xfce4-mixer.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-mixer.mo
-share/locale/pt_PT/LC_MESSAGES/xfce4-mixer.mo
-share/locale/ro/LC_MESSAGES/xfce4-mixer.mo
-share/locale/ru/LC_MESSAGES/xfce4-mixer.mo
-share/locale/sk/LC_MESSAGES/xfce4-mixer.mo
-share/locale/sl/LC_MESSAGES/xfce4-mixer.mo
-share/locale/sq/LC_MESSAGES/xfce4-mixer.mo
-share/locale/sv/LC_MESSAGES/xfce4-mixer.mo
-share/locale/ta/LC_MESSAGES/xfce4-mixer.mo
-share/locale/tr/LC_MESSAGES/xfce4-mixer.mo
-share/locale/uk/LC_MESSAGES/xfce4-mixer.mo
-share/locale/vi/LC_MESSAGES/xfce4-mixer.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-mixer.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-mixer.mo
diff --git a/audio/xfce4-mixer/buildlink3.mk b/audio/xfce4-mixer/buildlink3.mk
deleted file mode 100644
index c90895070f9..00000000000
--- a/audio/xfce4-mixer/buildlink3.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.19 2007/01/23 11:53:46 martti Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-XFCE4_MIXER_BUILDLINK3_MK:= ${XFCE4_MIXER_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= xfce4-mixer
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-mixer}
-BUILDLINK_PACKAGES+= xfce4-mixer
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-mixer
-
-.if ${XFCE4_MIXER_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-mixer+= xfce4-mixer>=4.2.4
-BUILDLINK_PKGSRCDIR.xfce4-mixer?= ../../audio/xfce4-mixer
-.endif # XFCE4_MIXER_BUILDLINK3_MK
-
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/xfce4-mixer/distinfo b/audio/xfce4-mixer/distinfo
deleted file mode 100644
index 5ad62f7bf22..00000000000
--- a/audio/xfce4-mixer/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.14 2007/01/23 11:53:46 martti Exp $
-
-SHA1 (xfce4-mixer-4.2.4.tar.gz) = aa3f12f6ce13774a296566db10c2c90396d0e3b2
-RMD160 (xfce4-mixer-4.2.4.tar.gz) = c545b70960cecc2f9ee5f923b3dd11a56cec05d1
-Size (xfce4-mixer-4.2.4.tar.gz) = 607409 bytes
-SHA1 (patch-aa) = 813b37e41c8a19c8ce2d2b4ed9fc5e53601dd025
-SHA1 (patch-ab) = 52d3d875c335a55e00870385cc114af7265748dc
diff --git a/audio/xfce4-mixer/patches/patch-aa b/audio/xfce4-mixer/patches/patch-aa
deleted file mode 100644
index c7989e7cc96..00000000000
--- a/audio/xfce4-mixer/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/11/28 18:57:25 rillig Exp $
-
---- panel-plugin/plugin.c.orig 2006-11-28 19:25:31.314565636 +0100
-+++ panel-plugin/plugin.c 2006-11-28 19:27:08.972814548 +0100
-@@ -18,6 +18,14 @@
- /* DO: timeout -> update volume */
- #define UPDATE_TIMEOUT 1000
-
-+#ifdef XFCE_PANEL_THREADED
-+# define XFCE_PANEL_LOCK() gdk_threads_enter()
-+# define XFCE_PANEL_UNLOCK() gdk_threads_leave()
-+#else
-+# define XFCE_PANEL_LOCK() do { } while (0)
-+# define XFCE_PANEL_UNLOCK() do { } while (0)
-+#endif
-+
- typedef struct
- {
- GtkWidget *box;
diff --git a/audio/xfce4-mixer/patches/patch-ab b/audio/xfce4-mixer/patches/patch-ab
deleted file mode 100644
index abb62294577..00000000000
--- a/audio/xfce4-mixer/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2007/01/23 11:53:46 martti Exp $
-
-SunPro cannot handle function-like macros on the command line.
-
---- configure.orig 2007-01-14 21:05:51.000000000 +0000
-+++ configure 2007-01-23 12:35:37.000000000 +0000
-@@ -23199,13 +23199,9 @@
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
- xdt_cv_CFLAGS="$xdt_cv_CFLAGS -DXFCE_PANEL_THREADED=1"
-- xdt_cv_CFLAGS="$xdt_cv_CFLAGS -DXFCE_PANEL_LOCK\(\)=gdk_threads_enter\(\)"
-- xdt_cv_CFLAGS="$xdt_cv_CFLAGS -DXFCE_PANEL_UNLOCK\(\)=gdk_threads_leave\(\)"
- else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
-- xdt_cv_CFLAGS="$xdt_cv_CFLAGS -DXFCE_PANEL_LOCK\(\)=do{}while\(0\)"
-- xdt_cv_CFLAGS="$xdt_cv_CFLAGS -DXFCE_PANEL_UNLOCK\(\)=do{}while\(0\)"
- fi
- XFCE4_PANEL_CFLAGS="$xdt_cv_CFLAGS"
-
diff --git a/audio/xfce4-xmms-plugin/DESCR b/audio/xfce4-xmms-plugin/DESCR
deleted file mode 100644
index cc548f0b2f8..00000000000
--- a/audio/xfce4-xmms-plugin/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-XMMS plugin for Xfce.
diff --git a/audio/xfce4-xmms-plugin/Makefile b/audio/xfce4-xmms-plugin/Makefile
deleted file mode 100644
index 49e9233d016..00000000000
--- a/audio/xfce4-xmms-plugin/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2006/04/17 13:46:13 wiz Exp $
-
-.include "../../meta-pkgs/xfce4/Makefile.common"
-
-XFCE4_VERSION= 0.3.1
-
-DISTNAME= xfce4-xmms-plugin-${XFCE4_VERSION}
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
-COMMENT= Xfce XMMS plugin
-
-EXTRACT_SUFX= .tar.bz2
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xfce4-xmms-plugin/PLIST b/audio/xfce4-xmms-plugin/PLIST
deleted file mode 100644
index 5bbde0056e8..00000000000
--- a/audio/xfce4-xmms-plugin/PLIST
+++ /dev/null
@@ -1,18 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2006/04/17 07:07:12 jlam Exp $
-lib/xfce4/panel-plugins/libxmms_plugin.la
-share/locale/de/LC_MESSAGES/xfce4-xmms-plugin.mo
-share/locale/ko/LC_MESSAGES/xfce4-xmms-plugin.mo
-share/locale/lt/LC_MESSAGES/xfce4-xmms-plugin.mo
-share/xfce4/xmms-plugin/xmms-plugin-menu-eject.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-icon.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-next.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-pause.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-play.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-prev.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-stop.png
-share/xfce4/xmms-plugin/xmms-plugin-next.png
-share/xfce4/xmms-plugin/xmms-plugin-pause.png
-share/xfce4/xmms-plugin/xmms-plugin-play.png
-share/xfce4/xmms-plugin/xmms-plugin-prev.png
-share/xfce4/xmms-plugin/xmms-plugin-stop.png
-@dirrm share/xfce4/xmms-plugin
diff --git a/audio/xfce4-xmms-plugin/buildlink3.mk b/audio/xfce4-xmms-plugin/buildlink3.mk
deleted file mode 100644
index 761304518eb..00000000000
--- a/audio/xfce4-xmms-plugin/buildlink3.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/10/12 06:06:07 martti Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:= ${XFCE4_XMMS_PLUGIN_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= xfce4-xmms-plugin
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-xmms-plugin}
-BUILDLINK_PACKAGES+= xfce4-xmms-plugin
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-xmms-plugin
-
-.if ${XFCE4_XMMS_PLUGIN_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-xmms-plugin+= xfce4-xmms-plugin>=0.3.1nb3
-BUILDLINK_PKGSRCDIR.xfce4-xmms-plugin?= ../../audio/xfce4-xmms-plugin
-.endif # XFCE4_XMMS_PLUGIN_BUILDLINK3_MK
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/xfce4-xmms-plugin/distinfo b/audio/xfce4-xmms-plugin/distinfo
deleted file mode 100644
index bdb8f088233..00000000000
--- a/audio/xfce4-xmms-plugin/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/10/12 05:43:20 martti Exp $
-
-SHA1 (xfce4-xmms-plugin-0.3.1.tar.bz2) = f59c799d672941dfadd19272daff6f6e5b1c02fd
-RMD160 (xfce4-xmms-plugin-0.3.1.tar.bz2) = 955f0ffcce94480d1144416076e3bfd8de76ac00
-Size (xfce4-xmms-plugin-0.3.1.tar.bz2) = 518730 bytes
-SHA1 (patch-aa) = 4fb80effa95987e87ae305db886cfc34cffb4292
-SHA1 (patch-ab) = b24664d40d4c05b872bdb5696a4182cd55ec088e
diff --git a/audio/xfce4-xmms-plugin/patches/patch-aa b/audio/xfce4-xmms-plugin/patches/patch-aa
deleted file mode 100644
index a3f914aea77..00000000000
--- a/audio/xfce4-xmms-plugin/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/10/12 05:43:20 martti Exp $
-
---- configure.ac.orig 2006-10-12 08:38:23.000000000 +0000
-+++ configure.ac 2006-10-12 08:38:33.000000000 +0000
-@@ -35,7 +35,7 @@
- dnl check for player
- AC_MSG_CHECKING([what player to link with])
- AC_ARG_WITH([player], [ --with-player=xmms/beep Specify player to link with [default=xmms]])
--if test x"$with_player" == x"beep"; then
-+if test x"$with_player" = x"beep"; then
- AC_MSG_RESULT([Beep media player])
- BM_DEPEND([PLAYER], [beep], [0.9.6.0])
-
-@@ -44,7 +44,7 @@
- AC_MSG_RESULT([XMMS media player])
-
- AC_CHECK_PROGS([XMMS_CONFIG], [xmms-config], [no])
-- if test x"$XMMS_CONFIG" == x"no"; then
-+ if test x"$XMMS_CONFIG" = x"no"; then
- AC_MSG_ERROR([*** XMMS not found. Please install XMMS first. ***])
- fi
-
diff --git a/audio/xfce4-xmms-plugin/patches/patch-ab b/audio/xfce4-xmms-plugin/patches/patch-ab
deleted file mode 100644
index 869a2c40476..00000000000
--- a/audio/xfce4-xmms-plugin/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/10/12 05:43:20 martti Exp $
-
---- configure.orig 2006-10-12 08:39:06.000000000 +0000
-+++ configure 2006-10-12 08:39:35.000000000 +0000
-@@ -20790,7 +20790,7 @@
- withval="$with_player"
-
- fi;
--if test x"$with_player" == x"beep"; then
-+if test x"$with_player" = x"beep"; then
- echo "$as_me:$LINENO: result: Beep media player" >&5
- echo "${ECHO_T}Beep media player" >&6
-
-@@ -20942,7 +20942,7 @@
- done
- test -n "$XMMS_CONFIG" || XMMS_CONFIG="no"
-
-- if test x"$XMMS_CONFIG" == x"no"; then
-+ if test x"$XMMS_CONFIG" = x"no"; then
- { { echo "$as_me:$LINENO: error: *** XMMS not found. Please install XMMS first. ***" >&5
- echo "$as_me: error: *** XMMS not found. Please install XMMS first. ***" >&2;}
- { (exit 1); exit 1; }; }
diff --git a/audio/xhippo/DESCR b/audio/xhippo/DESCR
deleted file mode 100644
index 6b036874dd2..00000000000
--- a/audio/xhippo/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-xhippo is a generic playlist manager program for a variety of UNIX
-sound players. It's been shown to work with mpg123, bplay, mikmod,
-s3mod, tracker, xmp and timidity, and should work with more-or-less
-anything that can take a filename on the command line. It is capable
-of automatically deciding which player to use depending on a file's
-extension; the defaults are set in a config file. It uses textual
-playlist files, which are easily generated with the "find" or "locate"
-utilities. xhippo's interface is very loosely modelled on the
-shareware "HippoPlayer" player for the Amiga.
diff --git a/audio/xhippo/Makefile b/audio/xhippo/Makefile
deleted file mode 100644
index 2621118a92d..00000000000
--- a/audio/xhippo/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile,v 1.27 2006/03/04 21:28:59 jlam Exp $
-#
-
-DISTNAME= xhippo-3.3
-PKGREVISION= 6
-CATEGORIES= audio x11
-MASTER_SITES= ${MASTER_SITE_GNU:=xhippo/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.gnu.org/software/xhippo/xhippo.html
-COMMENT= Generic playlist manager for UNIX
-
-GNU_CONFIGURE= yes
-USE_PKGLOCALEDIR= yes
-
-CONFIGURE_ENV+= --with-gnome=no
-
-CONF_FILES= ${PREFIX}/share/doc/xhippo/xhippo.config.example \
- ${PKG_SYSCONFDIR}/xhippo.config
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xhippo
- ${INSTALL_DATA} ${WRKSRC}/xhippo.config \
- ${PREFIX}/share/doc/xhippo/xhippo.config.example
- ${INSTALL_DATA} ${WRKSRC}/xhippo.gtkrc \
- ${PREFIX}/share/doc/xhippo/xhippo.gtkrc
- ${INSTALL_DATA} ${WRKSRC}/BUGS ${PREFIX}/share/doc/xhippo
- ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/xhippo
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xhippo
- ${INSTALL_DATA} ${WRKSRC}/README.fvwm2 ${PREFIX}/share/doc/xhippo
- ${INSTALL_DATA} ${WRKSRC}/doc/xhippo.ps.gz ${PREFIX}/share/doc/xhippo
- ${INSTALL_DATA} ${WRKSRC}/doc/xhippo.txt.gz ${PREFIX}/share/doc/xhippo
- ${INSTALL_DATA} ${WRKSRC}/doc/xhippo.sgml ${PREFIX}/share/doc/xhippo
-
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xhippo/PLIST b/audio/xhippo/PLIST
deleted file mode 100644
index 7bee759cd3e..00000000000
--- a/audio/xhippo/PLIST
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2006/04/17 07:07:12 jlam Exp $
-bin/xhippo
-man/man1/xhippo.1
-share/doc/xhippo/BUGS
-share/doc/xhippo/ChangeLog
-share/doc/xhippo/README
-share/doc/xhippo/README.fvwm2
-share/doc/xhippo/xhippo.ps.gz
-share/doc/xhippo/xhippo.txt.gz
-share/doc/xhippo/xhippo.sgml
-share/doc/xhippo/xhippo.gtkrc
-share/doc/xhippo/xhippo.config.example
-share/locale/de/LC_MESSAGES/xhippo.mo
-@dirrm share/doc/xhippo
diff --git a/audio/xhippo/distinfo b/audio/xhippo/distinfo
deleted file mode 100644
index 20de5f24553..00000000000
--- a/audio/xhippo/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/09/22 04:30:41 minskim Exp $
-
-SHA1 (xhippo-3.3.tar.gz) = 15fb21a9027110f1f7b8e17dc33be6c28a67c601
-RMD160 (xhippo-3.3.tar.gz) = 4023286bc843c15b1527fec49cda65a48a763af5
-Size (xhippo-3.3.tar.gz) = 417111 bytes
-SHA1 (patch-aa) = 1be473dacdfb78561da8b9a90cd3c9e7570143b7
diff --git a/audio/xhippo/patches/patch-aa b/audio/xhippo/patches/patch-aa
deleted file mode 100644
index ca3400b9beb..00000000000
--- a/audio/xhippo/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/09/22 04:31:28 minskim Exp $
-
---- Makefile.in.orig 2003-02-02 16:25:29.000000000 -0800
-+++ Makefile.in
-@@ -582,7 +582,7 @@ info-am:
-
- install-data-am: install-man
-
--install-exec-am: install-binPROGRAMS install-sysconfDATA
-+install-exec-am: install-binPROGRAMS
-
- install-info: install-info-recursive
-
diff --git a/audio/xine-arts/DESCR b/audio/xine-arts/DESCR
deleted file mode 100644
index e89035d1096..00000000000
--- a/audio/xine-arts/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Xine is a free multimedia player library for playing back CDs, DVDs,
-and VCDs. It also decodes multimedia files like AVI, MOV, WMV, and MP3
-from local disk drives, and displays multimedia streamed over the
-Internet. It interprets many of the most common multimedia formats
-available -- and some of the most uncommon formats, too.
-
-This package provides the aRts audio output plugin for xine-lib.
diff --git a/audio/xine-arts/Makefile b/audio/xine-arts/Makefile
deleted file mode 100644
index a9a23d070d4..00000000000
--- a/audio/xine-arts/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.23 2006/12/08 18:48:52 drochner Exp $
-#
-
-.include "../../multimedia/xine-lib/Makefile.common"
-
-PKGNAME= ${XINE_PKGNAME:S/lib/arts/}
-CATEGORIES= audio
-COMMENT= The aRts audio output plugin for xine-lib
-
-DEPENDS+= xine-lib>=1rc3a:../../multimedia/xine-lib
-
-BUILD_DIRS= ${WRKSRC}/src/audio_out
-CONFIGURE_ARGS+= --without-x
-
-INSTALLATION_DIRS= lib/xine/plugins/${XINE_LIB_VER}
-
-do-install:
- cd ${WRKSRC}/src/audio_out && \
- ${LIBTOOL} --mode=install ${INSTALL_DATA} \
- xineplug_ao_out_arts.la ${PREFIX}/lib/xine/plugins/${XINE_LIB_VER}
-
-.include "../../audio/arts/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xine-arts/PLIST b/audio/xine-arts/PLIST
deleted file mode 100644
index e2d86b2a970..00000000000
--- a/audio/xine-arts/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2006/08/06 10:36:50 wiz Exp $
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_ao_out_arts.la
diff --git a/audio/xine-esound/DESCR b/audio/xine-esound/DESCR
deleted file mode 100644
index b2f7631020b..00000000000
--- a/audio/xine-esound/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Xine is a free multimedia player library for playing back CDs, DVDs,
-and VCDs. It also decodes multimedia files like AVI, MOV, WMV, and MP3
-from local disk drives, and displays multimedia streamed over the
-Internet. It interprets many of the most common multimedia formats
-available -- and some of the most uncommon formats, too.
-
-This package provides the esound audio output plugin for xine-lib.
diff --git a/audio/xine-esound/Makefile b/audio/xine-esound/Makefile
deleted file mode 100644
index cc2714432ce..00000000000
--- a/audio/xine-esound/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2006/12/08 18:48:52 drochner Exp $
-#
-
-.include "../../multimedia/xine-lib/Makefile.common"
-
-PKGNAME= ${XINE_PKGNAME:S/lib/esound/}
-CATEGORIES= audio
-COMMENT= The esound audio output plugin for xine-lib
-
-DEPENDS+= xine-lib>=1rc3a:../../multimedia/xine-lib
-
-BUILD_DIRS= ${WRKSRC}/src/audio_out
-CONFIGURE_ARGS+= --without-x
-
-INSTALLATION_DIRS= lib/xine/plugins/${XINE_LIB_VER}
-
-do-install:
- cd ${WRKSRC}/src/audio_out && \
- ${LIBTOOL} --mode=install ${INSTALL_DATA} \
- xineplug_ao_out_esd.la ${PREFIX}/lib/xine/plugins/${XINE_LIB_VER}/
-
-.include "../../audio/esound/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xine-esound/PLIST b/audio/xine-esound/PLIST
deleted file mode 100644
index 5e069785d69..00000000000
--- a/audio/xine-esound/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2006/08/06 10:36:50 wiz Exp $
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_ao_out_esd.la
diff --git a/audio/xmcd/DEINSTALL b/audio/xmcd/DEINSTALL
deleted file mode 100644
index 48e38832605..00000000000
--- a/audio/xmcd/DEINSTALL
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.3 2002/10/08 11:50:04 jlam Exp $
-#
-
-XMCDDIR=${PKG_PREFIX}/lib/X11/xmcd
-
-case ${STAGE} in
-POST-DEINSTALL)
- ${CAT} << EOF
-=============================================================================
-If you won't be using ${PKGNAME} any longer, you may want to remove
-any cached CD information in
-
- ${XMCDDIR}/cdinfo
-
-any local discography collection in
-
- ${XMCDDIR}/discog
-
-and any drive information in
-
- ${XMCDDIR}/config
-
-e.g., by deleting the corresponding directory. Please note that config
-files will get overwritten on re-install if you don't save them manually.
-=============================================================================
-EOF
- ;;
-esac
diff --git a/audio/xmcd/DESCR b/audio/xmcd/DESCR
deleted file mode 100644
index 3879271a00f..00000000000
--- a/audio/xmcd/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Xmcd is a full-featured CD Player utility package including xmcd, a CD
-Player for the X window system using the Motif graphical user interface;
-and cda, a command-line driven, text mode CD Player which also features
-a curses-based, screen-oriented mode. Both utilities transform your
-CD-ROM, CD-R or CD-RW drive into a stereo CD player, allowing you to play
-audio CDs on your computer.
diff --git a/audio/xmcd/INSTALL b/audio/xmcd/INSTALL
deleted file mode 100644
index 8ea1556ac3e..00000000000
--- a/audio/xmcd/INSTALL
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.1 2002/10/08 11:50:04 jlam Exp $
-#
-
-XMCDDIR=${PKG_PREFIX}/lib/X11/xmcd
-
-case ${STAGE} in
-POST-INSTALL)
- #
- # Generate the index.html files in the local discography collection.
- #
- ${XMCDDIR}/scripts/genidx
- ;;
-esac
diff --git a/audio/xmcd/MESSAGE b/audio/xmcd/MESSAGE
deleted file mode 100644
index 6a434590213..00000000000
--- a/audio/xmcd/MESSAGE
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2002/10/08 11:50:04 jlam Exp $
-
-Before using xmcd/cda for the first time, you must set up the software by
-running the following interactive script as ${ROOT_USER}:
-
- ${PREFIX}/lib/X11/xmcd/config/config.sh
-
-Xmcd/cda will not work until that is done.
-===========================================================================
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
deleted file mode 100644
index 8e4a47ee46f..00000000000
--- a/audio/xmcd/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-# $NetBSD: Makefile,v 1.66 2007/02/22 19:26:08 wiz Exp $
-
-DISTNAME= xmcd-3.0.2
-PKGREVISION= 9
-CATEGORIES= audio
-MASTER_SITES= http://www.ibiblio.org/tkan/download/xmcd/src/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.amb.org/xmcd/
-COMMENT= Motif CD player
-
-PATCH_SITES= ${HOMEPAGE}
-PATCHFILES= xmcd-3.0.2-proxyauth-patch
-PATCH_DIST_STRIP= -p1
-
-WRKSRC= ${WRKDIR}/xmcd-3.0
-
-USE_IMAKE= yes
-MAKE_ENV+= BATCH_BINDIR=${PREFIX}/bin
-MAKE_ENV+= BATCH_LIBDIR=${PREFIX}/lib/X11
-MAKE_ENV+= BATCH_MANDIR=${PREFIX}/${PKGMANDIR}/man1
-MAKE_ENV+= SHELL=${SH:Q}
-
-CHECK_PERMS_SKIP+= lib/X11/xmcd/discog/*
-
-INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-S]*-*
-
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-ARCH= Solaris
-.else
-ARCH= ${OPSYS}
-.endif
-
-ARCHBIN= ${PREFIX}/lib/X11/xmcd/bin-${ARCH}-${MACHINE_ARCH}
-XMCDDIR= ${PREFIX}/lib/X11/xmcd
-PLIST_SUBST+= ARCH=${ARCH:Q}
-
-_SETUID_ROOT= ${ROOT_USER} ${ROOT_GROUP} 4511
-SPECIAL_PERMS= ${ARCHBIN}/cda ${_SETUID_ROOT}
-SPECIAL_PERMS+= ${ARCHBIN}/xmcd ${_SETUID_ROOT}
-
-CFILES= common.cfg device.cfg wwwwarp.cfg
-.for FILE in ${CFILES}
-CONF_FILES+= ${XMCDDIR}/config/${FILE}.dist ${XMCDDIR}/config/${FILE}
-.endfor
-REQD_DIRS= ${XMCDDIR} ${XMCDDIR}/cdinfo ${XMCDDIR}/config ${XMCDDIR}/discog
-
-pre-configure:
- cd ${WRKSRC} && \
- for f in libdi_d/config.sh misc_d/start.sh install.sh; do \
- ${SED} -e "s/@MACHINE_ARCH@/${MACHINE_ARCH}/" $$f > $$f.new; \
- ${MV} -f $$f.new $$f; \
- done
-
-post-install:
- if [ -n "${_STRIPFLAG_INSTALL}" ]; then \
- for file in cda xmcd gobrowser; do \
- strip ${ARCHBIN}/$$file; \
- done; \
- fi
-
-.if ${OPSYS} != "SunOS"
-.include "../../devel/ncurses/buildlink3.mk"
-.endif
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../mk/motif.buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmcd/PLIST b/audio/xmcd/PLIST
deleted file mode 100644
index df46af8ae36..00000000000
--- a/audio/xmcd/PLIST
+++ /dev/null
@@ -1,275 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2006/02/22 00:06:21 rillig Exp $
-bin/cda
-bin/xmcd
-bin/xmcd_start
-lib/X11/xmcd/app-defaults/XKeysymDB
-lib/X11/xmcd/app-defaults/XMcd
-lib/X11/xmcd/bin-${ARCH}-${MACHINE_ARCH}/README
-lib/X11/xmcd/bin-${ARCH}-${MACHINE_ARCH}/cda
-lib/X11/xmcd/bin-${ARCH}-${MACHINE_ARCH}/gobrowser
-lib/X11/xmcd/bin-${ARCH}-${MACHINE_ARCH}/xmcd
-lib/X11/xmcd/config/.tbl/Acer
-lib/X11/xmcd/config/.tbl/Apple
-lib/X11/xmcd/config/.tbl/Aztech
-lib/X11/xmcd/config/.tbl/Chinon
-lib/X11/xmcd/config/.tbl/Compaq
-lib/X11/xmcd/config/.tbl/Compro
-lib/X11/xmcd/config/.tbl/Creative
-lib/X11/xmcd/config/.tbl/Cyberdri
-lib/X11/xmcd/config/.tbl/DEC
-lib/X11/xmcd/config/.tbl/Goldstar
-lib/X11/xmcd/config/.tbl/HP
-lib/X11/xmcd/config/.tbl/Hitachi
-lib/X11/xmcd/config/.tbl/IBM
-lib/X11/xmcd/config/.tbl/Kenwood
-lib/X11/xmcd/config/.tbl/Longshin
-lib/X11/xmcd/config/.tbl/MDI
-lib/X11/xmcd/config/.tbl/MediaVis
-lib/X11/xmcd/config/.tbl/Mitsumi
-lib/X11/xmcd/config/.tbl/NEC
-lib/X11/xmcd/config/.tbl/Nakamich
-lib/X11/xmcd/config/.tbl/Okano
-lib/X11/xmcd/config/.tbl/Opticsto
-lib/X11/xmcd/config/.tbl/Orchid
-lib/X11/xmcd/config/.tbl/Panasoni
-lib/X11/xmcd/config/.tbl/Philips
-lib/X11/xmcd/config/.tbl/Pioneer
-lib/X11/xmcd/config/.tbl/Plextor
-lib/X11/xmcd/config/.tbl/Procom
-lib/X11/xmcd/config/.tbl/Regal
-lib/X11/xmcd/config/.tbl/Ricoh
-lib/X11/xmcd/config/.tbl/SGI
-lib/X11/xmcd/config/.tbl/Samsung
-lib/X11/xmcd/config/.tbl/Sanyo
-lib/X11/xmcd/config/.tbl/Sony
-lib/X11/xmcd/config/.tbl/Stratus
-lib/X11/xmcd/config/.tbl/Sun
-lib/X11/xmcd/config/.tbl/Tatung
-lib/X11/xmcd/config/.tbl/Teac
-lib/X11/xmcd/config/.tbl/Toshiba
-lib/X11/xmcd/config/.tbl/Yamaha
-lib/X11/xmcd/config/common.cfg.dist
-lib/X11/xmcd/config/config.sh
-lib/X11/xmcd/config/device.cfg.dist
-lib/X11/xmcd/config/wwwwarp.cfg.dist
-lib/X11/xmcd/discog/Blues/General_Blues/index.html
-lib/X11/xmcd/discog/Classical/General_Classical/index.html
-lib/X11/xmcd/discog/Country/General_Country/index.html
-lib/X11/xmcd/discog/Data/General_Data/index.html
-lib/X11/xmcd/discog/Folk/General_Folk/index.html
-lib/X11/xmcd/discog/Jazz/General_Jazz/index.html
-lib/X11/xmcd/discog/Newage/General_Newage/index.html
-lib/X11/xmcd/discog/Rock/General_Rock/index.html
-lib/X11/xmcd/discog/Soundtrack/General_Soundtrack/index.html
-lib/X11/xmcd/discog/Unclassifiable/General_Unclassifiable/index.html
-lib/X11/xmcd/discog/World/Reggae/index.html
-lib/X11/xmcd/discog/bkgnd.gif
-lib/X11/xmcd/discog/cda.html
-lib/X11/xmcd/discog/discog.html
-lib/X11/xmcd/discog/index.html
-lib/X11/xmcd/discog/xmcd.html
-lib/X11/xmcd/discog/xmcdlogo.gif
-lib/X11/xmcd/docs/ACKS
-lib/X11/xmcd/docs/CDDB
-lib/X11/xmcd/docs/CHANGES
-lib/X11/xmcd/docs/COPYING
-lib/X11/xmcd/docs/DRIVES
-lib/X11/xmcd/docs/FAQ
-lib/X11/xmcd/docs/FEATURES
-lib/X11/xmcd/docs/INSTALL
-lib/X11/xmcd/docs/INSTALL.VMS
-lib/X11/xmcd/docs/PLATFORM
-lib/X11/xmcd/docs/PORTING
-lib/X11/xmcd/docs/PRIVACY
-lib/X11/xmcd/docs/README
-lib/X11/xmcd/docs/RELNOTES
-lib/X11/xmcd/docs/WEB
-lib/X11/xmcd/help/Cr/Add.btn
-lib/X11/xmcd/help/Cr/AutoTr.btn
-lib/X11/xmcd/help/Cr/Credit.lsw
-lib/X11/xmcd/help/Cr/Delete.btn
-lib/X11/xmcd/help/Cr/Dir.btn
-lib/X11/xmcd/help/Cr/FName.btn
-lib/X11/xmcd/help/Cr/Modify.btn
-lib/X11/xmcd/help/Cr/Name.txw
-lib/X11/xmcd/help/Cr/Notes.txw
-lib/X11/xmcd/help/Cr/Ok.btn
-lib/X11/xmcd/help/Cr/PriRole.opt
-lib/X11/xmcd/help/Cr/SubRole.opt
-lib/X11/xmcd/help/Dd/Comp.btn
-lib/X11/xmcd/help/Dd/Dnum.txw
-lib/X11/xmcd/help/Dd/Genre.opt
-lib/X11/xmcd/help/Dd/Info.lbl
-lib/X11/xmcd/help/Dd/Label.txw
-lib/X11/xmcd/help/Dd/Notes.txw
-lib/X11/xmcd/help/Dd/Ok.btn
-lib/X11/xmcd/help/Dd/Region.txw
-lib/X11/xmcd/help/Dd/SortTt.txw
-lib/X11/xmcd/help/Dd/Tnum.txw
-lib/X11/xmcd/help/Dd/Year.txw
-lib/X11/xmcd/help/Df/Name.txw
-lib/X11/xmcd/help/Df/Ok.btn
-lib/X11/xmcd/help/Dl/Cancel.btn
-lib/X11/xmcd/help/Dl/ChgTo.btn
-lib/X11/xmcd/help/Dl/Del.btn
-lib/X11/xmcd/help/Dl/DelAll.btn
-lib/X11/xmcd/help/Dl/Disc.lsw
-lib/X11/xmcd/help/Dl/ReScan.btn
-lib/X11/xmcd/help/Dl/Show.btn
-lib/X11/xmcd/help/Dl/Type.opt
-lib/X11/xmcd/help/Dp/AddPgm.btn
-lib/X11/xmcd/help/Dp/Artist.txw
-lib/X11/xmcd/help/Dp/ClrPgm.btn
-lib/X11/xmcd/help/Dp/DCredits.btn
-lib/X11/xmcd/help/Dp/DExt.btn
-lib/X11/xmcd/help/Dp/DList.btn
-lib/X11/xmcd/help/Dp/FName.btn
-lib/X11/xmcd/help/Dp/Flush.btn
-lib/X11/xmcd/help/Dp/Offline.btn
-lib/X11/xmcd/help/Dp/Ok.btn
-lib/X11/xmcd/help/Dp/PgmSeq.txw
-lib/X11/xmcd/help/Dp/Reload.btn
-lib/X11/xmcd/help/Dp/SavePgm.btn
-lib/X11/xmcd/help/Dp/Segments.btn
-lib/X11/xmcd/help/Dp/Submit.btn
-lib/X11/xmcd/help/Dp/TCredits.btn
-lib/X11/xmcd/help/Dp/TExt.btn
-lib/X11/xmcd/help/Dp/TTitle.txw
-lib/X11/xmcd/help/Dp/TimSel.btn
-lib/X11/xmcd/help/Dp/Title.txw
-lib/X11/xmcd/help/Dp/TotTim.lbl
-lib/X11/xmcd/help/Dp/Trk.lsw
-lib/X11/xmcd/help/Dp/UserReg.btn
-lib/X11/xmcd/help/Dt/Artist.txw
-lib/X11/xmcd/help/Dt/AutoTr.btn
-lib/X11/xmcd/help/Dt/BPM.txw
-lib/X11/xmcd/help/Dt/Dir.btn
-lib/X11/xmcd/help/Dt/FName.btn
-lib/X11/xmcd/help/Dt/Genre.opt
-lib/X11/xmcd/help/Dt/ISRC.lbl
-lib/X11/xmcd/help/Dt/Label.txw
-lib/X11/xmcd/help/Dt/Notes.txw
-lib/X11/xmcd/help/Dt/Ok.btn
-lib/X11/xmcd/help/Dt/SortTt.txw
-lib/X11/xmcd/help/Dt/Year.txw
-lib/X11/xmcd/help/Hp/About.btn
-lib/X11/xmcd/help/Hp/Cancel.btn
-lib/X11/xmcd/help/Hp/Text.txw
-lib/X11/xmcd/help/Hp/Topic.opt
-lib/X11/xmcd/help/Kp/Cancel.btn
-lib/X11/xmcd/help/Kp/Clear.btn
-lib/X11/xmcd/help/Kp/Enter.btn
-lib/X11/xmcd/help/Kp/Ind.lbl
-lib/X11/xmcd/help/Kp/Num.btn
-lib/X11/xmcd/help/Kp/Sel.btn
-lib/X11/xmcd/help/Kp/Warp.scl
-lib/X11/xmcd/help/Ms/Match.lsw
-lib/X11/xmcd/help/Ms/Ok.btn
-lib/X11/xmcd/help/Op/Bal.scl
-lib/X11/xmcd/help/Op/BalCtr.btn
-lib/X11/xmcd/help/Op/ChRt.rbx
-lib/X11/xmcd/help/Op/Chgr.cbx
-lib/X11/xmcd/help/Op/Done.cbx
-lib/X11/xmcd/help/Op/Eject.cbx
-lib/X11/xmcd/help/Op/Exit.rbx
-lib/X11/xmcd/help/Op/Load.cbx
-lib/X11/xmcd/help/Op/Load.rbx
-lib/X11/xmcd/help/Op/Ok.btn
-lib/X11/xmcd/help/Op/Reset.btn
-lib/X11/xmcd/help/Op/Save.btn
-lib/X11/xmcd/help/Op/VolTpr.rbx
-lib/X11/xmcd/help/Rs/Ok.btn
-lib/X11/xmcd/help/Rs/Region.lsw
-lib/X11/xmcd/help/Sg/Add.btn
-lib/X11/xmcd/help/Sg/Credits.btn
-lib/X11/xmcd/help/Sg/Delete.btn
-lib/X11/xmcd/help/Sg/Fields.txw
-lib/X11/xmcd/help/Sg/Modify.btn
-lib/X11/xmcd/help/Sg/Notes.txw
-lib/X11/xmcd/help/Sg/Ok.btn
-lib/X11/xmcd/help/Sg/PlayPaus.btn
-lib/X11/xmcd/help/Sg/Segment.lsw
-lib/X11/xmcd/help/Sg/Set.btn
-lib/X11/xmcd/help/Sg/Stop.btn
-lib/X11/xmcd/help/Su/Ok.btn
-lib/X11/xmcd/help/Su/SubmURL.txw
-lib/X11/xmcd/help/Su/Submit.btn
-lib/X11/xmcd/help/Ur/Age.txw
-lib/X11/xmcd/help/Ur/AllowM.btn
-lib/X11/xmcd/help/Ur/AllowS.btn
-lib/X11/xmcd/help/Ur/Cancel.btn
-lib/X11/xmcd/help/Ur/Email.txw
-lib/X11/xmcd/help/Ur/Gender.rbx
-lib/X11/xmcd/help/Ur/Handle.txw
-lib/X11/xmcd/help/Ur/Hint.btn
-lib/X11/xmcd/help/Ur/Hint.txw
-lib/X11/xmcd/help/Ur/Ok.btn
-lib/X11/xmcd/help/Ur/Passwd.txw
-lib/X11/xmcd/help/Ur/Postal.txw
-lib/X11/xmcd/help/Ur/Region.txw
-lib/X11/xmcd/help/Ur/Vpaswd.txw
-lib/X11/xmcd/help/Xm/Ab.btn
-lib/X11/xmcd/help/Xm/DbMode.lbl
-lib/X11/xmcd/help/Xm/DbProg.btn
-lib/X11/xmcd/help/Xm/Disc.lbl
-lib/X11/xmcd/help/Xm/DiscTitl.lbl
-lib/X11/xmcd/help/Xm/Eject.btn
-lib/X11/xmcd/help/Xm/Ff.btn
-lib/X11/xmcd/help/Xm/Help.btn
-lib/X11/xmcd/help/Xm/Index.lbl
-lib/X11/xmcd/help/Xm/Keypad.btn
-lib/X11/xmcd/help/Xm/Level.scl
-lib/X11/xmcd/help/Xm/Main.cbx
-lib/X11/xmcd/help/Xm/Mode.btn
-lib/X11/xmcd/help/Xm/NextDisc.btn
-lib/X11/xmcd/help/Xm/NextIdx.btn
-lib/X11/xmcd/help/Xm/NextTrk.btn
-lib/X11/xmcd/help/Xm/Options.btn
-lib/X11/xmcd/help/Xm/PlayMode.lbl
-lib/X11/xmcd/help/Xm/PlayPaus.btn
-lib/X11/xmcd/help/Xm/PrevDisc.btn
-lib/X11/xmcd/help/Xm/PrevIdx.btn
-lib/X11/xmcd/help/Xm/PrevTrk.btn
-lib/X11/xmcd/help/Xm/ProgMode.lbl
-lib/X11/xmcd/help/Xm/Quit.btn
-lib/X11/xmcd/help/Xm/Rew.btn
-lib/X11/xmcd/help/Xm/RptCnt.lbl
-lib/X11/xmcd/help/Xm/Sample.btn
-lib/X11/xmcd/help/Xm/Stop.btn
-lib/X11/xmcd/help/Xm/Time.btn
-lib/X11/xmcd/help/Xm/Time.lbl
-lib/X11/xmcd/help/Xm/TimeMode.lbl
-lib/X11/xmcd/help/Xm/Track.lbl
-lib/X11/xmcd/help/Xm/TrkTitle.lbl
-lib/X11/xmcd/help/Xm/WWWwarp.btn
-@exec ${MKDIR} %D/lib/X11/xmcd/lib-${ARCH}-${MACHINE_ARCH}
-lib/X11/xmcd/pixmaps/xmcd.icon
-lib/X11/xmcd/pixmaps/xmcd.xpm
-lib/X11/xmcd/pixmaps/xmcd_a.px
-lib/X11/xmcd/pixmaps/xmcd_b.px
-lib/X11/xmcd/scripts/genidx
-man/man1/cda.1
-man/man1/xmcd.1
-@dirrm lib/X11/xmcd/pixmaps
-@dirrm lib/X11/xmcd/help/Xm
-@dirrm lib/X11/xmcd/help/Ur
-@dirrm lib/X11/xmcd/help/Su
-@dirrm lib/X11/xmcd/help/Sg
-@dirrm lib/X11/xmcd/help/Rs
-@dirrm lib/X11/xmcd/help/Op
-@dirrm lib/X11/xmcd/help/Ms
-@dirrm lib/X11/xmcd/help/Kp
-@dirrm lib/X11/xmcd/help/Hp
-@dirrm lib/X11/xmcd/help/Dt
-@dirrm lib/X11/xmcd/help/Dp
-@dirrm lib/X11/xmcd/help/Dl
-@dirrm lib/X11/xmcd/help/Df
-@dirrm lib/X11/xmcd/help/Dd
-@dirrm lib/X11/xmcd/help/Cr
-@dirrm lib/X11/xmcd/help
-@dirrm lib/X11/xmcd/docs
-@dirrm lib/X11/xmcd/config/.tbl
-@dirrm lib/X11/xmcd/bin-${ARCH}-${MACHINE_ARCH}
-@dirrm lib/X11/xmcd/lib-${ARCH}-${MACHINE_ARCH}
-@dirrm lib/X11/xmcd/scripts
-@dirrm lib/X11/xmcd/app-defaults
diff --git a/audio/xmcd/distinfo b/audio/xmcd/distinfo
deleted file mode 100644
index 720c9af0b65..00000000000
--- a/audio/xmcd/distinfo
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: distinfo,v 1.15 2006/03/01 17:39:17 tron Exp $
-
-SHA1 (xmcd-3.0.2.tar.gz) = 10258f299f917c94780d3e6d9feb57535d4603b5
-RMD160 (xmcd-3.0.2.tar.gz) = 9fbee32681e8df4623a06b49ee64ac328478623b
-Size (xmcd-3.0.2.tar.gz) = 690285 bytes
-SHA1 (xmcd-3.0.2-proxyauth-patch) = a6114c73e5470747fe2dcfe16cb11bc7c5e5b4dd
-RMD160 (xmcd-3.0.2-proxyauth-patch) = 405be2eefaaf51fc029828d5850b9f5c78cef5b2
-Size (xmcd-3.0.2-proxyauth-patch) = 2922 bytes
-SHA1 (patch-aa) = 0a446d2943dd9ac9d66938674daa16d1d629e470
-SHA1 (patch-ab) = 2721877c17a7e810a4039be7056d015b87d94273
-SHA1 (patch-ac) = 19440a72fda657bf73811c20aabab5c955369516
-SHA1 (patch-ad) = 0a65563d8b50a07a4ae1f5ca6c722f91d6cefc93
-SHA1 (patch-ae) = 3de0e9fd004fcb6012f033739ff1b66bd059d655
-SHA1 (patch-af) = e8bc1a3b791f6df15f12f074712a55423fa3fadf
-SHA1 (patch-ag) = cdca79fa131a6b2e74c7cea377167f8d0290c162
-SHA1 (patch-ah) = bae28364d50709529cad5ce5ebf3362dd14cf99b
-SHA1 (patch-ai) = 630d725a223728c75531765dd8f5e1be2f3adc32
-SHA1 (patch-aj) = 60e8b099b12cdd5bad6068d0e4e7896f7f63980f
diff --git a/audio/xmcd/patches/patch-aa b/audio/xmcd/patches/patch-aa
deleted file mode 100644
index 0b867c6dd36..00000000000
--- a/audio/xmcd/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2001/07/24 16:00:02 nra Exp $
-
---- xmcd_d/Imakefile.orig Mon Jul 23 14:32:31 2001
-+++ xmcd_d/Imakefile Mon Jul 23 14:33:21 2001
-@@ -54,7 +54,7 @@
- SYS_LIBRARIES= $(LIBCDDB)
- #endif
-
--LOCAL_LIBRARIES= XmClientLibs
-+LOCAL_LIBRARIES= ${MOTIFLIB} XawClientLibs
-
- #if defined(FreeBSDArchitecture)
- .if exists(/usr/include/camlib.h)
diff --git a/audio/xmcd/patches/patch-ab b/audio/xmcd/patches/patch-ab
deleted file mode 100644
index fd0e4a70f74..00000000000
--- a/audio/xmcd/patches/patch-ab
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ab,v 1.12 2003/06/13 10:55:26 cjep Exp $
---- cda_d/Imakefile.orig Wed Aug 8 01:15:13 2001
-+++ cda_d/Imakefile Tue Jun 10 13:29:21 2003
-@@ -53,7 +53,13 @@
- DEFINES= -DBSDCOMPAT -DUSE_TERMIOS
- #else
- #if defined(NetBSDArchitecture)
--DEFINES= -DBSDCOMPAT -DNOVISUAL -DUSE_TERMIOS
-+#if OSMajorVersion == 1 && (OSMinorVersion < 6 || \
-+ (OSMinorVersion == 6 && OSTeenyVersion < 20))
-+DEFINES= -DBSDCOMPAT -DUSE_TERMIOS
-+#else
-+DEFINES= -DBSDCOMPAT -DUSE_TERMIOS -DUSE_NETBSD_CURSES
-+#define USE_NETBSD_CURSES
-+#endif
- #else
- #if defined(__bsdi__)
- .if exists(/usr/include/ncurses.h)
-@@ -127,11 +133,16 @@
- .endif
- #else
- #if defined(NetBSDArchitecture)
--LOCAL_LIBRARIES=
-+LOCAL_LIBRARIES= ${MOTIFLIB} XawClientLibs
-+#if defined USE_NETBSD_CURSES
-+LOCAL_LIBRARIES+=-lcurses
-+#else
-+LOCAL_LIBRARIES+=-lncurses
-+#endif
- #else
- #if defined(__bsdi__)
- .if exists(/usr/include/ncurses.h)
--LOCAL_LIBRARIES=-lncurses
-+LOCAL_LIBRARIES=-I${LOCALBASE}/include -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lncurses
- .else
- LOCAL_LIBRARIES=
- .endif
diff --git a/audio/xmcd/patches/patch-ac b/audio/xmcd/patches/patch-ac
deleted file mode 100644
index 0e5e351e5ac..00000000000
--- a/audio/xmcd/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2001/07/24 16:00:02 nra Exp $
-
---- Imakefile.orig Mon Jul 23 13:38:08 2001
-+++ Imakefile Mon Jul 23 13:38:32 2001
-@@ -74,6 +74,6 @@
-
- install::
- @BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) MANDIR=$(MANDIR) \
-- MANSUFFIX=$(MANSUFFIX) $(SHELL) ./install.sh -n
-+ MANSUFFIX=$(MANSUFFIX) $(SHELL) ./install.sh -n -b
-
-
diff --git a/audio/xmcd/patches/patch-ad b/audio/xmcd/patches/patch-ad
deleted file mode 100644
index f10f6227300..00000000000
--- a/audio/xmcd/patches/patch-ad
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-ad,v 1.9 2006/02/22 00:06:21 rillig Exp $
-
---- install.sh.orig 2001-08-08 02:14:54.000000000 +0200
-+++ install.sh 2006-02-22 00:59:18.000000000 +0100
-@@ -57,7 +57,7 @@ XBINOWNER=root
- XBINGROUP=bin
- ERRFILE=/tmp/xmcd.err
- TMPFILE=/tmp/xmcdinst.$$
--STARTUP_SCRIPT=.xmcd_start
-+STARTUP_SCRIPT=xmcd_start
-
- #
- # Utility functions
-@@ -493,7 +493,7 @@ trap "rm -f $TMPFILE; exit 1" 1 2 3 5 15
- #
- OS_SYS=`(uname -s) 2>/dev/null`
- OS_REL=`(uname -r) 2>/dev/null`
--OS_MACH=`(uname -m) 2>/dev/null`
-+OS_MACH=@MACHINE_ARCH@
-
- if [ -z "$OS_SYS" ]
- then
-@@ -693,7 +693,7 @@ then
- $ECHO "\n\nYou should be the super user to install xmcd."
-
- YNDEF=n
-- if [ -z "$BATCH" ] && get_yn "\n Proceed with installation anyway"
-+ if true
- then
- $ECHO "\nWARNING: Without super-user privilege, some files may"
- $ECHO "not be properly installed, or they may be installed"
-@@ -1226,20 +1226,11 @@ do
- done
-
- # Configuration files
--if [ -f $XMCDLIB/config/common.cfg ]
--then
-- diff $XMCDLIB/config/common.cfg libdi_d/common.cfg >/dev/null 2>&1
-- if [ $? -ne 0 ]
-- then
-- # Save old config file for use by config.sh
-- mv $XMCDLIB/config/common.cfg $XMCDLIB/config/common.cfg.old
-- fi
--fi
--inst_file libdi_d/common.cfg $XMCDLIB/config/common.cfg \
-+inst_file libdi_d/common.cfg $XMCDLIB/config/common.cfg.dist \
- $FILEPERM $OWNER $GROUP
--inst_file libdi_d/device.cfg $XMCDLIB/config/device.cfg \
-+inst_file libdi_d/device.cfg $XMCDLIB/config/device.cfg.dist \
- $FILEPERM $OWNER $GROUP
--inst_file cdinfo_d/wwwwarp.cfg $XMCDLIB/config/wwwwarp.cfg \
-+inst_file cdinfo_d/wwwwarp.cfg $XMCDLIB/config/wwwwarp.cfg.dist \
- $FILEPERM $OWNER $GROUP
-
- rm -f $XMCDLIB/config/.tbl/*
diff --git a/audio/xmcd/patches/patch-ae b/audio/xmcd/patches/patch-ae
deleted file mode 100644
index 15954250734..00000000000
--- a/audio/xmcd/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2001/07/24 16:00:02 nra Exp $
-
---- misc_d/start.sh.orig Mon Jul 23 13:54:32 2001
-+++ misc_d/start.sh Mon Jul 23 13:55:10 2001
-@@ -116,7 +116,7 @@
-
- PROG=`(basename $0) 2>/dev/null`
- SYS=`(uname -s) 2>/dev/null | sed -e 's/\//_/g' -e 's/-/_/g' -e 's/[ ]/_/g'`
--MACH=`(uname -m) 2>/dev/null | sed -e 's/\//_/g' -e 's/-/_/g' -e 's/[ ]/_/g'`
-+MACH=`echo @MACHINE_ARCH@ | sed -e 's/\//_/g' -e 's/-/_/g' -e 's/[ ]/_/g'`
- REL=`(uname -r) 2>/dev/null | sed -e 's/\//_/g' -e 's/-/_/g' -e 's/[ ]/_/g'`
-
- o_path=$PATH
diff --git a/audio/xmcd/patches/patch-af b/audio/xmcd/patches/patch-af
deleted file mode 100644
index c425f550fe7..00000000000
--- a/audio/xmcd/patches/patch-af
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-af,v 1.3 2002/01/08 09:55:04 tron Exp $
-
---- libdi_d/config.sh.orig Mon Jul 16 19:52:02 2001
-+++ libdi_d/config.sh Tue Jan 8 10:39:13 2002
-@@ -1287,12 +1287,7 @@
- elif [ "$OS_SYS" = NetBSD ] || [ "$OS_SYS" = OpenBSD ]
- then
- # NetBSD/OpenBSD
-- if [ "$IS_SCSI" -eq 1 ]
-- then
-- DEVPREF=/dev/rcd
-- else
-- DEVPREF=/dev/rwcd
-- fi
-+ DEVPREF=/dev/rcd
- case "$OS_MACH" in
- *86)
- DEVSUFF=d
-@@ -2001,7 +1996,7 @@
- # Get platform information
- OS_SYS=`(uname -s) 2>/dev/null`
- OS_REL=`(uname -r) 2>/dev/null`
--OS_MACH=`(uname -m) 2>/dev/null`
-+OS_MACH=@MACHINE_ARCH@
- OS_NODE=`(uname -n) 2>/dev/null`
-
- if [ -z "$OS_SYS" ]
diff --git a/audio/xmcd/patches/patch-ag b/audio/xmcd/patches/patch-ag
deleted file mode 100644
index 8c3b44b80af..00000000000
--- a/audio/xmcd/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2001/08/05 15:21:34 fredb Exp $
-
---- util_d/Imakefile.orig Mon Jul 16 12:52:16 2001
-+++ util_d/Imakefile
-@@ -43,7 +43,7 @@
- * #include "Motif.tmpl"
- * #include "Motif.rules"
- */
--LOCAL_LIBRARIES= XmClientLibs
-+LOCAL_LIBRARIES= ${MOTIFLIB} XawClientLibs
-
-
- /**** Optional defines: Change as you see fit. *****************************
diff --git a/audio/xmcd/patches/patch-ah b/audio/xmcd/patches/patch-ah
deleted file mode 100644
index 788fa4801fc..00000000000
--- a/audio/xmcd/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2002/01/25 08:38:34 tron Exp $
-
---- cdinfo_d/cdinfo_i.c.orig Fri Jan 25 09:23:13 2002
-+++ cdinfo_d/cdinfo_i.c Fri Jan 25 09:26:30 2002
-@@ -2100,7 +2100,7 @@
- return FALSE;
- if (!cdinfo_puts(pp, XMCD_PIPESIG "match.genre"))
- return FALSE;
-- if (!cdinfo_puts(pp, p->genre))
-+ if (!cdinfo_puts(pp, (p->genre == NULL) ? "221" : p->genre))
- return FALSE;
- }
-
diff --git a/audio/xmcd/patches/patch-ai b/audio/xmcd/patches/patch-ai
deleted file mode 100644
index 0437b0af90d..00000000000
--- a/audio/xmcd/patches/patch-ai
+++ /dev/null
@@ -1,123 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2003/06/13 10:55:26 cjep Exp $
---- cda_d/visual.c.orig Wed Aug 8 01:15:14 2001
-+++ cda_d/visual.c Tue Jun 10 15:13:16 2003
-@@ -52,15 +52,17 @@
- #if defined(ultrix) || defined(__ultrix)
- #include <cursesX.h>
- #else
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__)
-+#if defined(__FreeBSD__) || defined(__bsdi__) || \
-+(defined(__NetBSD__) && !defined(USE_NETBSD_CURSES))
- #include <ncurses.h>
- #else
- #include <curses.h>
--#endif /* __FreeBSD__ __NetBSD__ __bsdi__ */
-+#endif /* __FreeBSD__ __bsdi__ __NetBSD__ */
- #endif /* ultrix */
- #endif /* SYSV */
-
--#ifndef __QNX__
-+#if !((defined __QNX__) || \
-+(defined(__NetBSD__) && defined(USE_NETBSD_CURSES)))
- #include <term.h>
- #endif
-
-@@ -425,7 +427,7 @@
- cda_clrstatus();
- wprintw(status_win, "Choose one (1-%d): ", i);
- cda_v_echo(TRUE);
-- putp(cursor_normal);
-+ curs_set(1);
- wrefresh(status_win);
- cda_wgetstr(status_win, input, 60);
-
-@@ -437,7 +439,7 @@
- }
-
- cda_v_echo(FALSE);
-- putp(cursor_invisible);
-+ curs_set(0);
-
- if (n == i)
- return 0;
-@@ -508,7 +510,7 @@
- cda_clrstatus();
- wprintw(status_win, "Username: ");
- cda_v_echo(TRUE);
-- putp(cursor_normal);
-+ curs_set(1);
- wrefresh(status_win);
- cda_wgetstr(status_win, input, 60);
- if (input[0] == '\0')
-@@ -1575,7 +1577,7 @@
- cda_clrstatus();
- wprintw(status_win, "Program: ");
- cda_v_echo(TRUE);
-- putp(cursor_normal);
-+ curs_set(1);
- wrefresh(status_win);
-
- /* Before reading the program list, check for
-@@ -1616,7 +1618,7 @@
- }
-
- cda_v_echo(FALSE);
-- putp(cursor_invisible);
-+ curs_set(0);
-
- refresh_sts = TRUE;
- }
-@@ -2061,7 +2063,7 @@
- cda_clrstatus();
- wprintw(status_win, "Track n [mins secs] : ");
- cda_v_echo(TRUE);
-- putp(cursor_normal);
-+ curs_set(1);
- wrefresh(status_win);
-
- cda_wgetstr(status_win, inbuf, 20);
-@@ -2091,7 +2093,7 @@
- }
-
- cda_v_echo(FALSE);
-- putp(cursor_invisible);
-+ curs_set(0);
- refresh_sts = TRUE;
- }
-
-@@ -2119,7 +2121,7 @@
- /* Put screen in sane state */
- move(LINES-1, 0);
- printw("\r\n\n");
-- putp(cursor_normal);
-+ curs_set(1);
- refresh();
- reset_shell_mode();
-
-@@ -2150,7 +2152,7 @@
-
- /* Restore visual attributes */
- reset_prog_mode();
-- putp(cursor_invisible);
-+ curs_set(0);
-
- /* Set up for auto refresh */
- wclear(info_win);
-@@ -2184,7 +2186,7 @@
- {
- if (isvisual) {
- keypad(stdscr, FALSE);
-- putp(cursor_normal);
-+ curs_set(1);
- clear();
-
- move(LINES-1, 0);
-@@ -2293,7 +2295,7 @@
-
- noecho();
- cbreak();
-- putp(cursor_invisible);
-+ curs_set(0);
-
- if ((info_win = newpad(MAXTRACK * 2, COLS)) == (WINDOW *) NULL) {
- cda_quit(s);
diff --git a/audio/xmcd/patches/patch-aj b/audio/xmcd/patches/patch-aj
deleted file mode 100644
index 31056242445..00000000000
--- a/audio/xmcd/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2006/03/01 17:39:17 tron Exp $
-
---- cda_d/cda.c.orig 2001-08-08 01:15:14.000000000 +0100
-+++ cda_d/cda.c 2006-03-01 17:33:38.000000000 +0000
-@@ -4040,8 +4040,6 @@
- /* Make some needed directories */
- cda_mkdirs();
-
-- (void) signal(SIGCHLD, SIG_IGN);
--
- /* Become a daemon process */
- switch (FORK()) {
- case -1:
diff --git a/audio/xmix/DESCR b/audio/xmix/DESCR
deleted file mode 100644
index 2b93da2efc6..00000000000
--- a/audio/xmix/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This is the xmix sound mixer for the sound drivers in the FreeBSD
-It was originally written for Linux by Hal Brand (brand@netcom.com).
diff --git a/audio/xmix/Makefile b/audio/xmix/Makefile
deleted file mode 100644
index 7c884d24f3d..00000000000
--- a/audio/xmix/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.23 2006/12/27 13:37:35 joerg Exp $
-
-DISTNAME= xmix-2.1
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/sound/mixers/}
-
-PATCH_SITES= ${MASTER_SITES}
-PATCHFILES= xmix-2.1.mixers.patch
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= Mixer for X Window System
-
-NOT_FOR_PLATFORM= Interix-*-*
-
-WRKSRC= ${WRKDIR}/xmix
-USE_IMAKE= yes
-
-pre-configure:
- ${CP} ${WRKSRC}/xmix.1 ${WRKSRC}/xmix.man
-
-pre-install:
- ${INSTALL_DATA} ${WRKSRC}/XMix ${PREFIX}/lib/X11/app-defaults
-
-.include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmix/PLIST b/audio/xmix/PLIST
deleted file mode 100644
index d87264e11cd..00000000000
--- a/audio/xmix/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/11/06 23:58:05 joerg Exp $
-bin/xmix
-lib/X11/app-defaults/XMix
-${IMAKE_MAN_DIR}/xmix.${IMAKE_MANNEWSUFFIX}
diff --git a/audio/xmix/distinfo b/audio/xmix/distinfo
deleted file mode 100644
index 751670f5dff..00000000000
--- a/audio/xmix/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/11/06 23:49:03 joerg Exp $
-
-SHA1 (xmix-2.1.tar.gz) = 390096a541a41ffb47c9b57ee6029211d31393d3
-RMD160 (xmix-2.1.tar.gz) = 0f1bc15b89bfc657ade9b12cb9decb248d780925
-Size (xmix-2.1.tar.gz) = 34835 bytes
-SHA1 (xmix-2.1.mixers.patch) = 86b423774a6afcd56a8f8931108823d702db1ea5
-RMD160 (xmix-2.1.mixers.patch) = bbbc4b44ed603e54044fc1c71fa20f4373cae81a
-Size (xmix-2.1.mixers.patch) = 1684 bytes
-SHA1 (patch-aa) = a60baf409d6f9182f185fbd41676d85c31971363
-SHA1 (patch-ab) = a6201bea678a64b41d71dd52830a79250e72a461
diff --git a/audio/xmix/patches/patch-aa b/audio/xmix/patches/patch-aa
deleted file mode 100644
index 7aa49dd6cb1..00000000000
--- a/audio/xmix/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2005/11/06 23:49:03 joerg Exp $
-
---- Imakefile.orig Tue Feb 1 23:54:35 1994
-+++ Imakefile
-@@ -2,7 +2,7 @@
- # xmix Imakefile.
- #
- #CDEBUGFLAGS=-gstabs
--CDEBUGFLAGS=-O
-+#CDEBUGFLAGS=-O
- #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
-
- SRCS1= xmix.c
-@@ -12,6 +12,8 @@
-
- all:: $(PROGRAMS)
-
--LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-+LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) $(LIBOSSAUDIO)
-
--NormalProgramTarget(xmix,$(OBJS1),,$(LOCAL_LIBRARIES),)
-+PROGRAM = $(PROGRAMS)
-+
-+ComplexProgramTarget_1($(PROGRAM),$(LOCAL_LIBRARIES),)
diff --git a/audio/xmix/patches/patch-ab b/audio/xmix/patches/patch-ab
deleted file mode 100644
index 9549fe031f5..00000000000
--- a/audio/xmix/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.4 1999/02/10 14:55:33 frueauf Exp $
-
-diff -r -u ../../src/xmix-2.1/xmix.c ./xmix.c
---- ../../src/xmix-2.1/xmix.c Sun Jan 17 13:13:12 1999
-+++ ./xmix.c Sun Jan 17 13:16:12 1999
-@@ -77,7 +77,12 @@
- #include "square_empty.bit"
- #include "square_with_x.bit"
-
--#include <linux/soundcard.h>
-+#ifdef __NetBSD__
-+#include <sys/ioctl.h>
-+#include <soundcard.h>
-+#else
-+#include <machine/soundcard.h>
-+#endif
-
- #define SOUND_FULL_SCALE 100.0
- #define MAX_SOUND_VOL 95
-@@ -742,7 +747,7 @@
- mic.locked = 0;
- reclvl.locked = 0;
-
-- printf("supported = 0x%x\n",supported);
-+ /*printf("supported = 0x%x\n",supported);*/
- set_supported(&master,(supported & SOUND_MASK_VOLUME) != 0);
- set_supported(&bass,(supported & SOUND_MASK_BASS) != 0);
- set_supported(&treble,(supported & SOUND_MASK_TREBLE) != 0);
diff --git a/audio/xmmix/DESCR b/audio/xmmix/DESCR
deleted file mode 100644
index e1768d8d8ed..00000000000
--- a/audio/xmmix/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
- ----------------------
- X M M I X version 1.2
- patchlevel 2
- ----------------------
- by Ti Kan
-
-Xmmix is a sound mixer utility for the X Window System using the
-OSF/Motif interface. It requires the Unix Sound System (formerly
-"VoxWare") sound driver by Hannu Savolainen (hannu@voxware.pp.fi)
-and from 4front Technologies. This driver is also known as the Linux
-sound driver.
-
-The NetBSD ports adds automatic updating of the mixer controls
-on screen when other programs manipulate them.
diff --git a/audio/xmmix/Makefile b/audio/xmmix/Makefile
deleted file mode 100644
index 4889f40271c..00000000000
--- a/audio/xmmix/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.28 2007/02/22 19:26:08 wiz Exp $
-
-DISTNAME= xmmix-1.2
-PKGREVISION= 4
-CATEGORIES= audio
-MASTER_SITES= http://www.ibiblio.org/tkan/download/xmmix/1.2.2/src/
-
-MAINTAINER= augustss@cs.chalmers.se
-HOMEPAGE= http://www.amb.org/xmmix/
-COMMENT= X interface to the audio mixer device
-
-USE_IMAKE= yes
-
-pre-configure:
- cd ${WRKSRC}; for file in XMmix.ad resource.h; do \
- ${SED} -e "s|/usr/lib/X11/|${PREFIX}/lib/X11/|g" \
- $$file > $$file.fixed; \
- ${MV} -f $$file.fixed $$file; \
- done
-
-.include "../../mk/motif.buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmmix/PLIST b/audio/xmmix/PLIST
deleted file mode 100644
index 9d9d12329c4..00000000000
--- a/audio/xmmix/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/05 06:06:23 uebayasi Exp $
-bin/xmmix
-lib/X11/app-defaults/XMmix
-lib/X11/xmmix.hlp
-${IMAKE_MAN_DIR}/xmmix.${IMAKE_MANNEWSUFFIX}
diff --git a/audio/xmmix/distinfo b/audio/xmmix/distinfo
deleted file mode 100644
index eae6e92abc9..00000000000
--- a/audio/xmmix/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/12/11 20:35:40 joerg Exp $
-
-SHA1 (xmmix-1.2.tar.gz) = 9ec44500dccba63ef7a9d50f66acfb6e45d08714
-RMD160 (xmmix-1.2.tar.gz) = 05f5ca6811848f0b86a9dc94e6d943a07cda0ba8
-Size (xmmix-1.2.tar.gz) = 33496 bytes
-SHA1 (patch-aa) = 68a33a91de0e373da4818a26e339d3c87e895b33
-SHA1 (patch-ab) = cbdc30e17aa2a857d756b403c0873436e9480129
-SHA1 (patch-ac) = 8d68a2de3ee8a094a7f84ecb1d387bc22ca82bbb
-SHA1 (patch-ba) = 8092fcec3c39060da476f2ad2d018e8e0a8aa028
-SHA1 (patch-bb) = 4c468f8b42150b2dc9d21176863be168428b8885
-SHA1 (patch-bc) = 1c77a45c31ee023a3b0e7c9a720c1d9d2d2fb75e
-SHA1 (patch-bd) = d4209f5de96ef45d47aec2c28ccfe099c0c13fdf
diff --git a/audio/xmmix/patches/patch-aa b/audio/xmmix/patches/patch-aa
deleted file mode 100644
index 57561876dff..00000000000
--- a/audio/xmmix/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2002/10/08 12:30:57 jlam Exp $
-
---- Imakefile.orig Sun Jul 14 19:48:56 1996
-+++ Imakefile Fri Oct 24 23:34:17 1997
-@@ -43,7 +43,7 @@
- * #include "Motif.tmpl"
- * #include "Motif.rules"
- */
--LOCAL_LIBRARIES= XmClientLibs
-+LOCAL_LIBRARIES= ${MOTIFLIB} XawClientLibs ${LIBOSSAUDIO}
-
-
- /*
diff --git a/audio/xmmix/patches/patch-ab b/audio/xmmix/patches/patch-ab
deleted file mode 100644
index 0b8222ab0db..00000000000
--- a/audio/xmmix/patches/patch-ab
+++ /dev/null
@@ -1,116 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/10/08 12:30:57 jlam Exp $
-
---- mixer.c.orig Thu Nov 7 08:00:26 1996
-+++ mixer.c
-@@ -104,6 +104,14 @@ STATIC ctlinfo_t ctlsav; /* Saved state
- ***********************/
-
-
-+#ifdef __NetBSD__
-+void
-+mxchg(int sig)
-+{
-+ deliverSIGIO();
-+}
-+#endif
-+
- /*
- * do_ioctl
- * Perform ioctl command. If file is not yet open or if we
-@@ -201,12 +209,18 @@ mx_queryhw(widgets_t *m)
- ctlinfo.slinfo[i].right = ((level >> 8) & 0xff);
-
- /* Sanity check */
-- if (ctlinfo.slinfo[i].left > 100)
-- ctlinfo.slinfo[i].left = 100;
-+#if defined(__NetBSD__) && \
-+ !defined(OPEN_SOUND_SYSTEM) && !defined(UNIX_SOUND_SYSTEM)
-+# define SLIDER_MAX 255
-+#else
-+# define SLIDER_MAX 100
-+#endif
-+ if (ctlinfo.slinfo[i].left > SLIDER_MAX)
-+ ctlinfo.slinfo[i].left = SLIDER_MAX;
- else if (ctlinfo.slinfo[i].left < 0)
- ctlinfo.slinfo[i].left = 0;
-- if (ctlinfo.slinfo[i].right > 100)
-- ctlinfo.slinfo[i].right = 100;
-+ if (ctlinfo.slinfo[i].right > SLIDER_MAX)
-+ ctlinfo.slinfo[i].right = SLIDER_MAX;
- else if (ctlinfo.slinfo[i].right < 0)
- ctlinfo.slinfo[i].right = 0;
-
-@@ -674,18 +688,25 @@ mx_init_drv(void)
- }
-
- /* Set maximum number of devices supported */
-+#if defined(__NetBSD__) && \
-+ !defined(OPEN_SOUND_SYSTEM) && !defined(UNIX_SOUND_SYSTEM)
-+ maxdevs = SOUND_MIXER_NRDEVICES;
-+#else
- maxdevs = MAXDEVS_V3;
-+#endif
-
- strcpy(drv_ver, "unknown");
-
- /* Query sound driver version */
- if ((fp = fopen("/dev/sndstat", "r")) == NULL) {
- if (!app_data.demo) {
-+#if defined(OPEN_SOUND_SYSTEM) || defined(UNIX_SOUND_SYSTEM)
- fprintf(errfp, "%s: %s: %s\n",
- PROGNAME,
- "Cannot open /dev/sndstat",
- "assuming pre-3.0 sound driver.");
- maxdevs = MAXDEVS_V2;
-+#endif
- }
- return;
- }
-@@ -915,6 +936,7 @@ void
- mx_start(widgets_t *m)
- {
- char msg[256];
-+ int one = 1;
-
- if (app_data.autoload != NULL && app_data.autoload[0] != '\0' &&
- strcmp(app_data.autoload, "/dev/null") != 0) {
-@@ -930,6 +952,16 @@ mx_start(widgets_t *m)
- }
- }
-
-+#if defined(__NetBSD__)
-+ signal(SIGIO, mxchg);
-+#if !defined(OPEN_SOUND_SYSTEM) && !defined(UNIX_SOUND_SYSTEM)
-+ do_ioctl(FIOASYNC, &one, "FIOASYNC", IOC_DATA_NONE);
-+#endif
-+#endif
-+
-+ /* Query hardware mixer settings */
-+ mx_queryhw(&widgets);
-+
- /* Update screen controls to match current status */
- mx_updctl(m);
- }
-@@ -1531,6 +1563,22 @@ mx_focuschg(Widget w, XtPointer client_d
- if (p->reason != XmCR_FOCUS || form == (Widget) NULL)
- return;
-
-+ /* Query hardware mixer settings */
-+ mx_queryhw(&widgets);
-+
-+ /* Update screen controls */
-+ mx_updctl(&widgets);
-+}
-+
-+
-+/*
-+ * mx_change
-+ * Mixer device has changed
-+ */
-+/*ARGSUSED*/
-+void
-+mx_change(XtPointer client_data)
-+{
- /* Query hardware mixer settings */
- mx_queryhw(&widgets);
-
diff --git a/audio/xmmix/patches/patch-ac b/audio/xmmix/patches/patch-ac
deleted file mode 100644
index a6f1b722ad2..00000000000
--- a/audio/xmmix/patches/patch-ac
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2000/09/19 11:09:21 fredb Exp $
-
---- widget.c.orig Sun Jul 14 12:49:09 1996
-+++ widget.c Mon Sep 18 17:36:06 2000
-@@ -268,7 +268,7 @@
-
- if (pd->btip[i].acc != NULL) {
- xs_acc = XmStringCreateSimple(pd->btip[i].acc);
-- XtSetArg(arg[n], XmNaccelerator, xs_acc); n++;
-+ XtSetArg(arg[n], XmNaccelerators, xs_acc); n++;
- }
-
- if (pd->btip[i].mne != NULL) {
-@@ -298,7 +298,7 @@
- }
- if (pd->acc != NULL) {
- xs_acc = XmStringCreateSimple(pd->acc);
-- XtSetArg(arg[n], XmNaccelerator, xs_acc); n++;
-+ XtSetArg(arg[n], XmNaccelerators, xs_acc); n++;
- }
- if (pd->mne != NULL) {
- XtSetArg(arg[n], XmNmnemonic, XStringToKeysym(pd->mne)); n++;
-@@ -973,6 +973,10 @@
- delw = XmInternAtom(display, "WM_DELETE_WINDOW", False);
- }
-
-+static XtSignalId sigid;
-+void deliverSIGIO() {
-+ XtNoticeSignal(sigid);
-+}
-
- /*
- * register_callbacks
-@@ -985,7 +989,7 @@
- * Nothing
- */
- void
--register_callbacks(widgets_t *m)
-+register_callbacks(widgets_t *m, XtAppContext app)
- {
- int i;
-
-@@ -1126,6 +1130,15 @@
- XmNfocusCallback,
- (XtCallbackProc) mx_focuschg, (XtPointer) m->form
- );
-+
-+#ifdef __NetBSD__
-+ /*
-+ * Mixer SIGIO change callback
-+ */
-+ sigid = XtAppAddSignal(app,
-+ (XtSignalCallbackProc) mx_change, (XtPointer) 0
-+ );
-+#endif
-
- /*
- * Install WM_DELETE_WINDOW handler
diff --git a/audio/xmmix/patches/patch-ba b/audio/xmmix/patches/patch-ba
deleted file mode 100644
index 0a97706e5e4..00000000000
--- a/audio/xmmix/patches/patch-ba
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2000/11/02 14:24:32 mjl Exp $
-
---- ../xmmix-1.2/appenv.h Sun Jul 14 19:48:59 1996
-+++ ./appenv.h Fri Oct 24 23:33:47 1997
-@@ -59,7 +59,13 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
-+#ifdef __NetBSD__
-+#include <soundcard.h>
-+/* Ensure we SIGIO */
-+#undef _POSIX_SOURCE
-+#else
- #include <sys/soundcard.h>
-+#endif
- #include <stdlib.h>
- #include <stdio.h>
- #include <errno.h>
diff --git a/audio/xmmix/patches/patch-bb b/audio/xmmix/patches/patch-bb
deleted file mode 100644
index 596d391ae6b..00000000000
--- a/audio/xmmix/patches/patch-bb
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-bb,v 1.2 2005/12/11 20:35:41 joerg Exp $
-
---- main.c.orig 1996-11-07 16:01:43.000000000 +0000
-+++ main.c
-@@ -33,7 +33,7 @@ static char *_main_c_ident_ = "@(#)main.
- bool_t exit_flag; /* Flag indicating end of application */
- appdata_t app_data; /* Options data */
- widgets_t widgets; /* Holder of all widgets */
--FILE *errfp = stderr;/* Error message stream */
-+FILE *errfp;/* Error message stream */
-
-
- /***********************
-@@ -103,6 +103,7 @@ main(int argc, char **argv)
-
- /* Initialize variables */
- exit_flag = FALSE;
-+ errfp = stderr;
-
- /* Handle some signals */
- signal(SIGINT, onsig);
-@@ -159,7 +160,7 @@ main(int argc, char **argv)
- post_realize_config(&widgets);
-
- /* Register callback routines */
-- register_callbacks(&widgets);
-+ register_callbacks(&widgets, app);
-
- /* Initialize screen controls */
- mx_start(&widgets);
diff --git a/audio/xmmix/patches/patch-bc b/audio/xmmix/patches/patch-bc
deleted file mode 100644
index 86fd297ae84..00000000000
--- a/audio/xmmix/patches/patch-bc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2000/11/02 14:24:32 mjl Exp $
-
---- ../xmmix-1.2/mixer.h Sun Jul 14 19:49:04 1996
-+++ ./mixer.h Mon Aug 11 23:19:17 1997
-@@ -78,6 +78,7 @@
- extern void mx_fsok_btn(Widget, XtPointer, XtPointer);
- extern void mx_fscancel_btn(Widget, XtPointer, XtPointer);
- extern void mx_focuschg(Widget, XtPointer, XtPointer);
-+extern void mx_change(XtPointer);
-
- #endif /* __MIXER_H__ */
-
diff --git a/audio/xmmix/patches/patch-bd b/audio/xmmix/patches/patch-bd
deleted file mode 100644
index 144785e584d..00000000000
--- a/audio/xmmix/patches/patch-bd
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2000/11/02 14:24:32 mjl Exp $
-
---- ../xmmix-1.2/widget.h Sun Jul 14 19:49:10 1996
-+++ ./widget.h Mon Aug 11 23:13:43 1997
-@@ -119,7 +119,7 @@
- extern void widget_init(widgets_t *);
- extern void create_widgets(widgets_t *);
- extern void post_realize_config(widgets_t *);
--extern void register_callbacks(widgets_t *);
-+extern void register_callbacks(widgets_t *, XtAppContext);
-
- #endif /* __WIDGET_H__ */
-
diff --git a/audio/xmms-alarm/DESCR b/audio/xmms-alarm/DESCR
deleted file mode 100644
index d7052f9b055..00000000000
--- a/audio/xmms-alarm/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This plugin allows your XMMS be used as an alarm clock. Various settings are
-available (like, for example, volume fading-in time).
diff --git a/audio/xmms-alarm/Makefile b/audio/xmms-alarm/Makefile
deleted file mode 100644
index 21690425227..00000000000
--- a/audio/xmms-alarm/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2006/12/11 09:09:48 obache Exp $
-#
-
-DISTNAME= xmms-alarm-0.3.7
-CATEGORIES= audio
-MASTER_SITES= http://www.snika.uklinux.net/xmms-alarm/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.snika.uklinux.net/index.php?show=xmms-alarm
-COMMENT= Plugin which allows XMMS to be used as an alarm clock
-
-GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
-SHLIBTOOL_OVERRIDE= # empty
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-alarm/PLIST b/audio/xmms-alarm/PLIST
deleted file mode 100644
index 5e7e99a3ec7..00000000000
--- a/audio/xmms-alarm/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:18 jlam Exp $
-lib/xmms/General/libalarm.la
diff --git a/audio/xmms-alarm/distinfo b/audio/xmms-alarm/distinfo
deleted file mode 100644
index 18cd5a562c9..00000000000
--- a/audio/xmms-alarm/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/12/11 09:09:48 obache Exp $
-
-SHA1 (xmms-alarm-0.3.7.tar.bz2) = 18eb8dd84cc7d4b444196f68999c2877049758ce
-RMD160 (xmms-alarm-0.3.7.tar.bz2) = 2a54a0f42b50833cec7588b5cedf82b31b33eee3
-Size (xmms-alarm-0.3.7.tar.bz2) = 247385 bytes
-SHA1 (patch-aa) = 3449a689d560dc57be821d56bd75614100cb1584
diff --git a/audio/xmms-alarm/patches/patch-aa b/audio/xmms-alarm/patches/patch-aa
deleted file mode 100644
index 5afd97d9317..00000000000
--- a/audio/xmms-alarm/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/08/12 07:10:07 wiz Exp $
-
---- src/alarm.c~ Fri Jun 13 21:51:30 2003
-+++ src/alarm.c Fri Jun 13 21:56:46 2003
-@@ -750,7 +750,7 @@
- pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-
- pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED);
-- pthread_attr_setschedpolicy(&attr, SCHED_OTHER);
-+/* pthread_attr_setschedpolicy(&attr, SCHED_OTHER); */
- pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM);
-
- pthread_create(&tid, &attr, start_routine, args);
diff --git a/audio/xmms-arts/DESCR b/audio/xmms-arts/DESCR
deleted file mode 100644
index 3615c2ef6f0..00000000000
--- a/audio/xmms-arts/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-xmms-arts is an output plugin for the XMMS program that allows it to output
-sound using the aRts sound daemon (mainly used by the KDE desktop).
diff --git a/audio/xmms-arts/Makefile b/audio/xmms-arts/Makefile
deleted file mode 100644
index c0fb4ec39df..00000000000
--- a/audio/xmms-arts/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2006/07/07 15:49:30 jlam Exp $
-#
-
-DISTNAME= arts_output-0.7.1
-PKGNAME= xmms-arts-0.7.1
-PKGREVISION= 2
-CATEGORIES= audio kde
-MASTER_SITES= http://havardk.xmms.org/plugins/arts_output/
-
-MAINTAINER= markd@NetBSD.org
-HOMEPAGE= http://www.xmms.org/plugins.php?category=output
-COMMENT= XMMS plugin to output sound through the aRts sound daemon
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-SHLIBTOOL_OVERRIDE= # empty
-
-LIBS+= ${LIBOSSAUDIO}
-
-.include "../../audio/arts/buildlink3.mk"
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../devel/glib/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-arts/PLIST b/audio/xmms-arts/PLIST
deleted file mode 100644
index 2a3c8c2172f..00000000000
--- a/audio/xmms-arts/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/12/01 11:47:44 markd Exp $
-bin/xmms-arts-helper
-lib/xmms/Output/libarts.la
-@comment in xmms: @dirrm lib/xmms/Output
diff --git a/audio/xmms-arts/distinfo b/audio/xmms-arts/distinfo
deleted file mode 100644
index 65dacee98e5..00000000000
--- a/audio/xmms-arts/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:54 agc Exp $
-
-SHA1 (arts_output-0.7.1.tar.gz) = 026b7b0be459cfff75557c04e54425c4d21dacaf
-RMD160 (arts_output-0.7.1.tar.gz) = 3784f2ef5f99c61123477ce03ee6bcb1ffdf3214
-Size (arts_output-0.7.1.tar.gz) = 236839 bytes
-SHA1 (patch-ab) = b5205b675f9db35d1035a68d4e01f9473322c39d
diff --git a/audio/xmms-arts/patches/patch-ab b/audio/xmms-arts/patches/patch-ab
deleted file mode 100644
index 34a1113a04f..00000000000
--- a/audio/xmms-arts/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/12/01 11:47:45 markd Exp $
-
---- arts_helper.c.orig 2004-11-29 15:01:44.000000000 +1300
-+++ arts_helper.c 2004-11-29 15:02:12.000000000 +1300
-@@ -15,6 +15,7 @@
- #include <errno.h>
- #include <signal.h>
- #include <sys/select.h>
-+#include <sys/time.h>
-
- #include <artsc.h>
-
-@@ -243,7 +244,7 @@
- {
- going = 0;
- arts_close_stream(handle);
-- arts_free();
-+ /* arts_free(); */
- }
-
- static int read_all(int fd, void *buf, size_t count)
-@@ -439,5 +440,5 @@
- ret = main_loop(fd);
- close(fd);
- /* fprintf(stderr, "helper exits\n"); */
-- return ret < 0;
-+ exit(ret < 0);
- }
diff --git a/audio/xmms-bezier/DESCR b/audio/xmms-bezier/DESCR
deleted file mode 100644
index 7b3ca96a69e..00000000000
--- a/audio/xmms-bezier/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-Jittering plane in the rhythm of the sound, using OpenGL.
-
- There are also some keyboard keys you can press to modify options:
- 'f': toggle fullscreen mode
- 't': toggle between flat and smooth shading.
- 'g': toggle the drawing of the ground.
- 'p': pause and unpause display
- ',' and '.': adjust the tessellation.
- 'i' and 'k': adjust the camera height.
- 'o' and 'l': adjust the camera velocity.
-
- It also accepts the following xmms shortcuts (sent to session 0):
- 'z': previous 'x': pause
- 'c': play 'v': stop
- 'b': next 's': shuffle
- 'r': repeat
diff --git a/audio/xmms-bezier/Makefile b/audio/xmms-bezier/Makefile
deleted file mode 100644
index 5ae0f8aeb44..00000000000
--- a/audio/xmms-bezier/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2006/05/15 18:39:36 joerg Exp $
-#
-
-DISTNAME= bezier-0.0.3
-PKGNAME= xmms-${DISTNAME}
-PKGREVISION= 5
-CATEGORIES= audio
-MASTER_SITES= http://yossman.net/~kuroyi/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= OpenGL XMMS plugin
-
-GNU_CONFIGURE= yes
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1
-LIBS+= -lX11 -lm
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../devel/glib/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-bezier/PLIST b/audio/xmms-bezier/PLIST
deleted file mode 100644
index c5ffcbcabac..00000000000
--- a/audio/xmms-bezier/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:18 jlam Exp $
-lib/xmms/Visualization/libbezier.la
diff --git a/audio/xmms-bezier/distinfo b/audio/xmms-bezier/distinfo
deleted file mode 100644
index 6959e8277e9..00000000000
--- a/audio/xmms-bezier/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:54 agc Exp $
-
-SHA1 (bezier-0.0.3.tar.gz) = 682c634a02943add289de0e0a5ea60de4640babc
-RMD160 (bezier-0.0.3.tar.gz) = 45a1a1fb8a18330b0db1a8b467771b687afbd831
-Size (bezier-0.0.3.tar.gz) = 129507 bytes
-SHA1 (patch-aa) = 1c84d71205e5903de83a670d3057b16edf2cfd12
diff --git a/audio/xmms-bezier/patches/patch-aa b/audio/xmms-bezier/patches/patch-aa
deleted file mode 100644
index ddfe953eef3..00000000000
--- a/audio/xmms-bezier/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/12/28 15:00:50 wiz Exp $
-
---- configure.orig 2004-12-28 15:55:24.000000000 +0100
-+++ configure
-@@ -3308,7 +3308,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_save_LIBS="$LIBS"
--LIBS="-lMesaGL $LIBS"
-+LIBS="-lMesaGL -lXext $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 3314 "configure"
- #include "confdefs.h"
-@@ -3336,7 +3336,7 @@ LIBS="$ac_save_LIBS"
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
-- OPENGL_LIBS="-lMesaGL"
-+ OPENGL_LIBS="-lMesaGL -lXext"
- else
- echo "$ac_t""no" 1>&6
- { echo "configure: error: *** OpenGL libs not found - please install first ***" 1>&2; exit 1; }
-@@ -3422,7 +3422,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_save_LIBS="$LIBS"
--LIBS="-lMesaGLU $LIBS"
-+LIBS="-lMesaGLU -lXext $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 3428 "configure"
- #include "confdefs.h"
-@@ -3453,7 +3453,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
- cat >> confdefs.h <<\EOF
- #define HAVE_GLU 1
- EOF
-- OPENGL_LIBS="$OPENGL_LIBS -l MesaGLU"
-+ OPENGL_LIBS="$OPENGL_LIBS -lMesaGLU -lXext"
- else
- echo "$ac_t""no" 1>&6
- fi
diff --git a/audio/xmms-blursk/DESCR b/audio/xmms-blursk/DESCR
deleted file mode 100644
index 89fef71e789..00000000000
--- a/audio/xmms-blursk/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Blursk is a visualization plugin for the XMMS MP3 player. It was
-inspired by the "Blur Scope" plugin, but Blursk goes far beyond
-that. It supports a wide variety of colormaps, blur patterns,
-plotting styles, and other options
diff --git a/audio/xmms-blursk/MESSAGE b/audio/xmms-blursk/MESSAGE
deleted file mode 100644
index 7a653f17678..00000000000
--- a/audio/xmms-blursk/MESSAGE
+++ /dev/null
@@ -1,8 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2003/07/13 08:43:31 mrg Exp $
-
-A large list of default preset settings for Blursk have been installed
-into ${PREFIX}/share/xmms/blursk-presets, and should be copied to each
-users ~/.xmms directory for use.
-
-===========================================================================
diff --git a/audio/xmms-blursk/Makefile b/audio/xmms-blursk/Makefile
deleted file mode 100644
index d3cbd9d8abf..00000000000
--- a/audio/xmms-blursk/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2007/01/11 11:39:04 joerg Exp $
-
-DISTNAME= Blursk-1.3
-PKGNAME= xmms-blursk-1.3
-PKGREVISION= 2
-CATEGORIES= xmms audio
-MASTER_SITES= http://www.cs.pdx.edu/~kirkenda/blursk/
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} blursk-presets
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= ${MASTER_SITES}
-COMMENT= Visualization plugin for XMMS inspired by "Blur Scope"
-
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-
-GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
-
-post-install:
- ${INSTALL_DATA} ${DISTDIR}/blursk-presets ${PREFIX}/share/xmms/blursk-presets
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXv/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-blursk/PLIST b/audio/xmms-blursk/PLIST
deleted file mode 100644
index 1c5931e662a..00000000000
--- a/audio/xmms-blursk/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:18 jlam Exp $
-lib/xmms/Visualization/libblursk.la
-share/xmms/blursk-presets
diff --git a/audio/xmms-blursk/distinfo b/audio/xmms-blursk/distinfo
deleted file mode 100644
index 406871e0661..00000000000
--- a/audio/xmms-blursk/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/02/16 18:05:09 wiz Exp $
-
-SHA1 (Blursk-1.3.tar.gz) = b9ee5c50c3810d017cb09eace004610ad739c118
-RMD160 (Blursk-1.3.tar.gz) = 5a0dbaa5f800a998981c79b5a91b827aeecac0ad
-Size (Blursk-1.3.tar.gz) = 345631 bytes
-SHA1 (blursk-presets) = 828924d46de93401bb83b20548040f00e96a85c9
-RMD160 (blursk-presets) = 4d4bc70ee7669232d57c7ee83d2d8b7cbde37155
-Size (blursk-presets) = 16386 bytes
-SHA1 (patch-aa) = d425c1ba61e9171bd9c57972ed20d3eed9caf940
diff --git a/audio/xmms-blursk/patches/patch-aa b/audio/xmms-blursk/patches/patch-aa
deleted file mode 100644
index 7e6ce7bf6df..00000000000
--- a/audio/xmms-blursk/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/02/16 18:05:09 wiz Exp $
-
---- Makefile.in.orig 2006-02-16 09:55:22.000000000 +0000
-+++ Makefile.in
-@@ -123,7 +123,7 @@ lib_LTLIBRARIES = libblursk.la
- libdir = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR)
-
- libblursk_la_LDFLAGS = -module -avoid-version
--LIBS = @GTK_LIBS@ @PTHREAD_LIBS@
-+LIBS = @GTK_LIBS@
-
- COMMON_CFLAGS = -O2 -I$(top_builddir) -I$(top_srcdir) -D_REENTRANT @GTK_CFLAGS@
- COMMON_SRC = blur.c blursk.c blursk.h color.c config.c config.h readme.c about.c img.c loop.c render.c preset.c bitmap.c paste.c xv.c text.c
diff --git a/audio/xmms-bump-scope/DESCR b/audio/xmms-bump-scope/DESCR
deleted file mode 100644
index 623358e4e49..00000000000
--- a/audio/xmms-bump-scope/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Moving light embossing oscilloscope.
diff --git a/audio/xmms-bump-scope/Makefile b/audio/xmms-bump-scope/Makefile
deleted file mode 100644
index 2421ebc2936..00000000000
--- a/audio/xmms-bump-scope/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2006/10/04 20:44:20 wiz Exp $
-#
-
-DISTNAME= bump_scope-0.0.3
-PKGNAME= xmms-bump-scope-0.0.3
-PKGREVISION= 5
-CATEGORIES= xmms audio
-MASTER_SITES= http://zinx.xmms.org/xmms/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://zinx.xmms.org/xmms/
-COMMENT= Moving light embossing oscilloscope
-
-USE_LIBTOOL= YES
-GNU_CONFIGURE= YES
-
-MAKE_ENV+= plugindir=${PREFIX}/lib/xmms/Visualization
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-bump-scope/PLIST b/audio/xmms-bump-scope/PLIST
deleted file mode 100644
index 8cfa5760d9a..00000000000
--- a/audio/xmms-bump-scope/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/09/26 12:48:03 wiz Exp $
-lib/xmms/Visualization/libbumpscope.la
diff --git a/audio/xmms-bump-scope/distinfo b/audio/xmms-bump-scope/distinfo
deleted file mode 100644
index 71bdb6157c8..00000000000
--- a/audio/xmms-bump-scope/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/12/07 17:40:59 joerg Exp $
-
-SHA1 (bump_scope-0.0.3.tar.gz) = 034d611246ce7ed96770ffda250ebadd20de33fb
-RMD160 (bump_scope-0.0.3.tar.gz) = 4abf24b0552a874363e7fbc838087b900660db4c
-Size (bump_scope-0.0.3.tar.gz) = 160690 bytes
-SHA1 (patch-aa) = fd3ea0cea8e4cb34d338cc3ea2ea6684805bdd2f
diff --git a/audio/xmms-bump-scope/patches/patch-aa b/audio/xmms-bump-scope/patches/patch-aa
deleted file mode 100644
index bac16dac4df..00000000000
--- a/audio/xmms-bump-scope/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/12/07 17:40:59 joerg Exp $
-
---- bump_scope.c.orig 2005-12-07 17:23:21.000000000 +0000
-+++ bump_scope.c
-@@ -399,6 +399,7 @@ void bumpscope_menu_cb(gpointer cb_data,
- GTK_CHECK_MENU_ITEM(gtk_item_factory_get_widget(bumpscope_menu, "/Fullscreen"))->active = am_fullscreen;
- break;
- default:
-+ break;
- /* ugh */
- }
- }
diff --git a/audio/xmms-crossfade/DESCR b/audio/xmms-crossfade/DESCR
deleted file mode 100644
index 719c240a5b3..00000000000
--- a/audio/xmms-crossfade/DESCR
+++ /dev/null
@@ -1,17 +0,0 @@
- XMMS-Crossfade can be used to remove the gaps between two songs, or to
-smoothly crossfade inbetween. Features are:
-
- * Crossfading:
- * Fadein/Fadeout:
- * Continuous output:
- * Gap-Killer:
- * Automatic detection of live albums:
- * High quality:
- * Secondary effect plugin:
-
- Version 0.1 of XMMS-Crossfade was devised as a replacement plugin for
-the original OSS-plugin that comes with XMMS. It was talking directly to
-the OSS driver. Unfortunately, any other platforms (Solaris, AIX), that
-don't support OSS, would not work this way. As of version 0.2, it can use
-existing plugins for output. It acts as a kind of crossfading "proxy"
-between XMMS and the output plugin.
diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
deleted file mode 100644
index 3f2b238576f..00000000000
--- a/audio/xmms-crossfade/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.28 2006/10/04 20:44:20 wiz Exp $
-#
-
-DISTNAME= xmms-crossfade-0.2.9
-PKGREVISION= 6
-CATEGORIES= audio
-MASTER_SITES= http://www.mynetcologne.de/~nc-eisenlpe2/xmms-crossfade/ \
- ftp://ftp.falsehope.com/pub/xmms-crossfade/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.mynetcologne.de/~nc-eisenlpe2/xmms-crossfade/
-COMMENT= Crossfading/Gapless Plugin for XMMS
-
-GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
-
-LDFLAGS+= ${LIBOSSAUDIO}
-OSS_DEFS+= -DDEFAULT_OSS_ALT_AUDIO_DEVICE='"${DEVOSSSOUND}"'
-MAKE_ENV+= OSS_DEFS=${OSS_DEFS:Q}
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-crossfade/PLIST b/audio/xmms-crossfade/PLIST
deleted file mode 100644
index 6fbf4d40c59..00000000000
--- a/audio/xmms-crossfade/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:18 jlam Exp $
-lib/xmms/Output/libcrossfade.la
diff --git a/audio/xmms-crossfade/distinfo b/audio/xmms-crossfade/distinfo
deleted file mode 100644
index 55dcd2ed340..00000000000
--- a/audio/xmms-crossfade/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 20:39:54 agc Exp $
-
-SHA1 (xmms-crossfade-0.2.9.tar.gz) = afe3ec2a17d9dae54fffe318ef0a14470e045894
-RMD160 (xmms-crossfade-0.2.9.tar.gz) = bc313a0e83cc41c790e12110bb34e84301367762
-Size (xmms-crossfade-0.2.9.tar.gz) = 200553 bytes
-SHA1 (patch-aa) = 1f710760444071888612a76d4ac698930b7ea999
-SHA1 (patch-ab) = ab26ceb14c568eb36728d0aa9498812a56b1e12b
-SHA1 (patch-ac) = 94aa72566f6da4ff68e229b8e7e88627de709e4d
-SHA1 (patch-ad) = d2a1f96dc6544020d49b7e21b1860224a71fa1c6
-SHA1 (patch-ae) = 885cc2fa18a9120a9af92f070aec6a76d3895014
-SHA1 (patch-af) = a79ca55bc695169f57c3b7bc569a1ca69e416895
diff --git a/audio/xmms-crossfade/patches/patch-aa b/audio/xmms-crossfade/patches/patch-aa
deleted file mode 100644
index 8f334c4b61e..00000000000
--- a/audio/xmms-crossfade/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/05/23 20:17:22 rh Exp $
-
---- configure.orig Tue May 8 15:30:46 2001
-+++ configure
-@@ -2695,7 +2695,7 @@
-
-
- if test "x$oss" = xyes; then
-- for ac_hdr in sys/soundcard.h machine/soundcard.h
-+ for ac_hdr in sys/soundcard.h machine/soundcard.h soundcard.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -2738,7 +2738,7 @@
- fi
- done
-
-- if test "${ac_cv_header_sys_soundcard_h}" = "yes" || test "${ac_cv_header_machine_soundcard_h}" = "yes"; then
-+ if test "${ac_cv_header_sys_soundcard_h}" = "yes" || test "${ac_cv_header_machine_soundcard_h}" || test "${ac_cv_header_soundcard_h}" = "yes"; then
-
-
- if true; then
diff --git a/audio/xmms-crossfade/patches/patch-ab b/audio/xmms-crossfade/patches/patch-ab
deleted file mode 100644
index 3bbb1e2cdb9..00000000000
--- a/audio/xmms-crossfade/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/10/17 00:02:01 jlam Exp $
-
---- crossfade.h.orig Mon May 14 04:27:08 2001
-+++ crossfade.h
-@@ -108,7 +108,13 @@
- #define FC_OFFSET_LOCK_OUT 2
- #define FC_OFFSET_CUSTOM 3
-
-+#ifndef DEFAULT_OSS_ALT_AUDIO_DEVICE
-+#ifdef __NetBSD__
-+#define DEFAULT_OSS_ALT_AUDIO_DEVICE "/dev/sound"
-+#else
- #define DEFAULT_OSS_ALT_AUDIO_DEVICE "/dev/dsp"
-+#endif
-+#endif
- #define DEFAULT_OSS_ALT_MIXER_DEVICE "/dev/mixer"
- #define DEFAULT_OP_CONFIG_STRING "libOSS.so=0,1,2304,0; libdisk_writer.so=1,0,2304,1"
- #define DEFAULT_OP_NAME "libOSS.so"
diff --git a/audio/xmms-crossfade/patches/patch-ac b/audio/xmms-crossfade/patches/patch-ac
deleted file mode 100644
index 212646922a9..00000000000
--- a/audio/xmms-crossfade/patches/patch-ac
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2002/10/27 06:47:45 rh Exp $
-
---- oss.c.orig Tue May 15 07:35:52 2001
-+++ oss.c
-@@ -42,9 +42,10 @@
- # include <sys/soundcard.h>
- #elif defined(HAVE_MACHINE_SOUNDCARD_H)
- # include <machine/soundcard.h>
-+#elif defined(HAVE_SOUNDCARD_H)
-+# include <soundcard.h>
- #endif
-
--
- /* output plugin callback prototypes */
- static void oss_get_volume (int *l, int *r);
- static void oss_set_volume (int l, int r);
-@@ -305,9 +306,9 @@ oss_open_audio(AFormat fmt, int rate, in
- if(config->oss_use_alt_audio_device && (config->oss_alt_audio_device != NULL))
- device_name = g_strdup(config->oss_alt_audio_device);
- else if(config->oss_audio_device > 0)
-- device_name = g_strdup_printf("/dev/dsp%d", config->oss_audio_device);
-+ device_name = g_strdup_printf(DEFAULT_OSS_ALT_AUDIO_DEVICE "%d", config->oss_audio_device);
- else
-- device_name = g_strdup("/dev/dsp");
-+ device_name = g_strdup(DEFAULT_OSS_ALT_AUDIO_DEVICE);
-
- /* HACK: Test if the device is not locked by another process. This is
- * just a crude workaround to avoid complete lockup of XMMS. It is
-@@ -499,13 +500,26 @@ buffer_thread_f(void *arg)
- while(dsp_fd != -1) {
- /* wait for device */
- if(dsp_select_works) {
-- tv.tv_sec = 0;
-+ pthread_mutex_unlock(&buffer_mutex);
-+#ifdef _PTH_PTHREAD_H_
-+ { int i;
-+
-+ for (i=0; i<16; i++) {
-+ tv.tv_usec = OSS_FRAGMENT_UTIME/16;
-+#else
- tv.tv_usec = OSS_FRAGMENT_UTIME;
-+#endif
-+ tv.tv_sec = 0;
- FD_ZERO(&set);
- FD_SET(dsp_fd, &set);
-
-- pthread_mutex_unlock(&buffer_mutex);
- sel = select(dsp_fd+1, NULL, &set, NULL, &tv);
-+#ifdef _PTH_PTHREAD_H_
-+ if (sel) break;
-+
-+ sched_yield();
-+ }}
-+#endif
- pthread_mutex_lock(&buffer_mutex);
-
- if(sel == -1) {
diff --git a/audio/xmms-crossfade/patches/patch-ad b/audio/xmms-crossfade/patches/patch-ad
deleted file mode 100644
index 3976a0c0a59..00000000000
--- a/audio/xmms-crossfade/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/05/23 20:17:22 rh Exp $
-
---- config.h.in.orig Tue May 8 15:36:40 2001
-+++ config.h.in
-@@ -25,6 +25,9 @@
- /* Define if you have the <sys/soundcard.h> header file. */
- #undef HAVE_SYS_SOUNDCARD_H
-
-+/* Define if you have the <soundcard.h> header file. */
-+#undef HAVE_SOUNDCARD_H
-+
- /* Name of package */
- #undef PACKAGE
-
diff --git a/audio/xmms-crossfade/patches/patch-ae b/audio/xmms-crossfade/patches/patch-ae
deleted file mode 100644
index 503c6435c0a..00000000000
--- a/audio/xmms-crossfade/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2002/10/27 06:47:45 rh Exp $
-
---- crossfade.c.orig Fri Jun 8 04:09:28 2001
-+++ crossfade.c
-@@ -1671,6 +1671,10 @@ xfade_output_time()
- {
- gint time;
-
-+#ifdef _PTH_PTHREAD_H_
-+ pthread_yield_np();
-+#endif
-+
- #ifdef DEBUG_HARDCORE
- DEBUG(("[crossfade] output_time:\n"));
- #endif
diff --git a/audio/xmms-crossfade/patches/patch-af b/audio/xmms-crossfade/patches/patch-af
deleted file mode 100644
index 8581d5de4cc..00000000000
--- a/audio/xmms-crossfade/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2002/10/17 00:02:01 jlam Exp $
-
---- Makefile.in.orig Thu Jun 7 09:35:11 2001
-+++ Makefile.in
-@@ -109,7 +109,7 @@ CONFIG_CLEAN_FILES = xmms-crossfade.spe
- LTLIBRARIES = $(lib_LTLIBRARIES)
-
-
--DEFS = @DEFS@ -I. -I$(srcdir) -I.
-+DEFS = @DEFS@ -I. -I$(srcdir) -I. $(OSS_DEFS)
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
diff --git a/audio/xmms-dflowers/DESCR b/audio/xmms-dflowers/DESCR
deleted file mode 100644
index a622f49f83c..00000000000
--- a/audio/xmms-dflowers/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Dual Flower Scope XMMS plugin
diff --git a/audio/xmms-dflowers/Makefile b/audio/xmms-dflowers/Makefile
deleted file mode 100644
index acd343cc151..00000000000
--- a/audio/xmms-dflowers/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2006/10/04 20:44:20 wiz Exp $
-#
-
-DISTNAME= dflowers-1.2
-PKGNAME= xmms-${DISTNAME}
-PKGREVISION= 4
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-# HOMEPAGE= http://www.shell.linux.se/bm/index.php?page=xmmsplugin
-# AWOL
-COMMENT= XMMS plugin for dual flower scope
-
-USE_LIBTOOL= YES
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-dflowers/PLIST b/audio/xmms-dflowers/PLIST
deleted file mode 100644
index 6d42d6ebe50..00000000000
--- a/audio/xmms-dflowers/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:18 jlam Exp $
-lib/xmms/Visualization/libdflowers.la
-share/xmms/dflowers_themes/bg_blueheart.xpm
-share/xmms/dflowers_themes/bg_def.xpm
-@dirrm share/xmms/dflowers_themes
diff --git a/audio/xmms-dflowers/distinfo b/audio/xmms-dflowers/distinfo
deleted file mode 100644
index 8ac28bc62c2..00000000000
--- a/audio/xmms-dflowers/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 20:39:54 agc Exp $
-
-SHA1 (dflowers-1.2.tar.gz) = 5f7b518652a6df3677fdeaffa5014ad0171dd426
-RMD160 (dflowers-1.2.tar.gz) = 40fc89003846f180ca3b803c1ac1eade9c428e80
-Size (dflowers-1.2.tar.gz) = 47953 bytes
-SHA1 (patch-aa) = 23999676cc61311cfc69206e67653c6a01e4f1e5
diff --git a/audio/xmms-dflowers/patches/patch-aa b/audio/xmms-dflowers/patches/patch-aa
deleted file mode 100644
index bfaed568310..00000000000
--- a/audio/xmms-dflowers/patches/patch-aa
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2002/09/21 01:32:23 jlam Exp $
-
---- Makefile.orig Sat Jun 9 14:37:36 2001
-+++ Makefile
-@@ -1,13 +1,9 @@
- # Change paths if necessary
-
--CC = gcc
--OPT = -m486 -O2
- #OPT = -mpentium -O6
- #OPT = -mcpu=k6 -march=k6 -O6
--CONF= -DNO_WIN_DECORATIONS
--CFLAGS = $(OPT) -Wall -fPIC `gtk-config --cflags gthread`
--LFLAGS = -shared -fPIC -L/usr/local/lib
--OBJ = dflowers.o
-+CFLAGS+= $(OPT) -Wall -fPIC `gtk-config --cflags gthread`
-+OBJ = dflowers.lo
- INSTALL-DIR=`xmms-config --visualization-plugin-dir`
- XMMS_DATADIR=`xmms-config --data-dir`
- #INSTALL-DIR=$(HOME)/.xmms/Plugins
-@@ -15,21 +11,26 @@ XMMS_DATADIR=`xmms-config --data-dir`
- THEME_SUBDIR=dflowers_themes
- XMMS_DATADIR_FLAGS=-DTHEMEDIR=\"$(XMMS_DATADIR)/$(THEME_SUBDIR)/\"
-
--all: libdflowers.so
-+.SUFFIXES: .c .lo
-
--libdflowers.so: $(OBJ)
-- $(CC) -o libdflowers.so $(OBJ) $(LFLAGS)
-+all: libdflowers.la
-+
-+libdflowers.la: $(OBJ)
-+ ${LIBTOOL} --mode=link $(CC) -o libdflowers.la -module -avoid-version $(OBJ) $(LFLAGS) -rpath ${INSTALL-DIR}
-+
-+.c.lo:
-+ ${LIBTOOL} $(CC) $(CFLAGS) $(CONF) $(XMMS_DATADIR_FLAGS) -c $<
-
--.c.o:
-- $(CC) $(CFLAGS) $(XMMS_DATADIR_FLAGS) -c $<
-
- clean:
-- rm -f *.o core *.so*
-+ rm -f *.o core *.so* *.la *.so *.lo
-+ rm -fr .libs
-
- distclean:
- rm -f *.o core *~
-
--install:
-- install libdflowers.so $(INSTALL-DIR)
-+install: libdflowers.la
-+ ${LIBTOOL} install libdflowers.la $(INSTALL-DIR)
- mkdir -p $(XMMS_DATADIR)/$(THEME_SUBDIR)
-- install bg_*.xpm $(XMMS_DATADIR)/$(THEME_SUBDIR)
-+ $(BSD_INSTALL_DATA) bg_*.xpm $(XMMS_DATADIR)/$(THEME_SUBDIR)
-+
diff --git a/audio/xmms-dscope/DESCR b/audio/xmms-dscope/DESCR
deleted file mode 100644
index f3866964647..00000000000
--- a/audio/xmms-dscope/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Dual Scope XMMS plugin
diff --git a/audio/xmms-dscope/Makefile b/audio/xmms-dscope/Makefile
deleted file mode 100644
index 53b350d1894..00000000000
--- a/audio/xmms-dscope/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2006/03/04 21:28:59 jlam Exp $
-#
-
-DISTNAME= dscope-1.2
-PKGNAME= xmms-${DISTNAME}
-PKGREVISION= 4
-CATEGORIES= audio
-MASTER_SITES= http://hem.passagen.se/joakime/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://hem.passagen.se/joakime/linuxapp.html
-COMMENT= XMMS plugin for dual scope
-
-USE_LIBTOOL= YES
-
-pre-build:
- cd ${WRKSRC} ; ${MAKE} clean
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-dscope/PLIST b/audio/xmms-dscope/PLIST
deleted file mode 100644
index 9c6684c2cad..00000000000
--- a/audio/xmms-dscope/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:18 jlam Exp $
-lib/xmms/Visualization/libdscope.la
-share/xmms/dscope_themes/bg_xmms.xpm
-share/xmms/dscope_themes/bg_gtk.xpm
-@dirrm share/xmms/dscope_themes
diff --git a/audio/xmms-dscope/distinfo b/audio/xmms-dscope/distinfo
deleted file mode 100644
index f9c4a47057a..00000000000
--- a/audio/xmms-dscope/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 20:39:54 agc Exp $
-
-SHA1 (dscope-1.2.tar.gz) = 5a4750c0a8170c1e2d263df1212262b3adad1210
-RMD160 (dscope-1.2.tar.gz) = c8a8fcfdfe37591b0d757cab84ff83898af924ae
-Size (dscope-1.2.tar.gz) = 34353 bytes
-SHA1 (patch-aa) = 1dec86cbec9d870ee2586d3f209e4bbb7ecacfb5
diff --git a/audio/xmms-dscope/patches/patch-aa b/audio/xmms-dscope/patches/patch-aa
deleted file mode 100644
index bdf0d1d3fcc..00000000000
--- a/audio/xmms-dscope/patches/patch-aa
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2002/09/21 01:34:50 jlam Exp $
-
---- Makefile.orig Sat Jan 20 06:18:28 2001
-+++ Makefile
-@@ -1,12 +1,12 @@
- # Change paths & OPT if necessary
-
--CC = gcc
--OPT = -m486 -O2
-+#CC = gcc
-+#OPT = -m486 -O2
- #OPT = -mpentium -O6
- #OPT = -mcpu=k6 -march=k6 -O6
--CFLAGS = $(OPT) -Wall -fPIC `gtk-config --cflags gthread`
--LFLAGS = -shared -fPIC -L/usr/local/lib
--OBJ = dscope.o
-+CFLAGS+= $(OPT) -Wall -fPIC `gtk-config --cflags gthread`
-+#LFLAGS = -shared -fPIC -L/usr/local/lib
-+OBJ = dscope.lo
- INSTALL-DIR=`xmms-config --visualization-plugin-dir`
- XMMS_DATADIR=`xmms-config --data-dir`
- #INSTALL-DIR=$(HOME)/.xmms/Plugins
-@@ -14,21 +14,24 @@ XMMS_DATADIR=`xmms-config --data-dir`
- THEME_SUBDIR=dscope_themes
- XMMS_DATADIR_FLAGS=-DTHEMEDIR=\"$(XMMS_DATADIR)/$(THEME_SUBDIR)/\"
-
--all: libdscope.so
-+.SUFFIXES: .c .lo
-
--libdscope.so: $(OBJ)
-- $(CC) -o libdscope.so $(OBJ) $(LFLAGS)
-+all: libdscope.la
-
--.c.o:
-- $(CC) $(CFLAGS) $(XMMS_DATADIR_FLAGS) -c $<
-+libdscope.la: $(OBJ)
-+ ${LIBTOOL} $(CC) -o libdscope.la -module -avoid-version $(OBJ) $(LFLAGS) -rpath $(INSTALL-DIR)
-+
-+.c.lo:
-+ ${LIBTOOL} $(CC) $(CFLAGS) $(XMMS_DATADIR_FLAGS) -c $<
-
- clean:
-- rm -f *.o core *.so*
-+ rm -f *.o core *.so* *.lo *.la
-+ rm -fr .libs
-
- distclean:
- rm -f *.o core *~
-
- install:
-- install libdscope.so $(INSTALL-DIR)
-- mkdir -p $(XMMS_DATADIR)/$(THEME_SUBDIR)
-- install bg_*.xpm $(XMMS_DATADIR)/$(THEME_SUBDIR)
-+ ${LIBTOOL} ${INSTALL} libdscope.la $(INSTALL-DIR)
-+ ${BSD_INSTALL_DATA_DIR} $(XMMS_DATADIR)/$(THEME_SUBDIR)
-+ ${BSD_INSTALL_DATA} bg_*.xpm $(XMMS_DATADIR)/$(THEME_SUBDIR)
diff --git a/audio/xmms-dspectogram/DESCR b/audio/xmms-dspectogram/DESCR
deleted file mode 100644
index 7b083e74362..00000000000
--- a/audio/xmms-dspectogram/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Dual Spectogram visual XMMS plugin
diff --git a/audio/xmms-dspectogram/Makefile b/audio/xmms-dspectogram/Makefile
deleted file mode 100644
index aedb20798a8..00000000000
--- a/audio/xmms-dspectogram/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.23 2006/10/04 20:44:20 wiz Exp $
-#
-
-DISTNAME= dspectogram-1.2
-PKGNAME= xmms-${DISTNAME}
-PKGREVISION= 4
-CATEGORIES= audio
-MASTER_SITES= http://hem.passagen.se/joakime/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://hem.passagen.se/joakime/
-COMMENT= XMMS plugin for dual spectogram
-
-USE_LIBTOOL= YES
-
-pre-build:
- cd ${WRKSRC} ; ${MAKE} clean
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-dspectogram/PLIST b/audio/xmms-dspectogram/PLIST
deleted file mode 100644
index d276db95fe6..00000000000
--- a/audio/xmms-dspectogram/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:18 jlam Exp $
-lib/xmms/Visualization/libdspectogram.la
-share/xmms/dspectogram_themes/bg_gtk.xpm
-share/xmms/dspectogram_themes/bg_xmms.xpm
-share/xmms/dspectogram_themes/bg_xmms1.xpm
-share/xmms/dspectogram_themes/bg_xmms2.xpm
-@dirrm share/xmms/dspectogram_themes
diff --git a/audio/xmms-dspectogram/distinfo b/audio/xmms-dspectogram/distinfo
deleted file mode 100644
index 76711cace93..00000000000
--- a/audio/xmms-dspectogram/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 20:39:54 agc Exp $
-
-SHA1 (dspectogram-1.2.tar.gz) = defad396e898efdaa597312629afc1b46bd7e9c9
-RMD160 (dspectogram-1.2.tar.gz) = bf7d3004ba647d176b822791a9cf49f26a495057
-Size (dspectogram-1.2.tar.gz) = 40791 bytes
-SHA1 (patch-aa) = b08397f747f762d4da09471a3f91a03cba173603
diff --git a/audio/xmms-dspectogram/patches/patch-aa b/audio/xmms-dspectogram/patches/patch-aa
deleted file mode 100644
index fd242a0acab..00000000000
--- a/audio/xmms-dspectogram/patches/patch-aa
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2002/09/21 01:46:52 jlam Exp $
-
---- Makefile.orig Sat Jan 20 06:20:49 2001
-+++ Makefile
-@@ -1,12 +1,12 @@
- # Change paths & OPT if necessary
-
--CC = gcc
--OPT = -m486 -O2
-+#CC = gcc
-+#OPT = -m486 -O2
- #OPT = -mpentium -O6
- #OPT = -mcpu=k6 -march=k6 -O6
--CFLAGS = $(OPT) -Wall -fPIC `gtk-config --cflags gthread`
--LFLAGS = -shared -fPIC -L/usr/local/lib
--OBJ = dspectogram.o
-+CFLAGS+= $(OPT) -Wall -fPIC `gtk-config --cflags gthread`
-+#LFLAGS = -shared -fPIC -L/usr/local/lib
-+OBJ = dspectogram.lo
- INSTALL-DIR=`xmms-config --visualization-plugin-dir`
- XMMS_DATADIR=`xmms-config --data-dir`
- #INSTALL-DIR=$(HOME)/.xmms/Plugins
-@@ -14,21 +14,24 @@ XMMS_DATADIR=`xmms-config --data-dir`
- THEME_SUBDIR=dspectogram_themes
- XMMS_DATADIR_FLAGS=-DTHEMEDIR=\"$(XMMS_DATADIR)/$(THEME_SUBDIR)/\"
-
--all: libdspectogram.so
-+.SUFFIXES: .c .lo
-
--libdspectogram.so: $(OBJ)
-- $(CC) -o libdspectogram.so $(OBJ) $(LFLAGS)
-+all: libdspectogram.la
-
--.c.o:
-- $(CC) $(CFLAGS) $(XMMS_DATADIR_FLAGS) -c $<
-+libdspectogram.la: $(OBJ)
-+ ${LIBTOOL} $(CC) -o libdspectogram.la $(OBJ) $(LFLAGS) -rpath ${INSTALL-DIR} -module -avoid-version
-+
-+.c.lo:
-+ ${LIBTOOL} $(CC) $(CFLAGS) $(XMMS_DATADIR_FLAGS) -c $<
-
- clean:
-- rm -f *.o core *.so*
-+ rm -f *.o core *.so* *.la *.lo
-+ rm -fr .libs
-
- distclean:
- rm -f *.o core *~
-
- install:
-- install libdspectogram.so $(INSTALL-DIR)
-- mkdir -p $(XMMS_DATADIR)/$(THEME_SUBDIR)
-- install bg_*.xpm $(XMMS_DATADIR)/$(THEME_SUBDIR)
-+ ${LIBTOOL} ${INSTALL} libdspectogram.la $(INSTALL-DIR)
-+ ${BSD_INSTALL_DATA_DIR} $(XMMS_DATADIR)/$(THEME_SUBDIR)
-+ ${BSD_INSTALL_DATA} bg_*.xpm $(XMMS_DATADIR)/$(THEME_SUBDIR)
diff --git a/audio/xmms-dspectral/DESCR b/audio/xmms-dspectral/DESCR
deleted file mode 100644
index 2b6d7835013..00000000000
--- a/audio/xmms-dspectral/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Dual Spectralizer visual XMMS plugin
diff --git a/audio/xmms-dspectral/Makefile b/audio/xmms-dspectral/Makefile
deleted file mode 100644
index 548bac061d6..00000000000
--- a/audio/xmms-dspectral/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:00 jlam Exp $
-#
-
-DISTNAME= dspectral-1.2
-PKGNAME= xmms-dspectral-1.2
-PKGREVISION= 4
-CATEGORIES= audio
-MASTER_SITES= http://hem.passagen.se/joakime/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://hem.passagen.se/joakime/linuxapp.html
-COMMENT= XMMS plugin for dual spectral analyzer
-
-USE_LIBTOOL= YES
-
-pre-build:
- cd ${WRKSRC} ; ${MAKE} clean
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-dspectral/PLIST b/audio/xmms-dspectral/PLIST
deleted file mode 100644
index d9625ad7643..00000000000
--- a/audio/xmms-dspectral/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:18 jlam Exp $
-lib/xmms/Visualization/libdspectral.la
-share/xmms/dspectral_themes/bg_blue.xpm
-share/xmms/dspectral_themes/bg_gtk.xpm
-share/xmms/dspectral_themes/bg_white.xpm
-share/xmms/dspectral_themes/bg_xmms.xpm
-@dirrm share/xmms/dspectral_themes
diff --git a/audio/xmms-dspectral/distinfo b/audio/xmms-dspectral/distinfo
deleted file mode 100644
index e15eeb2dda5..00000000000
--- a/audio/xmms-dspectral/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:54 agc Exp $
-
-SHA1 (dspectral-1.2.tar.gz) = da32adcdcfef1cc2e32e4d5013623be64922c430
-RMD160 (dspectral-1.2.tar.gz) = 7cdbdeadb8309d90ff1d42deb0704dc495b81728
-Size (dspectral-1.2.tar.gz) = 41866 bytes
-SHA1 (patch-aa) = ba20a05edbc3f1cccde8593933186bea2c37286f
diff --git a/audio/xmms-dspectral/patches/patch-aa b/audio/xmms-dspectral/patches/patch-aa
deleted file mode 100644
index 33448c397e6..00000000000
--- a/audio/xmms-dspectral/patches/patch-aa
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/02/15 00:44:42 hubertf Exp $
-
---- Makefile.orig Sat Jan 20 06:19:26 2001
-+++ Makefile
-@@ -1,12 +1,12 @@
- # Change paths & OPT if necessary
-
--CC = gcc
--OPT = -m486 -O2
-+#CC = gcc
-+OPT = -O2
- #OPT = -mpentium -O6
- #OPT = -mcpu=k6 -march=k6 -O6
--CFLAGS = $(OPT) -Wall -fPIC `gtk-config --cflags gthread`
--LFLAGS = -shared -fPIC -L/usr/local/lib
--OBJ = dspectral.o
-+CFLAGS+= $(OPT) -Wall -fPIC `gtk-config --cflags gthread`
-+#LFLAGS = -shared -fPIC -L/usr/local/lib
-+OBJ = dspectral.lo
- INSTALL-DIR=`xmms-config --visualization-plugin-dir`
- XMMS_DATADIR=`xmms-config --data-dir`
- #INSTALL-DIR=$(HOME)/.xmms/Plugins
-@@ -14,21 +14,24 @@ XMMS_DATADIR=`xmms-config --data-dir`
- THEME_SUBDIR=dspectral_themes
- XMMS_DATADIR_FLAGS=-DTHEMEDIR=\"$(XMMS_DATADIR)/$(THEME_SUBDIR)/\"
-
--all: libdspectral.so
-+.SUFFIXES: .c .lo
-
--libdspectral.so: $(OBJ)
-- $(CC) -o libdspectral.so $(OBJ) $(LFLAGS)
-+all: libdspectral.la
-
--.c.o:
-- $(CC) $(CFLAGS) $(XMMS_DATADIR_FLAGS) -c $<
-+libdspectral.la: $(OBJ)
-+ ${LIBTOOL} $(CC) -o libdspectral.la $(OBJ) $(LFLAGS) -module -avoid-version -rpath $(INSTALL-DIR)
-+
-+.c.lo:
-+ ${LIBTOOL} $(CC) $(CFLAGS) $(XMMS_DATADIR_FLAGS) -c $<
-
- clean:
-- rm -f *.o core *.so*
-+ rm -f *.o core *.so* *.lo *.la
-+ rm -fr .libs
-
- distclean:
- rm -f *.o core *~
-
- install:
-- install libdspectral.so $(INSTALL-DIR)
-- mkdir -p $(XMMS_DATADIR)/$(THEME_SUBDIR)
-- install bg_*.xpm $(XMMS_DATADIR)/$(THEME_SUBDIR)
-+ ${LIBTOOL} ${INSTALL} libdspectral.la $(INSTALL-DIR)
-+ ${BSD_INSTALL_DATA_DIR} $(XMMS_DATADIR)/$(THEME_SUBDIR)
-+ ${BSD_INSTALL_DATA} bg_*.xpm $(XMMS_DATADIR)/$(THEME_SUBDIR)
diff --git a/audio/xmms-esound/DESCR b/audio/xmms-esound/DESCR
deleted file mode 100644
index 315b785fe4c..00000000000
--- a/audio/xmms-esound/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-xmms-esound is an output plugin for the XMMS program that allows it to output
-sound using the enlightened sound daemon (mainly used by the GNOME desktop).
diff --git a/audio/xmms-esound/Makefile b/audio/xmms-esound/Makefile
deleted file mode 100644
index e1665af3d4d..00000000000
--- a/audio/xmms-esound/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2006/04/06 06:21:37 reed Exp $
-#
-
-.include "../../audio/xmms/Makefile.common"
-
-PKGNAME= ${DISTNAME:S/xmms/xmms-esound/}
-PKGREVISION= 3
-CATEGORIES+= gnome
-
-COMMENT= XMMS plugin to output sound through the esound daemon
-
-CONFLICTS+= xmms<=1.2.7nb8
-
-BUILDLINK_API_DEPENDS.xmms+= xmms>=1.2.7nb9
-
-BUILD_DIRS= ${WRKSRC}/Output/esd
-INSTALL_DIRS= ${WRKSRC}/Output/esd
-
-.include "../../audio/esound/buildlink3.mk"
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-esound/PLIST b/audio/xmms-esound/PLIST
deleted file mode 100644
index b815857217b..00000000000
--- a/audio/xmms-esound/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:18 jlam Exp $
-lib/xmms/Output/libesdout.la
-@comment in xmms: @dirrm lib/xmms/Output
diff --git a/audio/xmms-faad/DESCR b/audio/xmms-faad/DESCR
deleted file mode 100644
index ea1aa45dc44..00000000000
--- a/audio/xmms-faad/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-XMMS plugin for AAC files.
diff --git a/audio/xmms-faad/Makefile b/audio/xmms-faad/Makefile
deleted file mode 100644
index bb1ac832542..00000000000
--- a/audio/xmms-faad/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2007/02/09 20:10:50 drochner Exp $
-
-DISTNAME= faad2-2.0
-PKGNAME= xmms-faad-2.0
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.audiocoding.com/
-COMMENT= XMMS plugin for faad
-
-#RESTRICTED= Dolby doesn't allow binary distributions
-#NO_BIN_ON_FTP= ${RESTRICTED}
-#NO_BIN_ON_CDROM= ${RESTRICTED}
-
-WRKSRC= ${WRKDIR}/faad2
-USE_TOOLS+= automake gmake pkg-config
-USE_LANGUAGES= c c++
-USE_LIBTOOL= YES
-SHLIBTOOL_OVERRIDE= # empty
-DISTINFO_FILE= ${.CURDIR}/../../audio/faad2/distinfo
-PATCHDIR= ${.CURDIR}/../../audio/faad2/patches
-
-AUTOCONF_REQD= 2.50
-GNU_CONFIGURE= YES
-
-CONFIGURE_ARGS+= --with-xmms
-CONFIGURE_ARGS+= --with-mp4v2
-BUILD_DIRS= plugins/xmms/src
-INSTALL_DIRS= plugins/xmms
-
-pre-configure:
- ${CP} ${WRKSRC}/common/faad/getopt.* ${WRKSRC}/frontend
- for dir in . ; do \
- cd ${WRKSRC}/$$dir; \
- aclocal -I .; \
- autoheader; \
- ${LOCALBASE}/bin/libtoolize --automake; \
- automake --add-missing; \
- autoconf; \
- done
-
-.include "../../audio/faad2/buildlink3.mk"
-.include "../../audio/id3lib/buildlink3.mk"
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../multimedia/libmp4v2/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-faad/PLIST b/audio/xmms-faad/PLIST
deleted file mode 100644
index 23023897e06..00000000000
--- a/audio/xmms-faad/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/05/21 03:16:23 grant Exp $
-lib/xmms/Input/libmp4.la
-@comment in xmms: @dirrm lib/xmms/Input
diff --git a/audio/xmms-flac/DESCR b/audio/xmms-flac/DESCR
deleted file mode 100644
index 724f7a1bc42..00000000000
--- a/audio/xmms-flac/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-XMMS plugin for FLAC compressed audio.
diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile
deleted file mode 100644
index f31c1aa366e..00000000000
--- a/audio/xmms-flac/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2007/01/08 00:19:18 wiz Exp $
-#
-
-DISTNAME= flac-1.1.3
-PKGNAME= xmms-${DISTNAME}
-CATEGORIES= audio archivers
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flac/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://flac.sourceforge.net/
-COMMENT= FLAC XMMS plugin
-
-USE_TOOLS+= gmake
-GNU_CONFIGURE= yes
-
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-SHLIBTOOL_OVERRIDE= libtool-disable-static
-
-XMMS_WRKSRC= ${WRKSRC}/src/plugin_xmms
-
-# previous name of the package
-CONFLICTS= flac-xmms-[0-9]*
-
-BUILD_DIRS= src/libFLAC
-BUILD_DIRS+= src/plugin_common
-BUILD_DIRS+= src/share
-BUILD_DIRS+= src/plugin_xmms
-INSTALL_DIRS= src/plugin_xmms
-
-.include "../../mk/compiler.mk"
-
-# SunPro does not support __inline
-.if !empty(PKGSRC_COMPILER:Msunpro)
-CFLAGS+= -D__inline=inline
-.endif
-
-do-install:
- cd ${XMMS_WRKSRC} && ${SETENV} ${MAKE_ENV} \
- ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} ${INSTALL_TARGET}
-
-BUILDLINK_API_DEPENDS.flac+= flac>=1.1.3nb1
-.include "../../audio/flac/buildlink3.mk"
-.include "../../audio/xmms/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-flac/PLIST b/audio/xmms-flac/PLIST
deleted file mode 100644
index 32f14271b5e..00000000000
--- a/audio/xmms-flac/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:18 jlam Exp $
-lib/xmms/Input/libxmms-flac.la
diff --git a/audio/xmms-flac/distinfo b/audio/xmms-flac/distinfo
deleted file mode 100644
index c3f0a151d0f..00000000000
--- a/audio/xmms-flac/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.9 2007/01/07 12:52:32 wiz Exp $
-
-SHA1 (flac-1.1.3.tar.gz) = e19c92bebe536b69dd14d54de76c1f626b83b295
-RMD160 (flac-1.1.3.tar.gz) = 3bb360940775b6b2a5127accfb12d29c04da1132
-Size (flac-1.1.3.tar.gz) = 1592699 bytes
diff --git a/audio/xmms-fmradio/DESCR b/audio/xmms-fmradio/DESCR
deleted file mode 100644
index 516dca710c6..00000000000
--- a/audio/xmms-fmradio/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-The FM-Radio plugin allows you to use an FM radio tuner card with XMMS.
diff --git a/audio/xmms-fmradio/Makefile b/audio/xmms-fmradio/Makefile
deleted file mode 100644
index 50948093e6d..00000000000
--- a/audio/xmms-fmradio/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2006/11/05 14:47:55 rillig Exp $
-#
-
-DISTNAME= xmms-FMRadio-1.4
-PKGNAME= xmms-fmradio-1.4
-PKGREVISION= 4
-CATEGORIES= audio
-MASTER_SITES= http://silicone.free.fr/xmms-FMRadio/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= jmcneill@NetBSD.org
-HOMEPAGE= http://silicone.free.fr/xmms-FMRadio/
-COMMENT= Use a Radio Tuner card in XMMS
-
-ONLY_FOR_PLATFORM= NetBSD-1.5Z[A-Z]-* NetBSD-1.6*-* NetBSD-[2-9]*-*
-
-MAKE_ENV+= ${BSD_MAKE_ENV}
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-fmradio/PLIST b/audio/xmms-fmradio/PLIST
deleted file mode 100644
index 4754194e317..00000000000
--- a/audio/xmms-fmradio/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/06 06:50:35 jmcneill Exp $
-lib/xmms/Input/libradio.so
diff --git a/audio/xmms-fmradio/distinfo b/audio/xmms-fmradio/distinfo
deleted file mode 100644
index be803af91f1..00000000000
--- a/audio/xmms-fmradio/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:54 agc Exp $
-
-SHA1 (xmms-FMRadio-1.4.tgz) = 8c22a2532df986f425341295c7b37f7b93d09560
-RMD160 (xmms-FMRadio-1.4.tgz) = 4dbc178634d9cceb84291d44825d34ab343f6e3e
-Size (xmms-FMRadio-1.4.tgz) = 10378 bytes
-SHA1 (patch-aa) = 7b572563d6427c791afbc98594582790f0e059e9
-SHA1 (patch-ab) = 8a6411ff75409019b5fde7796866079fef62bf33
-SHA1 (patch-ac) = 945b3c30d80d9602b15223b9852b86d13c5a66fe
-SHA1 (patch-ad) = 32daee9f65164ce7560cf2fa92120bdcd8ce32f7
diff --git a/audio/xmms-fmradio/patches/patch-aa b/audio/xmms-fmradio/patches/patch-aa
deleted file mode 100644
index 2bbd9b55152..00000000000
--- a/audio/xmms-fmradio/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/01/06 06:50:35 jmcneill Exp $
-
---- Makefile.orig Sat Dec 15 10:32:11 2001
-+++ Makefile Sun Jan 6 02:18:37 2002
-@@ -1,15 +1,14 @@
- CC?= cc
- OBJ=radio.o radio_configure.o radio_file_info.o
- CFLAGS?= -O2 -Wall
--CFLAGS+= -fpic -DPIC `gtk-config --cflags`
--LDFLAGS+= --shared -L/usr/local/lib -lxmms `gtk-config --libs`
-+CFLAGS+= -fpic -DPIC `xmms-config --cflags` `gtk-config --cflags`
-+LDFLAGS+= --shared `xmms-config --libs` `gtk-config --libs`
-
--PREFIX?= /usr/local
--XMMS_PLUG_INS_DIR= $(PREFIX)/lib/xmms/Input
-+XMMS_PLUG_INS_DIR= `xmms-config --input-plugin-dir`
-
- # These are for linux, they're defined under BSD
- BINOWN?= root
--BINGRP?= root
-+BINGRP?= wheel
- BINMODE?= 555
- DIRMODE?= 755
-
diff --git a/audio/xmms-fmradio/patches/patch-ab b/audio/xmms-fmradio/patches/patch-ab
deleted file mode 100644
index 413e70ea57f..00000000000
--- a/audio/xmms-fmradio/patches/patch-ab
+++ /dev/null
@@ -1,209 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/01/06 06:50:35 jmcneill Exp $
-
---- radio.c.orig Sun Jan 6 02:28:50 2002
-+++ radio.c Sun Jan 6 02:34:04 2002
-@@ -25,9 +25,9 @@
- #include "radio.h"
-
- #include <errno.h>
--#ifdef __OpenBSD__
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
- #include <err.h>
--#endif /* __OpenBSD__ */
-+#endif /* __OpenBSD__ || __NetBSD__ */
-
- static void radio_init(void);
- static int is_our_file(char *filename);
-@@ -72,10 +72,10 @@
-
- gint radio_fd = -1;
- gint freq,volume;
--#ifdef __OpenBSD__
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
- struct radio_info ri;
- static mixer_ctrl_t volctl;
--#endif /* __OpenBSD__ */
-+#endif /* __OpenBSD__ || defined(__NetBSD__) */
- gboolean is_paused,tuned;
-
-
-@@ -110,16 +110,16 @@
- if (!radio_cfg.device)
- #ifdef linux
- radio_cfg.device = g_strdup("/dev/radio0");
--#elif defined __OpenBSD__
-+#elif defined(__OpenBSD__) || defined(__NetBSD__)
- radio_cfg.device = g_strdup("/dev/radio");
--#endif /* linux || __OpenBSD__ */
-+#endif /* linux || __OpenBSD__ || __NetBSD__ */
- if (!radio_cfg.directory)
- radio_cfg.directory = g_strdup(g_get_home_dir());
-
- volume=FMR_VOL_DEFAULT;
--#ifdef __OpenBSD__
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
- SetGetRadioInfo(GET_INFO);
--#endif /* __OpenBSD__ */
-+#endif /* __OpenBSD__ || defined(__NetBSD__) */
- }
-
- static int is_our_file(char *filename)
-@@ -161,7 +161,7 @@
- return .016;
- return 16;
- }
--#elif defined __OpenBSD__
-+#elif defined(__OpenBSD__) || defined(__NetBSD__)
- int
- SetGetRadioInfo(int setinfo) {
- int rd;
-@@ -182,7 +182,7 @@
-
- return 0;
- }
--#endif /* linux || __OpenBSD__ */
-+#endif /* linux || __OpenBSD__ || __NetBSD__ */
-
-
- static void play_file(char *filename)
-@@ -268,7 +268,7 @@
- return ;
- }
- tuned = ((v.signal != 0) ? TRUE : FALSE);
--#elif defined __OpenBSD__
-+#elif defined(__OpenBSD__) || defined(__NetBSD__)
- ri.freq = (unsigned long)freq;
- ri.mute = 0;
- ri.volume = volume * (255/(FMR_VOL_MAX - FMR_VOL_MIN));
-@@ -276,7 +276,7 @@
- usleep(50000);
- SetGetRadioInfo(GET_INFO);
- tuned = ri.info ? TRUE : FALSE;
--#endif /* linux || __OpenBSD__ */
-+#endif /* linux || __OpenBSD__ || __NetBSD__ */
-
- if (radioname==NULL)
- tmp = g_strdup_printf("FM Radio %6.2fMHz", (float)freq/1000.0);
-@@ -316,7 +316,7 @@
- return ;
- }
- tuned = ((v.signal != 0) ? TRUE : FALSE);
--#elif defined __OpenBSD__
-+#elif defined(__OpenBSD__) || defined(__NetBSD__)
- ri.freq = (unsigned long)freq;
- ri.mute = 0;
- ri.volume = volume * (255/(FMR_VOL_MAX - FMR_VOL_MIN));
-@@ -324,7 +324,7 @@
- usleep(50000);
- SetGetRadioInfo(GET_INFO);
- tuned = ri.info ? TRUE : FALSE;
--#endif /* linux || __OpenBSD__ */
-+#endif /* linux || __OpenBSD__ || __NetBSD__ */
-
- if (radioname==NULL)
- tmp = g_strdup_printf("FM Radio (undefined)");
-@@ -350,10 +350,10 @@
- ioctl (radio_fd, VIDIOCSAUDIO, &va);
- close(radio_fd);
- radio_fd = -1;
--#elif defined __OpenBSD__
-+#elif defined(__OpenBSD__) || defined(__NetBSD__)
- ri.mute = 1;
- SetGetRadioInfo(SET_INFO);
--#endif /* linux || __OpenBSD__ */
-+#endif /* linux || __OpenBSD__ || __NetBSD__ */
- }
-
- static void radio_pause(short p)
-@@ -380,7 +380,7 @@
- is_paused = (p ? TRUE : FALSE);
- close(radio_fd);
- radio_fd = -2;
--#elif defined __OpenBSD__
-+#elif defined(__OpenBSD__) || defined(__NetBSD__)
- if (p) {
- ri.mute = 1;
- is_paused = TRUE;
-@@ -389,7 +389,7 @@
- is_paused = FALSE;
- }
- SetGetRadioInfo(SET_INFO);
--#endif /* linux || __OpenBSD__ */
-+#endif /* linux || __OpenBSD__ || __NetBSD__ */
- }
-
- static void get_song_info(char *filename, char **title, int *len)
-@@ -453,9 +453,9 @@
-
- static void get_volume(int *l, int *r)
- {
--#ifdef __OpenBSD__
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
- mixer_devinfo_t devinfo;
--#endif /* __OpenBSD__ */
-+#endif /* __OpenBSD__ || __NetBSD__ */
- int fd, devs, cmd, v;
-
- #if defined(HAVE_SYS_SOUNDCARD_H) || defined(HAVE_MACHINE_SOUNDCARD_H)
-@@ -490,7 +490,7 @@
- } else {
- printf( "Cannot open /dev/mixer %ld\n", errno );
- }
--#elif defined __OpenBSD__
-+#elif defined(__OpenBSD__) || defined(__NetBSD__)
- cmd = 1;
- fd = open("/dev/mixer", O_RDWR);
- if (fd < 0) {
-@@ -537,7 +537,7 @@
-
- if (close(fd) < 0)
- warn("/dev/mixer close error");
--#endif /* linux || __OpenBSD__ */
-+#endif /* linux || __OpenBSD__ || defined(__NetBSD__) */
- }
- else
- #endif
-@@ -555,9 +555,9 @@
- {
- #ifdef linux
- struct video_audio va;
--#elif defined __OpenBSD__
-+#elif defined(__OpenBSD__) || defined(__NetBSD__)
- mixer_devinfo_t devinfo;
--#endif /* linux || __OpenBSD__ */
-+#endif /* linux || __OpenBSD__ || defined(__NetBSD__) */
- int fd, devs, cmd, v;
-
- #if defined(HAVE_SYS_SOUNDCARD_H) || defined(HAVE_MACHINE_SOUNDCARD_H)
-@@ -590,7 +590,7 @@
- } else {
- printf( "Cannot open /dev/mixer %ld\n", errno );
- }
--#elif defined __OpenBSD__
-+#elif defined(__OpenBSD__) || defined(__NetBSD__)
- cmd = 1;
- fd = open("/dev/mixer", O_RDWR);
- if (fd < 0) {
-@@ -639,7 +639,7 @@
-
- if (close(fd) < 0)
- warn("/dev/mixer close error");
--#endif /* linux || __OpenBSD__ */
-+#endif /* linux || __OpenBSD__ || __NetBSD__ */
- }
- else
- #endif
-@@ -676,11 +676,11 @@
- }
- close(radio_fd);
- radio_fd = -2;
--#elif defined __OpenBSD__
-+#elif defined(__OpenBSD__) || defined(__NetBSD__)
- ri.volume = volume * (255 / (FMR_VOL_MAX - FMR_VOL_MIN));
- ri.mute = is_paused ? 1 : 0;
- SetGetRadioInfo(SET_INFO);
--#endif /* linux || __OpenBSD__ */
-+#endif /* linux || __OpenBSD__ || __NetBSD__ */
- }
- }
-
diff --git a/audio/xmms-fmradio/patches/patch-ac b/audio/xmms-fmradio/patches/patch-ac
deleted file mode 100644
index 6005b11f2e4..00000000000
--- a/audio/xmms-fmradio/patches/patch-ac
+++ /dev/null
@@ -1,66 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/01/06 06:50:35 jmcneill Exp $
-
---- radio.h.orig Sun Jan 6 02:34:32 2002
-+++ radio.h Sun Jan 6 02:36:15 2002
-@@ -45,11 +45,11 @@
- #include <math.h>
-
- #ifdef HAVE_SYS_SOUNDCARD_H
--#ifdef __OpenBSD__
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
- #include <sys/audioio.h>
- #else
- #include <sys/soundcard.h>
--#endif /* __OpenBSD__ */
-+#endif /* __OpenBSD__ || __NetBSD__ */
- #else
- #ifdef HAVE_MACHINE_SOUNDCARD_H
- #include <machine/soundcard.h>
-@@ -58,9 +58,9 @@
-
- #ifdef linux
- #include <linux/videodev.h>
--#elif defined __OpenBSD__
-+#elif defined(__OpenBSD__) || defined(__NetBSD__)
- #include <sys/radioio.h>
--#endif /* linux || __OpenBSD__ */
-+#endif /* linux || __OpenBSD__ || __NetBSD__ */
-
- #include <fcntl.h>
-
-@@ -94,10 +94,10 @@
-
- #define STR_LEN_MAX 80
-
--#ifdef __OpenBSD__
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
- #define GET_INFO 0
- #define SET_INFO 1
--#endif /* __OpenBSD__ */
-+#endif /* __OpenBSD__ || __NetBSD__ */
-
- typedef struct
- {
-@@ -108,9 +108,9 @@
- RadioConfig;
-
- extern RadioConfig radio_cfg;
--#ifdef __OpenBSD__
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
- extern struct radio_info ri;
--#endif /* __OpenBSD__ */
-+#endif /* __OpenBSD__ || defined(__NetBSD__) */
-
- extern gint radio_fd;
- extern gint freq,volume;
-@@ -121,8 +121,8 @@
-
- void radio_file_info_box(char *filename);
-
--#ifdef __OpenBSD__
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
- int SetGetRadioInfo(int);
--#endif /* __OpenBSD__ */
-+#endif /* __OpenBSD__ || __NetBSD__ */
-
- #endif /* RADIO_H */
diff --git a/audio/xmms-fmradio/patches/patch-ad b/audio/xmms-fmradio/patches/patch-ad
deleted file mode 100644
index c8fab574c54..00000000000
--- a/audio/xmms-fmradio/patches/patch-ad
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/01/06 06:50:35 jmcneill Exp $
-
---- radio_file_info.c.orig Sun Jan 6 02:36:53 2002
-+++ radio_file_info.c Sun Jan 6 02:38:25 2002
-@@ -163,7 +163,7 @@
- tuned = ((v.signal != 0) ? TRUE : FALSE);
- close(radio_fd);
- radio_fd = -2;
--#elif defined __OpenBSD__
-+#elif defined(__OpenBSD__) || defined(__NetBSD__)
- ri.freq = freq;
- ri.volume = volume * (255 / (FMR_VOL_MAX - FMR_VOL_MIN));
- ri.mute = is_paused ? 1 : 0;
-@@ -171,7 +171,7 @@
- usleep(50000);
- SetGetRadioInfo(GET_INFO);
- tuned = ri.info ? TRUE : FALSE;
--#endif /* linux || __OpenBSD__ */
-+#endif /* linux || __OpenBSD__ || __NetBSD__ */
- }
-
- static void scan_cb(GtkWidget * sb, gpointer data){
-@@ -205,12 +205,12 @@
- va.flags = VIDEO_AUDIO_VOLUME|(is_paused ? VIDEO_AUDIO_MUTE : 0);
- ioctl (radio_fd, VIDIOCSFREQ, &xl_freq);
- ioctl (radio_fd, VIDIOCSAUDIO, &va);
--#elif defined __OpenBSD__
-+#elif defined(__OpenBSD__) || defined(__NetBSD__)
- ri.freq = fr;
- ri.volume = volume * (255/(FMR_VOL_MAX-FMR_VOL_MIN));
- ri.mute = is_paused ? 1 : 0;
- SetGetRadioInfo(SET_INFO);
--#endif /* linux || __OpenBSD__ */
-+#endif /* linux || __OpenBSD__ || __NetBSD__ */
-
- for(i=0;(i<tries)&&(tuned);i++){
- usleep (10000);
-@@ -218,10 +218,10 @@
- v.tuner = 0;
- ioctl (radio_fd, VIDIOCGTUNER, &v);
- tuned = ((v.signal != 0) ? TRUE : FALSE);
--#elif defined __OpenBSD__
-+#elif defined(__OpenBSD__) || defined(__NetBSD__)
- SetGetRadioInfo(GET_INFO);
- tuned = ri.info & (RADIO_INFO_SIGNAL | RADIO_INFO_STEREO) ? 1 : 0;
--#endif /* linux || __OpenBSD__ */
-+#endif /* linux || __OpenBSD__ || __NetBSD__ */
- }
- }
-
-@@ -236,12 +236,12 @@
- va.flags = VIDEO_AUDIO_VOLUME|(is_paused ? VIDEO_AUDIO_MUTE : 0);
- ioctl (radio_fd, VIDIOCSFREQ, &xl_freq);
- ioctl (radio_fd, VIDIOCSAUDIO, &va);
--#elif defined __OpenBSD__
-+#elif defined(__OpenBSD__) || defined(__NetBSD__)
- ri.freq = fr;
- ri.volume = volume * (255/(FMR_VOL_MAX-FMR_VOL_MIN));
- ri.mute = is_paused ? 1 : 0;
- SetGetRadioInfo(SET_INFO);
--#endif /* linux || __OpenBSD__ */
-+#endif /* linux || __OpenBSD__ || __NetBSD__ */
-
- for(i=0;(i<tries)&&(!tuned);i++){
- usleep (10000);
-@@ -249,10 +249,10 @@
- v.tuner = 0;
- ioctl (radio_fd, VIDIOCGTUNER, &v);
- tuned = ((v.signal != 0) ? TRUE : FALSE);
--#elif defined __OpenBSD__
-+#elif defined(__OpenBSD__) || defined(__NetBSD__)
- SetGetRadioInfo(GET_INFO);
- tuned = ri.info & (RADIO_INFO_SIGNAL | RADIO_INFO_STEREO) ? 1 : 0;
--#endif /* linux || __OpenBSD__ */
-+#endif /* linux || __OpenBSD__ || __NetBSD__ */
- }
- }
- }
diff --git a/audio/xmms-funtimedancer/DESCR b/audio/xmms-funtimedancer/DESCR
deleted file mode 100644
index 5b16366d533..00000000000
--- a/audio/xmms-funtimedancer/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-XMMS visual plugin that displays a character dancing to the rhythm of the
-music.
diff --git a/audio/xmms-funtimedancer/Makefile b/audio/xmms-funtimedancer/Makefile
deleted file mode 100644
index 7add466f8a6..00000000000
--- a/audio/xmms-funtimedancer/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2007/02/22 19:01:15 wiz Exp $
-#
-
-DISTNAME= FunTimeDancer-0.1
-PKGNAME= xmms-funtimedancer-0.1
-PKGREVISION= 8
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ftd/}
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} FunTimeDancer-packs-1.0.tar.gz
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://sourceforge.net/projects/ftd/
-COMMENT= XMMS plugin displaying an animation
-
-post-install:
- cd ${WRKDIR} && \
- pax -rw -pp FunTimeDancer ${PREFIX}/lib/xmms/Visualization
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-funtimedancer/PLIST b/audio/xmms-funtimedancer/PLIST
deleted file mode 100644
index 67d53869ff8..00000000000
--- a/audio/xmms-funtimedancer/PLIST
+++ /dev/null
@@ -1,84 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/02/14 23:56:39 hubertf Exp $
-lib/xmms/Visualization/FunTimeDancer/BreakMan/0.bmp
-lib/xmms/Visualization/FunTimeDancer/BreakMan/1.bmp
-lib/xmms/Visualization/FunTimeDancer/BreakMan/2.bmp
-lib/xmms/Visualization/FunTimeDancer/BreakMan/3.bmp
-lib/xmms/Visualization/FunTimeDancer/BreakMan/4.bmp
-lib/xmms/Visualization/FunTimeDancer/BreakMan/5.bmp
-lib/xmms/Visualization/FunTimeDancer/BreakMan/6.bmp
-lib/xmms/Visualization/FunTimeDancer/BreakMan/7.bmp
-lib/xmms/Visualization/FunTimeDancer/Flairin/0.bmp
-lib/xmms/Visualization/FunTimeDancer/Flairin/1.bmp
-lib/xmms/Visualization/FunTimeDancer/Flairin/2.bmp
-lib/xmms/Visualization/FunTimeDancer/Flairin/3.bmp
-lib/xmms/Visualization/FunTimeDancer/Flairin/4.bmp
-lib/xmms/Visualization/FunTimeDancer/Flairin/5.bmp
-lib/xmms/Visualization/FunTimeDancer/Flairin/6.bmp
-lib/xmms/Visualization/FunTimeDancer/Flairin/7.bmp
-lib/xmms/Visualization/FunTimeDancer/GreenThing/0.bmp
-lib/xmms/Visualization/FunTimeDancer/GreenThing/1.bmp
-lib/xmms/Visualization/FunTimeDancer/GreenThing/2.bmp
-lib/xmms/Visualization/FunTimeDancer/GreenThing/3.bmp
-lib/xmms/Visualization/FunTimeDancer/GreenThing/4.bmp
-lib/xmms/Visualization/FunTimeDancer/GreenThing/5.bmp
-lib/xmms/Visualization/FunTimeDancer/GreenThing/6.bmp
-lib/xmms/Visualization/FunTimeDancer/GreenThing/7.bmp
-lib/xmms/Visualization/FunTimeDancer/Kitten/0.bmp
-lib/xmms/Visualization/FunTimeDancer/Kitten/1.bmp
-lib/xmms/Visualization/FunTimeDancer/Kitten/2.bmp
-lib/xmms/Visualization/FunTimeDancer/Kitten/3.bmp
-lib/xmms/Visualization/FunTimeDancer/Kitten/4.bmp
-lib/xmms/Visualization/FunTimeDancer/Kitten/5.bmp
-lib/xmms/Visualization/FunTimeDancer/Kitten/6.bmp
-lib/xmms/Visualization/FunTimeDancer/Kitten/7.bmp
-lib/xmms/Visualization/FunTimeDancer/KittenSinging/0.bmp
-lib/xmms/Visualization/FunTimeDancer/KittenSinging/1.bmp
-lib/xmms/Visualization/FunTimeDancer/KittenSinging/2.bmp
-lib/xmms/Visualization/FunTimeDancer/KittenSinging/3.bmp
-lib/xmms/Visualization/FunTimeDancer/KittenSinging/4.bmp
-lib/xmms/Visualization/FunTimeDancer/KittenSinging/5.bmp
-lib/xmms/Visualization/FunTimeDancer/KittenSinging/6.bmp
-lib/xmms/Visualization/FunTimeDancer/KittenSinging/7.bmp
-lib/xmms/Visualization/FunTimeDancer/SpaceGhost/0.bmp
-lib/xmms/Visualization/FunTimeDancer/SpaceGhost/1.bmp
-lib/xmms/Visualization/FunTimeDancer/SpaceGhost/2.bmp
-lib/xmms/Visualization/FunTimeDancer/SpaceGhost/3.bmp
-lib/xmms/Visualization/FunTimeDancer/SpaceGhost/4.bmp
-lib/xmms/Visualization/FunTimeDancer/SpaceGhost/5.bmp
-lib/xmms/Visualization/FunTimeDancer/SpaceGhost/6.bmp
-lib/xmms/Visualization/FunTimeDancer/SpaceGhost/7.bmp
-lib/xmms/Visualization/FunTimeDancer/Test-Digits/0.bmp
-lib/xmms/Visualization/FunTimeDancer/Test-Digits/1.bmp
-lib/xmms/Visualization/FunTimeDancer/Test-Digits/2.bmp
-lib/xmms/Visualization/FunTimeDancer/Test-Digits/3.bmp
-lib/xmms/Visualization/FunTimeDancer/Test-Digits/4.bmp
-lib/xmms/Visualization/FunTimeDancer/Test-Digits/5.bmp
-lib/xmms/Visualization/FunTimeDancer/Test-Digits/6.bmp
-lib/xmms/Visualization/FunTimeDancer/Test-Digits/7.bmp
-lib/xmms/Visualization/FunTimeDancer/Test-Dot/0.bmp
-lib/xmms/Visualization/FunTimeDancer/Test-Dot/1.bmp
-lib/xmms/Visualization/FunTimeDancer/Test-Dot/2.bmp
-lib/xmms/Visualization/FunTimeDancer/Test-Dot/3.bmp
-lib/xmms/Visualization/FunTimeDancer/Test-Dot/4.bmp
-lib/xmms/Visualization/FunTimeDancer/Test-Dot/5.bmp
-lib/xmms/Visualization/FunTimeDancer/Test-Dot/6.bmp
-lib/xmms/Visualization/FunTimeDancer/Test-Dot/7.bmp
-lib/xmms/Visualization/FunTimeDancer/YellowDancer/0.bmp
-lib/xmms/Visualization/FunTimeDancer/YellowDancer/1.bmp
-lib/xmms/Visualization/FunTimeDancer/YellowDancer/2.bmp
-lib/xmms/Visualization/FunTimeDancer/YellowDancer/3.bmp
-lib/xmms/Visualization/FunTimeDancer/YellowDancer/4.bmp
-lib/xmms/Visualization/FunTimeDancer/YellowDancer/5.bmp
-lib/xmms/Visualization/FunTimeDancer/YellowDancer/6.bmp
-lib/xmms/Visualization/FunTimeDancer/YellowDancer/7.bmp
-lib/xmms/Visualization/libfuntimedancer.so
-@dirrm lib/xmms/Visualization/FunTimeDancer/YellowDancer
-@dirrm lib/xmms/Visualization/FunTimeDancer/Test-Dot
-@dirrm lib/xmms/Visualization/FunTimeDancer/Test-Digits
-@dirrm lib/xmms/Visualization/FunTimeDancer/SpaceGhost
-@dirrm lib/xmms/Visualization/FunTimeDancer/KittenSinging
-@dirrm lib/xmms/Visualization/FunTimeDancer/Kitten
-@dirrm lib/xmms/Visualization/FunTimeDancer/GreenThing
-@dirrm lib/xmms/Visualization/FunTimeDancer/Flairin
-@dirrm lib/xmms/Visualization/FunTimeDancer/BreakMan
-@dirrm lib/xmms/Visualization/FunTimeDancer
diff --git a/audio/xmms-funtimedancer/distinfo b/audio/xmms-funtimedancer/distinfo
deleted file mode 100644
index 484cb288e58..00000000000
--- a/audio/xmms-funtimedancer/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:54 agc Exp $
-
-SHA1 (FunTimeDancer-0.1.tar.gz) = 6cdd02209c647bfb6786f3ccff27de1194f54311
-RMD160 (FunTimeDancer-0.1.tar.gz) = 76b94a8f5f137cc1be9463eeb9bf5837f78e380e
-Size (FunTimeDancer-0.1.tar.gz) = 26877 bytes
-SHA1 (FunTimeDancer-packs-1.0.tar.gz) = 7392144570646f86e9138f285deaea5b8a9280fa
-RMD160 (FunTimeDancer-packs-1.0.tar.gz) = 16f416945be45d9b114f938bc7aad4214da93ce7
-Size (FunTimeDancer-packs-1.0.tar.gz) = 462063 bytes
-SHA1 (patch-aa) = c93ebd9093d91e37866640c2851b19e95c218e8b
-SHA1 (patch-ab) = 503d9455434a3a411a873c9759978314c2e3312f
diff --git a/audio/xmms-funtimedancer/patches/patch-aa b/audio/xmms-funtimedancer/patches/patch-aa
deleted file mode 100644
index 0e6a5ecc632..00000000000
--- a/audio/xmms-funtimedancer/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/02/14 23:56:39 hubertf Exp $
-
---- Makefile.orig Mon Nov 27 08:21:21 2000
-+++ Makefile
-@@ -3,7 +3,7 @@
- all: $(LIB)
-
- libfuntimedancer.so: FunTimeDancer.c FunTimeDancer.h
-- gcc -shared -lpthread -lglib -lSDL -fPIC -D_REENTRANT -o $(LIB) `glib-config --cflags` FunTimeDancer.c
-+ ${CC} -DPREFIX=\"${PREFIX}\" -shared `xmms-config --cflags --libs` -lSDL -fPIC -D_REENTRANT -o $(LIB) `glib-config --cflags` FunTimeDancer.c
-
- clean:
- rm -f *.o $(LIB)
diff --git a/audio/xmms-funtimedancer/patches/patch-ab b/audio/xmms-funtimedancer/patches/patch-ab
deleted file mode 100644
index bd27440a1da..00000000000
--- a/audio/xmms-funtimedancer/patches/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/02/14 23:56:39 hubertf Exp $
-
---- FunTimeDancer.c.orig 2003-02-02 20:33:42.000000000 +0000
-+++ FunTimeDancer.c 2003-02-02 20:35:10.000000000 +0000
-@@ -150,11 +150,20 @@
- }
-
- void get_base_dirname(void) {
-+#if 1
-+ /*
-+ **
-+ ** Search for bitmaps in the system dirs on all platforms
-+ **
-+ */
-+ strcpy(base_dirname, PREFIX "/lib/xmms/Visualization/FunTimeDancer");
-+#else
- gchar *home_dirname; // glib allocates it, we just point to it
-
- home_dirname = g_get_home_dir();
- strcpy(base_dirname, home_dirname);
- strcat(base_dirname, "/.xmms/FunTimeDancer/");
-+#endif
- }
-
- void ftd_Cleanup(void) {
diff --git a/audio/xmms-gdancer/DESCR b/audio/xmms-gdancer/DESCR
deleted file mode 100644
index ba69bad3b0c..00000000000
--- a/audio/xmms-gdancer/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-GDancer is a plugin to animate characters to the beat of the music. The
-default character is Space Ghost, but you can use and make your own characters
-through themes.
diff --git a/audio/xmms-gdancer/Makefile b/audio/xmms-gdancer/Makefile
deleted file mode 100644
index 617a5e50782..00000000000
--- a/audio/xmms-gdancer/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:29:00 jlam Exp $
-#
-
-DISTNAME= gdancer-0.4.3
-PKGNAME= xmms-${DISTNAME}
-PKGREVISION= 4
-CATEGORIES= audio
-MASTER_SITES= http://figz.com/gdancer/files/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://figz.com/gdancer/
-COMMENT= XMMS plugin to animate characters to the beat of the music
-
-GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-gdancer/PLIST b/audio/xmms-gdancer/PLIST
deleted file mode 100644
index 9f8d953f942..00000000000
--- a/audio/xmms-gdancer/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:18 jlam Exp $
-lib/xmms/Visualization/gdancer.la
diff --git a/audio/xmms-gdancer/distinfo b/audio/xmms-gdancer/distinfo
deleted file mode 100644
index f3d8fbff5c0..00000000000
--- a/audio/xmms-gdancer/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:54 agc Exp $
-
-SHA1 (gdancer-0.4.3.tar.gz) = 102f0161fc2bffb8377e2466f634cbdd1f449cfc
-RMD160 (gdancer-0.4.3.tar.gz) = d7598bc194179cb8c44106b9bde458ca68e5a9a1
-Size (gdancer-0.4.3.tar.gz) = 171074 bytes
diff --git a/audio/xmms-infinity/DESCR b/audio/xmms-infinity/DESCR
deleted file mode 100644
index 08829ddd561..00000000000
--- a/audio/xmms-infinity/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-If you wonder why it is called Infinity, the main reason is that
-in some effects, trajectories of particles are suppose to look like
-the symbol infinity in mathematics; and I think that in fact this
-title fits quite well to this plug-in . Thanks to Inigo Olmos for
-this strange idea.
-
-The aim of this project is to make a full screen psychedelic
-visualization plug-in for xmms, an X media player. The design of
-light effects is inspired by Geiss and G-Force, two Winamp plug-ins.
diff --git a/audio/xmms-infinity/Makefile b/audio/xmms-infinity/Makefile
deleted file mode 100644
index 0d9477d8145..00000000000
--- a/audio/xmms-infinity/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2006/06/12 16:28:05 wiz Exp $
-#
-
-DISTNAME= infinity-0.2
-PKGNAME= xmms-${DISTNAME}
-PKGREVISION= 9
-CATEGORIES= xmms audio
-MASTER_SITES= http://julien.carme.free.fr/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://julien.carme.free.fr/infinite.html
-COMMENT= Psychedelic visualization plug-in for xmms
-
-USE_LIBTOOL= YES
-GNU_CONFIGURE= YES
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../devel/glib/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-infinity/PLIST b/audio/xmms-infinity/PLIST
deleted file mode 100644
index 024b3b35be2..00000000000
--- a/audio/xmms-infinity/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:18 jlam Exp $
-lib/xmms/Visualization/libinfinite.la
-share/xmms/infinite_states
diff --git a/audio/xmms-infinity/distinfo b/audio/xmms-infinity/distinfo
deleted file mode 100644
index 0c0de67442d..00000000000
--- a/audio/xmms-infinity/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:54 agc Exp $
-
-SHA1 (infinity-0.2.tar.gz) = 5cbbd4d4f07b4babe1c3cdd1605c35903ac9928f
-RMD160 (infinity-0.2.tar.gz) = 36b3ffa07e8d7fc67d02534ff0414d35ba942b8f
-Size (infinity-0.2.tar.gz) = 132094 bytes
diff --git a/audio/xmms-iris/DESCR b/audio/xmms-iris/DESCR
deleted file mode 100644
index 913482ff12b..00000000000
--- a/audio/xmms-iris/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-This is an OpenGL visualization plugin for XMMS XMMS is the X
-MultiMedia System, a multimedia player able to play mp3, mpeg, avi
-and other multimedia file formats. IRIS is an adaptation of the
-"OpenGL Spectrum Analyzer" from XMMS. It features a theme engine
-and fullscreen modes.
diff --git a/audio/xmms-iris/Makefile b/audio/xmms-iris/Makefile
deleted file mode 100644
index abadf5fcb6f..00000000000
--- a/audio/xmms-iris/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2007/01/11 11:47:09 joerg Exp $
-#
-
-DISTNAME= iris-0.11
-PKGNAME= xmms-${DISTNAME}
-PKGREVISION= 4
-CATEGORIES= xmms audio
-MASTER_SITES= http://cdelfosse.free.fr/xmms-iris/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://cdelfosse.free.fr/xmms-iris/
-COMMENT= OpenGL Spectrum Analyzer with theme engine and fullscreen modes
-
-GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-iris/PLIST b/audio/xmms-iris/PLIST
deleted file mode 100644
index d643e2b36de..00000000000
--- a/audio/xmms-iris/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:18 jlam Exp $
-lib/xmms/Visualization/libiris.la
diff --git a/audio/xmms-iris/distinfo b/audio/xmms-iris/distinfo
deleted file mode 100644
index 3c3e5555286..00000000000
--- a/audio/xmms-iris/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:54 agc Exp $
-
-SHA1 (iris-0.11.tar.gz) = c461cf9f0e3aef5b8c956a6bbc55356247b94527
-RMD160 (iris-0.11.tar.gz) = 99c75bee367c01871166c562bb3e5c2d66c64ee0
-Size (iris-0.11.tar.gz) = 216752 bytes
diff --git a/audio/xmms-jakdaw/DESCR b/audio/xmms-jakdaw/DESCR
deleted file mode 100644
index 6640aa5f5e7..00000000000
--- a/audio/xmms-jakdaw/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-More GL based color-animation stuff: spectrum analyzer with some
-blurring effects.
diff --git a/audio/xmms-jakdaw/Makefile b/audio/xmms-jakdaw/Makefile
deleted file mode 100644
index a8b846c3950..00000000000
--- a/audio/xmms-jakdaw/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2007/01/11 11:49:33 joerg Exp $
-
-DISTNAME= jakdaw-0.0.4
-PKGNAME= xmms-${DISTNAME}
-PKGREVISION= 6
-CATEGORIES= audio xmms
-MASTER_SITES= http://www.jakdaw.ucam.org/xmms/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.jakdaw.ucam.org/xmms/
-COMMENT= Very customizable XMMS plugin with nice effects
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-jakdaw/PLIST b/audio/xmms-jakdaw/PLIST
deleted file mode 100644
index 5c458341b3b..00000000000
--- a/audio/xmms-jakdaw/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:18 jlam Exp $
-lib/xmms/Visualization/libjakdaw.la
diff --git a/audio/xmms-jakdaw/distinfo b/audio/xmms-jakdaw/distinfo
deleted file mode 100644
index 8c9b89db5fd..00000000000
--- a/audio/xmms-jakdaw/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:54 agc Exp $
-
-SHA1 (jakdaw-0.0.4.tar.gz) = bab96f3133e93f5f3dfcb3981691c73f94e8d458
-RMD160 (jakdaw-0.0.4.tar.gz) = 2003d207729e655ed6da9de26ec48abea4ebfd77
-Size (jakdaw-0.0.4.tar.gz) = 129715 bytes
diff --git a/audio/xmms-jess/DESCR b/audio/xmms-jess/DESCR
deleted file mode 100644
index 3040d96ee4d..00000000000
--- a/audio/xmms-jess/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Yet another all-singing all-dancing XMMS plugin with Blur, image
-distortion, etc.
diff --git a/audio/xmms-jess/Makefile b/audio/xmms-jess/Makefile
deleted file mode 100644
index 47ad01519a9..00000000000
--- a/audio/xmms-jess/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2006/06/12 16:28:05 wiz Exp $
-#
-
-DISTNAME= JESS-2.9.1
-PKGNAME= xmms-jess-2.9.1
-PKGREVISION= 8
-CATEGORIES= xmms audio
-MASTER_SITES= http://arquier.free.fr/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://arquier.free.fr/
-COMMENT= XMMS plugin with Blur, image distortion, and others
-
-USE_LIBTOOL= YES
-GNU_CONFIGURE= YES
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-jess/PLIST b/audio/xmms-jess/PLIST
deleted file mode 100644
index 2bb07082f08..00000000000
--- a/audio/xmms-jess/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:18 jlam Exp $
-lib/xmms/Visualization/libjess.la
diff --git a/audio/xmms-jess/distinfo b/audio/xmms-jess/distinfo
deleted file mode 100644
index d4a4d55e203..00000000000
--- a/audio/xmms-jess/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/12/07 18:32:35 joerg Exp $
-
-SHA1 (JESS-2.9.1.tar.gz) = a60fcfb1d38e0c9dae1b40b4163f3b6b099f754c
-RMD160 (JESS-2.9.1.tar.gz) = 53697fd9ee4d6c7f7e94d841fdaff6c796bbe117
-Size (JESS-2.9.1.tar.gz) = 182447 bytes
-SHA1 (patch-aa) = 4b94764860eb5e5a9cc0bc8ea0f172c8fb4e1584
-SHA1 (patch-ab) = 1e829facc6f0639f948eae0f877d2764b65c01ac
-SHA1 (patch-ac) = 9ba3706ed1dca2e0851d403a219b31cf4e7efdbb
diff --git a/audio/xmms-jess/patches/patch-aa b/audio/xmms-jess/patches/patch-aa
deleted file mode 100644
index e32a80a9b06..00000000000
--- a/audio/xmms-jess/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/12/07 18:32:35 joerg Exp $
-
---- draw.c.orig 2005-12-07 18:19:01.000000000 +0000
-+++ draw.c
-@@ -511,6 +511,7 @@ void burn_3d (unsigned char * buffer, gi
- }
- break;
- default:
-+ break;
- }
- /* printf(" Appel rotation_3d\n");
- printf(" Appel perspective\n");
-@@ -624,6 +625,7 @@ void stars_create_state(float pos[3][STA
- break;
-
- default:
-+ break;
- }
- }
-
diff --git a/audio/xmms-jess/patches/patch-ab b/audio/xmms-jess/patches/patch-ab
deleted file mode 100644
index 0ef6d67481a..00000000000
--- a/audio/xmms-jess/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/12/07 18:32:35 joerg Exp $
-
---- misc.c.orig 2005-12-07 18:23:43.000000000 +0000
-+++ misc.c
-@@ -196,9 +196,11 @@ void keyboard(void)
- break;
-
- default:
-+ break;
- }
- break;
- default:
-+ break;
- }
-
- }
diff --git a/audio/xmms-jess/patches/patch-ac b/audio/xmms-jess/patches/patch-ac
deleted file mode 100644
index 51371d239a4..00000000000
--- a/audio/xmms-jess/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/12/07 18:32:35 joerg Exp $
-
---- renderer.c.orig 2005-12-07 18:25:25.000000000 +0000
-+++ renderer.c
-@@ -94,6 +94,7 @@ void draw_mode(int mode)
- break;
-
- default:
-+ break;
- }
-
- conteur.k3 += 10;
diff --git a/audio/xmms-liveice/DESCR b/audio/xmms-liveice/DESCR
deleted file mode 100644
index 861d4d90e98..00000000000
--- a/audio/xmms-liveice/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-The LiveIce plugin for XMMS allows you to use XMMS for streaming music
-(or whatever) to Icecast servers. Multiple bitrate streams and title
-streaming is not supported though.
diff --git a/audio/xmms-liveice/Makefile b/audio/xmms-liveice/Makefile
deleted file mode 100644
index d1c63f2f33d..00000000000
--- a/audio/xmms-liveice/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:08 wiz Exp $
-#
-
-DISTNAME= liveice-xmms
-PKGNAME= xmms-liveice-1.0.0
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= http://star.arm.ac.uk/~spm/software/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://star.arm.ac.uk/~spm/software/
-COMMENT= Audio streaming plugin for XMMS
-
-WRKSRC= ${WRKDIR}/LiveIce-1.0.0
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-
-CFLAGS+= -DLAME="\"${BUILDLINK_PREFIX.lame}/bin/lame\""
-
-.include "../../audio/lame/buildlink3.mk"
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-liveice/PLIST b/audio/xmms-liveice/PLIST
deleted file mode 100644
index dcefbd8232e..00000000000
--- a/audio/xmms-liveice/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:19 jlam Exp $
-lib/xmms/Effect/libliveice.la
-@comment in xmms: @dirrm lib/xmms/Effect
diff --git a/audio/xmms-liveice/distinfo b/audio/xmms-liveice/distinfo
deleted file mode 100644
index fd29d5a8879..00000000000
--- a/audio/xmms-liveice/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/12/11 20:29:12 joerg Exp $
-
-SHA1 (liveice-xmms.tar.gz) = a1986bbd7532cc3eb148bc98e0a3baca680b5d96
-RMD160 (liveice-xmms.tar.gz) = d2356bc0bd1ce7268cad9b603c8127de4bcb266e
-Size (liveice-xmms.tar.gz) = 132719 bytes
-SHA1 (patch-aa) = c6dc0b3d423b3f8cbbb3174867a1e037ca9f34d8
-SHA1 (patch-ab) = 2ff694005c49f69ea47fce4a3a30df59ccc961b6
-SHA1 (patch-ac) = 5805b66113494c5f6bab194055662c05d98bbd54
diff --git a/audio/xmms-liveice/patches/patch-aa b/audio/xmms-liveice/patches/patch-aa
deleted file mode 100644
index 0d5a1cfea3a..00000000000
--- a/audio/xmms-liveice/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/12/11 20:29:12 joerg Exp $
-
---- src/liveice.c.orig 2000-05-14 19:42:20.000000000 +0000
-+++ src/liveice.c
-@@ -27,8 +27,6 @@
-
-
-
--extern int errno;
--
- static sckt *liveice_sp=NULL;
-
- static gboolean config_read = FALSE;
-@@ -167,7 +165,7 @@ static void init(void)
- if(!xmms_cfg_read_string(cfg, "LiveIce", "description", &lv_conf.description))
- lv_conf.description=g_strdup("Music from XMMS");
- if(!xmms_cfg_read_string(cfg, "LiveIce", "encoder_path", &lv_conf.encoder_path))
-- lv_conf.encoder_path=g_strdup("lame");
-+ lv_conf.encoder_path=g_strdup(LAME);
-
- if(!xmms_cfg_read_string(cfg, "LiveIce", "remote_dumpfile", &lv_conf.remote_dumpfile))
- lv_conf.encoder_path=g_strdup("liveice_xmms.mp3");
-@@ -182,7 +180,7 @@ static void init(void)
- lv_conf.genre=g_strdup("live");
- lv_conf.url=g_strdup("http://www.icecast.org");
- lv_conf.description=g_strdup("Music from XMMS");
-- lv_conf.encoder_path=g_strdup("lame");
-+ lv_conf.encoder_path=g_strdup(LAME);
- lv_conf.remote_dumpfile=g_strdup("liveice_xmms.mp3");
- }
- g_free(filename);
diff --git a/audio/xmms-liveice/patches/patch-ab b/audio/xmms-liveice/patches/patch-ab
deleted file mode 100644
index 3ec026a6297..00000000000
--- a/audio/xmms-liveice/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/12/11 20:29:12 joerg Exp $
-
---- src/serverlib.c.orig 2005-12-11 20:21:28.000000000 +0000
-+++ src/serverlib.c
-@@ -12,8 +12,6 @@
-
-
-
--extern int errno;
--
-
-
- /* Create a new socket which can be bound to a socket later */
diff --git a/audio/xmms-liveice/patches/patch-ac b/audio/xmms-liveice/patches/patch-ac
deleted file mode 100644
index 9e7ea597ecb..00000000000
--- a/audio/xmms-liveice/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/12/11 20:29:12 joerg Exp $
-
---- src/serverlib.h.orig 2005-12-11 20:21:44.000000000 +0000
-+++ src/serverlib.h
-@@ -18,7 +18,7 @@
- *
- */
-
--
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netdb.h>
- #include <netinet/in.h>
diff --git a/audio/xmms-mac/DESCR b/audio/xmms-mac/DESCR
deleted file mode 100644
index f22edb3ab38..00000000000
--- a/audio/xmms-mac/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-xmms-mac: Monkey's Audio Codec plugin for XMMS!
diff --git a/audio/xmms-mac/Makefile b/audio/xmms-mac/Makefile
deleted file mode 100644
index 41e6d27493e..00000000000
--- a/audio/xmms-mac/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2007/02/23 15:56:22 joerg Exp $
-#
-
-DISTNAME= xmms-mac-0.3.1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mac-port/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://sourceforge.net/projects/mac-port/
-COMMENT= XMMS plugin for Monkey's Audio files
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_LANGUAGES= c c++
-
-# needs a bugfix to compile
-BUILDLINK_API_DEPENDS.xmms+= xmms>=1.2.10nb7
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../audio/mac/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-mac/PLIST b/audio/xmms-mac/PLIST
deleted file mode 100644
index cb73a1ee609..00000000000
--- a/audio/xmms-mac/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/02/09 21:21:34 drochner Exp $
-lib/xmms/Input/libxmms-mac.la
diff --git a/audio/xmms-mac/distinfo b/audio/xmms-mac/distinfo
deleted file mode 100644
index 18ff75fb5af..00000000000
--- a/audio/xmms-mac/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/02/09 21:21:34 drochner Exp $
-
-SHA1 (xmms-mac-0.3.1.tar.gz) = 68a75ca93d76fa7deffceac4994b3c2c54518159
-RMD160 (xmms-mac-0.3.1.tar.gz) = a7b22cdf0a8196480016f02314a0f60dfcab9984
-Size (xmms-mac-0.3.1.tar.gz) = 299783 bytes
diff --git a/audio/xmms-mad/DESCR b/audio/xmms-mad/DESCR
deleted file mode 100644
index 18b4fea95a0..00000000000
--- a/audio/xmms-mad/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-xmms-mad is an input plugin for xmms that uses libmad to decode MPEG
-layer 1/2/3 file and streams. Current featured include:
- local mp3 file playback
- shoutchast/icecast stream playback
- seeking
- ID3 tag parsing
- http header parsing
diff --git a/audio/xmms-mad/Makefile b/audio/xmms-mad/Makefile
deleted file mode 100644
index b4df3c8254a..00000000000
--- a/audio/xmms-mad/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.23 2006/08/07 23:46:23 wiz Exp $
-#
-
-DISTNAME= xmms-mad-0.5.7
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmms-mad/}
-
-MAINTAINER= jmcneill@NetBSD.org
-HOMEPAGE= http://sourceforge.net/projects/xmms-mad/
-COMMENT= Input plugin for XMMS that uses libmad
-
-GNU_CONFIGURE= YES
-USE_TOOLS+= pkg-config
-
-CPPFLAGS.NetBSD+= -DHAVE_NANOSLEEP=1
-
-BUILDLINK_API_DEPENDS.libmad+= libmad>=0.15.0bnb1
-
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/xmms/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-mad/PLIST b/audio/xmms-mad/PLIST
deleted file mode 100644
index 329b02161de..00000000000
--- a/audio/xmms-mad/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:19 jlam Exp $
-lib/xmms/Input/libxmmsmad.la
diff --git a/audio/xmms-mad/distinfo b/audio/xmms-mad/distinfo
deleted file mode 100644
index 9a02e68a413..00000000000
--- a/audio/xmms-mad/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.7 2006/08/07 23:46:23 wiz Exp $
-
-SHA1 (xmms-mad-0.5.7.tar.gz) = b45d8d42069d1a550c85633649edfc59df6312da
-RMD160 (xmms-mad-0.5.7.tar.gz) = 1c51dc570ea3f8bd2c62cf93176673a2307170da
-Size (xmms-mad-0.5.7.tar.gz) = 303044 bytes
-SHA1 (patch-aa) = 425482b7e945e4c2770fd273eb640cbde0b4f705
-SHA1 (patch-ab) = 88f1b7af5e976d92d1a98251f876026d54cb3fc2
-SHA1 (patch-ac) = 01cc47abfbe60ac5718e71cfbd5fa6076ed7f527
diff --git a/audio/xmms-mad/patches/patch-aa b/audio/xmms-mad/patches/patch-aa
deleted file mode 100644
index a57b7401a38..00000000000
--- a/audio/xmms-mad/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/08/07 23:46:23 wiz Exp $
-
---- src/decoder.c.orig 2004-05-16 17:08:05.000000000 +0000
-+++ src/decoder.c
-@@ -274,6 +274,9 @@ decode (void *arg)
- /* main loop */
- do
- {
-+#ifdef _PTH_PTHREAD_H_
-+ sched_yield();
-+#endif
- if (info->stop)
- break;
- if (seek_skip)
-@@ -430,6 +433,8 @@ decode (void *arg)
- #endif /* DEBUG */
-
- mad_plugin.output->close_audio ();
-+ close (info->infile);
-+ info->infile = 0;
- info->stop = 1;
- pthread_exit (0);
- }
diff --git a/audio/xmms-mad/patches/patch-ab b/audio/xmms-mad/patches/patch-ab
deleted file mode 100644
index 4277ccaced4..00000000000
--- a/audio/xmms-mad/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2006/08/07 23:46:23 wiz Exp $
-
---- src/xmms-mad.c.orig 2004-05-16 16:54:38.000000000 +0000
-+++ src/xmms-mad.c
-@@ -144,6 +144,9 @@ xmmsmad_stop ()
- g_message ("waiting for thread");
- #endif /* DEBUG */
- pthread_join (*decode_thread, 0);
-+#ifdef _PTH_PTHREAD_H_
-+ sched_yield ();
-+#endif
- #ifdef DEBUG
- g_message ("thread done");
- #endif /* DEBUG */
-@@ -185,6 +188,9 @@ xmmsmad_play_file (char *url)
- g_free (decode_thread);
- decode_thread = 0;
- }
-+#ifdef _PTH_PTHREAD_H_
-+ sched_yield ();
-+#endif
- }
-
- static void
diff --git a/audio/xmms-mad/patches/patch-ac b/audio/xmms-mad/patches/patch-ac
deleted file mode 100644
index 752eb53f076..00000000000
--- a/audio/xmms-mad/patches/patch-ac
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/08/07 23:46:23 wiz Exp $
-
---- src/input.c.orig 2004-05-16 16:24:04.000000000 +0000
-+++ src/input.c
-@@ -28,6 +28,10 @@
- #include <sys/types.h>
- #endif /* HAVE_SYS_TYPES_H */
-
-+#ifdef HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif /* HAVE_SYS_SOCKET_H */
-@@ -451,6 +455,9 @@ input_read_tag (struct mad_info_t *info)
- if (title_input->genre) g_free (title_input->genre);
- if (title_input->comment) g_free (title_input->comment);
- g_free (title_input);
-+
-+ id3_file_close (info->id3file);
-+ info->id3file = NULL;
- }
-
- /**
diff --git a/audio/xmms-madspin/DESCR b/audio/xmms-madspin/DESCR
deleted file mode 100644
index 112cf4854dd..00000000000
--- a/audio/xmms-madspin/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-OpenGL XMMS plugin
diff --git a/audio/xmms-madspin/Makefile b/audio/xmms-madspin/Makefile
deleted file mode 100644
index fabdd5f1a60..00000000000
--- a/audio/xmms-madspin/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2007/01/11 11:51:12 joerg Exp $
-#
-
-DISTNAME= madspin-0.05
-PKGNAME= xmms-${DISTNAME}
-PKGREVISION= 5
-CATEGORIES= xmms audio
-MASTER_SITES= http://www.students.uiuc.edu/~birck/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.students.uiuc.edu/~birck/madspin.html
-COMMENT= Based on the madspin winamp plugin
-
-GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
-USE_LIBTOOL= YES
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/xmms/madspin
- ${INSTALL_DATA} ${WRKSRC}/star1.bmp ${PREFIX}/share/xmms/madspin
- ${INSTALL_DATA} ${WRKSRC}/star2.bmp ${PREFIX}/share/xmms/madspin
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-madspin/PLIST b/audio/xmms-madspin/PLIST
deleted file mode 100644
index 96ec59a5898..00000000000
--- a/audio/xmms-madspin/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:19 jlam Exp $
-lib/xmms/Visualization/libmadspin.la
-share/xmms/madspin/star1.bmp
-share/xmms/madspin/star2.bmp
-@dirrm share/xmms/madspin
diff --git a/audio/xmms-madspin/distinfo b/audio/xmms-madspin/distinfo
deleted file mode 100644
index afcab77bcba..00000000000
--- a/audio/xmms-madspin/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:55 agc Exp $
-
-SHA1 (madspin-0.05.tar.gz) = 4bddb3e77da8f28a17c2a9190c0a345c29159b42
-RMD160 (madspin-0.05.tar.gz) = 8613d81ea06d101a62eec46291c2c4204199d203
-Size (madspin-0.05.tar.gz) = 565244 bytes
-SHA1 (patch-aa) = 4cc8d55a32ff980376ca965d6e09d1a9ab928b7e
diff --git a/audio/xmms-madspin/patches/patch-aa b/audio/xmms-madspin/patches/patch-aa
deleted file mode 100644
index 878d3380828..00000000000
--- a/audio/xmms-madspin/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/03/12 02:05:30 snj Exp $
-
---- configure.orig 2004-03-11 17:43:15.000000000 -0800
-+++ configure 2004-03-11 17:44:01.000000000 -0800
-@@ -3750,13 +3750,6 @@ EOF
- chmod +x $CONFIG_STATUS
- rm -fr confdefs* $ac_clean_files
-
--echo ""
--echo "**** Putting star1.bmp and star2.bmp in $XMMS_VISUALIZATION_PLUGIN_DIR/madspin/ ****"
--echo ""
--
--mkdir -p $XMMS_DATA_DIR/madspin
--cp star1.bmp $XMMS_DATA_DIR/madspin/star1.bmp
--cp star2.bmp $XMMS_DATA_DIR/madspin/star2.bmp
-
- test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/audio/xmms-meta-input/DEINSTALL b/audio/xmms-meta-input/DEINSTALL
deleted file mode 100644
index 950873d7f15..00000000000
--- a/audio/xmms-meta-input/DEINSTALL
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.2 2006/06/19 23:16:33 jlam Exp $
-
-case "${STAGE}" in
-DEINSTALL)
- INPUT_MESA_SCRIPTDIR="${PKG_PREFIX}/lib/xmms/Input/Meta"
- ${RMDIR} -p ${INPUT_MESA_SCRIPTDIR} 2>/dev/null || ${TRUE}
- if ${TEST} -d ${INPUT_MESA_SCRIPTDIR}; then
- ${CAT} << EOF
-======================================================================
-The xmms-meta-input player scripts were not wiped out by this deletion
-process. If you don't want them around, then please remove the
-following directory:
-
- ${INPUT_MESA_SCRIPTDIR}
-======================================================================
-EOF
- fi
- ;;
-esac
diff --git a/audio/xmms-meta-input/DESCR b/audio/xmms-meta-input/DESCR
deleted file mode 100644
index 1f7e8c7048e..00000000000
--- a/audio/xmms-meta-input/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-This plugin allows you to write XMMS plugins as Unix programs. You write
-a program that understands the very simple commands on its command line
-and outputs raw sound on its standard output and you're done with it.
-
-What's good (and in fact the purpose of this plugin) is that you can
-write input plugins for XMMS in C shell or Bash! Of course, you won't
-be able to do much number crunching in a shell script, but you can use
-it to run other programs to do the actual playing.
diff --git a/audio/xmms-meta-input/MESSAGE b/audio/xmms-meta-input/MESSAGE
deleted file mode 100644
index 8e67823bc02..00000000000
--- a/audio/xmms-meta-input/MESSAGE
+++ /dev/null
@@ -1,8 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2004/03/12 02:55:49 snj Exp $
-
-You will need to configure xmms-meta-input by adding player scripts to
-${PREFIX}/lib/xmms/Input/Meta. Example player scripts may be found
-in ${PREFIX}/share/xmms-meta-input.
-
-===========================================================================
diff --git a/audio/xmms-meta-input/Makefile b/audio/xmms-meta-input/Makefile
deleted file mode 100644
index 5b6a6a2bcc9..00000000000
--- a/audio/xmms-meta-input/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2006/12/15 14:34:19 wiz Exp $
-#
-
-DISTNAME= xmms-meta-input-0.4
-PKGREVISION= 4
-CATEGORIES= audio
-MASTER_SITES= http://www.corbac.com/Data/Sources/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.corbac.com/page3.html
-COMMENT= XMMS plugin wrapper for shell scripts
-
-INSTALLATION_DIRS= lib/xmms/Input
-REQD_DIRS+= lib/xmms/Input/Meta
-
-USE_LIBTOOL= yes
-
-do-install:
- ${LIBTOOL} --mode=install ${INSTALL_DATA} \
- ${WRKSRC}/libmetainput.la ${PREFIX}/lib/xmms/Input
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/xmms/Input/Meta
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xmms-input
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xmms-input
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xmms-meta-input
- cd ${WRKSRC}/Examples && ${INSTALL_SCRIPT} dsp_input esound_link midi \
- modules mp3 spc vorbis ${PREFIX}/share/examples/xmms-meta-input
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-meta-input/PLIST b/audio/xmms-meta-input/PLIST
deleted file mode 100644
index cdb82f8c1f7..00000000000
--- a/audio/xmms-meta-input/PLIST
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2006/08/29 05:35:27 ben Exp $
-lib/xmms/Input/libmetainput.la
-share/doc/xmms-input/README
-share/examples/xmms-meta-input/dsp_input
-share/examples/xmms-meta-input/esound_link
-share/examples/xmms-meta-input/midi
-share/examples/xmms-meta-input/modules
-share/examples/xmms-meta-input/mp3
-share/examples/xmms-meta-input/spc
-share/examples/xmms-meta-input/vorbis
-@dirrm share/examples/xmms-meta-input
-@dirrm share/doc/xmms-input
-@comment in xmms: @dirrm lib/xmms/Input
diff --git a/audio/xmms-meta-input/buildlink3.mk b/audio/xmms-meta-input/buildlink3.mk
deleted file mode 100644
index 3128cecd78e..00000000000
--- a/audio/xmms-meta-input/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:38 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-XMMS_META_INPUT_BUILDLINK3_MK:= ${XMMS_META_INPUT_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= xmms-meta-input
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxmms-meta-input}
-BUILDLINK_PACKAGES+= xmms-meta-input
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xmms-meta-input
-
-.if !empty(XMMS_META_INPUT_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xmms-meta-input+= xmms-meta-input>=0.4
-BUILDLINK_ABI_DEPENDS.xmms-meta-input?= xmms-meta-input>=0.4nb2
-BUILDLINK_PKGSRCDIR.xmms-meta-input?= ../../audio/xmms-meta-input
-.endif # XMMS_META_INPUT_BUILDLINK3_MK
-
-.include "../../audio/xmms/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/xmms-meta-input/distinfo b/audio/xmms-meta-input/distinfo
deleted file mode 100644
index 2b4a036ac3e..00000000000
--- a/audio/xmms-meta-input/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/08/29 05:35:27 ben Exp $
-
-SHA1 (xmms-meta-input-0.4.tar.gz) = 46d3644ca51b21b6756b305068aeb54125c44768
-RMD160 (xmms-meta-input-0.4.tar.gz) = bb4623cd28d8f0946a922b4bfa100855a913f8d3
-Size (xmms-meta-input-0.4.tar.gz) = 14653 bytes
-SHA1 (patch-aa) = 01cc72cb9f9efff119fddcb2aad0852133a190e1
-SHA1 (patch-ab) = b9b926d7be76a41139281ab7e52dbe8e60cb33ae
diff --git a/audio/xmms-meta-input/patches/patch-aa b/audio/xmms-meta-input/patches/patch-aa
deleted file mode 100644
index 9a59e4234bf..00000000000
--- a/audio/xmms-meta-input/patches/patch-aa
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/08/29 05:35:27 ben Exp $
-
---- Makefile.orig 2002-05-02 08:34:52.000000000 -0700
-+++ Makefile
-@@ -1,4 +1,4 @@
--CCOPT = -O6
-+CCOPT = #-O6
-
- # Global XMMS directory
- PLAYER_DIR = "\"`xmms-config --input-plugin-dir`/Meta\""
-@@ -11,10 +11,10 @@ PLUGIN_DIR = "`xmms-config --input-plugi
- all: libmetainput.so
-
- install: all
-- cp -f libmetainput.so ${PLUGIN_DIR}
-+ ${LIBTOOL} --mode=install cp libmetainput.la ${PLUGIN_DIR}
-
--libmetainput.so: meta-input.c
-- gcc ${CCOPT} -shared `xmms-config --cflags` `xmms-config --libs` -DPLAYER_DIR=${PLAYER_DIR} -o libmetainput.so meta-input.c
-+libmetainput.so: meta-input.lo
-+ ${LIBTOOL} --mode=link ${CC} `xmms-config --libs` -o libmetainput.la meta-input.lo -rpath ${PREFIX}/lib -module -avoid-version
- @echo
- @echo ======================================
- @echo "The meta-input players directory is:"
-@@ -24,5 +24,7 @@ libmetainput.so: meta-input.c
- @echo "recompile...)"
- @echo ======================================
- @echo
-+meta-input.lo: meta-input.c
-+ ${LIBTOOL} --mode=compile ${CC} ${CCOPT} `xmms-config --cflags` -DPLAYER_DIR=${PLAYER_DIR} -c meta-input.c
- clean:
- rm -f *.o libmetainput.so
diff --git a/audio/xmms-meta-input/patches/patch-ab b/audio/xmms-meta-input/patches/patch-ab
deleted file mode 100644
index 756b621f808..00000000000
--- a/audio/xmms-meta-input/patches/patch-ab
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/01/29 14:07:24 ben Exp $
-
---- meta-input.c.orig 2002-05-02 08:29:12.000000000 -0700
-+++ meta-input.c
-@@ -53,7 +53,7 @@ static int is_our_file (char *filename);
- static void *play_loop(void *arg);
- static void play (char *filename);
- static void stop (void);
--static void pause (short p);
-+static void do_pause (short p);
- static int get_time (void);
- static void get_song_info (char *filename, char **title_real, int *len_real);
- static void seek (int sec);
-@@ -75,7 +75,7 @@ InputPlugin meta_input_ip =
- NULL,
- play,
- stop,
-- pause,
-+ do_pause,
- seek,
- NULL,
- get_time,
-@@ -327,7 +327,7 @@ static void play (char *filename)
- if (ret == 0) // Child process
- {
- // Set group ID for easy killing of the player later...
-- setpgrp();
-+ setpgrp(0, getpid());
-
- close (filedes [0]);
- close (0);
-@@ -409,9 +409,10 @@ static void stop (void)
- }
- }
-
--static void pause (short p)
-+static void do_pause (short p)
- {
-- meta_input_ip.output->pause (p);
-+ /* for some reason this coredumps for me -Ben */
-+ /* meta_input_ip.output->pause (p); */
- }
-
- static int get_time (void)
-@@ -508,7 +509,7 @@ static char *magic_get (char *filename)
- if (! inited)
- {
- inited = 1;
-- ret = system ("file -i /dev/zero");
-+ ret = system ("file -i /dev/zero >/dev/null");
- if (ret == 0)
- {
- mime_supported = 1;
diff --git a/audio/xmms-meta-timidity/DESCR b/audio/xmms-meta-timidity/DESCR
deleted file mode 100644
index 4a356b77759..00000000000
--- a/audio/xmms-meta-timidity/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This is an input script for xmms-meta-input which allows xmms to play
-MIDI files using timidity.
diff --git a/audio/xmms-meta-timidity/Makefile b/audio/xmms-meta-timidity/Makefile
deleted file mode 100644
index 1833c0b74a2..00000000000
--- a/audio/xmms-meta-timidity/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2006/12/15 14:34:19 wiz Exp $
-#
-
-DISTNAME= xmms-meta-timidity-0.2
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= # empty
-DISTFILES= # empty
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= # empty
-COMMENT= XMMS meta input script for timidity
-
-DEPENDS+= timidity-[0-9]*:../../audio/timidity
-DEPENDS+= freepats-[0-9]*:../../audio/freepats
-DEPENDS+= xmms-meta-input-[0-9]*:../../audio/xmms-meta-input
-
-WRKSRC= ${WRKDIR}
-USE_LANGUAGES= # empty
-NO_CHECKSUM= yes
-INSTALLATION_DIRS= lib/xmms/Input/Meta
-
-do-build:
- ${SED} <${FILESDIR}/timidity.sh >${WRKSRC}/timidity.sh \
- -e "s,XXXPREFIXXXX,${PREFIX},g" \
- -e "s,XXXPKG_SYSCONFDIRXXX,${PKG_SYSCONFDIR},g"
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/timidity.sh ${PREFIX}/lib/xmms/Input/Meta
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-meta-timidity/PLIST b/audio/xmms-meta-timidity/PLIST
deleted file mode 100644
index b032ed5eb8d..00000000000
--- a/audio/xmms-meta-timidity/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/24 00:11:16 ben Exp $
-lib/xmms/Input/Meta/timidity.sh
diff --git a/audio/xmms-meta-timidity/files/timidity.sh b/audio/xmms-meta-timidity/files/timidity.sh
deleted file mode 100755
index 97a97db11a4..00000000000
--- a/audio/xmms-meta-timidity/files/timidity.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-play)
- if [ -f XXXPKG_SYSCONFDIRXXX/timidity/timidity.cfg ]
- then
- TIMIDITY_CFG=""
- else
- TIMIDITY_CFG="-L XXXPREFIXXXX/share/freepats -c timidity.cfg"
- fi
- XXXPREFIXXXX/bin/timidity $TIMIDITY_CFG -U -idq -Or -o - -s 44100 "$2"
- exit 0
- ;;
-isOurFile)
- file - <"$2" | grep -q MIDI
- if [ $? -eq 0 ]
- then
- exit 0
- else
- exit 1
- fi
- ;;
-esac
-exit 1
diff --git a/audio/xmms-modplug/DESCR b/audio/xmms-modplug/DESCR
deleted file mode 100644
index 55977c2fc72..00000000000
--- a/audio/xmms-modplug/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Modplug Plugin for XMMS v2.0
- Based on the ModPlug sound engine by Olivier Lapicque <olivierl@jps.net>
- XMMS plugin by Kenton Varda <temporal@gauge3d.org>
- Placed in the public domain in October, 2001
-
-Olivier Lapicque, author of Modplug, which is arguably the best quality
-MOD-playing software available, has placed his sound rendering code in the
-public domain. This plugin is based on that code.
diff --git a/audio/xmms-modplug/Makefile b/audio/xmms-modplug/Makefile
deleted file mode 100644
index 5f8bbaf5752..00000000000
--- a/audio/xmms-modplug/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2007/02/22 19:26:08 wiz Exp $
-#
-
-DISTNAME= modplugxmms-2.05
-PKGNAME= xmms-modplug-2.05
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=modplug-xmms/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://modplug-xmms.sourceforge.net/
-COMMENT= XMMS plugin based on modplug
-
-DEPENDS+= unzip-[0-9]*:../../archivers/unzip
-
-LDFLAGS+= -lm ${LIBOSSAUDIO}
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-SHLIBTOOL_OVERRIDE= libtool-disable-static
-USE_TOOLS+= pkg-config
-
-CFLAGS+= -DDEVICE_NAME="\"${DEVOSSSOUND}\""
-USE_LANGUAGES= c c++
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "Darwin"
-SUBST_CLASSES+= mpplay
-SUBST_MESSAGE.mpplay= Skipping modplugplay
-SUBST_STAGE.mpplay= pre-build
-SUBST_FILES.mpplay= Makefile
-SUBST_SED.mpplay= -e 's,^\(SUBDIRS = modplugxmms glade\) modplugplay,\1,'
-
-PLIST_SUBST+= NOTFOROSX="@comment "
-.else
-PLIST_SUBST+= NOTFOROSX=""
-.endif
-
-.include "../../audio/libmodplug/buildlink3.mk"
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-modplug/PLIST b/audio/xmms-modplug/PLIST
deleted file mode 100644
index 804c3eacf48..00000000000
--- a/audio/xmms-modplug/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2006/08/29 04:40:53 ben Exp $
-${NOTFOROSX}bin/modplugplay
-lib/xmms/Input/libmodplugxmms.la
diff --git a/audio/xmms-modplug/distinfo b/audio/xmms-modplug/distinfo
deleted file mode 100644
index bf4dad93f32..00000000000
--- a/audio/xmms-modplug/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/01/05 15:09:04 joerg Exp $
-
-SHA1 (modplugxmms-2.05.tar.gz) = ccb307fc7490a94aad2aadb5dac4e4e96aa7892f
-RMD160 (modplugxmms-2.05.tar.gz) = 16a754d4d7567b36f2786f6fc198c03703d7b686
-Size (modplugxmms-2.05.tar.gz) = 242595 bytes
-SHA1 (patch-aa) = bca48bf7fce079c365b83d52ce32f9f8c7095291
-SHA1 (patch-ab) = 751321d0686436c01e139952957f71c31e24ae04
-SHA1 (patch-ac) = 894ceefe4fe405b7ca5b3a5ec824b54de4b1f117
-SHA1 (patch-ad) = 55fcd439905303d3666bf2b8676e3aeeede7ea0f
-SHA1 (patch-ae) = 5f9ba3568d9c2cdad0305624e9eeb00594e97d83
diff --git a/audio/xmms-modplug/patches/patch-aa b/audio/xmms-modplug/patches/patch-aa
deleted file mode 100644
index 360b9421c26..00000000000
--- a/audio/xmms-modplug/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/01/05 15:09:04 joerg Exp $
-
---- modplugxmms/gui/main.cpp.orig 2006-01-05 14:51:18.000000000 +0000
-+++ modplugxmms/gui/main.cpp
-@@ -7,6 +7,8 @@
- # include <config.h>
- #endif
-
-+#include <stddef.h>
-+
- #include <gtk/gtk.h>
- #include <libintl.h>
-
diff --git a/audio/xmms-modplug/patches/patch-ab b/audio/xmms-modplug/patches/patch-ab
deleted file mode 100644
index d6558177eb0..00000000000
--- a/audio/xmms-modplug/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/01/05 15:09:04 joerg Exp $
-
---- modplugxmms/plugin.cpp.orig 2006-01-05 14:56:10.000000000 +0000
-+++ modplugxmms/plugin.cpp
-@@ -4,6 +4,8 @@
- * This source code is public domain.
- */
-
-+#include <stddef.h>
-+
- #include "plugin.h"
- #include <libmodplug/modplug.h>
- #include "gui/main.h"
diff --git a/audio/xmms-modplug/patches/patch-ac b/audio/xmms-modplug/patches/patch-ac
deleted file mode 100644
index 9111cdca7e7..00000000000
--- a/audio/xmms-modplug/patches/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2004/03/14 07:15:49 ben Exp $
-
---- modplugplay/modplugplay.c.orig Thu Oct 16 03:47:46 2003
-+++ modplugplay/modplugplay.c
-@@ -89,7 +89,9 @@ command line option handling
- #define VERSION "1.0"
-
- #define BUF_SIZE 4096
-+#ifndef DEVICE_NAME
- #define DEVICE_NAME "/dev/dsp"
-+#endif
-
- static struct termios stored_settings;
- int audio_fd, mixer_fd;
-@@ -288,7 +290,6 @@ int main(int argc, char* argv[])
- int songsplayed = 0;
-
- ModPlug_Settings settings;
-- ModPlug_GetSettings(&settings);
-
- int format;
- int channels = 2;
-@@ -317,6 +318,8 @@ int main(int argc, char* argv[])
- int surdly=0; // y
- int bas=0; // x
- int basrng=0; // c
-+
-+ ModPlug_GetSettings(&settings);
-
- if ((format = get_byteorder()) == -1) {
- return 1;
diff --git a/audio/xmms-modplug/patches/patch-ad b/audio/xmms-modplug/patches/patch-ad
deleted file mode 100644
index ff82a994f46..00000000000
--- a/audio/xmms-modplug/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/03/05 22:36:12 ben Exp $
-
---- modplugxmms/Makefile.in.orig 2003-10-15 20:30:45.000000000 -0700
-+++ modplugxmms/Makefile.in
-@@ -119,7 +119,7 @@ plugindir = @plugindir@
- lib_LTLIBRARIES = libmodplugxmms.la
-
- INCLUDES = $(LIBMODPLUG_CFLAGS) -I.. -I../../..
--libmodplugxmms_la_LDFLAGS = -module -avoid-version -lstdc++
-+libmodplugxmms_la_LDFLAGS = -module -avoid-version
- libmodplugxmms_la_SOURCES = plugin.cpp modplugxmms.cpp
- libmodplugxmms_la_LIBADD = ./archive/libarchive.la ./gui/libgui.la $(LIBMODPLUG_LIBS)
-
diff --git a/audio/xmms-modplug/patches/patch-ae b/audio/xmms-modplug/patches/patch-ae
deleted file mode 100644
index 09a8e5fc0b4..00000000000
--- a/audio/xmms-modplug/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/03/14 07:15:49 ben Exp $
-
---- modplugxmms/modplugxmms.h.orig Fri Oct 10 22:08:19 2003
-+++ modplugxmms/modplugxmms.h
-@@ -14,6 +14,7 @@
- #endif
-
- #include "plugin.h"
-+#include <pthread.h>
-
- using namespace std;
-
diff --git a/audio/xmms-musepack/DESCR b/audio/xmms-musepack/DESCR
deleted file mode 100644
index abb10448623..00000000000
--- a/audio/xmms-musepack/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-xmms-musepack is an audio input plugin for Musepack (mpc) files
-for the XMMS multimedia player. Andree Buschmann's (lossy)
-en-/decoder is a great improvement of lossy audio compression
-compared to MPEG-III.
diff --git a/audio/xmms-musepack/Makefile b/audio/xmms-musepack/Makefile
deleted file mode 100644
index 9d006a823e3..00000000000
--- a/audio/xmms-musepack/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2006/07/22 04:46:14 rillig Exp $
-#
-
-DISTNAME= xmms-musepack-1.1
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= http://musepack.imosnet.de/linux/plugins/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.musepack.net/
-COMMENT= XMMS plugin for musepack (mpc) files
-
-USE_LANGUAGES= c c++
-GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config
-
-.include "../../audio/libmusepack/buildlink3.mk"
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-musepack/PLIST b/audio/xmms-musepack/PLIST
deleted file mode 100644
index d180540c79c..00000000000
--- a/audio/xmms-musepack/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/12/04 20:35:09 wiz Exp $
-lib/xmms/Input/libmpc.la
-@comment in xmms: @dirrm lib/xmms/Input
diff --git a/audio/xmms-musepack/distinfo b/audio/xmms-musepack/distinfo
deleted file mode 100644
index 823e1f97b68..00000000000
--- a/audio/xmms-musepack/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:55 agc Exp $
-
-SHA1 (xmms-musepack-1.1.tar.bz2) = 450b296c72f6e6b402846826504ce7ea2a385519
-RMD160 (xmms-musepack-1.1.tar.bz2) = 116e036b12c58d4996e157ca8e7e292b5fcba382
-Size (xmms-musepack-1.1.tar.bz2) = 207369 bytes
diff --git a/audio/xmms-neato/DESCR b/audio/xmms-neato/DESCR
deleted file mode 100644
index 146f0c9c676..00000000000
--- a/audio/xmms-neato/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Russerll's Super-Neato-Box is a visual XMMS plugin.
diff --git a/audio/xmms-neato/Makefile b/audio/xmms-neato/Makefile
deleted file mode 100644
index 2ddc5bf7d74..00000000000
--- a/audio/xmms-neato/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2006/10/04 20:44:20 wiz Exp $
-#
-
-DISTNAME= neato
-PKGNAME= xmms-neato-20010818
-PKGREVISION= 5
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://web.archive.org/web/20021209022733/http://www.rpi.edu/~mullr/xmms/
-COMMENT= Circle effect XMMS plugin
-
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
-USE_LIBTOOL= yes
-
-GNU_CONFIGURE= YES
-
-post-extract:
- cd ${WRKSRC} ; \
- ${RM} mkinstalldirs ; \
- ${ECHO} "#!/bin/sh" >>mkinstalldirs ; \
- ${ECHO} 'exec ${MKDIR} "$$@"' >>mkinstalldirs ; \
- ${CHMOD} +x mkinstalldirs ; \
- ${RM} install-sh ; \
- ${ECHO} "#!/bin/sh" >>install-sh ; \
- ${ECHO} 'exec ${INSTALL} "$$@"' >>install-sh ; \
- ${CHMOD} +x install-sh ; \
- ${MAKE} distclean
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-neato/PLIST b/audio/xmms-neato/PLIST
deleted file mode 100644
index 51e1e68d9b5..00000000000
--- a/audio/xmms-neato/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:19 jlam Exp $
-lib/xmms/Visualization/neato.la
diff --git a/audio/xmms-neato/distinfo b/audio/xmms-neato/distinfo
deleted file mode 100644
index c484b8b6f9b..00000000000
--- a/audio/xmms-neato/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:55 agc Exp $
-
-SHA1 (neato.tar.gz) = 43bbbf0f87a24073924dd0f6b7c095c468cec867
-RMD160 (neato.tar.gz) = 5354449185c2948ff7a9009139164ab9ae614a82
-Size (neato.tar.gz) = 138206 bytes
-SHA1 (patch-aa) = e91166f84d265f36aa8a0690391dd228b823defa
diff --git a/audio/xmms-neato/patches/patch-aa b/audio/xmms-neato/patches/patch-aa
deleted file mode 100644
index 9cc68b7a213..00000000000
--- a/audio/xmms-neato/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2002/09/21 02:00:53 jlam Exp $
-
---- Makefile.in.orig Sat Dec 25 23:16:10 1999
-+++ Makefile.in
-@@ -75,7 +75,7 @@
- VERSION = @VERSION@
-
- lib_LTLIBRARIES = neato.la
--libdir = /usr/lib/xmms/Visualization
-+libdir = `xmms-config --visualization-plugin-dir`
-
- neato_la_LDFLAGS = -module -avoid-version
- LIBS = @GTK_LIBS@
diff --git a/audio/xmms-nebulus/DESCR b/audio/xmms-nebulus/DESCR
deleted file mode 100644
index 3af0972438d..00000000000
--- a/audio/xmms-nebulus/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-Nebulus is an OpenGL visual plugin for XMMS.
-It's based of several projects:
-
-- Face blur
-- Spectrum analyzer
-- Knot effect
-- Glthreads
-- Tunnel
-- Twist
-- Tentacles
-- Blob
-- Energy
diff --git a/audio/xmms-nebulus/Makefile b/audio/xmms-nebulus/Makefile
deleted file mode 100644
index d016791a31f..00000000000
--- a/audio/xmms-nebulus/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2006/06/12 16:28:05 wiz Exp $
-#
-
-DISTNAME= xmms-nebulus-0.6.0
-PKGREVISION= 5
-CATEGORIES= xmms audio
-MASTER_SITES= http://nebulus.tuxfamily.org/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://nebulus.tuxfamily.org/
-COMMENT= Xmms plugin that uses OpenGL
-
-USE_LIBTOOL= YES
-GNU_CONFIGURE= YES
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-nebulus/PLIST b/audio/xmms-nebulus/PLIST
deleted file mode 100644
index 3a0188af4c2..00000000000
--- a/audio/xmms-nebulus/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:19 jlam Exp $
-lib/xmms/Visualization/libnebulus.la
diff --git a/audio/xmms-nebulus/distinfo b/audio/xmms-nebulus/distinfo
deleted file mode 100644
index 853a16546e6..00000000000
--- a/audio/xmms-nebulus/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:55 agc Exp $
-
-SHA1 (xmms-nebulus-0.6.0.tar.bz2) = 8f156d3e36ee6e970d8fd2130a54ca74e34c6b6b
-RMD160 (xmms-nebulus-0.6.0.tar.bz2) = 5074a3bd905026a121aed3ca172913181301e810
-Size (xmms-nebulus-0.6.0.tar.bz2) = 437870 bytes
diff --git a/audio/xmms-osx/DESCR b/audio/xmms-osx/DESCR
deleted file mode 100644
index 5484743e067..00000000000
--- a/audio/xmms-osx/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-OSX Native Audio Output Plugin for XMMS
diff --git a/audio/xmms-osx/Makefile b/audio/xmms-osx/Makefile
deleted file mode 100644
index 8f844453e99..00000000000
--- a/audio/xmms-osx/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2006/12/15 14:34:19 wiz Exp $
-#
-
-DISTNAME= xmms_osx_plugin-1.0
-PKGNAME= xmms-osx-1.0
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dbmix/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://dbmix.sourceforge.net/
-COMMENT= XMMS plugin for OSX native audio output
-
-LDFLAGS+= -lm
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-SHLIBTOOL_OVERRIDE= libtool-disable-static
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-ONLY_FOR_PLATFORM= Darwin-*-*
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-osx/PLIST b/audio/xmms-osx/PLIST
deleted file mode 100644
index 8a4614351f6..00000000000
--- a/audio/xmms-osx/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/08/28 05:11:06 ben Exp $
-lib/xmms/Output/libOSX.la
diff --git a/audio/xmms-osx/distinfo b/audio/xmms-osx/distinfo
deleted file mode 100644
index c5d3a7cf21c..00000000000
--- a/audio/xmms-osx/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/08/28 05:11:06 ben Exp $
-
-SHA1 (xmms_osx_plugin-1.0.tar.gz) = 93ef4dcf8f6697c24a1924168a386c839c7df08f
-RMD160 (xmms_osx_plugin-1.0.tar.gz) = febb02b64cf9ac923aee08be443e17e647669354
-Size (xmms_osx_plugin-1.0.tar.gz) = 313050 bytes
-SHA1 (patch-aa) = 7e8119c6009cc555507528493c4a01f09c42d04b
diff --git a/audio/xmms-osx/patches/patch-aa b/audio/xmms-osx/patches/patch-aa
deleted file mode 100644
index f58dc5fd2e6..00000000000
--- a/audio/xmms-osx/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/08/28 05:11:06 ben Exp $
-
---- src/audio.c.orig 2004-06-13 15:43:04.000000000 -0700
-+++ src/audio.c
-@@ -257,7 +257,14 @@ gint osx_get_written_time(void)
- gint osx_get_output_time(void)
- {
- gint retval;
--
-+ // output.bps is updated several times per second, however
-+ // this function is called before output.bps is initalized,
-+ // causing a divide by zero floating point exception.
-+ // in this case, choose a sane default value. it will be
-+ // overwritten in a few microseconds, so the value is not
-+ // critical. --Ben
-+ if (output.bps == 0)
-+ output.bps = 384000;
- retval = output_time_offset + ((output_total * sample_size * 1000) / output.bps);
- retval = (int)((float)retval / user_pitch);
-
diff --git a/audio/xmms-paranormal/DESCR b/audio/xmms-paranormal/DESCR
deleted file mode 100644
index 697e0bcaefa..00000000000
--- a/audio/xmms-paranormal/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Paranormal is an extremely customizable (pseudo-programmable)
-visualization plugin for the X MultiMedia System, based (conceptually)
-on Winamp's AVS plugin. The goal of Paranormal is to be as flexible as
-possible by providing a number of 'actuators' that perform various
-tasks involved in generating an image. These actuators can then be
-combined to create a nearly unlimited number of effects. These
-combinations can be saved to a file to be brought back later or
-distributed to your friends.
diff --git a/audio/xmms-paranormal/Makefile b/audio/xmms-paranormal/Makefile
deleted file mode 100644
index 6fc5b429e6d..00000000000
--- a/audio/xmms-paranormal/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2006/06/12 16:28:05 wiz Exp $
-#
-
-DISTNAME= paranormal-0.2.0
-PKGNAME= xmms-paranormal-0.2.0
-PKGREVISION= 10
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=/paranormal/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://paranormal.sourceforge.net/
-COMMENT= Extremely customizable (pseudo-programmable) XMMS plugin
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1
-
-# Might be better in textproc/libxml2/buildlink.mk:
-CPPFLAGS+= -I${BUILDLINK_DIR}/include/libxml2
-CPPFLAGS+= -I${BUILDLINK_DIR}/include/libxml2/libxml
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-paranormal/PLIST b/audio/xmms-paranormal/PLIST
deleted file mode 100644
index 950c477bdcb..00000000000
--- a/audio/xmms-paranormal/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:19 jlam Exp $
-bin/paranormal
-bin/pndoc
-lib/xmms/Visualization/libparanormal.la
diff --git a/audio/xmms-paranormal/distinfo b/audio/xmms-paranormal/distinfo
deleted file mode 100644
index dc403c1ed74..00000000000
--- a/audio/xmms-paranormal/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/10/03 12:11:08 joerg Exp $
-
-SHA1 (paranormal-0.2.0.tar.gz) = d0770592b088f80bb4832afe9b391d72b7ce86f0
-RMD160 (paranormal-0.2.0.tar.gz) = f1d739e9d625fa58ac24da7bb7be6209304cc5e1
-Size (paranormal-0.2.0.tar.gz) = 150654 bytes
-SHA1 (patch-aa) = f7930ad6402dcb6b0fcc3f1d66ff18932b1a2c73
-SHA1 (patch-ab) = b80d551c456cc0c37c1aac73c86bad9ff25fbef3
diff --git a/audio/xmms-paranormal/patches/patch-aa b/audio/xmms-paranormal/patches/patch-aa
deleted file mode 100644
index ed2d4488184..00000000000
--- a/audio/xmms-paranormal/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/10/03 12:11:08 joerg Exp $
-
---- actuators.c.orig 2005-07-22 19:22:22.000000000 +0000
-+++ actuators.c
-@@ -3,6 +3,7 @@
- #endif
-
- #include <glib.h>
-+#include <string.h>
-
- #include "actuators.h"
- //#include "containers.h"
-@@ -45,6 +46,7 @@ copy_actuator (const struct pn_actuator
- sizeof (union actuator_option_val));
- break;
- case OPT_TYPE_STRING:
-+ break;
- }
- }
-
diff --git a/audio/xmms-paranormal/patches/patch-ab b/audio/xmms-paranormal/patches/patch-ab
deleted file mode 100644
index 222dbc01a35..00000000000
--- a/audio/xmms-paranormal/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/10/03 12:11:08 joerg Exp $
-
---- paranormal.c.orig 2005-07-22 19:23:22.000000000 +0000
-+++ paranormal.c
-@@ -8,6 +8,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <math.h>
-+#include <string.h>
-
- #include <SDL.h>
-
-@@ -168,6 +169,7 @@ pn_render (void)
- take_screenshot ();
- break;
- default:
-+ break;
- }
- break;
- case SDL_VIDEORESIZE:
diff --git a/audio/xmms-sid/DESCR b/audio/xmms-sid/DESCR
deleted file mode 100644
index d44289c7a69..00000000000
--- a/audio/xmms-sid/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-XMMS plugin for SID (Commodore 64) music
diff --git a/audio/xmms-sid/Makefile b/audio/xmms-sid/Makefile
deleted file mode 100644
index ea6e1e2e3d4..00000000000
--- a/audio/xmms-sid/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2006/09/03 00:56:28 wiz Exp $
-#
-
-DISTNAME= xmms-sid-0.7.4
-PKGREVISION= 4
-CATEGORIES= audio
-MASTER_SITES= http://www.tnsp.org/xs-files/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.tnsp.org/
-COMMENT= XMMS plugin for SID (Commodore 64) music
-
-GNU_CONFIGURE= YES
-USE_LANGUAGES= c c++
-USE_LIBTOOL= YES
-
-.include "../../audio/libsidplay/buildlink3.mk"
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-sid/PLIST b/audio/xmms-sid/PLIST
deleted file mode 100644
index 40c43620dac..00000000000
--- a/audio/xmms-sid/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:19 jlam Exp $
-lib/xmms/Input/libsid.la
diff --git a/audio/xmms-sid/distinfo b/audio/xmms-sid/distinfo
deleted file mode 100644
index be10c875dea..00000000000
--- a/audio/xmms-sid/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.8 2006/02/16 18:05:58 wiz Exp $
-
-SHA1 (xmms-sid-0.7.4.tar.gz) = 9ccf412e7c9759ae69ca78dee0895bdb724df9e8
-RMD160 (xmms-sid-0.7.4.tar.gz) = e359daf6fd3a7f3d9a40ae9ca8daa2c27ddb6f63
-Size (xmms-sid-0.7.4.tar.gz) = 226916 bytes
-SHA1 (patch-aa) = fb0558110b61f54eab42cd805f9ffb2cdfa2617a
-SHA1 (patch-ab) = 772dc1e50401516de9b5a6844dc7c93c2f1fbc2b
-SHA1 (patch-ac) = b8cea4e8bf7742dec63143f30141cb48ee946260
-SHA1 (patch-ad) = e67c0a99ece07ae5e28ac1b6d169eff61bcb2bf6
-SHA1 (patch-ae) = fae2c22765c1cdc8e6bf3b78b4016e9d6cbd0bb9
diff --git a/audio/xmms-sid/patches/patch-aa b/audio/xmms-sid/patches/patch-aa
deleted file mode 100644
index 2ad522d895a..00000000000
--- a/audio/xmms-sid/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/03/12 04:28:12 snj Exp $
-
---- src/Makefile.in.orig 2004-03-11 20:20:34.000000000 -0800
-+++ src/Makefile.in 2004-03-11 20:21:03.000000000 -0800
-@@ -104,8 +104,8 @@ lib_LTLIBRARIES = libsid.la
-
- # Generals
-
--CFLAGS = -O2 -W -Wall -I$(top_builddir) -I$(top_srcdir) -I$(includedir) -D_REENTRANT @GTK_CFLAGS@ @SIDPLAY_CFLAGS@ -lstdc++
--CXXFLAGS = $(CFLAGS)
-+CFLAGS += -I$(top_builddir) -I$(top_srcdir) -I$(includedir) -D_REENTRANT @GTK_CFLAGS@ @SIDPLAY_CFLAGS@
-+CXXFLAGS += $(CFLAGS)
- LIBS = -lsidplay
-
- libsid_la_LDFLAGS = -module -avoid-version
diff --git a/audio/xmms-sid/patches/patch-ab b/audio/xmms-sid/patches/patch-ab
deleted file mode 100644
index 942a40b3cb1..00000000000
--- a/audio/xmms-sid/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/01/05 14:46:46 joerg Exp $
-
---- src/xs_fileinfo.cc.orig 2001-11-18 12:51:25.000000000 +0000
-+++ src/xs_fileinfo.cc
-@@ -21,6 +21,7 @@
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#include <stddef.h>
-
- #include "xmms-sid.h"
- #include <gtk/gtk.h>
diff --git a/audio/xmms-sid/patches/patch-ac b/audio/xmms-sid/patches/patch-ac
deleted file mode 100644
index 4cae303613c..00000000000
--- a/audio/xmms-sid/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/01/05 14:46:46 joerg Exp $
-
---- src/xmms-sid.cc.orig 2006-01-05 14:28:57.000000000 +0000
-+++ src/xmms-sid.cc
-@@ -21,6 +21,8 @@
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#include <stddef.h>
-+
- #include "xmms-sid.h"
- #include <sidplay/player.h>
- #include <sidplay/myendian.h>
-@@ -196,7 +198,7 @@ static void * xs_play_loop(void *arg)
- int fxlen, tn;
- struct sidTuneInfo sidInf;
- char *name;
-- enum AFormat fmt = (xs_emuConf.bitsPerSample == 16) ? FMT_S16_NE : FMT_U8;
-+ AFormat fmt = (xs_emuConf.bitsPerSample == 16) ? FMT_S16_NE : FMT_U8;
- gint chn = xs_emuConf.channels;
-
- tune->getInfo(sidInf);
diff --git a/audio/xmms-sid/patches/patch-ad b/audio/xmms-sid/patches/patch-ad
deleted file mode 100644
index d752f8b2f4e..00000000000
--- a/audio/xmms-sid/patches/patch-ad
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/02/16 18:05:58 wiz Exp $
-
---- configure.in.orig 2002-09-02 21:12:52.000000000 +0000
-+++ configure.in
-@@ -43,6 +43,36 @@ AM_PATH_GLIB(1.2.2,,AC_MSG_ERROR([*** GL
- AM_PATH_GTK(1.2.2,,AC_MSG_ERROR([*** Gtk+ >= 1.2.2 not found. You either don't have Gtk+ at all or your Gtk+ is too old. Latest Gtk+ can be found from Gtk+ homepages (http://www.gtk.org/)]), gthread)
-
-
-+PTHREAD_LIBS=error
-+AC_MSG_CHECKING(for old style FreeBSD -pthread flag)
-+AC_EGREP_CPP(yes,
-+[#if (defined(__FreeBSD_cc_version) && __FreeBSD_cc_version <= 500001) || defined(__OpenBSD__)
-+ yes
-+ #endif
-+ ], AC_MSG_RESULT(yes)
-+ CFLAGS="$CFLAGS -D_THREAD_SAFE" PTHREAD_LIBS="-pthread",
-+ AC_MSG_RESULT(no))
-+if test "x$PTHREAD_LIBS" = xerror; then
-+ AC_CHECK_LIB(pthread, pthread_attr_init,
-+ PTHREAD_LIBS="-lpthread")
-+fi
-+if test "x$PTHREAD_LIBS" = xerror; then
-+ AC_CHECK_LIB(pthreads, pthread_attr_init,
-+ PTHREAD_LIBS="-lpthreads")
-+fi
-+if test "x$PTHREAD_LIBS" = xerror; then
-+ AC_CHECK_LIB(c_r, pthread_attr_init,
-+ PTHREAD_LIBS="-lc_r")
-+fi
-+if test "x$PTHREAD_LIBS" = xerror; then
-+ AC_CHECK_FUNC(pthread_attr_init, PTHREAD_LIBS="")
-+fi
-+if test "x$PTHREAD_LIBS" = xerror; then
-+ AC_MSG_ERROR(*** Unable to locate working posix thread library ***)
-+fi
-+AC_SUBST(PTHREAD_LIBS)
-+
-+
- dnl ***
- dnl *** Song position patch check
- dnl ***
diff --git a/audio/xmms-sid/patches/patch-ae b/audio/xmms-sid/patches/patch-ae
deleted file mode 100644
index 7c8dccc262c..00000000000
--- a/audio/xmms-sid/patches/patch-ae
+++ /dev/null
@@ -1,225 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/02/16 18:05:58 wiz Exp $
-
---- configure.orig 2006-02-16 10:04:26.000000000 +0000
-+++ configure
-@@ -6892,8 +6841,212 @@ rm -f conftest*
-
-
-
-+PTHREAD_LIBS=error
-+echo $ac_n "checking for old style FreeBSD -pthread flag""... $ac_c" 1>&6
-+echo "configure:6847: checking for old style FreeBSD -pthread flag" >&5
-+cat > conftest.$ac_ext <<EOF
-+#line 6849 "configure"
-+#include "confdefs.h"
-+#if (defined(__FreeBSD_cc_version) && __FreeBSD_cc_version <= 500001) || defined(__OpenBSD__)
-+ yes
-+ #endif
-+
-+EOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ egrep "yes" >/dev/null 2>&1; then
-+ rm -rf conftest*
-+ echo "$ac_t""yes" 1>&6
-+ CFLAGS="$CFLAGS -D_THREAD_SAFE" PTHREAD_LIBS="-pthread"
-+else
-+ rm -rf conftest*
-+ echo "$ac_t""no" 1>&6
-+fi
-+rm -f conftest*
-+
-+if test "x$PTHREAD_LIBS" = xerror; then
-+ echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
-+echo "configure:6869: checking for pthread_attr_init in -lpthread" >&5
-+ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ ac_save_LIBS="$LIBS"
-+LIBS="-lpthread $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 6877 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char pthread_attr_init();
-+
-+int main() {
-+pthread_attr_init()
-+; return 0; }
-+EOF
-+if { (eval echo configure:6888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+ rm -rf conftest*
-+ eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+ echo "$ac_t""yes" 1>&6
-+ PTHREAD_LIBS="-lpthread"
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+fi
-+if test "x$PTHREAD_LIBS" = xerror; then
-+ echo $ac_n "checking for pthread_attr_init in -lpthreads""... $ac_c" 1>&6
-+echo "configure:6911: checking for pthread_attr_init in -lpthreads" >&5
-+ac_lib_var=`echo pthreads'_'pthread_attr_init | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ ac_save_LIBS="$LIBS"
-+LIBS="-lpthreads $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 6919 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char pthread_attr_init();
-+
-+int main() {
-+pthread_attr_init()
-+; return 0; }
-+EOF
-+if { (eval echo configure:6930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+ rm -rf conftest*
-+ eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+ echo "$ac_t""yes" 1>&6
-+ PTHREAD_LIBS="-lpthreads"
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+fi
-+if test "x$PTHREAD_LIBS" = xerror; then
-+ echo $ac_n "checking for pthread_attr_init in -lc_r""... $ac_c" 1>&6
-+echo "configure:6953: checking for pthread_attr_init in -lc_r" >&5
-+ac_lib_var=`echo c_r'_'pthread_attr_init | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ ac_save_LIBS="$LIBS"
-+LIBS="-lc_r $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 6961 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char pthread_attr_init();
-+
-+int main() {
-+pthread_attr_init()
-+; return 0; }
-+EOF
-+if { (eval echo configure:6972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+ rm -rf conftest*
-+ eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+ echo "$ac_t""yes" 1>&6
-+ PTHREAD_LIBS="-lc_r"
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+fi
-+if test "x$PTHREAD_LIBS" = xerror; then
-+ echo $ac_n "checking for pthread_attr_init""... $ac_c" 1>&6
-+echo "configure:6995: checking for pthread_attr_init" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_init'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ cat > conftest.$ac_ext <<EOF
-+#line 7000 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char pthread_attr_init(); below. */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char pthread_attr_init();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+ to always fail with ENOSYS. Some functions are actually named
-+ something starting with __ and the normal name is an alias. */
-+#if defined (__stub_pthread_attr_init) || defined (__stub___pthread_attr_init)
-+choke me
-+#else
-+pthread_attr_init();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:7023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+ rm -rf conftest*
-+ eval "ac_cv_func_pthread_attr_init=yes"
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ eval "ac_cv_func_pthread_attr_init=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'pthread_attr_init`\" = yes"; then
-+ echo "$ac_t""yes" 1>&6
-+ PTHREAD_LIBS=""
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+fi
-+if test "x$PTHREAD_LIBS" = xerror; then
-+ { echo "configure: error: *** Unable to locate working posix thread library ***" 1>&2; exit 1; }
-+fi
-+
-+
-+
- echo $ac_n "checking for song position patch""... $ac_c" 1>&6
- echo "configure:6897: checking for song position patch" >&5
- tmp_CPPFLAGS=$CPPFLAGS
- if test -d "$prefix" ;then
- CPPFLAGS="$CPPFLAGS -I${prefix}/include"
-@@ -7126,6 +7277,7 @@ s%@GLIB_LIBS@%$GLIB_LIBS%g
- s%@GTK_CONFIG@%$GTK_CONFIG%g
- s%@GTK_CFLAGS@%$GTK_CFLAGS%g
- s%@GTK_LIBS@%$GTK_LIBS%g
-+s%@PTHREAD_LIBS@%$PTHREAD_LIBS%g
-
- CEOF
- EOF
diff --git a/audio/xmms-synaesthesia/DESCR b/audio/xmms-synaesthesia/DESCR
deleted file mode 100644
index b513eb0aa7d..00000000000
--- a/audio/xmms-synaesthesia/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Port of Synaesthesia to an XMMS plugin
diff --git a/audio/xmms-synaesthesia/Makefile b/audio/xmms-synaesthesia/Makefile
deleted file mode 100644
index 42290061f70..00000000000
--- a/audio/xmms-synaesthesia/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2006/10/04 20:44:20 wiz Exp $
-#
-
-DISTNAME= synaesthesia-xmms-0.0.3-rc3
-PKGNAME= xmms-synaesthesia-0.0.3rc3
-PKGREVISION= 4
-CATEGORIES= audio xmms
-MASTER_SITES= http://zinx.xmms.org/xmms/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://zinx.xmms.org/xmms/
-COMMENT= Port of Synaesthesia to an XMMS plugin
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-
-CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-synaesthesia/PLIST b/audio/xmms-synaesthesia/PLIST
deleted file mode 100644
index 48ce00c4255..00000000000
--- a/audio/xmms-synaesthesia/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:19 jlam Exp $
-lib/xmms/Visualization/libsynaesthesia.la
diff --git a/audio/xmms-synaesthesia/distinfo b/audio/xmms-synaesthesia/distinfo
deleted file mode 100644
index 26a6d37352e..00000000000
--- a/audio/xmms-synaesthesia/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/10/03 12:12:12 joerg Exp $
-
-SHA1 (synaesthesia-xmms-0.0.3-rc3.tar.gz) = 7c60a4ac9cc069e0f1fecf97d34b4f48a7b77c5c
-RMD160 (synaesthesia-xmms-0.0.3-rc3.tar.gz) = 89150fd577e7639fb9878ce6d11ffdf50f1bdebb
-Size (synaesthesia-xmms-0.0.3-rc3.tar.gz) = 152116 bytes
-SHA1 (patch-aa) = 4eec587086f03253ecb292db82ac1f3fa319838b
diff --git a/audio/xmms-synaesthesia/patches/patch-aa b/audio/xmms-synaesthesia/patches/patch-aa
deleted file mode 100644
index fc5b57ff296..00000000000
--- a/audio/xmms-synaesthesia/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/10/03 12:12:12 joerg Exp $
-
---- syna_xmms.c.orig 2005-07-22 19:19:18.000000000 +0000
-+++ syna_xmms.c
-@@ -19,6 +19,7 @@
- #include <gtk/gtk.h>
- #include <gdk/gdkkeysyms.h>
- #include <pthread.h>
-+#include <string.h>
- #include "math.h"
- #include <xmms/plugin.h>
- #include <xmms/util.h>
-@@ -285,6 +286,7 @@ void synx_menu_cb(gpointer cb_data, guin
- synx_fullscreen_toggle();
- break;
- default:
-+ break;
- /* ugh */
- }
- }
diff --git a/audio/xmms-tv-scope/DESCR b/audio/xmms-tv-scope/DESCR
deleted file mode 100644
index 623358e4e49..00000000000
--- a/audio/xmms-tv-scope/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Moving light embossing oscilloscope.
diff --git a/audio/xmms-tv-scope/Makefile b/audio/xmms-tv-scope/Makefile
deleted file mode 100644
index 12160002ed7..00000000000
--- a/audio/xmms-tv-scope/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.22 2006/10/04 20:44:20 wiz Exp $
-#
-
-DISTNAME= tv_scope-0.0.2
-PKGNAME= xmms-tv-scope-0.0.2
-PKGREVISION= 8
-CATEGORIES= xmms audio
-MASTER_SITES= http://zinx.xmms.org/xmms/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://zinx.xmms.org/xmms/
-COMMENT= 3D Representation of a waveform
-
-USE_LIBTOOL= YES
-GNU_CONFIGURE= YES
-
-ONLY_FOR_PLATFORM= SunOS-*-* Linux-*-* Darwin-*-*
-ONLY_FOR_PLATFORM+= NetBSD-1.6[N-Z]-* NetBSD-1.6Z[A-Z]-*
-ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-*
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-tv-scope/PLIST b/audio/xmms-tv-scope/PLIST
deleted file mode 100644
index 4a7fdbd5c35..00000000000
--- a/audio/xmms-tv-scope/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:19 jlam Exp $
-lib/xmms/Visualization/tv_scope.la
diff --git a/audio/xmms-tv-scope/distinfo b/audio/xmms-tv-scope/distinfo
deleted file mode 100644
index bbecdfc7f92..00000000000
--- a/audio/xmms-tv-scope/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:56 agc Exp $
-
-SHA1 (tv_scope-0.0.2.tar.gz) = cdb825dd8d22140bad694a0721faa42f4f4d9af3
-RMD160 (tv_scope-0.0.2.tar.gz) = 8e2c0bab35601b753bc3219a1f7c952481bee73b
-Size (tv_scope-0.0.2.tar.gz) = 123721 bytes
diff --git a/audio/xmms-vismsa/DESCR b/audio/xmms-vismsa/DESCR
deleted file mode 100644
index b53649c4e2e..00000000000
--- a/audio/xmms-vismsa/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-visual XMMS plugin similar to the Spectrum Analyser from Open Cubic Player
diff --git a/audio/xmms-vismsa/Makefile b/audio/xmms-vismsa/Makefile
deleted file mode 100644
index 41e94e1e43e..00000000000
--- a/audio/xmms-vismsa/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:29:00 jlam Exp $
-#
-
-DISTNAME= vismsa-xmms-plugin-0.2
-PKGNAME= xmms-vismsa-0.2
-PKGREVISION= 4
-CATEGORIES= audio
-MASTER_SITES= http://a.godau.org/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://a.godau.org/
-COMMENT= Vis plugin similar to the Spectrum Analyser from Open Cubic Player
-
-USE_LIBTOOL= YES
-
-pre-build:
- cd ${WRKSRC} ; ${MAKE} clean
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-vismsa/PLIST b/audio/xmms-vismsa/PLIST
deleted file mode 100644
index bfdb18f710d..00000000000
--- a/audio/xmms-vismsa/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:19 jlam Exp $
-lib/xmms/Visualization/libvismsa.la
diff --git a/audio/xmms-vismsa/distinfo b/audio/xmms-vismsa/distinfo
deleted file mode 100644
index 0d31c435d7c..00000000000
--- a/audio/xmms-vismsa/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 20:39:56 agc Exp $
-
-SHA1 (vismsa-xmms-plugin-0.2.tar.gz) = c3e44f2097e6f0c6ed1b41fa652e41650f0722ee
-RMD160 (vismsa-xmms-plugin-0.2.tar.gz) = 052f7f60cfb3d8bbf0236df56d2ddf86ed1f3b47
-Size (vismsa-xmms-plugin-0.2.tar.gz) = 13694 bytes
-SHA1 (patch-aa) = 69221322c242ee59e38c7f304aaf0eb89d208c51
diff --git a/audio/xmms-vismsa/patches/patch-aa b/audio/xmms-vismsa/patches/patch-aa
deleted file mode 100644
index 495881edc19..00000000000
--- a/audio/xmms-vismsa/patches/patch-aa
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2002/09/21 02:09:36 jlam Exp $
-
---- Makefile.orig Fri Mar 23 14:36:18 2001
-+++ Makefile
-@@ -1,31 +1,34 @@
- # Change paths & OPT if necessary
-
--CC = gcc
--OPT = -m486 -O2
-+#CC = gcc
-+#OPT = -m486 -O2
- #OPT = -mpentium -O6
- #OPT = -mcpu=k6 -march=k6 -O6
--CFLAGS = $(OPT) -Wall -fPIC `gtk-config --cflags gthread`
--LFLAGS = -shared -fPIC -L/usr/local/lib
--OBJ = vismsa.o
-+CFLAGS+= $(OPT) -Wall -fPIC `gtk-config --cflags gthread`
-+#LFLAGS = -shared -fPIC -L/usr/local/lib
-+OBJ = vismsa.lo
- INSTALL-DIR=`xmms-config --visualization-plugin-dir`
- XMMS_DATADIR=`xmms-config --data-dir`
- #INSTALL-DIR=$(HOME)/.xmms/Plugins
- #XMMS_DATADIR=$(HOME)/.xmms
- #XMMS_DATADIR_FLAGS=-DTHEMEDIR=\"$(XMMS_DATADIR)/$(THEME_SUBDIR)/\"
-
--all: libvismsa.so
-+all: libvismsa.la
-
--libvismsa.so: $(OBJ)
-- $(CC) -o libvismsa.so $(OBJ) $(LFLAGS)
-+.SUFFIXES: .lo .c
-
--.c.o:
-- $(CC) $(CFLAGS) $(XMMS_DATADIR_FLAGS) -c $<
-+libvismsa.la: $(OBJ)
-+ ${LIBTOOL} $(CC) -o libvismsa.la -module -avoid-version $(OBJ) $(LFLAGS) -rpath ${INSTALL-DIR}
-+
-+.c.lo:
-+ ${LIBTOOL} $(CC) $(CFLAGS) $(XMMS_DATADIR_FLAGS) -c $<
-
- clean:
-- rm -f *.o core *.so*
-+ rm -f *.o core *.so* *.la *.so
-+ rm -fr .libs
-
- distclean:
- rm -f *.o core *~
-
- install:
-- install libvismsa.so $(INSTALL-DIR)
-+ ${LIBTOOL} ${INSTALL} libvismsa.la $(INSTALL-DIR)
diff --git a/audio/xmms-wma/DESCR b/audio/xmms-wma/DESCR
deleted file mode 100644
index bc3653e605e..00000000000
--- a/audio/xmms-wma/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-XMMS input plugin to play WMA files.
diff --git a/audio/xmms-wma/Makefile b/audio/xmms-wma/Makefile
deleted file mode 100644
index 7165b3a3293..00000000000
--- a/audio/xmms-wma/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2006/03/04 21:29:00 jlam Exp $
-#
-
-DISTNAME= xmms-wma-1.0.4
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= http://mcmcc.bat.ru/xmms-wma/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://mcmcc.bat.ru/xmms-wma/
-COMMENT= WMA input plugin for XMMS
-
-ONLY_FOR_PLATFORM= *-*-i386 # Doesn't seem to be very portable...
-
-USE_TOOLS+= gmake
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} != "Linux" # XXX
-SUBST_CLASSES+= rintf
-SUBST_STAGE.rintf= pre-configure
-SUBST_FILES.rintf= ffmpeg-strip-wma/wmadec.c
-SUBST_SED.rintf= -e "s,lrintf,rintf,g"
-.endif
-
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-wma/PLIST b/audio/xmms-wma/PLIST
deleted file mode 100644
index f1cfb50ba34..00000000000
--- a/audio/xmms-wma/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/03/01 01:17:00 xtraeme Exp $
-lib/xmms/Input/libwma.so
diff --git a/audio/xmms-wma/distinfo b/audio/xmms-wma/distinfo
deleted file mode 100644
index 5d03172ec85..00000000000
--- a/audio/xmms-wma/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/05/23 08:50:36 rillig Exp $
-
-SHA1 (xmms-wma-1.0.4.tar.bz2) = b7071c6fc17b22cb861f5071c97f72f876f271f9
-RMD160 (xmms-wma-1.0.4.tar.bz2) = bd79cf369a739000facc00f59d7a0d30dab6f5eb
-Size (xmms-wma-1.0.4.tar.bz2) = 145691 bytes
-SHA1 (patch-aa) = 20bc90e9267a56cb464c66e301939854b84c3869
-SHA1 (patch-ab) = feb6e8a14f515630901a83f6a2cb5d9a81fcf2d2
-SHA1 (patch-ac) = 93e1fd03a950fbd995d492bda07b28ce81e339f4
-SHA1 (patch-ad) = aee4ea1a154f71b2d4d1672bd8226ed76e0f909a
diff --git a/audio/xmms-wma/patches/patch-aa b/audio/xmms-wma/patches/patch-aa
deleted file mode 100644
index 169a1028e78..00000000000
--- a/audio/xmms-wma/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/03/14 16:29:02 rillig Exp $
-
---- xmms-wma.c.orig Wed Nov 24 00:12:22 2004
-+++ xmms-wma.c Sat Mar 12 00:03:04 2005
-@@ -19,9 +19,12 @@
- #ifndef __XMMS_WMA_C__
- #define __XMMS_WMA_C__
-
-+#ifdef HAVE_MALLOC_H
- #include <malloc.h>
-+#endif
-+
- #include <math.h>
--#include <stdbool.h>
-+#include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
- #include <pthread.h>
diff --git a/audio/xmms-wma/patches/patch-ab b/audio/xmms-wma/patches/patch-ab
deleted file mode 100644
index 4239a1af579..00000000000
--- a/audio/xmms-wma/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/03/01 01:17:00 xtraeme Exp $
-
---- ffmpeg-strip-wma/mem.c.orig 2005-03-01 01:58:20.000000000 +0100
-+++ ffmpeg-strip-wma/mem.c 2005-03-01 01:59:04.000000000 +0100
-@@ -32,6 +32,12 @@
- #ifdef HAVE_MALLOC_H
- #include <malloc.h>
- #endif
-+#include <stdlib.h>
-+#include <sys/param.h>
-+
-+#ifdef BSD
-+#undef HAVE_MEMALIGN
-+#endif
-
- /* you can redefine av_malloc and av_free in your project to use your
- memory allocator. You do not need to suppress this file because the
diff --git a/audio/xmms-wma/patches/patch-ac b/audio/xmms-wma/patches/patch-ac
deleted file mode 100644
index 79c07927937..00000000000
--- a/audio/xmms-wma/patches/patch-ac
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2005/05/23 08:50:36 rillig Exp $
-
---- ffmpeg-strip-wma/asf.c.orig Wed May 26 19:16:39 2004
-+++ ffmpeg-strip-wma/asf.c Sat Dec 11 21:32:58 2004
-@@ -16,10 +16,13 @@
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-+
-+#ifdef USE_ICONV
-+#include <iconv.h>
-+#endif
-+
- #include "avformat.h"
- #include "avi.h"
--//#include "mpegaudio.h"
--#include <iconv.h>
-
- #undef NDEBUG
- #include <assert.h>
-@@ -830,6 +833,7 @@
- return str;
- }
-
-+#ifdef USE_ICONV
- static void tag_recode(char *before, int len)
- {
- int result;
-@@ -859,6 +863,7 @@
- return;
- return;
- }
-+#endif
-
- static void get_str16_nolen(ByteIOContext *pb, int len, char *buf, int buf_size)
- {
-@@ -868,12 +873,17 @@
- q = buf;
- lenz = len;
- while (len > 0) {
-- c = get_byte(pb);
-- if ((q - buf) < buf_size-1)
-- *q++ = c;
-- len--;
-+ c = get_byte(pb);
-+ if ((q - buf) < buf_size - 1)
-+ *q++ = c;
-+ len--;
- }
-- tag_recode(buf, lenz);
-+
-+#ifdef USE_ICONV
-+ tag_recode(buf, lenz);
-+#else
-+ *q = '\0';
-+#endif
- }
-
- static int asf_probe(AVProbeData *pd)
diff --git a/audio/xmms-wma/patches/patch-ad b/audio/xmms-wma/patches/patch-ad
deleted file mode 100644
index e0da8752175..00000000000
--- a/audio/xmms-wma/patches/patch-ad
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2005/03/01 01:17:01 xtraeme Exp $
-
---- Makefile.orig 2005-03-01 02:09:43.000000000 +0100
-+++ Makefile 2005-03-01 02:10:42.000000000 +0100
-@@ -1,6 +1,6 @@
- .PHONY: all install install-home uninstall uninstall-home clean
-
--INSTALL_DIR := /usr/lib/xmms/Input
-+INSTALL_DIR := `xmms-config --input-plugin-dir`
- INSTALL_DIR_HOME := ~/.xmms/Plugins/Input
-
- export PLUGIN_FILE := libwma.so
-@@ -14,12 +14,9 @@
- @cd ffmpeg-strip-wma; make; cd ..
- @$(MAKE) --no-print-directory -f Makefile.inc
- @strip $(PLUGIN_FILE)
-- @echo "The plug-in has been compiled. Run one of the following:"
-- @echo "make install - for global (root) installation to $(INSTALL_DIR)"
-- @echo "make install-home - for installation to home directory $(INSTALL_DIR_HOME)"
-
- install: all
-- cp -f $(PLUGIN_FILE) $(INSTALL_DIR)
-+ $(BSD_INSTALL_LIB) $(PLUGIN_FILE) $(INSTALL_DIR)
- @echo "The plug-in has been installed."
- @echo "Enjoy!"
-
diff --git a/audio/xmms/DESCR b/audio/xmms/DESCR
deleted file mode 100644
index c19752a3e69..00000000000
--- a/audio/xmms/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-XMMS --- X Multimedia System. XMMS is a multimedia player based on
-the look of Winamp. Currently it plays mpeg layer 1/2/3, wav, au, and
-CD audio. Other formats are supported by different xmms plugins (e.g.
-xmms-mikmod).
diff --git a/audio/xmms/MESSAGE b/audio/xmms/MESSAGE
deleted file mode 100644
index 28d8d163904..00000000000
--- a/audio/xmms/MESSAGE
+++ /dev/null
@@ -1,16 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2003/02/06 15:33:30 wiz Exp $
-
-If you wish to use the Audio CD playback capability of XMMS, you need
-to configure XMMS in the following manner:
-
-1. Select "Options" -> "Preferences" (or press Control-P)
-2. Select "Audio I/O Plugins" tab
-3. Configure "CD Audio Player ... [libcdaudio.so]"
-4. Change "Device:" to the raw partition of your CD player (e.g., `/dev/cd0d').
-5. Change "Directory:" to an existing (empty) directory to be used within the
- XMMS file selection dialog boxes as the path to select tracks on audio CDs
- (e.g., `/cdrom/').
-6. Select "OK" to save the changes.
-
-===========================================================================
diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
deleted file mode 100644
index ed022afc07d..00000000000
--- a/audio/xmms/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.64 2007/02/01 16:55:58 drochner Exp $
-#
-
-PKGREVISION= 7
-
-.include "Makefile.common"
-
-CONFIGURE_ARGS+= --disable-esd
-
-.if ${OPSYS} == "Darwin"
-PLIST_SUBST+= CDAUDIO="@comment "
-_INSTALL_UNSTRIPPED= yes
-.else
-PLIST_SUBST+= CDAUDIO=""
-.endif
-
-BUILDLINK_DEPMETHOD.libXt?= build
-
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms/Makefile.common b/audio/xmms/Makefile.common
deleted file mode 100644
index f54ca37035d..00000000000
--- a/audio/xmms/Makefile.common
+++ /dev/null
@@ -1,80 +0,0 @@
-# $NetBSD: Makefile.common,v 1.26 2007/02/22 19:26:08 wiz Exp $
-#
-
-DISTNAME= xmms-1.2.10
-CATEGORIES= audio
-MASTER_SITES= http://www.xmms.org/files/1.2.x/ \
- ftp://ftp.sunet.se/pub/multimedia/xmms/1.2.x/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= rh@NetBSD.org
-HOMEPAGE= http://www.xmms.org/
-COMMENT= X Multimedia System - an audio player with a Winamp GUI
-
-USE_PKGLOCALEDIR= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake
-GNU_CONFIGURE= yes
-
-DISTINFO_FILE= ${.CURDIR}/../../audio/xmms/distinfo
-FILESDIR= ${.CURDIR}/../../audio/xmms/files
-PATCHDIR= ${.CURDIR}/../../audio/xmms/patches
-
-CONFIGURE_ARGS+= --without-gnome
-SHLIBTOOL_OVERRIDE= # empty
-
-# Broken configure script assumes that iconv_open lives in libc; work around.
-CPPFLAGS+= -DHAVE_ICONV_OPEN=1
-CONFIGURE_ENV+= ac_cv_func_iconv_open=yes
-LDFLAGS+= ${BUILDLINK_LDADD.iconv}
-
-PTHREAD_OPTS+= require
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.xmms
-PKG_SUPPORTED_OPTIONS= inet6
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --enable-ipv6
-.endif
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-RAWPART_cmd= /sbin/sysctl -n kern.rawpartition | ${TR} 0-9 a-j
-CONFIGURE_ARGS+= --with-dev-dsp=${DEVOSSSOUND:Q} \
- --with-cdda-device=/dev/rcd0${RAWPART_cmd:sh} \
- --with-cdda-dir=/cdrom/
-CPPFLAGS+= -DHAVE_NANOSLEEP=1
-
-post-patch:
-. if ${MACHINE_ARCH} == "i386"
-. if ${OBJECT_FMT} == "a.out"
- ${CP} ${FILESDIR}/decode_i586_.s ${WRKSRC}/Input/mpg123/decode_i586.s
-. endif
- cd ${WRKSRC}/Input/mpg123 && \
- ${MV} decode_i586.s decode_i586.s.orig && \
- ${SED} -e 's@^/@#/@g' <decode_i586.s.orig >decode_i586.s
-. endif
- ${RM} -f ${WRKSRC}/Output/OSS/soundcard.h
-.endif
-
-# the configure test for OSS is broken on Solaris and by default tries
-# to build the OSS module. explicitly turn it off for all platforms
-# except those which support OSS.
-.if ${OPSYS} != "FreeBSD" && ${OPSYS} != "Linux" && ${OPSYS} != "NetBSD" && \
- ${OPSYS} != "OpenBSD" && ${OPSYS} != "DragonFly"
-CONFIGURE_ARGS+= --disable-oss
-PLIST_SUBST+= OSS="@comment "
-.else
-PLIST_SUBST+= OSS=""
-.endif
-
-.include "../../audio/libmikmod/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
diff --git a/audio/xmms/PLIST.Linux b/audio/xmms/PLIST.Linux
deleted file mode 100644
index 44d59910089..00000000000
--- a/audio/xmms/PLIST.Linux
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.2 2004/09/22 08:09:18 jlam Exp $
-lib/xmms/General/libjoy.la
diff --git a/audio/xmms/PLIST.NetBSD b/audio/xmms/PLIST.NetBSD
deleted file mode 100644
index ef7ca683b6e..00000000000
--- a/audio/xmms/PLIST.NetBSD
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.2 2004/09/22 08:09:18 jlam Exp $
-lib/xmms/Output/libsun.la
diff --git a/audio/xmms/PLIST.OpenBSD b/audio/xmms/PLIST.OpenBSD
deleted file mode 100644
index 7c1426b6ffe..00000000000
--- a/audio/xmms/PLIST.OpenBSD
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.OpenBSD,v 1.2 2004/09/22 08:09:18 jlam Exp $
-lib/xmms/Output/libsun.la
diff --git a/audio/xmms/PLIST.SunOS b/audio/xmms/PLIST.SunOS
deleted file mode 100644
index c23c7064136..00000000000
--- a/audio/xmms/PLIST.SunOS
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.SunOS,v 1.1 2006/07/08 01:11:21 minskim Exp $
-lib/xmms/Output/libSolaris.la
diff --git a/audio/xmms/PLIST.common b/audio/xmms/PLIST.common
deleted file mode 100644
index a52d9bf98f6..00000000000
--- a/audio/xmms/PLIST.common
+++ /dev/null
@@ -1,92 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.7 2006/07/08 01:22:41 minskim Exp $
-bin/wmxmms
-bin/xmms
-bin/xmms-config
-include/xmms/configfile.h
-include/xmms/dirbrowser.h
-include/xmms/formatter.h
-include/xmms/fullscreen.h
-include/xmms/plugin.h
-include/xmms/titlestring.h
-include/xmms/util.h
-include/xmms/xmmsctrl.h
-lib/libxmms.la
-lib/xmms/Effect/libecho.la
-lib/xmms/Effect/libstereo.la
-lib/xmms/Effect/libvoice.la
-lib/xmms/General/libir.la
-lib/xmms/General/libsong_change.la
-${CDAUDIO}lib/xmms/Input/libcdaudio.la
-lib/xmms/Input/libmikmod.la
-lib/xmms/Input/libmpg123.la
-lib/xmms/Input/libtonegen.la
-lib/xmms/Input/libvorbis.la
-lib/xmms/Input/libwav.la
-${OSS}lib/xmms/Output/libOSS.la
-lib/xmms/Output/libdisk_writer.la
-lib/xmms/Visualization/libbscope.la
-lib/xmms/Visualization/libogl_spectrum.la
-lib/xmms/Visualization/libsanalyzer.la
-man/man1/wmxmms.1
-man/man1/xmms.1
-share/aclocal/xmms.m4
-share/locale/af/LC_MESSAGES/xmms.mo
-share/locale/az/LC_MESSAGES/xmms.mo
-share/locale/be/LC_MESSAGES/xmms.mo
-share/locale/bg/LC_MESSAGES/xmms.mo
-share/locale/bs/LC_MESSAGES/xmms.mo
-share/locale/ca/LC_MESSAGES/xmms.mo
-share/locale/cs/LC_MESSAGES/xmms.mo
-share/locale/cy/LC_MESSAGES/xmms.mo
-share/locale/da/LC_MESSAGES/xmms.mo
-share/locale/de/LC_MESSAGES/xmms.mo
-share/locale/el/LC_MESSAGES/xmms.mo
-share/locale/en/LC_MESSAGES/xmms.mo
-share/locale/eo/LC_MESSAGES/xmms.mo
-share/locale/es/LC_MESSAGES/xmms.mo
-share/locale/et/LC_MESSAGES/xmms.mo
-share/locale/eu/LC_MESSAGES/xmms.mo
-share/locale/fi/LC_MESSAGES/xmms.mo
-share/locale/fr/LC_MESSAGES/xmms.mo
-share/locale/ga/LC_MESSAGES/xmms.mo
-share/locale/gl/LC_MESSAGES/xmms.mo
-share/locale/hr/LC_MESSAGES/xmms.mo
-share/locale/hu/LC_MESSAGES/xmms.mo
-share/locale/id/LC_MESSAGES/xmms.mo
-share/locale/it/LC_MESSAGES/xmms.mo
-share/locale/ja/LC_MESSAGES/xmms.mo
-share/locale/ka/LC_MESSAGES/xmms.mo
-share/locale/ko/LC_MESSAGES/xmms.mo
-share/locale/lt/LC_MESSAGES/xmms.mo
-share/locale/lv/LC_MESSAGES/xmms.mo
-share/locale/mk/LC_MESSAGES/xmms.mo
-share/locale/ms/LC_MESSAGES/xmms.mo
-share/locale/nl/LC_MESSAGES/xmms.mo
-share/locale/nn/LC_MESSAGES/xmms.mo
-share/locale/no/LC_MESSAGES/xmms.mo
-share/locale/pl/LC_MESSAGES/xmms.mo
-share/locale/pt/LC_MESSAGES/xmms.mo
-share/locale/pt_BR/LC_MESSAGES/xmms.mo
-share/locale/ro/LC_MESSAGES/xmms.mo
-share/locale/ru/LC_MESSAGES/xmms.mo
-share/locale/sk/LC_MESSAGES/xmms.mo
-share/locale/sl/LC_MESSAGES/xmms.mo
-share/locale/sq/LC_MESSAGES/xmms.mo
-share/locale/sr/LC_MESSAGES/xmms.mo
-share/locale/sr@Latn/LC_MESSAGES/xmms.mo
-share/locale/sv/LC_MESSAGES/xmms.mo
-share/locale/tg/LC_MESSAGES/xmms.mo
-share/locale/th/LC_MESSAGES/xmms.mo
-share/locale/tr/LC_MESSAGES/xmms.mo
-share/locale/uk/LC_MESSAGES/xmms.mo
-share/locale/uz/LC_MESSAGES/xmms.mo
-share/locale/vi/LC_MESSAGES/xmms.mo
-share/locale/wa/LC_MESSAGES/xmms.mo
-share/locale/zh_CN/LC_MESSAGES/xmms.mo
-share/locale/zh_TW/LC_MESSAGES/xmms.mo
-share/xmms/wmxmms.xpm
-@dirrm share/xmms
-@dirrm lib/xmms/Visualization
-@dirrm lib/xmms/Input
-@dirrm lib/xmms/Effect
-@dirrm include/xmms
diff --git a/audio/xmms/PLIST.common_end b/audio/xmms/PLIST.common_end
deleted file mode 100644
index 4c26d17c6f1..00000000000
--- a/audio/xmms/PLIST.common_end
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST.common_end,v 1.2 2004/05/10 15:56:21 minskim Exp $
-@dirrm lib/xmms/Output
-@dirrm lib/xmms/General
-@dirrm lib/xmms
diff --git a/audio/xmms/buildlink3.mk b/audio/xmms/buildlink3.mk
deleted file mode 100644
index 1179f05cc39..00000000000
--- a/audio/xmms/buildlink3.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/16 23:03:20 seb Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-XMMS_BUILDLINK3_MK:= ${XMMS_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= xmms
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxmms}
-BUILDLINK_PACKAGES+= xmms
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xmms
-
-.if !empty(XMMS_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xmms+= xmms>=1.2.7nb10
-BUILDLINK_ABI_DEPENDS.xmms?= xmms>=1.2.10nb6
-BUILDLINK_PKGSRCDIR.xmms?= ../../audio/xmms
-.endif # XMMS_BUILDLINK3_MK
-
-PTHREAD_OPTS+= require
-
-.include "../../audio/libmikmod/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-
-.include "../../mk/pthread.buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/xmms/distinfo b/audio/xmms/distinfo
deleted file mode 100644
index a2d90a378bc..00000000000
--- a/audio/xmms/distinfo
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: distinfo,v 1.30 2007/03/08 15:01:50 rillig Exp $
-
-SHA1 (xmms-1.2.10.tar.bz2) = a3c3d3756d5263183c27b3c50a7f5404cba8bfaf
-RMD160 (xmms-1.2.10.tar.bz2) = 0360cbb8c326b3325bd8ebb3343c69a9788d7084
-Size (xmms-1.2.10.tar.bz2) = 2418265 bytes
-SHA1 (patch-aa) = 91b17156a2d0a48d8610552993357bf522aacbd0
-SHA1 (patch-ab) = 806b1e8e974fe1100be90eca1ce582b9d80f3ab2
-SHA1 (patch-ac) = 208d0f9ac537a042893db02130c14a8417808f9c
-SHA1 (patch-ad) = 4b1856f43c4cd92418046afa3f9c91f6d0900328
-SHA1 (patch-ae) = ee126d0744feea2e260a0080a6903ea49a0b12ec
-SHA1 (patch-af) = 9b97ab806c497533a0e4d116a072a5d7920a15a6
-SHA1 (patch-ag) = d03063c53d2b04c0d172a3e420c5cb0319e4ae59
-SHA1 (patch-ah) = a49b667b145380f501ebd932185014d4a957e287
-SHA1 (patch-ai) = c0bb82e63e6fb96327b1ee1e9ec5617fe9b55b44
-SHA1 (patch-aj) = 67a69e2a05f343a5d7c22b3f1f1cf0c25d9aeb6d
-SHA1 (patch-ak) = b49316325c6f778b0d3e85007b141699cf338238
-SHA1 (patch-al) = 1457ca7b5e4e1084623207d042a8ff349eb31aaa
-SHA1 (patch-am) = 6474ef355b194189345008e35a4efc9648c26397
-SHA1 (patch-an) = 3abc68bd37018800dc70b151a5b419211a727a02
-SHA1 (patch-ao) = 2cadee08e6db7b802d1b700559705a8fe591f2dd
-SHA1 (patch-ap) = 101c54e2ce0e575893b8d3880ca54a021e89a8dd
diff --git a/audio/xmms/files/decode_i586_.s b/audio/xmms/files/decode_i586_.s
deleted file mode 100644
index 1e9802085e0..00000000000
--- a/audio/xmms/files/decode_i586_.s
+++ /dev/null
@@ -1,320 +0,0 @@
-/
-/ synth_1to1 works the same way as the c version of this
-/ file. only two types of changes have been made:
-/ - reordered floating point instructions to
-/ prevent pipline stalls
-/ - made WRITE_SAMPLE use integer instead of
-/ (slower) floating point
-/ all kinds of x86 processors should benefit from these
-/ modifications.
-/
-/ useful sources of information on optimizing x86 code include:
-/
-/ Intel Architecture Optimization Manual
-/ http://www.intel.com/design/pentium/manuals/242816.htm
-/
-/ Cyrix 6x86 Instruction Set Summary
-/ ftp://ftp.cyrix.com/6x86/6x-dbch6.pdf
-/
-/ AMD-K5 Processor Software Development
-/ http://www.amd.com/products/cpg/techdocs/appnotes/20007e.pdf
-/
-/ Stefan Bieschewski <stb@acm.org>
-/
-/ $Id: decode_i586_.s,v 1.2 2005/05/31 21:47:48 rillig Exp $
-/
-.bss
- .comm buffs,4352
-.data
- .align 2
-bo:
- .long 1
-.text
- .align 3
-.LC0:
- .long 0x0,0x40dfffc0
- .align 3
-.LC1:
- .long 0x0,0xc0e00000
-.text
- .align 3
-.globl _mpg123_synth_1to1_pent
-_mpg123_synth_1to1_pent:
- subl $12,%esp
- pushl %ebp
- pushl %edi
- pushl %esi
- pushl %ebx
- movl 32(%esp),%eax
- movl 40(%esp),%esi
- xorl %edi,%edi
- movl bo,%ebp
- cmpl %edi,36(%esp)
- jne .L48
- decl %ebp
- andl $15,%ebp
- movl %ebp,bo
- movl $buffs,%ecx
- jmp .L49
-.L48:
- addl $2,%esi
- movl $buffs+2176,%ecx
-.L49:
- testl $1,%ebp
- je .L50
- movl %ecx,%ebx
- movl %ebp,16(%esp)
- pushl %eax
- movl 20(%esp),%edx
- leal (%ebx,%edx,4),%eax
- pushl %eax
- movl 24(%esp),%eax
- incl %eax
- andl $15,%eax
- leal 1088(,%eax,4),%eax
- addl %ebx,%eax
- jmp .L74
-.L50:
- leal 1088(%ecx),%ebx
- leal 1(%ebp),%edx
- movl %edx,16(%esp)
- pushl %eax
- leal 1092(%ecx,%ebp,4),%eax
- pushl %eax
- leal (%ecx,%ebp,4),%eax
-.L74:
- pushl %eax
- call _mpg123_dct64
- addl $12,%esp
- movl 16(%esp),%edx
- leal 0(,%edx,4),%edx
- movl $_mpg123_decwin+64,%eax
- movl %eax,%ecx
- subl %edx,%ecx
- movl $16,%ebp
-.L55:
- flds (%ecx)
- fmuls (%ebx)
- flds 4(%ecx)
- fmuls 4(%ebx)
- fxch %st(1)
- flds 8(%ecx)
- fmuls 8(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds 12(%ecx)
- fmuls 12(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 16(%ecx)
- fmuls 16(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds 20(%ecx)
- fmuls 20(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 24(%ecx)
- fmuls 24(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds 28(%ecx)
- fmuls 28(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 32(%ecx)
- fmuls 32(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds 36(%ecx)
- fmuls 36(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 40(%ecx)
- fmuls 40(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds 44(%ecx)
- fmuls 44(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 48(%ecx)
- fmuls 48(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds 52(%ecx)
- fmuls 52(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 56(%ecx)
- fmuls 56(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds 60(%ecx)
- fmuls 60(%ebx)
- fxch %st(2)
- subl $4,%esp
- faddp %st,%st(1)
- fxch %st(1)
- fsubrp %st,%st(1)
- fistpl (%esp)
- popl %eax
- cmpl $32767,%eax
- jg 1f
- cmpl $-32768,%eax
- jl 2f
- movw %ax,(%esi)
- jmp 4f
-1: movw $32767,(%esi)
- jmp 3f
-2: movw $-32768,(%esi)
-3: incl %edi
-4:
-.L54:
- addl $64,%ebx
- subl $-128,%ecx
- addl $4,%esi
- decl %ebp
- jnz .L55
- flds (%ecx)
- fmuls (%ebx)
- flds 8(%ecx)
- fmuls 8(%ebx)
- flds 16(%ecx)
- fmuls 16(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 24(%ecx)
- fmuls 24(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 32(%ecx)
- fmuls 32(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 40(%ecx)
- fmuls 40(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 48(%ecx)
- fmuls 48(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 56(%ecx)
- fmuls 56(%ebx)
- fxch %st(2)
- subl $4,%esp
- faddp %st,%st(1)
- fxch %st(1)
- faddp %st,%st(1)
- fistpl (%esp)
- popl %eax
- cmpl $32767,%eax
- jg 1f
- cmpl $-32768,%eax
- jl 2f
- movw %ax,(%esi)
- jmp 4f
-1: movw $32767,(%esi)
- jmp 3f
-2: movw $-32768,(%esi)
-3: incl %edi
-4:
-.L62:
- addl $-64,%ebx
- addl $4,%esi
- movl 16(%esp),%edx
- leal -128(%ecx,%edx,8),%ecx
- movl $15,%ebp
-.L68:
- flds -4(%ecx)
- fchs
- fmuls (%ebx)
- flds -8(%ecx)
- fmuls 4(%ebx)
- fxch %st(1)
- flds -12(%ecx)
- fmuls 8(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -16(%ecx)
- fmuls 12(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -20(%ecx)
- fmuls 16(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -24(%ecx)
- fmuls 20(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -28(%ecx)
- fmuls 24(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -32(%ecx)
- fmuls 28(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -36(%ecx)
- fmuls 32(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -40(%ecx)
- fmuls 36(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -44(%ecx)
- fmuls 40(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -48(%ecx)
- fmuls 44(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -52(%ecx)
- fmuls 48(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -56(%ecx)
- fmuls 52(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -60(%ecx)
- fmuls 56(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds (%ecx)
- fmuls 60(%ebx)
- fxch %st(2)
- subl $4,%esp
- fsubrp %st,%st(1)
- fxch %st(1)
- fsubrp %st,%st(1)
- fistpl (%esp)
- popl %eax
- cmpl $32767,%eax
- jg 1f
- cmpl $-32768,%eax
- jl 2f
- movw %ax,(%esi)
- jmp 4f
-1: movw $32767,(%esi)
- jmp 3f
-2: movw $-32768,(%esi)
-3: incl %edi
-4:
-.L67:
- addl $-64,%ebx
- addl $-128,%ecx
- addl $4,%esi
- decl %ebp
- jnz .L68
- movl %edi,%eax
- popl %ebx
- popl %esi
- popl %edi
- popl %ebp
- addl $12,%esp
- ret
diff --git a/audio/xmms/hacks.mk b/audio/xmms/hacks.mk
deleted file mode 100644
index 7c75d1f1f87..00000000000
--- a/audio/xmms/hacks.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2006/08/07 11:22:27 wiz Exp $
-
-.include "../../mk/compiler.mk"
-
-# gcc 4.x generates code that produces background noise during playback.
-# Disabling optimizations when using this compiler solves the problem.
-.if !empty(CC_VERSION:Mgcc-4*)
-CFLAGS+= -O0
-CXXFLAGS+= -O0
-.endif
diff --git a/audio/xmms/patches/patch-aa b/audio/xmms/patches/patch-aa
deleted file mode 100644
index 84edc31033b..00000000000
--- a/audio/xmms/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2005/09/06 08:10:57 abs Exp $
-
---- Input/cdaudio/cdaudio.c.orig 2004-05-06 17:52:36.000000000 +0200
-+++ Input/cdaudio/cdaudio.c 2004-05-06 17:54:45.000000000 +0200
-@@ -305,7 +305,11 @@
- FILE *mounts;
- struct mntent *mnt;
- #elif defined(HAVE_GETMNTINFO)
-+#if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */
-+ struct statvfs *fsp;
-+#else
- struct statfs *fsp;
-+#endif
- int entries;
- #endif
-
diff --git a/audio/xmms/patches/patch-ab b/audio/xmms/patches/patch-ab
deleted file mode 100644
index e3ab8c6dfcd..00000000000
--- a/audio/xmms/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2004/05/19 06:09:25 minskim Exp $
-
---- Output/OSS/OSS.h.orig 2004-05-12 21:21:08.000000000 +0200
-+++ Output/OSS/OSS.h 2004-05-12 21:21:26.000000000 +0200
-@@ -37,7 +37,7 @@
- #include <stdio.h>
- #include <string.h>
-
--#include "soundcard.h"
-+#include <sys/soundcard.h>
-
- #include "xmms/plugin.h"
- #include "libxmms/configfile.h"
diff --git a/audio/xmms/patches/patch-ac b/audio/xmms/patches/patch-ac
deleted file mode 100644
index a47468a93af..00000000000
--- a/audio/xmms/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2004/05/12 19:33:14 drochner Exp $
-
---- Output/OSS/Makefile.in.orig 2004-05-12 21:38:26.000000000 +0200
-+++ Output/OSS/Makefile.in 2004-05-12 21:40:23.000000000 +0200
-@@ -240,7 +240,7 @@
- lib_LTLIBRARIES = $(ossltlibs)
-
- libOSS_la_LDFLAGS = @PLUGIN_LDFLAGS@
--libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@
-+libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ ${LIBOSSAUDIO}
- libOSS_la_SOURCES = $(ossbuildsources)
- INCLUDES = @GTK_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir)
- subdir = Output/OSS
diff --git a/audio/xmms/patches/patch-ad b/audio/xmms/patches/patch-ad
deleted file mode 100644
index bac731827f9..00000000000
--- a/audio/xmms/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2004/05/19 06:09:25 minskim Exp $
-
---- Input/cdaudio/cdaudio.h.orig 2004-05-12 21:26:15.000000000 +0200
-+++ Input/cdaudio/cdaudio.h 2004-05-12 21:27:13.000000000 +0200
-@@ -39,7 +39,7 @@
- #include "cdinfo.h"
-
- #ifdef HAVE_OSS
--#include <Output/OSS/soundcard.h>
-+#include <sys/soundcard.h>
- #endif
-
- #ifdef HAVE_MNTENT_H
diff --git a/audio/xmms/patches/patch-ae b/audio/xmms/patches/patch-ae
deleted file mode 100644
index 4994b635155..00000000000
--- a/audio/xmms/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.8 2004/05/12 19:33:14 drochner Exp $
-
---- Input/cdaudio/Makefile.in.orig 2004-05-12 21:39:31.000000000 +0200
-+++ Input/cdaudio/Makefile.in 2004-05-12 21:40:22.000000000 +0200
-@@ -242,7 +242,7 @@
-
- INCLUDES = @GTK_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir)
- libcdaudio_la_LDFLAGS = @PLUGIN_LDFLAGS@
--libcdaudio_la_LIBADD = @GTK_LIBS@
-+libcdaudio_la_LIBADD = @GTK_LIBS@ ${LIBOSSAUDIO}
- libcdaudio_la_SOURCES = $(cdaudiobuildsources)
- subdir = Input/cdaudio
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/audio/xmms/patches/patch-af b/audio/xmms/patches/patch-af
deleted file mode 100644
index ad305a407ac..00000000000
--- a/audio/xmms/patches/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-af,v 1.6 2004/05/12 18:50:21 drochner Exp $
-
---- Output/sun/configure.c.orig 2004-05-12 22:33:27.000000000 +0200
-+++ Output/sun/configure.c 2004-05-12 22:34:11.000000000 +0200
-@@ -75,12 +75,12 @@
- xmms_cfg_write_default_file(cfgfile);
- xmms_cfg_free(cfgfile);
-
-- configure_win_destroy();
-+ gtk_widget_destroy(configure_win);
- }
-
- static void configure_win_cancel_cb(GtkWidget *w, gpointer data)
- {
-- configure_win_destroy();
-+ gtk_widget_destroy(configure_win);
- }
-
- static void mixer_cbutton_toggled_cb(GtkWidget *w, int id)
diff --git a/audio/xmms/patches/patch-ag b/audio/xmms/patches/patch-ag
deleted file mode 100644
index db2ba6a28be..00000000000
--- a/audio/xmms/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.5 2004/05/19 06:09:25 minskim Exp $
-
---- Output/esd/mixer.c.orig 2004-05-17 15:21:52.000000000 -0700
-+++ Output/esd/mixer.c 2004-05-17 15:21:58.000000000 -0700
-@@ -24,7 +24,7 @@
-
- #include <sys/ioctl.h>
- #ifdef HAVE_OSS
--# include <Output/OSS/soundcard.h>
-+# include <sys/soundcard.h>
- # define OSS_AVAILABLE TRUE
- #else
- # define OSS_AVAILABLE FALSE
diff --git a/audio/xmms/patches/patch-ah b/audio/xmms/patches/patch-ah
deleted file mode 100644
index e807429327f..00000000000
--- a/audio/xmms/patches/patch-ah
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ah,v 1.8 2004/11/18 06:25:11 grant Exp $
-
---- libxmms/xmmsctrl.c.orig 2004-02-24 07:31:42.000000000 +1100
-+++ libxmms/xmmsctrl.c
-@@ -382,6 +382,22 @@ void xmms_remote_play_pause(gint session
- remote_cmd(session, CMD_PLAY_PAUSE);
- }
-
-+void xmms_remote_main_volume_up(gint session)
-+{
-+ gint vol = xmms_remote_get_main_volume(session);
-+ vol += 5;
-+ xmms_remote_set_main_volume(session, vol);
-+}
-+
-+void xmms_remote_main_volume_down(gint session)
-+{
-+ gint vol = xmms_remote_get_main_volume(session);
-+ vol -= 5;
-+ if (vol < 0)
-+ vol = 0;
-+ xmms_remote_set_main_volume(session, vol);
-+}
-+
- gboolean xmms_remote_is_playing(gint session)
- {
- return remote_get_gboolean(session, CMD_IS_PLAYING);
diff --git a/audio/xmms/patches/patch-ai b/audio/xmms/patches/patch-ai
deleted file mode 100644
index 3e6f0387beb..00000000000
--- a/audio/xmms/patches/patch-ai
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ai,v 1.9 2004/11/18 06:25:11 grant Exp $
-
---- libxmms/xmmsctrl.h.orig 2003-06-12 04:44:17.000000000 +1000
-+++ libxmms/xmmsctrl.h
-@@ -83,6 +83,9 @@ void xmms_remote_quit(gint session);
- void xmms_remote_play_pause(gint session);
- void xmms_remote_playlist_ins_url_string(gint session, gchar * string, gint pos);
-
-+void xmms_remote_main_volume_up(gint session );
-+void xmms_remote_main_volume_down(gint session );
-+
-
- #ifdef __cplusplus
- };
diff --git a/audio/xmms/patches/patch-aj b/audio/xmms/patches/patch-aj
deleted file mode 100644
index 2ef5d12c2d5..00000000000
--- a/audio/xmms/patches/patch-aj
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2004/11/18 06:25:11 grant Exp $
-
---- xmms/main.c.orig 2004-02-24 07:31:43.000000000 +1100
-+++ xmms/main.c
-@@ -3212,6 +3212,8 @@ static struct option long_options[] =
- {"show-main-window", 0, NULL, 'm'},
- {"version", 0, NULL, 'v'},
- {"sm-client-id", 1, NULL, 'i'},
-+ {"vol-up", 0, NULL, 'l'},
-+ {"vol-down", 0, NULL, 'q'},
- {0, 0, 0, 0}
- };
-
-@@ -3263,7 +3265,7 @@ void display_usage(void)
- struct cmdlineopt {
- GList *filenames;
- int session;
-- gboolean play, stop, pause, fwd, rew, play_pause;
-+ gboolean play, stop, pause, fwd, rew, play_pause, louder, quieter;
- gboolean enqueue, mainwin, remote;
- char *previous_session_id;
- };
-@@ -3275,7 +3277,7 @@ void parse_cmd_line(int argc, char **arg
-
- memset(opt, 0, sizeof(struct cmdlineopt));
- opt->session = -1;
-- while ((c = getopt_long(argc, argv, "hn:rpusfemvt", long_options, NULL)) != -1)
-+ while ((c = getopt_long(argc, argv, "hn:rpusfemvtlq", long_options, NULL)) != -1)
- {
- switch (c)
- {
-@@ -3316,6 +3318,12 @@ void parse_cmd_line(int argc, char **arg
- case 'i':
- opt->previous_session_id = g_strdup(optarg);
- break;
-+ case 'l':
-+ opt->louder = TRUE;
-+ break;
-+ case 'q':
-+ opt->quieter = TRUE;
-+ break;
- }
- }
- for (i = optind; i < argc; i++)
-@@ -3380,6 +3388,10 @@ void handle_cmd_line_options(struct cmdl
- xmms_remote_play_pause(opt->session);
- if (opt->mainwin)
- xmms_remote_main_win_toggle(opt->session, TRUE);
-+ if (opt->louder)
-+ xmms_remote_main_volume_up(opt->session);
-+ if (opt->quieter)
-+ xmms_remote_main_volume_down(opt->session);
- }
-
- void segfault_handler(int sig)
diff --git a/audio/xmms/patches/patch-ak b/audio/xmms/patches/patch-ak
deleted file mode 100644
index 62e81f19d04..00000000000
--- a/audio/xmms/patches/patch-ak
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ak,v 1.7 2005/04/27 14:57:54 wiz Exp $
-
---- xmms.m4.orig 2000-01-27 21:30:35.000000000 +0100
-+++ xmms.m4
-@@ -14,7 +14,7 @@ dnl and XMMS_VERSION for your plugin ple
- dnl
-
- dnl XMMS_TEST_VERSION(AVAILABLE-VERSION, NEEDED-VERSION [, ACTION-IF-OKAY [, ACTION-IF-NOT-OKAY]])
--AC_DEFUN(XMMS_TEST_VERSION, [
-+AC_DEFUN([XMMS_TEST_VERSION], [
-
- # Determine which version number is greater. Prints 2 to stdout if
- # the second number is greater, 1 if the first number is greater,
-@@ -59,7 +59,7 @@ function vercmp(ver1, ver2, ver1arr,
- fi
- ])
-
--AC_DEFUN(AM_PATH_XMMS,
-+AC_DEFUN([AM_PATH_XMMS],
- [
- AC_ARG_WITH(xmms-prefix,[ --with-xmms-prefix=PFX Prefix where XMMS is installed (optional)],
- xmms_config_prefix="$withval", xmms_config_prefix="")
diff --git a/audio/xmms/patches/patch-al b/audio/xmms/patches/patch-al
deleted file mode 100644
index 81368384ef7..00000000000
--- a/audio/xmms/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.9 2006/03/03 03:45:23 minskim Exp $
-
---- General/ir/ir.h.orig 2001-03-05 05:17:44.000000000 -0800
-+++ General/ir/ir.h
-@@ -49,8 +49,6 @@ typedef struct
- }
- irConfig;
-
--extern pthread_t irapp_thread;
--extern gboolean keepGoing;
- extern irConfig ircfg;
- extern gboolean irconf_is_going;
-
diff --git a/audio/xmms/patches/patch-am b/audio/xmms/patches/patch-am
deleted file mode 100644
index 8182f87d86e..00000000000
--- a/audio/xmms/patches/patch-am
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-am,v 1.7 2007/03/08 15:01:50 rillig Exp $
-
---- configure.orig 2004-02-23 13:44:32.000000000 -0800
-+++ configure
-@@ -19078,13 +19078,6 @@ _ACEOF
-
- fi
- ;;
-- *-*-darwin*)
--
--cat >>confdefs.h <<\_ACEOF
--#define SYMBOL_PREFIX "_"
--_ACEOF
--
-- ;;
- *-hpux-*)
- ARCH_DEFINES="-DHPUX"
- ;;
-@@ -19099,7 +19092,7 @@ case "$host" in
- i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
- arch_type=ix86
- case "$host" in
-- *-*-netbsd* | *-*openbsd*)
-+ *-*-netbsd* | *-*openbsd* | *-*darwin*)
- ;;
- *)
- ARCH_DEFINES="-DI386_ASSEM"
diff --git a/audio/xmms/patches/patch-an b/audio/xmms/patches/patch-an
deleted file mode 100644
index 63bcf2c7c9f..00000000000
--- a/audio/xmms/patches/patch-an
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-an,v 1.7 2006/08/28 05:09:05 ben Exp $
-
---- libxmms/util.c.orig 2003-05-19 14:22:07.000000000 -0700
-+++ libxmms/util.c
-@@ -15,6 +15,13 @@
- #include <sys/sysctl.h>
- #endif
-
-+#if defined(__APPLE__) && defined(__MACH__)
-+#include <mach/mach.h>
-+#include <mach/thread_policy.h>
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#endif
-+
- #if TIME_WITH_SYS_TIME
- # include <sys/time.h>
- # include <time.h>
-@@ -73,6 +80,28 @@ GtkWidget *xmms_show_message(gchar * tit
-
- gboolean xmms_check_realtime_priority(void)
- {
-+#if defined(__APPLE__) && defined(__MACH__)
-+ struct thread_time_constraint_policy ttcpolicy;
-+ int bus_speed, mib [2] = { CTL_HW, HW_BUS_FREQ };
-+ size_t len;
-+
-+ len = sizeof (bus_speed);
-+ sysctl (mib, 2, &bus_speed, &len, NULL, 0);
-+
-+ /* Is it enough? */
-+ ttcpolicy.period = bus_speed / 120;
-+ ttcpolicy.computation = bus_speed / 1000;
-+ ttcpolicy.constraint = bus_speed / 500;
-+ ttcpolicy.preemptible = 1;
-+
-+ thread_policy_set (mach_thread_self (),
-+ THREAD_TIME_CONSTRAINT_POLICY,
-+ (int*)&ttcpolicy,
-+ THREAD_TIME_CONSTRAINT_POLICY_COUNT);
-+
-+ return TRUE;
-+#endif
-+
- #ifdef HAVE_SCHED_SETSCHEDULER
- #ifdef __FreeBSD__
- /*
diff --git a/audio/xmms/patches/patch-ao b/audio/xmms/patches/patch-ao
deleted file mode 100644
index ef3d243b630..00000000000
--- a/audio/xmms/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.6 2007/02/01 16:55:59 drochner Exp $
-
---- libxmms/titlestring.h.orig 2007-02-01 15:18:41.000000000 +0100
-+++ libxmms/titlestring.h
-@@ -80,7 +80,7 @@ gchar *xmms_get_titlestring(gchar *fmt,
- GtkWidget* xmms_titlestring_descriptions(char* tags, int rows);
-
- #ifdef __cplusplus
--};
-+}
- #endif
-
- #endif /* !XMMS_TITLESTRING_H */
diff --git a/audio/xmms/patches/patch-ap b/audio/xmms/patches/patch-ap
deleted file mode 100644
index 0ebbc2725db..00000000000
--- a/audio/xmms/patches/patch-ap
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ap,v 1.3 2007/03/08 15:01:51 rillig Exp $
-
-gcc 4.1.2 says:
-Sun.c:8: error: static declaration of 'op' follows non-static declaration
-Sun.h:40: error: previous declaration of 'op' was here
-
---- Output/solaris/Sun.c.orig 2001-04-27 00:31:34.000000000 +0200
-+++ Output/solaris/Sun.c 2007-03-08 16:07:29.000000000 +0100
-@@ -5,7 +5,7 @@
- #include "config.h"
- #include "xmms/i18n.h"
-
--static OutputPlugin op =
-+OutputPlugin op =
- {
- NULL,
- NULL,
diff --git a/audio/xmmsctrl/DESCR b/audio/xmmsctrl/DESCR
deleted file mode 100644
index 95f54a23445..00000000000
--- a/audio/xmmsctrl/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-xmmsctrl is a small utility to control xmms from the command line.
-Its goal is to be used coupled with sh to test xmms state and perform
-an appropriate action, e.g. if playing then pause else play. The
-interest of this is to bind keys in a window manager to have control
-over xmms with keys that do play/next/pause, prev, control sound...
diff --git a/audio/xmmsctrl/Makefile b/audio/xmmsctrl/Makefile
deleted file mode 100644
index 2e5974dc48b..00000000000
--- a/audio/xmmsctrl/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2006/10/04 20:44:20 wiz Exp $
-#
-
-DISTNAME= xmmsctrl-1.6
-PKGREVISION= 2
-CATEGORIES= audio
-MASTER_SITES= http://user.it.uu.se/~adavid/utils/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://user.it.uu.se/~adavid/utils/
-COMMENT= Small utility to control xmms from the command line
-
-USE_TOOLS+= gmake
-INSTALLATION_DIRS= bin
-
-.include "../../audio/xmms/buildlink3.mk"
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/xmmsctrl ${PREFIX}/bin
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmmsctrl/PLIST b/audio/xmmsctrl/PLIST
deleted file mode 100644
index 44cd10424cb..00000000000
--- a/audio/xmmsctrl/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/05/09 04:42:46 minskim Exp $
-bin/xmmsctrl
diff --git a/audio/xmmsctrl/distinfo b/audio/xmmsctrl/distinfo
deleted file mode 100644
index 4bd32e3ce7d..00000000000
--- a/audio/xmmsctrl/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:56 agc Exp $
-
-SHA1 (xmmsctrl-1.6.tar.gz) = 0cfb33cf841eba3bbc0230f66f22d1fa3347a799
-RMD160 (xmmsctrl-1.6.tar.gz) = 1701e9c3b27baccd5021daaf13bc22c9940483e3
-Size (xmmsctrl-1.6.tar.gz) = 7843 bytes
-SHA1 (patch-aa) = 7ef892ee09bee6d3e80863f5599973021b076ff0
-SHA1 (patch-ab) = 1e208da231e3b547a9dccf8cfcf406b7143732c8
diff --git a/audio/xmmsctrl/patches/patch-aa b/audio/xmmsctrl/patches/patch-aa
deleted file mode 100644
index b5d9555c703..00000000000
--- a/audio/xmmsctrl/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/06/12 01:05:37 grant Exp $
-
---- xmmsctrl.c.orig 2001-11-22 05:45:56.000000000 +1100
-+++ xmmsctrl.c
-@@ -38,7 +38,7 @@ USA.
- /* This declaration seems to be missing on my system
- * Comment it if your are running Debian
- */
--void usleep(unsigned long usec);
-+/* void usleep(unsigned long usec); */
-
- /* returns true if xmms is playing a stream */
- static gboolean is_stream_playing(gint);
-@@ -537,7 +537,7 @@ static void set_dir(gint session, char *
- * print xmmsctrl help
- * the dummy variable is used just for convenience
- */
--static void print_help(__attribute__ ((unused)) gint dummy) {
-+static void print_help(gint dummy) {
- unsigned int i;
-
- /* The string is cut to conform to ISO C89 */
diff --git a/audio/xmmsctrl/patches/patch-ab b/audio/xmmsctrl/patches/patch-ab
deleted file mode 100644
index 63143cb4d38..00000000000
--- a/audio/xmmsctrl/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/05/09 04:42:46 minskim Exp $
-
---- Makefile.orig 2001-11-21 12:45:56.000000000 -0600
-+++ Makefile
-@@ -6,10 +6,10 @@ TARGET = xmmsctrl
- VERSION = 1.6
- DIRNAME = $(shell basename $(PWD))
-
--CC = gcc
-+#CC = gcc
- WARN = -Wall -ansi -pedantic -Wshadow -Wmissing-prototypes -W
--CFLAGS = $(WARN) -O2 $(shell xmms-config --cflags) -DVERSION=\"$(VERSION)\"
--LDFLAGS = $(shell xmms-config --libs)
-+CFLAGS += $(shell xmms-config --cflags) -DVERSION=\"$(VERSION)\"
-+LDFLAGS += $(shell xmms-config --libs)
-
- all : $(TARGET) HELP
-
diff --git a/audio/xmp/DESCR b/audio/xmp/DESCR
deleted file mode 100644
index e5e75631bfc..00000000000
--- a/audio/xmp/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-This is the Extended Module Player, an open source module player for UNIX
-distributed under the terms of the GNU GPL. xmp currently runs on several
-platforms, including ALSA, OSS (for Linux on i386 and Alpha and FreeBSD),
-BSD, SunOS, Solaris, S/Linux and HP-UX. On PC class machines with GUS or
-AWE cards xmp takes advantage of the OSS sequencer to play modules with
-virtually no system load. Using software mixing, xmp plays at rates up to
-48 kHz in mono or stereo, 8 or 16 bits, signed or unsigned, little or big
-endian samples with 32 bit linear interpolation.
-
-The current version of xmp supports many Amiga and PC module formats
-(including packed, Powerpacked and SQSHed modules) -- currently 47 known
-formats.
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
deleted file mode 100644
index 290feec6a5f..00000000000
--- a/audio/xmp/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2007/01/26 18:23:30 joerg Exp $
-
-DISTNAME= xmp-2.0.4
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmp/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= rxg@NetBSD.org
-HOMEPAGE= http://xmp.sourceforge.net/
-COMMENT= Player for many different Amiga and PC module formats
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--disable-alsa \
- --disable-oss \
- --disable-xmms \
- --sysconfdir=${PKG_SYSCONFDIR:Q}
-
-USE_TOOLS+= gmake
-
-EGDIR= ${PREFIX}/share/examples/xmp
-CONF_FILES= ${EGDIR}/xmp-modules.conf ${PKG_SYSCONFDIR}/xmp-modules.conf
-CONF_FILES+= ${EGDIR}/xmp.conf ${PKG_SYSCONFDIR}/xmp.conf
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix"
-# No native support for these OS's, so use esound for audio output
-.include "../../audio/esound/buildlink3.mk"
-.endif
-
-pre-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
-
-BUILDLINK_DEPMETHOD.libXt?= build
-
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmp/PLIST b/audio/xmp/PLIST
deleted file mode 100644
index 7c902840f34..00000000000
--- a/audio/xmp/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/22 17:05:51 jmmv Exp $
-bin/xmp
-bin/xxmp
-man/man1/xmp.1
-man/man1/xxmp.1
-share/examples/xmp/xmp-modules.conf
-share/examples/xmp/xmp.conf
-@dirrm share/examples/xmp
diff --git a/audio/xmp/distinfo b/audio/xmp/distinfo
deleted file mode 100644
index 0a087add0b3..00000000000
--- a/audio/xmp/distinfo
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: distinfo,v 1.9 2006/06/30 12:54:37 tron Exp $
-
-SHA1 (xmp-2.0.4.tar.bz2) = 35c1578f2f6728aa2ec92f34ada050e328694167
-RMD160 (xmp-2.0.4.tar.bz2) = c1c0c3af63d1f3e43fe6b47ca55725e0922fe2f1
-Size (xmp-2.0.4.tar.bz2) = 314820 bytes
-SHA1 (patch-aa) = e5ce08ae036f947c2486dcf5def72bc0a65a6600
-SHA1 (patch-ab) = 9d4732f57cf045a3904b8d9627ccb866d39e0fb0
-SHA1 (patch-ac) = 0efcb2f094f149c56da96a6ba7ba9a59ed06dc4d
-SHA1 (patch-ad) = 7b2c1f5c10b4b8a766bcca7bc4d7d9f538e89db1
-SHA1 (patch-ae) = e136083ec69df5b32cb741bb14173f58fa613574
-SHA1 (patch-af) = 96743b9d31adec688a0bcab05bd8b32a9e162a54
-SHA1 (patch-ag) = 431875a9a1889e0c63620c04a78473116c090fae
-SHA1 (patch-ah) = d6119a1d0ef33bf58bd443b2f18d72cb9ea1956a
-SHA1 (patch-ai) = 7882313a892f2043a051fdc2b49161ae209824ba
-SHA1 (patch-aj) = 5364b5135e8e2bd60bbf6cbcd00adac99611f2ce
-SHA1 (patch-ak) = 93a9abfc66a526d52bd62ece5b9d8cd727f816e7
-SHA1 (patch-al) = 902a0c5311f560d5bf01e3946d785bca932131d3
-SHA1 (patch-am) = 601b55de29ca76ab4671fc3470181544b5770f1a
-SHA1 (patch-an) = bd021634555751a78cc1f5af61aa83c4d1e3287f
diff --git a/audio/xmp/patches/patch-aa b/audio/xmp/patches/patch-aa
deleted file mode 100644
index b8dca8f51dd..00000000000
--- a/audio/xmp/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/12/22 17:05:51 jmmv Exp $
-
---- Makefile.orig Sat Jan 20 02:51:28 2001
-+++ Makefile Mon Jan 28 15:30:21 2002
-@@ -43,8 +44,8 @@
-
- install::
- @echo
-- @echo " Installation complete. To customize, copy /etc/xmp.conf to"
-- @echo " \$$HOME/.xmp/xmp.conf and /etc/xmp-modules.conf to \$$HOME/.xmp/modules.conf"
-+ @echo " Installation complete. To customize, copy ${ETC_DIR}/xmp.conf to"
-+ @echo " \$$HOME/.xmp/xmp.conf and ${ETC_DIR}/xmp-modules.conf to \$$HOME/.xmp/modules.conf"
- @echo
- @echo " Please report bugs to xmp-bugs@helllabs.org."
- @echo
diff --git a/audio/xmp/patches/patch-ab b/audio/xmp/patches/patch-ab
deleted file mode 100644
index 4613f0a5b32..00000000000
--- a/audio/xmp/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2002/12/22 17:05:52 jmmv Exp $
-
---- src/player/readrc.c.orig Wed Jan 3 11:50:08 2001
-+++ src/player/readrc.c Mon Jan 28 15:28:59 2002
-@@ -58,7 +58,7 @@
- if ((rc = fopen (myrc2, "r")) == NULL) {
- if ((rc = fopen (myrc, "r")) == NULL) {
- #ifndef __EMX__
-- if ((rc = fopen ("/etc/xmp.conf", "r")) == NULL) {
-+ if ((rc = fopen (ETC_DIR "/xmp.conf", "r")) == NULL) {
- #else
- if ((rc = fopen ("xmp.conf", "r")) == NULL) {
- #endif
-@@ -206,7 +206,7 @@
- myrc = malloc ((home ? strlen (home) : 0) + 20);
- #ifndef __EMX__
- sprintf (myrc, "%s/.xmp/modules.conf", home);
-- parse_modconf (ctl, "/etc/xmp-modules.conf", crc, size);
-+ parse_modconf (ctl, ETC_DIR "/xmp-modules.conf", crc, size);
- #else
- sprintf (myrc, "%s\\.xmp\\modules.conf", home);
- parse_modconf (ctl, "xmp-modules.conf", crc, size);
diff --git a/audio/xmp/patches/patch-ac b/audio/xmp/patches/patch-ac
deleted file mode 100644
index 89f9894e65c..00000000000
--- a/audio/xmp/patches/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2002/12/22 17:05:52 jmmv Exp $
-
---- etc/Makefile.orig Fri Dec 29 19:06:28 2000
-+++ etc/Makefile
-@@ -13,12 +13,6 @@ subdist:: all
- include ../Makefile.rules
-
- install::
-- @echo Installing xmp.conf and xmp-modules.conf in $(DEST_DIR)...
-- @if [ -f $(DEST_DIR)/etc/xmp.conf ]; then \
-- mv -f $(DEST_DIR)/etc/xmp.conf $(DEST_DIR)/etc/xmp.conf.old; \
-- fi
-- @if [ -f $(DEST_DIR)/etc/xmp-modules.conf ]; then \
-- mv -f $(DEST_DIR)/etc/xmp-modules.conf $(DEST_DIR)/etc/xmp-modules.conf.old; \
-- fi
-- $(INSTALL) -m644 xmp.conf xmp-modules.conf $(DEST_DIR)/etc
-+ @echo Installing xmp.conf and xmp-modules.conf in $(datadir)/examples/xmp...
-+ $(INSTALL) -m644 xmp.conf xmp-modules.conf $(datadir)/examples/xmp
-
diff --git a/audio/xmp/patches/patch-ad b/audio/xmp/patches/patch-ad
deleted file mode 100644
index 2daf0e595cb..00000000000
--- a/audio/xmp/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2002/01/29 07:41:28 martti Exp $
-
---- src/main/Makefile.orig Tue Jan 16 01:54:02 2001
-+++ src/main/Makefile Mon Jan 28 15:32:24 2002
-@@ -7,7 +7,7 @@
- XDEPS =
- BINS = xmp $(X_XMP)
- XLIBS = -L../../lib -lxmp -lm #-lefence
--X11LIBS = -lX11 -lXext
-+X11LIBS = -lX11 -lXext -Wl,-R${X11BASE}/lib
- XPMS = bg1.xpm bg2.xpm bg3.xpm
- DFILES = Makefile $(OBJS:.o=.c) $(X11OBJS:.o=.c) main.c xpanel.h $(XPMS) \
- simple.c
diff --git a/audio/xmp/patches/patch-ae b/audio/xmp/patches/patch-ae
deleted file mode 100644
index b359b676638..00000000000
--- a/audio/xmp/patches/patch-ae
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2004/05/16 17:11:30 danw Exp $
-
---- Makefile.rules.in.orig Fri Jan 19 20:51:53 2001
-+++ Makefile.rules.in
-@@ -7,14 +7,16 @@ DATE = Fri Jan 19 23:51:53 BRST 2001
- DEST_DIR=
- prefix = $(DEST_DIR)@prefix@
- exec_prefix= $(DEST_DIR)@prefix@
-+datadir = @datadir@
-+ETC_DIR = @sysconfdir@
- BIN_DIR = @bindir@
- LIB_DIR = @libdir@
- MAN_DIR = @mandir@/man1
-
- CC = @CC@
--CFLAGS = -c @CFLAGS@ @DEFS@ @CINCS@
-+CFLAGS = -c @CFLAGS@ @DEFS@ @CINCS@ -DETC_DIR=\"${ETC_DIR}\"
- LD = @CC@
--LDFLAGS = -o$@ @LDFLAGS@
-+LDFLAGS = -o $@ @LDFLAGS@
- RANLIB = @RANLIB@
- INSTALL = @INSTALL@
- LIBS = @LIBS@ $(XLIBS)
diff --git a/audio/xmp/patches/patch-af b/audio/xmp/patches/patch-af
deleted file mode 100644
index 664750fac33..00000000000
--- a/audio/xmp/patches/patch-af
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/09/22 09:30:05 tron Exp $
-
---- src/loaders/it_load.c.orig 2000-12-29 19:08:28.000000000 +0100
-+++ src/loaders/it_load.c 2003-09-22 11:27:16.000000000 +0200
-@@ -327,14 +327,14 @@
-
- #define BUILD_ENV(X) { \
- fread (&env, 1, sizeof (env), f); \
-- xxih[i].##X##ei.flg = env.flg & IT_ENV_ON ? XXM_ENV_ON : 0; \
-- xxih[i].##X##ei.flg |= env.flg & IT_ENV_LOOP ? XXM_ENV_LOOP : 0; \
-- xxih[i].##X##ei.flg |= env.flg & IT_ENV_SLOOP ? XXM_ENV_SUS : 0; \
-- xxih[i].##X##ei.npt = env.num; \
-- xxih[i].##X##ei.sus = env.slb; \
-- xxih[i].##X##ei.sue = env.sle; \
-- xxih[i].##X##ei.lps = env.lpb; \
-- xxih[i].##X##ei.lpe = env.lpe; \
-+ xxih[i].X##ei.flg = env.flg & IT_ENV_ON ? XXM_ENV_ON : 0; \
-+ xxih[i].X##ei.flg |= env.flg & IT_ENV_LOOP ? XXM_ENV_LOOP : 0; \
-+ xxih[i].X##ei.flg |= env.flg & IT_ENV_SLOOP ? XXM_ENV_SUS : 0; \
-+ xxih[i].X##ei.npt = env.num; \
-+ xxih[i].X##ei.sus = env.slb; \
-+ xxih[i].X##ei.sue = env.sle; \
-+ xxih[i].X##ei.lps = env.lpb; \
-+ xxih[i].X##ei.lpe = env.lpe; \
- if (env.num) xx##X##e[i] = calloc (4, env.num); \
- for (j = 0; j < env.num; j++) { \
- L_ENDIAN16 (env.node[j].x); \
diff --git a/audio/xmp/patches/patch-ag b/audio/xmp/patches/patch-ag
deleted file mode 100644
index b55f3e25148..00000000000
--- a/audio/xmp/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2004/05/16 17:11:30 danw Exp $
-
---- configure.orig Sat May 15 09:48:55 2004
-+++ configure
-@@ -593,7 +593,6 @@ CINCS="${CPPFLAGS}"
- PLUGIN=""
-
-
--LDFLAGS=""
-
-
- X_XMP="xxmp"
diff --git a/audio/xmp/patches/patch-ah b/audio/xmp/patches/patch-ah
deleted file mode 100644
index b2d9b4c0828..00000000000
--- a/audio/xmp/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2004/05/16 17:11:30 danw Exp $
-
---- src/Makefile.orig Sat May 15 10:09:32 2004
-+++ src/Makefile
-@@ -2,7 +2,7 @@
-
- DFILES = Makefile
- _DIRS = drivers include loaders player misc main
--DDIRS = $(_DIRS) os2 xmms
-+DDIRS = $(_DIRS)
- CFILES =
- DCFILES =
-
diff --git a/audio/xmp/patches/patch-ai b/audio/xmp/patches/patch-ai
deleted file mode 100644
index 7b345dba508..00000000000
--- a/audio/xmp/patches/patch-ai
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2005/12/11 20:20:34 joerg Exp $
-
---- src/loaders/ac1d_load.c.orig 2005-12-11 20:07:34.000000000 +0000
-+++ src/loaders/ac1d_load.c
-@@ -150,6 +150,7 @@ int ac1d_load (FILE *f)
- case 0x0a:
- event->fxt = 0x00;
- case 0x0f:
-+ break;
- }
- }
- }
diff --git a/audio/xmp/patches/patch-aj b/audio/xmp/patches/patch-aj
deleted file mode 100644
index f8195bcc6a3..00000000000
--- a/audio/xmp/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2005/12/11 20:20:34 joerg Exp $
-
---- src/loaders/pp10_load.c.orig 2005-12-11 20:08:22.000000000 +0000
-+++ src/loaders/pp10_load.c
-@@ -226,6 +226,7 @@ int pha_load (FILE *f)
- case 0x0a:
- event->fxt = 0x00;
- case 0x0f:
-+ break;
- }
- }
-
diff --git a/audio/xmp/patches/patch-ak b/audio/xmp/patches/patch-ak
deleted file mode 100644
index fa6ca4be397..00000000000
--- a/audio/xmp/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2006/06/30 12:54:38 tron Exp $
-
---- src/drivers/file.c.orig 2000-12-29 18:08:07.000000000 +0000
-+++ src/drivers/file.c 2006-06-30 11:43:38.000000000 +0100
-@@ -91,7 +91,7 @@
- while (i) {
- if ((j = write (audio_fd, b, i)) > 0) {
- i -= j;
-- (char *)b += j;
-+ b = (char *)b + j;
- } else
- break;
- };
diff --git a/audio/xmp/patches/patch-al b/audio/xmp/patches/patch-al
deleted file mode 100644
index 2e1d4820c23..00000000000
--- a/audio/xmp/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1 2006/06/30 12:54:38 tron Exp $
-
---- src/drivers/netbsd.c.orig 2000-12-29 18:08:08.000000000 +0000
-+++ src/drivers/netbsd.c 2006-06-30 12:11:46.000000000 +0100
-@@ -182,7 +182,7 @@
- while (i) {
- if ((j = write (audio_fd, b, i)) > 0) {
- i -= j;
-- (char *)b += j;
-+ b = (char *)b + j;
- } else
- break;
- };
diff --git a/audio/xmp/patches/patch-am b/audio/xmp/patches/patch-am
deleted file mode 100644
index cb750c22ba1..00000000000
--- a/audio/xmp/patches/patch-am
+++ /dev/null
@@ -1,155 +0,0 @@
-$NetBSD: patch-am,v 1.1 2006/06/30 12:54:38 tron Exp $
-
---- src/loaders/mdl_load.c.orig 2000-12-29 18:08:33.000000000 +0000
-+++ src/loaders/mdl_load.c 2006-06-30 12:57:09.000000000 +0100
-@@ -35,6 +35,35 @@
- static struct mdl_envelope *v_env;
- static struct mdl_envelope *p_env;
-
-+static void *
-+get_uint16_le(void *p, uint16_t *x16)
-+{
-+ uint8_t *bp;
-+
-+ bp = p;
-+ *x16 = bp[0] | (bp[1] << 8);
-+ return bp + sizeof(uint16);
-+}
-+
-+static void *
-+get_uint16_le_int(void *p, int *ip)
-+{
-+ uint8_t *bp;
-+
-+ bp = p;
-+ *ip = bp[0] | (bp[1] << 8);
-+ return bp + sizeof(uint16);
-+}
-+
-+static void *
-+get_uint32_le_int(void *p, int *ip)
-+{
-+ uint8_t *bp;
-+
-+ bp = p;
-+ *ip = bp[0] | (bp[1] << 8) | (bp[2] << 16) | (bp[3] << 24);
-+ return bp + sizeof(uint32);
-+}
-
- /* Effects 1-6 (note effects) can only be entered in the first effect
- * column, G-L (volume-effects) only in the second column.
-@@ -130,7 +159,8 @@
- unsigned int x;
-
- if (i == 0) {
-- b = *((uint32 *)(*buf))++;
-+ (void)memcpy(&b, *buf, sizeof(b));
-+ *buf += sizeof(b);
- n = 32;
- return 0;
- }
-@@ -268,8 +298,7 @@
-
- buffer += 16; /* Skip pattern name */
- for (j = 0; j < chn; j++) {
-- x16 = *((uint16 *)buffer)++;
-- L_ENDIAN16 (x16);
-+ buffer = get_uint16_le(buffer, &x16);
- xxp[i]->info[j].index = x16;
- }
- if (V (0))
-@@ -297,8 +326,7 @@
- xxp[i]->rows = 64;
-
- for (j = 0; j < 32; j++) {
-- x16 = *((uint16 *)buffer)++;
-- L_ENDIAN16 (x16);
-+ buffer = get_uint16_le(buffer, &x16);
- if (j < xxh->chn)
- xxp[i]->info[j].index = x16;
- }
-@@ -315,7 +343,8 @@
- int i, j, k, row, len;
- struct xxm_track *track;
-
-- xxh->trk = *((uint16 *) buffer)++ + 1;
-+ buffer = get_uint16_le_int(buffer, &xxh->trk);
-+ xxh->trk++;
-
- if (V (0))
- report ("Stored tracks : %d ", xxh->trk);
-@@ -330,7 +359,7 @@
-
- for (i = 1; i < xxh->trk; i++) {
- /* Length of the track in bytes */
-- len = *((uint16 *) buffer)++;
-+ buffer = get_uint16_le_int(buffer, &len);
-
- memset (track, 0, sizeof (struct xxm_track) +
- sizeof (struct xxm_event) * 256);
-@@ -449,7 +478,7 @@
- xxih[i].rls = *(uint16 *)buffer;
- L_ENDIAN32 (xxih[i].rls);
- }
-- ((uint16 *)buffer)++;
-+ buffer += sizeof(uint16);
-
- xxi[i][j].vra = *buffer++;
- xxi[i][j].vde = *buffer++;
-@@ -498,15 +527,12 @@
- buffer += 32; /* Sample name */
- buffer += 8; /* Sample filename */
-
-- c2spd[i] = *((uint32 *)buffer)++;
-+ (void)memcpy(&c2spd[i], buffer, sizeof(c2spd[i]));
-+ buffer += sizeof(c2spd[i]);
-
-- xxs[i].len = *((uint32 *)buffer)++;
-- xxs[i].lps = *((uint32 *)buffer)++;
-- xxs[i].lpe = *((uint32 *)buffer)++;
--
-- L_ENDIAN32 (xxs[i].len);
-- L_ENDIAN32 (xxs[i].lps);
-- L_ENDIAN32 (xxs[i].lpe);
-+ buffer = get_uint32_le_int(buffer, &xxs[i].len);
-+ buffer = get_uint32_le_int(buffer, &xxs[i].lps);
-+ buffer = get_uint32_le_int(buffer, &xxs[i].lpe);
-
- xxs[i].flg = xxs[i].lpe > 0 ? WAVE_LOOPING : 0;
- xxs[i].lpe = xxs[i].lps + xxs[i].lpe;
-@@ -579,16 +605,11 @@
- buffer += 32; /* Sample name */
- buffer += 8; /* Sample filename */
-
-- c2spd[i] = *((uint16 *)buffer)++;
-- L_ENDIAN16 (c2spd[i]);
-+ buffer = get_uint16_le_int(buffer, &c2spd[i]);
-
-- xxs[i].len = *((uint32 *)buffer)++;
-- xxs[i].lps = *((uint32 *)buffer)++;
-- xxs[i].lpe = *((uint32 *)buffer)++;
--
-- L_ENDIAN32 (xxs[i].len);
-- L_ENDIAN32 (xxs[i].lps);
-- L_ENDIAN32 (xxs[i].lpe);
-+ buffer = get_uint32_le_int(buffer, &xxs[i].len);
-+ buffer = get_uint32_le_int(buffer, &xxs[i].lps);
-+ buffer = get_uint32_le_int(buffer, &xxs[i].lpe);
-
- xxs[i].flg = xxs[i].lpe > 0 ? WAVE_LOOPING : 0;
- xxs[i].lpe = xxs[i].lps + xxs[i].lpe;
-@@ -648,12 +669,12 @@
- buffer += xxs[i].len;
- break;
- case 1:
-- len = *((uint32 *)buffer)++;
-+ buffer = get_uint32_le_int(buffer, &len);
- unpack_sample8 (smpbuf, buffer, xxs[i].len);
- buffer += len;
- break;
- case 2:
-- len = *((uint32 *)buffer)++;
-+ buffer = get_uint32_le_int(buffer, &len);
- unpack_sample16 ((uint16 *)smpbuf, buffer, xxs[i].len >> 1);
- buffer += len;
- break;
diff --git a/audio/xmp/patches/patch-an b/audio/xmp/patches/patch-an
deleted file mode 100644
index e5e1d05f25d..00000000000
--- a/audio/xmp/patches/patch-an
+++ /dev/null
@@ -1,159 +0,0 @@
-$NetBSD: patch-an,v 1.1 2006/06/30 12:54:38 tron Exp $
-
---- src/loaders/med_load.c.orig 2001-01-13 19:58:02.000000000 +0000
-+++ src/loaders/med_load.c 2006-06-30 13:48:59.000000000 +0100
-@@ -31,6 +31,25 @@
-
- static int bpmon, bpmlen;
-
-+static void big_endian_uint16_t(void *p)
-+{
-+ uint16 *x16p, x16;
-+
-+ x16p = p;
-+ x16 = *x16p;
-+ B_ENDIAN16(x16);
-+ *x16p = x16;
-+}
-+
-+static void big_endian_uint32_t(void *p)
-+{
-+ uint32 *x32p, x32;
-+
-+ x32p = p;
-+ x32 = *x32p;
-+ B_ENDIAN32(x32);
-+ *x32p = x32;
-+}
-
- static void xlat_fx (uint8 *fxt, uint8 *fxp)
- {
-@@ -136,11 +155,11 @@
-
- header = (struct MMD0 *)mmd;
-
-- B_ENDIAN32 ((uint32)header->modlen);
-- B_ENDIAN32 ((uint32)header->song);
-- B_ENDIAN32 ((uint32)header->blockarr);
-- B_ENDIAN32 ((uint32)header->smplarr);
-- B_ENDIAN32 ((uint32)header->expdata);
-+ big_endian_uint32_t(&header->modlen);
-+ big_endian_uint32_t(&header->song);
-+ big_endian_uint32_t(&header->blockarr);
-+ big_endian_uint32_t(&header->smplarr);
-+ big_endian_uint32_t(&header->expdata);
-
- song = (struct MMD0song *)(mmd + (uint32)header->song);
- song2 = (struct MMD2song *)(mmd + (uint32)header->song);
-@@ -148,21 +167,21 @@
- (uint32)header->expdata) : NULL;
-
- if (expdata) {
-- B_ENDIAN32 ((uint32)expdata->nextmod);
-- B_ENDIAN32 ((uint32)expdata->exp_smp);
-- B_ENDIAN16 ((uint16)expdata->s_ext_entries);
-- B_ENDIAN16 ((uint16)expdata->s_ext_entrsz);
-- B_ENDIAN32 ((uint32)expdata->annotxt);
-- B_ENDIAN32 ((uint32)expdata->annolen);
-- B_ENDIAN32 ((uint32)expdata->iinfo);
-- B_ENDIAN16 ((uint16)expdata->i_ext_entries);
-- B_ENDIAN16 ((uint16)expdata->i_ext_entrsz);
-- B_ENDIAN32 ((uint32)expdata->jumpmask);
-- B_ENDIAN32 ((uint32)expdata->rgbtable);
-- B_ENDIAN32 ((uint32)expdata->n_info);
-- B_ENDIAN32 ((uint32)expdata->songname);
-- B_ENDIAN32 ((uint32)expdata->songnamelen);
-- B_ENDIAN32 ((uint32)expdata->dumps);
-+ big_endian_uint32_t(&expdata->nextmod);
-+ big_endian_uint32_t(&expdata->exp_smp);
-+ big_endian_uint16_t(&expdata->s_ext_entries);
-+ big_endian_uint16_t(&expdata->s_ext_entrsz);
-+ big_endian_uint32_t(&expdata->annotxt);
-+ big_endian_uint32_t(&expdata->annolen);
-+ big_endian_uint32_t(&expdata->iinfo);
-+ big_endian_uint16_t(&expdata->i_ext_entries);
-+ big_endian_uint16_t(&expdata->i_ext_entrsz);
-+ big_endian_uint32_t(&expdata->jumpmask);
-+ big_endian_uint32_t(&expdata->rgbtable);
-+ big_endian_uint32_t(&expdata->n_info);
-+ big_endian_uint32_t(&expdata->songname);
-+ big_endian_uint32_t(&expdata->songnamelen);
-+ big_endian_uint32_t(&expdata->dumps);
- }
-
- for (i = 0; i < 63; i++) {
-@@ -198,7 +217,7 @@
-
- for (i = 0; i < xxh->ins; i++) {
- bytecopy(&instr, mmd + (uint32)header->smplarr + i * 4, 4);
-- B_ENDIAN32 ((uint32)instr);
-+ big_endian_uint32_t(&instr);
- if (!instr)
- continue;
- instr = (struct InstrHdr *)(mmd + (uint32)instr);
-@@ -225,16 +244,16 @@
- if (ver < 2) {
- memcpy (xxo, song->playseq, xxh->len);
- } else {
-- B_ENDIAN32 ((uint32)song2->playseqtable);
-+ big_endian_uint32_t(&song2->playseqtable);
- playseq = (struct PlaySeq **)(mmd + (uint32)song2->playseqtable);
-- B_ENDIAN32 ((uint32)playseq[0]);
-+ big_endian_uint32_t(&playseq[0]);
- playseq[0] = (struct PlaySeq *)(mmd + (uint32)playseq[0]);
-- B_ENDIAN16 ((uint16)playseq[0]->length);
-+ big_endian_uint16_t(&playseq[0]->length);
- xxh->len = playseq[0]->length;
- if (xxh->len > 0xff)
- xxh->len = 0xff;
- for (i = 0; i < xxh->len; i++) {
-- B_ENDIAN16 ((uint16)playseq[0]->seq[i]);
-+ big_endian_uint16_t(&playseq[0]->seq[i]);
- xxo[i] = playseq[0]->seq[i];
- }
- }
-@@ -243,7 +262,7 @@
-
- for (i = 0; i < xxh->pat; i++) {
- bytecopy(&block0, mmd + (uint32)header->blockarr + i * 4, 4);
-- B_ENDIAN32 ((uint32)block0);
-+ big_endian_uint32_t(&block0);
- block0 = (struct MMD0Block *)(mmd + (uint32)block0);
- block1 = (struct MMD1Block *)block0;
-
-@@ -283,7 +302,7 @@
-
- for (i = 0; i < xxh->pat; i++) {
- bytecopy(&block0, mmd + (uint32)header->blockarr + i * 4, 4);
-- B_ENDIAN32 ((uint32)block0);
-+ big_endian_uint32_t(&block0);
- block0 = (struct MMD0Block *)(mmd + (uint32)block0);
- block1 = (struct MMD1Block *)block0;
-
-@@ -345,7 +364,7 @@
-
- for (smp_idx = i = 0; i < xxh->ins; i++) {
- bytecopy(&instr, mmd + (uint32)header->smplarr + i * 4, 4);
-- B_ENDIAN32 ((uint32)instr);
-+ big_endian_uint32_t(&instr);
- if (!instr)
- continue;
- instr = (struct InstrHdr *)(mmd + (uint32)instr);
-@@ -381,7 +400,7 @@
- xxih[i].vts = synth->volspeed;
- xxih[i].wts = synth->wfspeed;
-
-- B_ENDIAN32 ((uint32)synth->wf[0]);
-+ big_endian_uint32_t(&synth->wf[0]);
- instr = (struct InstrHdr *)((char *)synth + (uint32)synth->wf[0]);
- B_ENDIAN32 (instr->length);
- B_ENDIAN16 (instr->type);
-@@ -438,7 +457,7 @@
- xxih[i].wts = synth->wfspeed;
-
- for (j = 0; j < synth->wforms; j++) {
-- B_ENDIAN32 ((uint32)synth->wf[j]);
-+ big_endian_uint32_t(&synth->wf[j]);
-
- xxi[i][j].pan = 0x80;
- xxi[i][j].vol = song->sample[i].svol;
diff --git a/audio/xmradio/DESCR b/audio/xmradio/DESCR
deleted file mode 100644
index 7676b0ef253..00000000000
--- a/audio/xmradio/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This is a simple radio application for FM tuners built into
-some TV cards, such as the Hauppauge Win/TV.
diff --git a/audio/xmradio/Makefile b/audio/xmradio/Makefile
deleted file mode 100644
index 60ef437ff96..00000000000
--- a/audio/xmradio/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.27 2006/12/15 20:32:53 joerg Exp $
-
-DISTNAME= xmradio-1.2
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= http://core.de/~coto/radio/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://core.de/~coto/xmradio.html
-COMMENT= Radio application for Brooktree 848 compatible TV cards
-
-DEPENDS+= sox>=12.16:../../audio/sox
-
-ONLY_FOR_PLATFORM= NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-i386 \
- NetBSD-1.5_ALPHA-i386 NetBSD-1.[5-9]*-* \
- NetBSD-[2-9]*.*-*
-
-USE_IMAKE= YES
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xmradio
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xmradio
-
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../mk/motif.buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmradio/PLIST b/audio/xmradio/PLIST
deleted file mode 100644
index 095158f39f1..00000000000
--- a/audio/xmradio/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:18:39 zuntum Exp $
-bin/xmradio
-lib/X11/app-defaults/XMradio
-share/doc/xmradio/README
-@dirrm share/doc/xmradio
diff --git a/audio/xmradio/distinfo b/audio/xmradio/distinfo
deleted file mode 100644
index 85b93adccc3..00000000000
--- a/audio/xmradio/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 20:39:56 agc Exp $
-
-SHA1 (xmradio-1.2.tar.gz) = 6f128758307771478eafeef3c5ab96d1b33731f1
-RMD160 (xmradio-1.2.tar.gz) = 6e94f0be8c05319d64156cb301d840dba2bdc82a
-Size (xmradio-1.2.tar.gz) = 72373 bytes
diff --git a/audio/xsidplay/DESCR b/audio/xsidplay/DESCR
deleted file mode 100644
index 0fc5ef8f3f1..00000000000
--- a/audio/xsidplay/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-xsidplay is a Commodore 64 music player and SID chip emulator for X11. It
-uses the qt library.
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
deleted file mode 100644
index 645f9b37009..00000000000
--- a/audio/xsidplay/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# $NetBSD: Makefile,v 1.40 2007/01/11 09:41:04 joerg Exp $
-#
-
-DISTNAME= xsidplay-1.6.5.1a
-PKGREVISION= 4
-CATEGORIES= audio x11
-MASTER_SITES= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= pooka@NetBSD.org
-HOMEPAGE= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/
-COMMENT= Commodore 64 music player and SID chip emulator for X11
-
-GNU_CONFIGURE= yes
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake
-MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH:Q}
-
-CONFIGURE_ARGS+= --with-qt-dir=${QTDIR:Q}
-CONFIGURE_ENV+= DISABLE_ESD_TEST=yes
-CONFIGURE_ENV+= DISABLE_ARTSD_TEST=yes
-
-INSTALLATION_DIRS= bin
-
-pre-configure:
- rm ${WRKSRC}/scripts/ltmain.sh && ${LN} -s ${PREFIX}/share/libtool/ltmain.sh ${WRKSRC}/scripts/ltmain.sh
-
-do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/src/xsidplay ${PREFIX}/bin
-
-BUILDLINK_DEPMETHOD.libXt?= build
-
-.include "../../audio/libsidplay/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/qt3-libs/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xsidplay/PLIST b/audio/xsidplay/PLIST
deleted file mode 100644
index afdf55d89fd..00000000000
--- a/audio/xsidplay/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:18:41 zuntum Exp $
-bin/xsidplay
diff --git a/audio/xsidplay/distinfo b/audio/xsidplay/distinfo
deleted file mode 100644
index 81fc04f0912..00000000000
--- a/audio/xsidplay/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.9 2007/01/13 11:02:12 joerg Exp $
-
-SHA1 (xsidplay-1.6.5.1a.tgz) = 60f2262a8dd79b276272d49eff9a07277dc6c9aa
-RMD160 (xsidplay-1.6.5.1a.tgz) = 9a0529c7b76e7659feddc35c04aaf81ae2002984
-Size (xsidplay-1.6.5.1a.tgz) = 355698 bytes
-SHA1 (patch-aa) = 9429e87677967e7b34a8fc48655dbdfebbd595ad
-SHA1 (patch-ab) = 188ab597250e8a444d33f0813fba157a3469872e
diff --git a/audio/xsidplay/patches/patch-aa b/audio/xsidplay/patches/patch-aa
deleted file mode 100644
index 269e41ec63c..00000000000
--- a/audio/xsidplay/patches/patch-aa
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2007/01/13 11:02:12 joerg Exp $
-
---- configure.orig 2003-02-01 20:18:09.000000000 +0000
-+++ configure
-@@ -6577,6 +6577,7 @@ else
- fi
-
-
-+if test -z "$DISABLE_ARTSD_TEST"; then
- # aRts (KDE Sound Server).
- # Extract the first word of "artsc-config", so it can be a program name with args.
- set dummy artsc-config; ac_word=$2
-@@ -6622,6 +6623,7 @@ EOF
- ARTSC_INCLUDES="`$ARTSC_CONFIG --cflags`"
- ARTSC_LDADD="`$ARTSC_CONFIG --libs`"
- fi
-+fi # DISABLE_ARTSD_TEST
-
-
- if test -n "$ARTSC_CONFIG"; then
-@@ -6634,7 +6636,7 @@ fi
-
-
-
--
-+if test -z "$DISABLE_ESD_TEST"; then
- # Enlightenment Sound Daemon.
- # Extract the first word of "esd-config", so it can be a program name with args.
- set dummy esd-config; ac_word=$2
-@@ -6680,6 +6682,7 @@ EOF
- ESD_INCLUDES="`$ESD_CONFIG --cflags`"
- ESD_LDADD="`$ESD_CONFIG --libs`"
- fi
-+fi # DISABLE_ESD_TEST
-
-
- if test -n "$ESD_CONFIG"; then
-@@ -6705,7 +6708,7 @@ EOF
- $CP src/audio/linux/* src/audio
- echo "$ac_t""linux (OSS)" 1>&6
- ;;
-- *freebsd*) my_have_audio_driver=yes
-+ *freebsd*|*dragonfly*) my_have_audio_driver=yes
- cat >> confdefs.h <<\EOF
- #define HAVE_FREEBSD 1
- EOF
-@@ -6946,9 +6949,10 @@ if test "$ac_x_libraries" = NO; then
- cat > conftest.$ac_ext <<EOF
- #line 6948 "configure"
- #include "confdefs.h"
-+#include <X11/Intrinsic.h>
-
- int main() {
--${x_direct_test_function}()
-+${x_direct_test_function}(0)
- ; return 0; }
- EOF
- if { (eval echo configure:6955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -7789,6 +7793,7 @@ fi
- done
-
- my_qt_includes=$qt_incdir
-+my_qt_lib=-lqt
-
- qt_libdir=""
- for i in $qt_libdirs;
-@@ -7797,6 +7802,8 @@ my_qt_includes=$qt_incdir
- do
- if test -r "$i/$j"; then
- qt_libdir=$i
-+ my_qt_lib=-lqt-mt
-+ echo "Using multi-threaded version of Qt lib (libqt-mt)"
- break 2
- fi
- done
-@@ -7886,7 +7893,7 @@ echo "configure:7879: checking for Qt ve
- CXX="${SHELL-/bin/sh} ${srcdir}/libtool $CXX"
- CXXFLAGS="$CXXFLAGS $QT_INCLUDES"
- LDFLAGS="$LDFLAGS $QT_LDFLAGS"
-- LIBS="$LIBS -lqt"
-+ LIBS="$LIBS ${my_qt_lib}"
-
- cat > conftest.$ac_ext <<EOF
- #line 7893 "configure"
diff --git a/audio/xsidplay/patches/patch-ab b/audio/xsidplay/patches/patch-ab
deleted file mode 100644
index d6b32e4b7b8..00000000000
--- a/audio/xsidplay/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2005/12/07 18:59:26 joerg Exp $
-
---- src/songlendb/File.cpp.orig 2005-12-07 16:56:52.000000000 +0000
-+++ src/songlendb/File.cpp
-@@ -126,7 +126,7 @@ bool SongLengthFile::init(const char* fi
- streampos fileLen = myIn.tellg();
- #endif
- #ifdef XSID_HAVE_NOTHROW
-- pDB = new(std::nothrow) char[fileLen+1L];
-+ pDB = new(std::nothrow) char[(size_t)fileLen+1L];
- #else
- pDB = new char[fileLen+1L];
- #endif
diff --git a/audio/xwave/DESCR b/audio/xwave/DESCR
deleted file mode 100644
index 5c2819c67a7..00000000000
--- a/audio/xwave/DESCR
+++ /dev/null
@@ -1,20 +0,0 @@
-xwave is an audio player, recorder and editor for the X Window System.
-
-This is an alpha release of xwave.
-
-The user interface of xwave is based on the Athena Widget Set and some
-Widgets from FWF. The application defaults are optimized to work with
-Xaw3d (replaces the Xaw for 3d look), so if you don't use Xaw3d you will
-probably need to modify the resources.
-
-Features:
- - multiple files
- - overview window
- - zoom window
- - mark, cut, copy, paste, merge
- - echo, reverse, swap, resample, volume (absolute, dynamic
- compressor)
- - stop record on demand
- - raw, wav, au, aiff, aifc (PCM,ALAW,ULAW,ADPCM <- not all
- implementations)
- - files of every length
diff --git a/audio/xwave/Makefile b/audio/xwave/Makefile
deleted file mode 100644
index b92faf2d485..00000000000
--- a/audio/xwave/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.22 2006/12/27 13:37:36 joerg Exp $
-#
-
-DISTNAME= xwave2
-PKGNAME= xwave-2.0
-PKGREVISION= 1
-CATEGORIES= audio x11
-MASTER_SITES= # empty
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= Audio player/recorder/editor for the X Window System
-
-USE_IMAKE= YES
-INSTALLATION_DIRS= bin lib/X11/app-defaults
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/src/xwave ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/src/XWave ${PREFIX}/lib/X11/app-defaults
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xwave2
- ${INSTALL_DATA} ${WRKSRC}/README \
- ${WRKSRC}/README-XWAVE2 \
- ${WRKSRC}/README.v06 \
- ${WRKSRC}/COPYING \
- ${WRKSRC}/INSTALL \
- ${PREFIX}/share/doc/xwave2
-
-.include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xwave/PLIST b/audio/xwave/PLIST
deleted file mode 100644
index 46ec9eb8e63..00000000000
--- a/audio/xwave/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:18:42 zuntum Exp $
-bin/xwave
-lib/X11/app-defaults/XWave
-share/doc/xwave2/README
-share/doc/xwave2/README-XWAVE2
-share/doc/xwave2/README.v06
-share/doc/xwave2/COPYING
-share/doc/xwave2/INSTALL
-@dirrm share/doc/xwave2
diff --git a/audio/xwave/distinfo b/audio/xwave/distinfo
deleted file mode 100644
index 266afc7475f..00000000000
--- a/audio/xwave/distinfo
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: distinfo,v 1.9 2005/10/09 15:04:14 joerg Exp $
-
-SHA1 (xwave2.tar.gz) = 7ace9911c9425eab4907a34694cd208d21a6dac2
-RMD160 (xwave2.tar.gz) = 71df0bc4640be385c33ea3a2525bc7287741d9ab
-Size (xwave2.tar.gz) = 269942 bytes
-SHA1 (patch-aa) = 934f1818bc09fb8b6ccea1ec921fac95a460098f
-SHA1 (patch-ab) = 28801c1e4722275b599e9035e65136b9cc25215d
-SHA1 (patch-ac) = ae802fc9d4f882089496f41cc7b06412ae9ddf62
-SHA1 (patch-ad) = 87638e7555fe3d855f0972bef0942a9dcc90f535
-SHA1 (patch-ae) = 9b4fed9bb232334f2fcaaf59db152d1b078f3702
-SHA1 (patch-af) = 01d5fdad2c7056252ab64c49d9ebb06c7b5fbf6c
-SHA1 (patch-ag) = f06b4eecf0eafc985077fa2c356cd4c0e88cfe15
-SHA1 (patch-ah) = 61449264babde8d304f93084dbfa194d9a8b07c8
-SHA1 (patch-ai) = 34cd50fc75d5dd604349d5f694a993f23d87a24a
-SHA1 (patch-aj) = 6fbd9f8643d9557b3b4ae1df5db45235a531584b
-SHA1 (patch-ak) = cab81a7ad665ecabf09cae3908b13cef17f3ca17
-SHA1 (patch-al) = 8b0decd012d84f425805e577ff02ef56faa9ee17
-SHA1 (patch-am) = 401677317560d7e0bbacee977d02c23871dd550f
-SHA1 (patch-an) = 10ffb81b79da56bb2087924b645eefb56a1d1fc3
-SHA1 (patch-ao) = 3cf9f51939be5f02ad423d79103e7faeab13a3fd
-SHA1 (patch-ap) = 7a06de821da92a2d388939fdcaf7618a0a7f96ba
-SHA1 (patch-aq) = 62164a6a788190b5cce231bfadf5d7e0a22ee0d1
-SHA1 (patch-ar) = 22874069ef6de212d3f13302e649be06d03760a9
-SHA1 (patch-as) = 71bfcb6ebf047e01d08ba9d9b091e506943aa944
-SHA1 (patch-at) = 49e89a952862f47f00c37e6dd6879b5f3fea49b8
diff --git a/audio/xwave/patches/patch-aa b/audio/xwave/patches/patch-aa
deleted file mode 100644
index 79195f69c30..00000000000
--- a/audio/xwave/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 1999/02/10 14:56:42 frueauf Exp $
-
---- src/XWave.orig Thu Aug 13 01:27:09 1998
-+++ src/XWave Mon Feb 8 16:41:18 1999
-@@ -2,7 +2,7 @@
-
- XWave*wdir: /usr/share/data/sounds/prosonus
- XWave*tdir: /mnt/d/tmp
--XWave*device: /dev/dsp
-+XWave*device: /dev/audio
- XWave*maxmem: 1000
- XWave*doubleplay: False
- XWave*raisecanvas: False
diff --git a/audio/xwave/patches/patch-ab b/audio/xwave/patches/patch-ab
deleted file mode 100644
index 6c2d54e8117..00000000000
--- a/audio/xwave/patches/patch-ab
+++ /dev/null
@@ -1,81 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2001/11/18 15:03:39 itohy Exp $
-
---- src/aifc.c.orig Thu Aug 13 08:27:09 1998
-+++ src/aifc.c Sun Nov 18 22:28:26 2001
-@@ -9,7 +9,7 @@
-
- #ifdef linux
- #include <endian.h>
--#elif defined (FreeBSD)
-+#elif defined (FreeBSD) || defined(__NetBSD__)
- #include <machine/endian.h>
- #elif defined (sgi)
- #include <sys/endian.h>
-@@ -21,8 +21,8 @@
- #include "types.h"
- #include "audio_file.h"
- #include "ieee/ieee.h"
--#include "aifc.h"
- #include "endian.h"
-+#include "aifc.h"
-
- static int aifc_new(Audio_File *af);
-
-@@ -49,8 +49,8 @@
- int i,count;
- Aif_Form form;
- Aif_Chunk chunk;
-- ulong frames,stamp,block_size,offset;
-- short channels,bps;
-+ u_int32_t frames,stamp,block_size,offset;
-+ int16_t channels,bps;
- ID comp_typ;
- unsigned char freq[10],plength,*pstring;
- bool com_found=False;
-@@ -177,7 +177,7 @@
- Com_Chunk com;
- int headoffs=0;
- char freq[10];
-- ulong stamp,offset,block_size;
-+ u_int32_t stamp,offset,block_size;
- int i;
-
- com.channels=af->channels;
-@@ -291,7 +291,7 @@
- M_32_SWAP(form.type);
- #endif
-
-- if (aifc_seek(*af,0,SEEK_SET)==AF_ERROR) {
-+ if (lseek(af->fd,0,SEEK_SET)==-1) {
- if (com.pstring!=NULL) free(com.pstring);
- return(AF_ERROR);
- }
-@@ -301,7 +301,7 @@
- return(AF_ERROR);
- }
-
-- if (aifc_seek(*af,headoffs,SEEK_SET)==AF_ERROR) {
-+ if (lseek(af->fd,headoffs,SEEK_SET)==-1) {
- if (com.pstring!=NULL) free(com.pstring);
- return(AF_ERROR);
- }
-@@ -348,14 +348,16 @@
- {
- switch (af.comp) {
- case AF_PCM:
-- return(lseek(af.fd,pos,mode));
-+ break;
-+ default:
-+ return(AF_ERROR);
- }
-- return(AF_ERROR);
-+ return(lseek(af.fd, mode == SEEK_SET ? pos + af.headoffs : pos, mode));
- }
-
- int aifc_close(Audio_File af)
- {
-- if (aifc_seek(af,0,SEEK_SET)==AF_ERROR) return(AF_ERROR);
-+ if (lseek(af.fd,0,SEEK_SET)==-1) return(AF_ERROR);
- if (aifc_new (&af)==AF_ERROR) return(AF_ERROR);
- return(close(af.fd));
- }
diff --git a/audio/xwave/patches/patch-ac b/audio/xwave/patches/patch-ac
deleted file mode 100644
index e18822a1b58..00000000000
--- a/audio/xwave/patches/patch-ac
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2001/11/18 15:03:39 itohy Exp $
-
---- src/au.c.orig Thu Aug 13 08:27:09 1998
-+++ src/au.c Sun Nov 18 22:22:37 2001
-@@ -32,7 +32,7 @@
-
- #ifdef linux
- #include <endian.h>
--#elif defined (FreeBSD)
-+#elif defined (FreeBSD) || defined(__NetBSD__)
- #include <machine/endian.h>
- #elif defined (sgi)
- #include <sys/endian.h>
-@@ -212,16 +212,19 @@
- {
- switch (af.comp) {
- case AF_PCM:
-- return(lseek(af.fd,pos,mode));
-+ break;
- case AF_MULAW:
-- return(lseek(af.fd,pos/2,mode));
-+ pos /= 2;
-+ break;
-+ default:
-+ return(AF_ERROR);
- }
-- return(AF_ERROR);
-+ return(lseek(af.fd, mode == SEEK_SET ? pos + af.headoffs : pos, mode));
- }
-
- int au_close(Audio_File af)
- {
-- if (au_seek(af,0,SEEK_SET)==AF_ERROR) return(AF_ERROR);
-+ if (lseek(af.fd,0,SEEK_SET)==-1) return(AF_ERROR);
- if (au_new (&af)==AF_ERROR) return(AF_ERROR);
- return(close(af.fd));
- }
diff --git a/audio/xwave/patches/patch-ad b/audio/xwave/patches/patch-ad
deleted file mode 100644
index 963284a2158..00000000000
--- a/audio/xwave/patches/patch-ad
+++ /dev/null
@@ -1,189 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2005/10/03 13:30:20 joerg Exp $
-
---- orig/xwave/src/audio.c Tue Nov 26 11:13:44 1996
-+++ src/audio.c Fri Feb 20 23:46:06 1998
-@@ -37,9 +37,12 @@
- #ifdef linux
- #include <linux/soundcard.h>
-
--#elif defined(FreeBSD)
-+#elif defined(FreeBSD) || defined(__DragonFly__)
- #include <machine/soundcard.h>
-
-+#elif defined(__NetBSD__)
-+#include <soundcard.h>
-+
- #elif defined(sgi)
- #include <dmedia/audio.h>
-
-@@ -55,7 +58,7 @@
- #include "sample_settings.h"
- #include "audio.h"
-
--#if defined(linux) || defined (FreeBSD) || defined(sun)
-+#if defined(linux) || defined (FreeBSD) || defined(sun) || defined(__NetBSD__) || defined(__DragonFly__)
- static int set_dsp(int o_mode,int res,int channels,int freq,int *buf_size);
- #endif
-
-@@ -67,7 +70,7 @@ extern AppResources app_resources;
- static Audio_File af;
- static int stop_record;
-
--#if defined (linux) || defined (FreeBSD)
-+#if defined (linux) || defined (FreeBSD) || defined(__NetBSD__) || defined(__DragonFly__)
- int set_dsp(int o_mode,int res, int channels, int freq, int *buf_size)
- {
- int check;
-@@ -274,7 +277,7 @@ int get_samples(byte* audio_buffer,int m
- }
- #endif
-
--#ifdef sun
-+#if defined(sun)
- void check_audio(Main_Bool *mb)
- /* test if there is a play device, and how fast we can play */
- {
-@@ -307,7 +310,7 @@ void check_audio(Main_Bool *mb)
- case AUDIO_ENCODING_LINEAR:
- printf("ULAW\n");break;
- default:
-- printf("unknown encoding\n");
-+ printf("unknown encoding: %d\n",au_info.play.encoding);
- }
- close(audio);
- } else {
-@@ -370,7 +373,7 @@ int get_samples(byte* audio_buffer,int m
-
- void play_file(char *fname,Main_Bool *mb)
- {
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- int audio;
- #elif defined(sgi)
- ALport port;
-@@ -384,7 +387,7 @@ void play_file(char *fname,Main_Bool *mb
- return;
- }
-
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__)
- if ((audio=set_dsp(O_WRONLY,af.bps,af.channels,af.freq,&buf_size))==-1) {
- fprintf(stderr,"XWave: Error ! Cannot set dsp !\n");
- close(af.fd);
-@@ -404,7 +407,7 @@ void play_file(char *fname,Main_Bool *mb
- if ((buffer=malloc(buf_size))==NULL) {
- fprintf(stderr,"XWave: Error ! Cannot alloc mem !\n");
- close(af.fd);
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- close(audio);
- #elif defined(sgi)
- ALcloseport(port);
-@@ -413,7 +416,7 @@ void play_file(char *fname,Main_Bool *mb
- return;
- }
-
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- while ((length=af_read(af,buffer,buf_size))>0) {
- if (write(audio, buffer, length)==-1) break;
- }
-@@ -440,7 +443,7 @@ void play_buffer(Main_Data *md)
- int offset=0,playlength,length;
- #ifdef sgi
- ALport port;
--#elif defined(linux) || defined (FreeBSD) || defined (sun)
-+#elif defined(linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- int audio;
-
- if ((audio=set_dsp(O_WRONLY,wd->res,wd->channels,wd->freq,&buf_size))==-1) {
-@@ -473,7 +476,7 @@ void play_buffer(Main_Data *md)
- buffer=wd->buffer+offset;
- while (playlength>0) {
- if (playlength<buf_size) buf_size=playlength;
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- if (write(audio, buffer, buf_size)==-1) {
- close(audio);
- kill((pid_t) getppid(),SIGUSR1);
-@@ -497,7 +500,7 @@ void play_buffer(Main_Data *md)
- wd2af(wd,&af);
- af_rewind(af);
- if (af_seek(af,offset,SEEK_CUR)==AF_ERROR) {
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- close(audio);
- #elif defined(sgi)
- ALcloseport(port);
-@@ -510,7 +513,7 @@ void play_buffer(Main_Data *md)
- while (playlength>0) {
- if (playlength<buf_size) buf_size=playlength;
- if ((length=af_read(af,(char*) md->mg->fbuf,buf_size))==-1) {
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- close(audio);
- #elif defined(sgi)
- ALcloseport(port);
-@@ -518,7 +521,7 @@ void play_buffer(Main_Data *md)
- kill((pid_t) getppid(),SIGUSR1);
- return;
- }
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- if (write(audio,(char*) md->mg->fbuf,length)==-1) {
- close(audio);
- kill((pid_t) getppid(),SIGUSR1);
-@@ -536,7 +539,7 @@ void play_buffer(Main_Data *md)
- }
- }
-
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- close(audio);
- #elif defined(sgi)
- while (ALgetfilled(port)) sginap(2);
-@@ -556,7 +559,7 @@ void rec_file(byte res,byte mode,int fre
- void write_length();
- byte *data=NULL;
- int abuf_size,count;
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- int audio;
-
- if ((audio=set_dsp(O_RDONLY,res,mode,freq,&abuf_size))==-1) {
-@@ -577,7 +580,7 @@ void rec_file(byte res,byte mode,int fre
-
- if ((data = (byte *) malloc(abuf_size)) == NULL) {
- fprintf(stderr,"XWave: Error while alloc mem for audio_buffer !\n");
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- close(audio);
- #elif defined(sgi)
- ALcloseport(port);
-@@ -595,7 +598,7 @@ void rec_file(byte res,byte mode,int fre
-
- if (af_open(fname,&af,AF_NEW)==AF_ERROR) {
- free(data);
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- close(audio);
- #elif defined(sgi)
- ALcloseport(port);
-@@ -608,7 +611,7 @@ void rec_file(byte res,byte mode,int fre
- signal(SIGUSR1,write_length);
-
- while(1) {
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- if ((count=read(audio, data, abuf_size))==-1) {
- close(audio);
- af_close(af);
-@@ -632,7 +635,7 @@ void rec_file(byte res,byte mode,int fre
- return;
- }
- if ((count=af_write(af,(char*)data,count))==AF_ERROR) {
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- close(audio);
- #elif defined(sgi)
- ALcloseport(port);
diff --git a/audio/xwave/patches/patch-ae b/audio/xwave/patches/patch-ae
deleted file mode 100644
index 3ad38950fce..00000000000
--- a/audio/xwave/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 10:36:23 agc Exp $
-
---- orig/xwave/src/button.c Tue Nov 19 13:27:11 1996
-+++ src/button.c Sat Sep 13 04:19:49 1997
-@@ -521,7 +521,7 @@
- now_clock=clock();
- sample_time=(float)md->wd->tlength/(float)md->wd->freq;
-
--#if defined(linux) || defined (FreeBSD) || defined(sun)
-+#if defined(linux) || defined (FreeBSD) || defined(sun) || defined(__NetBSD__)
- gone_time=(float)(now_clock-start_clock)/(float)CLOCKS_PER_SEC;
- #elif defined(sgi)
- gone_time=(float)(now_clock-start_clock)/(float)750000;
diff --git a/audio/xwave/patches/patch-af b/audio/xwave/patches/patch-af
deleted file mode 100644
index 06418773f98..00000000000
--- a/audio/xwave/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 10:36:23 agc Exp $
-
---- orig/xwave/src/effects.c Tue Nov 19 15:57:27 1996
-+++ src/effects.c Sat Sep 13 04:21:24 1997
-@@ -350,7 +350,7 @@
- case 8: {
- #if defined (linux) || defined (FreeBSD)
- for (i=0;i<newlength;i++) newbuf[i]=obuf[(i<<1)+1]+128;
--#elif defined (sgi) || defined (sun)
-+#elif defined (sgi) || defined (sun) || defined(__NetBSD__)
- for (i=0;i<newlength;i++) newbuf[i]=obuf[(i<<1)]+128;
- #endif
- break;
-@@ -358,7 +358,7 @@
- case 16: {
- #if defined (linux) || defined (FreeBSD)
- for (i=0;i<wd->length;i++) newbuf[(i<<1)+1]=obuf[i]-128;
--#elif defined (sgi) || defined (sun)
-+#elif defined (sgi) || defined (sun) || defined(__NetBSD__)
- for (i=0;i<wd->length;i++) newbuf[(i<<1)]=obuf[i]-128;
- #endif
- break;
diff --git a/audio/xwave/patches/patch-ag b/audio/xwave/patches/patch-ag
deleted file mode 100644
index 2fe0dd65d37..00000000000
--- a/audio/xwave/patches/patch-ag
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2001/11/18 15:03:39 itohy Exp $
-
---- src/endian.h.orig Thu Aug 13 08:27:09 1998
-+++ src/endian.h Sun Nov 18 21:10:10 2001
-@@ -8,7 +8,9 @@
-
- #ifdef sun
-
--typedef unsigned long u_int32_t;
-+typedef int int32_t;
-+typedef unsigned int u_int32_t;
-+typedef short int16_t;
- typedef unsigned short u_int16_t;
- #if defined (_LITTLE_ENDIAN)
- #define little_endian 1
-@@ -16,7 +18,7 @@
- #define big_endian 1
- #endif
-
--#elif defined (linux) || defined (sun) || defined (FreeBSD)
-+#elif defined (linux) || defined (sun) || defined (FreeBSD) || defined(__NetBSD__)
-
- #if BYTE_ORDER==LITTLE_ENDIAN
- #define little_endian 1
diff --git a/audio/xwave/patches/patch-ah b/audio/xwave/patches/patch-ah
deleted file mode 100644
index 6ae55cd8351..00000000000
--- a/audio/xwave/patches/patch-ah
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2001/11/18 05:37:44 itohy Exp $
-
---- src/graphics.c.orig Thu Aug 13 08:27:09 1998
-+++ src/graphics.c Sun Nov 18 13:32:53 2001
-@@ -30,7 +30,7 @@
-
- #ifdef linux
- #include <endian.h>
--#elif defined (FreeBSD)
-+#elif defined (FreeBSD) || defined(__NetBSD__)
- #include <machine/endian.h>
- #elif defined (sgi)
- #include <sys/endian.h>
-@@ -1758,6 +1758,8 @@
- md->wd->markbeg=ceil(event->x*md->mg->step);
- md->wd->marklength=ceil((firstmark-event->x)*md->mg->step);
- }
-+ if (md->wd->markbeg + md->wd->marklength > md->wd->tlength)
-+ md->wd->marklength = md->wd->tlength - md->wd->markbeg;
- md->wd->ismark=True;
- md->wd->isplay=False;
- md->cg->pos=(md->wd->markbeg+md->wd->marklength)*md->wd->bpspl;
-@@ -2064,6 +2066,9 @@
- if (XPending(dpy)) {
- XPeekEvent(dpy,&pev);
- switch (pev.type) {
-+ default:
-+ XNextEvent(dpy,&pev);
-+ break;
- case MotionNotify: {
- XMotionEvent *ev;
-
diff --git a/audio/xwave/patches/patch-ai b/audio/xwave/patches/patch-ai
deleted file mode 100644
index 041159c154c..00000000000
--- a/audio/xwave/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.3 1999/11/15 13:15:12 rh Exp $
-
---- src/record_dialog.c.orig Mon Nov 15 14:11:49 1999
-+++ src/record_dialog.c Mon Nov 15 14:11:50 1999
-@@ -524,7 +524,7 @@
- sprintf(MD->mw->messages,"%.2lf kbytes (%.2lfs)",
- (double)playsize/1024,recordtime);
- XtVaSetValues(label5,XtNlabel, MD->mw->messages, NULL);
--#if defined(linux)||defined(FreeBSD)||defined(sun)
-+#if defined(linux)||defined(FreeBSD)||defined(sun) || defined(__NetBSD__)
- usleep(80000);
- #elif defined(sgi)
- sginap(CLK_TCK/(ONE_SECOND/80000));
diff --git a/audio/xwave/patches/patch-aj b/audio/xwave/patches/patch-aj
deleted file mode 100644
index 9a80c96e0c9..00000000000
--- a/audio/xwave/patches/patch-aj
+++ /dev/null
@@ -1,90 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2001/11/18 15:03:39 itohy Exp $
-
---- src/riff.c.orig Thu Aug 13 08:27:10 1998
-+++ src/riff.c Sun Nov 18 22:19:23 2001
-@@ -33,7 +33,7 @@
-
- #ifdef linux
- #include <endian.h>
--#elif defined (FreeBSD)
-+#elif defined (FreeBSD) || defined(__NetBSD__)
- #include <machine/endian.h>
- #elif defined (sgi)
- #include <sys/endian.h>
-@@ -45,12 +45,12 @@
-
- #include "types.h"
- #include "audio_file.h"
-+#include "endian.h"
- #include "riff.h"
- #include "xwave.h"
- #include "ccitt/g711.h"
- #include "ccitt/g72x.h"
- #include "adpcm2pcm/adpcm.h"
--#include "endian.h"
-
-
- extern Main_Data *MD;
-@@ -79,9 +79,10 @@
- {
- RiffHeader rh;
- FmtHeader fh;
-- long chunk;
-+ int32_t chunk;
- int headoffs,i;
-- ulong length,slength;
-+ u_int32_t length;
-+ off_t slength;
-
- if (mode==AF_NEW) return(riff_new(af));
-
-@@ -112,7 +113,7 @@
- if ((i=read (af->fd,&chunk,sizeof(chunk)))!=sizeof(chunk))
- return(AF_ERROR);
- headoffs+=i;
-- if ((i=read (af->fd,&length,sizeof(ulong)))!=sizeof(ulong))
-+ if ((i=read (af->fd,&length,sizeof(length)))!=sizeof(length))
- return(AF_ERROR);
- headoffs+=i;
-
-@@ -172,8 +173,9 @@
- {
- RiffHeader rh;
- FmtHeader fh;
-- long chunk;
-- ulong length,count;
-+ int32_t chunk;
-+ u_int32_t length;
-+ int count;
-
- length=af->length;
-
-@@ -344,19 +346,26 @@
- {
- switch (af.comp) {
- case AF_PCM:
-+ break;
- return(lseek(af.fd,pos,mode));
- case AF_ALAW:
- case AF_MULAW:
-+ pos /= 2;
-+ break;
- return(lseek(af.fd,pos/2,mode));
- case AF_ADPCM:
-+ pos /= 4;
-+ break;
- return(lseek(af.fd,pos/4,mode));
-+ default:
-+ return(AF_ERROR);
- }
-- return(AF_ERROR);
-+ return(lseek(af.fd, mode == SEEK_SET ? pos + af.headoffs : pos, mode));
- }
-
- int riff_close(Audio_File af)
- {
-- if (riff_seek(af,0,SEEK_SET)==AF_ERROR) return(AF_ERROR);
-+ if (lseek(af.fd,0,SEEK_SET)) return(AF_ERROR);
-
- if (riff_new (&af)==AF_ERROR) return(AF_ERROR);
- return(close(af.fd));
diff --git a/audio/xwave/patches/patch-ak b/audio/xwave/patches/patch-ak
deleted file mode 100644
index 965a517de12..00000000000
--- a/audio/xwave/patches/patch-ak
+++ /dev/null
@@ -1,72 +0,0 @@
-$NetBSD: patch-ak,v 1.4 1999/12/25 23:58:59 wiz Exp $
---- FWF/FWF.rules.orig Thu Aug 13 01:27:07 1998
-+++ FWF/FWF.rules Fri Oct 22 15:13:20 1999
-@@ -23,13 +23,11 @@
- libdir/libname:: objlist @@\
- -@(if [ ! -f libdir/libname ]; then \ @@\
- $(MKDIRHIER) libdir ; \ @@\
-- echo Creating Library libdir/libname ; \ @@\
-- $(AR) libdir/libname ; \ @@\
-- RanLibrary(libdir/libname) ; \ @@\
- fi; exit 0) @@\
- @echo Adding objlist To Library libdir/libname @@\
- $(ARMERGE) libdir/libname objlist @@\
-- RanLibrary(libdir/libname)
-+ RanLibrary(libdir/libname) @@\
-+ sleep 1
- #endif /* AddToLibraryTarget */
-
- /*
-@@ -44,16 +42,6 @@
- #endif /* FileCopyWhenNeeded */
-
- /*
-- * RequireThisFileForDepend(file)
-- *
-- */
--#ifndef RequireThisFileForDepend
--#define RequireThisFileForDepend(file) @@\
--depend:: file @@\
--
--#endif /* RequireThisFileForDepend */
--
--/*
- * RequireThisFileForInit(file)
- *
- */
-@@ -146,7 +134,8 @@
- #define InstallLibraryFile(srcdir,lib,destdir) @@\
- install:: srcdir/lib @@\
- $(INSTALL) -c $(INSTLIBFLAGS) srcdir/lib destdir @@\
-- RanLibrary($(RANLIBINSTFLAGS) destdir/lib)
-+ RanLibrary($(RANLIBINSTFLAGS) destdir/lib) @@\
-+ sleep 1
- #endif /* InstallLibraryFile */
-
- /*
-@@ -244,18 +233,6 @@
- #endif /* ObjectRuleWithFlags */
-
- /*
-- * DependTargetWithFlags(flags,sources)
-- *
-- */
--#ifndef DependTargetWithFlags
--#define DependTargetWithFlags(flags,sources) @@\
--DependDependency() @@\
-- @@\
--depend:: @@\
-- $(DEPEND) -s "# DO NOT DELETE" -- flags -- sources
--#endif /* DependTargetWithFlags */
--
--/*
- * SqueakyCleanTarget()
- *
- */
-@@ -282,3 +259,6 @@
- #define SqueakyCleanSubdirs(dirs) @@\
- NamedSqueakyCleanSubdirs(squeakyclean,dirs)
- #endif
-+
-+DependSubdirs($(SUBDIRS))
-+
diff --git a/audio/xwave/patches/patch-al b/audio/xwave/patches/patch-al
deleted file mode 100644
index 41ffaed9e24..00000000000
--- a/audio/xwave/patches/patch-al
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-al,v 1.3 2002/09/25 06:37:20 jlam Exp $
-
---- config.site.BAK Sat Feb 21 19:55:25 1998
-+++ config.site Sat Feb 21 19:55:55 1998
-@@ -1,5 +1,8 @@
-
--EXTRA_INCLUDES=-I../ -I../include
-+EXTRA_INCLUDES=-I../ -I../include -I${X11BASE}/include
-
- XCOMM On sgi we need libaudio
- XCOMM OSLIBS=-laudio
-+
-+XCOMM On NetBSD we use OSS audio
-+OSLIBS=$(LIBOSSAUDIO)
diff --git a/audio/xwave/patches/patch-am b/audio/xwave/patches/patch-am
deleted file mode 100644
index d9dc4e7748d..00000000000
--- a/audio/xwave/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.2 1998/08/07 10:36:25 agc Exp $
-
---- src/Imakefile.distrib.BAK Sat Feb 21 20:59:35 1998
-+++ src/Imakefile.distrib Sat Feb 21 20:59:43 1998
-@@ -17,6 +17,8 @@
- LIBS= $(OSLIBS) $(XLIBS) $(AUDIOLIBS) -lm -lc
-
- NormalProgramTarget(xwave,$(OBJS),,$(LIBS),)
-+ComplexProgramTarget(xwave)
-+InstallAppDefaults(XWave)
-
- all:: $(PROGRAMS)
-
diff --git a/audio/xwave/patches/patch-an b/audio/xwave/patches/patch-an
deleted file mode 100644
index 9e14c48cbea..00000000000
--- a/audio/xwave/patches/patch-an
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-an,v 1.2 1998/08/07 10:36:25 agc Exp $
-
---- Imakefile.BAK Sat Feb 21 21:53:52 1998
-+++ Imakefile Sat Feb 21 21:56:04 1998
-@@ -2,13 +2,14 @@
- #define IHaveSubDirs
- #define PassCDebugFlags CDEBUGFLAGS='$(CDEBUGFLAGS)'
-
--SUBDIRS = ccitt adpcm2pcm ieee FWF src
-+SUBDIRS = ccitt adpcm2pcm ieee src
-+ALLSUBDIRS= FWF ${SUBDIRS}
-
--MakeSubdirs($(SUBDIRS))
-+MakeSubdirs($(ALLSUBDIRS))
- InstallSubdirs($(SUBDIRS))
--DependSubdirs($(SUBDIRS))
--CleanSubdirs($(SUBDIRS))
--MakefileSubdirs($(SUBDIRS))
-+DependSubdirs($(ALLSUBDIRS))
-+CleanSubdirs($(ALLSUBDIRS))
-+MakefileSubdirs($(ALLSUBDIRS))
-
- clean::
- @rm -rf lib include man
diff --git a/audio/xwave/patches/patch-ao b/audio/xwave/patches/patch-ao
deleted file mode 100644
index d02aabd7db4..00000000000
--- a/audio/xwave/patches/patch-ao
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ao,v 1.2 1998/08/07 10:36:25 agc Exp $
-
---- FWF/FWF.tmpl.orig Thu Jul 23 02:11:50 1998
-+++ FWF/FWF.tmpl Thu Jul 23 02:16:13 1998
-@@ -54,4 +54,4 @@
-
--XPM_LIBDIR =
--XPM_INCDIR =
-+XPM_LIBDIR = $(PREFIX)/lib
-+XPM_INCDIR = $(PREFIX)/include
- XPM_LIB = -lXpm
diff --git a/audio/xwave/patches/patch-ap b/audio/xwave/patches/patch-ap
deleted file mode 100644
index 15aea8dcf66..00000000000
--- a/audio/xwave/patches/patch-ap
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2001/11/18 15:03:39 itohy Exp $
-
---- src/aifc.h.orig Thu Aug 13 08:27:09 1998
-+++ src/aifc.h Sun Nov 18 21:05:29 2001
-@@ -1,5 +1,5 @@
-
--#define ID int
-+#define ID int32_t
- #define FORM 0x464F524D
- #define AIFF 0x41494646
- #define AIFC 0x41494643
-@@ -13,18 +13,18 @@
-
- typedef struct {
- ID form;
-- long length;
-+ int32_t length;
- ID type;
- } Aif_Form;
-
- typedef struct {
- ID type;
-- long length;
-+ int32_t length;
- } Aif_Chunk;
-
- typedef struct {
- short channels;
-- unsigned long s_frames;
-+ u_int32_t s_frames;
- short bps;
- double freq;
- ID comp_typ;
diff --git a/audio/xwave/patches/patch-aq b/audio/xwave/patches/patch-aq
deleted file mode 100644
index a2ab74e5c81..00000000000
--- a/audio/xwave/patches/patch-aq
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2001/11/18 15:03:39 itohy Exp $
-
---- src/riff.h.orig Thu Aug 13 08:27:10 1998
-+++ src/riff.h Sun Nov 18 21:10:34 2001
-@@ -17,20 +17,20 @@
- #define RIFF_IDVI_ADPCM 1024
-
- typedef struct {
-- long riff;
-- ulong length;
-- long wave;
-+ int32_t riff;
-+ u_int32_t length;
-+ int32_t wave;
- } RiffHeader;
-
- typedef struct {
-- long fmt;
-- ulong chunk_length;
-- short format;
-- short modus;
-- ulong freq;
-- ulong bpsec;
-- short bpspl;
-- short res;
-+ int32_t fmt;
-+ u_int32_t chunk_length;
-+ int16_t format;
-+ int16_t modus;
-+ u_int32_t freq;
-+ u_int32_t bpsec;
-+ int16_t bpspl;
-+ int16_t res;
- } FmtHeader;
-
- bool is_riff(int fd);
diff --git a/audio/xwave/patches/patch-ar b/audio/xwave/patches/patch-ar
deleted file mode 100644
index f204a61a497..00000000000
--- a/audio/xwave/patches/patch-ar
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2001/11/18 15:03:40 itohy Exp $
-
---- src/audio_file.c.orig Thu Aug 13 08:27:09 1998
-+++ src/audio_file.c Sun Nov 18 21:21:01 2001
-@@ -16,6 +16,7 @@
- #include "xwave.h"
- #include "xwave_widget.h"
- #include "audio_file.h"
-+#include "endian.h"
- #include "riff.h"
- #include "aifc.h"
- #include "au.h"
diff --git a/audio/xwave/patches/patch-as b/audio/xwave/patches/patch-as
deleted file mode 100644
index 57845942c8d..00000000000
--- a/audio/xwave/patches/patch-as
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.1 2005/10/03 13:30:20 joerg Exp $
-
---- src/types.h.orig 2005-07-22 18:54:48.000000000 +0000
-+++ src/types.h
-@@ -27,7 +27,7 @@
- typedef unsigned char byte;
- typedef byte bool;
-
--#ifdef FreeBSD
-+#if defined(FreeBSD) || defined(__DragonFly__)
- typedef unsigned long ulong;
- #endif
-
diff --git a/audio/xwave/patches/patch-at b/audio/xwave/patches/patch-at
deleted file mode 100644
index 42c2a513071..00000000000
--- a/audio/xwave/patches/patch-at
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-at,v 1.2 2005/10/09 15:04:14 joerg Exp $
-
---- src/misc.c.orig 2005-07-22 18:59:34.000000000 +0000
-+++ src/misc.c
-@@ -27,7 +27,7 @@
- #include <stdio.h>
- #include <dirent.h>
- #include <sys/stat.h>
--#include <sys/errno.h>
-+#include <errno.h>
- #include <X11/Intrinsic.h> /* Intrinsics Definitions */
- #include <X11/StringDefs.h> /* Standard Name-String definitions */
- #include <X11/Shell.h> /* Shell Definitions */
-@@ -294,7 +294,6 @@ char *get_wd(void)
- {
- static char *name;
- int i=MAX_NAMELENGTH;
-- extern int errno;
-
- while(True) {
- if ((name=calloc(i,1))==NULL) return(NULL);