Attachment 91758 Details for Bug 129225 – netcdf-3.6.3_2.patch

[patch] netcdf-3.6.3_2.patch

netcdf-3.6.3_2.patch (text/plain), 4.24 KB, created by Sunpoet Po-Chuan Hsieh on 2008-11-27 10:30:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sunpoet Po-Chuan Hsieh

Created: 2008-11-27 10:30:03 UTC

Size: 4.24 KB

patch

obsolete

>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%%

Actions: View | Diff

Attachments on bug 129225: 91758