Mon Jul 24 07:30:07 2017 UTC ()
fix build without doxygen
bump pkgrevision for removing DEPENDS in favor of BUILD_DEPENDS


(dbj)
diff -r1.25 -r1.26 pkgsrc/ham/uhd/Makefile
diff -r1.4 -r1.5 pkgsrc/ham/uhd/options.mk
cvs diff -r1.25 -r1.26 pkgsrc/ham/uhd/Makefile (expand / switch to unified diff)

--- pkgsrc/ham/uhd/Makefile 2017/04/30 01:21:46 1.25
+++ pkgsrc/ham/uhd/Makefile 2017/07/24 07:30:07 1.26
@@ -1,31 +1,30 @@ @@ -1,31 +1,30 @@
1# $NetBSD: Makefile,v 1.25 2017/04/30 01:21:46 ryoon Exp $ 1# $NetBSD: Makefile,v 1.26 2017/07/24 07:30:07 dbj Exp $
2 2
3DISTNAME= uhd-3.9.4 3DISTNAME= uhd-3.9.4
4PKGREVISION= 5 4PKGREVISION= 6
5CATEGORIES= ham 5CATEGORIES= ham
6MASTER_SITES= ${MASTER_SITE_GITHUB:=EttusResearch/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=EttusResearch/}
7# 3.9.1 -> 003_009_001 7# 3.9.1 -> 003_009_001
8GITHUB_TAG= release_${PKGVERSION_NOREV:C/([0-9])\.([0-9])\.([0-9])/00\1_00\2_00\3/} 8GITHUB_TAG= release_${PKGVERSION_NOREV:C/([0-9])\.([0-9])\.([0-9])/00\1_00\2_00\3/}
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
17BUILD_DEPENDS+= ${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako 17BUILD_DEPENDS+= ${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
18BUILD_DEPENDS+= doxygen>=1.8.12:../../devel/doxygen 
19 18
20PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-cheetah 19PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-cheetah
21 20
22CMAKE_ARGS+= -DRST2HTML_EXECUTABLE=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}.py 21CMAKE_ARGS+= -DRST2HTML_EXECUTABLE=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}.py
23CMAKE_ARGS+= -Wno-dev 22CMAKE_ARGS+= -Wno-dev
24 23
25USE_LANGUAGES= c c++ 24USE_LANGUAGES= c c++
26USE_TOOLS= cmake pkg-config 25USE_TOOLS= cmake pkg-config
27USE_CMAKE= yes 26USE_CMAKE= yes
28# extra pax_global_header exists, and to avoid that: 27# extra pax_global_header exists, and to avoid that:
29EXTRACT_USING= gtar 28EXTRACT_USING= gtar
30#EXTRACT_ELEMENTS= uhd-${GITHUB_TAG} 29#EXTRACT_ELEMENTS= uhd-${GITHUB_TAG}
31 30
cvs diff -r1.4 -r1.5 pkgsrc/ham/uhd/options.mk (expand / switch to unified diff)

--- pkgsrc/ham/uhd/options.mk 2016/06/08 07:26:59 1.4
+++ pkgsrc/ham/uhd/options.mk 2017/07/24 07:30:07 1.5
@@ -1,17 +1,20 @@ @@ -1,17 +1,20 @@
1# $NetBSD: options.mk,v 1.4 2016/06/08 07:26:59 wiz Exp $ 1# $NetBSD: options.mk,v 1.5 2017/07/24 07:30:07 dbj Exp $
2### Set options 2### Set options
3PKG_OPTIONS_VAR= PKG_OPTIONS.uhd 3PKG_OPTIONS_VAR= PKG_OPTIONS.uhd
4PKG_SUPPORTED_OPTIONS= doxygen manual 4PKG_SUPPORTED_OPTIONS= doxygen manual
5PKG_SUGGESTED_OPTIONS= doxygen manual 5PKG_SUGGESTED_OPTIONS= doxygen manual
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9.if !empty(PKG_OPTIONS:Mdoxygen) 9.if !empty(PKG_OPTIONS:Mdoxygen)
10DEPENDS+= doxygen>=1.8.11:../../devel/doxygen 10BUILD_DEPENDS+= doxygen>=1.8.12:../../devel/doxygen
11PLIST_SRC+= ${PKGDIR}/PLIST.doxygen 11PLIST_SRC+= ${PKGDIR}/PLIST.doxygen
 12CMAKE_ARGS+= -DENABLE_DOXYGEN:BOOL=ON
 13.else
 14CMAKE_ARGS+= -DENABLE_DOXYGEN:BOOL=OFF
12.endif 15.endif
13 16
14.if !empty(PKG_OPTIONS:Mmanual) 17.if !empty(PKG_OPTIONS:Mmanual)
15BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils 18BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
16#PLIST_SRC+= ${PKGDIR}/PLIST.manual 19#PLIST_SRC+= ${PKGDIR}/PLIST.manual
17.endif 20.endif