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:   26-Jul-2005 08:23:26
  Branch: HEAD                             Handle: 2005072607232500

  Added files:
    openpkg-src/di          di.patch
  Modified files:
    openpkg-src/di          di.spec

  Log:
    upgrading package: di 3.11 -> 4.0

  Summary:
    Revision    Changes     Path
    1.1         +12 -0      openpkg-src/di/di.patch
    1.23        +10 -13     openpkg-src/di/di.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/di/di.patch
  ============================================================================
  $ cvs diff -u -r0 -r1.1 di.patch
  --- /dev/null 2005-07-26 08:23:17 +0200
  +++ di.patch  2005-07-26 08:23:25 +0200
  @@ -0,0 +1,12 @@
  +Index: Makefile
  +--- Makefile.orig    2005-07-25 23:38:32 +0200
  ++++ Makefile 2005-07-26 08:17:23 +0200
  +@@ -45,7 +45,7 @@
  + #
  + # simple man page installation
  + #
  +-MANPATH = $(prefix)/share/man
  ++MANPATH = $(prefix)/man
  + MANDIR = $(MANPATH)/man1
  + MANTARGET = $(PROG).1
  + MANPERM = 644
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/di/di.spec
  ============================================================================
  $ cvs diff -u -r1.22 -r1.23 di.spec
  --- openpkg-src/di/di.spec    24 Mar 2005 11:18:40 -0000      1.22
  +++ openpkg-src/di/di.spec    26 Jul 2005 06:23:25 -0000      1.23
  @@ -32,11 +32,12 @@
   Class:        PLUS
   Group:        System
   License:      MIT-style
  -Version:      3.11
  -Release:      20040312
  +Version:      4.0
  +Release:      20050726
   
   #   list of sources
   Source0:      http://www.gentoo.com/di/di-%{version}.tar.gz
  +Patch0:       di.patch
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -61,26 +62,22 @@
   
   %prep
       %setup -q
  -    %{l_shtool} subst \
  -        -e 's;4\.\*);[45].*);' \
  -        hints/freebsd.sh
  +    %patch -p0
   
   %build
  -    #   start compiler as 'gcc' to hint the configure script
  -    CC="%{l_prefix}/bin/gcc" \
  +    CC="%{l_cc}" \
       CFLAGS="%{l_cflags}" \
  -    ./configure \
  -        --prefix=%{l_prefix}
  +    LDFLAGS="%{l_ldflags}" \
  +    prefix=%{l_prefix} \
  +    ./Build
       %{l_make} %{l_mflags -O}
   
   %install
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/bin \
  -        $RPM_BUILD_ROOT%{l_prefix}/man/man1
  +        $RPM_BUILD_ROOT%{l_prefix}
       %{l_make} %{l_mflags} install \
  -        PREFIX=$RPM_BUILD_ROOT%{l_prefix} \
  -        MANDIR=$RPM_BUILD_ROOT%{l_prefix}/man/man1
  +        prefix=$RPM_BUILD_ROOT%{l_prefix}
       strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
   
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to