From owner-svn-ports-head@freebsd.org Sat Mar 25 01:47:41 2017 Return-Path: Delivered-To: svn-ports-head@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 0201CD1B659; Sat, 25 Mar 2017 01:47:40 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D47A5683; Sat, 25 Mar 2017 01:47:40 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1033) id 27F5822FD; Sat, 25 Mar 2017 01:47:40 +0000 (UTC) Date: Sat, 25 Mar 2017 01:47:40 +0000 From: Alexey Dokuchaev To: Diane Bruce Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r436814 - in head/comms: . direwolf direwolf/files Message-ID: <20170325014740.GC54562@FreeBSD.org> References: <201703241401.v2OE1nwY023666@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201703241401.v2OE1nwY023666@repo.freebsd.org> User-Agent: Mutt/1.7.1 (2016-10-04) X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Mar 2017 01:47:41 -0000 On Fri, Mar 24, 2017 at 02:01:49PM +0000, Diane Bruce wrote: > New Revision: 436814 > URL: https://svnweb.freebsd.org/changeset/ports/436814 > > Log: > 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 > 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. > [...] > +COMMENT= Software software "soundcard" modem/TNC and APRS encoder/decoder Double "software". > +GH_PROJECT= direwolf Not needed. > +pre-patch: > + ${CP} ${FILESDIR}/Makefile.FreeBSD ${WRKSRC} BoGus whitespace after ${CP} (tab should be space). Also below after .for. > + ${REINPLACE_CMD} -e 's|%%STAGEDIR%%|${STAGEDIR}|' \ > + -e 's|%%PREFIX%%|${PREFIX}|' \ > + -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ > + ${WRKSRC}/Makefile.FreeBSD These variables are passed via MAKE_ENV/MAKE_ARGS, you rarely need to fix up them with sed(1) in inner makefiles. > +# Makefile for FreeBSD version of Dire Wolf. It was not explained why the FreeBSD version of Makefile is needed at all. What's wrong with original version? Most of its contents are not related to FreeBSD in any way. > +LOCALBASE= %%LOCALBASE%% Per above, not needed. Next time, care to $make -V MAKE_ENV (diffo for MAKE_ARGS) before polluting makefiles with unnecessary constructs. > + $(INSTALL) -D --mode=644 tocalls.txt ${SHAREDIR}/direwolf/tocalls.txt > + $(INSTALL) -D --mode=644 symbols-new.txt ${SHAREDIR}/direwolf/symbols-new.txt > + $(INSTALL) -D --mode=644 symbolsX.txt ${SHAREDIR}/direwolf/symbolsX.txt > + $(INSTALL) -D --mode=644 dw-icon.png ${SHAREDIR}/direwolf/dw-icon.png > + mkdir -p ${SHAREDIR}/applications > + $(INSTALL) -D --mode=644 direwolf.desktop ${SHAREDIR}/applications/direwolf.desktop > ... This is wrong, our version of install(1) treats -D differently from GNU. > @@ -0,0 +1,24 @@ > +--- dw-start.sh.orig 2017-01-20 00:11:50 UTC > ++++ dw-start.sh > +@@ -83,15 +83,15 @@ DWCMD="direwolf -a 100" > + # > + > + > +-if [ -x /usr/bin/lxterminal ] > ++if [ -x /usr/local/bin/lxterminal ] Funny, you try to substitute %%LOCALBASE%% where it is not needed, but hardcode it here (and below). ./danfe