[pkgsrc/trunk]: pkgsrc/x11/xf86-video-nv Fix two more sed REs to get the corr...

[toshii <toshii%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5aa14de88430
branches:  trunk
changeset: 523751:5aa14de88430
user:      toshii <toshii%pkgsrc.org@localhost>
date:      Sat Jan 13 05:36:35 2007 +0000

description:
Fix two more sed REs to get the correct package version numbers compiled.

diffstat:

 x11/xf86-video-nv/distinfo         |   4 ++--
 x11/xf86-video-nv/patches/patch-aa |  21 +++++++++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diffs (46 lines):

diff -r b10eb53e2a2a -r 5aa14de88430 x11/xf86-video-nv/distinfo
--- a/x11/xf86-video-nv/distinfo        Sat Jan 13 05:21:19 2007 +0000
+++ b/x11/xf86-video-nv/distinfo        Sat Jan 13 05:36:35 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/01/13 05:15:50 toshii Exp $
+$NetBSD: distinfo,v 1.2 2007/01/13 05:36:35 toshii Exp $
 
 SHA1 (xf86-video-nv-1.2.2.tar.bz2) = d71592820f8f4311cf946252feb7e06630bd5780
 RMD160 (xf86-video-nv-1.2.2.tar.bz2) = 963f70a6788982204b2309237ecddd6df5662083
 Size (xf86-video-nv-1.2.2.tar.bz2) = 297435 bytes
-SHA1 (patch-aa) = e668c55685b3b7ce26e659e83a32a09c523baab8
+SHA1 (patch-aa) = de29e063529ec92ee1ccf6b09b306fdccd3ff245
diff -r b10eb53e2a2a -r 5aa14de88430 x11/xf86-video-nv/patches/patch-aa
--- a/x11/xf86-video-nv/patches/patch-aa        Sat Jan 13 05:21:19 2007 +0000
+++ b/x11/xf86-video-nv/patches/patch-aa        Sat Jan 13 05:36:35 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/01/13 05:15:50 toshii Exp $
+$NetBSD: patch-aa,v 1.2 2007/01/13 05:36:35 toshii Exp $
 
---- configure.orig     2007-01-13 12:47:16.000000000 +0900
+--- configure.orig     2006-12-16 08:48:45.000000000 +0900
 +++ configure
-@@ -21458,7 +21458,7 @@ echo "$as_me: Building with package name
+@@ -21458,10 +21458,10 @@ echo "$as_me: Building with package name
        fi
  
  cat >>confdefs.h <<_ACEOF
@@ -10,4 +10,17 @@
 +#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'`
++      PVM=`echo $PACKAGE_VERSION | sed -ne 's/^\([^\.][^\.]*\)\.\([^\.][^\.]*\).*/\2/p'`
+       if test "x$PVM" = "x"; then
+               PVM="0"
+       fi
+@@ -21470,7 +21470,7 @@ cat >>confdefs.h <<_ACEOF
+ #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