- Fix typo in include file

- install wrapper script in a plist safe way
- Mark IGNORE on platforms != i386 (dumps core)

PR:		ports/78686
Approved by:	portmgr (marcus), arved (mentor)
		Perdo F. Giffuni (maintainer)

4 files changed, 34 insertions, 10 deletions

diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile
index a0fd945dc7bb..971aab3c487a 100644
--- a/cad/brlcad/Makefile
+++ b/cad/brlcad/Makefile
@@ -31,11 +31,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=	--with-libs="-lpng"
 
-.ifdef PACKAGE_BUILDING
-CONFIGURE_ARGS+=	--disable-debug --enable-optimized
-.else
-CONFIGURE_ARGS+=	--disable-dependency-tracking --disable-libtool-lock
-.endif
 ALL_TARGET=
 
 MAN1=	aliastorle.1 all_sf.1 alias-pix.1 anim_cascade.1 anim_fly.1 	\
@@ -204,8 +199,26 @@ LDFLAGS+=	${PTHREAD_LIBS}
 BROKEN=		"Does not compile on FreeBSD-${OSREL}"
 .endif
 
-.if ${ARCH} != "i386" && ${ARCH} != "amd64"
-BROKEN=		"Does not compile on !i386 and !amd64"
+.if ${ARCH} != i386
+IGNORE=		"Dumps core on ${ARCH}!"
+.endif
+
+.ifndef WITHOUT_OPTIMIZATION
+CONFIGURE_ARGS+=	--disable-debug
+.if !(${ARCH} == alpha || ${ARCH} == sparc64)
+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:
@@ -214,6 +227,6 @@ pre-install:
 		${WRKSRC}/mged.sh
 
 post-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/mged.sh ${PREFIX}/../bin/mged
+	@${INSTALL_SCRIPT} ${WRKSRC}/mged.sh ${LOCALBASE}/bin/mged
 
 .include <bsd.port.post.mk>
diff --git a/cad/brlcad/files/mged.sh b/cad/brlcad/files/mged.sh
index d6bb0f1c461f..2c0bbd5ee12e 100644
--- a/cad/brlcad/files/mged.sh
+++ b/cad/brlcad/files/mged.sh
@@ -8,4 +8,4 @@ export BRLCAD_ROOT
 export PATH=%%BRLCAD_ROOT%%/bin:$PATH
 export MANPATH=%%BRLCAD_ROOT%%/man:$MANPATH
 
-exec %%BRLCAD_ROOT%%/bin/mged
+exec %%BRLCAD_ROOT%%/bin/mged $@
diff --git a/cad/brlcad/files/patch-include+raytrace.h b/cad/brlcad/files/patch-include+raytrace.h
new file mode 100644
index 000000000000..7fd857f1ab3f
--- /dev/null
+++ b/cad/brlcad/files/patch-include+raytrace.h
@@ -0,0 +1,11 @@
+--- include/raytrace.h.orig	Fri Mar 11 00:20:44 2005
++++ include/raytrace.h	Fri Mar 11 00:21:55 2005
+@@ -5001,7 +5001,7 @@
+ 		    (struct bu_list		*vhead,
+ 		     const struct faceuse	*fu,
+ 		     int			poly_markers));
+-RT_EXPORT BU_EXTERN(voidnmg_s_to_vlist,
++RT_EXPORT BU_EXTERN(void nmg_s_to_vlist,
+ 		    (struct bu_list		*vhead,
+ 		     const struct shell	*s,
+ 		     int			poly_markers));
diff --git a/cad/brlcad/pkg-plist b/cad/brlcad/pkg-plist
index 01985bf8e6be..aca8c4bd0267 100644
--- a/cad/brlcad/pkg-plist
+++ b/cad/brlcad/pkg-plist
@@ -1,4 +1,4 @@
-../bin/mged
+@unexec rm -f %%LOCALBASE%%/bin/mged
 bin/a-d
 bin/alias-pix
 bin/aliastorle