26 files changed, 46 insertions, 88 deletions

diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile
index e51dcaa91299..f7b9df70fdb2 100644
--- a/net-mgmt/nagios-plugins/Makefile
+++ b/net-mgmt/nagios-plugins/Makefile
@@ -32,5 +32,5 @@ pre-fetch:
 
 post-clean:
 	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-	
+
 .include <bsd.port.mk>
diff --git a/net-mgmt/nagios-plugins/scripts/configure b/net-mgmt/nagios-plugins/scripts/configure
index 1a71b7ed8ec9..1a17d8fb4392 100644
--- a/net-mgmt/nagios-plugins/scripts/configure
+++ b/net-mgmt/nagios-plugins/scripts/configure
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $FreeBSD$
 
-if [ -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc ]; then
+if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
 fi
 
@@ -39,7 +39,7 @@ OpenLDAP	"OpenLDAP support" OFF \
 	esac
 fi
 
-exec > ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 
 SUB_QSTAT="@comment "
 SUB_FPING="@comment "
@@ -91,7 +91,7 @@ while [ "$1" ]; do
 			;;
 		*)
 			echo "Invalid option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			exit 1
 			;;
 	esac
diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index a93519dd68ae..a88506ecef76 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -6,13 +6,11 @@
 #
 
 PORTNAME=	netsaint
-PORTVERSION=	0.0.7b6
-PORTREVISION=	1
+PORTVERSION=	0.0.7b8
 CATEGORIES=	net
 MASTER_SITES=	http://netsaint.sourceforge.net/download/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=dwcjr
-
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} netsaint-graphics.tar.gz
 
 MAINTAINER=	blaz@si.FreeBSD.org
@@ -45,14 +43,9 @@ pre-install:
 
 BSDIMAGES=	bsd_logofullsize.gif bsd_sblogo.gif
 
-post-patch:
-	cd ${WRKSRC} && tar zxf ${DISTDIR}/netsaint-graphics.tar.gz
-
-
 post-install:
 .for i in ${BSDIMAGES}
-	${INSTALL_DATA} ${WRKSRC}/html/images/$i ${PREFIX}/share/${PORTNAME}/images/
+	${INSTALL_DATA} ${WRKDIR}/netsaint-0.0.7b6/html/images/$i ${PREFIX}/share/${PORTNAME}/images/
 .endfor
 
-
 .include <bsd.port.mk>
diff --git a/net-mgmt/nagios/distinfo b/net-mgmt/nagios/distinfo
index e40fd57f46c9..505a7d83931a 100644
--- a/net-mgmt/nagios/distinfo
+++ b/net-mgmt/nagios/distinfo
@@ -1,2 +1,2 @@
-MD5 (netsaint-0.0.7b6.tar.gz) = ff03fc4d440e4d368b87fe51aae75701
+MD5 (netsaint-0.0.7b8.tar.gz) = 0a7045e5f07242a8fb1c80729c2c745d
 MD5 (netsaint-graphics.tar.gz) = d959b80cccdee3ff22f4025c6f2446c4
diff --git a/net-mgmt/nagios/pkg-plist b/net-mgmt/nagios/pkg-plist
index ad222cae64b9..9b0efc925dc7 100644
--- a/net-mgmt/nagios/pkg-plist
+++ b/net-mgmt/nagios/pkg-plist
@@ -40,6 +40,7 @@ share/netsaint/docs/developer/xrd.html
 share/netsaint/docs/developer/xsd.html
 share/netsaint/docs/distributed.html
 share/netsaint/docs/downtime.html
+share/netsaint/docs/embeddedperl.html
 share/netsaint/docs/escalations.html
 share/netsaint/docs/eventhandlers.html
 share/netsaint/docs/extcommands.html
@@ -95,7 +96,6 @@ share/netsaint/docs/makehtml.html
 share/netsaint/docs/networkoutages.html
 share/netsaint/docs/networkreachability.html
 share/netsaint/docs/notifications.html
-share/netsaint/docs/oldplugins.html
 share/netsaint/docs/parallelization.html
 share/netsaint/docs/passivechecks.html
 share/netsaint/docs/perfdata.html
@@ -120,7 +120,7 @@ share/netsaint/docs/xdata-db.html
 share/netsaint/images/ack.gif
 share/netsaint/images/active.gif
 share/netsaint/images/bsd_logofullsize.gif
