- Update to 7.12.4

PR:		124105
Submitted by:	Erik Greenwald <erik@smluc.org> (maintainer)

4 files changed, 37 insertions, 7 deletions

diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile
index 7baa8f02fc3b..c0e42f7add27 100644
--- a/cad/brlcad/Makefile
+++ b/cad/brlcad/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	brlcad
-PORTVERSION=	7.12.2
+PORTVERSION=	7.12.4
 CATEGORIES=	cad
 MASTER_SITES=	SF
 
diff --git a/cad/brlcad/distinfo b/cad/brlcad/distinfo
index 0bb0f8891ef6..003bd485c34c 100644
--- a/cad/brlcad/distinfo
+++ b/cad/brlcad/distinfo
@@ -1,3 +1,3 @@
-MD5 (brlcad-7.12.2.tar.bz2) = c63a55228208450de4076aabeb52a99a
-SHA256 (brlcad-7.12.2.tar.bz2) = fca6beb659d4ec329a31de3d56aa19b2335123113da4cf7185dd74eadde8a8fe
-SIZE (brlcad-7.12.2.tar.bz2) = 34407057
+MD5 (brlcad-7.12.4.tar.bz2) = d9a062a83d303ebf3aebb2b11add0d8f
+SHA256 (brlcad-7.12.4.tar.bz2) = ad58536517c330f1b15cd9c22424e2753d4e05412f27063652571e5245222c30
+SIZE (brlcad-7.12.4.tar.bz2) = 24570087
diff --git a/cad/brlcad/files/mged.sh b/cad/brlcad/files/mged.sh
index 2c0bbd5ee12e..d819c2bb7301 100644
--- a/cad/brlcad/files/mged.sh
+++ b/cad/brlcad/files/mged.sh
@@ -7,5 +7,7 @@ BRLCAD_ROOT=%%BRLCAD_ROOT%%
 export BRLCAD_ROOT
 export PATH=%%BRLCAD_ROOT%%/bin:$PATH
 export MANPATH=%%BRLCAD_ROOT%%/man:$MANPATH
+export ITCL_PATH=%%BRLCAD_ROOT%%/lib/itcl3.4
+export ITK_PATH=%%BRLCAD_ROOT%%/lib/itk3.4
 
 exec %%BRLCAD_ROOT%%/bin/mged $@
diff --git a/cad/brlcad/pkg-plist b/cad/brlcad/pkg-plist
index ab2c6ee02ff9..cda172ed548d 100644
--- a/cad/brlcad/pkg-plist
+++ b/cad/brlcad/pkg-plist
@@ -478,8 +478,10 @@ include/brlcad/dm_xvars.h
 include/brlcad/fb.h
 include/brlcad/fbio.h
 include/brlcad/fbserv_obj.h
+include/brlcad/ged.h
 include/brlcad/libtermio.h
 include/brlcad/light.h
+include/brlcad/magic.h
 include/brlcad/mater.h
 include/brlcad/missing.h
 include/brlcad/nmg.h
@@ -493,7 +495,6 @@ include/brlcad/plastic.h
 include/brlcad/plot3.h
 include/brlcad/raytrace.h
 include/brlcad/redblack.h
-include/brlcad/regex.h
 include/brlcad/rtgeom.h
 include/brlcad/rtprivate.h
 include/brlcad/rtserver.h
@@ -510,7 +511,6 @@ include/brlcad/vector_x86.h
 include/brlcad/vfont-if.h
 include/brlcad/vmath.h
 include/brlcad/wdb.h
-include/debug.h
 include/fixpt.h
 include/itcl.h
 include/itclDecls.h
@@ -609,7 +609,6 @@ include/openNURBS/opennurbs_workspace.h
 include/openNURBS/opennurbs_x.h
 include/openNURBS/opennurbs_xform.h
 include/openNURBS/opennurbs_zlib.h
-include/qray.h
 include/rb_internals.h
 include/tie/adrt.h
 include/tie/adrt_struct.h
@@ -652,6 +651,7 @@ include/tie/tienet_master.h
 include/tie/tienet_slave.h
 include/tie/tienet_util.h
 include/tie/umath.h
+include/uce-dirent.h
 lib/blt2.4/ZoomStack.itcl
 lib/blt2.4/dd_protocols/dd-color.tcl
 lib/blt2.4/dd_protocols/dd-file.tcl
@@ -772,6 +772,10 @@ lib/libfft.a
 lib/libfft.la
 lib/libfft.so
 lib/libfft.so.19
+lib/libged.a
+lib/libged.la
+lib/libged.so
+lib/libged.so.19
 lib/libitcl.a
 lib/libitcl.la
 lib/libitcl.so
