- Fix BROKEN by disabling build of togl an isst [1]

- Add missing library deps this package's binaries link to

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

2 files changed, 14 insertions, 25 deletions

diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile
index f141ca6ab8a8..52ee06387ccf 100644
--- a/cad/brlcad/Makefile
+++ b/cad/brlcad/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for:	brlcad
-# Date created:		Jan 2005
-# Whom:			Pedro F. Giffuni <giffunip@asme.org>
-#
+# Created by: Pedro F. Giffuni <giffunip@asme.org>
 # $FreeBSD$
-#
 
 PORTNAME=	brlcad
 PORTVERSION=	7.22.0
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/BRL-CAD%20Source/${PORTVERSION}
 
@@ -15,16 +12,22 @@ COMMENT=	CSG modelling system from the US Ballistic Research Laboratory
 
 BUILD_DEPENDS=	${LOCALBASE}/include/tnt/jama_lu.h:${PORTSDIR}/math/jama	\
 		xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
-		rle.1:${PORTSDIR}/graphics/urt
-
-BROKEN=		does not compile
+LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
+		drm:${PORTSDIR}/graphics/libdrm \
+		png15:${PORTSDIR}/graphics/png \
+		rle:${PORTSDIR}/graphics/urt \
+		freetype:${PORTSDIR}/print/freetype2 \
+		expat:${PORTSDIR}/textproc/expat2 \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		xcb:${PORTSDIR}/x11/libxcb
 
 USE_BZIP2=	yes
 USE_GL=		gl glu
-USE_XORG=	x11 xt xi xproto xext inputproto
+USE_XORG=	ice inputproto sm x11 xau xdamage xdmcp xext xfixes xft xi \
+		xproto xrender xscrnsaver xt xxf86vm
 USE_GMAKE=	yes
 USE_BISON=	build
+USE_TCL=	85
 USE_TK=		85
 USE_LDCONFIG=	yes
 
@@ -38,7 +41,7 @@ PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 CFLAGS+=	-I${LOCALBASE}/include
 #LDFLAGS+=	-L${LOCALBASE}/lib
-CMAKE_ARGS=	-DBRLCAD_ENABLE_STRICT:BOOL=OFF
+CMAKE_ARGS=	-DBRLCAD_ENABLE_STRICT:BOOL=OFF -DBRLCAD_TOGL=SYSTEM
 MANPREFIX=	${DATADIR}/${PORTVERSION}
 
 MAN1=	aliastorle.1 anim_script.1 anim_sort.1 anim_time.1 anim_track.1		\
diff --git a/cad/brlcad/pkg-plist b/cad/brlcad/pkg-plist
index ac2698046e44..c3a6aa289cc7 100644
--- a/cad/brlcad/pkg-plist
+++ b/cad/brlcad/pkg-plist
@@ -219,7 +219,6 @@ bin/into
 bin/ios-icons.sh
 bin/ir-X
 bin/irdisp
-bin/isst
 bin/istats
 bin/jack-g
 bin/kurt
@@ -492,7 +491,6 @@ 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
@@ -737,9 +735,6 @@ 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/Itcl3.4/pkgIndex.tcl
 lib/Itk3.4/pkgIndex.tcl
 lib/Iwidgets4.0.1/iwidgets.tcl
@@ -810,8 +805,6 @@ 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/pkgIndex.tcl
 lib/itcl3.4/itcl.tcl
 lib/itk3.4/Archetype.itk
 lib/itk3.4/Toplevel.itk
@@ -872,7 +865,6 @@ lib/libicv.a
 lib/libicv.so
 lib/libicv.so.20
 lib/libicv.so.20.0.1
-lib/libissttcltk.so
 lib/libitcl.so
 lib/libitcl.so.3
 lib/libitcl.so.3.4
@@ -940,8 +932,6 @@ lib/libtermlib.a
 lib/libtermlib.so
 lib/libtkpng.so
 lib/libtkpng.so.0.8
-lib/libtogl.so
-lib/libtoglstub.a
 lib/libutahrle.a
 lib/libutahrle.so
 lib/libutahrle.so.19
@@ -2908,8 +2898,6 @@ libdata/pkgconfig/libwdb.pc
 @dirrm lib/tkpng0.8
 @dirrm lib/itk3.4
 @dirrm lib/itcl3.4
-@dirrm lib/isst0.1
-@dirrm lib/Togl2.1
 @dirrm lib/Tktable2.10
 @dirrm lib/Tkhtml3.0
 @dirrm lib/Iwidgets4.0.1/scripts
@@ -2917,12 +2905,10 @@ libdata/pkgconfig/libwdb.pc
 @dirrm lib/Itk3.4
 @dirrm lib/Itcl3.4
 @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