ports/151753: [PATCH] update science/peekabot

Chris Petrik c.petrik.sosa at gmail.com
Tue Oct 26 13:10:08 UTC 2010 

>Number:         151753
>Category:       ports
>Synopsis:       [PATCH] update science/peekabot
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 26 13:10:07 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Chris Petrik
>Release:        FreeBSD 8.1-STABLE
>Organization:
none
>Environment:
FreeBSD 8.1-STABLE
>Description:
1. update to 0.8.1
2. remove files/*
3. remove PNG type patches

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: peekabot/Makefile
===================================================================
RCS file: /usr/local/freebsdcvs/ports/science/peekabot/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- peekabot/Makefile	15 Jun 2010 01:01:13 -0000	1.18
+++ peekabot/Makefile	26 Oct 2010 13:02:40 -0000
@@ -6,18 +6,17 @@
 #
 
 PORTNAME=	peekabot
-PORTVERSION=	0.7.2
-PORTREVISION=	4
+PORTVERSION=	0.8.1
 CATEGORIES=	science
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/0.7.x/ \
-		http://distfiles.officialunix.com/
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/0.8.x/
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	c.petrik.sosa at gmail.com
 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
+		fltk.1:${PORTSDIR}/x11-toolkits/fltk \
+		gtkglextmm-x11-1.2:${PORTSDIR}/x11-toolkits/gtkglextmm
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LDFLAGS="`fltk-config --ldflags`" \
@@ -25,19 +24,13 @@
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+#Internal compiler error with < 4.4
+USE_GCC=	4.4+
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 700042
-USE_GCC=	4.2+
-.endif
-
 .if ${ARCH} == "sparc64"
 BROKEN=		does not compile with boost on sparc64
 .endif
 
-post-patch:
-	${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
-		${WRKSRC}/src/3rdparty/png++/io_base.hpp
-
 .include <bsd.port.post.mk>
Index: peekabot/distinfo
===================================================================
RCS file: /usr/local/freebsdcvs/ports/science/peekabot/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- peekabot/distinfo	5 Nov 2009 14:57:18 -0000	1.4
+++ peekabot/distinfo	26 Oct 2010 13:02:40 -0000
@@ -1,3 +1,3 @@
-MD5 (peekabot-0.7.2.tar.bz2) = 091f588e3b1931de2454539c797f7526
-SHA256 (peekabot-0.7.2.tar.bz2) = aa27e4082bb42cdc770d0090aae96b74b8a7014d8a36325e69b8d1553a4ff7b4
-SIZE (peekabot-0.7.2.tar.bz2) = 2546064
+MD5 (peekabot-0.8.1.tar.bz2) = 375e1db89dce6581fb3272b1de1c854f
+SHA256 (peekabot-0.8.1.tar.bz2) = 870160df54666d2843d4663bbdccb78b21d6475cc0c7c5706444500eafa569bd
+SIZE (peekabot-0.8.1.tar.bz2) = 2706247
Index: peekabot/pkg-plist
===================================================================
RCS file: /usr/local/freebsdcvs/ports/science/peekabot/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- peekabot/pkg-plist	23 Aug 2009 15:48:18 -0000	1.2
+++ peekabot/pkg-plist	26 Oct 2010 13:02:40 -0000
@@ -2,11 +2,10 @@
 bin/peekabot
 include/peekabot.hh
 include/peekabot/Action.hh
+include/peekabot/Any.hh
 include/peekabot/Deprecated.hh
-include/peekabot/Matrix.hh
 include/peekabot/PathIdentifier.hh
 include/peekabot/Types.hh
-include/peekabot/Vector.hh
 include/peekabot/Visibility.hh
 include/peekabot/Version.hh
 include/peekabot/client/DelayedDispatch.hh
@@ -17,7 +16,6 @@
 include/peekabot/client/Recording.hh
 include/peekabot/client/Result.hh
 include/peekabot/client/Status.hh
-include/peekabot/client/any_dl.hpp
 include/peekabot/client/proxies/CameraProxy.hh
 include/peekabot/client/proxies/CircleProxy.hh
 include/peekabot/client/proxies/CubeProxy.hh
@@ -39,48 +37,45 @@
 include/peekabot/client/proxies/SliderProxy.hh
 include/peekabot/client/proxies/SphereProxy.hh
 include/peekabot/client/proxies/VertexBasedProxy.hh
+include/peekabot/client/proxies/OccupancyGrid3DProxy.hh
+include/peekabot/client/proxies/TriMeshProxy.hh
+include/peekabot/client/proxies/PolylineProxy.hh
 lib/libpeekabot.a
 lib/libpeekabot.la
 lib/libpeekabot.so
-lib/libpeekabot.so.5
+lib/libpeekabot.so.6
 %%DATADIR%%/data/default_scene.xml
 %%DATADIR%%/fonts/COPYING
 %%DATADIR%%/fonts/FreeSerif.ttf
-%%DATADIR%%/images/add_camera.png
-%%DATADIR%%/images/camera_object.png
-%%DATADIR%%/images/camera_object2.png
-%%DATADIR%%/images/camera_object3.png
-%%DATADIR%%/images/circle_object.png
-%%DATADIR%%/images/cont_snapshot.png
-%%DATADIR%%/images/cube_object.png
-%%DATADIR%%/images/cube_object_aa.png
-%%DATADIR%%/images/cylinder_object.png
-%%DATADIR%%/images/cylinder_object_aa.png
-%%DATADIR%%/images/dof.png
-%%DATADIR%%/images/grid.png
-%%DATADIR%%/images/groundplane.png
-%%DATADIR%%/images/group_object.png
-%%DATADIR%%/images/label.png
-%%DATADIR%%/images/light_object.png
-%%DATADIR%%/images/line_cloud.png
-%%DATADIR%%/images/locked.png
-%%DATADIR%%/images/move.png
-%%DATADIR%%/images/occupancy_grid_2d.png
-%%DATADIR%%/images/ortho_mode.png
-%%DATADIR%%/images/ortho_mode_aa.png
-%%DATADIR%%/images/perspective_mode.png
-%%DATADIR%%/images/perspective_mode_aa.png
-%%DATADIR%%/images/point_cloud.png
-%%DATADIR%%/images/polygon_object.png
-%%DATADIR%%/images/polyline_object.png
-%%DATADIR%%/images/polyline_object_aa.png
-%%DATADIR%%/images/rotate.png
-%%DATADIR%%/images/snapshot.png
-%%DATADIR%%/images/snapshot_disabled.png
-%%DATADIR%%/images/sphere_object.png
-%%DATADIR%%/images/teapot.png
-%%DATADIR%%/images/topdown.png
-%%DATADIR%%/images/topdown_aa.png
+%%DATADIR%%/icons/objects/camera-16.png
+%%DATADIR%%/icons/objects/circle-16.png
+%%DATADIR%%/icons/objects/cube-16.png
+%%DATADIR%%/icons/objects/cylinder-16.png
+%%DATADIR%%/icons/objects/dof-16.png
+%%DATADIR%%/icons/objects/grid-16.png
+%%DATADIR%%/icons/objects/label-16.png
+%%DATADIR%%/icons/objects/line-cloud-16.png
+%%DATADIR%%/icons/objects/model-16.png
+%%DATADIR%%/icons/objects/og2d-16.png
+%%DATADIR%%/icons/objects/og3d-16.png
+%%DATADIR%%/icons/objects/point-cloud-16.png
+%%DATADIR%%/icons/objects/polygon-16.png
+%%DATADIR%%/icons/objects/polyline-16.png
+%%DATADIR%%/icons/objects/sphere-16.png
+%%DATADIR%%/icons/objects/tri-mesh-16.png
+%%DATADIR%%/icons/log-22.png
+%%DATADIR%%/icons/log-error-22.png
+%%DATADIR%%/icons/move-tool-16.png
+%%DATADIR%%/icons/move-tool-22.png
+%%DATADIR%%/icons/navigate-tool-22.png
+%%DATADIR%%/icons/ortho-16.png
+%%DATADIR%%/icons/ortho-22.png
+%%DATADIR%%/icons/rotate-tool-16.png
+%%DATADIR%%/icons/rotate-tool-22.png
+%%DATADIR%%/icons/screenshot-16.png
+%%DATADIR%%/icons/screenshot-22.png
+%%DATADIR%%/icons/top-down-16.png
+%%DATADIR%%/icons/top-down-22.png
 %%DATADIR%%/schemas/basic_types.xsd
 %%DATADIR%%/schemas/camera.xsd
 %%DATADIR%%/schemas/circle.xsd
@@ -100,11 +95,18 @@
 %%DATADIR%%/schemas/scene_object.xsd
 %%DATADIR%%/schemas/slider.xsd
 %%DATADIR%%/schemas/sphere.xsd
+%%DATADIR%%/schemas/tri_mesh.xsd
+%%DATADIR%%/schemas/polyline.xsd
+%%DATADIR%%/peekabot.ui
+lib/pkgconfig/peekabot.pc
 @dirrm %%DATADIR%%/schemas
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%/fonts
 @dirrm %%DATADIR%%/data
+ at dirrm %%DATADIR%%/icons/objects
+ at dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
 @dirrm include/peekabot/client/proxies
 @dirrm include/peekabot/client
 @dirrm include/peekabot
+ at dirrmtry lib/pkgconfig
Index: peekabot/files/patch-src-3rdparty-png++-config.hpp
===================================================================
RCS file: peekabot/files/patch-src-3rdparty-png++-config.hpp
diff -N peekabot/files/patch-src-3rdparty-png++-config.hpp
--- peekabot/files/patch-src-3rdparty-png++-config.hpp	22 Jun 2009 15:55:11 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
---- src/3rdparty/png++/config.hpp.orig	2009-06-15 02:57:01.000000000 +0400
-+++ src/3rdparty/png++/config.hpp	2009-06-22 02:47:55.000000000 +0400
-@@ -47,6 +47,11 @@
- #include <machine/endian.h>
- #include <sys/_endian.h>
- 
-+#elif defined(__FreeBSD__)
-+
-+#include <machine/endian.h>
-+#include <sys/endian.h>
-+
- #else
- 
- #error Byte-order could not be detected.


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list