Upgrade to 3.4.4 released over a year ago. Obey CFLAGS.

Split the man-pages into the actual texts and MLINKS, of which there are
over a hundred. The vendor used the .so macro, but either it was not
used properly, or there is a bug in our man(1). Either way, MLINKS seems
cleaner.

Move the text in the post-install target into pkg-message and arrange
for showing it after installing the port. The last two items were not
shown to maintainer, but are not expected to raise objections.

TODO -- add WITHOUT_X11 compliance -- a must for some deployments.

Approved by:	demon (maintainer).

5 files changed, 96 insertions, 67 deletions

diff --git a/net/pvm/Makefile b/net/pvm/Makefile
index bf4f82bb8e72..9aa214b406f6 100644
--- a/net/pvm/Makefile
+++ b/net/pvm/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	pvm
-PORTVERSION=	3.4.3
-PORTREVISION=	1
+PORTVERSION=	3.4.4
 CATEGORIES=	net
 MASTER_SITES=	http://www.netlib.org/pvm3/	\
 		ftp://ftp.chg.ru/pub/prog/parallel/pvm/pvm3/
-DISTNAME=	pvm3.4.3
+DISTNAME=	pvm${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	demon@FreeBSD.org
@@ -23,55 +22,92 @@ MAKE_ENV+=	PVM_ROOT=${WRKSRC} ARCHCFLAGS="${CFLAGS}"
 MAKE_FLAGS+=	F77=/usr/bin/f77
 ALL_TARGET=	all install
 PVM_ROOT=	${PREFIX}/lib/pvm
+USE_REINPLACE=	yes
+REINPLACE_ARGS=	-i ""
 
-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 \
+MAN1=		aimk.1 pvm.1 pvm_intro.1 pvm_shmd.1 pvmd3.1
+MAN3=		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 \
-		pvm_delinfo.3 pvm_delmhf.3 pvm_exit.3 pvm_export.3 \
-		pvm_freebuf.3 pvm_freecontext.3 pvm_freezegroup.3 pvm_gather.3 \
-		pvm_getcontext.3 pvm_getfds.3 pvm_getinst.3 pvm_getmboxinfo.3 \
-		pvm_getmwid.3 pvm_getopt.3 pvm_getrbuf.3 pvm_getsbuf.3 \
-		pvm_gettid.3 pvm_gettmask.3 pvm_gsize.3 pvm_halt.3 \
-		pvm_hostsync.3 pvm_initsend.3 pvm_insert.3 pvm_joingroup.3 \
-		pvm_kill.3 pvm_lookup.3 pvm_lvgroup.3 pvm_mcast.3 pvm_mkbuf.3 \
-		pvm_mstat.3 pvm_mytid.3 pvm_newcontext.3 pvm_notify.3 \
-		pvm_nrecv.3 pvm_pack.3 pvm_packf.3 pvm_parent.3 pvm_perror.3 \
-		pvm_pkbyte.3 pvm_pkcplx.3 pvm_pkdcplx.3 pvm_pkdouble.3 \
-		pvm_pkfloat.3 pvm_pkint.3 pvm_pklong.3 pvm_pkmesg.3 \
-		pvm_pkmesgbody.3 pvm_pkshort.3 pvm_pkstr.3 pvm_pkuint.3 \
-		pvm_pkulong.3 pvm_pkushort.3 pvm_precv.3 pvm_probe.3 \
-		pvm_psend.3 pvm_pstat.3 pvm_putinfo.3 pvm_recv.3 pvm_recvf.3 \
-		pvm_recvinfo.3 pvm_reduce.3 pvm_reg_hoster.3 pvm_reg_rm.3 \
+		pvm_exit.3 pvm_export.3 pvm_freebuf.3 pvm_freezegroup.3 \
+		pvm_gather.3 pvm_getfds.3 pvm_getinst.3 pvm_getopt.3 \
+		pvm_getrbuf.3 pvm_getsbuf.3 pvm_gettid.3 pvm_gsize.3 \
+		pvm_halt.3 pvm_hostsync.3 pvm_initsend.3 pvm_insert.3 \
+		pvm_joingroup.3 pvm_kill.3 pvm_lookup.3 pvm_lvgroup.3 \
+		pvm_mcast.3 pvm_mkbuf.3 pvm_mstat.3 pvm_mytid.3 \
+		pvm_newcontext.3 pvm_notify.3 pvm_nrecv.3 pvm_pack.3 \
+		pvm_parent.3 pvm_perror.3 pvm_pkmesg.3 pvm_precv.3 \
+		pvm_probe.3 pvm_psend.3 pvm_pstat.3 pvm_putinfo.3 pvm_recv.3 \
+		pvm_recvf.3 pvm_reduce.3 pvm_reg_hoster.3 pvm_reg_rm.3 \
 		pvm_reg_tasker.3 pvm_scatter.3 pvm_send.3 pvm_sendsig.3 \
-		pvm_serror.3 pvm_setcontext.3 pvm_setmwid.3 pvm_setopt.3 \
-		pvm_setrbuf.3 pvm_setsbuf.3 pvm_settmask.3 pvm_siblings.3 \
-		pvm_spawn.3 pvm_start_pvmd.3 pvm_tasks.3 pvm_tidtohost.3 \
-		pvm_trecv.3 pvm_unexport.3 pvm_unpack.3 pvm_unpackf.3 \
-		pvm_upkbyte.3 pvm_upkcplx.3 pvm_upkdcplx.3 pvm_upkdouble.3 \
-		pvm_upkfloat.3 pvm_upkint.3 pvm_upklong.3 pvm_upkmesg.3 \
-		pvm_upkshort.3 pvm_upkstr.3  pvm_upkuint.3 pvm_upkulong.3 \
-		pvm_upkushort.3 pvmfaddhost.3 pvmfaddmhf.3 pvmfadvise.3 \
-		pvmfarchcode.3 pvmfbarrier.3 pvmfbcast.3 pvmfbufinfo.3 \
-		pvmfcatchout.3 pvmfconfig.3 pvmfdelhost.3 pvmfdelinfo.3 \
-		pvmfdelmhf.3 pvmfexit.3 pvmffreebuf.3 pvmffreecontext.3 \
-		pvmffrzgrp.3 pvmfgather.3 pvmfgetcontext.3 pvmfgetinst.3 \
-		pvmfgetmboxinfo.3 pvmfgetopt.3 pvmfgetrbuf.3 pvmfgetsbuf.3 \
-		pvmfgettid.3 pvmfgsize.3 pvmfhalt.3 pvmfhostsync.3 \
-		pvmfinitsend.3 pvmfjoingrp.3 pvmfkill.3 pvmflvgrp.3 pvmfmcast.3\
-		pvmfmkbuf.3 pvmfmstat.3 pvmfmytid.3 pvmfnewcontext.3 \
-		pvmfnotify.3 pvmfnrecv.3 pvmfpack.3 pvmfparent.3 pvmfperror.3 \
-		pvmfpkmesg.3 pvmfpkmesgbody.3 pvmfprecv.3 pvmfprobe.3 \
-		pvmfpsend.3 pvmfpstat.3 pvmfputinfo.3 pvmfrecv.3 pvmfrecvinfo.3\
-		pvmfreduce.3 pvmfscatter.3 pvmfsend.3 pvmfsendsig.3 \
-		pvmfserror.3 pvmfsetcontext.3 pvmfsetopt.3 pvmfsetrbuf.3 \
-		pvmfsetsbuf.3 pvmfsiblings.3 pvmfspawn.3 pvmfstartpvmd.3 \
-		pvmftasks.3 pvmftidtoh.3 pvmftrecv.3 pvmfunpack.3 pvmfupkmesg.3
+		pvm_serror.3 pvm_setmwid.3 pvm_setopt.3 pvm_setrbuf.3 \
+		pvm_setsbuf.3 pvm_settmask.3 pvm_siblings.3 pvm_spawn.3 \
+		pvm_start_pvmd.3 pvm_tasks.3 pvm_tidtohost.3 pvm_trecv.3 \
+		pvm_unpack.3
+MLINKS=		pvm_intro.1 PVM.1 pvmd3.1 pvmd.1 \
+		libpvm.3 libfpvm.3 pvm_putinfo.3 pvm_delinfo.3 \
+		pvm_addmhf.3 pvm_delmhf.3 pvm_newcontext.3 pvm_freecontext.3 \
+		pvm_newcontext.3 pvm_getcontext.3
+		pvm_putinfo.3 pvm_getmboxinfo.3 pvm_setmwid.3 pvm_getmwid.3 \
+		pvm_settmask.3 pvm_gettmask.3 pvm_pack.3 pvm_packf.3 \
+		pvm_pack.3 pvm_pkbyte.3 pvm_pack.3 pvm_pkcplx.3 \
+		pvm_pack.3 pvm_pkdcplx.3 pvm_pack.3 pvm_pkdouble.3 \
+		pvm_pack.3 pvm_pkfloat.3 pvm_pack.3 pvm_pkint.3 \
+		pvm_pack.3 pvm_pklong.3 pvm_pkmesg.3 pvm_pkmesgbody.3 \
+		pvm_pack.3 pvm_pkshort.3 pvm_pack.3 pvm_pkstr.3 \
+		pvm_pack.3 pvm_pkuint.3 pvm_pack.3 pvm_pkulong.3 \
+		pvm_pack.3 pvm_pkushort.3 pvm_putinfo.3 pvm_recvinfo.3 \
+		pvm_newcontext.3 pvm_setcontext.3 pvm_export.3 pvm_unexport.3 \
+		pvm_unpack.3 pvm_unpackf.3 pvm_unpack.3 pvm_upkbyte.3 \
+		pvm_unpack.3 pvm_upkcplx.3 pvm_unpack.3 pvm_upkdcplx.3 \
+		pvm_unpack.3 pvm_upkdouble.3 pvm_unpack.3 pvm_upkfloat.3 \
+		pvm_unpack.3 pvm_upkint.3 pvm_unpack.3 pvm_upklong.3 \
+		pvm_pkmesg.3 pvm_upkmesg.3 pvm_unpack.3 pvm_upkshort.3 \
+		pvm_unpack.3 pvm_upkstr.3 pvm_unpack.3 pvm_upkuint.3 \
+		pvm_unpack.3 pvm_upkulong.3 pvm_unpack.3 pvm_upkushort.3 \
+		pvm_addhosts.3 pvmfaddhost.3 pvm_addmhf.3 pvmfaddmhf.3 \
+		pvm_advise.3 pvmfadvise.3 pvm_archcode.3 pvmfarchcode.3 \
+		pvm_barrier.3 pvmfbarrier.3 pvm_bcast.3 pvmfbcast.3 \
+		pvm_bufinfo.3 pvmfbufinfo.3 pvm_catchout.3 pvmfcatchout.3 \
+		pvm_config.3 pvmfconfig.3 pvm_delhosts.3 pvmfdelhost.3 \
+		pvm_putinfo.3 pvmfdelinfo.3 pvm_addmhf.3 pvmfdelmhf.3 \
+		pvm_exit.3 pvmfexit.3 pvm_freebuf.3 pvmffreebuf.3 \
+		pvm_newcontext.3 pvmffreecontext.3 \
+		pvm_freezegroup.3 pvmffrzgrp.3 pvm_gather.3 pvmfgather.3 \
+		pvm_newcontext.3 pvmfgetcontext.3 \
+		pvm_getinst.3 pvmfgetinst.3 pvm_putinfo.3 pvmfgetmboxinfo.3 \
+		pvm_getopt.3 pvmfgetopt.3 pvm_getrbuf.3 pvmfgetrbuf.3 \
+		pvm_getsbuf.3 pvmfgetsbuf.3 pvm_gettid.3 pvmfgettid.3 \
+		pvm_gsize.3 pvmfgsize.3 pvm_halt.3 pvmfhalt.3 \
+		pvm_hostsync.3 pvmfhostsync.3 pvm_initsend.3 pvmfinitsend.3 \
+		pvm_joingroup.3 pvmfjoingrp.3 pvm_kill.3 pvmfkill.3 \
+		pvm_lvgroup.3 pvmflvgrp.3 pvm_mcast.3 pvmfmcast.3 \
+		pvm_mkbuf.3 pvmfmkbuf.3 pvm_mstat.3 pvmfmstat.3 \
+		pvm_mytid.3 pvmfmytid.3 pvm_newcontext.3 pvmfnewcontext.3 \
+		pvm_notify.3 pvmfnotify.3 pvm_nrecv.3 pvmfnrecv.3 \
+		pvm_pack.3 pvmfpack.3 pvm_parent.3 pvmfparent.3 \
+		pvm_perror.3 pvmfperror.3 pvm_pkmesg.3 pvmfpkmesg.3 \
+		pvm_pkmesg.3 pvmfpkmesgbody.3 pvm_precv.3 pvmfprecv.3 \
+		pvm_probe.3 pvmfprobe.3 pvm_psend.3 pvmfpsend.3 \
+		pvm_pstat.3 pvmfpstat.3 pvm_putinfo.3 pvmfputinfo.3 \
+		pvm_recv.3 pvmfrecv.3 pvm_putinfo.3 pvmfrecvinfo.3 \
+		pvm_reduce.3 pvmfreduce.3 pvm_scatter.3 pvmfscatter.3 \
+		pvm_send.3 pvmfsend.3 pvm_sendsig.3 pvmfsendsig.3 \
+		pvm_serror.3 pvmfserror.3 pvm_newcontext.3 pvmfsetcontext.3 \
+		pvm_setopt.3 pvmfsetopt.3 pvm_setrbuf.3 pvmfsetrbuf.3 \
+		pvm_setsbuf.3 pvmfsetsbuf.3 pvm_siblings.3 pvmfsiblings.3 \
+		pvm_spawn.3 pvmfspawn.3 pvm_start_pvmd.3 pvmfstartpvmd.3 \
+		pvm_tasks.3 pvmftasks.3 pvm_tidtohost.3 pvmftidtoh.3 \
+		pvm_trecv.3 pvmftrecv.3 pvm_unpack.3 pvmfunpack.3 \
+		pvm_pkmesg.3 pvmfupkmesg.3
 
 pre-patch:
-	@${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \
+	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
 		${WRKSRC}/tracer/tracer.h ${WRKSRC}/tracer/trclib.h \
 		${WRKSRC}/tracer/trcsort.c
+	${FIND} ${WRKSRC} -name Makefile.aimk | ${XARGS} ${REINPLACE_CMD} \
+		-e 's,-[gO],,g' \
+		-e 's,^\([CF]FL[A-Z]*[ 	]*\)=,\1+=,'
 
 do-install:
 	@ ${MKDIR} ${PVM_ROOT}/lib/FREEBSD ${PVM_ROOT}/bin/FREEBSD ${PVM_ROOT}/conf
@@ -91,16 +127,10 @@ do-install:
 	@ ${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
+	cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1
+	cd ${WRKSRC}/man/man3 && ${INSTALL_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}
+	${SED} 's|/usr/local|${PREFIX}|g' ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net/pvm/distinfo b/net/pvm/distinfo
index 187df99eea8f..702c4f0a2294 100644
--- a/net/pvm/distinfo
+++ b/net/pvm/distinfo
@@ -1 +1 @@
-MD5 (pvm3.4.3.tgz) = 58d732cf31d21bd123f5c4ab04aa8610
+MD5 (pvm3.4.4.tgz) = 806abe9a866eab5981383c17ff9ed175
diff --git a/net/pvm/files/patch-ac b/net/pvm/files/patch-ac
index a9d524a37b6b..38a00d2ac3c6 100644
--- a/net/pvm/files/patch-ac
+++ b/net/pvm/files/patch-ac
@@ -1,9 +1,11 @@
---- src/host.c.orig	Fri Nov 26 17:28:41 1999
-+++ src/host.c	Fri Nov 26 17:28:54 1999
-@@ -939,7 +939,7 @@
+--- src/host.c	Wed Sep 26 19:35:18 2001
++++ src/host.c	Thu Oct 31 13:57:18 2002
+@@ -992,9 +992,7 @@
  			perror("ioctl");
  			goto bail;
  		}
+-		/* On some FreeBSD systems: */
+-		/* if (IFF_UP & req.ifr_flags) { */
 -		if (IFF_UP & req.ifr_ifru.ifru_flags) {
 +		if (IFF_UP & req.ifr_flags) {
  			if (nip > 0 && !(nip % 10))
diff --git a/net/pvm/files/patch-ad b/net/pvm/files/patch-ad
deleted file mode 100644
index 8cce16b3f338..000000000000
--- a/net/pvm/files/patch-ad
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/pvmgetarch.orig	Sun Feb  6 18:18:29 2000
-+++ lib/pvmgetarch	Sun Feb  6 18:18:48 2000
-@@ -73,6 +73,7 @@
- 	Linux,ppc )             ARCH=LINUXPPC ;;
- 	BSD/OS,i[3456]86 )      ARCH=BSD386 ;;
- 	FreeBSD,i386 )          ARCH=FREEBSD ;;
-+	FreeBSD,alpha )         ARCH=FREEBSD ;;
- 	SUPER-UX,SX-3 )         ARCH=SX3 ;;
- 	uts,* )                 ARCH=UTS2 ;;
- 	realix,M88* )           ARCH=M88K ;;
diff --git a/net/pvm/pkg-message b/net/pvm/pkg-message
new file mode 100644
index 000000000000..a784cc37f978
--- /dev/null
+++ b/net/pvm/pkg-message
@@ -0,0 +1,7 @@
+-
+You have to set PVM_ROOT=/usr/local/lib/pvm enviropment variable on all machines
+which you are planning to use for distributed computing. The best way to set
+this variable on system-wide basis is to add "PVM_ROOT=/opt/lib/pvm" into
+appropriate section of your /etc/login.conf file. You also have to enable
+rshd on those machines.
+-