Upgrade to 2.3

6 files changed, 285 insertions, 82 deletions

diff --git a/audio/playmidi/Makefile b/audio/playmidi/Makefile
index 5ed37bac815e..bd2e1172cf72 100644
--- a/audio/playmidi/Makefile
+++ b/audio/playmidi/Makefile
@@ -1,16 +1,20 @@
 # New ports collection makefile for:    playmidi
-# Version required:     1.1
+# Version required:     2.3
 # Date created:         27 Feb 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.3 1995/04/11 19:46:47 asami Exp $
+# $Id: Makefile,v 1.4 1995/04/12 04:54:19 asami Exp $
 #
 
-DISTNAME=       playmidi
-PKGNAME=	playmidi-1.1
-CATEGORIES+=	audio
+DISTNAME=       playmidi-2.3
+CATEGORIES=     audio
 MASTER_SITES=   ftp://sunsite.unc.edu/pub/Linux/apps/sound/players/
-DISTFILES=      playmidi-1.1.tar.gz
+
+IS_INTERACTIVE= YES
+HAS_CONFIGURE=  YES
+CONFIGURE_SCRIPT=       Configure
+CONFIGURE_ENV=  PREFIX=${PREFIX}
+INSTALL_TARGET= install.lame install.man
 
 MAINTAINER=     ache@FreeBSD.ORG
 
diff --git a/audio/playmidi/distinfo b/audio/playmidi/distinfo
index 07a5877d3e79..55c3660f53ca 100644
--- a/audio/playmidi/distinfo
+++ b/audio/playmidi/distinfo
@@ -1 +1 @@
-MD5 (playmidi-1.1.tar.gz) = 0bd288bfc26caedb6f85dc930390f58c
+MD5 (playmidi-2.3.tar.gz) = f5114d85cdbf6096f5820eb58b9ea390
diff --git a/audio/playmidi/files/patch-ab b/audio/playmidi/files/patch-ab
index c7cfccbd7013..d0463befab9e 100644
--- a/audio/playmidi/files/patch-ab
+++ b/audio/playmidi/files/patch-ab
@@ -1,98 +1,239 @@
-*** Makefile.orig	Fri Nov 25 22:24:59 1994
---- Makefile	Mon Feb 27 23:08:42 1995
+*** Makefile.orig	Sat Feb 24 17:00:00 1996
+--- Makefile	Fri Nov 15 09:38:06 1996
 ***************
-*** 9,59 ****
-  # to prevent segmentation faults 'cause of a bug, otherwise use 2.5.8
-  #CFLAGS = -g
-  #LDFLAGS = -g
-! CFLAGS = -O2 -m486 -Wall
-! LDFLAGS = -s
+*** 28,34 ****
+  
+  # ncurses usually /usr/lib, -L/usr/local/lib doesn't hurt
+  # unless there's more than one ncurses floating around on your system
+! LIBNC	= -L/usr/local/lib -lncurses
+  
+  ######### NOTE:  X11R6 or newer REQUIRED
+  LIBX11	= -L/usr/X11R6/lib -lXaw -lXmu -lXt -lX11 -lXext -lSM -lICE
+--- 28,34 ----
+  
+  # ncurses usually /usr/lib, -L/usr/local/lib doesn't hurt
+  # unless there's more than one ncurses floating around on your system
+! LIBNC   = -lncurses -lmytinfo
+  
+  ######### NOTE:  X11R6 or newer REQUIRED
+  LIBX11	= -L/usr/X11R6/lib -lXaw -lXmu -lXt -lX11 -lXext -lSM -lICE
+***************
+*** 36,60 ****
+  
+  # ncurses is usually in /usr/include/ncurses, but you may need
+  # to use /usr/local/include/ncurses depending on your setup.
+! INCNC	= -I/usr/include/ncurses
+  
+  # just in case you keep your X includes in an odd location.
+  INCX11	= -I/usr/X11R6/include -DNARROWPROTO
+  
+  # usually in /usr/include, but -I/usr/local/include doesn't hurt
+  # unless there's more than one svgalib floating around your system.
+! INCVGA	= -I/usr/local/include
+  
+  # Directory where application defaults files are stored for X11 version
+  XAPPDEFAULTS = /usr/X11R6/lib/X11/app-defaults
+  
+  INCLUDES= $(INCNC) $(INCX11) $(INCVGA)
 ! INSTALLDIR = /usr/local/bin
-  OBJECTS = playmidi.o midifile.o playevents.o patchload.o emumidi.o
+! INSTALL = install -s
   
