Module Name: src
Committed By: jmmv
Date: Wed Aug 17 18:51:10 UTC 2011
Modified Files:
src/external/bsd/tmux/usr.bin/tmux: Makefile
Removed Files:
src/external/bsd/tmux/usr.bin/tmux: config.h version.txt
Log Message:
Adjust reachover Makefiles after tmux 1.5 import.
The new code has quite a bit of warnings to be fixed. I did not realize
until merge-resolving time that christos@ had fixed such warnings in our
copy of tmux 1.4 and assumed these warnings were new and thus could just
be disabled.
Therefore, I'm disabling some global warning checks as a temporary measure
to bring the tree back to a buildable state. I will take a look at these
warnings afterwards.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/tmux/usr.bin/tmux/Makefile
cvs rdiff -u -r1.2 -r0 src/external/bsd/tmux/usr.bin/tmux/config.h
cvs rdiff -u -r1.1 -r0 src/external/bsd/tmux/usr.bin/tmux/version.txt
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/tmux/usr.bin/tmux/Makefile
diff -u src/external/bsd/tmux/usr.bin/tmux/Makefile:1.4 src/external/bsd/tmux/usr.bin/tmux/Makefile:1.5
--- src/external/bsd/tmux/usr.bin/tmux/Makefile:1.4 Tue Aug 16 07:57:21 2011
+++ src/external/bsd/tmux/usr.bin/tmux/Makefile Wed Aug 17 18:51:10 2011
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2011/08/16 07:57:21 christos Exp $
+# $NetBSD: Makefile,v 1.5 2011/08/17 18:51:10 jmmv Exp $
.include <bsd.own.mk>
-WARNS?= 4
SRCDIR= ${NETBSDSRCDIR}/external/bsd/tmux/dist
.PATH: ${SRCDIR}
@@ -11,7 +10,12 @@
PROG= tmux
MAN= tmux.1
-SRCS= attributes.c
+WARNS?= 4
+CWARNFLAGS+= -Wno-cast-qual
+CWARNFLAGS+= -Wno-pointer-sign
+
+SRCS= arguments.c
+SRCS+= attributes.c
SRCS+= cfg.c
SRCS+= client.c
SRCS+= clock.c
@@ -27,14 +31,12 @@
SRCS+= cmd-clock-mode.c
SRCS+= cmd-command-prompt.c
SRCS+= cmd-confirm-before.c
-SRCS+= cmd-copy-buffer.c
SRCS+= cmd-copy-mode.c
SRCS+= cmd-delete-buffer.c
SRCS+= cmd-detach-client.c
SRCS+= cmd-display-message.c
SRCS+= cmd-display-panes.c
SRCS+= cmd-find-window.c
-SRCS+= cmd-generic.c
SRCS+= cmd-has-session.c
SRCS+= cmd-if-shell.c
SRCS+= cmd-join-pane.c
@@ -42,8 +44,6 @@
SRCS+= cmd-kill-server.c
SRCS+= cmd-kill-session.c
SRCS+= cmd-kill-window.c
-SRCS+= cmd-last-pane.c
-SRCS+= cmd-last-window.c
SRCS+= cmd-link-window.c
SRCS+= cmd-list-buffers.c
SRCS+= cmd-list-clients.c
@@ -54,22 +54,17 @@
SRCS+= cmd-list-windows.c
SRCS+= cmd-list.c
SRCS+= cmd-load-buffer.c
-SRCS+= cmd-lock-client.c
SRCS+= cmd-lock-server.c
-SRCS+= cmd-lock-session.c
SRCS+= cmd-move-window.c
SRCS+= cmd-new-session.c
SRCS+= cmd-new-window.c
-SRCS+= cmd-next-layout.c
-SRCS+= cmd-next-window.c
SRCS+= cmd-paste-buffer.c
SRCS+= cmd-pipe-pane.c
-SRCS+= cmd-previous-layout.c
-SRCS+= cmd-previous-window.c
SRCS+= cmd-refresh-client.c
SRCS+= cmd-rename-session.c
SRCS+= cmd-rename-window.c
SRCS+= cmd-resize-pane.c
+SRCS+= cmd-respawn-pane.c
SRCS+= cmd-respawn-window.c
SRCS+= cmd-rotate-window.c
SRCS+= cmd-run-shell.c
@@ -83,12 +78,10 @@
SRCS+= cmd-set-buffer.c
SRCS+= cmd-set-environment.c
SRCS+= cmd-set-option.c
-SRCS+= cmd-set-window-option.c
SRCS+= cmd-show-buffer.c
SRCS+= cmd-show-environment.c
SRCS+= cmd-show-messages.c
SRCS+= cmd-show-options.c
-SRCS+= cmd-show-window-options.c
SRCS+= cmd-source-file.c
SRCS+= cmd-split-window.c
SRCS+= cmd-start-server.c
@@ -112,12 +105,12 @@
SRCS+= key-string.c
SRCS+= layout-custom.c
SRCS+= layout-set.c
-SRCS+= layout-string.c
SRCS+= layout.c
SRCS+= log.c
SRCS+= mode-key.c
SRCS+= names.c
SRCS+= options.c
+SRCS+= options-table.c
SRCS+= osdep-netbsd.c
SRCS+= paste.c
SRCS+= resize.c
@@ -145,24 +138,73 @@
SRCS+= xterm-keys.c
# Files in compat/
+#SRCS+= forkpty-hpux.c
SRCS+= imsg-buffer.c
SRCS+= imsg.c
SRCS+= strtonum.c
#SRCS+= unvis.c
#SRCS+= vis.c
-VERSION!= cat "$(.CURDIR)/version.txt"
-CPPFLAGS+= -DBUILD="\"$(VERSION)\""
CPPFLAGS+= -I${SRCDIR} -I${.CURDIR}
-COPTS.cmd-paste-buffer.c+= -Wno-stack-protector
-COPTS.cmd-server-info.c+= -Wno-stack-protector
-COPTS.imsg-buffer.c+= -Wno-stack-protector
-COPTS.imsg.c+= -Wno-stack-protector
-COPTS.screen.c+= -Wno-stack-protector
-COPTS.status.c+= -Wno-format-nonliteral
+# The following flags have been extracted from the compiler command-line
+# generated by Automake and Autoconf when building tmux under NetBSD.
+# Would be nicer to stick this in a config.h file, but the upstream code
+# does not use one at this moment.
+CPPFLAGS+= -DPACKAGE_TARNAME=\"tmux\"
+CPPFLAGS+= -DPACKAGE_VERSION=\"1.5\"
+CPPFLAGS+= -DPACKAGE_STRING=\"tmux\ 1.5\"
+CPPFLAGS+= -DPACKAGE_BUGREPORT=\"\"
+CPPFLAGS+= -DPACKAGE_URL=\"\"
+CPPFLAGS+= -DPACKAGE=\"tmux\"
+CPPFLAGS+= -DVERSION=\"1.5\"
+CPPFLAGS+= -DSTDC_HEADERS=1
+CPPFLAGS+= -DHAVE_SYS_TYPES_H=1
+CPPFLAGS+= -DHAVE_SYS_STAT_H=1
+CPPFLAGS+= -DHAVE_STDLIB_H=1
+CPPFLAGS+= -DHAVE_STRING_H=1
+CPPFLAGS+= -DHAVE_MEMORY_H=1
+CPPFLAGS+= -DHAVE_STRINGS_H=1
+CPPFLAGS+= -DHAVE_INTTYPES_H=1
+CPPFLAGS+= -DHAVE_STDINT_H=1
+CPPFLAGS+= -DHAVE_UNISTD_H=1
+CPPFLAGS+= -DHAVE_BITSTRING_H=1
+CPPFLAGS+= -DHAVE_CURSES_H=1
+CPPFLAGS+= -DHAVE_DIRENT_H=1
+CPPFLAGS+= -DHAVE_FCNTL_H=1
+CPPFLAGS+= -DHAVE_INTTYPES_H=1
+CPPFLAGS+= -DHAVE_PATHS_H=1
+CPPFLAGS+= -DHAVE_STDINT_H=1
+CPPFLAGS+= -DHAVE_SYS_DIR_H=1
+CPPFLAGS+= -DHAVE_SYS_TREE_H=1
+CPPFLAGS+= -DHAVE_TERM_H=1
+CPPFLAGS+= -DHAVE_UTIL_H=1
+CPPFLAGS+= -DHAVE_LIBRT=1
+CPPFLAGS+= -DHAVE_FORKPTY=1
+CPPFLAGS+= -DHAVE_CLOSEFROM=1
+CPPFLAGS+= -DHAVE_DAEMON=1
+CPPFLAGS+= -DHAVE_SETENV=1
+CPPFLAGS+= -DHAVE_STRLCPY=1
+CPPFLAGS+= -DHAVE_STRLCAT=1
+CPPFLAGS+= -DHAVE_ASPRINTF=1
+CPPFLAGS+= -DHAVE_FGETLN=1
+CPPFLAGS+= -DHAVE_STRCASESTR=1
+CPPFLAGS+= -DHAVE_STRSEP=1
+CPPFLAGS+= -DHAVE_VIS=1
+CPPFLAGS+= -DHAVE_DECL_OPTARG=1
+CPPFLAGS+= -DHAVE_DECL_OPTIND=1
+CPPFLAGS+= -DHAVE_DECL_OPTRESET=1
+CPPFLAGS+= -DHAVE_GETOPT=1
+CPPFLAGS+= -DHAVE_BZERO=1
+CPPFLAGS+= -DHAVE_SETPROCTITLE=1
+CPPFLAGS+= -DHAVE_SYSCONF=1
+CPPFLAGS+= -DHAVE_BSD_TYPES=1
+CPPFLAGS+= -DHAVE___PROGNAME=1
+CPPFLAGS+= -DHAVE_FCNTL_CLOSEM=1
+CPPFLAGS+= -DHAVE_PROC_PID=1
+CPPFLAGS+= -DHAVE_DIRFD=1
-LDADD+= -levent -lterminfo -lutil
+LDADD+= -levent -lterminfo -lutil -lm
DPADD+= ${LIBEVENT} ${LIBTERMINFO} ${LIBUTIL}
.include <bsd.prog.mk>
