From owner-svn-ports-all@FreeBSD.ORG Sat May 10 16:35:59 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 378D1379; Sat, 10 May 2014 16:35:59 +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 19A571D3; Sat, 10 May 2014 16:35:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4AGZwgE005609; Sat, 10 May 2014 16:35:58 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4AGZwcK005608; Sat, 10 May 2014 16:35:58 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201405101635.s4AGZwcK005608@svn.freebsd.org> From: Pawel Pekala Date: Sat, 10 May 2014 16:35:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353578 - head/audio/spiralsynthmodular 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 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: Sat, 10 May 2014 16:35:59 -0000 Author: pawel Date: Sat May 10 16:35:58 2014 New Revision: 353578 URL: http://svnweb.freebsd.org/changeset/ports/353578 QAT: https://qat.redports.org/buildarchive/r353578/ Log: - Add staging support - Use options helpers - Break lines around 80 characters, remove excessive blank ones Modified: head/audio/spiralsynthmodular/Makefile Modified: head/audio/spiralsynthmodular/Makefile ============================================================================== --- head/audio/spiralsynthmodular/Makefile Sat May 10 16:11:11 2014 (r353577) +++ head/audio/spiralsynthmodular/Makefile Sat May 10 16:35:58 2014 (r353578) @@ -16,7 +16,6 @@ BUILD_DEPENDS= ${LOCALBASE}/include/lads LIB_DEPENDS= libfltk.so:${PORTSDIR}/x11-toolkits/fltk \ libsndfile.so:${PORTSDIR}/audio/libsndfile -NO_STAGE= yes USE_XORG= x11 GNU_CONFIGURE= yes @@ -26,17 +25,11 @@ CPPFLAGS+= -I${LOCALBASE}/include WRKSRC= ${WRKDIR}/spiralmodular-0.2.2 -OPTIONS_DEFINE= OPTIMIZED_CFLAGS +ia64_BROKEN= Does not compile on ia64 -.include +OPTIONS_DEFINE= OPTIMIZED_CFLAGS -.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} -CFLAGS+= -O3 -ffast-math -.endif - -.if ${ARCH} == "ia64" -BROKEN= Does not compile on ia64 -.endif +OPTIMIZED_CFLAGS_CFLAGS=-O3 -ffast-math post-patch: @${REINPLACE_CMD} -E -e 's@(-O3|-ffast-math)@@g; \ @@ -46,40 +39,26 @@ post-patch: s|^SpiralSound/Plugins/MidiPlugin/Makefile||; \ s|MidiPlugin||' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} - @${REINPLACE_CMD} -e 's|-I/usr/X11R6/include|-I${LOCALBASE}/include|' \ ${WRKSRC}/SpiralSound/Plugins/LADSPAPlugin/Makefile.in - @${REINPLACE_CMD} -e 's|O_SYNC|O_FSYNC|' \ ${WRKSRC}/SpiralSound/Midi.C - - @${REINPLACE_CMD} -e \ - 's|True|true|; s|False|false|' \ + @${REINPLACE_CMD} -e 's|True|true|; s|False|false|' \ ${WRKSRC}/SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.C - - @${REINPLACE_CMD} -e \ - 's|JackPort::||' \ + @${REINPLACE_CMD} -e 's|JackPort::||' \ ${WRKSRC}/SpiralSound/Plugins/JackPlugin/JackPlugin.h - - @${REINPLACE_CMD} -e \ - 's|CVGUI::||' \ + @${REINPLACE_CMD} -e 's|CVGUI::||' \ ${WRKSRC}/SpiralSound/Plugins/ControllerPlugin/ControllerPluginGUI.h - - @${REINPLACE_CMD} -e \ - 's|Sample::||' \ + @${REINPLACE_CMD} -e 's|Sample::||' \ ${WRKSRC}/SpiralSound/Sample.h - @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -E -e \ - 's|-ldl||; \ - s|-lrt||; \ - s|g\+\+|$$(CXX)|; \ - /^CC[[:space:]]*=.+$$/d; \ - /^CXX[[:space:]]*=.+$$/d; \ + 's,-l(dl|rt),,; s|g\+\+|$$(CXX)|; \ + /^(CC|CXX)[[:space:]]*=.+$$/d; s|-lpthread|${PTHREAD_LIBS}|g; \ s,@FLTK_(C|CXX)FLAGS@,-I${LOCALBASE}/include,; \ - s|-lpthread|${PTHREAD_LIBS}|g' - - @${FIND} ${WRKSRC} -type f -name "*.C" -o -name "*.cpp" -o -name "*.h" | ${XARGS} \ - ${REINPLACE_CMD} -e '/^#include $$|.H>|; /^#include "FL/s|.h"$$|.H"|; \ - s|fl_file_chooser.H|Fl_File_Chooser.H|g' + s,(bin|lib)dir),DESTDIR)$$(&,' + @${FIND} ${WRKSRC} -type f -name "*.C" -o -name "*.cpp" -o -name "*.h" \ + | ${XARGS} ${REINPLACE_CMD} -e '/^#include $$|.H>|; \ + /^#include "FL/s|.h"$$|.H"|; \ + s|fl_file_chooser.H|Fl_File_Chooser.H|g' -.include +.include