diff options
| author | wiz <wiz> | 2016-01-09 11:13:15 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2016-01-09 11:13:15 +0000 |
| commit | 26e155ca0c012b7368f4dd9a6553d64ea4d4485d (patch) | |
| tree | 3ed2341e5808fa175a41d3d24cd87077200abdc9 /misc/tmux | |
| parent | f0fe2987d6fa84051daa4dccd615ee94a02a8247 (diff) | |
| download | pkgsrc-26e155ca0c012b7368f4dd9a6553d64ea4d4485d.tar.gz | |
Fix two issues with autoconf.
1. add missing pkg-config dependency for pkg-config m4 file
2. fix quoting in a macro in configure.ac.
Diffstat (limited to 'misc/tmux')
| -rw-r--r-- | misc/tmux/Makefile | 4 | ||||
| -rw-r--r-- | misc/tmux/distinfo | 3 | ||||
| -rw-r--r-- | misc/tmux/patches/patch-configure.ac | 22 |
3 files changed, 26 insertions, 3 deletions
diff --git a/misc/tmux/Makefile b/misc/tmux/Makefile index fd5b2980a1c..d623384a453 100644 --- a/misc/tmux/Makefile +++ b/misc/tmux/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2015/12/31 07:07:16 ryoon Exp $ +# $NetBSD: Makefile,v 1.33 2016/01/09 11:13:15 wiz Exp $ DISTNAME= tmux-2.1 CATEGORIES= misc @@ -14,7 +14,7 @@ LICENSE= modified-bsd GNU_CONFIGURE= yes USE_TERMINFO= yes -USE_TOOLS+= automake +USE_TOOLS+= automake pkg-config .include "../../mk/bsd.prefs.mk" .include "../../mk/compiler.mk" diff --git a/misc/tmux/distinfo b/misc/tmux/distinfo index 7e5fffd909d..fac38a00848 100644 --- a/misc/tmux/distinfo +++ b/misc/tmux/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.29 2015/12/31 07:07:16 ryoon Exp $ +$NetBSD: distinfo,v 1.30 2016/01/09 11:13:15 wiz Exp $ SHA1 (tmux-2.1.tar.gz) = df182bd69b2f9b5c238c2a777d92a37479fd4b30 RMD160 (tmux-2.1.tar.gz) = 993ab8b4bbb5ff7ccf146910dfe821b8c5499ada SHA512 (tmux-2.1.tar.gz) = 73e917125413917f5a6edd105aa3fdcb5655fa96def26d7e7f1b75a598062d15124960fe38e2a7eafec950ad8039e4f783cb6c533ca7872ac64795425e750a2a Size (tmux-2.1.tar.gz) = 588644 bytes SHA1 (patch-Makefile.am) = 4578ec2aa2c4e0f3c81801568b1eaecdf7b67cf1 +SHA1 (patch-configure.ac) = 92458929d7fb1ed5997443f394e253409422d11f SHA1 (patch-server-client.c) = 64bd26054f220d80f3ba1cf117425f216a004987 diff --git a/misc/tmux/patches/patch-configure.ac b/misc/tmux/patches/patch-configure.ac new file mode 100644 index 00000000000..aae36fead05 --- /dev/null +++ b/misc/tmux/patches/patch-configure.ac @@ -0,0 +1,22 @@ +$NetBSD: patch-configure.ac,v 1.4 2016/01/09 11:13:15 wiz Exp $ + +Fix quoting issue. If the macro is put in square brackets, +it's not expanded. + +--- configure.ac.orig 2015-10-18 17:10:43.000000000 +0000 ++++ configure.ac +@@ -130,14 +130,12 @@ PKG_CHECK_MODULES( + LIBS="$LIBEVENT_LIBS $LIBS" + found_libevent=yes + ], +- [ + AC_SEARCH_LIBS( + event_init, + [event event-1.4 event2], + found_libevent=yes, + found_libevent=no + ) +- ] + ) + if test "x$found_libevent" = xno; then + AC_MSG_ERROR("libevent not found") |