30 files changed, 497 insertions, 0 deletions

diff --git a/audio/Makefile b/audio/Makefile
index b63ec610cdc5..feb176a5a1bb 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -59,6 +59,7 @@
     SUBDIR += gqmpeg
     SUBDIR += gramofile
     SUBDIR += grip
+    SUBDIR += gsi
     SUBDIR += gsm
     SUBDIR += holyshout
     SUBDIR += icecast
diff --git a/audio/gsi/Makefile b/audio/gsi/Makefile
new file mode 100644
index 000000000000..b1fde7c07fff
--- /dev/null
+++ b/audio/gsi/Makefile
@@ -0,0 +1,48 @@
+# New ports collection makefile for:	gsi
+# Date created:				3 October 2000
+# Whom:					Sean Farley <sean-freebsd@farley.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	gsi
+PORTVERSION=	0.9.4
+CATEGORIES=	audio
+MASTER_SITES=	http://www.farley.org/ \
+		http://www.xs4all.nl/~whs/gsi/bestanden/
+EXTRACT_SUFX=	.tgz
+
+MAINTAINER=	ports@FreeBSD.org
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
+USE_GMAKE=	yes
+INSTALLS_SHLIB=	yes
+
+MANCOMPRESSED=	no
+
+MAN1=		gsifile.1 gsiplay.1
+MAN3=		gsi.3 gsi_commands.3 gsi_events.3 gsif.3 gsipcm.3
+MAN5=		gsi.conf.5
+MAN7=		gsi_overview.7
+MAN8=		gsi_server.8
+
+pre-configure:
+	@${SH} ${FILESDIR}/configure.sh ${PREFIX} ${WRKSRC}
+
+post-install:
+	@${INSTALL_DATA} ${WRKSRC}/server.conf/gsi.conf.fbsd \
+		 ${PREFIX}/etc/gsi.conf.sample
+.for fileNdx in gsi_server gsifile gsiplay
+	@strip ${PREFIX}/bin/${fileNdx}
+.endfor
+.for lib in "" cd f midi_pcm mixer pcm synth
+	@strip ${PREFIX}/lib/libgsi${lib}.so.[02]
+.endfor
+	@${ECHO} "A sample configuration file was installed as" \
+		${PREFIX}/etc/gsi.conf.sample.
+	@${ECHO} "Copy and edit it to fit the system."
+	@${ECHO}
+	@${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.mk>
diff --git a/audio/gsi/distinfo b/audio/gsi/distinfo
new file mode 100644
index 000000000000..6b164c1cbe4b
--- /dev/null
+++ b/audio/gsi/distinfo
@@ -0,0 +1 @@
+MD5 (gsi-0.9.4.tgz) = d6d901b545d6bd2e264e8ed326fe07bf
diff --git a/audio/gsi/files/configure.sh b/audio/gsi/files/configure.sh
new file mode 100644
index 000000000000..8e483694c596
--- /dev/null
+++ b/audio/gsi/files/configure.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+PREFIX=$1
+SYSCONFSCRIPT=Config/Configure_system.sh
+APPCONFSCRIPT=Config/Configure_application.sh
+
+# Change to the work directory.
+cd $2
+
+# Execute two configure scripts while piping the output to /dev/null.
+# This is because the output looks somewhat mashed.
+echo -n "Executing ${SYSCONFSCRIPT}... "
+${SYSCONFSCRIPT} << _E_O_M_ > /dev/null 2>&1
+0
+${PREFIX}
+_E_O_M_
+echo "done."
+
+echo -n "Executing ${APPCONFSCRIPT}... "
+${APPCONFSCRIPT} << _E_O_M2_ > /dev/null 2>&1
+3
+
+
+
+
+_E_O_M2_
+echo "done."
+
+# Fix a file to reflect where the configuration file should be looked for.
+echo -n "Configuring server/config.c... "
+mv server/config.c server/config.c.orig
+cat server/config.c.orig | sed "s|/etc/gsi.conf|${PREFIX}&|" > server/config.c
+
+echo "done."
diff --git a/audio/gsi/files/patch-aa b/audio/gsi/files/patch-aa
new file mode 100644
index 000000000000..1a6c0840ad46
--- /dev/null
+++ b/audio/gsi/files/patch-aa
@@ -0,0 +1,18 @@
+--- ../gsi/Config/Choose.sh	Wed Jan  5 09:32:05 2000
++++ ./Config/Choose.sh	Thu Dec  7 18:59:20 2000
+@@ -7,15 +7,6 @@
+ 
+ prompt=$1
+ default=$2
+-if [ "$default" != "" ]; then
+-	default="[$default]"
+-fi
+-if [ "`echo '\c'`" != "" ]; then
+-	echo -e "$prompt $default \c"	>/dev/tty
+-else
+-	echo -ne "$prompt $default "	>/dev/tty
+-fi
+-#echo -e $prompt [$default] >/dev/tty
+ read answer
+ if [ "$answer" = "" ]; then
+ 	echo $2
diff --git a/audio/gsi/files/patch-ab b/audio/gsi/files/patch-ab
new file mode 100644
index 000000000000..b6a898d02f1c
--- /dev/null
+++ b/audio/gsi/files/patch-ab
@@ -0,0 +1,24 @@
+--- Config/Configure_application.sh.orig	Thu Feb 10 05:05:40 2000
++++ Config/Configure_application.sh	Thu Dec  7 19:20:18 2000
+@@ -274,8 +274,8 @@
+ # Optimize & debug:
+ # Include DEBUG code?
+ if [ "`$Ask 'Do you want to compile with DEBUG code included?' 'y'`" != "n" ]; then
+-	debug="-DDEBUG -g"
+-	optimize="-O2"
++	debug="-DDEBUG"
++#	optimize="-O2"
+ 
+ 	# Use NANA debugging library?
+ 	if [ "`$Ask '  Use the NANA debugging library? (probably only usable for GCC)' 'n'`" != "n" ]; then
+@@ -283,9 +283,8 @@
+ 		extralibs="$extralibs -lnana"
+ 	fi
+ 
+-else
+ 	# Default: full optimization:
+-	optimize="-O2 -fomit-frame-pointer"
++	optimize=""
+ 	optimize=`$Ask 'What optimization flags do you want to use?' "$optimize"`
+ fi
+ 
diff --git a/audio/gsi/files/patch-ac b/audio/gsi/files/patch-ac
new file mode 100644
index 000000000000..880f8e2aef2a
--- /dev/null
+++ b/audio/gsi/files/patch-ac
@@ -0,0 +1,11 @@
+--- ../gsi/applications/file/Makefile	Wed Feb  2 19:04:50 2000
++++ ./applications/file/Makefile	Thu Dec  7 18:59:20 2000
+@@ -23,7 +23,7 @@
+ 
+ INCLUDES	= -I../../include
+ 
+-CFLAGS		= -O2 -fomit-frame-pointer -DDEBUG -g -Wall
++CFLAGS		+= -Wall -DDEBUG
+ ALL_CFLAGS	= $(DEFINES) $(INCLUDES) $(CFLAGS)
+ 
+ 
diff --git a/audio/gsi/files/patch-ad b/audio/gsi/files/patch-ad
new file mode 100644
index 000000000000..e0cd91f156c5
--- /dev/null
+++ b/audio/gsi/files/patch-ad
@@ -0,0 +1,11 @@
+--- ../gsi/applications/player/Makefile	Wed Feb  2 19:05:01 2000
++++ ./applications/player/Makefile	Thu Dec  7 18:59:20 2000
+@@ -23,7 +23,7 @@
+ 
+ INCLUDES	= -I../../include
+ 
+-CFLAGS		= -O2 -fomit-frame-pointer -DDEBUG -g -Wall
++CFLAGS		+= -Wall -DDEBUG
+ ALL_CFLAGS	= $(DEFINES) $(INCLUDES) $(CFLAGS)
+ 
+ 
diff --git a/audio/gsi/files/patch-ae b/audio/gsi/files/patch-ae
new file mode 100644
index 000000000000..6499b591b2f4
--- /dev/null
+++ b/audio/gsi/files/patch-ae
@@ -0,0 +1,20 @@
+--- ../gsi/lib/gsi/Makefile	Wed Feb  2 19:02:05 2000
++++ ./lib/gsi/Makefile	Thu Dec  7 18:59:20 2000
+@@ -23,7 +23,7 @@
+ STATIC_LIB	= libgsi.a
+ DYNAMIC_LIB	= libgsi.so
+ LIB_NAME	= $(LIBGSI)
+-VERSION		= .0.1
++VERSION		= .0
+ LIB_OBJS	= gsi.o event.o functions.o io.o
+ 
+ 
+@@ -31,7 +31,7 @@
+ 
+ INCLUDES	= -I../../include
+ 
+-WARN		= -Wall -Wstrict-prototypes
++WARN		= -Wall #-Wstrict-prototypes
+ 
+ MY_CFLAGS	= $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_CFLAGS)
+ 
diff --git a/audio/gsi/files/patch-af b/audio/gsi/files/patch-af
new file mode 100644
index 000000000000..2c878cb4fe57
--- /dev/null
+++ b/audio/gsi/files/patch-af
@@ -0,0 +1,19 @@
+--- ../gsi/lib/gsicd/Makefile	Wed Feb  2 19:02:51 2000
++++ ./lib/gsicd/Makefile	Thu Dec  7 18:59:20 2000
+@@ -23,14 +23,14 @@
+ STATIC_LIB	= libgsicd.a
+ DYNAMIC_LIB	= libgsicd.so
+ LIB_NAME	= $(LIBGSICD)
+-VERSION		= .0.1
++VERSION		= .0
+ LIB_OBJS	= gsicd.o utils.o event.o
+ 
+ 
+ 
+ INCLUDES	= -I../../include
+ 
+-WARN		= -Wall -Wstrict-prototypes
++WARN		= -Wall #-Wstrict-prototypes
+ 
+ MY_CFLAGS	= $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_CFLAGS)
+ 
diff --git a/audio/gsi/files/patch-ag b/audio/gsi/files/patch-ag
new file mode 100644
index 000000000000..f29265e24775
--- /dev/null
+++ b/audio/gsi/files/patch-ag
@@ -0,0 +1,20 @@
+--- ../gsi/lib/gsif/Makefile	Wed Feb  2 19:03:14 2000
++++ ./lib/gsif/Makefile	Thu Dec  7 18:59:20 2000
+@@ -23,7 +23,7 @@
+ STATIC_LIB	= libgsif.a
+ DYNAMIC_LIB	= libgsif.so
+ LIB_NAME	= $(LIBGSIF)
+-VERSION		= .0.1
++VERSION		= .0
+ LIB_OBJS	= io.o \
+ 			sample/load_save.o sample/sample_format.o sample/block.o sample/types.o sample/fill_buffer.o sample/convert_block.o sample/mulaw.o sample/sample_get_structure_aif.o sample/sample_get_structure_au.o sample/sample_get_structure_voc.o sample/sample_get_structure_wav.o sample/save_au.o sample/save_aiff.o \
+ 			song/save_midi.o song/midi_utils.o song/midi_decode.o song/load_song.o song/load_midi.o song/load_hmp.o song/load_mus.o song/convert_mus_to_midi.o
+@@ -34,7 +34,7 @@
+ 
+ INCLUDES	= -I../../include
+ 
+-WARN		= -Wall -Wstrict-prototypes
++WARN		= -Wall #-Wstrict-prototypes
+ 
+ MY_CFLAGS	= $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_CFLAGS)
+ 
diff --git a/audio/gsi/files/patch-ah b/audio/gsi/files/patch-ah
new file mode 100644
index 000000000000..1a2fbfd3e526
--- /dev/null
+++ b/audio/gsi/files/patch-ah
@@ -0,0 +1,20 @@
+--- ../gsi/lib/gsimidi_pcm/Makefile	Wed Feb  2 19:03:27 2000
++++ ./lib/gsimidi_pcm/Makefile	Thu Dec  7 18:59:21 2000
+@@ -23,7 +23,7 @@
+ STATIC_LIB	= libgsimidi_pcm.a
+ DYNAMIC_LIB	= libgsimidi_pcm.so
+ LIB_NAME	= $(LIBGSIMIDI_PCM)
+-VERSION		= .2.0
++VERSION		= .2
+ LIB_SRCS	= patchgram.c patchlex.c
+ LIB_OBJS	= debug.o midi.o midiparse.o mididata.o input/midifile.o \
+ 		init.o input/midiin.o match.o volume.o instrum.o error.o \
+@@ -33,7 +33,7 @@
+ INSTRUM_DIR	= $(SHRDIR)/share/gsi/gsimidi_pcm
+ INSTRUM_MAP	= $(INSTRUM_DIR)/patch.mp
+ 
+-DEBUG_FLAGS	= -DKPMIDI_DEBUG -Wall -Wstrict-prototypes
++DEBUG_FLAGS	= -DKPMIDI_DEBUG -Wall #-Wstrict-prototypes
+ #OTHER_FLAGS	= -DPOSIX_REALTIME -DREPLACED_GUS_C
+ #OUTPUT_SRCS	= output/gsi.c
+ #OUTPUT_OBJS	= output/gsi.o
diff --git a/audio/gsi/files/patch-ai b/audio/gsi/files/patch-ai
new file mode 100644
index 000000000000..7c8f276384a9
--- /dev/null
+++ b/audio/gsi/files/patch-ai
@@ -0,0 +1,20 @@
+--- ../gsi/lib/gsimixer/Makefile	Wed Feb  2 19:03:43 2000
++++ ./lib/gsimixer/Makefile	Thu Dec  7 18:59:21 2000
+@@ -23,7 +23,7 @@
+ STATIC_LIB	= libgsimixer.a
+ DYNAMIC_LIB	= libgsimixer.so
+ LIB_NAME	= $(LIBGSIMIXER)
+-VERSION		= .0.1
++VERSION		= .0
+ LIB_OBJS	= gsimixer.o
+ 
+ 
+@@ -31,7 +31,7 @@
+ 
+ INCLUDES	= -I../../include
+ 
+-WARN		= -Wall -Wstrict-prototypes
++WARN		= -Wall #-Wstrict-prototypes
+ 
+ MY_CFLAGS	= $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_CFLAGS)
+ 
diff --git a/audio/gsi/files/patch-aj b/audio/gsi/files/patch-aj
new file mode 100644
index 000000000000..ba81d915aa31
--- /dev/null
+++ b/audio/gsi/files/patch-aj
@@ -0,0 +1,20 @@
+--- ../gsi/lib/gsipcm/Makefile	Wed Feb  2 19:04:05 2000
++++ ./lib/gsipcm/Makefile	Thu Dec  7 18:59:21 2000
+@@ -23,7 +23,7 @@
+ STATIC_LIB	= libgsipcm.a
+ DYNAMIC_LIB	= libgsipcm.so
+ LIB_NAME	= $(LIBGSIPCM)
+-VERSION		= .0.1
++VERSION		= .0
+ LIB_OBJS	= gsipcm.o
+ 
+ 
+@@ -31,7 +31,7 @@
+ 
+ INCLUDES	= -I../../include
+ 
+-WARN		= -Wall -Wstrict-prototypes
++WARN		= -Wall #-Wstrict-prototypes
+ 
+ MY_CFLAGS	= $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_CFLAGS)
+ 
diff --git a/audio/gsi/files/patch-ak b/audio/gsi/files/patch-ak
new file mode 100644
index 000000000000..8141ec74851c
--- /dev/null
+++ b/audio/gsi/files/patch-ak
@@ -0,0 +1,18 @@
+--- ../gsi/lib/gsisynth/Makefile	Wed Feb  2 19:04:23 2000
++++ ./lib/gsisynth/Makefile	Thu Dec  7 18:59:21 2000
+@@ -23,13 +23,13 @@
+ STATIC_LIB	= libgsisynth.a
+ DYNAMIC_LIB	= libgsisynth.so
+ LIB_NAME	= $(LIBGSISYNTH)
+-VERSION		= .0.1
++VERSION		= .0
+ LIB_OBJS	= gsisynth.o midi_control.o api/synth_null.o api/synth_oss.o api/synth_oss_opl.o api/synth_oss_gus.o api/synth_ultra.o api/synth_pcm.o api/midi_control_null.o api/midi_control_oss.o api/midi_control_ultra.o
+ 
+ 
+ INCLUDES	= -I../../include
+ 
+-WARN		= -Wall -Wstrict-prototypes
++WARN		= -Wall #-Wstrict-prototypes
+ 
+ MY_CFLAGS	= $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_CFLAGS)
+ 
diff --git a/audio/gsi/files/patch-al b/audio/gsi/files/patch-al
new file mode 100644
index 000000000000..e330da7afee6
--- /dev/null
+++ b/audio/gsi/files/patch-al
@@ -0,0 +1,24 @@
+--- ../gsi/server/Makefile	Wed Feb  2 19:01:15 2000
++++ ./server/Makefile	Thu Dec  7 18:59:21 2000
+@@ -23,7 +23,7 @@
+ 
+ DEFINES		=
+ 
+-WARN		= -Wall -Wstrict-prototypes
++WARN		= -Wall #-Wstrict-prototypes
+ 
+ CFLAGS		= $(DEBUG) $(OPTIMIZE) $(WARN)
+ 
+@@ -96,12 +96,6 @@
+ 	@echo
+ 	@echo "Installing the server:"
+ 	cp $(GSI_SERVER) $(INSTALL_FILE)
+-	@echo
+-	@echo "Don't forget to place a line in /etc/services, like this:"
+-	@echo "gsi_server      9000/tcp                        # Shared 3d sound server"
+-	@echo "if you want to be able to run the server over a network."
+-	@echo "[ note the security implications, see the documentation ]"
+-
+ 
+ install.man: $(MANDIR)/man8/gsi_server.8 $(MANDIR)/man5/gsi.conf.5
+ 
diff --git a/audio/gsi/files/patch-am b/audio/gsi/files/patch-am
new file mode 100644
index 000000000000..84996f631e01
--- /dev/null
+++ b/audio/gsi/files/patch-am
@@ -0,0 +1,11 @@
+--- ../gsi/test/gsicd/Makefile	Wed Feb  2 19:05:14 2000
++++ ./test/gsicd/Makefile	Thu Dec  7 18:59:21 2000
+@@ -26,7 +26,7 @@
+ #-----------------------------------------------------------------------------#
+ INCLUDES	= -I../../include
+ 
+-CFLAGS		= -O2 -fomit-frame-pointer -DDEBUG -g -Wall
++CFLAGS		+= -Wall -DDEBUG
+ ALL_CFLAGS	= $(DEFINES) $(INCLUDES) $(CFLAGS)
+ 
+ 
diff --git a/audio/gsi/files/patch-an b/audio/gsi/files/patch-an
new file mode 100644
index 000000000000..d264821f2a5f
--- /dev/null
+++ b/audio/gsi/files/patch-an
@@ -0,0 +1,11 @@
+--- ../gsi/test/gsif/Makefile	Wed Feb  2 19:05:23 2000
++++ ./test/gsif/Makefile	Thu Dec  7 18:59:21 2000
+@@ -25,7 +25,7 @@
+ #-----------------------------------------------------------------------------#
+ INCLUDES	= -I../../include
+ 
+-CFLAGS		= -O2 -fomit-frame-pointer -DDEBUG -g -Wall
++CFLAGS		+= -Wall -DDEBUG
+ 
+ ALL_CFLAGS	= $(DEFINES) $(INCLUDES) $(CFLAGS)
+ 
diff --git a/audio/gsi/files/patch-ao b/audio/gsi/files/patch-ao
new file mode 100644
index 000000000000..35186f4c7a2a
--- /dev/null
+++ b/audio/gsi/files/patch-ao
@@ -0,0 +1,11 @@
+--- ../gsi/test/gsif/mus_to_midi/Makefile	Wed Feb  2 19:05:31 2000
++++ ./test/gsif/mus_to_midi/Makefile	Thu Dec  7 18:59:21 2000
+@@ -25,7 +25,7 @@
+ #-----------------------------------------------------------------------------#
+ INCLUDES	= -I../../../include
+ 
+-CFLAGS		= -O2 -fomit-frame-pointer -DDEBUG -g -Wall
++CFLAGS		+= -Wall -DDEBUG
+ 
+ ALL_CFLAGS	= $(DEFINES) $(INCLUDES) $(CFLAGS)
+ 
diff --git a/audio/gsi/files/patch-ap b/audio/gsi/files/patch-ap
new file mode 100644
index 000000000000..682b22c93e9d
--- /dev/null
+++ b/audio/gsi/files/patch-ap
@@ -0,0 +1,11 @@
+--- ../gsi/test/gsimixer/Makefile	Wed Feb  2 19:05:44 2000
++++ ./test/gsimixer/Makefile	Thu Dec  7 18:59:21 2000
+@@ -26,7 +26,7 @@
+ #-----------------------------------------------------------------------------#
+ INCLUDES	= -I../../include
+ 
+-CFLAGS		= -O2 -fomit-frame-pointer -DDEBUG -g -Wall
++CFLAGS		+= -Wall -DDEBUG
+ ALL_CFLAGS	= $(DEFINES) $(INCLUDES) $(CFLAGS)
+ 
+ 
diff --git a/audio/gsi/files/patch-aq b/audio/gsi/files/patch-aq
new file mode 100644
index 000000000000..a36f7bfd7bc3
--- /dev/null
+++ b/audio/gsi/files/patch-aq
@@ -0,0 +1,11 @@
+--- ../gsi/test/gsipcm/Makefile	Wed Feb  2 19:05:53 2000
++++ ./test/gsipcm/Makefile	Thu Dec  7 18:59:21 2000
+@@ -26,7 +26,7 @@
+ #-----------------------------------------------------------------------------#
+ INCLUDES	= -I../../include
+ 
+-CFLAGS		= -O2 -fomit-frame-pointer -DDEBUG -g -Wall
++CFLAGS		+= -Wall -DDEBUG
+ ALL_CFLAGS	= $(DEFINES) $(INCLUDES) $(CFLAGS)
+ 
+ 
diff --git a/audio/gsi/files/patch-ar b/audio/gsi/files/patch-ar
new file mode 100644
index 000000000000..3d8176b09a2e
--- /dev/null
+++ b/audio/gsi/files/patch-ar
@@ -0,0 +1,11 @@
+--- ../gsi/test/memory_leak/Makefile	Wed Feb  2 19:06:01 2000
++++ ./test/memory_leak/Makefile	Thu Dec  7 18:59:21 2000
+@@ -28,7 +28,7 @@
+ 
+ INCLUDES	= -I../../include #-I/usr/local/include
+ 
+-CFLAGS		= -O2 -fomit-frame-pointer -DDEBUG -g -Wall
++CFLAGS		+= -Wall -DDEBUG
+ ALL_CFLAGS	= $(DEFINES) $(INCLUDES) $(CFLAGS)
+ 
+ 
diff --git a/audio/gsi/files/patch-as b/audio/gsi/files/patch-as
new file mode 100644
index 000000000000..4870dd774ba3
--- /dev/null
+++ b/audio/gsi/files/patch-as
@@ -0,0 +1,11 @@
+--- ../gsi/test/server/general/Makefile	Wed Feb  2 19:06:12 2000
++++ ./test/server/general/Makefile	Thu Dec  7 18:59:21 2000
+@@ -28,7 +28,7 @@
+ 
+ INCLUDES	= -I../../../include
+ 
+-CFLAGS		= -O2 -fomit-frame-pointer -DDEBUG -g -Wall
++CFLAGS		+= -Wall -DDEBUG
+ ALL_CFLAGS	= $(DEFINES) $(INCLUDES) $(CFLAGS)
+ 
+ 
diff --git a/audio/gsi/files/patch-at b/audio/gsi/files/patch-at
new file mode 100644
index 000000000000..a073d2c8cff1
--- /dev/null
+++ b/audio/gsi/files/patch-at
@@ -0,0 +1,11 @@
+--- ../gsi/test/server/shm/Makefile	Wed Feb  2 19:06:19 2000
++++ ./test/server/shm/Makefile	Thu Dec  7 18:59:21 2000
+@@ -28,7 +28,7 @@
+ 
+ INCLUDES	= -I../../../include
+ 
+-CFLAGS		= -O2 -fomit-frame-pointer -DDEBUG -g -Wall
++CFLAGS		+= -Wall -DDEBUG
+ ALL_CFLAGS	= $(DEFINES) $(INCLUDES) $(CFLAGS)
+ 
+ 
diff --git a/audio/gsi/files/patch-au b/audio/gsi/files/patch-au
new file mode 100644
index 000000000000..0ee10a518abc
--- /dev/null
+++ b/audio/gsi/files/patch-au
@@ -0,0 +1,11 @@
+--- ../gsi/test/server/stream/Makefile	Wed Feb  2 19:06:27 2000
++++ ./test/server/stream/Makefile	Thu Dec  7 18:59:21 2000
+@@ -28,7 +28,7 @@
+ 
+ INCLUDES	= -I../../../include
+ 
+-CFLAGS		= -O2 -fomit-frame-pointer -DDEBUG -g -Wall
++CFLAGS		+= -Wall -DDEBUG
+ ALL_CFLAGS	= $(DEFINES) $(INCLUDES) $(CFLAGS)
+ 
+ 
diff --git a/audio/gsi/files/patch-av b/audio/gsi/files/patch-av
new file mode 100644
index 000000000000..f6642fc09374
--- /dev/null
+++ b/audio/gsi/files/patch-av
@@ -0,0 +1,11 @@
+--- ../gsi/test/server/threads/Makefile	Wed Feb  2 19:06:37 2000
++++ ./test/server/threads/Makefile	Thu Dec  7 18:59:21 2000
+@@ -29,7 +29,7 @@
+ 
+ INCLUDES	= -I../../../include
+ 
+-CFLAGS		= -O2 -fomit-frame-pointer -DDEBUG -g -Wall
++CFLAGS		+= -Wall -DDEBUG
+ ALL_CFLAGS	= $(DEFINES) $(INCLUDES) $(CFLAGS)
+ 
+ 
diff --git a/audio/gsi/pkg-comment b/audio/gsi/pkg-comment
new file mode 100644
index 000000000000..4648f5463787
--- /dev/null
+++ b/audio/gsi/pkg-comment
@@ -0,0 +1 @@
+GSI - general sound interface
diff --git a/audio/gsi/pkg-descr b/audio/gsi/pkg-descr
new file mode 100644
index 000000000000..d9aa1c14dc3e
--- /dev/null
+++ b/audio/gsi/pkg-descr
@@ -0,0 +1,20 @@
+From the home page:
+     GSI is an easy to use audio system which can be used over a network
+     and which gives applications, through a very simple API, sample
+     playing with stereo, 3D, doppler effects, music playing (MIDI, HMP,
+     MUS), cd playing and ejecting/changing.
+
+     GSI also contains a separately usable sound/music
+     loading/saving/format conversion library libgsif
+     (au/aiff/voc/wav/raw, midi/hmp/mus), although saving/format
+     conversion is not completely done.
+
+     GSI runs on any unix system that has generic /dev/audio (8000Hz mono
+     mulaw), OSS, ultrasound project drivers, or NAS (well, it did once, I
+     need to update the NAS stuff), e.g. Linux, OpenBSD and FreeBSD. CD
+     playing is dependant on the OS' ioctl's and structs so that probably
+     works on linux/*BSD only (solaris may work, as it seems to use the
+     same ioctl's/structs as linux).
+
+License:  2-clause BSD-style for code / public domain for headers
+WWW:      http://www.xs4all.nl/~whs/gsi/gsi.html
diff --git a/audio/gsi/pkg-message b/audio/gsi/pkg-message
new file mode 100644
index 000000000000..fbff770528bf
--- /dev/null
+++ b/audio/gsi/pkg-message
@@ -0,0 +1,6 @@
+Don't forget to place a line in /etc/services, like this:
+
+gsi_server      9000/tcp                        # Shared 3d sound server
+
+if you want to be able to run the server over a network.
+[ note the security implications, see the documentation ]
diff --git a/audio/gsi/pkg-plist b/audio/gsi/pkg-plist
new file mode 100644
index 000000000000..5aaef01ac741
--- /dev/null
+++ b/audio/gsi/pkg-plist
@@ -0,0 +1,51 @@
+bin/gsi_server
+bin/gsifile
+bin/gsiplay
+etc/gsi.conf.sample
+include/gsi/config.h
+include/gsi/device.h
+include/gsi/gsi.h
+include/gsi/gsi_command_lengths.h
+include/gsi/gsi_command_names.h
+include/gsi/gsi_commands.h
+include/gsi/gsi_config.h
+include/gsi/gsi_debug.h
+include/gsi/gsi_event_lengths.h
+include/gsi/gsi_event_names.h
+include/gsi/gsi_eventmasks.h
+include/gsi/gsi_events.h
+include/gsi/gsi_instrumentnames_gus.h
+include/gsi/gsi_midi_names.h
+include/gsi/gsi_subcommands.h
+include/gsi/gsicd.h
+include/gsi/gsif.h
+include/gsi/gsif_midi.h
+include/gsi/gsimixer.h
+include/gsi/gsipcm.h
+include/gsi/gsisynth.h
+include/gsi/kpmidi.h
+include/gsi/kpmidi_patch.h
+include/gsi/mixer_data.h
+include/gsi/p_signal.c
+include/gsi/p_signal.h
+include/gsi/pcm_data.h
+include/gsi/synth_data.h
+include/gsi/version.h
+include/gsi/whs_debug.h
+include/gsi/whs_defines.h
+include/gsi/whs_types.h
+lib/libgsi.so
+lib/libgsi.so.0
+lib/libgsicd.so
+lib/libgsicd.so.0
+lib/libgsif.so
+lib/libgsif.so.0
+lib/libgsimidi_pcm.so
+lib/libgsimidi_pcm.so.2
+lib/libgsimixer.so
+lib/libgsimixer.so.0
+lib/libgsipcm.so
+lib/libgsipcm.so.0
+lib/libgsisynth.so
+lib/libgsisynth.so.0
+@dirrm include/gsi