From owner-svn-ports-head@FreeBSD.ORG Sun Feb 16 10:59:22 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B33E4E6D; Sun, 16 Feb 2014 10:59:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9201E133E; Sun, 16 Feb 2014 10:59:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1GAxMeo072418; Sun, 16 Feb 2014 10:59:22 GMT (envelope-from ehaupt@svn.freebsd.org) Received: (from ehaupt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1GAxMkg072411; Sun, 16 Feb 2014 10:59:22 GMT (envelope-from ehaupt@svn.freebsd.org) Message-Id: <201402161059.s1GAxMkg072411@svn.freebsd.org> From: Emanuel Haupt Date: Sun, 16 Feb 2014 10:59:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344528 - in head/audio/playmidi: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Feb 2014 10:59:22 -0000 Author: ehaupt Date: Sun Feb 16 10:59:21 2014 New Revision: 344528 URL: http://svnweb.freebsd.org/changeset/ports/344528 QAT: https://qat.redports.org/buildarchive/r344528/ Log: - Support staging - Add LICENSE Modified: head/audio/playmidi/Makefile head/audio/playmidi/files/patch-Makefile head/audio/playmidi/pkg-plist Modified: head/audio/playmidi/Makefile ============================================================================== --- head/audio/playmidi/Makefile Sun Feb 16 10:51:24 2014 (r344527) +++ head/audio/playmidi/Makefile Sun Feb 16 10:59:21 2014 (r344528) @@ -10,6 +10,8 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= MIDI player +LICENSE= GPLv2 + WRKSRC= ${WRKDIR}/${PORTNAME}-2.4 ONLY_FOR_ARCHS= i386 amd64 @@ -17,8 +19,6 @@ HAS_CONFIGURE= yes CONFIGURE_SCRIPT= Configure CONFIGURE_ENV= PREFIX=${PREFIX} INSTALL_TARGET= install.lame install.man -MAN1= playmidi.1 -NO_STAGE= yes OPTIONS_SINGLE= DEFAULTDEVICE OPTIONS_SINGLE_DEFAULTDEVICE= EXTERNAL YAMAHA2 YAMAHA4 GRAVISULTRA SBAWE32 @@ -43,7 +43,7 @@ CONFIGURE_ENV+= ans1=3 .elif ${PORT_OPTIONS:MGRAVISULTRA} CONFIGURE_ENV+= ans1=4 .elif ${PORT_OPTIONS:MSBAWE32} -CONFIGURE_ENV+= ans1=5 +CONFIGURE_ENV+= ans1=5 .endif # EXTERNAL is default anyway; just use other defaults .include Modified: head/audio/playmidi/files/patch-Makefile ============================================================================== --- head/audio/playmidi/files/patch-Makefile Sun Feb 16 10:51:24 2014 (r344527) +++ head/audio/playmidi/files/patch-Makefile Sun Feb 16 10:59:21 2014 (r344528) @@ -1,5 +1,5 @@ ---- Makefile.orig Thu Oct 1 11:39:18 1998 -+++ Makefile Tue Aug 15 23:27:03 2000 +--- Makefile.orig 1998-10-01 04:39:18.000000000 +0200 ++++ Makefile 2014-02-16 11:55:45.713871624 +0100 @@ -12,39 +12,40 @@ # ncurses usually /usr/lib, -L/usr/local/lib doesn't hurt @@ -42,8 +42,8 @@ INCLUDES= $(INCNC) $(INCX11) $(INCVGA) $(INCAWE) -INSTALLDIR = /usr/bin -INSTALL = install -s -+INSTALLDIR = ${PREFIX}/bin -+MIDI = ${PREFIX}/share/midi ++INSTALLDIR = ${DESTDIR}${PREFIX}/bin ++MIDI = ${DESTDIR}${PREFIX}/share/midi +#INSTALL = install -s # if you are using the GUS Ultra driver module, add -DULTRA_DRIVER @@ -97,24 +97,24 @@ $(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 +-/etc/std.o3: +- cp -i std.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 +-/etc/drums.o3: +- cp -i drums.o3 /etc +$(MIDI)/std.sb: + ${BSD_INSTALL_DATA} std.sb $(MIDI) +-/etc/std.sb: +- cp -i std.sb /etc +- -/etc/drums.sb: - cp -i drums.sb /etc +$(MIDI)/drums.sb: @@ -122,35 +122,38 @@ $(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 +- +-install.novga: $(INSTALLDIR)/playmidi \ +- $(INSTALLDIR)/xplaymidi /etc/std.o3 /etc/drums.o3 \ +- /etc/std.sb /etc/drums.sb $(XAPPDEFAULTS)/XPlaymidi ++ ${BSD_INSTALL_DATA} XPlaymidi.ad $(XAPPDEFAULTS)/XPlaymidi + +-install.noX11: $(INSTALLDIR)/playmidi $(INSTALLDIR)/splaymidi \ +- /etc/std.o3 /etc/drums.o3 /etc/std.sb /etc/drums.sb +dirs: + -@mkdir -p $(MIDI) --install.novga: $(INSTALLDIR)/playmidi \ -- $(INSTALLDIR)/xplaymidi /etc/std.o3 /etc/drums.o3 \ +-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: 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 @@ -161,7 +164,7 @@ install.man: - cp playmidi.1 /usr/man/man1/ -+ ${BSD_INSTALL_MAN} playmidi.1 ${PREFIX}/man/man1/ ++ ${BSD_INSTALL_MAN} playmidi.1 ${DESTDIR}${PREFIX}/man/man1/ clean: rm -f *.o playmidi splaymidi xplaymidi a.out toy seq2mid beat Modified: head/audio/playmidi/pkg-plist ============================================================================== --- head/audio/playmidi/pkg-plist Sun Feb 16 10:51:24 2014 (r344527) +++ head/audio/playmidi/pkg-plist Sun Feb 16 10:59:21 2014 (r344528) @@ -1,4 +1,5 @@ bin/playmidi +man/man1/playmidi.1.gz share/midi/drums.o3 share/midi/drums.sb share/midi/std.o3