3 files changed, 187 insertions, 359 deletions

diff --git a/audio/s3mod/Makefile b/audio/s3mod/Makefile
index 1b28bc8f5f3b..f77ece340ffc 100644
--- a/audio/s3mod/Makefile
+++ b/audio/s3mod/Makefile
@@ -1,20 +1,25 @@
 # New ports collection makefile for:    s3mod
-# Version required:     1.08A
+# Version required:     1.09
 # Date created:         9 March 1995
 # Whom:                 ugen
 #
-# $Id: Makefile,v 1.4 1996/11/15 23:14:19 obrien Exp $
+# $Id: Makefile,v 1.5 1996/11/18 10:34:43 asami Exp $
 #
 
-DISTNAME=       s3mod-v1.08A
-PKGNAME=	s3mod-1.08a
+DISTNAME=	s3mod-v1.09
+PKGNAME=	s3mod-1.09
 CATEGORIES=	audio
-MASTER_SITES=   ${MASTER_SITE_SUNSITE}
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/sound/players
-DISTFILES=      s3mod-v1.08A.tar.gz
 
 MAINTAINER=	ugen@FreeBSD.org
 
-INSTALL_TARGET= install 
+ALL_TARGET=	freebsd
+
+pre-patch:
+	@${CP} ${WRKSRC}/DspDrivers/linux_dsp.c ${WRKSRC}/dsp.c
+
+post-install:
+	@strip ${PREFIX}/bin/s3mod
 
 .include <bsd.port.mk>
