svn commit: r370821 - branches/2014Q4/devel/libsigrok

[Antoine Brodin]

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
- at dirrm include/libsigrok