Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1585222308257760"
MIME-Version: 1.0
Date: Thu, 26 Mar 2020 11:31:48 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/devel/netcdf-fortran
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20200326113148.C57ACFB27@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1585222308257760
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Thu Mar 26 11:31:48 UTC 2020

Modified Files:
	pkgsrc/devel/netcdf-fortran: Makefile PLIST options.mk

Log Message:
netcdf-fortran: Fix f90 PLIST. While here, silence some pkglint warnings.

Noted by Dr. Thomas Orgis


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/netcdf-fortran/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/netcdf-fortran/PLIST \
    pkgsrc/devel/netcdf-fortran/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1585222308257760
Content-Disposition: inline
Content-Length: 2137
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/netcdf-fortran/Makefile
diff -u pkgsrc/devel/netcdf-fortran/Makefile:1.19 pkgsrc/devel/netcdf-fortran/Makefile:1.20
--- pkgsrc/devel/netcdf-fortran/Makefile:1.19	Sun Mar  8 16:47:40 2020
+++ pkgsrc/devel/netcdf-fortran/Makefile	Thu Mar 26 11:31:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2020/03/08 16:47:40 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2020/03/26 11:31:48 nia Exp $
 
 DISTNAME=	netcdf-fortran-4.2
 PKGREVISION=	17
@@ -7,7 +7,7 @@ MASTER_SITES=	https://www.unidata.ucar.e
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.unidata.ucar.edu/software/netcdf/index.html
-COMMENT=	Fortran support for NetCDF.
+COMMENT=	Fortran support for NetCDF
 
 USE_LANGUAGES=		c fortran77
 USE_LIBTOOL=		yes

Index: pkgsrc/devel/netcdf-fortran/PLIST
diff -u pkgsrc/devel/netcdf-fortran/PLIST:1.1 pkgsrc/devel/netcdf-fortran/PLIST:1.2
--- pkgsrc/devel/netcdf-fortran/PLIST:1.1	Mon Apr 29 07:43:32 2013
+++ pkgsrc/devel/netcdf-fortran/PLIST	Thu Mar 26 11:31:48 2020
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2013/04/29 07:43:32 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/03/26 11:31:48 nia Exp $
 bin/nf-config
-${PLIST.f90}include/NETCDF.mod
-${PLIST.f90}include/TYPESIZES.mod
 include/netcdf.inc
+${PLIST.f90}include/netcdf.mod
+${PLIST.f90}include/typesizes.mod
 info/netcdf-f77.info
 info/netcdf-f77.info-1
 info/netcdf-f77.info-2
Index: pkgsrc/devel/netcdf-fortran/options.mk
diff -u pkgsrc/devel/netcdf-fortran/options.mk:1.1 pkgsrc/devel/netcdf-fortran/options.mk:1.2
--- pkgsrc/devel/netcdf-fortran/options.mk:1.1	Mon Apr 29 07:43:32 2013
+++ pkgsrc/devel/netcdf-fortran/options.mk	Thu Mar 26 11:31:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2013/04/29 07:43:32 adam Exp $
+# $NetBSD: options.mk,v 1.2 2020/03/26 11:31:48 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.netcdf-fortran
 PKG_SUPPORTED_OPTIONS=	f90
@@ -7,9 +7,9 @@ PKG_SUPPORTED_OPTIONS=	f90
 
 PLIST_VARS+=	f90
 
-.if empty(PKG_OPTIONS:Mf90)
-CONFIGURE_ARGS+=	--disable-f90
-.else
+.if !empty(PKG_OPTIONS:Mf90)
 USE_LANGUAGES+=		fortran
 PLIST.f90=		yes
+.else
+CONFIGURE_ARGS+=	--disable-f90
 .endif


--_----------=_1585222308257760--