A few modifications of pkgsrc-wip/grub2 patches

[Grégoire Sutre <gregoire.sutre%labri.fr@localhost>]

Hi,

I tried to compile grub2 from pkgsrc-wip, but some of the patches 
included in the package were rejected.

This was due to changes in grub2 sources since the package was created, 
and the trick to make the patches pass was essentially to adapt the 
context lines.

In case someone is interested, I attach the diff between the current CVS 
pkgsrc-wip/grub2 directory and my local fixed copy.

Best,

Grégoire

Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/grub2/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo    20 Nov 2007 05:56:10 -0000      1.10
+++ distinfo    9 Dec 2009 19:06:09 -0000
@@ -1,8 +1,8 @@
 $NetBSD$
 
 SHA1 (patch-aa) = 3bf24d8da73dc283944d78ad18c97fb7fa297e10
-SHA1 (patch-ab) = cde3c795acae8343bf54ebda228c70f1b2ff2312
 SHA1 (patch-ag) = 2e9af1e1d8f340bf09bcc91d9e973e3e7adb56b0
 SHA1 (patch-ah) = 1048f551688628b8a577e46a292d92d587693fa3
 SHA1 (patch-ak) = c844ebd381519dc9d1a8a1029727b66a5812eb9c
-SHA1 (patch-al) = b5cbe09f1436446bde27bb2a1ebdadd5279e1da5
+SHA1 (patch-al) = 3ee5d6eb05d11286766280699abcdb89defde1a1
+SHA1 (patch-ab) = 3ebac7adfee145e029ae615c869a78e65aa875d0
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/grub2/patches/patch-ab,v
retrieving revision 1.8
diff -u -r1.8 patch-ab
--- patches/patch-ab    20 Nov 2007 05:56:10 -0000      1.8
+++ patches/patch-ab    9 Dec 2009 19:06:10 -0000
@@ -22,8 +22,8 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
 @@ -159,23 +160,23 @@ install-local: all
-         dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
          $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(sbindir)/$$dest; \
+         $(HELP2MAN) --section=8 $(builddir)/$$file > 
$(DESTDIR)$(mandir)/man8/$$dest.8; \
        done
 -      $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/grub.d
 +      $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
Index: patches/patch-al
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/grub2/patches/patch-al,v
retrieving revision 1.5
diff -u -r1.5 patch-al
--- patches/patch-al    20 Nov 2007 05:56:10 -0000      1.5
+++ patches/patch-al    9 Dec 2009 19:06:10 -0000
@@ -6,8 +6,8 @@
  
  %%
  /* It should be possible to do this in a clean way...  */
--script:               { state->err = 0} newlines commands
-+script:               { state->err = 0;} newlines commands
+-script_init:  { state->err = 0} script
++script_init:  { state->err = 0;} script
                  {
-                   state->parsed = $3;
+                   state->parsed = $2;
                  }

------------------------------------------------------------------------------
Return on Information:
Google Enterprise Search pays you back
Get the facts.
http://p.sf.net/sfu/google-dev2dev

_______________________________________________
pkgsrc-wip-discuss mailing list
pkgsrc-wip-discuss%lists.sourceforge.net@localhost
https://lists.sourceforge.net/lists/listinfo/pkgsrc-wip-discuss