From owner-svn-ports-all@FreeBSD.ORG Sun Mar 8 21:37:43 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 773EEAC5; Sun, 8 Mar 2015 21:37:43 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 574F7AE4; Sun, 8 Mar 2015 21:37:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t28Lbhr2066979; Sun, 8 Mar 2015 21:37:43 GMT (envelope-from robak@FreeBSD.org) Received: (from robak@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t28Lbgan066975; Sun, 8 Mar 2015 21:37:42 GMT (envelope-from robak@FreeBSD.org) Message-Id: <201503082137.t28Lbgan066975@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: robak set sender to robak@FreeBSD.org using -f From: Bartek Rutkowski Date: Sun, 8 Mar 2015 21:37:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r380803 - in head/audio/wildmidi: . 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-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2015 21:37:43 -0000 Author: robak Date: Sun Mar 8 21:37:41 2015 New Revision: 380803 URL: https://svnweb.freebsd.org/changeset/ports/380803 QAT: https://qat.redports.org/buildarchive/r380803/ Log: audio/wildmidi: update 0.2.3.5 -> 0.3.8 - Switch from SF to GitHub usage PR: 186476 Submitted by: RyoTa SimaMoto Deleted: head/audio/wildmidi/files/ Modified: head/audio/wildmidi/Makefile head/audio/wildmidi/distinfo head/audio/wildmidi/pkg-descr head/audio/wildmidi/pkg-plist Modified: head/audio/wildmidi/Makefile ============================================================================== --- head/audio/wildmidi/Makefile Sun Mar 8 21:36:35 2015 (r380802) +++ head/audio/wildmidi/Makefile Sun Mar 8 21:37:41 2015 (r380803) @@ -1,39 +1,80 @@ # $FreeBSD$ PORTNAME= wildmidi -PORTVERSION= 0.2.3.5 -PORTREVISION= 2 +PORTVERSION= 0.3.8 CATEGORIES= audio -MASTER_SITES= SF/${PORTNAME}/${PORTNAME} MAINTAINER= liangtai.s16@gmail.com COMMENT= Simple software midi player and core softsynth library # player: GPLv3, library: LGPL3 -LICENSE= GPLv3 LGPL3 -LICENSE_COMB= multi - -MAKE_JOBS_UNSAFE= yes +LICENSE= LGPL3 -USES= compiler gmake libtool +USE_GITHUB= yes +GH_ACCOUNT= Mindwerks +GH_PROJECT= wildmidi +GH_TAGNAME= ${PORTNAME}-${PORTVERSION:R} +GH_COMMIT= de35d7f +USES= gmake cmake:outsource USE_LDCONFIG= yes -GNU_CONFIGURE= yes -.include +OPTIONS_SUB= yes +OPTIONS_SINGLE= BACKEND +OPTIONS_SINGLE_BACKEND= ALSA OSS OPENAL OPENALSOFT +OPTIONS_DEFINE= PLAYER PLAYERSTATIC STATIC +OPTIONS_DEFAULT= ALSA PLAYER + +STATIC_CMAKE_ON= -DWANT_STATIC:BOOL=ON +STATIC_CMAKE_OFF= -DWANT_STATIC:BOOL=OFF + +PLAYER_DESC= Simple player +PLAYERSTATIC_DESC= Simple player using STATIC libWildMidi +BACKEND_DESC= Sound system PLAYER and PLAYERSTATIC uses +PLAYER_CMAKE_ON= -DWANT_PLAYER:BOOL=ON +PLAYER_CMAKE_OFF= -DWANT_PLAYER:BOOL=OFF +PLAYERSTATIC_CMAKE_ON= -DWANT_PLAYERSTATIC:BOOL=ON +PLAYERSTATIC_CMAKE_OFF= -DWANT_PLAYERSTATIC:BOOL=OFF +ALSA_CMAKE_ON= -DWANT_ALSA:BOOL=ON +ALSA_CMAKE_OFF= -DWANT_ALSA:BOOL=OFF +OSS_CMAKE_ON= -DWANT_OSS:BOOL=ON +OSS_CMAKE_OFF= -DWANT_OSS:BOOL=OFF +OPENALSOFT_DESC= OpenAL support -.if ${COMPILER_TYPE} == clang -CONFIGURE_ARGS+= --disable-optimize +.include + +.if ${PORT_OPTIONS:MPLAYER} || ${PORT_OPTIONS:MPLAYERSTATIC} +LICENSE+= GPLv3 +LICENSE_COMB= multi +CMAKE_ARGS+= -DWANT_OPENAL:BOOL=OFF +. if ${PORT_OPTIONS:MALSA} +LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib +. elif ${PORT_OPTIONS:MOPENALSOFT} +LIB_DEPENDS+= libopenal.so:${PORTSDIR}/audio/openal-soft +CMAKE_ARGS+= -DWANT_OPENAL:BOOL=ON +. elif ${PORT_OPTIONS:MOPENAL} +LIB_DEPENDS+= libopenal.so:${PORTSDIR}/audio/openal +CMAKE_ARGS+= -DWANT_OPENAL:BOOL=ON +. endif .endif post-patch: - @${REINPLACE_CMD} -e 's@/etc/@${DATADIR}/@' \ - ${WRKSRC}/docs/wildmidi.1 \ - ${WRKSRC}/docs/wildmidi.cfg.5 - @${REINPLACE_CMD} -e 's@/usr/local/share/wildmidi/@${DATADIR}/@' \ - -e 's@default_timifityconf@default_wildmidiconf@' \ - -e 's@$${\(.*\)-unset} = unset@x"$${\1}" = x@' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e '/WM_MixerOptions/s/ \&\& / \& /' \ - ${WRKSRC}/src/wildmidi_lib.c + @${GREP} -L ${LOCALBASE} ${WRKSRC}/cfg/wildmidi.cfg | ${XARGS} \ + ${REINPLACE_CMD} -e "/^dir \/usr\/share\//{" \ + -e "s|/usr/share/midi/freepats|${LOCALBASE}/share/freepats|;" \ + -e "h; x; s|^|# |; s|freepats|guspat|; H; s|guspat|eawpats|; H;" \ + -e "s|eawpats|eawplus|; H; x;}" + @${GREP} -L ${LOCALBASE} ${WRKSRC}/docs/man/man1/wildmidi.1 \ + ${WRKSRC}/docs/man/man5/wildmidi.cfg.5 \ + ${WRKSRC}/CMakeLists.txt | ${XARGS} \ + ${REINPLACE_CMD} -e 's@/etc/wildmidi/@${DATADIR}/@' \ + -e 's@/etc/@${DATADIR}/@' + @${GREP} -l share/man ${WRKSRC}/src/CMakeLists.txt | ${XARGS} \ + ${REINPLACE_CMD} '/INSTALL/s@share/man@man@' + +pre-install: + @${RM} -f ${WRKSRC}/docs/man/man1/wildmidi.1${REINPLACE_ARGS:S/-i//} \ + ${WRKSRC}/docs/man/man5/wildmidi.cfg.5${REINPLACE_ARGS:S/-i//} + ${MKDIR} ${STAGEDIR}${DATADIR} ; \ + ${CP} ${WRKSRC}/cfg/wildmidi.cfg ${STAGEDIR}${DATADIR}/wildmidi.cfg.sample -.include +.include Modified: head/audio/wildmidi/distinfo ============================================================================== --- head/audio/wildmidi/distinfo Sun Mar 8 21:36:35 2015 (r380802) +++ head/audio/wildmidi/distinfo Sun Mar 8 21:37:41 2015 (r380803) @@ -1,2 +1,2 @@ -SHA256 (wildmidi-0.2.3.5.tar.gz) = 00642702d3475d134596b19531c9e589043dcac482011494e42b035b4739e554 -SIZE (wildmidi-0.2.3.5.tar.gz) = 375792 +SHA256 (wildmidi-0.3.8.tar.gz) = 2a9f26b97dba4dae5adb2ac3babcc678a34211f066379d1a4a32f5ad141d0e4f +SIZE (wildmidi-0.3.8.tar.gz) = 121699 Modified: head/audio/wildmidi/pkg-descr ============================================================================== --- head/audio/wildmidi/pkg-descr Sun Mar 8 21:36:35 2015 (r380802) +++ head/audio/wildmidi/pkg-descr Sun Mar 8 21:37:41 2015 (r380803) @@ -12,4 +12,4 @@ able to use a different patch set for ea The wildmidi player is a demonstration program to show the capabilities of libWildMidi. -WWW: http://wildmidi.sourceforge.net/ +WWW: http://www.mindwerks.net/projects/wildmidi/ Modified: head/audio/wildmidi/pkg-plist ============================================================================== --- head/audio/wildmidi/pkg-plist Sun Mar 8 21:36:35 2015 (r380802) +++ head/audio/wildmidi/pkg-plist Sun Mar 8 21:37:41 2015 (r380803) @@ -1,8 +1,10 @@ -bin/wildmidi +%%PLAYER%%bin/wildmidi +%%PLAYERSTATIC%%bin/wildmidi-static include/wildmidi_lib.h -lib/libWildMidi.so.1 -lib/libWildMidi.so.1.1.0 +%%STATIC%%lib/libWildMidi.a lib/libWildMidi.so +lib/libWildMidi.so.1 +lib/libWildMidi.so.1.1.2 man/man1/wildmidi.1.gz man/man3/WildMidi_Close.3.gz man/man3/WildMidi_FastSeek.3.gz @@ -16,3 +18,4 @@ man/man3/WildMidi_OpenBuffer.3.gz man/man3/WildMidi_SetOption.3.gz man/man3/WildMidi_Shutdown.3.gz man/man5/wildmidi.cfg.5.gz +%%DATADIR%%/wildmidi.cfg.sample