From 21ee80aee4c65d9e1d81ccba72509faf6702a10c Mon Sep 17 00:00:00 2001 From: Jonathan Perkin Date: Tue, 29 Sep 2020 11:27:17 +0100 Subject: [PATCH] *: Add libutempter support to various packages. Resolves the rest of joyent/pkgsrc#284. --- misc/screen/Makefile | 1 + misc/tmux/Makefile | 3 +++ net/mosh/Makefile | 1 + x11/xterm/Makefile | 3 +++ 4 files changed, 8 insertions(+) diff --git a/misc/screen/Makefile b/misc/screen/Makefile index 7439e5515ea2..c869125e4d6b 100644 --- a/misc/screen/Makefile +++ b/misc/screen/Makefile @@ -79,5 +79,6 @@ screen-terminfo: ${SETENV} TERMINFO=${DESTDIR}${PREFIX}/share/lib/terminfo \ /usr/bin/tic screeninfo.src +.include "../../joyent/libutempter/buildlink3.mk" .include "../../mk/termcap.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/tmux/Makefile b/misc/tmux/Makefile index 6c836d095a3e..bdf99a7683cc 100644 --- a/misc/tmux/Makefile +++ b/misc/tmux/Makefile @@ -15,6 +15,8 @@ USE_TERMINFO= yes USE_TOOLS+= pkg-config +CONFIGURE_ARGS+= --enable-utempter + SUBST_CLASSES+= sysconfdir SUBST_STAGE.sysconfdir= pre-configure SUBST_MESSAGE.sysconfdir= Do not force sysconfdir to /etc @@ -36,5 +38,6 @@ CPPFLAGS+= -D__DARWIN_VERS_1050=0 .include "../../devel/libevent/buildlink3.mk" BUILDLINK_API_DEPENDS.libevent+= libevent>=2.0.10 +.include "../../joyent/libutempter/buildlink3.mk" .include "../../mk/curses.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/mosh/Makefile b/net/mosh/Makefile index 98b6c38aabce..65f9d00f69ae 100644 --- a/net/mosh/Makefile +++ b/net/mosh/Makefile @@ -25,6 +25,7 @@ TEST_TARGET= check .include "../../devel/protobuf/buildlink3.mk" BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.0.4 .include "../../devel/zlib/buildlink3.mk" +.include "../../joyent/libutempter/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/curses.buildlink3.mk" diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile index f05c445c8d77..80ba2926b09f 100644 --- a/x11/xterm/Makefile +++ b/x11/xterm/Makefile @@ -39,6 +39,8 @@ CONFIGURE_ARGS+= --enable-narrowproto CONFIGURE_ARGS+= --enable-wide-chars .endif +CONFIGURE_ARGS+= --with-utempter + .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" ### @@ -59,6 +61,7 @@ post-install: .include "../../mk/curses.buildlink3.mk" .include "../../mk/termcap.buildlink3.mk" +.include "../../joyent/libutempter/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/xaw.buildlink3.mk" .include "../../mk/bsd.pkg.mk"