Attachment 122792 Details for Bug 166050 – file.diff

[patch] file.diff

file.diff (text/plain), 2.92 KB, created by tkato432 on 2012-03-13 18:10:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2012-03-13 18:10:12 UTC

Size: 2.92 KB

patch

obsolete

>diff -urN /usr/ports/science/peekabot/Makefile science/peekabot/Makefile
>--- /usr/ports/science/peekabot/Makefile	2011-11-01 19:42:46.000000000 +0900
>+++ science/peekabot/Makefile	2012-02-28 05:58:00.000000000 +0900
>@@ -6,30 +6,30 @@
> #
> 
> PORTNAME=	peekabot
>-PORTVERSION=	0.8.4
>-PORTREVISION=	1
>+PORTVERSION=	0.8.6
> CATEGORIES=	science
>-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}.x/
>+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.27:${PORTSDIR}/textproc/xerces-c2 \
>-		fltk.1:${PORTSDIR}/x11-toolkits/fltk \
>+		xerces-c.3:${PORTSDIR}/textproc/xerces-c3 \
> 		gtkglextmm-x11-1.2:${PORTSDIR}/x11-toolkits/gtkglextmm
> 
>-BROKEN=		does not compile
>+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>
> 
>@@ -37,4 +37,10 @@
> 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>
>diff -urN /usr/ports/science/peekabot/distinfo science/peekabot/distinfo
>--- /usr/ports/science/peekabot/distinfo	2011-02-05 22:52:30.000000000 +0900
>+++ science/peekabot/distinfo	2012-02-28 04:45:57.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (peekabot-0.8.4.tar.bz2) = 5104c33006947eafc1a89fe4d774414c87419cad371f40f703f2f6e65d3a0f1a
>-SIZE (peekabot-0.8.4.tar.bz2) = 2711144
>+SHA256 (peekabot-0.8.6.tar.bz2) = d4f05cc0b4e7df6da5ae7b0ac9c0fb12f8ed54d0e771d335f978b5135bc46113
>+SIZE (peekabot-0.8.6.tar.bz2) = 2786521
>diff -urN /usr/ports/science/peekabot/files/patch-src_gui_ScreneViewFrame.cc science/peekabot/files/patch-src_gui_ScreneViewFrame.cc
>--- /usr/ports/science/peekabot/files/patch-src_gui_ScreneViewFrame.cc	2011-07-30 18:39:44.000000000 +0900
>+++ science/peekabot/files/patch-src_gui_ScreneViewFrame.cc	1970-01-01 09:00:00.000000000 +0900
>@@ -1,15 +0,0 @@
>---- 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);
>-

Actions: View | Diff

Attachments on bug 166050: 122792 | 122793