Attachment #113162 for bug #154714

View | Details | Raw Unified | Return to bug 154714
Collapse All | Expand All

Lines 6-12 Link Here

(-)net/mpich2/Makefile (-8 / +12 lines)
6	#	6	#
7		7
8	PORTNAME= mpich2	8	PORTNAME= mpich2
9	PORTVERSION= 1.3	9	PORTVERSION= 1.3.2
10	PORTEPOCH= 5	10	PORTEPOCH= 5
11	CATEGORIES= net parallel	11	CATEGORIES= net parallel
12	MASTER_SITES= http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${PORTVERSION}/	12	MASTER_SITES= http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${PORTVERSION}/
Lines 28-33 Link Here
28	# - WITH_RECV_TIMEOUT set a non-default MPIEXEC_RECV_TIMEOUT	28	# - WITH_RECV_TIMEOUT set a non-default MPIEXEC_RECV_TIMEOUT
29	#-----------------------------------------------------------------------	29	#-----------------------------------------------------------------------
30		30
		31	LICENSE= MPICH
		32	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
		33	LICENSE_NAME= MPICH
		34	LICENSE_FILE= ${WRKSRC}/COPYRIGHT
		35
31	.if defined(MAINTAINER_MODE)	36	.if defined(MAINTAINER_MODE)
32	WITH_RECV_TIMEOUT?= 100	37	WITH_RECV_TIMEOUT?= 100
33	.else	38	.else
Lines 62-68 Link Here
62		67
63	SUB_FILES= pkg-message	68	SUB_FILES= pkg-message
64		69
65	VERSO= 2.0	70	VERSO= 2.2
66	VERSOM= ${VERSO:R}	71	VERSOM= ${VERSO:R}
67	PLIST_SUB= VER=${VERSO} VERM=${VERSOM}	72	PLIST_SUB= VER=${VERSO} VERM=${VERSOM}
68	.if defined(WITHOUT_X11)	73	.if defined(WITHOUT_X11)
Lines 174-187 Link Here
174	${WRKSRC}/${cnf}	179	${WRKSRC}/${cnf}
175	.endfor	180	.endfor
176		181
177	post-configure:	182	pre-install:
178	${REINPLACE_CMD} -e 's\|$${exec_prefix}\|${PREFIX}\|g; \	183	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/bin
179	s\|$${prefix}\|${PREFIX}\|g' \	184	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/bin
180	${WRKSRC}/src/packaging/pkgconfig/mpich2-ch3.pc
181		185
182	post-install:	186	post-install:
183	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/bin	187	${INSTALL_SCRIPT} ${WRKSRC}/bin/*.pyc ${PREFIX}/bin
184	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/bin	188	${INSTALL_SCRIPT} ${WRKSRC}/bin/*.pyo ${PREFIX}/bin
185	@${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${WRKDIR}/mpd.conf.dist	189	@${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${WRKDIR}/mpd.conf.dist
186	${INSTALL_DATA} ${WRKDIR}/mpd.conf.dist ${PREFIX}/etc/	190	${INSTALL_DATA} ${WRKDIR}/mpd.conf.dist ${PREFIX}/etc/
187	if [ ! -e ${PREFIX}/etc/mpd.conf ]; then \	191	if [ ! -e ${PREFIX}/etc/mpd.conf ]; then \

Lines 1-2 Link Here

(-)net/mpich2/distinfo (-2 / +2 lines)
1	SHA256 (mpich/mpich2-1.3.tar.gz) = c76e869045ce274ee0494b0c72d884f9e2d3176a4689d362e684754ae0430e63	1	SHA256 (mpich/mpich2-1.3.2.tar.gz) = 05e8cd3cd5e34972adf461a5c2dea0558293d231b28c5e72696831be26480089
2	SIZE (mpich/mpich2-1.3.tar.gz) = 19394388	2	SIZE (mpich/mpich2-1.3.2.tar.gz) = 19216689




--- Makefile.in.orig	2011-01-31 19:23:28.000000000 +0100
+++ Makefile.in	2011-02-02 22:51:16.000000000 +0100
@@ -127,61 +127,61 @@
 install:  install-preamble FORCE_TARGET 
 	if [ ! -d ${DESTDIR}${prefix} ] ; then $(MKDIR_P) ${DESTDIR}${prefix} ; fi
 	if [ ! -d ${DESTDIR}${datarootdir} ] ; then $(MKDIR_P) ${DESTDIR}${datarootdir} ; fi

 	if [ ! -d ${DESTDIR}${exec_prefix} ] ; then $(MKDIR_P) ${DESTDIR}${exec_prefix} ; fi
 	if [ ! -d ${DESTDIR}${libdir} ] ; then $(MKDIR_P) ${DESTDIR}${libdir} ; fi
 	${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 \

+%%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
@@ -195,10 +195,10 @@
 	if [ -s lib/libf${MPILIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) -version-info $(ABIVERSION) --mode=install  lib/libf${MPILIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/libf${MPILIBNAME}.@SHLIB_EXT@ ; fi
 	if [ -s lib/lib${MPILIBNAME}f90.@SHLIB_EXT@ ] ; then $(CREATESHLIB) -version-info $(ABIVERSION) --mode=install  lib/lib${MPILIBNAME}f90.@SHLIB_EXT@ ${DESTDIR}${libdir}/lib${MPILIBNAME}f90.@SHLIB_EXT@ ; fi
 	if [ -s lib/lib${MPICXXLIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) -version-info $(ABIVERSION) --mode=install --clink="@CXX_SHL@" lib/lib${MPICXXLIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/lib${MPICXXLIBNAME}.@SHLIB_EXT@ ; fi
-	if [ -s $(srcdir)/doc/userguide/user.pdf ] ; then $(INSTALL_DATA)  $(srcdir)/doc/userguide/user.pdf ${DESTDIR}${docdir}/user.pdf ; fi
-	if [ -s $(srcdir)/doc/installguide/install.pdf ] ; then $(INSTALL_DATA)  $(srcdir)/doc/installguide/install.pdf ${DESTDIR}${docdir}/install.pdf ; fi
-	if [ -s $(srcdir)/doc/smpd/smpd_pmi.pdf ] ; then $(INSTALL_DATA)  $(srcdir)/doc/smpd/smpd_pmi.pdf ${DESTDIR}${docdir}/smpd_pmi.pdf ; fi
-	if [ -s $(srcdir)/doc/logging/logging.pdf ] ; then $(INSTALL_DATA)  $(srcdir)/doc/logging/logging.pdf ${DESTDIR}${docdir}/logging.pdf ; fi
+%%PORTDOCS%%	if [ -s $(srcdir)/doc/userguide/user.pdf ] ; then $(INSTALL_DATA)  $(srcdir)/doc/userguide/user.pdf ${DESTDIR}${docdir}/user.pdf ; fi
+%%PORTDOCS%%	if [ -s $(srcdir)/doc/installguide/install.pdf ] ; then $(INSTALL_DATA)  $(srcdir)/doc/installguide/install.pdf ${DESTDIR}${docdir}/install.pdf ; fi
+%%PORTDOCS%%	if [ -s $(srcdir)/doc/smpd/smpd_pmi.pdf ] ; then $(INSTALL_DATA)  $(srcdir)/doc/smpd/smpd_pmi.pdf ${DESTDIR}${docdir}/smpd_pmi.pdf ; fi
+%%PORTDOCS%%	if [ -s $(srcdir)/doc/logging/logging.pdf ] ; then $(INSTALL_DATA)  $(srcdir)/doc/logging/logging.pdf ${DESTDIR}${docdir}/logging.pdf ; fi
 	(cd src/env && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) install)
 	(cd src/packaging/pkgconfig && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) install)
 	(cd src/packaging/envmods && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) install)

Lines 98-107 Link Here

(-)net/mpich2/pkg-plist (-5 / +4 lines)
98	%%JAVA%%bin/slog2navigator	98	%%JAVA%%bin/slog2navigator
99	%%JAVA%%bin/slog2print	99	%%JAVA%%bin/slog2print
100	%%JAVA%%bin/slog2updater	100	%%JAVA%%bin/slog2updater
101	bin/smtpd.pyc
102	bin/smtpd.pyo
103	bin/smtpd2.6.pyc
104	bin/smtpd2.6.pyo
105	etc/mpe_callstack_ldflags.conf	101	etc/mpe_callstack_ldflags.conf
106	etc/mpe_f77env.conf	102	etc/mpe_f77env.conf
107	etc/mpe_graphics.conf	103	etc/mpe_graphics.conf
Lines 777-781 Link Here
777	%%JAVA%%@dirrm lib/trace_rlog	773	%%JAVA%%@dirrm lib/trace_rlog
778	@dirrm include/primitives	774	@dirrm include/primitives
779	@cwd %%LOCALBASE%%	775	@cwd %%LOCALBASE%%
780	libdata/pkgconfig/mpich2-ch3.pc	776	libdata/pkgconfig/mpich2-c.pc
		777	libdata/pkgconfig/mpich2-cxx.pc
		778	libdata/pkgconfig/mpich2-f77.pc
		779	libdata/pkgconfig/mpich2-f90.pc
781	@comment libdata/pkgconfig/openpa.pc	780	@comment libdata/pkgconfig/openpa.pc

Return to bug 154714

Lines 1-6 Link Here

(-)net/mpich2/files/patch-Makefile.in (-20 / +20 lines)
1	--- Makefile.in.orig 2009-10-07 19:18:28.000000000 +0200	1	--- Makefile.in.orig 2011-01-31 19:23:28.000000000 +0100
2	+++ Makefile.in 2009-10-09 21:41:59.000000000 +0200	2	+++ Makefile.in 2011-02-02 22:51:16.000000000 +0100
3	@@ -195,61 +195,61 @@	3	@@ -127,61 +127,61 @@
4	install: install-preamble FORCE_TARGET	4	install: install-preamble FORCE_TARGET
5	if [ ! -d ${DESTDIR}${prefix} ] ; then $(MKDIR_P) ${DESTDIR}${prefix} ; fi	5	if [ ! -d ${DESTDIR}${prefix} ] ; then $(MKDIR_P) ${DESTDIR}${prefix} ; fi
6	if [ ! -d ${DESTDIR}${datarootdir} ] ; then $(MKDIR_P) ${DESTDIR}${datarootdir} ; fi	6	if [ ! -d ${DESTDIR}${datarootdir} ] ; then $(MKDIR_P) ${DESTDIR}${datarootdir} ; fi
Lines 12-19 Link Here
12	if [ ! -d ${DESTDIR}${exec_prefix} ] ; then $(MKDIR_P) ${DESTDIR}${exec_prefix} ; fi	12	if [ ! -d ${DESTDIR}${exec_prefix} ] ; then $(MKDIR_P) ${DESTDIR}${exec_prefix} ; fi
13	if [ ! -d ${DESTDIR}${libdir} ] ; then $(MKDIR_P) ${DESTDIR}${libdir} ; fi	13	if [ ! -d ${DESTDIR}${libdir} ] ; then $(MKDIR_P) ${DESTDIR}${libdir} ; fi
14	${MAKE} install-local	14	${MAKE} install-local
15	$(INSTALL_DATA) src/include/mpi.h ${DESTDIR}${includedir}/mpi.h	15	$(INSTALL_DATA) src/include/mpi.h ${DESTDIR}${includedir}/mpi.h
16	$(INSTALL_DATA) lib/lib${MPILIBNAME}.a ${DESTDIR}${libdir}/lib${MPILIBNAME}.a	16	$(INSTALL_DATA) lib/lib${MPILIBNAME}.a ${DESTDIR}${libdir}/lib${MPILIBNAME}.a
17	- if [ ! -d ${DESTDIR}${docdir} ] ; then $(MKDIR_P) ${DESTDIR}${docdir} ; fi	17	- if [ ! -d ${DESTDIR}${docdir} ] ; then $(MKDIR_P) ${DESTDIR}${docdir} ; fi
18	- @if test -d $(srcdir)/www && cd $(srcdir)/www ; then \	18	- @if test -d $(srcdir)/www && cd $(srcdir)/www ; then \
19	- for name in * ; do \	19	- for name in * ; do \
Lines 108-128 Link Here
108	+%%PORTDOCS%% fi ; \	108	+%%PORTDOCS%% fi ; \
109	+%%PORTDOCS%% done ; \	109	+%%PORTDOCS%% done ; \
110	+%%PORTDOCS%% fi	110	+%%PORTDOCS%% fi
111	if [ -s src/mpi/romio/include/mpiof.h ] ; then $(INSTALL_DATA) src/mpi/romio/include/mpiof.h ${DESTDIR}${includedir}/mpiof.h ; fi	111	if [ -s src/mpi/romio/include/mpiof.h ] ; then $(INSTALL_DATA) src/mpi/romio/include/mpiof.h ${DESTDIR}${includedir}/mpiof.h ; fi
112	if [ -s src/mpi/romio/include/mpio.h ] ; then $(INSTALL_DATA) src/mpi/romio/include/mpio.h ${DESTDIR}${includedir}/mpio.h ; fi	112	if [ -s src/mpi/romio/include/mpio.h ] ; then $(INSTALL_DATA) src/mpi/romio/include/mpio.h ${DESTDIR}${includedir}/mpio.h ; fi
113	if [ -s lib/lib${MPIFLIBNAME}.a ] ; then $(INSTALL_DATA) lib/lib${MPIFLIBNAME}.a ${DESTDIR}${libdir}/lib${MPIFLIBNAME}.a ; fi	113	if [ -s lib/lib${MPIFLIBNAME}.a ] ; then $(INSTALL_DATA) lib/lib${MPIFLIBNAME}.a ${DESTDIR}${libdir}/lib${MPIFLIBNAME}.a ; fi
114	@@ -263,10 +263,10 @@	114	@@ -195,10 +195,10 @@
115	if [ -s lib/libf${MPILIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) -version-info $(ABIVERSION) --mode=install lib/libf${MPILIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/libf${MPILIBNAME}.@SHLIB_EXT@ ; fi	115	if [ -s lib/libf${MPILIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) -version-info $(ABIVERSION) --mode=install lib/libf${MPILIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/libf${MPILIBNAME}.@SHLIB_EXT@ ; fi
116	if [ -s lib/lib${MPILIBNAME}f90.@SHLIB_EXT@ ] ; then $(CREATESHLIB) -version-info $(ABIVERSION) --mode=install lib/lib${MPILIBNAME}f90.@SHLIB_EXT@ ${DESTDIR}${libdir}/lib${MPILIBNAME}f90.@SHLIB_EXT@ ; fi	116	if [ -s lib/lib${MPILIBNAME}f90.@SHLIB_EXT@ ] ; then $(CREATESHLIB) -version-info $(ABIVERSION) --mode=install lib/lib${MPILIBNAME}f90.@SHLIB_EXT@ ${DESTDIR}${libdir}/lib${MPILIBNAME}f90.@SHLIB_EXT@ ; fi
117	if [ -s lib/lib${MPICXXLIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) -version-info $(ABIVERSION) --mode=install lib/lib${MPICXXLIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/lib${MPICXXLIBNAME}.@SHLIB_EXT@ ; fi	117	if [ -s lib/lib${MPICXXLIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) -version-info $(ABIVERSION) --mode=install --clink="@CXX_SHL@" lib/lib${MPICXXLIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/lib${MPICXXLIBNAME}.@SHLIB_EXT@ ; fi
118	- if [ -s $(srcdir)/doc/userguide/user.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/userguide/user.pdf ${DESTDIR}${docdir}/user.pdf ; fi	118	- if [ -s $(srcdir)/doc/userguide/user.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/userguide/user.pdf ${DESTDIR}${docdir}/user.pdf ; fi
119	- if [ -s $(srcdir)/doc/installguide/install.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/installguide/install.pdf ${DESTDIR}${docdir}/install.pdf ; fi	119	- if [ -s $(srcdir)/doc/installguide/install.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/installguide/install.pdf ${DESTDIR}${docdir}/install.pdf ; fi
120	- if [ -s $(srcdir)/doc/smpd/smpd_pmi.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/smpd/smpd_pmi.pdf ${DESTDIR}${docdir}/smpd_pmi.pdf ; fi	120	- if [ -s $(srcdir)/doc/smpd/smpd_pmi.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/smpd/smpd_pmi.pdf ${DESTDIR}${docdir}/smpd_pmi.pdf ; fi
121	- if [ -s $(srcdir)/doc/logging/logging.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/logging/logging.pdf ${DESTDIR}${docdir}/logging.pdf ; fi	121	- if [ -s $(srcdir)/doc/logging/logging.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/logging/logging.pdf ${DESTDIR}${docdir}/logging.pdf ; fi
122	+%%PORTDOCS%% if [ -s $(srcdir)/doc/userguide/user.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/userguide/user.pdf ${DESTDIR}${docdir}/user.pdf ; fi	122	+%%PORTDOCS%% if [ -s $(srcdir)/doc/userguide/user.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/userguide/user.pdf ${DESTDIR}${docdir}/user.pdf ; fi
123	+%%PORTDOCS%% if [ -s $(srcdir)/doc/installguide/install.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/installguide/install.pdf ${DESTDIR}${docdir}/install.pdf ; fi	123	+%%PORTDOCS%% if [ -s $(srcdir)/doc/installguide/install.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/installguide/install.pdf ${DESTDIR}${docdir}/install.pdf ; fi
124	+%%PORTDOCS%% if [ -s $(srcdir)/doc/smpd/smpd_pmi.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/smpd/smpd_pmi.pdf ${DESTDIR}${docdir}/smpd_pmi.pdf ; fi	124	+%%PORTDOCS%% if [ -s $(srcdir)/doc/smpd/smpd_pmi.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/smpd/smpd_pmi.pdf ${DESTDIR}${docdir}/smpd_pmi.pdf ; fi
125	+%%PORTDOCS%% if [ -s $(srcdir)/doc/logging/logging.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/logging/logging.pdf ${DESTDIR}${docdir}/logging.pdf ; fi	125	+%%PORTDOCS%% if [ -s $(srcdir)/doc/logging/logging.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/logging/logging.pdf ${DESTDIR}${docdir}/logging.pdf ; fi
126	(cd src/env && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) install)	126	(cd src/env && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) install)
127	(cd src/packaging/pkgconfig && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) install)	127	(cd src/packaging/pkgconfig && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) install)
128	(cd src/packaging/envmods && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) install)	128	(cd src/packaging/envmods && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) install)