Attachment 228500 Details for Bug 254178 – workaround for broken tarball

[patch] workaround for broken tarball

0001-x11-xscreensaver-work-around-broken-tarball.patch (text/plain), 1.44 KB, created by Felix Palmen on 2021-10-07 16:03:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Felix Palmen

Created: 2021-10-07 16:03:52 UTC

Size: 1.44 KB

patch

obsolete

>From 3addb4ee9625f7de4b9658093c70b7b42e520471 Mon Sep 17 00:00:00 2001
>From: Felix Palmen <felix@palmen-it.de>
>Date: Thu, 7 Oct 2021 17:57:41 +0200
>Subject: [PATCH] x11/xscreensaver: work around broken tarball
>
>---
> x11/xscreensaver/Makefile | 17 ++++++++++++++---
> 1 file changed, 14 insertions(+), 3 deletions(-)
>
>diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
>index b1d5ab17a0c6..fab2e5ca9be3 100644
>--- a/x11/xscreensaver/Makefile
>+++ b/x11/xscreensaver/Makefile
>@@ -25,8 +25,6 @@ USE_PERL5=	run
> USE_XORG=	ice sm x11 xext xi xinerama xmu xpm xrandr xrender xt xxf86vm
> USE_CSTD=	gnu99
> CPE_VENDOR=	xscreensaver_project
>-# ignore error from tar due to duplicate driver/xscreensaver-command.man
>-EXTRACT_AFTER_ARGS+=	|| :
> 
> CONFLICTS=	xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]*
> 
>@@ -114,4 +112,17 @@ post-install:
> 	${INSTALL_DATA} ${WRKDIR}/*.desktop ${STAGEDIR}${PREFIX}/share/applications/
> 	${RM} ${STAGEDIR}${PREFIX}/etc/pam.d/xscreensaver.pam
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.pre.mk>
>+
>+# upstream tarball contains duplicate driver/xscreensaver-command.man
>+# base tar can't handle that prior to FreeBSD 13, so use star instead
>+# on 13 and newer, it's sufficient to ignore the error
>+.if ${OSVERSION} < 1300139
>+EXTRACT_CMD=		${LOCALBASE}/bin/star
>+EXTRACT_BEFORE_ARGS=	cli=gnutar -xf
>+EXTRACT_DEPENDS=	${EXTRACT_CMD}:archivers/star
>+.else
>+EXTRACT_AFTER_ARGS+=	|| :
>+.endif
>+
>+.include <bsd.port.post.mk>
>-- 
>2.32.0
>

Actions: View | Diff

Attachments on bug 254178: 223139 | 226958 | 228092 | 228095 | 228500 | 228515 | 228661 | 229118 | 231805 | 231815 | 231850