From 32455af3a9bf0c7d90059467eeeb8e9633489249 Mon Sep 17 00:00:00 2001
From: mef <mef>
Date: Sun, 20 Jan 2013 07:09:29 +0000
Subject: With previous commit for PR pkg/47409, - patch target for patch-ab
 and patch-configure were the same.   Merged them as patch-ab.   (Naturally
 Revoming patches/patch-configure.) - Also cvs delete for patches/patch-a[ce]
 were missing, corrected.

---
 wm/fvwm/distinfo                |  5 ++---
 wm/fvwm/patches/patch-ab        | 20 +++++++++++++++++++-
 wm/fvwm/patches/patch-ac        | 20 --------------------
 wm/fvwm/patches/patch-ae        | 12 ------------
 wm/fvwm/patches/patch-configure | 19 -------------------
 5 files changed, 21 insertions(+), 55 deletions(-)
 delete mode 100644 wm/fvwm/patches/patch-ac
 delete mode 100644 wm/fvwm/patches/patch-ae
 delete mode 100644 wm/fvwm/patches/patch-configure

(limited to 'wm')

diff --git a/wm/fvwm/distinfo b/wm/fvwm/distinfo
index 63ac7df1bd0..05ce55594ab 100644
--- a/wm/fvwm/distinfo
+++ b/wm/fvwm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2013/01/20 06:53:53 mef Exp $
+$NetBSD: distinfo,v 1.5 2013/01/20 07:09:29 mef Exp $
 
 SHA1 (fvwm-2.6.5.tar.gz) = c200e9647d11d1a8b4938c419a987fea4aec6606
 RMD160 (fvwm-2.6.5.tar.gz) = 39f3154b4ae71d935bfbb8715eb2b5dc76cccb23
@@ -6,6 +6,5 @@ Size (fvwm-2.6.5.tar.gz) = 3449177 bytes
 SHA1 (fvwm_icons.tgz) = d6ee1e52f1a84c4edd722ccee0f7e9cc79cc2a4b
 RMD160 (fvwm_icons.tgz) = a5aa60994e64aab939f94b4620d79ea4fcb156f3
 Size (fvwm_icons.tgz) = 363406 bytes
-SHA1 (patch-ab) = b3f3a75e252102854952f45c52b442bd4da81d08
+SHA1 (patch-ab) = b38e1b58a2001b844321d204229ab0d9b07c7542
 SHA1 (patch-ad) = 4a36153af9cab68746d097e83599d5f39764f46f
-SHA1 (patch-configure) = e0e26fa168603d6ff08873098579ab9f7df38c05
diff --git a/wm/fvwm/patches/patch-ab b/wm/fvwm/patches/patch-ab
index bb651979687..88591d449f8 100644
--- a/wm/fvwm/patches/patch-ab
+++ b/wm/fvwm/patches/patch-ab
@@ -1,10 +1,19 @@
-$NetBSD: patch-ab,v 1.3 2013/01/20 06:53:53 mef Exp $
+$NetBSD: patch-ab,v 1.4 2013/01/20 07:09:29 mef Exp $
 
+(1) 
 Convert install path from fvwm to fvwm2
 This can not be done with 
 CONFIGURE_ARGS+=        --datarootdir=${PREFIX:Q}/share/fvwm2
 this will install fvwm2/fvwm.
 
+(2)
+Avoid following problem on NetBSD/amd64 6.99.16 with clang
++-----------------
+| conftest.c:38:3: error: non-void function 'main' should return a value [-Wreturn-type]
+|   return;
+|   ^
++-----------------
+
 --- configure.orig	2013-01-06 10:03:11.000000000 +0900
 +++ configure	2013-01-06 10:08:01.000000000 +0900
 @@ -3179,7 +3179,7 @@ fi
@@ -16,3 +25,12 @@ this will install fvwm2/fvwm.
   VERSION=${version}
  
  
+@@ -6492,7 +6492,7 @@ int i; static j; int *p; char *c;
+   switch (*p = p = *c) { case 0: printf("%Q", c, p); }
+   *c = &i; c = p;
+   while (1 || (unsigned int)3 >= 0 || ((int)-1) == ((unsigned int)1));
+-  return;
++  return -1;
+   ;
+   return 0;
+ }
diff --git a/wm/fvwm/patches/patch-ac b/wm/fvwm/patches/patch-ac
deleted file mode 100644
index 1bcb1bc9adb..00000000000
--- a/wm/fvwm/patches/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2006/07/02 09:21:57 martti Exp $
-
---- libs/Picture.c.orig	Sat Jul 31 02:18:29 2004
-+++ libs/Picture.c	Sat Jul 31 02:27:44 2004
-@@ -75,7 +75,15 @@
- Bool Pdefault;
- Visual *Pvisual;
- static Visual *FvwmVisual;
-+#ifdef __APPLE__
-+/* The Apple toolchain has some quirks with common symbols in archives
-+ * which makes it fail to pull in a file into a binary if only common
-+ * symbols are needed from that file.  Work around this by initializing
-+ * one of the variables. */
-+Colormap Pcmap = {0};
-+#else
- Colormap Pcmap;
-+#endif
- static Colormap FvwmCmap;
- unsigned int Pdepth;
- static unsigned int FvwmDepth;
diff --git a/wm/fvwm/patches/patch-ae b/wm/fvwm/patches/patch-ae
deleted file mode 100644
index d77adce3f05..00000000000
--- a/wm/fvwm/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2006/07/02 09:21:57 martti Exp $
-
---- fvwm/module_interface.c.orig	2005-12-06 14:48:01.000000000 +0000
-+++ fvwm/module_interface.c
-@@ -1460,7 +1460,6 @@ void FlushMessageQueue(int module)
-   char *dptr;
-   struct queue_buff_struct *d;
-   int a;
--  extern int errno;
- 
-   if((pipeOn[module] <= 0)||(pipeQueue[module] == NULL))
-     return;
diff --git a/wm/fvwm/patches/patch-configure b/wm/fvwm/patches/patch-configure
deleted file mode 100644
index 7057e7d54b2..00000000000
--- a/wm/fvwm/patches/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2013/01/20 06:53:53 mef Exp $
-Avoid following problem on NetBSD/amd64 6.99.16 with clang
-+-----------------
-| conftest.c:38:3: error: non-void function 'main' should return a value [-Wreturn-type]
-|   return;
-|   ^
-+-----------------
-
---- configure.orig	2013-01-15 09:54:13.000000000 +0900
-+++ configure	2013-01-15 10:04:58.000000000 +0900
-@@ -6492,7 +6492,7 @@ int i; static j; int *p; char *c;
-   switch (*p = p = *c) { case 0: printf("%Q", c, p); }
-   *c = &i; c = p;
-   while (1 || (unsigned int)3 >= 0 || ((int)-1) == ((unsigned int)1));
--  return;
-+  return -1;
-   ;
-   return 0;
- }
-- 
cgit v1.2.3