From nobody Thu Dec 23 18:14:45 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4A5E31905A41; Thu, 23 Dec 2021 18:14:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JKddL09Jgz3thn; Thu, 23 Dec 2021 18:14:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DA18D156FD; Thu, 23 Dec 2021 18:14:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BNIEjgF070973; Thu, 23 Dec 2021 18:14:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BNIEjOl070972; Thu, 23 Dec 2021 18:14:45 GMT (envelope-from git) Date: Thu, 23 Dec 2021 18:14:45 GMT Message-Id: <202112231814.1BNIEjOl070972@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Diane Bruce Subject: git: e91198da77a6 - main - comms/linrad: Unbreak on current List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: db X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e91198da77a6215d6ef7730cc16004b8e44bb58b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640283286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U9gFaEv95eHsBqtwu96rVtWDf6IKr7WSrTM3tLBcSTI=; b=YeOhVspHAM9iGwJIRQqFTXrKLR+hhCQSGnhQ7zIf+jezAoF0NS/kOAob2nfFA7bjfvdd6t Gt515+Lj0SuDBzWuIJsxtZyowbvRsyk0S4ng5lmXhi8n5bH5sAmd+QiHeCmJi/hn5ZjwHp eYZFpOslygoywMt3aBrMkf2SPwnTXA+Gsejl9kKaFm8tG6JXjUUl99flKNBLgSqUJRBkLm NSZoD0Rp1TGIVd8PRfGL4gwgt9mUvUkT4exHI0PuyQyDxBkwsnY96p9nGaMa3xXtemfOET WxhYlrnx418lWELyv3nlC0bzKZd2wMmyiL26icSBJcJdJFKvVkQTzROBkQKEpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640283286; a=rsa-sha256; cv=none; b=r76iU63kMGSoIEtCzIJquyjATus+NXalzZpep/JxHCqlrDc7ewTTuGTyx/fJO9Ltbl2DDD kxQyC8lMCKG5UlFMQD4DVNsv9JzjXvi+GvQjPHLL5SfPFC4xyng9z7u9kkBJf/Z7vRe1El qi+Anw+UQA/HLU4PeQu6/ECr4LvqN0tCcFzQcs8VghV5PFYhDh2OXBX5KLUGKqVPRg23vH 2i7JBmLriEauPJmO5B3pXGfi2InN5M5YJlHut+zZ8FaOcPU4mfFM5dxoaywKUoh5r1s/BY OD6qeGQYiP02ymr3HHKumHDVZInOouzZqdvtHEYkGt6cmIT9UpeCkOHqwcUUfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by db: URL: https://cgit.FreeBSD.org/ports/commit/?id=e91198da77a6215d6ef7730cc16004b8e44bb58b commit e91198da77a6215d6ef7730cc16004b8e44bb58b Author: Diane Bruce AuthorDate: 2021-12-23 18:01:04 +0000 Commit: Diane Bruce CommitDate: 2021-12-23 18:01:04 +0000 comms/linrad: Unbreak on current Unbreak on head of tree. The port itself needs a major update. Patches welcome. --- comms/linrad/Makefile | 8 ++------ comms/linrad/files/patch-help.c | 12 ++++++------ comms/linrad/files/patch-libfind1.c | 20 ++++++++++---------- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/comms/linrad/Makefile b/comms/linrad/Makefile index f9230fa1bc30..2a1ffaf13358 100644 --- a/comms/linrad/Makefile +++ b/comms/linrad/Makefile @@ -50,18 +50,14 @@ BINFILE= xlinrad64 ALL_TARGET= ${BINFILE} post-patch: - @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}/|' \ - ${WRKSRC}/help.c - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}/|' \ - ${WRKSRC}/libfind1.c + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}/|' \ + ${WRKSRC}/libfind1.c ${WRKSRC}/help.c do-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/errors.lir ${STAGEDIR}${DATADIR}/errors.lir ${INSTALL_DATA} ${WRKSRC}/help.lir ${STAGEDIR}${DATADIR}/help.lir ${INSTALL_SCRIPT} -m0555 ${FILESDIR}/linrad ${STAGEDIR}${PREFIX}/bin/linrad -# Some day we may want the svga version as well. -# ${INSTALL_PROGRAM} -m0555 ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}.svga ${INSTALL_PROGRAM} -m0555 ${WRKSRC}/${BINFILE} ${STAGEDIR}${PREFIX}/bin/x${PORTNAME} ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${LINRAD_DOCFILES} diff --git a/comms/linrad/files/patch-help.c b/comms/linrad/files/patch-help.c index a1a678a9c3c4..cff872107ebd 100644 --- a/comms/linrad/files/patch-help.c +++ b/comms/linrad/files/patch-help.c @@ -1,20 +1,20 @@ ---- help.c.orig 2014-11-04 05:25:00.000000000 -0500 -+++ help.c 2020-08-28 11:17:46.820070000 -0400 -@@ -720,7 +720,7 @@ +--- help.c.orig 2014-11-04 10:25:00 UTC ++++ help.c +@@ -720,7 +720,7 @@ else printf("\n%s",s); DEB"\n%s",s); } -msg_filename="errors.lir"; -+msg_filename="%%DATADIR%%errors.lir"; ++msg_filename="%%PREFIX%%/share/linrad/errors.lir"; line=3; write_from_msg_file(&line, lir_errcod, screen_mode, ERROR_VERNR); } -@@ -730,7 +730,7 @@ +@@ -730,7 +730,7 @@ void help_message(int msg_no) { int i, line; if(msg_no < 0)return; -msg_filename="help.lir"; -+msg_filename="%%DATADIR%%help.lir"; ++msg_filename="%%PREFIX%%/share/linrad/help.lir"; line=0; settextcolor(15); clear_screen(); diff --git a/comms/linrad/files/patch-libfind1.c b/comms/linrad/files/patch-libfind1.c index b5e59f52940f..63f7baff1885 100644 --- a/comms/linrad/files/patch-libfind1.c +++ b/comms/linrad/files/patch-libfind1.c @@ -1,12 +1,12 @@ --- libfind1.c.orig 2014-11-04 10:25:00 UTC +++ libfind1.c -@@ -38,7 +38,8 @@ char *dirs[]={"/lib/i386-linux-gnu", - "/usr/lib64/lib", - "/usr/lib32", - "/usr/lib64", -- "/usr/local/lib", -+ "%%LOCALBASE%%lib", -+ "%%LOCALBASE%%lib32", - "/usr/local/lib64", - "/usr/local32/lib", - "/usr/lib", +@@ -30,7 +30,8 @@ + char *dirs[]={"/lib/i386-linux-gnu", + "/lib/x86_64-linux-gnu", + "/lib", +- "/lib32", ++ "%%PREFIX%%/lib", ++ "/lib32", + "/lib64", + "/usr/lib/i386-linux-gnu", + "/usr/lib/x86_64-linux-gnu",