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:   08-Jul-2007 09:52:52
  Branch: HEAD                             Handle: 2007070808525200

  Modified files:
    openpkg-src/jam         jam.spec

  Log:
    add FreeType Jam (ftjam) flavor

  Summary:
    Revision    Changes     Path
    1.15        +20 -2      openpkg-src/jam/jam.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/jam/jam.spec
  ============================================================================
  $ cvs diff -u -r1.14 -r1.15 jam.spec
  --- openpkg-src/jam/jam.spec  19 Jun 2007 09:09:33 -0000      1.14
  +++ openpkg-src/jam/jam.spec  8 Jul 2007 07:52:52 -0000       1.15
  @@ -25,6 +25,7 @@
   #   package version
   %define       V_perforce  2.5
   %define       V_boost     2.0-m11
  +%define       V_freetype  2.5.3rc2
   
   #   package information
   Name:         jam
  @@ -37,11 +38,12 @@
   Group:        Building
   License:      Freely distributable
   Version:      %{V_perforce}
  -Release:      20070619
  +Release:      20070708
   
   #   list of sources
   Source0:      ftp://ftp.perforce.com/pub/jam/jam-%{V_perforce}.tar
   Source1:      
http://switch.dl.sourceforge.net/boost/boost-build-%{V_boost}.tar.bz2
  +Source2:      http://david.freetype.org/jam/ftjam-%{V_freetype}.tar.bz2
   Patch0:       jam.patch
   
   #   build information
  @@ -62,7 +64,8 @@
       on-the-fly.
   
       This OpenPKG package contains both the original Jam from Perforce
  -    (jam) and the enhanced Jam from the Boost Build system (bjam).
  +    (jam), the enhanced Jam from the Boost Build system (bjam) and the
  +    enhanced Jam from the FreeType project (ftjam).
   
   %track
       prog jam:jam = {
  @@ -75,10 +78,16 @@
           url       = http://www.boost.org/tools/build/v2/index.html
           regex     = boost-build-(__VER__)\.tar\.bz2
       }
  +    prog jam:bjam = {
  +        version   = %{V_freetype}
  +        url       = http://david.freetype.org/jam/
  +        regex     = ftjam-(__VER__)\.tar\.bz2
  +    }
   
   %prep
       %setup -q -c
       %setup -q -T -D -a 1
  +    %setup -q -T -D -a 2
       %patch -p0
   
   %build
  @@ -92,6 +101,13 @@
       ( cd boost-build/jam_src
         sh ./build.sh
       ) || exit $?
  +    ( cd ftjam-%{V_freetype}
  +      CC="%{l_cc}" \
  +      CFLAGS="%{l_cflags -O}" \
  +      ./configure \
  +          --prefix=%{l_prefix}
  +      %{l_make} %{l_mflags}
  +    ) || exit $?
   
   %install
       rm -rf $RPM_BUILD_ROOT
  @@ -102,6 +118,8 @@
           jam-%{V_perforce}/bin.*/jam $RPM_BUILD_ROOT%{l_prefix}/bin/
       %{l_shtool} install -c -s -m 755 \
           boost-build/jam_src/bin.*/bjam $RPM_BUILD_ROOT%{l_prefix}/bin/
  +    %{l_shtool} install -c -s -m 755 \
  +        ftjam-%{V_freetype}/bin.unix/jam $RPM_BUILD_ROOT%{l_prefix}/bin/ftjam
       %{l_shtool} install -c -m 644 \
           boost-build/doc/html/jam/*.html 
$RPM_BUILD_ROOT%{l_prefix}/share/jam/bjam/
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to