Update PLIST and options.mk for doxygen 1.8.9.1.

3 files changed, 15 insertions, 21 deletions

diff --git a/ham/uhd/Makefile b/ham/uhd/Makefile
index a4d1d5c86bf..3927afa6b64 100644
--- a/ham/uhd/Makefile
+++ b/ham/uhd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/11/07 19:39:36 adam Exp $
+# $NetBSD: Makefile,v 1.7 2015/01/31 00:58:06 mef Exp $
 
 DISTNAME=		uhd-release_003_007_002
 PKGNAME=		uhd-3.7.2
@@ -53,14 +53,14 @@ REPLACE_PYTHON=	\
 	uhd-fpga/usrp3/top/python/bit_to_zynq_bin.py \
 	uhd-fpga/usrp3/top/python/check_inout.py \
 	uhd-fpga/usrp3/top/python/check_timing.py \
-        uhd-fpga/usrp3/lib/io_port2/create-lvbitx.py \
+        uhd-fpga/usrp3/lib/io_port2/create-lvbitx.py
 
 REPLACE_PERL=	uhd-fpga/usrp1/tb/makesine.pl
 
 REPLACE_BASH=	\
 	uhd-fpga/usrp2/top/impactor.sh \
 	uhd-fpga/usrp3/top/impactor.sh \
-        uhd-fpga/usrp3/top/python/batch-build \
+        uhd-fpga/usrp3/top/python/batch-build
 
 INSTALLATION_DIRS+=	share/uhd
 INSTALLATION_DIRS+=	share/uhd/firmware
@@ -91,13 +91,13 @@ post-patch:
 # (2) suppress warning at intallation, "non executable files get +x bit set".
 #
 #  Converting ${CP} into ${INTALL_DATA_DIR} and ${INSTALL_DATA} as pkglint
-#  flags are not easy, sorry for that.
+#  flags are NOT easy, sorry for that.
 post-install:
 	for i in firmware fpga images ; do \
 	  ${CP} -r ${WRKSRC}/uhd-$$i/* ${DESTDIR}${PREFIX}/share/uhd/$$i/;\
 	  ${FIND} ${DESTDIR}${PREFIX}/share/uhd/$$i -type f -exec \
 	          ${CHMOD} -x '{}' \; ;\
-		done	
+		done
 
 .include "../../lang/python/application.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
diff --git a/ham/uhd/PLIST.doxygen b/ham/uhd/PLIST.doxygen
index 40aaec282e8..b9abdaf7667 100644
--- a/ham/uhd/PLIST.doxygen
+++ b/ham/uhd/PLIST.doxygen
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST.doxygen,v 1.1 2014/09/08 07:12:05 mef Exp $
+@comment $NetBSD: PLIST.doxygen,v 1.2 2015/01/31 00:58:06 mef Exp $
 share/doc/uhd/doxygen/html/algorithm_8hpp.html
 share/doc/uhd/doxygen/html/algorithm_8hpp_source.html
 share/doc/uhd/doxygen/html/annotated.html
+share/doc/uhd/doxygen/html/arrowdown.png
+share/doc/uhd/doxygen/html/arrowright.png
 share/doc/uhd/doxygen/html/assert__has_8hpp.html
 share/doc/uhd/doxygen/html/assert__has_8hpp_source.html
 share/doc/uhd/doxygen/html/atomic_8hpp.html
@@ -193,25 +195,15 @@ share/doc/uhd/doxygen/html/dir_000004.html
 share/doc/uhd/doxygen/html/dir_000005.html
 share/doc/uhd/doxygen/html/dir_000006.html
 share/doc/uhd/doxygen/html/dir_000007.html
+share/doc/uhd/doxygen/html/doc.png
 share/doc/uhd/doxygen/html/doxygen.css
 share/doc/uhd/doxygen/html/doxygen.png
 share/doc/uhd/doxygen/html/dynsections.js
 share/doc/uhd/doxygen/html/exception_8hpp.html
 share/doc/uhd/doxygen/html/exception_8hpp_source.html
 share/doc/uhd/doxygen/html/files.html
-share/doc/uhd/doxygen/html/ftv2blank.png
-share/doc/uhd/doxygen/html/ftv2doc.png
-share/doc/uhd/doxygen/html/ftv2folderclosed.png
-share/doc/uhd/doxygen/html/ftv2folderopen.png
-share/doc/uhd/doxygen/html/ftv2lastnode.png
-share/doc/uhd/doxygen/html/ftv2link.png
-share/doc/uhd/doxygen/html/ftv2mlastnode.png
-share/doc/uhd/doxygen/html/ftv2mnode.png
-share/doc/uhd/doxygen/html/ftv2node.png
-share/doc/uhd/doxygen/html/ftv2plastnode.png
-share/doc/uhd/doxygen/html/ftv2pnode.png
-share/doc/uhd/doxygen/html/ftv2splitbar.png
-share/doc/uhd/doxygen/html/ftv2vertline.png
+share/doc/uhd/doxygen/html/folderclosed.png
+share/doc/uhd/doxygen/html/folderopen.png
 share/doc/uhd/doxygen/html/functions.html
 share/doc/uhd/doxygen/html/functions_a.html
 share/doc/uhd/doxygen/html/functions_b.html
@@ -591,6 +583,7 @@ share/doc/uhd/doxygen/html/search/search.js
 share/doc/uhd/doxygen/html/search/search_l.png
 share/doc/uhd/doxygen/html/search/search_m.png
 share/doc/uhd/doxygen/html/search/search_r.png
+share/doc/uhd/doxygen/html/search/searchdata.js
 share/doc/uhd/doxygen/html/search/typedefs_0.html
 share/doc/uhd/doxygen/html/search/typedefs_0.js
 share/doc/uhd/doxygen/html/search/typedefs_1.html
@@ -667,6 +660,7 @@ share/doc/uhd/doxygen/html/sensors_8hpp.html
 share/doc/uhd/doxygen/html/sensors_8hpp_source.html
 share/doc/uhd/doxygen/html/serial_8hpp.html
 share/doc/uhd/doxygen/html/serial_8hpp_source.html
+share/doc/uhd/doxygen/html/splitbar.png
 share/doc/uhd/doxygen/html/static_8hpp.html
 share/doc/uhd/doxygen/html/static_8hpp_source.html
 share/doc/uhd/doxygen/html/stream_8hpp.html
diff --git a/ham/uhd/options.mk b/ham/uhd/options.mk
index caf1d369ae0..6b1b95f9c12 100644
--- a/ham/uhd/options.mk
+++ b/ham/uhd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2014/09/08 07:12:05 mef Exp $
+# $NetBSD: options.mk,v 1.2 2015/01/31 00:58:06 mef Exp $
 ### Set options
 PKG_OPTIONS_VAR=	PKG_OPTIONS.uhd
 PKG_SUPPORTED_OPTIONS=	doxygen manual
@@ -7,7 +7,7 @@ PKG_SUGGESTED_OPTIONS=	doxygen manual
 .include	"../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdoxygen)
-DEPENDS+=		doxygen-[0-9]*:../../devel/doxygen
+DEPENDS+=		doxygen>=1.8.9.1:../../devel/doxygen
 PLIST_SRC+=		${PKGDIR}/PLIST.doxygen
 .endif