- Fix build on sparc64. [1]

- Respect ${X11BASE}. [2]

PR:		ports/105535 [1], ports/106245 [2]
Submitted by:	Erik Greenwald <erik@smluc.org> (maintainer)

cad/brlcad/Makefile

@@ -175,6 +175,9 @@ CONFIGURE_ARGS+=	--enable-optimized
 .endif
 .endif
 
+post-patch:
+	${REINPLACE_CMD} "s+/usr/X11R6+${X11BASE}+" ${WRKSRC}/configure
+
 pre-install:
 	${CP} ${FILESDIR}/mged.sh ${WRKSRC}
 	${REINPLACE_CMD} -e 's+%%BRLCAD_ROOT%%+${PREFIX}+g;'	\

cad/brlcad/files/patch-include_machine.h

@@ -0,0 +1,31 @@
+Index: include/machine.h
+===================================================================
+RCS file: /cvsroot/brlcad/brlcad/include/machine.h,v
+retrieving revision 14.20
+diff -u -r14.20 machine.h
+--- include/machine.h	18 Sep 2006 05:24:07 -0000	14.20
++++ include/machine.h	14 Nov 2006 18:00:33 -0000
+@@ -611,7 +611,8 @@
+ 
+ #endif
+ 
+-#if defined(__sparc64__)
++/* TODO: should this be looking for solaris/sunos tags? */
++#if defined(__sparc64__) && !defined(__FreeBSD__)
+ /********************************
+  *                              *
+  *      Sparc 64       		*
+@@ -702,11 +703,11 @@
+ # define LOCAL		auto		/* static|auto, for serial|parallel cpu */
+ 
+ /* amd64 */
+-# if defined(__x86_64__)
++# if defined(__x86_64__) || defined(__sparc64__) || defined(__ia64__)
+ #  define BITV_SHIFT	6
+ #  define MAX_PSW		256
+ /* ia32 */
+-# elif !defined(__ia64__) && !defined(__x86_64__) && !defined(__sparc64__)
++# else
+ #  define BITV_SHIFT	5
+ #  define MAX_PSW	16
+ # endif