Index: head/net/pvm/Makefile
===================================================================
--- head/net/pvm/Makefile	(revision 434162)
+++ head/net/pvm/Makefile	(revision 434163)
@@ -1,77 +1,78 @@
 # Created by: Dima Sivachenko <dima@chg.ru>
 # $FreeBSD$
 
 PORTNAME=	pvm
 PORTVERSION=	3.4.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net parallel
 MASTER_SITES=	NL/pvm3 ftp://ftp.chg.ru/pub/prog/parallel/pvm3/
 DISTNAME=	pvm${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Parallel Virtual Machine libraries and environment
 
 LICENSE=	MIT
 
 USES=		tar:tgz
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/pvm3
-MAKE_ENV=	PVM_ROOT=${WRKSRC} SHAREDLDFLAGS="-shared"
+MAKE_ENV=	PVM_ROOT=${WRKSRC} SHAREDLDFLAGS="${LDFLAGS} -shared"
 PVM_ROOT_REL=	lib/pvm
 PVM_ROOT=	${PREFIX}/${PVM_ROOT_REL}
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	X11
-OPTIONS_DEFAULT=	X11
+OPTIONS_DEFAULT=X11
 OPTIONS_SUB=	yes
 
-X11_USE=	XORG=x11,xaw,xt
+X11_USE=	XORG=x11,xaw,xext,xmu,xt
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${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'
 	@${REINPLACE_CMD} \
 		-e 's/$$(XCFLAGS) $$(CFLAGS)/$$(CFLAGS) $$(XCFLAGS)/' \
 		${WRKSRC}/xep/Makefile.aimk
 .if ! ${PORT_OPTIONS:MX11}
 	@${REINPLACE_CMD} -e '/default/s/xep[^ ]*//' ${WRKSRC}/xep/Makefile.aimk
 .endif
 
 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)
 
 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 ../${PVM_ROOT_REL}/lib/pvm ${STAGEDIR}${PREFIX}/bin
 	${LN} -sf ../${PVM_ROOT_REL}/lib/pvmd ${STAGEDIR}${PREFIX}/bin
 	${LN} -sf ../${PVM_ROOT_REL}/lib/aimk ${STAGEDIR}${PREFIX}/bin
 	${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_LIB} ${WRKSRC}/lib/FREEBSD/libpvm3.so ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${WRKSRC}/lib/FREEBSD/libgpvm3.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.mk>
Index: head/net/pvm/files/patch-FREEBSD.def
===================================================================
--- head/net/pvm/files/patch-FREEBSD.def	(revision 434162)
+++ head/net/pvm/files/patch-FREEBSD.def	(revision 434163)
@@ -1,10 +1,14 @@
---- conf/FREEBSD.def.orig	Wed Dec 19 11:09:23 2001
-+++ conf/FREEBSD.def	Wed Dec 19 11:09:39 2001
-@@ -1,6 +1,6 @@
+--- conf/FREEBSD.def.orig	1998-10-01 21:02:13 UTC
++++ conf/FREEBSD.def
+@@ -1,9 +1,9 @@
  ARCHCFLAGS	=	-DSOCKADHASLEN -DNOREXEC -DRSHCOMMAND=\"/usr/bin/rsh\" \
  				-DHASSTDLIB -DNEEDMENDIAN -DHASERRORVARS \
 -				-DFAKEXDRFLOAT -DSYSERRISCONST
 +				-DFAKEXDRFLOAT -DSYSERRISCONST -DSHAREDTMP $(EXTRACFLAGS)
  ARCHDLIB	=
  ARCHDOBJ	=
- ARCHLIB		=	-lrpcsvc
+-ARCHLIB		=	-lrpcsvc
++ARCHLIB		=
+ HASRANLIB	=	t
+ AR			=	ar
+ PVM_ARCH	=	FREEBSD
Index: head/net/pvm/files/patch-Makefile.aimk
===================================================================
--- head/net/pvm/files/patch-Makefile.aimk	(nonexistent)
+++ head/net/pvm/files/patch-Makefile.aimk	(revision 434163)
@@ -0,0 +1,10 @@
+--- Makefile.aimk.orig	2007-03-07 18:16:06 UTC
++++ Makefile.aimk
+@@ -136,4 +136,7 @@ shared:
+ 	@ echo "building shared in src"
+ 	cd src; ../lib/aimk $(PVMOPTS) install-shared
+ 	@ echo "done building shared in src"
++	@ echo "building shared in pvmgs"
++	cd pvmgs; ../lib/aimk $(PVMOPTS) install-shared
++	@ echo "done building shared in pvmgs"
+ 

Property changes on: head/net/pvm/files/patch-Makefile.aimk
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/pvm/files/patch-pvmgs-Makefile.aimk
===================================================================
--- head/net/pvm/files/patch-pvmgs-Makefile.aimk	(nonexistent)
+++ head/net/pvm/files/patch-pvmgs-Makefile.aimk	(revision 434163)
@@ -0,0 +1,33 @@
+--- pvmgs/Makefile.aimk.orig	2001-11-30 20:33:11 UTC
++++ pvmgs/Makefile.aimk
+@@ -46,11 +46,14 @@ PROGS		=	$(PVMXDIR)/pvm_gstat$(EXESFX) \
+ LPROGS		=	$(PVMLDIR)/pvmgs$(EXESFX)
+ 
+ LIBGPVM		=	$(LIBPREFIX)gpvm3.a
++LIBGPVMSO	=	$(LIBPREFIX)gpvm3.so
+ 
+ install:	all
+ 
+ install-mpp:	all-mpp
+ 
++install-shared:	$(PVMLDIR) $(PVMLDIR)/$(LIBGPVMSO)
++
+ all:	$(DIRS) $(PROGS) $(PVMLDIR)/$(LIBGPVM) $(LPROGS)
+ 
+ all-mpp:	$(DIRS) $(PROGS) $(PVMLDIR)/$(LIBGPVM)-mpp $(LPROGS)
+@@ -103,6 +106,15 @@ $(LIBGPVM)-mpp:	$(LOBJ)
+ pvm_gstat$(EXESFX): pvm_gstat.o $(LIBGPVM) $(PVMLIBDEP)
+ 	$(CC) $(CFLAGS) -o $@ pvm_gstat.o $(LIBGPVM) $(LIBS)
+ 
++# shared library libgpvm3.so
++
++$(PVMLDIR)/$(LIBGPVMSO):	$(LIBGPVMSO)
++	cp $(LIBGPVMSO) $(PVMLDIR)
++
++$(LIBGPVMSO):	$(LOBJ)
++	rm -f $(LIBGPVMSO)
++	$(CC) $(SHAREDLDFLAGS) -o $(LIBGPVMSO) $(LOBJ) $(LIBS)
++
+ clean:
+ 	rm -f $(DOBJ) $(LOBJ) pvmgs$(EXESFX) $(LIBGPVM) \
+ 		pvm_gstat.o pvmgroups.o pvm_gstat$(EXESFX) pvmgroups$(EXESFX)

Property changes on: head/net/pvm/files/patch-pvmgs-Makefile.aimk
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/pvm/pkg-plist
===================================================================
--- head/net/pvm/pkg-plist	(revision 434162)
+++ head/net/pvm/pkg-plist	(revision 434163)
@@ -1,245 +1,246 @@
 bin/aimk
 bin/pvm
 bin/pvmd
 include/fpvm3.h
 include/fpvm3_watcom.h
 include/pvm3.h
 include/pvmproto.h
 include/pvmtev.h
 lib/libfpvm3.a
 lib/libgpvm3.a
+lib/libgpvm3.so
 lib/libpvm3.a
 lib/libpvm3.so
 lib/libpvmtrc.a
 lib/pvm/bin/FREEBSD/dbwtest
 lib/pvm/bin/FREEBSD/ge
 lib/pvm/bin/FREEBSD/gexamp
 lib/pvm/bin/FREEBSD/gexample
 lib/pvm/bin/FREEBSD/gmbi
 lib/pvm/bin/FREEBSD/hello
 lib/pvm/bin/FREEBSD/hello_other
 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
 %%X11%%lib/pvm/bin/FREEBSD/xep
 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