Attachment 136311 Details for Bug 181491 – file.diff

[patch] file.diff

file.diff (text/plain), 3.39 KB, created by Chris Petrik on 2013-08-23 19:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Petrik

Created: 2013-08-23 19:20:00 UTC

Size: 3.39 KB

patch

obsolete

>Index: clanlib/Makefile
>===================================================================
>--- clanlib/Makefile	(revision 325046)
>+++ clanlib/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	clanlib
>-PORTVERSION=	2.3.6
>-PORTREVISION=	1
>+PORTVERSION=	2.3.7
> PORTEPOCH=	1
> CATEGORIES=	devel
> MASTER_SITES=	http://www.clanlib.org/download/releases-2.0/
>@@ -21,7 +20,8 @@
> 		mikmod:${PORTSDIR}/audio/libmikmod \
> 		vorbis:${PORTSDIR}/audio/libvorbis \
> 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
>-		pcre:${PORTSDIR}/devel/pcre
>+		pcre:${PORTSDIR}/devel/pcre \
>+		execinfo:${PORTSDIR}/devel/libexecinfo
> 
> USE_GMAKE=	yes
> USE_GCC=	yes
>@@ -56,5 +56,10 @@
> post-patch:
> 	@${REINPLACE_CMD} -e 's|LIBS="-lsqlite3 -ldl"|LIBS="-lsqlite3"|g' \
> 		${WRKSRC}/configure
>-
>+	@${REINPLACE_CMD} -e '114 s|/proc/self/exe|/proc/curproc/file|g' \
>+		${WRKSRC}/Sources/Core/System/Unix/init_linux.cpp
>+	@${REINPLACE_CMD} -e 's|APPLE|FreeBSD|g' \
>+		${WRKSRC}/Sources/Core/System/system.cpp
>+	@${REINPLACE_CMD} -e '47 s|#ifndef __FreeBSD__|#if !defined(__FreeBSD__)|g' \
>+		${WRKSRC}/Sources/Core/System/system.cpp
> .include <bsd.port.mk>
>Index: clanlib/distinfo
>===================================================================
>--- clanlib/distinfo	(revision 325046)
>+++ clanlib/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (ClanLib-2.3.6.tgz) = b8dc9b41028bf16c0a6082aa15cdee5d8b1ecd5256797576970f09a63e3fafde
>-SIZE (ClanLib-2.3.6.tgz) = 25605576
>+SHA256 (ClanLib-2.3.7.tgz) = d46127c08103f48d15936ceb9f95b3dfb1ff8ccba667cef1b3f8e639cb2601c2
>+SIZE (ClanLib-2.3.7.tgz) = 26132425
>Index: clanlib/files/patch-Sources__Core__System__Unix__init_linux.cpp
>===================================================================
>--- clanlib/files/patch-Sources__Core__System__Unix__init_linux.cpp	(revision 325046)
>+++ clanlib/files/patch-Sources__Core__System__Unix__init_linux.cpp	(working copy)
>@@ -1,11 +0,0 @@
>---- ./Sources/Core/System/Unix/init_linux.cpp.orig	2012-03-05 06:24:31.000000000 -0500
>-+++ ./Sources/Core/System/Unix/init_linux.cpp	2012-09-25 07:42:19.000000000 -0400
>-@@ -111,7 +111,7 @@
>- 
>- #else
>- #ifndef PROC_EXE_PATH
>--#define PROC_EXE_PATH "/proc/self/exe"
>-+#define PROC_EXE_PATH "/proc/curproc/file"
>- #endif
>- 	int size;
>- 	struct stat sb;
>Index: clanlib/files/patch-Sources__Core__System__system.cpp
>===================================================================
>--- clanlib/files/patch-Sources__Core__System__system.cpp	(revision 325046)
>+++ clanlib/files/patch-Sources__Core__System__system.cpp	(working copy)
>@@ -1,34 +0,0 @@
>---- ./Sources/Core/System/system.cpp.orig	2012-09-25 07:46:49.000000000 -0400
>-+++ ./Sources/Core/System/system.cpp	2012-09-25 07:57:19.000000000 -0400
>-@@ -1,3 +1,4 @@
>-+
>- /*
>- **  ClanLib SDK
>- **  Copyright (c) 1997-2011 The ClanLib Team
>-@@ -44,7 +45,7 @@
>- #include <sys/sysctl.h>
>- #endif
>- 
>--#ifndef __APPLE__
>-+#if !(defined(__APPLE__) || defined(__FreeBSD__))
>- #include <execinfo.h>
>- #endif
>- #include <cxxabi.h>
>-@@ -128,7 +129,7 @@
>- 		*out_hash = 0;
>- 	return capturedFrames;
>- 
>--#elif !defined(__APPLE__)
>-+#elif !(defined(__APPLE__) || defined(__FreeBSD__))
>- 	// Ensure the output is cleared
>- 	memset(out_frames, 0, (sizeof(void *)) * max_frames);
>- 
>-@@ -188,7 +189,7 @@
>- 	SymCleanup(GetCurrentProcess());
>- 	return backtrace_text;
>- 
>--#elif !defined(__APPLE__)
>-+#elif !(defined(__APPLE__) || defined(__FreeBSD__))
>- 
>- 	char **strings;
>-  	strings = backtrace_symbols(frames, num_frames);

Actions: View | Diff

Attachments on bug 181491: 136311