Update 2.5.3 --> 2.5.4

PR:		44787
Submitted by:	Anders Andersson <anders@hack.org>

5 files changed, 19 insertions, 17 deletions

diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index 979ff2c49227..364506c87799 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	fvwm
-PORTVERSION=	2.5.3
-PORTREVISION=	1
+PORTVERSION=	2.5.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/
diff --git a/x11-wm/fvwm2-devel/distinfo b/x11-wm/fvwm2-devel/distinfo
index 3cbedd04f7a3..975233306fdb 100644
--- a/x11-wm/fvwm2-devel/distinfo
+++ b/x11-wm/fvwm2-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (fvwm-2.5.3.tar.bz2) = 0e5d64db4d76ced2a75f031b6ce381ea
+MD5 (fvwm-2.5.4.tar.bz2) = f60b777f1c7d48e053528b3066af0c89
 MD5 (fvwm_icons.tgz) = de6c2822f1f6d43a0e1daddd0c7a8665
diff --git a/x11-wm/fvwm2-devel/files/patch-configure b/x11-wm/fvwm2-devel/files/patch-configure
index a677cb854b25..da3b50faaabe 100644
--- a/x11-wm/fvwm2-devel/files/patch-configure
+++ b/x11-wm/fvwm2-devel/files/patch-configure
@@ -1,17 +1,17 @@
---- configure.orig	Sun Aug 25 04:31:08 2002
-+++ configure	Fri Sep 13 18:29:58 2002
-@@ -3758,7 +3758,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
+--- configure.orig	Thu Oct 31 18:14:43 2002
++++ configure	Thu Oct 31 18:15:52 2002
+@@ -6157,7 +6157,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   ac_save_LIBS="$LIBS"
+   ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpng ${png_LIBS} -lz -lm $LIBS"
 +LIBS="-L%%LOCALBASE%%/lib -lpng ${png_LIBS} -lz -lm $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 3764 "configure"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
  #include "confdefs.h"
-@@ -3921,7 +3921,7 @@
+@@ -6429,7 +6429,7 @@
  #define HAVE_PNG 1
- EOF
+ _ACEOF
  
 -  png_LIBS="-lpng -lz"
 +  png_LIBS="-L%%LOCALBASE%%/lib -lpng -lz"
diff --git a/x11-wm/fvwm2-devel/files/patch-fvwm::Makefile.in b/x11-wm/fvwm2-devel/files/patch-fvwm::Makefile.in
index 0d4abd14687c..b8ffa408c358 100644
--- a/x11-wm/fvwm2-devel/files/patch-fvwm::Makefile.in
+++ b/x11-wm/fvwm2-devel/files/patch-fvwm::Makefile.in
@@ -1,15 +1,15 @@
---- fvwm/Makefile.in.orig	Sun Aug 25 04:34:20 2002
-+++ fvwm/Makefile.in	Tue Sep 10 10:21:40 2002
-@@ -919,9 +919,9 @@
+--- fvwm/Makefile.in.orig	Thu Oct 31 18:34:30 2002
++++ fvwm/Makefile.in	Thu Oct 31 18:34:51 2002
+@@ -936,9 +936,9 @@
  		echo "Minor warning: $(bindir)/fvwm2 symlink was not created"
  
  install-data-local:
 -	@rm -f $(DESTDIR)$(mandir)/man1/fvwm2.1
 -	@$(LN_S) fvwm.1 $(DESTDIR)$(mandir)/man1/fvwm2.1 || \
--		echo "Minor warning: $(mandir)/man1/fvwm2.1 symlink was not created"
+-	echo "Minor warning: $(mandir)/man1/fvwm2.1 symlink was not created"
 +	@rm -f $(DESTDIR)$(mandir)/man1/fvwm2.1.gz
 +	@$(LN_S) fvwm.1.gz $(DESTDIR)$(mandir)/man1/fvwm2.1.gz || \
-+		echo "Minor warning: $(mandir)/man1/fvwm2.1.gz symlink was not created"
++	echo "Minor warning: $(mandir)/man1/fvwm2.1.gz symlink was not created"
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/x11-wm/fvwm2-devel/pkg-plist b/x11-wm/fvwm2-devel/pkg-plist
index 67803a2058e8..ef2b6c8503d7 100644
--- a/x11-wm/fvwm2-devel/pkg-plist
+++ b/x11-wm/fvwm2-devel/pkg-plist
@@ -34,6 +34,7 @@ libexec/fvwm/%%FVWM_VERSION%%/FvwmDragWell
 libexec/fvwm/%%FVWM_VERSION%%/FvwmEvent
 libexec/fvwm/%%FVWM_VERSION%%/FvwmForm
 %%GTK%%libexec/fvwm/%%FVWM_VERSION%%/FvwmGtk
+libexec/fvwm/%%FVWM_VERSION%%/FvwmGtkDebug
 libexec/fvwm/%%FVWM_VERSION%%/FvwmIconBox
 libexec/fvwm/%%FVWM_VERSION%%/FvwmIconMan
 libexec/fvwm/%%FVWM_VERSION%%/FvwmIdent
@@ -409,6 +410,8 @@ share/fvwm/fvwm-script-ComExample.pl
 share/fvwm/fvwm-script-setup95.pl
 share/fvwm/system.fvwm2rc-sample-95
 share/fvwm/perllib/FVWM/Constants.pm
+share/fvwm/perllib/FVWM/Event.pm
+share/fvwm/perllib/FVWM/EventNames.pm
 share/fvwm/perllib/FVWM/Module/Gtk.pm
 share/fvwm/perllib/FVWM/Module/Tk.pm
 share/fvwm/perllib/FVWM/Module.pm