Sat Dec 3 13:02:22 2016 UTC ()
Correct the if statement to AND, not OR.
Unbreak builds on FreeBSD & DragonFly BSD


(sevan)
diff -r1.1 -r1.2 pkgsrc/comms/dfu-util/Makefile
cvs diff -r1.1 -r1.2 pkgsrc/comms/dfu-util/Makefile (expand / switch to unified diff)

--- pkgsrc/comms/dfu-util/Makefile 2016/12/03 03:26:07 1.1
+++ pkgsrc/comms/dfu-util/Makefile 2016/12/03 13:02:22 1.2
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: Makefile,v 1.1 2016/12/03 03:26:07 sevan Exp $ 1# $NetBSD: Makefile,v 1.2 2016/12/03 13:02:22 sevan Exp $
2# 2#
3 3
4DISTNAME= dfu-util-0.9 4DISTNAME= dfu-util-0.9
5CATEGORIES= comms 5CATEGORIES= comms
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dfu-util/files/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dfu-util/files/}
7 7
8MAINTAINER= noud4@users.sourceforge.net 8MAINTAINER= noud4@users.sourceforge.net
9HOMEPAGE= http://dfu-util.sourceforge.net/ 9HOMEPAGE= http://dfu-util.sourceforge.net/
10COMMENT= Host side implementation of the USB DFU protocol 10COMMENT= Host side implementation of the USB DFU protocol
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13GNU_CONFIGURE= YES 13GNU_CONFIGURE= YES
14 14
15CPPFLAGS+= "-I${BUILDLINK_PREFIX.libusb1}/include/libusb-1.0" 15CPPFLAGS+= "-I${BUILDLINK_PREFIX.libusb1}/include/libusb-1.0"
16 16
17CONFIGURE_ARGS+= -prefix=${PREFIX} 17CONFIGURE_ARGS+= -prefix=${PREFIX}
18CONFIGURE_ARGS+= CPPFLAGS="${CPPFLAGS}" 18CONFIGURE_ARGS+= CPPFLAGS="${CPPFLAGS}"
19 19
20.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
21 21
22.if ${OPSYS} != "FreeBSD" || ${OPSYS} != "DragonFly" 22.if ${OPSYS} != "FreeBSD" && ${OPSYS} != "DragonFly"
23BUILDLINK_TRANSFORM+= l:usb:usb-1.0 23BUILDLINK_TRANSFORM+= l:usb:usb-1.0
24.endif 24.endif
25 25
26.include "../../devel/libusb1/buildlink3.mk" 26.include "../../devel/libusb1/buildlink3.mk"
27.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"