Index: head/audio/wildmidi/Makefile =================================================================== --- head/audio/wildmidi/Makefile +++ head/audio/wildmidi/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= wildmidi -PORTVERSION= 0.4.0 +PORTVERSION= 0.4.1 DISTVERSIONPREFIX= ${PORTNAME}- CATEGORIES= audio @@ -11,35 +11,29 @@ # player: GPLv3, library: LGPL3 LICENSE= LGPL3 -USE_GITHUB= yes -GH_ACCOUNT= Mindwerks - USES= cmake:outsource USE_LDCONFIG= yes +USE_GITHUB= yes +GH_ACCOUNT= Mindwerks + OPTIONS_SUB= yes OPTIONS_RADIO= BACKEND OPTIONS_RADIO_BACKEND= ALSA OPENAL OSS OPTIONS_DEFINE= PLAYER PLAYERSTATIC STATIC OPTIONS_DEFAULT= ALSA PLAYER -STATIC_CMAKE_ON= -DWANT_STATIC:BOOL=ON -STATIC_CMAKE_OFF= -DWANT_STATIC:BOOL=OFF +STATIC_CMAKE_BOOL= WANT_STATIC PLAYER_DESC= Simple player PLAYERSTATIC_DESC= Simple player using STATIC libWildMidi BACKEND_DESC= Sound system PLAYER and PLAYERSTATIC use -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 +PLAYER_CMAKE_BOOL= WANT_PLAYER +PLAYERSTATIC_CMAKE_BOOL= WANT_PLAYERSTATIC PLAYERSTATIC_IMPLIES= STATIC -ALSA_CMAKE_ON= -DWANT_ALSA:BOOL=ON -ALSA_CMAKE_OFF= -DWANT_ALSA:BOOL=OFF -OPENAL_CMAKE_ON= -DWANT_OPENAL:BOOL=ON -OPENAL_CMAKE_OFF= -DWANT_OPENAL:BOOL=OFF -OSS_CMAKE_ON= -DWANT_OSS:BOOL=ON -OSS_CMAKE_OFF= -DWANT_OSS:BOOL=OFF +ALSA_CMAKE_BOOL= WANT_ALSA +OPENAL_CMAKE_BOOL= WANT_OPENAL +OSS_CMAKE_BOOL= WANT_OSS .include @@ -59,18 +53,17 @@ .endif post-patch: - @${GREP} -L ${LOCALBASE} ${WRKSRC}/cfg/wildmidi.cfg | ${XARGS} \ - ${REINPLACE_CMD} -e "/^dir \/usr\/share\//{" \ + ${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 \ + -e "s|eawpats|eawplus|; H; x;}" ${WRKSRC}/cfg/wildmidi.cfg + ${REINPLACE_CMD} -e 's@/etc/wildmidi/@${DATADIR}/@' \ + -e 's@/etc/@${DATADIR}/@' ${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@' + ${WRKSRC}/CMakeLists.txt + ${REINPLACE_CMD} -e '/INSTALL/s@share/man@man@' \ + -e '/pkgconfig/s/$${WILDMIDILIB_INSTALLDIR}/libdata/' \ + ${WRKSRC}/src/CMakeLists.txt pre-install: @${RM} ${WRKSRC}/docs/man/man1/wildmidi.1${REINPLACE_ARGS:S/-i//} \ Index: head/audio/wildmidi/distinfo =================================================================== --- head/audio/wildmidi/distinfo +++ head/audio/wildmidi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1466091419 -SHA256 (Mindwerks-wildmidi-wildmidi-0.4.0_GH0.tar.gz) = ca2064f6fbab37250ab4fff4aed00d6d4fa24254718661e3e2f56b1536015d23 -SIZE (Mindwerks-wildmidi-wildmidi-0.4.0_GH0.tar.gz) = 175575 +TIMESTAMP = 1491656038 +SHA256 (Mindwerks-wildmidi-wildmidi-0.4.1_GH0.tar.gz) = 880f1cb5bf68589915a82a8e603ff561bdda7ddb5864c15ad28b5428d4abf9ea +SIZE (Mindwerks-wildmidi-wildmidi-0.4.1_GH0.tar.gz) = 191368 Index: head/audio/wildmidi/pkg-plist =================================================================== --- head/audio/wildmidi/pkg-plist +++ head/audio/wildmidi/pkg-plist @@ -4,7 +4,8 @@ %%STATIC%%lib/libWildMidi.a lib/libWildMidi.so lib/libWildMidi.so.2 -lib/libWildMidi.so.2.0.0 +lib/libWildMidi.so.2.0.1 +libdata/pkgconfig/wildmidi.pc man/man1/wildmidi.1.gz man/man3/WildMidi_ClearError.3.gz man/man3/WildMidi_Close.3.gz