Update to 3.4.3. This is not a downgrade. The update is needed for the

import of the pvmpov port.

Approved by:	maintainer

3 files changed, 94 insertions, 55 deletions

diff --git a/net/pvm/Makefile b/net/pvm/Makefile
index 3abdb18f5a15..d3fc3a887d13 100644
--- a/net/pvm/Makefile
+++ b/net/pvm/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	pvm3
-# Version required:			3.4beta7
+# Version required:			3.4.3
 # Date created:				11 March 1999
 # Whom:					Dima Sivachenko <dima@chg.ru>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	pvm3.4.beta7
-PKGNAME=	pvm-3.4.7
+DISTNAME=	pvm3.4.3
+PKGNAME=	pvm-3.4.3
 CATEGORIES=	net
 MASTER_SITES=	http://www.netlib.org/pvm3/	\
 		ftp://ftp.chg.ru/pub/prog/parallel/pvm/pvm3/
@@ -16,12 +16,14 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	dima@Chg.RU
 
 USE_XLIB=	yes
+
 WRKSRC=		${WRKDIR}/pvm3
-MAKE_ENV+=	PVM_ROOT=${WRKSRC}
+MAKE_ENV+=	PVM_ROOT=${WRKSRC} ARCHCFLAGS="${CFLAGS}"
 MAKE_FLAGS+=	F77=/usr/bin/f77
 ALL_TARGET=	all install
+PVM_ROOT=	${PREFIX}/lib/pvm
 
-MAN1=		aimk.1 pvm.1 pvm_intro.1 pvmd.1 pvmd3.1
+MAN1=		PVM.1 aimk.1 pvm.1 pvm_intro.1 pvm_shmd.1 pvmd.1 pvmd3.1
 MAN3=		libfpvm.3 libpvm.3 pvm_addhosts.3 pvm_addmhf.3 pvm_advise.3 \
 		pvm_archcode.3 pvm_barrier.3 pvm_bcast.3 pvm_bufinfo.3 \
 		pvm_catchout.3 pvm_config.3 pvm_delete.3 pvm_delhosts.3 \
@@ -66,18 +68,33 @@ MAN3=		libfpvm.3 libpvm.3 pvm_addhosts.3 pvm_addmhf.3 pvm_advise.3 \
 		pvmftasks.3 pvmftidtoh.3 pvmftrecv.3 pvmfunpack.3 pvmfupkmesg.3
 
 do-install:
