CVS commit: pkgsrc/devel/ncursesw

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat May  4 21:46:11 UTC 2024

Modified Files:
        pkgsrc/devel/ncursesw: Makefile

Log Message:
ncursesw: fix do-install issues and bump

1: When installing libraries, must use INSTALL_LIB, not INSTALL_PROGRAM.
Otherwise symbols get lost.

2: ${RUN} must not be used inside a shell for loop. Not only does it
not run the command because it will try to run the shell command "@",
but masks errors because "set -e" did not happen.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/ncursesw/Makefile

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

Modified files:

Index: pkgsrc/devel/ncursesw/Makefile
diff -u pkgsrc/devel/ncursesw/Makefile:1.23 pkgsrc/devel/ncursesw/Makefile:1.24
--- pkgsrc/devel/ncursesw/Makefile:1.23 Thu Jan 19 12:09:41 2023
+++ pkgsrc/devel/ncursesw/Makefile      Sat May  4 21:46:11 2024
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.23 2023/01/19 12:09:41 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2024/05/04 21:46:11 tnn Exp $
 
 .include "../../devel/ncurses/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/ncurses/ncursesw/}
 COMMENT=       Wide character CRT screen handling and optimization package
+PKGREVISION=   1
 
 PATCHDIR=      ${.CURDIR}/../../devel/ncurses/patches
 DISTINFO_FILE= ${.CURDIR}/../../devel/ncurses/distinfo
@@ -28,13 +29,13 @@ post-build:
        cd ${WRKSRC}/misc && ${SH} gen-pkgconfig
 
 do-install:
-       for DIR in c++ form include menu panel; do \
+       ${RUN} for DIR in c++ form include menu panel; do \
                cd ${WRKSRC}/$${DIR}; \
-               ${RUN} ${MAKE_ENV} ${MAKE_PROGRAM} ${INSTALL_MAKE_FLAGS} install.includes; \
+               ${MAKE_ENV} ${MAKE_PROGRAM} ${INSTALL_MAKE_FLAGS} install.includes; \
        done
        ${INSTALL_SCRIPT} ${WRKSRC}/misc/ncurses-config ${DESTDIR}${PREFIX}/bin/ncursesw${NC_VERS:R}-config
-       for LIB in gnuform gnumenu ncurses++ ncurses gnupanel; do       \
-               ${LIBTOOL} --mode=install ${INSTALL_PROGRAM}    \
+       ${RUN} for LIB in gnuform gnumenu ncurses++ ncurses gnupanel; do        \
+               ${LIBTOOL} --mode=install ${INSTALL_LIB}        \
                    ${WRKSRC}/lib/lib$${LIB}w.la ${DESTDIR}${PREFIX}/lib;       \
        done
        ${INSTALL_DATA} ${WRKSRC}/misc/*.pc ${DESTDIR}${PREFIX}/lib/pkgconfig