From owner-svn-ports-all@freebsd.org Sat Apr 29 17:42:27 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4007BD55328; Sat, 29 Apr 2017 17:42:27 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EBDB8F02; Sat, 29 Apr 2017 17:42:26 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3THgP6D072150; Sat, 29 Apr 2017 17:42:25 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3THgP3b072147; Sat, 29 Apr 2017 17:42:25 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201704291742.v3THgP3b072147@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Sat, 29 Apr 2017 17:42:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r439766 - in head/comms/direwolf: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Apr 2017 17:42:27 -0000 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.