From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 25 03:10:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B6C9627A for ; Tue, 25 Mar 2014 03:10:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 96923CE2 for ; Tue, 25 Mar 2014 03:10:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s2P3A0kd028209 for ; Tue, 25 Mar 2014 03:10:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s2P3A0bJ028208; Tue, 25 Mar 2014 03:10:00 GMT (envelope-from gnats) Resent-Date: Tue, 25 Mar 2014 03:10:00 GMT Resent-Message-Id: <201403250310.s2P3A0bJ028208@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Shin-ya Murakami Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CE3F621C for ; Tue, 25 Mar 2014 03:04:49 +0000 (UTC) Received: from dennou-k.gfd-dennou.org (studenno.kugi.kyoto-u.ac.jp [130.54.59.159]) by mx1.freebsd.org (Postfix) with SMTP id 0BDEACAF for ; Tue, 25 Mar 2014 03:04:47 +0000 (UTC) Received: (qmail 2914 invoked by uid 0); 25 Mar 2014 11:57:21 +0900 Received: from unknown (HELO localhost) (125.4.234.249) by studenno.kugi.kyoto-u.ac.jp with (RC4-SHA encrypted) SMTP; Tue, 25 Mar 2014 11:57:20 +0900 Message-Id: <20140325.115603.357769877.murashin@gfd-dennou.org> Date: Tue, 25 Mar 2014 11:56:03 +0900 (JST) From: Shin-ya Murakami To: FreeBSD-gnats-submit@freebsd.org Subject: ports/187916: science/netcdf{,3-ftn}: avoid conflict, etc. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Mar 2014 03:10:00 -0000 >Number: 187916 >Category: ports >Synopsis: science/netcdf{,3-ftn}: avoid conflict, etc. >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Mar 25 03:10:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Shin-ya Murakami >Release: FreeBSD 11.0-CURRENT amd64 >Organization: GFD-Dennou Club >Environment: System: FreeBSD phase 11.0-CURRENT FreeBSD 11.0-CURRENT #0 r263062: Sat Mar 15 02:00:48 JST 2014 murashin@phase:/usr/obj/usr/src/sys/PHASE amd64 >Description: - avoid conflict between science/netcdf{,3-ftn} - science/netcdf3-ftn installs only fortran libraries - use consistent and seachable naming convention - science/netcdf3-ftn -> science/netcdf-fortran - science/netcdf-ftn -> science/netcdf4-fortran - doesn't include this for the attached patches. - add dependencies for print/texinfo and TeX >How-To-Repeat: N/A >Fix: --- netcdf.diff begins here --- diff -urN /usr/ports/science/netcdf/Makefile netcdf/Makefile --- /usr/ports/science/netcdf/Makefile 2014-03-25 11:45:14.941016764 +0900 +++ netcdf/Makefile 2014-03-24 23:44:14.860005212 +0900 @@ -1,9 +1,9 @@ # Created by: Thomas Gellekum -# $FreeBSD: head/science/netcdf/Makefile 347528 2014-03-08 18:07:13Z tijl $ +# $FreeBSD: head/science/netcdf/Makefile 333015 2013-11-06 17:34:52Z sunpoet $ PORTNAME= netcdf PORTVERSION= 3.6.3 -PORTREVISION?= 6 +PORTREVISION?= 7 CATEGORIES= science MASTER_SITES= http://www.unidata.ucar.edu/downloads/netcdf/ftp/ \ ftp://ftp.unidata.ucar.edu/pub/netcdf/ \ @@ -11,12 +11,12 @@ PKGNAMESUFFIX?= 3 MAINTAINER= sunpoet@FreeBSD.org -COMMENT?= Library for machine-independent, array-oriented data access +COMMENT= Library for machine-independent, array-oriented data access CONFLICTS= hdf-4.* netcdf-4.* PORTSCOUT= limit:^3\. -CONFIGURE_ARGS= --enable-shared +CONFIGURE_ARGS= --enable-shared --disable-f77 --disable-f90 CPPFLAGS+= -I${LOCALBASE}/include -fPIC -DPIC GNU_CONFIGURE= yes USES= gmake libtool @@ -24,29 +24,21 @@ INFO= netcdf netcdf-c netcdf-cxx netcdf-f77 netcdf-f90 \ netcdf-install netcdf-tutorial +MAN1= ncdump.1 ncgen.1 +MAN3= netcdf.3 -OPTIONS_DEFINE= FORTRAN DOCS -FORTRAN_DESC= Build library for Fortran +OPTIONS_DEFINE= DOCS .include .if ${PORT_OPTIONS:MDOCS} +BUILD_DEPENDS= texi2dvi:${PORTSDIR}/print/texinfo +USE_TEX= full CONFIGURE_ARGS+=--enable-docs-install .else CONFIGURE_ARGS+=--disable-docs-install .endif -.if ${PORT_OPTIONS:MFORTRAN} -CPPFLAGS+= -DpgiFortran -CONFLICTS+= netcdf-3.* -PLIST_SUB+= FORTRAN="" -USES+= fortran -.else -CONFIGURE_ARGS+=--disable-f77 --disable-f90 -CONFLICTS+= netcdf-ftn-3.* -PLIST_SUB+= FORTRAN="@comment " -.endif - post-patch: @${REINPLACE_CMD} -e \ '291 s/\(html_docs)\).*/\1/' \ diff -urN /usr/ports/science/netcdf/pkg-plist netcdf/pkg-plist --- /usr/ports/science/netcdf/pkg-plist 2014-03-07 01:35:32.000000000 +0900 +++ netcdf/pkg-plist 2013-11-28 19:57:01.101373362 +0900 @@ -3,30 +3,18 @@ include/ncvalues.h include/netcdf.h include/netcdf.hh -%%FORTRAN%%include/netcdf.inc -%%FORTRAN%%include/netcdf.mod include/netcdfcpp.h -%%FORTRAN%%include/typesizes.mod lib/libnetcdf.a lib/libnetcdf.la lib/libnetcdf.so lib/libnetcdf.so.4 -lib/libnetcdf.so.4.0.0 lib/libnetcdf_c++.a lib/libnetcdf_c++.la lib/libnetcdf_c++.so lib/libnetcdf_c++.so.4 -lib/libnetcdf_c++.so.4.0.0 -%%FORTRAN%%lib/libnetcdff.a -%%FORTRAN%%lib/libnetcdff.la -%%FORTRAN%%lib/libnetcdff.so -%%FORTRAN%%lib/libnetcdff.so.4 -%%FORTRAN%%lib/libnetcdff.so.4.0.0 man/man1/ncdump.1.gz man/man1/ncgen.1.gz man/man3/netcdf.3.gz -%%FORTRAN%%man/man3/netcdf_f77.3.gz -%%FORTRAN%%man/man3/netcdf_f90.3.gz %%PORTDOCS%%%%DOCSDIR%%/ncgen-man-1.html %%PORTDOCS%%%%DOCSDIR%%/ncdump-man-1.html %%PORTDOCS%%%%DOCSDIR%%/netcdf-c.html --- netcdf.diff ends here --- --- netcdf-fortran.diff begins here --- diff -urN /usr/ports/science/netcdf3-ftn/Makefile netcdf-fortran/Makefile --- /usr/ports/science/netcdf3-ftn/Makefile 2013-11-07 02:35:50.000000000 +0900 +++ netcdf-fortran/Makefile 2014-03-25 11:35:21.682062623 +0900 @@ -2,13 +2,58 @@ # $FreeBSD: head/science/netcdf3-ftn/Makefile 333016 2013-11-06 17:35:50Z sunpoet $ PORTNAME= netcdf -PKGNAMESUFFIX= 3-ftn +PORTVERSION= 3.6.3 +PORTREVISION?= 7 +CATEGORIES= science +MASTER_SITES= http://www.unidata.ucar.edu/downloads/netcdf/ftp/ \ + ftp://ftp.unidata.ucar.edu/pub/netcdf/ \ + LOCAL/sunpoet +PKGNAMESUFFIX?= 3-fortran MAINTAINER= sunpoet@FreeBSD.org COMMENT= NetCDF (network Common Data Form), with Fortran support -MASTERDIR= ${.CURDIR}/../netcdf +LIB_DEPENDS= libnetcdf.so:${PORTSDIR}/science/netcdf -WITH_FORTRAN= yes +CONFLICTS= hdf-4.* netcdf-4.* +PORTSCOUT= limit:^3\. -.include "${MASTERDIR}/Makefile" +CONFIGURE_ARGS= --enable-shared --disable-fortran-type-check +CPPFLAGS+= -I${LOCALBASE}/include -fPIC -DPIC -DpgiFortran +USE_GCC?= any +GNU_CONFIGURE= yes +USES= gmake libtool fortran +USE_LDCONFIG= yes + +MAN3= fortran/netcdf_f77.3 f90/netcdf_f90.3 + +.include + +.if ${PORT_OPTIONS:MDOCS} +CONFIGURE_ARGS+=--enable-docs-install +USE_TEX= full +.else +CONFIGURE_ARGS+=--disable-docs-install +.endif + +do-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/include +.for f in fortran/netcdf.inc f90/typesizes.mod f90/netcdf.mod + @${INSTALL} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/include/ +.endfor + @${MKDIR} ${STAGEDIR}${PREFIX}/lib +.for f in fortran/.libs/libnetcdff.a fortran/.libs/libnetcdff.la \ + fortran/.libs/libnetcdff.so.4 f90/.libs/libnetcdff90.a \ + f90/.libs/libnetcdff90.la + @${INSTALL} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/lib/ +.endfor + @${LN} -sf libnetcdff.so.4 ${STAGEDIR}${PREFIX}/lib/libnetcdff.so + @${MKDIR} ${STAGEDIR}${PREFIX}/man +.for f in ${MAN3} + @${INSTALL} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/man/man3/ +.endfor + +regression-test: build + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check + +.include diff -urN /usr/ports/science/netcdf3-ftn/distinfo netcdf-fortran/distinfo --- /usr/ports/science/netcdf3-ftn/distinfo 1970-01-01 09:00:00.000000000 +0900 +++ netcdf-fortran/distinfo 2013-08-06 16:36:30.612635000 +0900 @@ -0,0 +1,2 @@ +SHA256 (netcdf-3.6.3.tar.gz) = afa1a0fa82b9ea33b035257b6e9662b22e135f98b2fd93d5cf030320dfc3ffa1 +SIZE (netcdf-3.6.3.tar.gz) = 11572512 diff -urN /usr/ports/science/netcdf3-ftn/pkg-descr netcdf-fortran/pkg-descr --- /usr/ports/science/netcdf3-ftn/pkg-descr 1970-01-01 09:00:00.000000000 +0900 +++ netcdf-fortran/pkg-descr 2013-11-28 19:17:23.237542135 +0900 @@ -0,0 +1,9 @@ +NetCDF (network Common Data Form) is an interface for array-oriented +data access and a library that provides an implementation of the +interface. The netCDF library also defines a machine-independent +format for representing scientific data. Together, the interface, +library, and format support the creation, access, and sharing of +scientific data. The netCDF software was developed at the Unidata +Program Center in Boulder, Colorado. + +WWW: http://www.unidata.ucar.edu/software/netcdf/ diff -urN /usr/ports/science/netcdf3-ftn/pkg-plist netcdf-fortran/pkg-plist --- /usr/ports/science/netcdf3-ftn/pkg-plist 1970-01-01 09:00:00.000000000 +0900 +++ netcdf-fortran/pkg-plist 2014-03-24 21:11:09.862663861 +0900 @@ -0,0 +1,11 @@ +include/netcdf.inc +include/netcdf.mod +include/typesizes.mod +lib/libnetcdff.a +lib/libnetcdff.la +lib/libnetcdff.so +lib/libnetcdff.so.4 +lib/libnetcdff90.a +lib/libnetcdff90.la +man/man3/netcdf_f77.3.gz +man/man3/netcdf_f90.3.gz --- netcdf-fortran.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: