Attachment #136311 for bug #181491

View | Details | Raw Unified | Return to bug 181491
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	clanlib
PORTVERSION=	2.3.7
PORTREVISION=	1
PORTEPOCH=	1
CATEGORIES=	devel
MASTER_SITES=	http://www.clanlib.org/download/releases-2.0/

		mikmod:${PORTSDIR}/audio/libmikmod \
		vorbis:${PORTSDIR}/audio/libvorbis \
		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
		pcre:${PORTSDIR}/devel/pcre \
		execinfo:${PORTSDIR}/devel/libexecinfo

USE_GMAKE=	yes
USE_GCC=	yes

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>

Lines 1-2 Link Here

(-)clanlib/distinfo (-2 / +2 lines)
1	SHA256 (ClanLib-2.3.6.tgz) = b8dc9b41028bf16c0a6082aa15cdee5d8b1ecd5256797576970f09a63e3fafde	1	SHA256 (ClanLib-2.3.7.tgz) = d46127c08103f48d15936ceb9f95b3dfb1ff8ccba667cef1b3f8e639cb2601c2
2	SIZE (ClanLib-2.3.6.tgz) = 25605576	2	SIZE (ClanLib-2.3.7.tgz) = 26132425

Lines 1-11 Link Here

(-)clanlib/files/patch-Sources__Core__System__Unix__init_linux.cpp (-11 lines)
1	--- ./Sources/Core/System/Unix/init_linux.cpp.orig 2012-03-05 06:24:31.000000000 -0500
2	+++ ./Sources/Core/System/Unix/init_linux.cpp 2012-09-25 07:42:19.000000000 -0400
3	@@ -111,7 +111,7 @@
4
5	#else
6	#ifndef PROC_EXE_PATH
7	-#define PROC_EXE_PATH "/proc/self/exe"
8	+#define PROC_EXE_PATH "/proc/curproc/file"
9	#endif
10	int size;
11	struct stat sb;




--- ./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);

Return to bug 181491

Lines 2-9 Link Here

(-)clanlib/Makefile (-4 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= clanlib	4	PORTNAME= clanlib
5	PORTVERSION= 2.3.6	5	PORTVERSION= 2.3.7
6	PORTREVISION= 1
7	PORTEPOCH= 1	6	PORTEPOCH= 1
8	CATEGORIES= devel	7	CATEGORIES= devel
9	MASTER_SITES= http://www.clanlib.org/download/releases-2.0/	8	MASTER_SITES= http://www.clanlib.org/download/releases-2.0/
Lines 21-27 Link Here
21	mikmod:${PORTSDIR}/audio/libmikmod \	20	mikmod:${PORTSDIR}/audio/libmikmod \
22	vorbis:${PORTSDIR}/audio/libvorbis \	21	vorbis:${PORTSDIR}/audio/libvorbis \
23	fontconfig:${PORTSDIR}/x11-fonts/fontconfig \	22	fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
24	pcre:${PORTSDIR}/devel/pcre	23	pcre:${PORTSDIR}/devel/pcre \
		24	execinfo:${PORTSDIR}/devel/libexecinfo
25		25
26	USE_GMAKE= yes	26	USE_GMAKE= yes
27	USE_GCC= yes	27	USE_GCC= yes
Lines 56-60 Link Here
56	post-patch:	56	post-patch:
57	@${REINPLACE_CMD} -e 's\|LIBS="-lsqlite3 -ldl"\|LIBS="-lsqlite3"\|g' \	57	@${REINPLACE_CMD} -e 's\|LIBS="-lsqlite3 -ldl"\|LIBS="-lsqlite3"\|g' \
58	${WRKSRC}/configure	58	${WRKSRC}/configure
59		59	@${REINPLACE_CMD} -e '114 s\|/proc/self/exe\|/proc/curproc/file\|g' \
		60	${WRKSRC}/Sources/Core/System/Unix/init_linux.cpp
		61	@${REINPLACE_CMD} -e 's\|APPLE\|FreeBSD\|g' \
		62	${WRKSRC}/Sources/Core/System/system.cpp
		63	@${REINPLACE_CMD} -e '47 s\|#ifndef __FreeBSD__\|#if !defined(__FreeBSD__)\|g' \
		64	${WRKSRC}/Sources/Core/System/system.cpp
60	.include <bsd.port.mk>	65	.include <bsd.port.mk>

Lines 1-34 Link Here

(-)clanlib/files/patch-Sources__Core__System__system.cpp (-34 lines)
1	--- ./Sources/Core/System/system.cpp.orig 2012-09-25 07:46:49.000000000 -0400
2	+++ ./Sources/Core/System/system.cpp 2012-09-25 07:57:19.000000000 -0400
3	@@ -1,3 +1,4 @@
4	+
5	/*
6	** ClanLib SDK
7	** Copyright (c) 1997-2011 The ClanLib Team
8	@@ -44,7 +45,7 @@
9	#include <sys/sysctl.h>
10	#endif
11
12	-#ifndef __APPLE__
13	+#if !(defined(__APPLE__) \|\| defined(__FreeBSD__))
14	#include <execinfo.h>
15	#endif
16	#include <cxxabi.h>
17	@@ -128,7 +129,7 @@
18	*out_hash = 0;
19	return capturedFrames;
20
21	-#elif !defined(__APPLE__)
22	+#elif !(defined(__APPLE__) \|\| defined(__FreeBSD__))
23	// Ensure the output is cleared
24	memset(out_frames, 0, (sizeof(void )) max_frames);
25
26	@@ -188,7 +189,7 @@
27	SymCleanup(GetCurrentProcess());
28	return backtrace_text;
29
30	-#elif !defined(__APPLE__)
31	+#elif !(defined(__APPLE__) \|\| defined(__FreeBSD__))
32
33	char **strings;
34	strings = backtrace_symbols(frames, num_frames);