From nobody@FreeBSD.org  Wed Jun  9 22:37:00 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 316F7106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  9 Jun 2010 22:37:00 +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 203688FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  9 Jun 2010 22:37:00 +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 o59Maxbq095854
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 9 Jun 2010 22:36:59 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o59MaxvQ095853;
	Wed, 9 Jun 2010 22:36:59 GMT
	(envelope-from nobody)
Message-Id: <201006092236.o59MaxvQ095853@www.freebsd.org>
Date: Wed, 9 Jun 2010 22:36:59 GMT
From: Rob Farmer <rfarmer@predatorlabs.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [MAINTAINER] [PATCH] math/matio Update to 1.3.4, fix Fortran parts
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         147738
>Category:       ports
>Synopsis:       [MAINTAINER] [PATCH] math/matio Update to 1.3.4, fix Fortran parts
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wen
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 09 22:40:02 UTC 2010
>Closed-Date:    Fri Jun 11 01:40:11 UTC 2010
>Last-Modified:  Fri Jun 11 01:40:11 UTC 2010
>Originator:     Rob Farmer
>Release:        9.0-CURRENT
>Organization:
>Environment:
FreeBSD thinkpad.predatorlabs.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Tue Jun  8 21:46:22 PDT 2010     rfarmer@thinkpad.predatorlabs.net:/usr/obj/usr/src/sys/THINKPAD  amd64
>Description:
* Update to 1.3.4
* Fix Fortran support (previously USE_FORTRAN was set but never used)
* Make Fortran support optional, defaulting to off since nobody ever complained about it being broken
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/math/matio/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile	24 Feb 2010 05:44:03 -0000	1.1
+++ Makefile	9 Jun 2010 22:31:45 -0000
@@ -6,19 +6,22 @@
 #
 
 PORTNAME=	matio
-PORTVERSION=	1.3.3
+PORTVERSION=	1.3.4
 CATEGORIES=	math
 MASTER_SITES=	SF
 
 MAINTAINER=	rfarmer@predatorlabs.net
 COMMENT=	Library for reading/writing Matlab files
 
-USE_FORTRAN=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-fPIC
 
+OPTIONS=	FORTRAN "Build Fortran bindings" OFF
+
+.include <bsd.port.options.mk>
+
 PLIST_FILES= 	include/matio.h \
 		include/matioConfig.h \
 		lib/libmatio.a \
@@ -26,15 +29,36 @@
 		lib/libmatio.so.1 \
 		libdata/pkgconfig/matio.pc
 
+.if !defined(WITHOUT_FORTRAN)
+USE_FORTRAN=	yes
+
+FFLAGS+=	-fPIC
+
+CONFIGURE_ARGS+=	--enable-fortran
+CONFIGURE_ENV+=	FCFLAGS="${FFLAGS}"
+
+PLIST_FILES+=	include/matio.mod
+.endif
+
 post-build:
-	(cd ${WRKSRC}/src && ${CC} ${CFLAGS} -shared -o libmatio.so.1 snprintf.o endian.o io.o inflate.o read_data.o mat5.o mat4.o mat.o)
+.if defined(WITHOUT_FORTRAN)
+	(cd ${WRKSRC}/src && ${CC} ${CFLAGS} -shared -o libmatio.so.1 snprintf.o \
+	endian.o io.o inflate.o read_data.o mat5.o mat4.o mat.o)
+.else
+	(cd ${WRKSRC}/src && ${CC} ${CFLAGS} -shared -o libmatio.so.1 snprintf.o \
+	endian.o io.o inflate.o read_data.o mat5.o mat4.o mat.o matio_internal.o \
+	matio.o)
+.endif
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/src/.libs/libmatio.lai ${PREFIX}/lib/libmatio.la
 	${INSTALL_DATA} ${WRKSRC}/src/.libs/libmatio.a ${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/src/matio.h ${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/src/matioConfig.h ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/matio.pc ${PREFIX}/libdata/pkgconfig
 	${INSTALL_PROGRAM} ${WRKSRC}/src/libmatio.so.1 ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/matio.pc ${PREFIX}/libdata/pkgconfig
+.if !defined(WITHOUT_FORTRAN)
+	${INSTALL_DATA} ${WRKSRC}/src/matio.mod ${PREFIX}/include
+.endif
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/math/matio/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo	24 Feb 2010 05:44:03 -0000	1.1
+++ distinfo	9 Jun 2010 21:33:05 -0000
@@ -1,3 +1,3 @@
-MD5 (matio-1.3.3.tar.gz) = 5c12a98f391de000e88b5a1b20d74abf
-SHA256 (matio-1.3.3.tar.gz) = 5ab18a4e31e7688623a74493f06a493b857c8a58f60c67673b7b7ff4a4cf08b0
-SIZE (matio-1.3.3.tar.gz) = 418794
+MD5 (matio-1.3.4.tar.gz) = a91208cf18f2456a5855bc1a9fdb90fd
+SHA256 (matio-1.3.4.tar.gz) = 7261880b18a661e5d206b4e479d4334b47549f093130df42f7204fd05dfe0bc5
+SIZE (matio-1.3.4.tar.gz) = 450343


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->wen 
Responsible-Changed-By: wen 
Responsible-Changed-When: Thu Jun 10 02:06:06 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/147738: commit references a PR
Date: Fri, 11 Jun 2010 01:35:36 +0000 (UTC)

 wen         2010-06-11 01:35:23 UTC
 
   FreeBSD ports repository
 
   Modified files:
     math/matio           Makefile distinfo 
   Log:
   - Update to 1.3.4
   - Fix Fortran support (previously USE_FORTRAN was set but never used)
   - Make Fortran support optional
   
   PR:             ports/147738
   Submitted by:   Rob Farmer <rfarmer@predatorlabs.net> (maintainer)
   
   Revision  Changes    Path
   1.2       +28 -4     ports/math/matio/Makefile
   1.2       +3 -3      ports/math/matio/distinfo
 _______________________________________________
 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"
 
State-Changed-From-To: open->closed 
State-Changed-By: wen 
State-Changed-When: Fri Jun 11 01:40:10 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

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