From d4fb2c479b5b5f90e23f4f723f7d1ec940c50434 Mon Sep 17 00:00:00 2001
From: jmmv <jmmv>
Date: Tue, 14 Jun 2005 16:33:13 +0000
Subject: Fix build under Linux (missing inclusion of string.h in some files).
 Closes PR pkg/29451.

---
 games/wormz/distinfo         |  5 +++--
 games/wormz/patches/patch-ar | 28 +++++++++++++++-------------
 games/wormz/patches/patch-ba | 12 ++++++++++++
 3 files changed, 30 insertions(+), 15 deletions(-)
 create mode 100644 games/wormz/patches/patch-ba

(limited to 'games')

diff --git a/games/wormz/distinfo b/games/wormz/distinfo
index 7b0fa738ab4..138dc582fed 100644
--- a/games/wormz/distinfo
+++ b/games/wormz/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 23:12:03 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/06/14 16:33:13 jmmv Exp $
 
 SHA1 (Wormz-1.0b5.tar.gz) = a5e45e90fcc0eb4d188508bdffe71220ddcd20a4
 RMD160 (Wormz-1.0b5.tar.gz) = 38411dcc3611d70d5873bf512439cd707372ef9e
@@ -20,7 +20,7 @@ SHA1 (patch-an) = 23be2ceb357f31160d6c820385e88a0c0251a20e
 SHA1 (patch-ao) = 90e77ae1d2f1e606eba06ee985b504e4fa4431c8
 SHA1 (patch-ap) = e8b24843effc24515ee81becd75c280b4ce6b548
 SHA1 (patch-aq) = 66ed99cc9521ce31f9d155f590ea0d296c0e9eb2
-SHA1 (patch-ar) = c99bd633119925d556b1ad17cc262159a9aa63ae
+SHA1 (patch-ar) = a43ccd48de0db0018495199af29e8fe6980c5b5b
 SHA1 (patch-as) = a01f27bf1187f02fa327c1bd2cf50e05d789641c
 SHA1 (patch-at) = 4acee68d04170e4fabacac37232a1e841306daa0
 SHA1 (patch-au) = e69f4050425dea7705782ac2688df6d19fbe6a2e
@@ -29,3 +29,4 @@ SHA1 (patch-aw) = b2d855826ffc9b67876acfe7da3b91a7ff5ea34a
 SHA1 (patch-ax) = 514898af5dcf6b88adcbbc2e910dab463099e2f5
 SHA1 (patch-ay) = 9f673fd72c1b111163c95038933b9ffb68474138
 SHA1 (patch-az) = 334817c8e6f92a39f8df8e0e645ae13c0716bd52
+SHA1 (patch-ba) = 80da240b3439b4cbc30e2796189ee94750c9021d
diff --git a/games/wormz/patches/patch-ar b/games/wormz/patches/patch-ar
index d5c50d950f1..7e328d845ef 100644
--- a/games/wormz/patches/patch-ar
+++ b/games/wormz/patches/patch-ar
@@ -1,10 +1,12 @@
-$NetBSD: patch-ar,v 1.1 2004/02/18 23:09:03 kristerw Exp $
+$NetBSD: patch-ar,v 1.2 2005/06/14 16:33:13 jmmv Exp $
 
---- XVision/SimpleViews.cc.orig	Wed Feb 18 23:21:00 2004
-+++ XVision/SimpleViews.cc	Wed Feb 18 23:28:53 2004
-@@ -6,8 +6,8 @@
+--- XVision/SimpleViews.cc.orig	1998-04-07 14:27:23.000000000 +0200
++++ XVision/SimpleViews.cc
+@@ -5,9 +5,10 @@
+ #include "Application.hh"
  #include "XVisionGlobal.hh"
  #include <stdio.h>
++#include <string.h>
  
 -StaticText::StaticText(const char * _text, TextDirection _direction=tdNorth,
 -		       FontShape _fontshape=fsRegular)
