svn commit: r439766 - in head/comms/direwolf: . files

[Alexey Dokuchaev]

Author: danfe
Date: Sat Apr 29 17:42:25 2017
New Revision: 439766
URL: https://svnweb.freebsd.org/changeset/ports/439766

Log:
  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

Modified:
  head/comms/direwolf/Makefile
  head/comms/direwolf/files/Makefile.FreeBSD
  head/comms/direwolf/pkg-descr

Modified: head/comms/direwolf/Makefile
==============================================================================
--- head/comms/direwolf/Makefile	Sat Apr 29 17:33:51 2017	(r439765)
+++ head/comms/direwolf/Makefile	Sat Apr 29 17:42:25 2017	(r439766)
@@ -24,8 +24,6 @@ SHEBANG_FILES=	telemetry-toolkit/telem-b
 		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

Modified: head/comms/direwolf/files/Makefile.FreeBSD
==============================================================================
--- head/comms/direwolf/files/Makefile.FreeBSD	Sat Apr 29 17:33:51 2017	(r439765)
+++ head/comms/direwolf/files/Makefile.FreeBSD	Sat Apr 29 17:42:25 2017	(r439766)
@@ -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.

Modified: head/comms/direwolf/pkg-descr
==============================================================================
--- head/comms/direwolf/pkg-descr	Sat Apr 29 17:33:51 2017	(r439765)
+++ head/comms/direwolf/pkg-descr	Sat Apr 29 17:42:25 2017	(r439766)
@@ -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.