pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
tmux: Import tmux-2.8rc as wip/tmux
Module Name: pkgsrc-wip
Committed By: Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By: leot
Date: Tue Sep 4 00:17:36 2018 +0200
Changeset: 19a8ce02af332d01a9bca60abde2836ccb3a2199
Modified Files:
Makefile
Added Files:
tmux/DESCR
tmux/Makefile
tmux/PLIST
tmux/distinfo
tmux/patches/patch-Makefile.in
tmux/patches/patch-server-client.c
Log Message:
tmux: Import tmux-2.8rc as wip/tmux
Tmux is a "terminal multiplexer", it enables a number of terminals
(or windows) to be accessed and controlled from a single terminal.
Tmux is intended to be a simple, modern, BSD-licensed alternative
to programs such as GNU screen.
Based on misc/tmux.
This package is intended to ease testing to update misc/tmux when tmux-2.8
will be out.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=19a8ce02af332d01a9bca60abde2836ccb3a2199
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 +
tmux/DESCR | 4 ++++
tmux/Makefile | 42 ++++++++++++++++++++++++++++++++++++++
tmux/PLIST | 3 +++
tmux/distinfo | 8 ++++++++
tmux/patches/patch-Makefile.in | 17 +++++++++++++++
tmux/patches/patch-server-client.c | 25 +++++++++++++++++++++++
7 files changed, 100 insertions(+)
diffs:
diff --git a/Makefile b/Makefile
index 4825ff5ec8..cfd24c1ea9 100644
--- a/Makefile
+++ b/Makefile
@@ -4383,6 +4383,7 @@ SUBDIR+= tleenx2
SUBDIR+= tleenx3
SUBDIR+= tme
SUBDIR+= tmuni-ttf
+SUBDIR+= tmux
SUBDIR+= tmva
SUBDIR+= tmw
SUBDIR+= tnt
diff --git a/tmux/DESCR b/tmux/DESCR
new file mode 100644
index 0000000000..2100306037
--- /dev/null
+++ b/tmux/DESCR
@@ -0,0 +1,4 @@
+Tmux is a "terminal multiplexer", it enables a number of terminals
+(or windows) to be accessed and controlled from a single terminal.
+Tmux is intended to be a simple, modern, BSD-licensed alternative
+to programs such as GNU screen.
diff --git a/tmux/Makefile b/tmux/Makefile
new file mode 100644
index 0000000000..e0ac25bea0
--- /dev/null
+++ b/tmux/Makefile
@@ -0,0 +1,42 @@
+# $NetBSD: Makefile,v 1.45 2018/06/09 11:23:05 leot Exp $
+
+DISTNAME= tmux-2.8-rc
+PKGNAME= tmux-2.8rc # XXX: Delete for non-rc release!
+CATEGORIES= misc
+MASTER_SITES= ${MASTER_SITE_GITHUB:=tmux/}
+GITHUB_RELEASE= ${PKGVERSION_NOREV:S/rc//} # XXX: Delete for non-rc release!
+#GITHUB_RELEASE= ${PKGVERSION_NOREV} # XXX: Uncomment for non-rc release!
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= http://tmux.github.io/
+COMMENT= BSD-licensed terminal multiplexer (GNU Screen alternative)
+LICENSE= modified-bsd
+
+GNU_CONFIGURE= yes
+USE_TERMINFO= yes
+
+USE_TOOLS+= pkg-config
+
+SUBST_CLASSES+= sysconfdir
+SUBST_STAGE.sysconfdir= pre-configure
+SUBST_MESSAGE.sysconfdir= Do not force sysconfdir to /etc
+SUBST_FILES.sysconfdir= configure configure.ac
+SUBST_SED.sysconfdir= -e '/Default tmux\.conf goes in \/etc/d'
+SUBST_SED.sysconfdir+= -e '/sysconfdir=\/etc/d'
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../mk/compiler.mk"
+.if !empty(MACHINE_PLATFORM:MSunOS-5.1[0-9]-*) && \
+ !empty(CC_VERSION:Mgcc-4.[6-9].*)
+BUILDLINK_TRANSFORM+= opt:-D_XPG4_2:-D_XPG6
+.endif
+
+# https://trac.macports.org/changeset/127986
+.if !empty(MACHINE_PLATFORM:MDarwin-1[0-9]*)
+CPPFLAGS+= -D__DARWIN_VERS_1050=0
+.endif
+
+.include "../../devel/libevent/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libevent+= libevent>=2.0.10
+.include "../../mk/curses.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/tmux/PLIST b/tmux/PLIST
new file mode 100644
index 0000000000..ea3ed12c0e
--- /dev/null
+++ b/tmux/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2009/03/06 12:16:17 hasso Exp $
+bin/tmux
+man/man1/tmux.1
diff --git a/tmux/distinfo b/tmux/distinfo
new file mode 100644
index 0000000000..8277b63003
--- /dev/null
+++ b/tmux/distinfo
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.36 2018/05/26 17:05:28 leot Exp $
+
+SHA1 (tmux-2.8-rc.tar.gz) = 1838a1f79b4c900b175be1c07e9733cc074a1f6a
+RMD160 (tmux-2.8-rc.tar.gz) = 4d28ec01780e6ab4e2bdb257e713c16e17c272ea
+SHA512 (tmux-2.8-rc.tar.gz) = 3e961450c7ce48671a4ccf7f053e4387c02b677f308531f78dc6f162304c1493ad2f927abd07ec1b9f9678c7fbc64f557a2c2e269e059c9610ae7571581fe3f4
+Size (tmux-2.8-rc.tar.gz) = 491679 bytes
+SHA1 (patch-Makefile.in) = fa9ec654cf6dad2b49b10ab981275d193d8b97c8
+SHA1 (patch-server-client.c) = a0949d4fdba20aaffce6cd56eedd47b7cc64e1bc
diff --git a/tmux/patches/patch-Makefile.in b/tmux/patches/patch-Makefile.in
new file mode 100644
index 0000000000..65e60a55a6
--- /dev/null
+++ b/tmux/patches/patch-Makefile.in
@@ -0,0 +1,17 @@
+$NetBSD: patch-Makefile.in,v 1.4 2016/05/09 12:39:05 fhajny Exp $
+
+At least on SunOS, lang/nawk (nawk-20050424nb3) insists on
+a space between -f and the program file name, by penalty of
+"/opt/local/bin/nawk: no program filename"
+
+--- Makefile.in.orig 2016-04-11 00:01:16.000000000 +0000
++++ Makefile.in
+@@ -1231,7 +1231,7 @@ install-exec-hook:
+ >$(srcdir)/tmux.1.mdoc; \
+ else \
+ sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1| \
+- $(AWK) -f$(srcdir)/mdoc2man.awk >$(srcdir)/tmux.1.man; \
++ $(AWK) -f $(srcdir)/mdoc2man.awk >$(srcdir)/tmux.1.man; \
+ fi
+ $(mkdir_p) $(DESTDIR)$(mandir)/man1
+ $(INSTALL_DATA) $(srcdir)/tmux.1.@MANFORMAT@ \
diff --git a/tmux/patches/patch-server-client.c b/tmux/patches/patch-server-client.c
new file mode 100644
index 0000000000..661d36ef56
--- /dev/null
+++ b/tmux/patches/patch-server-client.c
@@ -0,0 +1,25 @@
+$NetBSD: patch-server-client.c,v 1.5 2017/04/21 11:55:37 fhajny Exp $
+
+* timersub is missing on Solaris10
+
+--- server-client.c.orig 2017-04-20 10:29:06.000000000 +0000
++++ server-client.c
+@@ -30,6 +30,18 @@
+
+ #include "tmux.h"
+
++#ifndef timersub
++# define timersub(a, b, result) \
++ do { \
++ (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \
++ (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \
++ if ((result)->tv_usec < 0) { \
++ --(result)->tv_sec; \
++ (result)->tv_usec += 1000000; \
++ } \
++ } while (0)
++#endif
++
+ static void server_client_free(int, short, void *);
+ static void server_client_check_focus(struct window_pane *);
+ static void server_client_check_resize(struct window_pane *);
Home |
Main Index |
Thread Index |
Old Index