Date: Thu, 31 May 2007 16:18:24 -0700 (PDT) From: Fred Cox <sailorfred@yahoo.com> To: freebsd-x11@freebsd.org Subject: nv driver port fails to patch Message-ID: <155463.98974.qm@web33611.mail.mud.yahoo.com>
next in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
I'm in the middle of attempting to upgrade to 7.2 on
an AMD64 system, and the one driver that doesn't build
is xf86-video-nv.
Of course, I have an nVidia card.
Here is the make error I get:
[root@dred /usr/ports/x11-drivers/xf86-video-nv]# make
===> Patching for xf86-video-nv-1.2.2.1
===> Applying FreeBSD patches for
xf86-video-nv-1.2.2.1
2 out of 2 hunks failed--saving rejects to
configure.rej
=> Patch patch-configure failed to apply cleanly.
*** Error code 1
Stop in /usr/ports/x11-drivers/xf86-video-nv.
Attached are the configure.rej, and patch-configure
files. The configure file is 3/4 MB, so I've posted
it at http://fcox.net/configure
I am using portsnap to fetch and update the ports. I
have done this yesterday and today, with no behavior
change.
Thanks for any pointers,
Fred
____________________________________________________________________________________
Luggage? GPS? Comic books?
Check out fitting gifts for grads at Yahoo! Search
http://search.yahoo.com/search?fr=oni_on_mail&p=graduation+gifts&cs=bz
[-- Attachment #2 --]
***************
*** 21718,21727 ****
fi
cat >>confdefs.h <<_ACEOF
- #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]\+\).*/\1/p'`
_ACEOF
- PVM=`echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]\+\)\.\([^\.]\+\).*/\2/p'`
if test "x$PVM" = "x"; then
PVM="0"
fi
--- 21718,21727 ----
fi
cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]*\).*/\1/p'`
_ACEOF
+ PVM=`echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]*\)\.\([^\.]*\).*/\2/p'`
if test "x$PVM" = "x"; then
PVM="0"
fi
***************
*** 21730,21736 ****
#define PACKAGE_VERSION_MINOR $PVM
_ACEOF
- PVP=`echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]\+\)\.\([^\.]\+\)\.\([^\.]\+\).*/\3/p'`
if test "x$PVP" = "x"; then
PVP="0"
fi
--- 21730,21736 ----
#define PACKAGE_VERSION_MINOR $PVM
_ACEOF
+ PVP=`echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]*\)\.\([^\.]*\)\.\([^\.]*\).*/\3/p'`
if test "x$PVP" = "x"; then
PVP="0"
fi
[-- Attachment #3 --]
--- configure.orig Thu Dec 7 18:58:35 2006
+++ configure Thu Dec 7 18:59:34 2006
@@ -21718,10 +21718,10 @@
fi
cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]\+\).*/\1/p'`
+#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]*\).*/\1/p'`
_ACEOF
- PVM=`echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]\+\)\.\([^\.]\+\).*/\2/p'`
+ PVM=`echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]*\)\.\([^\.]*\).*/\2/p'`
if test "x$PVM" = "x"; then
PVM="0"
fi
@@ -21730,7 +21730,7 @@
#define PACKAGE_VERSION_MINOR $PVM
_ACEOF
- PVP=`echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]\+\)\.\([^\.]\+\)\.\([^\.]\+\).*/\3/p'`
+ PVP=`echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]*\)\.\([^\.]*\)\.\([^\.]*\).*/\3/p'`
if test "x$PVP" = "x"; then
PVP="0"
fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?155463.98974.qm>