-  all: playmidi resetmidi
+  # if you are using the GUS Ultra driver module, add -DULTRA_DRIVER
+! CFLAGS	= -Wall -pipe -fomit-frame-pointer -O2 -m486
+! LDFLAGS =
+  
+  OBJECTS = playmidi.o readmidi.o playevents.o \
+  	  patchload.o emumidi.o io_ncurses.o
+--- 36,62 ----
+  
+  # ncurses is usually in /usr/include/ncurses, but you may need
+  # to use /usr/local/include/ncurses depending on your setup.
+! INCNC   = #-I/usr/include/ncurses
+  
+  # just in case you keep your X includes in an odd location.
+  INCX11	= -I/usr/X11R6/include -DNARROWPROTO
+  
+  # usually in /usr/include, but -I/usr/local/include doesn't hurt
+  # unless there's more than one svgalib floating around your system.
+! INCVGA  = #-I/usr/local/include
+  
+  # Directory where application defaults files are stored for X11 version
+  XAPPDEFAULTS = /usr/X11R6/lib/X11/app-defaults
+  
+  INCLUDES= $(INCNC) $(INCX11) $(INCVGA)
+! INSTALLDIR = ${PREFIX}/bin
+  
+  # if you are using the GUS Ultra driver module, add -DULTRA_DRIVER
+! #CFLAGS  = -Wall -pipe -fomit-frame-pointer -O2 -m486
+! CFLAGS += -DPREFIX=\"$(PREFIX)\"
+! #LDFLAGS =
+! INSTALL_BIN = $(INSTALL) -s -c -o $(BINOWN) -g $(BINGRP) -m 755
+! INSTALL_DAT = $(INSTALL) -c -o $(BINOWN) -g $(BINGRP) -m 644
+  
+  OBJECTS = playmidi.o readmidi.o playevents.o \
+  	  patchload.o emumidi.o io_ncurses.o
+***************
+*** 65,71 ****
+  SOBJECTS= playmidi.o readmidi.o playevents.o \
+  	  patchload.o emumidi.o io_svgalib.o
+  
+! all: playmidi splaymidi xplaymidi
+  
+  config:
+  playmidi.h: playmidi.h-dist
+--- 67,73 ----
+  SOBJECTS= playmidi.o readmidi.o playevents.o \
+  	  patchload.o emumidi.o io_svgalib.o
+  
+! all: playmidi #splaymidi xplaymidi
+  
+  config:
+  playmidi.h: playmidi.h-dist
+***************
+*** 80,137 ****
+  io_svgalib.o: io_svgalib.c
+  	$(CC) $(CFLAGS) $(INCVGA) -c io_svgalib.c -o io_svgalib.o
   
 ! playmidi: .depend $(OBJECTS)
-  	$(CC) $(LDFLAGS) -o playmidi $(OBJECTS)
+  	$(CC) $(LDFLAGS) -o playmidi $(OBJECTS) $(LIBNC)
   
-! resetmidi: .depend resetmidi.o
-! 	$(CC) -N $(LDFLAGS) -o resetmidi resetmidi.o
-! 
-! scope: .depend scope.o
-! 	$(CC) -N $(LDFLAGS) -o scope scope.o -lvga
+! xplaymidi: .depend $(XOBJECTS)
+  	$(CC) $(LDFLAGS) -o xplaymidi $(XOBJECTS) $(LIBX11)
+  
+! splaymidi: .depend $(SOBJECTS)
+  	$(CC) $(LDFLAGS) -o splaymidi $(SOBJECTS) $(LIBVGA)
   
   $(INSTALLDIR)/playmidi: playmidi
-! 	cp playmidi $(INSTALLDIR)
+! 	$(INSTALL) playmidi $(INSTALLDIR)
   
-  $(INSTALLDIR)/resetmidi: resetmidi
-! 	cp resetmidi $(INSTALLDIR)
-! 
-! $(INSTALLDIR)/scope: scope
-! 	cp scope $(INSTALLDIR)
+  $(INSTALLDIR)/xplaymidi: xplaymidi
+! 	$(INSTALL) xplaymidi $(INSTALLDIR)
   
-! install: $(INSTALLDIR)/playmidi $(INSTALLDIR)/resetmidi #$(INSTALLDIR)/scope
+  $(INSTALLDIR)/splaymidi: splaymidi
+! 	$(INSTALL) splaymidi $(INSTALLDIR)
   
