1 files changed, 45 insertions, 47 deletions

diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile
index 433df47e0cc2..e8074a4f0d94 100644
--- a/cad/brlcad/Makefile
+++ b/cad/brlcad/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	brlcad
-PORTVERSION=	7.8.0
+PORTVERSION=	7.8.2
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	brlcad
@@ -42,35 +42,35 @@ MAN1=	alias-pix.1 all_sf.1 anim_cascade.1 anim_fly.1 anim_hardtrack.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 cat-fb.1 cell-fb.1		\
 	chan_mult.1 chan_permute.1 cmap-fb.1 comgeom-g.1 conv-vg2g.1 cv.1	\
-	cy-g.1 dbclean.1 dbcp.1 decimate.1 dpix-pix.1 dunncolor.1 dunnsnap.1	\
-	dxf-g.1 enf-g.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 firpass.1 g-acad.1 g-dxf.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-vrml.1 g-x3d.1 g2asc.1 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 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 pixborder.1 pixbustup.1		\
-	pixclump.1 pixcolors.1 pixcut.1 pixdiff.1 pixdsplit.1 pixfade.1		\
-	pixfilter.1 pixhalve.1 pixhist.1 pixhist3d-pl.1 pixhist3d.1		\
+	cy-g.1 dbclean.1 dbcp.1 dbupgrade.1 decimate.1 dpix-pix.1 dunncolor.1	\
+	dunnsnap.1 dxf-g.1 enf-g.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 firpass.1 g-acad.1 g-dxf.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 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 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 pixborder.1		\
+	pixbustup.1 pixclump.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-X10.1 pl-asc.1 pl-fb.1 pl-hpgl.1 pl-pl.1		\
-	pl-ps.1 pl-sgi.1 pl-starbase.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 query.1 remrt.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 tclsh.1 terrain.1 ug-g.1	\
-	vas4.1 vdeck.1 viewpoint-g.1 wavelet.1 wish.1
+	pixuntile.1 pl-X.1 pl-X10.1 pl-asc.1 pl-fb.1 pl-hpgl.1 pl-pl.1 pl-ps.1	\
+	pl-sgi.1 pl-starbase.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 query.1 remrt.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 tclsh.1 terrain.1 ug-g.1 vas4.1	\
+	vdeck.1 viewpoint-g.1 wavelet.1 wish.1
 
 MAN3=	3DBorder.3 Access.3 AddErrInfo.3 AddOption.3 Alloc.3 AllowExc.3		\
 	AppInit.3 AssocData.3 Async.3 BackgdErr.3 Backslash.3 BindTable.3	\
@@ -154,34 +154,22 @@ MANN=	Archetype.n Tcl.n Toplevel.n Widget.n after.n append.n array.n		\
 	tkwait.n toplevel.n trace.n unknown.n unset.n update.n uplevel.n	\
 	upvar.n usual.n variable.n vwait.n while.n winfo.n wm.n
 
+OPTIONS=	OPTIMIZATION "Try building with optimizations" on
+
 .include <bsd.port.pre.mk>
 
+# we only run on i386 and amd64 release 5+
 .if ${OSVERSION} < 500000
-LDFLAGS+=	${PTHREAD_LIBS}
 BROKEN=		Does not compile on FreeBSD-${OSREL}
-.endif
-
-.if !(${ARCH} == i386 || ${ARCH} == amd64)
+.elif !(${ARCH} == i386 || ${ARCH} == amd64)
 IGNORE=		dumps core on ${ARCH}
 .endif
 
-.ifndef WITHOUT_OPTIMIZATION
+.ifdef WITH_OPTIMIZATION
 CONFIGURE_ARGS+=	--disable-debug
-#.if !(${ARCH} == alpha || ${ARCH} == sparc64 || ${ARCH} == amd64)
-.if !(${ARCH} == alpha || ${ARCH} == sparc64)
+.if (${ARCH} == i386 || ${ARCH} == amd64)
 CONFIGURE_ARGS+=	--enable-optimized
 .endif
-.else
-CONFIGURE_ARGS+=	--disable-dependency-tracking --disable-libtool-lock
-.endif
-
-.ifndef (WITHOUT_OPTIMIZATION)
-pre-everything::
-	@${ECHO_MSG}
-	@${ECHO_MSG} Hit CTRL+C now and build an unoptimized version of brlcad by
-	@${ECHO_MSG} specifying -DWITHOUT_OPTIMIZATION at the command line!
-	@${ECHO_MSG}
-	@sleep 2
 .endif
 
 pre-install:
@@ -189,7 +177,17 @@ pre-install:
 	${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 ${LOCALBASE}/bin/mged.sh
+	${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>