Update metisse to 0.4.1.

This is mostly a maintenance release compared to 0.4.0. It fixes build
issues when building with _FORTIFY_SOURCE and it includes all the
security patches from Mandriva.

Pkgsrc Changes:
 * set LICENSE gnu-gpl-v3
 * marked as user-destdir ready.
 * add option: mmx and python , fixes PR 41735.
 * set selected X's one to default font path.

11 files changed, 119 insertions, 45 deletions

diff --git a/wm/metisse/Makefile b/wm/metisse/Makefile
index 1035aa8bf27..1df1d812c7d 100644
--- a/wm/metisse/Makefile
+++ b/wm/metisse/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.8 2009/06/12 17:24:54 ahoka Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/24 12:10:18 obache Exp $
 #
 
-DISTNAME=	metisse-0.4.0-rc4
-PKGNAME=	metisse-0.4.0rc4
-PKGREVISION=	5
+DISTNAME=	metisse-0.4.1
 CATEGORIES=	wm x11
-MASTER_SITES=	http://insitu.lri.fr/metisse/download/0.4.0-rc4/
+MASTER_SITES=	http://insitu.lri.fr/metisse/download/metisse/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://insitu.lri.fr/metisse/
 COMMENT=	Window manager with novel features
+LICENSE=	gnu-gpl-v3
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config msgfmt perl
@@ -21,6 +22,12 @@ USE_GNU_READLINE=	yes	# uses read_history_range, append_history & history_trunca
 
 DEPENDS+=	rxvt>=2.7.10nb5:../../x11/rxvt
 
+CONFIGURE_ARGS+=	--with-fontdir=${X11BASE}/lib/X11/fonts
+
+REPLACE_PERL+=	FvwmCompositor/config/scripting.pl
+
+.include "options.mk"
+
 .include "../../audio/rplay/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/wm/metisse/PLIST b/wm/metisse/PLIST
index bc0d86921ef..970f981357f 100644
--- a/wm/metisse/PLIST
+++ b/wm/metisse/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:19:00 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/07/24 12:10:18 obache Exp $
 bin/FvwmCommand
 bin/Xmetisse
 bin/Xwnc
@@ -14,10 +14,9 @@ bin/fvwm-perllib
 bin/fvwm-root
 bin/fvwmi
 bin/fvwmi-config
-bin/metisse-combo2radio
-bin/metisse-combo2radio-edit
-bin/metisse-demo-address-app
-bin/metisse-dummy-win
+${PLIST.python}bin/metisse-combo2radio
+${PLIST.python}bin/metisse-combo2radio-edit
+${PLIST.python}bin/metisse-demo-address-app
 bin/metisse-start-fvwm
 bin/metisse-xlib
 bin/opale-start-fvwmi
@@ -28,9 +27,9 @@ include/libmetisse/auth.h
 include/libmetisse/proto.h
 lib/libmetisse.la
 lib/pkgconfig/libmetisse.pc
-lib/python2.4/site-packages/facade_setup.py
-lib/python2.4/site-packages/facade_setup.pyc
-lib/python2.4/site-packages/facade_setup.pyo
+${PLIST.python}${PYSITELIB}/facade_setup.py
+${PLIST.python}${PYSITELIB}/facade_setup.pyc
+${PLIST.python}${PYSITELIB}/facade_setup.pyo
 libexec/fvwm-insitu/2.5.20/FvwmAnimate
 libexec/fvwm-insitu/2.5.20/FvwmAudio
 libexec/fvwm-insitu/2.5.20/FvwmAuto
@@ -304,12 +303,15 @@ share/metisse/fvwm/background
 share/metisse/fvwm/bindings
 share/metisse/fvwm/bindings-functions
 share/metisse/fvwm/colours/Ia_Ora_blue.theme
+share/metisse/fvwm/colours/Ia_Ora_free.theme
+share/metisse/fvwm/colours/Ia_Ora_gray.theme
 share/metisse/fvwm/colours/Ia_Ora_orange.theme
 share/metisse/fvwm/colours/Metisse.theme
 share/metisse/fvwm/colours/Metisse_Contrast.theme
 share/metisse/fvwm/colours/Opale.theme
 share/metisse/fvwm/config
 share/metisse/fvwm/config-files-list
+share/metisse/fvwm/demos
 share/metisse/fvwm/desks
 share/metisse/fvwm/fonts
 share/metisse/fvwm/images/backgrounds/sky-metisse.jpg
@@ -350,6 +352,8 @@ share/metisse/fvwm/shading
 share/metisse/fvwm/stroke
 share/metisse/fvwm/styles
 share/metisse/fvwm/themes/Ia_Ora_blue.theme
+share/metisse/fvwm/themes/Ia_Ora_free.theme
+share/metisse/fvwm/themes/Ia_Ora_gray.theme
 share/metisse/fvwm/themes/Ia_Ora_orange.theme
 share/metisse/fvwm/themes/Metisse.theme
 share/metisse/fvwm/themes/Metisse_Constrast.theme
@@ -365,3 +369,4 @@ share/metisse/fvwm/window/Vectors.theme
 share/metisse/shaders/blur-f.glsl
 share/metisse/shaders/shaders-files-list
 share/metisse/shaders/simple-anim-f.glsl
