[pkgsrc/trunk]: pkgsrc/ham/uhd fixes fancy fetch.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7d818a8477ee
branches:  trunk
changeset: 639217:7d818a8477ee
user:      obache <obache%pkgsrc.org@localhost>
date:      Mon Sep 08 10:02:02 2014 +0000

description:
fixes fancy fetch.

diffstat:

 ham/uhd/Makefile |  20 ++++++--------------
 ham/uhd/distinfo |   8 ++++----
 2 files changed, 10 insertions(+), 18 deletions(-)

diffs (69 lines):

diff -r c89dbd9a4537 -r 7d818a8477ee ham/uhd/Makefile
--- a/ham/uhd/Makefile  Mon Sep 08 09:41:08 2014 +0000
+++ b/ham/uhd/Makefile  Mon Sep 08 10:02:02 2014 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2014/09/08 08:49:39 mef Exp $
+# $NetBSD: Makefile,v 1.3 2014/09/08 10:02:02 obache Exp $
 
-DISTNAME=              release_003_007_002
+DISTNAME=              uhd-release_003_007_002
 PKGNAME=               uhd-3.7.2
 CATEGORIES=            ham
-MASTER_SITE=           https://github.com/EttusResearch/uhd/archive
+MASTER_SITES=          -https://github.com/EttusResearch/uhd/archive/${DISTNAME:S/uhd-//}${EXTRACT_SUFX}
 EXTRACT_SUFX=          .zip
-DIST_SUBDIR=           uhd
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://code.ettus.com/redmine/ettus/projects/uhd/wiki
@@ -14,11 +13,11 @@
 
 BUILD_DEPENDS+=                ${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah
 USE_LANGUAGES=         c c++
-USE_TOOLS=             cmake wget pkg-config
+USE_TOOLS=             cmake pkg-config
 
 # 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}/uhd-${DISTNAME}/host
+WRKSRC=                        ${WRKDIR}/${DISTNAME}/host
 
 # The files with their name uhd-xxxx, are moved down from uhd/xxxx for this process.
 REPLACE_PYTHON=        \
@@ -75,13 +74,6 @@
 # is it default ? and redundent ?
 PLIST_SRC=     ${PKGDIR}/PLIST
 .include "options.mk"
-# FETCH_USING at /etc/mk.conf doesn't good, (sorry), put work around for the target
-do-fetch:
-       if [   ! -f ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} ] ; then \
-         if [ ! -d ${DISTDIR}/${DIST_SUBDIR} ] ; then \
-          ${MKDIR} ${DISTDIR}/${DIST_SUBDIR}; fi; \
-         cd      ${DISTDIR}/${DIST_SUBDIR}; \
-         wget --no-check-certificate --quiet ${MASTER_SITE}/${DISTNAME}${EXTRACT_SUFX} ;fi
 
 # Copy (beyond) upper directory files (which should be handled at post-install)
 # to receive REPLACE_PYTHON conversion ( otherwise above the range )
@@ -89,7 +81,7 @@
        (cd ${WRKDIR}; \
        for i in firmware fpga images ; do \
          ${MKDIR} ${WRKSRC}/uhd-$$i ;\
-       ${CP} -r ${WRKDIR}/uhd-${DISTNAME}/$$i/* ${WRKSRC}/uhd-$$i ;\
+       ${CP} -r ${WRKDIR}/${DISTNAME}/$$i/* ${WRKSRC}/uhd-$$i ;\
        done)
 
 do-configure:
diff -r c89dbd9a4537 -r 7d818a8477ee ham/uhd/distinfo
--- a/ham/uhd/distinfo  Mon Sep 08 09:41:08 2014 +0000
+++ b/ham/uhd/distinfo  Mon Sep 08 10:02:02 2014 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2014/09/08 08:49:39 mef Exp $
+$NetBSD: distinfo,v 1.3 2014/09/08 10:02:02 obache Exp $
 
-SHA1 (uhd/release_003_007_002.zip) = 41e110454a7e8a7c749226f17dcf49a62c7c4da4
-RMD160 (uhd/release_003_007_002.zip) = 914115d13028ff753465119848ee9d88811f127b
-Size (uhd/release_003_007_002.zip) = 90350334 bytes
+SHA1 (uhd-release_003_007_002.zip) = 41e110454a7e8a7c749226f17dcf49a62c7c4da4
+RMD160 (uhd-release_003_007_002.zip) = 914115d13028ff753465119848ee9d88811f127b
+Size (uhd-release_003_007_002.zip) = 90350334 bytes
 SHA1 (patch-host_include_uhd_transport_nirio_nirio__driver__iface_h) = 2ba6c50f467515bfac9fe330572bb0154154a0ad