-share/netsaint/images/bsd_sblogo.gif 
+share/netsaint/images/bsd_sblogo.gif
 share/netsaint/images/command.gif
 share/netsaint/images/comment.gif
 share/netsaint/images/config.gif
diff --git a/net-mgmt/nagios12/Makefile b/net-mgmt/nagios12/Makefile
index a93519dd68ae..a88506ecef76 100644
--- a/net-mgmt/nagios12/Makefile
+++ b/net-mgmt/nagios12/Makefile
@@ -6,13 +6,11 @@
 #
 
 PORTNAME=	netsaint
-PORTVERSION=	0.0.7b6
-PORTREVISION=	1
+PORTVERSION=	0.0.7b8
 CATEGORIES=	net
 MASTER_SITES=	http://netsaint.sourceforge.net/download/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=dwcjr
-
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} netsaint-graphics.tar.gz
 
 MAINTAINER=	blaz@si.FreeBSD.org
@@ -45,14 +43,9 @@ pre-install:
 
 BSDIMAGES=	bsd_logofullsize.gif bsd_sblogo.gif
 
-post-patch:
-	cd ${WRKSRC} && tar zxf ${DISTDIR}/netsaint-graphics.tar.gz
-
-
 post-install:
 .for i in ${BSDIMAGES}
-	${INSTALL_DATA} ${WRKSRC}/html/images/$i ${PREFIX}/share/${PORTNAME}/images/
+	${INSTALL_DATA} ${WRKDIR}/netsaint-0.0.7b6/html/images/$i ${PREFIX}/share/${PORTNAME}/images/
 .endfor
 
-
 .include <bsd.port.mk>
diff --git a/net-mgmt/nagios12/distinfo b/net-mgmt/nagios12/distinfo
index e40fd57f46c9..505a7d83931a 100644
--- a/net-mgmt/nagios12/distinfo
+++ b/net-mgmt/nagios12/distinfo
@@ -1,2 +1,2 @@
-MD5 (netsaint-0.0.7b6.tar.gz) = ff03fc4d440e4d368b87fe51aae75701
+MD5 (netsaint-0.0.7b8.tar.gz) = 0a7045e5f07242a8fb1c80729c2c745d
 MD5 (netsaint-graphics.tar.gz) = d959b80cccdee3ff22f4025c6f2446c4
diff --git a/net-mgmt/nagios12/pkg-plist b/net-mgmt/nagios12/pkg-plist
index ad222cae64b9..9b0efc925dc7 100644
--- a/net-mgmt/nagios12/pkg-plist
+++ b/net-mgmt/nagios12/pkg-plist
@@ -40,6 +40,7 @@ share/netsaint/docs/developer/xrd.html
 share/netsaint/docs/developer/xsd.html
 share/netsaint/docs/distributed.html
 share/netsaint/docs/downtime.html
+share/netsaint/docs/embeddedperl.html
 share/netsaint/docs/escalations.html
 share/netsaint/docs/eventhandlers.html
 share/netsaint/docs/extcommands.html
@@ -95,7 +96,6 @@ share/netsaint/docs/makehtml.html
 share/netsaint/docs/networkoutages.html
 share/netsaint/docs/networkreachability.html
 share/netsaint/docs/notifications.html
-share/netsaint/docs/oldplugins.html
 share/netsaint/docs/parallelization.html
 share/netsaint/docs/passivechecks.html
 share/netsaint/docs/perfdata.html
@@ -120,7 +120,7 @@ share/netsaint/docs/xdata-db.html
 share/netsaint/images/ack.gif
 share/netsaint/images/active.gif
 share/netsaint/images/bsd_logofullsize.gif
-share/netsaint/images/bsd_sblogo.gif 
+share/netsaint/images/bsd_sblogo.gif
 share/netsaint/images/command.gif
 share/netsaint/images/comment.gif
 share/netsaint/images/config.gif
diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile
index a93519dd68ae..a88506ecef76 100644
--- a/net-mgmt/nagios2/Makefile
+++ b/net-mgmt/nagios2/Makefile
@@ -6,13 +6,11 @@
 #
 
 PORTNAME=	netsaint
-PORTVERSION=	0.0.7b6
-PORTREVISION=	1
+PORTVERSION=	0.0.7b8
 CATEGORIES=	net
 MASTER_SITES=	http://netsaint.sourceforge.net/download/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=dwcjr
