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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   18-Aug-2006 15:07:05
  Branch: HEAD                             Handle: 2006081814070500

  Modified files:
    openpkg-src/perl-www    perl-www.patch perl-www.spec

  Log:
    install embpcgi script and fix shebang in all embperl scripts

  Summary:
    Revision    Changes     Path
    1.18        +11 -2      openpkg-src/perl-www/perl-www.patch
    1.308       +6  -2      openpkg-src/perl-www/perl-www.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/perl-www/perl-www.patch
  ============================================================================
  $ cvs diff -u -r1.17 -r1.18 perl-www.patch
  --- openpkg-src/perl-www/perl-www.patch       18 Jul 2006 11:39:42 -0000      
1.17
  +++ openpkg-src/perl-www/perl-www.patch       18 Aug 2006 13:07:05 -0000      
1.18
  @@ -1,6 +1,6 @@
   Index: Embperl-2.2.0/Makefile.PL
   --- Embperl-2.2.0/Makefile.PL.orig   2005-10-26 08:44:21 +0200
  -+++ Embperl-2.2.0/Makefile.PL        2005-11-15 08:12:18 +0100
  ++++ Embperl-2.2.0/Makefile.PL        2006-08-18 13:51:54 +0200
   @@ -621,7 +621,7 @@
    $base = $ENV{'ProgramFiles'} if ($win32) ;
    
  @@ -10,9 +10,18 @@
    
    if ($apache && $apache_src ne '')
        {
  +@@ -1330,7 +1330,7 @@
  +     'LIBS'     => [$libs || ''],                     
  +     'DEFINE'           => "$d \$(DEFS)",                     
  +     'INC'      => $i,                        
  +-    'EXE_FILES'    => [ 'embpexec.pl', 'embpmsgid.pl' ],
  ++    'EXE_FILES'    => [ 'embpexec.pl', 'embpmsgid.pl', 'embpcgi.pl' ],
  +     'clean'        => { FILES => 'dirent.h test/conf/httpd.conf 
test/conf/httpd.stop.conf test/conf/httpd.min.conf test/tmp/* Embperl.c 
$(OBJECT)' },
  +     'realclean'    => { FILES => 'embpmsgid.pl embpexec.pl embpexec.bat 
embpcgi.pl embpcgi.test.pl embpcgi.bat epocgi.pl epocgi.bat epocgi.test.pl 
embpfastcgi.pl embpfastcgi.test.pl test/conf/config.pl xs/mmargs.pl' },
  +     'dist'         => { COMPRESS => 'gzip', SUFFIX => 'gz'},
   Index: Embperl-2.2.0/driver/epxalan.MAKEPL
   --- Embperl-2.2.0/driver/epxalan.MAKEPL.orig 2005-10-26 00:16:36 +0200
  -+++ Embperl-2.2.0/driver/epxalan.MAKEPL      2005-11-15 08:12:18 +0100
  ++++ Embperl-2.2.0/driver/epxalan.MAKEPL      2006-08-18 13:51:33 +0200
   @@ -8,7 +8,7 @@
    
    if (!$win32)
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/perl-www/perl-www.spec
  ============================================================================
  $ cvs diff -u -r1.307 -r1.308 perl-www.spec
  --- openpkg-src/perl-www/perl-www.spec        17 Aug 2006 17:01:36 -0000      
1.307
  +++ openpkg-src/perl-www/perl-www.spec        18 Aug 2006 13:07:05 -0000      
1.308
  @@ -95,7 +95,7 @@
   Group:        Language
   License:      GPL/Artistic
   Version:      %{V_perl}
  -Release:      20060817
  +Release:      20060818
   
   #   list of sources
   Source0:      http://www.cpan.org/modules/by-module/URI/URI-%{V_uri}.tar.gz
  @@ -606,7 +606,11 @@
       #   cleanup installation
       ( cd $RPM_BUILD_ROOT%{l_prefix}/bin
         for prog in *.pl; do
  -          mv $prog `echo $prog | sed -e 's;\.pl$;;'`
  +          base=`echo $prog | sed -e 's;\.pl$;;'`
  +          %{l_shtool} install -c -m 755 \
  +              -e 's;^#!/.*;#!%{l_prefix}/bin/perl;' \
  +              $prog $base
  +          rm -f $prog
         done
       ) || exit $?
   
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to