git: 7dfb4eca4f79 - main - net/xrdesktop2: fix pixmap install reported by pkg-fallout
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 15 Mar 2024 13:09:32 UTC
The branch main has been updated by rodrigo:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7dfb4eca4f79bc09baa609c2a8400705f34df504
commit 7dfb4eca4f79bc09baa609c2a8400705f34df504
Author: Rodrigo Osorio <rodrigo@FreeBSD.org>
AuthorDate: 2024-03-14 15:48:14 +0000
Commit: Rodrigo Osorio <rodrigo@FreeBSD.org>
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 <portmaster@bsdforge.com> (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}