@@ -13,7 +15,7 @@ $NetBSD: patch-ar,v 1.1 2004/02/18 23:09:03 kristerw Exp $
      : text(0), buffer1(0), buffer2(0), buffer3(0),
    direction(_direction), fontshape(_fontshape)
  {
-@@ -67,7 +67,7 @@
+@@ -67,7 +68,7 @@ void StaticText::SetText(const char * _t
    if (Visible && (!Hidden)) {
  //    Hide();
  //    Show();
@@ -22,7 +24,7 @@ $NetBSD: patch-ar,v 1.1 2004/02/18 23:09:03 kristerw Exp $
    }
  }
  
-@@ -105,8 +105,8 @@
+@@ -105,8 +106,8 @@ void StaticText::Draw()
  }
  
  Label::Label(const char * _text, const CommandType _cc,
@@ -33,7 +35,7 @@ $NetBSD: patch-ar,v 1.1 2004/02/18 23:09:03 kristerw Exp $
      : StaticText(_text, _direction, _fontshape)
  {
    AutoResize = _AutoResize;
-@@ -114,7 +114,7 @@
+@@ -114,7 +115,7 @@ Label::Label(const char * _text, const C
    Selectable = TRUE;
  }
     
@@ -42,7 +44,7 @@ $NetBSD: patch-ar,v 1.1 2004/02/18 23:09:03 kristerw Exp $
  {
    if (direction == VAVertical)
      SetSize(Point(1, Size));
-@@ -123,14 +123,14 @@
+@@ -123,14 +124,14 @@ Padding::Padding(const Align direction=V
    MinSize = Area.Size;
  }
  
@@ -60,7 +62,7 @@ $NetBSD: patch-ar,v 1.1 2004/02/18 23:09:03 kristerw Exp $
      : picture(_picture), DeleteP(_DeleteP)
  {
    if (_cc != cmInvalid) {
-@@ -197,8 +197,8 @@
+@@ -197,8 +198,8 @@ void CheckBoxImg::Choose()
    parent->SendDataChanged();
  }
  
@@ -71,7 +73,7 @@ $NetBSD: patch-ar,v 1.1 2004/02/18 23:09:03 kristerw Exp $
      : Group(VAHorizontal), Checked(_Checked), Valuep(_Valuep)
  {
    AutoResize = TRUE;
-@@ -217,9 +217,9 @@
+@@ -217,9 +218,9 @@ void CheckBox::SetChecked(bool _Checked)
    Status_v->Choose();
  }
  
@@ -84,7 +86,7 @@ $NetBSD: patch-ar,v 1.1 2004/02/18 23:09:03 kristerw Exp $
      : Label(_Items[_SelectedItem], cmInvalid, _AutoResize, _direction, _fontshape),
    Items(_Items), NumItems(_NumItems), SelectedItem(_SelectedItem)
  {
-@@ -234,8 +234,8 @@
+@@ -234,8 +235,8 @@ void Selector::Choose()
  }
  
  InputLine::InputLine(const char * _text, const int _MAXTextLen, const CommandType _cc /* = cmInvalid */,
@@ -95,7 +97,7 @@ $NetBSD: patch-ar,v 1.1 2004/02/18 23:09:03 kristerw Exp $
      : Label(_text, _cc, _AutoResize, _direction, _fontshape),
    MAXTextLen(_MAXTextLen)
  {
-@@ -300,10 +300,10 @@
+@@ -300,10 +301,10 @@ void PictureSelector::SetItem(int _ItemN
  static const int invalid_number = -4888839; // can't initialize on this number
  
  InputNumber::InputNumber(const int _Number, const int _MinNumber, const int _MaxNumber,
@@ -109,7 +111,7 @@ $NetBSD: patch-ar,v 1.1 2004/02/18 23:09:03 kristerw Exp $
      : Label(" ", _cc, _AutoResize, _direction, _fontshape),
    Number(invalid_number), Valuep(_Valuep), MinNumber(_MinNumber), MaxNumber(_MaxNumber)
  {
-@@ -335,7 +335,7 @@
+@@ -335,7 +336,7 @@ void InputNumber::Deselect()
    Label::Deselect();
  }
  
diff --git a/games/wormz/patches/patch-ba b/games/wormz/patches/patch-ba
new file mode 100644
index 00000000000..c895b84b26e
--- /dev/null
+++ b/games/wormz/patches/patch-ba
@@ -0,0 +1,12 @@
+$NetBSD: patch-ba,v 1.1 2005/06/14 16:33:13 jmmv Exp $
+
+--- Xlib/XlibImage.cc.orig	2005-06-14 17:01:14.191898576 +0200
++++ Xlib/XlibImage.cc	2005-06-14 17:01:32.255152544 +0200
+@@ -2,6 +2,7 @@
+ #include <X11/Xutil.h>
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
++#include <string.h>
+ #include "Utils.hh"
+ 
+ static bool DontUseShm = FALSE;
-- 
cgit v1.2.3