Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 May 2007 12:25:09 -0500 (CDT)
From:      Jason Bacon <bacon@smithers.neuro.mcw.edu>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/112868: [maintainer update] science/afni
Message-ID:  <200705221725.l4MHP94e057345@smithers.neuro.mcw.edu>
Resent-Message-ID: <200705221730.l4MHU5hH052596@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         112868
>Category:       ports
>Synopsis:       [maintainer update] science/afni
>Confidential:   no
>Severity:       critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 22 17:30:05 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Jason Bacon
>Release:        FreeBSD 5.4-RELEASE i386
>Organization:
Medical College of Wisconsin
>Environment:
System: FreeBSD smithers.neuro.mcw.edu 5.4-RELEASE FreeBSD 5.4-RELEASE #2: Wed Aug 24 14:54:53 CDT 2005 bacon@clone.neuro.mcw.edu:/usr/obj/usr/src/sys/clone i386
>Description:
	AFNI port fails to build since the X11 merge.  Adding libGLU
	to LIB_DEPENDS should correct the problem.  This update also includes
	a few minor, unrelated updates.
>How-To-Repeat:
>Fix:

diff -ruN afni/Makefile afni-latest/Makefile
--- afni/Makefile	Sat May 19 15:22:01 2007
+++ afni-latest/Makefile	Tue May 22 12:21:00 2007
@@ -3,7 +3,7 @@
 # Date created:        11 Jan 2005
 # Whom:                bacon@smithers.neuro.mcw.edu
 #
-# $FreeBSD: ports/science/afni/Makefile,v 1.11 2007/05/19 20:22:01 flz Exp $
+# $FreeBSD$
 #
 
 ############################################################################
@@ -17,7 +17,7 @@
 
 PORTNAME=	afni
 PORTVERSION=	2007.04.18.1830
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science biology graphics
 MASTER_SITES=	http://www.neuro.mcw.edu/~bacon/Ports/distfiles/AFNI/${PORTVERSION}/ \
 		http://afni.nimh.nih.gov/pub/dist/tgz/
@@ -34,6 +34,7 @@
 		whirlgif:${PORTSDIR}/graphics/whirlgif \
 		ppmtogif:${PORTSDIR}/graphics/netpbm \
 		endian:${PORTSDIR}/sysutils/endian
+LIB_DEPENDS=	GLU.1:${PORTSDIR}/graphics/libGLU
 
 .include <bsd.port.pre.mk>
 
@@ -88,10 +89,6 @@
 		${STAGE}/doc \
 		${STAGE}/share
 	${MV}	${INSTALL_WRKSRC}/libf2c.a \
-		${INSTALL_WRKSRC}/cjpeg \
-		${INSTALL_WRKSRC}/djpeg \
-		${INSTALL_WRKSRC}/mpeg_encode \
-		${INSTALL_WRKSRC}/whirlgif \
 		${STAGE}/trash
 	${MV}	${INSTALL_WRKSRC}/*.a \
 		${INSTALL_WRKSRC}/*.so \
@@ -104,6 +101,7 @@
 		${STAGE}/include
 	${MV}	${INSTALL_WRKSRC}/README* \
 		${STAGE}/doc
+	${MV}	${INSTALL_WRKSRC}/abut ${INSTALL_WRKSRC}/afni_abut
 	for binary in `${FILE} ${INSTALL_WRKSRC}/* | fgrep 'ELF' | ${AWK} -F ':' ' { print $$1 }'` ; do \
 		${MV} $${binary} ${STAGE}/bin ; \
 	done
diff -ruN afni/files/patch-Makefile.INCLUDE afni-latest/files/patch-Makefile.INCLUDE
--- afni/files/patch-Makefile.INCLUDE	Wed Dec 31 18:00:00 1969
+++ afni-latest/files/patch-Makefile.INCLUDE	Fri Apr 27 15:03:56 2007
@@ -0,0 +1,11 @@
+--- Makefile.INCLUDE.orig	Fri Apr 27 15:03:08 2007
++++ Makefile.INCLUDE	Fri Apr 27 15:03:29 2007
+@@ -41,7 +41,7 @@
+ ## AFNI package, but included because they are useful.  Some of
+ ## them are Open Source programs, not from the AFNI group at all.
+ 
+-EXTRAS   = cjpeg djpeg whirlgif mpeg_encode myget Xphace rmz aiv $(EXPROGS)
++EXTRAS   = myget Xphace rmz aiv $(EXPROGS)
+ 
+ # mpegtoppm in above list
+ 
diff -ruN afni/pkg-message afni-latest/pkg-message
--- afni/pkg-message	Sat Apr 21 08:37:39 2007
+++ afni-latest/pkg-message	Tue Apr 24 14:32:11 2007
@@ -14,4 +14,7 @@
 memory limit on your system.  For instructions, visit
 
 http://www.neuro.mcw.edu/~bacon/FreeBSD_MRI/
+
+The prorgam "abut" has been renamed "afni_abut" to resolve a collision
+with the unixstat port.
 =============================================================================
diff -ruN afni/pkg-plist afni-latest/pkg-plist
--- afni/pkg-plist	Sat Apr 21 08:37:39 2007
+++ afni-latest/pkg-plist	Tue Apr 24 14:53:31 2007
@@ -209,9 +209,9 @@
 bin/SurfaceMetrics
 bin/Vecwarp
 bin/Xphace
-bin/abut
 bin/adwarp
 bin/afni
+bin/afni_abut
 bin/afni_base.py
 bin/afni_proc.py
 bin/afni_util.py
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200705221725.l4MHP94e057345>