>Number: 167265
>Category: ports
>Synopsis: x11-drivers/xf86-video-mga 1.4.13,2 fails to cleanly apply patch files
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Tue Apr 24 13:10:16 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: John W. O'Brien
>Release: 9-STABLE
>Organization:
Saltant Solutions
>Environment:
FreeBSD nippl.y.saltant.net 9.0-STABLE FreeBSD 9.0-STABLE #0: Mon Apr 9 07:44:49 EDT 2012 root@nippl.y.saltant.net:/usr/obj/usr/src/sys/NIPPL amd64
>Description:
'make patch' in /usr/ports/x11-drivers/xf86-video-mga fails after port updated from 1.4.11 to 1.4.13. Updated ports with 'portsnap fetch' and 'portsnap update'.
Details of all patch files:
# pwd
/usr/ports/x11-drivers/xf86-video-mga
# ls -lR
total 20
-rw-r--r-- 1 root wheel 620 Apr 21 13:03 Makefile
-rw-r--r-- 1 root wheel 176 Apr 21 13:03 distinfo
drwxrwxr-x 2 root wheel 512 Apr 24 08:49 files
-rw-r--r-- 1 root wheel 78 Feb 25 2011 pkg-descr
-rw-r--r-- 1 root wheel 153 May 19 2007 pkg-plist
./files:
total 28
-rw-r--r-- 1 root wheel 434 May 1 2010 patch-src__mga.h
-rw-r--r-- 1 root wheel 7161 May 1 2010 patch-src__mga_dacG.c
-rw-r--r-- 1 root wheel 3831 May 1 2010 patch-src__mga_driver.c
-rw-r--r-- 1 root wheel 617 May 1 2010 patch-src__mga_merge.c
-rw-r--r-- 1 root wheel 453 May 1 2010 patch-src__mga_reg.h
-rw-r--r-- 1 root wheel 392 May 1 2010 patch-src__mga_storm.c
# foreach patchfile ( `ls files` )
foreach? patch -tNC -d work/xf86-video-mga-1.4.13 < files/$patchfile
foreach? end
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- ./src/mga.h.orig 2009-07-27 17:24:51.000000000 -0700
|+++ ./src/mga.h 2010-03-09 17:58:54.154420020 -0800
--------------------------
Patching file ./src/mga.h using Plan A...
Ignoring previously applied (or reversed) patch.
Hunk #1 ignored at 133.
Hunk #2 ignored at 478.
2 out of 2 hunks ignored--saving rejects to ./src/mga.h.rej
done
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- ./src/mga_dacG.c.orig 2010-03-09 17:58:54.152419708 -0800
|+++ ./src/mga_dacG.c 2010-03-09 17:58:54.157420208 -0800
--------------------------
Patching file ./src/mga_dacG.c using Plan A...
Hunk #1 succeeded at 260 (offset 49 lines).
Hunk #2 succeeded at 615 with fuzz 1 (offset 83 lines).
Hunk #3 succeeded at 818 (offset 55 lines).
Hunk #4 succeeded at 1058 (offset 92 lines).
Hunk #5 failed at 1416.
Hunk #6 failed at 1457.
Hunk #7 failed at 1643.
Hunk #8 failed at 1829.
Hunk #9 failed at 1842.
Hunk #10 failed at 1943.
6 out of 10 hunks failed--saving rejects to ./src/mga_dacG.c.rej
done
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- ./src/mga_driver.c.orig 2009-07-27 22:11:40.000000000 -0700
|+++ ./src/mga_driver.c 2010-03-09 17:58:54.163419467 -0800
--------------------------
Patching file ./src/mga_driver.c using Plan A...
Hunk #1 succeeded at 404 (offset 16 lines).
Hunk #2 succeeded at 433 with fuzz 2 (offset 2 lines).
Hunk #3 failed at 453.
Hunk #4 succeeded at 493 with fuzz 2 (offset 19 lines).
Hunk #5 succeeded at 916 with fuzz 1 (offset 6 lines).
Hunk #6 failed at 1143.
Hunk #7 failed at 1625.
Hunk #8 failed at 2147.
Hunk #9 failed at 2260.
Hunk #10 failed at 2447.
Hunk #11 failed at 4351.
7 out of 11 hunks failed--saving rejects to ./src/mga_driver.c.rej
done
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- ./src/mga_merge.c.orig 2009-07-27 17:24:03.000000000 -0700
|+++ ./src/mga_merge.c 2010-03-09 17:58:54.164420182 -0800
--------------------------
Patching file ./src/mga_merge.c using Plan A...
Ignoring previously applied (or reversed) patch.
Hunk #1 ignored at 362.
Hunk #2 ignored at 517.
2 out of 2 hunks ignored--saving rejects to ./src/mga_merge.c.rej
done
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- ./src/mga_reg.h.orig 2009-07-26 20:37:46.000000000 -0700
|+++ ./src/mga_reg.h 2010-03-09 17:58:54.165420896 -0800
--------------------------
Patching file ./src/mga_reg.h using Plan A...
Ignoring previously applied (or reversed) patch.
Hunk #1 ignored at 432.
1 out of 1 hunks ignored--saving rejects to ./src/mga_reg.h.rej
done
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- ./src/mga_storm.c.orig 2009-07-26 20:37:46.000000000 -0700
|+++ ./src/mga_storm.c 2010-03-09 17:58:54.168419688 -0800
--------------------------
Patching file ./src/mga_storm.c using Plan A...
Ignoring previously applied (or reversed) patch.
Hunk #1 ignored at 1130.
1 out of 1 hunks ignored--saving rejects to ./src/mga_storm.c.rej
done
# egrep "^PORT" Makefile
PORTNAME= xf86-video-mga
PORTVERSION= 1.4.13
PORTEPOCH= 2
>How-To-Repeat:
# make clean -C /usr/ports/x11-drivers/xf86-video-mga
===> Cleaning for xf86-video-mga-1.4.13,2
# make patch -C /usr/ports/x11-drivers/xf86-video-mga
===> License check disabled, port has not defined LICENSE
===> Extracting for xf86-video-mga-1.4.13,2
=> SHA256 Checksum OK for xorg/driver/xf86-video-mga-1.4.13.tar.bz2.
===> Patching for xf86-video-mga-1.4.13,2
===> Applying FreeBSD patches for xf86-video-mga-1.4.13,2
Ignoring previously applied (or reversed) patch.
2 out of 2 hunks ignored--saving rejects to ./src/mga.h.rej
=> Patch patch-src__mga.h failed to apply cleanly.
*** Error code 1
Stop in /usr/ports/x11-drivers/xf86-video-mga.
>Fix:
>Release-Note:
>Audit-Trail:
>Unformatted: