Index: branches/2014Q4/devel/libsigrok/Makefile
===================================================================
--- branches/2014Q4/devel/libsigrok/Makefile	(revision 370820)
+++ branches/2014Q4/devel/libsigrok/Makefile	(revision 370821)
@@ -1,28 +1,32 @@
 # Created by: Uffe Jakobsen <uffe@uffe.org>
 # $FreeBSD$
 
 PORTNAME=	libsigrok
 PORTVERSION=	0.3.0
 CATEGORIES=	devel
 MASTER_SITES=	http://sigrok.org/download/source/libsigrok/
 
 MAINTAINER=	uffe@uffe.org
 COMMENT=	Framework for hardware logic analyzers, core library
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libserialport.so:${PORTSDIR}/devel/libserialport \
 		libzip.so:${PORTSDIR}/archivers/libzip
 
 GNU_CONFIGURE=	yes
 USES=		gmake pathfix libtool pkgconfig
 USE_GNOME=	glib20
 INSTALL_TARGET=	install-strip
 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>
Index: branches/2014Q4/devel/libsigrok/pkg-plist
===================================================================
--- branches/2014Q4/devel/libsigrok/pkg-plist	(revision 370820)
+++ branches/2014Q4/devel/libsigrok/pkg-plist	(revision 370821)
@@ -1,9 +1,8 @@
 include/libsigrok/libsigrok.h
 include/libsigrok/proto.h
 include/libsigrok/version.h
 lib/libsigrok.a
 lib/libsigrok.so
 lib/libsigrok.so.2
 lib/libsigrok.so.2.0.0
 libdata/pkgconfig/libsigrok.pc
-@dirrm include/libsigrok
Index: branches/2014Q4
===================================================================
--- branches/2014Q4	(revision 370820)
+++ branches/2014Q4	(revision 370821)

Property changes on: branches/2014Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r370272