diff --git a/audio/s3mod/distinfo b/audio/s3mod/distinfo
index 3480eb2949d5..6476fe12e5b8 100644
--- a/audio/s3mod/distinfo
+++ b/audio/s3mod/distinfo
@@ -1 +1 @@
-MD5 (s3mod-v1.08A.tar.gz) = d8082a70e0ca34d3e9a7961ec3c6f4f0
+MD5 (s3mod-v1.09.tar.gz) = 28b124c320cd33a0c6aa66611fedd41b
diff --git a/audio/s3mod/files/patch-aa b/audio/s3mod/files/patch-aa
index c6737c5f5da5..4d043dbba277 100644
--- a/audio/s3mod/files/patch-aa
+++ b/audio/s3mod/files/patch-aa
@@ -1,351 +1,174 @@
-diff -cr s3mod-v1.08A/Makefile s3mod-v1.08A.port/Makefile
-*** ./Makefile	Mon Mar  7 05:54:59 1994
---- ..port/Makefile	Thu Mar  9 13:02:33 1995
-***************
-*** 30,36 ****
-  # Uncomment these for Linux (DSP and GUS support)
-  #
-   COPTS	= -O2
-!  DEFINES	= -DLINUX -DGUS
-   INCLUDES	=
-   LIBS	=
-   LIBDIR	=
---- 30,36 ----
-  # Uncomment these for Linux (DSP and GUS support)
-  #
-   COPTS	= -O2
-!  DEFINES	= -DGUS
-   INCLUDES	=
-   LIBS	=
-   LIBDIR	=
-***************
-*** 55,60 ****
---- 55,63 ----
-  
-  dep:
-  	makedepend $(CFLAGS) $(LFLAGS) $(CFILES)
-+ 
-+ install:
-+ 	install -m 555 s3mod /usr/local/bin 
-  
-  # DO NOT DELETE THIS LINE -- make depend depends on it.
-  
-diff -cr s3mod-v1.08A/gus.c s3mod-v1.08A.port/gus.c
-*** ./gus.c	Mon Mar  7 05:19:56 1994
---- ..port/gus.c	Thu Mar  9 12:56:50 1995
-***************
-*** 20,27 ****
-  /* See the associated README file for Thanks       */
-  /***************************************************/
-  
-! #include <sys/soundcard.h>
-! #include <sys/ultrasound.h>
-  #include <unistd.h>
-  #include "gus.h"
-  #include "mod.h"
---- 20,27 ----
-  /* See the associated README file for Thanks       */
-  /***************************************************/
-  
-! #include <machine/soundcard.h>
-! #include <machine/ultrasound.h>
-  #include <unistd.h>
-  #include "gus.h"
-  #include "mod.h"
-diff -cr s3mod-v1.08A/main.c s3mod-v1.08A.port/main.c
-*** ./main.c	Mon Mar  7 05:56:44 1994
---- ..port/main.c	Thu Mar  9 12:59:57 1995
-***************
-*** 38,47 ****
-   * Portability conditions                
-   */
-  
-! #ifdef LINUX
-! #include <linux/soundcard.h>
-! #include <bytesex.h>
-! #endif /* LINUX */
-  #ifdef GUS
-  #include "gus.h"
-  #endif /* GUS */
---- 38,47 ----
-   * Portability conditions                
-   */
-  
-! #ifdef __FreeBSD__
-! #include <machine/soundcard.h>
-! #include <machine/endian.h>
-! #endif /* __FreeBSD__ */
-  #ifdef GUS
-  #include "gus.h"
-  #endif /* GUS */
-***************
-*** 81,96 ****
-    printf("For information email (s3mod@uiuc.edu).\n");
-    printf("s3mod [-sbfqnl] [sampling frequency] filename\n");
-    printf("     -s stereo\n");
-! #ifdef LINUX
-    printf("     -b 16 bit samples\n");
-! #endif /* ?LINUX */
-    printf("     -f set frequency\n");
-    printf("     -q quiet (don't print anything)\n");
-    printf("     -n don't loop\n");
-    printf("     -l loud mode (shift voices louder)\n");
-! #ifdef LINUX
-    printf("     -g do NOT use GUS native mode\n");
-! #endif /* ?LINUX */
-    printf("     -p PAL speed adjustment (145bpm start)\n");
-    printf("s3mod -sbf 44100 foobar.mod\n");
-    printf("   plays in stereo, 16 bits, 44.1 kHz\n\n");
---- 81,96 ----
-    printf("For information email (s3mod@uiuc.edu).\n");
-    printf("s3mod [-sbfqnl] [sampling frequency] filename\n");
-    printf("     -s stereo\n");
-! #ifdef __FreeBSD__
-    printf("     -b 16 bit samples\n");
-! #endif /* ?__FreeBSD__ */
-    printf("     -f set frequency\n");
-    printf("     -q quiet (don't print anything)\n");
-    printf("     -n don't loop\n");
-    printf("     -l loud mode (shift voices louder)\n");
-! #ifdef __FreeBSD__
-    printf("     -g do NOT use GUS native mode\n");
-! #endif /* ?__FreeBSD__ */
-    printf("     -p PAL speed adjustment (145bpm start)\n");
-    printf("s3mod -sbf 44100 foobar.mod\n");
-    printf("   plays in stereo, 16 bits, 44.1 kHz\n\n");
-***************
-*** 98,104 ****
-    printf("4,6,or 8 track MODs.\n\n");
-  #ifdef DEC
-    printf("NOTE: DEC AF support is in it's ALPHA stages\n\n");
-! #endif /* ?LINUX */
-    exit(1);
-  }
-  
---- 98,104 ----
-    printf("4,6,or 8 track MODs.\n\n");
-  #ifdef DEC
-    printf("NOTE: DEC AF support is in it's ALPHA stages\n\n");
-! #endif /* ?__FreeBSD__ */
-    exit(1);
-  }
-  
-***************
-*** 110,116 ****
-  {
-    int found_gus=0;
-  
-! #ifdef LINUX
-  #ifdef GUS 
-    if (use_gus)
-      {
---- 110,116 ----
-  {
-    int found_gus=0;
-  
-! #ifdef __FreeBSD__
-  #ifdef GUS 
-    if (use_gus)
-      {
-***************
-*** 124,130 ****
-  #else /* GUS */
-    get_dsp_device();
-  #endif /* GUS */
-! #endif /* LINUX */
-  
-  #ifdef SUN
-    get_sun_device();
---- 124,130 ----
-  #else /* GUS */
-    get_dsp_device();
-  #endif /* GUS */
-! #endif /* __FreeBSD__ */
-  
-  #ifdef SUN
-    get_sun_device();
-***************
-*** 231,237 ****
-  #endif /* ?SUN */
-  
-  
-! #ifdef LINUX 
-  int get_dsp_device(void)
-  {
-    uint32 j;
---- 231,237 ----
-  #endif /* ?SUN */
-  
-  
-! #ifdef __FreeBSD__ 
-  int get_dsp_device(void)
-  {
-    uint32 j;
-***************
-*** 279,285 ****
-    audio_curptr = audio_start_buffer;  
-  
-  }
-! #endif /* ?LINUX */
-  
-  
-  
---- 279,285 ----
-    audio_curptr = audio_start_buffer;  
-  
-  }
-! #endif /* ?__FreeBSD__ */
-  
-  
-  
-diff -cr s3mod-v1.08A/mix.c s3mod-v1.08A.port/mix.c
-*** ./mix.c	Mon Mar  7 05:19:25 1994
---- ..port/mix.c	Thu Mar  9 12:56:16 1995
-***************
-*** 27,39 ****
-  #include <string.h>
-  #include "mod.h"
-  
-! #ifdef LINUX
-! #include <sys/soundcard.h>
-! #include <bytesex.h>
-! #endif /* ?LINUX */
-  
-  #ifdef GUS
-! #include <sys/ultrasound.h>
-  #include "gus.h"
-  #endif /* ?GUS */
-  
---- 27,39 ----
-  #include <string.h>
-  #include "mod.h"
-  
-! #ifdef __FreeBSD__
-! #include <machine/soundcard.h>
-! #include <machine/endian.h>
-! #endif /* ?__FreeBSD__ */
-  
-  #ifdef GUS
-! #include <machine/ultrasound.h>
-  #include "gus.h"
-  #endif /* ?GUS */
-  
-diff -cr s3mod-v1.08A/mod.c s3mod-v1.08A.port/mod.c
-*** ./mod.c	Mon Mar  7 05:19:01 1994
---- ..port/mod.c	Thu Mar  9 12:53:53 1995
-***************
-*** 30,42 ****
-  #include "mod.h"
-  #include "main.h"
-  
-! #ifdef LINUX
-! #include <sys/soundcard.h>
-! #include <bytesex.h>
-! #endif /* ?LINUX */
-  
-  #ifdef GUS
-! #include <sys/ultrasound.h>
-  #include "gus.h"
-  #endif /* GUS */
-  
---- 30,42 ----
-  #include "mod.h"
-  #include "main.h"
-  
-! #ifdef __FreeBSD__
-! #include <machine/soundcard.h>
-! #include <machine/endian.h>
-! #endif /* ?__FreeBSD__ */
-  
-  #ifdef GUS
-! #include <machine/ultrasound.h>
-  #include "gus.h"
-  #endif /* GUS */
-  
-diff -cr s3mod-v1.08A/mod.h s3mod-v1.08A.port/mod.h
-*** ./mod.h	Mon Mar  7 05:21:18 1994
---- ..port/mod.h	Thu Mar  9 12:53:09 1995
-***************
-*** 22,28 ****
-  #define __BYTE_ORDER 4321
-  #endif 
-  
-! #ifdef linux
-  #define BIT_32
-  #undef NEAR_FAR_PTR
-  #endif
---- 22,28 ----
-  #define __BYTE_ORDER 4321
-  #endif 
-  
-! #ifdef __FreeBSD__
-  #define BIT_32
-  #undef NEAR_FAR_PTR
-  #endif
-diff -cr s3mod-v1.08A/play.c s3mod-v1.08A.port/play.c
-*** ./play.c	Mon Mar  7 05:18:08 1994
---- ..port/play.c	Thu Mar  9 12:55:46 1995
-***************
-*** 31,43 ****
-  
-  #include "main.h"
-  
-! #ifdef LINUX
-! #include <bytesex.h>
-! #include <sys/soundcard.h>
-! #endif /* ?LINUX */
-  
-  #ifdef GUS
-! #include <sys/ultrasound.h>
-  #include "gus.h"
-  #endif /* ?GUS */
-  
---- 31,43 ----
-  
-  #include "main.h"
-  
-! #ifdef __FreeBSD__
-! #include <machine/endian.h>
-! #include <machine/soundcard.h>
-! #endif /* ?__FreeBSD__ */
-  
-  #ifdef GUS
-! #include <machine/ultrasound.h>
-  #include "gus.h"
-  #endif /* ?GUS */
-  
-diff -cr s3mod-v1.08A/s3m.c s3mod-v1.08A.port/s3m.c
-*** ./s3m.c	Mon Mar  7 05:18:37 1994
---- ..port/s3m.c	Thu Mar  9 12:55:01 1995
-***************
-*** 22,35 ****
-  
-  #include <stdio.h>
-  #include <string.h>
-  
-  #include <fcntl.h>
-  
-  #include "mod.h"
-  
-! #ifdef LINUX
-! #include <bytesex.h>
-! #include <linux/soundcard.h>
-  #endif
-  
-  #ifdef GUS
---- 22,36 ----
-  
-  #include <stdio.h>
-  #include <string.h>
-+ #include <stdlib.h>
-  
-  #include <fcntl.h>
-  
-  #include "mod.h"
-  
-! #ifdef __FreeBSD__
-! #include <machine/endian.h>
-! #include <machine/soundcard.h>
-  #endif
-  
-  #ifdef GUS
+--- config.h.orig	Sun Jun  8 00:11:14 1997
++++ config.h	Sun Jun  8 00:12:37 1997
+@@ -64,6 +64,14 @@
+ #define GUS
+ #endif /* GUS */
+ 
++#elif defined(__FreeBSD__)
++#define BIT_32
++#undef NEAR_FAR_PTR
++#define DSP
++#ifndef GUS
++#define GUS
++#endif /* GUS */
++
+ #elif defined(MSDOS)
+ #define NEAR_FAR_PTR
+ #define DSP
+--- dsp.c.orig	Sat Oct 21 14:40:29 1995
++++ dsp.c	Sun Jun  8 00:21:50 1997
+@@ -22,14 +22,14 @@
+  *  linux_dsp.c - Support for the Linux DSP driver from the Voxware(C) Drivers.
+  */
+ 
+-#ifdef LINUX
++#ifdef __FreeBSD__
+ #include "config.h"
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <fcntl.h>
+ #include <sys/types.h>
+-#include <linux/soundcard.h>
+-#include <bytesex.h>
++#include <machine/soundcard.h>
++#include <machine/endian.h>
+ #include "main.h"
+ #include "dsp.h"
+ 
+@@ -93,5 +93,5 @@
+     return;
+ }
+ 
+-#endif /* ?LINUX */
++#endif /* ?__FreeBSD__ */
+ 
+--- gus.c.orig	Sun Jun  8 00:05:28 1997
++++ gus.c	Sun Jun  8 00:05:51 1997
+@@ -25,8 +25,8 @@
+ 
+ #ifdef GUS
+ 
+-#include <sys/soundcard.h>
+-#include <sys/ultrasound.h>
++#include <machine/soundcard.h>
++#include <machine/ultrasound.h>
+ #include <unistd.h>
+ #include "gus.h"
+ #include "mod.h"
+--- main.c.orig	Sun Jun  8 00:05:59 1997
++++ main.c	Sun Jun  8 00:10:46 1997
+@@ -56,6 +56,10 @@
+   printf("         Linux Support by Daniel Marks \n");
+   printf("           GUS Support by David Jeske (jeske@uiuc.edu)\n");
+ #endif /* LINUX */
++#ifdef __FreeBSD__
++  printf("         FreeBSD Support by Vanilla I. Shu \n");
++  printf("           GUS Support by David Jeske (jeske@uiuc.edu\n");
++#endif /* __FreeBSD__ */
+ #if defined(__sgi)
+   printf("           SGI Support by Mike Muuss (Mike@arl.mil)\n\n");
+ #endif /* __sgi */
+@@ -69,6 +73,9 @@
+ #ifdef LINUX
+   printf("     -b 16 bit samples\n");
+ #endif /* ?LINUX */
++#ifdef __FreeBSD__
++  printf("     -b 16 bit samples\n");
++#endif /* __FreeBSD__ */
+   printf("     -f set frequency\n");
+   printf("     -q quiet (don't print anything)\n");
+   printf("     -n don't loop\n");
+@@ -76,6 +83,9 @@
+ #ifdef LINUX
+   printf("     -g do NOT use GUS native mode\n");
+ #endif /* ?LINUX */
++#ifdef __FreeBSD__
++  printf("     -g do NOT use GUS native mode\n");
++#endif /* __FreeBSD__ */
+   printf("     -p PAL speed adjustment (145bpm start)\n");
+   printf("s3mod -sbf 44100 foobar.mod\n");
+   printf("   plays in stereo, 16 bits, 44.1 kHz\n\n");
+--- mod.c.orig	Sun Jun  8 00:12:48 1997
++++ mod.c	Sun Jun  8 00:14:30 1997
+@@ -11,7 +11,7 @@
+ 
+ 
+ #ifdef GUS
+-#include <sys/ultrasound.h>
++#include <machine/ultrasound.h>
+ #include "gus.h"
+ #endif /* GUS */
+ 
+@@ -130,8 +130,10 @@
+     /* Portamento Down */
+     if ((track->period += track->port_down) > track->period_high_limit)
+       track->period = track->period_high_limit;
+-    track->pitch = track->finetune_rate / track->period;
+-
++    if (track->period != 0)
++      track->pitch = track->finetune_rate / track->period;
++    else
++      track->pitch = 1;
+     track->playing_period = track->period;
+   }
+ 
+--- play.c.orig	Sun Jun  8 00:15:23 1997
++++ play.c	Sun Jun  8 00:15:46 1997
+@@ -36,7 +36,7 @@
+ #include "dsp.h"
+ 
+ #ifdef GUS
+-#include <sys/ultrasound.h>
++#include <machine/ultrasound.h>
+ #include "gus.h"
+ #endif /* GUS */
+ 
+--- gus.h.orig	Sun Jun  8 00:31:14 1997
++++ gus.h	Sun Jun  8 00:31:23 1997
+@@ -26,7 +26,7 @@
+ #ifndef _GUS_H
+ #define _GUS_H 
+ 
+-#include <sys/soundcard.h>
++#include <machine/soundcard.h>
+ 
+ #define ERR_SEQUENCER    51
+ #define ERR_NOGUS        53
+--- Makefile.orig	Sun Oct 22 03:48:51 1995
++++ Makefile	Sun Jun  8 01:03:46 1997
+@@ -9,7 +9,6 @@
+ RM	= rm
+ LN	= ln -s
+ 
+-CFLAGS  = -O2
+ LFLAGS  = 
+ 
+ OBJS	= mod.o s3m.o main.o play.o mix.o cmdline.o dsp.o gus.o
+@@ -24,6 +23,7 @@
+ 	@echo "     make sun              - SunOS/Solaris"
+ 	@echo "     make sgi              - SGI Irix"
+ 	@echo "     make linux            - Voxware DSP/GUS"
++	@echo "     make freebsd          - Voxware DSP/GUS"
+ 	@echo "     make dec              - Dec OSF/1"
+ 	@echo "     make clean            - remove all .o files"
+ 	@echo "     make clobber          - remove all .o and targets"
+@@ -51,6 +51,9 @@
+ 	$(LN) DspDrivers/linux_dsp.c dsp.c
+ 	make CC=gcc CFLAGS=-O2 DEFINES="-DLINUX -DGUS" s3mod
+ 
++freebsd:
++	make CC=gcc CFLAGS="$(CFLAGS)" DEFINES="-DGUS" s3mod
++
+ s3mod:	$(OBJS)
+ 	$(CC) $(CFLAGS) -o s3mod $(OBJS) $(LFLAGS) $(LIBS)
+ 
+@@ -62,6 +65,9 @@
+ 
+ dep:
+ 	makedepend $(CFLAGS) $(LFLAGS) $(LIBS) $(CFILES)
++
++install:
++	install -m 555 s3mod /usr/local/bin
+ 
+ # DO NOT DELETE THIS LINE -- make depend depends on it.
+