aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/playmidi/Makefile27
-rw-r--r--audio/playmidi/distinfo2
-rw-r--r--audio/playmidi/files/patch-ab171
-rw-r--r--audio/playmidi/files/patch-ad22
-rw-r--r--audio/playmidi/pkg-descr20
-rw-r--r--audio/playmidi/pkg-plist9
6 files changed, 140 insertions, 111 deletions
diff --git a/audio/playmidi/Makefile b/audio/playmidi/Makefile
index 9e12ee004558..9bbe5a930cb0 100644
--- a/audio/playmidi/Makefile
+++ b/audio/playmidi/Makefile
@@ -1,23 +1,22 @@
-# New ports collection makefile for: playmidi
-# Version required: 2.3
-# Date created: 27 Feb 1995
-# Whom: ache
+# New ports collection makefile for: playmidi
+# Version required: 2.4
+# Date created: 27 Feb 1995
+# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= playmidi-2.3
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/players
+DISTNAME= playmidi-2.4
+CATEGORIES= audio
+MASTER_SITES= http://nl.linux.org/~diz/playmidi/
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
-IS_INTERACTIVE= YES # asks what devices you want to support
-HAS_CONFIGURE= YES
-CONFIGURE_SCRIPT= Configure
-CONFIGURE_ENV= PREFIX=${PREFIX}
-INSTALL_TARGET= install.lame install.man
+IS_INTERACTIVE= YES # asks what devices you want to support
+HAS_CONFIGURE= YES
+CONFIGURE_SCRIPT= Configure
+CONFIGURE_ENV= PREFIX=${PREFIX}
+INSTALL_TARGET= install.lame install.man
MAN1= playmidi.1
.include <bsd.port.mk>
diff --git a/audio/playmidi/distinfo b/audio/playmidi/distinfo
index 55c3660f53ca..b0f8f802484e 100644
--- a/audio/playmidi/distinfo
+++ b/audio/playmidi/distinfo
@@ -1 +1 @@
-MD5 (playmidi-2.3.tar.gz) = f5114d85cdbf6096f5820eb58b9ea390
+MD5 (playmidi-2.4.tar.gz) = ce27bfbc4e122f103bf3d2fe8d253011
diff --git a/audio/playmidi/files/patch-ab b/audio/playmidi/files/patch-ab
index d0463befab9e..b29c3823f594 100644
--- a/audio/playmidi/files/patch-ab
+++ b/audio/playmidi/files/patch-ab
@@ -1,96 +1,108 @@
-*** Makefile.orig Sat Feb 24 17:00:00 1996
---- Makefile Fri Nov 15 09:38:06 1996
+*** Makefile.orig Thu Oct 1 11:39:18 1998
+--- Makefile Wed Jan 5 06:38:01 2000
***************
-*** 28,34 ****
+*** 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
---- 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 ****
+! 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
+! 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
+! XAPPDEFAULTS = /usr/X11R6/lib/X11/app-defaults
- INCLUDES= $(INCNC) $(INCX11) $(INCVGA)
-! INSTALLDIR = /usr/local/bin
+ 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
+! CFLAGS = -Wall -pipe -fomit-frame-pointer -O2 -m486 $(INCAWE)
! LDFLAGS =
OBJECTS = playmidi.o readmidi.o playevents.o \
patchload.o emumidi.o io_ncurses.o
---- 36,62 ----
+--- 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
+! #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.
# 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)
+ 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 = -Wall -pipe -fomit-frame-pointer -O2 -m486
-! CFLAGS += -DPREFIX=\"$(PREFIX)\"
+! CFLAGS += -DPREFIX=\"$(PREFIX)\" $(INCAWE)
! #LDFLAGS =
-! INSTALL_BIN = $(INSTALL) -s -c -o $(BINOWN) -g $(BINGRP) -m 755
-! INSTALL_DAT = $(INSTALL) -c -o $(BINOWN) -g $(BINGRP) -m 644
+! INSTALL_BIN = ${BSD_INSTALL_PROGRAM}
+! INSTALL_DAT = ${BSD_INSTALL_DATA}
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
+*** 58,64 ****
+ GOBJECTS= playmidi.o readmidi.o playevents.o \
+ patchload.o emumidi.o io_gtk.o
-! all: playmidi splaymidi xplaymidi
+! all: playmidi xplaymidi
config:
playmidi.h: playmidi.h-dist
---- 67,73 ----
- SOBJECTS= playmidi.o readmidi.o playevents.o \
- patchload.o emumidi.o io_svgalib.o
+--- 61,67 ----
+ GOBJECTS= playmidi.o readmidi.o playevents.o \
+ patchload.o emumidi.o io_gtk.o
-! all: playmidi #splaymidi xplaymidi
+! all: playmidi #xplaymidi
config:
playmidi.h: playmidi.h-dist
***************
-*** 80,137 ****
+*** 73,136 ****
io_svgalib.o: io_svgalib.c
$(CC) $(CFLAGS) $(INCVGA) -c io_svgalib.c -o io_svgalib.o
@@ -100,6 +112,9 @@
! 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)
@@ -109,6 +124,9 @@
$(INSTALLDIR)/xplaymidi: xplaymidi
! $(INSTALL) xplaymidi $(INSTALLDIR)
+ $(INSTALLDIR)/gtkplaymidi: gtkplaymidi
+! $(INSTALL) gtkplaymidi $(INSTALLDIR)
+
$(INSTALLDIR)/splaymidi: splaymidi
! $(INSTALL) splaymidi $(INSTALLDIR)
@@ -120,27 +138,27 @@
! /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
@@ -148,8 +166,8 @@
! cp playmidi.1 /usr/man/man1/
clean:
- rm -f *.o playmidi splaymidi xplaymidi a.out
---- 82,143 ----
+ 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
@@ -159,6 +177,9 @@
! xplaymidi: $(XOBJECTS)
$(CC) $(LDFLAGS) -o xplaymidi $(XOBJECTS) $(LIBX11)
+! gtkplaymidi: $(GOBJECTS)
+ $(CC) $(LDFLAGS) -o gtkplaymidi $(GOBJECTS) $(LIBGTK)
+
! splaymidi: $(SOBJECTS)
$(CC) $(LDFLAGS) -o splaymidi $(SOBJECTS) $(LIBVGA)
@@ -168,52 +189,58 @@
$(INSTALLDIR)/xplaymidi: xplaymidi
! $(INSTALL_BIN) xplaymidi $(INSTALLDIR)
+ $(INSTALLDIR)/gtkplaymidi: gtkplaymidi
+! $(INSTALL_BIN) gtkplaymidi $(INSTALLDIR)
+
$(INSTALLDIR)/splaymidi: splaymidi
! $(INSTALL_BIN) splaymidi $(INSTALLDIR)
-! ${PREFIX}/lib/midi/std.o3:
-! $(INSTALL_DAT) std.o3 $@
+! $(LIBDATADIR)/std.o3:
+! $(INSTALL_DAT) std.o3 $(LIBDATADIR)
+!
+! $(LIBDATADIR)/drums.o3:
+! $(INSTALL_DAT) drums.o3 $(LIBDATADIR)
-! ${PREFIX}/lib/midi/drums.o3:
-! $(INSTALL_DAT) drums.o3 $@
+! $(LIBDATADIR)/std.sb:
+! $(INSTALL_DAT) std.sb $(LIBDATADIR)
-! ${PREFIX}/lib/midi/std.sb:
-! $(INSTALL_DAT) std.sb $@
-
-! ${PREFIX}/lib/midi/drums.sb:
-! $(INSTALL_DAT) drums.sb $@
+! $(LIBDATADIR)/drums.sb:
+! $(INSTALL_DAT) drums.sb $(LIBDATADIR)
$(XAPPDEFAULTS)/XPlaymidi:
! $(INSTALL_DAT) XPlaymidi.ad $(XAPPDEFAULTS)/XPlaymidi
! dirs:
-! -@mkdir -p $(PREFIX)/lib/midi
-! -@mkdir -p $(PREFIX)/lib/Plib
-
+! -@mkdir -p $(LIBDATADIR)
+! -@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
-
+! $(INSTALLDIR)/xplaymidi $(LIBDATADIR)/std.o3 $(LIBDATADIR)/drums.o3 \
+! $(LIBDATADIR)/std.sb $(LIBDATADIR)/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
-
+! $(INSTALLDIR)/xplaymidi $(LIBDATADIR)/std.o3 $(LIBDATADIR)/drums.o3 \
+! $(LIBDATADIR)/std.sb $(LIBDATADIR)/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
+! $(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 \
-! ${PREFIX}/lib/midi/std.o3 ${PREFIX}/lib/midi/drums.o3 ${PREFIX}/lib/midi/std.sb ${PREFIX}/lib/midi/drums.sb
+! $(LIBDATADIR)/std.o3 $(LIBDATADIR)/drums.o3 \
+! $(LIBDATADIR)/std.sb $(LIBDATADIR)/drums.sb
install.man:
-! ${INSTALL_DAT} playmidi.1 ${PREFIX}/man/man1
+! ${BSD_INSTALL_MAN} playmidi.1 ${PREFIX}/man/man1/
clean:
- rm -f *.o playmidi splaymidi xplaymidi a.out
+ rm -f *.o playmidi splaymidi xplaymidi a.out toy seq2mid beat
***************
-*** 139,160 ****
+*** 138,159 ****
distclean: clean
rm -f .depend *~ *.bak playmidi.h config.sed
@@ -236,4 +263,4 @@
- @echo "Successful. Trying to make again"
- @exit 0
- endif
---- 145,147 ----
+--- 148,150 ----
diff --git a/audio/playmidi/files/patch-ad b/audio/playmidi/files/patch-ad
index 893d42c186ba..c797c3cf4c76 100644
--- a/audio/playmidi/files/patch-ad
+++ b/audio/playmidi/files/patch-ad
@@ -1,5 +1,5 @@
-*** playmidi.h-dist.bak Sat Feb 24 17:00:00 1996
---- playmidi.h-dist Fri Nov 15 08:47:23 1996
+*** 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
@@ -17,18 +17,18 @@
/* where to find fm patch libraries */
#define SEQUENCER_DEV "/dev/sequencer"
! #ifndef PREFIX
-! #define PREFIX "/usr/local"
+! #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 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))
***************
-*** 49,55 ****
---- 52,62 ----
+*** 50,56 ****
+--- 53,63 ----
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -38,5 +38,5 @@
#include <sys/soundcard.h>
+ #endif
#include <sys/ioctl.h>
-
- struct chanstate {
+ #ifdef linux
+ #include <linux/awe_voice.h>
diff --git a/audio/playmidi/pkg-descr b/audio/playmidi/pkg-descr
index d9596a077de9..3bb62d3c52f6 100644
--- a/audio/playmidi/pkg-descr
+++ b/audio/playmidi/pkg-descr
@@ -1,9 +1,11 @@
- playmidi is a small, quick midi file player using the level two sequencer
- of the voxware 3.0 package to play on general midi devices or FM or
- Gravis Ultrasound. If no files are specified, playmidi will give a short
- summary of usage options. If more than one file is specified, you may
- skip to the next file while the current one is playing by pressing your
- interrupt (usually control-c) key. If you invoke playmidi while it is al-
- ready running, it will allow you to control the currently running invoca-
- tion until its death, after which time all waiting invocations fight to
- go first.
+playmidi is a small, quick midi file player using the level two sequencer
+of the voxware 3.0 package to play on general midi devices or FM or
+Gravis Ultrasound. If no files are specified, playmidi will give a short
+summary of usage options. If more than one file is specified, you may
+skip to the next file while the current one is playing by pressing your
+interrupt (usually control-c) key. If you invoke playmidi while it is al-
+ready running, it will allow you to control the currently running invoca-
+tion until its death, after which time all waiting invocations fight to
+go first.
+
+WWW: http://playmidi.openprojects.net/
diff --git a/audio/playmidi/pkg-plist b/audio/playmidi/pkg-plist
index d31ab8c61fba..d0e6657131b7 100644
--- a/audio/playmidi/pkg-plist
+++ b/audio/playmidi/pkg-plist
@@ -1,5 +1,6 @@
bin/playmidi
-lib/midi/std.o3
-lib/midi/std.sb
-lib/midi/drums.o3
-lib/midi/drums.sb
+libdata/midi/drums.o3
+libdata/midi/drums.sb
+libdata/midi/std.o3
+libdata/midi/std.sb
+@dirrm libdata/midi
generated by cgit (git 2.34.1) at 2024-11-01 12:43:55 +0800