diff options
Diffstat (limited to 'audio')
88 files changed, 0 insertions, 5178 deletions
diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile deleted file mode 100644 index 45105558f0ad..000000000000 --- a/audio/gnome-audio/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# New ports collection makefile for: gnomeaudio -# Version required: 1.0.0 -# Date created: 29 Dec 1998 -# Whom: Vanilla I. Shu <vanilla@FreeBSD.org> -# -# $FreeBSD$ -# - -DISTNAME= gnome-audio-1.0.0 -PKGNAME= gnomeaudio-1.0.0 -CATEGORIES= audio gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/gnome-audio - -MAINTAINER= vanilla@FreeBSD.org - -BUILD_DEPENDS= gnome-config:${PORTSDIR}/x11/gnomelibs -RUN_DEPENDS= gnome-config:${PORTSDIR}/x11/gnomelibs - -USE_X_PREFIX= yes -USE_GMAKE= yes -NO_BUILD= yes - -INSTALL_TARGET= INSTALL_DATA="${INSTALL_DATA}" install - -post-extract: - @${RM} -fr ${WRKSRC}/sounds/sounds - -.include <bsd.port.mk> diff --git a/audio/gnome-audio/distinfo b/audio/gnome-audio/distinfo deleted file mode 100644 index b6a971e4403e..000000000000 --- a/audio/gnome-audio/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (gnome-audio-1.0.0.tar.gz) = 3ae217dfa20fc8fbb67595a32d6beeec diff --git a/audio/gnome-audio/files/patch-aa b/audio/gnome-audio/files/patch-aa deleted file mode 100644 index 905fd58df364..000000000000 --- a/audio/gnome-audio/files/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ ---- sounds/Makefile.orig Wed Feb 24 14:19:09 1999 -+++ sounds/Makefile Mon Jul 12 11:24:27 1999 -@@ -1,15 +1,13 @@ --prefix=$(shell gnome-config --prefix) -- - all: - - install: install-files install-default-links - - install-files: - for I in $(shell find . -name '*.wav'); do \ -- install -d $(prefix)/share/sounds/`dirname $$I`; \ -- install -m444 $$I $(prefix)/share/sounds/$$I; \ -+ mkdir -p $(PREFIX)/share/gnome/sounds/`dirname $$I`; \ -+ ${INSTALL_DATA} $$I $(PREFIX)/share/gnome/sounds/$$I; \ - done - - install-default-links: -- ln -sf startup3.wav $(prefix)/share/sounds/login.wav -- ln -sf shutdown1.wav $(prefix)/share/sounds/logout.wav -+ ln -sf startup3.wav $(PREFIX)/share/gnome/sounds/startup.wav -+ ln -sf shutdown1.wav $(PREFIX)/share/gnome/sounds/logout.wav diff --git a/audio/gnome-audio/pkg-comment b/audio/gnome-audio/pkg-comment deleted file mode 100644 index c061452c9b05..000000000000 --- a/audio/gnome-audio/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -Sound files for use with GNOME diff --git a/audio/gnome-audio/pkg-descr b/audio/gnome-audio/pkg-descr deleted file mode 100644 index a7572a0ecf46..000000000000 --- a/audio/gnome-audio/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This module holds sound files for use with GNOME. Stick them in the -'sounds' directory here, or a subdirectory thereof - the whole tree will -be copied over into $(gnome_prefix)/share/gnome/sounds. diff --git a/audio/gnome-audio/pkg-plist b/audio/gnome-audio/pkg-plist deleted file mode 100644 index 806f9647d5cd..000000000000 --- a/audio/gnome-audio/pkg-plist +++ /dev/null @@ -1,16 +0,0 @@ -share/gnome/sounds/card_shuffle.wav -share/gnome/sounds/gtk-events/activate.wav -share/gnome/sounds/gtk-events/clicked.wav -share/gnome/sounds/gtk-events/toggled.wav -share/gnome/sounds/login.wav -share/gnome/sounds/logout.wav -share/gnome/sounds/panel/slide.wav -share/gnome/sounds/phone.wav -share/gnome/sounds/shutdown1.wav -share/gnome/sounds/startup.wav -share/gnome/sounds/startup1.wav -share/gnome/sounds/startup2.wav -share/gnome/sounds/startup3.wav -@dirrm share/gnome/sounds/gtk-events -@dirrm share/gnome/sounds/panel -@dirrm share/gnome/sounds diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile deleted file mode 100644 index 6ee54e2514c6..000000000000 --- a/audio/gnome-media/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# New ports collection makefile for: gnome-media -# Version required: 1.0.51 -# Date created: 20 January 1999 -# Whom: Jeremy Lea <reg@shale.csir.co.za> -# -# $FreeBSD$ -# - -DISTNAME= gnome-media-1.0.51 -PKGNAME= gnomemedia-1.0.51 -CATEGORIES= audio gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/gnome-media - -MAINTAINER= reg@shale.csir.co.za - -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore - -USE_X_PREFIX= yes -USE_GMAKE= yes -USE_LIBTOOL= yes -CONFIGURE_ARGS= --without-ncurses \ - --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" - -.include <bsd.port.mk> diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo deleted file mode 100644 index dd5df81a3f24..000000000000 --- a/audio/gnome-media/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (gnome-media-1.0.51.tar.gz) = d52772de47b214d9fc48aea75108cce7 diff --git a/audio/gnome-media/files/patch-ac b/audio/gnome-media/files/patch-ac deleted file mode 100644 index 729dd0e75d9b..000000000000 --- a/audio/gnome-media/files/patch-ac +++ /dev/null @@ -1,71 +0,0 @@ ---- vu-meter/Makefile.in.orig Wed Mar 3 12:35:57 1999 -+++ vu-meter/Makefile.in Wed Mar 3 12:36:25 1999 -@@ -116,9 +116,9 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ - --Audiodir = $(datadir)/gnome/apps/Multimedia -+Audiodir = $(datadir)/apps/Multimedia - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = vumeter ---- gmix/Makefile.in.orig Wed Sep 22 03:11:25 1999 -+++ gmix/Makefile.in Fri Sep 24 11:55:02 1999 -@@ -123,12 +123,12 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --Audiodir = $(datadir)/gnome/apps/Multimedia -+Audiodir = $(datadir)/apps/Multimedia - pixmapdir = $(datadir)/pixmaps - - EXTRA_DIST = README TODO NEWS gmix.desktop gnome-mixer.png - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gmix ---- tcd/Makefile.in.orig Sat Feb 27 09:22:02 1999 -+++ tcd/Makefile.in Wed Mar 3 12:38:28 1999 -@@ -116,7 +116,7 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ - --Audiodir = $(datadir)/gnome/apps/Multimedia -+Audiodir = $(datadir)/apps/Multimedia - - EXTRA_DIST = README TODO NEWS gtcd.desktop - -@@ -141,7 +141,7 @@ - - CLEANFILES = *~ - --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(USE_CD_CHANGER) -g -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(USE_CD_CHANGER) -g - - - Audio_DATA = gtcd.desktop ---- cddbslave/Makefile.in.orig Thu Jul 15 07:55:51 1999 -+++ cddbslave/Makefile.in Fri Jul 16 00:02:50 1999 -@@ -123,7 +123,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" - - - bin_PROGRAMS = cddbslave cddbsubmit -@@ -137,7 +137,7 @@ - cddbsubmit_LDADD = $(GNOME_LIBDIR) $(GNOME_LIBS) $(GHTTP_LIB) $(INTLLIBS) - - --gnomedatadir = $(datadir)/gnome -+gnomedatadir = $(datadir) - - gnomedata_DATA = cddb-submit-methods - diff --git a/audio/gnome-media/files/patch-ad b/audio/gnome-media/files/patch-ad deleted file mode 100644 index 8c2d1acfb01f..000000000000 --- a/audio/gnome-media/files/patch-ad +++ /dev/null @@ -1,74 +0,0 @@ ---- gmix/gmix.c.orig Sun Feb 21 12:10:17 1999 -+++ gmix/gmix.c Mon Mar 8 20:41:05 1999 -@@ -94,6 +94,17 @@ - /* - * All, that is known about a mixer-device - */ -+ -+#if !defined(OPEN_SOUND_SYSTEM) -+typedef struct mixer_info -+{ -+ char id[16]; -+ char name[32]; -+ int modify_counter; -+ int fillers[10]; -+} mixer_info; -+#endif -+ - typedef struct device_info { - int fd; - mixer_info info; -@@ -272,11 +283,7 @@ - /* - * open the mixer-device - */ -- if (num==0) { -- sprintf(device_name, "/dev/mixer"); -- } else { -- sprintf(device_name, "/dev/mixer%i", num); -- } -+ sprintf(device_name, "/dev/mixer%i", num); - new_device->fd=open(device_name, O_RDWR, 0); - if (new_device->fd<0) { - free(new_device); -@@ -291,6 +298,8 @@ - fprintf(stderr, "Warning: This version of gmix was compiled with a different version of\nsoundcard.h.\n"); - } - #endif -+ -+#if defined(OPEN_SOUND_SYSTEM) - /* - * mixer-name - */ -@@ -301,6 +310,11 @@ - } - if(!isalpha(new_device->info.name[0])) - g_snprintf(new_device->info.name, 31, "Card %d", num+1); -+#else -+ g_snprintf(new_device->info.id, 15, "mixer%d", num); -+ g_snprintf(new_device->info.name, 31, "Sound Card %d", num+1); -+ new_device->info.modify_counter=0; -+#endif - /* - * several bitmasks describing the mixer - */ -@@ -386,15 +400,16 @@ - { - int cnt; - device_info *new_device; -- cnt=0; devices=NULL; -+ cnt=0; num_mixers=0; devices=NULL; - do { - new_device=open_device(cnt++); - if (new_device) { - new_device->channels=make_channels(new_device); - devices=g_list_append(devices, new_device); -+ num_mixers++; - } -- } while (new_device); -- num_mixers=cnt-1; -+ } while ((errno == EACCES) || (errno == EINVAL) || (errno == ENXIO) \ -+ || new_device); - } - - void free_one_device(gpointer a, gpointer b) diff --git a/audio/gnome-media/files/patch-ae b/audio/gnome-media/files/patch-ae deleted file mode 100644 index 1d1670e93047..000000000000 --- a/audio/gnome-media/files/patch-ae +++ /dev/null @@ -1,942 +0,0 @@ ---- tcd/callbacks.c.orig Tue Feb 23 21:03:37 1999 -+++ tcd/callbacks.c Mon Jul 12 15:20:13 1999 -@@ -10,7 +10,7 @@ - - void play_cb(GtkWidget *widget, gpointer data) - { -- if(cd.sc.cdsc_audiostatus==CDROM_AUDIO_PAUSED) -+ if(SC_AUDIOSTATUS(cd.sc)==CDROM_AUDIO_PAUSED) - tcd_pausecd(&cd); - else - tcd_playtracks(&cd, cd.first_t, cd.last_t, prefs.only_use_trkind); -@@ -42,7 +42,7 @@ - cd.play_method = NORMAL; - cd.repeat_track = -1; - /* SDH: Make sure play/pause state change is noticed */ -- cd.sc.cdsc_audiostatus = -1; -+ SC_AUDIOSTATUS(cd.sc) = -1; - if(cd.isplayable) - { - make_goto_menu(); ---- tcd/cddb.c.orig Mon May 31 22:18:28 1999 -+++ tcd/cddb.c Mon Jul 12 15:23:19 1999 -@@ -199,16 +199,16 @@ - { - int min, sec; - -- min = cd->trk[trk].toc.cdte_addr.msf.minute; -- sec = cd->trk[trk].toc.cdte_addr.msf.second; -+ min = TOC_MINUTE(cd->trk[trk]); -+ sec = TOC_SECOND(cd->trk[trk]); - - n = (min*60)+sec; -- fprintf( fp, "# %u\n", (n*75)+cd->trk[trk].toc.cdte_addr.msf.frame ); -+ fprintf( fp, "# %u\n", (n*75)+TOC_FRAME(cd->trk[trk]) ); - } - /* Print the number of seconds */ - fprintf( fp, "#\n# Disc length: %i seconds\n", -- (cd->trk[cd->last_t+1].toc.cdte_addr.msf.minute*60) -- +(cd->trk[cd->last_t+1].toc.cdte_addr.msf.second) ); -+ (TOC_MINUTE(cd->trk[cd->last_t+1])*60) -+ +(TOC_SECOND(cd->trk[cd->last_t+1])) ); - - fprintf( fp, "#\n# Revision: %lu\n", cd->cddb_rev ); - fprintf( fp, "# Submitted via: tcd 2.0b\n" ); -@@ -245,10 +245,10 @@ - { - int min, sec; - -- min = cd->trk[i].toc.cdte_addr.msf.minute; -- sec = cd->trk[i].toc.cdte_addr.msf.second; -+ min = TOC_MINUTE(cd->trk[i]); -+ sec = TOC_SECOND(cd->trk[i]); - -- l=sprintf( tmp, "%u ", calc_offset(min,sec,cd->trk[i].toc.cdte_addr.msf.frame)); -+ l=sprintf( tmp, "%u ", calc_offset(min,sec,TOC_FRAME(cd->trk[i]))); - - if(blen>l) - { -@@ -257,8 +257,8 @@ - } - } - l=sprintf( tmp, "%i\n", -- (cd->trk[cd->last_t+1].toc.cdte_addr.msf.minute*60) -- +(cd->trk[cd->last_t+1].toc.cdte_addr.msf.second) ); -+ (TOC_MINUTE(cd->trk[cd->last_t+1])*60) -+ +(TOC_SECOND(cd->trk[cd->last_t+1])) ); - if(blen>l) - strcat( buf,tmp ); - -@@ -298,9 +298,9 @@ - - for( i=0; i <= cd->last_t+1; i++ ) - { -- cdtoc[i].frame = cd->trk[i+1].toc.cdte_addr.msf.frame; -- cdtoc[i].min = cd->trk[i+1].toc.cdte_addr.msf.minute; -- cdtoc[i].sec = cd->trk[i+1].toc.cdte_addr.msf.second; -+ cdtoc[i].frame = TOC_FRAME(cd->trk[i+1]); -+ cdtoc[i].min = TOC_MINUTE(cd->trk[i+1]); -+ cdtoc[i].sec = TOC_SECOND(cd->trk[i+1]); - } - - ---- tcd/gtcd.c.orig Mon Sep 20 07:48:29 1999 -+++ tcd/gtcd.c Fri Sep 24 13:34:55 1999 -@@ -160,7 +160,11 @@ - gint release_timer(gpointer *data) - { - cd.time_lock = TRUE; -+#ifdef TCD_BSD -+ ioctl(cd.cd_dev, CDIOCPAUSE); -+#else - ioctl(cd.cd_dev, CDROMPAUSE); -+#endif - - roll_t = gtk_timeout_add(40, (GtkFunction)roll_timer, data); - release_t = 0; -@@ -435,8 +439,8 @@ - break; - case DISC_R: - cur = cd.cur_pos_abs; -- end = (cd.trk[cd.last_t+1].toc.cdte_addr.msf.minute -- *60)+cd.trk[cd.last_t+1].toc.cdte_addr.msf.second; -+ end = (TOC_MINUTE(cd.trk[cd.last_t+1])*60 -+ +TOC_SECOND(cd.trk[cd.last_t+1])); - pos = end-cur; - min = pos/60; - sec = pos-(pos/60)*60; -@@ -537,7 +541,7 @@ - - if( !cd.err ) - { -- switch( cd.sc.cdsc_audiostatus ) -+ switch( SC_AUDIOSTATUS(cd.sc) ) - { - case CDROM_AUDIO_INVALID: - strcpy(tmp, _("No Disc")); -@@ -633,8 +637,8 @@ - } - - /* see if we need to repeat */ -- if( cd.sc.cdsc_audiostatus != CDROM_AUDIO_PLAY && -- cd.sc.cdsc_audiostatus != CDROM_AUDIO_PAUSED ) -+ if( SC_AUDIOSTATUS(cd.sc) != CDROM_AUDIO_PLAY && -+ SC_AUDIOSTATUS(cd.sc) != CDROM_AUDIO_PAUSED ) - { - if( cd.play_method == REPEAT_CD ) - tcd_playtracks( &cd, cd.first_t, cd.last_t, prefs->only_use_trkind); -@@ -651,14 +655,14 @@ - - void status_changed(void) - { -- if(old_status != cd.sc.cdsc_audiostatus) -+ if(old_status != SC_AUDIOSTATUS(cd.sc)) - { - GtkWidget *pixmap; - GtkSignalFunc func; - char tmp[256]; - char *name; - -- old_status = cd.sc.cdsc_audiostatus; -+ old_status = SC_AUDIOSTATUS(cd.sc); - g_snprintf(tmp, 255, "tcd/%s.xpm", - (old_status==CDROM_AUDIO_PLAY)?"pause":"play"); - ---- tcd/gtracked.c.orig Tue May 11 09:35:44 1999 -+++ tcd/gtracked.c Mon Jul 12 15:24:02 1999 -@@ -206,8 +206,8 @@ - - /* Disc area */ - g_snprintf(tmp, 63, _("Disc Information (%02u:%02u minutes)"), -- cd.trk[cd.last_t+1].toc.cdte_addr.msf.minute, -- cd.trk[cd.last_t+1].toc.cdte_addr.msf.second); -+ TOC_MINUTE(cd.trk[cd.last_t+1]), -+ TOC_SECOND(cd.trk[cd.last_t+1])); - - disc_frame = gtk_frame_new(tmp); - disc_vbox = gtk_vbox_new(FALSE, GNOME_PAD_SMALL); ---- tcd/linux-cdrom.c.orig Sun Aug 15 23:58:40 1999 -+++ tcd/linux-cdrom.c Fri Sep 24 13:40:27 1999 -@@ -71,7 +71,7 @@ - debug("cdrom.c: tcd_init_disc(%p) top\n", cd ); - tcd_opencddev( cd, msg_cb ); - --#if defined(TCD_CHANGER_ENABLED) -+#if defined(TCD_CHANGER_ENABLED) && !defined(TCD_BSD) - cd->nslots = ioctl( cd->cd_dev, CDROM_CHANGER_NSLOTS ); - #else - cd->nslots = 0; -@@ -114,8 +114,11 @@ - - int tcd_readtoc( cd_struct *cd ) - { -- int tmp,i; -+ int i; - int delsecs; -+#ifdef TCD_BSD -+ struct ioc_read_toc_single_entry tocentry; -+#endif - - if(cd->time_lock) - return; -@@ -125,26 +128,47 @@ - cd->isplayable=FALSE; - - /* read the TOC header */ -+#ifdef TCD_BSD -+ if(ioctl( cd->cd_dev, CDIOREADTOCHEADER, &cd->tochdr)) -+#else - if(ioctl( cd->cd_dev, CDROMREADTOCHDR, &cd->tochdr)) -+#endif - { - strcpy( cd->errmsg, "Can't read disc." ); - cd->err = TRUE; - debug("cdrom.c: tcd_readtoc exiting prematurly. CDROMREADTOCHDR ioctl error.\n" ); - cd->cur_t = 0; - cd->cddb_id = 0; -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - return(-1); - } - - /* grab first & last tracks */ -+#ifdef TCD_BSD -+ cd->first_t = cd->tochdr.starting_track; -+ cd->last_t = cd->tochdr.ending_track; -+#else - cd->first_t = cd->tochdr.cdth_trk0; - cd->last_t = cd->tochdr.cdth_trk1; -+#endif - - /* read the leadout track */ -+#ifdef TCD_BSD -+ tocentry.track = cd->last_t+1; /* Magic last track */ -+ tocentry.address_format = CD_MSF_FORMAT; -+#else - cd->trk[C(cd->last_t+1)].toc.cdte_track = CDROM_LEADOUT; - cd->trk[C(cd->last_t+1)].toc.cdte_format = CDROM_MSF; -+#endif - - /* read the leadout toc */ -+#ifdef TCD_BSD -+ if(ioctl(cd->cd_dev, CDIOREADTOCENTRY, &tocentry)) -+#else - if(ioctl(cd->cd_dev, CDROMREADTOCENTRY, &cd->trk[C(cd->last_t+1)].toc)) -+#endif - { - strcpy(cd->errmsg, "Can't read disc."); - cd->err = TRUE; -@@ -152,40 +176,65 @@ - debug("cdrom.c: tcd_readtoc exiting prematurly. CDROMREADTOCENTRY ioctl error.\n" ); - cd->cur_t = 0; - cd->cddb_id = 0; -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - return(-1); -- } -+ } -+ -+#ifdef TCD_BSD -+ cd->trk[C(cd->last_t+1)].toc = tocentry.entry; -+#endif -+ cd->trk[C(cd->last_t+1)].length = TOC_MINUTE(cd->trk[C(cd->last_t+1)]) * 60 + -+ TOC_SECOND(cd->trk[C(cd->last_t+1)]); -+ cd->trk[C(cd->last_t+1)].start = cd->trk[C(cd->last_t+1)].length * 75 + -+ TOC_FRAME(cd->trk[C(cd->last_t+1)]); - - /* read the rest of the tocs */ - for( i = cd->first_t; i <= cd->last_t; i++ ) - { -+#ifdef TCD_BSD -+ tocentry.track = i; -+ tocentry.address_format = CD_MSF_FORMAT; -+#else - cd->trk[C(i)].toc.cdte_track = i; - cd->trk[C(i)].toc.cdte_format = CDROM_MSF; -+#endif - -+#ifdef TCD_BSD -+ if(ioctl(cd->cd_dev, CDIOREADTOCENTRY, &tocentry)) -+#else - if(ioctl(cd->cd_dev, CDROMREADTOCENTRY, &cd->trk[C(i)].toc)) -+#endif - { - strcpy( cd->errmsg, "Can't read disc." ); - cd->err = TRUE; - debug("cdrom.c: tcd_readtoc exiting prematurly. CDROMREADTOCENTRY ioctl error.\n" ); - cd->cur_t = 0; - cd->cddb_id = 0; -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - return(-1); - } - -+#ifdef TCD_BSD -+ cd->trk[C(i)].toc = tocentry.entry; -+ cd->trk[C(i)].type = cd->trk[C(i)].toc.control; -+#else - cd->trk[C(i)].type = cd->trk[C(i)].toc.cdte_ctrl; -- cd->trk[C(i)].length = cd->trk[C(i)].toc.cdte_addr.msf.minute * 60 + -- cd->trk[C(i)].toc.cdte_addr.msf.second; -+#endif -+ cd->trk[C(i)].length = TOC_MINUTE(cd->trk[C(i)]) * 60 + -+ TOC_SECOND(cd->trk[C(i)]); - cd->trk[C(i)].start = cd->trk[C(i)].length * 75 + -- cd->trk[C(i)].toc.cdte_addr.msf.frame; -+ TOC_FRAME(cd->trk[C(i)]); - } - - /* calculate track times */ - for(i = cd->first_t; i <= cd->last_t; i ++) - { - /* Taken from cdtool...Thanks Thomas I.! */ -- delsecs = cd->trk[C(i+1)].toc.cdte_addr.msf.minute * 60 -- + cd->trk[C(i+1)].toc.cdte_addr.msf.second -- - cd->trk[C(i)].toc.cdte_addr.msf.minute * 60 -- - cd->trk[C(i)].toc.cdte_addr.msf.second; -+ delsecs = cd->trk[C(i+1)].length - cd->trk[C(i)].length; - - cd->trk[C(i)].tot_min = delsecs / 60; - cd->trk[C(i)].tot_sec = delsecs - (delsecs/60)*60; -@@ -204,7 +253,7 @@ - - cd->isplayable=TRUE; - debug("cdrom.c: tcd_readtoc exiting normally\n" ); -- return tmp; -+ return 0; - } - - void tcd_recalculate(cd_struct *cd) -@@ -214,9 +263,8 @@ - return; - - /* calculate various timing values */ -- cd->cur_pos_abs = cd->sc.cdsc_absaddr.msf.minute * 60 + -- cd->sc.cdsc_absaddr.msf.second; -- cd->cur_frame = cd->cur_pos_abs * 75 + cd->sc.cdsc_absaddr.msf.frame; -+ cd->cur_pos_abs = SC_MINUTE(cd->sc) * 60 + SC_SECOND(cd->sc); -+ cd->cur_frame = cd->cur_pos_abs * 75 + SC_FRAME(cd->sc); - - cd->cur_pos_rel = (cd->cur_frame - cd->trk[C(cd->cur_t)].start) / 75; - -@@ -235,8 +283,10 @@ - cd->cd_min = cd->cur_pos_abs / 60; - - #ifdef TCD_CHANGER_ENABLED -+#ifndef TCD_BSD - cd->cur_disc = ioctl( cd->cd_dev, CDROM_SELECT_DISC, CDSL_CURRENT ); - #endif -+#endif - } - - void tcd_recalculate_fake(cd_struct *cd, gint abs_pos, gint track) -@@ -281,35 +331,76 @@ - - void tcd_gettime( cd_struct *cd ) - { -+#ifdef TCD_BSD -+ struct ioc_read_subchannel subch; -+#endif -+ - cd->err = FALSE; -+#ifdef TCD_BSD -+ subch.address_format = CD_MSF_FORMAT; -+ subch.data_format = CD_CURRENT_POSITION; -+ subch.data_len = sizeof(cd->sc); -+ subch.data = &(cd->sc); -+#else - cd->sc.cdsc_format = CDROM_MSF; -+#endif - - if(cd->isplayable) - { -+#ifdef TCD_BSD -+ if(ioctl( cd->cd_dev, CDIOCREADSUBCHANNEL, &subch)) -+#else - if(ioctl( cd->cd_dev, CDROMSUBCHNL, &cd->sc)) -+#endif - { - strcpy( cd->errmsg, "Can't read disc." ); - cd->err = TRUE; - debug("cdrom.c: tcd_gettime exiting early. CDROMSUBCHNL ioctl error.\n" ); - cd->cur_t = 0; -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - return; - } -- if(cd->sc.cdsc_audiostatus==CDROM_AUDIO_PLAY) -- cd->cur_t = cd->sc.cdsc_trk; -+ if( SC_AUDIOSTATUS(cd->sc)==CDROM_AUDIO_PLAY ) -+ { -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCPREVENT); -+#endif -+ cd->cur_t = SC_TRACK(cd->sc); -+ } - else -+ { -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - cd->cur_t = 0; -+ } - tcd_recalculate(cd); - } - } - - int tcd_set_volume(cd_struct *cd, int volume) - { -+#ifdef TCD_BSD -+ struct ioc_vol vol; -+#else - struct cdrom_volctrl vol; -+#endif - -+#ifdef TCD_BSD -+ vol.vol[0] = volume; -+ vol.vol[1] = vol.vol[2] = vol.vol[3] = vol.vol[0]; -+#else - vol.channel0 = volume; - vol.channel1 = vol.channel2 = vol.channel3 = vol.channel0; -- -+#endif -+ -+#ifdef TCD_BSD -+ if(ioctl(cd->cd_dev, CDIOCSETVOL, &vol) < 0) -+#else - if(ioctl(cd->cd_dev, CDROMVOLCTRL, &vol) < 0) -+#endif - return FALSE; - - return TRUE; -@@ -317,6 +408,14 @@ - - int tcd_get_volume(cd_struct *cd) - { -+#ifdef TCD_BSD -+ struct ioc_vol vol; -+ -+ if(ioctl(cd->cd_dev, CDIOCGETVOL, &vol) < 0) -+ return -1; -+ -+ return vol.vol[0]; -+#else - #ifdef CDROMVOLREAD - struct cdrom_volctrl vol; - -@@ -327,12 +426,39 @@ - #else - return 0; - #endif -+#endif - } - - int tcd_playtracks(cd_struct *cd, int start_t, int end_t, int only_use_trkind) - { -+#ifdef TCD_BSD -+ struct ioc_play_msf msf; -+#define MSF_START_MIN (msf.start_m) -+#define MSF_START_SEC (msf.start_s) -+#define MSF_START_FRM (msf.start_f) -+#define MSF_END_MIN (msf.end_m) -+#define MSF_END_SEC (msf.end_s) -+#define MSF_END_FRM (msf.end_f) -+ struct ioc_play_track trkind; -+#define TI_START_TRK (trkind.start_track) -+#define TI_START_IND (trkind.start_index) -+#define TI_END_TRK (trkind.end_track) -+#define TI_END_IND (trkind.end_index) -+#else - struct cdrom_msf msf; -+#define MSF_START_MIN (msf.cdmsf_min0) -+#define MSF_START_SEC (msf.cdmsf_sec0) -+#define MSF_START_FRM (msf.cdmsf_frame0) -+#define MSF_END_MIN (msf.cdmsf_min1) -+#define MSF_END_SEC (msf.cdmsf_sec1) -+#define MSF_END_FRM (msf.cdmsf_frame0) - struct cdrom_ti trkind; -+#define TI_START_TRK (trkind.cdti_trk0) -+#define TI_START_IND (trkind.cdti_ind0) -+#define TI_END_TRK (trkind.cdti_trk1) -+#define TI_END_IND (trkind.cdti_ind1) -+#endif -+ - int tmp; - debug("cdrom.c: tcd_playtracks( %p, %d, %d )\n", cd, start_t, end_t ); - cd->err = FALSE; -@@ -341,7 +467,7 @@ - tcd_gettime(cd); - if(cd->err) - { -- /* try and inject cd */ -+ /* try and eject cd */ - tcd_ejectcd(cd); - - if(cd->err) -@@ -351,64 +477,88 @@ - } - } - -+#ifdef TCD_BSD -+ ioctl(cd->cd_dev, CDIOCCLOSE); -+#else - #if defined(CDROMCLOSETRAY) - ioctl(cd->cd_dev, CDROMCLOSETRAY); --#endif -- -+#endif -+#endif -+ -+ /* bad hack. most data tracks are the first track... */ -+#ifdef TCD_BSD -+ if(cd->trk[start_t].toc.control == 0x04) -+#else - if(cd->trk[start_t].toc.cdte_ctrl == CDROM_DATA_TRACK) -- start_t++; /* bad hack. most data tracks are the first track... */ -+#endif -+ start_t++; - -- msf.cdmsf_min0 = cd->trk[start_t].toc.cdte_addr.msf.minute; -- msf.cdmsf_sec0 = cd->trk[start_t].toc.cdte_addr.msf.second; -- msf.cdmsf_frame0 = cd->trk[start_t].toc.cdte_addr.msf.frame; -+ MSF_START_MIN = TOC_MINUTE(cd->trk[start_t]); -+ MSF_START_SEC = TOC_SECOND(cd->trk[start_t]); -+ MSF_START_FRM = TOC_FRAME(cd->trk[start_t]); - - if( end_t < 0 ) - { -- msf.cdmsf_min1 = cd->trk[start_t].tot_min+msf.cdmsf_min0; -- msf.cdmsf_sec1 = cd->trk[start_t].tot_sec+msf.cdmsf_sec0; -- msf.cdmsf_frame1=0; -+ MSF_END_MIN = cd->trk[start_t].tot_min+MSF_START_MIN; -+ MSF_END_SEC = cd->trk[start_t].tot_sec+MSF_START_SEC; -+ MSF_END_FRM = 0; - } - else - { -- msf.cdmsf_min1 = cd->trk[end_t+1].toc.cdte_addr.msf.minute; -- msf.cdmsf_sec1 = cd->trk[end_t+1].toc.cdte_addr.msf.second; -- msf.cdmsf_frame1 = cd->trk[end_t+1].toc.cdte_addr.msf.frame - 1; -+ MSF_END_MIN = TOC_MINUTE(cd->trk[end_t+1]); -+ MSF_END_SEC = TOC_SECOND(cd->trk[end_t+1]); -+ MSF_END_FRM = TOC_FRAME(cd->trk[end_t+1]) - 1; - - #ifdef UNSIGNED_NUMBERS_CAN_BE_NEGATIVE -- if(msf.cdmsf_frame1 < 0) -+ if(MSF_END_FRM < 0) - { -- msf.cdmsf_sec1 += msf.cdmsf_frame1; -- msf.cdmsf_frame1 = 0; -+ MSF_END_SEC += MSF_END_FRM; -+ MSF_END_FRM = 0; - } -- if(msf.cdmsf_sec1 < 0) -+ if(MSF_END_SEC < 0) - { -- msf.cdmsf_min1 += msf.cdmsf_sec1; -- msf.cdmsf_sec1 = 0; -+ MSF_END_MIN += MSF_END_SEC; -+ MSF_END_SEC = 0; - } -- if(msf.cdmsf_min1 < 0) -+ if(MSF_END_MIN < 0) - { -- msf.cdmsf_min1 = 0; -+ MSF_END_MIN = 0; - } - #endif - } -- msf.cdmsf_min1 += (msf.cdmsf_sec1 / 60); -- msf.cdmsf_sec1 %= 60; -+ MSF_END_MIN += (MSF_END_SEC / 60); -+ MSF_END_SEC %= 60; -+ -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCPREVENT); -+#endif - -+#ifdef TCD_BSD -+ if(only_use_trkind || ioctl( cd->cd_dev, CDIOCPLAYMSF, &msf)) -+#else - if(ioctl( cd->cd_dev, CDROMPLAYMSF, &msf) || only_use_trkind) -+#endif - { - debug("cdrom.c: tcd_playtracks error. CDROMPLAYMSF ioctl error (or user override). Trying PLAYTRKIND\n" ); - - /* Try alternate method of playing */ -- trkind.cdti_trk0 = start_t; /* start track */ -- trkind.cdti_ind0 = 0; /* start index */ -- trkind.cdti_trk1 = end_t; /* end track */ -- trkind.cdti_ind1 = 0; /* end index */ -+ TI_START_TRK = start_t; /* start track */ -+ TI_START_IND = 0; /* start index */ -+ TI_END_TRK = end_t; /* end track */ -+ TI_END_IND = 0; /* end index */ - -+#ifdef TCD_BSD -+ if(ioctl(cd->cd_dev, CDIOCPLAYTRACKS, &trkind)) -+#else - if(ioctl(cd->cd_dev, CDROMPLAYTRKIND, &trkind)) -+#endif - { - strcpy( cd->errmsg, "Error playing disc" ); - cd->err = TRUE; - debug("cdrom.c: tcd_playtracks error. CDROMPLAYTRKIND ioctl error.\n"); -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - return -1; - } - } -@@ -418,75 +568,68 @@ - return tmp; - } - --static int msf_2_frame( cd_min_sec_frame *msf ) --{ -- return( ( msf->minute * CD_SECS + msf->second ) -- * CD_FRAMES + msf->frame ); --} -- --static void frame_2_msf( int frame, cd_min_sec_frame *msf ) --{ -- msf->frame = frame % CD_FRAMES; -- frame /= CD_FRAMES; -- msf->second = frame % CD_SECS; -- msf->minute = frame / CD_SECS; --} -- - int tcd_play_seconds( cd_struct *cd, long int offset ) - { -+#ifdef TCD_BSD -+ struct ioc_play_msf msf; -+#else - struct cdrom_msf msf; -- cd_min_sec_frame msf0; -- int cur_frame, start_frame, end_frame; -+#endif -+ int tmp; - - debug("cdrom.c: tcd_play_seconds( %p, %ld )\n", cd, offset ); - - cd->err = FALSE; - cd->isplayable=FALSE; - -- /* converting msf to frames makes life much easier */ -- start_frame = msf_2_frame( &cd->trk[C(cd->first_t)].toc.cdte_addr.msf ); -- end_frame = msf_2_frame( &cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf ) - 1; -- cur_frame = cd->cur_frame + ( offset * CD_FRAMES ); -- -- /* keep the cur_frame within the boundaries of the first and last track */ -- if ( cur_frame < start_frame ) { -- cur_frame = start_frame; -- } else if ( cur_frame > end_frame ) { -- cur_frame = end_frame; -- } -- -- /* convert frames back to msf */ -- frame_2_msf( cur_frame, &msf0 ); -- msf.cdmsf_min0 = msf0.minute; -- msf.cdmsf_sec0 = msf0.second; -- msf.cdmsf_frame0 = msf0.frame; -- msf.cdmsf_min1 = cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.minute; -- msf.cdmsf_sec1 = cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.second; -- msf.cdmsf_frame1 = cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.frame - 1; -+ /* got subchannel? */ -+ MSF_START_SEC = SC_SECOND(cd->sc)+offset; -+ MSF_START_MIN = SC_MINUTE(cd->sc); -+ MSF_START_FRM = SC_FRAME(cd->sc); -+ MSF_END_MIN = TOC_MINUTE(cd->trk[C(cd->last_t+1)]); -+ MSF_END_SEC = TOC_SECOND(cd->trk[C(cd->last_t+1)]); -+ MSF_END_FRM = TOC_FRAME(cd->trk[C(cd->last_t+1)]) - 1; - - #ifdef UNSIGNED_NUMBERS_CAN_BE_NEGATIVE -- if(msf.cdmsf_frame1 < 0) -+ if((MSF_END_FRM < 0) - { -- msf.cdmsf_sec1 += msf.cdmsf_frame1; -- msf.cdmsf_frame1 = 0; -+ MSF_END_SEC += MSF_END_FRM; -+ MSF_END_FRM = 0; - } -- if(msf.cdmsf_sec1 < 0) -+ if(MSF_END_SEC < 0) - { -- msf.cdmsf_min1 += msf.cdmsf_sec1; -- msf.cdmsf_sec1 = 0; -+ MSF_END_MIN += MSF_END_SEC; -+ MSF_END_SEC = 0; - } -- if(msf.cdmsf_min1 < 0) -+ if(MSF_END_MIN < 0) - { -- msf.cdmsf_min1 = 0; -+ MSF_END_MIN = 0; - } - #endif -+ -+ if(MSF_START_SEC > 60 && (offset<0)) -+ { -+ MSF_START_SEC = 60-abs(offset); -+ MSF_START_MIN--; -+ } -+ -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCPREVENT ); -+#endif - -+#ifdef TCD_BSD -+ if(ioctl(cd->cd_dev, CDIOCPLAYMSF, &msf)) -+#else - if(ioctl(cd->cd_dev, CDROMPLAYMSF, &msf)) -+#endif - { - strcpy( cd->errmsg, "Error playing disc." ); - cd->err = TRUE; - - debug("cdrom.c: tcd_play_seconds error. CDROMPLAYMSF ioctl error.\n" ); -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW ); -+#endif - return(-1); - } - cd->isplayable=TRUE; -@@ -503,7 +646,15 @@ - if(cd->isplayable) tcd_stopcd(cd); - cd->err = FALSE; - -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif -+ -+#ifdef TCD_BSD -+ if(!ioctl(cd->cd_dev, CDIOCEJECT)) -+#else - if(!ioctl(cd->cd_dev, CDROMEJECT)) -+#endif - { - cd->isplayable = FALSE; - strcpy(cd->errmsg, "No disc in drive "); -@@ -511,9 +662,17 @@ - } - else - { -+#ifdef TCD_BSD -+ tmp = ioctl( cd->cd_dev, CDIOCCLOSE ); -+#else - #ifdef CDROMCLOSETRAY - tmp = ioctl( cd->cd_dev, CDROMCLOSETRAY ); - #endif -+#endif -+ -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCPREVENT); -+#endif - - if(tcd_post_init(cd)) - { -@@ -523,6 +682,9 @@ - debug("cdrom.c: tcd_eject - disc init error. %s\n", - strerror(errno) ); - -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - return(-1); - } - cd->isplayable = TRUE; -@@ -540,11 +702,19 @@ - debug("cdrom.c: tcd_stopcd(%p)\n", cd ); - - /* SDH: Makes things cleaner on eject */ -- if( cd->sc.cdsc_audiostatus==CDROM_AUDIO_PAUSED ) -+ if( SC_AUDIOSTATUS(cd->sc)==CDROM_AUDIO_PAUSED ) - tcd_pausecd(cd); - -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif -+ - cd->err = FALSE; -+#ifdef TCD_BSD -+ if(ioctl(cd->cd_dev, CDIOCSTOP)) -+#else - if(ioctl(cd->cd_dev, CDROMSTOP)) -+#endif - { - strcpy( cd->errmsg, "Can't stop disc." ); - cd->err = TRUE; -@@ -562,24 +732,44 @@ - int tmp; - cd->err = FALSE; - -- if(cd->sc.cdsc_audiostatus==CDROM_AUDIO_PAUSED) -- { -+ if(SC_AUDIOSTATUS(cd->sc)==CDROM_AUDIO_PAUSED) -+ { -+#ifdef TCD_BSD -+ if((tmp=ioctl(cd->cd_dev, CDIOCRESUME))) -+#else - if((tmp=ioctl(cd->cd_dev, CDROMRESUME))) -+#endif - { - strcpy(cd->errmsg, strerror(errno)); - cd->err = TRUE; -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - return(-1); - } -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCPREVENT); -+#endif - return tmp; - } - else - { -+#ifdef TCD_BSD -+ if((tmp=ioctl(cd->cd_dev, CDIOCPAUSE))) -+#else - if((tmp=ioctl(cd->cd_dev, CDROMPAUSE))) -+#endif - { - strcpy( cd->errmsg, strerror( errno ) ); - cd->err = TRUE; -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - return(-1); - } -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCPREVENT); -+#endif - return tmp; - } - } -@@ -587,6 +777,7 @@ - int tcd_change_disc( cd_struct *cd, int disc ) - { - #ifdef TCD_CHANGER_ENABLED -+#ifndef TCD_BSD - int tmp; - cd->err = FALSE; - -@@ -595,10 +786,10 @@ - fprintf( stdout, "ioctl: %s\n", strerror(errno) ); - - return tmp; --#else -+#endif -+#endif - debug("tcd_change_disc called, but changer support isn't compiled in. Ickyblah.\n" ); - return 0; --#endif - } - - void tcd_opencddev( cd_struct *cd, WarnFunc msg_cb ) ---- tcd/linux-cdrom.h.orig Tue Oct 5 14:27:47 1999 -+++ tcd/linux-cdrom.h Fri Oct 8 12:05:05 1999 -@@ -27,11 +27,27 @@ - - #include <sys/types.h> - #include <glib.h> --#if !defined(linux) && !defined(sun) && !defined(__sun__) --#error TCD only builds on linux and Solaris/SunOs --#endif - --#ifdef linux -+#if defined(__FreeBSD__) -+ -+#define TCD_BSD -+ -+#include <sys/cdio.h> -+ -+#define CDROM_AUDIO_INVALID CD_AS_AUDIO_INVALID -+#define CDROM_AUDIO_PLAY CD_AS_PLAY_IN_PROGRESS -+#define CDROM_AUDIO_PAUSED CD_AS_PLAY_PAUSED -+#define CDROM_AUDIO_COMPLETED CD_AS_PLAY_COMPLETED -+#define CDROM_AUDIO_ERROR CD_AS_PLAY_ERROR -+#define CDROM_AUDIO_NO_STATUS CD_AS_NO_STATUS -+ -+#define CDROM -+ -+#else -+ -+#define TCD_LINUX -+ -+#if defined(linux) - #include <linux/cdrom.h> - - typedef struct cdrom_msf0 cd_min_sec_frame; -@@ -110,6 +126,7 @@ - } cd_min_sec_frame; - - #endif /* sun __sun__ */ -+#endif /* __FreeBSD__ */ - - #define TRK_NAME_LEN 512 - #define DISC_INFO_LEN 512 -@@ -125,7 +142,17 @@ - { - char name[TRK_NAME_LEN+1]; - char extd[EXT_DATA_LEN+1]; /* extra information for this track */ -+#ifdef TCD_BSD -+ struct cd_toc_entry toc; -+#define TOC_MINUTE(trk) (trk.toc.addr.msf.minute) -+#define TOC_SECOND(trk) (trk.toc.addr.msf.second) -+#define TOC_FRAME(trk) (trk.toc.addr.msf.frame) -+#else - struct cdrom_tocentry toc; -+#define TOC_MINUTE(trk) (trk.toc.cdte_addr.msf.minute) -+#define TOC_SECOND(trk) (trk.toc.cdte_addr.msf.second) -+#define TOC_FRAME(trk) (trk.toc.cdte_addr.msf.frame) -+#endif - int titled; - int start, length; - int tot_min, tot_sec; -@@ -151,10 +178,28 @@ - char album[DISC_INFO_LEN+1], artist[DISC_INFO_LEN+1]; - char extd[EXT_DATA_LEN+1]; /* extra information for this disc */ - -+#ifdef TCD_BSD -+ /* See /usr/include/sys/cdio.h */ -+ struct ioc_play_track ti; -+ struct ioc_toc_header tochdr; -+ struct cd_sub_channel_info sc; -+#define SC_AUDIOSTATUS(sc) (sc.header.audio_status) -+#define SC_TRACK(sc) (sc.what.position.track_number) -+#define SC_MINUTE(sc) (sc.what.position.absaddr.msf.minute) -+#define SC_SECOND(sc) (sc.what.position.absaddr.msf.second) -+#define SC_FRAME(sc) (sc.what.position.absaddr.msf.frame) -+#else -+ - /* See /usr/src/linux/include/linux/cdrom.h */ - struct cdrom_ti ti; /* Track info */ - struct cdrom_tochdr tochdr; /* TOC header */ - struct cdrom_subchnl sc; /* Subchannel, for time */ -+#define SC_AUDIOSTATUS(sc) (sc.cdsc_audiostatus) -+#define SC_TRACK(sc) (sc.cdsc_trk) -+#define SC_MINUTE(sc) (sc.cdsc_absaddr.msf.minute) -+#define SC_SECOND(sc) (sc.cdsc_absaddr.msf.second) -+#define SC_FRAME(sc) (sc.cdsc_absaddr.msf.frame) -+#endif - int volume; /* Must range 0-100 */ - - int cd_min, cd_sec; /* Total CD time */ ---- tcd/tcd.c.orig Mon Feb 8 21:12:29 1999 -+++ tcd/tcd.c Mon Jul 12 15:20:13 1999 -@@ -139,8 +139,8 @@ - - /* if the user hasn't stopped the cd, but it is - stopped anyway, fix it. */ -- if( cd->sc.cdsc_audiostatus != CDROM_AUDIO_PLAY && -- cd->sc.cdsc_audiostatus != CDROM_AUDIO_PAUSED ) -+ if( SC_AUDIOSTATUS(cd->sc) != CDROM_AUDIO_PLAY && -+ SC_AUDIOSTATUS(cd->sc) != CDROM_AUDIO_PAUSED ) - { - if( cd->play_method == REPEAT_CD ) - tcd_playtracks(cd, cd->first_t, cd->last_t, 0); diff --git a/audio/gnome-media/pkg-comment b/audio/gnome-media/pkg-comment deleted file mode 100644 index 0028a932b1e0..000000000000 --- a/audio/gnome-media/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -Multimedia applications for the GNOME desktop diff --git a/audio/gnome-media/pkg-descr b/audio/gnome-media/pkg-descr deleted file mode 100644 index 3d3117e6a73a..000000000000 --- a/audio/gnome-media/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Multimedia applications for the GNOME desktop. Includes gtcd, a CDDB -aware CD player; GMix, for controlling the sound card's mixer; and -VU-Meter, to slow down your desktop... diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist deleted file mode 100644 index 7b61361fb6bb..000000000000 --- a/audio/gnome-media/pkg-plist +++ /dev/null @@ -1,43 +0,0 @@ -bin/cddbslave -bin/cddbsubmit -bin/gmix -bin/gtcd -bin/vumeter -share/gnome/apps/Multimedia/gmix.desktop -share/gnome/apps/Multimedia/gtcd.desktop -share/gnome/apps/Multimedia/vumeter.desktop -share/gnome/cddb-submit-methods -share/gnome/pixmaps/gnome-mixer.png -share/gnome/pixmaps/gnome-vumeter.png -share/gnome/pixmaps/tcd/cdrom.xpm -share/gnome/pixmaps/tcd/eject.xpm -share/gnome/pixmaps/tcd/ff.xpm -share/gnome/pixmaps/tcd/goto.xpm -share/gnome/pixmaps/tcd/next_t.xpm -share/gnome/pixmaps/tcd/pause.xpm -share/gnome/pixmaps/tcd/play.xpm -share/gnome/pixmaps/tcd/prev_t.xpm -share/gnome/pixmaps/tcd/rw.xpm -share/gnome/pixmaps/tcd/stop.xpm -share/locale/cs/LC_MESSAGES/gnome-media.mo -share/locale/da/LC_MESSAGES/gnome-media.mo -share/locale/de/LC_MESSAGES/gnome-media.mo -share/locale/en_GB/LC_MESSAGES/gnome-media.mo -share/locale/es/LC_MESSAGES/gnome-media.mo -share/locale/et/LC_MESSAGES/gnome-media.mo -share/locale/fi/LC_MESSAGES/gnome-media.mo -share/locale/fr/LC_MESSAGES/gnome-media.mo -share/locale/ga/LC_MESSAGES/gnome-media.mo -share/locale/hu/LC_MESSAGES/gnome-media.mo -share/locale/it/LC_MESSAGES/gnome-media.mo -share/locale/ja/LC_MESSAGES/gnome-media.mo -share/locale/ko/LC_MESSAGES/gnome-media.mo -share/locale/nl/LC_MESSAGES/gnome-media.mo -share/locale/no/LC_MESSAGES/gnome-media.mo -share/locale/pl/LC_MESSAGES/gnome-media.mo -share/locale/pt/LC_MESSAGES/gnome-media.mo -share/locale/pt_BR/LC_MESSAGES/gnome-media.mo -share/locale/ru/LC_MESSAGES/gnome-media.mo -share/locale/sv/LC_MESSAGES/gnome-media.mo -share/locale/zh_TW.Big5/LC_MESSAGES/gnome-media.mo -@dirrm share/gnome/pixmaps/tcd/ diff --git a/audio/gnomeaudio2/Makefile b/audio/gnomeaudio2/Makefile deleted file mode 100644 index 45105558f0ad..000000000000 --- a/audio/gnomeaudio2/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# New ports collection makefile for: gnomeaudio -# Version required: 1.0.0 -# Date created: 29 Dec 1998 -# Whom: Vanilla I. Shu <vanilla@FreeBSD.org> -# -# $FreeBSD$ -# - -DISTNAME= gnome-audio-1.0.0 -PKGNAME= gnomeaudio-1.0.0 -CATEGORIES= audio gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/gnome-audio - -MAINTAINER= vanilla@FreeBSD.org - -BUILD_DEPENDS= gnome-config:${PORTSDIR}/x11/gnomelibs -RUN_DEPENDS= gnome-config:${PORTSDIR}/x11/gnomelibs - -USE_X_PREFIX= yes -USE_GMAKE= yes -NO_BUILD= yes - -INSTALL_TARGET= INSTALL_DATA="${INSTALL_DATA}" install - -post-extract: - @${RM} -fr ${WRKSRC}/sounds/sounds - -.include <bsd.port.mk> diff --git a/audio/gnomeaudio2/distinfo b/audio/gnomeaudio2/distinfo deleted file mode 100644 index b6a971e4403e..000000000000 --- a/audio/gnomeaudio2/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (gnome-audio-1.0.0.tar.gz) = 3ae217dfa20fc8fbb67595a32d6beeec diff --git a/audio/gnomeaudio2/files/patch-aa b/audio/gnomeaudio2/files/patch-aa deleted file mode 100644 index 905fd58df364..000000000000 --- a/audio/gnomeaudio2/files/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ ---- sounds/Makefile.orig Wed Feb 24 14:19:09 1999 -+++ sounds/Makefile Mon Jul 12 11:24:27 1999 -@@ -1,15 +1,13 @@ --prefix=$(shell gnome-config --prefix) -- - all: - - install: install-files install-default-links - - install-files: - for I in $(shell find . -name '*.wav'); do \ -- install -d $(prefix)/share/sounds/`dirname $$I`; \ -- install -m444 $$I $(prefix)/share/sounds/$$I; \ -+ mkdir -p $(PREFIX)/share/gnome/sounds/`dirname $$I`; \ -+ ${INSTALL_DATA} $$I $(PREFIX)/share/gnome/sounds/$$I; \ - done - - install-default-links: -- ln -sf startup3.wav $(prefix)/share/sounds/login.wav -- ln -sf shutdown1.wav $(prefix)/share/sounds/logout.wav -+ ln -sf startup3.wav $(PREFIX)/share/gnome/sounds/startup.wav -+ ln -sf shutdown1.wav $(PREFIX)/share/gnome/sounds/logout.wav diff --git a/audio/gnomeaudio2/pkg-comment b/audio/gnomeaudio2/pkg-comment deleted file mode 100644 index c061452c9b05..000000000000 --- a/audio/gnomeaudio2/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -Sound files for use with GNOME diff --git a/audio/gnomeaudio2/pkg-descr b/audio/gnomeaudio2/pkg-descr deleted file mode 100644 index a7572a0ecf46..000000000000 --- a/audio/gnomeaudio2/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This module holds sound files for use with GNOME. Stick them in the -'sounds' directory here, or a subdirectory thereof - the whole tree will -be copied over into $(gnome_prefix)/share/gnome/sounds. diff --git a/audio/gnomeaudio2/pkg-plist b/audio/gnomeaudio2/pkg-plist deleted file mode 100644 index 806f9647d5cd..000000000000 --- a/audio/gnomeaudio2/pkg-plist +++ /dev/null @@ -1,16 +0,0 @@ -share/gnome/sounds/card_shuffle.wav -share/gnome/sounds/gtk-events/activate.wav -share/gnome/sounds/gtk-events/clicked.wav -share/gnome/sounds/gtk-events/toggled.wav -share/gnome/sounds/login.wav -share/gnome/sounds/logout.wav -share/gnome/sounds/panel/slide.wav -share/gnome/sounds/phone.wav -share/gnome/sounds/shutdown1.wav -share/gnome/sounds/startup.wav -share/gnome/sounds/startup1.wav -share/gnome/sounds/startup2.wav -share/gnome/sounds/startup3.wav -@dirrm share/gnome/sounds/gtk-events -@dirrm share/gnome/sounds/panel -@dirrm share/gnome/sounds diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile deleted file mode 100644 index 6ee54e2514c6..000000000000 --- a/audio/gnomemedia2/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# New ports collection makefile for: gnome-media -# Version required: 1.0.51 -# Date created: 20 January 1999 -# Whom: Jeremy Lea <reg@shale.csir.co.za> -# -# $FreeBSD$ -# - -DISTNAME= gnome-media-1.0.51 -PKGNAME= gnomemedia-1.0.51 -CATEGORIES= audio gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/gnome-media - -MAINTAINER= reg@shale.csir.co.za - -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore - -USE_X_PREFIX= yes -USE_GMAKE= yes -USE_LIBTOOL= yes -CONFIGURE_ARGS= --without-ncurses \ - --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" - -.include <bsd.port.mk> diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo deleted file mode 100644 index dd5df81a3f24..000000000000 --- a/audio/gnomemedia2/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (gnome-media-1.0.51.tar.gz) = d52772de47b214d9fc48aea75108cce7 diff --git a/audio/gnomemedia2/files/patch-ac b/audio/gnomemedia2/files/patch-ac deleted file mode 100644 index 729dd0e75d9b..000000000000 --- a/audio/gnomemedia2/files/patch-ac +++ /dev/null @@ -1,71 +0,0 @@ ---- vu-meter/Makefile.in.orig Wed Mar 3 12:35:57 1999 -+++ vu-meter/Makefile.in Wed Mar 3 12:36:25 1999 -@@ -116,9 +116,9 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ - --Audiodir = $(datadir)/gnome/apps/Multimedia -+Audiodir = $(datadir)/apps/Multimedia - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = vumeter ---- gmix/Makefile.in.orig Wed Sep 22 03:11:25 1999 -+++ gmix/Makefile.in Fri Sep 24 11:55:02 1999 -@@ -123,12 +123,12 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --Audiodir = $(datadir)/gnome/apps/Multimedia -+Audiodir = $(datadir)/apps/Multimedia - pixmapdir = $(datadir)/pixmaps - - EXTRA_DIST = README TODO NEWS gmix.desktop gnome-mixer.png - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gmix ---- tcd/Makefile.in.orig Sat Feb 27 09:22:02 1999 -+++ tcd/Makefile.in Wed Mar 3 12:38:28 1999 -@@ -116,7 +116,7 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ - --Audiodir = $(datadir)/gnome/apps/Multimedia -+Audiodir = $(datadir)/apps/Multimedia - - EXTRA_DIST = README TODO NEWS gtcd.desktop - -@@ -141,7 +141,7 @@ - - CLEANFILES = *~ - --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(USE_CD_CHANGER) -g -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(USE_CD_CHANGER) -g - - - Audio_DATA = gtcd.desktop ---- cddbslave/Makefile.in.orig Thu Jul 15 07:55:51 1999 -+++ cddbslave/Makefile.in Fri Jul 16 00:02:50 1999 -@@ -123,7 +123,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" - - - bin_PROGRAMS = cddbslave cddbsubmit -@@ -137,7 +137,7 @@ - cddbsubmit_LDADD = $(GNOME_LIBDIR) $(GNOME_LIBS) $(GHTTP_LIB) $(INTLLIBS) - - --gnomedatadir = $(datadir)/gnome -+gnomedatadir = $(datadir) - - gnomedata_DATA = cddb-submit-methods - diff --git a/audio/gnomemedia2/files/patch-ad b/audio/gnomemedia2/files/patch-ad deleted file mode 100644 index 8c2d1acfb01f..000000000000 --- a/audio/gnomemedia2/files/patch-ad +++ /dev/null @@ -1,74 +0,0 @@ ---- gmix/gmix.c.orig Sun Feb 21 12:10:17 1999 -+++ gmix/gmix.c Mon Mar 8 20:41:05 1999 -@@ -94,6 +94,17 @@ - /* - * All, that is known about a mixer-device - */ -+ -+#if !defined(OPEN_SOUND_SYSTEM) -+typedef struct mixer_info -+{ -+ char id[16]; -+ char name[32]; -+ int modify_counter; -+ int fillers[10]; -+} mixer_info; -+#endif -+ - typedef struct device_info { - int fd; - mixer_info info; -@@ -272,11 +283,7 @@ - /* - * open the mixer-device - */ -- if (num==0) { -- sprintf(device_name, "/dev/mixer"); -- } else { -- sprintf(device_name, "/dev/mixer%i", num); -- } -+ sprintf(device_name, "/dev/mixer%i", num); - new_device->fd=open(device_name, O_RDWR, 0); - if (new_device->fd<0) { - free(new_device); -@@ -291,6 +298,8 @@ - fprintf(stderr, "Warning: This version of gmix was compiled with a different version of\nsoundcard.h.\n"); - } - #endif -+ -+#if defined(OPEN_SOUND_SYSTEM) - /* - * mixer-name - */ -@@ -301,6 +310,11 @@ - } - if(!isalpha(new_device->info.name[0])) - g_snprintf(new_device->info.name, 31, "Card %d", num+1); -+#else -+ g_snprintf(new_device->info.id, 15, "mixer%d", num); -+ g_snprintf(new_device->info.name, 31, "Sound Card %d", num+1); -+ new_device->info.modify_counter=0; -+#endif - /* - * several bitmasks describing the mixer - */ -@@ -386,15 +400,16 @@ - { - int cnt; - device_info *new_device; -- cnt=0; devices=NULL; -+ cnt=0; num_mixers=0; devices=NULL; - do { - new_device=open_device(cnt++); - if (new_device) { - new_device->channels=make_channels(new_device); - devices=g_list_append(devices, new_device); -+ num_mixers++; - } -- } while (new_device); -- num_mixers=cnt-1; -+ } while ((errno == EACCES) || (errno == EINVAL) || (errno == ENXIO) \ -+ || new_device); - } - - void free_one_device(gpointer a, gpointer b) diff --git a/audio/gnomemedia2/files/patch-ae b/audio/gnomemedia2/files/patch-ae deleted file mode 100644 index 1d1670e93047..000000000000 --- a/audio/gnomemedia2/files/patch-ae +++ /dev/null @@ -1,942 +0,0 @@ ---- tcd/callbacks.c.orig Tue Feb 23 21:03:37 1999 -+++ tcd/callbacks.c Mon Jul 12 15:20:13 1999 -@@ -10,7 +10,7 @@ - - void play_cb(GtkWidget *widget, gpointer data) - { -- if(cd.sc.cdsc_audiostatus==CDROM_AUDIO_PAUSED) -+ if(SC_AUDIOSTATUS(cd.sc)==CDROM_AUDIO_PAUSED) - tcd_pausecd(&cd); - else - tcd_playtracks(&cd, cd.first_t, cd.last_t, prefs.only_use_trkind); -@@ -42,7 +42,7 @@ - cd.play_method = NORMAL; - cd.repeat_track = -1; - /* SDH: Make sure play/pause state change is noticed */ -- cd.sc.cdsc_audiostatus = -1; -+ SC_AUDIOSTATUS(cd.sc) = -1; - if(cd.isplayable) - { - make_goto_menu(); ---- tcd/cddb.c.orig Mon May 31 22:18:28 1999 -+++ tcd/cddb.c Mon Jul 12 15:23:19 1999 -@@ -199,16 +199,16 @@ - { - int min, sec; - -- min = cd->trk[trk].toc.cdte_addr.msf.minute; -- sec = cd->trk[trk].toc.cdte_addr.msf.second; -+ min = TOC_MINUTE(cd->trk[trk]); -+ sec = TOC_SECOND(cd->trk[trk]); - - n = (min*60)+sec; -- fprintf( fp, "# %u\n", (n*75)+cd->trk[trk].toc.cdte_addr.msf.frame ); -+ fprintf( fp, "# %u\n", (n*75)+TOC_FRAME(cd->trk[trk]) ); - } - /* Print the number of seconds */ - fprintf( fp, "#\n# Disc length: %i seconds\n", -- (cd->trk[cd->last_t+1].toc.cdte_addr.msf.minute*60) -- +(cd->trk[cd->last_t+1].toc.cdte_addr.msf.second) ); -+ (TOC_MINUTE(cd->trk[cd->last_t+1])*60) -+ +(TOC_SECOND(cd->trk[cd->last_t+1])) ); - - fprintf( fp, "#\n# Revision: %lu\n", cd->cddb_rev ); - fprintf( fp, "# Submitted via: tcd 2.0b\n" ); -@@ -245,10 +245,10 @@ - { - int min, sec; - -- min = cd->trk[i].toc.cdte_addr.msf.minute; -- sec = cd->trk[i].toc.cdte_addr.msf.second; -+ min = TOC_MINUTE(cd->trk[i]); -+ sec = TOC_SECOND(cd->trk[i]); - -- l=sprintf( tmp, "%u ", calc_offset(min,sec,cd->trk[i].toc.cdte_addr.msf.frame)); -+ l=sprintf( tmp, "%u ", calc_offset(min,sec,TOC_FRAME(cd->trk[i]))); - - if(blen>l) - { -@@ -257,8 +257,8 @@ - } - } - l=sprintf( tmp, "%i\n", -- (cd->trk[cd->last_t+1].toc.cdte_addr.msf.minute*60) -- +(cd->trk[cd->last_t+1].toc.cdte_addr.msf.second) ); -+ (TOC_MINUTE(cd->trk[cd->last_t+1])*60) -+ +(TOC_SECOND(cd->trk[cd->last_t+1])) ); - if(blen>l) - strcat( buf,tmp ); - -@@ -298,9 +298,9 @@ - - for( i=0; i <= cd->last_t+1; i++ ) - { -- cdtoc[i].frame = cd->trk[i+1].toc.cdte_addr.msf.frame; -- cdtoc[i].min = cd->trk[i+1].toc.cdte_addr.msf.minute; -- cdtoc[i].sec = cd->trk[i+1].toc.cdte_addr.msf.second; -+ cdtoc[i].frame = TOC_FRAME(cd->trk[i+1]); -+ cdtoc[i].min = TOC_MINUTE(cd->trk[i+1]); -+ cdtoc[i].sec = TOC_SECOND(cd->trk[i+1]); - } - - ---- tcd/gtcd.c.orig Mon Sep 20 07:48:29 1999 -+++ tcd/gtcd.c Fri Sep 24 13:34:55 1999 -@@ -160,7 +160,11 @@ - gint release_timer(gpointer *data) - { - cd.time_lock = TRUE; -+#ifdef TCD_BSD -+ ioctl(cd.cd_dev, CDIOCPAUSE); -+#else - ioctl(cd.cd_dev, CDROMPAUSE); -+#endif - - roll_t = gtk_timeout_add(40, (GtkFunction)roll_timer, data); - release_t = 0; -@@ -435,8 +439,8 @@ - break; - case DISC_R: - cur = cd.cur_pos_abs; -- end = (cd.trk[cd.last_t+1].toc.cdte_addr.msf.minute -- *60)+cd.trk[cd.last_t+1].toc.cdte_addr.msf.second; -+ end = (TOC_MINUTE(cd.trk[cd.last_t+1])*60 -+ +TOC_SECOND(cd.trk[cd.last_t+1])); - pos = end-cur; - min = pos/60; - sec = pos-(pos/60)*60; -@@ -537,7 +541,7 @@ - - if( !cd.err ) - { -- switch( cd.sc.cdsc_audiostatus ) -+ switch( SC_AUDIOSTATUS(cd.sc) ) - { - case CDROM_AUDIO_INVALID: - strcpy(tmp, _("No Disc")); -@@ -633,8 +637,8 @@ - } - - /* see if we need to repeat */ -- if( cd.sc.cdsc_audiostatus != CDROM_AUDIO_PLAY && -- cd.sc.cdsc_audiostatus != CDROM_AUDIO_PAUSED ) -+ if( SC_AUDIOSTATUS(cd.sc) != CDROM_AUDIO_PLAY && -+ SC_AUDIOSTATUS(cd.sc) != CDROM_AUDIO_PAUSED ) - { - if( cd.play_method == REPEAT_CD ) - tcd_playtracks( &cd, cd.first_t, cd.last_t, prefs->only_use_trkind); -@@ -651,14 +655,14 @@ - - void status_changed(void) - { -- if(old_status != cd.sc.cdsc_audiostatus) -+ if(old_status != SC_AUDIOSTATUS(cd.sc)) - { - GtkWidget *pixmap; - GtkSignalFunc func; - char tmp[256]; - char *name; - -- old_status = cd.sc.cdsc_audiostatus; -+ old_status = SC_AUDIOSTATUS(cd.sc); - g_snprintf(tmp, 255, "tcd/%s.xpm", - (old_status==CDROM_AUDIO_PLAY)?"pause":"play"); - ---- tcd/gtracked.c.orig Tue May 11 09:35:44 1999 -+++ tcd/gtracked.c Mon Jul 12 15:24:02 1999 -@@ -206,8 +206,8 @@ - - /* Disc area */ - g_snprintf(tmp, 63, _("Disc Information (%02u:%02u minutes)"), -- cd.trk[cd.last_t+1].toc.cdte_addr.msf.minute, -- cd.trk[cd.last_t+1].toc.cdte_addr.msf.second); -+ TOC_MINUTE(cd.trk[cd.last_t+1]), -+ TOC_SECOND(cd.trk[cd.last_t+1])); - - disc_frame = gtk_frame_new(tmp); - disc_vbox = gtk_vbox_new(FALSE, GNOME_PAD_SMALL); ---- tcd/linux-cdrom.c.orig Sun Aug 15 23:58:40 1999 -+++ tcd/linux-cdrom.c Fri Sep 24 13:40:27 1999 -@@ -71,7 +71,7 @@ - debug("cdrom.c: tcd_init_disc(%p) top\n", cd ); - tcd_opencddev( cd, msg_cb ); - --#if defined(TCD_CHANGER_ENABLED) -+#if defined(TCD_CHANGER_ENABLED) && !defined(TCD_BSD) - cd->nslots = ioctl( cd->cd_dev, CDROM_CHANGER_NSLOTS ); - #else - cd->nslots = 0; -@@ -114,8 +114,11 @@ - - int tcd_readtoc( cd_struct *cd ) - { -- int tmp,i; -+ int i; - int delsecs; -+#ifdef TCD_BSD -+ struct ioc_read_toc_single_entry tocentry; -+#endif - - if(cd->time_lock) - return; -@@ -125,26 +128,47 @@ - cd->isplayable=FALSE; - - /* read the TOC header */ -+#ifdef TCD_BSD -+ if(ioctl( cd->cd_dev, CDIOREADTOCHEADER, &cd->tochdr)) -+#else - if(ioctl( cd->cd_dev, CDROMREADTOCHDR, &cd->tochdr)) -+#endif - { - strcpy( cd->errmsg, "Can't read disc." ); - cd->err = TRUE; - debug("cdrom.c: tcd_readtoc exiting prematurly. CDROMREADTOCHDR ioctl error.\n" ); - cd->cur_t = 0; - cd->cddb_id = 0; -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - return(-1); - } - - /* grab first & last tracks */ -+#ifdef TCD_BSD -+ cd->first_t = cd->tochdr.starting_track; -+ cd->last_t = cd->tochdr.ending_track; -+#else - cd->first_t = cd->tochdr.cdth_trk0; - cd->last_t = cd->tochdr.cdth_trk1; -+#endif - - /* read the leadout track */ -+#ifdef TCD_BSD -+ tocentry.track = cd->last_t+1; /* Magic last track */ -+ tocentry.address_format = CD_MSF_FORMAT; -+#else - cd->trk[C(cd->last_t+1)].toc.cdte_track = CDROM_LEADOUT; - cd->trk[C(cd->last_t+1)].toc.cdte_format = CDROM_MSF; -+#endif - - /* read the leadout toc */ -+#ifdef TCD_BSD -+ if(ioctl(cd->cd_dev, CDIOREADTOCENTRY, &tocentry)) -+#else - if(ioctl(cd->cd_dev, CDROMREADTOCENTRY, &cd->trk[C(cd->last_t+1)].toc)) -+#endif - { - strcpy(cd->errmsg, "Can't read disc."); - cd->err = TRUE; -@@ -152,40 +176,65 @@ - debug("cdrom.c: tcd_readtoc exiting prematurly. CDROMREADTOCENTRY ioctl error.\n" ); - cd->cur_t = 0; - cd->cddb_id = 0; -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - return(-1); -- } -+ } -+ -+#ifdef TCD_BSD -+ cd->trk[C(cd->last_t+1)].toc = tocentry.entry; -+#endif -+ cd->trk[C(cd->last_t+1)].length = TOC_MINUTE(cd->trk[C(cd->last_t+1)]) * 60 + -+ TOC_SECOND(cd->trk[C(cd->last_t+1)]); -+ cd->trk[C(cd->last_t+1)].start = cd->trk[C(cd->last_t+1)].length * 75 + -+ TOC_FRAME(cd->trk[C(cd->last_t+1)]); - - /* read the rest of the tocs */ - for( i = cd->first_t; i <= cd->last_t; i++ ) - { -+#ifdef TCD_BSD -+ tocentry.track = i; -+ tocentry.address_format = CD_MSF_FORMAT; -+#else - cd->trk[C(i)].toc.cdte_track = i; - cd->trk[C(i)].toc.cdte_format = CDROM_MSF; -+#endif - -+#ifdef TCD_BSD -+ if(ioctl(cd->cd_dev, CDIOREADTOCENTRY, &tocentry)) -+#else - if(ioctl(cd->cd_dev, CDROMREADTOCENTRY, &cd->trk[C(i)].toc)) -+#endif - { - strcpy( cd->errmsg, "Can't read disc." ); - cd->err = TRUE; - debug("cdrom.c: tcd_readtoc exiting prematurly. CDROMREADTOCENTRY ioctl error.\n" ); - cd->cur_t = 0; - cd->cddb_id = 0; -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - return(-1); - } - -+#ifdef TCD_BSD -+ cd->trk[C(i)].toc = tocentry.entry; -+ cd->trk[C(i)].type = cd->trk[C(i)].toc.control; -+#else - cd->trk[C(i)].type = cd->trk[C(i)].toc.cdte_ctrl; -- cd->trk[C(i)].length = cd->trk[C(i)].toc.cdte_addr.msf.minute * 60 + -- cd->trk[C(i)].toc.cdte_addr.msf.second; -+#endif -+ cd->trk[C(i)].length = TOC_MINUTE(cd->trk[C(i)]) * 60 + -+ TOC_SECOND(cd->trk[C(i)]); - cd->trk[C(i)].start = cd->trk[C(i)].length * 75 + -- cd->trk[C(i)].toc.cdte_addr.msf.frame; -+ TOC_FRAME(cd->trk[C(i)]); - } - - /* calculate track times */ - for(i = cd->first_t; i <= cd->last_t; i ++) - { - /* Taken from cdtool...Thanks Thomas I.! */ -- delsecs = cd->trk[C(i+1)].toc.cdte_addr.msf.minute * 60 -- + cd->trk[C(i+1)].toc.cdte_addr.msf.second -- - cd->trk[C(i)].toc.cdte_addr.msf.minute * 60 -- - cd->trk[C(i)].toc.cdte_addr.msf.second; -+ delsecs = cd->trk[C(i+1)].length - cd->trk[C(i)].length; - - cd->trk[C(i)].tot_min = delsecs / 60; - cd->trk[C(i)].tot_sec = delsecs - (delsecs/60)*60; -@@ -204,7 +253,7 @@ - - cd->isplayable=TRUE; - debug("cdrom.c: tcd_readtoc exiting normally\n" ); -- return tmp; -+ return 0; - } - - void tcd_recalculate(cd_struct *cd) -@@ -214,9 +263,8 @@ - return; - - /* calculate various timing values */ -- cd->cur_pos_abs = cd->sc.cdsc_absaddr.msf.minute * 60 + -- cd->sc.cdsc_absaddr.msf.second; -- cd->cur_frame = cd->cur_pos_abs * 75 + cd->sc.cdsc_absaddr.msf.frame; -+ cd->cur_pos_abs = SC_MINUTE(cd->sc) * 60 + SC_SECOND(cd->sc); -+ cd->cur_frame = cd->cur_pos_abs * 75 + SC_FRAME(cd->sc); - - cd->cur_pos_rel = (cd->cur_frame - cd->trk[C(cd->cur_t)].start) / 75; - -@@ -235,8 +283,10 @@ - cd->cd_min = cd->cur_pos_abs / 60; - - #ifdef TCD_CHANGER_ENABLED -+#ifndef TCD_BSD - cd->cur_disc = ioctl( cd->cd_dev, CDROM_SELECT_DISC, CDSL_CURRENT ); - #endif -+#endif - } - - void tcd_recalculate_fake(cd_struct *cd, gint abs_pos, gint track) -@@ -281,35 +331,76 @@ - - void tcd_gettime( cd_struct *cd ) - { -+#ifdef TCD_BSD -+ struct ioc_read_subchannel subch; -+#endif -+ - cd->err = FALSE; -+#ifdef TCD_BSD -+ subch.address_format = CD_MSF_FORMAT; -+ subch.data_format = CD_CURRENT_POSITION; -+ subch.data_len = sizeof(cd->sc); -+ subch.data = &(cd->sc); -+#else - cd->sc.cdsc_format = CDROM_MSF; -+#endif - - if(cd->isplayable) - { -+#ifdef TCD_BSD -+ if(ioctl( cd->cd_dev, CDIOCREADSUBCHANNEL, &subch)) -+#else - if(ioctl( cd->cd_dev, CDROMSUBCHNL, &cd->sc)) -+#endif - { - strcpy( cd->errmsg, "Can't read disc." ); - cd->err = TRUE; - debug("cdrom.c: tcd_gettime exiting early. CDROMSUBCHNL ioctl error.\n" ); - cd->cur_t = 0; -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - return; - } -- if(cd->sc.cdsc_audiostatus==CDROM_AUDIO_PLAY) -- cd->cur_t = cd->sc.cdsc_trk; -+ if( SC_AUDIOSTATUS(cd->sc)==CDROM_AUDIO_PLAY ) -+ { -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCPREVENT); -+#endif -+ cd->cur_t = SC_TRACK(cd->sc); -+ } - else -+ { -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - cd->cur_t = 0; -+ } - tcd_recalculate(cd); - } - } - - int tcd_set_volume(cd_struct *cd, int volume) - { -+#ifdef TCD_BSD -+ struct ioc_vol vol; -+#else - struct cdrom_volctrl vol; -+#endif - -+#ifdef TCD_BSD -+ vol.vol[0] = volume; -+ vol.vol[1] = vol.vol[2] = vol.vol[3] = vol.vol[0]; -+#else - vol.channel0 = volume; - vol.channel1 = vol.channel2 = vol.channel3 = vol.channel0; -- -+#endif -+ -+#ifdef TCD_BSD -+ if(ioctl(cd->cd_dev, CDIOCSETVOL, &vol) < 0) -+#else - if(ioctl(cd->cd_dev, CDROMVOLCTRL, &vol) < 0) -+#endif - return FALSE; - - return TRUE; -@@ -317,6 +408,14 @@ - - int tcd_get_volume(cd_struct *cd) - { -+#ifdef TCD_BSD -+ struct ioc_vol vol; -+ -+ if(ioctl(cd->cd_dev, CDIOCGETVOL, &vol) < 0) -+ return -1; -+ -+ return vol.vol[0]; -+#else - #ifdef CDROMVOLREAD - struct cdrom_volctrl vol; - -@@ -327,12 +426,39 @@ - #else - return 0; - #endif -+#endif - } - - int tcd_playtracks(cd_struct *cd, int start_t, int end_t, int only_use_trkind) - { -+#ifdef TCD_BSD -+ struct ioc_play_msf msf; -+#define MSF_START_MIN (msf.start_m) -+#define MSF_START_SEC (msf.start_s) -+#define MSF_START_FRM (msf.start_f) -+#define MSF_END_MIN (msf.end_m) -+#define MSF_END_SEC (msf.end_s) -+#define MSF_END_FRM (msf.end_f) -+ struct ioc_play_track trkind; -+#define TI_START_TRK (trkind.start_track) -+#define TI_START_IND (trkind.start_index) -+#define TI_END_TRK (trkind.end_track) -+#define TI_END_IND (trkind.end_index) -+#else - struct cdrom_msf msf; -+#define MSF_START_MIN (msf.cdmsf_min0) -+#define MSF_START_SEC (msf.cdmsf_sec0) -+#define MSF_START_FRM (msf.cdmsf_frame0) -+#define MSF_END_MIN (msf.cdmsf_min1) -+#define MSF_END_SEC (msf.cdmsf_sec1) -+#define MSF_END_FRM (msf.cdmsf_frame0) - struct cdrom_ti trkind; -+#define TI_START_TRK (trkind.cdti_trk0) -+#define TI_START_IND (trkind.cdti_ind0) -+#define TI_END_TRK (trkind.cdti_trk1) -+#define TI_END_IND (trkind.cdti_ind1) -+#endif -+ - int tmp; - debug("cdrom.c: tcd_playtracks( %p, %d, %d )\n", cd, start_t, end_t ); - cd->err = FALSE; -@@ -341,7 +467,7 @@ - tcd_gettime(cd); - if(cd->err) - { -- /* try and inject cd */ -+ /* try and eject cd */ - tcd_ejectcd(cd); - - if(cd->err) -@@ -351,64 +477,88 @@ - } - } - -+#ifdef TCD_BSD -+ ioctl(cd->cd_dev, CDIOCCLOSE); -+#else - #if defined(CDROMCLOSETRAY) - ioctl(cd->cd_dev, CDROMCLOSETRAY); --#endif -- -+#endif -+#endif -+ -+ /* bad hack. most data tracks are the first track... */ -+#ifdef TCD_BSD -+ if(cd->trk[start_t].toc.control == 0x04) -+#else - if(cd->trk[start_t].toc.cdte_ctrl == CDROM_DATA_TRACK) -- start_t++; /* bad hack. most data tracks are the first track... */ -+#endif -+ start_t++; - -- msf.cdmsf_min0 = cd->trk[start_t].toc.cdte_addr.msf.minute; -- msf.cdmsf_sec0 = cd->trk[start_t].toc.cdte_addr.msf.second; -- msf.cdmsf_frame0 = cd->trk[start_t].toc.cdte_addr.msf.frame; -+ MSF_START_MIN = TOC_MINUTE(cd->trk[start_t]); -+ MSF_START_SEC = TOC_SECOND(cd->trk[start_t]); -+ MSF_START_FRM = TOC_FRAME(cd->trk[start_t]); - - if( end_t < 0 ) - { -- msf.cdmsf_min1 = cd->trk[start_t].tot_min+msf.cdmsf_min0; -- msf.cdmsf_sec1 = cd->trk[start_t].tot_sec+msf.cdmsf_sec0; -- msf.cdmsf_frame1=0; -+ MSF_END_MIN = cd->trk[start_t].tot_min+MSF_START_MIN; -+ MSF_END_SEC = cd->trk[start_t].tot_sec+MSF_START_SEC; -+ MSF_END_FRM = 0; - } - else - { -- msf.cdmsf_min1 = cd->trk[end_t+1].toc.cdte_addr.msf.minute; -- msf.cdmsf_sec1 = cd->trk[end_t+1].toc.cdte_addr.msf.second; -- msf.cdmsf_frame1 = cd->trk[end_t+1].toc.cdte_addr.msf.frame - 1; -+ MSF_END_MIN = TOC_MINUTE(cd->trk[end_t+1]); -+ MSF_END_SEC = TOC_SECOND(cd->trk[end_t+1]); -+ MSF_END_FRM = TOC_FRAME(cd->trk[end_t+1]) - 1; - - #ifdef UNSIGNED_NUMBERS_CAN_BE_NEGATIVE -- if(msf.cdmsf_frame1 < 0) -+ if(MSF_END_FRM < 0) - { -- msf.cdmsf_sec1 += msf.cdmsf_frame1; -- msf.cdmsf_frame1 = 0; -+ MSF_END_SEC += MSF_END_FRM; -+ MSF_END_FRM = 0; - } -- if(msf.cdmsf_sec1 < 0) -+ if(MSF_END_SEC < 0) - { -- msf.cdmsf_min1 += msf.cdmsf_sec1; -- msf.cdmsf_sec1 = 0; -+ MSF_END_MIN += MSF_END_SEC; -+ MSF_END_SEC = 0; - } -- if(msf.cdmsf_min1 < 0) -+ if(MSF_END_MIN < 0) - { -- msf.cdmsf_min1 = 0; -+ MSF_END_MIN = 0; - } - #endif - } -- msf.cdmsf_min1 += (msf.cdmsf_sec1 / 60); -- msf.cdmsf_sec1 %= 60; -+ MSF_END_MIN += (MSF_END_SEC / 60); -+ MSF_END_SEC %= 60; -+ -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCPREVENT); -+#endif - -+#ifdef TCD_BSD -+ if(only_use_trkind || ioctl( cd->cd_dev, CDIOCPLAYMSF, &msf)) -+#else - if(ioctl( cd->cd_dev, CDROMPLAYMSF, &msf) || only_use_trkind) -+#endif - { - debug("cdrom.c: tcd_playtracks error. CDROMPLAYMSF ioctl error (or user override). Trying PLAYTRKIND\n" ); - - /* Try alternate method of playing */ -- trkind.cdti_trk0 = start_t; /* start track */ -- trkind.cdti_ind0 = 0; /* start index */ -- trkind.cdti_trk1 = end_t; /* end track */ -- trkind.cdti_ind1 = 0; /* end index */ -+ TI_START_TRK = start_t; /* start track */ -+ TI_START_IND = 0; /* start index */ -+ TI_END_TRK = end_t; /* end track */ -+ TI_END_IND = 0; /* end index */ - -+#ifdef TCD_BSD -+ if(ioctl(cd->cd_dev, CDIOCPLAYTRACKS, &trkind)) -+#else - if(ioctl(cd->cd_dev, CDROMPLAYTRKIND, &trkind)) -+#endif - { - strcpy( cd->errmsg, "Error playing disc" ); - cd->err = TRUE; - debug("cdrom.c: tcd_playtracks error. CDROMPLAYTRKIND ioctl error.\n"); -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - return -1; - } - } -@@ -418,75 +568,68 @@ - return tmp; - } - --static int msf_2_frame( cd_min_sec_frame *msf ) --{ -- return( ( msf->minute * CD_SECS + msf->second ) -- * CD_FRAMES + msf->frame ); --} -- --static void frame_2_msf( int frame, cd_min_sec_frame *msf ) --{ -- msf->frame = frame % CD_FRAMES; -- frame /= CD_FRAMES; -- msf->second = frame % CD_SECS; -- msf->minute = frame / CD_SECS; --} -- - int tcd_play_seconds( cd_struct *cd, long int offset ) - { -+#ifdef TCD_BSD -+ struct ioc_play_msf msf; -+#else - struct cdrom_msf msf; -- cd_min_sec_frame msf0; -- int cur_frame, start_frame, end_frame; -+#endif -+ int tmp; - - debug("cdrom.c: tcd_play_seconds( %p, %ld )\n", cd, offset ); - - cd->err = FALSE; - cd->isplayable=FALSE; - -- /* converting msf to frames makes life much easier */ -- start_frame = msf_2_frame( &cd->trk[C(cd->first_t)].toc.cdte_addr.msf ); -- end_frame = msf_2_frame( &cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf ) - 1; -- cur_frame = cd->cur_frame + ( offset * CD_FRAMES ); -- -- /* keep the cur_frame within the boundaries of the first and last track */ -- if ( cur_frame < start_frame ) { -- cur_frame = start_frame; -- } else if ( cur_frame > end_frame ) { -- cur_frame = end_frame; -- } -- -- /* convert frames back to msf */ -- frame_2_msf( cur_frame, &msf0 ); -- msf.cdmsf_min0 = msf0.minute; -- msf.cdmsf_sec0 = msf0.second; -- msf.cdmsf_frame0 = msf0.frame; -- msf.cdmsf_min1 = cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.minute; -- msf.cdmsf_sec1 = cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.second; -- msf.cdmsf_frame1 = cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.frame - 1; -+ /* got subchannel? */ -+ MSF_START_SEC = SC_SECOND(cd->sc)+offset; -+ MSF_START_MIN = SC_MINUTE(cd->sc); -+ MSF_START_FRM = SC_FRAME(cd->sc); -+ MSF_END_MIN = TOC_MINUTE(cd->trk[C(cd->last_t+1)]); -+ MSF_END_SEC = TOC_SECOND(cd->trk[C(cd->last_t+1)]); -+ MSF_END_FRM = TOC_FRAME(cd->trk[C(cd->last_t+1)]) - 1; - - #ifdef UNSIGNED_NUMBERS_CAN_BE_NEGATIVE -- if(msf.cdmsf_frame1 < 0) -+ if((MSF_END_FRM < 0) - { -- msf.cdmsf_sec1 += msf.cdmsf_frame1; -- msf.cdmsf_frame1 = 0; -+ MSF_END_SEC += MSF_END_FRM; -+ MSF_END_FRM = 0; - } -- if(msf.cdmsf_sec1 < 0) -+ if(MSF_END_SEC < 0) - { -- msf.cdmsf_min1 += msf.cdmsf_sec1; -- msf.cdmsf_sec1 = 0; -+ MSF_END_MIN += MSF_END_SEC; -+ MSF_END_SEC = 0; - } -- if(msf.cdmsf_min1 < 0) -+ if(MSF_END_MIN < 0) - { -- msf.cdmsf_min1 = 0; -+ MSF_END_MIN = 0; - } - #endif -+ -+ if(MSF_START_SEC > 60 && (offset<0)) -+ { -+ MSF_START_SEC = 60-abs(offset); -+ MSF_START_MIN--; -+ } -+ -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCPREVENT ); -+#endif - -+#ifdef TCD_BSD -+ if(ioctl(cd->cd_dev, CDIOCPLAYMSF, &msf)) -+#else - if(ioctl(cd->cd_dev, CDROMPLAYMSF, &msf)) -+#endif - { - strcpy( cd->errmsg, "Error playing disc." ); - cd->err = TRUE; - - debug("cdrom.c: tcd_play_seconds error. CDROMPLAYMSF ioctl error.\n" ); -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW ); -+#endif - return(-1); - } - cd->isplayable=TRUE; -@@ -503,7 +646,15 @@ - if(cd->isplayable) tcd_stopcd(cd); - cd->err = FALSE; - -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif -+ -+#ifdef TCD_BSD -+ if(!ioctl(cd->cd_dev, CDIOCEJECT)) -+#else - if(!ioctl(cd->cd_dev, CDROMEJECT)) -+#endif - { - cd->isplayable = FALSE; - strcpy(cd->errmsg, "No disc in drive "); -@@ -511,9 +662,17 @@ - } - else - { -+#ifdef TCD_BSD -+ tmp = ioctl( cd->cd_dev, CDIOCCLOSE ); -+#else - #ifdef CDROMCLOSETRAY - tmp = ioctl( cd->cd_dev, CDROMCLOSETRAY ); - #endif -+#endif -+ -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCPREVENT); -+#endif - - if(tcd_post_init(cd)) - { -@@ -523,6 +682,9 @@ - debug("cdrom.c: tcd_eject - disc init error. %s\n", - strerror(errno) ); - -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - return(-1); - } - cd->isplayable = TRUE; -@@ -540,11 +702,19 @@ - debug("cdrom.c: tcd_stopcd(%p)\n", cd ); - - /* SDH: Makes things cleaner on eject */ -- if( cd->sc.cdsc_audiostatus==CDROM_AUDIO_PAUSED ) -+ if( SC_AUDIOSTATUS(cd->sc)==CDROM_AUDIO_PAUSED ) - tcd_pausecd(cd); - -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif -+ - cd->err = FALSE; -+#ifdef TCD_BSD -+ if(ioctl(cd->cd_dev, CDIOCSTOP)) -+#else - if(ioctl(cd->cd_dev, CDROMSTOP)) -+#endif - { - strcpy( cd->errmsg, "Can't stop disc." ); - cd->err = TRUE; -@@ -562,24 +732,44 @@ - int tmp; - cd->err = FALSE; - -- if(cd->sc.cdsc_audiostatus==CDROM_AUDIO_PAUSED) -- { -+ if(SC_AUDIOSTATUS(cd->sc)==CDROM_AUDIO_PAUSED) -+ { -+#ifdef TCD_BSD -+ if((tmp=ioctl(cd->cd_dev, CDIOCRESUME))) -+#else - if((tmp=ioctl(cd->cd_dev, CDROMRESUME))) -+#endif - { - strcpy(cd->errmsg, strerror(errno)); - cd->err = TRUE; -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - return(-1); - } -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCPREVENT); -+#endif - return tmp; - } - else - { -+#ifdef TCD_BSD -+ if((tmp=ioctl(cd->cd_dev, CDIOCPAUSE))) -+#else - if((tmp=ioctl(cd->cd_dev, CDROMPAUSE))) -+#endif - { - strcpy( cd->errmsg, strerror( errno ) ); - cd->err = TRUE; -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - return(-1); - } -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCPREVENT); -+#endif - return tmp; - } - } -@@ -587,6 +777,7 @@ - int tcd_change_disc( cd_struct *cd, int disc ) - { - #ifdef TCD_CHANGER_ENABLED -+#ifndef TCD_BSD - int tmp; - cd->err = FALSE; - -@@ -595,10 +786,10 @@ - fprintf( stdout, "ioctl: %s\n", strerror(errno) ); - - return tmp; --#else -+#endif -+#endif - debug("tcd_change_disc called, but changer support isn't compiled in. Ickyblah.\n" ); - return 0; --#endif - } - - void tcd_opencddev( cd_struct *cd, WarnFunc msg_cb ) ---- tcd/linux-cdrom.h.orig Tue Oct 5 14:27:47 1999 -+++ tcd/linux-cdrom.h Fri Oct 8 12:05:05 1999 -@@ -27,11 +27,27 @@ - - #include <sys/types.h> - #include <glib.h> --#if !defined(linux) && !defined(sun) && !defined(__sun__) --#error TCD only builds on linux and Solaris/SunOs --#endif - --#ifdef linux -+#if defined(__FreeBSD__) -+ -+#define TCD_BSD -+ -+#include <sys/cdio.h> -+ -+#define CDROM_AUDIO_INVALID CD_AS_AUDIO_INVALID -+#define CDROM_AUDIO_PLAY CD_AS_PLAY_IN_PROGRESS -+#define CDROM_AUDIO_PAUSED CD_AS_PLAY_PAUSED -+#define CDROM_AUDIO_COMPLETED CD_AS_PLAY_COMPLETED -+#define CDROM_AUDIO_ERROR CD_AS_PLAY_ERROR -+#define CDROM_AUDIO_NO_STATUS CD_AS_NO_STATUS -+ -+#define CDROM -+ -+#else -+ -+#define TCD_LINUX -+ -+#if defined(linux) - #include <linux/cdrom.h> - - typedef struct cdrom_msf0 cd_min_sec_frame; -@@ -110,6 +126,7 @@ - } cd_min_sec_frame; - - #endif /* sun __sun__ */ -+#endif /* __FreeBSD__ */ - - #define TRK_NAME_LEN 512 - #define DISC_INFO_LEN 512 -@@ -125,7 +142,17 @@ - { - char name[TRK_NAME_LEN+1]; - char extd[EXT_DATA_LEN+1]; /* extra information for this track */ -+#ifdef TCD_BSD -+ struct cd_toc_entry toc; -+#define TOC_MINUTE(trk) (trk.toc.addr.msf.minute) -+#define TOC_SECOND(trk) (trk.toc.addr.msf.second) -+#define TOC_FRAME(trk) (trk.toc.addr.msf.frame) -+#else - struct cdrom_tocentry toc; -+#define TOC_MINUTE(trk) (trk.toc.cdte_addr.msf.minute) -+#define TOC_SECOND(trk) (trk.toc.cdte_addr.msf.second) -+#define TOC_FRAME(trk) (trk.toc.cdte_addr.msf.frame) -+#endif - int titled; - int start, length; - int tot_min, tot_sec; -@@ -151,10 +178,28 @@ - char album[DISC_INFO_LEN+1], artist[DISC_INFO_LEN+1]; - char extd[EXT_DATA_LEN+1]; /* extra information for this disc */ - -+#ifdef TCD_BSD -+ /* See /usr/include/sys/cdio.h */ -+ struct ioc_play_track ti; -+ struct ioc_toc_header tochdr; -+ struct cd_sub_channel_info sc; -+#define SC_AUDIOSTATUS(sc) (sc.header.audio_status) -+#define SC_TRACK(sc) (sc.what.position.track_number) -+#define SC_MINUTE(sc) (sc.what.position.absaddr.msf.minute) -+#define SC_SECOND(sc) (sc.what.position.absaddr.msf.second) -+#define SC_FRAME(sc) (sc.what.position.absaddr.msf.frame) -+#else -+ - /* See /usr/src/linux/include/linux/cdrom.h */ - struct cdrom_ti ti; /* Track info */ - struct cdrom_tochdr tochdr; /* TOC header */ - struct cdrom_subchnl sc; /* Subchannel, for time */ -+#define SC_AUDIOSTATUS(sc) (sc.cdsc_audiostatus) -+#define SC_TRACK(sc) (sc.cdsc_trk) -+#define SC_MINUTE(sc) (sc.cdsc_absaddr.msf.minute) -+#define SC_SECOND(sc) (sc.cdsc_absaddr.msf.second) -+#define SC_FRAME(sc) (sc.cdsc_absaddr.msf.frame) -+#endif - int volume; /* Must range 0-100 */ - - int cd_min, cd_sec; /* Total CD time */ ---- tcd/tcd.c.orig Mon Feb 8 21:12:29 1999 -+++ tcd/tcd.c Mon Jul 12 15:20:13 1999 -@@ -139,8 +139,8 @@ - - /* if the user hasn't stopped the cd, but it is - stopped anyway, fix it. */ -- if( cd->sc.cdsc_audiostatus != CDROM_AUDIO_PLAY && -- cd->sc.cdsc_audiostatus != CDROM_AUDIO_PAUSED ) -+ if( SC_AUDIOSTATUS(cd->sc) != CDROM_AUDIO_PLAY && -+ SC_AUDIOSTATUS(cd->sc) != CDROM_AUDIO_PAUSED ) - { - if( cd->play_method == REPEAT_CD ) - tcd_playtracks(cd, cd->first_t, cd->last_t, 0); diff --git a/audio/gnomemedia2/pkg-comment b/audio/gnomemedia2/pkg-comment deleted file mode 100644 index 0028a932b1e0..000000000000 --- a/audio/gnomemedia2/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -Multimedia applications for the GNOME desktop diff --git a/audio/gnomemedia2/pkg-descr b/audio/gnomemedia2/pkg-descr deleted file mode 100644 index 3d3117e6a73a..000000000000 --- a/audio/gnomemedia2/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Multimedia applications for the GNOME desktop. Includes gtcd, a CDDB -aware CD player; GMix, for controlling the sound card's mixer; and -VU-Meter, to slow down your desktop... diff --git a/audio/gnomemedia2/pkg-plist b/audio/gnomemedia2/pkg-plist deleted file mode 100644 index 7b61361fb6bb..000000000000 --- a/audio/gnomemedia2/pkg-plist +++ /dev/null @@ -1,43 +0,0 @@ -bin/cddbslave -bin/cddbsubmit -bin/gmix -bin/gtcd -bin/vumeter -share/gnome/apps/Multimedia/gmix.desktop -share/gnome/apps/Multimedia/gtcd.desktop -share/gnome/apps/Multimedia/vumeter.desktop -share/gnome/cddb-submit-methods -share/gnome/pixmaps/gnome-mixer.png -share/gnome/pixmaps/gnome-vumeter.png -share/gnome/pixmaps/tcd/cdrom.xpm -share/gnome/pixmaps/tcd/eject.xpm -share/gnome/pixmaps/tcd/ff.xpm -share/gnome/pixmaps/tcd/goto.xpm -share/gnome/pixmaps/tcd/next_t.xpm -share/gnome/pixmaps/tcd/pause.xpm -share/gnome/pixmaps/tcd/play.xpm -share/gnome/pixmaps/tcd/prev_t.xpm -share/gnome/pixmaps/tcd/rw.xpm -share/gnome/pixmaps/tcd/stop.xpm -share/locale/cs/LC_MESSAGES/gnome-media.mo -share/locale/da/LC_MESSAGES/gnome-media.mo -share/locale/de/LC_MESSAGES/gnome-media.mo -share/locale/en_GB/LC_MESSAGES/gnome-media.mo -share/locale/es/LC_MESSAGES/gnome-media.mo -share/locale/et/LC_MESSAGES/gnome-media.mo -share/locale/fi/LC_MESSAGES/gnome-media.mo -share/locale/fr/LC_MESSAGES/gnome-media.mo -share/locale/ga/LC_MESSAGES/gnome-media.mo -share/locale/hu/LC_MESSAGES/gnome-media.mo -share/locale/it/LC_MESSAGES/gnome-media.mo -share/locale/ja/LC_MESSAGES/gnome-media.mo -share/locale/ko/LC_MESSAGES/gnome-media.mo -share/locale/nl/LC_MESSAGES/gnome-media.mo -share/locale/no/LC_MESSAGES/gnome-media.mo -share/locale/pl/LC_MESSAGES/gnome-media.mo -share/locale/pt/LC_MESSAGES/gnome-media.mo -share/locale/pt_BR/LC_MESSAGES/gnome-media.mo -share/locale/ru/LC_MESSAGES/gnome-media.mo -share/locale/sv/LC_MESSAGES/gnome-media.mo -share/locale/zh_TW.Big5/LC_MESSAGES/gnome-media.mo -@dirrm share/gnome/pixmaps/tcd/ diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile deleted file mode 100644 index ee06b2eb2188..000000000000 --- a/audio/gqmpeg-devel/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# New ports collection makefile for: gqmpeg -# Version required: 0.6.3 -# Date Created: 28 Oct 1998 -# Whom: Vanilla Pooh Shu <vanilla@FreeBSD.org> -# -# $FreeBSD$ -# - -DISTNAME= gqmpeg-0.6.3 -CATEGORIES= audio -MASTER_SITES= http://gqview.netpedia.net/ \ - http://www.geocities.com/SiliconValley/Haven/5235/ -EXTRACT_SUFX= .src.tar.gz - -MAINTAINER= nacai@iname.com - -RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 -LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib - -USE_X_PREFIX= yes -ALL_TARGET= gqmpeg - -post-install: - @strip ${PREFIX}/bin/gqmpeg - -.include <bsd.port.mk> diff --git a/audio/gqmpeg-devel/distinfo b/audio/gqmpeg-devel/distinfo deleted file mode 100644 index 617e017cf600..000000000000 --- a/audio/gqmpeg-devel/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (gqmpeg-0.6.3.src.tar.gz) = 01ec3ac587847b73e90326ea014cee22 diff --git a/audio/gqmpeg-devel/files/patch-aa b/audio/gqmpeg-devel/files/patch-aa deleted file mode 100644 index f06e819ff7ca..000000000000 --- a/audio/gqmpeg-devel/files/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ ---- Makefile.orig Sat Jul 3 04:39:08 1999 -+++ Makefile Mon Jul 5 19:14:39 1999 -@@ -1,8 +1,7 @@ - --PREFIX=/usr/local - --GTK_INCLUDE = `gtk-config --cflags` --GTK_LIB = `gtk-config --libs` -+GTK_INCLUDE = `gtk12-config --cflags` -+GTK_LIB = `gtk12-config --libs` - IMLIB_INCLUDE = `imlib-config --cflags-gdk` - IMLIB_LIB = `imlib-config --libs-gdk` - -@@ -15,7 +14,7 @@ - #for IRIX - #LDFLAGS = $(GTK_LIB) $(IMLIB_LIB) -laudio - --CC = gcc -Wall -+CC += -Wall - - GNOME_PREFIX = `gnome-config --prefix` - diff --git a/audio/gqmpeg-devel/files/patch-ab b/audio/gqmpeg-devel/files/patch-ab deleted file mode 100644 index 9f9e259ad949..000000000000 --- a/audio/gqmpeg-devel/files/patch-ab +++ /dev/null @@ -1,18 +0,0 @@ ---- main.c.orig Mon Oct 11 10:45:08 1999 -+++ main.c Mon Oct 11 10:46:19 1999 -@@ -11,6 +11,7 @@ - - #include "config.h" - #include "gqmpeg.h" -+#include "floatingpoint.h" - - static gint update_timeout_id = -1; - -@@ -693,6 +694,7 @@ - GList *list_buf = NULL; - GList *playlist_buf = NULL; - -+ fpsetmask(0); - init_vars(); - - /* setup random seed for shuffle mode */ diff --git a/audio/gqmpeg-devel/pkg-comment b/audio/gqmpeg-devel/pkg-comment deleted file mode 100644 index d936d62215a0..000000000000 --- a/audio/gqmpeg-devel/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -Another gtk-based MP3 frontend diff --git a/audio/gqmpeg-devel/pkg-descr b/audio/gqmpeg-devel/pkg-descr deleted file mode 100644 index f72a689e1030..000000000000 --- a/audio/gqmpeg-devel/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -A GTK-based mp3 front-end. Uses mpg123 for decoding and supports -winamp themes.. - -WWW: http://gqview.netpedia.net/mpeg-over.html - --Vanilla -vanilla@FreeBSD.ORG diff --git a/audio/gqmpeg-devel/pkg-plist b/audio/gqmpeg-devel/pkg-plist deleted file mode 100644 index 5df621d0552d..000000000000 --- a/audio/gqmpeg-devel/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/gqmpeg -bin/gqmpeg-shoutcast-plugin.sh diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile deleted file mode 100644 index ac3cd551aacf..000000000000 --- a/audio/icecast2/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# New ports collection makefile for: icecast -# Version required: 1.3.0 -# Date created: 28 Jan 1999 -# Whom: Chip Marshall <chip@eboai.org> -# -# $FreeBSD$ -# - -DISTNAME= icecast-1.3.0 -CATEGORIES= audio net -MASTER_SITES= http://www.icecast.org/releases/ \ - ftp://ftp.eboai.org/pub/icecast/ - -MAINTAINER= chip@eboai.org - -WRKSRC= ${WRKDIR}/icecast-1.3 - -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-libwrap - -do-configure: - cd ${WRKSRC} && ${SH} ./configure ${CONFIGURE_ARGS} - cd ${WRKSRC}/liveice && ${SH} ./configure ${CONFIGURE_ARGS} - -do-build: - cd ${WRKSRC} && ${MAKE} - cd ${WRKSRC} && ${MAKE} mkpasswd - cd ${WRKSRC}/liveice && ${MAKE} - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/icecast ${PREFIX}/sbin - ${INSTALL_PROGRAM} ${WRKSRC}/mkpasswd ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/shout/listen ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/shout/shout ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/shout/calibrate ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/shout/stresstest ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/liveice/liveice ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/shout/iceplay ${PREFIX}/bin -.if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/icecast - ${INSTALL_MAN} ${WRKSRC}/doc/* ${PREFIX}/share/doc/icecast - ${INSTALL_MAN} ${WRKSRC}/liveice/README.liveice ${PREFIX}/share/doc/icecast - ${INSTALL_MAN} ${WRKSRC}/liveice/README.xingmp3enc ${PREFIX}/share/doc/icecast - ${INSTALL_MAN} ${WRKSRC}/liveice/README_new_mixer.txt ${PREFIX}/share/doc/icecast - ${MKDIR} ${PREFIX}/share/examples/icecast - ${INSTALL_MAN} ${WRKSRC}/icecast.conf ${PREFIX}/share/examples/icecast - ${INSTALL_MAN} ${WRKSRC}/liveice/liveice.cfg ${PREFIX}/share/examples/icecast - ${INSTALL_MAN} ${WRKSRC}/shout/shoutrc.example ${PREFIX}/share/examples/icecast - ${INSTALL_MAN} ${WRKSRC}/shout/playlist.example ${PREFIX}/share/examples/icecast - ${INSTALL_MAN} ${WRKSRC}/shout/radio.tcl.example ${PREFIX}/share/examples/icecast - ${MKDIR} ${PREFIX}/share/examples/icecast/icedir - ${INSTALL_MAN} ${WRKSRC}/icedir/* ${PREFIX}/share/examples/icecast/icedir - ${MKDIR} ${PREFIX}/share/examples/icecast/templates - ${INSTALL_MAN} ${WRKSRC}/templates/* ${PREFIX}/share/examples/icecast/templates - ${INSTALL_MAN} ${WRKSRC}/liveice/frontend.tcl ${PREFIX}/share/examples/icecast - ${INSTALL_MAN} ${WRKSRC}/liveice/liveiceconfigure.tk ${PREFIX}/share/examples/icecast -.endif - @${CAT} ${PKGDIR}/MESSAGE - -.include <bsd.port.mk> diff --git a/audio/icecast2/distinfo b/audio/icecast2/distinfo deleted file mode 100644 index 45815d8e8ec7..000000000000 --- a/audio/icecast2/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (icecast-1.3.0.tar.gz) = d322cc60b5f3185a764bf65adca282e4 diff --git a/audio/icecast2/pkg-comment b/audio/icecast2/pkg-comment deleted file mode 100644 index 0f379ec1fb9d..000000000000 --- a/audio/icecast2/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -A SHOUTcast-compatible streaming MP3 server diff --git a/audio/icecast2/pkg-descr b/audio/icecast2/pkg-descr deleted file mode 100644 index 2d2606179da3..000000000000 --- a/audio/icecast2/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Icecast provides nearly all the functionality of the Shoutcast -server. It will accept encoding streams from either iceplay or WinAmp. -It can also add itself to a directory server such as our own -icecast.linuxpower.org or Nullsoft's yp.shoutcast.com. It does not yet -support redirection of streams from other icecast servers, but soon will. - -WWW: http://www.icecast.org/ diff --git a/audio/icecast2/pkg-message b/audio/icecast2/pkg-message deleted file mode 100644 index 3d0177c12f66..000000000000 --- a/audio/icecast2/pkg-message +++ /dev/null @@ -1,5 +0,0 @@ -FYI, there a several useful programs included in the icecast distribution that -are not installed as part of this port. These include two ways of sending -data to the server, a program for listening to the server, and another for -managing a listing of servers. These are located in the subdirectories -icedir and iceplay under the working directory. diff --git a/audio/icecast2/pkg-plist b/audio/icecast2/pkg-plist deleted file mode 100644 index 3195443ba037..000000000000 --- a/audio/icecast2/pkg-plist +++ /dev/null @@ -1,53 +0,0 @@ -bin/mkpasswd -bin/listen -bin/shout -bin/calibrate -bin/stresstest -bin/liveice -bin/iceplay -sbin/icecast -share/doc/icecast/AUTHORS -share/doc/icecast/BUGS -share/doc/icecast/CHANGES -share/doc/icecast/COPYING -share/doc/icecast/FAQ -share/doc/icecast/INSTALL -share/doc/icecast/README -share/doc/icecast/TESTED -share/doc/icecast/TODO -share/doc/icecast/manual.html -share/doc/icecast/README.liveice -share/doc/icecast/README.xingmp3enc -share/doc/icecast/README_new_mixer.txt -share/examples/icecast/icecast.conf -share/examples/icecast/liveice.cfg -share/examples/icecast/shoutrc.example -share/examples/icecast/playlist.example -share/examples/icecast/icedir/addsrv -share/examples/icecast/icedir/byserver.php3 -share/examples/icecast/icedir/bystream.php3 -share/examples/icecast/icedir/db_mysql.inc -share/examples/icecast/icedir/example.html -share/examples/icecast/icedir/example.phtml -share/examples/icecast/icedir/functions.phps -share/examples/icecast/icedir/gen-playlist -share/examples/icecast/icedir/gen-playlist.pls -share/examples/icecast/icedir/icedir_cleanup.pl -share/examples/icecast/icedir/remsrv -share/examples/icecast/icedir/servers.sql -share/examples/icecast/icedir/sources.sql -share/examples/icecast/icedir/tchsrv -share/examples/icecast/icedir/touch -share/examples/icecast/icedir/yp.inc -share/examples/icecast/radio.tcl.example -share/examples/icecast/templates/bodytag.html -share/examples/icecast/templates/info.html -share/examples/icecast/templates/list_directory.html -share/examples/icecast/templates/mountlist.html -share/examples/icecast/templates/statistics.html -share/examples/icecast/frontend.tcl -share/examples/icecast/liveiceconfigure.tk -@dirrm share/doc/icecast -@dirrm share/examples/icecast/icedir -@dirrm share/examples/icecast/templates -@dirrm share/examples/icecast diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile deleted file mode 100644 index 707b6d56a0c0..000000000000 --- a/audio/kdemultimedia3/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# New ports collection makefile for: kdemultimedia -# Version required: Beta1 -# Date created: 28 October 1997 -# Whom: Stefan Eßer <se@freebsd.org> -# -# $FreeBSD$ -# - -DISTNAME= kdemultimedia-1.1.2 -CATEGORIES= audio kde -MASTER_SITES= $(MASTER_SITE_KDE) -MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2 - -MAINTAINER= se@freebsd.org - -LIB_DEPENDS= gif.5:${PORTSDIR}/graphics/giflib \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ - kdecore.2:${PORTSDIR}/x11/kdelibs11 - -USE_BZIP2= yes -USE_QT= yes -HAS_CONFIGURE= yes -CONFIGURE_ARGS= "--prefix=$(PREFIX)" -CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" \ - INSTALL_SCRIPT="install -c -m 555" -USE_GMAKE= yes - -.include <bsd.port.mk> diff --git a/audio/kdemultimedia3/distinfo b/audio/kdemultimedia3/distinfo deleted file mode 100644 index 745eae46729e..000000000000 --- a/audio/kdemultimedia3/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (kdemultimedia-1.1.2.tar.bz2) = 91018d4cad9420d376d94aba034e1bbe diff --git a/audio/kdemultimedia3/pkg-comment b/audio/kdemultimedia3/pkg-comment deleted file mode 100644 index 6f31b51504cc..000000000000 --- a/audio/kdemultimedia3/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -KDE audio tools diff --git a/audio/kdemultimedia3/pkg-descr b/audio/kdemultimedia3/pkg-descr deleted file mode 100644 index 90ae45773bea..000000000000 --- a/audio/kdemultimedia3/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -KDE provides an integrated X11 based environment, much like CDE. diff --git a/audio/kdemultimedia3/pkg-plist b/audio/kdemultimedia3/pkg-plist deleted file mode 100644 index 34fd257b8340..000000000000 --- a/audio/kdemultimedia3/pkg-plist +++ /dev/null @@ -1,337 +0,0 @@ -bin/cddaslave -bin/kmedia -bin/kmid -bin/kmidi -bin/kmix -bin/kscd -bin/kscdmagic -bin/workman2cddb.pl -share/applnk/Multimedia/KMedia.kdelnk -share/applnk/Multimedia/KMidi.kdelnk -share/applnk/Multimedia/KMix.kdelnk -share/applnk/Multimedia/kmid.kdelnk -share/applnk/Multimedia/kscd.kdelnk -share/apps/kmedia/pics/eject.xbm -share/apps/kmedia/pics/ff.xbm -share/apps/kmedia/pics/kmedia.xpm -share/apps/kmedia/pics/kmedia_mini.xpm -share/apps/kmedia/pics/lock.xbm -share/apps/kmedia/pics/logo.xbm -share/apps/kmedia/pics/nexttrk.xbm -share/apps/kmedia/pics/playpause.xbm -share/apps/kmedia/pics/playpause_both.xpm -share/apps/kmedia/pics/playpause_play.xpm -share/apps/kmedia/pics/poweroff.xbm -share/apps/kmedia/pics/prevtrk.xbm -share/apps/kmedia/pics/rew.xbm -share/apps/kmedia/pics/stop.xbm -share/apps/kmid/AnotherGlitchInTheCall.kar -share/apps/kmid/OFortuna.kar -share/apps/kmid/StopInTheNameOfLove.kar -share/apps/kmid/TheGirlFromIpanema.kar -share/apps/kmid/fm/drums.o3 -share/apps/kmid/fm/drums.sb -share/apps/kmid/fm/std.o3 -share/apps/kmid/fm/std.sb -share/apps/kmid/maps/YamahaPSR500.map -share/apps/kmid/maps/YamahaPSS790.map -share/apps/kmid/maps/gm.map -share/apps/kmid/pics/button1.xpm -share/apps/kmid/pics/button2.xpm -share/apps/kmid/pics/keyboard.xpm -share/apps/kmid/toolbar/kmid_chn.xpm -share/apps/kmid/toolbar/kmid_fforward.xpm -share/apps/kmid/toolbar/kmid_frewind.xpm -share/apps/kmid/toolbar/kmid_next.xpm -share/apps/kmid/toolbar/kmid_pause.xpm -share/apps/kmid/toolbar/kmid_play.xpm -share/apps/kmid/toolbar/kmid_prev.xpm -share/apps/kmid/toolbar/kmid_stop.xpm -share/apps/kmid/toolbar/kmid_volume.xpm -share/apps/kmidi/config/chaos12-voices -share/apps/kmidi/config/chaos8-voices -share/apps/kmidi/config/gravis.cfg -share/apps/kmidi/config/gsdrum.cfg -share/apps/kmidi/config/megadrum -share/apps/kmidi/config/megainst -share/apps/kmidi/config/midia.cfg -share/apps/kmidi/config/mt32.cfg -share/apps/kmidi/config/patch/acpiano.pat -share/apps/kmidi/config/patch/nylongt2.pat -share/apps/kmidi/config/pila-voices -share/apps/kmidi/config/sndfont.cfg -share/apps/kmidi/config/sound-canvas-drums -share/apps/kmidi/config/timidity.cfg -share/apps/kmidi/config/wowpats.cfg -share/apps/kmidi/pics/kmidilogo.xpm -share/apps/kmix/pics/kmixdocked.xpm -share/apps/kmix/pics/mix_audio.xpm -share/apps/kmix/pics/mix_bass.xpm -share/apps/kmix/pics/mix_cd.xpm -share/apps/kmix/pics/mix_ext.xpm -share/apps/kmix/pics/mix_microphone.xpm -share/apps/kmix/pics/mix_midi.xpm -share/apps/kmix/pics/mix_recmon.xpm -share/apps/kmix/pics/mix_treble.xpm -share/apps/kmix/pics/mix_unknown.xpm -share/apps/kmix/pics/mix_volume.xpm -share/apps/kscd/pics/cdsmall.xpm -share/apps/kscd/pics/kscdlogo.xpm -share/doc/HTML/de/kmidi/kmidi-1.html -share/doc/HTML/de/kmidi/kmidi-2.html -share/doc/HTML/de/kmidi/kmidi-3.html -share/doc/HTML/de/kmidi/kmidi-4.html -share/doc/HTML/de/kmidi/kmidi-5.html -share/doc/HTML/de/kmidi/kmidi.html -share/doc/HTML/de/kmidi/kmidi.sgml -share/doc/HTML/de/kmidi/logotp3.gif -share/doc/HTML/en/kmedia/index-1.html -share/doc/HTML/en/kmedia/index-2.html -share/doc/HTML/en/kmedia/index-3.html -share/doc/HTML/en/kmedia/index-4.html -share/doc/HTML/en/kmedia/index-5.html -share/doc/HTML/en/kmedia/index.html -share/doc/HTML/en/kmedia/logotp3.gif -share/doc/HTML/en/kmid/index-1.html -share/doc/HTML/en/kmid/index-2.html -share/doc/HTML/en/kmid/index-3.html -share/doc/HTML/en/kmid/index-4.html -share/doc/HTML/en/kmid/index-5.html -share/doc/HTML/en/kmid/index-6.html -share/doc/HTML/en/kmid/index-7.html -share/doc/HTML/en/kmid/index-8.html -share/doc/HTML/en/kmid/index-9.html -share/doc/HTML/en/kmid/index.html -share/doc/HTML/en/kmid/logotp3.gif -share/doc/HTML/en/kmidi/kmidi-1.html -share/doc/HTML/en/kmidi/kmidi-2.html -share/doc/HTML/en/kmidi/kmidi-3.html -share/doc/HTML/en/kmidi/kmidi-4.html -share/doc/HTML/en/kmidi/kmidi-5.html -share/doc/HTML/en/kmidi/kmidi.html -share/doc/HTML/en/kmidi/kmidi.nif -share/doc/HTML/en/kmidi/kmidi.sgml -share/doc/HTML/en/kmidi/logotp3.gif -share/doc/HTML/en/kmix/index-1.html -share/doc/HTML/en/kmix/index-2.html -share/doc/HTML/en/kmix/index-3.html -share/doc/HTML/en/kmix/index-4.html -share/doc/HTML/en/kmix/index-5.html -share/doc/HTML/en/kmix/index-6.html -share/doc/HTML/en/kmix/index.html -share/doc/HTML/en/kmix/logotp3.gif -share/doc/HTML/en/kscd/kscd-1.html -share/doc/HTML/en/kscd/kscd-2.html -share/doc/HTML/en/kscd/kscd-3.html -share/doc/HTML/en/kscd/kscd-4.html -share/doc/HTML/en/kscd/kscd-5.html -share/doc/HTML/en/kscd/kscd-6.html -share/doc/HTML/en/kscd/kscd-7.html -share/doc/HTML/en/kscd/kscd-8.html -share/doc/HTML/en/kscd/kscd.html -share/doc/HTML/en/kscd/kscd1.gif -share/doc/HTML/en/kscd/kscd10.gif -share/doc/HTML/en/kscd/kscd11.gif -share/doc/HTML/en/kscd/kscd12.gif -share/doc/HTML/en/kscd/kscd13.gif -share/doc/HTML/en/kscd/kscd14.gif -share/doc/HTML/en/kscd/kscd15.gif -share/doc/HTML/en/kscd/kscd16.gif -share/doc/HTML/en/kscd/kscd2.gif -share/doc/HTML/en/kscd/kscd2a.gif -share/doc/HTML/en/kscd/kscd3.gif -share/doc/HTML/en/kscd/kscd4.gif -share/doc/HTML/en/kscd/kscd5.gif -share/doc/HTML/en/kscd/kscd6.gif -share/doc/HTML/en/kscd/kscd7.gif -share/doc/HTML/en/kscd/kscd8.gif -share/doc/HTML/en/kscd/kscd9.gif -share/doc/HTML/en/kscd/logotp3.gif -share/doc/HTML/es/kmid/index-1.html -share/doc/HTML/es/kmid/index-2.html -share/doc/HTML/es/kmid/index-3.html -share/doc/HTML/es/kmid/index-4.html -share/doc/HTML/es/kmid/index-5.html -share/doc/HTML/es/kmid/index-6.html -share/doc/HTML/es/kmid/index-7.html -share/doc/HTML/es/kmid/index-8.html -share/doc/HTML/es/kmid/index-9.html -share/doc/HTML/es/kmid/index.html -share/doc/HTML/es/kmid/logotp3.gif -share/icons/cd.xpm -share/icons/kmedia.xpm -share/icons/kmid.xpm -share/icons/kmidi.xpm -share/icons/kmix.xpm -share/icons/kscd.xpm -share/icons/large/kmedia.xpm -share/icons/large/kmid.xpm -share/icons/large/kmidi.xpm -share/icons/large/kmix.xpm -share/icons/large/kscd.xpm -share/icons/mini/kmedia.xpm -share/icons/mini/kmid.xpm -share/icons/mini/kmidi.xpm -share/icons/mini/kmix.xpm -share/icons/mini/kscd.xpm -share/locale/br/LC_MESSAGES/kmedia.mo -share/locale/br/LC_MESSAGES/kmid.mo -share/locale/br/LC_MESSAGES/kmidi.mo -share/locale/br/LC_MESSAGES/kmix.mo -share/locale/br/LC_MESSAGES/kscd.mo -share/locale/ca/LC_MESSAGES/kmedia.mo -share/locale/ca/LC_MESSAGES/kmid.mo -share/locale/ca/LC_MESSAGES/kmidi.mo -share/locale/ca/LC_MESSAGES/kmix.mo -share/locale/ca/LC_MESSAGES/kscd.mo -share/locale/cs/LC_MESSAGES/kmedia.mo -share/locale/cs/LC_MESSAGES/kmid.mo -share/locale/cs/LC_MESSAGES/kmidi.mo -share/locale/cs/LC_MESSAGES/kmix.mo -share/locale/cs/LC_MESSAGES/kscd.mo -share/locale/da/LC_MESSAGES/kmedia.mo -share/locale/da/LC_MESSAGES/kmid.mo -share/locale/da/LC_MESSAGES/kmidi.mo -share/locale/da/LC_MESSAGES/kmix.mo -share/locale/da/LC_MESSAGES/kscd.mo -share/locale/de/LC_MESSAGES/kmedia.mo -share/locale/de/LC_MESSAGES/kmid.mo -share/locale/de/LC_MESSAGES/kmidi.mo -share/locale/de/LC_MESSAGES/kmix.mo -share/locale/de/LC_MESSAGES/kscd.mo -share/locale/el/LC_MESSAGES/kmedia.mo -share/locale/el/LC_MESSAGES/kmix.mo -share/locale/el/LC_MESSAGES/kscd.mo -share/locale/eo/LC_MESSAGES/kmedia.mo -share/locale/eo/LC_MESSAGES/kmid.mo -share/locale/eo/LC_MESSAGES/kmix.mo -share/locale/eo/LC_MESSAGES/kscd.mo -share/locale/es/LC_MESSAGES/kmedia.mo -share/locale/es/LC_MESSAGES/kmid.mo -share/locale/es/LC_MESSAGES/kmix.mo -share/locale/es/LC_MESSAGES/kscd.mo -share/locale/et/LC_MESSAGES/kmedia.mo -share/locale/et/LC_MESSAGES/kmid.mo -share/locale/et/LC_MESSAGES/kmidi.mo -share/locale/et/LC_MESSAGES/kmix.mo -share/locale/et/LC_MESSAGES/kscd.mo -share/locale/fi/LC_MESSAGES/kmedia.mo -share/locale/fi/LC_MESSAGES/kmid.mo -share/locale/fi/LC_MESSAGES/kmix.mo -share/locale/fi/LC_MESSAGES/kscd.mo -share/locale/fr/LC_MESSAGES/kmedia.mo -share/locale/fr/LC_MESSAGES/kmid.mo -share/locale/fr/LC_MESSAGES/kmidi.mo -share/locale/fr/LC_MESSAGES/kmix.mo -share/locale/fr/LC_MESSAGES/kscd.mo -share/locale/hr/LC_MESSAGES/kmedia.mo -share/locale/hr/LC_MESSAGES/kmid.mo -share/locale/hr/LC_MESSAGES/kmix.mo -share/locale/hr/LC_MESSAGES/kscd.mo -share/locale/hu/LC_MESSAGES/kmid.mo -share/locale/hu/LC_MESSAGES/kmidi.mo -share/locale/hu/LC_MESSAGES/kmix.mo -share/locale/hu/LC_MESSAGES/kscd.mo -share/locale/is/LC_MESSAGES/kmedia.mo -share/locale/is/LC_MESSAGES/kmid.mo -share/locale/is/LC_MESSAGES/kmidi.mo -share/locale/is/LC_MESSAGES/kmix.mo -share/locale/is/LC_MESSAGES/kscd.mo -share/locale/it/LC_MESSAGES/kmedia.mo -share/locale/it/LC_MESSAGES/kmidi.mo -share/locale/it/LC_MESSAGES/kmix.mo -share/locale/it/LC_MESSAGES/kscd.mo -share/locale/ja/LC_MESSAGES/kmedia.mo -share/locale/ja/LC_MESSAGES/kmid.mo -share/locale/ja/LC_MESSAGES/kmidi.mo -share/locale/ja/LC_MESSAGES/kmix.mo -share/locale/ja/LC_MESSAGES/kscd.mo -share/locale/ko/LC_MESSAGES/kmedia.mo -share/locale/ko/LC_MESSAGES/kmid.mo -share/locale/ko/LC_MESSAGES/kmix.mo -share/locale/ko/LC_MESSAGES/kscd.mo -share/locale/nl/LC_MESSAGES/kmedia.mo -share/locale/nl/LC_MESSAGES/kscd.mo -share/locale/no/LC_MESSAGES/kmedia.mo -share/locale/no/LC_MESSAGES/kmid.mo -share/locale/no/LC_MESSAGES/kmidi.mo -share/locale/no/LC_MESSAGES/kmix.mo -share/locale/no/LC_MESSAGES/kscd.mo -share/locale/pl/LC_MESSAGES/kmedia.mo -share/locale/pl/LC_MESSAGES/kmid.mo -share/locale/pl/LC_MESSAGES/kmidi.mo -share/locale/pl/LC_MESSAGES/kmix.mo -share/locale/pl/LC_MESSAGES/kscd.mo -share/locale/pt/LC_MESSAGES/kmedia.mo -share/locale/pt/LC_MESSAGES/kmid.mo -share/locale/pt/LC_MESSAGES/kmix.mo -share/locale/pt/LC_MESSAGES/kscd.mo -share/locale/pt_BR/LC_MESSAGES/kmedia.mo -share/locale/pt_BR/LC_MESSAGES/kmid.mo -share/locale/pt_BR/LC_MESSAGES/kmidi.mo -share/locale/pt_BR/LC_MESSAGES/kmix.mo -share/locale/pt_BR/LC_MESSAGES/kscd.mo -share/locale/ro/LC_MESSAGES/kmedia.mo -share/locale/ro/LC_MESSAGES/kmix.mo -share/locale/sk/LC_MESSAGES/kmedia.mo -share/locale/sk/LC_MESSAGES/kmid.mo -share/locale/sk/LC_MESSAGES/kmidi.mo -share/locale/sk/LC_MESSAGES/kmix.mo -share/locale/sk/LC_MESSAGES/kscd.mo -share/locale/sl/LC_MESSAGES/kmedia.mo -share/locale/sl/LC_MESSAGES/kmid.mo -share/locale/sl/LC_MESSAGES/kmidi.mo -share/locale/sl/LC_MESSAGES/kmix.mo -share/locale/sl/LC_MESSAGES/kscd.mo -share/locale/sv/LC_MESSAGES/kmedia.mo -share/locale/sv/LC_MESSAGES/kmid.mo -share/locale/sv/LC_MESSAGES/kmix.mo -share/locale/sv/LC_MESSAGES/kscd.mo -share/locale/tr/LC_MESSAGES/kmedia.mo -share/locale/tr/LC_MESSAGES/kmid.mo -share/locale/tr/LC_MESSAGES/kmix.mo -share/locale/tr/LC_MESSAGES/kscd.mo -share/locale/zh_CN.GB2312/LC_MESSAGES/kmedia.mo -share/locale/zh_CN.GB2312/LC_MESSAGES/kmid.mo -share/locale/zh_CN.GB2312/LC_MESSAGES/kmix.mo -share/locale/zh_CN.GB2312/LC_MESSAGES/kscd.mo -share/locale/zh_TW.Big5/LC_MESSAGES/kmedia.mo -share/locale/zh_TW.Big5/LC_MESSAGES/kmid.mo -share/locale/zh_TW.Big5/LC_MESSAGES/kmix.mo -share/locale/zh_TW.Big5/LC_MESSAGES/kscd.mo -share/mimelnk/audio/x-karaoke.kdelnk -share/mimelnk/text/xmcd.kdelnk -@dirrm share/doc/HTML/es/kmid -@dirrm share/doc/HTML/en/kscd -@dirrm share/doc/HTML/en/kmix -@dirrm share/doc/HTML/en/kmidi -@dirrm share/doc/HTML/en/kmid -@dirrm share/doc/HTML/en/kmedia -@dirrm share/doc/HTML/de/kmidi -@dirrm share/apps/kscd/pics -@dirrm share/apps/kscd/cddb/soundtrack -@dirrm share/apps/kscd/cddb/rock -@dirrm share/apps/kscd/cddb/reggae -@dirrm share/apps/kscd/cddb/newage -@dirrm share/apps/kscd/cddb/misc -@dirrm share/apps/kscd/cddb/jazz -@dirrm share/apps/kscd/cddb/folk -@dirrm share/apps/kscd/cddb/data -@dirrm share/apps/kscd/cddb/country -@dirrm share/apps/kscd/cddb/classical -@dirrm share/apps/kscd/cddb/blues -@dirrm share/apps/kscd/cddb -@dirrm share/apps/kscd -@dirrm share/apps/kmix/pics -@dirrm share/apps/kmix -@dirrm share/apps/kmidi/pics -@dirrm share/apps/kmidi/config/patch -@dirrm share/apps/kmidi/config -@dirrm share/apps/kmidi -@dirrm share/apps/kmid/toolbar -@dirrm share/apps/kmid/pics -@dirrm share/apps/kmid/maps -@dirrm share/apps/kmid/fm -@dirrm share/apps/kmid -@dirrm share/apps/kmedia/pics -@dirrm share/apps/kmedia diff --git a/audio/libsidplay2/Makefile b/audio/libsidplay2/Makefile deleted file mode 100644 index f4c87f3d32c3..000000000000 --- a/audio/libsidplay2/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# New ports collection makefile for: sidplay -# Version required: 1.36.31 -# Date created: 31 October 1996 -# Whom: Stefan Zehl <sec@42.org> -# -# $FreeBSD$ -# - -DISTNAME= sidplay-1_36_35 -PKGNAME= sidplay-1.36.35 -CATEGORIES= audio emulators -MASTER_SITES= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/ -EXTRACT_SUFX= .tgz - -MAINTAINER= sec@42.org - -BUILD_DEPENDS= makedepend:${PORTSDIR}/x11/XFree86 - -GNU_CONFIGURE= YES - -USE_GMAKE= YES - -WRKSRC= ${WRKDIR}/${PKGNAME} - -post-install: - strip ${PREFIX}/bin/sidplay ${PREFIX}/bin/sid2wav ${PREFIX}/bin/sidcon - -.include <bsd.port.mk> diff --git a/audio/libsidplay2/distinfo b/audio/libsidplay2/distinfo deleted file mode 100644 index 95d8fa0ca4d5..000000000000 --- a/audio/libsidplay2/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (sidplay-1_36_35.tgz) = 9b540cfbf28a3b2e619173f69680c33e diff --git a/audio/libsidplay2/pkg-comment b/audio/libsidplay2/pkg-comment deleted file mode 100644 index 83fc036bdc06..000000000000 --- a/audio/libsidplay2/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -A Commodore SID-chip emulator that plays SID music files diff --git a/audio/libsidplay2/pkg-descr b/audio/libsidplay2/pkg-descr deleted file mode 100644 index 3850e15fa6a3..000000000000 --- a/audio/libsidplay2/pkg-descr +++ /dev/null @@ -1,14 +0,0 @@ -Basically, SIDPLAY is just an ordinary music player software. More -specifically, it emulates the Sound Interface Device chip (MOS 6581, -known as SID) and the Micro Processor Unit (MOS 6510) of the -Commodore 64 on your computer. Its platform-independent software -emulates 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 were transferred -directly from the C64. All you need is a supported operating system and -audio hardware with average PCM waveform playback capabilities. A -fast CPU and a 16-bit sound card are recommended for better -performance. - -WWW: http://www.geocities.com/SiliconValley/Lakes/5147/index.html diff --git a/audio/libsidplay2/pkg-plist b/audio/libsidplay2/pkg-plist deleted file mode 100644 index 91dc3239a6cb..000000000000 --- a/audio/libsidplay2/pkg-plist +++ /dev/null @@ -1,15 +0,0 @@ -bin/sidplay -bin/sid2wav -bin/sidcon -include/sidplay/compconf.h -include/sidplay/config.h -include/sidplay/emucfg.h -include/sidplay/fformat.h -include/sidplay/myendian.h -include/sidplay/mytypes.h -include/sidplay/player.h -include/sidplay/sidtune.h -include/sidplay/version.h -include/sidplay/fixpoint.h -@dirrm include/sidplay -lib/libsidplay.a diff --git a/audio/rat/Makefile b/audio/rat/Makefile deleted file mode 100644 index 046307711d9b..000000000000 --- a/audio/rat/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# New ports collection makefile for: rat -# Version required: 4.0.4 -# Date created: 3 July 1999 -# Whom: O.Hodson@cs.ucl.ac.uk (Orion Hodson) -# -# $FreeBSD$ -# - -DISTNAME= rat-4.0.4 -CATEGORIES= mbone audio -MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/4.0.4/ \ - http://www.freebsd.org/~cpiazza/distfiles/ - -MAINTAINER= O.Hodson@cs.ucl.ac.uk - -LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 - -USE_GMAKE= yes -MAN1= rat.1 -MANCOMPRESSED= no - -RAT_BUILD_DIRS= common rat - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/rat/rat-4.0.4 ${PREFIX}/bin/rat - ${INSTALL_MAN} ${WRKSRC}/rat/man/man1/rat.1 ${PREFIX}/man/man1 - ${MKDIR} ${LOCALBASE}/etc/sdr/plugins - ${INSTALL_DATA} ${WRKSRC}/rat/sdr2.plugin.S02.audio.rtp.*.rat-4.0.4 ${LOCALBASE}/etc/sdr/plugins - -do-build: - for d in ${RAT_BUILD_DIRS}; do \ - cd ${WRKSRC}/$$d && ${GMAKE}; \ - done - -do-configure: - for d in ${RAT_BUILD_DIRS}; do \ - cd ${WRKSRC}/$$d && ./configure; \ - done - -.include "bsd.port.mk" diff --git a/audio/rat/distinfo b/audio/rat/distinfo deleted file mode 100644 index 8ff05a380b92..000000000000 --- a/audio/rat/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (rat-4.0.4.tar.gz) = bf22b188bcb1d57e21a6c89a3bdee8c2 diff --git a/audio/rat/files/patch-aa b/audio/rat/files/patch-aa deleted file mode 100644 index 72673143c99e..000000000000 --- a/audio/rat/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- rat/sdr2.plugin.in.orig Wed May 12 07:36:14 1999 -+++ rat/sdr2.plugin.in Sun Aug 22 10:47:05 1999 -@@ -12,7 +12,7 @@ - - media: audio - proto: RTP/AVP --tool: rat-__VERSION__ -+tool: rat - protoname: RTP - cryptflag: -K - diff --git a/audio/rat/files/patch-ab b/audio/rat/files/patch-ab deleted file mode 100644 index 1494e645cbe1..000000000000 --- a/audio/rat/files/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ ---- rat/configure.orig Sun Aug 22 10:52:06 1999 -+++ rat/configure Sun Aug 22 10:53:22 1999 -@@ -111,7 +111,8 @@ - WFLAGS=$GCCWFLAGS - INCLUDE="-I/usr/X11R6/include -I/usr/local/include" - LDLIBS="-L/usr/X11R6/lib -lXext -lX11 -lm" -- TCL_LIBS="../tk-8.0/unix/libtk80.a ../tcl-8.0/unix/libtcl80.a" -+ TCL_LIBS="-L/usr/local/lib -ltk82 -ltcl82" -+ TCL_INCL="-I/usr/local/include/tk8.2 -I/usr/local/include/tcl8.2" - AUDIO="auddev_luigi.o" - DEBUG="-g" - CHAR="-fsigned-char" diff --git a/audio/rat/files/patch-ac b/audio/rat/files/patch-ac deleted file mode 100644 index 32e545a50c89..000000000000 --- a/audio/rat/files/patch-ac +++ /dev/null @@ -1,10 +0,0 @@ ---- rat/config_unix.h.orig Sat Nov 27 18:27:56 1999 -+++ rat/config_unix.h Sat Nov 27 18:33:33 1999 -@@ -17,6 +17,7 @@ - - #include <limits.h> - #include <sys/types.h> -+#include <sys/signal.h> - #include <sys/time.h> - #include <sys/resource.h> - diff --git a/audio/rat/pkg-comment b/audio/rat/pkg-comment deleted file mode 100644 index 75a87f463029..000000000000 --- a/audio/rat/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -Multicast and unicast robust audio conferencing tool diff --git a/audio/rat/pkg-descr b/audio/rat/pkg-descr deleted file mode 100644 index 22763c1892ae..000000000000 --- a/audio/rat/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -RAT is a network audio tool that allows users to particpate in -audio conferences over the internet. These can be between two -participants directly, or between a group of participants on a -common multicast group. RAT features sender based loss mitigation -mechanisms and receiver based audio repair techniques to compensate -for packet loss, and load adaption in response to host performance. - -WWW: http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/ diff --git a/audio/rat/pkg-plist b/audio/rat/pkg-plist deleted file mode 100644 index 3f0dbc063258..000000000000 --- a/audio/rat/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/rat -etc/sdr/plugins/sdr2.plugin.S02.audio.rtp.-.rat-4.0.4 diff --git a/audio/speak_freely/Makefile b/audio/speak_freely/Makefile deleted file mode 100644 index 232c556b0377..000000000000 --- a/audio/speak_freely/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# New ports collection makefile for: speak_freely -# Original WWW site: http://www.fourmilab.ch/speakfree/unix/index.html -# Version required: 6.1c -# Date created: 18 Apr 1996 -# Whom: ache -# -# $FreeBSD$ -# - -DISTNAME= speak_freely-6.1c -CATEGORIES= mbone audio security -MASTER_SITES= http://www.fourmilab.ch/speakfree/unix/prior-releases/6.1/ - -MAINTAINER= ache@FreeBSD.org - -LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm - -UTILS= sfspeaker sfmike sflwl -DEMNS= sfecho sflwld -DDEMNS= sfvod -SFLIB= ${PREFIX}/lib/speak_freely -MAN1= ${UTILS:S/$/.1/} ${DEMNS:S/$/.1/} ${DDEMNS:S/$/.1/} - -do-install: - if [ ! -d ${SFLIB} ]; then \ - install -d -o ${BINOWN} -g ${BINGRP} -m 755 ${SFLIB}; \ - fi - cd ${WRKSRC}; \ - $(INSTALL_DATA) busy.au ring.au ${SFLIB} - cd ${WRKSRC}; \ - for p in ${UTILS}; do \ - $(INSTALL_PROGRAM) $$p ${PREFIX}/bin; \ - $(INSTALL_MAN) $$p.1 ${PREFIX}/man/man1; \ - done; - cd ${WRKSRC}; \ - for p in ${DEMNS}; do \ - $(INSTALL_PROGRAM) $$p ${PREFIX}/sbin; \ - $(INSTALL_MAN) $$p.1 ${PREFIX}/man/man1; \ - done; - cd ${WRKSRC}; \ - for p in ${DDEMNS}; do \ - $(INSTALL_SCRIPT) $$p ${PREFIX}/sbin; \ - $(INSTALL_MAN) $$p.1 ${PREFIX}/man/man1; \ - done; - -.include <bsd.port.mk> diff --git a/audio/speak_freely/distinfo b/audio/speak_freely/distinfo deleted file mode 100644 index fe1bdb3ce777..000000000000 --- a/audio/speak_freely/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (speak_freely-6.1c.tar.gz) = 52f42e45bd78ddd069c8ef81d8bc8e83 diff --git a/audio/speak_freely/files/patch-aa b/audio/speak_freely/files/patch-aa deleted file mode 100644 index 0e10b0d18e94..000000000000 --- a/audio/speak_freely/files/patch-aa +++ /dev/null @@ -1,191 +0,0 @@ -*** Makefile.orig Mon Jul 21 17:06:21 1997 ---- Makefile Wed Sep 24 02:36:37 1997 -*************** -*** 32,40 **** - # THREADS, you can also remove the "-lpthread" library specification - # from the LFLAGS line, which may cause an error if the system does - # not include the POSIX threads library. -! CC = cc -fsingle # for Sun Compiler -! CCFLAGS = -DSolaris -DTHREADS -! LFLAGS = -lcurses -lsocket -lnsl -lm -lpthread - - # FreeBSD 2.2 courtesy of Andrey A. Chernov - # ---- 32,40 ---- - # THREADS, you can also remove the "-lpthread" library specification - # from the LFLAGS line, which may cause an error if the system does - # not include the POSIX threads library. -! #CC = cc -fsingle # for Sun Compiler -! #CCFLAGS = -DSolaris -DTHREADS -! #LFLAGS = -lcurses -lsocket -lnsl -lm -lpthread - - # FreeBSD 2.2 courtesy of Andrey A. Chernov - # -*************** -*** 46,53 **** - # Depending on how your driver handles non-blocking I/O, - # you may also have to add -DAUDIO_BLOCKING to the - # CCFLAGS line. -! #CCFLAGS = -DM_LITTLE_ENDIAN -! #LFLAGS = -lcurses -ltermcap -lcompat -lm - - # ** Linux users please note: many Linux audio drivers are - # half-duplex, even through your sound card may actually ---- 46,54 ---- - # Depending on how your driver handles non-blocking I/O, - # you may also have to add -DAUDIO_BLOCKING to the - # CCFLAGS line. -! PREFIX=/usr/local -! CCFLAGS = -DM_LITTLE_ENDIAN -! LFLAGS = -L${PREFIX}/lib -lcurses -ltermcap -lcompat -lm - - # ** Linux users please note: many Linux audio drivers are - # half-duplex, even through your sound card may actually -*************** -*** 78,87 **** - - # Where Perl is located on your system. This is used to make - # a directly-executable version of sfvod. -! PERL = /usr/local/bin/perl - - # If your audio hardware is half duplex, uncomment the next line -! #DUPLEX = -DHALF_DUPLEX - - # If your getdomainname() does not return the DNS domainname, define: - #DOMAIN=-DMYDOMAIN=\"somedomain.net\" ---- 79,88 ---- - - # Where Perl is located on your system. This is used to make - # a directly-executable version of sfvod. -! PERL = /usr/bin/perl - - # If your audio hardware is half duplex, uncomment the next line -! DUPLEX = -DHALF_DUPLEX - - # If your getdomainname() does not return the DNS domainname, define: - #DOMAIN=-DMYDOMAIN=\"somedomain.net\" -*************** -*** 108,118 **** - CARGS = -DInternet_Port=$(INTERNET_PORT) - - #DEBUG = -g -DHEXDUMP -! DEBUG = -O - - # Compiler flags - -! CFLAGS = $(DEBUG) -Iadpcm -Ilpc -Igsm/inc -Imd5 -Iidea -Ilibdes $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN) - - PROGRAMS = sfspeaker sfmike sflwld sflwl sfecho sfvod - ---- 109,127 ---- - CARGS = -DInternet_Port=$(INTERNET_PORT) - - #DEBUG = -g -DHEXDUMP -! #DEBUG = -O -! -! .if exists(/usr/lib/libdes.a) -! LDES=-ldes -! IDES= -! .else -! LDES=libdes/libdes.a -! IDES=-Ilibdes -! .endif - - # Compiler flags - -! CFLAGS += $(DEBUG) -Iadpcm -Ilpc -Iidea $(IDES) -I/usr/include -I${PREFIX}/include $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN) - - PROGRAMS = sfspeaker sfmike sflwld sflwl sfecho sfvod - -*************** -*** 120,132 **** - - SPKROBJS = speaker.o codecs.o deskey.o g711.o rate.o rtpacket.o soundbyte.o ulaw.o usleep.o vatpkt.o vox.o hp_audio.o - -! sfspeaker: $(SPKROBJS) adpcmlib.o lpclib.o lpc10lib.o gsmlib.o deslib.o md5lib.o idealib.o libdes.o xdsub.o -! $(CC) $(SPKROBJS) adpcm/adpcm-u.o des/des.o md5/md5.o idea/idea.o lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o xdsub.o libdes/libdes.a $(LFLAGS) -o sfspeaker - - MIKEOBJS = mike.o codecs.o deskey.o g711.o rate.o rtpacket.o soundbyte.o ulaw.o usleep.o vatpkt.o xdsub.o hp_audio.o - -! sfmike: $(MIKEOBJS) adpcmlib.o lpclib.o lpc10lib.o gsmlib.o deslib.o md5lib.o idealib.o libdes.o -! $(CC) $(MIKEOBJS) adpcm/adpcm-u.o des/des.o md5/md5.o idea/idea.o -lm lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o libdes/libdes.a $(LFLAGS) -o sfmike - - LWLDOBJS = lwld.o xdsub.o - ---- 129,141 ---- - - SPKROBJS = speaker.o codecs.o deskey.o g711.o rate.o rtpacket.o soundbyte.o ulaw.o usleep.o vatpkt.o vox.o hp_audio.o - -! sfspeaker: $(SPKROBJS) adpcmlib.o lpclib.o lpc10lib.o deslib.o idealib.o libdes.o xdsub.o -! $(CC) $(SPKROBJS) adpcm/adpcm-u.o des/des.o idea/idea.o lpc10/liblpc10.a -lgsm lpc/lpc.o xdsub.o -lmd $(LDES) $(LFLAGS) -o sfspeaker - - MIKEOBJS = mike.o codecs.o deskey.o g711.o rate.o rtpacket.o soundbyte.o ulaw.o usleep.o vatpkt.o xdsub.o hp_audio.o - -! sfmike: $(MIKEOBJS) adpcmlib.o lpclib.o lpc10lib.o deslib.o idealib.o libdes.o -! $(CC) $(MIKEOBJS) adpcm/adpcm-u.o des/des.o idea/idea.o -lm lpc10/liblpc10.a -lgsm lpc/lpc.o -lmd $(LDES) $(LFLAGS) -o sfmike - - LWLDOBJS = lwld.o xdsub.o - -*************** -*** 140,147 **** - - ECHOOBJS = echo.o codecs.o g711.o rtpacket.o ulaw.o xdsub.o - -! sfecho: $(ECHOOBJS) md5lib.o -! $(CC) $(ECHOOBJS) md5/md5.o adpcm/adpcm-u.o lpc/lpc.o $(LFLAGS) -o sfecho - - sfvod: sfvod.pl - echo \#\! $(PERL) >sfvod ---- 149,156 ---- - - ECHOOBJS = echo.o codecs.o g711.o rtpacket.o ulaw.o xdsub.o - -! sfecho: $(ECHOOBJS) -! $(CC) $(ECHOOBJS) adpcm/adpcm-u.o lpc/lpc.o -lmd $(LFLAGS) -o sfecho - - sfvod: sfvod.pl - echo \#\! $(PERL) >sfvod -*************** -*** 157,167 **** - chmod 755 sfvod - - adpcmlib.o: -! ( echo "Building ADPCM library."; cd adpcm ; make CC="$(CC)" ) - echo "ADPCM" >adpcmlib.o - - libdes.o: - ( echo "Building LIBDES library."; cd libdes ; make -f Makefile.sf CC="$(CC) $(CCFLAGS) $(DEBUG)" ) - echo "LIBDES" >libdes.o - - lpclib.o: ---- 166,178 ---- - chmod 755 sfvod - - adpcmlib.o: -! ( echo "Building ADPCM library."; cd adpcm ; make CC="$(CC) $(CCFLAGS)" ) - echo "ADPCM" >adpcmlib.o - - libdes.o: -+ .if !exists(/usr/lib/libdes.a) - ( echo "Building LIBDES library."; cd libdes ; make -f Makefile.sf CC="$(CC) $(CCFLAGS) $(DEBUG)" ) -+ .endif - echo "LIBDES" >libdes.o - - lpclib.o: -*************** -*** 185,191 **** - echo "MD5" >md5lib.o - - idealib.o: -! ( echo "Building IDEA library."; cd idea ; make CC="$(CC)" ) - echo "IDEA" >idealib.o - - codecs.o: codecs.c speakfree.h ---- 196,202 ---- - echo "MD5" >md5lib.o - - idealib.o: -! ( echo "Building IDEA library."; cd idea ; make CC="$(CC) $(CCFLAGS)" ) - echo "IDEA" >idealib.o - - codecs.o: codecs.c speakfree.h diff --git a/audio/speak_freely/files/patch-ac b/audio/speak_freely/files/patch-ac deleted file mode 100644 index 94ed40050744..000000000000 --- a/audio/speak_freely/files/patch-ac +++ /dev/null @@ -1,20 +0,0 @@ ---- mike.c.orig Wed Mar 5 14:08:20 1997 -+++ mike.c Tue Dec 15 22:21:32 1998 -@@ -8,6 +8,7 @@ - */ - - #include "speakfree.h" -+#define sendfile sf_sendfile - - /* Destination host descriptor. */ - -@@ -687,6 +688,9 @@ - (sb->buffer.buffer_len > 16)) { - pktlen += sizeof(sb->sendinghost); - } -+ /* must stay in network order for debugging output */ -+ sb->compression = htonl(sb->compression); -+ sb->buffer.buffer_len = htonl(sb->buffer.buffer_len); - } - } - } diff --git a/audio/speak_freely/files/patch-ad b/audio/speak_freely/files/patch-ad deleted file mode 100644 index 4abcc937427b..000000000000 --- a/audio/speak_freely/files/patch-ad +++ /dev/null @@ -1,74 +0,0 @@ -*** adpcm/Makefile.bak Fri Sep 1 14:58:19 1995 ---- adpcm/Makefile Fri Oct 25 18:55:46 1996 -*************** -*** 1,7 **** - # - # Makefile for adpcm and test programs - # ------------------- -! CFLAGS=-O -I.. - # May need this on a sun: - #CFLAGS=-O -I/usr/demo/SOUND - ---- 1,7 ---- - # - # Makefile for adpcm and test programs - # ------------------- -! CFLAGS+=-I.. - # May need this on a sun: - #CFLAGS=-O -I/usr/demo/SOUND - -*** des/Makefile.bak Thu Nov 2 22:38:58 1995 ---- des/Makefile Fri Oct 25 18:55:46 1996 -*************** -*** 1,4 **** -! CFLAGS=-O - - all: des.o - ---- 1,4 ---- -! #CFLAGS=-O - - all: des.o - -*** idea/Makefile.bak Wed Aug 2 22:39:19 1995 ---- idea/Makefile Fri Oct 25 18:55:46 1996 -*************** -*** 6,13 **** - - # Compiler flags - -! CC = cc -! CFLAGS = -O - - all: idea.o - ---- 6,13 ---- - - # Compiler flags - -! #CC = cc -! #CFLAGS = -O - - all: idea.o - -*** libdes/Makefile.bak Wed Apr 17 23:49:33 1996 ---- libdes/Makefile Fri Oct 25 18:55:46 1996 -*************** -*** 30,37 **** - - OPTS= $(OPTS0) $(OPTS1) $(OPTS2) - -! CC=cc -! CFLAGS= -O $(OPTS) $(CFLAG) - - #CC=gcc - #CFLAGS= -O3 -fomit-frame-pointer $(OPTS) $(CFLAG) ---- 30,37 ---- - - OPTS= $(OPTS0) $(OPTS1) $(OPTS2) - -! #CC=cc -! CFLAGS+= $(OPTS) $(CFLAG) - - #CC=gcc - #CFLAGS= -O3 -fomit-frame-pointer $(OPTS) $(CFLAG) diff --git a/audio/speak_freely/files/patch-ae b/audio/speak_freely/files/patch-ae deleted file mode 100644 index eb58a7f980de..000000000000 --- a/audio/speak_freely/files/patch-ae +++ /dev/null @@ -1,124 +0,0 @@ -*** soundbyte.c.orig Wed Mar 5 23:04:49 1997 ---- soundbyte.c Wed Sep 24 02:39:23 1997 -*************** -*** 15,21 **** ---- 15,23 ---- - #ifdef Solaris - #include <sys/filio.h> - #else -+ #ifndef __FreeBSD__ - #include <sys/dir.h> -+ #endif - #include <sys/file.h> - #endif - -*************** -*** 72,77 **** ---- 74,81 ---- - static unsigned char *playbuf= NULL; /* Current play pointer */ - static int squelch = 0; /* Squelch value */ - -+ void soundplayvol(); -+ - /* Convert local gain into device parameters */ - - static unsigned scale_gain(g) -*************** -*** 96,101 **** ---- 100,110 ---- - } - #endif - -+ #ifndef sun -+ #ifdef HALF_DUPLEX -+ static int oldvol = -1; -+ #endif -+ #endif - - /* SOUNDINIT -- Open the sound peripheral and initialise for - access. Return TRUE if successful, FALSE -*************** -*** 145,150 **** ---- 154,174 ---- - } - ioctl(Audio_fd, AUDIO_SETINFO, &Audio_info); - #endif -+ #ifndef sun -+ #ifdef HALF_DUPLEX -+ if (iomode == O_RDONLY) { -+ if (oldvol == -1) -+ oldvol = soundgetvol(); -+ soundplayvol(0); -+ } else if ( iomode == O_WRONLY -+ && oldvol != -1 -+ ) { -+ if (soundgetvol() == 0) -+ soundplayvol(oldvol); -+ oldvol = -1; -+ } -+ #endif -+ #endif - return TRUE; - } - if (errno != EINTR) { -*************** -*** 160,165 **** ---- 184,198 ---- - void soundterm() - { - if (audiof >= 0) { -+ #ifndef sun -+ #ifdef HALF_DUPLEX -+ if (oldvol != -1) { -+ if (soundgetvol() == 0) -+ soundplayvol(oldvol); -+ oldvol = -1; -+ } -+ #endif -+ #endif - if (close(audiof) < 0) { - perror("closing audio device"); - } -*************** -*** 210,219 **** - - arg = (value << 8) | value; - -! if (ioctl(Audio_fd, MIXER_WRITE(SOUND_MIXER_PCM), &arg) < 0) -! perror("SOUND_MIXER_PCM"); - #endif - } - - /* SOUNDRECGAIN -- Set recording gain from 0 (minimum) to 100 (maximum). */ - ---- 243,272 ---- - - arg = (value << 8) | value; - -! if (ioctl(Audio_fd, SOUND_MIXER_WRITE_PCM, &arg) < 0) -! perror("SOUND_MIXER_WRITE_PCM"); - #endif - } -+ -+ #ifndef sun -+ #ifdef HALF_DUPLEX -+ -+ /* SOUNDGETVOL -- Get current playback volume. */ -+ -+ int soundgetvol() -+ { -+ int arg, v1, v2; -+ -+ if (ioctl(Audio_fd, SOUND_MIXER_READ_PCM, &arg) < 0) { -+ perror("SOUND_MIXER_READ_PCM"); -+ return -1; -+ } -+ v1 = arg & 0xFF; -+ v2 = (arg >> 8) & 0xFF; -+ return (v1 > v2) ? v1 : v2; -+ } -+ #endif -+ #endif - - /* SOUNDRECGAIN -- Set recording gain from 0 (minimum) to 100 (maximum). */ - diff --git a/audio/speak_freely/pkg-comment b/audio/speak_freely/pkg-comment deleted file mode 100644 index 131b6287c617..000000000000 --- a/audio/speak_freely/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -Voice Communication Over Data Networks diff --git a/audio/speak_freely/pkg-descr b/audio/speak_freely/pkg-descr deleted file mode 100644 index f66a6d8b6f1f..000000000000 --- a/audio/speak_freely/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ - Speak Freely allows users of a variety of Unix and Unix- - like workstations equipped with audio hardware connected - by a network to converse, using the audio input and output - facilities of the workstation to digitise and later recon- - struct the sound and the network to relay sound packets. - Optional compression is provided, allowing conversations - over relatively low-bandwidth Internet links as well as - local area networks. diff --git a/audio/speak_freely/pkg-plist b/audio/speak_freely/pkg-plist deleted file mode 100644 index 245029b35455..000000000000 --- a/audio/speak_freely/pkg-plist +++ /dev/null @@ -1,9 +0,0 @@ -bin/sfspeaker -bin/sfmike -bin/sflwl -sbin/sfecho -sbin/sflwld -sbin/sfvod -lib/speak_freely/ring.au -lib/speak_freely/busy.au -@dirrm lib/speak_freely diff --git a/audio/vat/Makefile b/audio/vat/Makefile deleted file mode 100644 index 667d2d408c35..000000000000 --- a/audio/vat/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# New ports collection makefile for: vat -# Version required: 4.0b2 -# Date created: 2 November 1996 -# Whom: fenner -# -# $FreeBSD$ -# - -DISTNAME= vat-4.0b2 -CATEGORIES= mbone tk82 -MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/ -DISTFILES= vatsrc-4.0b2.tar.gz - -MAINTAINER= fenner@FreeBSD.org - -GSM_DIR= ${.CURDIR}/../../audio/gsm -GSM_WORK= ${WRKDIRPREFIX}${GSM_DIR}/work/gsm-1.0-pl10 - -# If configure is changed to look for libgsm.a in ${PREFIX}/lib, then -# we can use this first BUILD_DEPENDS and save some work. -#BUILD_DEPENDS= ${GSM_WORK}/inc/private.h:${GSM_DIR}:patch -BUILD_DEPENDS= ${GSM_WORK}/lib/libgsm.a:${GSM_DIR}:build -LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 \ - gsm.1:${GSM_DIR} - -USE_X_PREFIX= yes -USE_AUTOCONF= yes -CONFIGURE_ARGS= --with-gsm=${GSM_WORK} -INSTALL_TARGET= install install-man -MAN1= vat.1 - -post-install: - strip ${PREFIX}/bin/vat - -.include <bsd.port.mk> diff --git a/audio/vat/distinfo b/audio/vat/distinfo deleted file mode 100644 index 1975cbd2aeaf..000000000000 --- a/audio/vat/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (vatsrc-4.0b2.tar.gz) = ad6bfa8e986be1706e60251dd9c2f204 diff --git a/audio/vat/files/patch-aa b/audio/vat/files/patch-aa deleted file mode 100644 index 0937d2d2a5bc..000000000000 --- a/audio/vat/files/patch-aa +++ /dev/null @@ -1,249 +0,0 @@ ---- configure.in.tk.orig Thu May 16 01:06:05 1996 -+++ configure.in.tk Tue Sep 9 11:35:45 1997 -@@ -2,6 +2,7 @@ - dnl $Header: /home/ncvs/ports/mbone/vat/patches/patch-aa,v 1.3 1998/06/26 19:05:34 fenner Exp $ (LBL) - - AC_ARG_WITH(tcl, --with-tcl=path specify a pathname for tcl, d=$withval, d="") -+tclposs="tcl8.2 tcl82 tcl" - if test "$d" != "" ; then - if test ! -d $d ; then - echo "'$d' is not a directory" -@@ -12,22 +13,22 @@ - echo "can't find tcl.h in $d/include" - exit 1 - fi -- places="$d/lib/libtcl7.5.so \ -- $d/lib/libtcl7.5.a \ -- $d/lib/libtcl.so \ -- $d/lib/libtcl.a" - V_LIB_TCL=FAIL -- for dir in $places; do -- if test -r $dir ; then -- V_LIB_TCL=$dir -+ for p in $tclposs; do -+ if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then -+ V_LIB_TCL="-L$d/lib -l$p" -+ break -+ fi -+ if test -r $d/lib/lib$p.a ; then -+ V_LIB_TCL="-L$d/lib -l$p" - break - fi - done -- if test $V_LIB_TCL = FAIL ; then -+ if test "$V_LIB_TCL" = FAIL ; then - echo "can't find libtcl.a in $d/lib" - exit 1 - fi -- places="$d/lib/tcl7.5 \ -+ places="$d/lib/tcl8.2 \ - $d/lib/tcl" - V_LIBRARY_TCL=FAIL - for dir in $places; do -@@ -44,13 +45,14 @@ - AC_TEST_CPP([#include <tcl.h>], V_INCLUDE_TCL="", V_INCLUDE_TCL=FAIL) - if test "$V_INCLUDE_TCL" = FAIL; then - echo "checking for tcl.h" -- places="$PWD/../tcl7.5 \ -- /usr/src/local/tcl7.5 \ -- /import/tcl/include/tcl7.5 \ -+ places="$PWD/../tcl8.2 \ -+ /usr/src/local/tcl8.2 \ -+ /import/tcl/include/tcl8.2 \ - $prefix/include \ - $x_includes/tk \ - $x_includes \ - /usr/local/include \ -+ /usr/local/include/tcl8.2 \ - /usr/contrib/include \ - /usr/include" - for dir in $places; do -@@ -64,7 +66,7 @@ - exit 1 - fi - fi -- AC_CHECK_LIB(tcl7.5, main, V_LIB_TCL="-ltcl7.5", V_LIB_TCL="FAIL") -+ AC_CHECK_LIB(tcl8.2, main, V_LIB_TCL="-ltcl8.2", V_LIB_TCL="FAIL") - if test "$V_LIB_TCL" = FAIL; then - echo "checking for libtcl.a" - places="\ -@@ -73,17 +75,22 @@ - /usr/contrib/lib \ - /usr/local/lib \ - /usr/lib \ -- $PWD/../tcl7.5 \ -- /usr/src/local/tcl7.5 \ -- /import/tcl/lib/tcl7.5 \ -+ $PWD/../tcl8.2 \ -+ /usr/src/local/tcl8.2 \ -+ /import/tcl/lib/tcl8.2 \ - " - for dir in $places; do -- if test -r $dir/libtcl7.5.so -o -r $dir/libtcl7.5.a; then -- V_LIB_TCL="-L$dir -ltcl7.5" -- break -- fi -- if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then -- V_LIB_TCL="-L$dir -ltcl" -+ for p in $tclposs; do -+ if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then -+ V_LIB_TCL="-L$dir -l$p" -+ break -+ fi -+ if test -r $dir/lib$p.a ; then -+ V_LIB_TCL="-L$dir -l$p" -+ break -+ fi -+ done -+ if test "$V_LIB_TCL" != FAIL; then - break - fi - done -@@ -98,15 +105,16 @@ - fi - echo "checking for tcl/init.tcl" - V_LIBRARY_TCL=FAIL -- places="/usr/local/lib/tcl7.5 \ -- /usr/contrib/lib/tcl7.5 \ -- /usr/lib/tcl7.5 \ -- /usr/lib/tk/tcl7.5 \ -- /import/tcl/lib/tcl7.5 \ -- $prefix/lib/tcl7.5 \ -- $x_libraries/tcl7.5 \ -+ places="/usr/local/lib/tcl8.2 \ -+ /usr/contrib/lib/tcl8.2 \ -+ /usr/lib/tcl8.2 \ -+ /usr/lib/tk/tcl8.2 \ -+ /import/tcl/lib/tcl8.2 \ -+ $prefix/lib/tcl8.2 \ -+ $x_libraries/tcl8.2 \ - /usr/local/lib/tcl \ - /usr/lib/tcl \ -+ /usr/libdata/tcl \ - /usr/lib/tk/tcl \ - /import/tcl/lib/tcl \ - $prefix/lib/tcl \ -@@ -128,6 +136,7 @@ - AC_SUBST(V_LIBRARY_TCL) - - AC_ARG_WITH(tk, --with-tk=path specify a pathname for tk, d=$withval, d="") -+tkposs="tk8.2 tk82 tk" - if test "$d" != "" ; then - if test ! -d $d ; then - echo "'$d' is not a directory" -@@ -138,22 +147,22 @@ - echo "can't find tk.h in $d/include" - exit 1 - fi -- places="$d/lib/libtk4.1.so \ -- $d/lib/libtk4.1.a \ -- $d/lib/libtk.so \ -- $d/lib/libtk.a" - V_LIB_TK=FAIL -- for dir in $places; do -- if test -r $dir ; then -- V_LIB_TK=$dir -+ for p in $tkposs; do -+ if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then -+ V_LIB_TK="-L$d/lib -l$p" -+ break -+ fi -+ if test -r $d/lib/lib$p.a ; then -+ V_LIB_TK="-L$d/lib -l$p" - break - fi - done -- if test $V_LIB_TK = FAIL ; then -+ if test "$V_LIB_TK" = FAIL ; then - echo "can't find libtk.a in $d/lib" - exit 1 - fi -- places="$d/lib/tk4.1 \ -+ places="$d/lib/tk8.2 \ - $d/lib/tk" - V_LIBRARY_TK=FAIL - for dir in $places; do -@@ -174,14 +183,15 @@ - places="\ - $prefix/include \ - /usr/local/include \ -+ /usr/local/include/tk8.2 \ - /usr/contrib/include \ - /usr/include/tcl \ - /usr/include\ - $x_includes/tk \ - $x_includes \ -- $PWD/../tk4.1 \ -- /usr/src/local/tk4.1 \ -- /import/tcl/include/tk4.1 \ -+ $PWD/../tk8.2 \ -+ /usr/src/local/tk8.2 \ -+ /import/tcl/include/tk8.2 \ - " - for dir in $places; do - if test -r $dir/tk.h ; then -@@ -194,7 +204,7 @@ - exit 1 - fi - fi -- AC_CHECK_LIB(tk4.1, main, V_LIB_TK="-ltk4.1", V_LIB_TK="FAIL") -+ AC_CHECK_LIB(tk8.2, main, V_LIB_TK="-ltk8.2", V_LIB_TK="FAIL") - if test "$V_LIB_TK" = FAIL; then - echo "checking for libtk.a" - places="/usr/local/lib \ -@@ -202,17 +212,22 @@ - /usr/lib \ - /usr/lib/tk \ - /import/tcl/lib \ -- $PWD/../tk4.1 \ -- /usr/src/local/tk4.1 \ -+ $PWD/../tk8.2 \ -+ /usr/src/local/tk8.2 \ - $prefix/lib \ - $x_libraries" - for dir in $places; do -- if test -r $dir/libtk4.1.so -o -r $dir/libtk4.1.a; then -- V_LIB_TK="-L$dir -ltk4.1" -- break -- fi -- if test -r $dir/libtk.so -o -r $dir/libtk.a; then -- V_LIB_TK="-L$dir -ltk" -+ for p in $tkposs; do -+ if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then -+ V_LIB_TK="-L$dir -l$p" -+ break -+ fi -+ if test -r $dir/lib$p.a ; then -+ V_LIB_TK="-L$dir -l$p" -+ break -+ fi -+ done -+ if test "$V_LIB_TK" != FAIL; then - break - fi - done -@@ -227,15 +242,15 @@ - fi - echo "checking for tk/tk.tcl" - V_LIBRARY_TK=FAIL -- places="/usr/local/lib/tk4.1 \ -- /usr/contrib/lib/tk4.1 \ -- /usr/lib/tk4.1 \ -- /usr/lib/tk/tk4.1 \ -- /import/tcl/lib/tk4.1 \ -- $prefix/lib/tk4.1 \ -- $x_libraries/tk4.1 \ -- $PWD/../tk4.1/library \ -- /usr/src/local/tk4.1/library \ -+ places="/usr/local/lib/tk8.2 \ -+ /usr/contrib/lib/tk8.2 \ -+ /usr/lib/tk8.2 \ -+ /usr/lib/tk/tk8.2 \ -+ /import/tcl/lib/tk8.2 \ -+ $prefix/lib/tk8.2 \ -+ $x_libraries/tk8.2 \ -+ $PWD/../tk8.2/library \ -+ /usr/src/local/tk8.2/library \ - /usr/local/lib/tk \ - /usr/lib/tk \ - /usr/lib/tk/tk \ diff --git a/audio/vat/files/patch-ab b/audio/vat/files/patch-ab deleted file mode 100644 index 8424b66fc784..000000000000 --- a/audio/vat/files/patch-ab +++ /dev/null @@ -1,136 +0,0 @@ ---- tkStripchart.c.orig Tue Sep 9 11:00:42 1997 -+++ tkStripchart.c Tue Sep 9 10:52:30 1997 -@@ -148,7 +148,7 @@ - int scrollrequired; - int guarantee_draw; - int grow_up; -- XFontStruct *fontPtr; /* Information about text font, or NULL. */ -+ Tk_Font tkfont; /* Information about text font, or NULL. */ - XColor *textColorPtr; /* Color for drawing text. */ - GC textGC; /* GC for drawing text. */ - XColor *tickColorPtr; /* Color for drawing ticks. */ -@@ -257,7 +257,7 @@ - {TK_CONFIG_SYNONYM, "-fg", "stripcolor", 0, - 0, 0, 0}, - {TK_CONFIG_FONT, "-font", "font", "Font", -- DEF_STRIPCHART_FONT, Tk_Offset(Stripchart, fontPtr), -+ DEF_STRIPCHART_FONT, Tk_Offset(Stripchart, tkfont), - 0}, - {TK_CONFIG_BOOLEAN, "-guaranteedrawing", "guaranteedrawing", - "Guaranteedrawing", DEF_GUARANTEE_DRAW, -@@ -570,8 +570,8 @@ - if (StripchartPtr->value != NULL) - free(StripchartPtr->value); - -- if (StripchartPtr->fontPtr != NULL) -- Tk_FreeFontStruct(StripchartPtr->fontPtr); -+ if (StripchartPtr->tkfont != NULL) -+ Tk_FreeFont(StripchartPtr->tkfont); - - if (StripchartPtr->textColorPtr != NULL) - Tk_FreeColor(StripchartPtr->textColorPtr); -@@ -631,7 +631,7 @@ - - Tk_SetBackgroundFromBorder(StripchartPtr->tkwin, StripchartPtr->border); - -- gcValues.font = StripchartPtr->fontPtr->fid; -+ gcValues.font = Tk_FontId(StripchartPtr->tkfont); - gcValues.foreground = StripchartPtr->textColorPtr->pixel; - newGC = Tk_GetGC(StripchartPtr->tkwin, GCForeground|GCFont, &gcValues); - if (StripchartPtr->textGC != None && StripchartPtr->tkwin) { -@@ -692,8 +692,11 @@ - { - int tt = hasatitle(StripchartPtr); - int bd = StripchartPtr->borderWidth; -- int lineHeight = StripchartPtr->fontPtr->ascent + -- StripchartPtr->fontPtr->descent; -+ Tk_FontMetrics fm; -+ int lineHeight; -+ -+ Tk_GetFontMetrics(StripchartPtr->tkfont, &fm); -+ lineHeight = fm.ascent + fm.descent; - - Tk_GeometryRequest(StripchartPtr->tkwin, - 2 * (bd + PADDING) + StripchartPtr->num_strips * -@@ -726,11 +729,13 @@ - /* - * Variable declarations used in the title drawing routines - */ -- XFontStruct *fp = StripchartPtr->fontPtr; -- XCharStruct bbox; -- int x, dummy; -- int lineHeight = StripchartPtr->fontPtr->ascent + -- StripchartPtr->fontPtr->descent; -+ Tk_Font tkf = StripchartPtr->tkfont; -+ int x; -+ Tk_FontMetrics fm; -+ int lineHeight; -+ -+ Tk_GetFontMetrics(tkf, &fm); -+ lineHeight = fm.ascent + fm.descent; - - StripchartPtr->displaybits &= ~REDRAW_PENDING; - if ((StripchartPtr->tkwin == NULL) || !Tk_IsMapped(tkwin)) -@@ -747,18 +752,17 @@ - * space. Otherwise left justified and clipped on the right. - */ - if (tt && StripchartPtr->displaybits & DISPLAY_TITLE) { -- XTextExtents(fp, StripchartPtr->title, -- strlen(StripchartPtr->title), -- &dummy, &dummy, &dummy, &bbox); -- if (bbox.lbearing + bbox.rbearing < Tk_Width(tkwin) - 2 * bd) -- x = (Tk_Width(tkwin) - bbox.lbearing - bbox.rbearing)/2; -+ int width = Tk_TextWidth(tkf, StripchartPtr->title, -+ strlen(StripchartPtr->title)); -+ if (width < Tk_Width(tkwin) - 2 * bd) -+ x = (Tk_Width(tkwin) - width)/2; - else - x = bd + PADDING; - - XClearArea(Tk_Display(tkwin), Tk_WindowId(tkwin), bd, bd, - Tk_Width(tkwin) - 2 * bd, lineHeight + PADDING, False); - XDrawString(Tk_Display(tkwin), Tk_WindowId(tkwin), -- StripchartPtr->textGC, x, fp->max_bounds.ascent + bd, -+ StripchartPtr->textGC, x, fm.ascent + bd, /*XXX no max_bounds */ - StripchartPtr->title, strlen(StripchartPtr->title)); - } - /* -@@ -1057,7 +1061,8 @@ - DrawStripi(Stripchart* SPtr, int i) - { - Tk_Window tkwin = SPtr->tkwin; -- int lineHeight = SPtr->fontPtr->ascent + SPtr->fontPtr->descent; -+ Tk_FontMetrics fm; -+ int lineHeight; - int x = SPtr->borderWidth + PADDING + (i - 1) * SPtr->strip_width; - int y = SPtr->borderWidth + PADDING + - hasatitle(SPtr) * (lineHeight + PADDING); -@@ -1066,6 +1071,9 @@ - double maxv = SPtr->max_value; - double minv = SPtr->min_value; - -+ Tk_GetFontMetrics(SPtr->tkfont, &fm); -+ lineHeight = fm.ascent + fm.descent; -+ - if (i < 1 || i > SPtr->num_strips) - return; - -@@ -1136,7 +1144,8 @@ - ScrollStrips(Stripchart* SPtr) - { - Tk_Window tkwin = SPtr->tkwin; -- int lineHeight = SPtr->fontPtr->ascent + SPtr->fontPtr->descent; -+ Tk_FontMetrics fm; -+ int lineHeight; - int src_x = SPtr->borderWidth + PADDING + SPtr->strip_width; - int src_y = SPtr->borderWidth + PADDING + - hasatitle(SPtr) * (lineHeight + PADDING); -@@ -1144,6 +1153,8 @@ - int dest_y = src_y; - int w = (SPtr->num_strips - 1) * SPtr->strip_width; - int h = SPtr->max_height; -+ -+ Tk_GetFontMetrics(SPtr->tkfont, &fm); - - XCopyArea(Tk_Display(tkwin), Tk_WindowId(tkwin), Tk_WindowId(tkwin), - Tk_GetGC(tkwin, 0, NULL), src_x, src_y, w, h, dest_x, dest_y); diff --git a/audio/vat/files/patch-ac b/audio/vat/files/patch-ac deleted file mode 100644 index 42144397d299..000000000000 --- a/audio/vat/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- main.cc.orig Tue Sep 9 11:17:10 1997 -+++ main.cc Tue Sep 9 11:17:31 1997 -@@ -162,7 +162,7 @@ - else { - Tk_Window tk = t.tkmain(); - Tk_Uid uid = Tk_GetUid((char*)argv[1]); -- XFontStruct* p = Tk_GetFontStruct(t.interp(), tk, uid); -+ Tk_Font p = Tk_GetFont(t.interp(), tk, uid); - t.result(p != 0 ? "1" : "0"); - } - return (TCL_OK); diff --git a/audio/vat/files/patch-ad b/audio/vat/files/patch-ad deleted file mode 100644 index 8577e53a9883..000000000000 --- a/audio/vat/files/patch-ad +++ /dev/null @@ -1,70 +0,0 @@ ---- sitebox.cc.orig Tue Sep 9 11:24:41 1997 -+++ sitebox.cc Tue Sep 9 11:24:43 1997 -@@ -112,7 +112,7 @@ - static Drawable pixmap_; - static int pixw_; - static int pixh_; -- static XFontStruct* fs_; /* font metrics */ -+ static Tk_Font fs_; /* font metrics */ - }; - - class SiteBox : public TkWidget, public IdleCallback { -@@ -160,7 +160,7 @@ - GC Site::copy_gc_; - GC Site::fg_[4]; - GC Site::bg_[4]; --XFontStruct* Site::fs_; -+Tk_Font Site::fs_; - XColor* Site::fc_; - XColor* Site::bc_; - XColor* Site::ac_; -@@ -190,15 +190,16 @@ - sitebox_(sb) - { - Tcl& tcl = Tcl::instance(); -+ Tk_FontMetrics fm; - if (fs_ == 0) { - const char* font = tcl.attr("siteFont"); -- fs_ = Tk_GetFontStruct(tcl.interp(), tk_, (char*)font); -+ fs_ = Tk_GetFont(tcl.interp(), tk_, (char*)font); - if (fs_ == 0) { - fprintf(stderr, - "vat: couldn't find font: %s\n", font); -- fs_ = Tk_GetFontStruct(tcl.interp(), tk_, "screen"); -+ fs_ = Tk_GetFont(tcl.interp(), tk_, "screen"); - if (fs_ == 0) -- fs_ = Tk_GetFontStruct(tcl.interp(), tk_, -+ fs_ = Tk_GetFont(tcl.interp(), tk_, - "fixed"); - if (fs_ == 0) { - fprintf(stderr, -@@ -220,8 +221,9 @@ - - copy_gc_ = sitebox_.lookup_gc(0, 0, 0); - } -- descent_ = fs_->descent; -- ascent_ = fs_->ascent; -+ Tk_GetFontMetrics(fs_, &fm); -+ descent_ = fm.descent; -+ ascent_ = fm.ascent; - major_ = ascent_; - minor_ = major_ / 2; - } -@@ -292,7 +294,7 @@ - */ - inline int Site::textwidth(const char* s) - { -- return (XTextWidth(fs_, s, strlen(s))); -+ return (Tk_TextWidth(fs_, s, strlen(s))); - } - - inline void Site::square(Display* dpy, Drawable window, GC gc, -@@ -450,7 +452,7 @@ - free_gc(bg_[0]); - free_gc(bg_[1]); - } -- Font fid = fs_->fid; -+ Font fid = Tk_FontId(fs_); - fg_[0] = raw_gc(fid, fc_, bc_, pixmap_); - fg_[2] = raw_gc(fid, dc_, bc_, pixmap_); - bg_[0] = raw_gc(fid, bc_, bc_, pixmap_); diff --git a/audio/vat/files/patch-ae b/audio/vat/files/patch-ae deleted file mode 100644 index 6ac2e51801f1..000000000000 --- a/audio/vat/files/patch-ae +++ /dev/null @@ -1,79 +0,0 @@ ---- Tcl.h.orig Sat Mar 16 13:14:34 1996 -+++ Tcl.h Tue Dec 17 14:39:45 1996 -@@ -53,7 +53,8 @@ - inline int dark() const { return (tcl_ == 0); } - inline Tcl_Interp* interp() const { return (tcl_); } - inline char* result() const { return (tcl_->result); } -- inline void result(const char* p) { tcl_->result = (char*)p; } -+ inline void result(const char* p, Tcl_FreeProc* freeProc = TCL_STATIC) -+ { Tcl_SetResult(tcl_, (char *)p, freeProc); } - void resultf(const char* fmt, ...); - inline void CreateCommand(const char* cmd, Tcl_CmdProc* cproc, - ClientData cd = 0, ---- source.cc.orig Thu Apr 4 07:05:45 1996 -+++ source.cc Tue Dec 17 14:38:44 1996 -@@ -251,8 +251,7 @@ - return (TCL_OK); - } - if (strcmp(argv[1], "addr") == 0) { -- strcpy(wrk, InetNtoa(addr_)); -- tcl.result(wrk); -+ tcl.result(InetNtoa(addr_), TCL_DYNAMIC); - return (TCL_OK); - } - if (strcmp(argv[1], "srcid") == 0) { ---- Tcl.cc.orig Tue Apr 2 20:53:27 1996 -+++ Tcl.cc Tue Dec 17 15:45:30 1996 -@@ -65,6 +65,7 @@ - { - instance_.tcl_ = tcl; - instance_.application_ = application; -+ Tcl_Init(tcl); - } - - void Tcl::evalc(const char* s) -@@ -162,6 +163,8 @@ - Tcl& tcl = Tcl::instance(); - if (!tcl.dark()) - tcl.DeleteCommand(name_); -+ if (name_ != 0) -+ delete name_; - TclObject** p; - for (p = &all_; *p != this; p = &(*p)->next_) - ; -@@ -197,8 +200,9 @@ - void TclObject::setproc(const char* s) - { - Tcl& tcl = Tcl::instance(); -- if (name_ != 0 && !tcl.dark()) { -- tcl.DeleteCommand(name_); -+ if (name_ != 0) { -+ if (!tcl.dark()) -+ tcl.DeleteCommand(name_); - delete name_; - } - int n = strlen(s); ---- sitebox.cc.orig 1997/01/07 22:48:27 -+++ sitebox.cc 1997/01/07 23:27:35 -@@ -230,6 +230,10 @@ - - Site::~Site() - { -+ if (text_) -+ delete text_; -+ if (tag_) -+ delete tag_; - } - - int Site::command(int argc, const char*const* argv) -@@ -638,8 +642,8 @@ - need_sort_ = 0; - - Tcl& tcl = Tcl::instance(); -- Tk_Uid fg = mono()? "black" : (char*)tcl.attr("foreground"); -- Tk_Uid bg = mono()? "white" : (char*)tcl.attr("background"); -+ Tk_Uid fg = mono()? (char*)"black" : (char*)tcl.attr("foreground"); -+ Tk_Uid bg = mono()? (char*)"white" : (char*)tcl.attr("background"); - fg_ = lookup_gc(0, fg, bg); - bg_ = lookup_gc(0, bg, bg); - } diff --git a/audio/vat/files/patch-af b/audio/vat/files/patch-af deleted file mode 100644 index 6b73cca9f5c8..000000000000 --- a/audio/vat/files/patch-af +++ /dev/null @@ -1,117 +0,0 @@ ---- net.cc.orig 1997/10/07 19:07:01 -+++ net.cc 1998/01/26 22:21:41 -@@ -163,46 +163,48 @@ - { - int cc = ::send(fd, (char*)buf, len, 0); - if (cc < 0) { -- switch (errno) { -+ /* -+ * Due to a bug in kern/uipc_socket.c, on several -+ * systems, datagram sockets incorrectly persist -+ * in an error state on receipt of any ICMP -+ * error. This causes unicast connection -+ * rendezvous problems, and worse, multicast -+ * transmission problems because several systems -+ * incorrectly send port unreachables for -+ * multicast destinations. Our work around -+ * is to call getsockopt(..., SO_ERROR, ...) -+ * which resets so->so_error. -+ * -+ * This bug originated at CSRG in Berkeley -+ * and was present in the BSD Reno networking -+ * code release. It has since been fixed -+ * in OSF-3.x. It is know to remain -+ * in 4.4BSD and AIX-4.1.3. -+ * -+ * A fix is to change the following lines from -+ * kern/uipc_socket.c: -+ * -+ * if (so_serror) -+ * snderr(so->so_error); -+ * -+ * to: -+ * -+ * if (so->so_error) { -+ * error = so->so_error; -+ * so->so_error = 0; -+ * splx(s); -+ * goto release; -+ * } -+ * -+ */ -+ int err, errlen = sizeof(err), savederrno; -+ -+ savederrno = errno; -+ getsockopt(fd, SOL_SOCKET, SO_ERROR, &err, -+ &errlen); -+ switch (savederrno) { - case ECONNREFUSED: - /* no one listening at some site - ignore */ --#if defined(__osf__) || defined(_AIX) -- /* -- * Due to a bug in kern/uipc_socket.c, on several -- * systems, datagram sockets incorrectly persist -- * in an error state on receipt of an ICMP -- * port-unreachable. This causes unicast connection -- * rendezvous problems, and worse, multicast -- * transmission problems because several systems -- * incorrectly send port unreachables for -- * multicast destinations. Our work around -- * is to simply close and reopen the socket -- * (by calling reset() below). -- * -- * This bug originated at CSRG in Berkeley -- * and was present in the BSD Reno networking -- * code release. It has since been fixed -- * in 4.4BSD and OSF-3.x. It is know to remain -- * in AIX-4.1.3. -- * -- * A fix is to change the following lines from -- * kern/uipc_socket.c: -- * -- * if (so_serror) -- * snderr(so->so_error); -- * -- * to: -- * -- * if (so->so_error) { -- * error = so->so_error; -- * so->so_error = 0; -- * splx(s); -- * goto release; -- * } -- * -- */ -- reset(); --#endif - break; - - case ENETUNREACH: -@@ -217,7 +219,7 @@ - * icmp unreachable, so we should be able to - * send now. - */ -- (void)::send(ssock_, (char*)buf, len, 0); -+ (void)::send(fd, (char*)buf, len, 0); - break; - - default: -@@ -264,12 +266,14 @@ - } - int cc = ::sendmsg(ssock_, (msghdr*)&mh, 0); - if (cc < 0) { -- switch (errno) { -+ int err, errlen = sizeof(err), savederrno; -+ -+ savederrno = errno; -+ getsockopt(ssock_, SOL_SOCKET, SO_ERROR, &err, -+ &errlen); -+ switch (savederrno) { - case ECONNREFUSED: - /* no one listening at some site - ignore */ --#if defined(__osf__) || defined(_AIX) -- reset(); --#endif - break; - - case ENETUNREACH: diff --git a/audio/vat/files/patch-ag b/audio/vat/files/patch-ag deleted file mode 100644 index c4735e351557..000000000000 --- a/audio/vat/files/patch-ag +++ /dev/null @@ -1,45 +0,0 @@ ---- ui-resource.tcl.orig Tue Mar 12 07:32:56 1996 -+++ ui-resource.tcl Thu Feb 19 10:48:04 1998 -@@ -111,32 +111,24 @@ - # - option add *tearOff 0 - -- # -- # Make the color scheme a little darker than the default gray. -- # Go through all the palette resources and raise the option data -- # base priority from widgetDefault to 61 so that user's X resources -- # won't override these. -- # -- tk_setPalette gray80 -- foreach option [array names tkPalette] { -- option add *$option $tkPalette($option) 61 -- } -- - option add *highlightThickness 0 - - option add *Radiobutton.relief flat startupFile - option add *Checkbutton.anchor w startupFile - option add *Radiobutton.anchor w startupFile - option add *Radiobutton.relief flat startupFile -- option add *Scale.sliderForeground gray66 startupFile -- option add *Scale.activeForeground gray80 startupFile -- option add *Scale.background gray70 startupFile - -- # vat widgets -- option add Vat.disabledColor gray50 startupFile -- option add Vat.highlightColor gray95 startupFile -+ # add color defaults for vat widgets - where possible, use -+ # the platform specific values compiled into tk widgets -+ scale .junk -+ option add *foreground [.junk cget -foreground] widgetDefault -+ option add *background [.junk cget -background] widgetDefault -+ option add *activeBackground [.junk cget -activebackground] widgetDefault -+ destroy .junk -+ -+ option add *highlightColor white widgetDefault - option add Vat.infoHighlightColor LightYellow2 startupFile -- option add *VatVU.foreground black startupFile -+ option add Vat.disabledColor gray50 startupFile - option add *VatVU.peak gray50 startupFile - option add *VatVU.hot firebrick1 startupFile - option add *VatVU.hotLevel 90 startupFile diff --git a/audio/vat/files/patch-ah b/audio/vat/files/patch-ah deleted file mode 100644 index 06d8512f9daa..000000000000 --- a/audio/vat/files/patch-ah +++ /dev/null @@ -1,662 +0,0 @@ ---- audio-voxware.cc.dist Fri Apr 26 05:22:37 1996 -+++ audio-voxware.cc Fri Jun 26 11:44:52 1998 -@@ -1,4 +1,6 @@ - /* -+ * Modifications (C) 1997-1998 by Luigi Rizzo and others. -+ * - * Copyright (c) 1991-1993 Regents of the University of California. - * All rights reserved. - * -@@ -35,29 +37,41 @@ - --#include <string.h> --#include <sys/fcntl.h> --#include <errno.h> --#if defined(sco) || defined(__bsdi__) --#include <sys/socket.h> --#endif --#if defined(__FreeBSD__) --#include <sys/types.h> --#include <sys/uio.h> --#include <unistd.h> --#include <machine/soundcard.h> -+ -+/* -+ * Full Duplex audio module for the new sound driver and full duplex -+ * cards. Luigi Rizzo, from original sources supplied by Amancio Hasty. -+ * -+ * This includes some enhancements: -+ * - the audio device to use can be in the AUDIODEV env. variable. -+ * It can be either a unit number or a full pathname; -+ * - use whatever format is available from the card (included split -+ * format e.g. for the sb16); -+ * - limit the maximum size of the playout queue to approx 4 frames; -+ * this is necessary if the write channel is slower than expected; -+ * the fix is based on two new ioctls, AIOGCAP and AIONWRITE, -+ * but the code should compile with the old driver as well. -+ */ -+ -+#if !defined(__FreeBSD__) || (__FreeBSD__ < 4) -+#include <osfcn.h> - #else --#include <sys/soundcard.h> -+#include <fcntl.h> - #endif -+#include <machine/soundcard.h> - #include "audio.h" -+#include "mulaw.h" - #include "Tcl.h" - - #define ULAW_ZERO 0x7f -+ -+/* for use in the Voxware driver */ - #define ABUFLOG2 8 --#define ABUFLEN (1 << ABUFLOG2) - #define NFRAG 5 - --class VoxWareAudio : public Audio { -+extern const u_char lintomulawX[]; -+ -+class VoxWare : public Audio { - public: -- VoxWareAudio(); -+ VoxWare(); - virtual int FrameReady(); - virtual u_char* Read(); - virtual void Write(u_char *); -@@ -66,163 +80,400 @@ - virtual void OutputPort(int); - virtual void InputPort(int); - virtual void Obtain(); -+ virtual void Release(); - virtual void RMute(); - virtual void RUnmute(); - virtual int HalfDuplex() const; - protected: -+ int ext_fd; /* source for external file */ - -- u_char* readptr; -- u_char* readbufend; - u_char* readbuf; -+ u_short *s16_buf; -+ -+ int play_fmt ; -+ int is_half_duplex ; -+ -+ // new sound driver -+ int rec_fmt ; /* the sb16 has split format... */ -+ snd_capabilities soundcaps; - -- u_char* ubufptr; -- u_char* ubufend; -- u_char* ubuf; -- -- u_char* writeptr; -- u_char* writebufend; -- u_char* writebuf; - }; - --static class VoxWareAudioMatcher : public Matcher { -+static class VoxWareMatcher : public Matcher { - public: -- VoxWareAudioMatcher() : Matcher("audio") {} -+ VoxWareMatcher() : Matcher("audio") {} - TclObject* match(const char* fmt) { - if (strcmp(fmt, "voxware") == 0) -- return (new VoxWareAudio); -- else -+ return (new VoxWare); - return (0); - } --} voxware_audio_matcher; -+} linux_audio_matcher; - --VoxWareAudio::VoxWareAudio() -+VoxWare::VoxWare() - { -- readbuf = new u_char[ABUFLEN]; -- readptr = readbufend = readbuf + ABUFLEN; -+ readbuf = new u_char[blksize]; -+ s16_buf = new u_short[blksize]; - -- writeptr = writebuf = new u_char[ABUFLEN]; -- writebufend = writebuf + ABUFLEN; -+ memset(readbuf, ULAW_ZERO, blksize); - -- ubufptr = ubuf = new u_char[blksize]; -- ubufend = ubuf + blksize; -- memset(ubuf, ULAW_ZERO, blksize); -+ ext_fd = -1 ; /* no external audio */ -+ iports = 4; /* number of input ports */ - } - --int VoxWareAudio::HalfDuplex() const -+void -+VoxWare::Obtain() - { -- /*XXX change this if full duplex audio device available*/ -- return 1; --} -+ char *thedev; -+ char buf[64]; -+ int d = -1; - --void VoxWareAudio::Obtain() --{ - if (HaveAudio()) - abort(); -- -- fd = open("/dev/audio", O_RDWR|O_NDELAY); -+ is_half_duplex = 0 ; -+ /* -+ * variable AUDIODEV has the name of the audio device. -+ * With the new audio driver, the main device can also control -+ * the mixer, so there is no need to carry two descriptors around. -+ */ -+ thedev=getenv("AUDIODEV"); -+ if (thedev==NULL) -+ thedev="/dev/audio"; -+ else if ( thedev[0] >= '0' && thedev[0] <= '9' ) { -+ d = atoi(thedev); -+ sprintf(buf,"/dev/audio%d", d); -+ thedev = buf ; -+ } -+ fd = open(thedev, O_RDWR ); - if (fd >= 0) { -- int on = 1; -- ioctl(fd, FIONBIO, &on); -+ int i = -1 ; -+ u_long fmt = 0 ; -+ int rate = 8000 ; -+ -+ snd_chan_param pa; -+ struct snd_size sz; -+ i = ioctl(fd, AIOGCAP, &soundcaps); -+ fmt = soundcaps.formats ; /* can be invalid, check later */ -+ -+ play_fmt = AFMT_MU_LAW ; -+ rec_fmt = AFMT_MU_LAW ; -+ -+ if (i == -1 ) { /* setup code for old voxware driver */ -+ i = ioctl(fd, SNDCTL_DSP_GETFMTS, &fmt); -+ fmt &= AFMT_MU_LAW ; /* only use mu-law */ -+ fmt |= AFMT_FULLDUPLEX ; -+ if ( i < 0 ) { /* even voxware driver failed, try with pcaudio */ -+ fmt = AFMT_MU_LAW | AFMT_WEIRD ; -+ } -+ } -+ switch (soundcaps.formats & (AFMT_FULLDUPLEX | AFMT_WEIRD)) { -+ case AFMT_FULLDUPLEX : -+ /* -+ * this entry for cards with decent full duplex. Use s16 -+ * preferably (some are broken in ulaw) or ulaw or u8 otherwise. -+ */ -+ if (fmt & AFMT_S16_LE) -+ play_fmt = rec_fmt = AFMT_S16_LE ; -+ else if (soundcaps.formats & AFMT_MU_LAW) -+ play_fmt = rec_fmt = AFMT_MU_LAW ; -+ else if (soundcaps.formats & AFMT_U8) -+ play_fmt = rec_fmt = AFMT_U8 ; -+ else { -+ printf("sorry, no supported formats\n"); -+ close(fd); -+ fd = -1 ; -+ return; -+ } -+ break ; -+ case AFMT_FULLDUPLEX | AFMT_WEIRD : -+ /* this is the sb16... */ -+ if (fmt & AFMT_S16_LE) { -+ play_fmt = AFMT_U8 ; -+ rec_fmt = AFMT_S16_LE; -+ } else { -+ printf("sorry, no supported formats\n"); -+ close(fd); -+ fd = -1 ; -+ return; -+ } -+ break ; -+ default : -+ printf("sorry don't know how to deal with this card\n"); -+ close (fd); -+ fd = -1; -+ return; -+ } - -- int frag = (NFRAG << 16) | ABUFLOG2; -- ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &frag); --#ifdef fullduplex -+ pa.play_format = play_fmt ; -+ pa.rec_format = rec_fmt ; -+ pa.play_rate = pa.rec_rate = rate ; -+ ioctl(fd, AIOSFMT, &pa); /* if this fails, also AIOSSIZE will.. */ -+ sz.play_size = (play_fmt == AFMT_S16_LE) ? 2*blksize : blksize; -+ sz.rec_size = (rec_fmt == AFMT_S16_LE) ? 2*blksize : blksize; -+ i = ioctl(fd, AIOSSIZE, &sz); -+ -+ /* -+ * Set the line input level to 0 to avoid loopback if the mic -+ * is connected to the line-in port (e.g. through an echo -+ * canceller). -+ */ -+ int v = 0; -+ (void)ioctl(fd, MIXER_WRITE(SOUND_MIXER_LINE), &v); -+ // restore hardware settings in case some other vat changed them -+ InputPort(iport); -+ SetRGain(rgain); -+ SetPGain(pgain); -+ -+ if ( i < 0 ) { // if AIOSSIZE fails, maybe this is a Voxware driver -+ ioctl(fd, SNDCTL_DSP_SPEED, &rate); -+ ioctl(fd, SNDCTL_DSP_SETFMT, &play_fmt); // same for play/rec -+ d = (play_fmt == AFMT_S16_LE) ? 2*blksize : blksize; -+ ioctl(fd, SNDCTL_DSP_SETBLKSIZE, &d); -+ read(fd, &i, 1); /* dummy read to start read engine */ -+ } - Audio::Obtain(); --#else -- notify(); --#endif -+ } else { -+ fprintf(stderr, "failed to open rw...\n"); -+ fd = open(thedev, O_WRONLY ); -+ fprintf(stderr, "open wronly returns %d\n", fd); -+ is_half_duplex = 1 ; -+ play_fmt = rec_fmt = AFMT_MU_LAW ; -+ notify(); /* XXX */ - } - } - --void VoxWareAudio::Write(u_char *cp) -+/* -+ * note: HalfDuplex() uses a modified function of the new driver, -+ * which will return AFMT_FULLDUPLEX set in SNDCTL_DSP_GETFMTS -+ * for full-duplex devices. In the old driver this was 0 so -+ * the default is to use half-duplex for them. Note also that I have -+ * not tested half-duplex operation. -+ */ -+int -+VoxWare::HalfDuplex() const - { -- if (HaveAudio() && (rmute & 1) != 0) { -- register u_char *cpend = cp + blksize; -- register u_char *wbuf = writeptr; -- register u_char *wend = writebufend; -- for ( ; cp < cpend; cp += 4) { -- wbuf[0] = cp[0]; -- wbuf[1] = cp[1]; -- wbuf[2] = cp[2]; -- wbuf[3] = cp[3]; -- wbuf += 4; -- if (wbuf >= wend) { -- wbuf = writebuf; -- if (write(fd, (char*)wbuf, ABUFLEN) != ABUFLEN) -- perror("aud write"); -- } -- } -- writeptr = wbuf; -+ int i; -+ if (is_half_duplex) { -+ fprintf(stderr, "HalfDuplex returns 1\n"); -+ return 1 ; - } -+ ioctl(fd, SNDCTL_DSP_GETFMTS, &i); -+ return (i & AFMT_FULLDUPLEX) ? 0 : 1 ; - } - --int VoxWareAudio::FrameReady() -+void VoxWare::Release() - { -- if ((rmute & 1) == 0) { -- register u_char* cp = ubufptr; -- register u_char* cpend = ubufend; -- register u_char* rbuf = readptr; -- register u_char* rend = readbufend; -- -- for ( ; cp < cpend; cp += 4) { -- if (rbuf >= rend) { -- rbuf = readbuf; -- int cc = read(fd, (char*)rbuf, ABUFLEN); -- if (cc <= 0) { -- ubufptr = cp; -- readbufend = rbuf; -- if (cc == -1 && errno != EAGAIN) { -- Release(); -- Obtain(); -- } -- return (0); -+ if (HaveAudio()) { -+ Audio::Release(); - } -- readbufend = rend = rbuf + cc; - } -- cp[0] = rbuf[0]; -- cp[1] = rbuf[1]; -- cp[2] = rbuf[2]; -- cp[3] = rbuf[3]; -- rbuf += 4; -+ -+void VoxWare::Write(u_char *cp) -+{ -+ int i = blksize, l; -+ if (play_fmt == AFMT_S16_LE) { -+ for (i=0; i< blksize; i++) -+ s16_buf[i] = mulawtolin[cp[i]] ; -+ cp = (u_char *)s16_buf; -+ i = 2 *blksize ; -+ } else if (play_fmt == AFMT_S8) { -+ for (i=0; i< blksize; i++) { -+ int x = mulawtolin[cp[i]] ; -+ x = (x >> 8 ) & 0xff; -+ cp[i] = (u_char)x ; -+ } -+ i = blksize ; -+ } else if (play_fmt == AFMT_U8) { -+ for (i=0; i< blksize; i++) { -+ int x = mulawtolin[cp[i]] ; -+ /* -+ * when translating to 8-bit formats, it would be useful to -+ * implement AGC to avoid loss of resolution in the conversion. -+ * This code is still incomplete... -+ */ -+#if 0 /* AGC -- still not complete... */ -+ static int peak = 0; -+ if (x < 0) x = -x ; -+ if (x > peak) peak = ( peak*16 + x - peak ) / 16 ; -+ else peak = ( peak*8192 + x - peak ) / 8192 ; -+ if (peak < 128) peak = 128 ; -+ /* at this point peak is in the range 128..32k -+ * samples can be scaled and clipped consequently. -+ */ -+ x = x * 32768/peak ; -+ if (x > 32767) x = 32767; -+ else if (x < -32768) x = -32768; -+#endif -+ x = (x >> 8 ) & 0xff; -+ x = (x ^ 0x80) & 0xff ; -+ cp[i] = (u_char)x ; -+ } -+ i = blksize ; -+ } -+#if 0 -+ // this code is meant to keep the queue short. -+ int r, queued; -+ r = ioctl(fd, AIONWRITE, &queued); -+ queued = soundcaps.bufsize - queued ; -+ if (play_fmt == AFMT_S16_LE) { -+ if (queued > 8*blksize) -+ i -= 8 ; -+ } else { -+ if (queued > 4*blksize) -+ i -= 4 ; - } -- readptr = rbuf; -+#endif -+ for ( ; i > 0 ; i -= l) { -+ l = write(fd, cp, i); -+ cp += l; - } -- return (1); - } - --u_char* VoxWareAudio::Read() -+u_char* VoxWare::Read() - { -- u_char* cp = ubuf; -- ubufptr = cp; -- return (cp); -+ u_char* cp; -+ int l=0, l0 = blksize, i = blksize; -+ -+ cp = readbuf; -+ -+ if (rec_fmt == AFMT_S16_LE) { -+ cp = (u_char *)s16_buf; -+ l0 = i = 2 *blksize ; -+ } -+ for ( ; i > 0 ; i -= l ) { -+ l = read(fd, cp, i); -+ if (l<0) break; -+ cp += l ; -+ } -+ if (rec_fmt == AFMT_S16_LE) { -+ for (i=0; i< blksize; i++) { -+#if 1 /* remove DC component... */ -+ static int smean = 0 ; /* smoothed mean to remove DC */ -+ int dif = ((short) s16_buf[i]) - (smean >> 13) ; -+ smean += dif ; -+ readbuf[i] = lintomulawX[ dif & 0x1ffff ] ; -+#else -+ readbuf[i] = lintomulaw[ s16_buf[i] ] ; -+#endif -+ } -+ } -+ else if (rec_fmt == AFMT_S8) { -+ for (i=0; i< blksize; i++) -+ readbuf[i] = lintomulaw[ readbuf[i]<<8 ] ; -+ } -+ else if (rec_fmt == AFMT_U8) { -+ for (i=0; i< blksize; i++) -+ readbuf[i] = lintomulaw[ (readbuf[i]<<8) ^ 0x8000 ] ; -+ } -+ if (iport == 3) { -+ l = read(ext_fd, readbuf, blksize); -+ if (l < blksize) { -+ lseek(ext_fd, (off_t) 0, 0); -+ read(ext_fd, readbuf+l, blksize - l); -+ } -+ } -+ return readbuf; - } - --void VoxWareAudio::SetRGain(int level) -+/* -+ * should check that I HaveAudio() before trying to set gain. -+ * -+ * In most mixer devices, there is only a master volume control on -+ * the capture channel, so the following code does not really work -+ * as expected. The only (partial) exception is the MIC line, where -+ * there is generally a 20dB boost which can be enabled or not -+ * depending on the type of device. -+ */ -+void VoxWare::SetRGain(int level) - { -+ double x = level; -+ level = (int) (x/2.56); -+ int foo = (level<<8) | level; -+ if (!HaveAudio()) -+ Obtain(); -+ switch (iport) { -+ case 2: -+ case 1: -+ break; -+ case 0: -+ if (ioctl(fd, MIXER_WRITE(SOUND_MIXER_MIC), &foo) == -1) -+ printf("failed to set mic volume \n"); -+ break; -+ } -+ if (ioctl(fd, MIXER_WRITE(SOUND_MIXER_IGAIN), &foo) == -1) -+ printf("failed set input line volume \n"); - rgain = level; - } - --void VoxWareAudio::SetPGain(int level) -+void VoxWare::SetPGain(int level) - { -+ float x = level; -+ level = (int) (x/2.56); -+ int foo = (level<<8) | level; -+ if (ioctl(fd, MIXER_WRITE(SOUND_MIXER_PCM), &foo) == -1) { -+ printf("failed to output level %d \n", level); -+ } - pgain = level; - } - --void VoxWareAudio::OutputPort(int p) -+void VoxWare::OutputPort(int p) - { - oport = p; - } - --void VoxWareAudio::InputPort(int p) -+void VoxWare::InputPort(int p) - { -+ int src = 0; -+ -+ if (ext_fd >= 0 && p != 3) { -+ close(ext_fd); -+ ext_fd = -1 ; -+ } -+ -+ switch(p) { -+ case 3: -+ if (ext_fd == -1) -+ ext_fd = open(ext_fname, 0); -+ if (ext_fd != -1) -+ lseek(ext_fd, (off_t) 0, 0); -+ break; -+ case 2: -+ src = 1 << SOUND_MIXER_LINE; -+ break; -+ case 1: /* cd ... */ -+ src = 1 << SOUND_MIXER_CD; -+ break; -+ case 0 : -+ src = 1 << SOUND_MIXER_MIC; -+ break; -+ } -+ if ( ioctl(fd, SOUND_MIXER_WRITE_RECSRC, &src) == -1 ) { -+ printf("failed to select input \n"); -+ p = 0; -+ } - iport = p; - } - --void VoxWareAudio::RMute() -+void VoxWare::RMute() - { - rmute |= 1; - } - --void VoxWareAudio::RUnmute() -+void VoxWare::RUnmute() - { - rmute &=~ 1; - } -+ -+/* -+ * FrameReady must return 0 every so often, or the system will keep -+ * processing mike data and not other events. -+ */ -+int VoxWare::FrameReady() -+{ -+ int i, l = 0; -+ int lim = blksize; -+ -+ i = ioctl(fd, FIONREAD, &l ); -+ if (rec_fmt == AFMT_S16_LE) lim = 2*blksize; -+ return (l >= lim) ? 1 : 0 ; -+} -+/*** end of file ***/ -diff -ubwr old/audio.cc audio.cc ---- old/audio.cc Fri May 3 13:27:20 1996 -+++ audio.cc Thu Apr 16 21:36:33 1998 -@@ -70,6 +70,7 @@ - filter(new Filter(this)), - handler_(0) - { -+ ext_fname[0]='\0'; - for (u_int i = 0; i < sizeof(omode)/sizeof(omode[0]); ++i) - omode[i] = mode_mikemutesnet; - } -@@ -479,6 +480,10 @@ - *cp++ = '\0'; - return (TCL_OK); - } -+ } else if (strcmp(argv[1], "filename") == 0) { -+ strncpy(ext_fname, argv[2], sizeof(ext_fname)); -+ InputPort(input_line3); -+ return (TCL_OK); - } - } else if (argc == 4) { - if (strcmp(argv[1], "input") == 0) { -diff -ubwr old/audio.h audio.h ---- old/audio.h Fri Apr 26 12:00:44 1996 -+++ audio.h Fri Feb 20 13:44:01 1998 -@@ -158,6 +158,7 @@ - int rgain, pgain; - Filter *filter; - AudioHandler* handler_; -+ char ext_fname[256]; - }; - - #endif -diff -ubwr old/bitmaps/linein3.xbm bitmaps/linein3.xbm ---- old/bitmaps/linein3.xbm Fri May 3 12:18:11 1996 -+++ bitmaps/linein3.xbm Wed Oct 29 11:07:34 1997 -@@ -1,11 +1,11 @@ - #define linein3_width 30 - #define linein3_height 24 - static char linein3_bits[] = { -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, -- 0x00, 0x80, 0xff, 0x00, 0x00, 0xe0, 0xc1, 0x03, 0x00, 0x70, 0x04, 0x07, -- 0x00, 0x30, 0x0c, 0x06, 0x00, 0x18, 0x18, 0x0c, 0x00, 0x18, 0x30, 0x0c, -- 0x00, 0x0c, 0x60, 0x18, 0xe0, 0xff, 0xff, 0x18, 0xe0, 0xff, 0xff, 0x19, -- 0xe0, 0xff, 0xff, 0x18, 0x00, 0x0c, 0x60, 0x18, 0x00, 0x18, 0x30, 0x0c, -- 0x18, 0x18, 0x18, 0x0c, 0x24, 0x30, 0x0c, 0x06, 0x20, 0x70, 0x04, 0x07, -- 0x18, 0xe0, 0xc1, 0x03, 0x10, 0x80, 0xff, 0x00, 0x20, 0x00, 0x3e, 0x00, -- 0x24, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -+ 0x00, 0x00, 0x00, 0x00, 0x7c, 0x1b, 0x3e, 0x00, 0x0c, 0x1b, 0x06, 0x00, -+ 0x0c, 0x1b, 0x06, 0x00, 0x3c, 0x1b, 0x1e, 0x00, 0x0c, 0x1b, 0x06, 0x00, -+ 0x0c, 0x1b, 0x06, 0x00, 0x0c, 0xfb, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x70, 0x00, 0x80, 0x0f, 0xf8, 0x00, -+ 0xc0, 0x18, 0x8c, 0x01, 0x60, 0x30, 0x06, 0x03, 0x60, 0x30, 0x06, 0x03, -+ 0x60, 0x30, 0x06, 0x03, 0xc0, 0x18, 0x8c, 0x01, 0x80, 0xff, 0xff, 0x00, -+ 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -diff -ubwr old/ui-main.tcl ui-main.tcl ---- old/ui-main.tcl Fri May 3 13:27:22 1996 -+++ ui-main.tcl Sat Feb 21 06:02:59 1998 -@@ -373,9 +373,9 @@ - } - mk.obuttons $w.frame.buttons - frame $w.frame.ssthresh -- # mk.ssthresh $w.frame.ssthresh -- #pack $w.frame.radios $w.frame.buttons $w.frame.ssthresh \ -- # -anchor c -pady 4 -+ mk.ssthresh $w.frame.ssthresh -+ pack $w.frame.radios $w.frame.buttons $w.frame.ssthresh \ -+ -anchor c -pady 4 - pack $w.frame.radios $w.frame.buttons \ - -anchor c -pady 4 - pack $w.label $w.frame -expand 1 -fill x -@@ -515,6 +515,12 @@ - return 0 - } - -+proc update_filename { w s } { -+ set s [string trim $s] -+ audio filename $s -+ return 0 -+} -+ - proc mk.entries { w } { - global sessionKey confName - set sessionKey [option get . sessionKey Vat] -@@ -913,6 +919,16 @@ - set a .m.right - frame $a.ab - mk.ab $a.ab -+ -+### XXX -+ set f [ctrlfont] -+ frame .m.file -+ label .m.file.label -text "AU File: " -font $f -+ mk.entry .m.file update_filename "" -+ .m.file.entry configure -width 30 -+ pack .m.file.label -side left -+ pack .m.file.entry -side left -expand 1 -fill x -pady 2 -+ pack .m.file -fill x - - bind . c purge_sources - bind . C purge_sources diff --git a/audio/vat/files/patch-ai b/audio/vat/files/patch-ai deleted file mode 100644 index 15a8677d87c7..000000000000 --- a/audio/vat/files/patch-ai +++ /dev/null @@ -1,20 +0,0 @@ ---- iohandler.cc.orig Sun Nov 28 18:49:59 1999 -+++ iohandler.cc Sun Nov 28 18:50:46 1999 -@@ -132,7 +132,7 @@ - - } - #else -- Tk_CreateFileHandler((ClientData)fd, mask, callback, (ClientData)this); -+ Tk_CreateFileHandler(fd, mask, callback, (ClientData)this); - #endif - } - -@@ -151,7 +151,7 @@ - } - #else - if (fd_ >= 0) { -- Tk_DeleteFileHandler((ClientData)fd_); -+ Tk_DeleteFileHandler(fd_); - fd_ = -1; - } - #endif diff --git a/audio/vat/pkg-comment b/audio/vat/pkg-comment deleted file mode 100644 index e16ddfdfa5eb..000000000000 --- a/audio/vat/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -The Visual Audio Tool - multicast audioconferencing diff --git a/audio/vat/pkg-descr b/audio/vat/pkg-descr deleted file mode 100644 index 61f95885629c..000000000000 --- a/audio/vat/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -Vat allows users to conduct host-to-host or multihost audio -teleconferences over an internet. diff --git a/audio/vat/pkg-plist b/audio/vat/pkg-plist deleted file mode 100644 index 6a553559bfde..000000000000 --- a/audio/vat/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -bin/vat diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile deleted file mode 100644 index 5ba3d70e92a0..000000000000 --- a/audio/wsoundserver/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# New ports collection makefile for: wmsound -# Version required: 0.9.0 -# Date created: 9 December 1998 -# Whom: gljohns@bellsouth.net -# -# $FreeBSD$ -# - -DISTNAME= wmsound-0.9.5 -CATEGORIES= audio windowmaker -MASTER_SITES= ftp://shadowmere.student.utwente.nl/pub/WindowMaker/ - -MAINTAINER= ports@FreeBSD.org - -BUILD_DEPENDS= wmaker:${PORTSDIR}/x11-wm/windowmaker -LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList - -USE_IMAKE= yes -NO_INSTALL_MANPAGES= yes - -post-install: - ${SH} ${FILESDIR}/configure > ${WRKDIR}/WMSound - ${MKDIR} ${PREFIX}/share/WindowMaker/Defaults - ${INSTALL_DATA} ${WRKDIR}/WMSound \ - ${PREFIX}/share/WindowMaker/Defaults/WMSound - ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib - -.include <bsd.port.mk> diff --git a/audio/wsoundserver/distinfo b/audio/wsoundserver/distinfo deleted file mode 100644 index 5bac56de9ca8..000000000000 --- a/audio/wsoundserver/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (wmsound-0.9.5.tar.gz) = 86f9b19ca0ca1daa072d76d02943dd3e diff --git a/audio/wsoundserver/files/configure b/audio/wsoundserver/files/configure deleted file mode 100644 index 797a9b04d04c..000000000000 --- a/audio/wsoundserver/files/configure +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -# WMSound configuration and compilation script -# (C) Copyright 1998, Anthony Quinn & Pascal Hofstee -# Modified for FreeBSD port installation by Glenn Johnson - -VERSION="0.9.2" -DEVICE="/dev/dsp" - -(echo "{";\ -echo " SoundPath = (\"~/GNUstep/Library/WindowMaker/Sounds\",";\ -echo " \"/usr/X11R6/share/WindowMaker/Sounds\");";\ -echo " SoundSetsPath = (\"~/GNUstep/Library/WindowMaker/SoundSets\",";\ -echo " \"/usr/X11R6/share/WindowMaker/SoundSets\");";\ -echo " Device = $DEVICE;";\ -echo " AppExit = appexit.wav;";\ -echo " AppStart = appstart.wav;";\ -echo " Hide = hide.wav;";\ -echo " Iconify = iconify.wav;";\ -echo " Maximize = maximize.wav;";\ -echo " UnMaximize = unmaximize.wav;";\ -echo " Shade = shade.wav;";\ -echo " Startup = startup.wav;";\ -echo " UnHide = unhide.wav;";\ -echo " DeIconify = uniconify.wav;";\ -echo " UnShade = unshade.wav;";\ -echo " UserDefined = replaceme.wav;";\ -echo "}";) - diff --git a/audio/wsoundserver/pkg-comment b/audio/wsoundserver/pkg-comment deleted file mode 100644 index 41c2e0d52832..000000000000 --- a/audio/wsoundserver/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -The sound server for Window Maker diff --git a/audio/wsoundserver/pkg-descr b/audio/wsoundserver/pkg-descr deleted file mode 100644 index dd6a0c3e9a6c..000000000000 --- a/audio/wsoundserver/pkg-descr +++ /dev/null @@ -1,17 +0,0 @@ -This is the sound server for Window Maker. To use it, execute "wmsound &" from -an xterm, then dock the application icon. This package comes with a utility -called nmaker that can be used to play .wav files. You can set nmaker to be -the application to play .au and .wav files that you drop onto the docked -wmsound icon. - -Recent versions of Window Maker are built with sound enabled by default. If -you are using an older version of Window Maker, you will have to add the -following argument to configure: "--enable-sound" and rebuild and reinstall -Window Maker, or upgrade to a newer version. - -You must set up your sounds to use for various events, ie., iconification. You -can get preset SoundSets from: - -http://www.frontiernet.net/~southgat/wmsound/sounds/index.shtml - -WWW: http://www.frontiernet.net/~southgat/ diff --git a/audio/wsoundserver/pkg-plist b/audio/wsoundserver/pkg-plist deleted file mode 100644 index 44e6aec25c45..000000000000 --- a/audio/wsoundserver/pkg-plist +++ /dev/null @@ -1,9 +0,0 @@ -bin/wmsound -bin/nmaker -bin/getsounds -bin/setsounds -include/wmsnd.h -share/WindowMaker/Defaults/WMSound -lib/libwmsnd.a -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R |