-  clean:
-! 	rm -f *.o *~ *.bak playmidi resetmidi scope a.out
+! /etc/std.o3:
+! 	cp -i std.o3 /etc
   
-- ifeq (.depend, $(wildcard .depend))
-- .depend depend dep:
-- 	for i in *.c; do $(CPP) -M $$i; done >.depend
-- 
-- include .depend
-- else
-- depend dep:
-- 	for i in *.c; do $(CPP) -M $$i; done >.depend
-- 
-- .depend:
-- 	@echo
-- 	@echo "Bad or missing .depend running 'make depend'"
-- 	@echo
-- 	$(MAKE) depend
-- 	@echo
-- 	@echo "Successful.  Now make again (ignore following error)"
-- 	@exit 1
-- endif
---- 9,50 ----
-  # to prevent segmentation faults 'cause of a bug, otherwise use 2.5.8
-  #CFLAGS = -g
-  #LDFLAGS = -g
-! PREFIX = /usr/local
-! CFLAGS += -g -Wall -DPREFIX=\"$(PREFIX)\"
-! #LDFLAGS = -s
-! INSTALLDIR = $(PREFIX)/bin
-  OBJECTS = playmidi.o midifile.o playevents.o patchload.o emumidi.o
-+ #INSTALL_BIN = cp
-+ #INSTALL_DAT = cp
-+ INSTALL_BIN = $(INSTALL) -s $(COPY) -o $(BINOWN) -g $(BINGRP) -m 755
-+ INSTALL_DAT = $(INSTALL) -c -o $(BINOWN) -g $(BINGRP) -m 644
-  
-  all: playmidi resetmidi
+! /etc/drums.o3:
+! 	cp -i drums.o3 /etc
+  
+! /etc/std.sb:
+! 	cp -i std.sb /etc
+  
+! /etc/drums.sb:
+! 	cp -i drums.sb /etc
+  
+  $(XAPPDEFAULTS)/XPlaymidi:
+! 	cp -i XPlaymidi.ad $(XAPPDEFAULTS)/XPlaymidi
+  
+! install: $(INSTALLDIR)/playmidi $(INSTALLDIR)/splaymidi \
+! 	 $(INSTALLDIR)/xplaymidi /etc/std.o3 /etc/drums.o3 \
+! 	 /etc/std.sb /etc/drums.sb $(XAPPDEFAULTS)/XPlaymidi
+  
+! install.novga: $(INSTALLDIR)/playmidi \
+! 	 $(INSTALLDIR)/xplaymidi /etc/std.o3 /etc/drums.o3 \
+! 	 /etc/std.sb /etc/drums.sb $(XAPPDEFAULTS)/XPlaymidi
+  
+! install.noX11: $(INSTALLDIR)/playmidi $(INSTALLDIR)/splaymidi \
+! 	 /etc/std.o3 /etc/drums.o3 /etc/std.sb /etc/drums.sb
+  
+! install.Xonly: $(INSTALLDIR)/xplaymidi /etc/std.o3 /etc/drums.o3 \
+! 	 /etc/std.sb /etc/drums.sb $(XAPPDEFAULTS)/XPlaymidi
+  
+! install.lame: $(INSTALLDIR)/playmidi \
+! 	 /etc/std.o3 /etc/drums.o3 /etc/std.sb /etc/drums.sb
+  
+  install.man:
+! 	 cp playmidi.1 /usr/man/man1/
+  
+  clean:
+  	rm -f *.o playmidi splaymidi xplaymidi a.out
+--- 82,143 ----
+  io_svgalib.o: io_svgalib.c
+  	$(CC) $(CFLAGS) $(INCVGA) -c io_svgalib.c -o io_svgalib.o
   
 ! playmidi: $(OBJECTS)
-  	$(CC) $(LDFLAGS) -o playmidi $(OBJECTS)
+  	$(CC) $(LDFLAGS) -o playmidi $(OBJECTS) $(LIBNC)
   
-! resetmidi: resetmidi.o
-! 	$(CC) $(LDFLAGS) -o resetmidi resetmidi.o
+! xplaymidi: $(XOBJECTS)
+  	$(CC) $(LDFLAGS) -o xplaymidi $(XOBJECTS) $(LIBX11)
+  
+! splaymidi: $(SOBJECTS)
+  	$(CC) $(LDFLAGS) -o splaymidi $(SOBJECTS) $(LIBVGA)
   
   $(INSTALLDIR)/playmidi: playmidi
 ! 	$(INSTALL_BIN) playmidi $(INSTALLDIR)
   
