aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authorMateusz Piotrowski <0mp@FreeBSD.org>2020-11-13 23:52:53 +0800
committerMateusz Piotrowski <0mp@FreeBSD.org>2020-11-13 23:52:53 +0800
commit12d9c5aae5c3609b20cbb2581ae3dc10fe38f5d0 (patch)
treef63dccc0c1f6d555e2504b2afbaafc3162943389 /sysutils
parent6ff70940c5bf62a9bb487dc41020084fc0f02389 (diff)
downloadfreebsd-ports-gnome-12d9c5aae5c3609b20cbb2581ae3dc10fe38f5d0.tar.gz
freebsd-ports-gnome-12d9c5aae5c3609b20cbb2581ae3dc10fe38f5d0.tar.zst
freebsd-ports-gnome-12d9c5aae5c3609b20cbb2581ae3dc10fe38f5d0.zip
Fix CONFLICTS for sysutils/*hared ports
While here, improve COMMENT in sysutils/py-hared. Reported by: http://pkgtool.osorio.me/0mp@FreeBSD.org.html
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/hared/Makefile2
-rw-r--r--sysutils/py-hared/Makefile4
2 files changed, 4 insertions, 2 deletions
diff --git a/sysutils/hared/Makefile b/sysutils/hared/Makefile
index 3531299a6c21..5bbec5249266 100644
--- a/sysutils/hared/Makefile
+++ b/sysutils/hared/Makefile
@@ -25,7 +25,7 @@ GH_TUPLE= go-gcfg:gcfg:f02745a:gcfg/vendor/gopkg.in/gcfg.v1 \
GO_TARGET= ./daemon:${PORTNAME}
-CONFLICTS_INSTALL= sysutils/py-hared
+CONFLICTS_INSTALL= py-${PORTNAME}
OPTIONS_DEFINE= DOCS
diff --git a/sysutils/py-hared/Makefile b/sysutils/py-hared/Makefile
index 094a8086a571..bcf4b380be3c 100644
--- a/sysutils/py-hared/Makefile
+++ b/sysutils/py-hared/Makefile
@@ -8,7 +8,7 @@ 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 MQTT
LICENSE= MIT
@@ -19,6 +19,8 @@ ETCDIR= ${PREFIX}/etc
RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}paho-mqtt>0:net/py-paho-mqtt@${PY_FLAVOR}
+CONFLICTS_INSTALL= hared
+
pre-install:
${INSTALL_DATA} ${FILESDIR}/hared.conf ${STAGEDIR}${ETCDIR}/hared.ini.sample