Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

--- pkgsrc/ham/uhd/Makefile	2014/09/08 10:02:02	1.3
+++ pkgsrc/ham/uhd/Makefile	2014/09/08 15:37:42	1.4
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/09/08 10:02:02 obache Exp $
+# $NetBSD: Makefile,v 1.4 2014/09/08 15:37:42 mef Exp $
 
 DISTNAME=		uhd-release_003_007_002
 PKGNAME=		uhd-3.7.2
@@ -12,13 +12,38 @@ COMMENT=		USRP (Universal Software Radio
 LICENSE=		gnu-gpl-v2
 
 BUILD_DEPENDS+=		${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah
+
 USE_LANGUAGES=		c c++
 USE_TOOLS=		cmake pkg-config
+USE_CMAKE=		yes
 
 # Please note distribution has many stuff under uhd/, but build itself
 # needs under host/ only.  Those uhd/ stuff will be handled post-{patch,install}:
 WRKSRC=			${WRKDIR}/${DISTNAME}/host
 
+CONFIGURE_ARGS+=	-DCMAKE_BUILD_WITH_INSTALL_RPATH=True
+CONFIGURE_ARGS+=	-DCMAKE_INSTALL_PREFIX=${PREFIX}
+CONFIGURE_ARGS+=	-DCMAKE_INSTALL_RPATH=${PREFIX}/lib
+CONFIGURE_ARGS+=	-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE
+CONFIGURE_ARGS+=	-DLIBUSB_INCLUDE_DIR=${PREFIX}/include/libusb-1.0
+
+CONFIGURE_ARGS+=	-DENABLE_LIBUHD=True
+CONFIGURE_ARGS+=	-DENABLE_EXAMPLES=True
+CONFIGURE_ARGS+=	-DENABLE_UTILS=True
+CONFIGURE_ARGS+=	-DENABLE_TESTS=True
+CONFIGURE_ARGS+=	-DENABLE_MANUAL=True
+CONFIGURE_ARGS+=	-DENABLE_DOXYGEN=True
+CONFIGURE_ARGS+=	-DENABLE_MAN_PAGES=True
+CONFIGURE_ARGS+=	-DENABLE_ORC=True
+CONFIGURE_ARGS+=	-DENABLE_USB=True
+CONFIGURE_ARGS+=	-DENABLE_USRP1=True
+CONFIGURE_ARGS+=	-DENABLE_USRP2=True
+CONFIGURE_ARGS+=	-DENABLE_B100=True
+CONFIGURE_ARGS+=	-DENABLE_X300=True
+CONFIGURE_ARGS+=	-DENABLE_B200=True
+# E100 is Linux only
+CONFIGURE_ARGS+=	-DENABLE_E100=True
+
 # The files with their name uhd-xxxx, are moved down from uhd/xxxx for this process.
 REPLACE_PYTHON=	\
 	utils/uhd_images_downloader.py.in \
@@ -84,32 +109,6 @@ post-patch:
 	${CP} -r ${WRKDIR}/${DISTNAME}/$$i/* ${WRKSRC}/uhd-$$i ;\
 	done)
 
-do-configure:
-	(cd $(WRKSRC) ; \
-	cmake \
-	-DCMAKE_BUILD_WITH_INSTALL_RPATH=True \
-	-DCMAKE_INSTALL_PREFIX=${PREFIX} \
-	-DCMAKE_INSTALL_RPATH=${PREFIX}/lib \
-	-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE \
-	-DLIBUSB_INCLUDE_DIR=${PREFIX}/include/libusb-1.0 \
-	-DENABLE_LIBUHD=True \
-	-DENABLE_EXAMPLES=True \
-	-DENABLE_UTILS=True \
-	-DENABLE_TESTS=True \
-	-DENABLE_MANUAL=True \
-	-DENABLE_DOXYGEN=True \
-	-DENABLE_MAN_PAGES=True \
-	-DENABLE_ORC=True \
-	-DENABLE_USB=True \
-	-DENABLE_USRP1=True \
-	-DENABLE_USRP2=True \
-	-DENABLE_B100=True \
-	-DENABLE_X300=True \
-	-DENABLE_B200=True \
-	-DENABLE_E100=True \
-	.)
-# E100 above is Linux only
-
 # (1) move back the files to original location after REPLACE_PYTHON handled
 # (2) suppress warning at intallation, "non executable files get +x bit set".
 #