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:   28-Oct-2003 17:14:08
  Branch: HEAD                             Handle: 2003102816140701

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

  Log:
    port to OpenDarwin 6.6.2

  Summary:
    Revision    Changes     Path
    1.10        +64 -0      openpkg-src/perl/perl.patch
    1.82        +1  -1      openpkg-src/perl/perl.spec
    1.7206      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/perl/perl.patch
  ============================================================================
  $ cvs diff -u -r1.9 -r1.10 perl.patch
  --- openpkg-src/perl/perl.patch       26 Sep 2003 07:34:19 -0000      1.9
  +++ openpkg-src/perl/perl.patch       28 Oct 2003 16:14:08 -0000      1.10
  @@ -118,3 +118,67 @@
    #ifdef PERL_OTHERLIBDIRS
        incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE);
    #endif
  +
  +-----------------------------------------------------------------------------
  +
  +Port to [Open]Darwin 6.6.2:
  +
  +1. In OpenPKG, Perl does not use the vendor GCC and our GCC does not
  +   understand "-no-cpp-precomp", so remove this build option.
  +
  +2. The <sys/mman.h> indirectly includes system specific headers
  +   which in turn have fields named "environ" while Perl uses
  +   a define of "environ" internally. So wrap the inclusion.
  +
  +3. Darwin 6 no longer accepts the non-standard "#import" statements,
  +   so replace with "#include" and circumvent some header problem
  +   related to the non-standard "__private_extern__" attribute.
  +
  +Index: hints/darwin.sh
  +--- hints/darwin.sh.orig     2003-09-02 15:40:19.000000000 +0200
  ++++ hints/darwin.sh  2003-10-28 16:40:57.000000000 +0100
  +@@ -115,9 +115,6 @@
  +   *-2147483648) ccflags="${ccflags} -DINT32_MIN_BROKEN -DINT64_MIN_BROKEN" ;;
  + esac
  + 
  +-# Avoid Apple's cpp precompiler, better for extensions
  +-cppflags="${cppflags} -no-cpp-precomp"
  +-
  + # This is necessary because perl's build system doesn't
  + # apply cppflags to cc compile lines as it should.
  + ccflags="${ccflags} ${cppflags}"
  +Index: perlio.c
  +--- perlio.c.orig    2003-09-24 22:50:22.000000000 +0200
  ++++ perlio.c 2003-10-28 17:03:59.000000000 +0100
  +@@ -432,7 +432,14 @@
  + #include <unistd.h>
  + #endif
  + #ifdef HAS_MMAP
  ++#ifdef PERL_DARWIN
  ++#define environ_safe environ
  ++#undef environ
  + #include <sys/mman.h>
  ++#define environ environ_safe
  ++#else
  ++#include <sys/mman.h>
  ++#endif
  + #endif
  + 
  + /*
  +Index: ext/DynaLoader/dl_dyld.xs
  +--- ext/DynaLoader/dl_dyld.xs.orig   2003-09-02 15:39:27.000000000 +0200
  ++++ ext/DynaLoader/dl_dyld.xs        2003-10-28 17:07:31.000000000 +0100
  +@@ -45,7 +45,13 @@
  + 
  + #undef environ
  + #undef bool
  ++#ifdef PERL_DARWIN
  ++#define __private_extern__ extern
  ++#include <mach-o/dyld.h>
  ++#undef __private_extern__
  ++#else
  + #import <mach-o/dyld.h>
  ++#endif
  + 
  + static char *dlerror()
  + {
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/perl/perl.spec
  ============================================================================
  $ cvs diff -u -r1.81 -r1.82 perl.spec
  --- openpkg-src/perl/perl.spec        26 Sep 2003 07:34:19 -0000      1.81
  +++ openpkg-src/perl/perl.spec        28 Oct 2003 16:14:08 -0000      1.82
  @@ -33,7 +33,7 @@
   Group:        Language
   License:      GPL/Artistic
   Version:      5.8.1
  -Release:      20030926
  +Release:      20031028
   
   #   list of sources
   Source0:      ftp://ftp.cpan.org/pub/CPAN/src/perl-%{version}.tar.gz
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.7205 -r1.7206 news.txt
  --- openpkg-web/news.txt      28 Oct 2003 16:13:57 -0000      1.7205
  +++ openpkg-web/news.txt      28 Oct 2003 16:14:07 -0000      1.7206
  @@ -1,3 +1,4 @@
  +28-Oct-2003: Upgraded package: P<perl-5.8.1-20031028>
   28-Oct-2003: Upgraded package: P<apache-1.3.29-20031028>
   27-Oct-2003: Upgraded package: P<mplayer-1.0pre2-20031027>
   27-Oct-2003: Upgraded package: P<monit-4.1-20031027>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to