From owner-svn-ports-all@FreeBSD.ORG  Sat Jan 25 12:56:57 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
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 4CA7BB7E;
 Sat, 25 Jan 2014 12:56:57 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 383BF1F33;
 Sat, 25 Jan 2014 12:56:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PCuvaO005430;
 Sat, 25 Jan 2014 12:56:57 GMT (envelope-from miwi@svn.freebsd.org)
Received: (from miwi@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PCuu7t005428;
 Sat, 25 Jan 2014 12:56:56 GMT (envelope-from miwi@svn.freebsd.org)
Message-Id: <201401251256.s0PCuu7t005428@svn.freebsd.org>
From: Martin Wilke <miwi@FreeBSD.org>
Date: Sat, 25 Jan 2014 12:56:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r341017 - branches/2014Q1/audio/calf
X-SVN-Group: ports-branches
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Jan 2014 12:56:57 -0000

Author: miwi
Date: Sat Jan 25 12:56:56 2014
New Revision: 341017
URL: http://svnweb.freebsd.org/changeset/ports/341017
QAT: https://qat.redports.org/buildarchive/r341017/

Log:
  MFH: r340242
  
  - Fix build with clang
  
  PR:		185500
  Submitted by:	Ports Fury

Modified:
  branches/2014Q1/audio/calf/Makefile
  branches/2014Q1/audio/calf/pkg-plist
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/audio/calf/Makefile
==============================================================================
--- branches/2014Q1/audio/calf/Makefile	Sat Jan 25 12:55:49 2014	(r341016)
+++ branches/2014Q1/audio/calf/Makefile	Sat Jan 25 12:56:56 2014	(r341017)
@@ -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: branches/2014Q1/audio/calf/pkg-plist
==============================================================================
--- branches/2014Q1/audio/calf/pkg-plist	Sat Jan 25 12:55:49 2014	(r341016)
+++ branches/2014Q1/audio/calf/pkg-plist	Sat Jan 25 12:56:56 2014	(r341017)
@@ -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