From 8e65d0ba9168ba8b05ea5e89562124e3c081bb91 Mon Sep 17 00:00:00 2001
From: Thomas Gellekum <tg@FreeBSD.org>
Date: Thu, 1 Jul 2004 11:27:30 +0000
Subject: Upgrade to 0.6.5b.

Use gtkmm-2.4; this should fix the build problems on -stable.
---
 games/freedoko/Makefile                | 21 +++++++++++++--------
 games/freedoko/distinfo                |  4 ++--
 games/freedoko/files/patch-Makefile.os | 13 +++++++++++++
 3 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 games/freedoko/files/patch-Makefile.os

(limited to 'games/freedoko')

diff --git a/games/freedoko/Makefile b/games/freedoko/Makefile
index a79d4c292dc9..e96fb4b5b132 100644
--- a/games/freedoko/Makefile
+++ b/games/freedoko/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freedoko
-PORTVERSION=	0.6.5
+PORTVERSION=	0.6.5b
 #PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -16,21 +16,26 @@ DISTNAME=	FreeDoko_${PORTVERSION}.src
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Play the card game Doppelkopf
 
-LIB_DEPENDS=    gtkmm-2.0.6:${PORTSDIR}/x11-toolkits/gtk--2
+LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
 
 USE_ZIP=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME:C/\.src$//}/src
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
+USE_GCC=	3.3
 MAKE_ENV=	OSTYPE=linux-gnu DATADIR=${DATADIR}
 
 CPIOFLAGS=	--quiet -pdum -R ${SHAREOWN}:${SHAREGRP}
 DATASUBDIRS=	ai backgrounds cardsets rules translations
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		"Does not compile on 4.x (port and dependencies need recent C++ compiler)"
-.endif
+post-patch:
+	@for f in ${WRKSRC}/ui/gtkmm/*.cpp ${WRKSRC}/ui/gtkmm/widgets/*.cpp ${WRKSRC}/ui/gtkmm/widgets/*.h; \
+	do \
+		${REINPLACE_CMD} -e "s/SigC::slot/sigc::mem_fun/g" \
+			-e "s/SigC::Connection/sigc::connection/g" \
+			-e "s/SigC::Slot/sigc::slot/g" \
+			-e "s/SigC/sigc/g" $$f; \
+	done
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/FreeDoko ${PREFIX}/bin
@@ -43,4 +48,4 @@ do-install:
 	@cd ${WRKSRC}/../doc && \
 	 ${FIND} . ! -name Makefile\* | ${CPIO} ${CPIOFLAGS} ${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/freedoko/distinfo b/games/freedoko/distinfo
index d056e805c928..de8d540fad2a 100644
--- a/games/freedoko/distinfo
+++ b/games/freedoko/distinfo
@@ -1,2 +1,2 @@
-MD5 (FreeDoko_0.6.5.src.zip) = 3aa2a66dddc0cd9414838a4983b3011d
-SIZE (FreeDoko_0.6.5.src.zip) = 2902832
+MD5 (FreeDoko_0.6.5b.src.zip) = 54e6b0d32275009b76e40b55b7b4a20c
+SIZE (FreeDoko_0.6.5b.src.zip) = 2905444
diff --git a/games/freedoko/files/patch-Makefile.os b/games/freedoko/files/patch-Makefile.os
new file mode 100644
index 000000000000..8c575fbf87bb
--- /dev/null
+++ b/games/freedoko/files/patch-Makefile.os
@@ -0,0 +1,13 @@
+--- Makefile.os~	Fri Jun 25 11:51:12 2004
++++ Makefile.os	Tue Jun 29 10:23:02 2004
+@@ -23,8 +23,8 @@
+ 	DEPGEN_FLAGS ?= -MMD -MP
+ 	override CPPFLAGS += -DLINUX
+ 	ifeq ($(USE_UI_GTKMM), true)
+-		INCLUDE_GTKMM ?= `pkg-config --cflags gtkmm-2.0`
+-		LIBS_GTKMM ?= `pkg-config --libs gtkmm-2.0`
++		INCLUDE_GTKMM ?= `pkg-config --cflags gtkmm-2.4`
++		LIBS_GTKMM ?= `pkg-config --libs gtkmm-2.4`
+ 	endif
+ endif
+ 
-- 
cgit v1.2.3