3 files changed, 18 insertions, 26 deletions

diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile
index b5af3c60220c..bb57aa2cafa2 100644
--- a/cad/brlcad/Makefile
+++ b/cad/brlcad/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	brlcad
-PORTVERSION=	7.12.4
+PORTVERSION=	7.12.6
 CATEGORIES=	cad
 MASTER_SITES=	SF
 
@@ -24,8 +24,6 @@ USE_XORG=	x11 xt xi xproto xext inputproto
 USE_GMAKE=	yes
 USE_TK=		85
 
-BROKEN=		Does not compile
-
 PREFIX?=	${LOCALBASE}/${PORTNAME}
 GNU_CONFIGURE=	yes
 NO_MTREE=	yes
@@ -115,10 +113,6 @@ OPTIONS=	OPTIMIZATION "Build with optimizations" on
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 800032
-BROKEN=		Does not compile
-.endif
-
 EXTRA_LIBS=	${PTHREAD_LIBS}
 
 .ifdef WITH_OPTIMIZATION
diff --git a/cad/brlcad/distinfo b/cad/brlcad/distinfo
index 003bd485c34c..ee28962302d9 100644
--- a/cad/brlcad/distinfo
+++ b/cad/brlcad/distinfo
@@ -1,3 +1,3 @@
-MD5 (brlcad-7.12.4.tar.bz2) = d9a062a83d303ebf3aebb2b11add0d8f
-SHA256 (brlcad-7.12.4.tar.bz2) = ad58536517c330f1b15cd9c22424e2753d4e05412f27063652571e5245222c30
-SIZE (brlcad-7.12.4.tar.bz2) = 24570087
+MD5 (brlcad-7.12.6.tar.bz2) = 532fe9df258f2fc332a848506d445c31
+SHA256 (brlcad-7.12.6.tar.bz2) = 2eade11701d06dc44e7908531a5e6dfd6941f73e6f346746810890f46fd443f5
+SIZE (brlcad-7.12.6.tar.bz2) = 23909924
diff --git a/cad/brlcad/pkg-plist b/cad/brlcad/pkg-plist
index cda172ed548d..079a64ba5420 100644
--- a/cad/brlcad/pkg-plist
+++ b/cad/brlcad/pkg-plist
@@ -321,7 +321,6 @@ bin/room
 bin/rpatch
 bin/rt
 bin/rt_bot_faces
-bin/rt_simple
 bin/rtarea
 bin/rtcell
 bin/rtcheck
@@ -420,7 +419,6 @@ include/bltVecInt.h
 include/bltVector.h
 include/bltWait.h
 include/bltWin.h
-include/bot.h
 include/brlcad/RtServerImpl.h
 include/brlcad/anim.h
 include/brlcad/blt.h
@@ -453,6 +451,7 @@ include/brlcad/bltVector.h
 include/brlcad/bltWait.h
 include/brlcad/bltWin.h
 include/brlcad/bn.h
+include/brlcad/bot.h
 include/brlcad/brep.h
 include/brlcad/brlcad.h
 include/brlcad/brlcad_config.h
@@ -511,7 +510,6 @@ include/brlcad/vector_x86.h
 include/brlcad/vfont-if.h
 include/brlcad/vmath.h
 include/brlcad/wdb.h
-include/fixpt.h
 include/itcl.h
 include/itclDecls.h
 include/itclInt.h
@@ -870,17 +868,17 @@ lib/tkimg.a
 lib/tkimg.la
 lib/tkimg.so
 lib/tkimg.so.0
-libdata/pkgconfig/bn.pc
-libdata/pkgconfig/brlcad.pc
-libdata/pkgconfig/bu.pc
-libdata/pkgconfig/dm.pc
-libdata/pkgconfig/fb.pc
-libdata/pkgconfig/fft.pc
-libdata/pkgconfig/multispectral.pc
-libdata/pkgconfig/optical.pc
-libdata/pkgconfig/pkg.pc
-libdata/pkgconfig/rt.pc
-libdata/pkgconfig/wdb.pc
+libdata/pkgconfig/libbn.pc
+libdata/pkgconfig/libbrlcad.pc
+libdata/pkgconfig/libbu.pc
+libdata/pkgconfig/libdm.pc
+libdata/pkgconfig/libfb.pc
+libdata/pkgconfig/libfft.pc
+libdata/pkgconfig/libmultispectral.pc
+libdata/pkgconfig/liboptical.pc
+libdata/pkgconfig/libpkg.pc
+libdata/pkgconfig/librt.pc
+libdata/pkgconfig/libwdb.pc
 %%DATADIR%%/%%PORTVERSION%%/AUTHORS
 %%DATADIR%%/%%PORTVERSION%%/COPYING
 %%DATADIR%%/%%PORTVERSION%%/HACKING
@@ -958,7 +956,7 @@ libdata/pkgconfig/wdb.pc
 %%DATADIR%%/%%PORTVERSION%%/doc/legal/lgpl.txt
 %%DATADIR%%/%%PORTVERSION%%/doc/mater.txt
 %%DATADIR%%/%%PORTVERSION%%/doc/matrix.txt
-%%DATADIR%%/%%PORTVERSION%%/doc/mged.tr
+%%DATADIR%%/%%PORTVERSION%%/doc/mged.sh
 %%DATADIR%%/%%PORTVERSION%%/doc/mk.tr
 %%DATADIR%%/%%PORTVERSION%%/doc/movie.txt
 %%DATADIR%%/%%PORTVERSION%%/doc/old-mged.tr
@@ -1276,6 +1274,7 @@ libdata/pkgconfig/wdb.pc
 %%DATADIR%%/%%PORTVERSION%%/nirt/csv-gap.nrt
 %%DATADIR%%/%%PORTVERSION%%/nirt/csv.nrt
 %%DATADIR%%/%%PORTVERSION%%/nirt/default.nrt
+%%DATADIR%%/%%PORTVERSION%%/nirt/entryexit.nrt
 %%DATADIR%%/%%PORTVERSION%%/nirt/gap1.nrt
 %%DATADIR%%/%%PORTVERSION%%/nirt/gap2.nrt
 %%DATADIR%%/%%PORTVERSION%%/pix/bldg391.log
@@ -1302,7 +1301,6 @@ libdata/pkgconfig/wdb.pc
 %%DATADIR%%/%%PORTVERSION%%/sample_applications/g-xxx.c
 %%DATADIR%%/%%PORTVERSION%%/sample_applications/g-xxx_facets.c
 %%DATADIR%%/%%PORTVERSION%%/sample_applications/g_transfer.c
-%%DATADIR%%/%%PORTVERSION%%/sample_applications/g_xxx.c
 %%DATADIR%%/%%PORTVERSION%%/sample_applications/nurb_example.c
 %%DATADIR%%/%%PORTVERSION%%/sample_applications/pl-dm.c
 %%DATADIR%%/%%PORTVERSION%%/sample_applications/raydebug.tcl