aboutsummaryrefslogtreecommitdiffstats
path: root/comms
diff options
context:
space:
mode:
authordanfe <danfe@FreeBSD.org>2017-04-30 01:42:25 +0800
committerdanfe <danfe@FreeBSD.org>2017-04-30 01:42:25 +0800
commit724b9d9628f9b8977c0e8de025bee4bba65ec071 (patch)
tree7237e2a4a01411d48cabfd2bb90d40ecab06b9b9 /comms
parentcc01736464775702e24b3bad4fc12c6b0f9c747d (diff)
downloadfreebsd-ports-graphics-724b9d9628f9b8977c0e8de025bee4bba65ec071.tar.gz
freebsd-ports-graphics-724b9d9628f9b8977c0e8de025bee4bba65ec071.tar.zst
freebsd-ports-graphics-724b9d9628f9b8977c0e8de025bee4bba65ec071.zip
Don't pass STAGEDIR via MAKE_ENV, it's already being defined (as DESTDIR)
in MAKE_ARGS. Also, remove bogus trailing slash when setting INSTALLDIR, kill EOL whitespace in the port description text, and fix its formatting. Forgotten by: db
Diffstat (limited to 'comms')
-rw-r--r--comms/direwolf/Makefile2
-rw-r--r--comms/direwolf/files/Makefile.FreeBSD2
-rw-r--r--comms/direwolf/pkg-descr8
3 files changed, 5 insertions, 7 deletions
diff --git a/comms/direwolf/Makefile b/comms/direwolf/Makefile
index d94f8a2fef7..0ede614823e 100644
--- a/comms/direwolf/Makefile
+++ b/comms/direwolf/Makefile
@@ -24,8 +24,6 @@ SHEBANG_FILES= telemetry-toolkit/telem-bits.pl telemetry-toolkit/telem-parm.pl\
telemetry-toolkit/telem-data91.pl \
telemetry-toolkit/telem-unit.pl telemetry-toolkit/telem-balloon.pl
-MAKE_ENV+= STAGEDIR=${STAGEDIR}
-
post-patch:
${CP} ${FILESDIR}/Makefile.FreeBSD ${WRKSRC}
${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/dw-start.sh
diff --git a/comms/direwolf/files/Makefile.FreeBSD b/comms/direwolf/files/Makefile.FreeBSD
index 6f5010f1d82..9041311a972 100644
--- a/comms/direwolf/files/Makefile.FreeBSD
+++ b/comms/direwolf/files/Makefile.FreeBSD
@@ -191,7 +191,7 @@ direwolf.conf : generic.conf
# This is a step in the right direction but not sufficient to use /usr instead.
# Eventually I'd like to have targets here to build the .DEB and .RPM packages.
-INSTALLDIR := ${STAGEDIR}/${PREFIX}/
+INSTALLDIR := ${DESTDIR}/${PREFIX}
SHAREDIR := ${INSTALLDIR}/share
# Command to "install" to system directories. Use "ginstall" for Mac.
diff --git a/comms/direwolf/pkg-descr b/comms/direwolf/pkg-descr
index 4db11ae253d..26e72fd5bf6 100644
--- a/comms/direwolf/pkg-descr
+++ b/comms/direwolf/pkg-descr
@@ -1,6 +1,6 @@
-Dire Wolf is a software "soundcard" modem/TNC and APRS encoder/decoder.
+Dire Wolf is a software "soundcard" modem/TNC and APRS encoder/decoder.
It can be used stand-alone to observe APRS traffic, as a digipeater,
-APRStt gateway, or Internet Gateway (IGate). It can also be used as a
+APRStt gateway, or Internet Gateway (IGate). It can also be used as a
virtual TNC for other applications such as APRSIS32, UI-View32, Xastir,
-APRS-TW, YAAC, UISS, Linux AX25, SARTrack, RMS Express, BPQ32,
-Outpost PM and many others.
+APRS-TW, YAAC, UISS, Linux AX25, SARTrack, RMS Express, BPQ32, Outpost
+PM, and many others.