diff options
| author | martti <martti@pkgsrc.org> | 2002-09-21 08:27:13 +0000 |
|---|---|---|
| committer | martti <martti@pkgsrc.org> | 2002-09-21 08:27:13 +0000 |
| commit | 67c19324a5de733e5166de59a1e9a878b245d040 (patch) | |
| tree | 4814f83524a11e827d7ae82b1ec9dcacecd6b2bd /wm/fvwm2/patches | |
| parent | 294b60003d0d6d5cad32349bd26bc1352ef09a18 (diff) | |
| download | pkgsrc-67c19324a5de733e5166de59a1e9a878b245d040.tar.gz | |
Updated fvwm2 to 2.4.11
* Fixed a crash with ssh-askpass introduced in 2.4.10.
* Allow the use of mouse buttons other than the first in
FvwmWinList when invoked transient.
Diffstat (limited to 'wm/fvwm2/patches')
| -rw-r--r-- | wm/fvwm2/patches/patch-aa | 26 | ||||
| -rw-r--r-- | wm/fvwm2/patches/patch-ab | 34 |
2 files changed, 26 insertions, 34 deletions
diff --git a/wm/fvwm2/patches/patch-aa b/wm/fvwm2/patches/patch-aa index 734b0c6029e..e7c7c0c8ee1 100644 --- a/wm/fvwm2/patches/patch-aa +++ b/wm/fvwm2/patches/patch-aa @@ -1,21 +1,31 @@ -$NetBSD: patch-aa,v 1.6 2002/09/16 09:31:48 martti Exp $ +$NetBSD: patch-aa,v 1.7 2002/09/21 08:27:15 martti Exp $ ---- utils/Makefile.in.orig Sun Sep 15 22:19:50 2002 -+++ utils/Makefile.in Mon Sep 16 10:53:07 2002 -@@ -113,13 +113,13 @@ +--- utils/Makefile.in.orig Fri Sep 20 11:06:52 2002 ++++ utils/Makefile.in Sat Sep 21 10:11:12 2002 +@@ -130,14 +130,14 @@ xpm_CFLAGS = @xpm_CFLAGS@ xpm_LIBS = @xpm_LIBS@ -bin_PROGRAMS = @XPMROOT@ +bin_PROGRAMS = - bin_SCRIPTS = fvwm-config fvwmbug fvwm-menu-xlock fvwm-menu-directory fvwm-menu-desktop fvwm-menu-headlines fvwm24_convert + bin_SCRIPTS = fvwm-config fvwmbug fvwm-menu-xlock fvwm-menu-directory \ + fvwm-menu-desktop fvwm-menu-headlines fvwm24_convert -EXTRA_PROGRAMS = xpmroot xselection +EXTRA_PROGRAMS = xselection --man_MANS = xpmroot.1 fvwm-config.1 fvwmbug.1 fvwmrc_convert.1 fvwm24_convert.1 fvwm-menu-xlock.1 fvwm-menu-directory.1 fvwm-menu-desktop.1 fvwm-menu-headlines.1 -+man_MANS = fvwm-config.1 fvwmbug.1 fvwmrc_convert.1 fvwm24_convert.1 fvwm-menu-xlock.1 fvwm-menu-directory.1 fvwm-menu-desktop.1 fvwm-menu-headlines.1 +-man_MANS = xpmroot.1 fvwm-config.1 fvwmbug.1 fvwmrc_convert.1 fvwm24_convert.1 \ ++man_MANS = fvwm-config.1 fvwmbug.1 fvwmrc_convert.1 fvwm24_convert.1 \ + fvwm-menu-xlock.1 fvwm-menu-directory.1 \ + fvwm-menu-desktop.1 fvwm-menu-headlines.1 - EXTRA_DIST = fvwmrc_convert quantize_pixmaps $(man_MANS) +@@ -157,7 +157,7 @@ + CONFIG_CLEAN_FILES = fvwm-config fvwm-menu-xlock fvwm-menu-directory \ + fvwm-menu-desktop fvwm-menu-headlines fvwm24_convert fvwmbug.sh + EXTRA_PROGRAMS = xpmroot$(EXEEXT) xselection$(EXEEXT) +-bin_PROGRAMS = @XPMROOT@ ++bin_PROGRAMS = + PROGRAMS = $(bin_PROGRAMS) + xpmroot_SOURCES = xpmroot.c diff --git a/wm/fvwm2/patches/patch-ab b/wm/fvwm2/patches/patch-ab index f284186ac36..bcd880f4697 100644 --- a/wm/fvwm2/patches/patch-ab +++ b/wm/fvwm2/patches/patch-ab @@ -1,31 +1,13 @@ -$NetBSD: patch-ab,v 1.13 2002/09/16 09:31:48 martti Exp $ +$NetBSD: patch-ab,v 1.14 2002/09/21 08:27:15 martti Exp $ ---- configure.orig Sun Sep 15 22:06:39 2002 -+++ configure Mon Sep 16 10:53:32 2002 -@@ -672,7 +672,7 @@ - # It thinks the first close brace ends the variable substitution. - test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - --test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' -+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM:S/-s//g}' - - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -@@ -761,7 +761,7 @@ +--- configure.orig Fri Sep 20 11:07:02 2002 ++++ configure Sat Sep 21 09:26:44 2002 +@@ -1486,7 +1486,7 @@ fi + # Define the identity of the package. +- PACKAGE=fvwm ++ PACKAGE=fvwm2 + VERSION=2.4.11 --PACKAGE=fvwm -+PACKAGE=fvwm2 - - VERSION=2.4.10 - -@@ -3911,7 +3911,7 @@ - # It thinks the first close brace ends the variable substitution. - test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - --test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' -+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM:S/-s//g}' - - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' |