From nobody Fri Mar 15 13:09:32 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 4Tx4Mw4BBKz5DPc1; Fri, 15 Mar 2024 13:09:32 +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 4Tx4Mw2brGz4Khx; Fri, 15 Mar 2024 13:09:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710508172; 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=m7ZLdOebuNHuOdV3sM66zy7mS0emMc2l7s0HRNzd7Ic=; b=XouDcU97JHZ599WVvRAlhgGbbd/tIov+I6ymG5osaphsNjsqEboy3oFONK6ENW1QHAHXLH FL2r6uuXXsLcJr4w0IBZZsn6hyxdRvahpfyG7K+6Q/tNiCRx0WPgphmjIpLijKABFWL62w 5N9A/cPpFxcrsFrNEOOBiehKfLgyKNWyJu1/B1S8JNxMfedUXnSE58Ruq2fk7xlWkHJ6Km LUiKg2lRQ+SD+IW8Urm/kT1ZgLS1BZ490ll/OaKZtHuu4oZXpsnycfrEVQYif8W/P67L6j GlB5PKyxu9cIYmTZP4Fn8Bf5FCPxoRfou+jEx5K8ikaHQlxSV4SAqOQmamjmKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710508172; a=rsa-sha256; cv=none; b=W45L28c7eDge0gYMF7ZTaJlpjsoW6QyUBFDUSZoV0/oyHd1fsD8rnvKOBLHzubitNe5BPr r+WhMtq26KKNbBfrd7rmTFmGMePSKXOCCmXj4qjHsB+OctOfzt2YHxCxmjNouxevQ77+CC ln7Usiarv6ik1TjRB4KNyZ1J9M0wN/8jz5VchvGP40vwUR9HinD2mBw5S0xvBmYlcwcb0/ +Nw1O3a2V2rpWCnugVYe/XLTt/AcdAvuInHNXaLDsgb1JIcUqwjHjR4Tcw3saZwWzamuV2 g62qjmYVlRFfaey3/PybsncICJsCJdT9p/KrOEvVxSRER65uvWMEhWwlitQKPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710508172; 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=m7ZLdOebuNHuOdV3sM66zy7mS0emMc2l7s0HRNzd7Ic=; b=G4rC59lqtZ9xQUPJlySGqjCj6oaYhRo46dESRuu+QVD+wk9YBLKvDCwMwyEBSkghGCg/Uy p1sJehsZQfGbRTsc83ErTetSkSGgcseyeqrwIEPsZWwkDEayrW8Kc7Dj5pkoF/W8c4cTLr xU7f/lQ3KoNYhEHyJ8VwSrgWqVv4ZHr1/9Ro1wWftN7EHInm+7gFYHfJTkyJyGIdFho6Ue DgN4RrEdGUu/0jpwm05Z/9UxE9QDvM0omSgmv07ETp9cbde6NgtGNEdc4FO7GWpXgbEbzg FMpp4H3+osdaLNR6GDNV9oncJv293N+vyOGX8TRmHAA75mP6bHCRc1ch95PLrg== 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 4Tx4Mw205Rz1Bff; Fri, 15 Mar 2024 13:09:32 +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 42FD9WCr012109; Fri, 15 Mar 2024 13:09:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42FD9WNv012106; Fri, 15 Mar 2024 13:09:32 GMT (envelope-from git) Date: Fri, 15 Mar 2024 13:09:32 GMT Message-Id: <202403151309.42FD9WNv012106@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rodrigo Osorio Subject: git: 7dfb4eca4f79 - main - net/xrdesktop2: fix pixmap install reported by pkg-fallout 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: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7dfb4eca4f79bc09baa609c2a8400705f34df504 Auto-Submitted: auto-generated The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=7dfb4eca4f79bc09baa609c2a8400705f34df504 commit 7dfb4eca4f79bc09baa609c2a8400705f34df504 Author: Rodrigo Osorio AuthorDate: 2024-03-14 15:48:14 +0000 Commit: Rodrigo Osorio CommitDate: 2024-03-15 13:08:51 +0000 net/xrdesktop2: fix pixmap install reported by pkg-fallout Also fix issue reported by portclippy and portfrmt PR: 277325 Reported by: Chris Hutchinson (maintainer) --- net/xrdesktop2/Makefile | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/net/xrdesktop2/Makefile b/net/xrdesktop2/Makefile index 91e37a7406cd..b07de503b123 100644 --- a/net/xrdesktop2/Makefile +++ b/net/xrdesktop2/Makefile @@ -1,5 +1,6 @@ PORTNAME= xrdesktop2 PORTVERSION= 2.00 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= https://BSDforge.com/projects/source/net/xrdesktop2/ @@ -10,27 +11,30 @@ WWW= https://BSDforge.com/projects/net/xrdesktop2/ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rdesktop:net/rdesktop \ - p5-Gtk2>=0:x11-toolkits/p5-Gtk2 +RUN_DEPENDS= p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \ + rdesktop:net/rdesktop +USES= desktop-file-utils perl5 shebangfix tar:xz +SHEBANG_FILES= xrdesktop CONFLICTS= xrdesktop-1* -NO_BUILD= yes NO_ARCH= yes -USES= perl5 shebangfix tar:xz -SHEBANG_FILES= xrdesktop +NO_BUILD= yes DOCS= Changelog README -PIXMAPS= *.png +PIXMAPS= x-remote-desktop-256.png x-remote-desktop-128.png \ + x-remote-desktop-48.png -PLIST_FILES= bin/xrdesktop share/doc/xrdesktop2/Changelog \ - share/doc/xrdesktop2/README share/pixmaps/x-remote-desktop-256.png \ +PLIST_FILES= bin/xrdesktop \ + share/applications/xrdesktop2.desktop \ + share/doc/xrdesktop2/Changelog \ + share/doc/xrdesktop2/README \ share/pixmaps/x-remote-desktop-128.png \ - share/pixmaps/x-remote-desktop-48.png \ - share/applications/xrdesktop2.desktop + share/pixmaps/x-remote-desktop-256.png \ + share/pixmaps/x-remote-desktop-48.png do-install: ${INSTALL_SCRIPT} ${WRKSRC}/xrdesktop ${STAGEDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/${PIXMAPS} ${STAGEDIR}${PREFIX}/share/pixmaps + ${INSTALL_DATA} ${PIXMAPS:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/share/pixmaps/ ${INSTALL_DATA} ${WRKSRC}/xrdesktop2.desktop ${STAGEDIR}${PREFIX}/share/applications @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}; ${INSTALL_DATA} ${WRKSRC}/${DOCS} ${STAGEDIR}${DOCSDIR}