pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: jperkin
Date: Mon May 6 08:27:56 UTC 2024
Modified Files:
pkgsrc/audio/cmus: Makefile
pkgsrc/audio/cmus-legacy: Makefile
pkgsrc/audio/herrie: Makefile
pkgsrc/audio/ncmpcpp: Makefile
pkgsrc/audio/ncspot: options.mk
pkgsrc/audio/ocp: Makefile
pkgsrc/chat/catgirl: Makefile
pkgsrc/chat/centerim5: Makefile
pkgsrc/chat/finch: Makefile
pkgsrc/chat/swirc: Makefile
pkgsrc/comms/qodem: Makefile
pkgsrc/comms/syncterm: Makefile
pkgsrc/databases/mariadb1011-client: Makefile.common
pkgsrc/databases/mariadb104-client: Makefile.common
pkgsrc/databases/mariadb105-client: Makefile.common
pkgsrc/databases/mariadb106-client: Makefile.common
pkgsrc/devel/git-branchless: Makefile
pkgsrc/devel/got: Makefile
pkgsrc/devel/libgnt: Makefile buildlink3.mk
pkgsrc/devel/p5-Curses: Makefile
pkgsrc/devel/tig: Makefile
pkgsrc/doc: TODO
pkgsrc/editors/dit: Makefile
pkgsrc/editors/kakoune: Makefile
pkgsrc/editors/mg: Makefile
pkgsrc/editors/sandy: Makefile
pkgsrc/editors/vile: options.mk
pkgsrc/games/angband: Makefile.common
pkgsrc/games/cataclysm-dda: Makefile
pkgsrc/games/minetest: Makefile
pkgsrc/games/netmaj: Makefile
pkgsrc/games/stone-soup: Makefile.common
pkgsrc/games/termatrix: Makefile
pkgsrc/mail/neomutt: options.mk
pkgsrc/math/sc-im: Makefile
pkgsrc/math/teapot: Makefile
pkgsrc/meta-pkgs/bulk-medium: Makefile
pkgsrc/misc/catpoint: Makefile
pkgsrc/misc/ipbt: Makefile
pkgsrc/misc/pinfo: Makefile
pkgsrc/mk: curses.buildlink3.mk
pkgsrc/net/asuka: Makefile
pkgsrc/net/ettercap: Makefile.common
pkgsrc/net/nanotodon: Makefile
pkgsrc/net/ncdc: Makefile
pkgsrc/net/ncgopher: Makefile
pkgsrc/news/neix: Makefile
pkgsrc/news/newsbeuter: Makefile
pkgsrc/news/newsraft: Makefile
pkgsrc/sysutils/clex: Makefile
pkgsrc/sysutils/htop: options.mk
pkgsrc/sysutils/lnav: Makefile
pkgsrc/sysutils/mc: options.mk
pkgsrc/sysutils/ncdu2: Makefile
pkgsrc/www/wiki-tui: Makefile
Log Message:
*: Switch packages to combined ncurses package.
CURSES_TYPE=ncursesw is no longer valid, update matches to use ncurses.
To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 pkgsrc/audio/cmus/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/cmus-legacy/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/audio/herrie/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/audio/ncmpcpp/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/audio/ncspot/options.mk
cvs rdiff -u -r1.26 -r1.27 pkgsrc/audio/ocp/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/chat/catgirl/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/chat/centerim5/Makefile
cvs rdiff -u -r1.92 -r1.93 pkgsrc/chat/finch/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/chat/swirc/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/comms/qodem/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/comms/syncterm/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/mariadb1011-client/Makefile.common
cvs rdiff -u -r1.18 -r1.19 pkgsrc/databases/mariadb104-client/Makefile.common
cvs rdiff -u -r1.26 -r1.27 pkgsrc/databases/mariadb105-client/Makefile.common
cvs rdiff -u -r1.22 -r1.23 pkgsrc/databases/mariadb106-client/Makefile.common
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/git-branchless/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/got/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/libgnt/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/libgnt/buildlink3.mk
cvs rdiff -u -r1.69 -r1.70 pkgsrc/devel/p5-Curses/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/tig/Makefile
cvs rdiff -u -r1.24422 -r1.24423 pkgsrc/doc/TODO
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/dit/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/editors/kakoune/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/editors/mg/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/editors/sandy/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/editors/vile/options.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/games/angband/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/games/cataclysm-dda/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/games/minetest/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/games/netmaj/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/games/stone-soup/Makefile.common
cvs rdiff -u -r1.5 -r1.6 pkgsrc/games/termatrix/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/mail/neomutt/options.mk
cvs rdiff -u -r1.44 -r1.45 pkgsrc/math/sc-im/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/math/teapot/Makefile
cvs rdiff -u -r1.110 -r1.111 pkgsrc/meta-pkgs/bulk-medium/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/catpoint/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/misc/ipbt/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/misc/pinfo/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/mk/curses.buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/asuka/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/ettercap/Makefile.common
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/nanotodon/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/net/ncdc/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/ncgopher/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/news/neix/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/news/newsbeuter/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/news/newsraft/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/clex/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/htop/options.mk
cvs rdiff -u -r1.30 -r1.31 pkgsrc/sysutils/lnav/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/sysutils/mc/options.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/ncdu2/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/wiki-tui/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/audio/cmus/Makefile
diff -u pkgsrc/audio/cmus/Makefile:1.113 pkgsrc/audio/cmus/Makefile:1.114
--- pkgsrc/audio/cmus/Makefile:1.113 Tue Jan 30 14:21:30 2024
+++ pkgsrc/audio/cmus/Makefile Mon May 6 08:27:48 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2024/01/30 14:21:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.114 2024/05/06 08:27:48 jperkin Exp $
DISTNAME= cmus-2.10.0
PKGREVISION= 7
@@ -49,5 +49,5 @@ PLIST.coreaudio= yes
.include "../../mk/atomic64.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/audio/cmus-legacy/Makefile
diff -u pkgsrc/audio/cmus-legacy/Makefile:1.1 pkgsrc/audio/cmus-legacy/Makefile:1.2
--- pkgsrc/audio/cmus-legacy/Makefile:1.1 Sat Mar 16 17:53:11 2024
+++ pkgsrc/audio/cmus-legacy/Makefile Mon May 6 08:27:48 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2024/03/16 17:53:11 nia Exp $
+# $NetBSD: Makefile,v 1.2 2024/05/06 08:27:48 jperkin Exp $
DISTNAME= cmus-2.7.1
CATEGORIES= audio
@@ -59,5 +59,5 @@ PLIST.libao= yes
.include "../../audio/flac/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/audio/herrie/Makefile
diff -u pkgsrc/audio/herrie/Makefile:1.55 pkgsrc/audio/herrie/Makefile:1.56
--- pkgsrc/audio/herrie/Makefile:1.55 Wed Nov 8 13:18:07 2023
+++ pkgsrc/audio/herrie/Makefile Mon May 6 08:27:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2023/11/08 13:18:07 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2024/05/06 08:27:49 jperkin Exp $
#
DISTNAME= herrie-2.2
@@ -35,7 +35,7 @@ FAKE_NCURSES= yes
.include "options.mk"
-.if ${CURSES_TYPE} != "ncursesw"
+.if ${CURSES_TYPE} != "ncurses"
CONFIGURE_ARGS+= ncurses
.endif
Index: pkgsrc/audio/ncmpcpp/Makefile
diff -u pkgsrc/audio/ncmpcpp/Makefile:1.22 pkgsrc/audio/ncmpcpp/Makefile:1.23
--- pkgsrc/audio/ncmpcpp/Makefile:1.22 Sun Jan 28 13:24:34 2024
+++ pkgsrc/audio/ncmpcpp/Makefile Mon May 6 08:27:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2024/01/28 13:24:34 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2024/05/06 08:27:49 jperkin Exp $
DISTNAME= ncmpcpp-0.9.2
PKGREVISION= 16
@@ -21,7 +21,7 @@ USE_CXX_FEATURES+= c++14
.include "../../mk/curses.buildlink3.mk"
-.if ${CURSES_TYPE} != "ncursesw"
+.if ${CURSES_TYPE} != "ncurses"
CONFIGURE_ENV+= ncursesw_CFLAGS="-I${BUILDLINK_PREFIX.curses}/include"
CONFIGURE_ENV+= ncursesw_LIBS="${BUILDLINK_LDADD.curses}"
.endif
Index: pkgsrc/audio/ncspot/options.mk
diff -u pkgsrc/audio/ncspot/options.mk:1.6 pkgsrc/audio/ncspot/options.mk:1.7
--- pkgsrc/audio/ncspot/options.mk:1.6 Thu Apr 6 13:22:01 2023
+++ pkgsrc/audio/ncspot/options.mk Mon May 6 08:27:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2023/04/06 13:22:01 pin Exp $
+# $NetBSD: options.mk,v 1.7 2024/05/06 08:27:49 jperkin Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.ncspot
PKG_OPTIONS_OPTIONAL_GROUPS= backend ui
@@ -35,8 +35,8 @@ CARGO_FEATURES+= rodio_backend
.if !empty(PKG_OPTIONS:Mncursesw)
USE_NCURSES= yes #NCURSES_MOUSE_VERSION
CARGO_FEATURES+= cursive/pancurses-backend
-RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.ncursesw}/lib
-.include "../../devel/ncursesw/buildlink3.mk"
+RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.ncurses}/lib
+.include "../../devel/ncurses/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mtermion)
Index: pkgsrc/audio/ocp/Makefile
diff -u pkgsrc/audio/ocp/Makefile:1.26 pkgsrc/audio/ocp/Makefile:1.27
--- pkgsrc/audio/ocp/Makefile:1.26 Thu Apr 18 08:44:11 2024
+++ pkgsrc/audio/ocp/Makefile Mon May 6 08:27:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2024/04/18 08:44:11 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2024/05/06 08:27:49 jperkin Exp $
DISTNAME= ocp-0.2.109
CATEGORIES= audio
@@ -44,7 +44,7 @@ CFLAGS.SunOS+= -mimpure-text
# curses_version(3) was introduced in NetBSD 10.0.
.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 100000
USE_NCURSES= yes
-. include "../../devel/ncursesw/buildlink3.mk"
+. include "../../devel/ncurses/buildlink3.mk"
.else
USE_CURSES= wide
FAKE_NCURSES= yes
Index: pkgsrc/chat/catgirl/Makefile
diff -u pkgsrc/chat/catgirl/Makefile:1.4 pkgsrc/chat/catgirl/Makefile:1.5
--- pkgsrc/chat/catgirl/Makefile:1.4 Mon Apr 15 14:09:02 2024
+++ pkgsrc/chat/catgirl/Makefile Mon May 6 08:27:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2024/04/15 14:09:02 ryoon Exp $
+# $NetBSD: Makefile,v 1.5 2024/05/06 08:27:49 jperkin Exp $
DISTNAME= catgirl-2.2
CATEGORIES= chat
@@ -24,6 +24,6 @@ SUBST_FILES.ssl+= configure
SUBST_SED.ssl+= -e "s,OPENSSL_BIN /usr/bin/openssl,OPENSSL_BIN ${SSLBASE}/bin/openssl,g"
SUBST_SED.ssl+= -e "s,OPENSSL_BIN /bin/openssl,OPENSSL_BIN ${SSLBASE}/bin/openssl,g"
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../security/libretls/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/chat/centerim5/Makefile
diff -u pkgsrc/chat/centerim5/Makefile:1.22 pkgsrc/chat/centerim5/Makefile:1.23
--- pkgsrc/chat/centerim5/Makefile:1.22 Wed Nov 8 13:18:14 2023
+++ pkgsrc/chat/centerim5/Makefile Mon May 6 08:27:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2023/11/08 13:18:14 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2024/05/06 08:27:49 jperkin Exp $
DISTNAME= centerim5-5.0.1
PKGREVISION= 17
@@ -39,6 +39,6 @@ pre-configure:
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libidn/buildlink3.mk"
.include "../../devel/libsigc++/buildlink3.mk"
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../chat/libpurple/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/chat/finch/Makefile
diff -u pkgsrc/chat/finch/Makefile:1.92 pkgsrc/chat/finch/Makefile:1.93
--- pkgsrc/chat/finch/Makefile:1.92 Wed Nov 8 13:18:14 2023
+++ pkgsrc/chat/finch/Makefile Mon May 6 08:27:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2023/11/08 13:18:14 wiz Exp $
+# $NetBSD: Makefile,v 1.93 2024/05/06 08:27:49 jperkin Exp $
PKGNAME= finch-${PIDGIN_VERSION}
PKGREVISION= 3
@@ -46,6 +46,6 @@ BUILDLINK_API_DEPENDS.libpurple+= libpur
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libidn/buildlink3.mk"
.include "../../devel/libgnt/buildlink3.mk"
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/chat/swirc/Makefile
diff -u pkgsrc/chat/swirc/Makefile:1.25 pkgsrc/chat/swirc/Makefile:1.26
--- pkgsrc/chat/swirc/Makefile:1.25 Wed Nov 8 13:18:18 2023
+++ pkgsrc/chat/swirc/Makefile Mon May 6 08:27:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2023/11/08 13:18:18 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2024/05/06 08:27:49 jperkin Exp $
DISTNAME= swirc-3.4.6
PKGREVISION= 1
@@ -23,7 +23,7 @@ MAKE_FLAGS+= DEST_CONFMAN=${DESTDIR}${PR
.include "../../devel/libidn/buildlink3.mk"
# Relies on ncurses struct internals - cannot use NetBSD libcurses.
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/comms/qodem/Makefile
diff -u pkgsrc/comms/qodem/Makefile:1.6 pkgsrc/comms/qodem/Makefile:1.7
--- pkgsrc/comms/qodem/Makefile:1.6 Mon Jun 27 15:29:14 2022
+++ pkgsrc/comms/qodem/Makefile Mon May 6 08:27:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/06/27 15:29:14 fcambus Exp $
+# $NetBSD: Makefile,v 1.7 2024/05/06 08:27:50 jperkin Exp $
DISTNAME= qodem-1.0.1
CATEGORIES= comms
@@ -13,5 +13,5 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-gpm --disable-sdl --disable-upnp
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/comms/syncterm/Makefile
diff -u pkgsrc/comms/syncterm/Makefile:1.8 pkgsrc/comms/syncterm/Makefile:1.9
--- pkgsrc/comms/syncterm/Makefile:1.8 Sat Apr 6 08:04:56 2024
+++ pkgsrc/comms/syncterm/Makefile Mon May 6 08:27:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2024/04/06 08:04:56 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2024/05/06 08:27:50 jperkin Exp $
DISTNAME= syncterm-1.1-src
PKGNAME= ${DISTNAME:S/-src//}
@@ -26,7 +26,7 @@ MAKE_FLAGS+= SYSTEM_LIST_DIR=${PKG_SYSCO
MAKE_FLAGS+= WITHOUT_CRYPTLIB=1
# incompatible with NetBSD curses - tries to access within cchar_t
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/SDL2/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
Index: pkgsrc/databases/mariadb1011-client/Makefile.common
diff -u pkgsrc/databases/mariadb1011-client/Makefile.common:1.6 pkgsrc/databases/mariadb1011-client/Makefile.common:1.7
--- pkgsrc/databases/mariadb1011-client/Makefile.common:1.6 Wed Apr 10 19:24:05 2024
+++ pkgsrc/databases/mariadb1011-client/Makefile.common Mon May 6 08:27:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2024/04/10 19:24:05 nia Exp $
+# $NetBSD: Makefile.common,v 1.7 2024/05/06 08:27:50 jperkin Exp $
#
# used by databases/mariadb1011-client/Makefile
# used by databases/mariadb1011-server/Makefile
@@ -90,11 +90,8 @@ CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
.if !empty(CURSES_TYPE:M*ncurses*)
CMAKE_ARGS+= -DCURSES_NEED_NCURSES=ON
-CPPFLAGS+= -DHAVE_CURSES_H
-.endif
-
-.if !empty(CURSES_TYPE:M*ncursesw*)
CMAKE_ARGS+= -DCURSES_NEED_WIDE=ON
+CPPFLAGS+= -DHAVE_CURSES_H
.endif
# We don't clone MariaDB from git, so avoid peeking into
Index: pkgsrc/databases/mariadb104-client/Makefile.common
diff -u pkgsrc/databases/mariadb104-client/Makefile.common:1.18 pkgsrc/databases/mariadb104-client/Makefile.common:1.19
--- pkgsrc/databases/mariadb104-client/Makefile.common:1.18 Thu Aug 17 08:20:27 2023
+++ pkgsrc/databases/mariadb104-client/Makefile.common Mon May 6 08:27:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2023/08/17 08:20:27 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.19 2024/05/06 08:27:50 jperkin Exp $
#
# used by databases/mariadb104-client/Makefile
# used by databases/mariadb104-server/Makefile
@@ -91,11 +91,8 @@ CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
.if !empty(CURSES_TYPE:M*ncurses*)
CMAKE_ARGS+= -DCURSES_NEED_NCURSES=ON
-CPPFLAGS+= -DHAVE_CURSES_H
-.endif
-
-.if !empty(CURSES_TYPE:M*ncursesw*)
CMAKE_ARGS+= -DCURSES_NEED_WIDE=ON
+CPPFLAGS+= -DHAVE_CURSES_H
.endif
CFLAGS.SunOS+= -fPIC
Index: pkgsrc/databases/mariadb105-client/Makefile.common
diff -u pkgsrc/databases/mariadb105-client/Makefile.common:1.26 pkgsrc/databases/mariadb105-client/Makefile.common:1.27
--- pkgsrc/databases/mariadb105-client/Makefile.common:1.26 Wed Apr 10 19:21:45 2024
+++ pkgsrc/databases/mariadb105-client/Makefile.common Mon May 6 08:27:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2024/04/10 19:21:45 nia Exp $
+# $NetBSD: Makefile.common,v 1.27 2024/05/06 08:27:50 jperkin Exp $
#
# used by databases/mariadb105-client/Makefile
# used by databases/mariadb105-server/Makefile
@@ -90,11 +90,8 @@ CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
.if !empty(CURSES_TYPE:M*ncurses*)
CMAKE_ARGS+= -DCURSES_NEED_NCURSES=ON
-CPPFLAGS+= -DHAVE_CURSES_H
-.endif
-
-.if !empty(CURSES_TYPE:M*ncursesw*)
CMAKE_ARGS+= -DCURSES_NEED_WIDE=ON
+CPPFLAGS+= -DHAVE_CURSES_H
.endif
CFLAGS.SunOS+= -fPIC
Index: pkgsrc/databases/mariadb106-client/Makefile.common
diff -u pkgsrc/databases/mariadb106-client/Makefile.common:1.22 pkgsrc/databases/mariadb106-client/Makefile.common:1.23
--- pkgsrc/databases/mariadb106-client/Makefile.common:1.22 Wed Apr 10 19:22:38 2024
+++ pkgsrc/databases/mariadb106-client/Makefile.common Mon May 6 08:27:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2024/04/10 19:22:38 nia Exp $
+# $NetBSD: Makefile.common,v 1.23 2024/05/06 08:27:50 jperkin Exp $
#
# used by databases/mariadb106-client/Makefile
# used by databases/mariadb106-server/Makefile
@@ -88,11 +88,8 @@ CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
.if !empty(CURSES_TYPE:M*ncurses*)
CMAKE_ARGS+= -DCURSES_NEED_NCURSES=ON
-CPPFLAGS+= -DHAVE_CURSES_H
-.endif
-
-.if !empty(CURSES_TYPE:M*ncursesw*)
CMAKE_ARGS+= -DCURSES_NEED_WIDE=ON
+CPPFLAGS+= -DHAVE_CURSES_H
.endif
# https://github.com/MariaDB/server/pull/2326
Index: pkgsrc/devel/git-branchless/Makefile
diff -u pkgsrc/devel/git-branchless/Makefile:1.7 pkgsrc/devel/git-branchless/Makefile:1.8
--- pkgsrc/devel/git-branchless/Makefile:1.7 Wed Nov 8 13:18:44 2023
+++ pkgsrc/devel/git-branchless/Makefile Mon May 6 08:27:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2023/11/08 13:18:44 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2024/05/06 08:27:50 jperkin Exp $
DISTNAME= git-branchless-0.8.0
PKGREVISION= 3
@@ -18,7 +18,7 @@ USE_NCURSES= yes #NCURSES_MOUSE_VERSION
INSTALLATION_DIRS= bin
-RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.ncursesw}/lib
+RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.ncurses}/lib
RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.sqlite3}/lib
post-patch:
@@ -30,6 +30,6 @@ do-install:
.include "../../lang/rust/cargo.mk"
.include "../../security/openssl/buildlink3.mk"
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/got/Makefile
diff -u pkgsrc/devel/got/Makefile:1.5 pkgsrc/devel/got/Makefile:1.6
--- pkgsrc/devel/got/Makefile:1.5 Sun Mar 17 11:38:48 2024
+++ pkgsrc/devel/got/Makefile Mon May 6 08:27:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2024/03/17 11:38:48 vins Exp $
+# $NetBSD: Makefile,v 1.6 2024/05/06 08:27:50 jperkin Exp $
DISTNAME= got-portable-0.97
PKGNAME= ${DISTNAME:S/-portable//}
@@ -85,7 +85,7 @@ BUILDLINK_API_DEPENDS.openssl+= openss
.include "../../security/openssl/buildlink3.mk"
# required for set_panel_userptr(3) and waddwstr(3).
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
# compatibility macros and functions for Linux.
.if ${OPSYS} == "Linux"
Index: pkgsrc/devel/libgnt/Makefile
diff -u pkgsrc/devel/libgnt/Makefile:1.11 pkgsrc/devel/libgnt/Makefile:1.12
--- pkgsrc/devel/libgnt/Makefile:1.11 Wed Apr 3 21:36:16 2024
+++ pkgsrc/devel/libgnt/Makefile Mon May 6 08:27:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2024/04/03 21:36:16 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2024/05/06 08:27:51 jperkin Exp $
DISTNAME= libgnt-2.14.0
PKGREVISION= 9
@@ -28,6 +28,6 @@ PKGCONFIG_OVERRIDE+= output/meson-priva
.include "../../devel/meson/build.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/libgnt/buildlink3.mk
diff -u pkgsrc/devel/libgnt/buildlink3.mk:1.8 pkgsrc/devel/libgnt/buildlink3.mk:1.9
--- pkgsrc/devel/libgnt/buildlink3.mk:1.8 Wed Nov 8 13:18:54 2023
+++ pkgsrc/devel/libgnt/buildlink3.mk Mon May 6 08:27:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2023/11/08 13:18:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2024/05/06 08:27:51 jperkin Exp $
BUILDLINK_TREE+= libgnt
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.libgnt?= libgnt>=2
BUILDLINK_PKGSRCDIR.libgnt?= ../../devel/libgnt
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.endif # LIBGNT_BUILDLINK3_MK
Index: pkgsrc/devel/p5-Curses/Makefile
diff -u pkgsrc/devel/p5-Curses/Makefile:1.69 pkgsrc/devel/p5-Curses/Makefile:1.70
--- pkgsrc/devel/p5-Curses/Makefile:1.69 Sat Dec 16 10:16:48 2023
+++ pkgsrc/devel/p5-Curses/Makefile Mon May 6 08:27:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2023/12/16 10:16:48 mef Exp $
+# $NetBSD: Makefile,v 1.70 2024/05/06 08:27:51 jperkin Exp $
DISTNAME= Curses-1.44
PKGNAME= p5-${DISTNAME}
@@ -26,7 +26,7 @@ SUBST_MESSAGE.h_form= Hard wiring form.h
SUBST_FILES.h_form= c-config.h
SUBST_SED.h_form= -e 's,<form.h>,"/usr/include/form.h",g'
-.elif ${CURSES_TYPE} == "ncurses" || ${CURSES_TYPE} == "ncursesw"
+.elif ${CURSES_TYPE} == "ncurses"
MAKE_PARAMS+= PANELS
# Don't link to system termcap as we're using ncurses
BUILDLINK_TRANSFORM+= rm:-ltermcap
@@ -45,8 +45,6 @@ CURSES_LIBTYPE= bsd
. endif
.elif ${CURSES_TYPE} == "ncurses"
CURSES_LIBTYPE= ncurses
-.elif ${CURSES_TYPE} == "ncursesw"
-CURSES_LIBTYPE= ncursesw
.endif
.if defined(CURSES_LIBTYPE)
Index: pkgsrc/devel/tig/Makefile
diff -u pkgsrc/devel/tig/Makefile:1.26 pkgsrc/devel/tig/Makefile:1.27
--- pkgsrc/devel/tig/Makefile:1.26 Wed Feb 8 07:43:41 2023
+++ pkgsrc/devel/tig/Makefile Mon May 6 08:27:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2023/02/08 07:43:41 fcambus Exp $
+# $NetBSD: Makefile,v 1.27 2024/05/06 08:27:51 jperkin Exp $
DISTNAME= tig-2.5.8
CATEGORIES= devel scm
@@ -49,6 +49,6 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/tigrc ${DESTDIR}/${EGDIR}
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/doc/TODO
diff -u pkgsrc/doc/TODO:1.24422 pkgsrc/doc/TODO:1.24423
--- pkgsrc/doc/TODO:1.24422 Mon May 6 06:53:02 2024
+++ pkgsrc/doc/TODO Mon May 6 08:27:51 2024
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.24422 2024/05/06 06:53:02 wiz Exp $
+$NetBSD: TODO,v 1.24423 2024/05/06 08:27:51 jperkin Exp $
Suggested new packages
======================
@@ -1529,8 +1529,7 @@ Suggested cleanups in pkgsrc
sysutils/mtoolsfm, sysutils/xnc
o Convert packages to use mk/curses.buildlink3.mk instead of
- devel/ncurses/buildlink3.mk and devel/ncursesw/buildlink3.mk,
- test with NetBSD curses.
+ devel/ncurses/buildlink3.mk, test with NetBSD curses.
o Convert packages to use OPSYS_VERSION and numeric comparisons
instead of OS_VERSION and string-based comparisons.
Index: pkgsrc/editors/dit/Makefile
diff -u pkgsrc/editors/dit/Makefile:1.2 pkgsrc/editors/dit/Makefile:1.3
--- pkgsrc/editors/dit/Makefile:1.2 Wed Jan 27 11:31:18 2021
+++ pkgsrc/editors/dit/Makefile Mon May 6 08:27:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/01/27 11:31:18 nia Exp $
+# $NetBSD: Makefile,v 1.3 2024/05/06 08:27:51 jperkin Exp $
DISTNAME= dit-0.7
CATEGORIES= editors
@@ -19,7 +19,7 @@ LUA_VERSIONS_ACCEPTED= 53 52 51
# when compiling with NetBSD curses:
# error: 'cchar_t' {aka 'struct <anonymous>'} has no member named 'chars'
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../lang/lua/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/editors/kakoune/Makefile
diff -u pkgsrc/editors/kakoune/Makefile:1.6 pkgsrc/editors/kakoune/Makefile:1.7
--- pkgsrc/editors/kakoune/Makefile:1.6 Tue Jul 18 14:13:23 2023
+++ pkgsrc/editors/kakoune/Makefile Mon May 6 08:27:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2023/07/18 14:13:23 nia Exp $
+# $NetBSD: Makefile,v 1.7 2024/05/06 08:27:52 jperkin Exp $
DISTNAME= kakoune-2020.01.16
CATEGORIES= editors
@@ -23,5 +23,5 @@ MAKE_FLAGS+= gzip_man=no
LDFLAGS.SunOS+= -lsocket -lnsl
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/editors/mg/Makefile
diff -u pkgsrc/editors/mg/Makefile:1.18 pkgsrc/editors/mg/Makefile:1.19
--- pkgsrc/editors/mg/Makefile:1.18 Thu Dec 7 23:57:25 2023
+++ pkgsrc/editors/mg/Makefile Mon May 6 08:27:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2023/12/07 23:57:25 tnn Exp $
+# $NetBSD: Makefile,v 1.19 2024/05/06 08:27:52 jperkin Exp $
DISTNAME= mg-20230501
PKGREVISION= 1
@@ -44,5 +44,5 @@ pre-install:
.if ${OPSYS} == "Linux"
.include "../../devel/libbsd/buildlink3.mk"
.endif
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/editors/sandy/Makefile
diff -u pkgsrc/editors/sandy/Makefile:1.9 pkgsrc/editors/sandy/Makefile:1.10
--- pkgsrc/editors/sandy/Makefile:1.9 Sat Jun 8 10:40:57 2019
+++ pkgsrc/editors/sandy/Makefile Mon May 6 08:27:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/06/08 10:40:57 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2024/05/06 08:27:52 jperkin Exp $
DISTNAME= sandy-0.4
PKGREVISION= 2
@@ -15,9 +15,9 @@ SUBST_STAGE.fix-paths= pre-configure
SUBST_MESSAGE.fix-paths= Fixing absolute paths.
SUBST_FILES.fix-paths= config.mk
SUBST_SED.fix-paths= -e 's,/usr/local,${PREFIX},g'
-SUBST_SED.fix-paths+= -e 's,/usr/include,${BUILDLINK_PREFIX.ncursesw}/include,g'
-SUBST_SED.fix-paths+= -e 's,/usr/lib,${BUILDLINK_PREFIX.ncursesw}/lib -Wl\,-R${BUILDLINK_PREFIX.ncursesw}/lib,g'
+SUBST_SED.fix-paths+= -e 's,/usr/include,${BUILDLINK_PREFIX.ncurses}/include,g'
+SUBST_SED.fix-paths+= -e 's,/usr/lib,${BUILDLINK_PREFIX.ncurses}/lib -Wl\,-R${BUILDLINK_PREFIX.ncurses}/lib,g'
SUBST_SED.fix-paths+= -e 's,share/man,${PKGMANDIR},g'
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/editors/vile/options.mk
diff -u pkgsrc/editors/vile/options.mk:1.3 pkgsrc/editors/vile/options.mk:1.4
--- pkgsrc/editors/vile/options.mk:1.3 Fri Jul 20 14:38:51 2012
+++ pkgsrc/editors/vile/options.mk Mon May 6 08:27:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2012/07/20 14:38:51 marino Exp $
+# $NetBSD: options.mk,v 1.4 2024/05/06 08:27:52 jperkin Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.vile
PKG_SUPPORTED_OPTIONS= wide-curses
@@ -9,7 +9,7 @@ PKG_SUPPORTED_OPTIONS= wide-curses
### Wide curses support; otherwise, default to using narrow curses.
###
.if !empty(PKG_OPTIONS:Mwide-curses)
-. include "../../devel/ncursesw/buildlink3.mk"
+. include "../../devel/ncurses/buildlink3.mk"
CONFIGURE_ARGS+= --with-screen=ncursesw
.else
. include "../../mk/curses.buildlink3.mk"
Index: pkgsrc/games/angband/Makefile.common
diff -u pkgsrc/games/angband/Makefile.common:1.6 pkgsrc/games/angband/Makefile.common:1.7
--- pkgsrc/games/angband/Makefile.common:1.6 Wed Nov 22 11:19:36 2023
+++ pkgsrc/games/angband/Makefile.common Mon May 6 08:27:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2023/11/22 11:19:36 nia Exp $
+# $NetBSD: Makefile.common,v 1.7 2024/05/06 08:27:52 jperkin Exp $
# used by games/angband-sdl/Makefile
# used by games/angband/Makefile
@@ -39,4 +39,4 @@ SUBST_SED.nc+= -e 's|ncursesw5|ncursesw
pre-configure:
cd ${WRKSRC} && ./autogen.sh
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
Index: pkgsrc/games/cataclysm-dda/Makefile
diff -u pkgsrc/games/cataclysm-dda/Makefile:1.3 pkgsrc/games/cataclysm-dda/Makefile:1.4
--- pkgsrc/games/cataclysm-dda/Makefile:1.3 Thu Apr 30 14:57:30 2020
+++ pkgsrc/games/cataclysm-dda/Makefile Mon May 6 08:27:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/04/30 14:57:30 nia Exp $
+# $NetBSD: Makefile,v 1.4 2024/05/06 08:27:52 jperkin Exp $
.include "Makefile.common"
@@ -25,5 +25,5 @@ do-install:
${DESTDIR}${PREFIX}/share/cataclysm-dda
cd ${WRKSRC} && LOCALE_DIR=${DESTDIR}${PREFIX}/share/locale ${SH} lang/compile_mo.sh
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/games/minetest/Makefile
diff -u pkgsrc/games/minetest/Makefile:1.32 pkgsrc/games/minetest/Makefile:1.33
--- pkgsrc/games/minetest/Makefile:1.32 Tue Jan 2 14:18:07 2024
+++ pkgsrc/games/minetest/Makefile Mon May 6 08:27:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2024/01/02 14:18:07 gdt Exp $
+# $NetBSD: Makefile,v 1.33 2024/05/06 08:27:52 jperkin Exp $
PKGNAME= minetest-5.8.0
CATEGORIES= games
@@ -61,7 +61,7 @@ post-extract:
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/gmp/buildlink3.mk"
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../archivers/zstd/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
Index: pkgsrc/games/netmaj/Makefile
diff -u pkgsrc/games/netmaj/Makefile:1.30 pkgsrc/games/netmaj/Makefile:1.31
--- pkgsrc/games/netmaj/Makefile:1.30 Tue Jun 28 11:33:56 2022
+++ pkgsrc/games/netmaj/Makefile Mon May 6 08:27:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2022/06/28 11:33:56 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2024/05/06 08:27:53 jperkin Exp $
#
DISTNAME= netmaj-2.0.7
@@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/netmaj
USE_TOOLS+= perl:run
HAS_CONFIGURE= yes
CONFIGURE_ENV+= OPSYS=${OPSYS}
-CONFIGURE_ENV+= CURSES_LIBS=${BUILDLINK_LDADD.ncursesw:Q}
+CONFIGURE_ENV+= CURSES_LIBS=${BUILDLINK_LDADD.ncurses:Q}
INSTALL_MAKE_FLAGS+= PERL=${PERL5:Q}
INSTALL_TARGET= install install-pf
@@ -29,5 +29,5 @@ post-install:
${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/html/* ${DESTDIR}${DOCDIR}
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/games/stone-soup/Makefile.common
diff -u pkgsrc/games/stone-soup/Makefile.common:1.14 pkgsrc/games/stone-soup/Makefile.common:1.15
--- pkgsrc/games/stone-soup/Makefile.common:1.14 Tue Jul 18 18:13:44 2023
+++ pkgsrc/games/stone-soup/Makefile.common Mon May 6 08:27:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2023/07/18 18:13:44 nia Exp $
+# $NetBSD: Makefile.common,v 1.15 2024/05/06 08:27:53 jperkin Exp $
# used by games/stone-soup/Makefile
# used by games/stone-soup-sdl/Makefile
@@ -19,7 +19,7 @@ USE_TOOLS+= pkg-config gmake perl
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
-CXXFLAGS+= -DCURSES_INCLUDE_FILE='<ncursesw/ncurses.h>'
+CXXFLAGS+= -DCURSES_INCLUDE_FILE='<ncurses/ncurses.h>'
MAKE_FLAGS+= prefix=${PREFIX}
MAKE_FLAGS+= SAVEDIR='~/.crawl'
@@ -60,7 +60,7 @@ pre-build:
.include "../../databases/sqlite3/buildlink3.mk"
# FIXME: Compatibility issue with NetBSD curses
# https://github.com/crawl/crawl/issues/1661
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../lang/lua/buildlink3.mk"
.include "../../lang/python/tool.mk"
Index: pkgsrc/games/termatrix/Makefile
diff -u pkgsrc/games/termatrix/Makefile:1.5 pkgsrc/games/termatrix/Makefile:1.6
--- pkgsrc/games/termatrix/Makefile:1.5 Tue Sep 27 07:44:28 2022
+++ pkgsrc/games/termatrix/Makefile Mon May 6 08:27:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/09/27 07:44:28 pin Exp $
+# $NetBSD: Makefile,v 1.6 2024/05/06 08:27:53 jperkin Exp $
DISTNAME= termatrix-2.2.0
CATEGORIES= games
@@ -16,12 +16,12 @@ USE_TOOLS+= pkg-config
INSTALLATION_DIRS= bin
-RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.ncursesw}/lib
+RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.ncurses}/lib
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/target/release/termatrix \
${DESTDIR}${PREFIX}/bin
.include "../../lang/rust/cargo.mk"
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/mail/neomutt/options.mk
diff -u pkgsrc/mail/neomutt/options.mk:1.21 pkgsrc/mail/neomutt/options.mk:1.22
--- pkgsrc/mail/neomutt/options.mk:1.21 Sat Nov 4 00:21:04 2023
+++ pkgsrc/mail/neomutt/options.mk Mon May 6 08:27:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.21 2023/11/04 00:21:04 wiz Exp $
+# $NetBSD: options.mk,v 1.22 2024/05/06 08:27:53 jperkin Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.neomutt
PKG_OPTIONS_REQUIRED_GROUPS= display
@@ -52,7 +52,7 @@ LDFLAGS.SunOS+= ${COMPILER_RPATH_FLAG}
### ncursesw
###
.if !empty(PKG_OPTIONS:Mncursesw)
-. include "../../devel/ncursesw/buildlink3.mk"
+. include "../../devel/ncurses/buildlink3.mk"
.else
SUBST_CLASSES+= curse
SUBST_MESSAGE.curse= Fixing mutt to avoid ncursesw
Index: pkgsrc/math/sc-im/Makefile
diff -u pkgsrc/math/sc-im/Makefile:1.44 pkgsrc/math/sc-im/Makefile:1.45
--- pkgsrc/math/sc-im/Makefile:1.44 Wed Nov 8 13:20:03 2023
+++ pkgsrc/math/sc-im/Makefile Mon May 6 08:27:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2023/11/08 13:20:03 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2024/05/06 08:27:53 jperkin Exp $
DISTNAME= sc-im-0.8.3
PKGREVISION= 2
@@ -29,8 +29,8 @@ CFLAGS+= -DGNUPLOT
# needed for PATH_MAX due to std=c99 set above (at least on Illumos)
CFLAGS+= -D_XOPEN_SOURCE
-MAKE_ENV+= CFLAGS_CURSES=${BUILDLINK_CFLAGS.ncursesw:Q}
-MAKE_ENV+= LDLIBS_CURSES=${BUILDLINK_LDADD.ncursesw:Q}
+MAKE_ENV+= CFLAGS_CURSES=${BUILDLINK_CFLAGS.ncurses:Q}
+MAKE_ENV+= LDLIBS_CURSES=${BUILDLINK_LDADD.ncurses:Q}
MAKE_ENV+= CFLAGS_DL=${BUILDLINK_CFLAGS.dl:Q}
MAKE_ENV+= LDLIBS_DL=${BUILDLINK_LDADD.dl:Q}
MAKE_ENV+= LDLIBS=${LDLIBS:Q}
@@ -38,11 +38,8 @@ MAKE_ENV+= LDLIBS=${LDLIBS:Q}
MAKE_FLAGS+= prefix=${PREFIX}
MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}/man1
-.include "../../devel/ncursesw/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
-
-# Include after ncursesw bl3, otherwise ncurses bl3 (non-wide), included
-# as a transitive dependency of lua, sabotages the -lncurses transform.
.include "options.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/math/teapot/Makefile
diff -u pkgsrc/math/teapot/Makefile:1.8 pkgsrc/math/teapot/Makefile:1.9
--- pkgsrc/math/teapot/Makefile:1.8 Sun Jan 26 17:31:41 2020
+++ pkgsrc/math/teapot/Makefile Mon May 6 08:27:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/01/26 17:31:41 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2024/05/06 08:27:53 jperkin Exp $
DISTNAME= teapot-2.3.0
PKGREVISION= 2
@@ -17,5 +17,5 @@ CMAKE_ARGS+= -DENABLE_HELP=NO
CFLAGS.SunOS+= -D__EXTENSIONS__
LDFLAGS.SunOS+= -lnsl
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/meta-pkgs/bulk-medium/Makefile
diff -u pkgsrc/meta-pkgs/bulk-medium/Makefile:1.110 pkgsrc/meta-pkgs/bulk-medium/Makefile:1.111
--- pkgsrc/meta-pkgs/bulk-medium/Makefile:1.110 Tue Feb 27 14:25:07 2024
+++ pkgsrc/meta-pkgs/bulk-medium/Makefile Mon May 6 08:27:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2024/02/27 14:25:07 taca Exp $
+# $NetBSD: Makefile,v 1.111 2024/05/06 08:27:53 jperkin Exp $
DISTNAME= bulk-medium-20240227
CATEGORIES= meta-pkgs
@@ -162,7 +162,6 @@ DEPENDS+= libidn2-[0-9]*:../../devel/lib
DEPENDS+= libltdl-[0-9]*:../../devel/libltdl
DEPENDS+= libusb1-[0-9]*:../../devel/libusb1
DEPENDS+= ncurses-[0-9]*:../../devel/ncurses
-DEPENDS+= ncursesw-[0-9]*:../../devel/ncursesw
DEPENDS+= pango-[0-9]*:../../devel/pango
DEPENDS+= pcre-[0-9]*:../../devel/pcre
DEPENDS+= popt-[0-9]*:../../devel/popt
Index: pkgsrc/misc/catpoint/Makefile
diff -u pkgsrc/misc/catpoint/Makefile:1.1 pkgsrc/misc/catpoint/Makefile:1.2
--- pkgsrc/misc/catpoint/Makefile:1.1 Sat Feb 27 21:09:40 2021
+++ pkgsrc/misc/catpoint/Makefile Mon May 6 08:27:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/02/27 21:09:40 leot Exp $
+# $NetBSD: Makefile,v 1.2 2024/05/06 08:27:53 jperkin Exp $
DISTNAME= catpoint-v0.2
PKGNAME= ${DISTNAME:S/-v/-/}
@@ -14,8 +14,6 @@ LICENSE= gnu-gpl-v3
MAKE_FLAGS+= PREFIX=${PREFIX}
MAKE_FLAGS+= MANPREFIX=${PREFIX}/${PKGMANDIR}
-BUILDLINK_TRANSFORM+= l:ncursesw:${BUILDLINK_LIBNAME.curses}
-
USE_LANGUAGES= c99
.include "../../mk/curses.buildlink3.mk"
Index: pkgsrc/misc/ipbt/Makefile
diff -u pkgsrc/misc/ipbt/Makefile:1.17 pkgsrc/misc/ipbt/Makefile:1.18
--- pkgsrc/misc/ipbt/Makefile:1.17 Tue Jun 28 11:34:47 2022
+++ pkgsrc/misc/ipbt/Makefile Mon May 6 08:27:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2022/06/28 11:34:47 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2024/05/06 08:27:54 jperkin Exp $
#
DISTNAME= ipbt-r8765
@@ -22,13 +22,6 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
BUILD_TARGET= ipbt
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-# NetBSD's curses do not work
-USE_BUILTIN.ncursesw= no
-.endif
-
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/ipbt ${DESTDIR}${PREFIX}/bin/ipbt
${INSTALL_MAN} ${WRKSRC}/ipbt.1 \
@@ -36,5 +29,5 @@ do-install:
${INSTALL_SCRIPT} ${WRKSRC}/ttydump ${DESTDIR}${PREFIX}/bin/ttydump
${INSTALL_SCRIPT} ${WRKSRC}/ttygrep ${DESTDIR}${PREFIX}/bin/ttygrep
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/misc/pinfo/Makefile
diff -u pkgsrc/misc/pinfo/Makefile:1.39 pkgsrc/misc/pinfo/Makefile:1.40
--- pkgsrc/misc/pinfo/Makefile:1.39 Wed Jan 4 21:17:56 2017
+++ pkgsrc/misc/pinfo/Makefile Mon May 6 08:27:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2017/01/04 21:17:56 roy Exp $
+# $NetBSD: Makefile,v 1.40 2024/05/06 08:27:54 jperkin Exp $
#
DISTNAME= pinfo-0.6.1
@@ -27,7 +27,7 @@ INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} syscon
.include "../../mk/curses.buildlink3.mk"
.if ${CURSES_TYPE} == "curses"
CONFIGURE_ARGS+= --with-vcurses
-.elif ${CURSES_TYPE} == "ncurses" || ${CURSES_TYPE} == "ncursesw"
+.elif ${CURSES_TYPE} == "ncurses"
CONFIGURE_ARGS+= --with-ncurses=${BUILDLINK_PREFIX.curses}
.endif
Index: pkgsrc/mk/curses.buildlink3.mk
diff -u pkgsrc/mk/curses.buildlink3.mk:1.32 pkgsrc/mk/curses.buildlink3.mk:1.33
--- pkgsrc/mk/curses.buildlink3.mk:1.32 Thu Sep 28 18:40:53 2023
+++ pkgsrc/mk/curses.buildlink3.mk Mon May 6 08:27:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: curses.buildlink3.mk,v 1.32 2023/09/28 18:40:53 rillig Exp $
+# $NetBSD: curses.buildlink3.mk,v 1.33 2024/05/06 08:27:54 jperkin Exp $
#
# This Makefile fragment is meant to be included by packages that require
# any curses implementation instead of one particular one. The available
@@ -16,7 +16,7 @@
# system. Setting this to "curses" means that the system curses
# implementation is fine.
#
-# Possible: curses, ncurses, ncursesw, pdcurses
+# Possible: curses, ncurses, pdcurses
# Default: (depends)
#
# Package-settable variables:
@@ -31,10 +31,10 @@
# Default: (unset)
#
# FAKE_NCURSES
-# Some packages look exclusively for ncurses or ncursesw,
-# headers and libraries. This really is an error with the package,
-# but patching it can be both challenging and cumbersome.
-# Set this to YES to transform these to system curses.
+# Some packages look exclusively for ncurses headers and libraries.
+# This really is an error with the package, but patching it can be
+# both challenging and cumbersome. Set this to YES to transform
+# these to system curses.
#
# Possible: YES, NO
# Default: NO
@@ -64,7 +64,7 @@ USE_CURSES?= wide
# _CURSES_PKGS is an exhaustive list of all of the curses implementations
# that may be used with curses.buildlink3.mk.
#
-_CURSES_PKGS?= curses ncurses ncursesw pdcurses
+_CURSES_PKGS?= curses ncurses pdcurses
CHECK_BUILTIN.curses:= yes
. include "curses.builtin.mk"
@@ -75,8 +75,6 @@ CHECK_BUILTIN.curses:= no
#
.if defined(USE_BUILTIN.curses) && !empty(USE_BUILTIN.curses:M[yY][eE][sS])
CURSES_DEFAULT?= curses
-.elif !empty(USE_CURSES:U:Mwide) || !empty(PKG_OPTIONS:U:Mwide-curses)
-CURSES_DEFAULT?= ncursesw
.else
CURSES_DEFAULT?= ncurses
.endif
@@ -89,7 +87,6 @@ _CURSES_ACCEPTED+= curses # system curs
_CURSES_ACCEPTED+= curses # system curses exists
.endif
_CURSES_ACCEPTED+= ncurses # pkgsrc ncurses
-_CURSES_ACCEPTED+= ncursesw # pkgsrc ncursesw
_CURSES_ACCEPTED+= pdcurses # pkgsrc pdcurses
_CURSES_TYPE= ${CURSES_DEFAULT}
@@ -132,10 +129,7 @@ BUILDLINK_LDADD.curses?= ${BUILDLINK_LIB
BUILDLINK_BUILTIN_MK.curses= ../../mk/curses.builtin.mk
.else
. if ${CURSES_TYPE} == "ncurses"
-USE_NCURSES= yes
. include "../devel/ncurses/buildlink3.mk"
-. elif ${CURSES_TYPE} == "ncursesw"
-. include "../devel/ncursesw/buildlink3.mk"
. elif ${CURSES_TYPE} == "pdcurses"
. include "../devel/pdcurses/buildlink3.mk"
. endif
@@ -151,17 +145,15 @@ ${var}.curses= ${${var}.${CURSES_TYPE}
# around the short-coming.
.if defined(FAKE_NCURSES) && !empty(FAKE_NCURSES:M[yY][eE][sS])
. if ${CURSES_TYPE} != "ncurses"
-. if ${CURSES_TYPE} != "ncursesw"
BUILDLINK_TARGETS+= buildlink-curses-ncurses-h
BUILDLINK_TRANSFORM+= l:ncursesw:${BUILDLINK_LIBNAME.curses}
-. endif
BUILDLINK_TRANSFORM+= l:ncurses:${BUILDLINK_LIBNAME.curses}
. endif
.endif
_VARGROUPS+= curses
_USER_VARS.curses= CURSES_DEFAULT
-_PKG_VARS.curses= FAKE_NCURSES USE_CURSES USE_NCURSES
+_PKG_VARS.curses= FAKE_NCURSES USE_CURSES
_SYS_VARS.curses= PKG_OPTIONS CURSES_TYPE BUILDLINK_BUILTIN_MK.curses \
BUILDLINK_PKGNAME.curses \
BUILDLINK_PREFIX.curses BUILDLINK_INCDIRS.curses \
Index: pkgsrc/net/asuka/Makefile
diff -u pkgsrc/net/asuka/Makefile:1.3 pkgsrc/net/asuka/Makefile:1.4
--- pkgsrc/net/asuka/Makefile:1.3 Tue Oct 24 22:10:12 2023
+++ pkgsrc/net/asuka/Makefile Mon May 6 08:27:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/10/24 22:10:12 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2024/05/06 08:27:54 jperkin Exp $
DISTNAME= 0.8.5
PKGNAME= asuka-${DISTNAME}
@@ -21,12 +21,12 @@ INSTALLATION_DIRS= bin
MAKE_ENV+= OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
-RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.ncursesw}/lib
+RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.ncurses}/lib
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/target/release/asuka ${DESTDIR}${PREFIX}/bin
.include "../../lang/rust/cargo.mk"
.include "../../security/openssl/buildlink3.mk"
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/ettercap/Makefile.common
diff -u pkgsrc/net/ettercap/Makefile.common:1.2 pkgsrc/net/ettercap/Makefile.common:1.3
--- pkgsrc/net/ettercap/Makefile.common:1.2 Mon Mar 22 06:40:07 2021
+++ pkgsrc/net/ettercap/Makefile.common Mon May 6 08:27:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2021/03/22 06:40:07 adam Exp $
+# $NetBSD: Makefile.common,v 1.3 2024/05/06 08:27:54 jperkin Exp $
# used by net/ettercap/Makefile
# used by net/ettercap-gtk/Makefile
@@ -33,7 +33,7 @@ pre-configure:
BUILDLINK_DEPMETHOD.check?= build # tests only
.include "../../devel/libnet/buildlink3.mk"
# It uses set_menu_spacing from libmenu which NetBSD curses doesn't have.
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../net/GeoIP/buildlink3.mk"
Index: pkgsrc/net/nanotodon/Makefile
diff -u pkgsrc/net/nanotodon/Makefile:1.17 pkgsrc/net/nanotodon/Makefile:1.18
--- pkgsrc/net/nanotodon/Makefile:1.17 Sun Mar 17 14:00:52 2024
+++ pkgsrc/net/nanotodon/Makefile Mon May 6 08:27:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2024/03/17 14:00:52 nia Exp $
+# $NetBSD: Makefile,v 1.18 2024/05/06 08:27:54 jperkin Exp $
GITHUB_TAG= 0.3.1
DISTNAME= nanotodon-${GITHUB_TAG}
@@ -29,7 +29,7 @@ do-install:
${DESTDIR}${PREFIX}/share/doc/nanotodon
.include "../../www/curl/buildlink3.mk"
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
# problems rendering UTF-8
#.include "../../mk/curses.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/ncdc/Makefile
diff -u pkgsrc/net/ncdc/Makefile:1.31 pkgsrc/net/ncdc/Makefile:1.32
--- pkgsrc/net/ncdc/Makefile:1.31 Wed Nov 8 13:20:31 2023
+++ pkgsrc/net/ncdc/Makefile Mon May 6 08:27:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2023/11/08 13:20:31 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2024/05/06 08:27:54 jperkin Exp $
DISTNAME= ncdc-1.23
PKGREVISION= 5
@@ -19,5 +19,5 @@ USE_TOOLS+= pkg-config
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32
.include "../../devel/glib2/buildlink3.mk"
.include "../../security/gnutls/buildlink3.mk"
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/ncgopher/Makefile
diff -u pkgsrc/net/ncgopher/Makefile:1.15 pkgsrc/net/ncgopher/Makefile:1.16
--- pkgsrc/net/ncgopher/Makefile:1.15 Sun Dec 3 20:48:21 2023
+++ pkgsrc/net/ncgopher/Makefile Mon May 6 08:27:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2023/12/03 20:48:21 pin Exp $
+# $NetBSD: Makefile,v 1.16 2024/05/06 08:27:54 jperkin Exp $
DISTNAME= ncgopher-0.6.0
CATEGORIES= net
@@ -20,7 +20,7 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
MAKE_ENV+= OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
-RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.ncursesw}/lib
+RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.ncurses}/lib
RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.sqlite3}/lib
do-install:
@@ -31,6 +31,6 @@ do-install:
.include "../../lang/rust/cargo.mk"
.include "../../security/openssl/buildlink3.mk"
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/news/neix/Makefile
diff -u pkgsrc/news/neix/Makefile:1.16 pkgsrc/news/neix/Makefile:1.17
--- pkgsrc/news/neix/Makefile:1.16 Wed Nov 8 13:20:38 2023
+++ pkgsrc/news/neix/Makefile Mon May 6 08:27:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2023/11/08 13:20:38 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2024/05/06 08:27:55 jperkin Exp $
DISTNAME= neix-0.1.5
PKGREVISION= 6
@@ -31,6 +31,6 @@ SUBST_SED.prefix+= -e 's,share/man,${PKG
pre-configure:
${MKDIR} -p ${WRKSRC}/build
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/news/newsbeuter/Makefile
diff -u pkgsrc/news/newsbeuter/Makefile:1.48 pkgsrc/news/newsbeuter/Makefile:1.49
--- pkgsrc/news/newsbeuter/Makefile:1.48 Wed Nov 8 13:20:38 2023
+++ pkgsrc/news/newsbeuter/Makefile Mon May 6 08:27:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2023/11/08 13:20:38 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2024/05/06 08:27:55 jperkin Exp $
DISTNAME= newsbeuter-2.9
PKGREVISION= 46
@@ -32,7 +32,7 @@ SUBST_SED.makefile= -e 's/^ifneq.*//; s/
.include "../../converters/libiconv/buildlink3.mk"
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../textproc/json-c/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../devel/stfl/buildlink3.mk"
Index: pkgsrc/news/newsraft/Makefile
diff -u pkgsrc/news/newsraft/Makefile:1.4 pkgsrc/news/newsraft/Makefile:1.5
--- pkgsrc/news/newsraft/Makefile:1.4 Wed Apr 3 13:42:59 2024
+++ pkgsrc/news/newsraft/Makefile Mon May 6 08:27:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2024/04/03 13:42:59 ktnb Exp $
+# $NetBSD: Makefile,v 1.5 2024/05/06 08:27:55 jperkin Exp $
DISTNAME= newsraft-0.24
CATEGORIES= news
@@ -29,7 +29,7 @@ do-install:
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/yajl/buildlink3.mk"
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
.include "../../www/gumbo-parser/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/clex/Makefile
diff -u pkgsrc/sysutils/clex/Makefile:1.10 pkgsrc/sysutils/clex/Makefile:1.11
--- pkgsrc/sysutils/clex/Makefile:1.10 Fri Sep 22 22:05:05 2017
+++ pkgsrc/sysutils/clex/Makefile Mon May 6 08:27:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2017/09/22 22:05:05 wiedi Exp $
+# $NetBSD: Makefile,v 1.11 2024/05/06 08:27:55 jperkin Exp $
DISTNAME= clex-4.6.4
PKGREVISION= 1
@@ -18,5 +18,5 @@ GNU_CONFIGURE= yes
post-extract:
cd ${WRKSRC} && ${RM} -f src/*.orig
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/htop/options.mk
diff -u pkgsrc/sysutils/htop/options.mk:1.2 pkgsrc/sysutils/htop/options.mk:1.3
--- pkgsrc/sysutils/htop/options.mk:1.2 Tue Oct 4 07:14:57 2022
+++ pkgsrc/sysutils/htop/options.mk Mon May 6 08:27:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2022/10/04 07:14:57 kim Exp $
+# $NetBSD: options.mk,v 1.3 2024/05/06 08:27:55 jperkin Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.htop
@@ -10,10 +10,10 @@ PKG_SUGGESTED_OPTIONS= curses
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mncurses)
-. include "../../devel/ncursesw/buildlink3.mk"
+. include "../../devel/ncurses/buildlink3.mk"
.else
. include "../../mk/curses.buildlink3.mk"
-. if ${CURSES_TYPE} != "ncursesw"
+. if ${CURSES_TYPE} != "ncurses"
# See netbsd/README.md
CONFIGURE_ARGS+= --disable-unicode
. endif
Index: pkgsrc/sysutils/lnav/Makefile
diff -u pkgsrc/sysutils/lnav/Makefile:1.30 pkgsrc/sysutils/lnav/Makefile:1.31
--- pkgsrc/sysutils/lnav/Makefile:1.30 Wed Nov 8 13:20:58 2023
+++ pkgsrc/sysutils/lnav/Makefile Mon May 6 08:27:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2023/11/08 13:20:58 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2024/05/06 08:27:55 jperkin Exp $
DISTNAME= lnav-0.11.1
PKGREVISION= 5
@@ -28,6 +28,6 @@ GCC_REQD+= 8
.include "../../devel/readline/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../lang/python/application.mk"
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/mc/options.mk
diff -u pkgsrc/sysutils/mc/options.mk:1.18 pkgsrc/sysutils/mc/options.mk:1.19
--- pkgsrc/sysutils/mc/options.mk:1.18 Fri Sep 29 17:30:57 2023
+++ pkgsrc/sysutils/mc/options.mk Mon May 6 08:27:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2023/09/29 17:30:57 jperkin Exp $
+# $NetBSD: options.mk,v 1.19 2024/05/06 08:27:55 jperkin Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mc
PKG_OPTIONS_REQUIRED_GROUPS= screen
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+= --with-screen=slang
.elif !empty(PKG_OPTIONS:Mncurses)
USE_NCURSES= yes
CONFIGURE_ARGS+= --with-screen=ncurses
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.else
CONFIGURE_ARGS+= --with-screen=mcslang
.endif
Index: pkgsrc/sysutils/ncdu2/Makefile
diff -u pkgsrc/sysutils/ncdu2/Makefile:1.5 pkgsrc/sysutils/ncdu2/Makefile:1.6
--- pkgsrc/sysutils/ncdu2/Makefile:1.5 Sun May 5 20:56:55 2024
+++ pkgsrc/sysutils/ncdu2/Makefile Mon May 6 08:27:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2024/05/05 20:56:55 nikita Exp $
+# $NetBSD: Makefile,v 1.6 2024/05/06 08:27:55 jperkin Exp $
DISTNAME= ncdu-2.4
CATEGORIES= sysutils
@@ -19,6 +19,6 @@ post-build:
mkdir ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
${INSTALL_DATA} ${WRKSRC}/ncdu.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../lang/zig/application.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/www/wiki-tui/Makefile
diff -u pkgsrc/www/wiki-tui/Makefile:1.20 pkgsrc/www/wiki-tui/Makefile:1.21
--- pkgsrc/www/wiki-tui/Makefile:1.20 Tue Oct 24 22:11:35 2023
+++ pkgsrc/www/wiki-tui/Makefile Mon May 6 08:27:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2023/10/24 22:11:35 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2024/05/06 08:27:56 jperkin Exp $
DISTNAME= wiki-tui-0.8.2
PKGREVISION= 1
@@ -20,7 +20,7 @@ INSTALLATION_DIRS= share/applications sh
MAKE_ENV+= OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
-RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.ncursesw}/lib
+RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.ncurses}/lib
post-install:
${INSTALL_DATA} ${WRKSRC}/wiki-tui.desktop \
@@ -30,6 +30,6 @@ post-install:
.include "../../lang/rust/cargo.mk"
.include "../../security/openssl/buildlink3.mk"
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index