Tue Nov 4 21:40:48 2014 UTC ()
Replace patch with much simpler logic that actually works.


(joerg)
diff -r1.1 -r1.2 pkgsrc/ham/gr-fcdproplus/Makefile
diff -r1.1 -r1.2 pkgsrc/ham/gr-fcdproplus/distinfo
diff -r1.1 -r0 pkgsrc/ham/gr-fcdproplus/patches/patch-CMakeLists.txt
cvs diff -r1.1 -r1.2 pkgsrc/ham/gr-fcdproplus/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/ham/gr-fcdproplus/Attic/Makefile 2014/10/13 13:07:13 1.1
+++ pkgsrc/ham/gr-fcdproplus/Attic/Makefile 2014/11/04 21:40:48 1.2
@@ -1,39 +1,35 @@ @@ -1,39 +1,35 @@
1# $NetBSD: Makefile,v 1.1 2014/10/13 13:07:13 mef Exp $ 1# $NetBSD: Makefile,v 1.2 2014/11/04 21:40:48 joerg Exp $
2 2
3DISTNAME= gr-fcdproplus_3.7.11.orig 3DISTNAME= gr-fcdproplus_3.7.11.orig
4PKGNAME= ${DISTNAME:S/_/-/S/.orig//} 4PKGNAME= ${DISTNAME:S/_/-/S/.orig//}
5CATEGORIES= ham 5CATEGORIES= ham
6MASTER_SITES+= ${MASTER_SITE_DEBIAN:=pool/main/g/gr-fcdproplus/} 6MASTER_SITES+= ${MASTER_SITE_DEBIAN:=pool/main/g/gr-fcdproplus/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/dl1ksv/gr-fcdproplus 10HOMEPAGE= https://github.com/dl1ksv/gr-fcdproplus
11COMMENT= Addon for funcube dongle pro+ to GNU Radio 11COMMENT= Addon for funcube dongle pro+ to GNU Radio
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15USE_TOOLS= cmake 15USE_TOOLS= cmake
16USE_CMAKE= yes 16USE_CMAKE= yes
17 17
18WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 18WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
19CXXFLAGS+= -I${PREFIX}/include/libusb-1.0 19CXXFLAGS+= -I${PREFIX}/include/libusb-1.0
20 20
21# Suppress warning for developer 21# Suppress warning for developer
22CMAKE_ARGS+= -Wno-dev 22CMAKE_ARGS+= -Wno-dev
23CMAKE_ARGS+= -DGNURADIO_RUNTIME_INCLUDE_DIRS=${PREFIX}/include 23CMAKE_ARGS+= -DGNURADIO_RUNTIME_INCLUDE_DIRS=${PREFIX}/include
24PLIST_SUBST+= PYSITELIB=${PYSITELIB} 24PLIST_SUBST+= PYSITELIB=${PYSITELIB}
25 25
26SUBST_CLASSES+= libusb 26CFLAGS+= -I${PREFIX}/include/libusb-1.0
27SUBST_FILES.libusb+= CMakeLists.txt 
28SUBST_STAGE.libusb= pre-configure 
29SUBST_SED.libusb= -e 's,@@PREFIX@@,${PREFIX},' 
30SUBST_MESSAGE.libusb= Fix for "libusb.h not found" 
31 27
32.include "../../devel/boost-headers/buildlink3.mk" 28.include "../../devel/boost-headers/buildlink3.mk"
33.include "../../devel/boost-libs/buildlink3.mk" 29.include "../../devel/boost-libs/buildlink3.mk"
34.include "../../devel/libusb1/buildlink3.mk" 30.include "../../devel/libusb1/buildlink3.mk"
35.include "../../lang/python/application.mk" 31.include "../../lang/python/application.mk"
36.include "../../lang/python/pyversion.mk" 32.include "../../lang/python/pyversion.mk"
37.include "../../ham/gnuradio-core/buildlink3.mk" 33.include "../../ham/gnuradio-core/buildlink3.mk"
38 34
39.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/ham/gr-fcdproplus/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/ham/gr-fcdproplus/Attic/distinfo 2014/10/13 13:07:13 1.1
+++ pkgsrc/ham/gr-fcdproplus/Attic/distinfo 2014/11/04 21:40:48 1.2
@@ -1,6 +1,5 @@ @@ -1,6 +1,5 @@
1$NetBSD: distinfo,v 1.1 2014/10/13 13:07:13 mef Exp $ 1$NetBSD: distinfo,v 1.2 2014/11/04 21:40:48 joerg Exp $
2 2
3SHA1 (gr-fcdproplus_3.7.11.orig.tar.xz) = f9997af287116c821e49209d65e7cb5525b21544 3SHA1 (gr-fcdproplus_3.7.11.orig.tar.xz) = f9997af287116c821e49209d65e7cb5525b21544
4RMD160 (gr-fcdproplus_3.7.11.orig.tar.xz) = 571c4e698bd68d3f162cabb9dea03c7d4683ab10 4RMD160 (gr-fcdproplus_3.7.11.orig.tar.xz) = 571c4e698bd68d3f162cabb9dea03c7d4683ab10
5Size (gr-fcdproplus_3.7.11.orig.tar.xz) = 102896 bytes 5Size (gr-fcdproplus_3.7.11.orig.tar.xz) = 102896 bytes
6SHA1 (patch-CMakeLists.txt) = 63f8e5ba6fef409d64f66638dc94df3ef9d1f63a 
File Deleted: pkgsrc/ham/gr-fcdproplus/patches/Attic/patch-CMakeLists.txt