4 files changed, 12 insertions, 40 deletions

diff --git a/sysutils/symon/Makefile b/sysutils/symon/Makefile
index 219743cfc8c6..588d72b1b6ba 100644
--- a/sysutils/symon/Makefile
+++ b/sysutils/symon/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	symon
-PORTVERSION=	2.85
-PORTREVISION=	1
+PORTVERSION=	2.86
 CATEGORIES=	sysutils
 MASTER_SITES=	http://wpd.home.xs4all.nl/symon/philes/ \
 		${MASTER_SITE_LOCAL}
@@ -18,6 +17,8 @@ USES=		perl5
 USE_PERL5=	build
 MAKE_JOBS_UNSAFE=	yes
 
+USERS=		_symon
+
 # Synonym for WITHOUT_SYMUX
 .if defined(WITHOUT_RRD)
 WITHOUT_SYMUX=	yes
@@ -34,7 +35,6 @@ IGNORE=	you have defined both WITHOUT_SYMUX or WITHOUT_RRD *and* WITHOUT_SYMON
 SUBDIR=		lib
 .if !defined(WITHOUT_SYMON)
 SUBDIR+=	symon
-MAN8+=		symon.8
 PLIST_SUB+=	SYMON=""
 USE_RC_SUBR+=	symon
 .else
@@ -42,7 +42,6 @@ PLIST_SUB+=	SYMON="@comment "
 .endif
 .if !defined(WITHOUT_SYMUX)
 SUBDIR+=	symux
-MAN8+=		symux.8
 PLIST_SUB+=	SYMUX=""
 USE_RC_SUBR+=	symux
 .else
@@ -50,23 +49,18 @@ PLIST_SUB+=	SYMUX="@comment "
 .endif
 SUBDIR+=	client
 
-MAKE_ARGS+=	SUBDIR="${SUBDIR}" RRDDIR="${LOCALBASE}"
+MAKE_ARGS+=	SUBDIR="${SUBDIR}" RRDDIR="${LOCALBASE}" \
+		SYSCONFDIR="${PREFIX}/etc" PREFIX="${STAGEDIR}/${PREFIX}"
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 post-extract:
 	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
 
-.if ${OSVERSION} < 700000
+# We need to teach symon about mbstat changes/removal in r253351 and r253361.
+.if ${OSVERSION} > 1000000
 post-patch:
-	@${REINPLACE_CMD} 's/^LIBS+=/LIBS= -pthread /' ${WRKSRC}/symux/Makefile
+	@${RM} ${WRKSRC}/platform/FreeBSD/sm_mbuf.c
 .endif
 
-pre-install:
-	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.post.mk>
diff --git a/sysutils/symon/distinfo b/sysutils/symon/distinfo
index 5fd9965bbefe..be2ba63fc6e4 100644
--- a/sysutils/symon/distinfo
+++ b/sysutils/symon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (symon-2.85.tar.gz) = 547329a1efbc2408298256d31a005db23869117ccf6249c052ef662b3ee12d35
-SIZE (symon-2.85.tar.gz) = 106011
+SHA256 (symon-2.86.tar.gz) = c36457e53e91cbb478cb57d96bf40c718a8582e0b19bd4cba247002b7a6068b3
+SIZE (symon-2.86.tar.gz) = 106791
diff --git a/sysutils/symon/pkg-install b/sysutils/symon/pkg-install
deleted file mode 100644
index 411bce8db330..000000000000
--- a/sysutils/symon/pkg-install
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/sbin
-
-USER=_symon
-GROUP=daemon
-UID=115
-
-case $2 in
-  PRE-INSTALL)
-  if pw user show "${USER}" 2>/dev/null; then
-    echo "You already have a user \"${USER}\", so I will use it."
-  else
-    if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-      -s /usr/sbin/nologin -L daemon -d /var/empty -c "Symon Account"
-    then
-      echo "Added user \"${USER}\"."
-    else
-      echo "Adding user \"${USER}\" failed..."
-      exit 1
-    fi
-  fi
-  ;;
-esac
diff --git a/sysutils/symon/pkg-plist b/sysutils/symon/pkg-plist
index 6adf8adbcd03..8170889274f9 100644
--- a/sysutils/symon/pkg-plist
+++ b/sysutils/symon/pkg-plist
@@ -1,5 +1,7 @@
 %%SYMON%%bin/symon
+%%SYMON%%man/man8/symon.8.gz
 %%SYMUX%%bin/symux
+%%SYMUX%%man/man8/symux.8.gz
 %%SYMON%%%%EXAMPLESDIR%%/symon.conf
 %%SYMUX%%%%EXAMPLESDIR%%/symux.conf
 %%SYMON%%%%DATADIR%%/c_config.sh