From 7a68c60ab0bd8a7463511f6ce37ae250ec367a44 Mon Sep 17 00:00:00 2001
From: marcus <marcus@FreeBSD.org>
Date: Sun, 25 Sep 2005 01:10:12 +0000
Subject: * Fix build when no DISPLAY is defined [1] * Remove some bashisms
 from configure * Don't remove the assetml directory

Reported by:	pointyhat via kris [1]
---
 games/gcompris2/Makefile              |  6 ++++++
 games/gcompris2/files/patch-configure | 30 ++++++++++++++++++++++++------
 games/gcompris2/pkg-plist             |  1 -
 3 files changed, 30 insertions(+), 7 deletions(-)

(limited to 'games/gcompris2')

diff --git a/games/gcompris2/Makefile b/games/gcompris2/Makefile
index 948412c5bf10..96a77fee691c 100644
--- a/games/gcompris2/Makefile
+++ b/games/gcompris2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gcompris2
 PORTVERSION=	7.0.1
+PORTREVISION=	1
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gcompris
@@ -40,6 +41,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 INFO=		gcompris
 
+.if defined(PACKAGE_BUILDING)
+BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT} \
+		${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
+.endif
+
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		's|-DGNOME_DISABLE_DEPRECATED||g'
diff --git a/games/gcompris2/files/patch-configure b/games/gcompris2/files/patch-configure
index 19244ec1a41c..24c1dc04fe88 100644
--- a/games/gcompris2/files/patch-configure
+++ b/games/gcompris2/files/patch-configure
@@ -1,6 +1,24 @@
---- configure.orig	Sat Feb 28 08:33:22 2004
-+++ configure	Sat Feb 28 11:14:06 2004
-@@ -12767,7 +12767,7 @@
+--- configure.orig	Sat Sep 24 19:05:39 2005
++++ configure	Sat Sep 24 19:07:01 2005
+@@ -23331,7 +23331,7 @@
+   USE_XRANDR="yes"
+ fi;
+ found_randr=no
+-if test "x$USE_XRANDR" == "xyes" ; then
++if test "x$USE_XRANDR" = "xyes" ; then
+   RANDR_LIBS=
+   echo "$as_me:$LINENO: checking for XRRSetScreenConfigAndRate in -lXrandr" >&5
+ echo $ECHO_N "checking for XRRSetScreenConfigAndRate in -lXrandr... $ECHO_C" >&6
+@@ -25072,7 +25072,7 @@
+ else
+   USE_DEBUG="no"
+ fi;
+-if test "x$USE_DEBUG" == "xyes" ; then
++if test "x$USE_DEBUG" = "xyes" ; then
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define DEBUG 1
+@@ -25176,7 +25176,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
@@ -9,7 +27,7 @@
  _ACEOF
  
  
-@@ -12775,7 +12775,7 @@
+@@ -25184,7 +25184,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
@@ -18,7 +36,7 @@
  _ACEOF
  
  
-@@ -12795,7 +12795,7 @@
+@@ -25215,7 +25215,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
@@ -27,7 +45,7 @@
  _ACEOF
  
  
-@@ -13372,11 +13372,11 @@
+@@ -26331,11 +26331,11 @@
  
  
  
diff --git a/games/gcompris2/pkg-plist b/games/gcompris2/pkg-plist
index 85ff5b2fb3f9..dda1a1e6c59b 100644
--- a/games/gcompris2/pkg-plist
+++ b/games/gcompris2/pkg-plist
@@ -3211,7 +3211,6 @@ share/locale/zh_CN/LC_MESSAGES/gcompris.mo
 @dirrm share/gnome/gcompris/boards/advanced_colors
 @dirrm share/gnome/gcompris/boards
 @dirrm share/gnome/gcompris
-@dirrm share/gnome/assetml
 @dirrm share/gcompris/python/gcompris/utils
 @dirrm share/gcompris/python/gcompris/timer
 @dirrm share/gcompris/python/gcompris/sound
-- 
cgit