- Update to version 7.20.4, build system changed from autotools to cmake [1]

- Add USE_GL=glu and USE_BISON=build to fix build
- Make sure that pkgconfig files are installed to ${PREFIX}/libdata/pkgconfig
- Mark MAKE_JOBS_SAFE
- Silence REINPLACE_CMD output

PR:		ports/162785 [1]
Submitted by:	Erik Greenwald <erik@brlcad.org> (maintainer) [1]
Feature safe:	yes

3 files changed, 448 insertions, 327 deletions

diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile
index 751c0e4831c5..d7c79f1fa747 100644
--- a/cad/brlcad/Makefile
+++ b/cad/brlcad/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	brlcad
-PORTVERSION=	7.18.4
+PORTVERSION=	7.20.4
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/BRL-CAD%20Source/${PORTVERSION}
 
@@ -18,141 +18,158 @@ BUILD_DEPENDS=	${LOCALBASE}/include/tnt/jama_lu.h:${PORTSDIR}/math/jama	\
 LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
 		rle.1:${PORTSDIR}/graphics/urt
 
-USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
-USE_GL=		gl
+USE_GL=		gl glu
 USE_XORG=	x11 xt xi xproto xext inputproto
 USE_GMAKE=	yes
+USE_BISON=	build
 USE_TK=		85
 
 PREFIX?=	${LOCALBASE}/${PORTNAME}
-GNU_CONFIGURE=	yes
 NO_MTREE=	yes
-USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack
+USE_CMAKE=	yes
+MAKE_JOBS_SAFE=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.5\
- -I${LOCALBASE}/include/tk8.5 -I${LOCALBASE}/include/tnt
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	TKINCDIR=${LOCALBASE}/include/tk8.5
-CONFIGURE_ARGS+=--with-libs="-lpng ${EXTRA_LIBS}" --program-transform-name=""	\
-	--x-includes=${LOCALBASE}/include --x-libraries=${LOCALBASE}/libs	\
-	--disable-jove-build --disable-strict-build --disable-warnings		\
-	--with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR}				\
-	--with-tkinclude=${TK_INCDIR}
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
-MAN1=	anim_script.1 anim_sort.1 anim_time.1 anim_track.1 anim_turn.1		\
-	ap-pix.1 asc-nmg.1 asc-pl.1 azel.1 bary.1 benchmark.1			\
-	bot_dump.1 bot_shell-vtk.1 brlcad-config.1 brlcad.1 brlman.1		\
-	buffer.1 bw-fb.1 bw-imp.1 bw-pix.1 bw-png.1 bw-ps.1 bw-rle.1		\
-	bw3-pix.1 bwcrop.1 bwdiff.1 bwfilter.1 bwhist.1 bwhisteq.1 bwmod.1	\
-	bwrect.1 bwrot.1 bwscale.1 bwshrink.1 bwstat.1 bwthresh.1		\
-	cad_boundp.1 cad_parea.1 canonize.1 cat-fb.1 cell-fb.1 chan_mult.1	\
-	chan_permute.1 cmap-fb.1 coil.1 comgeom-g.1 conv-vg2g.1 cv.1 cy-g.1	\
-	dataprobe.1 db.1 dbclean.1 dbcp.1 dbupgrade.1 decimate.1 dpix-pix.1	\
-	dunncolor.1 dunnsnap.1 dxf-g.1 enf-g.1 enigma.1 euclid-g.1 fast4-g.1	\
-	fb-bw.1 fb-cmap.1 fb-fb.1 fb-orle.1 fb-pix.1 fb-png.1 fb-rle.1		\
-	fbanim.1 fbcbars.1 fbclear.1 fbcmap.1 fbcmrot.1 fbcolor.1 fbed.1	\
-	fbfade.1 fbframe.1 fbfree.1 fbgamma.1 fbgrid.1 fbhelp.1 fblabel.1	\
-	fbline.1 fbpoint.1 fbscanplot.1 fbserv.1 fbstretch.1 fbzoom.1		\
-	fedex.1 fedex_plus.1 firpass.1 g-acad.1 g-dxf.1 g-egg.1 g-euclid.1	\
-	g-iges.1 g-nff.1 g-nmg.1 g-obj.1 g-shell-rect.1 g-stl.1 g-tankill.1	\
-	g-var.1 g-vrml.1 g-x3d.1 g2asc.1 g_diff.1 g_lint.1 gencolor.1		\
-	gif-fb.1 gif2fb.1 gqa.1 halftone.1 hex.1 iges-g.1 imgdims.1 ir-X.1	\
-	ir-sgi.1 irdisp.1 lgt.1 loop.1 mac-pix.1 mged.1 mkProbe.1		\
-	morphedit.1 nastran-g.1 nirt.1 nmg-bot.1 nmg-rib.1 obj-g.1 orle-fb.1	\
-	orle-pix.1 patch-g.1 pix-alias.1 pix-bw.1 pix-bw3.1 pix-fb.1		\
-	pix-orle.1 pix-png.1 pix-ppm.1 pix-ps.1 pix-rle.1 pix-sun.1		\
-	pix2asc.1 pixautosize.1 pixbackgnd.1 pixbgstrip.1 pixblend.1		\
-	pixborder.1 pixbustup.1 pixclump.1 pixcmp.1 pixcolors.1 pixcut.1	\
-	pixdiff.1 pixdsplit.1 pixfade.1 pixfilter.1 pixhalve.1 pixhist.1	\
-	pixhist3d-pl.1 pixhist3d.1 pixinterp2x.1 pixmatte.1 pixmerge.1		\
-	pixmorph.1 pixrect.1 pixrot.1 pixsaturate.1 pixscale.1 pixshrink.1	\
-	pixstat.1 pixsubst.1 pixtile.1 pixuntile.1 pl-X.1 pl-asc.1 pl-fb.1	\
-	pl-hpgl.1 pl-pl.1 pl-ps.1 pl-tek.1 plcolor.1 pldebug.1 plgetframe.1	\
-	plline2.1 plrot.1 ply-g.1 png-bw.1 png-fb.1 png-pix.1 png_info.1	\
-	polar-fb.1 poly-bot.1 pp-fb.1 proe-g.1 random.1 remapid.1 remrt.1	\
-	reshoot.1 rle-fb.1 rle-pix.1 rpatch.1 rt.1 rt_bot_faces.1 rtarea.1	\
-	rtcheck.1 rtedge.1 rtg3.1 rthide.1 rtpp.1 rtrange.1 rtray.1		\
-	rtregis.1 rtscale.1 rtshot.1 rttherm.1 rtwalk.1 rtweight.1 rtxray.1	\
-	scriptsort.1 secpass.1 shapefact.1 showshot.1 showtherm.1 ssamp-bw.1	\
-	stl-g.1 sun-pix.1 tabinterp.1 tabsub.1 tankill-g.1 terrain.1 tire.1	\
-	vdeck.1 viewpoint-g.1 wavelet.1
-
-MAN3=	RegisterC.3 Stack.3 htond.3 libbu.3 libcursor.3 libfb.3 liborle.3	\
-	libplot3.3 librt.3 libwdb.3 redblack.3 Preserve.3 Class.3 Object.3 List.3
-
-MAN5=	bw.5 cmap.5 gattributes.5 pix.5 plot3.5
-
-MANN=	3ptarb.nged Archetype.n B.nged E.nged M.nged Toplevel.n Widget.n	\
-	Z.nged adc.nged ae.nged alias-pix.nged all_sf.nged analyze.nged		\
-	anim_cascade.nged anim_fly.nged anim_hardtrack.nged			\
-	anim_keyread.nged anim_lookat.nged anim_offset.nged anim_orient.nged	\
-	animmate.nged apropos.nged aproposdevel.nged aproposlib.nged		\
-	arb.nged arced.nged area.nged arot.nged attach.nged attr.nged		\
-	autoview.nged bb.nged bev.nged bo.nged body.n bolt.nged			\
-	bot_condense.nged bot_decimate.nged bot_face_fuse.nged			\
-	bot_face_sort.nged bot_vertex_fuse.nged build_region.nged c.nged	\
-	cat.nged center.nged class.n code.n color.nged comb_color.nged		\
-	configbody.n copyeval.nged copymat.nged cp.nged cpi.nged d.nged		\
-	dall.nged db.nged db_glob.nged dbconcat.nged debugbu.nged		\
-	debugdir.nged debuglib.nged debugmem.nged debugnmg.nged			\
-	decompose.nged delay.nged delete.n dm.nged draw.nged dup.nged		\
-	e_command.nged e_muves.nged eac.nged echo.nged edcodes.nged		\
-	edcolor.nged edcomb.nged edgedir.nged edmater.nged em.nged		\
-	ensemble.n eqn.nged erase.nged erase_all.nged ev.nged exit.nged		\
-	expand.nged export_body.nged extrude.nged eye_pt.nged facedef.nged	\
-	facetize.nged find.n find.nged fracture.nged g.nged			\
-	garbage_collect.nged gastank.nged gqa.nged gui.nged handle.nged		\
-	help.nged helpdevel.nged helplib.nged hide.nged history.nged i.nged	\
-	idents.nged ill.nged in.nged inside.nged is.n itcl.n itclvars.n		\
-	item.nged itk.n itkvars.n iwidgets_buttonbox.n iwidgets_calendar.n	\
-	iwidgets_canvasprintbox.n iwidgets_canvasprintdialog.n			\
-	iwidgets_checkbox.n iwidgets_combobox.n iwidgets_dateentry.n		\
-	iwidgets_datefield.n iwidgets_dialog.n iwidgets_dialogshell.n		\
-	iwidgets_disjointlistbox.n iwidgets_entryfield.n			\
-	iwidgets_extbutton.n iwidgets_extfileselectionbox.n			\
-	iwidgets_extfileselectiondialog.n iwidgets_feedback.n			\
-	iwidgets_fileselectionbox.n iwidgets_fileselectiondialog.n		\
-	iwidgets_finddialog.n iwidgets_hierarchy.n iwidgets_hyperhelp.n		\
-	iwidgets_labeledframe.n iwidgets_labeledwidget.n			\
-	iwidgets_mainwindow.n iwidgets_menubar.n iwidgets_messagebox.n		\
-	iwidgets_messagedialog.n iwidgets_notebook.n iwidgets_optionmenu.n	\
-	iwidgets_panedwindow.n iwidgets_promptdialog.n iwidgets_pushbutton.n	\
-	iwidgets_radiobox.n iwidgets_scopedobject.n				\
-	iwidgets_scrolledcanvas.n iwidgets_scrolledframe.n			\
-	iwidgets_scrolledhtml.n iwidgets_scrolledlistbox.n			\
-	iwidgets_scrolledtext.n iwidgets_selectionbox.n				\
-	iwidgets_selectiondialog.n iwidgets_shell.n iwidgets_spindate.n		\
-	iwidgets_spinint.n iwidgets_spinner.n iwidgets_spintime.n		\
-	iwidgets_tabnotebook.n iwidgets_tabset.n iwidgets_timeentry.n		\
-	iwidgets_timefield.n iwidgets_toolbar.n iwidgets_watch.n		\
-	journal.nged keep.nged keypoint.nged kill.nged killall.nged		\
-	killtree.nged knob.nged l.nged l_muves.nged labelvert.nged		\
-	listeval.nged lm.nged loadtk.nged local.n lookat.nged ls.nged		\
-	make.nged make_bb.nged mater.nged matpick.nged memprint.nged		\
-	mirface.nged mrot.nged mv.nged mvall.nged nirt.nged			\
-	nmg_collapse.nged nmg_simplify.nged oed.nged opendb.nged		\
-	orientation.nged orot.nged oscale.nged overlay.nged p.nged		\
-	pathlist.nged paths.nged permute.nged picket_fence.nged plot.nged	\
-	prcolor.nged prefix.nged press.nged preview.nged prj_add.nged		\
-	ps.nged push.nged put_comb.nged putmat.nged q.nged qorot.nged		\
-	qray.nged query_ray.nged quit.nged qvrot.nged r.nged rcc-blend.nged	\
-	rcc-cap.nged rcc-tgc.nged rcc-tor.nged rcodes.nged read_muves.nged	\
-	red.nged redraw_vlist.nged refresh.nged regdebug.nged regdef.nged	\
-	regions.nged release.nged rfarb.nged rm.nged rmater.nged rmats.nged	\
-	rot.nged rotobj.nged rpp-arch.nged rpp-cap.nged rrt.nged rt.nged	\
-	rtcheck.nged rtwizard.nged savekey.nged saveview.nged sca.nged		\
-	scope.n search.nged sed.nged setview.nged shader.nged shell.nged	\
-	showmats.nged size.nged solids.nged sph-part.nged status.nged		\
-	summary.nged sv.nged sync.nged t.nged t_muves.nged ted.nged		\
-	title.nged tkhtml.n tol.nged tops.nged tor-rcc.nged tra.nged		\
-	track.nged translate.nged tree.nged units.nged usual.n vars.nged	\
-	vdraw.nged view.nged viewsize.nged vnirt.nged vquery_ray.nged		\
-	vrmgr.nged vrot.nged wcodes.nged whatid.nged which_shader.nged		\
-	whichair.nged whichid.nged who.nged window.nged window_frame.nged	\
-	wire.nged wmater.nged x.nged xpush.nged zoom.nged
+CFLAGS+=	-I${LOCALBASE}/include
+#LDFLAGS+=	-L${LOCALBASE}/lib
+CMAKE_ARGS=	-DBRLCAD-ENABLE_STRICT:BOOL=OFF
+
+MAN1=	aliastorle.1 anim_script.1 anim_sort.1 anim_time.1 anim_track.1 \
+	anim_turn.1 ap-pix.1 applymap.1 asc-nmg.1 asc-pl.1 avg4.1 azel.1 \
+	bary.1 benchmark.1 bot_dump.1 bot_shell-vtk.1 brlcad-config.1 \
+	brlcad.1 brlman.1 buffer.1 bw-fb.1 bw-imp.1 bw-pix.1 bw-png.1 \
+	bw-ps.1 bw-rle.1 bw3-pix.1 bwcrop.1 bwdiff.1 bwfilter.1 bwhist.1 \
+	bwhisteq.1 bwmod.1 bwrect.1 bwrot.1 bwscale.1 bwshrink.1 bwstat.1 \
+	bwthresh.1 cad_boundp.1 cad_parea.1 canonize.1 cell-fb.1 chan_mult.1 \
+	chan_permute.1 cmap-fb.1 coil.1 comgeom-g.1 conv-vg2g.1 crop.1 \
+	cubitorle.1 cv.1 cy-g.1 dataprobe.1 db.1 dbclean.1 dbcp.1 \
+	dbupgrade.1 decimate.1 dpix-pix.1 dunncolor.1 dunnsnap.1 dvirle.1 \
+	dxf-g.1 enf-g.1 enigma.1 euclid-g.1 fant.1 fast4-g.1 fb-bw.1 \
+	fb-cmap.1 fb-fb.1 fb-orle.1 fb-pix.1 fb-png.1 fb-rle.1 fbanim.1 \
+	fbcbars.1 fbclear.1 fbcmap.1 fbcmrot.1 fbcolor.1 fbed.1 fbfade.1 \
+	fbframe.1 fbfree.1 fbgamma.1 fbgrid.1 fbhelp.1 fblabel.1 fbline.1 \
+	fbpoint.1 fbscanplot.1 fbserv.1 fbstretch.1 fbzoom.1 fedex.1 \
+	fedex_plus.1 firpass.1 g-acad.1 g-dxf.1 g-egg.1 g-euclid.1 g-iges.1 \
+	g-nff.1 g-nmg.1 g-obj.1 g-shell-rect.1 g-stl.1 g-tankill.1 g-var.1 \
+	g-vrml.1 g-x3d.1 g2asc.1 g_diff.1 g_lint.1 gencolor.1 get4d.1 \
+	get_orion.1 getami.1 getap.1 getbob.1 getcx3d.1 getfb.1 getgmr.1 \
+	getiris.1 getmac.1 getmex.1 getqcr.1 getren.1 getsun.1 gettaac.1 \
+	getx10.1 getx11.1 gif-fb.1 gif2fb.1 giftorle.1 gqa.1 graytorle.1 \
+	halftone.1 hex.1 iges-g.1 imgdims.1 into.1 ir-X.1 irdisp.1 lgt.1 \
+	loop.1 mac-pix.1 mcut.1 mergechan.1 mged.1 mkProbe.1 morphedit.1 \
+	nastran-g.1 nirt.1 nmg-bot.1 nmg-rib.1 obj-g.1 orle-fb.1 orle-pix.1 \
+	painttorle.1 patch-g.1 pgmtorle.1 pix-alias.1 pix-bw.1 pix-bw3.1 \
+	pix-fb.1 pix-orle.1 pix-png.1 pix-ppm.1 pix-ps.1 pix-rle.1 pix-sun.1 \
+	pix2asc.1 pixautosize.1 pixbackgnd.1 pixbgstrip.1 pixblend.1 \
+	pixborder.1 pixbustup.1 pixclump.1 pixcmp.1 pixcolors.1 pixcut.1 \
+	pixdiff.1 pixdsplit.1 pixfade.1 pixfilter.1 pixhalve.1 pixhist.1 \
+	pixhist3d-pl.1 pixhist3d.1 pixinterp2x.1 pixmatte.1 pixmerge.1 \
+	pixmorph.1 pixrect.1 pixrot.1 pixsaturate.1 pixscale.1 pixshrink.1 \
+	pixstat.1 pixsubst.1 pixtile.1 pixuntile.1 pl-X.1 pl-asc.1 pl-fb.1 \
+	pl-hpgl.1 pl-pl.1 pl-ps.1 pl-tek.1 plcolor.1 pldebug.1 plgetframe.1 \
+	plline2.1 plrot.1 ply-g.1 png-bw.1 png-fb.1 png-pix.1 png_info.1 \
+	polar-fb.1 poly-bot.1 pp-fb.1 ppmtorle.1 proe-g.1 pyrmask.1 random.1 \
+	rastorle.1 rawtorle.1 read98721.1 remapid.1 remrt.1 repos.1 \
+	reshoot.1 rlatorle.1 rle-fb.1 rle-pix.1 rleClock.1 rleaddcom.1 \
+	rleaddeof.1 rlebg.1 rlebox.1 rlecat.1 rleccube.1 rlecomp.1 \
+	rledither.1 rleflip.1 rlegrid.1 rlehdr.1 rlehisto.1 rleinterp.1 \
+	rleldmap.1 rlemandl.1 rlenoise.1 rlepatch.1 rleprint.1 rlequant.1 \
+	rlescale.1 rleselect.1 rlesetbg.1 rleskel.1 rlespiff.1 rlesplice.1 \
+	rlesplit.1 rlestereo.1 rleswap.1 rletoabA60.1 rletoabA62.1 \
+	rletoalias.1 rletoascii.1 rletocgm.1 rletogif.1 rletogray.1 \
+	rletopaint.1 rletoppm.1 rletops.1 rletorast.1 rletoraw.1 rletorla.1 \
+	rletotarga.1 rletotiff.1 rlezoom.1 rpatch.1 rt.1 rt_bot_faces.1 \
+	rtarea.1 rtcheck.1 rtedge.1 rtg3.1 rthide.1 rtpp.1 rtrange.1 rtray.1 \
+	rtregis.1 rtscale.1 rtshot.1 rttherm.1 rtwalk.1 rtweight.1 rtxray.1 \
+	scriptsort.1 secpass.1 shapefact.1 show3.1 showshot.1 showtherm.1 \
+	smush.1 ssamp-bw.1 stl-g.1 sun-pix.1 tabinterp.1 tabsub.1 \
+	tankill-g.1 targatorle.1 template.1 terrain.1 tifftorle.1 tire.1 \
+	to8.1 tobw.1 unexp.1 unslice.1 urt.1 vdeck.1 viewpoint-g.1 \
+	wasatchrle.1 wavelet.1
+
+MAN3=	buildmap.3 bwdithermap.3 colorquant.3 dither.3 ditherbw.3 dithergb.3 \
+	dithermap.3 float_to_exp.3 hilbert.3 hilbert_c2i.3 hilbert_i2c.3 \
+	htond.3 inv_cmap.3 libbu.3 libcursor.3 libfb.3 liborle.3 libplot3.3 \
+	librle.3 librt.3 libutahrle.3 libwdb.3 make_square.3 redblack.3 \
+	rgb_to_bw.3 rle_addhist.3 rle_cp.3 rle_debug.3 rle_delcom.3 \
+	rle_freeraw.3 rle_get_error.3 rle_get_set.3 rle_get_setup.3 \
+	rle_get_setup_ok.3 rle_getcom.3 rle_getraw.3 rle_getrow.3 \
+	rle_getskip.3 rle_hdr.3 rle_op.3 rle_open_f.3 rle_open_f_noexit.3 \
+	rle_put_init.3 rle_put_setup.3 rle_putcom.3 rle_puteof.3 \
+	rle_putraw.3 rle_putrow.3 rle_raw_alloc.3 rle_raw_free.3 \
+	rle_rawtorow.3 rle_row_alloc.3 rle_row_free.3 rle_skiprow.3 \
+	scanargs.3
+
+MAN5=	rle.5 bw.5 cmap.5 pix.5 plot3.5 gattributes.5
+
+MANN=	iwidgets_buttonbox.n iwidgets_calendar.n iwidgets_canvasprintbox.n \
+	iwidgets_canvasprintdialog.n iwidgets_checkbox.n iwidgets_combobox.n \
+	iwidgets_dateentry.n iwidgets_datefield.n iwidgets_dialog.n \
+	iwidgets_dialogshell.n iwidgets_disjointlistbox.n \
+	iwidgets_entryfield.n iwidgets_extbutton.n \
+	iwidgets_extfileselectionbox.n iwidgets_feedback.n \
+	iwidgets_extfileselectiondialog.n iwidgets_fileselectionbox.n \
+	iwidgets_fileselectiondialog.n iwidgets_finddialog.n \
+	iwidgets_hierarchy.n iwidgets_hyperhelp.n iwidgets_labeledframe.n \
+	iwidgets_labeledwidget.n iwidgets_mainwindow.n iwidgets_menubar.n \
+	iwidgets_messagebox.n iwidgets_messagedialog.n iwidgets_notebook.n \
+	iwidgets_optionmenu.n iwidgets_panedwindow.n iwidgets_promptdialog.n \
+	iwidgets_pushbutton.n iwidgets_radiobox.n iwidgets_scopedobject.n \
+	iwidgets_scrolledcanvas.n iwidgets_scrolledframe.n \
+	iwidgets_scrolledhtml.n iwidgets_scrolledlistbox.n \
+	iwidgets_scrolledtext.n iwidgets_selectionbox.n \
+	iwidgets_selectiondialog.n iwidgets_shell.n iwidgets_spindate.n \
+	iwidgets_spinint.n iwidgets_spinner.n iwidgets_spintime.n \
+	iwidgets_tabnotebook.n iwidgets_tabset.n iwidgets_timeentry.n \
+	iwidgets_timefield.n iwidgets_toolbar.n iwidgets_watch.n tkhtml.n \
+	3ptarb.nged B.nged E.nged M.nged Z.nged adc.nged ae.nged \
+	alias-pix.nged all_sf.nged analyze.nged anim_cascade.nged \
+	anim_fly.nged anim_hardtrack.nged anim_keyread.nged bb.nged \
+	anim_lookat.nged anim_offset.nged anim_orient.nged animmate.nged \
+	apropos.nged aproposdevel.nged aproposlib.nged arb.nged arced.nged \
+	area.nged arot.nged attach.nged attr.nged autoview.nged bev.nged \
+	bo.nged bolt.nged bot_condense.nged bot_decimate.nged \
+	bot_face_fuse.nged bot_face_sort.nged c.nged bot_vertex_fuse.nged \
+	build_region.nged cat.nged center.nged color.nged comb_color.nged \
+	copyeval.nged copymat.nged cp.nged cpi.nged d.nged dall.nged db.nged \
+	db_glob.nged dbconcat.nged debugbu.nged debugdir.nged debuglib.nged \
+	debugmem.nged debugnmg.nged decompose.nged delay.nged dm.nged \
+	draw.nged dup.nged e_command.nged e_muves.nged eac.nged echo.nged \
+	edcodes.nged edcolor.nged edcomb.nged edgedir.nged edit.nged \
+	edit_translate.nged edmater.nged em.nged eqn.nged erase.nged \
+	erase_all.nged ev.nged exists.nged exit.nged expand.nged \
+	export_body.nged extrude.nged eye_pt.nged facedef.nged facetize.nged \
+	find.nged fracture.nged g.nged garbage_collect.nged gastank.nged \
+	gqa.nged gui.nged handle.nged help.nged helpdevel.nged helplib.nged \
+	hide.nged history.nged i.nged idents.nged ill.nged in.nged \
+	inside.nged item.nged journal.nged keep.nged keypoint.nged kill.nged \
+	killall.nged killtree.nged knob.nged l.nged l_muves.nged \
+	labelvert.nged listeval.nged lm.nged loadtk.nged lookat.nged ls.nged \
+	make.nged make_bb.nged mater.nged matpick.nged memprint.nged \
+	mirface.nged mrot.nged mv.nged mvall.nged nirt.nged \
+	nmg_collapse.nged nmg_simplify.nged oed.nged opendb.nged \
+	orientation.nged orot.nged oscale.nged overlay.nged p.nged \
+	pathlist.nged paths.nged permute.nged picket_fence.nged plot.nged \
+	prcolor.nged prefix.nged press.nged preview.nged prj_add.nged \
+	ps.nged push.nged put_comb.nged putmat.nged q.nged qorot.nged \
+	qray.nged query_ray.nged quit.nged qvrot.nged r.nged rcc-blend.nged \
+	rcc-cap.nged rcc-tgc.nged rcc-tor.nged rcodes.nged read_muves.nged \
+	red.nged redraw_vlist.nged refresh.nged regdebug.nged regdef.nged \
+	regions.nged release.nged rfarb.nged rm.nged rmater.nged rmats.nged \
+	rot.nged rotobj.nged rpp-arch.nged rpp-cap.nged rrt.nged rt.nged \
+	rtcheck.nged rtwizard.nged savekey.nged saveview.nged sca.nged \
+	search.nged sed.nged setview.nged shader.nged shell.nged \
+	showmats.nged size.nged solids.nged sph-part.nged status.nged \
+	summary.nged sv.nged sync.nged t.nged t_muves.nged ted.nged \
+	title.nged tol.nged tops.nged tor-rcc.nged tra.nged track.nged \
+	translate.nged tree.nged units.nged vars.nged vdraw.nged view.nged \
+	viewsize.nged vnirt.nged vquery_ray.nged vrmgr.nged vrot.nged \
+	wcodes.nged whatid.nged which_shader.nged whichair.nged whichid.nged \
+	who.nged window.nged window_frame.nged wire.nged wmater.nged x.nged \
+	xpush.nged zoom.nged
 
 OPTIONS=	OPTIMIZATION "Build with optimizations" on
 
@@ -161,7 +178,7 @@ OPTIONS=	OPTIMIZATION "Build with optimizations" on
 EXTRA_LIBS=	${PTHREAD_LIBS}
 
 .ifdef WITH_OPTIMIZATION
-CONFIGURE_ARGS+=	--disable-debug --enable-optimized
+CMAKE_BUILD_TYPE=Release
 .endif
 
 .if ${ARCH} == "sparc64"
@@ -169,7 +186,9 @@ BROKEN=		Does not compile on sparc64: invokes i386 assembler
 .endif
 
 post-patch:
-	${REINPLACE_CMD} "s+-exact Tcl 8\.5\.1+Tcl 8.5+" ${WRKSRC}/src/other/tcl/library/init.tcl
+	@${REINPLACE_CMD} "s+-exact Tcl 8\.5\.1+Tcl 8.5+" ${WRKSRC}/src/other/tcl/library/init.tcl
+	@${REINPLACE_CMD} -e 's|{LIB_DIR}|{prefix}/libdata|' \
+			${WRKSRC}/misc/pkgconfig/CMakeLists.txt
 
 pre-install:
 	${CP} ${FILESDIR}/mged.sh ${WRKSRC}
diff --git a/cad/brlcad/distinfo b/cad/brlcad/distinfo
index 87b7aa7e4e44..ea204f5f630a 100644
--- a/cad/brlcad/distinfo
+++ b/cad/brlcad/distinfo
@@ -1,2 +1,2 @@
-SHA256 (brlcad-7.18.4.tar.bz2) = bb8e857f8e377d0a958711ef389ea12b13ef20aed461b8a30408ddc8d66858e5
-SIZE (brlcad-7.18.4.tar.bz2) = 47263065
+SHA256 (brlcad-7.20.4.tar.bz2) = 4a0150806bb97fc1997c2783fa88360118633859884da5c079fd4df07caf23bb
+SIZE (brlcad-7.20.4.tar.bz2) = 61849605
diff --git a/cad/brlcad/pkg-plist b/cad/brlcad/pkg-plist
index 0818b67f47b1..61ad8cb1639d 100644
--- a/cad/brlcad/pkg-plist
+++ b/cad/brlcad/pkg-plist
@@ -3,6 +3,7 @@
 bin/3dm-g
 bin/a-d
 bin/alias-pix
