From erik@smluc.org  Thu Dec 29 00:32:30 2005
Return-Path: <erik@smluc.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0C19D16A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 29 Dec 2005 00:32:30 +0000 (GMT)
	(envelope-from erik@smluc.org)
Received: from phoenix.smluc.org (phoenix.smluc.org [12.28.48.23])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 79BDF43D53
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 29 Dec 2005 00:32:29 +0000 (GMT)
	(envelope-from erik@smluc.org)
Received: by phoenix.smluc.org (Postfix, from userid 1000)
	id 74EA81CE44; Wed, 28 Dec 2005 18:34:40 -0600 (CST)
Message-Id: <20051229003440.74EA81CE44@phoenix.smluc.org>
Date: Wed, 28 Dec 2005 18:34:40 -0600 (CST)
From: Erik Greenwald <erik@smluc.org>
Reply-To: Erik Greenwald <erik@smluc.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: erik@math.missouristate.edu,egreenwald@arl.army.mil
Subject: [Maintainer Update]  cad/brlcad  7.6.4 -> 7.6.6
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         91037
>Category:       ports
>Synopsis:       [Maintainer Update]  cad/brlcad  7.6.4 -> 7.6.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 29 00:40:03 GMT 2005
>Closed-Date:    Thu Dec 29 05:18:50 GMT 2005
>Last-Modified:  Thu Dec 29 05:18:50 GMT 2005
>Originator:     Erik Greenwald
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
US Army Research Lab AMSRD-ARL-SL-BS
>Environment:
System: FreeBSD fenris 6.0-STABLE FreeBSD 6.0-STABLE #2: Fri Nov 4 19:18:58 EST 2005 root@fenris:/usr/obj/usr/src/sys/FENRIS i386

>Description:

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. :/

Thanks

>How-To-Repeat:
>Fix:

--- cad_brlcad.patch begins here ---
diff -Nur cad/brlcad.orig/Makefile cad/brlcad/Makefile
--- cad/brlcad.orig/Makefile	Wed Dec 28 18:09:25 2005
+++ cad/brlcad/Makefile	Wed Dec 28 19:03:16 2005
@@ -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 @@
 		--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       \
@@ -136,10 +134,6 @@
 
 .if !(${ARCH} == i386 || ${ARCH} == amd64)
 IGNORE=		dumps core on ${ARCH}
-.endif
-
-.if ${ARCH} == amd64
-BROKEN=		"Does not compile"
 .endif
 
 .ifndef WITHOUT_OPTIMIZATION
diff -Nur cad/brlcad.orig/distinfo cad/brlcad/distinfo
--- cad/brlcad.orig/distinfo	Wed Dec 28 18:09:25 2005
+++ cad/brlcad/distinfo	Wed Dec 28 18:10:48 2005
@@ -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 -Nur cad/brlcad.orig/files/patch-src_liboptical_Makefile.in cad/brlcad/files/patch-src_liboptical_Makefile.in
--- cad/brlcad.orig/files/patch-src_liboptical_Makefile.in	Wed Dec 28 19:26:37 2005
+++ cad/brlcad/files/patch-src_liboptical_Makefile.in	Wed Dec 28 18:36:21 2005
@@ -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 -Nur cad/brlcad.orig/pkg-plist cad/brlcad/pkg-plist
--- cad/brlcad.orig/pkg-plist	Wed Dec 28 18:09:25 2005
+++ cad/brlcad/pkg-plist	Wed Dec 28 19:00:31 2005
@@ -206,7 +206,6 @@
 bin/orle-pix
 bin/patch-g
 bin/pcd-pix
-bin/perf.sh
 bin/picket_fence
 bin/pipe
 bin/pipetest
--- cad_brlcad.patch ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Thu Dec 29 05:18:48 UTC 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=91037 
>Unformatted:
