diff options
Diffstat (limited to 'audio')
147 files changed, 0 insertions, 6763 deletions
diff --git a/audio/ccaudio2/Makefile b/audio/ccaudio2/Makefile deleted file mode 100644 index 663a7f47e56b..000000000000 --- a/audio/ccaudio2/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# New ports collection makefile for: ccaudio -# Date created: 26 July 2000 -# Whom: David Sugar <dyfet@gnu.org> -# -# $FreeBSD$ -# - -PORTNAME= ccaudio -PORTVERSION= 0.2.4 -CATEGORIES= audio -MASTER_SITES= ftp://www.voxilla.org/pub/ccaudio/ - -MAINTAINER= dyfet@gnu.org - -USE_GMAKE= yes -USE_LIBTOOL= yes -USE_AUTOCONF= yes -INSTALLS_SHLIB= yes - -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" - -post-extract: - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ - 's|-release \@LT_RELEASE\@||g' - -.include <bsd.port.mk> diff --git a/audio/ccaudio2/distinfo b/audio/ccaudio2/distinfo deleted file mode 100644 index ec047805c3bd..000000000000 --- a/audio/ccaudio2/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (ccaudio-0.2.4.tar.gz) = f326313e78a1952aed90819b7d519350 diff --git a/audio/ccaudio2/pkg-comment b/audio/ccaudio2/pkg-comment deleted file mode 100644 index 8370304c3e14..000000000000 --- a/audio/ccaudio2/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -C++ class framework for manipulating audio files. diff --git a/audio/ccaudio2/pkg-descr b/audio/ccaudio2/pkg-descr deleted file mode 100644 index 0dab234f6115..000000000000 --- a/audio/ccaudio2/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -ccaudio offers a portable framework for developing applications which -access audio files. This library is optimized for DSP frame presentation -and for merging audio from multiple sources. Support is provided for many -common and popular sound file formats such as .au, .wav/RIFF, etc. - -- David Sugar -dyfet@gnu.org diff --git a/audio/ccaudio2/pkg-plist b/audio/ccaudio2/pkg-plist deleted file mode 100644 index b8ddbbf8506a..000000000000 --- a/audio/ccaudio2/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -include/cc++/audio.h -lib/libccaudio.a -lib/libccaudio.so -lib/libccaudio.so.0 - diff --git a/audio/festival+OGI/Makefile b/audio/festival+OGI/Makefile deleted file mode 100644 index 12939fc9853b..000000000000 --- a/audio/festival+OGI/Makefile +++ /dev/null @@ -1,139 +0,0 @@ -# New ports collection makefile for: festival -# Date created: 2000-06-11 -# Whom: Trevor Johnson <trevor@jpj.net> -# based on the NetBSD port -# -# $NetBSD: Makefile,v 1.11 1999/12/28 04:19:58 wiz Exp $ -# $FreeBSD$ -# - -PORTNAME= festival -PORTVERSION= 1.4.1 -CATEGORIES= audio -MASTER_SITES= ftp://ftp.cstr.ed.ac.uk/pub/festival/${PORTVERSION}/ \ - http://www.speech.cs.cmu.edu/festival/cstr/festival/${PORTVERSION}/ \ - ftp://ftp.leb.net/pub/blinux/${SUB} \ - ftp://ftp.mayn.de/pub/linux/BLinux/${SUB} \ - ftp://ftp.tuwien.ac.at/zaux024/opsys/linux/blinux/${SUB} -SUB= festival/mirror.festival_home/${PORTVERSION}/ -.if defined (WITH_OGI) -MASTER_SITES+= ${PATCH_SITES} -PATCH_SITES= ftp://ftp.leb.net/pub/blinux/festival/mirror.ogi-synth_home/ \ - ftp://ftp.mayn.de/pub/linux/BLinux/festival/mirror.ogi-synth_home/ \ - ftp://cslu.cse.ogi.edu/pub/tts/ -.endif -DISTFILES= ${DISTNAME}.tar.gz \ - speech_tools-1.2.1.tar.gz -.if defined (WITH_OGI) -DISTFILES+= OGIresLPC-2.0.4.tar.gz -.endif - -.if defined (WITH_OGI) -PATCHFILES= OGIfestpatch-${PORTVERSION}.tar.gz -.endif - -MAINTAINER= trevor@jpj.net - -LIB_DEPENDS= audio.1:${PORTSDIR}/audio/nas \ - esd.2:${PORTSDIR}/audio/esound - -DIST_SUBDIR= festival - -EXTRA_PATCHES= ${FILESDIR}/patch-aa -.if defined (WITH_OGI) -EXTRA_PATCHES= ${FILESDIR}/patch-aa-ogi -RESTRICTED= no-commercial-use -.endif - -PLIST= ${PKGDIR}/PLIST -.if defined (WITH_OGI) -PLIST= ${PKGDIR}/PLIST-ogi -.endif - -WRKSRC= ${WRKDIR} - -USE_GMAKE= yes -USE_NEWGCC= yes - -SPEECHTOOLS= ${WRKSRC}/speech_tools -FESTIVAL= ${WRKSRC}/festival - -FHOME= ${PREFIX}/share/festival - -MAKE_ENV+= PKG_EST_HOME=${SPEECHTOOLS} \ - EST_HOME=${SPEECHTOOLS} \ - PKG_FESTIVAL_BUILD_HOME=${FESTIVAL} \ - PKG_FESTIVAL_HOME=${FHOME} \ - PKG_COMPILER="${CC}" \ - PKG_X11BASE=${X11BASE} \ - PKG_PREFIX=${PREFIX} \ - EGCS_CC="${CC}" \ - EGCS_CXX="${CXX}" \ - GCC28_CC="${CC}" \ - GCC28_CXX="${CXX}" \ - GCC27_CC="${CC}" \ - GCC27_CXX="${CXX}" \ - GCC26_CC="${CC}" \ - GCC26_CXX="${CXX}" \ - CC="${CC}" \ - CXX="${CXX}" - -MAN1= festival.1 festival_client.1 - -.if defined (WITH_OGI) -post-extract: - @${GUNZIP_CMD} -dc ${DISTDIR}/${DIST_SUBDIR}/OGIfestpatch-${PORTVERSION}.tar.gz \ - | ${TAR} -C ${WRKSRC} -xf - -.endif - -.if !defined(WITH_OGI) -pre-fetch: - @${ECHO} - @${ECHO_MSG} "********************************************************" - @${ECHO_MSG} "* To build this port with the OGI enhancements, define *" - @${ECHO_MSG} "* \"WITH_OGI\" and restart the build. The license for *" - @${ECHO_MSG} "* the OGI materials prohibits commercial use, but they *" - @${ECHO_MSG} "* are required by some of the voices. *" - @${ECHO_MSG} "********************************************************" - @${ECHO} -.endif - -pre-patch: - ${CP} ${SPEECHTOOLS}/config/config-dist ${SPEECHTOOLS}/config/config && \ - ${CHMOD} u+w ${SPEECHTOOLS}/config/config - ${CP} ${FESTIVAL}/config/config-dist ${FESTIVAL}/config/config && \ - ${CHMOD} u+w ${FESTIVAL}/config/config - -post-patch: - ${CP} ${FILESDIR}/top-Makefile ${WRKSRC}/Makefile - ${CP} ${FILESDIR}/FreeBSD.mak ${SPEECHTOOLS}/config/systems/FreeBSD.mak - ${CP} ${SPEECHTOOLS}/config/systems/ix86_FreeBSD3.3.mak \ - ${SPEECHTOOLS}/config/systems/ix86_FreeBSD3.4.mak - ${CP} ${SPEECHTOOLS}/config/systems/ix86_FreeBSD3.3.mak \ - ${SPEECHTOOLS}/config/systems/ix86_FreeBSD3.5.mak - ${CP} ${SPEECHTOOLS}/config/systems/ix86_FreeBSD4.0.mak \ - ${SPEECHTOOLS}/config/systems/ix86_FreeBSD4.1.mak - ${CP} ${SPEECHTOOLS}/config/systems/ix86_FreeBSD4.0.mak \ - ${SPEECHTOOLS}/config/systems/ix86_FreeBSD5.0.mak - -do-install: - ${MKDIR} ${FHOME} - ${CHMOD} -R u+w,a+r,og-w ${FESTIVAL}/lib - ${FIND} ${FESTIVAL}/lib -type d -print0| xargs -0 ${CHMOD} 755 - cd ${FESTIVAL} && ${CP} -pPR lib examples ${FHOME} - ${RM} -rf ${FHOME}/lib/etc/*FreeBSD* - ${INSTALL_PROGRAM} ${FESTIVAL}/lib/etc/*FreeBSD*/audsp ${PREFIX}/libexec - ${INSTALL_PROGRAM} ${FESTIVAL}/src/main/festival ${PREFIX}/libexec/festival.naked - ${INSTALL_PROGRAM} ${FESTIVAL}/src/main/festival_client ${PREFIX}/libexec/festival_client.naked - for n in festival.sh festival_client.sh sitevars.scm; \ - do {\ - ${SED} "s%@PKG_FESTIVAL_LOCATION@%${FHOME}%; \ - s%@PKG_PREFIX@%${PREFIX}%" <${FILESDIR}/$$n > ${WRKDIR}/$$n ;} \ - done - ${INSTALL_SCRIPT} ${WRKDIR}/festival.sh ${PREFIX}/bin/festival - ${INSTALL_SCRIPT} ${WRKDIR}/festival_client.sh ${PREFIX}/bin/festival_client - ${INSTALL_DATA} ${WRKDIR}/sitevars.scm ${FHOME}/lib/sitevars.scm - ${INSTALL_MAN} ${FESTIVAL}/doc/festival.1 ${PREFIX}/man/man1/festival.1 - ${INSTALL_MAN} ${FESTIVAL}/doc/festival_client.1 ${PREFIX}/man/man1/festival_client.1 - -.include <bsd.port.mk> diff --git a/audio/festival+OGI/distinfo b/audio/festival+OGI/distinfo deleted file mode 100644 index 8df832e77811..000000000000 --- a/audio/festival+OGI/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -MD5 (festival/festival-1.4.1.tar.gz) = 1cf585adfd5f8f14a3eed71200c5cbde -MD5 (festival/speech_tools-1.2.1.tar.gz) = 4b77d63f202a410868cc79b5e0640b9b -MD5 (festival/OGIresLPC-2.0.4.tar.gz) = d9ef4871ae35bd750dfb649de8ec1728 -MD5 (festival/OGIfestpatch-1.4.1.tar.gz) = a94d02c9c6415d373e50536f6aeaeac4 diff --git a/audio/festival+OGI/files/FreeBSD.mak b/audio/festival+OGI/files/FreeBSD.mak deleted file mode 100644 index 26854d2f3cbf..000000000000 --- a/audio/festival+OGI/files/FreeBSD.mak +++ /dev/null @@ -1,15 +0,0 @@ -include $(EST)/config/systems/default.mak - -## echo -n doesn't work (well only sometimes ?) -ECHO_N = /usr/bin/printf "%s" - -NAWK=awk - -NAS_LIB=$(PKG_X11BASE)/lib -NAS_INCLUDE=$(PKG_X11BASE)/include - -X11_LIB=$(PKG_X11BASE)/lib -X11_INCLUDE=$(PKG_X11BASE)/include - -OS_INCLUDES+=-I$(PKG_PREFIX)/include -OS_LIBS+=-L$(PKG_PREFIX)/lib diff --git a/audio/festival+OGI/files/extra-patch-aa b/audio/festival+OGI/files/extra-patch-aa deleted file mode 100644 index e6072304c475..000000000000 --- a/audio/festival+OGI/files/extra-patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.2 1999/10/11 14:13:49 proff Exp $ - ---- festival/config/config Mon Oct 11 07:48:44 1999 -+++ festival/config/config Mon Oct 11 05:48:33 1999 -@@ -20,7 +20,7 @@ - ## You may need to set this explicitly if automounter or NFS - ## side effects cause problems - --FESTIVAL_HOME := $(shell (cd $(TOP); pwd)) -+FESTIVAL_HOME := $(PKG_FESTIVAL_HOME) - - ########################################################################### - ## Feature selection. diff --git a/audio/festival+OGI/files/extra-patch-aa-ogi b/audio/festival+OGI/files/extra-patch-aa-ogi deleted file mode 100644 index 5bd4cb84e40d..000000000000 --- a/audio/festival+OGI/files/extra-patch-aa-ogi +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aa,v 1.2 1999/10/11 14:13:49 proff Exp $ - ---- festival/config/config Mon Oct 11 07:48:44 1999 -+++ festival/config/config Mon Oct 11 05:48:33 1999 -@@ -20,7 +20,7 @@ - ## You may need to set this explicitly if automounter or NFS - ## side effects cause problems - --FESTIVAL_HOME := $(shell (cd $(TOP); pwd)) -+FESTIVAL_HOME := $(PKG_FESTIVAL_HOME) - - ########################################################################### - ## Feature selection. -@@ -70,3 +70,6 @@ - ## in config/configs/default.mak. - - -+ALSO_INCLUDE += OGIcommon -+ALSO_INCLUDE += OGIdbase -+ALSO_INCLUDE += OGIresLPC diff --git a/audio/festival+OGI/files/festival.sh b/audio/festival+OGI/files/festival.sh deleted file mode 100644 index 6d606b8a44ee..000000000000 --- a/audio/festival+OGI/files/festival.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# path for audsp -PATH=@PKG_PREFIX@/libexec:$PATH -export PATH -exec festival.naked --libdir @PKG_FESTIVAL_LOCATION@/lib $* diff --git a/audio/festival+OGI/files/festival_client.sh b/audio/festival+OGI/files/festival_client.sh deleted file mode 100644 index fc4ba4c944b7..000000000000 --- a/audio/festival+OGI/files/festival_client.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -PATH=@PKG_PREFIX@/libexec:$PATH -export PATH -exec festival_client.naked @PKG_FESTIVAL_LOCATION@/lib $* diff --git a/audio/festival+OGI/files/patch-ab b/audio/festival+OGI/files/patch-ab deleted file mode 100644 index e8e939e1f994..000000000000 --- a/audio/festival+OGI/files/patch-ab +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ab,v 1.2 1999/10/11 14:13:49 proff Exp $ - ---- festival/doc/Makefile Thu Jun 17 20:29:54 1999 -+++ festival/doc/Makefile Mon Oct 11 06:06:35 1999 -@@ -44,7 +44,7 @@ - - EXAMPLE_TO_DOCUMENT= - --FESTIVAL=$(TOP)/bin/festival --libdir $(TOP)/lib -+FESTIVAL=$(TOP)/src/main/festival --libdir $(TOP)/lib - - # Include some of EST documentation. - DOCXX_EXTRA_FILES = -@@ -72,9 +72,9 @@ - %.1 : %.head %.options %.tail - cat $^ >$@ - %.options : $(TOP)/src/main/% -- $(TOP)/bin/$* -man_options >$@ -+ $(FESTIVAL)$* -man_options >$@ - %.options : $(TOP)/src/main/%.exe -- $(TOP)/bin/$* -man_options >$@ -+ $(FESTIVAL)$* -man_options >$@ - - festival.info: festival.texi festfunc.texi festvars.texi festfeat.texi - @ if [ ! -d info ] ; \ diff --git a/audio/festival+OGI/files/patch-ac b/audio/festival+OGI/files/patch-ac deleted file mode 100644 index 628ef33f0d22..000000000000 --- a/audio/festival+OGI/files/patch-ac +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ac,v 1.2 1999/10/11 14:13:49 proff Exp $ - ---- festival/examples/benchmark Thu Feb 27 00:47:45 1997 -+++ festival/examples/benchmark Mon Oct 11 05:41:14 1999 -@@ -1,6 +1,6 @@ - #!/bin/sh - --default_libdir="/projects/festival/lib" -+default_libdir="$FESTIVAL_HOME/lib" - - while true - do -@@ -15,9 +15,9 @@ - esac - done - --text=${1-"$HOME/projects/festival/examples/benchmark.text"} -+text=${1-"$FESTIVAL_HOME/examples/benchmark.text"} - --for i in . src/main ../src/main $HOME/projects/festival/src/main /cstr/bin -+for i in . src/main ../src/main $FESTIVAL_HOME/src/main - do - if [ -n "$festival" ] - then diff --git a/audio/festival+OGI/files/patch-ad b/audio/festival+OGI/files/patch-ad deleted file mode 100644 index 31e40bb6e906..000000000000 --- a/audio/festival+OGI/files/patch-ad +++ /dev/null @@ -1,33 +0,0 @@ ---- speech_tools/config/config.orig Thu Nov 18 19:10:29 1999 -+++ speech_tools/config/config Fri Jun 16 17:03:16 2000 -@@ -15,7 +15,7 @@ - ## You may need to set this explicitly if automounter or NFS - ## side effects cause problems - --EST_HOME := $(shell (cd $(EST); pwd)) -+EST_HOME := $(PKG_EST_HOME) - - ########################################################################### - ## System type. -@@ -77,10 +77,10 @@ - ## specify a program to play files in a desired format. - - ## NCD's network audio system, This is recommended. --# INCLUDE_MODULES += NAS_AUDIO -+INCLUDE_MODULES += NAS_AUDIO - - ## Elightenment Sound Demon, for KDE etc. --# INCLUDE_MODULES += ESD_AUDIO -+INCLUDE_MODULES += ESD_AUDIO - - ## Native audio for your platform (sun, linux, freebsd, irix, windows) - INCLUDE_MODULES += NATIVE_AUDIO -@@ -95,7 +95,7 @@ - INCLUDE_MODULES += EDITLINE - - # speech recognition --#INCLUDE_MODULES += ASR -+INCLUDE_MODULES += ASR - - - ## Scheme diff --git a/audio/festival+OGI/files/patch-ae b/audio/festival+OGI/files/patch-ae deleted file mode 100644 index ac4d747da708..000000000000 --- a/audio/festival+OGI/files/patch-ae +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ae,v 1.2 1999/10/11 14:13:49 proff Exp $ - ---- speech_tools/include/EST_unix.h Sun May 30 20:53:04 1999 -+++ speech_tools/include/EST_unix.h Mon Oct 11 05:40:15 1999 -@@ -53,6 +53,7 @@ - # include <sys/wait.h> - # include <sys/resource.h> - # include <dirent.h> -+# define unix 1 - #elif defined(SYSTEM_IS_WIN32) - # include <io.h> - # include "win32/EST_unix_win32.h" diff --git a/audio/festival+OGI/files/patch-af b/audio/festival+OGI/files/patch-af deleted file mode 100644 index 63a2742d378d..000000000000 --- a/audio/festival+OGI/files/patch-af +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-af,v 1.1 1999/10/11 14:13:49 proff Exp $ - ---- festival/config/project.mak-dist Mon Oct 11 21:41:08 1999 -+++ festival/config/project.mak Mon Oct 11 22:27:37 1999 -@@ -70,8 +70,8 @@ - - # Place where programs are compiled - --PROJECT_MAIN_DIR=$(FESTIVAL_HOME)/src/main --PROJECT_SCRIPTS_DIR=$(FESTIVAL_HOME)/src/scripts -+PROJECT_MAIN_DIR=$(PKG_FESTIVAL_BUILD_HOME)/src/main -+PROJECT_SCRIPTS_DIR=$(PKG_FESTIVAL_BUILD_HOME)/src/scripts - - # Where the main RCS tree is, probably only used within CSTR - diff --git a/audio/festival+OGI/files/patch-ag b/audio/festival+OGI/files/patch-ag deleted file mode 100644 index 528356470d10..000000000000 --- a/audio/festival+OGI/files/patch-ag +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2000/05/05 20:54:57 hubertf Exp $ - ---- speech_tools/config/modules/nas_audio.mak.orig Fri May 5 20:55:15 2000 -+++ speech_tools/config/modules/nas_audio.mak Fri May 5 20:58:07 2000 -@@ -45,6 +45,6 @@ - AUDIO_DEFINES += -DSUPPORT_NAS - AUDIO_INCLUDES += -I$(NAS_INCLUDE) - MODULE_LIBS += -L$(NAS_LIB) -laudio --MODULE_EXTRA_LIBS += -L$(X11_LIB) -lX11 -lXt -+MODULE_EXTRA_LIBS += -L$(X11_LIB) -Wl,-R $(X11_LIB) -lX11 -lXt - - diff --git a/audio/festival+OGI/files/patch-ah b/audio/festival+OGI/files/patch-ah deleted file mode 100644 index 090c337db539..000000000000 --- a/audio/festival+OGI/files/patch-ah +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2000/05/05 20:54:57 hubertf Exp $ - ---- festival/config/modules/nas_audio.mak.orig Fri May 5 21:07:15 2000 -+++ festival/config/modules/nas_audio.mak Fri May 5 21:07:29 2000 -@@ -44,6 +44,6 @@ - - AUDIO_DEFINES += -DSUPPORT_NAS - AUDIO_INCLUDES += -I$(NAS_INCLUDE) --MODULE_LIBS += -L$(NAS_LIB) -laudio -L$(X11_LIB) -lX11 -lXt -+MODULE_LIBS += -L$(NAS_LIB) -laudio -L$(X11_LIB) -Wl,-R$(X11_LIB) -lX11 -lXt - - diff --git a/audio/festival+OGI/files/patch-ai b/audio/festival+OGI/files/patch-ai deleted file mode 100644 index a20edf01ef03..000000000000 --- a/audio/festival+OGI/files/patch-ai +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2000/05/31 14:51:16 dmcmahill Exp $ - -work around pmax compiler bug - ---- speech_tools/grammar/ngram/Makefile.orig Sun May 30 06:59:41 1999 -+++ speech_tools/grammar/ngram/Makefile Tue May 30 12:41:32 2000 -@@ -49,3 +49,10 @@ - include $(TOP)/config/common_make_rules - -+ifeq ($(MACHINETYPE),pmax) -+ -+ngrammar_io.o: ngrammar_io.cc -+ ${CXX} -c -fno-implicit-templates -fguiding-decls -Wall -I../../include ${OS_INCLUDES} ngrammar_io.cc -+ -+endif -+ - diff --git a/audio/festival+OGI/files/patch-al b/audio/festival+OGI/files/patch-al deleted file mode 100644 index 40bc2e8906ab..000000000000 --- a/audio/festival+OGI/files/patch-al +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-al,v 1.1 2000/05/31 14:51:17 dmcmahill Exp $ - -work around pmax compiler bug - ---- festival/src/modules/Duration/Makefile.orig Sun May 30 08:07:31 1999 -+++ festival/src/modules/Duration/Makefile Wed May 31 09:22:01 2000 -@@ -51,3 +51,9 @@ - include $(TOP)/config/common_make_rules - -+ifeq ($(MACHINETYPE),pmax) -+ -+duration.o:duration.cc -+ ${CXX} -c -fno-implicit-templates -fguiding-decls -Wall -I../include -I../../../src/include -I../../../../speech_tools/include ${OS_INCLUDES} duration.cc -+ -+endif - diff --git a/audio/festival+OGI/files/patch-am b/audio/festival+OGI/files/patch-am deleted file mode 100644 index 3cd79202f9d1..000000000000 --- a/audio/festival+OGI/files/patch-am +++ /dev/null @@ -1,13 +0,0 @@ -passing `int *' as argument 3 of `accept(int, sockaddr *, socklen_t *)' changes signedness - ---- speech_tools/utils/EST_Server.cc.orig Thu Nov 18 23:14:51 1999 -+++ speech_tools/utils/EST_Server.cc Sun Jun 11 17:27:17 2000 -@@ -647,7 +647,7 @@ - - while (connected() && - (csocket = accept(p_socket, (struct sockaddr *) &sin, -- SOCKLEN_CAST &sin_size))>=0) -+ (socklen_t *) &sin_size))>=0) - { - if (p_trace) - *p_trace << "connection " << csocket << "\n"; diff --git a/audio/festival+OGI/files/patch-an b/audio/festival+OGI/files/patch-an deleted file mode 100644 index 405e46cffbff..000000000000 --- a/audio/festival+OGI/files/patch-an +++ /dev/null @@ -1,13 +0,0 @@ -passing `int *' as argument 3 of `getsockname(int, sockaddr *, socklen_t *)' changes signedness - ---- speech_tools/utils/EST_ServiceTable.cc.orig Thu Nov 18 23:15:21 1999 -+++ speech_tools/utils/EST_ServiceTable.cc Sun Jun 11 17:28:29 2000 -@@ -296,7 +296,7 @@ - - // This only gets the port number - -- if (getsockname(socket, (struct sockaddr *)&sin, SOCKLEN_CAST &size) != 0) -+ if (getsockname(socket, (struct sockaddr *)&sin, (socklen_t *) &size) != 0) - EST_sys_error("Can't find my address"); - - diff --git a/audio/festival+OGI/files/patch-ao b/audio/festival+OGI/files/patch-ao deleted file mode 100644 index 73b77083ebf9..000000000000 --- a/audio/festival+OGI/files/patch-ao +++ /dev/null @@ -1,13 +0,0 @@ -passing `int *' as argument 3 of `getpeername(int, sockaddr *, socklen_t *)' changes signedness - ---- ./festival/src/arch/festival/server.cc.orig Thu Nov 18 23:46:47 1999 -+++ ./festival/src/arch/festival/server.cc Sun Jun 11 17:48:45 2000 -@@ -206,7 +206,7 @@ - const char *client_hostnum; - const char *reason = ""; - -- getpeername(fd,(struct sockaddr *)&peer,SOCKLEN_CAST &addrlen); -+ getpeername(fd,(struct sockaddr *)&peer, (socklen_t *) &addrlen); - clienthost = gethostbyaddr((char *)&peer.sin_addr, - sizeof(peer.sin_addr),AF_INET); - client_hostnum = inet_ntoa(peer.sin_addr); diff --git a/audio/festival+OGI/files/patch-ap b/audio/festival+OGI/files/patch-ap deleted file mode 100644 index 0794c74870f9..000000000000 --- a/audio/festival+OGI/files/patch-ap +++ /dev/null @@ -1,12 +0,0 @@ ---- speech_tools/audio/nas.cc.orig Thu Oct 14 16:26:29 1999 -+++ speech_tools/audio/nas.cc Fri Jun 16 17:24:25 2000 -@@ -57,7 +57,8 @@ - - int nas_supported = TRUE; - --int endian_int = 1; -+extern int endian_int; -+int endian_int = 1; - #define NAS_BIG_ENDIAN (((char *)&endian_int)[0] == 0) - - static void na_sync_play_cb(AuServer *aud, AuEventHandlerRec *handler, diff --git a/audio/festival+OGI/files/patch-aq b/audio/festival+OGI/files/patch-aq deleted file mode 100644 index 012bfe0c9817..000000000000 --- a/audio/festival+OGI/files/patch-aq +++ /dev/null @@ -1,10 +0,0 @@ ---- speech_tools/audio/esd.cc.orig Mon Oct 4 15:39:01 1999 -+++ speech_tools/audio/esd.cc Fri Jun 16 17:49:10 2000 -@@ -66,7 +66,6 @@ - - bool esd_supported = TRUE; - --int endian_int = 1; - #define ESD_BIG_ENDIAN (((char *)&endian_int)[0] == 0) - - EST_String server; diff --git a/audio/festival+OGI/files/sitevars.scm b/audio/festival+OGI/files/sitevars.scm deleted file mode 100644 index e80dbfa1c73c..000000000000 --- a/audio/festival+OGI/files/sitevars.scm +++ /dev/null @@ -1,2 +0,0 @@ -(set! system-voice-path '("@PKG_FESTIVAL_LOCATION@/lib/voices")) -(set! sgml_parse_progname "nsgmls") diff --git a/audio/festival+OGI/files/top-Makefile b/audio/festival+OGI/files/top-Makefile deleted file mode 100644 index ee190c4fe49e..000000000000 --- a/audio/festival+OGI/files/top-Makefile +++ /dev/null @@ -1,3 +0,0 @@ -all: - cd speech_tools && $(MAKE) - cd festival && $(MAKE) diff --git a/audio/festival+OGI/pkg-comment b/audio/festival+OGI/pkg-comment deleted file mode 100644 index b7749a368efd..000000000000 --- a/audio/festival+OGI/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -Festival is an advanced multi-lingual speech synthesis system diff --git a/audio/festival+OGI/pkg-descr b/audio/festival+OGI/pkg-descr deleted file mode 100644 index 6bc4fe4096dd..000000000000 --- a/audio/festival+OGI/pkg-descr +++ /dev/null @@ -1,19 +0,0 @@ -from the authors: - -The Festival Speech Synthesis System is a general multi-lingual -text-to-speech system for Unix platforms. It is written in C++ and -includes a Scheme-based scripting language. Included with Festival -are lexicons and voices that together form a whole text-to-speech -system. - -For output via esd do: - - (Parameter.set 'Audio_Method 'esdaudio) - -NAS and direct output are documented in section 23 of the users' -manual. - -WWW: http://www.cstr.ed.ac.uk/projects/festival.html - -Trevor Johnson -trevor@jpj.net diff --git a/audio/festival+OGI/pkg-message b/audio/festival+OGI/pkg-message deleted file mode 100644 index 8043e6681d28..000000000000 --- a/audio/festival+OGI/pkg-message +++ /dev/null @@ -1,6 +0,0 @@ -************************************************************************** -* You need to install at least one festvox-* package before festival can * -* do anything other than mumble silently to itself. See the festival * -* package description, the festdoc package (share/doc/festival/*), * -* or the festival home page for more information. * -************************************************************************** diff --git a/audio/festival+OGI/pkg-plist b/audio/festival+OGI/pkg-plist deleted file mode 100644 index 2c09eec7fd37..000000000000 --- a/audio/festival+OGI/pkg-plist +++ /dev/null @@ -1,109 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 1999/10/27 14:20:50 hubertf Exp $ -bin/festival -bin/festival_client -libexec/festival.naked -libexec/festival_client.naked -libexec/audsp -share/festival/lib/Makefile -share/festival/lib/VCLocalRules -share/festival/lib/mrpa_phones.scm -share/festival/lib/mrpa_allophones.scm -share/festival/lib/radio_phones.scm -share/festival/lib/holmes_phones.scm -share/festival/lib/darpa_phones.scm -share/festival/lib/phoneset.scm -share/festival/lib/mrpa_durs.scm -share/festival/lib/klatt_durs.scm -share/festival/lib/gswdurtreeZ.scm -share/festival/lib/f2bdurtreeZ.scm -share/festival/lib/tobi.scm -share/festival/lib/f2bf0lr.scm -share/festival/lib/tobi_rules.scm -share/festival/lib/tilt.scm -share/festival/lib/sec.ts20.quad.ngrambin -share/festival/lib/sec.B.hept.ngrambin -share/festival/lib/init.scm -share/festival/lib/synthesis.scm -share/festival/lib/module_description.scm -share/festival/lib/lexicons.scm -share/festival/lib/festival.scm -share/festival/lib/intonation.scm -share/festival/lib/duration.scm -share/festival/lib/pos.scm -share/festival/lib/phrase.scm -share/festival/lib/voices.scm -share/festival/lib/tts.scm -share/festival/lib/festdoc.scm -share/festival/lib/languages.scm -share/festival/lib/token.scm -share/festival/lib/mbrola.scm -share/festival/lib/display.scm -share/festival/lib/postlex.scm -share/festival/lib/tokenpos.scm -share/festival/lib/festtest.scm -share/festival/lib/cslush.scm -share/festival/lib/cart_aux.scm -share/festival/lib/pauses.scm -share/festival/lib/scfg.scm -share/festival/lib/mettree.scm -share/festival/lib/java.scm -share/festival/lib/lts.scm -share/festival/lib/engmorph.scm -share/festival/lib/engmorphsyn.scm -share/festival/lib/lts_build.scm -share/festival/lib/Sable.v0_2.dtd -share/festival/lib/sable-latin.ent -share/festival/lib/festival.el -share/festival/lib/scfg_wsj_wp20.gram -share/festival/lib/speech.properties -share/festival/lib/email-mode.scm -share/festival/lib/ogimarkup-mode.scm -share/festival/lib/sable-mode.scm -share/festival/lib/soleml-mode.scm -share/festival/lib/etc/Makefile -share/festival/lib/etc/email_filter -@dirrm share/festival/lib/etc -share/festival/lib/siod.scm -share/festival/lib/web.scm -share/festival/lib/cstr.scm -share/festival/lib/fringe.scm -share/festival/lib/sitevars.scm -@dirrm share/festival/lib -share/festival/examples/Makefile -share/festival/examples/webdemo.scm -share/festival/examples/ex1.email -share/festival/examples/ex1.ogi -share/festival/examples/example.sable -share/festival/examples/example2.sable -share/festival/examples/tobi.stml -share/festival/examples/example.th -share/festival/examples/intro.text -share/festival/examples/spintro.text -share/festival/examples/benchmark.text -share/festival/examples/saytime.sh -share/festival/examples/speech_pm_1.0.tar -share/festival/examples/text2pos.sh -share/festival/examples/latest.sh -share/festival/examples/scfg_parse_text.sh -share/festival/examples/text2wave.sh -share/festival/examples/make_utts.sh -share/festival/examples/dumpfeats.sh -share/festival/examples/durmeanstd.sh -share/festival/examples/benchmark -share/festival/examples/festival_client.pl -share/festival/examples/toksearch.scm -share/festival/examples/th-mode.scm -share/festival/examples/addr-mode.scm -share/festival/examples/festival_client.c -share/festival/examples/festival_client.h -share/festival/examples/benchmark.orig -share/festival/examples/saytime -share/festival/examples/text2pos -share/festival/examples/latest -share/festival/examples/scfg_parse_text -share/festival/examples/text2wave -share/festival/examples/make_utts -share/festival/examples/dumpfeats -share/festival/examples/durmeanstd -@dirrm share/festival/examples -@dirrm share/festival diff --git a/audio/festival+OGI/pkg-plist-ogi b/audio/festival+OGI/pkg-plist-ogi deleted file mode 100644 index d039fc7dd72e..000000000000 --- a/audio/festival+OGI/pkg-plist-ogi +++ /dev/null @@ -1,121 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 1999/10/27 14:20:50 hubertf Exp $ -bin/festival -bin/festival_client -libexec/festival.naked -libexec/festival_client.naked -libexec/audsp -share/festival/lib/ogi_gswdurtreeZ_wb.scm -share/festival/lib/ogi_hack.scm -share/festival/lib/ogi_kddurtreeZ_wb.scm -share/festival/lib/ogi_klatt_durs_wb.scm -share/festival/lib/ogi_languages.scm -share/festival/lib/ogi_lexicons.scm -share/festival/lib/ogi_lts_worldbet.scm -share/festival/lib/ogi_phrase.scm -share/festival/lib/ogi_postlex.scm -share/festival/lib/ogi_synthesis.scm -share/festival/lib/ogi_unitsel.scm -share/festival/lib/ogi_worldbet_phones.scm -share/festival/lib/Makefile -share/festival/lib/VCLocalRules -share/festival/lib/mrpa_phones.scm -share/festival/lib/mrpa_allophones.scm -share/festival/lib/radio_phones.scm -share/festival/lib/holmes_phones.scm -share/festival/lib/darpa_phones.scm -share/festival/lib/phoneset.scm -share/festival/lib/mrpa_durs.scm -share/festival/lib/klatt_durs.scm -share/festival/lib/gswdurtreeZ.scm -share/festival/lib/f2bdurtreeZ.scm -share/festival/lib/tobi.scm -share/festival/lib/f2bf0lr.scm -share/festival/lib/tobi_rules.scm -share/festival/lib/tilt.scm -share/festival/lib/sec.ts20.quad.ngrambin -share/festival/lib/sec.B.hept.ngrambin -share/festival/lib/init.scm -share/festival/lib/synthesis.scm -share/festival/lib/module_description.scm -share/festival/lib/lexicons.scm -share/festival/lib/festival.scm -share/festival/lib/intonation.scm -share/festival/lib/duration.scm -share/festival/lib/pos.scm -share/festival/lib/phrase.scm -share/festival/lib/voices.scm -share/festival/lib/tts.scm -share/festival/lib/festdoc.scm -share/festival/lib/languages.scm -share/festival/lib/token.scm -share/festival/lib/mbrola.scm -share/festival/lib/display.scm -share/festival/lib/postlex.scm -share/festival/lib/tokenpos.scm -share/festival/lib/festtest.scm -share/festival/lib/cslush.scm -share/festival/lib/cart_aux.scm -share/festival/lib/pauses.scm -share/festival/lib/scfg.scm -share/festival/lib/mettree.scm -share/festival/lib/java.scm -share/festival/lib/lts.scm -share/festival/lib/engmorph.scm -share/festival/lib/engmorphsyn.scm -share/festival/lib/lts_build.scm -share/festival/lib/Sable.v0_2.dtd -share/festival/lib/sable-latin.ent -share/festival/lib/festival.el -share/festival/lib/scfg_wsj_wp20.gram -share/festival/lib/speech.properties -share/festival/lib/email-mode.scm -share/festival/lib/ogimarkup-mode.scm -share/festival/lib/sable-mode.scm -share/festival/lib/soleml-mode.scm -share/festival/lib/etc/Makefile -share/festival/lib/etc/email_filter -@dirrm share/festival/lib/etc -share/festival/lib/siod.scm -share/festival/lib/web.scm -share/festival/lib/cstr.scm -share/festival/lib/fringe.scm -share/festival/lib/sitevars.scm -@dirrm share/festival/lib -share/festival/examples/Makefile -share/festival/examples/webdemo.scm -share/festival/examples/ex1.email -share/festival/examples/ex1.ogi -share/festival/examples/example.sable -share/festival/examples/example2.sable -share/festival/examples/tobi.stml -share/festival/examples/example.th -share/festival/examples/intro.text -share/festival/examples/spintro.text -share/festival/examples/benchmark.text -share/festival/examples/saytime.sh -share/festival/examples/speech_pm_1.0.tar -share/festival/examples/text2pos.sh -share/festival/examples/latest.sh -share/festival/examples/scfg_parse_text.sh -share/festival/examples/text2wave.sh -share/festival/examples/make_utts.sh -share/festival/examples/dumpfeats.sh -share/festival/examples/durmeanstd.sh -share/festival/examples/benchmark -share/festival/examples/festival_client.pl -share/festival/examples/toksearch.scm -share/festival/examples/th-mode.scm -share/festival/examples/addr-mode.scm -share/festival/examples/festival_client.c -share/festival/examples/festival_client.h -share/festival/examples/benchmark.orig -share/festival/examples/saytime -share/festival/examples/text2pos -share/festival/examples/latest -share/festival/examples/scfg_parse_text -share/festival/examples/text2wave -share/festival/examples/make_utts -share/festival/examples/dumpfeats -share/festival/examples/durmeanstd -@dirrm share/festival/examples -@dirrm share/festival diff --git a/audio/gkrellmms2/Makefile b/audio/gkrellmms2/Makefile deleted file mode 100644 index 016234e54414..000000000000 --- a/audio/gkrellmms2/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# New ports collection makefile for: gkrellmms -# Date Created: Jun 22 2000 -# Whom: Hajimu UMEMOTO <ume@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= gkrellmms -PORTVERSION= 0.5.4 -CATEGORIES= audio -MASTER_SITES= http://gkrellm.luon.net/files/ - -MAINTAINER= ume@FreeBSD.org - -LIB_DEPENDS= xmms.1:${PORTSDIR}/audio/xmms \ - gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - gdk_imlib.5:${PORTSDIR}/graphics/imlib -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm -RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm - -USE_X_PREFIX= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" - -WRKSRC= ${WRKDIR}/${PORTNAME} - -.include <bsd.port.mk> diff --git a/audio/gkrellmms2/distinfo b/audio/gkrellmms2/distinfo deleted file mode 100644 index fbec9e863e47..000000000000 --- a/audio/gkrellmms2/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (gkrellmms-0.5.4.tar.gz) = a2cbe4fc0d5cfc667b35b44e8fd6d927 diff --git a/audio/gkrellmms2/files/patch-aa b/audio/gkrellmms2/files/patch-aa deleted file mode 100644 index 37269971b91d..000000000000 --- a/audio/gkrellmms2/files/patch-aa +++ /dev/null @@ -1,40 +0,0 @@ -Index: Makefile -diff -u Makefile.orig Makefile ---- Makefile.orig Sun Jul 2 01:45:19 2000 -+++ Makefile Fri Sep 15 03:30:01 2000 -@@ -3,27 +3,27 @@ - # You may want to rename the binary-file. - BIN_FILENAME = gkrellmms - --GTK_INCLUDE = `gtk-config --cflags` --GTK_LIB = `gtk-config --libs` -+GTK_INCLUDE = `$(GTK_CONFIG) --cflags gthread` -+GTK_LIB = `$(GTK_CONFIG) --libs gthread` - IMLIB_INCLUDE = `imlib-config --cflags-gdk` - IMLIB_LIB = `imlib-config --libs-gdk` - --FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) -+CFLAGS += -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) - LIBS = $(GTK_LIB) $(IMLIB_LIB) --LFLAGS = -shared -lpthread -lxmms -- --CC = gcc $(CFLAGS) $(FLAGS) -+LFLAGS = -shared -lxmms - - OBJS = gkrellmms.o options.o playlist.o - -+all: $(BIN_FILENAME).so -+ - $(BIN_FILENAME).so: $(OBJS) -- $(CC) $(OBJS) -o $(BIN_FILENAME).so $(LFLAGS) $(LIBS) -+ $(CC) $(CFLAGS) $(OBJS) -o $(BIN_FILENAME).so $(LFLAGS) $(LIBS) - - clean: - rm -f *.o core *.so* *.bak *~ - - install: -- install -c -s -m 755 $(BIN_FILENAME).so /usr/share/gkrellm/plugins -+ install -c -s -m 755 $(BIN_FILENAME).so $(PREFIX)/libexec/gkrellm/plugins - - gkrellmms.c.o: gkrellmms.c - options.c.o: options.c diff --git a/audio/gkrellmms2/pkg-comment b/audio/gkrellmms2/pkg-comment deleted file mode 100644 index 56dcd6eb69af..000000000000 --- a/audio/gkrellmms2/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -GKrellM XMMS Plugin diff --git a/audio/gkrellmms2/pkg-descr b/audio/gkrellmms2/pkg-descr deleted file mode 100644 index a236c27de607..000000000000 --- a/audio/gkrellmms2/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -GKrellM XMMS Plugin -Author: Sander Klein Lebbink <sander@cerberus.demon.nl> -WWW: http://gkrellm.luon.net/gkrellmms.phtml - -A plugin for GKrellM, which allows you to control XMMS from within GKrellM. - - -- Hajimu UMEMOTO <ume@FreeBSD.org> diff --git a/audio/gkrellmms2/pkg-plist b/audio/gkrellmms2/pkg-plist deleted file mode 100644 index 49ff34de4ca0..000000000000 --- a/audio/gkrellmms2/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -libexec/gkrellm/plugins/xmms.so diff --git a/audio/gkrellmvolume2/Makefile b/audio/gkrellmvolume2/Makefile deleted file mode 100644 index 9fae04f040d0..000000000000 --- a/audio/gkrellmvolume2/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# New ports collection makefile for: gkrellmvolume -# Date Created: Jun 22 2000 -# Whom: Hajimu UMEMOTO <ume@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= gkrellmvolume -PORTVERSION= 0.6 -CATEGORIES= audio -MASTER_SITES= http://gkrellm.luon.net/files/ -DISTNAME= volume-${PORTVERSION} - -MAINTAINER= ume@FreeBSD.org - -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - gdk_imlib.5:${PORTSDIR}/graphics/imlib -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm -RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -USE_X_PREFIX= yes -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" - -.include <bsd.port.mk> diff --git a/audio/gkrellmvolume2/distinfo b/audio/gkrellmvolume2/distinfo deleted file mode 100644 index a0b678e18627..000000000000 --- a/audio/gkrellmvolume2/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (volume-0.6.tar.gz) = 68de87480dfdd8c84c11e148640421d7 diff --git a/audio/gkrellmvolume2/files/patch-aa b/audio/gkrellmvolume2/files/patch-aa deleted file mode 100644 index 0815a07610c9..000000000000 --- a/audio/gkrellmvolume2/files/patch-aa +++ /dev/null @@ -1,53 +0,0 @@ -Index: Makefile -diff -u Makefile.orig Makefile ---- Makefile.orig Thu Jun 15 21:02:13 2000 -+++ Makefile Tue Jun 27 00:34:00 2000 -@@ -1,15 +1,15 @@ - # Makefile for GKrellM volume plugin - - # Linux --GTK_CONFIG = gtk-config --SYSLIB = -lpthread -+#GTK_CONFIG = gtk-config -+#SYSLIB = -lpthread - - # FreeBSD - #GTK_CONFIG = gtk12-config - #SYSLIB = - --PLUGIN_DIR = /usr/share/gkrellm/plugins --GKRELLM_INCLUDE = -I/usr/local/include -+PLUGIN_DIR = $(PREFIX)/libexec/gkrellm/plugins -+GKRELLM_INCLUDE = -I$(PREFIX)/include - - GTK_INCLUDE = `$(GTK_CONFIG) --cflags` - GTK_LIB = `$(GTK_CONFIG) --libs` -@@ -17,12 +17,10 @@ - IMLIB_INCLUDE = `imlib-config --cflags-gdk` - IMLIB_LIB = `imlib-config --libs-gdk` - --FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE) -+CFLAGS += -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE) - LIBS = $(GTK_LIB) $(IMLIB_LIB) $(SYSLIB) - LFLAGS = -shared - --CC = gcc $(CFLAGS) $(FLAGS) -- - INSTALL = install -c - INSTALL_PROGRAM = $(INSTALL) -s - -@@ -34,12 +32,13 @@ - make GTK_CONFIG=gtk12-config SYSLIB= all - - volume.so: $(OBJS) -- $(CC) $(OBJS) -o volume.so $(LIBS) $(LFLAGS) -+ $(CC) $(CFLAGS) $(OBJS) -o volume.so $(LFLAGS) $(LIBS) - - clean: - rm -f *.o core *.so* *.bak *~ - - install: -+ mkdir -p $(PLUGIN_DIR) - $(INSTALL_PROGRAM) volume.so $(PLUGIN_DIR) - - volume.c.o: volume.c diff --git a/audio/gkrellmvolume2/pkg-comment b/audio/gkrellmvolume2/pkg-comment deleted file mode 100644 index 0f65f28536d7..000000000000 --- a/audio/gkrellmvolume2/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -GKrellM volume plugin diff --git a/audio/gkrellmvolume2/pkg-descr b/audio/gkrellmvolume2/pkg-descr deleted file mode 100644 index 846ebc2fc426..000000000000 --- a/audio/gkrellmvolume2/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -GKrellM volume plugin -Author: Sjoerd Simons <Sjoerd@donald-duck.ele.tue.nl> -WWW: http://gkrellm.luon.net/volume.phtml - -A plugin for GKrellM, that let's you control your mixer.. - - -- Hajimu UMEMOTO <ume@FreeBSD.org> diff --git a/audio/gkrellmvolume2/pkg-plist b/audio/gkrellmvolume2/pkg-plist deleted file mode 100644 index df108a97623d..000000000000 --- a/audio/gkrellmvolume2/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -libexec/gkrellm/plugins/volume.so diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile deleted file mode 100644 index 0232dfb10729..000000000000 --- a/audio/gnome-audio/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# New ports collection makefile for: gnomeaudio -# Date created: 29 Dec 1998 -# Whom: Vanilla I. Shu <vanilla@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= gnomeaudio -PORTVERSION= 1.0.0 -CATEGORIES= audio gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/gnome-audio -DISTNAME= gnome-audio-${PORTVERSION} - -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 d669cae2653b..000000000000 --- a/audio/gnome-media/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# New ports collection makefile for: gnomemedia -# Date created: 20 January 1999 -# Whom: Jeremy Lea <reg@shale.csir.co.za> -# -# $FreeBSD$ -# - -PORTNAME= gnomemedia -PORTVERSION= 1.2.0 -CATEGORIES= audio gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/gnome-media -DISTNAME= gnome-media-${PORTVERSION} - -MAINTAINER= reg@FreeBSD.org - -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ - sox:${PORTSDIR}/audio/sox - -USE_X_PREFIX= yes -USE_GMAKE= yes -USE_LIBTOOL= yes -CONFIGURE_ARGS= --without-ncurses \ - --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" - -pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ - 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ - s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' - -.include <bsd.port.mk> diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo deleted file mode 100644 index 311191fc2cc0..000000000000 --- a/audio/gnome-media/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (gnome-media-1.2.0.tar.gz) = c7cda6054b47f71aa46aaabe9db6fb4c diff --git a/audio/gnome-media/files/patch-ac b/audio/gnome-media/files/patch-ac deleted file mode 100644 index 550d1e6d083c..000000000000 --- a/audio/gnome-media/files/patch-ac +++ /dev/null @@ -1,14 +0,0 @@ ---- cddbslave/Makefile.in.orig Wed May 24 14:53:10 2000 -+++ cddbslave/Makefile.in Tue May 30 15:13:02 2000 -@@ -139,3 +139,3 @@ - --gnomedatadir = $(datadir)/gnome -+gnomedatadir = $(datadir) - ---- tcd/Makefile.in.orig Wed May 24 14:53:16 2000 -+++ tcd/Makefile.in Tue May 30 15:12:38 2000 -@@ -147,3 +147,3 @@ - --tcd_LDADD = $(GNOME_LIBDIR) -lglib -lm $(CURSES_LIBS) $(INTLLIBS) -+tcd_LDADD = `$(GLIB_CONFIG) --libs` -lm $(CURSES_LIBS) $(INTLLIBS) - 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 b2878eb5521b..000000000000 --- a/audio/gnome-media/files/patch-ae +++ /dev/null @@ -1,789 +0,0 @@ ---- tcd/callbacks.c.orig Thu Jan 13 22:27:52 2000 -+++ tcd/callbacks.c Tue May 30 15:17:17 2000 -@@ -12,3 +12,3 @@ - { -- if(cd.sc.cdsc_audiostatus==CDROM_AUDIO_PAUSED) -+ if(SC_AUDIOSTATUS(cd.sc)==CDROM_AUDIO_PAUSED) - tcd_pausecd(&cd); -@@ -44,3 +44,3 @@ - /* SDH: Make sure play/pause state change is noticed */ -- cd.sc.cdsc_audiostatus = -1; -+ SC_AUDIOSTATUS(cd.sc) = -1; - if(cd.isplayable) ---- tcd/cddb.c.orig Thu Jan 13 22:27:52 2000 -+++ tcd/cddb.c Tue May 30 15:17:17 2000 -@@ -201,7 +201,7 @@ - -- 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]) ); - } -@@ -209,4 +209,4 @@ - 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])) ); - -@@ -247,6 +247,6 @@ - -- 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]))); - -@@ -259,4 +259,4 @@ - 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) -@@ -300,5 +300,5 @@ - { -- 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 Sun May 21 15:13:04 2000 -+++ tcd/gtcd.c Tue May 30 15:17:17 2000 -@@ -157,3 +157,7 @@ - cd.time_lock = TRUE; -+#ifdef TCD_BSD -+ ioctl(cd.cd_dev, CDIOCPAUSE); -+#else - ioctl(cd.cd_dev, CDROMPAUSE); -+#endif - -@@ -421,4 +425,4 @@ - 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; -@@ -524,3 +528,3 @@ - { -- switch( cd.sc.cdsc_audiostatus ) -+ switch( SC_AUDIOSTATUS(cd.sc) ) - { -@@ -620,4 +624,4 @@ - /* 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 ) - { -@@ -638,3 +642,3 @@ - { -- if(old_status != cd.sc.cdsc_audiostatus) -+ if(old_status != SC_AUDIOSTATUS(cd.sc)) - { -@@ -645,3 +649,3 @@ - -- old_status = cd.sc.cdsc_audiostatus; -+ old_status = SC_AUDIOSTATUS(cd.sc); - g_snprintf(tmp, 255, "tcd/%s.xpm", ---- tcd/gtracked.c.orig Sun May 21 15:13:05 2000 -+++ tcd/gtracked.c Tue May 30 15:17:17 2000 -@@ -211,4 +211,4 @@ - 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])); - ---- tcd/linux-cdrom.c.orig Thu Jan 13 22:27:52 2000 -+++ tcd/linux-cdrom.c Tue May 30 15:29:32 2000 -@@ -73,3 +73,3 @@ - --#if defined(TCD_CHANGER_ENABLED) -+#if defined(TCD_CHANGER_ENABLED) && !defined(TCD_BSD) - cd->nslots = ioctl( cd->cd_dev, CDROM_CHANGER_NSLOTS ); -@@ -116,4 +116,7 @@ - { -- int tmp,i; -+ int i; - int delsecs; -+#ifdef TCD_BSD -+ struct ioc_read_toc_single_entry tocentry; -+#endif - -@@ -127,3 +130,7 @@ - /* read the TOC header */ -+#ifdef TCD_BSD -+ if((ioctl( cd->cd_dev, CDIOREADTOCHEADER, &cd->tochdr))==-1) -+#else - if(ioctl( cd->cd_dev, CDROMREADTOCHDR, &cd->tochdr)) -+#endif - { -@@ -134,2 +141,5 @@ - cd->cddb_id = 0; -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - return(-1); -@@ -138,11 +148,25 @@ - /* 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 = 0xaa; /* 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)) == -1) -+#else - if(ioctl(cd->cd_dev, CDROMREADTOCENTRY, &cd->trk[C(cd->last_t+1)].toc)) -+#endif - { -@@ -154,4 +178,15 @@ - 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)]); - -@@ -160,6 +195,15 @@ - { -+#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)) == -1) -+#else - if(ioctl(cd->cd_dev, CDROMREADTOCENTRY, &cd->trk[C(i)].toc)) -+#endif - { -@@ -170,2 +214,5 @@ - cd->cddb_id = 0; -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - return(-1); -@@ -173,7 +220,12 @@ - -+#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)]); - } -@@ -184,6 +236,3 @@ - /* 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; - -@@ -206,3 +255,3 @@ - debug("cdrom.c: tcd_readtoc exiting normally\n" ); -- return tmp; -+ return 0; - } -@@ -216,5 +265,4 @@ - /* 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); - -@@ -237,4 +285,6 @@ - #ifdef TCD_CHANGER_ENABLED -+#ifndef TCD_BSD - cd->cur_disc = ioctl( cd->cd_dev, CDROM_SELECT_DISC, CDSL_CURRENT ); - #endif -+#endif - } -@@ -284,4 +334,16 @@ - { -+#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.track = 0; -+ subch.data = &(cd->sc); -+#else - cd->sc.cdsc_format = CDROM_MSF; -+#endif - -@@ -289,3 +351,7 @@ - { -+#ifdef TCD_BSD -+ if((ioctl( cd->cd_dev, CDIOCREADSUBCHANNEL, &subch)) == -1) -+#else - if(ioctl( cd->cd_dev, CDROMSUBCHNL, &cd->sc)) -+#endif - { -@@ -295,8 +361,21 @@ - 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); -@@ -307,8 +386,21 @@ - { -+#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; -@@ -320,2 +412,10 @@ - { -+#ifdef TCD_BSD -+ struct ioc_vol vol; -+ -+ if(ioctl(cd->cd_dev, CDIOCGETVOL, &vol) < 0) -+ return -1; -+ -+ return vol.vol[0]; -+#else - #ifdef CDROMVOLREAD -@@ -330,2 +430,3 @@ - #endif -+#endif - } -@@ -334,4 +435,30 @@ - { -+#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; -@@ -344,3 +471,3 @@ - { -- /* try and inject cd */ -+ /* try and eject cd */ - tcd_ejectcd(cd); -@@ -354,2 +481,5 @@ - -+#ifdef TCD_BSD -+ ioctl(cd->cd_dev, CDIOCCLOSE); -+#else - #if defined(CDROMCLOSETRAY) -@@ -358,9 +488,15 @@ - #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]); - -@@ -368,5 +504,5 @@ - { -- 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; - } -@@ -374,20 +510,20 @@ - { -- 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; - } -@@ -395,6 +531,11 @@ - } -- 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); -+ if(only_use_trkind || ioctl( cd->cd_dev, CDIOCPLAYMSF, &msf)) -+#else - if(ioctl( cd->cd_dev, CDROMPLAYMSF, &msf) || only_use_trkind) -+#endif - { -@@ -403,8 +544,12 @@ - /* 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 - { -@@ -413,2 +558,5 @@ - debug("cdrom.c: tcd_playtracks error. CDROMPLAYTRKIND ioctl error.\n"); -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - return -1; -@@ -422,21 +570,10 @@ - --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; - -@@ -447,41 +584,42 @@ - -- /* 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 - { -@@ -491,2 +629,5 @@ - debug("cdrom.c: tcd_play_seconds error. CDROMPLAYMSF ioctl error.\n" ); -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW ); -+#endif - return(-1); -@@ -507,3 +648,11 @@ - -+#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 - { -@@ -515,2 +664,5 @@ - { -+#ifdef TCD_BSD -+ tmp = ioctl( cd->cd_dev, CDIOCCLOSE ); -+#else - #ifdef CDROMCLOSETRAY -@@ -518,2 +670,7 @@ - #endif -+#endif -+ -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCPREVENT); -+#endif - -@@ -527,2 +684,5 @@ - -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - return(-1); -@@ -544,7 +704,15 @@ - /* 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 - { -@@ -566,5 +734,9 @@ - -- 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 - { -@@ -572,4 +744,10 @@ - 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; -@@ -578,3 +756,7 @@ - { -+#ifdef TCD_BSD -+ if((tmp=ioctl(cd->cd_dev, CDIOCPAUSE))) -+#else - if((tmp=ioctl(cd->cd_dev, CDROMPAUSE))) -+#endif - { -@@ -582,4 +764,10 @@ - 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; -@@ -591,2 +779,3 @@ - #ifdef TCD_CHANGER_ENABLED -+#ifndef TCD_BSD - int tmp; -@@ -599,6 +788,6 @@ - return tmp; --#else -+#endif -+#endif - debug("tcd_change_disc called, but changer support isn't compiled in. Ickyblah.\n" ); - return 0; --#endif - } ---- tcd/linux-cdrom.h.orig Thu Jan 13 22:27:52 2000 -+++ tcd/linux-cdrom.h Tue May 30 15:34:32 2000 -@@ -29,4 +29,16 @@ - #include <glib.h> --#if !defined(linux) && !defined(sun) && !defined(__sun__) --# error TCD only builds on linux and Solaris/SunOs -+#if !defined(linux) && !defined(sun) && !defined(__sun__) && !defined(__FreeBSD__) -+# error TCD only builds on Linux, Solaris, SunOS, and FreeBSD -+#endif -+ -+#ifdef __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 - #endif -@@ -128,3 +140,13 @@ - 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; -@@ -154,2 +176,14 @@ - -+#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 */ -@@ -158,2 +192,8 @@ - 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 */ ---- tcd/tcd.c.orig Thu Jan 13 22:27:52 2000 -+++ tcd/tcd.c Tue May 30 15:17:17 2000 -@@ -141,4 +141,4 @@ - 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 ) - { -@@ -172,3 +172,3 @@ - if(cd->isplayable) { -- if( cd->sc.cdsc_audiostatus == CDROM_AUDIO_PAUSED ) -+ if( SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PAUSED ) - tcd_pausecd(cd); -@@ -442,4 +442,4 @@ - mvwprintw(win,maxy-4,38,"%02u:%02u", -- cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.minute, -- cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.second ); -+ TOC_MINUTE(cd->trk[C(cd->last_t+1)]), -+ TOC_SECOND(cd->trk[C(cd->last_t+1)]) ); - mvwprintw(win,maxy-3,38,cd->dtitle ); -@@ -480,3 +480,3 @@ - { -- if(cd->cur_t == i && cd->sc.cdsc_audiostatus == CDROM_AUDIO_PLAY) -+ if(cd->cur_t == i && SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PLAY) - stat = 'P'; -@@ -484,3 +484,7 @@ - stat = 'R'; -+#if defined(TCD_BSD) -+ else if(cd->trk[i].toc.control == 0x04) -+#else - else if(cd->trk[i].toc.cdte_ctrl == CDROM_DATA_TRACK) -+#endif - stat = 'd'; -@@ -500,3 +504,3 @@ - -- if( cd->sc.cdsc_audiostatus == CDROM_AUDIO_PLAY && cd->cur_t == i ) -+ if( SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PLAY && cd->cur_t == i ) - attron( A_BOLD ); -@@ -507,3 +511,3 @@ - -- if(cd->sc.cdsc_audiostatus == CDROM_AUDIO_PLAY && cd->cur_t == i) -+ if(SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PLAY && cd->cur_t == i) - attroff( A_BOLD ); -@@ -518,3 +522,3 @@ - { -- switch( cd->sc.cdsc_audiostatus ) -+ switch( SC_AUDIOSTATUS(cd->sc) ) - { 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 9519b4d3804f..000000000000 --- a/audio/gnome-media/pkg-plist +++ /dev/null @@ -1,56 +0,0 @@ -bin/cddbslave -bin/cddbsubmit -bin/gmix -bin/grecord -bin/gtcd -bin/vumeter -share/gnome/apps/Multimedia/Soundrecorder.desktop -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/mime-info/grecord.keys -share/gnome/mime-info/grecord.mime -share/gnome/pixmaps/gnome-mixer.png -share/gnome/pixmaps/gnome-vumeter.png -share/gnome/pixmaps/gtcd.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/ca/LC_MESSAGES/gnome-media.mo -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/el/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/gl/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/lt/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/ro/LC_MESSAGES/gnome-media.mo -share/locale/ru/LC_MESSAGES/gnome-media.mo -share/locale/sv/LC_MESSAGES/gnome-media.mo -share/locale/tr/LC_MESSAGES/gnome-media.mo -share/locale/uk/LC_MESSAGES/gnome-media.mo -share/locale/zh_CN.GB2312/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 0232dfb10729..000000000000 --- a/audio/gnomeaudio2/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# New ports collection makefile for: gnomeaudio -# Date created: 29 Dec 1998 -# Whom: Vanilla I. Shu <vanilla@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= gnomeaudio -PORTVERSION= 1.0.0 -CATEGORIES= audio gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/gnome-audio -DISTNAME= gnome-audio-${PORTVERSION} - -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 d669cae2653b..000000000000 --- a/audio/gnomemedia2/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# New ports collection makefile for: gnomemedia -# Date created: 20 January 1999 -# Whom: Jeremy Lea <reg@shale.csir.co.za> -# -# $FreeBSD$ -# - -PORTNAME= gnomemedia -PORTVERSION= 1.2.0 -CATEGORIES= audio gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/gnome-media -DISTNAME= gnome-media-${PORTVERSION} - -MAINTAINER= reg@FreeBSD.org - -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ - sox:${PORTSDIR}/audio/sox - -USE_X_PREFIX= yes -USE_GMAKE= yes -USE_LIBTOOL= yes -CONFIGURE_ARGS= --without-ncurses \ - --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" - -pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ - 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ - s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' - -.include <bsd.port.mk> diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo deleted file mode 100644 index 311191fc2cc0..000000000000 --- a/audio/gnomemedia2/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (gnome-media-1.2.0.tar.gz) = c7cda6054b47f71aa46aaabe9db6fb4c diff --git a/audio/gnomemedia2/files/patch-ac b/audio/gnomemedia2/files/patch-ac deleted file mode 100644 index 550d1e6d083c..000000000000 --- a/audio/gnomemedia2/files/patch-ac +++ /dev/null @@ -1,14 +0,0 @@ ---- cddbslave/Makefile.in.orig Wed May 24 14:53:10 2000 -+++ cddbslave/Makefile.in Tue May 30 15:13:02 2000 -@@ -139,3 +139,3 @@ - --gnomedatadir = $(datadir)/gnome -+gnomedatadir = $(datadir) - ---- tcd/Makefile.in.orig Wed May 24 14:53:16 2000 -+++ tcd/Makefile.in Tue May 30 15:12:38 2000 -@@ -147,3 +147,3 @@ - --tcd_LDADD = $(GNOME_LIBDIR) -lglib -lm $(CURSES_LIBS) $(INTLLIBS) -+tcd_LDADD = `$(GLIB_CONFIG) --libs` -lm $(CURSES_LIBS) $(INTLLIBS) - 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 b2878eb5521b..000000000000 --- a/audio/gnomemedia2/files/patch-ae +++ /dev/null @@ -1,789 +0,0 @@ ---- tcd/callbacks.c.orig Thu Jan 13 22:27:52 2000 -+++ tcd/callbacks.c Tue May 30 15:17:17 2000 -@@ -12,3 +12,3 @@ - { -- if(cd.sc.cdsc_audiostatus==CDROM_AUDIO_PAUSED) -+ if(SC_AUDIOSTATUS(cd.sc)==CDROM_AUDIO_PAUSED) - tcd_pausecd(&cd); -@@ -44,3 +44,3 @@ - /* SDH: Make sure play/pause state change is noticed */ -- cd.sc.cdsc_audiostatus = -1; -+ SC_AUDIOSTATUS(cd.sc) = -1; - if(cd.isplayable) ---- tcd/cddb.c.orig Thu Jan 13 22:27:52 2000 -+++ tcd/cddb.c Tue May 30 15:17:17 2000 -@@ -201,7 +201,7 @@ - -- 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]) ); - } -@@ -209,4 +209,4 @@ - 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])) ); - -@@ -247,6 +247,6 @@ - -- 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]))); - -@@ -259,4 +259,4 @@ - 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) -@@ -300,5 +300,5 @@ - { -- 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 Sun May 21 15:13:04 2000 -+++ tcd/gtcd.c Tue May 30 15:17:17 2000 -@@ -157,3 +157,7 @@ - cd.time_lock = TRUE; -+#ifdef TCD_BSD -+ ioctl(cd.cd_dev, CDIOCPAUSE); -+#else - ioctl(cd.cd_dev, CDROMPAUSE); -+#endif - -@@ -421,4 +425,4 @@ - 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; -@@ -524,3 +528,3 @@ - { -- switch( cd.sc.cdsc_audiostatus ) -+ switch( SC_AUDIOSTATUS(cd.sc) ) - { -@@ -620,4 +624,4 @@ - /* 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 ) - { -@@ -638,3 +642,3 @@ - { -- if(old_status != cd.sc.cdsc_audiostatus) -+ if(old_status != SC_AUDIOSTATUS(cd.sc)) - { -@@ -645,3 +649,3 @@ - -- old_status = cd.sc.cdsc_audiostatus; -+ old_status = SC_AUDIOSTATUS(cd.sc); - g_snprintf(tmp, 255, "tcd/%s.xpm", ---- tcd/gtracked.c.orig Sun May 21 15:13:05 2000 -+++ tcd/gtracked.c Tue May 30 15:17:17 2000 -@@ -211,4 +211,4 @@ - 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])); - ---- tcd/linux-cdrom.c.orig Thu Jan 13 22:27:52 2000 -+++ tcd/linux-cdrom.c Tue May 30 15:29:32 2000 -@@ -73,3 +73,3 @@ - --#if defined(TCD_CHANGER_ENABLED) -+#if defined(TCD_CHANGER_ENABLED) && !defined(TCD_BSD) - cd->nslots = ioctl( cd->cd_dev, CDROM_CHANGER_NSLOTS ); -@@ -116,4 +116,7 @@ - { -- int tmp,i; -+ int i; - int delsecs; -+#ifdef TCD_BSD -+ struct ioc_read_toc_single_entry tocentry; -+#endif - -@@ -127,3 +130,7 @@ - /* read the TOC header */ -+#ifdef TCD_BSD -+ if((ioctl( cd->cd_dev, CDIOREADTOCHEADER, &cd->tochdr))==-1) -+#else - if(ioctl( cd->cd_dev, CDROMREADTOCHDR, &cd->tochdr)) -+#endif - { -@@ -134,2 +141,5 @@ - cd->cddb_id = 0; -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - return(-1); -@@ -138,11 +148,25 @@ - /* 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 = 0xaa; /* 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)) == -1) -+#else - if(ioctl(cd->cd_dev, CDROMREADTOCENTRY, &cd->trk[C(cd->last_t+1)].toc)) -+#endif - { -@@ -154,4 +178,15 @@ - 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)]); - -@@ -160,6 +195,15 @@ - { -+#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)) == -1) -+#else - if(ioctl(cd->cd_dev, CDROMREADTOCENTRY, &cd->trk[C(i)].toc)) -+#endif - { -@@ -170,2 +214,5 @@ - cd->cddb_id = 0; -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - return(-1); -@@ -173,7 +220,12 @@ - -+#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)]); - } -@@ -184,6 +236,3 @@ - /* 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; - -@@ -206,3 +255,3 @@ - debug("cdrom.c: tcd_readtoc exiting normally\n" ); -- return tmp; -+ return 0; - } -@@ -216,5 +265,4 @@ - /* 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); - -@@ -237,4 +285,6 @@ - #ifdef TCD_CHANGER_ENABLED -+#ifndef TCD_BSD - cd->cur_disc = ioctl( cd->cd_dev, CDROM_SELECT_DISC, CDSL_CURRENT ); - #endif -+#endif - } -@@ -284,4 +334,16 @@ - { -+#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.track = 0; -+ subch.data = &(cd->sc); -+#else - cd->sc.cdsc_format = CDROM_MSF; -+#endif - -@@ -289,3 +351,7 @@ - { -+#ifdef TCD_BSD -+ if((ioctl( cd->cd_dev, CDIOCREADSUBCHANNEL, &subch)) == -1) -+#else - if(ioctl( cd->cd_dev, CDROMSUBCHNL, &cd->sc)) -+#endif - { -@@ -295,8 +361,21 @@ - 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); -@@ -307,8 +386,21 @@ - { -+#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; -@@ -320,2 +412,10 @@ - { -+#ifdef TCD_BSD -+ struct ioc_vol vol; -+ -+ if(ioctl(cd->cd_dev, CDIOCGETVOL, &vol) < 0) -+ return -1; -+ -+ return vol.vol[0]; -+#else - #ifdef CDROMVOLREAD -@@ -330,2 +430,3 @@ - #endif -+#endif - } -@@ -334,4 +435,30 @@ - { -+#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; -@@ -344,3 +471,3 @@ - { -- /* try and inject cd */ -+ /* try and eject cd */ - tcd_ejectcd(cd); -@@ -354,2 +481,5 @@ - -+#ifdef TCD_BSD -+ ioctl(cd->cd_dev, CDIOCCLOSE); -+#else - #if defined(CDROMCLOSETRAY) -@@ -358,9 +488,15 @@ - #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]); - -@@ -368,5 +504,5 @@ - { -- 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; - } -@@ -374,20 +510,20 @@ - { -- 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; - } -@@ -395,6 +531,11 @@ - } -- 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); -+ if(only_use_trkind || ioctl( cd->cd_dev, CDIOCPLAYMSF, &msf)) -+#else - if(ioctl( cd->cd_dev, CDROMPLAYMSF, &msf) || only_use_trkind) -+#endif - { -@@ -403,8 +544,12 @@ - /* 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 - { -@@ -413,2 +558,5 @@ - debug("cdrom.c: tcd_playtracks error. CDROMPLAYTRKIND ioctl error.\n"); -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - return -1; -@@ -422,21 +570,10 @@ - --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; - -@@ -447,41 +584,42 @@ - -- /* 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 - { -@@ -491,2 +629,5 @@ - debug("cdrom.c: tcd_play_seconds error. CDROMPLAYMSF ioctl error.\n" ); -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW ); -+#endif - return(-1); -@@ -507,3 +648,11 @@ - -+#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 - { -@@ -515,2 +664,5 @@ - { -+#ifdef TCD_BSD -+ tmp = ioctl( cd->cd_dev, CDIOCCLOSE ); -+#else - #ifdef CDROMCLOSETRAY -@@ -518,2 +670,7 @@ - #endif -+#endif -+ -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCPREVENT); -+#endif - -@@ -527,2 +684,5 @@ - -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCALLOW); -+#endif - return(-1); -@@ -544,7 +704,15 @@ - /* 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 - { -@@ -566,5 +734,9 @@ - -- 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 - { -@@ -572,4 +744,10 @@ - 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; -@@ -578,3 +756,7 @@ - { -+#ifdef TCD_BSD -+ if((tmp=ioctl(cd->cd_dev, CDIOCPAUSE))) -+#else - if((tmp=ioctl(cd->cd_dev, CDROMPAUSE))) -+#endif - { -@@ -582,4 +764,10 @@ - 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; -@@ -591,2 +779,3 @@ - #ifdef TCD_CHANGER_ENABLED -+#ifndef TCD_BSD - int tmp; -@@ -599,6 +788,6 @@ - return tmp; --#else -+#endif -+#endif - debug("tcd_change_disc called, but changer support isn't compiled in. Ickyblah.\n" ); - return 0; --#endif - } ---- tcd/linux-cdrom.h.orig Thu Jan 13 22:27:52 2000 -+++ tcd/linux-cdrom.h Tue May 30 15:34:32 2000 -@@ -29,4 +29,16 @@ - #include <glib.h> --#if !defined(linux) && !defined(sun) && !defined(__sun__) --# error TCD only builds on linux and Solaris/SunOs -+#if !defined(linux) && !defined(sun) && !defined(__sun__) && !defined(__FreeBSD__) -+# error TCD only builds on Linux, Solaris, SunOS, and FreeBSD -+#endif -+ -+#ifdef __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 - #endif -@@ -128,3 +140,13 @@ - 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; -@@ -154,2 +176,14 @@ - -+#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 */ -@@ -158,2 +192,8 @@ - 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 */ ---- tcd/tcd.c.orig Thu Jan 13 22:27:52 2000 -+++ tcd/tcd.c Tue May 30 15:17:17 2000 -@@ -141,4 +141,4 @@ - 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 ) - { -@@ -172,3 +172,3 @@ - if(cd->isplayable) { -- if( cd->sc.cdsc_audiostatus == CDROM_AUDIO_PAUSED ) -+ if( SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PAUSED ) - tcd_pausecd(cd); -@@ -442,4 +442,4 @@ - mvwprintw(win,maxy-4,38,"%02u:%02u", -- cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.minute, -- cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.second ); -+ TOC_MINUTE(cd->trk[C(cd->last_t+1)]), -+ TOC_SECOND(cd->trk[C(cd->last_t+1)]) ); - mvwprintw(win,maxy-3,38,cd->dtitle ); -@@ -480,3 +480,3 @@ - { -- if(cd->cur_t == i && cd->sc.cdsc_audiostatus == CDROM_AUDIO_PLAY) -+ if(cd->cur_t == i && SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PLAY) - stat = 'P'; -@@ -484,3 +484,7 @@ - stat = 'R'; -+#if defined(TCD_BSD) -+ else if(cd->trk[i].toc.control == 0x04) -+#else - else if(cd->trk[i].toc.cdte_ctrl == CDROM_DATA_TRACK) -+#endif - stat = 'd'; -@@ -500,3 +504,3 @@ - -- if( cd->sc.cdsc_audiostatus == CDROM_AUDIO_PLAY && cd->cur_t == i ) -+ if( SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PLAY && cd->cur_t == i ) - attron( A_BOLD ); -@@ -507,3 +511,3 @@ - -- if(cd->sc.cdsc_audiostatus == CDROM_AUDIO_PLAY && cd->cur_t == i) -+ if(SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PLAY && cd->cur_t == i) - attroff( A_BOLD ); -@@ -518,3 +522,3 @@ - { -- switch( cd->sc.cdsc_audiostatus ) -+ switch( SC_AUDIOSTATUS(cd->sc) ) - { 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 9519b4d3804f..000000000000 --- a/audio/gnomemedia2/pkg-plist +++ /dev/null @@ -1,56 +0,0 @@ -bin/cddbslave -bin/cddbsubmit -bin/gmix -bin/grecord -bin/gtcd -bin/vumeter -share/gnome/apps/Multimedia/Soundrecorder.desktop -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/mime-info/grecord.keys -share/gnome/mime-info/grecord.mime -share/gnome/pixmaps/gnome-mixer.png -share/gnome/pixmaps/gnome-vumeter.png -share/gnome/pixmaps/gtcd.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/ca/LC_MESSAGES/gnome-media.mo -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/el/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/gl/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/lt/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/ro/LC_MESSAGES/gnome-media.mo -share/locale/ru/LC_MESSAGES/gnome-media.mo -share/locale/sv/LC_MESSAGES/gnome-media.mo -share/locale/tr/LC_MESSAGES/gnome-media.mo -share/locale/uk/LC_MESSAGES/gnome-media.mo -share/locale/zh_CN.GB2312/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 fa88ff0e1de6..000000000000 --- a/audio/gqmpeg-devel/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# New ports collection makefile for: gqmpeg -# Date Created: 28 Oct 1998 -# Whom: Vanilla Pooh Shu <vanilla@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= gqmpeg -PORTVERSION= 0.6.3 -CATEGORIES= audio -MASTER_SITES= http://www.netpedia.net/hosting/gqview/packages/ \ - http://www.geocities.com/SiliconValley/Haven/5235/packages/ -EXTRACT_SUFX= .src.tar.gz - -MAINTAINER= nakai@FreeBSD.org - -RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 -LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib - -USE_X_PREFIX= yes -ALL_TARGET= 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 ede87a7d5504..000000000000 --- a/audio/gqmpeg-devel/files/patch-aa +++ /dev/null @@ -1,34 +0,0 @@ ---- Makefile.orig Sat Jul 3 20:39:08 1999 -+++ Makefile Thu Apr 13 03:59:10 2000 -@@ -1,8 +1,8 @@ - --PREFIX=/usr/local -+PREFIX?=/usr/local - --GTK_INCLUDE = `gtk-config --cflags` --GTK_LIB = `gtk-config --libs` -+#GTK_INCLUDE = `gtk-config --cflags` -+#GTK_LIB = `gtk-config --libs` - IMLIB_INCLUDE = `imlib-config --cflags-gdk` - IMLIB_LIB = `imlib-config --libs-gdk` - -@@ -15,7 +15,7 @@ - #for IRIX - #LDFLAGS = $(GTK_LIB) $(IMLIB_LIB) -laudio - --CC = gcc -Wall -+CC ?= gcc -Wall - - GNOME_PREFIX = `gnome-config --prefix` - -@@ -119,8 +119,8 @@ - $(CC) $(OBJS) -o gqmpeg.static -static $(LDFLAGS) - - install: gqmpeg -- install -c gqmpeg $(PREFIX)/bin/gqmpeg -- install -c plugin/gqmpeg-shoutcast-plugin.sh $(PREFIX)/bin/gqmpeg-shoutcast-plugin.sh -+ ${BSD_INSTALL_PROGRAM} gqmpeg $(PREFIX)/bin/gqmpeg -+ ${BSD_INSTALL_SCRIPT} plugin/gqmpeg-shoutcast-plugin.sh $(PREFIX)/bin/gqmpeg-shoutcast-plugin.sh - - gnome-install: gqmpeg - install -c gqmpeg $(PREFIX)/bin/gqmpeg 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/files/patch-ac b/audio/gqmpeg-devel/files/patch-ac deleted file mode 100644 index 047e6f240ef8..000000000000 --- a/audio/gqmpeg-devel/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- mixer.c.orig Sun Jan 30 03:52:17 2000 -+++ mixer.c Sun Jan 30 03:52:51 2000 -@@ -80,7 +80,7 @@ - } - - t = ioctl(mf, SOUND_MIXER_READ_DEVMASK, &dev_mask); -- t|= ioctl(mf, SOUND_MIXER_READ_RECMASK, &rec_mask); -+ // t|= ioctl(mf, SOUND_MIXER_READ_RECMASK, &rec_mask); - t|= ioctl(mf, SOUND_MIXER_READ_STEREODEVS, &stereo_mask); - if (t!=0) - { 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 e49f3d038b98..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://www.netpedia.net/hosting/gqview/mpeg-index.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 100a8b158521..000000000000 --- a/audio/icecast2/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# New ports collection makefile for: icecast -# Date created: 28 Jan 1999 -# Whom: Chip Marshall <chip@eboai.org> -# -# $FreeBSD$ -# - -PORTNAME= icecast -PORTVERSION= 1.3.7 -CATEGORIES= audio net -MASTER_SITES= http://www.icecast.org/releases/ - -MAINTAINER= chip@eboai.org - -HAS_CONFIGURE= yes -CONFIGURE_ARGS=--with-libwrap - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/icecast ${PREFIX}/sbin - ${MKDIR} ${PREFIX}/etc/icecast/conf - ${MKDIR} ${PREFIX}/etc/icecast/templates -.for CONF in groups.aut.dist icecast.conf.dist mounts.aut.dist users.aut.dist - ${INSTALL_DATA} ${WRKSRC}/conf/${CONF} ${PREFIX}/etc/icecast/conf -.endfor -.for TEMPL in 306.html 400.html 403.html 404.html 504.html bodytag.html info.html \ - list_directory.html mountlist.html statistics.html admin_describe.html \ - admin.html alias_add.html manual.html alias_del.html header.html \ - footer.html admin_change.html - ${INSTALL_DATA} ${WRKSRC}/templates/${TEMPL} ${PREFIX}/etc/icecast/templates -.endfor - ${MKDIR} ${PREFIX}/share/doc/icecast/ - ${INSTALL_DATA} ${WRKSRC}/doc/manual.html ${PREFIX}/share/doc/icecast/ - @${CAT} ${PKGDIR}/MESSAGE | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' - -.include <bsd.port.mk> diff --git a/audio/icecast2/distinfo b/audio/icecast2/distinfo deleted file mode 100644 index 8aaa993cbf06..000000000000 --- a/audio/icecast2/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (icecast-1.3.7.tar.gz) = 74f78ca33bea3cfd562530bc90d0d214 diff --git a/audio/icecast2/pkg-comment b/audio/icecast2/pkg-comment deleted file mode 100644 index 627383078592..000000000000 --- a/audio/icecast2/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -A streaming mp3 audio server diff --git a/audio/icecast2/pkg-descr b/audio/icecast2/pkg-descr deleted file mode 100644 index c683f3434b65..000000000000 --- a/audio/icecast2/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -Icecast is a streaming mp3 audio server. - -Icecast provides nearly all the functionality of the Shoutcast server. -It will accept encoding streams from encoders like winamp, shout and ices. -It can also add itself to a directory server such as our own -icecast.linuxpower.org or Nullsoft's yp.shoutcast.com. - -WWW: http://www.icecast.org/ diff --git a/audio/icecast2/pkg-message b/audio/icecast2/pkg-message deleted file mode 100644 index 34690c5d02ae..000000000000 --- a/audio/icecast2/pkg-message +++ /dev/null @@ -1,15 +0,0 @@ ------------------------------------------------------------------ - -Icecast's various components have been installed in the following -directories: - - - The icecast server: - %%PREFIX%%/sbin/icecast - - - Icecast configuration files have been installed in: - %%PREFIX%%/etc/icecast/ - - - Icecast documentation is located in: - %%PREFIX%%/share/doc/icecast/ - ------------------------------------------------------------------ diff --git a/audio/icecast2/pkg-plist b/audio/icecast2/pkg-plist deleted file mode 100644 index 5ed338f1a9f0..000000000000 --- a/audio/icecast2/pkg-plist +++ /dev/null @@ -1,28 +0,0 @@ -etc/icecast/conf/groups.aut.dist -etc/icecast/conf/icecast.conf.dist -etc/icecast/conf/mounts.aut.dist -etc/icecast/conf/users.aut.dist -etc/icecast/templates/306.html -etc/icecast/templates/400.html -etc/icecast/templates/403.html -etc/icecast/templates/404.html -etc/icecast/templates/504.html -etc/icecast/templates/admin.html -etc/icecast/templates/admin_change.html -etc/icecast/templates/admin_describe.html -etc/icecast/templates/alias_add.html -etc/icecast/templates/alias_del.html -etc/icecast/templates/bodytag.html -etc/icecast/templates/footer.html -etc/icecast/templates/header.html -etc/icecast/templates/info.html -etc/icecast/templates/list_directory.html -etc/icecast/templates/manual.html -etc/icecast/templates/mountlist.html -etc/icecast/templates/statistics.html -sbin/icecast -share/doc/icecast/manual.html -@dirrm etc/icecast/conf -@dirrm etc/icecast/templates -@dirrm etc/icecast -@dirrm share/doc/icecast diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile deleted file mode 100644 index 7edc2afde790..000000000000 --- a/audio/kdemultimedia3/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# New ports collection makefile for: KDE2 Multimedia -# Date created: Saturday 2 September 2000 -# Whom: Will Andrews <will@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= kdemultimedia -PORTVERSION= 1.94 -CATEGORIES= misc kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src - -MAINTAINER= will@FreeBSD.org - -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - qt2.4:${PORTSDIR}/x11-toolkits/qt22 - -MOC?= ${X11BASE}/bin/moc2 -USE_BZIP2= yes -INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ - --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" -USE_GMAKE= yes - -.include <bsd.port.mk> diff --git a/audio/kdemultimedia3/distinfo b/audio/kdemultimedia3/distinfo deleted file mode 100644 index e1b274b524a1..000000000000 --- a/audio/kdemultimedia3/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (kdemultimedia-1.94.tar.bz2) = bae3c4421e28631a0646c59e47e13b32 diff --git a/audio/kdemultimedia3/pkg-comment b/audio/kdemultimedia3/pkg-comment deleted file mode 100644 index 186230f9287d..000000000000 --- a/audio/kdemultimedia3/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -Utilities for the KDE integrated X11 desktop 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 9686179e2512..000000000000 --- a/audio/kdemultimedia3/pkg-plist +++ /dev/null @@ -1,386 +0,0 @@ -bin/aktion -bin/artsbuilder -bin/artscontrol -bin/kaiman -bin/kmid -bin/kmidi -bin/kmix -bin/kmixctrl -bin/midisend -bin/sf2cfg -bin/timidity -lib/Arts/StructureBuilder.mcopclass -lib/Arts/StructureDesc.mcopclass -lib/Arts/Synth_ENVELOPE_ADSR.mcopclass -lib/Arts/Synth_MIDI_TEST.mcopclass -lib/Arts/Synth_NOISE.mcopclass -lib/Arts/Synth_SHELVE_CUTOFF.mcopclass -lib/Arts/Synth_WAVE_TRI.mcopclass -lib/Arts/Synth_XFADE.mcopclass -lib/artsmodules.mcopclass -lib/artsmodules.mcoptype -lib/libaktion.la -lib/libaktion.so -lib/libaktion.so.1 -lib/libartsbuilder.la -lib/libartsbuilder.so -lib/libartsbuilder.so.0 -lib/libartsmodules.la -lib/libartsmodules.so -lib/libartsmodules.so.0 -lib/libkcm_kmix.la -lib/libkcm_kmix.so -lib/libkmidpart.la -lib/libkmidpart.so -lib/libkmidpart.so.1 -lib/libkmixapplet.la -lib/libkmixapplet.so -lib/libkmixapplet.so.1 -share/applnk/Multimedia/aktion.desktop -share/applnk/Multimedia/artsbuilder.desktop -share/applnk/Multimedia/artscontrol.desktop -share/applnk/Multimedia/kaiman.desktop -share/applnk/Multimedia/kmid.desktop -share/applnk/Multimedia/kmidi.desktop -share/applnk/Multimedia/kmix.desktop -share/applnk/Multimedia/timidity.desktop -share/applnk/Settings/Sound/kmix.desktop -share/apps/aktion/aktion_part.rc -share/apps/aktion/toolbar/ak_maximize.png -share/apps/aktion/toolbar/ak_setup.png -share/apps/aktion/toolbar/aktion_logo.png -share/apps/aktion/toolbar/avanzar.png -share/apps/aktion/toolbar/ayuda.png -share/apps/aktion/toolbar/double.png -share/apps/aktion/toolbar/fullscreen.png -share/apps/aktion/toolbar/half.png -share/apps/aktion/toolbar/original.png -share/apps/aktion/toolbar/parar.png -share/apps/aktion/toolbar/pause.png -share/apps/aktion/toolbar/retroceder.png -share/apps/aktion/toolbar/tocar.png -share/apps/artscontrol/artscontrol.rc -share/apps/kaiman/Skins/car-preset/btn_exit.png -share/apps/kaiman/Skins/car-preset/btn_iconify.png -share/apps/kaiman/Skins/car-preset/btn_list.png -share/apps/kaiman/Skins/car-preset/btn_next.png -share/apps/kaiman/Skins/car-preset/btn_p1.png -share/apps/kaiman/Skins/car-preset/btn_p2.png -share/apps/kaiman/Skins/car-preset/btn_p3.png -share/apps/kaiman/Skins/car-preset/btn_p4.png -share/apps/kaiman/Skins/car-preset/btn_p5.png -share/apps/kaiman/Skins/car-preset/btn_p6.png -share/apps/kaiman/Skins/car-preset/btn_play.png -share/apps/kaiman/Skins/car-preset/btn_prev.png -share/apps/kaiman/Skins/car-preset/btn_sml.png -share/apps/kaiman/Skins/car-preset/btn_stop.png -share/apps/kaiman/Skins/car-preset/btn_voldn.png -share/apps/kaiman/Skins/car-preset/btn_volup.png -share/apps/kaiman/Skins/car-preset/digbig.png -share/apps/kaiman/Skins/car-preset/digmed.png -share/apps/kaiman/Skins/car-preset/letters.png -share/apps/kaiman/Skins/car-preset/main.png -share/apps/kaiman/Skins/car-preset/monoster.png -share/apps/kaiman/Skins/car-preset/posbar.png -share/apps/kaiman/Skins/car-preset/random.png -share/apps/kaiman/Skins/car-preset/repeat.png -share/apps/kaiman/Skins/car-preset/skindata -share/apps/kaiman/Skins/car-preset/status.png -share/apps/kaiman/Skins/car-preset/volume.png -share/apps/kaiman/Skins/circle/back.png -share/apps/kaiman/Skins/circle/back_mask.png -share/apps/kaiman/Skins/circle/back_sm.png -share/apps/kaiman/Skins/circle/back_sm_mask.png -share/apps/kaiman/Skins/circle/bar_pos.png -share/apps/kaiman/Skins/circle/bar_vol.png -share/apps/kaiman/Skins/circle/btn_exit.png -share/apps/kaiman/Skins/circle/btn_iconify.png -share/apps/kaiman/Skins/circle/btn_list.png -share/apps/kaiman/Skins/circle/btn_mode.png -share/apps/kaiman/Skins/circle/btn_next.png -share/apps/kaiman/Skins/circle/btn_play.png -share/apps/kaiman/Skins/circle/btn_pref.png -share/apps/kaiman/Skins/circle/btn_prev.png -share/apps/kaiman/Skins/circle/btn_repeat.png -share/apps/kaiman/Skins/circle/btn_shuffle.png -share/apps/kaiman/Skins/circle/btn_sm_exit.png -share/apps/kaiman/Skins/circle/btn_sm_iconify.png -share/apps/kaiman/Skins/circle/btn_sm_mode.png -share/apps/kaiman/Skins/circle/btn_sm_next.png -share/apps/kaiman/Skins/circle/btn_sm_play.png -share/apps/kaiman/Skins/circle/btn_sm_prev.png -share/apps/kaiman/Skins/circle/btn_sm_stop.png -share/apps/kaiman/Skins/circle/btn_stop.png -share/apps/kaiman/Skins/circle/dig.png -share/apps/kaiman/Skins/circle/digsml.png -share/apps/kaiman/Skins/circle/letters.png -share/apps/kaiman/Skins/circle/skindata -share/apps/kaiman/Skins/circle/status.png -share/apps/kaiman/Skins/k9/README -share/apps/kaiman/Skins/k9/conf.jpg -share/apps/kaiman/Skins/k9/conf.png -share/apps/kaiman/Skins/k9/eject.jpg -share/apps/kaiman/Skins/k9/icon.jpg -share/apps/kaiman/Skins/k9/icon.png -share/apps/kaiman/Skins/k9/kill.jpg -share/apps/kaiman/Skins/k9/kill.png -share/apps/kaiman/Skins/k9/knine-nfont.jpg -share/apps/kaiman/Skins/k9/knine-nfont.png -share/apps/kaiman/Skins/k9/knine-nfont2.jpg -share/apps/kaiman/Skins/k9/knine-nfont2.png -share/apps/kaiman/Skins/k9/knine-normal2.jpg -share/apps/kaiman/Skins/k9/knine-normal2.png -share/apps/kaiman/Skins/k9/knine-vfont.jpg -share/apps/kaiman/Skins/k9/knine-vfont.png -share/apps/kaiman/Skins/k9/long2.jpg -share/apps/kaiman/Skins/k9/mask.png -share/apps/kaiman/Skins/k9/newtext.jpg -share/apps/kaiman/Skins/k9/newtext.png -share/apps/kaiman/Skins/k9/next.jpg -share/apps/kaiman/Skins/k9/pause.jpg -share/apps/kaiman/Skins/k9/play.jpg -share/apps/kaiman/Skins/k9/pos_item.jpg -share/apps/kaiman/Skins/k9/repeat.jpg -share/apps/kaiman/Skins/k9/repeat.png -share/apps/kaiman/Skins/k9/reverse.jpg -share/apps/kaiman/Skins/k9/shuffle.jpg -share/apps/kaiman/Skins/k9/shuffle.png -share/apps/kaiman/Skins/k9/skindata -share/apps/kaiman/Skins/k9/small-k.jpg -share/apps/kaiman/Skins/k9/small-k.png -share/apps/kaiman/Skins/k9/square.jpg -share/apps/kaiman/Skins/k9/square.png -share/apps/kaiman/Skins/k9/status.jpg -share/apps/kaiman/Skins/k9/status.png -share/apps/kaiman/Skins/k9/stop.jpg -share/apps/kaiman/Skins/k9/trans-pos.png -share/apps/kaiman/Skins/k9/trans-slide.png -share/apps/kaiman/kaimanui.rc -share/apps/kicker/applets/kmixapplet.desktop -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/icons/button1.xpm -share/apps/kmid/icons/button2.xpm -share/apps/kmid/icons/hicolor/22x22/actions/piano.png -share/apps/kmid/icons/hicolor/22x22/actions/volume.png -share/apps/kmid/icons/hicolor/32x32/actions/piano.png -share/apps/kmid/icons/hicolor/32x32/actions/volume.png -share/apps/kmid/icons/keyboard.xpm -share/apps/kmid/icons/locolor/16x16/actions/piano.png -share/apps/kmid/icons/locolor/16x16/actions/volume.png -share/apps/kmid/kmid_partui.rc -share/apps/kmid/kmidui.rc -share/apps/kmid/maps/YamahaPSR500.map -share/apps/kmid/maps/YamahaPSS790.map -share/apps/kmid/maps/YamahaQY10.map -share/apps/kmid/maps/gm.map -share/apps/kmidi/Axel_Elf.mid -share/apps/kmidi/Cavatina.mid -share/apps/kmidi/Jarre-Chung_Kuo.mid -share/apps/kmidi/Malaguena.mid -share/apps/kmidi/Mission_Impossible.mid -share/apps/kmidi/Take_The_A_Train-Seq_by_Dianne_Lewandowski.mid -share/apps/kmidi/georgia.mid -share/apps/kmidi/mpostman.mid -share/apps/kmidi/pics/kmidilogo.png -share/apps/kmix/kmixui.rc -share/apps/kmix/pics/kmixdocked.png -share/apps/kmix/pics/logo.png -share/apps/kmix/pics/mix_audio.png -share/apps/kmix/pics/mix_bass.png -share/apps/kmix/pics/mix_cd.png -share/apps/kmix/pics/mix_ext.png -share/apps/kmix/pics/mix_microphone.png -share/apps/kmix/pics/mix_midi.png -share/apps/kmix/pics/mix_recmon.png -share/apps/kmix/pics/mix_surround.png -share/apps/kmix/pics/mix_treble.png -share/apps/kmix/pics/mix_unknown.png -share/apps/kmix/pics/mix_video.png -share/apps/kmix/pics/mix_volume.png -share/config/aktionrc -share/doc/HTML/en/artsbuilder/.anchors -share/doc/HTML/en/artsbuilder/common -share/doc/HTML/en/artsbuilder/index.docbook -share/doc/HTML/en/artsbuilder/index.html -share/doc/HTML/en/artsbuilder/insidearts.html -share/doc/HTML/en/artsbuilder/introduction.html -share/doc/HTML/en/artsbuilder/quickstart.html -share/doc/HTML/en/kmid/.anchors -share/doc/HTML/en/kmid/abouttheauthor.html -share/doc/HTML/en/kmid/addingsongstoacollectionhowtouseautoadd.html -share/doc/HTML/en/kmid/advancedfeatures.html -share/doc/HTML/en/kmid/collections.html -share/doc/HTML/en/kmid/common -share/doc/HTML/en/kmid/compilationandinstallation.html -share/doc/HTML/en/kmid/creatingamidimap.html -share/doc/HTML/en/kmid/deletingacollection.html -share/doc/HTML/en/kmid/displayinglyrics.html -share/doc/HTML/en/kmid/doineedamidimap.html -share/doc/HTML/en/kmid/finalnotes.html -share/doc/HTML/en/kmid/frequentlyaskedquestionsfaq.html -share/doc/HTML/en/kmid/generalusage.html -share/doc/HTML/en/kmid/hallofkmidsfriends.html -share/doc/HTML/en/kmid/index.cvlog -share/doc/HTML/en/kmid/index.docbook -share/doc/HTML/en/kmid/index.html -share/doc/HTML/en/kmid/installation.html -share/doc/HTML/en/kmid/introduction.html -share/doc/HTML/en/kmid/keybindings.html -share/doc/HTML/en/kmid/midimaps.html -share/doc/HTML/en/kmid/playinginorderoratrandom.html -share/doc/HTML/en/kmid/playingsongs.html -share/doc/HTML/en/kmid/removingsongsfromcollections.html -share/doc/HTML/en/kmid/requirements.html -share/doc/HTML/en/kmid/selectingasongfromacollection.html -share/doc/HTML/en/kmid/thetempolcd.html -share/doc/HTML/en/kmid/thetemporarycollection.html -share/doc/HTML/en/kmid/usingmidimaps.html -share/doc/HTML/en/kmidi/.anchors -share/doc/HTML/en/kmidi/FAQ -share/doc/HTML/en/kmidi/commandlineoptions.html -share/doc/HTML/en/kmidi/common -share/doc/HTML/en/kmidi/compilationandinstallation.html -share/doc/HTML/en/kmidi/computationissues.html -share/doc/HTML/en/kmidi/configuring.html -share/doc/HTML/en/kmidi/copyright.html -share/doc/HTML/en/kmidi/credits.html -share/doc/HTML/en/kmidi/design.html -share/doc/HTML/en/kmidi/effects.html -share/doc/HTML/en/kmidi/index.cvlog -share/doc/HTML/en/kmidi/index.docbook -share/doc/HTML/en/kmidi/index.html -share/doc/HTML/en/kmidi/installation.html -share/doc/HTML/en/kmidi/introduction.html -share/doc/HTML/en/kmidi/memoryissues.html -share/doc/HTML/en/kmidi/midifilenames.html -share/doc/HTML/en/kmidi/midiimplementation.html -share/doc/HTML/en/kmidi/patches.html -share/doc/HTML/en/kmidi/patchsets.html -share/doc/HTML/en/kmidi/playlists.html -share/doc/HTML/en/kmidi/polyphony.html -share/doc/HTML/en/kmidi/questionsandanswers.html -share/doc/HTML/en/kmidi/requirements.html -share/doc/HTML/en/kmidi/synthesismodel.html -share/doc/HTML/en/kmidi/usage.html -share/doc/HTML/en/kmidi/volume.html -share/doc/HTML/en/kmix/.anchors -share/doc/HTML/en/kmix/advancedfeatures.html -share/doc/HTML/en/kmix/commandlinearguments.html -share/doc/HTML/en/kmix/common -share/doc/HTML/en/kmix/compilationandinstallation.html -share/doc/HTML/en/kmix/configurationoptions.html -share/doc/HTML/en/kmix/help.html -share/doc/HTML/en/kmix/index.cvlog -share/doc/HTML/en/kmix/index.docbook -share/doc/HTML/en/kmix/index.html -share/doc/HTML/en/kmix/installation.html -share/doc/HTML/en/kmix/introduction.html -share/doc/HTML/en/kmix/keybindings.html -share/doc/HTML/en/kmix/multiplesoundcards.html -share/doc/HTML/en/kmix/panningslider.html -share/doc/HTML/en/kmix/questionsandanswers.html -share/doc/HTML/en/kmix/requirements.html -share/doc/HTML/en/kmix/themenuentries.html -share/doc/HTML/en/kmix/workingwithkmix.html -share/doc/HTML/en/kscd/.anchors -share/doc/HTML/en/kscd/about.html -share/doc/HTML/en/kscd/cddb-editor.html -share/doc/HTML/en/kscd/cddb-support.html -share/doc/HTML/en/kscd/cddb-tab.html -share/doc/HTML/en/kscd/cddb.howto -share/doc/HTML/en/kscd/common -share/doc/HTML/en/kscd/configuring-kscd.html -share/doc/HTML/en/kscd/credits-and-license.html -share/doc/HTML/en/kscd/index.docbook -share/doc/HTML/en/kscd/index.html -share/doc/HTML/en/kscd/installation.html -share/doc/HTML/en/kscd/introduction.html -share/doc/HTML/en/kscd/kscd-options-tab.html -share/doc/HTML/en/kscd/kscd.png -share/doc/HTML/en/kscd/kscd1.png -share/doc/HTML/en/kscd/kscd10.png -share/doc/HTML/en/kscd/kscd11.png -share/doc/HTML/en/kscd/kscd12.png -share/doc/HTML/en/kscd/kscd13.png -share/doc/HTML/en/kscd/kscd14.png -share/doc/HTML/en/kscd/kscd15.png -share/doc/HTML/en/kscd/kscd16.png -share/doc/HTML/en/kscd/kscd17.png -share/doc/HTML/en/kscd/kscd18.png -share/doc/HTML/en/kscd/kscd19.png -share/doc/HTML/en/kscd/kscd2.png -share/doc/HTML/en/kscd/kscd2a.png -share/doc/HTML/en/kscd/kscd3.png -share/doc/HTML/en/kscd/kscd4.png -share/doc/HTML/en/kscd/kscd5.png -share/doc/HTML/en/kscd/kscd6.png -share/doc/HTML/en/kscd/kscd7.png -share/doc/HTML/en/kscd/kscd8.png -share/doc/HTML/en/kscd/kscd9.png -share/doc/HTML/en/kscd/onscreen-fundamentals.html -share/doc/HTML/en/kscd/questions-and-answers.html -share/doc/HTML/en/kscd/smtp-options.html -share/doc/HTML/en/kscd/using-kscd-in-the-panel.html -share/icons/hicolor/22x22/apps/kaiman.png -share/icons/hicolor/32x32/apps/kaiman.png -share/icons/hicolor/32x32/apps/kmid.png -share/icons/hicolor/32x32/apps/kmidi.png -share/icons/hicolor/32x32/apps/kmix.png -share/icons/hicolor/48x48/apps/kaiman.png -share/icons/hicolor/48x48/apps/kmid.png -share/icons/hicolor/48x48/apps/kmidi.png -share/icons/hicolor/48x48/apps/kmix.png -share/icons/locolor/16x16/apps/aktion.png -share/icons/locolor/16x16/apps/kaiman.png -share/icons/locolor/16x16/apps/kmid.png -share/icons/locolor/16x16/apps/kmidi.png -share/icons/locolor/16x16/apps/kmix.png -share/icons/locolor/32x32/apps/aktion.png -share/icons/locolor/32x32/apps/kaiman.png -share/icons/locolor/32x32/apps/kmid.png -share/icons/locolor/32x32/apps/kmidi.png -share/icons/locolor/32x32/apps/kmix.png -share/mimelnk/audio/x-karaoke.desktop -@dirrm share/mimelnk/audio -@dirrm share/icons/locolor/32x32/apps -@dirrm share/icons/locolor/16x16/apps -@dirrm share/icons/hicolor/48x48/apps -@dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/22x22/apps -@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/artsbuilder -@dirrm share/config -@dirrm share/apps/kmix/pics -@dirrm share/apps/kmix -@dirrm share/apps/kmidi/pics -@dirrm share/apps/kmidi -@dirrm share/apps/kmid/maps -@dirrm share/apps/kmid/icons/locolor/16x16/actions -@dirrm share/apps/kmid/icons/hicolor/32x32/actions -@dirrm share/apps/kmid/icons/hicolor/22x22/actions -@dirrm share/apps/kmid/icons -@dirrm share/apps/kmid/fm -@dirrm share/apps/kmid -@dirrm share/apps/kicker/applets -@dirrm share/apps/kaiman/Skins/k9 -@dirrm share/apps/kaiman/Skins/circle -@dirrm share/apps/kaiman/Skins/car-preset -@dirrm share/apps/kaiman -@dirrm share/apps/artscontrol -@dirrm share/apps/aktion/toolbar -@dirrm share/apps/aktion -@dirrm share/applnk/Settings/Sound -@dirrm share/applnk/Multimedia -@dirrm lib/Arts -@dirrm lib -@dirrm bin diff --git a/audio/libshout2/Makefile b/audio/libshout2/Makefile deleted file mode 100644 index efae89beb1ab..000000000000 --- a/audio/libshout2/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# New ports collection makefile for: libshout -# Date created: 06 Jun 2000 -# Whom: zach@pabst.bendnet.com -# -# $FreeBSD$ -# - -PORTNAME= libshout -PORTVERSION= 1.0.3 -CATEGORIES= audio net -MASTER_SITES= http://developer.icecast.org/libshout/releases/ - -MAINTAINER= zach@pabst.bendnet.com - -GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes -PLIST_SUB+= PORTVERSION=${PORTVERSION} - -.include <bsd.port.mk> diff --git a/audio/libshout2/distinfo b/audio/libshout2/distinfo deleted file mode 100644 index 426a018d6f93..000000000000 --- a/audio/libshout2/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (libshout-1.0.3.tar.gz) = d4d6117dd971febc485ec2b5117fab40 diff --git a/audio/libshout2/files/patch-aa b/audio/libshout2/files/patch-aa deleted file mode 100644 index 38fbcef5d597..000000000000 --- a/audio/libshout2/files/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ ---- Makefile.in.orig Sun May 7 23:13:49 2000 -+++ Makefile.in Tue Jun 6 16:54:30 2000 -@@ -486,9 +486,9 @@ - - install-data-local: - mkdir -p $(DESTDIR)$(includedir)/shout -- mkdir -p $(DESTDIR)$(prefix)/doc/$(PACKAGE)-$(VERSION)/example -- $(INSTALL) -m 0644 README AUTHORS COPYING CHANGES $(DESTDIR)$(prefix)/doc/$(PACKAGE)-$(VERSION) -- $(INSTALL) -m 0644 example/Makefile example/example.c $(DESTDIR)$(prefix)/doc/$(PACKAGE)-$(VERSION)/example -+ mkdir -p $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)-$(VERSION)/example -+ $(INSTALL) -m 0644 README AUTHORS COPYING CHANGES $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)-$(VERSION) -+ $(INSTALL) -m 0644 example/Makefile example/example.c $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)-$(VERSION)/example - $(INSTALL) -m 0644 shout.h $(DESTDIR)$(includedir)/shout - - # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/audio/libshout2/files/patch-ab b/audio/libshout2/files/patch-ab deleted file mode 100644 index 568ff5c0b299..000000000000 --- a/audio/libshout2/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/Makefile.in.orig Sun May 7 23:13:50 2000 -+++ doc/Makefile.in Tue Jun 6 16:56:33 2000 -@@ -78,7 +78,7 @@ - - AUTOMAKE_OPTIONS = foreign - --docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION) -+docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION) - - doc_DATA = index.html overview.html initialization.html connection.html datastreaming.html metadata.html datastructures.html shout_conn_t.html shout_connect.html shout_disconnect.html shout_sleep.html shout_init_connection.html shout_send_data.html shout_update_metadata.html style.css example.html example_c.html reference.html - diff --git a/audio/libshout2/pkg-comment b/audio/libshout2/pkg-comment deleted file mode 100644 index e5b650179863..000000000000 --- a/audio/libshout2/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -A library providing routines for connecting and transmitting data to the icecast server diff --git a/audio/libshout2/pkg-descr b/audio/libshout2/pkg-descr deleted file mode 100644 index e25884891692..000000000000 --- a/audio/libshout2/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -A port of the libshout library. Libshout allows applications to easily -communicate and broadcast to an Icecast streaming media server. It handles the -socket connections, metadata communication, and data streaming for the calling -application, and lets developers focus on feature sets instead of -implementation details. - -WWW: http://developer.icecast.org/libshout/ - -- Zach -zach@pabst.bendnet.com diff --git a/audio/libshout2/pkg-plist b/audio/libshout2/pkg-plist deleted file mode 100644 index 0111fd02935a..000000000000 --- a/audio/libshout2/pkg-plist +++ /dev/null @@ -1,32 +0,0 @@ -lib/libshout.a -lib/libshout.la -lib/libshout.so -lib/libshout.so.1 -include/shout/shout.h -@dirrm include/shout -share/doc/libshout-%%PORTVERSION%%/example.html -share/doc/libshout-%%PORTVERSION%%/example/Makefile -share/doc/libshout-%%PORTVERSION%%/example/example.c -share/doc/libshout-%%PORTVERSION%%/example_c.html -@dirrm share/doc/libshout-%%PORTVERSION%%/example -share/doc/libshout-%%PORTVERSION%%/AUTHORS -share/doc/libshout-%%PORTVERSION%%/CHANGES -share/doc/libshout-%%PORTVERSION%%/COPYING -share/doc/libshout-%%PORTVERSION%%/README -share/doc/libshout-%%PORTVERSION%%/connection.html -share/doc/libshout-%%PORTVERSION%%/datastreaming.html -share/doc/libshout-%%PORTVERSION%%/datastructures.html -share/doc/libshout-%%PORTVERSION%%/index.html -share/doc/libshout-%%PORTVERSION%%/initialization.html -share/doc/libshout-%%PORTVERSION%%/metadata.html -share/doc/libshout-%%PORTVERSION%%/overview.html -share/doc/libshout-%%PORTVERSION%%/reference.html -share/doc/libshout-%%PORTVERSION%%/shout_conn_t.html -share/doc/libshout-%%PORTVERSION%%/shout_connect.html -share/doc/libshout-%%PORTVERSION%%/shout_disconnect.html -share/doc/libshout-%%PORTVERSION%%/shout_init_connection.html -share/doc/libshout-%%PORTVERSION%%/shout_send_data.html -share/doc/libshout-%%PORTVERSION%%/shout_sleep.html -share/doc/libshout-%%PORTVERSION%%/shout_update_metadata.html -share/doc/libshout-%%PORTVERSION%%/style.css -@dirrm share/doc/libshout-%%PORTVERSION%% diff --git a/audio/libsidplay2/Makefile b/audio/libsidplay2/Makefile deleted file mode 100644 index a120de316b15..000000000000 --- a/audio/libsidplay2/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# New ports collection makefile for: libsidplay -# Date created: 31 October 1996 -# Whom: Stefan Zehl <sec@42.org> -# -# $FreeBSD$ -# - -PORTNAME= libsidplay -PORTVERSION= 1.36.44 -CATEGORIES= audio emulators -MASTER_SITES= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/ -DISTNAME= ${PORTNAME}-${PORTVERSION:S/./_/g} -EXTRACT_SUFX= .tgz - -MAINTAINER= sec@42.org - -FETCH_CMD= /usr/bin/fetch -WRKSRC= ${WRKDIR}/${PKGNAME} -USE_LIBTOOL= yes -INSTALLS_SHLIB= yes -USE_GMAKE= yes -USE_NEWGCC= yes - -.include <bsd.port.mk> diff --git a/audio/libsidplay2/distinfo b/audio/libsidplay2/distinfo deleted file mode 100644 index 32b37ca3bd3a..000000000000 --- a/audio/libsidplay2/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (libsidplay-1_36_44.tgz) = 3817743d04ee3c6acdffdc2aec38eea5 diff --git a/audio/libsidplay2/pkg-comment b/audio/libsidplay2/pkg-comment deleted file mode 100644 index cced7b195bac..000000000000 --- a/audio/libsidplay2/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -A Commodore SID-chip emulator library to play SID music files diff --git a/audio/libsidplay2/pkg-descr b/audio/libsidplay2/pkg-descr deleted file mode 100644 index e2604b8bdbf0..000000000000 --- a/audio/libsidplay2/pkg-descr +++ /dev/null @@ -1,17 +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. - -This is just the library. To actually use it, you need one of the -front-ends like 'sidplay' or 'xsidplay'. - -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 b6bd85dfee72..000000000000 --- a/audio/libsidplay2/pkg-plist +++ /dev/null @@ -1,14 +0,0 @@ -include/sidplay/compconf.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 -include/sidplay/libcfg.h -lib/libsidplay.a -lib/libsidplay.so.1 -lib/libsidplay.so -@dirrm include/sidplay diff --git a/audio/rat/Makefile b/audio/rat/Makefile deleted file mode 100644 index 64cf552aa219..000000000000 --- a/audio/rat/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# New ports collection makefile for: rat -# Date created: 3 July 1999 -# Whom: O.Hodson@cs.ucl.ac.uk (Orion Hodson) -# -# $FreeBSD$ -# - -PORTNAME= rat -PORTVERSION= 4.2.9 -PORTREVISION= 1 -CATEGORIES= mbone audio ipv6 -MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/4.2.9/ \ - ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= cpiazza - -MAINTAINER= O.Hodson@cs.ucl.ac.uk - -LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 - -USE_AUTOCONF= yes -USE_GMAKE= yes -MAN1= rat.1 -MANCOMPRESSED= no - -PATCH_DEBUG= yes - -RAT_BUILD_DIRS= common rat - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 400014 -ENABLE_IPv6= --enable-ipv6 -.endif - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/rat/rat ${PREFIX}/bin/rat - ${INSTALL_PROGRAM} ${WRKSRC}/rat/rat-ui ${PREFIX}/bin/rat-ui - ${INSTALL_PROGRAM} ${WRKSRC}/rat/rat-media ${PREFIX}/bin/rat-media - ${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 ${LOCALBASE}/etc/sdr/plugins - -do-build: - for d in ${RAT_BUILD_DIRS}; do \ - cd ${WRKSRC}/$$d && ${GMAKE}; \ - done - -do-configure: - cd ${WRKSRC}/common && autoconf && ./configure ${ENABLE_IPv6} - cd ${WRKSRC}/rat && autoconf && ./configure --with-tcl=${LOCALBASE} --with-tk=${LOCALBASE} ${ENABLE_IPv6} - -.include "bsd.port.post.mk" diff --git a/audio/rat/distinfo b/audio/rat/distinfo deleted file mode 100644 index a8da8d69316e..000000000000 --- a/audio/rat/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (rat-4.2.9.tar.gz) = f50915d37cfbd2a90d28342b17a2f4ab diff --git a/audio/rat/files/patch-aa b/audio/rat/files/patch-aa deleted file mode 100644 index deb3f511964d..000000000000 --- a/audio/rat/files/patch-aa +++ /dev/null @@ -1,941 +0,0 @@ -diff -uPr rat/MODS /home/oh/src/rat-newpcm/rat/MODS ---- rat/MODS Fri Sep 8 21:02:40 2000 -+++ /home/oh/src/rat-newpcm/rat/MODS Sat Sep 16 20:33:47 2000 -@@ -1,7 +1,7 @@ - MODIFICATIONS FILE - ------------------ - --$Id: MODS,v 1.225 2000/09/08 19:58:13 ucaccsp Exp $ -+$Id: MODS,v 1.226 2000/09/16 17:43:21 ucacoxh Exp $ - - Copyright (C) 1995-2000 University College London - All rights reserved. -@@ -1429,18 +1429,23 @@ - - Fix labelling of transcoder input/output ports - * Released 8 September 2000 - -- -- -- -+v4.2.9p1 - Added auddev_newpcm.[ch] with newpcm style mixer control. Includes -+ support for loopback and preservation of mixer settings so mixer is -+ returned to original state upon exit. [oh] -+ -+ Note: both driver interfaces (luigi, newpcm) are pulled in -+ by configure and this is possible whilst luigi pcm and -+ newpcm maintain the same function call interface. This may -+ break in future. Both are necessary because mixer operation -+ is not consistent between the two interfaces. - - TODO -- They're features not bugs dammit! - ---- - - - Assorted audio driver problems: -- - FreeBSD driver bug on SoundBlaster 16 has small write buffers -+ - Luigi pcm driver bug on SoundBlaster 16 has small write buffers - and stops working full duplex mode after a time. Hard to fix because - of cushion. -- - Loopback support is broken on FreeBSD newpcm driver. - - Broken auddev_pca with adding of audio interface conversion code. - FreeBSD 3.1 pca audio does not seem to work anymore. - - SunVideoPlus interface code does not work properly. The driver Sun -diff -uPr rat/acconfig.h /home/oh/src/rat-newpcm/rat/acconfig.h ---- rat/acconfig.h Fri Sep 8 21:02:44 2000 -+++ /home/oh/src/rat-newpcm/rat/acconfig.h Sat Sep 16 20:33:49 2000 -@@ -1,7 +1,7 @@ - /* - * Define this if your C library doesn't have usleep. - * -- * $Id: acconfig.h,v 1.10 2000/02/06 22:04:23 ucacoxh Exp $ -+ * $Id: acconfig.h,v 1.11 2000/09/16 17:43:22 ucacoxh Exp $ - */ - #undef NEED_USLEEP - #undef NEED_SNPRINTF -@@ -42,12 +42,15 @@ - #undef HAVE_SGI_AUDIO - #undef HAVE_PCA_AUDIO - #undef HAVE_LUIGI_AUDIO -+#undef HAVE_NEWPCM_AUDIO - #undef HAVE_OSS_AUDIO - #undef HAVE_HP_AUDIO - #undef HAVE_NETBSD_AUDIO - #undef HAVE_OSPREY_AUDIO - #undef HAVE_MACHINE_PCAUDIOIO_H - #undef HAVE_ALSA_AUDIO -+ -+#undef HAVE_IPv6 - - /* GSM related */ - #undef SASR -diff -uPr rat/auddev.c /home/oh/src/rat-newpcm/rat/auddev.c ---- rat/auddev.c Fri Sep 8 21:02:44 2000 -+++ /home/oh/src/rat-newpcm/rat/auddev.c Sat Sep 16 20:33:52 2000 -@@ -9,7 +9,7 @@ - - #ifndef HIDE_SOURCE_STRINGS - static const char cvsid[] = -- "$Id: auddev.c,v 1.58 2000/05/08 10:11:40 ucaccsp Exp $"; -+ "$Id: auddev.c,v 1.59 2000/09/16 17:43:22 ucacoxh Exp $"; - #endif /* HIDE_SOURCE_STRINGS */ - - #include "config_unix.h" -@@ -22,6 +22,7 @@ - #include "auddev.h" - #include "auddev_null.h" - #include "auddev_luigi.h" -+#include "auddev_newpcm.h" - #include "auddev_osprey.h" - #include "auddev_oss.h" - #include "auddev_alsa.h" -@@ -298,6 +299,38 @@ - luigi_audio_supports - }, - #endif /* HAVE_LUIGI_AUDIO */ -+#ifdef HAVE_NEWPCM_AUDIO -+ { -+ newpcm_audio_query_devices, -+ NULL, -+ newpcm_get_device_count, -+ newpcm_get_device_name, -+ newpcm_audio_open, -+ newpcm_audio_close, -+ newpcm_audio_drain, -+ newpcm_audio_duplex, -+ newpcm_audio_read, -+ newpcm_audio_write, -+ newpcm_audio_non_block, -+ newpcm_audio_block, -+ newpcm_audio_set_igain, -+ newpcm_audio_get_igain, -+ newpcm_audio_set_ogain, -+ newpcm_audio_get_ogain, -+ newpcm_audio_loopback, -+ newpcm_audio_oport_set, -+ newpcm_audio_oport_get, -+ newpcm_audio_oport_details, -+ newpcm_audio_oport_count, -+ newpcm_audio_iport_set, -+ newpcm_audio_iport_get, -+ newpcm_audio_iport_details, -+ newpcm_audio_iport_count, -+ newpcm_audio_is_ready, -+ newpcm_audio_wait_for, -+ newpcm_audio_supports -+ }, -+#endif /* HAVE_NEWPCM_AUDIO */ - #ifdef HAVE_PCA_AUDIO - { - pca_audio_init, -diff -uPr rat/auddev_luigi.c /home/oh/src/rat-newpcm/rat/auddev_luigi.c ---- rat/auddev_luigi.c Fri Sep 8 21:02:46 2000 -+++ /home/oh/src/rat-newpcm/rat/auddev_luigi.c Sat Sep 16 20:33:54 2000 -@@ -1,15 +1,13 @@ - /* - * FILE: auddev_luigi.c - Sound interface for Luigi Rizzo's FreeBSD driver - * -- * Modified to support newpcm (July 2000). -- * - * Copyright (c) 1996-2000 University College London - * All rights reserved. - */ - - #ifndef HIDE_SOURCE_STRINGS - static const char cvsid[] = -- "$Id: auddev_luigi.c,v 1.51 2000/07/23 10:33:29 ucacoxh Exp $"; -+ "$Id: auddev_luigi.c,v 1.52 2000/09/16 17:43:23 ucacoxh Exp $"; - #endif /* HIDE_SOURCE_STRINGS */ - - #include "config_unix.h" -@@ -51,24 +49,6 @@ - static audio_format *input_format, *output_format, *tmp_format; - static snd_capabilities soundcaps[LUIGI_MAX_AUDIO_DEVICES]; - --/* There are some differences between the FreeBSD 4x newpcm driver -- * and Luigi's pcm driver: -- * -- * 1) Mixer loopback writes are handled differently (not supported -- * on newpcm yet - new mixer infrastructure looks to be WIP) -- * -- * 2) newpcm does not set AFMT_FULLDUPLEX when device caps are queried. -- * Luigi's driver does. Luigi's driver also opens half-duplex devices -- * when open() use O_RDWR. So with Luigi's driver we have to check -- * AFMT_FULLDUPLEX, with newpcm we assume if device opens O_RDWR it -- * is full duplex. -- * -- * The variable is_newpcm indicates applications understanding of which -- * driver it is talking to. -- */ -- --static int is_newpcm; -- - int - luigi_audio_open(audio_desc_t ad, audio_format *ifmt, audio_format *ofmt) - { -@@ -100,16 +80,12 @@ - LUIGI_AUDIO_IOCTL(audio_fd,SNDCTL_DSP_RESET,0); - - /* Check card is full duplex - need for Luigi driver only */ -- if (is_newpcm == FALSE && -- (soundcaps[ad].formats & AFMT_FULLDUPLEX) == 0) { -+ if ((soundcaps[ad].formats & AFMT_FULLDUPLEX) == 0) { - fprintf(stderr, "Sorry driver does support full duplex for this soundcard\n"); - luigi_audio_close(ad); - return FALSE; - } - -- /* From newpcm source code it looks like AFMT_WEIRD is handled -- * by driver interface, but Luigi's driver needs this. -- */ - if (soundcaps[ad].formats & AFMT_WEIRD) { - /* this is a sb16/32/64... - * you can change either ifmt or ofmt to U8 -@@ -556,16 +532,14 @@ - ndev++; - } else if (strstr(buf, "newpcm")) { - /* This is a clunky check for the -- * newpcm driver. -+ * newpcm driver. Don't use luigi in this case - */ -- is_newpcm = TRUE; -+ ndev = 0; -+ break; - } - } - fclose(f); - } -- -- debug_msg("Audio driver is %s\n", -- (is_newpcm) ? "newpcm" : "luigi"); - - return (ndev); - } -diff -uPr rat/auddev_newpcm.c /home/oh/src/rat-newpcm/rat/auddev_newpcm.c ---- rat/auddev_newpcm.c Thu Jan 1 01:00:00 1970 -+++ /home/oh/src/rat-newpcm/rat/auddev_newpcm.c Sat Sep 16 20:33:54 2000 -@@ -0,0 +1,622 @@ -+/* -+ * FILE: auddev_newpcm.c - Sound interface for newpcm FreeBSD driver. -+ * -+ * Modified to support newpcm (July 2000). -+ * -+ * Copyright (c) 1996-2000 University College London -+ * All rights reserved. -+ */ -+ -+#ifndef HIDE_SOURCE_STRINGS -+static const char cvsid[] = -+ "$Id: auddev_newpcm.c,v 1.1 2000/09/16 17:43:23 ucacoxh Exp $"; -+#endif /* HIDE_SOURCE_STRINGS */ -+ -+#include "config_unix.h" -+#include "config_win32.h" -+#include "audio_types.h" -+#include "audio_fmt.h" -+#include "auddev_newpcm.h" -+#include "memory.h" -+#include "debug.h" -+ -+#include <machine/soundcard.h> -+ -+static char *port_names[] = SOUND_DEVICE_LABELS; -+static int iport, oport, loop; -+static snd_chan_param pa; -+static struct snd_size sz; -+static int audio_fd = -1; -+ -+#define RAT_TO_DEVICE(x) ((x) * 100 / MAX_AMP) -+#define DEVICE_TO_RAT(x) ((x) * MAX_AMP / 100) -+ -+#define NEWPCM_AUDIO_IOCTL(fd, cmd, val) if (ioctl((fd), (cmd), (val)) < 0) { \ -+ debug_msg("Failed %s - line %d\n",#cmd, __LINE__); \ -+ newpcm_error = __LINE__; \ -+ } -+ -+#define NEWPCM_MAX_AUDIO_NAME_LEN 32 -+#define NEWPCM_MAX_AUDIO_DEVICES 3 -+ -+static int dev_ids[NEWPCM_MAX_AUDIO_DEVICES]; -+static char names[NEWPCM_MAX_AUDIO_DEVICES][NEWPCM_MAX_AUDIO_NAME_LEN]; -+static int ndev = 0; -+static int newpcm_error; -+static audio_format *input_format, *output_format, *tmp_format; -+static snd_capabilities soundcaps[NEWPCM_MAX_AUDIO_DEVICES]; -+ -+static void newpcm_mixer_save(int fd); -+static void newpcm_mixer_restore(int fd); -+static void newpcm_mixer_init(int fd); -+static void newpcm_audio_loopback_config(int gain); -+ -+int -+newpcm_audio_open(audio_desc_t ad, audio_format *ifmt, audio_format *ofmt) -+{ -+ int32_t fragment; -+ char thedev[64]; -+ -+ assert(ad >= 0 && ad < ndev); -+ sprintf(thedev, "/dev/audio%d", dev_ids[ad]); -+ -+ debug_msg("Opening %s\n", thedev); -+ -+ audio_fd = open(thedev, O_RDWR); -+ if (audio_fd >= 0) { -+ /* Ignore any earlier errors */ -+ newpcm_error = 0; -+ -+ newpcm_mixer_save(audio_fd); -+ -+ NEWPCM_AUDIO_IOCTL(audio_fd, AIOGCAP, &soundcaps[ad]); -+ debug_msg("soundcaps[%d].rate_min = %d\n", ad, soundcaps[ad].rate_min); -+ debug_msg("soundcaps[%d].rate_max = %d\n", ad, soundcaps[ad].rate_max); -+ debug_msg("soundcaps[%d].formats = 0x%08lx\n", ad, soundcaps[ad].formats); -+ debug_msg("soundcaps[%d].bufsize = %d\n", ad, soundcaps[ad].bufsize); -+ debug_msg("soundcaps[%d].mixers = 0x%08lx\n", ad, soundcaps[ad].mixers); -+ debug_msg("soundcaps[%d].inputs = 0x%08lx\n", ad, soundcaps[ad].inputs); -+ debug_msg("soundcaps[%d].left = 0x%04lx\n", ad, soundcaps[ad].left); -+ debug_msg("soundcaps[%d].right = 0x%04lx\n", ad, soundcaps[ad].right); -+ -+ /* Setup input and output format settings */ -+ assert(ofmt->channels == ifmt->channels); -+ memset(&pa, 0, sizeof(pa)); -+ if (ifmt->channels == 2) { -+ if (!soundcaps[ad].formats & AFMT_STEREO) { -+ fprintf(stderr,"Driver does not support stereo for this soundcard\n"); -+ newpcm_audio_close(ad); -+ return FALSE; -+ } -+ pa.rec_format = AFMT_STEREO; -+ pa.play_format = AFMT_STEREO; -+ } -+ -+ switch(ifmt->encoding) { -+ case DEV_PCMU: pa.rec_format |= AFMT_MU_LAW; break; -+ case DEV_PCMA: pa.rec_format |= AFMT_A_LAW; break; -+ case DEV_S8: pa.rec_format |= AFMT_S8; break; -+ case DEV_S16: pa.rec_format |= AFMT_S16_LE; break; -+ case DEV_U8: pa.rec_format |= AFMT_U8; break; -+ } -+ -+ switch(ofmt->encoding) { -+ case DEV_PCMU: pa.play_format |= AFMT_MU_LAW; break; -+ case DEV_PCMA: pa.play_format |= AFMT_A_LAW; break; -+ case DEV_S8: pa.play_format |= AFMT_S8; break; -+ case DEV_S16: pa.play_format |= AFMT_S16_LE; break; -+ case DEV_U8: pa.play_format |= AFMT_U8; break; -+ } -+ pa.play_rate = ofmt->sample_rate; -+ pa.rec_rate = ifmt->sample_rate; -+ NEWPCM_AUDIO_IOCTL(audio_fd, AIOSFMT, &pa); -+ -+ sz.play_size = ofmt->bytes_per_block; -+ sz.rec_size = ifmt->bytes_per_block; -+ NEWPCM_AUDIO_IOCTL(audio_fd, AIOSSIZE, &sz); -+ -+ NEWPCM_AUDIO_IOCTL(audio_fd, AIOGSIZE, &sz); -+ debug_msg("rec size %d, play size %d bytes\n", -+ sz.rec_size, sz.play_size); -+ -+ /* Fragment : 8msb = #frags, 16lsbs = log2 fragsize */ -+ fragment = 0x08000007; -+ NEWPCM_AUDIO_IOCTL(audio_fd, SNDCTL_DSP_SETFRAGMENT, &fragment); -+ -+ if (newpcm_error != 0) { -+ /* Failed somewhere in initialization - reset error and exit*/ -+ newpcm_audio_close(ad); -+ newpcm_error = 0; -+ return FALSE; -+ } -+ -+ /* Store format in case we have to re-open device because -+ * of driver bug. Careful with freeing format as input format -+ * could be static input_format if device reset during write. -+ */ -+ tmp_format = audio_format_dup(ifmt); -+ if (input_format != NULL) { -+ audio_format_free(&input_format); -+ } -+ input_format = tmp_format; -+ -+ tmp_format = audio_format_dup(ofmt); -+ if (output_format != NULL) { -+ audio_format_free(&output_format); -+ } -+ output_format = tmp_format; -+ -+ newpcm_mixer_init(audio_fd); -+ /* Turn off loopback from input to output... not fatal so -+ * after error check. -+ */ -+ newpcm_audio_loopback(ad, 0); -+ -+ read(audio_fd, thedev, 64); -+ return TRUE; -+ } else { -+ fprintf(stderr, -+ "Could not open device: %s (half-duplex?)\n", -+ names[ad]); -+ perror("newpcm_audio_open"); -+ newpcm_audio_close(ad); -+ return FALSE; -+ } -+} -+ -+/* Close the audio device */ -+void -+newpcm_audio_close(audio_desc_t ad) -+{ -+ UNUSED(ad); -+ -+ if (audio_fd < 0) { -+ debug_msg("Device already closed!\n"); -+ return; -+ } -+ if (input_format != NULL) { -+ audio_format_free(&input_format); -+ } -+ if (output_format != NULL) { -+ audio_format_free(&output_format); -+ } -+ newpcm_mixer_restore(audio_fd); -+ newpcm_audio_drain(audio_fd); -+ close(audio_fd); -+ audio_fd = -1; -+} -+ -+/* Flush input buffer */ -+void -+newpcm_audio_drain(audio_desc_t ad) -+{ -+ u_char buf[4]; -+ int pre, post; -+ -+ assert(audio_fd > 0); -+ -+ NEWPCM_AUDIO_IOCTL(audio_fd, FIONREAD, &pre); -+ NEWPCM_AUDIO_IOCTL(audio_fd, SNDCTL_DSP_RESET, 0); -+ NEWPCM_AUDIO_IOCTL(audio_fd, SNDCTL_DSP_SYNC, 0); -+ NEWPCM_AUDIO_IOCTL(audio_fd, FIONREAD, &post); -+ debug_msg("audio drain: %d -> %d\n", pre, post); -+ read(audio_fd, buf, sizeof(buf)); -+ -+ UNUSED(ad); -+} -+ -+int -+newpcm_audio_duplex(audio_desc_t ad) -+{ -+ /* We only ever open device full duplex! */ -+ UNUSED(ad); -+ return TRUE; -+} -+ -+int -+newpcm_audio_read(audio_desc_t ad, u_char *buf, int read_bytes) -+{ -+ int done, this_read; -+ int len; -+ /* Figure out how many bytes we can read before blocking... */ -+ -+ UNUSED(ad); assert(audio_fd > 0); -+ -+ NEWPCM_AUDIO_IOCTL(audio_fd, FIONREAD, &len); -+ -+ len = min(len, read_bytes); -+ -+ /* Read the data... */ -+ done = 0; -+ while(done < len) { -+ this_read = read(audio_fd, (void*)buf, len - done); -+ done += this_read; -+ buf += this_read; -+ } -+ return done; -+} -+ -+int -+newpcm_audio_write(audio_desc_t ad, u_char *buf, int write_bytes) -+{ -+ int done; -+ -+ UNUSED(ad); assert(audio_fd > 0); -+ -+ done = write(audio_fd, (void*)buf, write_bytes); -+ if (done != write_bytes && errno != EINTR) { -+ /* Only ever seen this with soundblaster cards. -+ * Driver occasionally packs in reading. Seems to be -+ * no way to reset cleanly whilst running, even -+ * closing device, waiting a few 100ms and re-opening -+ * seems to fail. -+ */ -+ perror("Error writing device."); -+ fprintf(stderr, "Please email this message to rat-trap@cs.ucl.ac.uk with output of:\n\t uname -a\n\t cat /dev/sndstat\n"); -+ return (write_bytes - done); -+ } -+ -+ return write_bytes; -+} -+ -+/* Set ops on audio device to be non-blocking */ -+void -+newpcm_audio_non_block(audio_desc_t ad) -+{ -+ int frag = 1; -+ -+ UNUSED(ad); assert(audio_fd != -1); -+ -+ NEWPCM_AUDIO_IOCTL(audio_fd, SNDCTL_DSP_NONBLOCK, &frag); -+} -+ -+/* Set ops on audio device to be blocking */ -+void -+newpcm_audio_block(audio_desc_t ad) -+{ -+ int frag = 0; -+ -+ UNUSED(ad); assert(audio_fd > 0); -+ -+ NEWPCM_AUDIO_IOCTL(audio_fd, SNDCTL_DSP_NONBLOCK, &frag); -+} -+ -+ -+static int recmask, playmask; -+ -+static void -+newpcm_mixer_init(int fd) -+{ -+ int devmask; -+ -+ NEWPCM_AUDIO_IOCTL(fd, SOUND_MIXER_READ_RECMASK, &recmask); -+ -+ if (recmask & SOUND_MASK_MIC) { -+ iport = SOUND_MASK_MIC; -+ } else { -+ iport = 1; -+ while ((iport & recmask) == 0) { -+ iport <<= 1; -+ } -+ } -+ -+ NEWPCM_AUDIO_IOCTL(fd, SOUND_MIXER_READ_DEVMASK, &devmask); -+ playmask = devmask & ~recmask & ~SOUND_MASK_RECLEV; -+ debug_msg("devmask 0x%08x recmask 0x%08x playmask 0x%08x\n", -+ devmask, -+ recmask, -+ playmask); -+} -+ -+static int -+newpcm_count_ports(int mask) -+{ -+ int n = 0, m = mask; -+ -+ while (m > 0) { -+ n += (m & 0x01); -+ m >>= 1; -+ } -+ -+ return n; -+} -+ -+static int -+newpcm_get_nth_port_mask(int mask, int n) -+{ -+ static int lgmask; -+ -+ lgmask = -1; -+ do { -+ lgmask ++; -+ if ((1 << lgmask) & mask) { -+ n--; -+ } -+ } while (n >= 0); -+ -+ assert((1 << lgmask) & mask); -+ return lgmask; -+} -+ -+/* Gain and volume values are in the range 0 - MAX_AMP */ -+void -+newpcm_audio_set_ogain(audio_desc_t ad, int vol) -+{ -+ int volume, lgport, op; -+ -+ UNUSED(ad); assert(audio_fd > 0); -+ -+ volume = vol << 8 | vol; -+ -+ lgport = -1; -+ op = oport; -+ while (op > 0) { -+ op >>= 1; -+ lgport ++; -+ } -+ -+ NEWPCM_AUDIO_IOCTL(audio_fd, MIXER_WRITE(lgport), &volume); -+} -+ -+int -+newpcm_audio_get_ogain(audio_desc_t ad) -+{ -+ int volume, lgport, op; -+ -+ UNUSED(ad); assert(audio_fd > 0); -+ -+ lgport = -1; -+ op = oport; -+ while (op > 0) { -+ op >>= 1; -+ lgport ++; -+ } -+ -+ NEWPCM_AUDIO_IOCTL(audio_fd, MIXER_READ(lgport), &volume); -+ -+ return DEVICE_TO_RAT(volume & 0xff); /* Extract left channel volume */ -+} -+ -+void -+newpcm_audio_oport_set(audio_desc_t ad, audio_port_t port) -+{ -+ UNUSED(ad); -+ oport = port; -+ return; -+} -+ -+audio_port_t -+newpcm_audio_oport_get(audio_desc_t ad) -+{ -+ UNUSED(ad); -+ return oport; -+} -+ -+int -+newpcm_audio_oport_count(audio_desc_t ad) -+{ -+ UNUSED(ad); -+ return newpcm_count_ports(playmask); -+} -+ -+const audio_port_details_t* -+newpcm_audio_oport_details(audio_desc_t ad, int idx) -+{ -+ static audio_port_details_t ap; -+ int lgmask; -+ -+ UNUSED(ad); -+ -+ lgmask = newpcm_get_nth_port_mask(playmask, idx); -+ ap.port = 1 << lgmask; -+ sprintf(ap.name, "%s", port_names[lgmask]); -+ -+ return ≈ -+} -+ -+void -+newpcm_audio_set_igain(audio_desc_t ad, int gain) -+{ -+ int volume = RAT_TO_DEVICE(gain) << 8 | RAT_TO_DEVICE(gain); -+ -+ UNUSED(ad); assert(audio_fd > 0); -+ newpcm_audio_loopback_config(gain); -+ NEWPCM_AUDIO_IOCTL(audio_fd, SOUND_MIXER_WRITE_RECLEV, &volume); -+} -+ -+int -+newpcm_audio_get_igain(audio_desc_t ad) -+{ -+ int volume; -+ -+ UNUSED(ad); assert(audio_fd > 0); -+ NEWPCM_AUDIO_IOCTL(audio_fd, SOUND_MIXER_READ_RECLEV, &volume); -+ return (DEVICE_TO_RAT(volume & 0xff)); -+} -+ -+void -+newpcm_audio_iport_set(audio_desc_t ad, audio_port_t port) -+{ -+ /* Check port is in record mask */ -+ int gain; -+ -+ debug_msg("port 0x%08x recmask 0x%08x\n", port, recmask); -+ -+ assert((port & recmask) != 0); -+ -+ if (ioctl(audio_fd, SOUND_MIXER_WRITE_RECSRC, &port) < 0) { -+ perror("Unable to write record mask\n"); -+ return; -+ } -+ iport = port; -+ gain = newpcm_audio_get_igain(ad); -+ newpcm_audio_loopback_config(gain); -+ UNUSED(ad); -+} -+ -+audio_port_t -+newpcm_audio_iport_get(audio_desc_t ad) -+{ -+ UNUSED(ad); assert(audio_fd > 0); -+ return iport; -+} -+ -+int -+newpcm_audio_iport_count(audio_desc_t ad) -+{ -+ UNUSED(ad); -+ return newpcm_count_ports(recmask); -+} -+ -+const audio_port_details_t * -+newpcm_audio_iport_details(audio_desc_t ad, int idx) -+{ -+ static audio_port_details_t ap; -+ int lgmask; -+ -+ UNUSED(ad); -+ -+ lgmask = newpcm_get_nth_port_mask(recmask, idx); -+ ap.port = 1 << lgmask; -+ sprintf(ap.name, "%s", port_names[lgmask]); -+ -+ return ≈ -+} -+ -+void -+newpcm_audio_loopback(audio_desc_t ad, int gain) -+{ -+ UNUSED(ad); assert(audio_fd > 0); -+ loop = gain; -+} -+ -+static void -+newpcm_audio_loopback_config(int gain) -+{ -+ int lgport, vol; -+ -+ /* Find current input port id */ -+ lgport = newpcm_get_nth_port_mask(iport, 0); -+ -+ if (loop) { -+ vol = RAT_TO_DEVICE(gain) << 8 | RAT_TO_DEVICE(gain); -+ } else { -+ vol = 0; -+ } -+ -+ NEWPCM_AUDIO_IOCTL(audio_fd, MIXER_WRITE(lgport), &vol); -+} -+ -+void -+newpcm_audio_wait_for(audio_desc_t ad, int delay_ms) -+{ -+ if (!newpcm_audio_is_ready(ad)) { -+ usleep((unsigned int)delay_ms * 1000); -+ } -+} -+ -+int -+newpcm_audio_is_ready(audio_desc_t ad) -+{ -+ int avail; -+ -+ UNUSED(ad); -+ -+ NEWPCM_AUDIO_IOCTL(audio_fd, FIONREAD, &avail); -+ -+ return (avail >= sz.rec_size); -+} -+ -+int -+newpcm_audio_supports(audio_desc_t ad, audio_format *fmt) -+{ -+ snd_capabilities s; -+ -+ UNUSED(ad); -+ -+ NEWPCM_AUDIO_IOCTL(audio_fd, AIOGCAP, &s); -+ if (!newpcm_error) { -+ if ((unsigned)fmt->sample_rate < s.rate_min || (unsigned)fmt->sample_rate > s.rate_max) return FALSE; -+ if (fmt->channels == 1) return TRUE; /* Always supports mono */ -+ assert(fmt->channels == 2); -+ if (s.formats & AFMT_STEREO) return TRUE; -+ } -+ return FALSE; -+} -+ -+int -+newpcm_audio_query_devices() -+{ -+ FILE *f; -+ char buf[128], *p; -+ int n, newpcm = FALSE; -+ -+ f = fopen("/dev/sndstat", "r"); -+ if (f) { -+ while (!feof(f) && ndev < NEWPCM_MAX_AUDIO_DEVICES) { -+ p = fgets(buf, 128, f); -+ n = sscanf(buf, "pcm%d: <%[A-z0-9 ]>", dev_ids + ndev, names[ndev]); -+ if (p && n == 2) { -+ debug_msg("dev (%d) name (%s)\n", dev_ids[ndev], names[ndev]); -+ ndev++; -+ } else if (strstr(buf, "newpcm")) { -+ newpcm = TRUE; -+ } -+ } -+ fclose(f); -+ } -+ -+ if (newpcm == FALSE) { -+ ndev = 0; /* Should be using Luigi's interface */ -+ } -+ -+ return (ndev); -+} -+ -+int -+newpcm_get_device_count() -+{ -+ return ndev; -+} -+ -+char * -+newpcm_get_device_name(audio_desc_t idx) -+{ -+ if (idx >=0 && idx < ndev) { -+ return names[idx]; -+ } -+ return NULL; -+} -+ -+/* Functions to save and restore recording source and mixer levels */ -+ -+static int saved_rec_mask, saved_gain_values[SOUND_MIXER_NRDEVICES]; -+ -+static void -+newpcm_mixer_save(int fd) -+{ -+ int devmask, i; -+ NEWPCM_AUDIO_IOCTL(fd, SOUND_MIXER_READ_RECSRC, &saved_rec_mask); -+ NEWPCM_AUDIO_IOCTL(fd, SOUND_MIXER_READ_DEVMASK, &devmask); -+ for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) { -+ if ((1 << i) & devmask) { -+ NEWPCM_AUDIO_IOCTL(fd, MIXER_READ(i), &saved_gain_values[i]); -+ } else { -+ saved_gain_values[i] = 0; -+ } -+ } -+} -+ -+static void -+newpcm_mixer_restore(int fd) -+{ -+ int devmask, i; -+ NEWPCM_AUDIO_IOCTL(fd, SOUND_MIXER_WRITE_RECSRC, &saved_rec_mask); -+ -+ NEWPCM_AUDIO_IOCTL(fd, SOUND_MIXER_READ_DEVMASK, &devmask); -+ for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) { -+ if ((1 << i) & devmask) { -+ NEWPCM_AUDIO_IOCTL(fd, MIXER_WRITE(i), &saved_gain_values[i]); -+ } -+ } -+} -diff -uPr rat/auddev_newpcm.h /home/oh/src/rat-newpcm/rat/auddev_newpcm.h ---- rat/auddev_newpcm.h Thu Jan 1 01:00:00 1970 -+++ /home/oh/src/rat-newpcm/rat/auddev_newpcm.h Sat Sep 16 20:33:54 2000 -@@ -0,0 +1,52 @@ -+/* -+ * FILE: auddev_newpcm.h -+ * PROGRAM: RAT -+ * AUTHOR: Orion Hodson -+ * -+ * Copyright (c) 1998-2000 University College London -+ * All rights reserved. -+ * -+ * $Id: auddev_newpcm.h,v 1.1 2000/09/16 17:43:24 ucacoxh Exp $ -+ */ -+ -+#ifndef _AUDDEV_NEWPCM_H_ -+#define _AUDDEV_NEWPCM_H_ -+ -+int newpcm_audio_open (audio_desc_t ad, audio_format* ifmt, audio_format *ofmt); -+void newpcm_audio_close (audio_desc_t ad); -+void newpcm_audio_drain (audio_desc_t ad); -+int newpcm_audio_duplex (audio_desc_t ad); -+ -+void newpcm_audio_set_igain (audio_desc_t ad, int gain); -+int newpcm_audio_get_igain (audio_desc_t ad); -+void newpcm_audio_set_ogain (audio_desc_t ad, int vol); -+int newpcm_audio_get_ogain (audio_desc_t ad); -+void newpcm_audio_loopback (audio_desc_t ad, int gain); -+ -+int newpcm_audio_read (audio_desc_t ad, u_char *buf, int buf_len); -+int newpcm_audio_write (audio_desc_t ad, u_char *buf, int buf_len); -+void newpcm_audio_non_block (audio_desc_t ad); -+void newpcm_audio_block (audio_desc_t ad); -+ -+void newpcm_audio_oport_set (audio_desc_t ad, audio_port_t port); -+audio_port_t newpcm_audio_oport_get (audio_desc_t ad); -+int newpcm_audio_oport_count (audio_desc_t ad); -+const audio_port_details_t* -+ newpcm_audio_oport_details (audio_desc_t ad, int idx); -+ -+void newpcm_audio_iport_set (audio_desc_t ad, audio_port_t port); -+audio_port_t newpcm_audio_iport_get (audio_desc_t ad); -+int newpcm_audio_iport_count (audio_desc_t ad); -+const audio_port_details_t* -+ newpcm_audio_iport_details (audio_desc_t ad, int idx); -+ -+int newpcm_audio_is_ready (audio_desc_t ad); -+void newpcm_audio_wait_for (audio_desc_t ad, int delay_ms); -+int newpcm_audio_supports (audio_desc_t ad, audio_format *f); -+ -+/* Functions to get names of devices */ -+int newpcm_audio_query_devices (void); -+int newpcm_get_device_count (void); -+char *newpcm_get_device_name (audio_desc_t ad); -+ -+#endif /* _AUDDEV_NEWPCM_H_ */ -diff -uPr rat/config.h.in /home/oh/src/rat-newpcm/rat/config.h.in ---- rat/config.h.in Fri Sep 8 21:03:01 2000 -+++ /home/oh/src/rat-newpcm/rat/config.h.in Sat Sep 16 20:34:04 2000 -@@ -27,7 +27,7 @@ - /* - * Define this if your C library doesn't have usleep. - * -- * $Id: config.h.in,v 1.18 2000/03/03 15:05:32 ucaccsp Exp $ -+ * $Id: config.h.in,v 1.19 2000/09/16 17:43:24 ucacoxh Exp $ - */ - #undef NEED_USLEEP - #undef NEED_SNPRINTF -@@ -68,12 +68,15 @@ - #undef HAVE_SGI_AUDIO - #undef HAVE_PCA_AUDIO - #undef HAVE_LUIGI_AUDIO -+#undef HAVE_NEWPCM_AUDIO - #undef HAVE_OSS_AUDIO - #undef HAVE_HP_AUDIO - #undef HAVE_NETBSD_AUDIO - #undef HAVE_OSPREY_AUDIO - #undef HAVE_MACHINE_PCAUDIOIO_H - #undef HAVE_ALSA_AUDIO -+ -+#undef HAVE_IPv6 - - /* GSM related */ - #undef SASR -diff -uPr common/configure.in /home/oh/src/rat-newpcm/common/configure.in ---- common/configure.in Sat Sep 9 05:02:27 2000 -+++ /home/oh/src/rat-newpcm/common/configure.in Thu Sep 21 10:15:12 2000 -@@ -179,7 +179,7 @@ - AC_DEFINE(HAVE_IPv6) - case "$host_os" in - # FreeBSD Kame uses seperate libinet6 -- freebsd*) -+ freebsd[23]*) - LIBS="$LIBS -L/usr/local/v6/lib -linet6" - ;; - *) ;; -@@ -216,6 +216,7 @@ - #ifdef HAVE_NETINET6_IN6_H - #include <netinet6/in6.h> - #else -+ #include <sys/types.h> - #include <netinet/in.h> - #endif /* HAVE_NETINET_IN6_H */ - ],[ diff --git a/audio/rat/files/patch-ab b/audio/rat/files/patch-ab deleted file mode 100644 index 4df1138df8e8..000000000000 --- a/audio/rat/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- rat/sdr2.plugin.in.orig Sat Sep 16 19:54:48 2000 -+++ rat/sdr2.plugin.in Sat Sep 16 19:55:02 2000 -@@ -14,7 +14,7 @@ - - media:audio - proto:RTP/AVP --tool:rat-VERSION -+tool:rat - protoname:RTP - cryptflag:-K - diff --git a/audio/rat/files/patch-ac b/audio/rat/files/patch-ac deleted file mode 100644 index d2591df82283..000000000000 --- a/audio/rat/files/patch-ac +++ /dev/null @@ -1,120 +0,0 @@ ---- rat/configure.in.orig Thu Sep 21 10:50:51 2000 -+++ rat/configure.in Thu Sep 21 10:51:20 2000 -@@ -1,5 +1,5 @@ - dnl UCL RAT configure script. --dnl $Header: /cs/research/mice/starship/src/local/CVS_repository/rat/configure.in,v 1.38 2000/03/23 10:00:53 ucacoxh Exp $ -+dnl $Header: /cs/research/mice/starship/src/local/CVS_repository/rat/configure.in,v 1.39 2000/09/16 17:43:25 ucacoxh Exp $ - dnl - dnl Process this file with GNU autoconf to generate a configure script. - -@@ -195,9 +195,12 @@ - AU_OBJ="$AU_OBJ auddev_pca.o" - AC_DEFINE(HAVE_PCA_AUDIO) - fi -- # Luigi's driver -- AU_OBJ="$AU_OBJ auddev_luigi.o" -- AC_DEFINE(HAVE_LUIGI_AUDIO) -+ # Note luigi and newpcm have compatible soundcard.h files but -+ # mixer behaves differently under both systems. During runtime -+ # only one of these modules will be used. -+ AU_OBJ="$AU_OBJ auddev_luigi.o auddev_newpcm.o" -+ AC_DEFINE(HAVE_LUIGI_AUDIO) -+ AC_DEFINE(HAVE_NEWPCM_AUDIO) - ;; - *netbsd*) - AU_OBJ="$AUDIOBJ auddev_netbsd.o" -@@ -277,12 +280,12 @@ - # We could be dealing with a source installation or a full installation. - # Expect a source installation to have headers in TCL8_HOME/generic and libs in - # TCL8_HOME/unix. A full installation should have headers in --# INSTDIR/include/tcl8.0, or INSTDIR/include, and have libraries be in -+# INSTDIR/include/tcl8.2, or INSTDIR/include, and have libraries be in - # INSTDIR/lib. - #------------------------------------------------------------------------------ - PARENT=`echo $PWD | sed -e 's%/[[^/]]*$%%'` --TCL_INC=${PARENT}/tcl-8.0 --TCL_LIB=${PARENT}/tcl-8.0 -+TCL_INC=${PARENT}/tcl-8.2 -+TCL_LIB=${PARENT}/tcl-8.2 - - AC_ARG_WITH(tcl, - [ --with-tcl=DIR specify location of Tcl installation], -@@ -292,7 +295,7 @@ - #----------------------------------------------------------------------------- - # Depending on config expect tcl.h to be tcl source dir or include path - #----------------------------------------------------------------------------- --for i in $TCL_INC/generic $TCL_INC/include/tcl8.0 $TCL_INC/include $TCL_INC -+for i in $TCL_INC/generic $TCL_INC/include/tcl8.2 $TCL_INC/include $TCL_INC - do - if test -d $i ; then - TCL_INC=$i -@@ -327,7 +330,7 @@ - SAVED_LIBS=$LIBS - LIBS="" - FOUND_TCL_LIB=no --AC_SEARCH_LIBS(Tcl_Init, tcl8.0 tcl80, -+AC_SEARCH_LIBS(Tcl_Init, tcl8.2 tcl82, - FOUND_TCL_LIB=yes, - , - -L${TCL_LIB} ${SAVED_LIBS} -lm) -@@ -343,8 +346,8 @@ - exit - fi - --TK_INC=${PARENT}/tk-8.0 --TK_LIB=${PARENT}/tk-8.0 -+TK_INC=${PARENT}/tk-8.2 -+TK_LIB=${PARENT}/tk-8.2 - - AC_ARG_WITH(tk, - [ --with-tk=DIR specify location of Tk installation], -@@ -356,7 +359,7 @@ - # include tcl.h, Xlib.h, Xutil.h before tk.h. - #----------------------------------------------------------------------------- - FOUND_TK_INC=0 --for i in $TK_INC/generic $TK_INC/include/tk8.0 $TK_INC/include $TK_INC -+for i in $TK_INC/generic $TK_INC/include/tk8.2 $TK_INC/include $TK_INC - do - AC_MSG_CHECKING(for $i/tk.h) - if test -r $i/tk.h ; then -@@ -388,7 +391,7 @@ - SAVED_LIBS=$LIBS - LIBS="" - FOUND_TK_LIB=no --AC_SEARCH_LIBS(Tk_Init, tk8.0 tk80, -+AC_SEARCH_LIBS(Tk_Init, tk8.2 tk82, - FOUND_TK_LIB=yes, - , - -L${TK_LIB} ${TCL_LIB} $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS ${SAVED_LIBS} -lm) -@@ -419,7 +422,7 @@ - AC_DEFINE(HAVE_IPv6) - case "$host_os" in - # FreeBSD Kame uses seperate libinet6 -- freebsd*) -+ freebsd[23]*) - LIBS="$LIBS -L/usr/local/v6/lib -linet6" - ;; - *) ;; -@@ -463,20 +466,8 @@ - COMMON_LIB=${COMMON_LIB}/lib - fi - --AC_CHECK_LIB(uclmmbase, -- mbus_init, -- [ -- EXTERNAL_DEP="${EXTERNAL_DEP} ${COMMON_LIB}/libuclmmbase.a" -- COMMON_LIB="-L${COMMON_LIB} -luclmmbase" -- ], -- [ -- echo "Could not find libuclmmbase.a. One of the following halted progess:" -- echo " (a) Library is not installed." -- echo " (b) Library is not built or not in expected location (--with-common=DIR)." -- echo " (c) this script failed to see it (please inform rat-trap@cs.ucl.ac.uk)." -- exit -- ], -- -L${COMMON_LIB}) -+EXTERNAL_DEP="${EXTERNAL_DEP} ${COMMON_LIB}/libuclmmbase.a" -+COMMON_LIB="-L${COMMON_LIB} -luclmmbase" - - AC_SUBST(COMMON_INC) - AC_SUBST(COMMON_LIB) diff --git a/audio/rat/files/patch-ad b/audio/rat/files/patch-ad deleted file mode 100644 index aa499c0f54ab..000000000000 --- a/audio/rat/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ ---- rat/Makefile.in.orig Sat Sep 16 20:45:21 2000 -+++ rat/Makefile.in Sat Sep 16 20:45:29 2000 -@@ -15,7 +15,7 @@ - ECHO = echo - - VERSION = @VERSION@ --RATVER = rat-$(VERSION) -+RATVER = rat - - AU_OBJ = @AU_OBJ@ - AU_INC = @AU_INC@ diff --git a/audio/rat/files/patch-af b/audio/rat/files/patch-af deleted file mode 100644 index f6f25611a616..000000000000 --- a/audio/rat/files/patch-af +++ /dev/null @@ -1,41 +0,0 @@ ---- rat/Makefile.in.prefix Fri Sep 8 21:02:41 2000 -+++ rat/Makefile.in Sun Sep 17 03:00:53 2000 -@@ -13,6 +13,7 @@ - AR = ar - RANLIB = @RANLIB@ - ECHO = echo -+STRIP = strip - - VERSION = @VERSION@ - RATVER = rat-$(VERSION) -@@ -122,7 +123,7 @@ - @${ECHO} "Generating version.h" - @sed -e 's/.*/#define RAT_VERSION "&"/' VERSION > version.h - --sdr2.plugin.S02.audio.rtp.-.rat-$(VERSION): sdr2.plugin.in -+sdr2.plugin.S02.audio.rtp.-.$(RATVER): sdr2.plugin.in - @${ECHO} "Generating sdr plugin" - @${ECHO} "# Generated automatically from sdr2.plugin.in" > $@ - @${ECHO} "# DO NOT EDIT THIS FILE" >> $@ -@@ -147,9 +148,9 @@ - -rm -rf core core-$(RATVER)-media core-$(RATVER)-ui - - install: all -- ./install-sh -m 555 -c $(RATVER) $(bindir) -- ./install-sh -m 555 -c $(RATVER)-media $(bindir) -- ./install-sh -m 555 -c $(RATVER)-ui $(bindir) -+ ./install-sh -m 555 -s $(STRIP) -c $(RATVER) $(bindir) -+ ./install-sh -m 555 -s $(STRIP) -c $(RATVER)-media $(bindir) -+ ./install-sh -m 555 -s $(STRIP) -c $(RATVER)-ui $(bindir) - ./install-sh -m 444 -c man/man1/rat.1 $(mandir)/man1/rat.1 - ./install-sh -m 444 -c sdr2.plugin.S02.audio.rtp.-.$(RATVER) $(prefix)/etc/sdr/plugins - -@@ -180,7 +181,7 @@ - cvs tag release-`cat VERSION | sed "s/\./-/g"` - - $(RATVER)-$(OSTYPE).tar.gz: $(RATVER) $(RATVER)-ui $(RATVER)-media -- tar cf $(RATVER)-$(OSTYPE).tar README.* MODS COPYRIGHT INSTALL.TXT VERSION $(RATVER) $(RATVER)-ui $(RATVER)-media sdr2.plugin.S02.audio.rtp.-.rat-$(VERSION) -+ tar cf $(RATVER)-$(OSTYPE).tar README.* MODS COPYRIGHT INSTALL.TXT VERSION $(RATVER) $(RATVER)-ui $(RATVER)-media sdr2.plugin.S02.audio.rtp.-.$(RATVER) - rm -f $(RATVER)-$(OSTYPE).tar.gz - gzip -9 $(RATVER)-$(OSTYPE).tar - diff --git a/audio/rat/files/patch-ag b/audio/rat/files/patch-ag deleted file mode 100644 index 66d4d30c2beb..000000000000 --- a/audio/rat/files/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ ---- rat/main_control.c.brokenbin Sun Sep 17 02:26:19 2000 -+++ rat/main_control.c Sun Sep 17 02:26:38 2000 -@@ -34,8 +34,8 @@ - #define ENGINE_NAME "ratmedia.exe" - #define CONTROL_NAME "rat.exe" - #else --#define UI_NAME "rat-"##RAT_VERSION##"-ui" --#define ENGINE_NAME "rat-"##RAT_VERSION##"-media" -+#define UI_NAME "rat-ui" -+#define ENGINE_NAME "rat-media" - #endif - - #define DEFAULT_RTP_PORT 5004 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 e0000def1a7c..000000000000 --- a/audio/rat/pkg-plist +++ /dev/null @@ -1,6 +0,0 @@ -bin/rat -bin/rat-ui -bin/rat-media -etc/sdr/plugins/sdr2.plugin.S02.audio.rtp.-.rat -@dirrm etc/sdr/plugins -@dirrm etc/sdr diff --git a/audio/speak_freely/Makefile b/audio/speak_freely/Makefile deleted file mode 100644 index c678bc233df4..000000000000 --- a/audio/speak_freely/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# New ports collection makefile for: speak_freely -# Date created: 18 Apr 1996 -# Whom: Mister X (to make portlint happy ;) -# -# $FreeBSD$ -# - -PORTNAME= speak_freely -PORTVERSION= 7.1 -CATEGORIES= mbone audio security -MASTER_SITES= http://www.fourmilab.ch/speakfree/unix/ - -MAINTAINER= ports@FreeBSD.org - -LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm - -UTILS= sfspeaker sfmike sflwl sflaunch -DEMNS= sfecho sflwld sfreflect -DDEMNS= sfvod -SFLIB= ${PREFIX}/lib/speak_freely -MAN1= ${UTILS:S/$/.1/} ${DEMNS:S/$/.1/} ${DDEMNS:S/$/.1/} - -MAKE_ENV="OPTFLAGS=${CFLAGS}" - -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 1e09161e5bf1..000000000000 --- a/audio/speak_freely/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (speak_freely-7.1.tar.gz) = f06e4115c7139f7e30ea57064b324558 diff --git a/audio/speak_freely/files/patch-aa b/audio/speak_freely/files/patch-aa deleted file mode 100644 index 63bbf0206ecd..000000000000 --- a/audio/speak_freely/files/patch-aa +++ /dev/null @@ -1,116 +0,0 @@ ---- Makefile.orig Sat Sep 18 18:29:44 1999 -+++ Makefile Wed Jan 5 20:23:52 2000 -@@ -3,7 +3,7 @@ - - # Debugging options - --DEBUG = -g -DHEXDUMP -+#DEBUG = -g -DHEXDUMP - #DEBUG = -g -DHEXDUMP -DNOCRYPTO - #DEBUG = -O - -@@ -38,9 +38,9 @@ - # functionality is working. Please see the detailed description - # of the available flags which follows these declarations. - # --CCFLAGS = -DAUDIO_BLOCKING -DLINUX -DHALF_DUPLEX -DM_LITTLE_ENDIAN --CC = gcc -O3 # for GNU's gcc compiler --LFLAGS = -lncurses -lm -+#CCFLAGS = -DAUDIO_BLOCKING -DLINUX -DHALF_DUPLEX -DM_LITTLE_ENDIAN -+#CC = gcc -O3 # for GNU's gcc compiler -+#LFLAGS = -lncurses -lm - # - # If the above LFLAGS doesn't work, try the one below. - #LFLAGS = -lcurses -lm -@@ -220,8 +220,8 @@ - # 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 -+CCFLAGS = -DM_LITTLE_ENDIAN -DHALF_DUPLEX -+LFLAGS = -lcurses -ltermcap -lcompat -lm - - # Hewlett-Packard - # (courtesy of Marc Kilian) -@@ -269,7 +269,7 @@ - - # Compiler flags - --CFLAGS = $(DEBUG) -Iadpcm -Ilpc -Igsm/inc -Imd5 -Iidea -Ilibdes -Iblowfish $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN) -+CFLAGS = $(OPTFLAGS) $(DEBUG) -Iadpcm -Ilpc -I$(LOCALBASE)/include -Iidea -Ilibdes -Iblowfish $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN) - - PROGRAMS = sfspeaker sfmike sflaunch sflwld sflwl sfecho sfreflect sfvod - -@@ -278,12 +278,12 @@ - SPKROBJS = speaker.o codecs.o deskey.o g711.o rate.o rtpacket.o soundbyte.o ulaw.o usleep.o vatpkt.o vox.o audio_hp.o audio_sgi.o common.o - - sfspeaker: $(SPKROBJS) adpcmlib.o libblowfish.o lpclib.o lpc10lib.o gsmlib.o deslib.o md5lib.o idealib.o libdes.o xdsub.o -- $(CC) $(SPKROBJS) adpcm/adpcm-u.o blowfish/libblowfish.a des/des.a md5/md5.o idea/idea.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o xdsub.o libdes/libdes.a $(LFLAGS) -o sfspeaker -+ $(CC) $(SPKROBJS) adpcm/adpcm-u.o blowfish/libblowfish.a des/des.a -lmd idea/idea.a lpc10/liblpc10.a -L/usr/local/lib -lgsm 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 audio_hp.o audio_sgi.o - - sfmike: $(MIKEOBJS) adpcmlib.o libblowfish.o lpclib.o lpc10lib.o gsmlib.o deslib.o md5lib.o idealib.o libdes.o -- $(CC) $(MIKEOBJS) adpcm/adpcm-u.o des/des.a md5/md5.o idea/idea.a -lm blowfish/libblowfish.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o libdes/libdes.a $(LFLAGS) -o sfmike -+ $(CC) $(MIKEOBJS) adpcm/adpcm-u.o des/des.a -lmd idea/idea.a -lm blowfish/libblowfish.a lpc10/liblpc10.a -L/usr/local/lib -lgsm lpc/lpc.o libdes/libdes.a $(LFLAGS) -o sfmike - - LAUNCHOBJS = launch.o soundbyte.o usleep.o g711.o - -@@ -303,12 +303,12 @@ - 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 -+ $(CC) $(ECHOOBJS) -lmd adpcm/adpcm-u.o lpc/lpc.o $(LFLAGS) -o sfecho - - REFLECTOBJS = reflect.o codecs.o html.o g711.o rtpacket.o ulaw.o xdsub.o - - sfreflect: $(REFLECTOBJS) md5lib.o -- $(CC) $(REFLECTOBJS) md5/md5.o adpcm/adpcm-u.o lpc/lpc.o $(LFLAGS) -o sfreflect -+ $(CC) $(REFLECTOBJS) -lmd adpcm/adpcm-u.o lpc/lpc.o $(LFLAGS) -o sfreflect - - # Configure the voice on demand server for the platform's - # location of Perl and network constant definitions. -@@ -337,7 +337,7 @@ - # in make not necessarily available on all platforms. - - adpcmlib.o: -- ( echo "Building ADPCM library."; cd adpcm ; make CC="$(CC)" ) -+ ( echo "Building ADPCM library."; cd adpcm ; make CC="$(CC) $(CCFLAGS)" ) - echo "ADPCM" >adpcmlib.o - - deslib.o: -@@ -349,11 +349,11 @@ - echo "BLOWFISH" >libblowfish.o - - libdes.o: -- ( echo "Building LIBDES library."; cd libdes ; make -f Makefile.sf CC="$(CC) $(CCFLAGS) $(DEBUG)" ) -+ ( echo "Building LIBDES library."; cd libdes ; make -f Makefile.sf CC="$(CC) $(OPTFLAGS) $(CCFLAGS) $(DEBUG)" ) - echo "LIBDES" >libdes.o - - lpclib.o: -- ( echo "Building LPC library."; cd lpc ; make CC="$(CC) $(CCFLAGS) $(DEBUG)" ) -+ ( echo "Building LPC library."; cd lpc ; make CC="$(CC) $(OPTFLAGS) $(CCFLAGS) $(DEBUG)" ) - echo "LPC" >lpclib.o - - lpc10lib.o: -@@ -361,15 +361,15 @@ - echo "LPC" >lpc10lib.o - - gsmlib.o: -- ( echo "Building GSM library."; cd gsm ; make CC="$(CC)" ) -+# ( echo "Building GSM library."; cd gsm ; make CC="$(CC) $(CCFLAGS)" ) - echo "GSM" >gsmlib.o - - md5lib.o: -- ( echo "Building MD5 library."; cd md5 ; make CC="$(CC)" ) -+# ( echo "Building MD5 library."; cd md5 ; make CC="$(CC) $(CCFLAGS)" ) - echo "MD5" >md5lib.o - - idealib.o: -- ( echo "Building IDEA library."; cd idea ; make CC="$(CC)" ) -+ ( echo "Building IDEA library."; cd idea ; make CC="$(CC) $(CCFLAGS)" ) - echo "IDEA" >idealib.o - - # Object file dependencies diff --git a/audio/speak_freely/files/patch-ac b/audio/speak_freely/files/patch-ac deleted file mode 100644 index 999b8335bb16..000000000000 --- a/audio/speak_freely/files/patch-ac +++ /dev/null @@ -1,69 +0,0 @@ ---- mike.c.orig Tue Sep 14 08:27:51 1999 -+++ mike.c Fri Dec 31 15:29:10 1999 -@@ -132,8 +132,8 @@ - #endif /* UNIX420 */ - - #ifdef UNIX5 --#include <termio.h> --static struct termio old_term_params; -+#include <termios.h> -+static struct termios old_term_params; - #endif /* UNIX5 */ - - /* Set raw mode on terminal file. Basically, get the terminal into a -@@ -152,16 +152,16 @@ - #endif /* UNIX420 */ - - #ifdef UNIX5 -- struct termio term_params; -+ struct termios term_params; - -- ioctl(fileno(stdin), TCGETA, &old_term_params); -+ tcgetattr(fileno(stdin), &old_term_params); - term_params = old_term_params; - term_params.c_iflag &= ~(ICRNL|IXON|IXOFF); /* no cr translation */ - term_params.c_iflag &= ~(ISTRIP); /* no stripping of high order bit */ - term_params.c_oflag &= ~(OPOST); /* no output processing */ - term_params.c_lflag &= ~(ISIG|ICANON|ECHO); /* raw mode */ - term_params.c_cc[4] = 1; /* satisfy read after 1 char */ -- ioctl(fileno(stdin), TCSETAF, &term_params); -+ tcsetattr(fileno(stdin), TCSAFLUSH, &term_params); - #endif /* UNIX5 */ - /*printf("\n(raw)\n");*/ - } -@@ -180,7 +180,7 @@ - #endif /* UNIX420 */ - - #ifdef UNIX5 -- ioctl(fileno(stdin), TCSETAF, &old_term_params); -+ tcsetattr(fileno(stdin), TCSAFLUSH, &old_term_params); - #endif /* UNIX5 */ - /*printf("\n(cooked)\n");*/ - } -@@ -1144,7 +1144,7 @@ - /* SENDFILE -- Send a file or, if the file name is NULL or a - single period, send real-time sound input. */ - --static int sendfile(f) -+static int sfsendfile(f) - char *f; - { - soundbuf netbuf; -@@ -2306,7 +2306,7 @@ - return 1; - } - } else { -- int ok = sendfile(op); -+ int ok = sfsendfile(op); - if (ok != 0) - return ok; - sentfile++; -@@ -2318,7 +2318,7 @@ - usage(); - } else { - if (sentfile == 0) { -- return sendfile(NULL); -+ return sfsendfile(NULL); - } - } - diff --git a/audio/speak_freely/files/patch-ad b/audio/speak_freely/files/patch-ad deleted file mode 100644 index 9fcad35ba658..000000000000 --- a/audio/speak_freely/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ ---- adpcm/Makefile.orig Fri Dec 31 15:34:54 1999 -+++ adpcm/Makefile Fri Dec 31 15:35:09 1999 -@@ -1,7 +1,7 @@ - # - # Makefile for adpcm and test programs - # ------------------- --CFLAGS=-O -I.. -+CFLAGS+= -I.. - # May need this on a sun: - #CFLAGS=-O -I/usr/demo/SOUND - diff --git a/audio/speak_freely/files/patch-ae b/audio/speak_freely/files/patch-ae deleted file mode 100644 index 4af5b7701d04..000000000000 --- a/audio/speak_freely/files/patch-ae +++ /dev/null @@ -1,12 +0,0 @@ ---- soundbyte.c.orig Fri Dec 31 15:36:07 1999 -+++ soundbyte.c Fri Dec 31 15:38:58 1999 -@@ -13,7 +13,9 @@ - #ifdef Solaris - #include <sys/filio.h> - #else -+#ifndef __FreeBSD__ - #include <sys/dir.h> -+#endif - #include <sys/file.h> - #endif - diff --git a/audio/speak_freely/files/patch-af b/audio/speak_freely/files/patch-af deleted file mode 100644 index 8f99c43f7cd2..000000000000 --- a/audio/speak_freely/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ ---- blowfish/Makefile.orig Wed Jan 5 20:12:14 2000 -+++ blowfish/Makefile Wed Jan 5 20:15:02 2000 -@@ -18,7 +18,7 @@ - - MAKE=make -f Makefile - CC=cc --CFLAG= -O -+CFLAG= $(OPTFLAGS) - - #CC=gcc - #CFLAG= -O4 -funroll-loops -fomit-frame-pointer diff --git a/audio/speak_freely/files/patch-ag b/audio/speak_freely/files/patch-ag deleted file mode 100644 index 8de3e742784f..000000000000 --- a/audio/speak_freely/files/patch-ag +++ /dev/null @@ -1,8 +0,0 @@ ---- des/Makefile.orig Wed Jan 5 20:20:30 2000 -+++ des/Makefile Wed Jan 5 20:20:44 2000 -@@ -1,4 +1,4 @@ --CFLAGS=-O -+CFLAGS=$(OPTFLAGS) - - all: des.a - diff --git a/audio/speak_freely/files/patch-ah b/audio/speak_freely/files/patch-ah deleted file mode 100644 index 48e6d2a4b513..000000000000 --- a/audio/speak_freely/files/patch-ah +++ /dev/null @@ -1,11 +0,0 @@ ---- idea/Makefile.orig Wed Jan 5 20:20:55 2000 -+++ idea/Makefile Wed Jan 5 20:21:08 2000 -@@ -7,7 +7,7 @@ - # Compiler flags - - CC = cc --CFLAGS = -O -+CFLAGS = $(OPTFLAGS) - - all: idea.a - 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 1361a82873e2..000000000000 --- a/audio/speak_freely/pkg-descr +++ /dev/null @@ -1,11 +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. - -WWW: http://www.speakfreely.org/ - http://www.fourmilab.ch/speakfree/unix/index.html diff --git a/audio/speak_freely/pkg-plist b/audio/speak_freely/pkg-plist deleted file mode 100644 index 39a54f5325c1..000000000000 --- a/audio/speak_freely/pkg-plist +++ /dev/null @@ -1,11 +0,0 @@ -bin/sfspeaker -bin/sfmike -bin/sflwl -bin/sflaunch -sbin/sfecho -sbin/sflwld -sbin/sfreflect -sbin/sfvod -lib/speak_freely/ring.au -lib/speak_freely/busy.au -@dirrm lib/speak_freely diff --git a/audio/spiralsynthbaby/Makefile b/audio/spiralsynthbaby/Makefile deleted file mode 100644 index d9323821d1c1..000000000000 --- a/audio/spiralsynthbaby/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# New ports collection makefile for: spiralsynth -# Date created: 2000-09-05 -# Whom: Trevor Johnson <trevor@jpj.net> -# based on the NetBSD port -# -# $FreeBSD$ -# - -PORTNAME= spiralsynth -PORTVERSION= 0.1.5 -CATEGORIES= audio -MASTER_SITES= http://www.blueammonite.f9.co.uk/SpiralSynth/dload/ \ - http://jpj.net/~trevor/freebsd/ports/ -DISTNAME= SpiralSynth-${PORTVERSION} - -MAINTAINER= trevor@jpj.net - -LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk - -USE_X_PREFIX= yes - -GNU_CONFIGURE= yes - -WRKSRC= ${WRKDIR}/${DISTNAME} - -DOC_FILES= CHANGES COPYING README - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/SpiralSynth ${PREFIX}/bin -.if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/spiralsynth -.for i in ${DOC_FILES} - ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/spiralsynth -.endfor -.endif -.include <bsd.port.mk> diff --git a/audio/spiralsynthbaby/distinfo b/audio/spiralsynthbaby/distinfo deleted file mode 100644 index 477281bb5bc5..000000000000 --- a/audio/spiralsynthbaby/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (SpiralSynth-0.1.5.tar.gz) = 7c2cd6fe828ef52e9127425301b9bbef diff --git a/audio/spiralsynthbaby/pkg-comment b/audio/spiralsynthbaby/pkg-comment deleted file mode 100644 index 97494204d6ba..000000000000 --- a/audio/spiralsynthbaby/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -MIDI-capable synthesizer for X diff --git a/audio/spiralsynthbaby/pkg-descr b/audio/spiralsynthbaby/pkg-descr deleted file mode 100644 index 74b286c76cdb..000000000000 --- a/audio/spiralsynthbaby/pkg-descr +++ /dev/null @@ -1,23 +0,0 @@ -adapted from the Web page and the README: - -Spiral Synth is a physically modelled, monophonic, analogue -synthesizer. It is capable of creating the kind of sounds made by -hardware analogue synths, the noises used in electronic music. -You can also use it to make stranger sounds. MIDI is supported, -including velocity detection, mapped to the volume of the oscillators -(but you can also use the PC keyboard to play the synth). Output -is to /dev/dsp or in Microsoft RIFF (.WAV) format to a file. You -can save and recall your sounds using the 100 patch save slots. - -The PC keyboard can be used to play the synth, "q" & "z" are C, -and the keys progess from them, ie "2" is C#, "w" is D etc. These -are just the defaults, and can be changed from the .Spiralrc file. -The function keys change the octave. - -Sample output and a detailed list of features can be found on the -home page. - -WWW: http://www.blueammonite.f9.co.uk/SpiralSynth/ - -Trevor Johnson -trevor@jpj.net diff --git a/audio/spiralsynthbaby/pkg-plist b/audio/spiralsynthbaby/pkg-plist deleted file mode 100644 index c78b27bdc0b3..000000000000 --- a/audio/spiralsynthbaby/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -bin/SpiralSynth -share/doc/spiralsynth/CHANGES -share/doc/spiralsynth/COPYING -share/doc/spiralsynth/README -@dirrm share/doc/spiralsynth diff --git a/audio/vat/Makefile b/audio/vat/Makefile deleted file mode 100644 index 096f092a0284..000000000000 --- a/audio/vat/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# New ports collection makefile for: vat -# Date created: 2 November 1996 -# Whom: fenner -# -# $FreeBSD$ -# - -PORTNAME= vat -PORTVERSION= 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/files/patch-aj b/audio/vat/files/patch-aj deleted file mode 100644 index 5ee097c986d3..000000000000 --- a/audio/vat/files/patch-aj +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Thu Jan 27 18:55:52 2000 -+++ Makefile.in Thu Jan 27 18:56:07 2000 -@@ -39,7 +39,7 @@ - all: $(ALL) - - .cc.o: -- rm -f $@; $(C++) -c $(CFLAGS) $*.cc -+ rm -f $@; $(C++) -pedantic -c $(CFLAGS) $*.cc - - .c.o: - rm -f $@; $(CC) -o $@ -c $(CFLAGS) $*.c 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 |