6 files changed, 245 insertions, 260 deletions

diff --git a/net/pvm/Makefile b/net/pvm/Makefile
index 303acfe12e1f..093082fb9a9f 100644
--- a/net/pvm/Makefile
+++ b/net/pvm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pvm
 PORTVERSION=	3.4.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net parallel
 MASTER_SITES=	NL ftp://ftp.chg.ru/pub/prog/parallel/pvm3/
 MASTER_SITE_SUBDIR=	pvm3
@@ -13,143 +13,61 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Parallel Virtual Machine libraries and environment
 
-.if defined(WITHOUT_X11)
-PKGNAMESUFFIX=	-nox11
-MAKE_ENV+=	WITHOUT_X11=yes
-PLIST_SUB+=	X11='@comment '
-.else
-USE_XORG=	x11 xaw xt
-PLIST_SUB+=	X11=''
-.endif
+OPTIONS_DEFINE=	X11
+OPTIONS_DEFAULT=X11
+OPTIONS_SUB=	yes
+X11_USE=	XORG=x11,xaw,xt
 
-USE_FORTRAN=	yes
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/pvm3
-MAKE_ENV+=	PVM_ROOT=${WRKSRC} SHAREDLDFLAGS="-lgfortran -shared"
-ALL_TARGET=	all shared install
+MAKE_ENV+=	PVM_ROOT=${WRKSRC} SHAREDLDFLAGS="-shared"
 PVM_ROOT=	${PREFIX}/lib/pvm
 REINPLACE_ARGS=	-i ""
-MAKE_JOBS_UNSAFE=yes
-
-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_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_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
-
 SUB_FILES=	pkg-message
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
 NOT_FOR_ARCHS=	powerpc
 
+.include <bsd.port.options.mk>
+
 pre-patch:
-	@${REINPLACE_CMD} -e 's|$$(ARCHCFLAGS)|$$(ARCHCFLAGS) -fPIC|g' ${WRKSRC}/src/Makefile.aimk
 	@${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+=,'
+	@${FIND} ${WRKSRC} -name Makefile.aimk | ${XARGS} ${REINPLACE_CMD} \
+		-e 's,-[gO],,g'
+.if ! ${PORT_OPTIONS:MX11}
+	@${REINPLACE_CMD} -e '/default/s/xep[^ ]*//' ${WRKSRC}/xep/Makefile.aimk
+.endif
 
-do-install:
-	@ ${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}/lib/FREEBSD/libpvm3.so ${PREFIX}/lib
-	@ ${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libpvm3.so ${PREFIX}/lib/libpvm3.so.3
-	@ ${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libgpvm3.so ${PREFIX}/lib
-	@ ${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libgpvm3.so ${PREFIX}/lib/libgpvm3.so.3
-	@ ${INSTALL_DATA} ${WRKSRC}/conf/FREEBSD.def ${PVM_ROOT}/conf
-	@ ${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include
-	cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1
-	cd ${WRKSRC}/man/man3 && ${INSTALL_MAN} ${MAN3} ${PREFIX}/man/man3
+do-build:
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} \
+		EXTRACFLAGS="${CFLAGS}" all)
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} clean)
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} \
+		EXTRACFLAGS="${CFLAGS} -fpic" shared)
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
+do-install:
+	${MKDIR} ${STAGEDIR}${PVM_ROOT}/lib/FREEBSD
+	${MKDIR} ${STAGEDIR}${PVM_ROOT}/bin/FREEBSD
+	${MKDIR} ${STAGEDIR}${PVM_ROOT}/conf
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/FREEBSD/* ${STAGEDIR}${PVM_ROOT}/bin/FREEBSD
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/FREEBSD/pvmd3 ${STAGEDIR}${PVM_ROOT}/lib/FREEBSD
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/FREEBSD/pvm ${STAGEDIR}${PVM_ROOT}/lib/FREEBSD
+	${INSTALL_SCRIPT} ${WRKSRC}/lib/pvm ${STAGEDIR}${PVM_ROOT}/lib
+	${INSTALL_SCRIPT} ${WRKSRC}/lib/pvmd ${STAGEDIR}${PVM_ROOT}/lib
+	${INSTALL_SCRIPT} ${WRKSRC}/lib/pvmgetarch ${STAGEDIR}${PVM_ROOT}/lib
+	${INSTALL_SCRIPT} ${WRKSRC}/lib/aimk ${STAGEDIR}${PVM_ROOT}/lib
+	${LN} -sf ../lib/pvm ${STAGEDIR}${PREFIX}/bin/pvm
+	${LN} -sf ../lib/pvmd ${STAGEDIR}${PREFIX}/bin/pvmd
+	${LN} -sf ../lib/aimk ${STAGEDIR}${PREFIX}/bin/aimk
+	${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libpvm3.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libfpvm3.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libgpvm3.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libpvmtrc.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libpvm3.so ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/conf/FREEBSD.def ${STAGEDIR}${PVM_ROOT}/conf
+	${INSTALL_DATA} ${WRKSRC}/include/* ${STAGEDIR}${PREFIX}/include
+	${INSTALL_MAN} ${WRKSRC}/man/man1/* ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/man3/* ${STAGEDIR}${PREFIX}/man/man3
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/pvm/files/patch-FREEBSD.def b/net/pvm/files/patch-FREEBSD.def
index c140a5c4f2c5..74e491a98a5f 100644
--- a/net/pvm/files/patch-FREEBSD.def
+++ b/net/pvm/files/patch-FREEBSD.def
@@ -4,7 +4,7 @@
  ARCHCFLAGS	=	-DSOCKADHASLEN -DNOREXEC -DRSHCOMMAND=\"/usr/bin/rsh\" \
  				-DHASSTDLIB -DNEEDMENDIAN -DHASERRORVARS \
 -				-DFAKEXDRFLOAT -DSYSERRISCONST
-+				-DFAKEXDRFLOAT -DSYSERRISCONST -DSHAREDTMP
++				-DFAKEXDRFLOAT -DSYSERRISCONST -DSHAREDTMP $(EXTRACFLAGS)
  ARCHDLIB	=
  ARCHDOBJ	=
  ARCHLIB		=	-lrpcsvc
diff --git a/net/pvm/files/patch-nox11 b/net/pvm/files/patch-nox11
deleted file mode 100644
index 592cc35b2330..000000000000
--- a/net/pvm/files/patch-nox11
+++ /dev/null
@@ -1,10 +0,0 @@
---- xep/Makefile.aimk	Fri Aug 29 10:17:48 1997
-+++ xep/Makefile.aimk	Thu Oct 31 18:28:36 2002
-@@ -32,3 +32,7 @@
- 
-+.if defined(WITHOUT_X11)
-+default:	mtile$(EXESFX)
-+.else
- default:	mtile$(EXESFX) xep$(EXESFX)
-+.endif
- 
diff --git a/net/pvm/files/patch-pvmgs-Makefile.aimk b/net/pvm/files/patch-pvmgs-Makefile.aimk
deleted file mode 100644
index 8ac3e5338ddc..000000000000
--- a/net/pvm/files/patch-pvmgs-Makefile.aimk
+++ /dev/null
@@ -1,95 +0,0 @@
-Index: pvmgs/Makefile.aimk
-===================================================================
---- pvmgs/Makefile.aimk
-+++ pvmgs/Makefile.aimk
-@@ -45,13 +45,13 @@ PROGS		=	$(PVMXDIR)/pvm_gstat$(EXESFX) \
- 
- LPROGS		=	$(PVMLDIR)/pvmgs$(EXESFX)
- 
--LIBGPVM		=	$(LIBPREFIX)gpvm3.a
-+LIBGPVM		=	$(LIBPREFIX)gpvm3
- 
- install:	all
- 
- install-mpp:	all-mpp
- 
--all:	$(DIRS) $(PROGS) $(PVMLDIR)/$(LIBGPVM) $(LPROGS)
-+all:	$(DIRS) $(PROGS) $(PVMLDIR)/$(LIBGPVM).a $(PVMLDIR)/$(LIBGPVM).so $(LPROGS)
- 
- all-mpp:	$(DIRS) $(PROGS) $(PVMLDIR)/$(LIBGPVM)-mpp $(LPROGS)
- 
-@@ -71,40 +71,57 @@ $(PVMXDIR)/pvmgs$(EXESFX):  pvmgs$(EXESF
- $(PVMXDIR)/pvmgroups$(EXESFX):  pvmgroups$(EXESFX)
- 	cp pvmgroups$(EXESFX) $(PVMXDIR)
- 
--$(PVMLDIR)/$(LIBGPVM):  $(LIBGPVM)
--	cp $(LIBGPVM) $(PVMLDIR)
--	case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(PVMLDIR)/$(LIBGPVM) ;; esac
-+$(PVMLDIR)/$(LIBGPVM).a:  $(LIBGPVM).a
-+	cp $(LIBGPVM).a $(PVMLDIR)
-+	case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(PVMLDIR)/$(LIBGPVM).a ;; esac
- 
- $(PVMLDIR)/$(LIBGPVM)-mpp:  $(LIBGPVM)-mpp
--	cp $(LIBGPVM) $(PVMLDIR)
--	case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(PVMLDIR)/$(LIBGPVM) ;; esac
-+	cp $(LIBGPVM).a $(PVMLDIR)
-+	case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(PVMLDIR)/$(LIBGPVM).a ;; esac
- 	touch $(PVMLDIR)/$(LIBGPVM)-mpp
- 
-+$(PVMLDIR)/$(LIBGPVM).so:  $(LIBGPVM).so
-+	cp $(LIBGPVM).so $(PVMLDIR)
-+
- $(PVMLDIR)/pvmgs$(EXESFX):  pvmgs$(EXESFX)
- 	cp pvmgs$(EXESFX) $(PVMLDIR)
- 
--pvmgroups$(EXESFX):	pvmgroups.o $(LIBGPVM) $(PVMLIBDEP)
--	$(CC) $(CFLAGS) -o $@ pvmgroups.o $(LIBGPVM) $(LIBS) 
-+pvmgroups$(EXESFX):	pvmgroups.o $(LIBGPVM).a $(PVMLIBDEP)
-+	$(CC) $(CFLAGS) -o $@ pvmgroups.o $(LIBGPVM).a $(LIBS) 
- 
- pvmgs$(EXESFX):	$(DOBJ) $(PVMLIBDEP)
- 	$(CC) $(CFLAGS) -o $@ $(DOBJ) $(LIBS)
- 
--$(LIBGPVM):	$(LOBJ)
--	rm -f $(LIBGPVM)
--	$(AR) cr $(LIBGPVM) $(LOBJ)
--	case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(LIBGPVM) ;; esac
-+$(LIBGPVM).a:
-+	echo -------------------------------
-+	echo --- Building static Library ---
-+	echo -------------------------------
-+	rm -f $(LIBGPVM).a $(LOBJ)
-+	pwd
-+	cd .. && ../lib/aimk CFLOPTS='$(CFLOPTS)' $(LOBJ)
-+	$(AR) cr $(LIBGPVM).a $(LOBJ)
-+	case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(LIBGPVM).a ;; esac
-+
-+$(LIBGPVM).so:
-+	echo -------------------------------
-+	echo --- Building shared Library ---
-+	echo -------------------------------
-+	rm -f $(LIBGPVM).a $(LOBJ)
-+	pwd
-+	cd .. && ../lib/aimk CFLOPTS='-fPIC $(CFLOPTS)' $(LOBJ)
-+	$(CC) -shared -Wl,-soname,libgpvm3.so.3 -o $(LIBGPVM).so $(LOBJ) -lc
- 
- $(LIBGPVM)-mpp:	$(LOBJ)
--	rm -f $(LIBGPVM)
--	$(AR_FRONT) cr $(LIBGPVM) $(LOBJ)
--	case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(LIBGPVM) ;; esac
-+	rm -f $(LIBGPVM).a
-+	$(AR_FRONT) cr $(LIBGPVM).a $(LOBJ)
-+	case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(LIBGPVM).a ;; esac
- 	touch $(LIBGPVM)-mpp
- 
--pvm_gstat$(EXESFX): pvm_gstat.o $(LIBGPVM) $(PVMLIBDEP)
--	$(CC) $(CFLAGS) -o $@ pvm_gstat.o $(LIBGPVM) $(LIBS)
-+pvm_gstat$(EXESFX): pvm_gstat.o $(LIBGPVM).a $(PVMLIBDEP)
-+	$(CC) $(CFLAGS) -o $@ pvm_gstat.o $(LIBGPVM).a $(LIBS)
- 
- clean:
--	rm -f $(DOBJ) $(LOBJ) pvmgs$(EXESFX) $(LIBGPVM) \
-+	rm -f $(DOBJ) $(LOBJ) pvmgs$(EXESFX) $(LIBGPVM).a \
- 		pvm_gstat.o pvmgroups.o pvm_gstat$(EXESFX) pvmgroups$(EXESFX)
- 
- tidy:
diff --git a/net/pvm/files/pkg-message.in b/net/pvm/files/pkg-message.in
index ddc4f1ef8393..1e682d6ecf5c 100644
--- a/net/pvm/files/pkg-message.in
+++ b/net/pvm/files/pkg-message.in
@@ -1,5 +1,5 @@
 -
-You have to set PVM_ROOT=%%PREFIX%%/lib/pvm enviropment variable on all machines
+You have to set PVM_ROOT=%%PREFIX%%/lib/pvm environment 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=%%PREFIX%%/lib/pvm" into
 appropriate section of your /etc/login.conf file. You also have to enable
diff --git a/net/pvm/pkg-plist b/net/pvm/pkg-plist
index 2f681b3797f1..ff12f1eb23f4 100644
--- a/net/pvm/pkg-plist
+++ b/net/pvm/pkg-plist
@@ -1,28 +1,23 @@
 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
+include/fpvm3.h
+include/fpvm3_watcom.h
+include/pvm3.h
+include/pvmproto.h
+include/pvmtev.h
+lib/libfpvm3.a
+lib/libgpvm3.a
+lib/libpvm3.a
+lib/libpvm3.so
+lib/libpvmtrc.a
 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
@@ -58,19 +53,196 @@ lib/pvm/bin/FREEBSD/trcsort
 lib/pvm/bin/FREEBSD/trsg
 lib/pvm/bin/FREEBSD/tst
 %%X11%%lib/pvm/bin/FREEBSD/xep
-include/fpvm3.h
-include/fpvm3_watcom.h
-include/pvm3.h
-include/pvmproto.h
-include/pvmtev.h
-lib/libpvm3.a
-lib/libpvmtrc.a
-lib/libfpvm3.a
-lib/libgpvm3.a
-lib/libpvm3.so
-lib/libpvm3.so.3
-lib/libgpvm3.so
-lib/libgpvm3.so.3
+lib/pvm/conf/FREEBSD.def
+lib/pvm/lib/FREEBSD/pvm
+lib/pvm/lib/FREEBSD/pvmd3
+lib/pvm/lib/aimk
+lib/pvm/lib/pvm
+lib/pvm/lib/pvmd
+lib/pvm/lib/pvmgetarch
+man/man1/PVM.1.gz
+man/man1/aimk.1.gz
+man/man1/pvm.1.gz
+man/man1/pvm_intro.1.gz
+man/man1/pvm_shmd.1.gz
+man/man1/pvmd.1.gz
+man/man1/pvmd3.1.gz
+man/man3/libfpvm.3.gz
+man/man3/libpvm.3.gz
+man/man3/pvm_addhosts.3.gz
+man/man3/pvm_addmhf.3.gz
+man/man3/pvm_advise.3.gz
+man/man3/pvm_archcode.3.gz
+man/man3/pvm_barrier.3.gz
+man/man3/pvm_bcast.3.gz
+man/man3/pvm_bufinfo.3.gz
+man/man3/pvm_catchout.3.gz
+man/man3/pvm_config.3.gz
+man/man3/pvm_delete.3.gz
+man/man3/pvm_delhosts.3.gz
+man/man3/pvm_delinfo.3.gz
+man/man3/pvm_delmhf.3.gz
+man/man3/pvm_exit.3.gz
+man/man3/pvm_export.3.gz
+man/man3/pvm_freebuf.3.gz
+man/man3/pvm_freecontext.3.gz
+man/man3/pvm_freezegroup.3.gz
+man/man3/pvm_gather.3.gz
+man/man3/pvm_getcontext.3.gz
+man/man3/pvm_getfds.3.gz
+man/man3/pvm_getinst.3.gz
+man/man3/pvm_getmboxinfo.3.gz
+man/man3/pvm_getmwid.3.gz
+man/man3/pvm_getopt.3.gz
+man/man3/pvm_getrbuf.3.gz
+man/man3/pvm_getsbuf.3.gz
+man/man3/pvm_gettid.3.gz
+man/man3/pvm_gettmask.3.gz
+man/man3/pvm_gsize.3.gz
+man/man3/pvm_halt.3.gz
+man/man3/pvm_hostsync.3.gz
+man/man3/pvm_initsend.3.gz
+man/man3/pvm_insert.3.gz
+man/man3/pvm_joingroup.3.gz
+man/man3/pvm_kill.3.gz
+man/man3/pvm_lookup.3.gz
+man/man3/pvm_lvgroup.3.gz
+man/man3/pvm_mcast.3.gz
+man/man3/pvm_mkbuf.3.gz
+man/man3/pvm_mstat.3.gz
+man/man3/pvm_mytid.3.gz
+man/man3/pvm_newcontext.3.gz
+man/man3/pvm_notify.3.gz
+man/man3/pvm_nrecv.3.gz
+man/man3/pvm_pack.3.gz
+man/man3/pvm_packf.3.gz
+man/man3/pvm_parent.3.gz
+man/man3/pvm_perror.3.gz
+man/man3/pvm_pkbyte.3.gz
+man/man3/pvm_pkcplx.3.gz
+man/man3/pvm_pkdcplx.3.gz
+man/man3/pvm_pkdouble.3.gz
+man/man3/pvm_pkfloat.3.gz
+man/man3/pvm_pkint.3.gz
+man/man3/pvm_pklong.3.gz
+man/man3/pvm_pkmesg.3.gz
+man/man3/pvm_pkmesgbody.3.gz
+man/man3/pvm_pkshort.3.gz
+man/man3/pvm_pkstr.3.gz
+man/man3/pvm_pkuint.3.gz
+man/man3/pvm_pkulong.3.gz
+man/man3/pvm_pkushort.3.gz
+man/man3/pvm_precv.3.gz
+man/man3/pvm_probe.3.gz
+man/man3/pvm_psend.3.gz
+man/man3/pvm_pstat.3.gz
+man/man3/pvm_putinfo.3.gz
+man/man3/pvm_recv.3.gz
+man/man3/pvm_recvf.3.gz
+man/man3/pvm_recvinfo.3.gz
+man/man3/pvm_reduce.3.gz
+man/man3/pvm_reg_hoster.3.gz
+man/man3/pvm_reg_rm.3.gz
+man/man3/pvm_reg_tasker.3.gz
+man/man3/pvm_scatter.3.gz
+man/man3/pvm_send.3.gz
+man/man3/pvm_sendsig.3.gz
+man/man3/pvm_serror.3.gz
+man/man3/pvm_setcontext.3.gz
+man/man3/pvm_setmwid.3.gz
+man/man3/pvm_setopt.3.gz
+man/man3/pvm_setrbuf.3.gz
+man/man3/pvm_setsbuf.3.gz
+man/man3/pvm_settmask.3.gz
+man/man3/pvm_siblings.3.gz
+man/man3/pvm_spawn.3.gz
+man/man3/pvm_start_pvmd.3.gz
+man/man3/pvm_tasks.3.gz
+man/man3/pvm_tidtohost.3.gz
+man/man3/pvm_trecv.3.gz
+man/man3/pvm_unexport.3.gz
+man/man3/pvm_unpack.3.gz
+man/man3/pvm_unpackf.3.gz
+man/man3/pvm_upkbyte.3.gz
+man/man3/pvm_upkcplx.3.gz
+man/man3/pvm_upkdcplx.3.gz
+man/man3/pvm_upkdouble.3.gz
+man/man3/pvm_upkfloat.3.gz
+man/man3/pvm_upkint.3.gz
+man/man3/pvm_upklong.3.gz
+man/man3/pvm_upkmesg.3.gz
+man/man3/pvm_upkshort.3.gz
+man/man3/pvm_upkstr.3.gz
+man/man3/pvm_upkuint.3.gz
+man/man3/pvm_upkulong.3.gz
+man/man3/pvm_upkushort.3.gz
+man/man3/pvmfaddhost.3.gz
+man/man3/pvmfaddmhf.3.gz
+man/man3/pvmfadvise.3.gz
+man/man3/pvmfarchcode.3.gz
+man/man3/pvmfbarrier.3.gz
+man/man3/pvmfbcast.3.gz
+man/man3/pvmfbufinfo.3.gz
+man/man3/pvmfcatchout.3.gz
+man/man3/pvmfconfig.3.gz
+man/man3/pvmfdelhost.3.gz
+man/man3/pvmfdelinfo.3.gz
+man/man3/pvmfdelmhf.3.gz
+man/man3/pvmfexit.3.gz
+man/man3/pvmffreebuf.3.gz
+man/man3/pvmffreecontext.3.gz
+man/man3/pvmffrzgrp.3.gz
+man/man3/pvmfgather.3.gz
+man/man3/pvmfgetcontext.3.gz
+man/man3/pvmfgetinst.3.gz
+man/man3/pvmfgetmboxinfo.3.gz
+man/man3/pvmfgetopt.3.gz
+man/man3/pvmfgetrbuf.3.gz
+man/man3/pvmfgetsbuf.3.gz
+man/man3/pvmfgettid.3.gz
+man/man3/pvmfgsize.3.gz
+man/man3/pvmfhalt.3.gz
+man/man3/pvmfhostsync.3.gz
+man/man3/pvmfinitsend.3.gz
+man/man3/pvmfjoingrp.3.gz
+man/man3/pvmfkill.3.gz
+man/man3/pvmflvgrp.3.gz
+man/man3/pvmfmcast.3.gz
+man/man3/pvmfmkbuf.3.gz
+man/man3/pvmfmstat.3.gz
+man/man3/pvmfmytid.3.gz
+man/man3/pvmfnewcontext.3.gz
+man/man3/pvmfnotify.3.gz
+man/man3/pvmfnrecv.3.gz
+man/man3/pvmfpack.3.gz
+man/man3/pvmfparent.3.gz
+man/man3/pvmfperror.3.gz
+man/man3/pvmfpkmesg.3.gz
+man/man3/pvmfpkmesgbody.3.gz
+man/man3/pvmfprecv.3.gz
+man/man3/pvmfprobe.3.gz
+man/man3/pvmfpsend.3.gz
+man/man3/pvmfpstat.3.gz
+man/man3/pvmfputinfo.3.gz
+man/man3/pvmfrecv.3.gz
+man/man3/pvmfrecvinfo.3.gz
+man/man3/pvmfreduce.3.gz
+man/man3/pvmfscatter.3.gz
+man/man3/pvmfsend.3.gz
+man/man3/pvmfsendsig.3.gz
+man/man3/pvmfserror.3.gz
+man/man3/pvmfsetcontext.3.gz
+man/man3/pvmfsetopt.3.gz
+man/man3/pvmfsetrbuf.3.gz
+man/man3/pvmfsetsbuf.3.gz
+man/man3/pvmfsiblings.3.gz
+man/man3/pvmfspawn.3.gz
+man/man3/pvmfstartpvmd.3.gz
+man/man3/pvmftasks.3.gz
+man/man3/pvmftidtoh.3.gz
+man/man3/pvmftrecv.3.gz
+man/man3/pvmfunpack.3.gz
+man/man3/pvmfupkmesg.3.gz
 @dirrm lib/pvm/lib/FREEBSD
 @dirrm lib/pvm/lib
 @dirrm lib/pvm/conf