From nobody@FreeBSD.org  Sun Jul 11 14:10:53 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4C6C61065672
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 11 Jul 2010 14:10:53 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 3BA578FC15
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 11 Jul 2010 14:10:53 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o6BEArU5010436
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 11 Jul 2010 14:10:53 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o6BEArBU010435;
	Sun, 11 Jul 2010 14:10:53 GMT
	(envelope-from nobody)
Message-Id: <201007111410.o6BEArBU010435@www.freebsd.org>
Date: Sun, 11 Jul 2010 14:10:53 GMT
From: Max Brazhnikov <makc@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: math/octave: optional build with hdf5 v1.6 or v1.8
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         148496
>Category:       ports
>Synopsis:       math/octave: optional build with hdf5 v1.6 or v1.8
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    maho
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 11 14:20:05 UTC 2010
>Closed-Date:    Sun Aug 01 12:16:30 UTC 2010
>Last-Modified:  Sun Aug  1 12:20:06 UTC 2010
>Originator:     Max Brazhnikov
>Release:        FreeBSD 8.1-PRERELEASE amd64
>Organization:
>Environment:
FreeBSD luna.dio.ru 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #6: Thu Jun 17 00:34:02 MSD 2010     root@luna.dio.ru:/usr/obj/usr/freebsd/8/src/sys/LUNA  amd64
>Description:
Add option to allow build with either hdf v1.6 or 1.8.
Build with 1.6 by default, since most of the ports still depend on legacy hdf5.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/math/octave/Makefile,v
retrieving revision 1.118
diff -u -r1.118 Makefile
--- Makefile	28 Mar 2010 06:39:27 -0000	1.118
+++ Makefile	11 Jul 2010 10:52:40 -0000
@@ -23,7 +23,6 @@
 		gsed:${PORTSDIR}/textproc/gsed
 LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3 \
 		glpk.28:${PORTSDIR}/math/glpk \
-		hdf5:${PORTSDIR}/science/hdf5 \
 		umfpack.1:${PORTSDIR}/math/suitesparse \
 		qhull:${PORTSDIR}/math/qhull \
 		arpack:${PORTSDIR}/math/arpack \
@@ -43,8 +42,16 @@
 INFO=		octave liboctave
 MAN1=		octave.1 octave-bug.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:
Responsible-Changed-From-To: freebsd-ports-bugs->maho 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Jul 11 14:20:37 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=148496 
State-Changed-From-To: open->closed 
State-Changed-By: makc 
State-Changed-When: Sun Aug 1 12:16:29 UTC 2010 
State-Changed-Why:  
Committed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=148496 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/148496: commit references a PR
Date: Sun,  1 Aug 2010 12:15:59 +0000 (UTC)

 makc        2010-08-01 12:15:44 UTC
 
   FreeBSD ports repository
 
   Modified files:
     math/octave          Makefile 
   Log:
   Add option to allow build with either hdf v1.6 or 1.8.
   Build with 1.6 by default, since most of the ports still depend on legacy hdf5.
   
   PR:             ports/148496
   Submitted by:   makc@
   Approved by:    maintainer timeout (three weeks)
   
   Revision  Changes    Path
   1.119     +8 -1      ports/math/octave/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
