CVS commit: pkgsrc/ham/uhd

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Tue Aug 20 16:34:32 UTC 2024

Modified Files:
        pkgsrc/ham/uhd: Makefile options.mk

Log Message:
ham/uhd: Modernize cmake and fix curses

  - use CMAKE_CONFIGURE_ARGS, since this package uses cmake/build.mk
  - declare FAKE_NCURSES, because the build looks for ncurses.h

With this, builds ok on NetBSD 10.


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 pkgsrc/ham/uhd/Makefile
cvs rdiff -u -r1.12 -r1.13 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.78 pkgsrc/ham/uhd/Makefile:1.79
--- pkgsrc/ham/uhd/Makefile:1.78        Fri Dec 29 18:24:51 2023
+++ pkgsrc/ham/uhd/Makefile     Tue Aug 20 16:34:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2023/12/29 18:24:51 adam Exp $
+# $NetBSD: Makefile,v 1.79 2024/08/20 16:34:32 gdt Exp $
 
 DISTNAME=      uhd-4.6.0.0
 PKGREVISION=   1
@@ -17,18 +17,18 @@ DEPENDS+=   ${PYPKGPREFIX}-mako>=0.4.2:../
 DEPENDS+=      ${PYPKGPREFIX}-requests>=2.0:../../devel/py-requests
 DEPENDS+=      ${PYPKGPREFIX}-ruamel-yaml>=0.15:../../devel/py-ruamel-yaml
 
-CMAKE_ARGS+=   -DLIB_SUFFIX=""
-CMAKE_ARGS+=   -DENABLE_MAN_PAGE_COMPRESSION=OFF
-CMAKE_ARGS+=   -DPKG_MAN_DIR=${PKGMANDIR}/man1
-CMAKE_ARGS+=   -DRST2HTML_EXECUTABLE=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}.py
-CMAKE_ARGS+=   -Wno-dev
+CMAKE_CONFIGURE_ARGS+= -DLIB_SUFFIX=""
+CMAKE_CONFIGURE_ARGS+= -DENABLE_MAN_PAGE_COMPRESSION=OFF
+CMAKE_CONFIGURE_ARGS+= -DPKG_MAN_DIR=${PKGMANDIR}/man1
+CMAKE_CONFIGURE_ARGS+= -DRST2HTML_EXECUTABLE=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}.py
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 .include "../../lang/python/pyversion.mk"
 
-CMAKE_ARGS+=   -DPYTHON_EXECUTABLE=${PYTHONBIN}
-CMAKE_ARGS+=   -DENABLE_PYTHON3=ON
+CMAKE_CONFIGURE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHONBIN}
+CMAKE_CONFIGURE_ARGS+= -DENABLE_PYTHON3=ON
 
 # Upstream says C++11 is required, even though it is not documented.
 # It is documented that gcc 4.8 is required, when using gcc.
@@ -98,5 +98,6 @@ PLIST_SRC+=   PLIST.x4xx
 .include "../../devel/orc/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/atomic64.mk"
+FAKE_NCURSES=          yes
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/ham/uhd/options.mk
diff -u pkgsrc/ham/uhd/options.mk:1.12 pkgsrc/ham/uhd/options.mk:1.13
--- pkgsrc/ham/uhd/options.mk:1.12      Sun Aug  6 19:58:54 2023
+++ pkgsrc/ham/uhd/options.mk   Tue Aug 20 16:34:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2023/08/06 19:58:54 adam Exp $
+# $NetBSD: options.mk,v 1.13 2024/08/20 16:34:32 gdt Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.uhd
 PKG_SUPPORTED_OPTIONS= doxygen
@@ -9,8 +9,8 @@ PLIST_SRC=      ${PLIST_SRC_DFLT}
 
 .if !empty(PKG_OPTIONS:Mdoxygen)
 TOOL_DEPENDS+= doxygen>=1.8.15:../../devel/doxygen
-CMAKE_ARGS+=   -DENABLE_MANUAL=ON
-CMAKE_ARGS+=   -DENABLE_DOXYGEN=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_MANUAL=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DOXYGEN=ON
 # different versions of Doxygen generate different files
 PLIST_SRC+=    ${WRKDIR}/PLIST.DOCS
 .PHONY: doxygen-plist
@@ -20,6 +20,6 @@ doxygen-plist:
        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
+CMAKE_CONFIGURE_ARGS+= -DENABLE_MANUAL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DOXYGEN=OFF
 .endif