-
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/bin/FREEBSD/* ${PREFIX}/bin
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/lib/FREEBSD/pvmd3 ${PREFIX}/libexec
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/lib/FREEBSD/pvm ${PREFIX}/libexec
-	@ ${INSTALL_SCRIPT} ${WRKSRC}/lib/pvm ${PREFIX}/bin
-	@ ${INSTALL_SCRIPT} ${WRKSRC}/lib/pvmd ${PREFIX}/bin
+	@ ${MKDIR} ${PVM_ROOT}/lib/FREEBSD ${PVM_ROOT}/bin/FREEBSD ${PVM_ROOT}/conf
+	@ ${INSTALL_PROGRAM} ${WRKSRC}/bin/FREEBSD/* ${PVM_ROOT}/bin/FREEBSD
+	@ ${INSTALL_PROGRAM} ${WRKSRC}/lib/FREEBSD/pvmd3 ${PVM_ROOT}/lib/FREEBSD
+	@ ${INSTALL_PROGRAM} ${WRKSRC}/lib/FREEBSD/pvm ${PVM_ROOT}/lib/FREEBSD
+	@ ${INSTALL_SCRIPT} ${WRKSRC}/lib/pvm ${PVM_ROOT}/lib
+	@ ${INSTALL_SCRIPT} ${WRKSRC}/lib/pvmd ${PVM_ROOT}/lib
+	@ ${INSTALL_SCRIPT} ${WRKSRC}/lib/pvmgetarch ${PVM_ROOT}/lib
+	@ ${INSTALL_SCRIPT} ${WRKSRC}/lib/aimk ${PVM_ROOT}/lib
+	@ ${LN} -sf ${PVM_ROOT}/lib/pvm ${PREFIX}/bin/pvm
+	@ ${LN} -sf ${PVM_ROOT}/lib/pvmd ${PREFIX}/bin/pvmd
+	@ ${LN} -sf ${PVM_ROOT}/lib/aimk ${PREFIX}/bin/aimk
 	@ ${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libpvm3.a ${PREFIX}/lib
 	@ ${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libfpvm3.a ${PREFIX}/lib
 	@ ${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libgpvm3.a ${PREFIX}/lib
 	@ ${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libpvmtrc.a ${PREFIX}/lib
+	@ ${INSTALL_DATA} ${WRKSRC}/conf/FREEBSD.def ${PVM_ROOT}/conf
 	@ ${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include
 	@ ${INSTALL_MAN} ${WRKSRC}/man/man1/* ${PREFIX}/man/man1
 	@ ${INSTALL_MAN} ${WRKSRC}/man/man3/* ${PREFIX}/man/man3
 
+post-install:
+	@ ${ECHO_MSG}
+	@ ${ECHO_MSG} "You have to set PVM_ROOT=${PVM_ROOT} enviropment variable on all machines"
+	@ ${ECHO_MSG} "which you are planning to use for distributed computing. The best way to set"
+	@ ${ECHO_MSG} "this variable on system-wide basis is to add \"PVM_ROOT=${PVM_ROOT}\" into"
+	@ ${ECHO_MSG} "appropriate section of your /etc/login.conf file. You also have to enable"
+	@ ${ECHO_MSG} "rshd on those machines."
+	@ ${ECHO_MSG}
+
 .include <bsd.port.mk>
diff --git a/net/pvm/distinfo b/net/pvm/distinfo
index 5d82e7dc3608..d7fbb0655509 100644
--- a/net/pvm/distinfo
+++ b/net/pvm/distinfo
@@ -1 +1 @@
-MD5 (pvm3.4.beta7.tgz) = 0a8d7aa3ff85f37a3b6a5cd0a3876440
+MD5 (pvm3.4.3.tgz) = 7ffa1310c31f737d80d45b4a3a2119af
diff --git a/net/pvm/pkg-plist b/net/pvm/pkg-plist
index e77ac55713ba..efa3b08190c4 100644
--- a/net/pvm/pkg-plist
+++ b/net/pvm/pkg-plist
@@ -1,49 +1,65 @@
-libexec/pvmd3
-libexec/pvm
-bin/dbwtest
-bin/ge
-bin/gexamp
-bin/gexample
-bin/gmbi
-bin/hello
-bin/hello_other
-bin/ibwtest
-bin/inherit1
-bin/inherit2
-bin/inherit3
-bin/inherita
-bin/inheritb
-bin/joinleave
-bin/lmbi
-bin/master1
-bin/master1h
-bin/mtile
-bin/pbwtest
-bin/pvm_gstat
-bin/pvmgroups
-bin/pvmgs
-bin/rbwtest
-bin/rme
-bin/slave1
-bin/spmd
-bin/srm
-bin/task0
-bin/task1
-bin/task_end
-bin/thb
-bin/timing
-bin/timing_slave
-bin/tjf
-bin/tjl
-bin/tnb
-bin/tracer
-bin/trcsort
-bin/trsg
-bin/tst
-bin/xep
+bin/aimk
 bin/pvm
 bin/pvmd
+lib/pvm/conf/FREEBSD.def
+lib/pvm/lib/aimk
+lib/pvm/lib/pvm
+lib/pvm/lib/pvmd
+lib/pvm/lib/pvmgetarch
+lib/pvm/lib/FREEBSD/pvmd3
+lib/pvm/lib/FREEBSD/pvm
+lib/pvm/bin/FREEBSD/dbwtest
+lib/pvm/bin/FREEBSD/fgexample
+lib/pvm/bin/FREEBSD/fmaster1
+lib/pvm/bin/FREEBSD/frsg
+lib/pvm/bin/FREEBSD/fslave1
+lib/pvm/bin/FREEBSD/fspmd
+lib/pvm/bin/FREEBSD/ge
+lib/pvm/bin/FREEBSD/gexamp
+lib/pvm/bin/FREEBSD/gexample
+lib/pvm/bin/FREEBSD/gmbi
+lib/pvm/bin/FREEBSD/gs
+lib/pvm/bin/FREEBSD/hello
+lib/pvm/bin/FREEBSD/hello_other
+lib/pvm/bin/FREEBSD/hitc
+lib/pvm/bin/FREEBSD/hitc_slave
+lib/pvm/bin/FREEBSD/ibwtest
+lib/pvm/bin/FREEBSD/inherit1
+lib/pvm/bin/FREEBSD/inherit2
+lib/pvm/bin/FREEBSD/inherit3
+lib/pvm/bin/FREEBSD/inherita
+lib/pvm/bin/FREEBSD/inheritb
+lib/pvm/bin/FREEBSD/joinleave
+lib/pvm/bin/FREEBSD/lmbi
+lib/pvm/bin/FREEBSD/master1
+lib/pvm/bin/FREEBSD/mhf_server
+lib/pvm/bin/FREEBSD/mhf_tickle
+lib/pvm/bin/FREEBSD/mtile
+lib/pvm/bin/FREEBSD/pbwtest
+lib/pvm/bin/FREEBSD/pvm_gstat
+lib/pvm/bin/FREEBSD/pvmgroups
+lib/pvm/bin/FREEBSD/pvmgs
+lib/pvm/bin/FREEBSD/rbwtest
+lib/pvm/bin/FREEBSD/rme
+lib/pvm/bin/FREEBSD/slave1
+lib/pvm/bin/FREEBSD/spmd
+lib/pvm/bin/FREEBSD/srm
+lib/pvm/bin/FREEBSD/task0
+lib/pvm/bin/FREEBSD/task1
+lib/pvm/bin/FREEBSD/task_end
+lib/pvm/bin/FREEBSD/thb
+lib/pvm/bin/FREEBSD/timing
+lib/pvm/bin/FREEBSD/timing_slave
+lib/pvm/bin/FREEBSD/tjf
+lib/pvm/bin/FREEBSD/tjl
+lib/pvm/bin/FREEBSD/tnb
+lib/pvm/bin/FREEBSD/tracer
+lib/pvm/bin/FREEBSD/trcsort
+lib/pvm/bin/FREEBSD/trsg
+lib/pvm/bin/FREEBSD/tst
+lib/pvm/bin/FREEBSD/xep
 include/fpvm3.h
+include/fpvm3_watcom.h
 include/pvm3.h
 include/pvmproto.h
 include/pvmtev.h
@@ -51,3 +67,9 @@ lib/libpvm3.a
 lib/libpvmtrc.a
 lib/libfpvm3.a
 lib/libgpvm3.a
+@dirrm lib/pvm/lib/FREEBSD
+@dirrm lib/pvm/lib
+@dirrm lib/pvm/conf
+@dirrm lib/pvm/bin/FREEBSD
+@dirrm lib/pvm/bin
+@dirrm lib/pvm