+bin/aliastorle
 bin/all_sf
 bin/anim_cascade
 bin/anim_fly
@@ -18,11 +19,13 @@ bin/anim_track
 bin/anim_turn
 bin/any-png.sh
 bin/ap-pix
+bin/applymap
 bin/archer
 bin/asc-nmg
 bin/asc-pl
 bin/asc2g
 bin/asc2pix
+bin/avg4
 bin/azel
 bin/bary
 bin/benchmark
@@ -69,20 +72,22 @@ bin/cad_boundp
 bin/cad_parea
 bin/cadbug.sh
 bin/canonize
-bin/cat-fb
 bin/cell-fb
 bin/chan_add
 bin/chan_mult
 bin/chan_permute
 bin/clutter
 bin/cmap-fb
+bin/cmp.sh
 bin/coil
 bin/comgeom-g
 bin/contours
 bin/conv-vg2g
 bin/conversion.sh
 bin/cray.sh
+bin/crop
 bin/csgbrep
+bin/cubitorle
 bin/cv
 bin/cy-g
 bin/d-a
@@ -122,6 +127,7 @@ bin/exppp
 bin/f-d
 bin/f-i
 bin/facetall.sh
+bin/fant
 bin/fast4-g
 bin/fb-bw
 bin/fb-cmap
@@ -161,6 +167,7 @@ bin/fhor
 bin/firpass
 bin/fix_polysolids
 bin/g-acad
+bin/g-dot
 bin/g-dxf
 bin/g-egg
 bin/g-euclid
@@ -185,7 +192,9 @@ bin/gastank
 bin/gencolor
 bin/gif-fb
 bin/gif2fb
+bin/giftorle
 bin/globe
+bin/graytorle
 bin/halftone
 bin/handle
 bin/hex
@@ -199,9 +208,10 @@ bin/imgdims
 bin/imod
 bin/indent.sh
 bin/intaval-g.py
+bin/into
 bin/ir-X
-bin/ir-sgi
 bin/irdisp
+bin/isst
 bin/istats
 bin/jack-g
 bin/kurt
@@ -211,6 +221,9 @@ bin/loop
 bin/lowp
 bin/mac-pix
 bin/masonry
+bin/mcut
+bin/menger
+bin/mergechan
 bin/metaball
 bin/mged
 bin/mged.sh
@@ -228,6 +241,7 @@ bin/obj-g
 bin/off-g
 bin/orle-fb
 bin/orle-pix
+bin/painttorle
 bin/patch-g
 bin/picket_fence
 bin/pipe
@@ -312,13 +326,58 @@ bin/poly-bot
 bin/pp-fb
 bin/proe-g
 bin/pyramid
+bin/pyrmask
 bin/random
 bin/rawbot
+bin/rawtorle
 bin/remapid
 bin/remrt
+bin/repos
 bin/reshoot
+bin/ringworld
 bin/rle-fb
 bin/rle-pix
+bin/rleClock
+bin/rleaddcom
+bin/rlebg
+bin/rlebox
+bin/rlecat
+bin/rleccube
+bin/rlecomp
+bin/rledither
+bin/rleflip
+bin/rlegrid
+bin/rlehdr
+bin/rlehisto
+bin/rleinterp
+bin/rleldmap
+bin/rlemandl
+bin/rlenoise
+bin/rlepatch
+bin/rleprint
+bin/rlequant
+bin/rlescale
+bin/rleselect
+bin/rlesetbg
+bin/rlesortmap
+bin/rlespiff
+bin/rlesplice
+bin/rlesplit
+bin/rlestereo
+bin/rleswap
+bin/rletoabA60
+bin/rletoabA62
+bin/rletoalias
+bin/rletoascii
+bin/rletogif
+bin/rletogray
+bin/rletopaint
+bin/rletops
+bin/rletoraw
+bin/rletorla
+bin/rletotarga
+bin/rletovcr
+bin/rlezoom
 bin/room
 bin/rpatch
 bin/rt
@@ -330,7 +389,6 @@ bin/rtedge
 bin/rtfrac
 bin/rtg3
 bin/rthide
-bin/rtmlt
 bin/rtpp
 bin/rtrad
 bin/rtrange
@@ -356,12 +414,14 @@ bin/showtherm
 bin/shp-g
 bin/sketch
 bin/smod
+bin/smush
 bin/sphflake
 bin/spltest
 bin/spm-fb
 bin/ssamp-bw
 bin/ssampview
 bin/ssampview.tcl
+bin/step-g
 bin/stl-g
 bin/sun-pix
 bin/surfaceintersect
@@ -370,12 +430,15 @@ bin/syn
 bin/tabinterp
 bin/tabsub
 bin/tankill-g
+bin/targatorle
 bin/tea
 bin/tea_nmg
 bin/terrain
 bin/texturescale
 bin/tgf-g
 bin/tire
+bin/to8
+bin/tobw
 bin/torii
 bin/tracker.sh
 bin/trimconfig.sh
@@ -386,18 +449,24 @@ bin/u-bw
 bin/u-d
 bin/u-f
 bin/umod
+bin/unexp
+bin/unslice
 bin/ustats
+bin/vcrtorle
 bin/vdeck
 bin/vegetation
 bin/viewpoint-g
+bin/wasatchrle
 bin/wavelet
 bin/wavy
 bin/wdb_example
 bin/window
 bin/window_frame
 bin/wire
+bin/xbmtorle
 bin/xyz-pl
 bin/yuv-pix
+include/GL/glew.h
 include/brlcad/RtServerImpl.h
 include/brlcad/analyze.h
 include/brlcad/anim.h
@@ -409,9 +478,9 @@ include/brlcad/brlcad_config.h
 include/brlcad/bu.h
 include/brlcad/cmd.h
 include/brlcad/common.h
-include/brlcad/config_win.h
 include/brlcad/db.h
 include/brlcad/db5.h
+include/brlcad/defines.h
 include/brlcad/dg.h
 include/brlcad/dm-Null.h
 include/brlcad/dm-X.h
@@ -459,23 +528,23 @@ include/brlcad/spectrum.h
 include/brlcad/spm.h
 include/brlcad/tclcad.h
 include/brlcad/tie.h
+include/brlcad/tol.h
 include/brlcad/vectfont.h
 include/brlcad/vector_fpu.h
 include/brlcad/vector_x86.h
 include/brlcad/vfont-if.h
 include/brlcad/vmath.h
 include/brlcad/wdb.h
+include/exit_status.h
 include/exppp/exppp.h
 include/express/alg.h
 include/express/basic.h
 include/express/caseitem.h
-include/express/de_end.h
-include/express/decstart.h
-include/express/defstart.h
 include/express/dict.h
 include/express/entity.h
 include/express/error.h
 include/express/expbasic.h
+include/express/expprint.h
 include/express/expr.h
 include/express/express.h
 include/express/hash.h
@@ -496,6 +565,11 @@ include/itclInt.h
 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/openNURBS/opennurbs.h
 include/openNURBS/opennurbs_3dm.h
 include/openNURBS/opennurbs_3dm_attributes.h
@@ -597,6 +671,12 @@ include/openNURBS/opennurbs_workspace.h
 include/openNURBS/opennurbs_x.h
 include/openNURBS/opennurbs_xform.h
 include/openNURBS/opennurbs_zlib.h
+include/pyramid.h
+include/rle.h
+include/rle_code.h
+include/rle_config.h
+include/rle_put.h
+include/rle_raw.h
 include/tie/adrt.h
 include/tie/adrt_struct.h
 include/tie/camera.h
@@ -605,14 +685,103 @@ include/tie/render_internal.h
 include/tie/render_util.h
 include/tie/texture.h
 include/tie/texture_internal.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/togl/togl.h
