From olivleh1@kartoffel.salatschuessel.net  Tue Mar 24 15:18:44 2009
Return-Path: <olivleh1@kartoffel.salatschuessel.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EC96710656C1;
	Tue, 24 Mar 2009 15:18:44 +0000 (UTC)
	(envelope-from olivleh1@kartoffel.salatschuessel.net)
Received: from kartoffel.salatschuessel.net (f054189187.adsl.alicedsl.de [78.54.189.187])
	by mx1.freebsd.org (Postfix) with ESMTP id 4ABC68FC22;
	Tue, 24 Mar 2009 15:18:43 +0000 (UTC)
	(envelope-from olivleh1@kartoffel.salatschuessel.net)
Received: from kartoffel.salatschuessel.net (localhost [127.0.0.1])
	by kartoffel.salatschuessel.net (8.14.3/8.14.3) with ESMTP id n2OFIg9l007279;
	Tue, 24 Mar 2009 16:18:42 +0100 (CET)
	(envelope-from olivleh1@kartoffel.salatschuessel.net)
Received: (from olivleh1@localhost)
	by kartoffel.salatschuessel.net (8.14.3/8.14.3/Submit) id n2OFIgrX007278;
	Tue, 24 Mar 2009 16:18:42 +0100 (CET)
	(envelope-from olivleh1)
Message-Id: <200903241518.n2OFIgrX007278@kartoffel.salatschuessel.net>
Date: Tue, 24 Mar 2009 16:18:42 +0100 (CET)
From: Oliver Lehmann <oliver@freebsd.org>
Reply-To: Oliver Lehmann <oliver@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Oliver Lehmann <oliver@freebsd.org>
Subject: [PATCH] x11-toolkits/gigi: prepare for upcoming boost 1.37.0
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         133008
>Category:       ports
>Synopsis:       [PATCH] x11-toolkits/gigi: prepare for upcoming boost 1.37.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lwhsu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 24 15:20:01 UTC 2009
>Closed-Date:    Tue Apr 07 12:18:34 UTC 2009
>Last-Modified:  Tue Apr  7 12:20:05 UTC 2009
>Originator:     Oliver Lehmann
>Release:        FreeBSD 7.1-STABLE amd64
>Organization:
>Environment:
System: FreeBSD kartoffel.salatschuessel.net 7.1-STABLE FreeBSD 7.1-STABLE #0: Sun Mar 8 02:58:44 CET 2009 olivleh1@kartoffel.salatschuessel.net:/usr/obj/usr/src/sys/KARTOFFEL amd64


>Description:
	this patch updates gigi to 0.7.0 and makes it compile with
	boost 1.37

	this PR may only be committed after boost 1.37 is in the portstree
	it was not verified to run with an earlier version of boost.
>How-To-Repeat:
>Fix:


--- gigi.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/gigi/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile	27 Feb 2009 21:24:37 -0000	1.11
+++ Makefile	24 Mar 2009 15:14:51 -0000
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gigi
-PORTVERSION=	0.6.0.20071206
-PORTREVISION=	2
+PORTVERSION=	0.7.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://ftp.alepulver.com.ar/distfiles/
+MASTER_SITES=	SF
+DISTNAME=	GG-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OpenGL Graphic User Interface Library
@@ -18,12 +18,10 @@
 		boost_python.4:${PORTSDIR}/devel/boost-python \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-USE_BZIP2=	yes
 USE_SCONS=	yes
 SCONS_ARGS=	prefix="" pkgconfigdir=""
 USE_SDL=	sdl
 USE_LDCONFIG=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}/GG
 # Ensure local headers are found first, otherwise updating would fail.
 CFLAGS+=	-I.
 
@@ -36,8 +34,10 @@
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_OGRE)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libOgreMain.so:${PORTSDIR}/graphics/ogre3d
-RUN_DEPENDS+=	${LOCALBASE}/lib/libOgreMain.so:${PORTSDIR}/graphics/ogre3d
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libOgreMain.so:${PORTSDIR}/graphics/ogre3d \
+		${LOCALBASE}/lib/libOIS.so:${PORTSDIR}/devel/ois
+RUN_DEPENDS+=	${LOCALBASE}/lib/libOgreMain.so:${PORTSDIR}/graphics/ogre3d \
+		${LOCALBASE}/lib/libOIS.so:${PORTSDIR}/devel/ois
 PLIST_SUB+=	OGRE=""
 GIGI_LIBS+=	GiGiOgre
 .else
