From 83a62cd79e40dd93a6124fe04165e1deb939e85a Mon Sep 17 00:00:00 2001
From: rh <rh>
Date: Sun, 12 May 2002 00:28:23 +0000
Subject: Make freecell and gnome-stones set their required CFLAGS properly.
 Bump PKGREVISION.

---
 games/gnome-games/Makefile         |  4 ++--
 games/gnome-games/distinfo         |  9 +++++----
 games/gnome-games/patches/patch-ad | 16 ++++++++++++----
 games/gnome-games/patches/patch-ae | 13 +++++++++----
 games/gnome-games/patches/patch-af |  9 +++++----
 5 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index c48c9edc2fd..7be695a5397 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2002/03/13 17:37:00 fredb Exp $
+# $NetBSD: Makefile,v 1.36 2002/05/12 00:28:23 rh Exp $
 
 DISTNAME=		gnome-games-1.4.0.3
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		games gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gnome-games/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo
index a3b7a05d8dc..1b4716f2ba6 100644
--- a/games/gnome-games/distinfo
+++ b/games/gnome-games/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.6 2001/12/12 14:59:14 wiz Exp $
+$NetBSD: distinfo,v 1.7 2002/05/12 00:28:23 rh Exp $
 
 SHA1 (gnome-games-1.4.0.3.tar.bz2) = 1e2232aab41a53004db5b0e3eaf69896ad430f29
 Size (gnome-games-1.4.0.3.tar.bz2) = 7052953 bytes
 SHA1 (patch-aa) = 888cf35c192d70e2edd1e4f656b69eac25c2e88a
 SHA1 (patch-ab) = a65a783eca7102c3ecb5352f7ce855b75434388b
 SHA1 (patch-ac) = 71cf86496f6a8cf5f3291a7e046704e3ed0855ed
-SHA1 (patch-ad) = df442b8054ab515e32c6ce667d5ebb8af1342b8c
-SHA1 (patch-ae) = 585442dc89430094211d598af63095ba7a99a055
-SHA1 (patch-af) = c370320ef670b855d0400245015527942b90f5da
+SHA1 (patch-ad) = 268de04b74b35a5ed37b9b3abc592100af3ad4fc
+SHA1 (patch-ae) = 3cb3e3cea44a092ab65d45f3557888a090bf8369
+SHA1 (patch-af) = 99ecb1786e6a32824ab30e81d7c9e4a31107a6ff
+SHA1 (patch-ag) = c9f2f6916f97d4996b61c89bd18128e105ee8eb7
diff --git a/games/gnome-games/patches/patch-ad b/games/gnome-games/patches/patch-ad
index 5e23969307c..3a4fd8137e9 100644
--- a/games/gnome-games/patches/patch-ad
+++ b/games/gnome-games/patches/patch-ad
@@ -1,8 +1,16 @@
-$NetBSD: patch-ad,v 1.4 2001/12/12 14:59:14 wiz Exp $
+$NetBSD: patch-ad,v 1.5 2002/05/12 00:28:23 rh Exp $
 
---- aclocal.m4.orig	Sun May 21 23:56:34 2000
-+++ aclocal.m4	Thu Nov  9 18:58:34 2000
-@@ -1594,7 +1594,7 @@
+--- aclocal.m4.orig	Thu Jul 12 06:02:03 2001
++++ aclocal.m4
+@@ -4298,6 +4298,7 @@
+   fi
+   AC_SUBST(GDK_PIXBUF_CFLAGS)
+   AC_SUBST(GDK_PIXBUF_LIBS)
++  CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS"
+   rm -f conf.gdk_pixbuftest
+ ])
+ 
+@@ -4697,7 +4698,7 @@
  		  [CATOBJEXT=.gmo
  		   DATADIRNAME=share],
  		  [CATOBJEXT=.mo
diff --git a/games/gnome-games/patches/patch-ae b/games/gnome-games/patches/patch-ae
index 2893284614f..70d1c172820 100644
--- a/games/gnome-games/patches/patch-ae
+++ b/games/gnome-games/patches/patch-ae
@@ -1,8 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2000/11/26 14:20:38 mycroft Exp $
+$NetBSD: patch-ae,v 1.2 2002/05/12 00:28:23 rh Exp $
 
---- gnome-stones/objects/Makefile.am.orig	Sun Nov 26 13:55:25 2000
-+++ gnome-stones/objects/Makefile.am	Sun Nov 26 13:53:34 2000
-@@ -10,5 +10,7 @@
+--- gnome-stones/objects/Makefile.am.orig	Tue Nov 10 14:55:56 1998
++++ gnome-stones/objects/Makefile.am
+@@ -6,9 +6,11 @@
+ 	-I$(GSTONES_SRC_DIR)				\
+ 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
+ 	-I$(includedir)					\
+-	$(GNOME_INCLUDEDIR)
++	$(GNOME_INCLUDEDIR) $(GDK_PIXBUF_CFLAGS)
  
  object_LTLIBRARIES = libgnome-stones.la libgnomekoban.la
  
diff --git a/games/gnome-games/patches/patch-af b/games/gnome-games/patches/patch-af
index bdf66707126..586784c8f7d 100644
--- a/games/gnome-games/patches/patch-af
+++ b/games/gnome-games/patches/patch-af
@@ -1,11 +1,12 @@
-$NetBSD: patch-af,v 1.1 2000/11/26 14:41:12 mycroft Exp $
+$NetBSD: patch-af,v 1.2 2002/05/12 00:28:23 rh Exp $
 
---- gnome-stones/Makefile.am.orig	Tue Apr  6 08:39:55 1999
-+++ gnome-stones/Makefile.am	Sun Nov 26 14:38:30 2000
-@@ -37,6 +37,7 @@
+--- gnome-stones/Makefile.am.orig	Sun Jul  8 18:56:41 2001
++++ gnome-stones/Makefile.am
+@@ -37,6 +37,8 @@
  	view.c                                  \
  	view.h
  
++gnome_stones_CFLAGS = ${GDK_PIXBUF_CFLAGS}
 +gnome_stones_LDFLAGS = -export-dynamic
  gnome_stones_LDADD =				\
  	$(GNOME_LIBDIR)				\
-- 
cgit v1.2.3