Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 19 Jan 2014 09:30:03 GMT
From:      dfilter@FreeBSD.ORG (dfilter service)
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/185500: commit references a PR
Message-ID:  <201401190930.s0J9U3sT027164@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/185500; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/185500: commit references a PR
Date: Sun, 19 Jan 2014 09:26:37 +0000 (UTC)

 Author: miwi
 Date: Sun Jan 19 09:26:25 2014
 New Revision: 340242
 URL: http://svnweb.freebsd.org/changeset/ports/340242
 QAT: https://qat.redports.org/buildarchive/r340242/
 
 Log:
   - Fix build with clang
   
   PR:		185500
   Submitted by:	Ports Fury
 
 Modified:
   head/audio/calf/Makefile
   head/audio/calf/pkg-plist
 
 Modified: head/audio/calf/Makefile
 ==============================================================================
 --- head/audio/calf/Makefile	Sun Jan 19 09:26:22 2014	(r340241)
 +++ head/audio/calf/Makefile	Sun Jan 19 09:26:25 2014	(r340242)
 @@ -20,33 +20,51 @@ LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR
  
  OPTIONS_DEFINE=	LASH LV2
  OPTIONS_DEFAULT=LASH LV2
 +OPTIONS_SUB=	yes
  LV2_DESC=	LV2 audio plugin
  
  USES=		gmake pkgconfig
  USE_GNOME=	gtk20
 -USE_CSTD=	gnu89
  GNU_CONFIGURE=	yes
  INSTALLS_ICONS=	yes
  
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  
 -OPTIONS_SUB=	yes
  LASH_LIB_DEPENDS=	liblash.so:${PORTSDIR}/audio/lash
  LASH_CONFIGURE_WITH=	lash
 -LV2_BUILD_DEPENDS+=	lv2core>0:${PORTSDIR}/audio/lv2core
 -LV2_RUN_DEPENDS+=	lv2core>0:${PORTSDIR}/audio/lv2core
 +LV2_BUILD_DEPENDS=	lv2core>0:${PORTSDIR}/audio/lv2core
 +LV2_RUN_DEPENDS=	lv2core>0:${PORTSDIR}/audio/lv2core
  LV2_CONFIGURE_WITH=	lv2
  
 +.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 '/^install-data-am:/s|install-data-local||' \
 -		${WRKSRC}/Makefile.in
 +	@${REINPLACE_CMD} -e '/calf.so/s|$$(pkglibdir)|../../calf|' \
 +		${WRKSRC}/src/Makefile.in
 +	@${REINPLACE_CMD} -e 's|src\.size();|src->size();|' \
 +		${WRKSRC}/src/calf/buffer.h
 +	@${REINPLACE_CMD} -e 's|data\[(1<<IntBits)+1\]|data[]|' \
 +		${WRKSRC}/src/calf/fixed_point.h
 +
 +pre-build:
 +.if ${PORT_OPTIONS:MLV2}
 +	@${MKDIR} ${WRKDIR}/calfmakerdf
 +	@(cd ${WRKSRC} && ${PAX} -rw . ${WRKDIR}/calfmakerdf)
 +	@${REINPLACE_CMD} -e 's|\(PKGLIBDIR\).*|\1 "${STAGEDIR}${DATADIR}"|' \
 +		${WRKDIR}/calfmakerdf/config.h
 +	@(cd ${WRKDIR}/calfmakerdf/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 +		${MAKE_FLAGS} ${MAKEFILE} -j${MAKE_JOBS_NUMBER} ${MAKE_ARGS} \
 +		calfmakerdf)
 +.endif
  
  post-install:
 -	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} \
 -		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install-data-local)
 +.if ${PORT_OPTIONS:MLV2}
 +	@(cd ${WRKDIR}/calfmakerdf/src && ./calfmakerdf -m ttl \
 +		-p ${STAGEDIR}${PREFIX}/lib/lv2/calf.lv2)
 +.endif
  
  .include <bsd.port.mk>
 
 Modified: head/audio/calf/pkg-plist
 ==============================================================================
 --- head/audio/calf/pkg-plist	Sun Jan 19 09:26:22 2014	(r340241)
 +++ head/audio/calf/pkg-plist	Sun Jan 19 09:26:25 2014	(r340242)
 @@ -34,6 +34,11 @@ lib/calf/calf.so
  %%LV2%%lib/lv2/calf.lv2/calf.so
  %%LV2%%lib/lv2/calf.lv2/calflv2gui.so
  %%LV2%%lib/lv2/calf.lv2/manifest.ttl
 +%%LV2%%lib/lv2/calf.lv2/presets-Filter.ttl
 +%%LV2%%lib/lv2/calf.lv2/presets-Flanger.ttl
 +%%LV2%%lib/lv2/calf.lv2/presets-Monosynth.ttl
 +%%LV2%%lib/lv2/calf.lv2/presets-Organ.ttl
 +%%LV2%%lib/lv2/calf.lv2/presets-Reverb.ttl
  man/man1/calfjackhost.1.gz
  man/man7/calf.7.gz
  share/applications/calf.desktop
 _______________________________________________
 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"
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401190930.s0J9U3sT027164>