Fri Aug 14 04:53:08 2015 UTC ()
(Just) gitubify.


(mef)
diff -r1.10 -r1.11 pkgsrc/ham/uhd/Makefile
diff -r1.4 -r1.5 pkgsrc/ham/uhd/distinfo
cvs diff -r1.10 -r1.11 pkgsrc/ham/uhd/Makefile (expand / switch to unified diff)

--- pkgsrc/ham/uhd/Makefile 2015/04/17 15:53:09 1.10
+++ pkgsrc/ham/uhd/Makefile 2015/08/14 04:53:08 1.11
@@ -1,39 +1,42 @@ @@ -1,39 +1,42 @@
1# $NetBSD: Makefile,v 1.10 2015/04/17 15:53:09 adam Exp $ 1# $NetBSD: Makefile,v 1.11 2015/08/14 04:53:08 mef Exp $
2 2
3DISTNAME= uhd-release_003_007_002 3DISTNAME= uhd-3.7.2
4PKGNAME= uhd-3.7.2 
5PKGREVISION= 2 4PKGREVISION= 2
6CATEGORIES= ham 5CATEGORIES= ham
7MASTER_SITES= -https://github.com/EttusResearch/uhd/archive/${DISTNAME:S/uhd-//}${EXTRACT_SUFX} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=EttusResearch/}
8EXTRACT_SUFX= .zip 7GITHUB_PROJECT= uhd
 8GITHUB_TAG= release_003_007_002
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://code.ettus.com/redmine/ettus/projects/uhd/wiki 11HOMEPAGE= http://code.ettus.com/redmine/ettus/projects/uhd/wiki
12COMMENT= USRP (Universal Software Radio Peripheral) Hardware Drivers 12COMMENT= USRP (Universal Software Radio Peripheral) Hardware Drivers
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15BUILD_DEPENDS+= ${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah 15BUILD_DEPENDS+= ${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah
16BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils 16BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
17 17
18CMAKE_ARGS+= -DRST2HTML_EXECUTABLE=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}.py 18CMAKE_ARGS+= -DRST2HTML_EXECUTABLE=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}.py
19 19
20USE_LANGUAGES= c c++ 20USE_LANGUAGES= c c++
21USE_TOOLS= cmake pkg-config 21USE_TOOLS= cmake pkg-config
22USE_CMAKE= yes 22USE_CMAKE= yes
 23# extra pax_global_header exists, and to avoid that:
 24EXTRACT_USING= gtar
 25#EXTRACT_ELEMENTS= uhd-${GITHUB_TAG}
23 26
24# Please note distribution has many stuff under uhd/, but build itself 27# Please note distribution has many stuff under uhd/, but build itself
25# needs under host/ only. Those uhd/ stuff will be handled post-{patch,install}: 28# needs under host/ only. Those uhd/ stuff will be handled post-{patch,install}:
26WRKSRC= ${WRKDIR}/${DISTNAME}/host 29WRKSRC= ${WRKDIR}/uhd-${GITHUB_TAG}/host
27 30
28# The files with their name uhd-xxxx, are moved down from uhd/xxxx for this process. 31# The files with their name uhd-xxxx, are moved down from uhd/xxxx for this process.
29REPLACE_PYTHON= \ 32REPLACE_PYTHON= \
30 utils/uhd_images_downloader.py.in \ 33 utils/uhd_images_downloader.py.in \
31 utils/usrp2_card_burner.py \ 34 utils/usrp2_card_burner.py \
32 utils/usrp2_card_burner_gui.py \ 35 utils/usrp2_card_burner_gui.py \
33 utils/usrp_n2xx_net_burner.py \ 36 utils/usrp_n2xx_net_burner.py \
34 utils/usrp_n2xx_net_burner_gui.py \ 37 utils/usrp_n2xx_net_burner_gui.py \
35 uhd-firmware/fx2/utils/build_eeprom.py \ 38 uhd-firmware/fx2/utils/build_eeprom.py \
36 uhd-firmware/fx2/utils/edit-gpif-b100.py \ 39 uhd-firmware/fx2/utils/edit-gpif-b100.py \
37 uhd-firmware/fx2/utils/edit-gpif.py \ 40 uhd-firmware/fx2/utils/edit-gpif.py \
38 uhd-firmware/fx2/utils/generate_regs.py \ 41 uhd-firmware/fx2/utils/generate_regs.py \
39 uhd-firmware/x300/bin_to_coe.py \ 42 uhd-firmware/x300/bin_to_coe.py \
@@ -77,27 +80,27 @@ SUBST_FILES.man= docs/CMakeLists.txt @@ -77,27 +80,27 @@ SUBST_FILES.man= docs/CMakeLists.txt
77SUBST_SED.man= -e '/UHD_INSTALL/s,$${PKG_MAN_DIR},${PREFIX}/${PKGMANDIR}/man1,' 80SUBST_SED.man= -e '/UHD_INSTALL/s,$${PKG_MAN_DIR},${PREFIX}/${PKGMANDIR}/man1,'
78# UHD_INSTALL(FILES ${gzfile} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages) 81# UHD_INSTALL(FILES ${gzfile} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages)
79 82
80# is it default ? and redundent ? 83# is it default ? and redundent ?
81PLIST_SRC= ${PKGDIR}/PLIST 84PLIST_SRC= ${PKGDIR}/PLIST
82.include "options.mk" 85.include "options.mk"
83 86
84# Copy (beyond) upper directory files (which should be handled at post-install) 87# Copy (beyond) upper directory files (which should be handled at post-install)
85# to receive REPLACE_PYTHON conversion ( otherwise above the range ) 88# to receive REPLACE_PYTHON conversion ( otherwise above the range )
86post-patch: 89post-patch:
87 (cd ${WRKDIR}; \ 90 (cd ${WRKDIR}; \
88 for i in firmware fpga images ; do \ 91 for i in firmware fpga images ; do \
89 ${MKDIR} ${WRKSRC}/uhd-$$i ;\ 92 ${MKDIR} ${WRKSRC}/uhd-$$i ;\
90 ${CP} -r ${WRKDIR}/${DISTNAME}/$$i/* ${WRKSRC}/uhd-$$i ;\ 93 ${CP} -r ${WRKDIR}/uhd-${GITHUB_TAG}/$$i/* ${WRKSRC}/uhd-$$i ;\
91 done) 94 done)
92 95
93# (1) move back the files to original location after REPLACE_PYTHON handled 96# (1) move back the files to original location after REPLACE_PYTHON handled
94# (2) suppress warning at intallation, "non executable files get +x bit set". 97# (2) suppress warning at intallation, "non executable files get +x bit set".
95# 98#
96# Converting ${CP} into ${INTALL_DATA_DIR} and ${INSTALL_DATA} as pkglint 99# Converting ${CP} into ${INTALL_DATA_DIR} and ${INSTALL_DATA} as pkglint
97# flags are NOT easy, sorry for that. 100# flags are NOT easy, sorry for that.
98post-install: 101post-install:
99 for i in firmware fpga images ; do \ 102 for i in firmware fpga images ; do \
100 ${CP} -r ${WRKSRC}/uhd-$$i/* ${DESTDIR}${PREFIX}/share/uhd/$$i/;\ 103 ${CP} -r ${WRKSRC}/uhd-$$i/* ${DESTDIR}${PREFIX}/share/uhd/$$i/;\
101 ${FIND} ${DESTDIR}${PREFIX}/share/uhd/$$i -type f -exec \ 104 ${FIND} ${DESTDIR}${PREFIX}/share/uhd/$$i -type f -exec \
102 ${CHMOD} -x '{}' \; ;\ 105 ${CHMOD} -x '{}' \; ;\
103 done 106 done
cvs diff -r1.4 -r1.5 pkgsrc/ham/uhd/distinfo (expand / switch to unified diff)

--- pkgsrc/ham/uhd/distinfo 2015/04/23 18:26:30 1.4
+++ pkgsrc/ham/uhd/distinfo 2015/08/14 04:53:08 1.5
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.4 2015/04/23 18:26:30 joerg Exp $ 1$NetBSD: distinfo,v 1.5 2015/08/14 04:53:08 mef Exp $
2 2
3SHA1 (uhd-release_003_007_002.zip) = 41e110454a7e8a7c749226f17dcf49a62c7c4da4 3SHA1 (uhd-3.7.2.tar.gz) = 76fd06744e82f4d4f8734c100fa9bca309a0a2ae
4RMD160 (uhd-release_003_007_002.zip) = 914115d13028ff753465119848ee9d88811f127b 4RMD160 (uhd-3.7.2.tar.gz) = b16c7e946fcb5e9c068c583f4e0cb910a908e1f1
5Size (uhd-release_003_007_002.zip) = 90350334 bytes 5Size (uhd-3.7.2.tar.gz) = 86463974 bytes
6SHA1 (patch-host_include_uhd_transport_nirio_nirio__driver__iface_h) = 2ba6c50f467515bfac9fe330572bb0154154a0ad 6SHA1 (patch-host_include_uhd_transport_nirio_nirio__driver__iface_h) = 2ba6c50f467515bfac9fe330572bb0154154a0ad
7SHA1 (patch-lib_usrp_b200_b200__io__impl.cpp) = 937003ecd88a31d96c5223c95751ace7622e2256 7SHA1 (patch-lib_usrp_b200_b200__io__impl.cpp) = 937003ecd88a31d96c5223c95751ace7622e2256