Date: Mon, 28 Jul 2014 14:12:36 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363157 - in head/audio: ascd/files boodler/files btc/files cam cam/files cd-console/files cdplay cdplay/files cplay/files dagrab/files esound/files fcplay/files festdoc/files festival/... Message-ID: <201407281412.s6SECaP9081868@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Mon Jul 28 14:12:36 2014 New Revision: 363157 URL: http://svnweb.freebsd.org/changeset/ports/363157 QAT: https://qat.redports.org/buildarchive/r363157/ Log: Rename audio/ patch-xy patches to reflect the files they modify. Added: head/audio/ascd/files/patch-Imakefile - copied unchanged from r363150, head/audio/ascd/files/patch-ae head/audio/ascd/files/patch-faktory.c - copied unchanged from r363150, head/audio/ascd/files/patch-ag head/audio/ascd/files/patch-misc_config.h.default - copied unchanged from r363150, head/audio/ascd/files/patch-aa head/audio/ascd/files/patch-misc_dirs.h.default - copied unchanged from r363150, head/audio/ascd/files/patch-ab head/audio/boodler/files/patch-configure.py - copied unchanged from r363150, head/audio/boodler/files/patch-ab head/audio/boodler/files/patch-wrapper_boodler - copied unchanged from r363150, head/audio/boodler/files/patch-aa head/audio/btc/files/patch-btc.c - copied unchanged from r363150, head/audio/btc/files/patch-aa head/audio/cam/files/patch-sounds.c - copied unchanged from r363150, head/audio/cam/files/patch-ac head/audio/cd-console/files/patch-Makefile - copied unchanged from r363150, head/audio/cd-console/files/patch-aa head/audio/cd-console/files/patch-cd-console.cpp - copied unchanged from r363150, head/audio/cd-console/files/patch-ac head/audio/cd-console/files/patch-cd_ll_bsd.cpp - copied unchanged from r363150, head/audio/cd-console/files/patch-ab head/audio/cdplay/files/patch-cd.c - copied unchanged from r363150, head/audio/cdplay/files/patch-ab head/audio/cdplay/files/patch-cdplay.1 - copied unchanged from r363150, head/audio/cdplay/files/patch-ac head/audio/cdplay/files/patch-cdplay.h - copied unchanged from r363150, head/audio/cdplay/files/patch-ad head/audio/cdplay/files/patch-main.c - copied unchanged from r363150, head/audio/cdplay/files/patch-ae head/audio/cplay/files/patch-Makefile - copied unchanged from r363150, head/audio/cplay/files/patch-aa head/audio/dagrab/files/patch-Makefile - copied unchanged from r363150, head/audio/dagrab/files/patch-aa head/audio/dagrab/files/patch-dagrab.c - copied unchanged from r363150, head/audio/dagrab/files/patch-ab head/audio/esound/files/patch-Makefile.in - copied unchanged from r363150, head/audio/esound/files/patch-aa head/audio/esound/files/patch-esd.c - copied unchanged from r363150, head/audio/esound/files/patch-ac head/audio/esound/files/patch-esdlib.c - copied unchanged from r363150, head/audio/esound/files/patch-ad head/audio/fcplay/files/patch-AudioDriver.h - copied unchanged from r363150, head/audio/fcplay/files/patch-ab head/audio/fcplay/files/patch-POINTER - copied unchanged from r363150, head/audio/fcplay/files/patch-aa head/audio/fcplay/files/patch-configure - copied unchanged from r363150, head/audio/fcplay/files/patch-ac head/audio/festdoc/files/patch-festival_info_festival.info - copied unchanged from r363150, head/audio/festdoc/files/patch-aa head/audio/festival/files/patch-festival_config_modules_nas_audio.mak - copied unchanged from r363150, head/audio/festival/files/patch-ah head/audio/festival/files/patch-speech_tools_audio_nas.cc - copied unchanged from r363150, head/audio/festival/files/patch-ap head/audio/festival/files/patch-speech_tools_config_modules_nas_audio.mak - copied unchanged from r363150, head/audio/festival/files/patch-ag head/audio/festival/files/patch-speech_tools_include_EST_unix.h - copied unchanged from r363150, head/audio/festival/files/patch-ae head/audio/gkrellmms2/files/patch-Makefile - copied unchanged from r363150, head/audio/gkrellmms2/files/patch-aa head/audio/gkrellmvolume2/files/patch-Makefile - copied unchanged from r363150, head/audio/gkrellmvolume2/files/patch-aa head/audio/gmixer/files/patch-Makefile - copied unchanged from r363150, head/audio/gmixer/files/patch-aa head/audio/gsm/files/patch-inc_config.h - copied unchanged from r363150, head/audio/gsm/files/patch-aa head/audio/id3ren/files/patch-src_Makefile - copied unchanged from r363150, head/audio/id3ren/files/patch-aa head/audio/id3ren/files/patch-src_id3tag.c - copied unchanged from r363150, head/audio/id3ren/files/patch-ab head/audio/juke/files/patch-src_conf.c - copied unchanged from r363150, head/audio/juke/files/patch-ab head/audio/juke/files/patch-src_conf.h - copied unchanged from r363150, head/audio/juke/files/patch-aa head/audio/mp3wrap/files/patch-crc.c - copied unchanged from r363150, head/audio/mp3wrap/files/patch-aa head/audio/nas/files/patch-config_NetAudio.def - copied unchanged from r363150, head/audio/nas/files/patch-af head/audio/nas/files/patch-server_dda_voxware_auvoxware.c - copied unchanged from r363150, head/audio/nas/files/patch-ab head/audio/nas/files/patch_clients_audio_audial_audial.c - copied unchanged from r363150, head/audio/nas/files/patch-aa head/audio/nosefart/files/patch-Makefile - copied unchanged from r363150, head/audio/nosefart/files/patch-aa head/audio/nspmod/files/patch-Makefile - copied unchanged from r363150, head/audio/nspmod/files/patch-ab head/audio/nspmod/files/patch-dacio-linux.c - copied unchanged from r363150, head/audio/nspmod/files/patch-aa head/audio/nspmod/files/patch-dacio.h - copied unchanged from r363150, head/audio/nspmod/files/patch-ad head/audio/nspmod/files/patch-nspmod.c - copied unchanged from r363150, head/audio/nspmod/files/patch-ac head/audio/nspmod/files/patch-nspmod.h - copied unchanged from r363150, head/audio/nspmod/files/patch-ae head/audio/rplay/files/patch-Makefile.config.in - copied unchanged from r363150, head/audio/rplay/files/patch-ac head/audio/rplay/files/patch-doc_Makefile.in - copied unchanged from r363150, head/audio/rplay/files/patch-ad head/audio/rplay/files/patch-doc_RPLAY.texi - copied unchanged from r363150, head/audio/rplay/files/patch-ae head/audio/rplay/files/patch-doc_RPTP.texi - copied unchanged from r363150, head/audio/rplay/files/patch-af head/audio/rplay/files/patch-doc_librplay.texi - copied unchanged from r363150, head/audio/rplay/files/patch-ag head/audio/rplay/files/patch-doc_rplayd.8 - copied unchanged from r363150, head/audio/rplay/files/patch-ai head/audio/rplay/files/patch-doc_rplayd.texi - copied unchanged from r363150, head/audio/rplay/files/patch-ah head/audio/rplay/files/patch-librplay_Makefile.in - copied unchanged from r363150, head/audio/rplay/files/patch-aj head/audio/rplay/files/patch-rplayd_Makefile.in - copied unchanged from r363150, head/audio/rplay/files/patch-ab head/audio/rplay/files/patch-rplayd__audio__audio_FreeBSD.c - copied unchanged from r363150, head/audio/rplay/files/patch-an head/audio/rplay/files/patch-rplayd_sound.h - copied unchanged from r363150, head/audio/rplay/files/patch-ak head/audio/rplay/files/patch-rplayd_spool.c - copied unchanged from r363150, head/audio/rplay/files/patch-al head/audio/rplay/files/patch-rx_Makefile.in - copied unchanged from r363150, head/audio/rplay/files/patch-am head/audio/rsynth/files/patch-Makefile.in - copied unchanged from r363150, head/audio/rsynth/files/patch-ac head/audio/rsynth/files/patch-naplay.c - copied unchanged from r363150, head/audio/rsynth/files/patch-aa head/audio/s3mod/files/patch-Makefile - copied unchanged from r363150, head/audio/s3mod/files/patch-ab head/audio/s3mod/files/patch-config.h - copied unchanged from r363150, head/audio/s3mod/files/patch-ac head/audio/s3mod/files/patch-gus.c - copied unchanged from r363150, head/audio/s3mod/files/patch-ae head/audio/s3mod/files/patch-gus.h - copied unchanged from r363150, head/audio/s3mod/files/patch-af head/audio/s3mod/files/patch-main.c - copied unchanged from r363150, head/audio/s3mod/files/patch-ag head/audio/s3mod/files/patch-main.h - copied unchanged from r363150, head/audio/s3mod/files/patch-ah head/audio/s3mod/files/patch-mod.c - copied unchanged from r363150, head/audio/s3mod/files/patch-ai head/audio/s3mod/files/patch-play.c - copied unchanged from r363150, head/audio/s3mod/files/patch-aj head/audio/s3mod/files/patch-tables.h - copied unchanged from r363150, head/audio/s3mod/files/patch-ak head/audio/shout/files/patch-configure - copied unchanged from r363150, head/audio/shout/files/patch-ac head/audio/shout/files/patch-sock.c - copied unchanged from r363150, head/audio/shout/files/patch-aa head/audio/shout/files/patch-util.c - copied unchanged from r363150, head/audio/shout/files/patch-ab head/audio/splaytk/files/patch-splay-tk.tcl - copied unchanged from r363150, head/audio/splaytk/files/patch-aa head/audio/tclmidi/files/patch-Makefile.ins - copied unchanged from r363150, head/audio/tclmidi/files/patch-aa head/audio/tclmidi/files/patch-configure - copied unchanged from r363150, head/audio/tclmidi/files/patch-ab head/audio/tclmidi/files/patch-smf_SMFTrack.cxx - copied unchanged from r363150, head/audio/tclmidi/files/patch-ac head/audio/tosha/files/patch-tosha.c - copied unchanged from r363150, head/audio/tosha/files/patch-aa head/audio/xmcd/files/patch-Imakefile - copied unchanged from r363150, head/audio/xmcd/files/patch-ab head/audio/xmcd/files/patch-cda_d__Imakefile - copied unchanged from r363150, head/audio/xmcd/files/patch-ac head/audio/xmcd/files/patch-cdda_d__Imakefile - copied unchanged from r363150, head/audio/xmcd/files/patch-ad head/audio/xmcd/files/patch-cdda_d__if_flac.c - copied unchanged from r363150, head/audio/xmcd/files/patch-ak head/audio/xmcd/files/patch-cdda_d__pthr.c - copied unchanged from r363150, head/audio/xmcd/files/patch-ah head/audio/xmcd/files/patch-cddb_d__Imakefile - copied unchanged from r363150, head/audio/xmcd/files/patch-aj head/audio/xmcd/files/patch-libdi_d__config.sh - copied unchanged from r363150, head/audio/xmcd/files/patch-ai head/audio/xmcd/files/patch-util_d__Imakefile - copied unchanged from r363150, head/audio/xmcd/files/patch-af head/audio/xmcd/files/patch-xmcd_d__Imakefile - copied unchanged from r363150, head/audio/xmcd/files/patch-aa head/audio/xmix/files/patch-Imakefile - copied unchanged from r363150, head/audio/xmix/files/patch-aa head/audio/xmix/files/patch-xmix.c - copied unchanged from r363150, head/audio/xmix/files/patch-ab head/audio/xmixer/files/patch-xmixer.man - copied unchanged from r363150, head/audio/xmixer/files/patch-af head/audio/xmms-mailnotify/files/patch-mailnotify.c_1 - copied unchanged from r363150, head/audio/xmms-mailnotify/files/patch-aa head/audio/xmms-mailnotify/files/patch-mailnotify.c_2 - copied unchanged from r363150, head/audio/xmms-mailnotify/files/patch-ab head/audio/xmms-mailnotify/files/patch-mailnotify.c_3 - copied unchanged from r363150, head/audio/xmms-mailnotify/files/patch-ac head/audio/xmradio/files/patch-Imakefile - copied unchanged from r363150, head/audio/xmradio/files/patch-aa head/audio/xmradio/files/patch-analyzer.c - copied unchanged from r363150, head/audio/xmradio/files/patch-ac head/audio/xmradio/files/patch-radio.c - copied unchanged from r363150, head/audio/xmradio/files/patch-ad head/audio/xmradio/files/patch-sample.c - copied unchanged from r363150, head/audio/xmradio/files/patch-ab head/audio/xwave/files/patch-FWF_Imakefile - copied unchanged from r363150, head/audio/xwave/files/patch-ap head/audio/xwave/files/patch-FWF_src_Imakefile - copied unchanged from r363150, head/audio/xwave/files/patch-at head/audio/xwave/files/patch-config.site - copied unchanged from r363150, head/audio/xwave/files/patch-al head/audio/xwave/files/patch-src_Imakefile - copied unchanged from r363150, head/audio/xwave/files/patch-aa head/audio/xwave/files/patch-src_XWave - copied unchanged from r363150, head/audio/xwave/files/patch-ar head/audio/xwave/files/patch-src__record_dialog.c - copied unchanged from r363150, head/audio/xwave/files/patch-ai head/audio/xwave/files/patch-src_aifc.c - copied unchanged from r363150, head/audio/xwave/files/patch-ab head/audio/xwave/files/patch-src_au.c - copied unchanged from r363150, head/audio/xwave/files/patch-ac head/audio/xwave/files/patch-src_audio.c - copied unchanged from r363150, head/audio/xwave/files/patch-ad head/audio/xwave/files/patch-src_button.c - copied unchanged from r363150, head/audio/xwave/files/patch-ae head/audio/xwave/files/patch-src_edit.c - copied unchanged from r363150, head/audio/xwave/files/patch-as head/audio/xwave/files/patch-src_effects.c - copied unchanged from r363150, head/audio/xwave/files/patch-af head/audio/xwave/files/patch-src_endian.c - copied unchanged from r363150, head/audio/xwave/files/patch-ag head/audio/xwave/files/patch-src_graphics.c - copied unchanged from r363150, head/audio/xwave/files/patch-ah head/audio/xwave/files/patch-src_riff.c - copied unchanged from r363150, head/audio/xwave/files/patch-aj head/audio/xwave/files/patch-src_types.h - copied unchanged from r363150, head/audio/xwave/files/patch-aq Deleted: head/audio/ascd/files/patch-aa head/audio/ascd/files/patch-ab head/audio/ascd/files/patch-ae head/audio/ascd/files/patch-ag head/audio/boodler/files/patch-aa head/audio/boodler/files/patch-ab head/audio/btc/files/patch-aa head/audio/cam/files/patch-ac head/audio/cd-console/files/patch-aa head/audio/cd-console/files/patch-ab head/audio/cd-console/files/patch-ac head/audio/cdplay/files/patch-ab head/audio/cdplay/files/patch-ac head/audio/cdplay/files/patch-ad head/audio/cdplay/files/patch-ae head/audio/cplay/files/patch-aa head/audio/dagrab/files/patch-aa head/audio/dagrab/files/patch-ab head/audio/esound/files/patch-aa head/audio/esound/files/patch-ac head/audio/esound/files/patch-ad head/audio/fcplay/files/patch-aa head/audio/fcplay/files/patch-ab head/audio/fcplay/files/patch-ac head/audio/festdoc/files/patch-aa head/audio/festival/files/patch-ae head/audio/festival/files/patch-ag head/audio/festival/files/patch-ah head/audio/festival/files/patch-ap head/audio/gkrellmms2/files/patch-aa head/audio/gkrellmvolume2/files/patch-aa head/audio/gmixer/files/patch-aa head/audio/gsm/files/patch-aa head/audio/id3ren/files/patch-aa head/audio/id3ren/files/patch-ab head/audio/juke/files/patch-aa head/audio/juke/files/patch-ab head/audio/mp3wrap/files/patch-aa head/audio/nas/files/patch-aa head/audio/nas/files/patch-ab head/audio/nas/files/patch-af head/audio/nosefart/files/patch-aa head/audio/nspmod/files/patch-aa head/audio/nspmod/files/patch-ab head/audio/nspmod/files/patch-ac head/audio/nspmod/files/patch-ad head/audio/nspmod/files/patch-ae head/audio/rplay/files/patch-ab head/audio/rplay/files/patch-ac head/audio/rplay/files/patch-ad head/audio/rplay/files/patch-ae head/audio/rplay/files/patch-af head/audio/rplay/files/patch-ag head/audio/rplay/files/patch-ah head/audio/rplay/files/patch-ai head/audio/rplay/files/patch-aj head/audio/rplay/files/patch-ak head/audio/rplay/files/patch-al head/audio/rplay/files/patch-am head/audio/rplay/files/patch-an head/audio/rsynth/files/patch-aa head/audio/rsynth/files/patch-ac head/audio/s3mod/files/patch-ab head/audio/s3mod/files/patch-ac head/audio/s3mod/files/patch-ae head/audio/s3mod/files/patch-af head/audio/s3mod/files/patch-ag head/audio/s3mod/files/patch-ah head/audio/s3mod/files/patch-ai head/audio/s3mod/files/patch-aj head/audio/s3mod/files/patch-ak head/audio/shout/files/patch-aa head/audio/shout/files/patch-ab head/audio/shout/files/patch-ac head/audio/splaytk/files/patch-aa head/audio/tclmidi/files/patch-aa head/audio/tclmidi/files/patch-ab head/audio/tclmidi/files/patch-ac head/audio/tosha/files/patch-aa head/audio/xmcd/files/patch-aa head/audio/xmcd/files/patch-ab head/audio/xmcd/files/patch-ac head/audio/xmcd/files/patch-ad head/audio/xmcd/files/patch-af head/audio/xmcd/files/patch-ah head/audio/xmcd/files/patch-ai head/audio/xmcd/files/patch-aj head/audio/xmcd/files/patch-ak head/audio/xmix/files/patch-aa head/audio/xmix/files/patch-ab head/audio/xmixer/files/patch-af head/audio/xmms-mailnotify/files/patch-aa head/audio/xmms-mailnotify/files/patch-ab head/audio/xmms-mailnotify/files/patch-ac head/audio/xmradio/files/patch-aa head/audio/xmradio/files/patch-ab head/audio/xmradio/files/patch-ac head/audio/xmradio/files/patch-ad head/audio/xwave/files/patch-aa head/audio/xwave/files/patch-ab head/audio/xwave/files/patch-ac head/audio/xwave/files/patch-ad head/audio/xwave/files/patch-ae head/audio/xwave/files/patch-af head/audio/xwave/files/patch-ag head/audio/xwave/files/patch-ah head/audio/xwave/files/patch-ai head/audio/xwave/files/patch-aj head/audio/xwave/files/patch-al head/audio/xwave/files/patch-ap head/audio/xwave/files/patch-aq head/audio/xwave/files/patch-ar head/audio/xwave/files/patch-as head/audio/xwave/files/patch-at Modified: head/audio/cam/Makefile head/audio/cdplay/Makefile head/audio/mp3wrap/Makefile head/audio/rsynth/Makefile head/audio/shout/Makefile Copied: head/audio/ascd/files/patch-Imakefile (from r363150, head/audio/ascd/files/patch-ae) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/ascd/files/patch-Imakefile Mon Jul 28 14:12:36 2014 (r363157, copy of r363150, head/audio/ascd/files/patch-ae) @@ -0,0 +1,16 @@ +--- Imakefile.orig Sun Sep 5 08:24:23 1999 ++++ Imakefile Wed Aug 2 04:41:16 2000 +@@ -5,11 +5,10 @@ + BINDIR = CBINDIR + MANDIR = CMANDIR + THEMESDIR = CTHDIR +-MOREFLAGS = -I/usr/local/include -I/usr/X11R6/include -I. +-CCOPTIONS = $(MOREFLAGS) ++EXTRA_INCLUDES = -I. + SYS_LIBRARIES = $(XLIB) -lXpm + +-LOCAL_LIBRARIES = -L../libworkman -lworkman -L/usr/local/lib ++LOCAL_LIBRARIES = -lworkman + + SRCS_OPT1 = + SRCS_OPT2 = Copied: head/audio/ascd/files/patch-faktory.c (from r363150, head/audio/ascd/files/patch-ag) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/ascd/files/patch-faktory.c Mon Jul 28 14:12:36 2014 (r363157, copy of r363150, head/audio/ascd/files/patch-ag) @@ -0,0 +1,14 @@ +--- /usr/ports/audio/ascd/work/ascd-0.13.2/faktory.c Mon Jul 5 20:52:38 1999 ++++ faktory.c Sat Sep 2 17:26:31 2000 +@@ -58,9 +58,9 @@ + unsigned int pos = 0; + + if ((strlen(ligne) > 0) && (ligne[0] != '#')) { +- while ((ligne[pos] != ' ') && (ligne[pos] != 9)) pos++; ++ while (ligne[pos] && (ligne[pos] != ' ') && (ligne[pos] != 9)) pos++; + tes_sncpy(key, ligne, pos); +- while (((ligne[pos] == ' ') || (ligne[pos] == 9)) && (pos < strlen(ligne))) pos++; ++ while (ligne[pos] && ((ligne[pos] == ' ') || (ligne[pos] == 9))) pos++; + if (pos < strlen(ligne)) strcpy(arguments, ligne + pos); + else strcpy(arguments, ""); + if (debug > 2) fprintf(stderr,"++ input: [%s]\n key: [%s]\n args: [%s]\n", ligne, key, arguments); Copied: head/audio/ascd/files/patch-misc_config.h.default (from r363150, head/audio/ascd/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/ascd/files/patch-misc_config.h.default Mon Jul 28 14:12:36 2014 (r363157, copy of r363150, head/audio/ascd/files/patch-aa) @@ -0,0 +1,10 @@ +--- misc/config.h.default.orig Sun Aug 8 21:23:05 1999 ++++ misc/config.h.default Sun Aug 8 21:23:38 1999 +@@ -1,5 +1,5 @@ + #define PACKAGE "ascd" + #define DEFAULT_COLOR "#2FAFAF" + #define DEFAULT_BGCOLOR "#000000" +-#define DEFAULTDEVICE "/dev/cdrom" +-#define THDIR "/usr/local/share/AScd" ++#define DEFAULTDEVICE "/dev/acd0c" ++#define THDIR "%%PREFIX%%/share/ascd" Copied: head/audio/ascd/files/patch-misc_dirs.h.default (from r363150, head/audio/ascd/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/ascd/files/patch-misc_dirs.h.default Mon Jul 28 14:12:36 2014 (r363157, copy of r363150, head/audio/ascd/files/patch-ab) @@ -0,0 +1,9 @@ +--- misc/dirs.h.default.orig Sun Aug 8 21:23:13 1999 ++++ misc/dirs.h.default Sun Aug 8 21:23:56 1999 +@@ -1,3 +1,3 @@ +-#define CBINDIR /usr/local/bin +-#define CMANDIR /usr/local/man/man1 +-#define CTHDIR /usr/local/share/AScd ++#define CBINDIR %%PREFIX%%/bin ++#define CMANDIR %%PREFIX%%/man/man1 ++#define CTHDIR %%PREFIX%%/share/ascd Copied: head/audio/boodler/files/patch-configure.py (from r363150, head/audio/boodler/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/boodler/files/patch-configure.py Mon Jul 28 14:12:36 2014 (r363157, copy of r363150, head/audio/boodler/files/patch-ab) @@ -0,0 +1,31 @@ +--- configure.py.orig Sat Jan 24 18:44:11 2004 ++++ configure.py Sat Jan 24 18:46:37 2004 +@@ -7,7 +7,7 @@ + import getopt + + usagemessage = 'usage: ' + sys.argv[0] + ' [-d NAME] [-i] [-I /dir/path] [-L /dir/path] [-l]' +-usagemessage = usagemessage + '\n or: ' + sys.argv[0] + ' [--driver NAME] [--integer] [--include /dir/path] [--lib /dir/path] [--list]' ++usagemessage = usagemessage + '\n or: ' + sys.argv[0] + ' [--driver NAME] [--integer] [--include /dir/path] [--lib /dir/path] [--list] [--PIC]' + + helpmessage = 'Boodler configuration script\n\n' + usagemessage + ''' + +@@ -68,8 +68,8 @@ + ''' + + try: +- (opts, args) = getopt.getopt(sys.argv[1:], 'd:I:L:lih', +- ['driver=', 'include=', 'lib=', 'list', 'integer', 'help']) ++ (opts, args) = getopt.getopt(sys.argv[1:], 'd:I:L:lihP', ++ ['driver=', 'include=', 'lib=', 'list', 'integer', 'help', 'PIC']) + except getopt.error, ex: + print (sys.argv[0] + ':'), str(ex) + print usagemessage +@@ -101,6 +101,8 @@ + extraheaders.append(opval) + if (opname == '--lib' or opname == '-L'): + extralibs.append(opval) ++ if (opname == '--PIC' or opname == '-P'): ++ cflagopts = cflagopts + ' -fPIC' + + headerpath = extraheaders + headerpath + libpath = extralibs + libpath Copied: head/audio/boodler/files/patch-wrapper_boodler (from r363150, head/audio/boodler/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/boodler/files/patch-wrapper_boodler Mon Jul 28 14:12:36 2014 (r363157, copy of r363150, head/audio/boodler/files/patch-aa) @@ -0,0 +1,12 @@ +diff -ruN wrapper.orig/boodler wrapper/boodler +--- wrapper.orig/boodler Wed Dec 31 19:00:00 1969 ++++ wrapper/boodler Tue Dec 30 14:46:19 2003 +@@ -0,0 +1,8 @@ ++#!/bin/sh ++ ++booroot=/home/USER/boodler ++ ++export BOODLER_SOUND_PATH=${booroot}/boodler-snd/ ++export BOODLER_EFFECTS_PATH=${booroot}/effects/ ++ ++python2 ${booroot}/boodler.py "$@" Copied: head/audio/btc/files/patch-btc.c (from r363150, head/audio/btc/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/btc/files/patch-btc.c Mon Jul 28 14:12:36 2014 (r363157, copy of r363150, head/audio/btc/files/patch-aa) @@ -0,0 +1,20 @@ +--- btc.c.orig Sat Oct 2 00:24:02 1993 ++++ btc.c Mon Jul 26 16:40:04 2004 +@@ -705,7 +705,7 @@ + /* + * GLOBALS + */ +-UINT max_line_length; /* Length of line in characters */ ++UINT max_line_length, /* Length of line in characters */ + num_of_lines_read; /* Number of lines read from file */ + + /* +@@ -1583,7 +1583,7 @@ + + #if FONT == NO_CUSTOM_FONT + fprintf( outfile, "\ +- || Capitol notes are dotted notes (1.5 x duration)\n\ ++ || Capital notes are dotted notes (1.5 x duration)\n\ + ||\n" ); + #endif + Modified: head/audio/cam/Makefile ============================================================================== --- head/audio/cam/Makefile Mon Jul 28 14:10:10 2014 (r363156) +++ head/audio/cam/Makefile Mon Jul 28 14:12:36 2014 (r363157) @@ -6,11 +6,12 @@ PORTVERSION= 1.02 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= apps/sound/mixers -EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Cpu's Audio Mixer [curses based] +USES= tar:tgz + MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" \ BINDIR="${PREFIX}/bin" \ MANDIR="${MAN1PREFIX}/man/man1" \ Copied: head/audio/cam/files/patch-sounds.c (from r363150, head/audio/cam/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/cam/files/patch-sounds.c Mon Jul 28 14:12:36 2014 (r363157, copy of r363150, head/audio/cam/files/patch-ac) @@ -0,0 +1,21 @@ +diff -ru ../cam-1.02-virgin/sounds.c ./sounds.c +--- ../cam-1.02-virgin/sounds.c Mon Oct 21 13:33:55 1996 ++++ ./sounds.c Sun Nov 10 12:20:22 1996 +@@ -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); Copied: head/audio/cd-console/files/patch-Makefile (from r363150, head/audio/cd-console/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/cd-console/files/patch-Makefile Mon Jul 28 14:12:36 2014 (r363157, copy of r363150, head/audio/cd-console/files/patch-aa) @@ -0,0 +1,62 @@ +--- Makefile.orig Sat Aug 25 11:09:00 2001 ++++ Makefile Mon Jun 3 19:55:53 2002 +@@ -5,43 +5,46 @@ + # very welcome). + + # for linux +-DEFS = -DOS_LINUX +-EXTRA_OBJS = cd_ll_linux.o ++#DEFS = -DOS_LINUX ++#EXTRA_OBJS = cd_ll_linux.o + + # for bsd. only tested on freebsd +-#DEFS = -DOS_BSD +-#EXTRA_OBJS = cd_ll_bsd.o +- ++DEFS = -DOS_BSD ++EXTRA_OBJS = cd_ll_bsd.o ++CDDEVICE=\"/dev/cdrom\" + + # you shouldn't have to change anything below this line + +- ++BINPATH=${PREFIX}/bin/ + OBJS=cd-console.o cd.o $(EXTRA_OBJS) + LIBS = -lncurses + + # common +-CFLAGS=-O2 -Wall $(DEFS) ++CFLAGS+= $(DEFS) + #CFLAGS=-g -Wall $(DEFS) +-CC = gcc ++#CC = gcc + + all: + make cd-console + strip cd-console + + cd-console: $(OBJS) +- $(CC) $(OBJS) $(LIBS) -o cd-console $(CFLAGS) ++ $(CXX) $(OBJS) $(LIBS) -o cd-console $(CFLAGS) + + cd-console.o: cd.h cd-console.cpp +- $(CC) -c cd-console.cpp $(CFLAGS) ++ $(CXX) -c cd-console.cpp $(CFLAGS) + + cd_ll_linux.o: cd_ll.h cd_ll_linux.h cd_ll_linux.cpp +- $(CC) -c cd_ll_linux.cpp $(CFLAGS) ++ $(CXX) -c cd_ll_linux.cpp $(CFLAGS) + + cd_ll_bsd.o: cd_ll.h cd_ll_bsd.h cd_ll_bsd.cpp +- $(CC) -c cd_ll_bsd.cpp $(CFLAGS) ++ $(CXX) -c -DDEVICE=$(CDDEVICE) cd_ll_bsd.cpp $(CFLAGS) + + cd.o: cd.h cd.cpp +- $(CC) -c cd.cpp $(CFLAGS) ++ $(CXX) -c cd.cpp $(CFLAGS) + + clean: + rm -f $(OBJS) cd-console ++ ++install: ++ @$(BSD_INSTALL_PROGRAM) cd-console $(BINPATH) Copied: head/audio/cd-console/files/patch-cd-console.cpp (from r363150, head/audio/cd-console/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/cd-console/files/patch-cd-console.cpp Mon Jul 28 14:12:36 2014 (r363157, copy of r363150, head/audio/cd-console/files/patch-ac) @@ -0,0 +1,8 @@ +--- cd-console.cpp.orig Mon Jun 3 19:46:12 2002 ++++ cd-console.cpp Mon Jun 3 19:46:01 2002 +@@ -1,4 +1,5 @@ + #include <stdlib.h> ++#include <string.h> + #include <unistd.h> + + #ifdef OS_BSD Copied: head/audio/cd-console/files/patch-cd_ll_bsd.cpp (from r363150, head/audio/cd-console/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/cd-console/files/patch-cd_ll_bsd.cpp Mon Jul 28 14:12:36 2014 (r363157, copy of r363150, head/audio/cd-console/files/patch-ab) @@ -0,0 +1,13 @@ +--- cd_ll_bsd.cpp.orig Sat Aug 25 14:09:00 2001 ++++ cd_ll_bsd.cpp Sat Oct 26 21:16:54 2002 +@@ -10,7 +10,9 @@ + #include "cd_ll_bsd.h" + + // the cd-rom device file +-#define DEVICE "/dev/acd0c" ++#ifndef DEVICE ++#define DEVICE "/dev/cdrom" ++#endif + + cd_ll_bsd::cd_ll_bsd() + : m_fd(-1) Modified: head/audio/cdplay/Makefile ============================================================================== --- head/audio/cdplay/Makefile Mon Jul 28 14:10:10 2014 (r363156) +++ head/audio/cdplay/Makefile Mon Jul 28 14:12:36 2014 (r363157) @@ -30,6 +30,6 @@ pre-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/cdplay ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/cdplay.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/cdplay.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 .include <bsd.port.mk> Copied: head/audio/cdplay/files/patch-cd.c (from r363150, head/audio/cdplay/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/cdplay/files/patch-cd.c Mon Jul 28 14:12:36 2014 (r363157, copy of r363150, head/audio/cdplay/files/patch-ab) @@ -0,0 +1,143 @@ + +$FreeBSD$ + +--- cd.c.orig Mon May 19 15:44:40 2003 ++++ cd.c Mon May 19 15:53:44 2003 +@@ -98,8 +98,16 @@ + cd_play.end_s=cdinfo.s_sec[cdinfo.l_track-1]; + cd_play.end_f=cdinfo.s_frame[cdinfo.l_track-1]; + +- if(ioctl (cd_fd, CDIOCPLAYMSF, (char *) &cd_play)<0) +- per(); ++ if(ioctl (cd_fd, CDIOCPLAYMSF, (char *) &cd_play)<0) { ++ /* Hack for IDE CD-ROMs */ ++ if (cd_play.start_s < 2) { ++ cd_play.start_s=2; ++ if(ioctl (cd_fd, CDIOCPLAYMSF, (char *) &cd_play)<0) ++ per(); ++ } else ++ per(); ++ } ++ cdinfo.pause=0; + } + + /* Skips one track forward */ +@@ -111,7 +119,7 @@ + /* Quess */ + void prev(void) + { +- if(cdinfo.c_sec<1) ++ if(cdinfo.c_sec<4) + play_track(cdinfo.c_track-1); + else play_track(cdinfo.c_track); + } +@@ -141,17 +149,59 @@ + } + } + ++/* Softly pauses the cd, or unpauses, as appropriate */ ++void cdsoftpause(void) ++{ ++ struct ioc_vol real_vol, cur_vol; ++ int i; ++ ++ if(ioctl(cd_fd,CDIOCGETVOL,(char *) &real_vol)) per(); ++ cur_vol = real_vol; ++ ++ if(cdinfo.pause){ ++ message="continue"; ++ memset (cur_vol.vol, 0, sizeof(cur_vol.vol)); ++ if(ioctl(cd_fd,CDIOCSETVOL,(char *) &cur_vol)) per(); ++ if(ioctl(cd_fd,CDIOCRESUME)<0) per(); else cdinfo.pause=0; ++ for (i=0; i<20; usleep(21), i++) { ++ cur_vol.vol[0] += (real_vol.vol[0] / 20); ++ cur_vol.vol[1] += (real_vol.vol[1] / 20); ++ cur_vol.vol[2] += (real_vol.vol[2] / 20); ++ cur_vol.vol[3] += (real_vol.vol[3] / 20); ++ if(ioctl(cd_fd,CDIOCSETVOL,(char *) &cur_vol)) per(); ++ } ++ if(ioctl(cd_fd,CDIOCSETVOL,(char *) &real_vol)) per(); ++ } ++ else { ++ message="pause"; ++ for (i=0; i<20; usleep(21), i++) { ++ cur_vol.vol[0] -= (real_vol.vol[0] / 20); ++ cur_vol.vol[1] -= (real_vol.vol[1] / 20); ++ cur_vol.vol[2] -= (real_vol.vol[2] / 20); ++ cur_vol.vol[3] -= (real_vol.vol[3] / 20); ++ if(ioctl(cd_fd,CDIOCSETVOL,(char *) &cur_vol)) per(); ++ } ++ if(ioctl (cd_fd, CDIOCPAUSE)<0) per(); else cdinfo.pause=1; ++ if(ioctl (cd_fd, CDIOCSETVOL,(char *) &real_vol)) per(); ++ } ++} ++ + /* Huge kludge */ +-void ff(void) ++void ff(int n_times) + { ++ int secs; + struct ioc_play_msf cd_play; + +- if(cdinfo.c_seca%60+5>=60){ +- cd_play.start_s=((cdinfo.c_seca%60)+5)%60; ++ secs=4*n_times; ++ ++ if (secs > 59) secs=59; ++ ++ if(cdinfo.c_seca%60+secs>=60){ ++ cd_play.start_s=((cdinfo.c_seca%60)+secs)%60; + cd_play.start_m=cdinfo.c_seca/60+1; + } + else { +- cd_play.start_s=(cdinfo.c_seca%60)+5; ++ cd_play.start_s=(cdinfo.c_seca%60)+secs; + cd_play.start_m=cdinfo.c_seca/60; + } + cd_play.start_f=1; +@@ -160,19 +210,25 @@ + cd_play.end_f=cdinfo.s_frame[cdinfo.l_track-1]; + + if(ioctl(cd_fd,CDIOCPLAYMSF,(char *) &cd_play)<0) per(); ++ cdinfo.pause=0; + } + + /* Hi mom!! */ +-void rew(void) ++void rew(int n_times) + { ++ int secs; + struct ioc_play_msf cd_play; + +- if(cdinfo.c_seca%60-5<0){ +- cd_play.start_s=((cdinfo.c_seca%60)-5)+60; ++ secs=4*n_times; ++ ++ if (secs > 59) secs=59; ++ ++ if(cdinfo.c_seca%60-secs<0){ ++ cd_play.start_s=((cdinfo.c_seca%60)-secs)+60; + cd_play.start_m=cdinfo.c_seca/60-1; + } + else { +- cd_play.start_s=(cdinfo.c_seca%60)-5; ++ cd_play.start_s=(cdinfo.c_seca%60)-secs; + cd_play.start_m=cdinfo.c_seca/60; + } + cd_play.start_f=1; +@@ -181,6 +237,7 @@ + cd_play.end_f=cdinfo.s_frame[cdinfo.l_track-1]; + + if(ioctl(cd_fd,CDIOCPLAYMSF,(char *) &cd_play)<0) per(); ++ cdinfo.pause=0; + } + + /* Spit cd out */ +@@ -192,6 +249,7 @@ + per(); + close(cd_fd); + cdinfo.eject=1; ++ cdinfo.pause=1; + } + + Copied: head/audio/cdplay/files/patch-cdplay.1 (from r363150, head/audio/cdplay/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/cdplay/files/patch-cdplay.1 Mon Jul 28 14:12:36 2014 (r363157, copy of r363150, head/audio/cdplay/files/patch-ac) @@ -0,0 +1,55 @@ +diff -ur ../cdplay-0.92.orig/cdplay.1 ./cdplay.1 +--- ../cdplay-0.92.orig/cdplay.1 Fri Nov 7 20:13:21 1997 ++++ ./cdplay.1 Sat Jun 27 00:29:34 1998 +@@ -35,15 +35,14 @@ + ] + .SH DESCRIPTION + .B cdplay +-plays audio cd's with a confortable console user interface. +-Supports only SCSI CD-ROM drives. ++plays audio cd's with a comfortable console user interface. + .SH OPTIONS + .TP + .BR \-d " device" + Uses + .B device +-instead of /dev/rcd0a witch it uses by default. (unless defined otherwise +-while compiling) ++instead of /dev/rcd0a which it uses by default (unless defined otherwise ++while compiling). + .TP + .BR -h + Display a brief help message. +@@ -59,6 +58,9 @@ + Space + Pause. If cd is already on pause continues. + .TP ++\'P\' ++Pause (or unpause) abruptly. ++.TP + \'e\' + Eject. Spits the disc out of your drive. + .TP +@@ -79,14 +81,18 @@ + .TP + \'q\' + Quit. Exit the program. ++.SH ENVIRONMENT ++.TP ++CDROM ++The cd device to use if one isn't specified with the -d flag. + .SH NOTES +-If someone gets this to work with IDE drive please let me know. Currently +-tested ONLY with FreeBSD and NetBSD. Writen for FreeBSD and some features ++Currently ++tested ONLY with FreeBSD and NetBSD. Written for FreeBSD and some features + may not work with NetBSD, OpenBSD or BSDi. Don't think it'll work with linux + or some SYSV Unix's. + .SH BUGS +-Yes. I know it does'nt work with your IDE drive. And I also know that it +-does'nt work with your old SCSI drive. ++Yes, I know that it ++doesn't work with your old SCSI drive. + .SH AUTHOR + .br + Copyright (C) 1997 Copied: head/audio/cdplay/files/patch-cdplay.h (from r363150, head/audio/cdplay/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/cdplay/files/patch-cdplay.h Mon Jul 28 14:12:36 2014 (r363157, copy of r363150, head/audio/cdplay/files/patch-ad) @@ -0,0 +1,25 @@ + +$FreeBSD$ + +--- ./cdplay.h.orig Mon May 19 15:44:41 2003 ++++ ./cdplay.h Mon May 19 15:55:12 2003 +@@ -71,8 +71,9 @@ + void prev(void); + void stop(void); + void cdpause(void); +-void ff(void); +-void rew(void); ++void cdsoftpause(void); ++void ff(int); ++void rew(int); + void eject(void); + + /* Terminal related functions */ +@@ -90,6 +91,7 @@ + void hs_winch(void); + void do_exit(int); + void do_stop(void); ++void getcommand(char *command, int *repetivity); + + /* Awesome!!1!!1! 2 sound functions */ + void more_vol(void); Copied: head/audio/cdplay/files/patch-main.c (from r363150, head/audio/cdplay/files/patch-ae) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/cdplay/files/patch-main.c Mon Jul 28 14:12:36 2014 (r363157, copy of r363150, head/audio/cdplay/files/patch-ae) @@ -0,0 +1,85 @@ + +$FreeBSD$ + +--- ./main.c.orig Mon May 19 15:44:41 2003 ++++ ./main.c Mon May 19 15:55:24 2003 +@@ -35,11 +35,14 @@ + int main(int argc, char **argv) + { + char cmd[1]; ++ int repetivity; + fd_set rset; + struct timeval stime; + + /* Parse arguments */ +- cd_device=DEVICE; ++ cd_device=getenv("CDROM"); ++ if (cd_device==NULL) ++ cd_device=DEVICE; + if(argc>1 && !strcmp(argv[1],"-d")) + cd_device=argv[2]; + else if(argc>1) +@@ -68,19 +71,20 @@ + + while(1){ + if(select(1,&rset,(fd_set *) 0,(fd_set *) 0,&stime)>0) { +- read(STDIN_FILENO,cmd,FD_SETSIZE); +- ++ getcommand(&cmd[0], &repetivity); ++ + if(cmd[0]=='p'){message="play";play_track(1);} + else if(cmd[0]=='F'){message="next";next();} + else if(cmd[0]=='R'){message="prev";prev();} +- else if(cmd[0]=='f'){message="ff";ff();} +- else if(cmd[0]=='r'){message="rew";rew();} ++ else if(cmd[0]=='f'){message="ff";ff(repetivity);} ++ else if(cmd[0]=='r'){message="rew";rew(repetivity);} + else if(cmd[0]=='s'){message="stop";stop();} +- else if(cmd[0]=='e'){message="eject";eject();} +- else if(cmd[0]==' ') cdpause(); ++ else if(cmd[0]=='E'){message="eject";eject();} ++ else if(cmd[0]==' ') cdsoftpause(); + else if(cmd[0]=='+'){message="more vol";more_vol();} + else if(cmd[0]=='-'){message="less vol";less_vol();} + else if(cmd[0]=='q'){message="bye!";do_exit(0);} ++ else if(cmd[0]=='P') cdpause(); + } + update_cdinfo(); + move_up(5); +@@ -90,6 +94,36 @@ + } + + exit(0); ++} ++ ++void getcommand(char *command, int *repetivity) ++{ ++ static char stored_command; ++ int n; ++ ++ fcntl(STDIN_FILENO, F_SETFL, O_NONBLOCK); ++ ++ if (stored_command) { ++ *command=stored_command; ++ } else { ++ n=read(STDIN_FILENO,command,1); ++ if (n <= 0) { ++ *command='\0'; ++ *repetivity=0; ++ return; ++ } ++ } ++ ++ *repetivity=1; ++ while (read(STDIN_FILENO, &stored_command, 1) > 0) { ++ if (stored_command == *command) { ++ (*repetivity)++; ++ } else { ++ return; ++ } ++ } ++ stored_command='\0'; ++ return; + } + + void hs_cont(void) Copied: head/audio/cplay/files/patch-Makefile (from r363150, head/audio/cplay/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/cplay/files/patch-Makefile Mon Jul 28 14:12:36 2014 (r363157, copy of r363150, head/audio/cplay/files/patch-aa) @@ -0,0 +1,11 @@ +--- Makefile.bak Sun Dec 28 15:51:04 2003 ++++ Makefile Sun Dec 28 15:51:44 2003 +@@ -14,7 +14,7 @@ + recursive-all recursive-install recursive-clean: + @target=$@; \ + for i in $(SUBDIRS); do \ +- (cd $$i && make $(ENV) $${target#recursive-}); \ ++ (cd $$i && $(MAKE) $(ENV) $${target#recursive-}); \ + done + + cplayrc: cplay Copied: head/audio/dagrab/files/patch-Makefile (from r363150, head/audio/dagrab/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/dagrab/files/patch-Makefile Mon Jul 28 14:12:36 2014 (r363157, copy of r363150, head/audio/dagrab/files/patch-aa) @@ -0,0 +1,14 @@ +--- Makefile.orig Sat Feb 19 15:41:30 2000 ++++ Makefile Fri Apr 21 17:12:20 2000 +@@ -1,8 +1,8 @@ +-CC=gcc ++#CC=gcc + #uncomment the following line for linux 2.0.x (and maybe 2.1.x or 1.x too ...) + #UCD=-DUSE_UCDROM +-PREFIX=/usr/local +-CFLAGS=-Wall -g ${UCD} ++PREFIX?=/usr/local ++CFLAGS+=${UCD} -DCDDB_PATH=\"${LOCALBASE}/lib/X11/xmcd/cddb\" + all:dagrab + + dagrab:dagrab.o Copied: head/audio/dagrab/files/patch-dagrab.c (from r363150, head/audio/dagrab/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/dagrab/files/patch-dagrab.c Mon Jul 28 14:12:36 2014 (r363157, copy of r363150, head/audio/dagrab/files/patch-ab) @@ -0,0 +1,262 @@ +--- dagrab.c.orig Sat Feb 19 17:32:46 2000 ++++ dagrab.c Tue Nov 18 00:05:29 2003 +@@ -94,26 +94,21 @@ + #include <string.h> + #include <errno.h> + #include <fcntl.h> +-#include <getopt.h> + #include <dirent.h> + #include <netdb.h> +-#include <unistd.h> + #include <pwd.h> + #include <ctype.h> +-#define __need_timeval /* needed by glibc */ +-#include <time.h> +-#include <linux/cdrom.h> +-#ifdef USE_UCDROM +-#include <linux/ucdrom.h> +-#endif +-#include <sys/vfs.h> + #include <sys/stat.h> + #include <sys/types.h> + #include <sys/ioctl.h> + #include <sys/socket.h> + #include <netinet/in.h> ++#include <sys/cdio.h> ++#include <sys/cdrio.h> ++#include <sys/param.h> ++#include <sys/mount.h> + #define CDDEVICE "/dev/cdrom" +-#define N_BUF 8 ++#define N_BUF 12 + #define OVERLAP 2 + #define KEYLEN 12 + #define OFS 12 +@@ -123,12 +118,18 @@ + #define D_MODE 0660 + #define CDDB_MAX 65535 + #define CDDB_PORT 888 ++#ifndef CDDB_PATH + #define CDDB_PATH "/usr/lib/X11/xmcd/cddb" ++#endif + #define CDDB_HOST "freedb.freedb.org" + //#define USE_CDDB (opt_save||opt_name) + #define USE_CDDB opt_cddb + #define PROGNAME "dagrab" + #define VERSION "0.3.5" ++#define CD_MSF_OFFSET 150 ++#define CDROM_DATA_TRACK 4 ++#define CDROM_LEADOUT 0xaa ++#define CD_FRAMESIZE_RAW 2352 + #define KW_TRACK 0 + #define KW_FULLD 1 + #define KW_AUTHOR 2 +@@ -206,16 +207,20 @@ + + struct Wavefile cd_newave(unsigned size) + { +- struct Wavefile dummy={{'R','I','F','F'},0x24+size,{'W','A','V','E'}, +- {'f','m','t',' '},0x10,1,2,44100,4*44100,4,16, +- {'d','a','t','a'},size }; +- /*dummy.Dlen=size; +- dummy.Rlen=0x24+size;*/ +- dummy.sample_rate = opt_srate; +- dummy.channel = 2 - opt_mono; +- dummy.byte_rate = opt_srate << dummy.channel; +- dummy.align = dummy.channel * dummy.sample >> 3; +- dummy.Dlen >>= opt_mono; ++ struct Wavefile dummy={{'R','I','F','F'}, /* Rid */ ++ 0x24 + (size >> opt_mono), /* Rlen */ ++ {'W','A','V','E'}, /* Wid */ ++ {'f','m','t',' '}, /* Fid */ ++ 0x10, /* Flen */ ++ 1, /* tag */ ++ 2 - opt_mono, /* channel */ ++ opt_srate, /* sample_rate */ ++ opt_srate << (2 - opt_mono), /* byte_rate */ ++ 16 * (2 - opt_mono) >> 3, /* align */ ++ 16, /* sample */ ++ {'d','a','t','a'}, /* Did */ ++ size >> opt_mono /* Dlen */ ++ }; + return dummy; + } + +@@ -226,16 +231,16 @@ + return buf; + } + +-int cd_get_tochdr(struct cdrom_tochdr *Th) ++int cd_get_tochdr(struct ioc_toc_header *Th) + { +- return ioctl(cdrom_fd,CDROMREADTOCHDR,Th); ++ return ioctl(cdrom_fd,CDIOREADTOCHEADER,Th); + } + +-int cd_get_tocentry(int trk,struct cdrom_tocentry *Te,int mode) ++int cd_get_tocentry(int trk,struct ioc_read_toc_single_entry *Te,int mode) + { +- Te->cdte_track=trk; +- Te->cdte_format=mode; +- return ioctl(cdrom_fd,CDROMREADTOCENTRY,Te); ++ Te->track=trk; ++ Te->address_format=mode; ++ return ioctl(cdrom_fd,CDIOREADTOCENTRY,Te); + } + + void cd_read_audio(int lba,int num,char *buf) +@@ -244,16 +249,27 @@ + /*NOTE: if num>CDROM_NBLOCKS_BUFFER as defined in ide_cd.c (8 in linux 2.0.32) + jitter correction may be required inside the block. */ + { +- struct cdrom_read_audio ra; ++/* CDIOCREADAUDIO has been removed in FreeBSD 5.1-CURRENT */ ++#if defined (__FreeBSD__) && (__FreeBSD_version >= 501106) ++ int bsize = 2352; ++ if(ioctl(cdrom_fd,CDRIOCSETBLOCKSIZE,&bsize) == -1) { ++ fprintf(stderr, "setblocksize"); ++ exit(1); ++ } ++ if (pread(cdrom_fd, buf, num*bsize, lba*bsize) != num*bsize){ ++ fprintf(stderr,"\n%s: read device at lba %d length %d: %s\n", ++ progname,lba,num,strerror(errno)); ++#else ++ struct ioc_read_audio ra; + +- ra.addr.lba=lba; +- ra.addr_format=CDROM_LBA; ++ ra.address.lba=lba; ++ ra.address_format=CD_LBA_FORMAT; + ra.nframes=num; +- ra.buf=buf; +- if(ioctl(cdrom_fd,CDROMREADAUDIO,&ra)){ +- /*fprintf(stderr,"%s: read raw ioctl failed \n",progname);*/ ++ ra.buffer=buf; ++ if(ioctl(cdrom_fd,CDIOCREADAUDIO,&ra)){ + fprintf(stderr,"\n%s: read raw ioctl failed at lba %d length %d: %s\n", + progname,lba,num,strerror(errno)); ++#endif + exit(1); + } + } +@@ -471,7 +487,7 @@ + DIR *d; + struct dirent *e; + char *id2,*p,*cddb,*loc; +- int i,cddbs,locs; ++ int i,cddbs,locs=0; + char id[12]; + char *path; + char path2[500]; +@@ -645,10 +661,10 @@ + int cd_getinfo(char *cd_dev,struct cd_trk_list *tl) + { + int i; +- struct cdrom_tochdr Th; +- struct cdrom_tocentry Te; ++ struct ioc_toc_header Th; ++ struct ioc_read_toc_single_entry Te; + +- if ((cdrom_fd=open(cd_dev,O_RDONLY|O_NONBLOCK))==-1){ ++ if ((cdrom_fd=open(cd_dev,O_RDONLY))==-1){ + fprintf(stderr,"%s: error opening device %s\n",progname,cd_dev); + exit(1); + } +@@ -656,7 +672,7 @@ + fprintf(stderr,"%s: read TOC ioctl failed: %s\n",progname,strerror(errno)); + exit(1); + } +- tl->min=Th.cdth_trk0;tl->max=Th.cdth_trk1; ++ tl->min=Th.starting_track;tl->max=Th.ending_track; + if((tl->starts=(int *)malloc((tl->max-tl->min+2)*sizeof(int)))==NULL){ + fprintf(stderr,"%s: list data allocation failed\n",progname); + exit(1); +@@ -668,21 +684,21 @@ + + for (i=tl->min;i<=tl->max;i++) + { +- if(cd_get_tocentry(i,&Te,CDROM_LBA)){ ++ if(cd_get_tocentry(i,&Te,CD_LBA_FORMAT)){ + fprintf(stderr,"%s: read TOC entry ioctl failed: %s\n", + progname,strerror(errno)); + exit(1); + } +- tl->starts[i-tl->min]=Te.cdte_addr.lba; +- tl->types[i-tl->min]=Te.cdte_ctrl&CDROM_DATA_TRACK; ++ tl->starts[i-tl->min]=ntohl(Te.entry.addr.lba); ++ tl->types[i-tl->min]=Te.entry.control&CDROM_DATA_TRACK; + } + i=CDROM_LEADOUT; +- if(cd_get_tocentry(i,&Te,CDROM_LBA)){ ++ if(cd_get_tocentry(i,&Te,CD_LBA_FORMAT)){ + fprintf(stderr,"%s: read TOC entry ioctl failed: %s\n",progname,strerror(errno)); + exit(1); + } +- tl->starts[tl->max-tl->min+1]=Te.cdte_addr.lba; +- tl->types[tl->max-tl->min+1]=Te.cdte_ctrl&CDROM_DATA_TRACK; ++ tl->starts[tl->max-tl->min+1]=ntohl(Te.entry.addr.lba); ++ tl->types[tl->max-tl->min+1]=Te.entry.control&CDROM_DATA_TRACK; + + i=cddb_main(tl); + if(i==-1) { +@@ -796,6 +812,7 @@ + struct Wavefile header; + int fd,bytes,i,n,q,space; + int bcount, sc, missing, speed = 0, ldp, now; ++ ssize_t wlen; + + if(tn<tl->min || tn>tl->max) return (-1); + space = ((tl->starts[tn-tl->min+1]-tl->starts[tn-tl->min]) * +@@ -879,8 +896,10 @@ + d = p1[c]; + buf3[c] = ((short)(d&65535) + (short)(d>>16)) >> 1; + } +- write(fd,buf3,n>>1); +- } else if(write(fd,p1,n)==-1){ ++ wlen = write(fd,buf3,n>>1); ++ } else ++ wlen = write(fd,p1,n); ++ if (wlen == -1){ + fprintf(stderr,"%s: error writing wave file %s: %s\n", + progname,nam,strerror(errno)); + exit(1); +@@ -896,7 +915,17 @@ + /* dump last bytes */ + if (bytes<(tl->starts[tn+1]-tl->starts[tn])*CD_FRAMESIZE_RAW){ + n=(tl->starts[tn+1]-tl->starts[tn])*CD_FRAMESIZE_RAW-bytes; +- if(write(fd,p1,n)==-1){ ++ if(opt_mono) { ++ register int c, d; ++ for(c = 0; c < (n>>2); c++) { ++ d = p1[c]; ++ buf3[c] = ((short)(d&65535) + (short)(d>>16)) >> 1; ++ } ++ wlen = write(fd,buf3,n>>1); ++ } else ++ wlen = write(fd,p1,n); ++ ++ if(wlen==-1){ + fprintf(stderr,"%s: error writing wave file %s: %s\n",progname,nam,strerror(errno)); + exit(1); + }; +@@ -961,7 +990,7 @@ + int main(int ac,char **av) + { + int i,l,disp_TOC=0; +- char c; ++ int c; + int all_tracks=0; + struct cd_trk_list tl; + char cd_dev[BLEN+1]=CDDEVICE; +@@ -969,10 +998,8 @@ + char filter[BLEN+1] = ""; + char path[500]; + FILE *f; +- + progname=av[0]; +- optind=0; +- while((c=getopt(ac,av,"d:f:n:o:k:r:t:m:e:H:P:D:pshaivCSN"))!=EOF){ ++ while((c=getopt(ac,av,"pshaivCSNd:f:n:o:k:r:t:m:e:H:P:D:"))!=-1){ + switch(c){ + case 'h':usage();break; + case 'd':CPARG(cd_dev);break; Copied: head/audio/esound/files/patch-Makefile.in (from r363150, head/audio/esound/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/esound/files/patch-Makefile.in Mon Jul 28 14:12:36 2014 (r363157, copy of r363150, head/audio/esound/files/patch-aa) @@ -0,0 +1,20 @@ +--- Makefile.in.orig 2008-07-17 13:45:22.000000000 -0400 ++++ Makefile.in 2008-07-17 13:45:46.000000000 -0400 +@@ -342,7 +342,7 @@ bin_SCRIPTS = \ + + lib_LTLIBRARIES = libesd.la $(libesddsp_la) + libesd_la_CFLAGS = $(AM_CFLAGS) +-libesd_la_LDFLAGS = -version-info $(ESD_VERSION_INFO) -no-undefined ++libesd_la_LDFLAGS = -version-info 2:0:0 -no-undefined + libesd_la_LIBADD = $(AUDIOFILE_LIBS) $(SOUND_LIBS) + libesd_la_SOURCES = \ + esdlib.c \ +@@ -373,7 +373,7 @@ AUDIO_BACKENDS = \ + audio_solaris.c \ + audio_win32.c + +-libesddsp_la_LDFLAGS = -version-info $(ESD_VERSION_INFO) ++libesddsp_la_LDFLAGS = -version-info 2:0:0 + libesddsp_la_LIBADD = libesd.la $(DL_LIB) -lm + libesddsp_la_SOURCES = \ + esddsp.c Copied: head/audio/esound/files/patch-esd.c (from r363150, head/audio/esound/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/esound/files/patch-esd.c Mon Jul 28 14:12:36 2014 (r363157, copy of r363150, head/audio/esound/files/patch-ac) @@ -0,0 +1,15 @@ +--- esd.c.orig Tue Nov 28 13:27:30 2000 ++++ esd.c Fri Dec 1 15:12:41 2000 +@@ -212,8 +212,8 @@ + #define ESD_UNIX_SOCKET_DIR_MODE (S_IRUSR|S_IWUSR|S_IXUSR|\ +- S_IRGRP|S_IWGRP|S_IXGRP|\ +- S_IROTH|S_IWOTH|S_IXOTH|S_ISVTX) ++ S_IRGRP|S_IXGRP|\ ++ S_IROTH|S_IXOTH|S_ISVTX) + #else + #define ESD_UNIX_SOCKET_DIR_MODE (S_IRUSR|S_IWUSR|S_IXUSR|\ +- S_IRGRP|S_IWGRP|S_IXGRP|\ +- S_IROTH|S_IWOTH|S_IXOTH) ++ S_IRGRP|S_IXGRP|\ ++ S_IROTH|S_IXOTH) + #endif Copied: head/audio/esound/files/patch-esdlib.c (from r363150, head/audio/esound/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/esound/files/patch-esdlib.c Mon Jul 28 14:12:36 2014 (r363157, copy of r363150, head/audio/esound/files/patch-ad) @@ -0,0 +1,55 @@ +--- esdlib.c.orig 2008-11-18 15:35:19.000000000 -0500 ++++ esdlib.c 2008-11-20 14:32:59.000000000 -0500 +@@ -21,6 +21,8 @@ + #include <errno.h> + #include <sys/wait.h> + #include <poll.h> ++#include <pwd.h> ++#include <limits.h> + + #include <sys/un.h> + +@@ -928,7 +930,7 @@ int esd_open_sound( const char *rhost ) + putenv(preload2); + } + cmd = malloc(strlen(SERVERDIR"/esd -spawnfd 9999999999") + strlen(esd_spawn_options)); +- sprintf(cmd, "%s/esd %s -spawnfd %d", SERVERDIR, esd_spawn_options, esd_pipe[1]); ++ sprintf(cmd, "exec esd %s -spawnfd %d", esd_spawn_options?esd_spawn_options:"", esd_pipe[1]); + + if(!fork()) { + /* child of child process. Minimal so startup overhead is +@@ -1747,3 +1749,34 @@ int esd_close( int esd ) + return close( esd ); + } + ++char * ++esd_unix_socket_dir(void) { ++ static char *sockdir = NULL, sockdirbuf[PATH_MAX]; ++ struct passwd *pw; ++ ++ if (sockdir != NULL) ++ return (sockdir); ++ pw = getpwuid(getuid()); ++ if (pw == NULL || pw->pw_dir == NULL) { ++ fprintf(stderr, "esd: could not find home directory\n"); ++ exit(1); ++ } ++ snprintf(sockdirbuf, sizeof(sockdirbuf), "%s/.esd", pw->pw_dir); ++ endpwent(); ++ sockdir = sockdirbuf; ++ return (sockdir); ++} ++ ++char * ++esd_unix_socket_name(void) { ++ static char *sockname = NULL, socknamebuf[PATH_MAX]; ++ ++ if (sockname != NULL) ++ return (sockname); ++ snprintf(socknamebuf, sizeof(socknamebuf), "%s/socket", ++ esd_unix_socket_dir()); ++ sockname = socknamebuf; ++ return (sockname); ++ } ++ ++ Copied: head/audio/fcplay/files/patch-AudioDriver.h (from r363150, head/audio/fcplay/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/fcplay/files/patch-AudioDriver.h Mon Jul 28 14:12:36 2014 (r363157, copy of r363150, head/audio/fcplay/files/patch-ab) @@ -0,0 +1,20 @@ +--- AudioDriver.h.orig Mon Mar 3 21:47:00 1997 ++++ AudioDriver.h Sun May 18 11:12:48 2003 +@@ -7,14 +7,15 @@ + #include <string.h> + #include <sys/ioctl.h> + #include <unistd.h> ++#include "Config.h" *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407281412.s6SECaP9081868>