aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Kortkamp <tobik@FreeBSD.org>2021-10-15 17:16:09 +0000
committerTobias Kortkamp <tobik@FreeBSD.org>2021-10-19 08:37:53 +0000
commit5290fb1d9274aa22c0a1dba1b21b424efd01dcd0 (patch)
treea79c1f7e76f9584bd10a44990210be2bd65e44ac
parent8c351bfd7438a166d2d9219ac705ac6df2e20430 (diff)
downloadports-5290fb1d9274aa22c0a1dba1b21b424efd01dcd0.tar.gz
ports-5290fb1d9274aa22c0a1dba1b21b424efd01dcd0.zip
comms/aprsd: Spell SUB_LIST correctly and unbreak rc script
Reported by: portscan (unreferenced variable)
-rw-r--r--comms/aprsd/Makefile4
-rw-r--r--comms/aprsd/files/aprsd.in6
2 files changed, 5 insertions, 5 deletions
diff --git a/comms/aprsd/Makefile b/comms/aprsd/Makefile
index bcd9254ef6bf..b12533eca532 100644
--- a/comms/aprsd/Makefile
+++ b/comms/aprsd/Makefile
@@ -2,7 +2,7 @@
PORTNAME= aprsd
PORTVERSION= 2.2.515
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= comms hamradio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2.2.5-15
DISTNAME= aprsd-2.2.5-15
@@ -23,7 +23,7 @@ GROUPS= aprsd dialer tnc
APRSD_RC_USER= aprsd
APRSD_RC_GROUP= aprsd
-RC_SUB_LIST= LOCALBASE=${LOCALBASE} APRSD_RC_USER=${APRSD_RC_USER} \
+SUB_LIST= APRSD_RC_USER=${APRSD_RC_USER} \
APRSD_RC_GROUP=${APRSD_RC_GROUP}
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/comms/aprsd/files/aprsd.in b/comms/aprsd/files/aprsd.in
index 393eefeb56af..f7cc47ab0c83 100644
--- a/comms/aprsd/files/aprsd.in
+++ b/comms/aprsd/files/aprsd.in
@@ -27,9 +27,9 @@ pidfile=/var/run/aprsd.pid
aprsd_pre()
{
if [ ${aprsd_root} != "YES" ]; then
- echo "Starting aprs server as user ${APRSD_RC_USER}:${APRSD_RC_GROUP}."
- install -o ${APRSD_RC_USER} -g ${APRSD_RC_GROUP} /dev/null ${pidfile}
- chown -R ${APRSD_RC_USER}:${APRSD_RC_GROUP} /var/log/aprsd
+ echo "Starting aprs server as user ${aprsd_user}:${aprsd_group}."
+ install -o ${aprsd_user} -g ${aprsd_group} /dev/null ${pidfile}
+ chown -R ${aprsd_user}:${aprsd_group} /var/log/aprsd
else
echo "Starting aprs server as root."
install -o root -g wheel /dev/null ${pidfile}