- Fix build on -current
Responsible Changed From-To: freebsd-ports-bugs->miwi miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Remake of the patch against current tree.
Responsible Changed From-To: miwi->amdmi3 Take, since I've committed fixes to these
Author: amdmi3 Date: Wed Apr 23 01:14:42 2014 New Revision: 351901 URL: http://svnweb.freebsd.org/changeset/ports/351901 QAT: https://qat.redports.org/buildarchive/r351901/ Log: - Minor port cleanup PR: 188145 Submitted by: KATO Tsuguru <tkato432@yahoo.com> Modified: head/audio/calf/Makefile Modified: head/audio/calf/Makefile ============================================================================== --- head/audio/calf/Makefile Wed Apr 23 01:09:58 2014 (r351900) +++ head/audio/calf/Makefile Wed Apr 23 01:14:42 2014 (r351901) @@ -18,12 +18,7 @@ LIB_DEPENDS= libfluidsynth.so:${PORTSDIR libfftw3f.so:${PORTSDIR}/math/fftw3-float \ libexpat.so:${PORTSDIR}/textproc/expat2 -OPTIONS_DEFINE= LASH LV2 -OPTIONS_DEFAULT=LASH LV2 -OPTIONS_SUB= yes -LV2_DESC= LV2 audio plugin - -USES= gmake pkgconfig compiler:env +USES= gmake pkgconfig USE_GNOME= gtk20 GNU_CONFIGURE= yes INSTALLS_ICONS= yes @@ -31,29 +26,36 @@ INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +OPTIONS_DEFINE= LASH LV2 +OPTIONS_DEFAULT= LASH LV2 +OPTIONS_SUB= yes + LASH_LIB_DEPENDS= liblash.so:${PORTSDIR}/audio/lash LASH_CONFIGURE_WITH= lash +LV2_DESC= LV2 audio plugin LV2_BUILD_DEPENDS= lv2core>0:${PORTSDIR}/audio/lv2core LV2_RUN_DEPENDS= lv2core>0:${PORTSDIR}/audio/lv2core LV2_CONFIGURE_WITH= lv2 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> post-patch: @${FIND} ${BUILD_WRKSRC} -name '*.cpp' | ${XARGS} ${REINPLACE_CMD} -e \ 's|<malloc.h>|<stdlib.h>|' - @${REINPLACE_CMD} -e '/CXXFLAGS/s|-O3||' ${WRKSRC}/configure - @${REINPLACE_CMD} -e '/calf.so/s|$$(pkglibdir)|../../calf|' \ + @${REINPLACE_CMD} -e \ + '/CXXFLAGS/s|-O3|| ; \ + /CXXFLAGS/s|-finline-functions-called-once||' \ + ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + '/AM_CXXFLAGS/s|-finline-limit=80|| ; \ + /calf.so/s|$$(pkglibdir)|../../calf|' \ ${WRKSRC}/src/Makefile.in - @${REINPLACE_CMD} -e 's|src\.size();|src->size();|' \ + @${REINPLACE_CMD} -e \ + 's|src\.size();|src->size();|' \ ${WRKSRC}/src/calf/buffer.h - @${REINPLACE_CMD} -e 's|data\[(1<<IntBits)+1\]|data[]|' \ + @${REINPLACE_CMD} -e \ + 's|data\[(1<<IntBits)+1\]|data[]|' \ ${WRKSRC}/src/calf/fixed_point.h -.if ${COMPILER_TYPE} == "clang" - @${REINPLACE_CMD} -e 's|-finline-functions -finline-functions-called-once||' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|-finline-limit=80||' ${WRKSRC}/src/Makefile.in -.endif pre-build: .if ${PORT_OPTIONS:MLV2} @@ -72,4 +74,4 @@ post-install: -p ${STAGEDIR}${PREFIX}/lib/lv2/calf.lv2) .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!