+include/togl/toglDecls.h
+include/togl/togl_config.h
+lib/Iwidgets4.0.1/iwidgets.tcl
+lib/Iwidgets4.0.1/license.terms
+lib/Iwidgets4.0.1/pkgIndex.tcl
+lib/Iwidgets4.0.1/scripts/buttonbox.itk
+lib/Iwidgets4.0.1/scripts/calendar.itk
+lib/Iwidgets4.0.1/scripts/canvasprintbox.itk
+lib/Iwidgets4.0.1/scripts/canvasprintdialog.itk
+lib/Iwidgets4.0.1/scripts/checkbox.itk
+lib/Iwidgets4.0.1/scripts/colors.itcl
+lib/Iwidgets4.0.1/scripts/combobox.itk
+lib/Iwidgets4.0.1/scripts/dateentry.itk
+lib/Iwidgets4.0.1/scripts/datefield.itk
+lib/Iwidgets4.0.1/scripts/dialog.itk
+lib/Iwidgets4.0.1/scripts/dialogshell.itk
+lib/Iwidgets4.0.1/scripts/disjointlistbox.itk
+lib/Iwidgets4.0.1/scripts/entryfield.itk
+lib/Iwidgets4.0.1/scripts/extbutton.itk
+lib/Iwidgets4.0.1/scripts/extfileselectionbox.itk
+lib/Iwidgets4.0.1/scripts/extfileselectiondialog.itk
+lib/Iwidgets4.0.1/scripts/feedback.itk
+lib/Iwidgets4.0.1/scripts/fileselectionbox.itk
+lib/Iwidgets4.0.1/scripts/fileselectiondialog.itk
+lib/Iwidgets4.0.1/scripts/finddialog.itk
+lib/Iwidgets4.0.1/scripts/hierarchy.itk
+lib/Iwidgets4.0.1/scripts/hyperhelp.itk
+lib/Iwidgets4.0.1/scripts/labeledframe.itk
+lib/Iwidgets4.0.1/scripts/labeledwidget.itk
+lib/Iwidgets4.0.1/scripts/mainwindow.itk
+lib/Iwidgets4.0.1/scripts/menubar.itk
+lib/Iwidgets4.0.1/scripts/messagebox.itk
+lib/Iwidgets4.0.1/scripts/messagedialog.itk
+lib/Iwidgets4.0.1/scripts/notebook.itk
+lib/Iwidgets4.0.1/scripts/optionmenu.itk
+lib/Iwidgets4.0.1/scripts/pane.itk
+lib/Iwidgets4.0.1/scripts/panedwindow.itk
+lib/Iwidgets4.0.1/scripts/promptdialog.itk
+lib/Iwidgets4.0.1/scripts/pushbutton.itk
+lib/Iwidgets4.0.1/scripts/radiobox.itk
+lib/Iwidgets4.0.1/scripts/regexpfield.itk
+lib/Iwidgets4.0.1/scripts/roman.itcl
+lib/Iwidgets4.0.1/scripts/scopedobject.itcl
+lib/Iwidgets4.0.1/scripts/scrolledcanvas.itk
+lib/Iwidgets4.0.1/scripts/scrolledframe.itk
+lib/Iwidgets4.0.1/scripts/scrolledhtml.itk
+lib/Iwidgets4.0.1/scripts/scrolledlistbox.itk
+lib/Iwidgets4.0.1/scripts/scrolledtext.itk
+lib/Iwidgets4.0.1/scripts/scrolledwidget.itk
+lib/Iwidgets4.0.1/scripts/selectionbox.itk
+lib/Iwidgets4.0.1/scripts/selectiondialog.itk
+lib/Iwidgets4.0.1/scripts/shell.itk
+lib/Iwidgets4.0.1/scripts/spindate.itk
+lib/Iwidgets4.0.1/scripts/spinint.itk
+lib/Iwidgets4.0.1/scripts/spinner.itk
+lib/Iwidgets4.0.1/scripts/spintime.itk
+lib/Iwidgets4.0.1/scripts/tabnotebook.itk
+lib/Iwidgets4.0.1/scripts/tabset.itk
+lib/Iwidgets4.0.1/scripts/tclIndex
+lib/Iwidgets4.0.1/scripts/timeentry.itk
+lib/Iwidgets4.0.1/scripts/timefield.itk
+lib/Iwidgets4.0.1/scripts/toolbar.itk
+lib/Iwidgets4.0.1/scripts/unknownimage.gif
+lib/Iwidgets4.0.1/scripts/watch.itk
 lib/Tkhtml3.0/pkgIndex.tcl
 lib/Tktable2.10/README.txt
-lib/Tktable2.10/html/tkTable.html
-lib/Tktable2.10/libTktable2.10.so
 lib/Tktable2.10/license.txt
 lib/Tktable2.10/pkgIndex.tcl
 lib/Tktable2.10/tkTable.tcl
 lib/Tktable2.10/tktable.py
+lib/Togl2.1/pkgIndex.tcl
+lib/isst0.1/libissttcltk.so
+lib/isst0.1/pkgIndex.tcl
 lib/itcl3.4/itcl.tcl
 lib/itcl3.4/pkgIndex.tcl
 lib/itk3.4/Archetype.itk
@@ -621,224 +790,143 @@ lib/itk3.4/Widget.itk
 lib/itk3.4/itk.tcl
 lib/itk3.4/pkgIndex.tcl
 lib/itk3.4/tclIndex
-lib/iwidgets4.0.1/iwidgets.tcl
-lib/iwidgets4.0.1/license.terms
-lib/iwidgets4.0.1/pkgIndex.tcl
-lib/iwidgets4.0.1/scripts/buttonbox.itk
-lib/iwidgets4.0.1/scripts/calendar.itk
-lib/iwidgets4.0.1/scripts/canvasprintbox.itk
-lib/iwidgets4.0.1/scripts/canvasprintdialog.itk
-lib/iwidgets4.0.1/scripts/checkbox.itk
-lib/iwidgets4.0.1/scripts/colors.itcl
-lib/iwidgets4.0.1/scripts/combobox.itk
-lib/iwidgets4.0.1/scripts/dateentry.itk
-lib/iwidgets4.0.1/scripts/datefield.itk
-lib/iwidgets4.0.1/scripts/dialog.itk
-lib/iwidgets4.0.1/scripts/dialogshell.itk
-lib/iwidgets4.0.1/scripts/disjointlistbox.itk
-lib/iwidgets4.0.1/scripts/entryfield.itk
-lib/iwidgets4.0.1/scripts/extbutton.itk
-lib/iwidgets4.0.1/scripts/extfileselectionbox.itk
-lib/iwidgets4.0.1/scripts/extfileselectiondialog.itk
-lib/iwidgets4.0.1/scripts/feedback.itk
-lib/iwidgets4.0.1/scripts/fileselectionbox.itk
-lib/iwidgets4.0.1/scripts/fileselectiondialog.itk
-lib/iwidgets4.0.1/scripts/finddialog.itk
-lib/iwidgets4.0.1/scripts/hierarchy.itk
-lib/iwidgets4.0.1/scripts/hyperhelp.itk
-lib/iwidgets4.0.1/scripts/labeledframe.itk
-lib/iwidgets4.0.1/scripts/labeledwidget.itk
-lib/iwidgets4.0.1/scripts/mainwindow.itk
-lib/iwidgets4.0.1/scripts/menubar.itk
-lib/iwidgets4.0.1/scripts/messagebox.itk
-lib/iwidgets4.0.1/scripts/messagedialog.itk
-lib/iwidgets4.0.1/scripts/notebook.itk
-lib/iwidgets4.0.1/scripts/optionmenu.itk
-lib/iwidgets4.0.1/scripts/pane.itk
-lib/iwidgets4.0.1/scripts/panedwindow.itk
-lib/iwidgets4.0.1/scripts/promptdialog.itk
-lib/iwidgets4.0.1/scripts/pushbutton.itk
-lib/iwidgets4.0.1/scripts/radiobox.itk
-lib/iwidgets4.0.1/scripts/regexpfield.itk
-lib/iwidgets4.0.1/scripts/roman.itcl
-lib/iwidgets4.0.1/scripts/scopedobject.itcl
-lib/iwidgets4.0.1/scripts/scrolledcanvas.itk
-lib/iwidgets4.0.1/scripts/scrolledframe.itk
-lib/iwidgets4.0.1/scripts/scrolledhtml.itk
-lib/iwidgets4.0.1/scripts/scrolledlistbox.itk
-lib/iwidgets4.0.1/scripts/scrolledtext.itk
-lib/iwidgets4.0.1/scripts/scrolledwidget.itk
-lib/iwidgets4.0.1/scripts/selectionbox.itk
-lib/iwidgets4.0.1/scripts/selectiondialog.itk
-lib/iwidgets4.0.1/scripts/shell.itk
-lib/iwidgets4.0.1/scripts/spindate.itk
-lib/iwidgets4.0.1/scripts/spinint.itk
-lib/iwidgets4.0.1/scripts/spinner.itk
-lib/iwidgets4.0.1/scripts/spintime.itk
-lib/iwidgets4.0.1/scripts/tabnotebook.itk
-lib/iwidgets4.0.1/scripts/tabset.itk
-lib/iwidgets4.0.1/scripts/tclIndex
-lib/iwidgets4.0.1/scripts/timeentry.itk
-lib/iwidgets4.0.1/scripts/timefield.itk
-lib/iwidgets4.0.1/scripts/toolbar.itk
-lib/iwidgets4.0.1/scripts/unknownimage.gif
-lib/iwidgets4.0.1/scripts/watch.itk
-lib/libTkhtml.la
 lib/libTkhtml.so
-lib/libTkhtml.so.0
+lib/libTkhtml.so.3.0
+lib/libTktable.so
+lib/libTktable.so.2.10
 lib/libanalyze.a
-lib/libanalyze.la
 lib/libanalyze.so
 lib/libanalyze.so.19
+lib/libanalyze.so.19.0.1
 lib/libbn.a
-lib/libbn.la
 lib/libbn.so
 lib/libbn.so.19
