Attachment 82079 Details for Bug 117462 – cad_brlcad.patch

[patch] cad_brlcad.patch

cad_brlcad.patch (text/plain), 10.06 KB, created by Erik Greenwald on 2007-10-24 20:30:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Erik Greenwald

Created: 2007-10-24 20:30:03 UTC

Size: 10.06 KB

patch

obsolete

>Index: cad/brlcad/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/cad/brlcad/Makefile,v
>retrieving revision 1.24
>diff -u -r1.24 Makefile
>--- cad/brlcad/Makefile	27 Aug 2007 14:06:14 -0000	1.24
>+++ cad/brlcad/Makefile	24 Oct 2007 19:18:36 -0000
>@@ -6,14 +6,14 @@
> #
> 
> PORTNAME=	brlcad
>-PORTVERSION=	7.10.2
>+PORTVERSION=	7.10.4
> CATEGORIES=	cad
>-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>-MASTER_SITE_SUBDIR=	brlcad
>+MASTER_SITES=	SF
> 
> MAINTAINER=	erik@smluc.org
> COMMENT=	CSG modelling system from the US Ballistic Research Laboratory
> 
>+BUILD_DEPENDS=	${LOCALBASE}/include/tnt/jama_lu.h:${PORTSDIR}/math/jama
> LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
> 		rle.1:${PORTSDIR}/graphics/urt
> 
>@@ -31,16 +31,16 @@
> USE_GNOME=	gnomehack
> 
> CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.5\
>-	-I${LOCALBASE}/include/tk8.5
>+ -I${LOCALBASE}/include/tk8.5 -I${LOCALBASE}/include/tnt
> LDFLAGS+=	-L${LOCALBASE}/lib
> CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
> CONFIGURE_ARGS+=--disable-adrt-build \
> 	--with-libs="-lpng ${EXTRA_LIBS}" --program-transform-name=""		\
>-	--x-includes=${LOCALBASE}/include --x-libraries=${LOCALBASE}/libs		\
>+	--x-includes=${LOCALBASE}/include --x-libraries=${LOCALBASE}/libs	\
> 	--disable-jove-build
> PLIST_SUB+=	PORTVERSION=${PORTVERSION}
> 
>-MAN1=	alias-pix.1 all_sf.1 anim_cascade.1 anim_fly.1 anim_hardtrack.1 	\
>+MAN1=	alias-pix.1 all_sf.1 anim_cascade.1 anim_fly.1 anim_hardtrack.1		\
> 	anim_keyread.1 anim_lookat.1 anim_offset.1 anim_orient.1 anim_script.1	\
> 	anim_sort.1 anim_time.1 anim_track.1 anim_turn.1 ap-pix.1 asc-nmg.1	\
> 	asc-pl.1 awf.1 azel.1 bary.1 benchmark.1 bot_shell-vtk.1		\
>@@ -60,7 +60,7 @@
> 	g_diff.1 g_lint.1 g_qa.1 gencolor.1 gif-fb.1 gif2fb.1 halftone.1 hd.1	\
> 	iges-g.1 imgdims.1 ir-X.1 ir-sgi.1 irdisp.1 lgt.1 loop.1 mac-pix.1	\
> 	mged.1 mk_bolt.1 mk_gastank.1 mk_handle.1 mk_window.1 mk_winfrm.1	\
>-	mk_wire.1 morphedit.1 nastran-g.1 nirt.1 nmg-bot.1 nmg-rib.1 op-bw.1	\
>+	mk_wire.1 morphedit.1 nastran-g.1 nirt.1 nmg-bot.1 nmg-rib.1		\
> 	orle-fb.1 orle-pix.1 patch-g.1 pcd-pix.1 picket_fence.1 pix-alias.1	\
> 	pix-bw.1 pix-bw3.1 pix-fb.1 pix-orle.1 pix-png.1 pix-ps.1 pix-rle.1	\
> 	pix-sun.1 pix2asc.1 pixautosize.1 pixbackgnd.1 pixbgstrip.1 pixblend.1	\
>@@ -108,42 +108,26 @@
> 	iwidgets_timefield.n iwidgets_toolbar.n iwidgets_watch.n local.n	\
> 	scope.n usual.n
> 
>-OPTIONS=	OPTIMIZATION "Try building with optimizations" on
>+OPTIONS=	OPTIMIZATION "Build with optimizations" on
> 
> .include <bsd.port.pre.mk>
> 
> EXTRA_LIBS=	${PTHREAD_LIBS}
> 
>-.if !(${ARCH} == i386 || ${ARCH} == amd64 || ${ARCH} == sparc64)
>-IGNORE=		dumps core on ${ARCH}
>-.endif
>-
> .ifdef WITH_OPTIMIZATION
>-CONFIGURE_ARGS+=	--disable-debug
>-.if (${ARCH} == i386 || ${ARCH} == amd64 || ${ARCH} == sparc64)
>-CONFIGURE_ARGS+=	--enable-optimized
>-.endif
>+CONFIGURE_ARGS+=	--disable-debug --enable-optimized
> .endif
> 
> post-patch:
>-	${REINPLACE_CMD} "s+/usr/X11R6+${X11BASE}+;41602,41612d" ${WRKSRC}/configure
>+	${REINPLACE_CMD} "s+8\.5a6+8.5b1+" ${WRKSRC}/src/other/tcl/library/init.tcl
> 
> pre-install:
> 	${CP} ${FILESDIR}/mged.sh ${WRKSRC}
>-	${REINPLACE_CMD} -e 's+%%BRLCAD_ROOT%%+${PREFIX}+g;'	\
>-		${WRKSRC}/mged.sh
>+	${REINPLACE_CMD} -e 's+%%BRLCAD_ROOT%%+${PREFIX}+g;' ${WRKSRC}/mged.sh
> 
> # note that installing outside of PREFIX wigs out package stuff... :/
> post-install:
> 	${INSTALL_SCRIPT} ${WRKSRC}/mged.sh ${PREFIX}/bin/mged.sh
> 	${LN} -s ${PREFIX}/bin/mged.sh ${LOCALBASE}/bin/mged.sh
>-.if defined(WITH_OPTIMIZATION) && !(${ARCH} == i386 || ${ARCH} == amd64)
>-	@echo "Optimization does not work here, but we went ahead and turned off debugging"
>-.endif
>-
>-.if defined(WITH_OPTIMIZATION) && !(${ARCH} == i386 || ${ARCH} == amd64)
>-post-build:
>-	@echo "Optimization does not work here, but we went ahead and turned off debugging"
>-.endif
> 
> .include <bsd.port.post.mk>
>Index: cad/brlcad/distinfo
>===================================================================
>RCS file: /home/ncvs/ports/cad/brlcad/distinfo,v
>retrieving revision 1.14
>diff -u -r1.14 distinfo
>--- cad/brlcad/distinfo	27 Aug 2007 14:06:14 -0000	1.14
>+++ cad/brlcad/distinfo	24 Oct 2007 19:18:36 -0000
>@@ -1,3 +1,3 @@
>-MD5 (brlcad-7.10.2.tar.bz2) = 6bc9ae0a10a3b2f9ede0d79a58f623dd
>-SHA256 (brlcad-7.10.2.tar.bz2) = 5384b0520bd36c23bddda9b35516d461b1742e4a37c363d435708d97b1ecb4e0
>-SIZE (brlcad-7.10.2.tar.bz2) = 22851450
>+MD5 (brlcad-7.10.4.tar.bz2) = 3986a3310a3a9c705b01d248bd14b190
>+SHA256 (brlcad-7.10.4.tar.bz2) = c7b6af13a5b45c7325b2f929e3e29e982020634a2a056e78f0d29da3d2e0b396
>+SIZE (brlcad-7.10.4.tar.bz2) = 22973681
>Index: cad/brlcad/pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/cad/brlcad/pkg-plist,v
>retrieving revision 1.15
>diff -u -r1.15 pkg-plist
>--- cad/brlcad/pkg-plist	27 Aug 2007 14:06:14 -0000	1.15
>+++ cad/brlcad/pkg-plist	24 Oct 2007 19:18:36 -0000
>@@ -212,7 +212,6 @@
> bin/nmg-sgp
> bin/nmgmodel
> bin/off-g
>-bin/op-bw
> bin/orle-fb
> bin/orle-pix
> bin/patch-g
>@@ -518,38 +517,13 @@
> include/itclIntDecls.h
> include/itk.h
> include/itkDecls.h
>-include/jama_cholesky.h
>-include/jama_eig.h
>-include/jama_lu.h
>-include/jama_qr.h
>-include/jama_svd.h
> include/missing.h
>-include/plane.h
> include/qray.h
> include/rb_internals.h
>-include/tnt.h
>-include/tnt_array1d.h
>-include/tnt_array1d_utils.h
>-include/tnt_array2d.h
>-include/tnt_array2d_utils.h
>-include/tnt_array3d.h
>-include/tnt_array3d_utils.h
>-include/tnt_fortran_array1d.h
>-include/tnt_fortran_array1d_utils.h
>-include/tnt_fortran_array2d.h
>-include/tnt_fortran_array2d_utils.h
>-include/tnt_fortran_array3d.h
>-include/tnt_fortran_array3d_utils.h
>-include/tnt_i_refvec.h
>-include/tnt_linalg.h
>-include/tnt_math_utils.h
>-include/tnt_matrix.h
>-include/tnt_sparse_matrix.h
>-include/tnt_sparse_vector.h
>-include/tnt_stopwatch.h
>-include/tnt_subscript.h
>-include/tnt_vector.h
>-include/tnt_version.h
>+include/tie/tie.h
>+include/tie/tie_define.h
>+include/tie/tie_kdtree.h
>+include/tie/tie_struct.h
> lib/blt2.4/ZoomStack.itcl
> lib/blt2.4/dd_protocols/dd-color.tcl
> lib/blt2.4/dd_protocols/dd-file.tcl
>@@ -734,6 +708,10 @@
> lib/libtermio.la
> lib/libtermio.so
> lib/libtermio.so.19
>+lib/libtie.a
>+lib/libtie.la
>+lib/libtie.so
>+lib/libtie.so.0
> lib/libwdb.a
> lib/libwdb.la
> lib/libwdb.so
>@@ -1612,73 +1590,13 @@
> %%DATADIR%%/%%PORTVERSION%%/tclscripts/vmath.tcl
> %%DATADIR%%/%%PORTVERSION%%/vfont/fix.6r
> %%DATADIR%%/%%PORTVERSION%%/vfont/nonie.r.12
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/vfont
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/util
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/swidgets/scripts
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/swidgets/images
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/swidgets
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/sdialogs/scripts
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/sdialogs
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/rtwizard/lib
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/rtwizard/examples/PictureTypeF
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/rtwizard/examples/PictureTypeE
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/rtwizard/examples/PictureTypeD
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/rtwizard/examples/PictureTypeC
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/rtwizard/examples/PictureTypeB
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/rtwizard/examples/PictureTypeA
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/rtwizard/examples
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/rtwizard
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/pl-dm
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/nirt
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/mged
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/lib
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/geometree
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/images/Themes/Windows
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/images/Themes/Crystal_Large
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/images/Themes/Crystal
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/images/Themes
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/images
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/archer
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/sample_applications
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/plugins/archer/Wizards/tankwizardIA/images
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/plugins/archer/Wizards/tankwizardIA
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/plugins/archer/Wizards
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/plugins/archer/Utility
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/plugins/archer/Core
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/plugins/archer/Command
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/plugins/archer
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/plugins
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/pix
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/html/manuals/shaders
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/html/manuals/mged/animmate
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/html/manuals/mged
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/html/manuals/librt
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/html/manuals/libdm
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/html/manuals/libbu
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/html/manuals/cadwidgets
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/html/manuals/archer
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/html/manuals/Anim_Tutorial
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/html/manuals
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/html/ReleaseNotes/Rel6.0
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/html/ReleaseNotes/Rel5.0/Summary
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/html/ReleaseNotes/Rel5.0
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/html/ReleaseNotes
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/html
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/doc/legal
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/doc
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/db
>-@dirrm %%DATADIR%%/%%PORTVERSION%%/awf
>-@dirrm %%DATADIR%%/%%PORTVERSION%%
>-@dirrm %%DATADIR%%
>-@dirrm share
>+@dirrmtry libdata/pkgconfig
>+@dirrmtry libdata
> @dirrm man/mann
> @dirrm man/man5
> @dirrm man/man3
> @dirrm man/man1
> @dirrm man
>-@dirrmtry libdata/pkgconfig
>-@dirrmtry libdata
> @dirrm lib/iwidgets4.0.1/scripts
> @dirrm lib/iwidgets4.0.1
> @dirrm lib/itk3.3
>@@ -1686,6 +1604,7 @@
> @dirrm lib/blt2.4/dd_protocols
> @dirrm lib/blt2.4
> @dirrm lib
>+@dirrm include/tie
> @dirrm include/brlcad
> @dirrm include
> @dirrm bin

Actions: View | Diff

Attachments on bug 117462: 82079