OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   22-Jul-2003 15:41:41
  Branch: HEAD                             Handle: 2003072214413901

  Added files:
    openpkg-src/perl56      perl56.patch
  Modified files:
    openpkg-src/perl56      perl56.spec
    openpkg-web             news.txt
  Removed files:
    openpkg-src/perl56      perl.patch

  Log:
    make sure patch file uses exactly the package name as prefix

  Summary:
    Revision    Changes     Path
    1.2         +0  -67     openpkg-src/perl56/perl.patch
    1.1         +67 -0      openpkg-src/perl56/perl56.patch
    1.5         +2  -2      openpkg-src/perl56/perl56.spec
    1.5720      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  rm -f openpkg-src/perl56/perl.patch <<'@@ .'
  Index: openpkg-src/perl56/perl.patch
  ============================================================================
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/perl56/perl56.patch
  ============================================================================
  $ cvs diff -u -r0 -r1.1 perl56.patch
  --- /dev/null 2003-07-22 15:41:40.000000000 +0200
  +++ perl56.patch      2003-07-22 15:41:41.000000000 +0200
  @@ -0,0 +1,67 @@
  +--- ext/Opcode/Safe.pm.orig
  ++++ ext/Opcode/Safe.pm
  +@@ -213,7 +213,7 @@
  +     # Create anon sub ref in root of compartment.
  +     # Uses a closure (on $expr) to pass in the code to be executed.
  +     # (eval on one line to keep line numbers as expected by caller)
  +-    my $evalcode = sprintf('package %s; sub { eval $expr; }', $root);
  ++    my $evalcode = sprintf('package %s; sub { @_ = (); eval $expr; }', $root);
  +     my $evalsub;
  + 
  +     if ($strict) { use strict; $evalsub = eval $evalcode; }
  +@@ -227,7 +227,7 @@
  +     my $root = $obj->{Root};
  + 
  +     my $evalsub = eval
  +-        sprintf('package %s; sub { do $file }', $root);
  ++        sprintf('package %s; sub { @_ = (); do $file }', $root);
  +     return Opcode::_safe_call_sv($root, $obj->{Mask}, $evalsub);
  + }
  +
  +--- makedepend.SH.orig       Mon Mar 19 08:33:17 2001
  ++++ makedepend.SH    Sun May 19 15:17:49 2002
  +@@ -141,6 +141,8 @@
  +         $cppstdin $finc -I. $cppflags $cppminus <UU/$file.c |
  +         $sed \
  +                 -e '/^#.*<stdin>/d' \
  ++                -e '/^#.*<built-in>/d' \
  ++                -e '/^#.*<command line>/d' \
  +         -e '/^#.*"-"/d' \
  +         -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \
  +         -e 's/^[     ]*#[    ]*line/#/' \
  +@@ -155,6 +157,8 @@
  +         $sed \
  +         -e '1d' \
  +         -e '/^#.*<stdin>/d' \
  ++                -e '/^#.*<built-in>/d' \
  ++                -e '/^#.*<command line>/d' \
  +         -e '/^#.*"-"/d' \
  +         -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \
  +         -e 's/^[     ]*#[    ]*line/#/' \
  +--- hints/dec_osf.sh.orig    Fri Feb 23 03:57:55 2001
  ++++ hints/dec_osf.sh Wed Jun  5 16:34:54 2002
  +@@ -65,7 +65,7 @@
  +     # reset
  +     _DEC_cc_style=
  + case "`$cc -v 2>&1 | grep cc`" in
  +-*gcc*)      _gcc_version=`$cc --version 2>&1 | tr . ' '`
  ++*gcc*)      _gcc_version=`$cc --version 2>&1 | head -1 | sed -e 's;^gcc (GCC) ;;' 
-e 's;^cc (GCC) ;;' | tr . ' '`
  +     set $_gcc_version
  +     if test "$1" -lt 2 -o \( "$1" -eq 2 -a \( "$2" -lt 95 -o \( "$2" -eq 95 -a 
"$3" -lt 2 \) \) \); then
  +         cat >&4 <<EOF
  +--- hints/freebsd.sh.orig    2002-08-26 16:57:58.000000000 +0200
  ++++ hints/freebsd.sh 2002-08-26 16:58:44.000000000 +0200
  +@@ -104,9 +104,10 @@
  + *)
  +         objformat=`/usr/bin/objformat`
  +         if [ x$objformat = xelf ]; then
  +-            libpth="/usr/lib /usr/local/lib"
  +-            glibpth="/usr/lib /usr/local/lib"
  +-            ldflags="-Wl,-E "
  ++            libpth=${libpth:-/usr/lib /usr/local/lib}
  ++            glibpth=${glibpth:-/usr/lib /usr/local/lib}
  ++            ldflags=`echo $ldflags | sed -e "s;.*\(-L[ ]*[^ ][^ ]*\).*;\1;"`
  ++            ldflags="-Wl,-E $ldflags"
  +             lddlflags="-shared "
  +         else
  +             if [ -e /usr/lib/aout ]; then
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/perl56/perl56.spec
  ============================================================================
  $ cvs diff -u -r1.4 -r1.5 perl56.spec
  --- openpkg-src/perl56/perl56.spec    8 Jul 2003 14:41:49 -0000       1.4
  +++ openpkg-src/perl56/perl56.spec    22 Jul 2003 13:41:40 -0000      1.5
  @@ -33,11 +33,11 @@
   Group:        Language
   License:      GPL/Artistic
   Version:      5.6.1
  -Release:      20030708
  +Release:      20030722
   
   #   list of sources
   Source0:      ftp://ftp.cpan.org/pub/CPAN/src/perl-%{version}.tar.gz
  -Patch0:       perl.patch
  +Patch0:       perl56.patch
   
   #   build information
   Prefix:       %{l_prefix}
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.5719 -r1.5720 news.txt
  --- openpkg-web/news.txt      22 Jul 2003 13:39:36 -0000      1.5719
  +++ openpkg-web/news.txt      22 Jul 2003 13:41:39 -0000      1.5720
  @@ -1,3 +1,4 @@
  +22-Jul-2003: Upgraded package: P<perl56-5.6.1-20030722>
   22-Jul-2003: Upgraded package: P<autoconf-2.57-20030722>
   22-Jul-2003: Upgraded package: P<pgp-6.5.8-20030722>
   22-Jul-2003: Upgraded package: P<perl-apache-20030722-20030722>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to