-lib/libbrlcad.a
-lib/libbrlcad.la
-lib/libbrlcad.so
-lib/libbrlcad.so.19
+lib/libbn.so.19.0.1
 lib/libbu.a
-lib/libbu.la
 lib/libbu.so
 lib/libbu.so.19
+lib/libbu.so.19.0.1
 lib/libcursor.a
-lib/libcursor.la
 lib/libcursor.so
 lib/libcursor.so.19
+lib/libcursor.so.19.0.1
 lib/libdm.a
-lib/libdm.la
 lib/libdm.so
 lib/libdm.so.19
+lib/libdm.so.19.0.1
 lib/libexppp.a
-lib/libexppp.la
 lib/libexppp.so
-lib/libexppp.so.19
+lib/libexppp.so.3
+lib/libexppp.so.3.2
 lib/libexpress.a
-lib/libexpress.la
 lib/libexpress.so
-lib/libexpress.so.19
+lib/libexpress.so.3
+lib/libexpress.so.3.2
 lib/libfb.a
-lib/libfb.la
 lib/libfb.so
 lib/libfb.so.19
+lib/libfb.so.19.0.1
 lib/libfft.a
-lib/libfft.la
 lib/libfft.so
 lib/libfft.so.19
+lib/libfft.so.19.0.1
 lib/libgcv.a
-lib/libgcv.la
 lib/libgcv.so
 lib/libgcv.so.19
+lib/libgcv.so.19.0.1
 lib/libged.a
-lib/libged.la
 lib/libged.so
 lib/libged.so.19
+lib/libged.so.19.0.1
 lib/libicv.a
-lib/libicv.la
 lib/libicv.so
 lib/libicv.so.19
-lib/libitcl.a
-lib/libitcl.la
+lib/libicv.so.19.0.1
 lib/libitcl.so
-lib/libitcl.so.0
-lib/libitcl3.4.a
-lib/libitcl3.4.la
-lib/libitcl3.4.so
-lib/libitcl3.4.so.0
+lib/libitcl.so.3
+lib/libitcl.so.3.4
 lib/libitclstub.a
-lib/libitclstub.la
-lib/libitclstub.so
-lib/libitclstub.so.0
-lib/libitclstub3.4.a
-lib/libitclstub3.4.la
-lib/libitclstub3.4.so
-lib/libitclstub3.4.so.0
-lib/libitk.a
-lib/libitk.la
 lib/libitk.so
-lib/libitk.so.0
-lib/libitk3.4.a
-lib/libitk3.4.la
-lib/libitk3.4.so
-lib/libitk3.4.so.0
+lib/libitk.so.3
+lib/libitk.so.3.4
 lib/libitkstub.a
-lib/libitkstub.la
-lib/libitkstub.so
-lib/libitkstub.so.0
-lib/libitkstub3.4.a
-lib/libitkstub3.4.la
-lib/libitkstub3.4.so
-lib/libitkstub3.4.so.0
 lib/libmultispectral.a
-lib/libmultispectral.la
 lib/libmultispectral.so
 lib/libmultispectral.so.19
+lib/libmultispectral.so.19.0.1
 lib/libopenNURBS.a
-lib/libopenNURBS.la
 lib/libopenNURBS.so
-lib/libopenNURBS.so.0
+lib/libopenNURBS.so.2010.04.95
 lib/liboptical.a
-lib/liboptical.la
 lib/liboptical.so
 lib/liboptical.so.19
+lib/liboptical.so.19.0.1
 lib/liborle.a
-lib/liborle.la
 lib/liborle.so
 lib/liborle.so.19
+lib/liborle.so.19.0.1
 lib/libpc.a
-lib/libpc.la
 lib/libpc.so
 lib/libpc.so.19
+lib/libpc.so.19.0.1
 lib/libpkg.a
-lib/libpkg.la
 lib/libpkg.so
 lib/libpkg.so.19
+lib/libpkg.so.19.0.1
+lib/libpoints.so
 lib/librender.a
-lib/librender.la
 lib/librender.so
-lib/librender.so.0
 lib/librt.a
-lib/librt.la
 lib/librt.so
 lib/librt.so.19
+lib/librt.so.19.0.1
+lib/librtms.a
 lib/libstepcore.a
-lib/libstepcore.la
 lib/libstepcore.so
-lib/libstepcore.so.19
+lib/libstepcore.so.3
+lib/libstepcore.so.3.2
 lib/libstepdai.a
-lib/libstepdai.la
 lib/libstepdai.so
-lib/libstepdai.so.19
+lib/libstepdai.so.3
+lib/libstepdai.so.3.2
 lib/libstepeditor.a
-lib/libstepeditor.la
 lib/libstepeditor.so
-lib/libstepeditor.so.19
+lib/libstepeditor.so.3
+lib/libstepeditor.so.3.2
 lib/libsteputils.a
-lib/libsteputils.la
 lib/libsteputils.so
-lib/libsteputils.so.19
+lib/libsteputils.so.3
+lib/libsteputils.so.3.2
 lib/libsysv.a
-lib/libsysv.la
 lib/libsysv.so
 lib/libsysv.so.19
+lib/libsysv.so.19.0.1
 lib/libtclcad.a
-lib/libtclcad.la
 lib/libtclcad.so
 lib/libtclcad.so.19
+lib/libtclcad.so.19.0.1
 lib/libtermio.a
-lib/libtermio.la
 lib/libtermio.so
 lib/libtermio.so.19
-lib/libtkpng.a
-lib/libtkpng.la
+lib/libtermio.so.19.0.1
+lib/libtermlib.a
+lib/libtermlib.so
 lib/libtkpng.so
-lib/libtkpng.so.0
+lib/libtkpng.so.0.8
+lib/libtogl.so
+lib/libtoglstub.a
+lib/libutahrle.a
+lib/libutahrle.so
+lib/libutahrle.so.19
+lib/libutahrle.so.19.0.1
+lib/libvfont.a
+lib/libvfont.so
+lib/libvfont.so.19
+lib/libvfont.so.19.0.1
 lib/libwdb.a
-lib/libwdb.la
 lib/libwdb.so
 lib/libwdb.so.19
-lib/tkpng0.8/pkgIndex.tcl
+lib/libwdb.so.19.0.1
 libdata/pkgconfig/libanalyze.pc
 libdata/pkgconfig/libbn.pc
 libdata/pkgconfig/libbrlcad.pc
@@ -855,27 +943,8 @@ libdata/pkgconfig/libpc.pc
 libdata/pkgconfig/libpkg.pc
 libdata/pkgconfig/librt.pc
 libdata/pkgconfig/libwdb.pc
-share/scl/3.2.0/AUTHORS
-share/scl/3.2.0/COPYING
-share/scl/3.2.0/INSTALL
-share/scl/3.2.0/NEWS
-share/scl/3.2.0/README
-share/scl/3.2.0/data/ap203/203wseds.exp
-share/scl/3.2.0/data/ap203/cube1.p21
-share/scl/3.2.0/data/ap203/cube2.p21
-share/scl/3.2.0/data/ap203/g_r_assembly1.p21
-share/scl/3.2.0/data/ap203/gasket1.p21
-share/scl/3.2.0/data/ap203/gasket2.p21
-share/scl/3.2.0/data/ap203/gasket3.p21
-share/scl/3.2.0/data/ap203/hex_prism1.p21
-share/scl/3.2.0/data/ap203/rod_aspect1.p21
-share/scl/3.2.0/data/ap203/star1.p21
-share/scl/3.2.0/data/ap227/ap227.exp
-share/scl/3.2.0/data/ap227/mitre.p21
-share/scl/3.2.0/data/ap227/mitre.step.txt
-share/scl/3.2.0/data/example/example.exp
-share/scl/3.2.0/data/pdmnet.exp
-share/scl/3.2.0/data/select.exp
+lib/tkpng0.8/pkgIndex.tcl
+man/tkhtml.n
 %%DATADIR%%/%%PORTVERSION%%/AUTHORS
 %%DATADIR%%/%%PORTVERSION%%/COPYING
 %%DATADIR%%/%%PORTVERSION%%/HACKING
@@ -884,10 +953,27 @@ share/scl/3.2.0/data/select.exp
 %%DATADIR%%/%%PORTVERSION%%/README
 %%DATADIR%%/%%PORTVERSION%%/data/GQA_SAMPLE_DENSITIES
 %%DATADIR%%/%%PORTVERSION%%/data/NIST_DENSITIES
+%%DATADIR%%/%%PORTVERSION%%/data/ap203/203wseds.exp
+%%DATADIR%%/%%PORTVERSION%%/data/ap203/cube1.p21
+%%DATADIR%%/%%PORTVERSION%%/data/ap203/cube2.p21
+%%DATADIR%%/%%PORTVERSION%%/data/ap203/g_r_assembly1.p21
+%%DATADIR%%/%%PORTVERSION%%/data/ap203/gasket1.p21
+%%DATADIR%%/%%PORTVERSION%%/data/ap203/gasket2.p21
+%%DATADIR%%/%%PORTVERSION%%/data/ap203/gasket3.p21
+%%DATADIR%%/%%PORTVERSION%%/data/ap203/hex_prism1.p21
+%%DATADIR%%/%%PORTVERSION%%/data/ap203/rod_aspect1.p21
+%%DATADIR%%/%%PORTVERSION%%/data/ap203/star1.p21
+%%DATADIR%%/%%PORTVERSION%%/data/ap227/ap227.exp
+%%DATADIR%%/%%PORTVERSION%%/data/ap227/mitre.p21
+%%DATADIR%%/%%PORTVERSION%%/data/ap227/mitre.step.txt
+%%DATADIR%%/%%PORTVERSION%%/data/example/example.exp
+%%DATADIR%%/%%PORTVERSION%%/data/pdmnet.exp
+%%DATADIR%%/%%PORTVERSION%%/data/select.exp
 %%DATADIR%%/%%PORTVERSION%%/db/axis.g
 %%DATADIR%%/%%PORTVERSION%%/db/bldg391.g
 %%DATADIR%%/%%PORTVERSION%%/db/boolean-ops.g
 %%DATADIR%%/%%PORTVERSION%%/db/castle.g
