Date: Fri, 18 Jan 2013 11:34:03 +0000 (UTC) From: Chris Rees <crees@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310598 - in head/audio/playmidi: . files Message-ID: <201301181134.r0IBY3ko071606@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: crees Date: Fri Jan 18 11:34:02 2013 New Revision: 310598 URL: http://svnweb.freebsd.org/changeset/ports/310598 Log: Use OPTIONS instead of INTERACTion with the configure script Works fine on amd64 While here, rename patches to correct scheme Added: head/audio/playmidi/files/patch-Configure - copied unchanged from r310596, head/audio/playmidi/files/patch-ac head/audio/playmidi/files/patch-Makefile - copied unchanged from r310596, head/audio/playmidi/files/patch-ab head/audio/playmidi/files/patch-playmidi_h-dist - copied unchanged from r310596, head/audio/playmidi/files/patch-ad Deleted: head/audio/playmidi/files/patch-ab head/audio/playmidi/files/patch-ac head/audio/playmidi/files/patch-ad Modified: head/audio/playmidi/Makefile Modified: head/audio/playmidi/Makefile ============================================================================== --- head/audio/playmidi/Makefile Fri Jan 18 11:33:02 2013 (r310597) +++ head/audio/playmidi/Makefile Fri Jan 18 11:34:02 2013 (r310598) @@ -1,9 +1,5 @@ -# New ports collection makefile for: playmidi -# Date created: 27 Feb 1995 -# Whom: ache -# +# Created by: ache # $FreeBSD$ -# PORTNAME= playmidi PORTVERSION= 2.5 @@ -16,12 +12,37 @@ COMMENT= MIDI player WRKSRC= ${WRKDIR}/${PORTNAME}-2.4 -ONLY_FOR_ARCHS= i386 -IS_INTERACTIVE= YES # asks what devices you want to support -HAS_CONFIGURE= YES +ONLY_FOR_ARCHS= i386 amd64 +HAS_CONFIGURE= yes CONFIGURE_SCRIPT= Configure CONFIGURE_ENV= PREFIX=${PREFIX} INSTALL_TARGET= install.lame install.man MAN1= playmidi.1 +OPTIONS_SINGLE= DEFAULTDEVICE +OPTIONS_SINGLE_DEFAULTDEVICE= EXTERNAL YAMAHA2 YAMAHA4 GRAVISULTRA SBAWE32 + +OPTIONS_DEFAULT= EXTERNAL + +EXTERNAL_DESC= External midi synth, Ensoniq Soundscape, TB Maui, waveblaster cards +YAMAHA2_DESC= Yamaha 2-op FM +YAMAHA4_DESC= Yamaha 4-op FM +GRAVISULTRA_DESC= Gravis Ultrasound +SBAWE32_DESC= SB AWE32 Synth + +.include <bsd.port.options.mk> + +post-patch: + ${REINPLACE_CMD} '/^read/d' ${WRKSRC}/Configure + +.if ${PORT_OPTIONS:MYAMAHA2} +CONFIGURE_ENV+= ans1=2 +.elif ${PORT_OPTIONS:MYAMAHA4} +CONFIGURE_ENV+= ans1=3 +.elif ${PORT_OPTIONS:MGRAVISULTRA} +CONFIGURE_ENV+= ans1=4 +.elif ${PORT_OPTIONS:MSBAWE32} +CONFIGURE_ENV+= ans1=5 +.endif # EXTERNAL is default anyway; just use other defaults + .include <bsd.port.mk> Copied: head/audio/playmidi/files/patch-Configure (from r310596, head/audio/playmidi/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/playmidi/files/patch-Configure Fri Jan 18 11:34:02 2013 (r310598, copy of r310596, head/audio/playmidi/files/patch-ac) @@ -0,0 +1,11 @@ +--- 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 ### Copied: head/audio/playmidi/files/patch-Makefile (from r310596, head/audio/playmidi/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/playmidi/files/patch-Makefile Fri Jan 18 11:34:02 2013 (r310598, copy of r310596, head/audio/playmidi/files/patch-ab) @@ -0,0 +1,190 @@ +--- 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 + + ######### 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 Copied: head/audio/playmidi/files/patch-playmidi_h-dist (from r310596, head/audio/playmidi/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/playmidi/files/patch-playmidi_h-dist Fri Jan 18 11:34:02 2013 (r310598, copy of r310596, head/audio/playmidi/files/patch-ad) @@ -0,0 +1,17 @@ +--- 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))
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301181134.r0IBY3ko071606>