-
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} netsaint-graphics.tar.gz
 
 MAINTAINER=	blaz@si.FreeBSD.org
@@ -45,14 +43,9 @@ pre-install:
 
 BSDIMAGES=	bsd_logofullsize.gif bsd_sblogo.gif
 
-post-patch:
-	cd ${WRKSRC} && tar zxf ${DISTDIR}/netsaint-graphics.tar.gz
-
-
 post-install:
 .for i in ${BSDIMAGES}
-	${INSTALL_DATA} ${WRKSRC}/html/images/$i ${PREFIX}/share/${PORTNAME}/images/
+	${INSTALL_DATA} ${WRKDIR}/netsaint-0.0.7b6/html/images/$i ${PREFIX}/share/${PORTNAME}/images/
 .endfor
 
-
 .include <bsd.port.mk>
diff --git a/net-mgmt/nagios2/distinfo b/net-mgmt/nagios2/distinfo
index e40fd57f46c9..505a7d83931a 100644
--- a/net-mgmt/nagios2/distinfo
+++ b/net-mgmt/nagios2/distinfo
@@ -1,2 +1,2 @@
-MD5 (netsaint-0.0.7b6.tar.gz) = ff03fc4d440e4d368b87fe51aae75701
+MD5 (netsaint-0.0.7b8.tar.gz) = 0a7045e5f07242a8fb1c80729c2c745d
 MD5 (netsaint-graphics.tar.gz) = d959b80cccdee3ff22f4025c6f2446c4
diff --git a/net-mgmt/nagios2/pkg-plist b/net-mgmt/nagios2/pkg-plist
index ad222cae64b9..9b0efc925dc7 100644
--- a/net-mgmt/nagios2/pkg-plist
+++ b/net-mgmt/nagios2/pkg-plist
@@ -40,6 +40,7 @@ share/netsaint/docs/developer/xrd.html
 share/netsaint/docs/developer/xsd.html
 share/netsaint/docs/distributed.html
 share/netsaint/docs/downtime.html
+share/netsaint/docs/embeddedperl.html
 share/netsaint/docs/escalations.html
 share/netsaint/docs/eventhandlers.html
 share/netsaint/docs/extcommands.html
@@ -95,7 +96,6 @@ share/netsaint/docs/makehtml.html
 share/netsaint/docs/networkoutages.html
 share/netsaint/docs/networkreachability.html
 share/netsaint/docs/notifications.html
-share/netsaint/docs/oldplugins.html
 share/netsaint/docs/parallelization.html
 share/netsaint/docs/passivechecks.html
 share/netsaint/docs/perfdata.html
@@ -120,7 +120,7 @@ share/netsaint/docs/xdata-db.html
 share/netsaint/images/ack.gif
 share/netsaint/images/active.gif
 share/netsaint/images/bsd_logofullsize.gif
-share/netsaint/images/bsd_sblogo.gif 
+share/netsaint/images/bsd_sblogo.gif
 share/netsaint/images/command.gif
 share/netsaint/images/comment.gif
 share/netsaint/images/config.gif
diff --git a/net-mgmt/netsaint-plugins/Makefile b/net-mgmt/netsaint-plugins/Makefile
index e51dcaa91299..f7b9df70fdb2 100644
--- a/net-mgmt/netsaint-plugins/Makefile
+++ b/net-mgmt/netsaint-plugins/Makefile
@@ -32,5 +32,5 @@ pre-fetch:
 
 post-clean:
 	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-	
+
 .include <bsd.port.mk>
diff --git a/net-mgmt/netsaint-plugins/scripts/configure b/net-mgmt/netsaint-plugins/scripts/configure
index 1a71b7ed8ec9..1a17d8fb4392 100644
--- a/net-mgmt/netsaint-plugins/scripts/configure
+++ b/net-mgmt/netsaint-plugins/scripts/configure
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $FreeBSD$
 
-if [ -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc ]; then
+if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
 fi
 
@@ -39,7 +39,7 @@ OpenLDAP	"OpenLDAP support" OFF \
 	esac
 fi
 
-exec > ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 
 SUB_QSTAT="@comment "
 SUB_FPING="@comment "
@@ -91,7 +91,7 @@ while [ "$1" ]; do
 			;;
 		*)
 			echo "Invalid option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			exit 1
 			;;
 	esac