@@ -49,6 +49,19 @@
 BROKEN=		Does not compile
 .endif
 
+post-patch:
+	${REINPLACE_CMD} -E 's|#include <boost/serialization/is_abstract.hpp>||g; \
+		s|BOOST_IS_ABSTRACT.*||g' \
+		${WRKSRC}/GG/BrowseInfoWnd.h \
+		${WRKSRC}/GG/Control.h
+	@rm -f ${WRKSRC}/GG/BrowseInfoWnd.h.bak ${WRKSRC}/GG/Control.h.bak
+	${REINPLACE_CMD} -E 's|system_error\(\) == EIO|code\(\) == boost::system::posix_error::io_error|g; \
+		s|filesystem/cerrno|system/system_error|g' \
+		${WRKSRC}/src/dialogs/FileDlg.cpp
+# for graphics/ogre3d version 1.6.x
+#	${REINPLACE_CMD} -E 's|CMPF_ALWAYS_PASS, 0)|CMPF_ALWAYS_PASS, 0, false)|g' \
+#		${WRKSRC}/src/Ogre/OgreGUI.cpp
+
 post-build:
 	@${REINPLACE_CMD} -Ee 's,^(prefix|(lib|include)dir)=,&${PREFIX},' \
 		${WRKSRC}/*.pc
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/gigi/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo	12 Dec 2007 05:13:24 -0000	1.4
+++ distinfo	24 Mar 2009 15:14:51 -0000
@@ -1,3 +1,3 @@
-MD5 (gigi-0.6.0.20071206.tar.bz2) = 558ae774b9de74b60e9f3d0e7188f6f4
-SHA256 (gigi-0.6.0.20071206.tar.bz2) = 88a6f726f6cb5aabdb9bb10752e3eb13f233a1e63d4e5052755c79ee480d2d7d
-SIZE (gigi-0.6.0.20071206.tar.bz2) = 601431
+MD5 (GG-0.7.0.tar.gz) = 360e7131fde11da55efbdd555eabf665
+SHA256 (GG-0.7.0.tar.gz) = f4ef86c2b8344085217163b6310f9c2f868929a22e864eebb200786f42a0aa54
+SIZE (GG-0.7.0.tar.gz) = 1730169
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/gigi/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- pkg-plist	12 Dec 2007 05:13:24 -0000	1.4
+++ pkg-plist	24 Mar 2009 15:14:51 -0000
@@ -61,6 +61,7 @@
 lib/libGiGiSDL.so
 lib/libGiGiSDL.so.0
 libdata/pkgconfig/GiGi.pc
+%%OGRE%%libdata/pkgconfig/GiGiOgre.pc
 libdata/pkgconfig/GiGiSDL.pc
 @dirrm include/GG/dialogs
 @dirrm include/GG/SDL
--- gigi.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->oliver 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Mar 24 15:20:38 UTC 2009 
Responsible-Changed-Why:  
Submitter has GNATS access (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=133008 
Responsible-Changed-From-To: oliver->amdmi3 
Responsible-Changed-By: oliver 
Responsible-Changed-When: Tue Mar 24 15:27:05 UTC 2009 
Responsible-Changed-Why:  
assign for fixing when boost 1.37 gets in place 

http://www.freebsd.org/cgi/query-pr.cgi?pr=133008 
Responsible-Changed-From-To: amdmi3->lwhsu 
Responsible-Changed-By: amdmi3 
Responsible-Changed-When: Tue Mar 24 15:39:30 UTC 2009 
Responsible-Changed-Why:  
Reassign to lwhsu who'll be committing boost update 

http://www.freebsd.org/cgi/query-pr.cgi?pr=133008 
State-Changed-From-To: open->closed 
State-Changed-By: lwhsu 
State-Changed-When: Tue Apr 7 12:18:33 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=133008 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/133008: commit references a PR
Date: Tue,  7 Apr 2009 12:18:39 +0000 (UTC)

 lwhsu       2009-04-07 12:18:21 UTC
 
   FreeBSD ports repository
 
   Modified files:
     x11-toolkits/gigi    Makefile distinfo pkg-plist 
   Log:
   - Update to 0.7.0
   - Fix building with boost 1.37
   
   PR:             ports/133008
   Submitted by:   oliver
   
   Revision  Changes    Path
   1.12      +20 -7     ports/x11-toolkits/gigi/Makefile
   1.5       +3 -3      ports/x11-toolkits/gigi/distinfo
   1.5       +1 -0      ports/x11-toolkits/gigi/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
