diff --git a/misc/xpns/Makefile b/misc/xpns/Makefile
index ad68b52434cb..755022af9242 100644
--- a/misc/xpns/Makefile
+++ b/misc/xpns/Makefile
@@ -13,9 +13,19 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Petri-Net Simulator for Xwindows
 
 NO_WRKSUBDIR=	yes
+
 USE_XORG=	x11 xaw
 MAKEFILE=	makefile
 ALL_TARGET=	pns
+MAKE_JOBS_SAFE=	yes
+
+PORTDOCS=	*
+PLIST_FILES=	bin/xpns \
+		libexec/xpns/pns \
+		%%DATADIR%%/pns.hlp \
+		%%DATADIR%%/pns.shell
+PLIST_DIRS=	%%DATADIR%% \
+		libexec/xpns
 
 .include <bsd.port.options.mk>
 
@@ -23,15 +33,14 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/xpns
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/xpns ${PREFIX}/bin/xpns
-	${MKDIR} ${PREFIX}/libexec/xpns
-	${INSTALL_PROGRAM} ${WRKSRC}/pns ${PREFIX}/libexec/xpns
-	${MKDIR} ${PREFIX}/share/xpns
-	${INSTALL_DATA} ${WRKSRC}/pns.hlp ${PREFIX}/share/xpns
-	${INSTALL_DATA} ${WRKSRC}/pns.shell ${PREFIX}/share/xpns
+	(cd ${WRKSRC} && ${INSTALL_SCRIPT} xpns ${PREFIX}/bin)
+	@${MKDIR} ${PREFIX}/libexec/xpns
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} pns ${PREFIX}/libexec/xpns)
+	@${MKDIR} ${DATADIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} pns.hlp pns.shell ${DATADIR})
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${PREFIX}/share/doc/xpns
-	${INSTALL_DATA} ${WRKSRC}/*.net ${PREFIX}/share/doc/xpns
+	@${MKDIR} ${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} *.net ${DOCSDIR})
 .endif
 
 .include <bsd.port.mk>
diff --git a/misc/xpns/files/patch-ab b/misc/xpns/files/patch-ab
index e79a2e477085..1c096cf88ddd 100644
--- a/misc/xpns/files/patch-ab
+++ b/misc/xpns/files/patch-ab
@@ -1,12 +1,13 @@
 --- xpns.orig	Tue Apr  8 11:27:14 1997
 +++ xpns	Tue Apr  8 11:29:05 1997
-@@ -1,6 +1,7 @@
+@@ -1,6 +1,8 @@
 -#!/bin/tcsh
 -setenv XAPPLRESDIR $PWD/
 -pns
-+#!/bin/csh
-+setenv XAPPLRESDIR %%PREFIX%%/share/xpns/
++#!/bin/sh
 +# Note pns will dump core if environment is not correct
++XAPPLRESDIR=%%PREFIX%%/share/xpns/
++export XAPPLRESDIR
 +%%PREFIX%%/libexec/xpns/pns
  
  
diff --git a/misc/xpns/files/patch-celldel.c b/misc/xpns/files/patch-celldel.c
new file mode 100644
index 000000000000..0fea014c0d61
--- /dev/null
+++ b/misc/xpns/files/patch-celldel.c
@@ -0,0 +1,10 @@
+--- celldel.c.orig
++++ celldel.c
+@@ -17,6 +17,7 @@
+ #include	"cellrefr.h"
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ 
+ #define CellOListToRList( v)   do {					\
diff --git a/misc/xpns/files/patch-cellein.c b/misc/xpns/files/patch-cellein.c
new file mode 100644
index 000000000000..7f692f97c726
--- /dev/null
+++ b/misc/xpns/files/patch-cellein.c
@@ -0,0 +1,10 @@
+--- cellein.c.orig
++++ cellein.c
+@@ -14,6 +14,7 @@
+ #include	"celltype.h"
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ 
+ /*************************************************************************
diff --git a/misc/xpns/files/patch-cellget.c b/misc/xpns/files/patch-cellget.c
new file mode 100644
index 000000000000..0be090402669
--- /dev/null
+++ b/misc/xpns/files/patch-cellget.c
@@ -0,0 +1,10 @@
+--- cellget.c.orig
++++ cellget.c
+@@ -16,6 +16,7 @@
+ 
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ 
+ static OBJECT	*pSte, *pTra, *pK;
diff --git a/misc/xpns/files/patch-cellkaio.c b/misc/xpns/files/patch-cellkaio.c
new file mode 100644
index 000000000000..3f1f24eca731
--- /dev/null
+++ b/misc/xpns/files/patch-cellkaio.c
@@ -0,0 +1,10 @@
+--- cellkaio.c.orig
++++ cellkaio.c
+@@ -21,6 +21,7 @@
+ 
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ 
+ 
diff --git a/misc/xpns/files/patch-cellkalook.c b/misc/xpns/files/patch-cellkalook.c
new file mode 100644
index 000000000000..704a653bfe04
--- /dev/null
+++ b/misc/xpns/files/patch-cellkalook.c
@@ -0,0 +1,10 @@
+--- cellkalook.c.orig
++++ cellkalook.c
+@@ -16,6 +16,7 @@
+ 
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ 
+ 
diff --git a/misc/xpns/files/patch-cellmisc.c b/misc/xpns/files/patch-cellmisc.c
new file mode 100644
index 000000000000..65c04d559d80
--- /dev/null
+++ b/misc/xpns/files/patch-cellmisc.c
@@ -0,0 +1,11 @@
+--- cellmisc.c.orig
++++ cellmisc.c
+@@ -14,6 +14,8 @@
+ #include 	"cell.h"
+ #include	"misc.h"
+ 
++#include <stdlib.h>
++
+ 
+ 
+ 
diff --git a/misc/xpns/files/patch-cellorg.c b/misc/xpns/files/patch-cellorg.c
new file mode 100644
index 000000000000..cd732623cb46
--- /dev/null
+++ b/misc/xpns/files/patch-cellorg.c
@@ -0,0 +1,11 @@
+--- cellorg.c.orig
++++ cellorg.c
+@@ -16,6 +16,8 @@
+ #include	"tra.h"
+ #include	"ka.h"
+ 
++#include <stdlib.h>
++
+ 
+ 
+ 
diff --git a/misc/xpns/files/patch-cellrefr.c b/misc/xpns/files/patch-cellrefr.c
new file mode 100644
index 000000000000..c92a01f666c1
--- /dev/null
+++ b/misc/xpns/files/patch-cellrefr.c
@@ -0,0 +1,10 @@
+--- cellrefr.c.orig
++++ cellrefr.c
+@@ -15,6 +15,7 @@
+ 
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ 
+ /*************************************************************************
diff --git a/misc/xpns/files/patch-diwinpop.c b/misc/xpns/files/patch-diwinpop.c
new file mode 100644
index 000000000000..ebf43b42409e
--- /dev/null
+++ b/misc/xpns/files/patch-diwinpop.c
@@ -0,0 +1,11 @@
+--- diwinpop.c.orig
++++ diwinpop.c
+@@ -27,6 +27,8 @@
+ #include	"hawin.h"
+ #include        "haka.H"
+ 
++#include <unistd.h>
++
+ /*************************************************************************
+ ** FUNKTION:	DiWinPopdown
+ ** ZWECK:	schliesst und zerstoert Widget
diff --git a/misc/xpns/files/patch-filekaio.c b/misc/xpns/files/patch-filekaio.c
new file mode 100644
index 000000000000..507c7bd56fb5
--- /dev/null
+++ b/misc/xpns/files/patch-filekaio.c
@@ -0,0 +1,10 @@
+--- filekaio.c.orig
++++ filekaio.c
+@@ -19,6 +19,7 @@
+ 
+ #include	<string.h>
+ #include	<stdio.h>
++#include	<stdlib.h>
+ 
+ 
+ 
diff --git a/misc/xpns/files/patch-filesteio.c b/misc/xpns/files/patch-filesteio.c
new file mode 100644
index 000000000000..4f8a5a1e5bf2
--- /dev/null
+++ b/misc/xpns/files/patch-filesteio.c
@@ -0,0 +1,10 @@
+--- filesteio.c.orig
++++ filesteio.c
+@@ -18,6 +18,7 @@
+ 
+ #include	<string.h>
+ #include	<stdio.h>
++#include	<stdlib.h>
+ 
+ 
+ 
diff --git a/misc/xpns/files/patch-filetraio.c b/misc/xpns/files/patch-filetraio.c
new file mode 100644
index 000000000000..804c05866061
--- /dev/null
+++ b/misc/xpns/files/patch-filetraio.c
@@ -0,0 +1,10 @@
+--- filetraio.c.orig
++++ filetraio.c
+@@ -17,6 +17,7 @@
+ 
+ #include	<string.h>
+ #include	<stdio.h>
++#include	<stdlib.h>
+ 
+ 
+ 
diff --git a/misc/xpns/files/patch-habreakmisc.c b/misc/xpns/files/patch-habreakmisc.c
new file mode 100644
index 000000000000..909951843060
--- /dev/null
+++ b/misc/xpns/files/patch-habreakmisc.c
@@ -0,0 +1,11 @@
+--- habreakmisc.c.orig
++++ habreakmisc.c
+@@ -52,7 +52,7 @@ void HaBreakInit()
+ ** RETURN: 	
+ ** ANMERK: 	
+ *************************************************************************/
+-static HaBreakMark( MarkOn)
++static void HaBreakMark( MarkOn)
+   BOOLEAN 	MarkOn;
+ {
+   OBJECT	*e;
diff --git a/misc/xpns/files/patch-hadatmisc.c b/misc/xpns/files/patch-hadatmisc.c
new file mode 100644
index 000000000000..5e6715a366e4
--- /dev/null
+++ b/misc/xpns/files/patch-hadatmisc.c
@@ -0,0 +1,11 @@
+--- hadatmisc.c.orig
++++ hadatmisc.c
+@@ -14,6 +14,8 @@
+ #include	"hawin.h"
+ #include	"diwin.h"
+ 
++#include <stdlib.h>
++
+ 
+ 
+ /*************************************************************************
diff --git a/misc/xpns/files/patch-hadelmisc.c b/misc/xpns/files/patch-hadelmisc.c
new file mode 100644
index 000000000000..40aac4a7e598
--- /dev/null
+++ b/misc/xpns/files/patch-hadelmisc.c
@@ -0,0 +1,10 @@
+--- hadelmisc.c.orig
++++ hadelmisc.c
+@@ -22,6 +22,7 @@
+ #include 	"cellget.h"
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ 
+ /*************************************************************************
diff --git a/misc/xpns/files/patch-hakadelta.c b/misc/xpns/files/patch-hakadelta.c
new file mode 100644
index 000000000000..8b6370eebfc1
--- /dev/null
+++ b/misc/xpns/files/patch-hakadelta.c
@@ -0,0 +1,11 @@
+--- hakadelta.c.orig
++++ hakadelta.c
+@@ -17,6 +17,8 @@
+ #include	"colors"
+ #include	"cellname.h"
+ 
++#include <stdio.h>
++
+ 
+ 
+ #define DeDrawX( t, p, gc)   XDrawImageString( MyDisplay, HaGraphPixmap, \
diff --git a/misc/xpns/files/patch-hakamisc.c b/misc/xpns/files/patch-hakamisc.c
new file mode 100644
index 000000000000..801801a8de88
--- /dev/null
+++ b/misc/xpns/files/patch-hakamisc.c
@@ -0,0 +1,11 @@
+--- hakamisc.c.orig
++++ hakamisc.c
+@@ -19,6 +19,8 @@
+ #include	"hagraph.h"
+ #include 	"colors"
+ 
++#include <stdlib.h>
++
+ /*************************************************************************
+ ** FUNKTION:	HaKaInit
+ *************************************************************************/
diff --git a/misc/xpns/files/patch-hakasete.c b/misc/xpns/files/patch-hakasete.c
new file mode 100644
index 000000000000..65bcd59eb8fa
--- /dev/null
+++ b/misc/xpns/files/patch-hakasete.c
@@ -0,0 +1,11 @@
+--- hakasete.c.orig
++++ hakasete.c
+@@ -18,6 +18,8 @@
+ #include	"celltype.h"
+ #include	"katype.h"
+ 
++#include <stdlib.h>
++
+ 
+ 
+ 
diff --git a/misc/xpns/files/patch-halook.c b/misc/xpns/files/patch-halook.c
new file mode 100644
index 000000000000..89952d5c40c6
--- /dev/null
+++ b/misc/xpns/files/patch-halook.c
@@ -0,0 +1,11 @@
+--- halook.c.orig
++++ halook.c
+@@ -18,7 +18,7 @@
+ #include	"stewin.h"
+ 
+ #include <stdio.h>
+-
++#include <stdlib.h>
+ 
+ 
+ 
diff --git a/misc/xpns/files/patch-harefreshx.c b/misc/xpns/files/patch-harefreshx.c
new file mode 100644
index 000000000000..3838d6435a4f
--- /dev/null
+++ b/misc/xpns/files/patch-harefreshx.c
@@ -0,0 +1,10 @@
+--- harefreshx.c.orig
++++ harefreshx.c
+@@ -25,6 +25,7 @@
+ #include	"hastename.h"
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #ifdef HALLO
+ 
diff --git a/misc/xpns/files/patch-hastemarke.c b/misc/xpns/files/patch-hastemarke.c
new file mode 100644
index 000000000000..af75a3d32dc0
--- /dev/null
+++ b/misc/xpns/files/patch-hastemarke.c
@@ -0,0 +1,11 @@
+--- hastemarke.c.orig
++++ hastemarke.c
+@@ -17,6 +17,8 @@
+ #include	"hagraph.h"
+ #include	"misc.h"
+ 
++#include <stdlib.h>
++
+ 
+ #define yDISP			5
+ 
diff --git a/misc/xpns/files/patch-hi.c b/misc/xpns/files/patch-hi.c
new file mode 100644
index 000000000000..9be280200d72
--- /dev/null
+++ b/misc/xpns/files/patch-hi.c
@@ -0,0 +1,10 @@
+--- hi.c.orig
++++ hi.c
+@@ -22,6 +22,7 @@
+ #include 	<X11/Xaw/Viewport.h>
+ #include 	<X11/Xaw/Paned.h>
+ #include	<stdio.h>
++#include	<stdlib.h>
+ 
+ Widget		HiCom;
+ Widget		HiShell;
diff --git a/misc/xpns/files/patch-kaio.c b/misc/xpns/files/patch-kaio.c
new file mode 100644
index 000000000000..52e16f6460c2
--- /dev/null
+++ b/misc/xpns/files/patch-kaio.c
@@ -0,0 +1,11 @@
+--- kaio.c.orig
++++ kaio.c
+@@ -17,6 +17,8 @@
+ #include	"ste.h"
+ #include	"tra.h"
+ 
++#include <stdlib.h>
++
+ 
+ 
+ /*************************************************************************
diff --git a/misc/xpns/files/patch-kawinpop.c b/misc/xpns/files/patch-kawinpop.c
new file mode 100644
index 000000000000..9dfee6c48257
--- /dev/null
+++ b/misc/xpns/files/patch-kawinpop.c
@@ -0,0 +1,10 @@
+--- kawinpop.c.orig
++++ kawinpop.c
+@@ -12,6 +12,7 @@
+ *************************************************************************/
+ #include 	"kawin.H"
+ #include	<stdio.h>
++#include	<stdlib.h>
+ 
+ 
+ 
diff --git a/misc/xpns/files/patch-pns.c b/misc/xpns/files/patch-pns.c
new file mode 100644
index 000000000000..1db8d7c4f345
--- /dev/null
+++ b/misc/xpns/files/patch-pns.c
@@ -0,0 +1,11 @@
+--- pns.c.orig
++++ pns.c
+@@ -39,7 +39,7 @@
+ extern Widget HaKonBox;
+ extern Widget HaKonMenuLabel;
+ 
+-main( argc, argv)
++int main( argc, argv)
+   int 	argc;
+   char 	**argv;
+ {
diff --git a/misc/xpns/files/patch-scandir.c b/misc/xpns/files/patch-scandir.c
new file mode 100644
index 000000000000..d136a5586736
--- /dev/null
+++ b/misc/xpns/files/patch-scandir.c
@@ -0,0 +1,11 @@
+--- scandir.c.orig
++++ scandir.c
+@@ -12,6 +12,8 @@
+ **									
+ *************************************************************************/
+ #include	<stdio.h>
++#include	<ctype.h>
++#include	<stdlib.h>
+ #include	"dir.H"
+ #include	"misc.h"
+ 
diff --git a/misc/xpns/files/patch-setpath.c b/misc/xpns/files/patch-setpath.c
new file mode 100644
index 000000000000..49a1ffc97afa
--- /dev/null
+++ b/misc/xpns/files/patch-setpath.c
@@ -0,0 +1,11 @@
+--- setpath.c.orig
++++ setpath.c
+@@ -15,6 +15,8 @@
+ #include	"dir.H"
+ #include	"misc.h"
+ 
++#include <string.h>
++
+ 
+ BOOLEAN SetPath( DirInh, Pfad)
+   DIRECTORY 	*DirInh;
diff --git a/misc/xpns/files/patch-simbreak.c b/misc/xpns/files/patch-simbreak.c
new file mode 100644
index 000000000000..daa7e6c959e9
--- /dev/null
+++ b/misc/xpns/files/patch-simbreak.c
@@ -0,0 +1,11 @@
+--- simbreak.c.orig
++++ simbreak.c
+@@ -15,6 +15,8 @@
+ #include	"celltype.h"
+ #include	"misc.h"
+ 
++#include <stdlib.h>
++
+ 
+ /*************************************************************************
+ ** FUNKTION:	SimBreakInit
diff --git a/misc/xpns/files/patch-simget.c b/misc/xpns/files/patch-simget.c
new file mode 100644
index 000000000000..62d02447d0b7
--- /dev/null
+++ b/misc/xpns/files/patch-simget.c
@@ -0,0 +1,22 @@
+--- simget.c.orig
++++ simget.c
+@@ -19,8 +19,9 @@
+ 
+ #include <stdio.h>
+ 
+-
+-#define RAND_MAX  ((1<<31)-1)
++#ifndef RAND_MAX
++#define RAND_MAX  ((1UL<<31)-1)
++#endif
+ 
+ 
+ /*************************************************************************
+@@ -32,6 +33,7 @@ void SimGetInit()
+   unsigned int e;
+   
+   srand( 17);
++  srandom( 17);
+ }
+ 
+ 
diff --git a/misc/xpns/files/patch-steio.c b/misc/xpns/files/patch-steio.c
new file mode 100644
index 000000000000..88d540a05b4e
--- /dev/null
+++ b/misc/xpns/files/patch-steio.c
@@ -0,0 +1,10 @@
+--- steio.c.orig
++++ steio.c
+@@ -15,6 +15,7 @@
+ #include	"celltype.h"
+ #include	"netsize.h"
+ #include	<stdio.h>
++#include	<stdlib.h>
+ 
+ 
+ #define DEFAULT_STEN_X_DISP	-HA_STE_RAD
diff --git a/misc/xpns/files/patch-traio.c b/misc/xpns/files/patch-traio.c
new file mode 100644
index 000000000000..574b4c3ea8a6
--- /dev/null
+++ b/misc/xpns/files/patch-traio.c
@@ -0,0 +1,10 @@
+--- traio.c.orig
++++ traio.c
+@@ -15,6 +15,7 @@
+ #include 	"celltype.h"
+ #include	"netsize.h"
+ #include	<stdio.h>
++#include	<stdlib.h>
+ 
+ 
+ #define DEFAULT_TRAN_X_DISP	-HA_STE_RAD
diff --git a/misc/xpns/pkg-plist b/misc/xpns/pkg-plist
deleted file mode 100644
index d3454b26dac2..000000000000
--- a/misc/xpns/pkg-plist
+++ /dev/null
@@ -1,15 +0,0 @@
-bin/xpns
-libexec/xpns/pns
-share/xpns/pns.hlp
-share/xpns/pns.shell
-%%PORTDOCS%%share/doc/xpns/a.net
-%%PORTDOCS%%share/doc/xpns/a1.net
-%%PORTDOCS%%share/doc/xpns/add.net
-%%PORTDOCS%%share/doc/xpns/mult.net
-%%PORTDOCS%%share/doc/xpns/phil.net
-%%PORTDOCS%%share/doc/xpns/rw.net
-%%PORTDOCS%%share/doc/xpns/sub.net
-%%PORTDOCS%%share/doc/xpns/sub2.net
-@dirrm share/xpns
-%%PORTDOCS%%@dirrm share/doc/xpns
-@dirrm libexec/xpns