From 3412519d3dbd70108dedea6feffe3f0496c63b50 Mon Sep 17 00:00:00 2001
From: martin <martin>
Date: Sun, 13 Nov 2005 19:18:14 +0000
Subject: Support option "debug" and make the pkg compile with debugging
 support.

---
 wm/qvwm/Makefile         |  3 ++-
 wm/qvwm/distinfo         |  4 +++-
 wm/qvwm/options.mk       | 10 ++++++++++
 wm/qvwm/patches/patch-ab | 13 +++++++++++++
 wm/qvwm/patches/patch-ac | 12 ++++++++++++
 5 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 wm/qvwm/options.mk
 create mode 100644 wm/qvwm/patches/patch-ab
 create mode 100644 wm/qvwm/patches/patch-ac

diff --git a/wm/qvwm/Makefile b/wm/qvwm/Makefile
index 4f91de1aa48..f59e0891438 100644
--- a/wm/qvwm/Makefile
+++ b/wm/qvwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/06/24 20:37:38 kristerw Exp $
+# $NetBSD: Makefile,v 1.22 2005/11/13 19:18:14 martin Exp $
 #
 
 DISTNAME=	qvwm-1.1.12
@@ -18,6 +18,7 @@ USE_LANGUAGES=	c++
 post-install:
 	${MV} ${PREFIX}/man/man1/qvwm.1x ${PREFIX}/man/man1/qvwm.1
 
+.include "options.mk"
 .include "../../audio/esound/buildlink3.mk"
 .include "../../graphics/imlib/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
diff --git a/wm/qvwm/distinfo b/wm/qvwm/distinfo
index cc1d6637f33..6e708e0911f 100644
--- a/wm/qvwm/distinfo
+++ b/wm/qvwm/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 18:43:55 wiz Exp $
+$NetBSD: distinfo,v 1.5 2005/11/13 19:18:14 martin Exp $
 
 SHA1 (qvwm-1.1.12.tar.gz) = 27b43148a750e5b6b3efac6a6506819adbc2ed4d
 RMD160 (qvwm-1.1.12.tar.gz) = ed8d78b43e4e5778224af3a490daa2d31eb9a914
 Size (qvwm-1.1.12.tar.gz) = 434618 bytes
 SHA1 (patch-aa) = f6417e645c7a17e7f826cebea51ba34713071a9d
+SHA1 (patch-ab) = 8f1b98de794a524cc58a75850c8384c92f7faf1d
+SHA1 (patch-ac) = b066895160e6123aed9372477ea881d146b2b8aa
diff --git a/wm/qvwm/options.mk b/wm/qvwm/options.mk
new file mode 100644
index 00000000000..a639fafe270
--- /dev/null
+++ b/wm/qvwm/options.mk
@@ -0,0 +1,10 @@
+# $NetBSD: options.mk,v 1.1 2005/11/13 19:18:14 martin Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.qvwm
+PKG_SUPPORTED_OPTIONS=	debug
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+=	--enable-debug=yes
+.endif
diff --git a/wm/qvwm/patches/patch-ab b/wm/qvwm/patches/patch-ab
new file mode 100644
index 00000000000..471fdf2181e
--- /dev/null
+++ b/wm/qvwm/patches/patch-ab
@@ -0,0 +1,13 @@
+# $NetBSD: patch-ab,v 1.1 2005/11/13 19:18:14 martin Exp $
+
+--- src/paging.cc.orig	2001-05-28 11:37:08.000000000 +0200
++++ src/paging.cc	2005-11-13 14:19:10.000000000 +0100
+@@ -518,7 +518,7 @@
+       return (BeltPos)i;
+   }
+     
+-  ASSERT(FALSE);
++  ASSERT(0);
+ 
+   return BOTTOM;  // XXX
+ }
diff --git a/wm/qvwm/patches/patch-ac b/wm/qvwm/patches/patch-ac
new file mode 100644
index 00000000000..e46ff871774
--- /dev/null
+++ b/wm/qvwm/patches/patch-ac
@@ -0,0 +1,12 @@
+# $NetBSD: patch-ac,v 1.1 2005/11/13 19:18:14 martin Exp $
+
+--- src/image.cc.orig	2001-03-03 10:44:27.000000000 +0100
++++ src/image.cc	2005-11-13 19:59:35.000000000 +0100
+@@ -22,6 +22,7 @@
+ #include "config.h"
+ #endif
+ #include <string.h>
++#include <stdlib.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include "main.h"
-- 
cgit v1.2.3