Attachment #122792 for bug #166050




#

PORTNAME=	peekabot
PORTVERSION=	0.8.6
PORTREVISION=	1
CATEGORIES=	science
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}.x

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Distributed real-time 3D visualization tool for robotics researchers

LIB_DEPENDS=	boost_regex.4:${PORTSDIR}/devel/boost-libs \
		xerces-c.3:${PORTSDIR}/textproc/xerces-c3 \
		fltk.1:${PORTSDIR}/x11-toolkits/fltk \
		gtkglextmm-x11-1.2:${PORTSDIR}/x11-toolkits/gtkglextmm

LICENSE=	BSL GPLv3
LICENSE_COMB=	multi

GNU_CONFIGURE=	yes
CPPFLAGS+=	`fltk-config --cflags`
LDFLAGS+=	`fltk-config --ldflags`
USE_LDCONFIG=	yes
USE_BZIP2=	yes
USE_GMAKE=	yes
USE_GNOME=	gnomehack
#Internal compiler error with < 4.4
USE_GCC=	4.4+
USE_GMAKE=	yes
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes
MAKE_JOBS_SAFE=	yes

CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

.include <bsd.port.pre.mk>


BROKEN=		does not compile with boost on sparc64
.endif

post-patch:
	@${REINPLACE_CMD} -e \
		"/names_next_round/s|'xerces-c'|'xerces-c-3.1'|" ${WRKSRC}/configure
	@${REINPLACE_CMD} -e \
		"/^AM_/s|-O2||" ${WRKSRC}/src/Makefile.in

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)science/peekabot/distinfo (-2 / +2 lines)
1	SHA256 (peekabot-0.8.4.tar.bz2) = 5104c33006947eafc1a89fe4d774414c87419cad371f40f703f2f6e65d3a0f1a	1	SHA256 (peekabot-0.8.6.tar.bz2) = d4f05cc0b4e7df6da5ae7b0ac9c0fb12f8ed54d0e771d335f978b5135bc46113
2	SIZE (peekabot-0.8.4.tar.bz2) = 2711144	2	SIZE (peekabot-0.8.6.tar.bz2) = 2786521




--- src/gui/SceneViewFrame.cc.orig	2011-06-26 14:46:09.000000000 +0200
+++ src/gui/SceneViewFrame.cc	2011-06-26 14:46:56.000000000 +0200
@@ -50,10 +50,11 @@
       m_gui(layout.get_gui()),
       m_gl_area(m_gui.get_gl_config(), true),
       m_cameras_model(Gtk::ListStore::create(m_camera_cols)),
-      m_cameras(m_cameras_model),
       m_cam_id(0xFFFFFFFF),
       m_layer_table(2, 5, true)
 {
+    m_cameras.set_model(m_cameras_model);
+
     for( std::size_t i = 0; i < NUMBER_OF_LAYERS; ++i )
         m_layers[i] = (i == 0);


Return to bug 166050

Lines 6-35 Link Here

(-)science/peekabot/Makefile (-12 / +18 lines)
6	#	6	#
7		7
8	PORTNAME= peekabot	8	PORTNAME= peekabot
9	PORTVERSION= 0.8.4	9	PORTVERSION= 0.8.6
10	PORTREVISION= 1
11	CATEGORIES= science	10	CATEGORIES= science
12	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}.x/	11	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}.x
13		12
14	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= ports@FreeBSD.org
15	COMMENT= Distributed real-time 3D visualization tool for robotics researchers	14	COMMENT= Distributed real-time 3D visualization tool for robotics researchers
16		15
17	LIB_DEPENDS= boost_regex.4:${PORTSDIR}/devel/boost-libs \	16	LIB_DEPENDS= boost_regex.4:${PORTSDIR}/devel/boost-libs \
18	xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \	17	xerces-c.3:${PORTSDIR}/textproc/xerces-c3 \
19	fltk.1:${PORTSDIR}/x11-toolkits/fltk \
20	gtkglextmm-x11-1.2:${PORTSDIR}/x11-toolkits/gtkglextmm	18	gtkglextmm-x11-1.2:${PORTSDIR}/x11-toolkits/gtkglextmm
21		19
22	BROKEN= does not compile	20	LICENSE= BSL GPLv3
		21	LICENSE_COMB= multi
23		22
24	GNU_CONFIGURE= yes
25	CPPFLAGS+= `fltk-config --cflags`
26	LDFLAGS+= `fltk-config --ldflags`
27	USE_LDCONFIG= yes
28	USE_BZIP2= yes	23	USE_BZIP2= yes
29	USE_GMAKE= yes
30	USE_GNOME= gnomehack	24	USE_GNOME= gnomehack
31	#Internal compiler error with < 4.4
32	USE_GCC= 4.4+	25	USE_GCC= 4.4+
		26	USE_GMAKE= yes
		27	GNU_CONFIGURE= yes
		28	USE_LDCONFIG= yes
		29	MAKE_JOBS_SAFE= yes
		30
		31	CPPFLAGS+= -I${LOCALBASE}/include
		32	LDFLAGS+= -L${LOCALBASE}/lib
33		33
34	.include <bsd.port.pre.mk>	34	.include <bsd.port.pre.mk>
35		35
Lines 37-40 Link Here
37	BROKEN= does not compile with boost on sparc64	37	BROKEN= does not compile with boost on sparc64
38	.endif	38	.endif
39		39
		40	post-patch:
		41	@${REINPLACE_CMD} -e \
		42	"/names_next_round/s\|'xerces-c'\|'xerces-c-3.1'\|" ${WRKSRC}/configure
		43	@${REINPLACE_CMD} -e \
		44	"/^AM_/s\|-O2\|\|" ${WRKSRC}/src/Makefile.in
		45
40	.include <bsd.port.post.mk>	46	.include <bsd.port.post.mk>

Lines 1-15 Link Here

(-)science/peekabot/files/patch-src_gui_ScreneViewFrame.cc (-15 lines)
1	--- src/gui/SceneViewFrame.cc.orig 2011-06-26 14:46:09.000000000 +0200
2	+++ src/gui/SceneViewFrame.cc 2011-06-26 14:46:56.000000000 +0200
3	@@ -50,10 +50,11 @@
4	m_gui(layout.get_gui()),
5	m_gl_area(m_gui.get_gl_config(), true),
6	m_cameras_model(Gtk::ListStore::create(m_camera_cols)),
7	- m_cameras(m_cameras_model),
8	m_cam_id(0xFFFFFFFF),
9	m_layer_table(2, 5, true)
10	{
11	+ m_cameras.set_model(m_cameras_model);
12	+
13	for( std::size_t i = 0; i < NUMBER_OF_LAYERS; ++i )
14	m_layers[i] = (i == 0);
15