Attachment 94781 Details for Bug 133008 – gigi.diff

[patch] gigi.diff

gigi.diff (text/plain), 3.31 KB, created by Oliver Lehmann on 2009-03-24 15:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oliver Lehmann

Created: 2009-03-24 15:20:01 UTC

Size: 3.31 KB

patch

obsolete

>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

Actions: View | Diff

Attachments on bug 133008: 94781