Update 2.4.4 -> 2.4.5

6 files changed, 16 insertions, 36 deletions

diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index c0b8b4248e13..7f061cc8c3ba 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	fvwm
-PORTVERSION=	2.5.4
-PORTREVISION=	1
+PORTVERSION=	2.5.5
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/
@@ -76,7 +75,9 @@ MAN1=	FvwmAnimate.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \
 	fvwm-menu-directory.1 fvwm-menu-headlines.1 fvwm-menu-xlock.1 \
 	fvwm.1 fvwm-root.1 fvwm-config.1 fvwm-bug.1 \
 	fvwm-convert-2.2.1 fvwm-convert-2.4.1 fvwm-convert-2.6.1 \
-	FvwmPerl.1 fvwm-perllib.1
+	FvwmPerl.1 fvwm-perllib.1 FvwmProxy.1 FvwmWindowLister.1 \
+	FvwmGtkDebug.1
+
 
 post-extract:
 	@${MKDIR} ${WRKDIR}/icons
diff --git a/x11-wm/fvwm2-devel/distinfo b/x11-wm/fvwm2-devel/distinfo
index 975233306fdb..87eb4efe48e2 100644
--- a/x11-wm/fvwm2-devel/distinfo
+++ b/x11-wm/fvwm2-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (fvwm-2.5.4.tar.bz2) = f60b777f1c7d48e053528b3066af0c89
+MD5 (fvwm-2.5.5.tar.bz2) = fec50963822d4effd34934d681284754
 MD5 (fvwm_icons.tgz) = de6c2822f1f6d43a0e1daddd0c7a8665
diff --git a/x11-wm/fvwm2-devel/files/patch-bin::Makefile.in b/x11-wm/fvwm2-devel/files/patch-bin::Makefile.in
index 5dc707c36c48..dde1241a25c4 100644
--- a/x11-wm/fvwm2-devel/files/patch-bin::Makefile.in
+++ b/x11-wm/fvwm2-devel/files/patch-bin::Makefile.in
@@ -1,6 +1,6 @@
---- bin/Makefile.in.orig	Sun Aug 25 04:34:30 2002
-+++ bin/Makefile.in	Tue Sep 10 10:26:39 2002
-@@ -511,9 +511,9 @@
+--- bin/Makefile.in.orig	Mon Dec  2 05:08:41 2002
++++ bin/Makefile.in	Tue Dec 17 11:29:50 2002
+@@ -592,9 +592,9 @@
  		echo "Minor warning: $(bindir)/xpmroot symlink was not created"
  
  install-data-local:
@@ -10,6 +10,6 @@
 +	@rm -f $(DESTDIR)$(mandir)/man1/xpmroot.1.gz
 +	@$(LN_S) fvwm-root.1.gz $(DESTDIR)$(mandir)/man1/xpmroot.1.gz || \
 +		echo "Minor warning: $(mandir)/man1/xpmroot.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.
+ .NOEXPORT:
diff --git a/x11-wm/fvwm2-devel/files/patch-fvwm::Makefile.in b/x11-wm/fvwm2-devel/files/patch-fvwm::Makefile.in
index b8ffa408c358..2b86f077c759 100644
--- a/x11-wm/fvwm2-devel/files/patch-fvwm::Makefile.in
+++ b/x11-wm/fvwm2-devel/files/patch-fvwm::Makefile.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- fvwm/Makefile.in.orig	Mon Dec  2 05:08:41 2002
++++ fvwm/Makefile.in	Tue Dec 17 11:31:56 2002
+@@ -645,9 +645,9 @@
  		echo "Minor warning: $(bindir)/fvwm2 symlink was not created"
  
  install-data-local:
@@ -10,6 +10,6 @@
 +	@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"
- 
  # 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.
+ .NOEXPORT:
diff --git a/x11-wm/fvwm2-devel/files/patch-modules::FvwmPager::x_pager.c b/x11-wm/fvwm2-devel/files/patch-modules::FvwmPager::x_pager.c
deleted file mode 100644
index d8c25416f123..000000000000
--- a/x11-wm/fvwm2-devel/files/patch-modules::FvwmPager::x_pager.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- modules/FvwmPager/x_pager.c.old	Thu Oct 24 00:46:59 2002
-+++ modules/FvwmPager/x_pager.c	Fri Nov  1 19:26:11 2002
-@@ -1630,8 +1630,8 @@
- 				XDrawLine(
- 					dpy,Desks[desk].w,Desks[desk].DashedGC,
- 					x1,y1,x1,y2);
--				x += Scr.MyDisplayWidth;
- 			}
-+			x += Scr.MyDisplayWidth;
- 		}
- 		y = Scr.MyDisplayHeight;
- 		x1 = 0;
-@@ -1640,9 +1640,11 @@
- 		{
- 			y1 = (y * desk_h) / Scr.VHeight;
- 			if (!use_no_separators)
-+			{
- 				XDrawLine(
- 					dpy,Desks[desk].w,Desks[desk].DashedGC,
- 					x1,y1,x2,y1);
-+			}
- 			y += Scr.MyDisplayHeight;
- 		}
- 	}
diff --git a/x11-wm/fvwm2-devel/pkg-plist b/x11-wm/fvwm2-devel/pkg-plist
index ef2b6c8503d7..eebcc71077e9 100644
--- a/x11-wm/fvwm2-devel/pkg-plist
+++ b/x11-wm/fvwm2-devel/pkg-plist
@@ -41,6 +41,7 @@ libexec/fvwm/%%FVWM_VERSION%%/FvwmIdent
 libexec/fvwm/%%FVWM_VERSION%%/FvwmM4
 libexec/fvwm/%%FVWM_VERSION%%/FvwmPager
 libexec/fvwm/%%FVWM_VERSION%%/FvwmPerl
+libexec/fvwm/%%FVWM_VERSION%%/FvwmProxy
 libexec/fvwm/%%FVWM_VERSION%%/FvwmRearrange
 libexec/fvwm/%%FVWM_VERSION%%/FvwmSave
 libexec/fvwm/%%FVWM_VERSION%%/FvwmSaveDesk
@@ -52,6 +53,7 @@ libexec/fvwm/%%FVWM_VERSION%%/FvwmTheme
 libexec/fvwm/%%FVWM_VERSION%%/FvwmTile
 libexec/fvwm/%%FVWM_VERSION%%/FvwmWharf
 libexec/fvwm/%%FVWM_VERSION%%/FvwmWinList
+libexec/fvwm/%%FVWM_VERSION%%/FvwmWindowLister
 @comment The following are here because they are symlinks
 man/man1/fvwm2.1.gz
 man/man1/xpmroot.1.gz
@@ -391,6 +393,7 @@ share/fvwm/FvwmForm-RootCursor
 share/fvwm/FvwmForm-Setup
 share/fvwm/FvwmForm-Talk
 share/fvwm/FvwmForm-TalkHelp
+share/fvwm/ConfigFvwmProxyDefaults
 share/fvwm/FvwmScript-BaseConfig
 share/fvwm/FvwmScript-BellSetup
 share/fvwm/FvwmScript-Buttons