This version tries to install docs even when --without-docdir is passed

to configure; fix it.

Reported by:	itetcu

4 files changed, 168 insertions, 26 deletions

diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
index bbc4ff2e2c84..73373065c8e7 100644
--- a/net/mpich2/Makefile
+++ b/net/mpich2/Makefile
@@ -135,6 +135,13 @@ pre-configure:
 	${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/src/mpe2/src/slog2sdk/trace_sample/libtool.m4
 	${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${THREAD2FIX:S|^|${WRKSRC}/|}
 	${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${LOCALBASE2FIX:S|^|${WRKSRC}/|}
+.for fin in Makefile.in src/mpe2/sbin/mpeinstall.in
+. if defined(NOPORTDOCS)
+	${REINPLACE_CMD} -e 's|%%PORTDOCS%%|#|' ${WRKSRC}/${fin}
+. else
+	${REINPLACE_CMD} -e 's|%%PORTDOCS%%||' ${WRKSRC}/${fin}
+. endif
+.endfor
 
 post-configure:
 	${REINPLACE_CMD} -e 's|$${exec_prefix}|${PREFIX}|g;	\
diff --git a/net/mpich2/files/patch-Makefile.in b/net/mpich2/files/patch-Makefile.in
new file mode 100644
index 000000000000..221eb7bf41d2
--- /dev/null
+++ b/net/mpich2/files/patch-Makefile.in
@@ -0,0 +1,103 @@
+--- Makefile.in.orig	2008-04-05 00:03:17.000000000 +0200
++++ Makefile.in	2008-05-25 15:00:09.000000000 +0200
+@@ -187,53 +187,53 @@
+ 	${MAKE} install-local
+ 	$(INSTALL_DATA) src/include/mpi.h ${DESTDIR}${includedir}/mpi.h
+ 	$(INSTALL_DATA) lib/lib${MPILIBNAME}.a ${DESTDIR}${libdir}/lib${MPILIBNAME}.a
+-	if [ ! -d ${DESTDIR}${docdir} ] ; then $(MKDIR_P) ${DESTDIR}${docdir} ; fi
+-	@if test -d $(srcdir)/www && cd $(srcdir)/www ; then \
+-	 for name in * ; do \
+-	  if [ "$$name" = "*" ] ; then continue ; fi ; \
+-	  if [ -f $$name ] ; then \
+-	    echo "$(INSTALL_DATA) $$name ${DESTDIR}${htmldir}/$$name" ; \
+-	    $(INSTALL_DATA) $$name ${DESTDIR}${htmldir}/$$name ; \
+-	  elif [ -d $$name ] ; then \
+-	    if [ ! -d ${DESTDIR}${htmldir}/$$name ] ; then $(MKDIR_P) ${DESTDIR}${htmldir}/$$name ; fi ;\
+-	    ( cd $$name && for name2 in * ; do \
+-	        if [ "$$name2" = "*" ] ; then continue ; fi ; \
+-	        if [ -f $$name2 ] ; then \
+-	            echo "$(INSTALL_DATA) $$name2 ${DESTDIR}${htmldir}/$$name/$$name2" ; \
+-	            $(INSTALL_DATA) $$name2 ${DESTDIR}${htmldir}/$$name/$$name2 ; \
+-	        elif [ -d $$name2 ] ; then  \
+-	            echo "cp -rp $$name2 ${DESTDIR}${htmldir}/$$name" ; \
+-	            cp -rp $$name2 ${DESTDIR}${htmldir}/$$name ; \
+-	        fi \
+-	    done ) ; \
+-	  else \
+-	    echo "Unknown file type for $$name" ; \
+-	  fi ; \
+-	 done ; \
+-	fi
+-	@if test -d $(srcdir)/man && cd $(srcdir)/man ; then \
+-	 for name in * ; do \
+-	  if [ "$$name" = "*" ] ; then continue ; fi ; \
+-	  if [ -f $$name ] ; then \
+-	    echo "$(INSTALL_DATA) $$name ${DESTDIR}${mandir}/$$name" ; \
+-	    $(INSTALL_DATA) $$name ${DESTDIR}${mandir}/$$name ; \
+-	  elif [ -d $$name ] ; then \
+-	    if [ ! -d ${DESTDIR}${mandir}/$$name ] ; then $(MKDIR_P) ${DESTDIR}${mandir}/$$name ; fi ;\
+-	    ( cd $$name && for name2 in * ; do \
+-	        if [ "$$name2" = "*" ] ; then continue ; fi ; \
+-	        if [ -f $$name2 ] ; then \
+-	            echo "$(INSTALL_DATA) $$name2 ${DESTDIR}${mandir}/$$name/$$name2" ; \
+-	            $(INSTALL_DATA) $$name2 ${DESTDIR}${mandir}/$$name/$$name2 ; \
+-	        elif [ -d $$name2 ] ; then  \
+-	            echo "cp -rp $$name2 ${DESTDIR}${mandir}/$$name" ; \
+-	            cp -rp $$name2 ${DESTDIR}${mandir}/$$name ; \
+-	        fi \
+-	    done ) ; \
+-	  else \
+-	    echo "Unknown file type for $$name" ; \
+-	  fi ; \
+-	 done ; \
+-	fi
++%%PORTDOCS%%	if [ ! -d ${DESTDIR}${docdir} ] ; then $(MKDIR_P) ${DESTDIR}${docdir} ; fi
++%%PORTDOCS%%	@if test -d $(srcdir)/www && cd $(srcdir)/www ; then \
++%%PORTDOCS%%	 for name in * ; do \
++%%PORTDOCS%%	  if [ "$$name" = "*" ] ; then continue ; fi ; \
++%%PORTDOCS%%	  if [ -f $$name ] ; then \
++%%PORTDOCS%%	    echo "$(INSTALL_DATA) $$name ${DESTDIR}${htmldir}/$$name" ; \
++%%PORTDOCS%%	    $(INSTALL_DATA) $$name ${DESTDIR}${htmldir}/$$name ; \
++%%PORTDOCS%%	  elif [ -d $$name ] ; then \
++%%PORTDOCS%%	    if [ ! -d ${DESTDIR}${htmldir}/$$name ] ; then $(MKDIR_P) ${DESTDIR}${htmldir}/$$name ; fi ;\
++%%PORTDOCS%%	    ( cd $$name && for name2 in * ; do \
++%%PORTDOCS%%	        if [ "$$name2" = "*" ] ; then continue ; fi ; \
++%%PORTDOCS%%	        if [ -f $$name2 ] ; then \
++%%PORTDOCS%%	            echo "$(INSTALL_DATA) $$name2 ${DESTDIR}${htmldir}/$$name/$$name2" ; \
++%%PORTDOCS%%	            $(INSTALL_DATA) $$name2 ${DESTDIR}${htmldir}/$$name/$$name2 ; \
++%%PORTDOCS%%	        elif [ -d $$name2 ] ; then  \
++%%PORTDOCS%%	            echo "cp -rp $$name2 ${DESTDIR}${htmldir}/$$name" ; \
++%%PORTDOCS%%	            cp -rp $$name2 ${DESTDIR}${htmldir}/$$name ; \
++%%PORTDOCS%%	        fi \
++%%PORTDOCS%%	    done ) ; \
++%%PORTDOCS%%	  else \
++%%PORTDOCS%%	    echo "Unknown file type for $$name" ; \
++%%PORTDOCS%%	  fi ; \
++%%PORTDOCS%%	 done ; \
++%%PORTDOCS%%	fi
++%%PORTDOCS%%	@if test -d $(srcdir)/man && cd $(srcdir)/man ; then \
++%%PORTDOCS%%	 for name in * ; do \
++%%PORTDOCS%%	  if [ "$$name" = "*" ] ; then continue ; fi ; \
++%%PORTDOCS%%	  if [ -f $$name ] ; then \
++%%PORTDOCS%%	    echo "$(INSTALL_DATA) $$name ${DESTDIR}${mandir}/$$name" ; \
++%%PORTDOCS%%	    $(INSTALL_DATA) $$name ${DESTDIR}${mandir}/$$name ; \
++%%PORTDOCS%%	  elif [ -d $$name ] ; then \
++%%PORTDOCS%%	    if [ ! -d ${DESTDIR}${mandir}/$$name ] ; then $(MKDIR_P) ${DESTDIR}${mandir}/$$name ; fi ;\
++%%PORTDOCS%%	    ( cd $$name && for name2 in * ; do \
++%%PORTDOCS%%	        if [ "$$name2" = "*" ] ; then continue ; fi ; \
++%%PORTDOCS%%	        if [ -f $$name2 ] ; then \
++%%PORTDOCS%%	            echo "$(INSTALL_DATA) $$name2 ${DESTDIR}${mandir}/$$name/$$name2" ; \
++%%PORTDOCS%%	            $(INSTALL_DATA) $$name2 ${DESTDIR}${mandir}/$$name/$$name2 ; \
++%%PORTDOCS%%	        elif [ -d $$name2 ] ; then  \
++%%PORTDOCS%%	            echo "cp -rp $$name2 ${DESTDIR}${mandir}/$$name" ; \
++%%PORTDOCS%%	            cp -rp $$name2 ${DESTDIR}${mandir}/$$name ; \
++%%PORTDOCS%%	        fi \
++%%PORTDOCS%%	    done ) ; \
++%%PORTDOCS%%	  else \
++%%PORTDOCS%%	    echo "Unknown file type for $$name" ; \
++%%PORTDOCS%%	  fi ; \
++%%PORTDOCS%%	 done ; \
++%%PORTDOCS%%	fi
+ 	if [ -s src/mpi/romio/include/mpiof.h ] ; then $(INSTALL_DATA) src/mpi/romio/include/mpiof.h ${DESTDIR}${includedir}/mpiof.h ; fi
+ 	if [ -s src/mpi/romio/include/mpio.h ] ; then $(INSTALL_DATA) src/mpi/romio/include/mpio.h ${DESTDIR}${includedir}/mpio.h ; fi
+ 	if [ -s lib/lib${MPIFLIBNAME}.a ] ; then $(INSTALL_DATA) lib/lib${MPIFLIBNAME}.a ${DESTDIR}${libdir}/lib${MPIFLIBNAME}.a ; fi
diff --git a/net/mpich2/files/patch-src_mpe2_src_sbin_mpeinstall.in b/net/mpich2/files/patch-src_mpe2_src_sbin_mpeinstall.in
new file mode 100644
index 000000000000..120e057d4326
--- /dev/null
+++ b/net/mpich2/files/patch-src_mpe2_src_sbin_mpeinstall.in
@@ -0,0 +1,31 @@
+--- ./src/mpe2/sbin/mpeinstall.in.orig	2007-11-28 22:51:40.000000000 +0100
++++ ./src/mpe2/sbin/mpeinstall.in	2008-05-25 16:45:21.000000000 +0200
+@@ -529,17 +529,17 @@
+ # ie INSTALL $top_srcdir/doc  $docdir
+ #    INSTALL $top_srcdir/man  $mandir
+ #    INSTALL $top_srcdir/html $htmldir
+-for type in doc man html ; do
+-    typename=${type}dir
+-    eval typevalue=\$"$typename"
+-    if [ -d $top_srcdir/$type ] ; then
+-        if [ ! -d $DESTDIR$typevalue ] ; then
+-            MkDir $typevalue
+-        fi
+-        echo "Installing $pkgname $type to $DESTDIR$typevalue"
+-        InstallDirRecur $top_srcdir/$type $typevalue $MODE
+-    fi
+-done
++%%PORTDOCS%%for type in doc man html ; do
++%%PORTDOCS%%    typename=${type}dir
++%%PORTDOCS%%    eval typevalue=\$"$typename"
++%%PORTDOCS%%    if [ -d $top_srcdir/$type ] ; then
++%%PORTDOCS%%        if [ ! -d $DESTDIR$typevalue ] ; then
++%%PORTDOCS%%            MkDir $typevalue
++%%PORTDOCS%%        fi
++%%PORTDOCS%%        echo "Installing $pkgname $type to $DESTDIR$typevalue"
++%%PORTDOCS%%        InstallDirRecur $top_srcdir/$type $typevalue $MODE
++%%PORTDOCS%%    fi
++%%PORTDOCS%%done
+ 
+ # Remove old uninstall file
+ if [ "$appendUninstall" = 0 -a -f $UNINSTALLFILE ] ; then
diff --git a/net/mpich2/pkg-plist b/net/mpich2/pkg-plist
index 3ca120177f6c..9d89fd41749d 100644
--- a/net/mpich2/pkg-plist
+++ b/net/mpich2/pkg-plist
@@ -1,14 +1,15 @@
 @comment "PREFIX set to %D/mpich2."
 bin/check_callstack
-%%JAVA%%bin/clog2TOslog2
+@comment SLOG-2 tools are not installed if NOPORTDOCS is set
+%%PORTDOCS%%%%JAVA%%bin/clog2TOslog2
 bin/clog2_join
 bin/clog2_print
-%%JAVA%%bin/clog2print
+%%PORTDOCS%%%%JAVA%%bin/clog2print
 bin/clog2_repair
-%%JAVA%%bin/clogTOslog2
-%%JAVA%%bin/clogprint
-%%JAVA%%bin/jumpshot
-%%JAVA%%bin/logconvertor
+%%PORTDOCS%%%%JAVA%%bin/clogTOslog2
+%%PORTDOCS%%%%JAVA%%bin/clogprint
+%%PORTDOCS%%%%JAVA%%bin/jumpshot
+%%PORTDOCS%%%%JAVA%%bin/logconvertor
 %%PM_MPD%%bin/mpd
 %%PM_MPD%%bin/mpd.py
 %%PM_MPD%%bin/mpd.pyc
@@ -91,16 +92,16 @@ bin/mpif90
 %%PM_MPD%%bin/mpirun.pyo
 bin/parkill
 %%PM_SMPD%%bin/smpd
-%%JAVA%%bin/rlogTOslog2
-%%JAVA%%bin/rlog_check_timeorder
-%%JAVA%%bin/rlog_print
-%%JAVA%%bin/rlogprint
-%%JAVA%%bin/slog2filter
-%%JAVA%%bin/slog2navigator
-%%JAVA%%bin/slog2print
-%%JAVA%%bin/slog2updater
-%%JAVA%%bin/traceTOslog2.in
-%%JAVA%%bin/traceprint.in
+%%PORTDOCS%%%%JAVA%%bin/rlogTOslog2
+%%PORTDOCS%%%%JAVA%%bin/rlog_check_timeorder
+%%PORTDOCS%%%%JAVA%%bin/rlog_print
+%%PORTDOCS%%%%JAVA%%bin/rlogprint
+%%PORTDOCS%%%%JAVA%%bin/slog2filter
+%%PORTDOCS%%%%JAVA%%bin/slog2navigator
+%%PORTDOCS%%%%JAVA%%bin/slog2print
+%%PORTDOCS%%%%JAVA%%bin/slog2updater
+%%PORTDOCS%%%%JAVA%%bin/traceTOslog2.in
+%%PORTDOCS%%%%JAVA%%bin/traceprint.in
 etc/mpe_callstack_ldflags.conf
 etc/mpe_f77env.conf
 etc/mpe_f77env.conf.in
@@ -179,14 +180,14 @@ lib/mpe_prof.o
 %%JAVA%%lib/slog2update205to206.jar
 %%JAVA%%lib/traceTOslog2.jar
 %%JAVA%%lib/traceprint.jar
-%%JAVA%%lib/trace_rlog/libTraceInput.la
-%%JAVA%%lib/trace_rlog/libTraceInput.so
+%%PORTDOCS%%%%JAVA%%lib/trace_rlog/libTraceInput.la
+%%PORTDOCS%%%%JAVA%%lib/trace_rlog/libTraceInput.so
 sbin/mpecheckinstall
 sbin/mpetestexec
 sbin/mpetestexeclog
 sbin/mpetestlink
 sbin/mpeuninstall
-%%JAVA%%share/barrier.rlog
+%%PORTDOCS%%%%JAVA%%share/barrier.rlog
 %%PORTDOCS%%%%DOCSDIR%%/index.htm
 %%PORTDOCS%%%%DOCSDIR%%/install.pdf
 %%PORTDOCS%%%%JAVA%%%%DOCSDIR%%/jumpshot-4/html/About24.png
@@ -725,8 +726,8 @@ share/examples_logging/pthread_allreduce.c
 share/examples_logging/pthread_sendrecv.c
 share/examples_logging/pthread_sendrecv_user.c
 share/examples_logging/srtest.c
-%%JAVA%%share/fpilog.clog
-%%JAVA%%share/fpilog.slog2
+%%PORTDOCS%%%%JAVA%%share/fpilog.clog
+%%PORTDOCS%%%%JAVA%%share/fpilog.slog2
 @dirrm share/examples_logging
 %%X11%%@dirrm share/examples_graphics
 @dirrm share/examples_collchk
@@ -739,11 +740,11 @@ share/examples_logging/srtest.c
 %%PORTDOCS%%@dirrm share/doc
 @dirrm share
 @dirrm sbin
-@dirrm man/man4
-@dirrm man/man3
-@dirrm man/man1
-@dirrm man
-%%JAVA%%@dirrm lib/trace_rlog
+%%PORTDOCS%%@dirrm man/man4
+%%PORTDOCS%%@dirrm man/man3
+%%PORTDOCS%%@dirrm man/man1
+%%PORTDOCS%%@dirrm man
+%%PORTDOCS%%%%JAVA%%@dirrm lib/trace_rlog
 @dirrm lib
 @dirrm include
 @dirrm etc