From owner-svn-ports-all@FreeBSD.ORG  Wed Apr 23 01:14:43 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6834D7DC;
 Wed, 23 Apr 2014 01:14:43 +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 3AE2D13C7;
 Wed, 23 Apr 2014 01:14:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3N1EhJp036571;
 Wed, 23 Apr 2014 01:14:43 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3N1Ehap036570;
 Wed, 23 Apr 2014 01:14:43 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201404230114.s3N1Ehap036570@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Wed, 23 Apr 2014 01:14:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r351901 - head/audio/calf
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.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: Wed, 23 Apr 2014 01:14:43 -0000

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>