From c6f1b6629f4a45070b8e2ed2e880056fa1744aaa Mon Sep 17 00:00:00 2001
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Thu, 29 Dec 2005 05:18:46 +0000
Subject: [Maintainer Update] cad/brlcad 7.6.4 -> 7.6.6

	Another version upgrade. The amd64 problem has been fixed,
	both as a patch here and in the HEAD of the sf.net repository.

	This has only been tested on 6.0/ia32 and 6.0/amd64, my 7
	box is down and I don't have 4 or 5 anymore. :/

PR:		ports/91037
Submitted by:	Erik Greenwald <erik@smluc.org>
---
 cad/brlcad/Makefile                               |  8 +-------
 cad/brlcad/distinfo                               |  6 +++---
 cad/brlcad/files/patch-src_liboptical_Makefile.in | 11 +++++++++++
 cad/brlcad/pkg-plist                              |  1 -
 4 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 cad/brlcad/files/patch-src_liboptical_Makefile.in

(limited to 'cad')

diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile
index 47c573089a1a..335b1d6691cc 100644
--- a/cad/brlcad/Makefile
+++ b/cad/brlcad/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	brlcad
-PORTVERSION=	7.6.4
+PORTVERSION=	7.6.6
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	brlcad
@@ -35,8 +35,6 @@ CONFIGURE_ARGS+=--with-libs="-lpng" --program-transform-name="" \
 		--disable-tcl-build --disable-jove
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
-ALL_TARGET=
-
 MAN1=	wish.1 awf.1 comgeom-g.1 g-iges.1 iges-g.1 patch-g.1 rpatch.1 ug-g.1   \
 	asc-nmg.1 bot_shell-vtk.1 conv-vg2g.1 cy-g.1 dbclean.1 dxf-g.1 enf-g.1 \
 	euclid-g.1 fast4-g.1 g-acad.1 g-dxf.1 g-euclid.1 g-nff.1 g-nmg.1       \
@@ -138,10 +136,6 @@ BROKEN=		"Does not compile on FreeBSD-${OSREL}"
 IGNORE=		dumps core on ${ARCH}
 .endif
 
-.if ${ARCH} == amd64
-BROKEN=		"Does not compile"
-.endif
-
 .ifndef WITHOUT_OPTIMIZATION
 CONFIGURE_ARGS+=	--disable-debug
 .if !(${ARCH} == alpha || ${ARCH} == sparc64 || ${ARCH} == amd64)
diff --git a/cad/brlcad/distinfo b/cad/brlcad/distinfo
index 1c1bc564aaf8..5ee321fc4c13 100644
--- a/cad/brlcad/distinfo
+++ b/cad/brlcad/distinfo
@@ -1,3 +1,3 @@
-MD5 (brlcad-7.6.4.tar.bz2) = dce2525d52b7de78650d870ef07d7945
-SHA256 (brlcad-7.6.4.tar.bz2) = 9cb46994332a1eacb66ecae0703cb8a1feaab3c3a560e235d6272d4e3f40b821
-SIZE (brlcad-7.6.4.tar.bz2) = 16810962
+MD5 (brlcad-7.6.6.tar.bz2) = 310247b10213f964c5e7438bf8105be0
+SHA256 (brlcad-7.6.6.tar.bz2) = 46a0324fc118468409d84c2395321460dbd26b76078fd21f694e2107e999ffed
+SIZE (brlcad-7.6.6.tar.bz2) = 17024173
diff --git a/cad/brlcad/files/patch-src_liboptical_Makefile.in b/cad/brlcad/files/patch-src_liboptical_Makefile.in
new file mode 100644
index 000000000000..5b6bf2ffbd39
--- /dev/null
+++ b/cad/brlcad/files/patch-src_liboptical_Makefile.in
@@ -0,0 +1,11 @@
+--- src/liboptical/Makefile.in.orig	Wed Dec 28 18:33:29 2005
++++ src/liboptical/Makefile.in	Wed Dec 28 18:33:36 2005
+@@ -421,7 +421,7 @@
+ 	vers.c
+ 
+ noinst_LTLIBRARIES = librtms.la
+-librtms_la_CFLAGS = -DRT_MULTISPECTRAL
++librtms_la_CFLAGS = -DRT_MULTISPECTRAL -fPIC
+ librtms_la_LDFLAGS = -static
+ librtms_la_LIBADD = ${BU} ${BN} ${TCL} ${LIBRT}
+ librtms_la_SOURCES = \
diff --git a/cad/brlcad/pkg-plist b/cad/brlcad/pkg-plist
index 58406655e4d0..4aa6ca9e8ccf 100644
--- a/cad/brlcad/pkg-plist
+++ b/cad/brlcad/pkg-plist
@@ -206,7 +206,6 @@ bin/orle-fb
 bin/orle-pix
 bin/patch-g
 bin/pcd-pix
-bin/perf.sh
 bin/picket_fence
 bin/pipe
 bin/pipetest
-- 
cgit v1.2.3