diff --git a/net-mgmt/netsaint/Makefile b/net-mgmt/netsaint/Makefile
index a93519dd68ae..a88506ecef76 100644
--- a/net-mgmt/netsaint/Makefile
+++ b/net-mgmt/netsaint/Makefile
@@ -6,13 +6,11 @@
 #
 
 PORTNAME=	netsaint
-PORTVERSION=	0.0.7b6
-PORTREVISION=	1
+PORTVERSION=	0.0.7b8
 CATEGORIES=	net
 MASTER_SITES=	http://netsaint.sourceforge.net/download/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=dwcjr
-
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} netsaint-graphics.tar.gz
 
 MAINTAINER=	blaz@si.FreeBSD.org
@@ -45,14 +43,9 @@ pre-install:
 
 BSDIMAGES=	bsd_logofullsize.gif bsd_sblogo.gif
 
-post-patch:
-	cd ${WRKSRC} && tar zxf ${DISTDIR}/netsaint-graphics.tar.gz
-
-
 post-install:
 .for i in ${BSDIMAGES}
-	${INSTALL_DATA} ${WRKSRC}/html/images/$i ${PREFIX}/share/${PORTNAME}/images/
+	${INSTALL_DATA} ${WRKDIR}/netsaint-0.0.7b6/html/images/$i ${PREFIX}/share/${PORTNAME}/images/
 .endfor
 
-
 .include <bsd.port.mk>
diff --git a/net-mgmt/netsaint/distinfo b/net-mgmt/netsaint/distinfo
index e40fd57f46c9..505a7d83931a 100644
--- a/net-mgmt/netsaint/distinfo
+++ b/net-mgmt/netsaint/distinfo
@@ -1,2 +1,2 @@
-MD5 (netsaint-0.0.7b6.tar.gz) = ff03fc4d440e4d368b87fe51aae75701
+MD5 (netsaint-0.0.7b8.tar.gz) = 0a7045e5f07242a8fb1c80729c2c745d
 MD5 (netsaint-graphics.tar.gz) = d959b80cccdee3ff22f4025c6f2446c4
diff --git a/net-mgmt/netsaint/pkg-plist b/net-mgmt/netsaint/pkg-plist
index ad222cae64b9..9b0efc925dc7 100644
--- a/net-mgmt/netsaint/pkg-plist
+++ b/net-mgmt/netsaint/pkg-plist
@@ -40,6 +40,7 @@ share/netsaint/docs/developer/xrd.html
 share/netsaint/docs/developer/xsd.html
 share/netsaint/docs/distributed.html
 share/netsaint/docs/downtime.html
+share/netsaint/docs/embeddedperl.html
 share/netsaint/docs/escalations.html
 share/netsaint/docs/eventhandlers.html
 share/netsaint/docs/extcommands.html
@@ -95,7 +96,6 @@ share/netsaint/docs/makehtml.html
 share/netsaint/docs/networkoutages.html
 share/netsaint/docs/networkreachability.html
 share/netsaint/docs/notifications.html
-share/netsaint/docs/oldplugins.html
 share/netsaint/docs/parallelization.html
 share/netsaint/docs/passivechecks.html
 share/netsaint/docs/perfdata.html
@@ -120,7 +120,7 @@ share/netsaint/docs/xdata-db.html
 share/netsaint/images/ack.gif
 share/netsaint/images/active.gif
 share/netsaint/images/bsd_logofullsize.gif
-share/netsaint/images/bsd_sblogo.gif 
+share/netsaint/images/bsd_sblogo.gif
 share/netsaint/images/command.gif
 share/netsaint/images/comment.gif
 share/netsaint/images/config.gif
diff --git a/net/nagios-plugins/Makefile b/net/nagios-plugins/Makefile
index e51dcaa91299..f7b9df70fdb2 100644
--- a/net/nagios-plugins/Makefile
+++ b/net/nagios-plugins/Makefile
@@ -32,5 +32,5 @@ pre-fetch:
 
 post-clean:
 	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-	
+
 .include <bsd.port.mk>
diff --git a/net/nagios-plugins/scripts/configure b/net/nagios-plugins/scripts/configure
index 1a71b7ed8ec9..1a17d8fb4392 100644
--- a/net/nagios-plugins/scripts/configure
+++ b/net/nagios-plugins/scripts/configure
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $FreeBSD$
 