-  $(INSTALLDIR)/resetmidi: resetmidi
-! 	$(INSTALL_BIN) resetmidi $(INSTALLDIR)
+  $(INSTALLDIR)/xplaymidi: xplaymidi
+! 	$(INSTALL_BIN) xplaymidi $(INSTALLDIR)
+  
+  $(INSTALLDIR)/splaymidi: splaymidi
+! 	$(INSTALL_BIN) splaymidi $(INSTALLDIR)
+  
+! ${PREFIX}/lib/midi/std.o3:
+! 	$(INSTALL_DAT) std.o3 $@
+  
+! ${PREFIX}/lib/midi/drums.o3:
+! 	$(INSTALL_DAT) drums.o3 $@
+  
+! ${PREFIX}/lib/midi/std.sb:
+! 	$(INSTALL_DAT) std.sb $@
+  
+! ${PREFIX}/lib/midi/drums.sb:
+! 	$(INSTALL_DAT) drums.sb $@
+  
+  $(XAPPDEFAULTS)/XPlaymidi:
+! 	$(INSTALL_DAT) XPlaymidi.ad $(XAPPDEFAULTS)/XPlaymidi
   
 ! dirs:
-! 	-@mkdir -p $(INSTALLDIR)
 ! 	-@mkdir -p $(PREFIX)/lib/midi
-! 	-@mkdir -p $(PREFIX)/lib/gus
-! 	-@mkdir -p $(PREFIX)/man/man1
-! 	-@mkdir -p $(PREFIX)/man/man3
+! 	-@mkdir -p $(PREFIX)/lib/Plib
+  
+! install: dirs $(INSTALLDIR)/playmidi $(INSTALLDIR)/splaymidi \
+! 	 $(INSTALLDIR)/xplaymidi ${PREFIX}/lib/midi/std.o3 ${PREFIX}/lib/midi/drums.o3 \
+! 	 ${PREFIX}/lib/midi/std.sb ${PREFIX}/lib/midi/drums.sb $(XAPPDEFAULTS)/XPlaymidi
+  
+! install.novga: dirs $(INSTALLDIR)/playmidi \
+! 	 $(INSTALLDIR)/xplaymidi ${PREFIX}/lib/midi/std.o3 ${PREFIX}/lib/midi/drums.o3 \
+! 	 ${PREFIX}/lib/midi/std.sb ${PREFIX}/lib/midi/drums.sb $(XAPPDEFAULTS)/XPlaymidi
+  
+! install.noX11: dirs $(INSTALLDIR)/playmidi $(INSTALLDIR)/splaymidi \
+! 	 ${PREFIX}/lib/midi/std.o3 ${PREFIX}/lib/midi/drums.o3 ${PREFIX}/lib/midi/std.sb ${PREFIX}/lib/midi/drums.sb
+  
+! install.Xonly: dirs $(INSTALLDIR)/xplaymidi ${PREFIX}/lib/midi/std.o3 ${PREFIX}/lib/midi/drums.o3 \
+! 	 ${PREFIX}/lib/midi/std.sb ${PREFIX}/lib/midi/drums.sb $(XAPPDEFAULTS)/XPlaymidi
 ! 
-! install: dirs $(INSTALLDIR)/playmidi $(INSTALLDIR)/resetmidi
-! 	$(INSTALL_DAT) std.o3 drums.o3 std.sb drums.sb $(PREFIX)/lib/midi
-! 	$(INSTALL_DAT) playmidi.1 $(PREFIX)/man/man1
-! 	$(INSTALL_DAT) midifile.3 $(PREFIX)/man/man3
+! install.lame: dirs $(INSTALLDIR)/playmidi \
+! 	 ${PREFIX}/lib/midi/std.o3 ${PREFIX}/lib/midi/drums.o3 ${PREFIX}/lib/midi/std.sb ${PREFIX}/lib/midi/drums.sb
+  
+  install.man:
+! 	${INSTALL_DAT} playmidi.1 ${PREFIX}/man/man1
   
   clean:
-! 	rm -f *.o *~ *.bak playmidi resetmidi a.out
+  	rm -f *.o playmidi splaymidi xplaymidi a.out
+***************
+*** 139,160 ****
+  distclean: clean
+  	rm -f .depend  *~ *.bak playmidi.h config.sed
   
