From 585edc213e86a3e3e75f297b3e3dc68aaba9d855 Mon Sep 17 00:00:00 2001
From: fgsch <fgsch@openbsd.org>
Date: Thu, 15 Dec 2011 17:59:21 +0000
Subject: [PATCH] Update to eboard 1.1.1. ajacoutot@ ok

---
 games/eboard/Makefile                | 18 ++++++++----------
 games/eboard/distinfo                | 10 +++++-----
 games/eboard/patches/patch-cimg_cc   | 14 ++++----------
 games/eboard/patches/patch-configure |  8 ++++----
 4 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/games/eboard/Makefile b/games/eboard/Makefile
index 89da6073ab6..b18b1290778 100644
--- a/games/eboard/Makefile
+++ b/games/eboard/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.44 2011/09/16 09:48:09 espie Exp $
+# $OpenBSD: Makefile,v 1.45 2011/12/15 17:59:21 fgsch Exp $
 
 COMMENT=	gtk+2 chess board interface
 
-DISTNAME=	eboard-1.0.4
-REVISION=	8
+DISTNAME=	eboard-1.1.1
 CATEGORIES=	games x11
 
 HOMEPAGE=	http://www.bergo.eng.br/eboard/
@@ -14,13 +13,12 @@ PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
-WANTLIB= 	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
-		Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig \
-		freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 \
-		m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 \
-		png pthread pthread-stubs sndio stdc++ xcb z gdk_pixbuf-2.0 \
-		gdk-x11-2.0 gtk-x11-2.0
-
+WANTLIB =	GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama \
+		Xrandr Xrender atk-1.0 c cairo expat fontconfig freetype \
+		gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
+		gobject-2.0 gthread-2.0 gtk-x11-2.0 m pango-1.0 \
+		pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread \
+		pthread-stubs sndio stdc++ xcb xcb-render xcb-shm z
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=eboard/}
 
diff --git a/games/eboard/distinfo b/games/eboard/distinfo
index 24463196c57..b3f36f839ad 100644
--- a/games/eboard/distinfo
+++ b/games/eboard/distinfo
@@ -1,5 +1,5 @@
-MD5 (eboard-1.0.4.tar.bz2) = K9KSemcO0jWUy/UkvFdG7w==
-RMD160 (eboard-1.0.4.tar.bz2) = 8SsJJ8qEhBjrRadbz/imQXZq4zw=
-SHA1 (eboard-1.0.4.tar.bz2) = RJOHVBQAQ/xkFD6RBnyVtsXJlwk=
-SHA256 (eboard-1.0.4.tar.bz2) = zQjt+uE1HT2MnqV8gpFBI7ZqD92uX84Nq15ktOpfcMQ=
-SIZE (eboard-1.0.4.tar.bz2) = 453603
+MD5 (eboard-1.1.1.tar.bz2) = A9zaoryFIYsbGMS+4nb+pw==
+RMD160 (eboard-1.1.1.tar.bz2) = E73+bTOhQ9YZxsW+jYSc7ZuV4sQ=
+SHA1 (eboard-1.1.1.tar.bz2) = Apzx51A/wqhiuYgNqepquR5WFM0=
+SHA256 (eboard-1.1.1.tar.bz2) = rZcQhml8DVocimRAH2Z1M56DKss4bclvpOF9oYMsom4=
+SIZE (eboard-1.1.1.tar.bz2) = 462386
diff --git a/games/eboard/patches/patch-cimg_cc b/games/eboard/patches/patch-cimg_cc
index 1ac692de466..cbde4aa0f96 100644
--- a/games/eboard/patches/patch-cimg_cc
+++ b/games/eboard/patches/patch-cimg_cc
@@ -1,10 +1,10 @@
-$OpenBSD: patch-cimg_cc,v 1.1 2011/07/08 20:36:09 naddy Exp $
+$OpenBSD: patch-cimg_cc,v 1.2 2011/12/15 17:59:21 fgsch Exp $
 
 Fix build with png-1.5.
 
---- cimg.cc.orig	Wed May 23 12:57:45 2007
-+++ cimg.cc	Tue Jul  5 23:44:41 2011
-@@ -95,16 +95,16 @@ CImg::CImg(const char *filename) {
+--- cimg.cc.orig	Wed Dec 14 23:31:38 2011
++++ cimg.cc	Wed Dec 14 23:32:22 2011
+@@ -94,11 +94,11 @@ CImg::CImg(const char *filename) {
        ct == PNG_COLOR_TYPE_GRAY_ALPHA)
      png_set_gray_to_rgb(pngp);
  
@@ -13,12 +13,6 @@ Fix build with png-1.5.
    if (!ok) { fclose(f); return; }
    ok = 0;
  
--  rp = (png_bytep *) malloc(sizeof(png_bytep) * (pngp->height));
-+  rp = (png_bytep *) malloc(sizeof(png_bytep) * (png_get_image_height(pngp, infp)));
-   if (rp==NULL) {
-     fclose(f); return;
-   }
- 
 -  for(i=0;i<pngp->height;i++) {
 +  for(i=0;i<png_get_image_height(pngp, infp);i++) {
      png_read_row(pngp, (png_bytep) (&data[i*rowlen]), NULL);
diff --git a/games/eboard/patches/patch-configure b/games/eboard/patches/patch-configure
index ec6432edad3..fca18684ea4 100644
--- a/games/eboard/patches/patch-configure
+++ b/games/eboard/patches/patch-configure
@@ -1,9 +1,9 @@
-$OpenBSD: patch-configure,v 1.4 2010/01/07 09:49:21 jakemsr Exp $
---- configure.orig	Wed May 23 11:57:45 2007
-+++ configure	Sat Dec 26 03:23:34 2009
+$OpenBSD: patch-configure,v 1.5 2011/12/15 17:59:21 fgsch Exp $
+--- configure.orig	Fri Feb 22 13:51:22 2008
++++ configure	Wed Dec 14 23:30:00 2011
 @@ -6,8 +6,8 @@ my $prefix      = "/usr/local";
  my $package     = "eboard";
- my $version     = "1.0.4";
+ my $version     = "1.1.1";
  my $cxx         = "g++";
 -my @cxxflags    = ("-O6");
 -my @ldflags     = ("-lpthread");