Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 7 Oct 2014 06:32:33 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r370272 - head/devel/libsigrok
Message-ID:  <201410070632.s976WXOt084496@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Tue Oct  7 06:32:32 2014
New Revision: 370272
URL: https://svnweb.freebsd.org/changeset/ports/370272
QAT: https://qat.redports.org/buildarchive/r370272/

Log:
  Fix build on head and 10.1

Modified:
  head/devel/libsigrok/Makefile
  head/devel/libsigrok/pkg-plist

Modified: head/devel/libsigrok/Makefile
==============================================================================
--- head/devel/libsigrok/Makefile	Tue Oct  7 06:12:39 2014	(r370271)
+++ head/devel/libsigrok/Makefile	Tue Oct  7 06:32:32 2014	(r370272)
@@ -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: head/devel/libsigrok/pkg-plist
==============================================================================
--- head/devel/libsigrok/pkg-plist	Tue Oct  7 06:12:39 2014	(r370271)
+++ head/devel/libsigrok/pkg-plist	Tue Oct  7 06:32:32 2014	(r370272)
@@ -6,4 +6,3 @@ lib/libsigrok.so
 lib/libsigrok.so.2
 lib/libsigrok.so.2.0.0
 libdata/pkgconfig/libsigrok.pc
-@dirrm include/libsigrok



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