6 files changed, 27 insertions, 43 deletions
diff --git a/sysutils/sanoid-devel/Makefile b/sysutils/sanoid-devel/Makefile
index edd8d0536571..302f85ff05e4 100644
--- a/sysutils/sanoid-devel/Makefile
+++ b/sysutils/sanoid-devel/Makefile
@@ -1,9 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	sanoid
-PORTVERSION=1.0.0.20190619
+PORTVERSION=	1.0.0.20190619
+PORTREVISION=	1
 CATEGORIES=	sysutils
-PKGNAMESUFFIX=-devel
+PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	hartzell@alerce.com
 COMMENT=	Policy-driven snapshot management and replication tools
@@ -21,12 +22,14 @@ USES=		shebangfix perl5
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jimsalterjrs
-GH_PROJECT=sanoid
-GH_TAGNAME=a90eec3
+GH_TAGNAME=	a90eec3
 
 USE_PERL5=	run
 SHEBANG_FILES=	findoid sanoid sleepymutex syncoid
 
+NO_BUILD=	yes
+NO_ARCH=	yes
+
 # line 19:  my %args = ("configdir" => "/etc/sanoid");
 post-patch:
 	@${REINPLACE_CMD} -i '' -e 's|/etc/sanoid|${PREFIX}/etc/sanoid|' \
@@ -35,8 +38,6 @@ post-patch:
 		-e 's|:/bin:/usr/bin:/sbin|:${PREFIX}/bin:/bin:/usr/bin:/sbin|' \
 		${WRKSRC}/syncoid
 
-do-build:
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/findoid ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/sanoid ${STAGEDIR}${PREFIX}/bin
diff --git a/sysutils/sanoid-devel/pkg-descr b/sysutils/sanoid-devel/pkg-descr
index f080c3904a13..eb26da8c7d35 100644
--- a/sysutils/sanoid-devel/pkg-descr
+++ b/sysutils/sanoid-devel/pkg-descr
@@ -2,3 +2,5 @@ Sanoid is a policy-driven snapshot management tool for ZFS
 filesystems.  More prosaically, you can use Sanoid to create,
 automatically thin, and monitor snapshots and pool health from a
 single eminently human-readable TOML config file.
+
+WWW: https://github.com/jimsalterjrs/sanoid
diff --git a/sysutils/sanoid-devel/pkg-message b/sysutils/sanoid-devel/pkg-message
index 2f9a71171ce7..5cd683df484c 100644
--- a/sysutils/sanoid-devel/pkg-message
+++ b/sysutils/sanoid-devel/pkg-message
@@ -1,28 +1,16 @@
 [
 {
+  type: install
   message: <<EOD
-***************************************************************************
 
- Sanoid requires additional configuration in the ${PREFIX}/etc/sanoid.conf 
+ Sanoid requires additional configuration in the ${PREFIX}/etc/sanoid/sanoid.conf 
  file.
 
- A sample has been installed in ${PREFIX}/etc/sanoid.conf.sample and
+ A sample has been installed in ${PREFIX}/etc/sanoid/sanoid.conf.sample and
  additional documentation can be found at the sanoid master site:
  
    https://github.com/jimsalterjrs/sanoid
 
-***************************************************************************
 EOD
 }
-{
-  message: <<EOD
-***************************************************************************
-
- If you have created a local configuration file,
- ${PREFIX}/etc/sanoid.conf, you will need to remove it separately.
-
-***************************************************************************
-EOD
-  type: remove
-}
 ]
diff --git a/sysutils/sanoid/Makefile b/sysutils/sanoid/Makefile
index 043481b973d7..135b31ec5977 100644
--- a/sysutils/sanoid/Makefile
+++ b/sysutils/sanoid/Makefile
@@ -1,7 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	sanoid
-DISTVERSION=	v2.0.1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	hartzell@alerce.com
@@ -24,19 +26,20 @@ GH_ACCOUNT=	jimsalterjrs
 USE_PERL5=	run
 SHEBANG_FILES=	findoid sanoid sleepymutex syncoid
 
+NO_BUILD=	yes
+NO_ARCH=	yes
+
 # line 19:  my %args = ("configdir" => "/etc/sanoid");
 post-patch:
 	@${REINPLACE_CMD} -i '' -e 's|/etc/sanoid|${PREFIX}/etc/sanoid|' \
 		${WRKSRC}/sanoid
 	@${REINPLACE_CMD} -i '' \
-		-e 's|/usr/bin/lzop|${PREFIX}/bin/lzop|' \
-		-e 's|/usr/bin/mbuffer|${PREFIX}/bin/mbuffer|' \
-		-e 's|/usr/bin/pv|${PREFIX}/bin/pv|' \
-		-e 's|/usr/bin/sudo|${PREFIX}/bin/sudo|' \
+		-e 's|/usr/bin/lzop|${LOCALBASE}/bin/lzop|' \
+		-e 's|/usr/bin/mbuffer|${LOCALBASE}/bin/mbuffer|' \
+		-e 's|/usr/bin/pv|${LOCALBASE}/bin/pv|' \
+		-e 's|/usr/bin/sudo|${LOCALBASE}/bin/sudo|' \
 		${WRKSRC}/syncoid
 
-do-build:
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/findoid ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/sanoid ${STAGEDIR}${PREFIX}/bin
diff --git a/sysutils/sanoid/pkg-descr b/sysutils/sanoid/pkg-descr
index f080c3904a13..eb26da8c7d35 100644
--- a/sysutils/sanoid/pkg-descr
+++ b/sysutils/sanoid/pkg-descr
@@ -2,3 +2,5 @@ Sanoid is a policy-driven snapshot management tool for ZFS
 filesystems.  More prosaically, you can use Sanoid to create,
 automatically thin, and monitor snapshots and pool health from a
 single eminently human-readable TOML config file.
+
+WWW: https://github.com/jimsalterjrs/sanoid
diff --git a/sysutils/sanoid/pkg-message b/sysutils/sanoid/pkg-message
index 2f9a71171ce7..5cd683df484c 100644
--- a/sysutils/sanoid/pkg-message
+++ b/sysutils/sanoid/pkg-message
@@ -1,28 +1,16 @@
 [
 {
+  type: install
   message: <<EOD
-***************************************************************************
 
- Sanoid requires additional configuration in the ${PREFIX}/etc/sanoid.conf 
+ Sanoid requires additional configuration in the ${PREFIX}/etc/sanoid/sanoid.conf 
  file.
 
- A sample has been installed in ${PREFIX}/etc/sanoid.conf.sample and
+ A sample has been installed in ${PREFIX}/etc/sanoid/sanoid.conf.sample and
  additional documentation can be found at the sanoid master site:
  
    https://github.com/jimsalterjrs/sanoid
 
-***************************************************************************
 EOD
 }
-{
-  message: <<EOD
-***************************************************************************
-
- If you have created a local configuration file,
- ${PREFIX}/etc/sanoid.conf, you will need to remove it separately.
-
-***************************************************************************
-EOD
-  type: remove
-}
 ]