Date: Sat, 30 Aug 2014 17:10:16 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366647 - head/audio/lmms Message-ID: <201408301710.s7UHAGXF040104@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Sat Aug 30 17:10:16 2014 New Revision: 366647 URL: http://svnweb.freebsd.org/changeset/ports/366647 QAT: https://qat.redports.org/buildarchive/r366647/ Log: - Fix build on 8 and 9 (all archs) and 10 and 11 (32-bit archs) by always installing into lib/lmms, not lib64/lmms - Use OPTIONS helpers - Don't try to remove share/mime/packages Modified: head/audio/lmms/Makefile head/audio/lmms/pkg-plist Modified: head/audio/lmms/Makefile ============================================================================== --- head/audio/lmms/Makefile Sat Aug 30 17:08:10 2014 (r366646) +++ head/audio/lmms/Makefile Sat Aug 30 17:10:16 2014 (r366647) @@ -3,6 +3,7 @@ PORTNAME= lmms PORTVERSION= 0.4.15 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= audio MASTER_SITES= SF @@ -43,25 +44,14 @@ CMAKE_ARGS= -DWANT_ALSA:BOOL=OFF \ -DHAVE_STRTOLL=ON DOS2UNIX_FILES= plugins/midi_import/portsmf/allegrowr.cpp plugins/midi_import/portsmf/mfmidi.cpp CMakeLists.txt -.include <bsd.port.options.mk> +JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack +JACK_CMAKE_OFF= -DWANT_JACK:BOOL=OFF -.if ${PORT_OPTIONS:MJACK} -LIB_DEPENDS+= libjack.so:${PORTSDIR}/audio/jack -.else -CMAKE_ARGS+= -DWANT_JACK:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MPULSEAUDIO} -LIB_DEPENDS+= libpulse.so:${PORTSDIR}/audio/pulseaudio -.else -CMAKE_ARGS+= -DWANT_PULSEAUDIO:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MSDL} -USE_SDL= sdl -.else -CMAKE_ARGS+= -DWANT_SDL:BOOL=OFF -.endif +PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio +PULSEAUDIO_CMAKE_OFF= -DWANT_PULSEAUDIO:BOOL=OFF + +SDL_USE= SDL=sdl +SDL_CMAKE_OFF= -DWANT_SDL:BOOL=OFF post-patch: .for file in data/lmms.desktop @@ -80,6 +70,8 @@ post-patch: '/\/usr\/lib/d ; \ s|/usr/local|${PREFIX}|g' ${WRKSRC}/${filename} .endfor + @${REINPLACE_CMD} -e 's/lib64/lib/' \ + ${WRKSRC}/cmake/modules/DetectMachine.cmake post-install: @${LN} -sf ${DATADIR}/themes/default/icon.png \ Modified: head/audio/lmms/pkg-plist ============================================================================== --- head/audio/lmms/pkg-plist Sat Aug 30 17:08:10 2014 (r366646) +++ head/audio/lmms/pkg-plist Sat Aug 30 17:10:16 2014 (r366647) @@ -182,30 +182,30 @@ include/lmms/transformable_auto_model.h include/lmms/update_event.h include/lmms/visualization_widget.h include/lmms/volume.h -lib64/lmms/RemoteZynAddSubFx -lib64/lmms/libZynAddSubFxCore.so -lib64/lmms/libaudiofileprocessor.so -lib64/lmms/libbassbooster.so -lib64/lmms/libbitinvader.so -lib64/lmms/libflpimport.so -lib64/lmms/libhydrogenimport.so -lib64/lmms/libkicker.so -lib64/lmms/libladspabrowser.so -lib64/lmms/libladspaeffect.so -lib64/lmms/liblb302.so -lib64/lmms/libmidiimport.so -lib64/lmms/liborganic.so -lib64/lmms/libpapu.so -lib64/lmms/libpatman.so -lib64/lmms/libpeakcontrollereffect.so -lib64/lmms/libsf2player.so -lib64/lmms/libsid.so -lib64/lmms/libspectrumanalyzer.so -lib64/lmms/libstereoenhancer.so -lib64/lmms/libstereomatrix.so -lib64/lmms/libtripleoscillator.so -lib64/lmms/libvibedstrings.so -lib64/lmms/libzynaddsubfx.so +lib/lmms/RemoteZynAddSubFx +lib/lmms/libZynAddSubFxCore.so +lib/lmms/libaudiofileprocessor.so +lib/lmms/libbassbooster.so +lib/lmms/libbitinvader.so +lib/lmms/libflpimport.so +lib/lmms/libhydrogenimport.so +lib/lmms/libkicker.so +lib/lmms/libladspabrowser.so +lib/lmms/libladspaeffect.so +lib/lmms/liblb302.so +lib/lmms/libmidiimport.so +lib/lmms/liborganic.so +lib/lmms/libpapu.so +lib/lmms/libpatman.so +lib/lmms/libpeakcontrollereffect.so +lib/lmms/libsf2player.so +lib/lmms/libsid.so +lib/lmms/libspectrumanalyzer.so +lib/lmms/libstereoenhancer.so +lib/lmms/libstereomatrix.so +lib/lmms/libtripleoscillator.so +lib/lmms/libvibedstrings.so +lib/lmms/libzynaddsubfx.so man/man1/lmms.1.gz share/applications/lmms.desktop %%DATADIR%%/backgrounds/lmms_tile.png @@ -1980,7 +1980,6 @@ share/applications/lmms.desktop share/menu/lmms share/mime/packages/lmms.xml share/pixmaps/lmms.png -@dirrmtry share/mime/packages @dirrmtry share/menu @dirrm %%DATADIR%%/themes/default @dirrm %%DATADIR%%/themes @@ -2061,5 +2060,4 @@ share/pixmaps/lmms.png @dirrm %%DATADIR%%/backgrounds @dirrm %%DATADIR%% @dirrm include/lmms -@dirrm lib64/lmms -@dirrmtry lib64 +@dirrm lib/lmms
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408301710.s7UHAGXF040104>