From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Nov 27 10:30:03 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C9D6E1065674 for ; Thu, 27 Nov 2008 10:30:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id AE8238FC17 for ; Thu, 27 Nov 2008 10:30:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id mARAU333061885 for ; Thu, 27 Nov 2008 10:30:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id mARAU3sU061883; Thu, 27 Nov 2008 10:30:03 GMT (envelope-from gnats) Resent-Date: Thu, 27 Nov 2008 10:30:03 GMT Resent-Message-Id: <200811271030.mARAU3sU061883@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, Sunpoet Po-Chuan Hsieh Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F3DDD1065674 for ; Thu, 27 Nov 2008 10:26:58 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: from sunpoet.net (sunpoet.net [203.204.205.212]) by mx1.freebsd.org (Postfix) with ESMTP id CC66E8FC1F for ; Thu, 27 Nov 2008 10:26:58 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: by sunpoet.net (Postfix, from userid 1000) id 6FD39DC; Thu, 27 Nov 2008 18:26:41 +0800 (CST) Message-Id: <20081127102641.6FD39DC@sunpoet.net> Date: Thu, 27 Nov 2008 18:26:41 +0800 (CST) From: Sunpoet Po-Chuan Hsieh To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/129225: [MAINTAINER] science/netcdf: minor changes X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2008 10:30:03 -0000 >Number: 129225 >Category: ports >Synopsis: [MAINTAINER] science/netcdf: minor changes >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Nov 27 10:30:03 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Sunpoet Po-Chuan Hsieh >Release: FreeBSD 7.1-PRERELEASE amd64 >Organization: SUNPOET.net >Environment: System: FreeBSD bonjour.sunpoet.net 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #12: Thu Sep 4 10:55:47 CST >Description: Changes: - remove unnecessary strip - install real documents - fix NOPORTDOCS - add NOPORTEXAMPLES Added file(s): - files/extra-patch-man-Makefile.in Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- netcdf-3.6.3_2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/science/netcdf/Makefile /usr/ports/sunpoet/netcdf/Makefile --- /usr/ports/science/netcdf/Makefile 2008-08-08 12:48:31.000000000 +0800 +++ /usr/ports/sunpoet/netcdf/Makefile 2008-08-30 00:19:30.095834865 +0800 @@ -7,7 +7,7 @@ PORTNAME= netcdf PORTVERSION= 3.6.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science MASTER_SITES= ftp://ftp.unidata.ucar.edu/pub/netcdf/ \ http://sunpoet.net/distfiles/ @@ -22,8 +22,7 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV+= ${MAKE_ENV} -PORTDOCS= COPYRIGHT README RELEASE_NOTES +#CONFIGURE_ENV+= ${MAKE_ENV} MAN1= ncdump.1 ncgen.1 MAN3= netcdf.3 @@ -31,9 +30,24 @@ INFO= netcdf netcdf-c netcdf-cxx netcdf-f77 netcdf-f90 \ netcdf-install netcdf-tutorial -.ifdef WITH_FORTRAN +OPTIONS= FORTRAN "Build library for Fortran" off + +.if !defined(NOPORTDOCS) +CONFIGURE_ARGS+=--enable-docs-install +.else +CONFIGURE_ARGS+=--disable-docs-install +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-man-Makefile.in +.endif + +.if !defined(NOPORTEXAMPLES) +CONFIGURE_ARGS+=--enable-examples +.else +CONFIGURE_ARGS+=--disable-examples +.endif + +.if defined(WITH_FORTRAN) USE_FORTRAN= yes -MAN3+= netcdf_f77.3 netcdf_f90.3 +MAN3+= netcdf_f77.3 netcdf_f90.3 PLIST_SUB+= FORTRAN="" .else CONFIGURE_ARGS+=--disable-f77 @@ -41,15 +55,8 @@ .endif post-install: - @${STRIP_CMD} ${PREFIX}/bin/ncdump ${PREFIX}/bin/ncgen ${LN} -fs libnetcdf.so.4 ${PREFIX}/lib/libnetcdf.so ${LN} -fs libnetcdf_c++.so.4 ${PREFIX}/lib/libnetcdf_c++.so -.if !defined(NOPORTDOCS) - @${INSTALL} -d ${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.else -CONFIGURE_ARGS+= --disable-docs-install -.endif regression-test: build @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check diff -ruN --exclude=CVS /usr/ports/science/netcdf/files/extra-patch-man-Makefile.in /usr/ports/sunpoet/netcdf/files/extra-patch-man-Makefile.in --- /usr/ports/science/netcdf/files/extra-patch-man-Makefile.in 1970-01-01 08:00:00.000000000 +0800 +++ /usr/ports/sunpoet/netcdf/files/extra-patch-man-Makefile.in 2008-08-29 23:59:01.787423321 +0800 @@ -0,0 +1,17 @@ +--- man/Makefile.in.orig 2008-06-30 01:25:05.000000000 +0800 ++++ man/Makefile.in 2008-08-29 23:58:27.317775084 +0800 +@@ -683,14 +683,6 @@ + rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \ + done + install-docDATA: $(doc_DATA) +- @$(NORMAL_INSTALL) +- test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" +- @list='$(doc_DATA)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \ +- $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \ +- done + + uninstall-docDATA: + @$(NORMAL_UNINSTALL) diff -ruN --exclude=CVS /usr/ports/science/netcdf/pkg-plist /usr/ports/sunpoet/netcdf/pkg-plist --- /usr/ports/science/netcdf/pkg-plist 2008-08-08 14:28:55.000000000 +0800 +++ /usr/ports/sunpoet/netcdf/pkg-plist 2008-08-08 05:34:42.135985282 +0800 @@ -4,8 +4,8 @@ include/netcdf.h include/netcdf.hh %%FORTRAN%%include/netcdf.mod -%%FORTRAN%%include/typesizes.mod include/netcdfcpp.h +%%FORTRAN%%include/typesizes.mod lib/libnetcdf.a lib/libnetcdf.la lib/libnetcdf.so @@ -18,4 +18,27 @@ %%FORTRAN%%lib/libnetcdff.la %%FORTRAN%%lib/libnetcdff.so %%FORTRAN%%lib/libnetcdff.so.4 -@dirrmtry %%DOCSDIR%% +%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES +%%PORTDOCS%%%%DOCSDIR%%/netcdf-c.html +%%PORTDOCS%%%%DOCSDIR%%/netcdf-c.pdf +%%PORTDOCS%%%%DOCSDIR%%/netcdf-c.ps +%%PORTDOCS%%%%DOCSDIR%%/netcdf-c.txt +%%PORTDOCS%%%%DOCSDIR%%/netcdf-cxx.html +%%PORTDOCS%%%%DOCSDIR%%/netcdf-cxx.pdf +%%PORTDOCS%%%%DOCSDIR%%/netcdf-cxx.ps +%%PORTDOCS%%%%DOCSDIR%%/netcdf-cxx.txt +%%PORTDOCS%%%%DOCSDIR%%/netcdf-install.html +%%PORTDOCS%%%%DOCSDIR%%/netcdf-install.pdf +%%PORTDOCS%%%%DOCSDIR%%/netcdf-install.ps +%%PORTDOCS%%%%DOCSDIR%%/netcdf-install.txt +%%PORTDOCS%%%%DOCSDIR%%/netcdf-tutorial.html +%%PORTDOCS%%%%DOCSDIR%%/netcdf-tutorial.pdf +%%PORTDOCS%%%%DOCSDIR%%/netcdf-tutorial.ps +%%PORTDOCS%%%%DOCSDIR%%/netcdf-tutorial.txt +%%PORTDOCS%%%%DOCSDIR%%/netcdf.html +%%PORTDOCS%%%%DOCSDIR%%/netcdf.pdf +%%PORTDOCS%%%%DOCSDIR%%/netcdf.ps +%%PORTDOCS%%%%DOCSDIR%%/netcdf.txt +%%PORTDOCS%%@dirrm %%DOCSDIR%% --- netcdf-3.6.3_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: