Index: hared/Makefile
===================================================================
--- hared/Makefile
+++ hared/Makefile
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	hared
-DISTVERSION=	1.0-41
-PORTREVISION=	1
-DISTVERSIONSUFFIX=	-ge17cdc6
+DISTVERSION=	1.0-45
+DISTVERSIONSUFFIX=	-g8341d8a
 CATEGORIES=	sysutils
 
 MAINTAINER=	0mp@FreeBSD.org
@@ -23,6 +22,8 @@
 		golang:net:9dfe398:net/src/golang.org/x/net \
 		gorilla:websocket:7a8dacf:websocket/src/github.com/gorilla/websocket
 
+CONFLICTS_INSTALL=	sysutils/py-hared
+
 OPTIONS_DEFINE=	DOCS
 
 ETCDIR=		${PREFIX}/etc
@@ -34,8 +35,7 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${GO_WRKSRC}/${GO_PKGNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/daemon/hared.ini.example \
-		${STAGEDIR}${ETCDIR}/hared.ini.sample
+	${INSTALL_DATA} ${WRKSRC}/daemon/hared.ini.sample ${STAGEDIR}${ETCDIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
Index: hared/distinfo
===================================================================
--- hared/distinfo
+++ hared/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1522849010
-SHA256 (jpmens-hared-hare-1.0-41-ge17cdc6_GH0.tar.gz) = f16038eaf12d7060462f36af60017141be748f5f9be0ebcd064fb39004156179
-SIZE (jpmens-hared-hare-1.0-41-ge17cdc6_GH0.tar.gz) = 16023
+TIMESTAMP = 1523833144
+SHA256 (jpmens-hared-hare-1.0-45-g8341d8a_GH0.tar.gz) = 2db2b095668426752cd8129ddbd0586188dbad171f64638248c6f6f6e5477b20
+SIZE (jpmens-hared-hare-1.0-45-g8341d8a_GH0.tar.gz) = 16042
 SHA256 (go-gcfg-gcfg-f02745a_GH0.tar.gz) = cd1eb3b45b0cc06da82118bcd5cb15fa9f65b4ccb39d67050b666028f8bb9233
 SIZE (go-gcfg-gcfg-f02745a_GH0.tar.gz) = 28580
 SHA256 (go-warnings-warnings-27b9fab_GH0.tar.gz) = 1db6ca861b2f9f3a53e3dff65d6c2d1b675f2fc7c81dc4f5672e1aaf79b9fe7b
Index: py-hared/Makefile
===================================================================
--- py-hared/Makefile
+++ py-hared/Makefile
@@ -2,16 +2,18 @@
 
 PORTNAME=	hared
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dvl@FreeBSD.org
-COMMENT=	Small Python server for inserting notications into mtqq
+COMMENT=	Small Python server for inserting notications into MTQQ
 
 LICENSE=	MIT
 
+CONFLICTS_INSTALL=	sysutils/hared
+
 USES=		python
 USE_PYTHON=	distutils autoplist
 
@@ -19,8 +21,6 @@
 
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}paho-mqtt>0:net/py-paho-mqtt@${PY_FLAVOR}
 
-PLIST_FILES+=	"@sample %%ETCDIR%%/hared.ini.sample"
-
 pre-install:
 	${INSTALL_DATA} ${FILESDIR}/hared.conf ${STAGEDIR}${ETCDIR}/hared.ini.sample
 
Index: py-hared/pkg-descr
===================================================================
--- py-hared/pkg-descr
+++ py-hared/pkg-descr
@@ -1,7 +1,7 @@
-Small Python server for receiving notications and tossing them into mtqq.
+Small Python server for receiving notifications and tossing them into MTQQ.
 
 This will form part of a centralized message distribution system.
 
-A client for this server is sysutils/hare
+A client for this server is sysutils/hare.
 
 WWW: https://github.com/jpmens/hared-hare
Index: py-hared/pkg-plist
===================================================================
--- /dev/null
+++ py-hared/pkg-plist
@@ -0,0 +1,3 @@
+@mode 640
+@sample %%ETCDIR%%/hared.ini.sample
+@mode