-if [ -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc ]; then
+if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
 fi
 
@@ -39,7 +39,7 @@ OpenLDAP	"OpenLDAP support" OFF \
 	esac
 fi
 
-exec > ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 
 SUB_QSTAT="@comment "
 SUB_FPING="@comment "
@@ -91,7 +91,7 @@ while [ "$1" ]; do
 			;;
 		*)
 			echo "Invalid option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			exit 1
 			;;
 	esac
diff --git a/net/nagios/Makefile b/net/nagios/Makefile
index a93519dd68ae..a88506ecef76 100644
--- a/net/nagios/Makefile
+++ b/net/nagios/Makefile
@@ -6,13 +6,11 @@
 #
 
 PORTNAME=	netsaint
-PORTVERSION=	0.0.7b6
-PORTREVISION=	1
+PORTVERSION=	0.0.7b8
 CATEGORIES=	net
 MASTER_SITES=	http://netsaint.sourceforge.net/download/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=dwcjr
-
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} netsaint-graphics.tar.gz
 
 MAINTAINER=	blaz@si.FreeBSD.org
@@ -45,14 +43,9 @@ pre-install:
 
 BSDIMAGES=	bsd_logofullsize.gif bsd_sblogo.gif
 
-post-patch:
-	cd ${WRKSRC} && tar zxf ${DISTDIR}/netsaint-graphics.tar.gz
-
-
 post-install:
 .for i in ${BSDIMAGES}
-	${INSTALL_DATA} ${WRKSRC}/html/images/$i ${PREFIX}/share/${PORTNAME}/images/
+	${INSTALL_DATA} ${WRKDIR}/netsaint-0.0.7b6/html/images/$i ${PREFIX}/share/${PORTNAME}/images/
 .endfor
 
-
 .include <bsd.port.mk>
diff --git a/net/nagios/distinfo b/net/nagios/distinfo
index e40fd57f46c9..505a7d83931a 100644
--- a/net/nagios/distinfo
+++ b/net/nagios/distinfo
@@ -1,2 +1,2 @@
-MD5 (netsaint-0.0.7b6.tar.gz) = ff03fc4d440e4d368b87fe51aae75701
+MD5 (netsaint-0.0.7b8.tar.gz) = 0a7045e5f07242a8fb1c80729c2c745d
 MD5 (netsaint-graphics.tar.gz) = d959b80cccdee3ff22f4025c6f2446c4
diff --git a/net/nagios/pkg-plist b/net/nagios/pkg-plist
index ad222cae64b9..9b0efc925dc7 100644
--- a/net/nagios/pkg-plist
+++ b/net/nagios/pkg-plist
@@ -40,6 +40,7 @@ share/netsaint/docs/developer/xrd.html
 share/netsaint/docs/developer/xsd.html
 share/netsaint/docs/distributed.html
 share/netsaint/docs/downtime.html
+share/netsaint/docs/embeddedperl.html
 share/netsaint/docs/escalations.html
 share/netsaint/docs/eventhandlers.html
 share/netsaint/docs/extcommands.html
@@ -95,7 +96,6 @@ share/netsaint/docs/makehtml.html
 share/netsaint/docs/networkoutages.html
 share/netsaint/docs/networkreachability.html
 share/netsaint/docs/notifications.html
-share/netsaint/docs/oldplugins.html
 share/netsaint/docs/parallelization.html
 share/netsaint/docs/passivechecks.html
 share/netsaint/docs/perfdata.html
@@ -120,7 +120,7 @@ share/netsaint/docs/xdata-db.html
 share/netsaint/images/ack.gif
 share/netsaint/images/active.gif
 share/netsaint/images/bsd_logofullsize.gif
-share/netsaint/images/bsd_sblogo.gif 
+share/netsaint/images/bsd_sblogo.gif
 share/netsaint/images/command.gif
 share/netsaint/images/comment.gif
 share/netsaint/images/config.gif
diff --git a/net/netsaint-plugins/Makefile b/net/netsaint-plugins/Makefile
index e51dcaa91299..f7b9df70fdb2 100644
--- a/net/netsaint-plugins/Makefile
+++ b/net/netsaint-plugins/Makefile
@@ -32,5 +32,5 @@ pre-fetch:
 
 post-clean:
 	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-	
+
 .include <bsd.port.mk>
diff --git a/net/netsaint-plugins/scripts/configure b/net/netsaint-plugins/scripts/configure
index 1a71b7ed8ec9..1a17d8fb4392 100644
--- a/net/netsaint-plugins/scripts/configure
+++ b/net/netsaint-plugins/scripts/configure
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $FreeBSD$
 
-if [ -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc ]; then
+if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
 fi
 
@@ -39,7 +39,7 @@ OpenLDAP	"OpenLDAP support" OFF \
 	esac
 fi
 
-exec > ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 
 SUB_QSTAT="@comment "
 SUB_FPING="@comment "
@@ -91,7 +91,7 @@ while [ "$1" ]; do
 			;;
 		*)
 			echo "Invalid option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			exit 1
 			;;
 	esac
diff --git a/net/netsaint/Makefile b/net/netsaint/Makefile
index a93519dd68ae..a88506ecef76 100644
--- a/net/netsaint/Makefile
+++ b/net/netsaint/Makefile
@@ -6,13 +6,11 @@
 #
 
 PORTNAME=	netsaint
-PORTVERSION=	0.0.7b6
-PORTREVISION=	1
+PORTVERSION=	0.0.7b8
 CATEGORIES=	net
 MASTER_SITES=	http://netsaint.sourceforge.net/download/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=dwcjr
-
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} netsaint-graphics.tar.gz
 
 MAINTAINER=	blaz@si.FreeBSD.org
@@ -45,14 +43,9 @@ pre-install:
 
 BSDIMAGES=	bsd_logofullsize.gif bsd_sblogo.gif
 
-post-patch:
-	cd ${WRKSRC} && tar zxf ${DISTDIR}/netsaint-graphics.tar.gz
-
-
 post-install:
 .for i in ${BSDIMAGES}
-	${INSTALL_DATA} ${WRKSRC}/html/images/$i ${PREFIX}/share/${PORTNAME}/images/
+	${INSTALL_DATA} ${WRKDIR}/netsaint-0.0.7b6/html/images/$i ${PREFIX}/share/${PORTNAME}/images/
 .endfor
 
-
 .include <bsd.port.mk>
diff --git a/net/netsaint/distinfo b/net/netsaint/distinfo
index e40fd57f46c9..505a7d83931a 100644
--- a/net/netsaint/distinfo
+++ b/net/netsaint/distinfo
@@ -1,2 +1,2 @@
-MD5 (netsaint-0.0.7b6.tar.gz) = ff03fc4d440e4d368b87fe51aae75701
+MD5 (netsaint-0.0.7b8.tar.gz) = 0a7045e5f07242a8fb1c80729c2c745d
 MD5 (netsaint-graphics.tar.gz) = d959b80cccdee3ff22f4025c6f2446c4
diff --git a/net/netsaint/pkg-plist b/net/netsaint/pkg-plist
index ad222cae64b9..9b0efc925dc7 100644
--- a/net/netsaint/pkg-plist
+++ b/net/netsaint/pkg-plist
@@ -40,6 +40,7 @@ share/netsaint/docs/developer/xrd.html
 share/netsaint/docs/developer/xsd.html
 share/netsaint/docs/distributed.html
 share/netsaint/docs/downtime.html
+share/netsaint/docs/embeddedperl.html
 share/netsaint/docs/escalations.html
 share/netsaint/docs/eventhandlers.html
 share/netsaint/docs/extcommands.html
@@ -95,7 +96,6 @@ share/netsaint/docs/makehtml.html
 share/netsaint/docs/networkoutages.html
 share/netsaint/docs/networkreachability.html
 share/netsaint/docs/notifications.html
-share/netsaint/docs/oldplugins.html
 share/netsaint/docs/parallelization.html
 share/netsaint/docs/passivechecks.html
 share/netsaint/docs/perfdata.html
@@ -120,7 +120,7 @@ share/netsaint/docs/xdata-db.html
 share/netsaint/images/ack.gif
 share/netsaint/images/active.gif
 share/netsaint/images/bsd_logofullsize.gif
-share/netsaint/images/bsd_sblogo.gif 
+share/netsaint/images/bsd_sblogo.gif
 share/netsaint/images/command.gif
 share/netsaint/images/comment.gif
 share/netsaint/images/config.gif