3 files changed, 79 insertions, 14 deletions

diff --git a/science/netcdf/Makefile b/science/netcdf/Makefile
index 7ef4c97f6305..0fd088ad9157 100644
--- a/science/netcdf/Makefile
+++ b/science/netcdf/Makefile
@@ -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 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -fPIC -DPIC -Df2cFor
 
 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,25 +30,41 @@ MAN3=		netcdf.3
 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
 PLIST_SUB+=	FORTRAN="@comment "
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'291 s/\(html_docs)\).*/\1/' \
+		${WRKSRC}/man/Makefile.in
+	@${REINPLACE_CMD} -e \
+		'271 s/\(info_docs\).*/html_docs\)/' \
+		${WRKSRC}/man4/Makefile.in
+
 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 --git a/science/netcdf/files/extra-patch-man-Makefile.in b/science/netcdf/files/extra-patch-man-Makefile.in
new file mode 100644
index 000000000000..5abaee615424
--- /dev/null
+++ b/science/netcdf/files/extra-patch-man-Makefile.in
@@ -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 --git a/science/netcdf/pkg-plist b/science/netcdf/pkg-plist
index 2f3e19916950..fdf6a628ef25 100644
--- a/science/netcdf/pkg-plist
+++ b/science/netcdf/pkg-plist
@@ -4,8 +4,8 @@ include/ncvalues.h
 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,37 @@ lib/libnetcdf_c++.so.4
 %%FORTRAN%%lib/libnetcdff.la
 %%FORTRAN%%lib/libnetcdff.so
 %%FORTRAN%%lib/libnetcdff.so.4
-@dirrmtry %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/ncgen-man-1.html
+%%PORTDOCS%%%%DOCSDIR%%/ncdump-man-1.html
+%%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-f77.html
+%%PORTDOCS%%%%DOCSDIR%%/netcdf-f77.pdf
+%%PORTDOCS%%%%DOCSDIR%%/netcdf-f77.ps
+%%PORTDOCS%%%%DOCSDIR%%/netcdf-f77.txt
+%%PORTDOCS%%%%DOCSDIR%%/netcdf-f90.html
+%%PORTDOCS%%%%DOCSDIR%%/netcdf-f90.pdf
+%%PORTDOCS%%%%DOCSDIR%%/netcdf-f90.ps
+%%PORTDOCS%%%%DOCSDIR%%/netcdf-f90.txt
+%%PORTDOCS%%%%DOCSDIR%%/netcdf-install.html
+%%PORTDOCS%%%%DOCSDIR%%/netcdf-install.pdf
+%%PORTDOCS%%%%DOCSDIR%%/netcdf-install.ps
+%%PORTDOCS%%%%DOCSDIR%%/netcdf-install.txt
+%%PORTDOCS%%%%DOCSDIR%%/netcdf-man-3.html
+%%PORTDOCS%%%%DOCSDIR%%/netcdf-tutorial.html
+%%PORTDOCS%%%%DOCSDIR%%/netcdf-tutorial.pdf
+%%PORTDOCS%%%%DOCSDIR%%/netcdf-tutorial.ps
+%%PORTDOCS%%%%DOCSDIR%%/netcdf-tutorial.txt
+%%PORTDOCS%%%%DOCSDIR%%/netcdf_f77-man.html
+%%PORTDOCS%%%%DOCSDIR%%/netcdf_f90-man.html
+%%PORTDOCS%%%%DOCSDIR%%/netcdf.html
+%%PORTDOCS%%%%DOCSDIR%%/netcdf.pdf
+%%PORTDOCS%%%%DOCSDIR%%/netcdf.ps
+%%PORTDOCS%%%%DOCSDIR%%/netcdf.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%