@@ -964,6 +968,22 @@ libdata/pkgconfig/wdb.pc
 %%DATADIR%%/%%PORTVERSION%%/doc/rounding.txt
 %%DATADIR%%/%%PORTVERSION%%/doc/sun.txt
 %%DATADIR%%/%%PORTVERSION%%/doc/tube.txt
+%%DATADIR%%/%%PORTVERSION%%/docbook/oed/README
+%%DATADIR%%/%%PORTVERSION%%/docbook/oed/lollipop.png
+%%DATADIR%%/%%PORTVERSION%%/docbook/oed/oed.xml
+%%DATADIR%%/%%PORTVERSION%%/docbook/oed/oed_0001.png
+%%DATADIR%%/%%PORTVERSION%%/docbook/oed/oed_0002.png
+%%DATADIR%%/%%PORTVERSION%%/docbook/oed/oed_0003.png
+%%DATADIR%%/%%PORTVERSION%%/docbook/oed/oed_0004.png
+%%DATADIR%%/%%PORTVERSION%%/docbook/oed/oed_0005.png
+%%DATADIR%%/%%PORTVERSION%%/docbook/oed/oed_0006.png
+%%DATADIR%%/%%PORTVERSION%%/docbook/oed/oed_0007.png
+%%DATADIR%%/%%PORTVERSION%%/docbook/oed/oed_0008.png
+%%DATADIR%%/%%PORTVERSION%%/docbook/oed/oed_0009.png
+%%DATADIR%%/%%PORTVERSION%%/docbook/oed/oed_0010.png
+%%DATADIR%%/%%PORTVERSION%%/docbook/oed/oed_0011.png
+%%DATADIR%%/%%PORTVERSION%%/docbook/oed/oed_0012.png
+%%DATADIR%%/%%PORTVERSION%%/docbook/oed/oed_examples.asc
 %%DATADIR%%/%%PORTVERSION%%/html/ReleaseNotes/Rel5.0/Summary/activem.gif
 %%DATADIR%%/%%PORTVERSION%%/html/ReleaseNotes/Rel5.0/Summary/activep.gif
 %%DATADIR%%/%%PORTVERSION%%/html/ReleaseNotes/Rel5.0/Summary/collapse.gif
@@ -1253,6 +1273,11 @@ libdata/pkgconfig/wdb.pc
 %%DATADIR%%/%%PORTVERSION%%/html/manuals/mged/tex-html.tcl
 %%DATADIR%%/%%PORTVERSION%%/html/manuals/shaders/camo.html
 %%DATADIR%%/%%PORTVERSION%%/html/manuals/small-eagleCAD.gif
+%%DATADIR%%/%%PORTVERSION%%/nirt/csv-gap.nrt
+%%DATADIR%%/%%PORTVERSION%%/nirt/csv.nrt
+%%DATADIR%%/%%PORTVERSION%%/nirt/default.nrt
+%%DATADIR%%/%%PORTVERSION%%/nirt/gap1.nrt
+%%DATADIR%%/%%PORTVERSION%%/nirt/gap2.nrt
 %%DATADIR%%/%%PORTVERSION%%/pix/bldg391.log
 %%DATADIR%%/%%PORTVERSION%%/pix/bldg391.pix
 %%DATADIR%%/%%PORTVERSION%%/pix/m35.log
@@ -1797,6 +1822,7 @@ libdata/pkgconfig/wdb.pc
 @dirrm %%DATADIR%%/%%PORTVERSION%%/plugins/archer
 @dirrm %%DATADIR%%/%%PORTVERSION%%/plugins
 @dirrm %%DATADIR%%/%%PORTVERSION%%/pix
+@dirrm %%DATADIR%%/%%PORTVERSION%%/nirt
 @dirrm %%DATADIR%%/%%PORTVERSION%%/html/manuals/shaders
 @dirrm %%DATADIR%%/%%PORTVERSION%%/html/manuals/mged/animmate
 @dirrm %%DATADIR%%/%%PORTVERSION%%/html/manuals/mged
@@ -1812,6 +1838,8 @@ libdata/pkgconfig/wdb.pc
 @dirrm %%DATADIR%%/%%PORTVERSION%%/html/ReleaseNotes/Rel5.0
 @dirrm %%DATADIR%%/%%PORTVERSION%%/html/ReleaseNotes
 @dirrm %%DATADIR%%/%%PORTVERSION%%/html
+@dirrm %%DATADIR%%/%%PORTVERSION%%/docbook/oed
+@dirrm %%DATADIR%%/%%PORTVERSION%%/docbook
 @dirrm %%DATADIR%%/%%PORTVERSION%%/doc/legal
 @dirrm %%DATADIR%%/%%PORTVERSION%%/doc/book
 @dirrm %%DATADIR%%/%%PORTVERSION%%/doc