+%%DATADIR%%/%%PORTVERSION%%/db/cornell-kunigami.g
 %%DATADIR%%/%%PORTVERSION%%/db/cornell.g
 %%DATADIR%%/%%PORTVERSION%%/db/cray.g
 %%DATADIR%%/%%PORTVERSION%%/db/crod.g
@@ -901,7 +987,6 @@ share/scl/3.2.0/data/select.exp
 %%DATADIR%%/%%PORTVERSION%%/db/lgt-test.g
 %%DATADIR%%/%%PORTVERSION%%/db/m35.g
 %%DATADIR%%/%%PORTVERSION%%/db/moss.g
-%%DATADIR%%/%%PORTVERSION%%/db/operators.asc2g
 %%DATADIR%%/%%PORTVERSION%%/db/operators.g
 %%DATADIR%%/%%PORTVERSION%%/db/pic.g
 %%DATADIR%%/%%PORTVERSION%%/db/pinewood.g
@@ -937,6 +1022,7 @@ share/scl/3.2.0/data/select.exp
 %%DATADIR%%/%%PORTVERSION%%/doc/axis-3525.ps
 %%DATADIR%%/%%PORTVERSION%%/doc/b.tex
 %%DATADIR%%/%%PORTVERSION%%/doc/benchmark.tr
+%%DATADIR%%/%%PORTVERSION%%/doc/bison_to_lemon.txt
 %%DATADIR%%/%%PORTVERSION%%/doc/brep.txt
 %%DATADIR%%/%%PORTVERSION%%/doc/buttonmenu.ps
 %%DATADIR%%/%%PORTVERSION%%/doc/c.tex
@@ -949,6 +1035,7 @@ share/scl/3.2.0/data/select.exp
 %%DATADIR%%/%%PORTVERSION%%/doc/description.txt
 %%DATADIR%%/%%PORTVERSION%%/doc/doit
 %%DATADIR%%/%%PORTVERSION%%/doc/e.tex
+%%DATADIR%%/%%PORTVERSION%%/doc/ecosystem.dot
 %%DATADIR%%/%%PORTVERSION%%/doc/eo-arbrot.ps
 %%DATADIR%%/%%PORTVERSION%%/doc/eo-bgrp.ps
 %%DATADIR%%/%%PORTVERSION%%/doc/eo-bgrp311.ps
@@ -1041,6 +1128,7 @@ share/scl/3.2.0/data/select.exp
 %%DATADIR%%/%%PORTVERSION%%/doc/fig-sgi.ps
 %%DATADIR%%/%%PORTVERSION%%/doc/fig-vg-buttons.ps
 %%DATADIR%%/%%PORTVERSION%%/doc/fig-vg-knobs.ps
+%%DATADIR%%/%%PORTVERSION%%/doc/flex_to_re2c.txt
 %%DATADIR%%/%%PORTVERSION%%/doc/g.tex
 %%DATADIR%%/%%PORTVERSION%%/doc/ged.tr
 %%DATADIR%%/%%PORTVERSION%%/doc/h.tex
@@ -1120,6 +1208,7 @@ share/scl/3.2.0/data/select.exp
 %%DATADIR%%/%%PORTVERSION%%/doc/wm-leg1.ps
 %%DATADIR%%/%%PORTVERSION%%/doc/wm-prims.ps
 %%DATADIR%%/%%PORTVERSION%%/doc/wm-tube.ps
+%%DATADIR%%/%%PORTVERSION%%/etc/termcap
 %%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
@@ -1344,6 +1433,18 @@ share/scl/3.2.0/data/select.exp
 %%DATADIR%%/%%PORTVERSION%%/html/books/en/images/tutorial_series_volI_fig05.png
 %%DATADIR%%/%%PORTVERSION%%/html/books/en/images/tutorial_series_volI_fig06.png
 %%DATADIR%%/%%PORTVERSION%%/html/books/en/images/tutorial_series_volI_fig07.png
+%%DATADIR%%/%%PORTVERSION%%/html/books/en/images/v4-image001.jpg
+%%DATADIR%%/%%PORTVERSION%%/html/books/en/images/v4-image002.jpg
+%%DATADIR%%/%%PORTVERSION%%/html/books/en/images/v4-image003.gif
+%%DATADIR%%/%%PORTVERSION%%/html/books/en/images/v4-image004.jpg
+%%DATADIR%%/%%PORTVERSION%%/html/books/en/images/v4-image005.jpg
+%%DATADIR%%/%%PORTVERSION%%/html/books/en/images/v4-image006.jpg
+%%DATADIR%%/%%PORTVERSION%%/html/books/en/images/v4-image007.jpg
+%%DATADIR%%/%%PORTVERSION%%/html/books/en/images/v4-image008.gif
+%%DATADIR%%/%%PORTVERSION%%/html/books/en/images/v4-image009.jpg
+%%DATADIR%%/%%PORTVERSION%%/html/books/en/images/v4-image010.jpg
+%%DATADIR%%/%%PORTVERSION%%/html/books/en/images/v4-image011.jpg
+%%DATADIR%%/%%PORTVERSION%%/html/css/brlcad.css
 %%DATADIR%%/%%PORTVERSION%%/html/lessons/en/images/mged01_commandwindow.png
 %%DATADIR%%/%%PORTVERSION%%/html/lessons/en/images/mged01_graphicswindow.png
 %%DATADIR%%/%%PORTVERSION%%/html/lessons/en/images/mged01_terminal.png
@@ -1679,12 +1780,15 @@ share/scl/3.2.0/data/select.exp
 %%DATADIR%%/%%PORTVERSION%%/html/mann/en/edcolor.html
 %%DATADIR%%/%%PORTVERSION%%/html/mann/en/edcomb.html
 %%DATADIR%%/%%PORTVERSION%%/html/mann/en/edgedir.html
+%%DATADIR%%/%%PORTVERSION%%/html/mann/en/edit.html
+%%DATADIR%%/%%PORTVERSION%%/html/mann/en/edit_translate.html
 %%DATADIR%%/%%PORTVERSION%%/html/mann/en/edmater.html
 %%DATADIR%%/%%PORTVERSION%%/html/mann/en/em.html
 %%DATADIR%%/%%PORTVERSION%%/html/mann/en/eqn.html
 %%DATADIR%%/%%PORTVERSION%%/html/mann/en/erase.html
 %%DATADIR%%/%%PORTVERSION%%/html/mann/en/erase_all.html
 %%DATADIR%%/%%PORTVERSION%%/html/mann/en/ev.html
+%%DATADIR%%/%%PORTVERSION%%/html/mann/en/exists.html
 %%DATADIR%%/%%PORTVERSION%%/html/mann/en/exit.html
 %%DATADIR%%/%%PORTVERSION%%/html/mann/en/expand.html
 %%DATADIR%%/%%PORTVERSION%%/html/mann/en/export_body.html
@@ -2041,8 +2145,16 @@ share/scl/3.2.0/data/select.exp
 %%DATADIR%%/%%PORTVERSION%%/html/manuals/mged/tex-html.tcl
 %%DATADIR%%/%%PORTVERSION%%/html/manuals/shaders/camo.html
 %%DATADIR%%/%%PORTVERSION%%/html/manuals/small-eagleCAD.gif
+%%DATADIR%%/%%PORTVERSION%%/html/presentations/en/images/copy-sph-part-left.png
+%%DATADIR%%/%%PORTVERSION%%/html/presentations/en/images/copy-sph-part-right.png
+%%DATADIR%%/%%PORTVERSION%%/html/presentations/en/images/mged-defaults.png
+%%DATADIR%%/%%PORTVERSION%%/html/presentations/en/images/special-character-interpretation.png
+%%DATADIR%%/%%PORTVERSION%%/html/presentations/en/images/tk-based-gui-for-mged.png
+%%DATADIR%%/%%PORTVERSION%%/html/presentations/en/intro-to-tcltk.html
 %%DATADIR%%/%%PORTVERSION%%/html/specifications/en/BRL_CAD_g_format_V5.html
 %%DATADIR%%/%%PORTVERSION%%/html/toc.html
+%%DATADIR%%/%%PORTVERSION%%/icons/archer.ico
+%%DATADIR%%/%%PORTVERSION%%/icons/brlcad.ico
 %%DATADIR%%/%%PORTVERSION%%/nirt/csv-gap.nrt
 %%DATADIR%%/%%PORTVERSION%%/nirt/csv.nrt
 %%DATADIR%%/%%PORTVERSION%%/nirt/default.nrt
@@ -2075,8 +2187,6 @@ share/scl/3.2.0/data/select.exp
 %%DATADIR%%/%%PORTVERSION%%/plugins/archer/Wizards/tankwizardIA/images/tank.png
 %%DATADIR%%/%%PORTVERSION%%/plugins/archer/Wizards/tirewizard.tcl
 %%DATADIR%%/%%PORTVERSION%%/plugins/archer/Wizards/tirewizard/TireWizard.tcl