+@pkgdir share/metisse/glade
diff --git a/wm/metisse/distinfo b/wm/metisse/distinfo
index 5a74c87c552..7b214672783 100644
--- a/wm/metisse/distinfo
+++ b/wm/metisse/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.3 2007/06/30 15:22:09 joerg Exp $
+$NetBSD: distinfo,v 1.4 2009/07/24 12:10:18 obache Exp $
 
-SHA1 (metisse-0.4.0-rc4.tar.bz2) = 01b4893fd68d46eb44d8ab7d8d11bee442de3017
-RMD160 (metisse-0.4.0-rc4.tar.bz2) = 9ff492c68081b01d51c564d2d5c2136d8db1c19c
-Size (metisse-0.4.0-rc4.tar.bz2) = 6017779 bytes
-SHA1 (patch-aa) = 4773fb8ba08d82bc3b4317c1bb91cdfbcf299e6f
-SHA1 (patch-ab) = 8f74e223ba8344e35a4e43ce286466738a53c8ca
-SHA1 (patch-ac) = 4f8bb2c57834d927907c56a1a9413866e05cf99b
-SHA1 (patch-ad) = d66bc0a8fa3d0d1397c2e59cd0c1d8a997c7f920
-SHA1 (patch-ae) = 4bafefd35ba57588b50d5d4d1eb0fc50dc8ff74d
-SHA1 (patch-af) = 546e808741ed585594336ca918dc8903b2e55884
+SHA1 (metisse-0.4.1.tar.bz2) = acf97b125905d91988955560a9b14b06a530eed6
+RMD160 (metisse-0.4.1.tar.bz2) = 7487322f22a3655d756b5d3d3cc59afbf277d137
+Size (metisse-0.4.1.tar.bz2) = 6178680 bytes
+SHA1 (patch-aa) = 4dc24324dfaa54f5fbd0b6732707245c79047c6c
+SHA1 (patch-ab) = 8fa77eaed337a617b8f14d75de0d92b0dc1529df
+SHA1 (patch-ac) = 2ed1d666d535ee2003cb3d11e58188ff9cff7de9
+SHA1 (patch-ad) = 6c8f66b54c96f18b3e835fea490d5eb444514b52
+SHA1 (patch-ae) = eab55e17f7e3518434d4ad42e7637c18cef5bf72
+SHA1 (patch-af) = 45cf852490bd30d17cac341916d83b0688f7bce0
+SHA1 (patch-ag) = b7159e56a1d1f1b5b12ea99ca60de0071bcf5294
diff --git a/wm/metisse/options.mk b/wm/metisse/options.mk
new file mode 100644
index 00000000000..01727f24e0c
--- /dev/null
+++ b/wm/metisse/options.mk
@@ -0,0 +1,36 @@
+# $NetBSD: options.mk,v 1.1 2009/07/24 12:10:18 obache Exp $
+#
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.metisse
+PKG_SUPPORTED_OPTIONS=	python
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${MACHINE_ARCH} == "i386"
+PKG_SUPPORTED_OPTIONS+=	mmx
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=	freetype python
+
+.if !empty(PKG_OPTIONS:Mmmx)
+CONFIGURE_ARGS+=	--enable-mmx
+.endif
+
+#.if !empty(PKG_OPTIONS:Mglx)
+#.  if ${MACHINE_ARCH} == "i386"
+#CONFIGURE_ARGS+=	--enable-glx-x86
+#.  else
+#CONFIGURE_ARGS+=	--enable-glx
+#.  endif
+#.endif
+
+.if !empty(PKG_OPTIONS:Mpython)
+PY_PATCHPLIST=		yes
+.include "../../lang/python/extension.mk"
+CONFIGURE_ENV+=		PYTHON=${PYTHON}
+PLIST.python=		yes
+.else
+CONFIGURE_ENV+=		am_cv_pathless_PYTHON=none
+.endif
diff --git a/wm/metisse/patches/patch-aa b/wm/metisse/patches/patch-aa
index 4386491b6b6..97b982a8278 100644
--- a/wm/metisse/patches/patch-aa
+++ b/wm/metisse/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2007/06/29 22:46:50 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2009/07/24 12:10:18 obache Exp $
 
---- fvwm-insitu/config.h.in	2007/06/02 08:47:27	1.1
-+++ fvwm-insitu/config.h.in	2007/06/02 08:51:55
-@@ -526,8 +526,12 @@
+--- fvwm-insitu/config.h.in.orig	2008-12-09 12:56:45.000000000 +0000
++++ fvwm-insitu/config.h.in
+@@ -554,8 +554,12 @@
  #  ifdef _AIX
         #pragma alloca
  #  else
diff --git a/wm/metisse/patches/patch-ab b/wm/metisse/patches/patch-ab
index c87329ce000..b08ed6883f8 100644
--- a/wm/metisse/patches/patch-ab
+++ b/wm/metisse/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2007/06/30 15:22:09 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2009/07/24 12:10:18 obache Exp $
 
---- xserver/os/osdep.h.orig	2006-12-01 00:19:58.000000000 +0000
+--- xserver/os/osdep.h.orig	2008-03-13 14:34:48.000000000 +0000
 +++ xserver/os/osdep.h
 @@ -117,6 +117,12 @@ SOFTWARE.
  
diff --git a/wm/metisse/patches/patch-ac b/wm/metisse/patches/patch-ac
index 281571d9ae2..d9d6bf1b4e4 100644
--- a/wm/metisse/patches/patch-ac
+++ b/wm/metisse/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2007/06/02 19:07:33 agc Exp $
+$NetBSD: patch-ac,v 1.2 2009/07/24 12:10:18 obache Exp $
 
---- xserver/os/access.c	2007/06/02 10:55:20	1.1
-+++ xserver/os/access.c	2007/06/02 10:56:15
-@@ -142,6 +142,11 @@
+--- xserver/os/access.c.orig	2008-03-13 14:34:48.000000000 +0000
++++ xserver/os/access.c
+@@ -142,6 +142,11 @@ SOFTWARE.
  #endif
  
  #ifdef HAS_GETIFADDRS
diff --git a/wm/metisse/patches/patch-ad b/wm/metisse/patches/patch-ad
index 4454a277495..095cfcfb95a 100644
--- a/wm/metisse/patches/patch-ad
+++ b/wm/metisse/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2007/06/30 15:22:09 joerg Exp $
+$NetBSD: patch-ad,v 1.3 2009/07/24 12:10:18 obache Exp $
 
---- FvwmCompositor/renderer/WindowRenderer.cxx	2007/06/02 12:23:48	1.1
-+++ FvwmCompositor/renderer/WindowRenderer.cxx	2007/06/02 12:27:40
-@@ -46,6 +46,20 @@
+--- FvwmCompositor/renderer/WindowRenderer.cxx.orig	2008-08-25 14:32:09.000000000 +0000
++++ FvwmCompositor/renderer/WindowRenderer.cxx
+@@ -51,6 +51,20 @@ float WindowRenderer::borderVisLens = 1.
  // ---------------------------------------------------------------------------
  //
  
diff --git a/wm/metisse/patches/patch-ae b/wm/metisse/patches/patch-ae
index 4f03eb146b5..21f3c2b9649 100644
--- a/wm/metisse/patches/patch-ae
+++ b/wm/metisse/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.2 2007/06/30 15:22:09 joerg Exp $
+$NetBSD: patch-ae,v 1.3 2009/07/24 12:10:18 obache Exp $
 
---- FvwmCompositor/main/LayerManager.cxx	2007/06/02 12:31:01	1.1
-+++ FvwmCompositor/main/LayerManager.cxx	2007/06/02 12:32:00
-@@ -24,6 +24,20 @@
- #define A_PAGER_MODE_MARGIN_P 0.02
+--- FvwmCompositor/main/LayerManager.cxx.orig	2008-08-25 13:54:44.000000000 +0000
++++ FvwmCompositor/main/LayerManager.cxx
+@@ -25,6 +25,20 @@
+ using namespace std;
  
  // --------------------------------------------------------------------
 +#if defined(__NetBSD__) || defined(__DragonFly__)
diff --git a/wm/metisse/patches/patch-af b/wm/metisse/patches/patch-af
index 0c715897658..924644fa540 100644
--- a/wm/metisse/patches/patch-af
+++ b/wm/metisse/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2007/06/30 15:22:09 joerg Exp $
+$NetBSD: patch-af,v 1.2 2009/07/24 12:10:18 obache Exp $
 
---- FvwmCompositor/main/AScreen.cxx.orig	2007-06-30 14:47:06.000000000 +0000
+--- FvwmCompositor/main/AScreen.cxx.orig	2008-11-25 10:22:45.000000000 +0000
 +++ FvwmCompositor/main/AScreen.cxx
-@@ -32,6 +32,7 @@
+@@ -36,6 +36,7 @@
  #include <math.h>
  #include <stdio.h>
  #include <stdexcept>
diff --git a/wm/metisse/patches/patch-ag b/wm/metisse/patches/patch-ag
new file mode 100644
index 00000000000..573829041e9
--- /dev/null
+++ b/wm/metisse/patches/patch-ag
@@ -0,0 +1,25 @@
+$NetBSD: patch-ag,v 1.1 2009/07/24 12:10:18 obache Exp $
+
+--- FvwmCompositor/renderer/goodies.cxx.orig	2008-06-26 12:32:30.000000000 +0000
++++ FvwmCompositor/renderer/goodies.cxx
+@@ -22,6 +22,20 @@
+ #include "FoldablePolygon.H"
+ #include "desktop/MetisseWindow.H"
+ 
++#if defined(__NetBSD__) || defined(__DragonFly__)
++static inline double
++fmin(double x, double y)
++{
++        return (x < y) ? x : y;
++}
++
++static inline double
++fmax(double x, double y)
++{
++        return (x > y) ? x : y;
++}
++#endif
++
+ void goodies_marcking_feedback(
+ 	GLfloat x, GLfloat y, int dist, int draw_dist, int dirs, GLfloat alpha)
+ {