ports/156940: Change in dependency to octave

[Stephen Montgomery-Smith]

>Number:         156940
>Category:       ports
>Synopsis:       Change in dependency to octave
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 10 23:20:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Stephen Montgomery-Smith
>Release:        FreeBSD 7.4-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD wilberforce 7.4-PRERELEASE FreeBSD 7.4-PRERELEASE #0: Wed Dec 1 20:53:06 CST 2010 stephen at wilberforce:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:

The octave port defaults to hdf-5.16 as a dependency.  This causes the octave-forge-bim port not to build, as it has cgnslib as a dependency which uses hdf-5.18.
	
>How-To-Repeat:
	
>Fix:

	


diff -ur /usr/ports/math/octave/Makefile octave/Makefile
--- /usr/ports/math/octave/Makefile	2011-05-10 22:45:43.000000000 +0000
+++ octave/Makefile	2011-05-10 22:49:35.000000000 +0000
@@ -32,7 +32,8 @@
 		ftgl:${PORTSDIR}/graphics/ftgl \
 		fltk.1:${PORTSDIR}/x11-toolkits/fltk \
 		GraphicsMagick.1:${PORTSDIR}/graphics/GraphicsMagick \
-		curl:${PORTSDIR}/ftp/curl
+		curl:${PORTSDIR}/ftp/curl \
+		hdf5:${PORTSDIR}/science/hdf5-18
 
 USE_BZIP2=	yes
 USE_PERL5_BUILD=yes
@@ -43,16 +44,8 @@
 INFO=		octave liboctave OctaveFAQ
 MAN1=		octave.1 mkoctfile.1 octave-config.1
 
-OPTIONS=	LEGACY_HDF5 "Build with HDF5 v1.6 (otherwise with HDF5 v1.8)" on
-
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_LEGACY_HDF5)
-LIB_DEPENDS+=	hdf5:${PORTSDIR}/science/hdf5-18
-.else
-LIB_DEPENDS+=	hdf5:${PORTSDIR}/science/hdf5
-.endif
-
 USE_BLAS?=	reference
 
 .if exists(${LOCALBASE}/lib/libgoto2.so)
>Release-Note:
>Audit-Trail:
>Unformatted: