From nobody Tue Jan 23 00:17:22 2024 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 4TJnhz17fHz58VmV; Tue, 23 Jan 2024 00:17:23 +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 4TJnhz0fD1z4qQ0; Tue, 23 Jan 2024 00:17:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705969043; 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=aOQq0MydOLZZeLcvwCGDnF9O8vQTCt6dw0PPNBZO2aw=; b=t0YSHOb+sPz9v/IUF83kyZAC7r93nPfrCCrsjPsm4hMvrEp3q9kIOmZgZ96se4dOrgbloB y3p0Km54LjsWshogSms/oh22Q+ZT1eg1209kMVSSAJmjOIytRNQxC66Xya9lnUFaRGK3lN fFG/wJe5e35RvyHp+N6ttAFTCafIgekO/gjmNPqkiDRr93tSUJbal8mSHiKC+vpSHnPQlG v3XveUvh+o4hWCR1/W9xEsv7ba+pDjMUHyNlvrAS6vY1izP0khsHZiI/tZIjqKigVhfrKT i42A+w+U6IzrFs8W0ihM3cePvPimG4Tdb5eVfQ5kd4AsRNbHK/gkJuvPzgsXLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705969043; 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=aOQq0MydOLZZeLcvwCGDnF9O8vQTCt6dw0PPNBZO2aw=; b=FLetSnco0sSBP/ghLTqk2g6W/HhjvEsDta2v3+47o0NEll/eZjIndRY7TEY4vIij0trGyN SVv598J29qA5iUeZIaRhO1JkYzXIOXtEA18ufX5KnVPaMGX4BaWP9q1uXK7BEgstGOdryZ dp0W8rB6M/vov7lvN2bjQhNd45JRiyBXdWE68bA9ZOt1VuFngMXM6oC4S0hiExEgnaDM5D YW6asI6oLDPSE/xfel7ZKbItfP0kWVvBu7v4/0jXdkl1R2cVHqmCYQSHjxvjaSRUW0SEyv qI+iECe3gNVomFIBJOPvHQEuxBR+ybe/iA5lF3+DiuL5reCYA/503T8P8VsiIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705969043; a=rsa-sha256; cv=none; b=XHQ/I6Dy0absEclSyyGa3OnjWFKZ66Sq15GDoriUCYP1krfSL8l0ZMD40fAn6tAFFusdgh x6dWxD6qgTiXKs75PHOav6bZlWeNq31C8tDlRpK/EypYU+0FgY0zf5ls1U7Dz+vAlrA/W4 p1JH5sMOHOXDSA3b6gvyAchw9B/fGsbEWdClQpAhRQ6kS7lVGYXoGF4cIWug5hvVUCvmJK cpJnZteTANfoqjZ9QQpQLE7Rvr/Wh37KpVbDXjcSaHUsA6B1Ckn7Xw2T7z9hHzYzYBZ6Gh 2CgEX9UAWCcp7Tl1tL2iHaklLEi2Gd9DPz0ueQ69T0h3geTPHXXTxrJL4uptmg== 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 4TJnhy6qKBz1Mb4; Tue, 23 Jan 2024 00:17:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40N0HM7S002600; Tue, 23 Jan 2024 00:17:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N0HMeL002597; Tue, 23 Jan 2024 00:17:22 GMT (envelope-from git) Date: Tue, 23 Jan 2024 00:17:22 GMT Message-Id: <202401230017.40N0HMeL002597@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 3c01a249d222 - main - security/cardpeek: unbreak against enforced ccache, move the manpage 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c01a249d22239dd0a2fee36832c35277b537a57 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=3c01a249d22239dd0a2fee36832c35277b537a57 commit 3c01a249d22239dd0a2fee36832c35277b537a57 Author: Alexey Dokuchaev AuthorDate: 2024-01-23 00:16:32 +0000 Commit: Alexey Dokuchaev CommitDate: 2024-01-23 00:16:32 +0000 security/cardpeek: unbreak against enforced ccache, move the manpage If `devel/ccache' is packaged with compiler symlinks, `gcc' would be detected and used via $(OBJCLD), switch to the $(CCLD)-based linking command to avoid that. Now that we're here, convert the `post-patch' target to a regular patch file. --- security/cardpeek/Makefile | 7 ++----- security/cardpeek/files/patch-Makefile.in | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/security/cardpeek/Makefile b/security/cardpeek/Makefile index c8cf5f519691..55c2e428bf04 100644 --- a/security/cardpeek/Makefile +++ b/security/cardpeek/Makefile @@ -17,8 +17,9 @@ RUN_DEPENDS= pcscd:devel/pcsc-lite USES= gnome iconv localbase lua:52 pkgconfig USE_GNOME= gtk30 GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share -PLIST_FILES= bin/cardpeek man/man1/cardpeek.1.gz \ +PLIST_FILES= bin/cardpeek share/man/man1/cardpeek.1.gz \ share/appdata/cardpeek.appdata.xml \ share/applications/cardpeek.desktop \ share/icons/hicolor/48x48/apps/cardpeek-logo.png @@ -26,8 +27,4 @@ PORTDOCS= AUTHORS README cardpeek_ref.en.pdf OPTIONS_DEFINE= DOCS -post-patch: - @${REINPLACE_CMD} -e 's,^doc_DATA =,& AUTHORS README,' \ - ${WRKSRC}/Makefile.in - .include diff --git a/security/cardpeek/files/patch-Makefile.in b/security/cardpeek/files/patch-Makefile.in new file mode 100644 index 000000000000..9f6676d6b5c8 --- /dev/null +++ b/security/cardpeek/files/patch-Makefile.in @@ -0,0 +1,20 @@ +--- Makefile.in.orig 2015-02-27 14:24:48 UTC ++++ Makefile.in +@@ -435,7 +435,7 @@ cardpeek_SOURCES = asn1.c asn1.h bytestring.c bytestri + cardpeek_public_key.h win32/config.h $(am__append_1) \ + $(am__append_3) + EXTRA_cardpeek_SOURCES = cardpeek.c osx/cardpeek-osx.m +-doc_DATA = doc/cardpeek_ref.en.pdf ++doc_DATA = AUTHORS README doc/cardpeek_ref.en.pdf + cardpeek_LDADD = cardpeek_resources.$(OBJEXT) @LUA_LIBS@ @PCSC_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @CURL_LIBS@ @ICONV_LIBS@ + cardpeek_LDFLAGS = -g $(am__append_2) + dist_man_MANS = cardpeek.1 +@@ -595,7 +595,7 @@ osx/cardpeek-osx.$(OBJEXT): osx/$(am__dirstamp) \ + + cardpeek$(EXEEXT): $(cardpeek_OBJECTS) $(cardpeek_DEPENDENCIES) $(EXTRA_cardpeek_DEPENDENCIES) + @rm -f cardpeek$(EXEEXT) +- $(AM_V_OBJCLD)$(cardpeek_LINK) $(cardpeek_OBJECTS) $(cardpeek_LDADD) $(LIBS) ++ $(AM_V_CCLD)$(LINK) $(cardpeek_OBJECTS) $(cardpeek_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT)