From owner-svn-ports-branches@FreeBSD.ORG  Mon Oct 13 22:05:16 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5031CD40;
 Mon, 13 Oct 2014 22:05:16 +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 3BF5C7DE;
 Mon, 13 Oct 2014 22:05:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9DM5GJr097594;
 Mon, 13 Oct 2014 22:05:16 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9DM5FB4097592;
 Mon, 13 Oct 2014 22:05:15 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201410132205.s9DM5FB4097592@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Mon, 13 Oct 2014 22:05:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r370821 - branches/2014Q4/devel/libsigrok
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Oct 2014 22:05:16 -0000

Author: antoine
Date: Mon Oct 13 22:05:15 2014
New Revision: 370821
URL: https://svnweb.freebsd.org/changeset/ports/370821
QAT: https://qat.redports.org/buildarchive/r370821/

Log:
  MFH: r370272
  
  Fix build on head and 10.1

Modified:
  branches/2014Q4/devel/libsigrok/Makefile
  branches/2014Q4/devel/libsigrok/pkg-plist
Directory Properties:
  branches/2014Q4/   (props changed)

Modified: branches/2014Q4/devel/libsigrok/Makefile
==============================================================================
--- branches/2014Q4/devel/libsigrok/Makefile	Mon Oct 13 22:02:18 2014	(r370820)
+++ branches/2014Q4/devel/libsigrok/Makefile	Mon Oct 13 22:05:15 2014	(r370821)
@@ -22,7 +22,11 @@ MAKE_JOBS_UNSAFE=	yes
 LDFLAGS+=	-L/usr/lib -lusb
 USE_LDCONFIG=	yes
 
+.include <bsd.port.pre.mk>
+
 # Workaround for libusb not knowing LIBUSB_CLASS_APPLICATION
+.if (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100029) || (${OSVERSION} < 1000715)
 CFLAGS+=	-DLIBUSB_CLASS_APPLICATION=0xfe
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: branches/2014Q4/devel/libsigrok/pkg-plist
==============================================================================
--- branches/2014Q4/devel/libsigrok/pkg-plist	Mon Oct 13 22:02:18 2014	(r370820)
+++ branches/2014Q4/devel/libsigrok/pkg-plist	Mon Oct 13 22:05:15 2014	(r370821)
@@ -6,4 +6,3 @@ lib/libsigrok.so
 lib/libsigrok.so.2
 lib/libsigrok.so.2.0.0
 libdata/pkgconfig/libsigrok.pc
-@dirrm include/libsigrok