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

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   04-Feb-2005 23:29:49
  Branch: HEAD                             Handle: 2005020422294900

  Modified files:
    openpkg-src/amd         amd.patch amd.spec

  Log:
    port to Solaris10 by hacking out the GROUP_OBJ conflicting definition

  Summary:
    Revision    Changes     Path
    1.11        +13 -0      openpkg-src/amd/amd.patch
    1.62        +1  -1      openpkg-src/amd/amd.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/amd/amd.patch
  ============================================================================
  $ cvs diff -u -r1.10 -r1.11 amd.patch
  --- openpkg-src/amd/amd.patch 21 Dec 2004 10:27:40 -0000      1.10
  +++ openpkg-src/amd/amd.patch 4 Feb 2005 22:29:49 -0000       1.11
  @@ -161,3 +161,16 @@
    
    struct opt_map {
      const char *opt;          /* option name */
  +Index: include/am_defs.h
  +--- include/am_defs.h.orig   2005-02-04 23:22:22 +0100
  ++++ include/am_defs.h        2005-02-04 23:22:23 +0100
  +@@ -908,6 +908,9 @@
  +  * Actions to take if <rpcsvc/nis.h> exists.
  +  */
  + #ifdef HAVE_RPCSVC_NIS_H
  ++#ifdef GROUP_OBJ
  ++#undef GROUP_OBJ
  ++#endif /* GROUP_OBJ */
  + # include <rpcsvc/nis.h>
  + #endif /* HAVE_RPCSVC_NIS_H */
  + 
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/amd/amd.spec
  ============================================================================
  $ cvs diff -u -r1.61 -r1.62 amd.spec
  --- openpkg-src/amd/amd.spec  1 Jan 2005 10:47:45 -0000       1.61
  +++ openpkg-src/amd/amd.spec  4 Feb 2005 22:29:49 -0000       1.62
  @@ -34,7 +34,7 @@
   Group:        System
   License:      BSD
   Version:      6.0.9
  -Release:      20041221
  +Release:      20050204
   
   #   list of sources
   Source0:      ftp://ftp.am-utils.org/pub/am-utils/am-utils-%{version}.tar.gz
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to