- Updated to version 2.4.3.

- Added FVWM2_USE_GTK and FVWM2_USE_RPLAY for those who want FvwmGtk
  and audio support.
- Removed dependency on imlib until a better PLIST_SUBST is written.

Changes in stable 2.4.3 (8-Oct-2001)

* Fixed activation of shape extension.
* Fixed problems with overriding key bindings.
* Single letter key names are allowed in upper and lower case in
  key bindings as before 2.4.0.
* Fixed WindowList placement with Xinerama.
* Fixed flickering icon titles.
* New X resource fvwmscreen to select the Xinerama screen on which to
  place new windows.
* Coordinates of a window during motion are show relative to the
  Xinerama screen.
* Some icon placement improvements with Xinerama.

4 files changed, 24 insertions, 14 deletions

diff --git a/wm/fvwm2/Makefile b/wm/fvwm2/Makefile
index 933f492f506..d0f57d98c76 100644
--- a/wm/fvwm2/Makefile
+++ b/wm/fvwm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/10/01 11:15:16 martti Exp $
+# $NetBSD: Makefile,v 1.9 2001/10/09 12:19:06 martti Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -18,8 +18,9 @@ DEPENDS+=	xpmroot-2.*:../../x11/xpmroot
 
 CONFLICTS=	fvwm-2.*
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
-FVWM_VER=	2.4.2
+FVWM_VER=	2.4.3
 
+## USE_BUILDLINK_ONLY=	YES
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 USE_GNU_READLINE=	YES
@@ -56,8 +57,16 @@ post-install:
 			${PREFIX}/lib/X11/fvwm2/system.fvwm2rc ; \
 	fi
 
+.if defined(FVWM2_USE_GTK) && ${FVWM2_USE_GTK} == "YES"
+.include "../../x11/gtk/buildlink.mk"
+PLIST_SUBST+=	GTK=""
+.else
+PLIST_SUBST+=	GTK="@comment "
+.endif
+
+.if defined(FVWM2_USE_RPLAY) && ${FVWM2_USE_RPLAY} == "YES"
 .include "../../audio/rplay/buildlink.mk"
+.endif
+
 .include "../../devel/readline/buildlink.mk"
-.include "../../graphics/imlib/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/fvwm2/distinfo b/wm/fvwm2/distinfo
index 6ae1244f54c..ff0a26a8d3d 100644
--- a/wm/fvwm2/distinfo
+++ b/wm/fvwm2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2001/10/01 11:15:16 martti Exp $
+$NetBSD: distinfo,v 1.5 2001/10/09 12:19:06 martti Exp $
 
-SHA1 (fvwm-2.4.2.tar.gz) = 249e6fa64d35d7baa762e29584a019fa960da524
-Size (fvwm-2.4.2.tar.gz) = 1682981 bytes
+SHA1 (fvwm-2.4.3.tar.gz) = ae516d9b52ef84c47f1b5472f58220cef404845e
+Size (fvwm-2.4.3.tar.gz) = 1679515 bytes
 SHA1 (fvwm_icons.tgz) = 418356862ab564ac0b771300b53004aea7c7c1ec
 Size (fvwm_icons.tgz) = 368640 bytes
 SHA1 (patch-aa) = a2b2f7f6aca946bc3c18929f59ff43d8da945553
-SHA1 (patch-ab) = 1fb3fcd20802af683f4f069deaa75221a21b1318
+SHA1 (patch-ab) = 0f15a56a5657ff0f291a8c2669f75aa47e93426e
diff --git a/wm/fvwm2/patches/patch-ab b/wm/fvwm2/patches/patch-ab
index 164fbd482fd..5caf0bd126f 100644
--- a/wm/fvwm2/patches/patch-ab
+++ b/wm/fvwm2/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.5 2001/10/01 11:14:42 martti Exp $
+$NetBSD: patch-ab,v 1.6 2001/10/09 12:19:06 martti Exp $
 
---- configure.orig	Sun Sep 16 16:33:27 2001
-+++ configure	Tue Sep 18 09:22:27 2001
+--- configure.orig	Mon Oct  8 11:59:25 2001
++++ configure	Tue Oct  9 09:22:29 2001
 @@ -670,7 +670,7 @@
  # It thinks the first close brace ends the variable substitution.
  test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
@@ -18,7 +18,7 @@ $NetBSD: patch-ab,v 1.5 2001/10/01 11:14:42 martti Exp $
 -PACKAGE=fvwm
 +PACKAGE=fvwm2
  
- VERSION=2.4.2
+ VERSION=2.4.3
  
 @@ -3879,7 +3879,7 @@
  # It thinks the first close brace ends the variable substitution.
diff --git a/wm/fvwm2/pkg/PLIST b/wm/fvwm2/pkg/PLIST
index 3ba99eb2882..0f7b04d8c19 100644
--- a/wm/fvwm2/pkg/PLIST
+++ b/wm/fvwm2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2001/10/01 11:15:16 martti Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/10/09 12:19:06 martti Exp $
 bin/FvwmCommand
 bin/fvwm-config
 bin/fvwm-menu-desktop
@@ -26,7 +26,7 @@ lib/X11/fvwm2/${FVWM_VER}/FvwmDebug
 lib/X11/fvwm2/${FVWM_VER}/FvwmDragWell
 lib/X11/fvwm2/${FVWM_VER}/FvwmEvent
 lib/X11/fvwm2/${FVWM_VER}/FvwmForm
-lib/X11/fvwm2/${FVWM_VER}/FvwmGtk
+${GTK}lib/X11/fvwm2/${FVWM_VER}/FvwmGtk
 lib/X11/fvwm2/${FVWM_VER}/FvwmIconBox
 lib/X11/fvwm2/${FVWM_VER}/FvwmIconMan
 lib/X11/fvwm2/${FVWM_VER}/FvwmIdent
@@ -393,6 +393,7 @@ man/man1/FvwmTaskBar.1
 man/man1/FvwmTheme.1
 man/man1/FvwmWharf.1
 man/man1/FvwmWinList.1
+man/man1/fvwm-config.1
 man/man1/fvwm-menu-desktop.1
 man/man1/fvwm-menu-directory.1
 man/man1/fvwm-menu-headlines.1