+- 
+- ifeq (.depend, $(wildcard .depend))
+- .depend depend dep: playmidi.h
+- 	for i in *.c; do $(CPP) -M $(CFLAGS) $(INCLUDES) $$i; done >.depend
+- 
+- include .depend
+- else
+- depend dep:
+- 	for i in *.c; do $(CPP) -M $(CFLAGS) $(INCLUDES) $$i; done >.depend
+- 
+- .depend: playmidi.h
+- 	@echo
+- 	@echo "Bad or missing .depend running 'make depend clean'"
+- 	@echo
+- 	$(MAKE) depend clean
+- 	@echo
+- 	@echo "Successful.  Trying to make again"
+- 	@exit 0
+- endif
+--- 145,147 ----
diff --git a/audio/playmidi/files/patch-ac b/audio/playmidi/files/patch-ac
new file mode 100644
index 000000000000..2d44bcc090f2
--- /dev/null
+++ b/audio/playmidi/files/patch-ac
@@ -0,0 +1,19 @@
+*** Configure.bak	Sat Feb 24 17:00:00 1996
+--- Configure	Fri Nov 15 08:47:23 1996
+***************
+*** 8,14 ****
+  mididevno=-1
+  play=PLAY_MIDI
+  gus1=/dos/ultrasnd/midi
+! gus2=/usr/local/lib/Plib
+  ##########################################################
+  ### YOU MUST HAVE THE VOXWARE SOUND DRIVER INSTALLED   ###
+  ### FOR THIS SCRIPT TO FUNCTION PROPERLY. /dev/sndstat ###
+--- 8,14 ----
+  mididevno=-1
+  play=PLAY_MIDI
+  gus1=/dos/ultrasnd/midi
+! gus2=${PREFIX}/lib/Plib
+  ##########################################################
+  ### YOU MUST HAVE THE VOXWARE SOUND DRIVER INSTALLED   ###
+  ### FOR THIS SCRIPT TO FUNCTION PROPERLY. /dev/sndstat ###
diff --git a/audio/playmidi/files/patch-ad b/audio/playmidi/files/patch-ad
new file mode 100644
index 000000000000..893d42c186ba
--- /dev/null
+++ b/audio/playmidi/files/patch-ad
@@ -0,0 +1,42 @@
+*** playmidi.h-dist.bak	Sat Feb 24 17:00:00 1996
+--- playmidi.h-dist	Fri Nov 15 08:47:23 1996
+***************
+*** 35,44 ****
+  #define MAXTRKS		128
+  /* where to find fm patch libraries */
+  #define SEQUENCER_DEV	"/dev/sequencer"
+! #define O3MELODIC	"/etc/std.o3"
+! #define O3DRUMS		"/etc/drums.o3"
+! #define SBMELODIC	"/etc/std.sb"
+! #define SBDRUMS		"/etc/drums.sb"
+  #define ISPERC(x)	(perc & (1 << x))
+  #define ISGUS(x)	(play_gus & (1 << x))
+  #define ISFM(x)		(play_fm & (1 << x))
+--- 35,47 ----
+  #define MAXTRKS		128
+  /* where to find fm patch libraries */
+  #define SEQUENCER_DEV	"/dev/sequencer"
+! #ifndef PREFIX
+! #define PREFIX "/usr/local"
+! #endif
+! #define O3MELODIC       PREFIX "/lib/midi/std.o3"
+! #define O3DRUMS         PREFIX "/lib/midi/drums.o3"
+! #define SBMELODIC       PREFIX "/lib/midi/std.sb"
+! #define SBDRUMS         PREFIX "/lib/midi/drums.sb"
+  #define ISPERC(x)	(perc & (1 << x))
+  #define ISGUS(x)	(play_gus & (1 << x))
+  #define ISFM(x)		(play_fm & (1 << x))
+***************
+*** 49,55 ****
+--- 52,62 ----
+  #include <stdio.h>
+  #include <string.h>
+  #include <stdlib.h>
++ #ifdef __FreeBSD__
++ #include <machine/soundcard.h>
++ #else
+  #include <sys/soundcard.h>
++ #endif
+  #include <sys/ioctl.h>
+  
+  struct chanstate {
diff --git a/audio/playmidi/pkg-plist b/audio/playmidi/pkg-plist
index 10238841d74d..30206d38d5a9 100644
--- a/audio/playmidi/pkg-plist
+++ b/audio/playmidi/pkg-plist
@@ -1,9 +1,6 @@
-@cwd /usr/local
 bin/playmidi
-bin/resetmidi
 lib/midi/std.o3
 lib/midi/std.sb
 lib/midi/drums.o3
 lib/midi/drums.sb
 man/man1/playmidi.1
-man/man3/midifile.3