-%%DATADIR%%/%%PORTVERSION%%/plugins/archer/utility.tcl
-%%DATADIR%%/%%PORTVERSION%%/plugins/archer/wizards.tcl
 %%DATADIR%%/%%PORTVERSION%%/sample_applications/fortran_example.f
 %%DATADIR%%/%%PORTVERSION%%/sample_applications/g-xxx.c
 %%DATADIR%%/%%PORTVERSION%%/sample_applications/g-xxx_facets.c
@@ -2111,6 +2221,7 @@ share/scl/3.2.0/data/select.exp
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/HypEditFrame.tcl
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/LoadArcherLibs.tcl
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/PartEditFrame.tcl
+%%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/PipeEditFrame.tcl
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/Plugin.tcl
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/RhcEditFrame.tcl
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/RpcEditFrame.tcl
@@ -2290,8 +2401,8 @@ share/scl/3.2.0/data/select.exp
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/images/object_undo.png
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/images/open.png
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/images/openf.gif
+%%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/images/option_edit.png
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/images/option_text.png
-%%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/images/option_tree.png
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/images/other.png
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/images/other_intersect.png
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/images/other_subtract.png
@@ -2368,6 +2479,7 @@ share/scl/3.2.0/data/select.exp
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/images/tgc_labeled.png
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/images/tgc_subtract.png
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/images/tgc_union.png
+%%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/images/tools.png
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/images/tor.png
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/images/tor_intersect.png
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/archer/images/tor_labeled.png
@@ -2409,6 +2521,7 @@ share/scl/3.2.0/data/select.exp
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/hv3/pkgIndex.tcl
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/hv3/snit.tcl
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/hv3/tclIndex
+%%DATADIR%%/%%PORTVERSION%%/tclscripts/lib/Accordian.tcl
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/lib/CellPlot.tcl
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/lib/ColorEntry.tcl
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/lib/ComboBox.tcl
@@ -2435,6 +2548,7 @@ share/scl/3.2.0/data/select.exp
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/lib/pkgIndex.tcl
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/lib/tclIndex
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/libdm.tcl
+%%DATADIR%%/%%PORTVERSION%%/tclscripts/man_browser.tcl
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/menu_override.tcl
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/mged/accel.tcl
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/mged/adc.tcl
@@ -2537,7 +2651,6 @@ share/scl/3.2.0/data/select.exp
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/mged/overlap.tcl
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/mged/pattern.tcl
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/mged/pattern_gui.tcl
-%%DATADIR%%/%%PORTVERSION%%/tclscripts/mged/pkgIndex.tcl
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/mged/plot.tcl
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/mged/points.tcl
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/mged/prj_add.tcl
@@ -2546,6 +2659,7 @@ share/scl/3.2.0/data/select.exp
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/mged/ray.tcl
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/mged/raypick.tcl
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/mged/reid.tcl
+%%DATADIR%%/%%PORTVERSION%%/tclscripts/mged/relos.tcl
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/mged/remap_mater.tcl
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/mged/remat.tcl
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/mged/rt.tcl
@@ -2655,12 +2769,6 @@ share/scl/3.2.0/data/select.exp
 %%DATADIR%%/%%PORTVERSION%%/tclscripts/vmath.tcl
 %%DATADIR%%/%%PORTVERSION%%/vfont/fix.6r
 %%DATADIR%%/%%PORTVERSION%%/vfont/nonie.r.12
-@dirrm share/scl/3.2.0/data/example
-@dirrm share/scl/3.2.0/data/ap227
-@dirrm share/scl/3.2.0/data/ap203
-@dirrm share/scl/3.2.0/data
-@dirrm share/scl/3.2.0
-@dirrm share/scl
 @dirrm %%DATADIR%%/%%PORTVERSION%%/vfont
 @dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/util
 @dirrm %%DATADIR%%/%%PORTVERSION%%/tclscripts/swidgets/scripts
@@ -2701,27 +2809,13 @@ share/scl/3.2.0/data/select.exp
 @dirrm %%DATADIR%%/%%PORTVERSION%%/plugins/archer
 @dirrm %%DATADIR%%/%%PORTVERSION%%/plugins
 @dirrm %%DATADIR%%/%%PORTVERSION%%/pix
-@dirrm %%DATADIR%%/%%PORTVERSION%%/pdf/specifications/en
-@dirrm %%DATADIR%%/%%PORTVERSION%%/pdf/specifications
-@dirrm %%DATADIR%%/%%PORTVERSION%%/pdf/mann/en
-@dirrm %%DATADIR%%/%%PORTVERSION%%/pdf/mann
-@dirrm %%DATADIR%%/%%PORTVERSION%%/pdf/man5/en
-@dirrm %%DATADIR%%/%%PORTVERSION%%/pdf/man5
-@dirrm %%DATADIR%%/%%PORTVERSION%%/pdf/man3/en
-@dirrm %%DATADIR%%/%%PORTVERSION%%/pdf/man3
-@dirrm %%DATADIR%%/%%PORTVERSION%%/pdf/man1/en
-@dirrm %%DATADIR%%/%%PORTVERSION%%/pdf/man1
-@dirrm %%DATADIR%%/%%PORTVERSION%%/pdf/lessons/es
-@dirrm %%DATADIR%%/%%PORTVERSION%%/pdf/lessons/en
-@dirrm %%DATADIR%%/%%PORTVERSION%%/pdf/lessons
-@dirrm %%DATADIR%%/%%PORTVERSION%%/pdf/books/en
-@dirrm %%DATADIR%%/%%PORTVERSION%%/pdf/books
-@dirrm %%DATADIR%%/%%PORTVERSION%%/pdf/articles/en
-@dirrm %%DATADIR%%/%%PORTVERSION%%/pdf/articles
-@dirrm %%DATADIR%%/%%PORTVERSION%%/pdf
 @dirrm %%DATADIR%%/%%PORTVERSION%%/nirt
+@dirrm %%DATADIR%%/%%PORTVERSION%%/icons
 @dirrm %%DATADIR%%/%%PORTVERSION%%/html/specifications/en
 @dirrm %%DATADIR%%/%%PORTVERSION%%/html/specifications
+@dirrm %%DATADIR%%/%%PORTVERSION%%/html/presentations/en/images
+@dirrm %%DATADIR%%/%%PORTVERSION%%/html/presentations/en
+@dirrm %%DATADIR%%/%%PORTVERSION%%/html/presentations
 @dirrm %%DATADIR%%/%%PORTVERSION%%/html/manuals/shaders
 @dirrm %%DATADIR%%/%%PORTVERSION%%/html/manuals/mged/animmate
 @dirrm %%DATADIR%%/%%PORTVERSION%%/html/manuals/mged
@@ -2744,6 +2838,7 @@ share/scl/3.2.0/data/select.exp
 @dirrm %%DATADIR%%/%%PORTVERSION%%/html/lessons/en/images
 @dirrm %%DATADIR%%/%%PORTVERSION%%/html/lessons/en
 @dirrm %%DATADIR%%/%%PORTVERSION%%/html/lessons
+@dirrm %%DATADIR%%/%%PORTVERSION%%/html/css
 @dirrm %%DATADIR%%/%%PORTVERSION%%/html/books/en/images
 @dirrm %%DATADIR%%/%%PORTVERSION%%/html/books/en
 @dirrm %%DATADIR%%/%%PORTVERSION%%/html/books
@@ -2755,9 +2850,13 @@ share/scl/3.2.0/data/select.exp
 @dirrm %%DATADIR%%/%%PORTVERSION%%/html/ReleaseNotes/Rel5.0
 @dirrm %%DATADIR%%/%%PORTVERSION%%/html/ReleaseNotes
 @dirrm %%DATADIR%%/%%PORTVERSION%%/html
+@dirrm %%DATADIR%%/%%PORTVERSION%%/etc
 @dirrm %%DATADIR%%/%%PORTVERSION%%/doc/legal
 @dirrm %%DATADIR%%/%%PORTVERSION%%/doc
 @dirrm %%DATADIR%%/%%PORTVERSION%%/db
+@dirrm %%DATADIR%%/%%PORTVERSION%%/data/example
+@dirrm %%DATADIR%%/%%PORTVERSION%%/data/ap227
+@dirrm %%DATADIR%%/%%PORTVERSION%%/data/ap203
 @dirrm %%DATADIR%%/%%PORTVERSION%%/data
 @dirrm %%DATADIR%%/%%PORTVERSION%%
 @dirrm %%DATADIR%%
@@ -2770,18 +2869,21 @@ share/scl/3.2.0/data/select.exp
 @dirrm libdata/pkgconfig
 @dirrm libdata
 @dirrm lib/tkpng0.8
-@dirrm lib/iwidgets4.0.1/scripts
-@dirrm lib/iwidgets4.0.1
 @dirrm lib/itk3.4
 @dirrm lib/itcl3.4
-@dirrm lib/Tktable2.10/html
+@dirrm lib/isst0.1
+@dirrm lib/Togl2.1
 @dirrm lib/Tktable2.10
 @dirrm lib/Tkhtml3.0
+@dirrm lib/Iwidgets4.0.1/scripts
+@dirrm lib/Iwidgets4.0.1
 @dirrm lib
+@dirrm include/togl
 @dirrm include/tie
 @dirrm include/openNURBS
 @dirrm include/express
 @dirrm include/exppp
 @dirrm include/brlcad
+@dirrm include/GL
 @dirrm include
 @dirrm bin