Date: Mon, 21 Aug 2000 09:21:09 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/20750: Update port: audio/playmidi Message-ID: <20000821162109.6DA5C37B42C@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 20750
>Category: ports
>Synopsis: Update port: audio/playmidi
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Aug 21 09:30:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Change location of data files from libdata/ to share/
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/audio/playmidi/patches/patch-ab audio/playmidi/patches/patch-ab
--- /usr/ports/audio/playmidi/patches/patch-ab Thu Jan 6 05:56:47 2000
+++ audio/playmidi/patches/patch-ab Tue Aug 15 23:27:19 2000
@@ -1,266 +1,190 @@
-*** Makefile.orig Thu Oct 1 11:39:18 1998
---- Makefile Wed Jan 5 06:38:01 2000
-***************
-*** 12,50 ****
-
- # 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
-! LIBGTK = -L/usr/X11R6/lib -lgtk-1.1 -lgdk-1.1 -lglib-1.1 -lX11 -lXext -lm
-! LIBVGA = -L/usr/local/lib -lvgagl -lvga
-
- # 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
-
- # stuff for sound blaster awe32
- INCAWE = -DVOXWARE_CONTROLLER_7_WORKING
- # awe_voice.h path
-! INCAWE += -I/usr/lib/oss/include/sys
-
- # 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) $(INCAWE)
-! INSTALLDIR = /usr/bin
-! INSTALL = install -s
-
- # if you are using the GUS Ultra driver module, add -DULTRA_DRIVER
-! CFLAGS = -Wall -pipe -fomit-frame-pointer -O2 -m486 $(INCAWE)
-! LDFLAGS =
-
- OBJECTS = playmidi.o readmidi.o playevents.o \
- patchload.o emumidi.o io_ncurses.o
---- 12,53 ----
-
- # 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
-! #LIBGTK = -L/usr/X11R6/lib -lgtk-1.1 -lgdk-1.1 -lglib-1.1 -lX11 -lXext -lm
-! #LIBVGA = -L/usr/local/lib -lvgagl -lvga
-
- # 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
-
- # stuff for sound blaster awe32
- INCAWE = -DVOXWARE_CONTROLLER_7_WORKING
- # awe_voice.h path
-! INCAWE += -I.
-
- # 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) $(INCAWE)
-! INSTALLDIR = ${PREFIX}/bin
-! LIBDATADIR = ${PREFIX}/libdata/midi
-! #INSTALL = install -s
-
- # if you are using the GUS Ultra driver module, add -DULTRA_DRIVER
-! CFLAGS += -DPREFIX=\"$(PREFIX)\" $(INCAWE)
-! #LDFLAGS =
-! INSTALL_BIN = ${BSD_INSTALL_PROGRAM}
-! INSTALL_DAT = ${BSD_INSTALL_DATA}
-
- OBJECTS = playmidi.o readmidi.o playevents.o \
- patchload.o emumidi.o io_ncurses.o
-***************
-*** 58,64 ****
- GOBJECTS= playmidi.o readmidi.o playevents.o \
- patchload.o emumidi.o io_gtk.o
-
-! all: playmidi xplaymidi
-
- config:
- playmidi.h: playmidi.h-dist
---- 61,67 ----
- GOBJECTS= playmidi.o readmidi.o playevents.o \
- patchload.o emumidi.o io_gtk.o
-
-! all: playmidi #xplaymidi
-
- config:
- playmidi.h: playmidi.h-dist
-***************
-*** 73,136 ****
- 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) $(LIBNC)
-
-! xplaymidi: .depend $(XOBJECTS)
- $(CC) $(LDFLAGS) -o xplaymidi $(XOBJECTS) $(LIBX11)
-
-! gtkplaymidi: .depend $(GOBJECTS)
- $(CC) $(LDFLAGS) -o gtkplaymidi $(GOBJECTS) $(LIBGTK)
-
-! splaymidi: .depend $(SOBJECTS)
- $(CC) $(LDFLAGS) -o splaymidi $(SOBJECTS) $(LIBVGA)
-
- $(INSTALLDIR)/playmidi: playmidi
-! $(INSTALL) playmidi $(INSTALLDIR)
-
- $(INSTALLDIR)/xplaymidi: xplaymidi
-! $(INSTALL) xplaymidi $(INSTALLDIR)
-
- $(INSTALLDIR)/gtkplaymidi: gtkplaymidi
-! $(INSTALL) gtkplaymidi $(INSTALLDIR)
-
- $(INSTALLDIR)/splaymidi: splaymidi
-! $(INSTALL) splaymidi $(INSTALLDIR)
-
-! /etc/std.o3:
-! cp -i std.o3 /etc
-
-! /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 toy seq2mid beat
---- 76,146 ----
- io_svgalib.o: io_svgalib.c
- $(CC) $(CFLAGS) $(INCVGA) -c io_svgalib.c -o io_svgalib.o
-
-! playmidi: $(OBJECTS)
- $(CC) $(LDFLAGS) -o playmidi $(OBJECTS) $(LIBNC)
-
-! xplaymidi: $(XOBJECTS)
- $(CC) $(LDFLAGS) -o xplaymidi $(XOBJECTS) $(LIBX11)
-
-! gtkplaymidi: $(GOBJECTS)
- $(CC) $(LDFLAGS) -o gtkplaymidi $(GOBJECTS) $(LIBGTK)
-
-! splaymidi: $(SOBJECTS)
- $(CC) $(LDFLAGS) -o splaymidi $(SOBJECTS) $(LIBVGA)
-
- $(INSTALLDIR)/playmidi: playmidi
-! $(INSTALL_BIN) playmidi $(INSTALLDIR)
-
- $(INSTALLDIR)/xplaymidi: xplaymidi
-! $(INSTALL_BIN) xplaymidi $(INSTALLDIR)
-
- $(INSTALLDIR)/gtkplaymidi: gtkplaymidi
-! $(INSTALL_BIN) gtkplaymidi $(INSTALLDIR)
-
- $(INSTALLDIR)/splaymidi: splaymidi
-! $(INSTALL_BIN) splaymidi $(INSTALLDIR)
-
-! $(LIBDATADIR)/std.o3:
-! $(INSTALL_DAT) std.o3 $(LIBDATADIR)
-!
-! $(LIBDATADIR)/drums.o3:
-! $(INSTALL_DAT) drums.o3 $(LIBDATADIR)
-
-! $(LIBDATADIR)/std.sb:
-! $(INSTALL_DAT) std.sb $(LIBDATADIR)
-
-! $(LIBDATADIR)/drums.sb:
-! $(INSTALL_DAT) drums.sb $(LIBDATADIR)
-
- $(XAPPDEFAULTS)/XPlaymidi:
-! $(INSTALL_DAT) XPlaymidi.ad $(XAPPDEFAULTS)/XPlaymidi
-
-! dirs:
-! -@mkdir -p $(LIBDATADIR)
-! -@mkdir -p ${PREFIX}/lib/Plib
-!
-! install: dirs $(INSTALLDIR)/playmidi $(INSTALLDIR)/splaymidi \
-! $(INSTALLDIR)/xplaymidi $(LIBDATADIR)/std.o3 $(LIBDATADIR)/drums.o3 \
-! $(LIBDATADIR)/std.sb $(LIBDATADIR)/drums.sb $(XAPPDEFAULTS)/XPlaymidi
-!
-! install.novga: dirs $(INSTALLDIR)/playmidi \
-! $(INSTALLDIR)/xplaymidi $(LIBDATADIR)/std.o3 $(LIBDATADIR)/drums.o3 \
-! $(LIBDATADIR)/std.sb $(LIBDATADIR)/drums.sb $(XAPPDEFAULTS)/XPlaymidi
-!
-! install.noX11: dirs $(INSTALLDIR)/playmidi $(INSTALLDIR)/splaymidi \
-! $(LIBDATADIR)/std.o3 $(LIBDATADIR)/drums.o3 \
-! $(LIBDATADIR)/std.sb $(LIBDATADIR)/drums.sb
-!
-! install.Xonly: dirs $(INSTALLDIR)/xplaymidi \
-! $(LIBDATADIR)/std.o3 $(LIBDATADIR)/drums.o3 \
-! $(LIBDATADIR)/std.sb $(LIBDATADIR)/drums.sb $(XAPPDEFAULTS)/XPlaymidi
-!
-! install.lame: dirs $(INSTALLDIR)/playmidi \
-! $(LIBDATADIR)/std.o3 $(LIBDATADIR)/drums.o3 \
-! $(LIBDATADIR)/std.sb $(LIBDATADIR)/drums.sb
-
- install.man:
-! ${BSD_INSTALL_MAN} playmidi.1 ${PREFIX}/man/man1/
-
- clean:
- rm -f *.o playmidi splaymidi xplaymidi a.out toy seq2mid beat
-***************
-*** 138,159 ****
- 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
---- 148,150 ----
+--- Makefile.orig Thu Oct 1 11:39:18 1998
++++ Makefile Tue Aug 15 23:27:03 2000
+@@ -12,39 +12,40 @@
+
+ # 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
++LIBNC = -lncurses -lmytinfo
+
+ ######### NOTE: X11R6 or newer REQUIRED
+-LIBX11 = -L/usr/X11R6/lib -lXaw -lXmu -lXt -lX11 -lXext -lSM -lICE
+-LIBGTK = -L/usr/X11R6/lib -lgtk-1.1 -lgdk-1.1 -lglib-1.1 -lX11 -lXext -lm
+-LIBVGA = -L/usr/local/lib -lvgagl -lvga
++#LIBX11 = -L/usr/X11R6/lib -lXaw -lXmu -lXt -lX11 -lXext -lSM -lICE
++#LIBGTK = -L/usr/X11R6/lib -lgtk-1.1 -lgdk-1.1 -lglib-1.1 -lX11 -lXext -lm
++#LIBVGA = -L/usr/local/lib -lvgagl -lvga
+
+ # 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
++#INCNC = -I/usr/include/ncurses
+
+ # just in case you keep your X includes in an odd location.
+-INCX11 = -I/usr/X11R6/include -DNARROWPROTO
++#INCX11 = -I/usr/X11R6/include -DNARROWPROTO
+
+ # stuff for sound blaster awe32
+ INCAWE = -DVOXWARE_CONTROLLER_7_WORKING
+ # awe_voice.h path
+-INCAWE += -I/usr/lib/oss/include/sys
++INCAWE += -I.
+
+ # 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
++#INCVGA = -I/usr/local/include
+
+ # Directory where application defaults files are stored for X11 version
+-XAPPDEFAULTS = /usr/X11R6/lib/X11/app-defaults
++#XAPPDEFAULTS = /usr/X11R6/lib/X11/app-defaults
+
+ INCLUDES= $(INCNC) $(INCX11) $(INCVGA) $(INCAWE)
+-INSTALLDIR = /usr/bin
+-INSTALL = install -s
++INSTALLDIR = ${PREFIX}/bin
++MIDI = ${PREFIX}/share/midi
++#INSTALL = install -s
+
+ # if you are using the GUS Ultra driver module, add -DULTRA_DRIVER
+-CFLAGS = -Wall -pipe -fomit-frame-pointer -O2 -m486 $(INCAWE)
+-LDFLAGS =
++CFLAGS += -DMIDI=\"$(MIDI)\" $(INCAWE)
++#LDFLAGS =
+
+ OBJECTS = playmidi.o readmidi.o playevents.o \
+ patchload.o emumidi.o io_ncurses.o
+@@ -58,7 +59,7 @@
+ GOBJECTS= playmidi.o readmidi.o playevents.o \
+ patchload.o emumidi.o io_gtk.o
+
+-all: playmidi xplaymidi
++all: playmidi #xplaymidi
+
+ config:
+ playmidi.h: playmidi.h-dist
+@@ -73,64 +74,70 @@
+ io_svgalib.o: io_svgalib.c
+ $(CC) $(CFLAGS) $(INCVGA) -c io_svgalib.c -o io_svgalib.o
+
+-playmidi: .depend $(OBJECTS)
++playmidi: $(OBJECTS)
+ $(CC) $(LDFLAGS) -o playmidi $(OBJECTS) $(LIBNC)
+
+-xplaymidi: .depend $(XOBJECTS)
++xplaymidi: $(XOBJECTS)
+ $(CC) $(LDFLAGS) -o xplaymidi $(XOBJECTS) $(LIBX11)
+
+-gtkplaymidi: .depend $(GOBJECTS)
++gtkplaymidi: $(GOBJECTS)
+ $(CC) $(LDFLAGS) -o gtkplaymidi $(GOBJECTS) $(LIBGTK)
+
+-splaymidi: .depend $(SOBJECTS)
++splaymidi: $(SOBJECTS)
+ $(CC) $(LDFLAGS) -o splaymidi $(SOBJECTS) $(LIBVGA)
+
+ $(INSTALLDIR)/playmidi: playmidi
+- $(INSTALL) playmidi $(INSTALLDIR)
++ ${BSD_INSTALL_PROGRAM} playmidi $(INSTALLDIR)
+
+ $(INSTALLDIR)/xplaymidi: xplaymidi
+- $(INSTALL) xplaymidi $(INSTALLDIR)
++ ${BSD_INSTALL_PROGRAM} xplaymidi $(INSTALLDIR)
+
+ $(INSTALLDIR)/gtkplaymidi: gtkplaymidi
+- $(INSTALL) gtkplaymidi $(INSTALLDIR)
++ ${BSD_INSTALL_PROGRAM} gtkplaymidi $(INSTALLDIR)
+
+ $(INSTALLDIR)/splaymidi: splaymidi
+- $(INSTALL) splaymidi $(INSTALLDIR)
+-
+-/etc/std.o3:
+- cp -i std.o3 /etc
++ ${BSD_INSTALL_PROGRAM} splaymidi $(INSTALLDIR)
+
+-/etc/drums.o3:
+- cp -i drums.o3 /etc
++$(MIDI)/std.o3:
++ ${BSD_INSTALL_DATA} std.o3 $(MIDI)
++
++$(MIDI)/drums.o3:
++ ${BSD_INSTALL_DATA} drums.o3 $(MIDI)
+
+-/etc/std.sb:
+- cp -i std.sb /etc
++$(MIDI)/std.sb:
++ ${BSD_INSTALL_DATA} std.sb $(MIDI)
+
+-/etc/drums.sb:
+- cp -i drums.sb /etc
++$(MIDI)/drums.sb:
++ ${BSD_INSTALL_DATA} drums.sb $(MIDI)
+
+ $(XAPPDEFAULTS)/XPlaymidi:
+- cp -i XPlaymidi.ad $(XAPPDEFAULTS)/XPlaymidi
++ ${BSD_INSTALL_DATA} 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
++dirs:
++ -@mkdir -p $(MIDI)
+
+-install.novga: $(INSTALLDIR)/playmidi \
+- $(INSTALLDIR)/xplaymidi /etc/std.o3 /etc/drums.o3 \
+- /etc/std.sb /etc/drums.sb $(XAPPDEFAULTS)/XPlaymidi
++install: dirs $(INSTALLDIR)/playmidi $(INSTALLDIR)/splaymidi \
++ $(INSTALLDIR)/xplaymidi $(MIDI)/std.o3 $(MIDI)/drums.o3 \
++ $(MIDI)/std.sb $(MIDI)/drums.sb $(XAPPDEFAULTS)/XPlaymidi
+
+-install.noX11: $(INSTALLDIR)/playmidi $(INSTALLDIR)/splaymidi \
+- /etc/std.o3 /etc/drums.o3 /etc/std.sb /etc/drums.sb
++install.novga: dirs $(INSTALLDIR)/playmidi \
++ $(INSTALLDIR)/xplaymidi $(MIDI)/std.o3 $(MIDI)/drums.o3 \
++ $(MIDI)/std.sb $(MIDI)/drums.sb $(XAPPDEFAULTS)/XPlaymidi
+
+-install.Xonly: $(INSTALLDIR)/xplaymidi /etc/std.o3 /etc/drums.o3 \
+- /etc/std.sb /etc/drums.sb $(XAPPDEFAULTS)/XPlaymidi
++install.noX11: dirs $(INSTALLDIR)/playmidi $(INSTALLDIR)/splaymidi \
++ $(MIDI)/std.o3 $(MIDI)/drums.o3 \
++ $(MIDI)/std.sb $(MIDI)/drums.sb
+
+-install.lame: $(INSTALLDIR)/playmidi \
+- /etc/std.o3 /etc/drums.o3 /etc/std.sb /etc/drums.sb
++install.Xonly: dirs $(INSTALLDIR)/xplaymidi \
++ $(MIDI)/std.o3 $(MIDI)/drums.o3 \
++ $(MIDI)/std.sb $(MIDI)/drums.sb $(XAPPDEFAULTS)/XPlaymidi
++
++install.lame: dirs $(INSTALLDIR)/playmidi \
++ $(MIDI)/std.o3 $(MIDI)/drums.o3 \
++ $(MIDI)/std.sb $(MIDI)/drums.sb
+
+ install.man:
+- cp playmidi.1 /usr/man/man1/
++ ${BSD_INSTALL_MAN} playmidi.1 ${PREFIX}/man/man1/
+
+ clean:
+ rm -f *.o playmidi splaymidi xplaymidi a.out toy seq2mid beat
+@@ -138,22 +145,3 @@
+ 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
diff -urN /usr/ports/audio/playmidi/patches/patch-ac audio/playmidi/patches/patch-ac
--- /usr/ports/audio/playmidi/patches/patch-ac Fri Nov 15 15:54:07 1996
+++ audio/playmidi/patches/patch-ac Tue Aug 15 23:05:18 2000
@@ -1,19 +1,11 @@
-*** 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 ###
+--- Configure.orig Mon May 12 06:26:36 1997
++++ Configure Tue Aug 15 22:51:15 2000
+@@ -8,7 +8,7 @@
+ mididevno=-1
+ play=PLAY_MIDI
+ gus1=/dos/ultrasnd/midi
+-gus2=/usr/local/lib/Plib
++gus2=${PREFIX}/lib/Plib
+ ##########################################################
+ ### YOU MUST HAVE THE VOXWARE SOUND DRIVER INSTALLED ###
+ ### FOR THIS SCRIPT TO FUNCTION PROPERLY. /dev/sndstat ###
diff -urN /usr/ports/audio/playmidi/patches/patch-ad audio/playmidi/patches/patch-ad
--- /usr/ports/audio/playmidi/patches/patch-ad Thu Jan 6 05:56:48 2000
+++ audio/playmidi/patches/patch-ad Tue Aug 15 23:02:29 2000
@@ -1,42 +1,29 @@
-*** playmidi.h-dist.orig Mon May 12 06:26:36 1997
---- playmidi.h-dist Wed Jan 5 06:33:52 2000
-***************
-*** 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 "/libdata/midi/std.o3"
-! #define O3DRUMS PREFIX "/libdata/midi/drums.o3"
-! #define SBMELODIC PREFIX "/libdata/midi/std.sb"
-! #define SBDRUMS PREFIX "/libdata/midi/drums.sb"
- #define ISPERC(x) (perc & (1 << x))
- #define ISGUS(x) (play_gus & (1 << x))
- #define ISFM(x) (play_fm & (1 << x))
-***************
-*** 50,56 ****
---- 53,63 ----
- #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>
- #ifdef linux
- #include <linux/awe_voice.h>
+--- playmidi.h-dist.orig Mon May 12 06:26:36 1997
++++ playmidi.h-dist Tue Aug 15 23:02:27 2000
+@@ -35,10 +35,10 @@
+ #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 O3MELODIC MIDI "/std.o3"
++#define O3DRUMS MIDI "/drums.o3"
++#define SBMELODIC MIDI "/std.sb"
++#define SBDRUMS MIDI "/drums.sb"
+ #define ISPERC(x) (perc & (1 << x))
+ #define ISGUS(x) (play_gus & (1 << x))
+ #define ISFM(x) (play_fm & (1 << x))
+@@ -50,7 +50,11 @@
+ #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>
+ #ifdef linux
+ #include <linux/awe_voice.h>
diff -urN /usr/ports/audio/playmidi/pkg/PLIST audio/playmidi/pkg/PLIST
--- /usr/ports/audio/playmidi/pkg/PLIST Thu Jan 6 05:56:50 2000
+++ audio/playmidi/pkg/PLIST Tue Aug 15 23:03:38 2000
@@ -1,6 +1,6 @@
bin/playmidi
-libdata/midi/drums.o3
-libdata/midi/drums.sb
-libdata/midi/std.o3
-libdata/midi/std.sb
-@dirrm libdata/midi
+share/midi/drums.o3
+share/midi/drums.sb
+share/midi/std.o3
+share/midi/std.sb
+@dirrm share/midi
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000821162109.6DA5C37B42C>