pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/ham/uhd



Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Aug  6 19:58:54 UTC 2023

Modified Files:
        pkgsrc/ham/uhd: Makefile options.mk
Removed Files:
        pkgsrc/ham/uhd: PLIST.doxygen

Log Message:
uhd: switch to dynamic PLIST for doxygen files, and cmake/build.mk


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 pkgsrc/ham/uhd/Makefile
cvs rdiff -u -r1.18 -r0 pkgsrc/ham/uhd/PLIST.doxygen
cvs rdiff -u -r1.11 -r1.12 pkgsrc/ham/uhd/options.mk

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

Modified files:

Index: pkgsrc/ham/uhd/Makefile
diff -u pkgsrc/ham/uhd/Makefile:1.74 pkgsrc/ham/uhd/Makefile:1.75
--- pkgsrc/ham/uhd/Makefile:1.74        Sun Apr 23 14:26:24 2023
+++ pkgsrc/ham/uhd/Makefile     Sun Aug  6 19:58:53 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2023/04/23 14:26:24 adam Exp $
+# $NetBSD: Makefile,v 1.75 2023/08/06 19:58:53 adam Exp $
 
 DISTNAME=      uhd-4.4.0.0
 PKGREVISION=   1
@@ -39,7 +39,6 @@ CMAKE_ARGS+=  -DENABLE_PYTHON3=ON
 # ticket filed because #236 resulted in in-ticket clarification only
 # (and not a doc edit), and having experimented no clarification is
 # needed.
-USE_CMAKE=             yes
 USE_LANGUAGES=         c gnu++14
 USE_TOOLS+=            pkg-config
 GCC_REQD+=             4.8
@@ -94,6 +93,7 @@ PLIST_SRC+=   PLIST.x4xx
 .endif
 
 .include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../devel/libusb1/buildlink3.mk"
 .include "../../devel/orc/buildlink3.mk"
 .include "../../lang/python/application.mk"

Index: pkgsrc/ham/uhd/options.mk
diff -u pkgsrc/ham/uhd/options.mk:1.11 pkgsrc/ham/uhd/options.mk:1.12
--- pkgsrc/ham/uhd/options.mk:1.11      Tue Jun  6 12:41:37 2023
+++ pkgsrc/ham/uhd/options.mk   Sun Aug  6 19:58:54 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2023/06/06 12:41:37 riastradh Exp $
+# $NetBSD: options.mk,v 1.12 2023/08/06 19:58:54 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.uhd
 PKG_SUPPORTED_OPTIONS= doxygen
@@ -9,9 +9,16 @@ PLIST_SRC=     ${PLIST_SRC_DFLT}
 
 .if !empty(PKG_OPTIONS:Mdoxygen)
 TOOL_DEPENDS+= doxygen>=1.8.15:../../devel/doxygen
-PLIST_SRC+=    ${PKGDIR}/PLIST.doxygen
 CMAKE_ARGS+=   -DENABLE_MANUAL=ON
 CMAKE_ARGS+=   -DENABLE_DOXYGEN=ON
+# different versions of Doxygen generate different files
+PLIST_SRC+=    ${WRKDIR}/PLIST.DOCS
+.PHONY: doxygen-plist
+post-install: doxygen-plist
+doxygen-plist:
+       ${RM} -f ${WRKDIR}/PLIST.DOCS
+       cd ${DESTDIR}${PREFIX} && \
+       ${FIND} share/doc/uhd/doxygen -type f -print > ${WRKDIR}/PLIST.DOCS
 .else
 CMAKE_ARGS+=   -DENABLE_MANUAL=OFF
 CMAKE_ARGS+=   -DENABLE_DOXYGEN=OFF



Home | Main Index | Thread Index | Old Index