Date: Tue, 01 Jan 2019 16:04:29 +0000 From: bugzilla-noreply@freebsd.org To: ports-bugs@FreeBSD.org Subject: [Bug 215811] x11/xscreensaver-gnome: update to 5.36 (and x11/xscreensaver-gnome-hacks) Message-ID: <bug-215811-7788-snlmdzQ7Gh@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-215811-7788@https.bugs.freebsd.org/bugzilla/> References: <bug-215811-7788@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D215811 Andrew <morrand276@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |morrand276@gmail.com --- Comment #4 from Andrew <morrand276@gmail.com> --- Confirmed the patch does not apply cleanly. The reported problem is: |Index: x11/xscreensaver-gnome/Makefile |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |--- x11/xscreensaver-gnome/Makefile (revision 430548) |+++ x11/xscreensaver-gnome/Makefile (working copy) -------------------------- Patching file x11/xscreensaver-gnome/Makefile using Plan A... Hunk #1 failed at 3. Hunk #2 succeeded at 11. Hunk #3 failed at 20. 2 out of 3 hunks failed--saving rejects to x11/xscreensaver-gnome/Makefile.= rej The first hunk apparently fails because of -PORTREVISION?=3D 4 at line 7, which has since been bumped and should be -PORTREVISION?=3D 5 The third hunk apparently fails because line 21, USE_PERL5=3D run is in the patch's context but isn't in the distributed Makefile since bug #233138. There was also a Patching file x11/xscreensaver-gnome-hacks/Makefile using Plan A... Hunk #1 succeeded at 2 with fuzz 1. but it's not significant. --=20 You are receiving this mail because: You are the assignee for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-215811-7788-snlmdzQ7Gh>