[pkgsrc/trunk]: pkgsrc/ham/gr-fcdproplus Replace patch with much simpler logi...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/79dab0086367
branches:  trunk
changeset: 641343:79dab0086367
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Nov 04 21:40:48 2014 +0000

description:
Replace patch with much simpler logic that actually works.

diffstat:

 ham/gr-fcdproplus/Makefile                     |   8 ++------
 ham/gr-fcdproplus/distinfo                     |   3 +--
 ham/gr-fcdproplus/patches/patch-CMakeLists.txt |  14 --------------
 3 files changed, 3 insertions(+), 22 deletions(-)

diffs (51 lines):

diff -r 4db75e009ad2 -r 79dab0086367 ham/gr-fcdproplus/Makefile
--- a/ham/gr-fcdproplus/Makefile        Tue Nov 04 21:40:05 2014 +0000
+++ b/ham/gr-fcdproplus/Makefile        Tue Nov 04 21:40:48 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/10/13 13:07:13 mef Exp $
+# $NetBSD: Makefile,v 1.2 2014/11/04 21:40:48 joerg Exp $
 
 DISTNAME=              gr-fcdproplus_3.7.11.orig
 PKGNAME=               ${DISTNAME:S/_/-/S/.orig//}
@@ -23,11 +23,7 @@
 CMAKE_ARGS+=           -DGNURADIO_RUNTIME_INCLUDE_DIRS=${PREFIX}/include
 PLIST_SUBST+=          PYSITELIB=${PYSITELIB}
 
-SUBST_CLASSES+=                libusb
-SUBST_FILES.libusb+=   CMakeLists.txt
-SUBST_STAGE.libusb=    pre-configure
-SUBST_SED.libusb=      -e 's,@@PREFIX@@,${PREFIX},'
-SUBST_MESSAGE.libusb=  Fix for "libusb.h not found"
+CFLAGS+=               -I${PREFIX}/include/libusb-1.0
 
 .include       "../../devel/boost-headers/buildlink3.mk"
 .include       "../../devel/boost-libs/buildlink3.mk"
diff -r 4db75e009ad2 -r 79dab0086367 ham/gr-fcdproplus/distinfo
--- a/ham/gr-fcdproplus/distinfo        Tue Nov 04 21:40:05 2014 +0000
+++ b/ham/gr-fcdproplus/distinfo        Tue Nov 04 21:40:48 2014 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1 2014/10/13 13:07:13 mef Exp $
+$NetBSD: distinfo,v 1.2 2014/11/04 21:40:48 joerg Exp $
 
 SHA1 (gr-fcdproplus_3.7.11.orig.tar.xz) = f9997af287116c821e49209d65e7cb5525b21544
 RMD160 (gr-fcdproplus_3.7.11.orig.tar.xz) = 571c4e698bd68d3f162cabb9dea03c7d4683ab10
 Size (gr-fcdproplus_3.7.11.orig.tar.xz) = 102896 bytes
-SHA1 (patch-CMakeLists.txt) = 63f8e5ba6fef409d64f66638dc94df3ef9d1f63a
diff -r 4db75e009ad2 -r 79dab0086367 ham/gr-fcdproplus/patches/patch-CMakeLists.txt
--- a/ham/gr-fcdproplus/patches/patch-CMakeLists.txt    Tue Nov 04 21:40:05 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2014/10/13 13:53:19 mef Exp $
-.. work/gr-fcdproplus/lib/hid/hid.c:47:20: fatal error: libusb.h: No such file or directory
-
---- CMakeLists.txt.orig        2014-10-03 09:19:29.000000000 +0900
-+++ CMakeLists.txt     2014-10-03 09:19:47.000000000 +0900
-@@ -44,7 +44,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SO
- ########################################################################
- if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
-     #http://gcc.gnu.org/wiki/Visibility
--    add_definitions(-fvisibility=hidden)
-+    add_definitions(-fvisibility=hidden -I@@PREFIX@@/include/libusb-1.0)
- endif()
- ########################################################################
- # Find boost