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:   08-Jul-2003 16:25:26
  Branch: HEAD                             Handle: 2003070815245729

  Modified files:
    openpkg-src/aspell      aspell.spec
    openpkg-src/cpu         cpu.spec
    openpkg-src/devtodo     devtodo.spec
    openpkg-src/dialog      dialog.spec
    openpkg-src/emacs       emacs.spec
    openpkg-src/exim        exim.spec
    openpkg-src/file        file.spec
    openpkg-src/gdk-pixbuf  gdk-pixbuf.spec
    openpkg-src/gnuplot     gnuplot.spec
    openpkg-src/grep        grep.spec
    openpkg-src/gv          gv.spec
    openpkg-src/imlib       imlib.spec
    openpkg-src/ipaudit     ipaudit.spec
    openpkg-src/ircd        ircd.spec
    openpkg-src/lbreakout   lbreakout.spec
    openpkg-src/libxml      libxml.spec
    openpkg-src/libxslt     libxslt.spec
    openpkg-src/links       links.spec
    openpkg-src/lout        lout.spec
    openpkg-src/mc          mc.spec
    openpkg-src/mico        mico.spec
    openpkg-src/neon        neon.spec
    openpkg-src/openssl     openssl.spec
    openpkg-src/perl        perl.spec
    openpkg-src/perl-comp   perl-comp.spec
    openpkg-src/perl-curses perl-curses.spec
    openpkg-src/perl-gd     perl-gd.spec
    openpkg-src/perl-tk     perl-tk.spec
    openpkg-src/perl56      perl56.spec
    openpkg-src/php         php.spec
    openpkg-src/popt        popt.spec
    openpkg-src/postfix     postfix.spec
    openpkg-src/radius      radius.spec
    openpkg-src/rc          rc.spec
    openpkg-src/samba       samba.spec
    openpkg-src/scanssh     scanssh.spec
    openpkg-src/sendmail    sendmail.spec
    openpkg-src/siege       siege.spec
    openpkg-src/styx        styx.spec
    openpkg-src/subversion  subversion.spec
    openpkg-src/transfig    transfig.spec
    openpkg-src/unixodbc    unixodbc.spec
    openpkg-src/vcg         vcg.spec
    openpkg-src/vilistextum vilistextum.spec
    openpkg-src/wml         wml.spec
    openpkg-src/xfig        xfig.spec
    openpkg-src/xmame       xmame.spec
    openpkg-src/xmms        xmms.spec
    openpkg-src/xplanet     xplanet.spec
    openpkg-web             news.txt

  Log:
    finish modernization of build flags through %{l_ldflags} and
    %{l_cppflags}

  Summary:
    Revision    Changes     Path
    1.14        +4  -4      openpkg-src/aspell/aspell.spec
    1.19        +5  -5      openpkg-src/cpu/cpu.spec
    1.15        +6  -6      openpkg-src/devtodo/devtodo.spec
    1.11        +5  -5      openpkg-src/dialog/dialog.spec
    1.36        +5  -5      openpkg-src/emacs/emacs.spec
    1.41        +6  -6      openpkg-src/exim/exim.spec
    1.35        +4  -4      openpkg-src/file/file.spec
    1.19        +4  -4      openpkg-src/gdk-pixbuf/gdk-pixbuf.spec
    1.11        +4  -4      openpkg-src/gnuplot/gnuplot.spec
    1.33        +5  -5      openpkg-src/grep/grep.spec
    1.9         +5  -5      openpkg-src/gv/gv.spec
    1.27        +6  -6      openpkg-src/imlib/imlib.spec
    1.11        +5  -5      openpkg-src/ipaudit/ipaudit.spec
    1.35        +5  -5      openpkg-src/ircd/ircd.spec
    1.15        +5  -5      openpkg-src/lbreakout/lbreakout.spec
    1.61        +6  -6      openpkg-src/libxml/libxml.spec
    1.50        +6  -6      openpkg-src/libxslt/libxslt.spec
    1.28        +6  -6      openpkg-src/links/links.spec
    1.16        +5  -5      openpkg-src/lout/lout.spec
    1.27        +6  -6      openpkg-src/mc/mc.spec
    1.31        +4  -4      openpkg-src/mico/mico.spec
    1.32        +5  -5      openpkg-src/neon/neon.spec
    1.43        +5  -5      openpkg-src/openssl/openssl.spec
    1.8         +7  -7      openpkg-src/perl-comp/perl-comp.spec
    1.31        +8  -8      openpkg-src/perl-curses/perl-curses.spec
    1.52        +5  -5      openpkg-src/perl-gd/perl-gd.spec
    1.21        +7  -7      openpkg-src/perl-tk/perl-tk.spec
    1.76        +4  -4      openpkg-src/perl/perl.spec
    1.3         +4  -4      openpkg-src/perl56/perl56.spec
    1.54        +5  -5      openpkg-src/php/php.spec
    1.15        +5  -5      openpkg-src/popt/popt.spec
    1.146       +7  -7      openpkg-src/postfix/postfix.spec
    1.24        +5  -5      openpkg-src/radius/radius.spec
    1.23        +5  -5      openpkg-src/rc/rc.spec
    1.42        +5  -5      openpkg-src/samba/samba.spec
    1.21        +5  -5      openpkg-src/scanssh/scanssh.spec
    1.80        +7  -7      openpkg-src/sendmail/sendmail.spec
    1.33        +5  -5      openpkg-src/siege/siege.spec
    1.10        +5  -5      openpkg-src/styx/styx.spec
    1.18        +4  -4      openpkg-src/subversion/subversion.spec
    1.6         +6  -6      openpkg-src/transfig/transfig.spec
    1.34        +4  -4      openpkg-src/unixodbc/unixodbc.spec
    1.5         +5  -5      openpkg-src/vcg/vcg.spec
    1.12        +5  -5      openpkg-src/vilistextum/vilistextum.spec
    1.32        +6  -6      openpkg-src/wml/wml.spec
    1.12        +7  -7      openpkg-src/xfig/xfig.spec
    1.38        +7  -7      openpkg-src/xmame/xmame.spec
    1.11        +4  -4      openpkg-src/xmms/xmms.spec
    1.10        +5  -5      openpkg-src/xplanet/xplanet.spec
    1.5447      +45 -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/aspell/aspell.spec
  ============================================================================
  $ cvs diff -u -r1.13 -r1.14 aspell.spec
  --- openpkg-src/aspell/aspell.spec    4 Jul 2003 09:36:04 -0000       1.13
  +++ openpkg-src/aspell/aspell.spec    8 Jul 2003 14:24:59 -0000       1.14
  @@ -38,7 +38,7 @@
   Group:        Text
   License:      GPL
   Version:      %{V_aspell}
  -Release:      20030704
  +Release:      20030708
   
   #   list of sources
   Source0:      ftp://ftp.gnu.org/gnu/aspell/aspell-%{V_aspell}.tar.gz
  @@ -48,8 +48,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20021204, gcc, ncurses
  -PreReq:       OpenPKG, openpkg >= 20021204, ncurses, perl
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, gcc, ncurses
  +PreReq:       OpenPKG, openpkg >= 20030708, ncurses, perl
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -81,7 +81,7 @@
             --prefix=%{l_prefix} \
             --sysconfdir=%{l_prefix}/etc/aspell \
             --enable-curses-include=%{l_prefix}/include \
  -          --enable-curses="-L%{l_prefix}/lib -lncurses" \
  +          --enable-curses="%{l_ldflags} -lncurses" \
             --disable-shared
         %{l_make} %{l_mflags -O}
       )
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/cpu/cpu.spec
  ============================================================================
  $ cvs diff -u -r1.18 -r1.19 cpu.spec
  --- openpkg-src/cpu/cpu.spec  7 Jul 2003 10:02:22 -0000       1.18
  +++ openpkg-src/cpu/cpu.spec  8 Jul 2003 14:25:00 -0000       1.19
  @@ -33,7 +33,7 @@
   Group:        Converter
   License:      GPL
   Version:      1.3.100
  -Release:      20030707
  +Release:      20030708
   
   #   list of sources
   Source0:      http://osdn.dl.sourceforge.net/sourceforge/cpu/cpu-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20021230, gcc
  -PreReq:       OpenPKG, openpkg >= 20021230
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, gcc
  +PreReq:       OpenPKG, openpkg >= 20030708
   BuildPreReq:  openldap, openssl
   PreReq:       openldap, openssl
   AutoReq:      no
  @@ -66,8 +66,8 @@
       esac
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
  -    CPPFLAGS="-I%{l_prefix}/include" \
  -    LDFLAGS="-L%{l_prefix}/lib" \
  +    CPPFLAGS="%{l_cppflags}" \
  +    LDFLAGS="%{l_ldflags}" \
       LIBS="-lldap -llber -lssl -lcrypto $libs" \
       ./configure \
           --prefix=%{l_prefix} \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/devtodo/devtodo.spec
  ============================================================================
  $ cvs diff -u -r1.14 -r1.15 devtodo.spec
  --- openpkg-src/devtodo/devtodo.spec  7 Jul 2003 10:06:21 -0000       1.14
  +++ openpkg-src/devtodo/devtodo.spec  8 Jul 2003 14:25:01 -0000       1.15
  @@ -33,7 +33,7 @@
   Group:        Text
   License:      GPL
   Version:      0.1.17
  -Release:      20030707
  +Release:      20030708
   
   #   list of sources
   Source0:      http://devtodo.sourceforge.net/?%{version}/devtodo-%{version}.tar.gz
  @@ -43,8 +43,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20021204, make, gcc
  -PreReq:       OpenPKG, openpkg >= 20021204
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, make, gcc
  +PreReq:       OpenPKG, openpkg >= 20030708
   BuildPreReq:  ncurses, readline
   PreReq:       ncurses, readline
   AutoReq:      no
  @@ -61,9 +61,9 @@
   %build
       CC="%{l_cc}" \
       CXX="%{l_cxx}" \
  -    CFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \
  -    CXXFLAGS="%{l_cxxflags -O} -I%{l_prefix}/include -Wno-deprecated" \
  -    LDFLAGS="-L%{l_prefix}/include" \
  +    CFLAGS="%{l_cflags -O} %{l_cppflags}" \
  +    CXXFLAGS="%{l_cxxflags -O} %{l_cppflags} -Wno-deprecated" \
  +    LDFLAGS="%{l_ldflags}" \
       ./configure \
           --prefix=%{l_prefix} \
           --sysconfdir=%{l_prefix}/etc/devtodo
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/dialog/dialog.spec
  ============================================================================
  $ cvs diff -u -r1.10 -r1.11 dialog.spec
  --- openpkg-src/dialog/dialog.spec    8 Mar 2003 21:33:24 -0000       1.10
  +++ openpkg-src/dialog/dialog.spec    8 Jul 2003 14:25:01 -0000       1.11
  @@ -37,7 +37,7 @@
   Group:        Terminal
   License:      BSD
   Version:      %{V_maj}.%{V_min}
  -Release:      20030308
  +Release:      20030708
   
   #   list of sources
   Source0:      ftp://invisible-island.net/dialog/dialog-%{V_maj}-%{V_min}.tgz
  @@ -45,8 +45,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, ncurses
  -PreReq:       OpenPKG, openpkg >= 20020206, ncurses
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, ncurses
  +PreReq:       OpenPKG, openpkg >= 20030708, ncurses
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -63,8 +63,8 @@
   %build
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
  -    CPPFLAGS="-I%{l_prefix}/include" \
  -    LDFLAGS="-L%{l_prefix}/lib" \
  +    CPPFLAGS="%{l_cppflags}" \
  +    LDFLAGS="%{l_ldflags}" \
       ./configure \
           --prefix=%{l_prefix}
       %{l_make} %{l_mflags -O}
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/emacs/emacs.spec
  ============================================================================
  $ cvs diff -u -r1.35 -r1.36 emacs.spec
  --- openpkg-src/emacs/emacs.spec      7 Jul 2003 10:12:49 -0000       1.35
  +++ openpkg-src/emacs/emacs.spec      8 Jul 2003 14:25:02 -0000       1.36
  @@ -33,7 +33,7 @@
   Group:        Editor
   License:      GPL
   Version:      21.3
  -Release:      20030707
  +Release:      20030708
   
   #   package options
   %option       with_x11       no
  @@ -53,8 +53,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20030103, make, texinfo
  -PreReq:       OpenPKG, openpkg >= 20030103
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, make, texinfo
  +PreReq:       OpenPKG, openpkg >= 20030708
   %if "%{with_x11}" == "yes"
   BuildPreReq:  X11
   PreReq:       X11
  @@ -85,8 +85,8 @@
           configure
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
  -    CPPFLAGS="-I%{l_prefix}/include" \
  -    LDFLAGS="-L%{l_prefix}/lib" \
  +    CPPFLAGS="%{l_cppflags}" \
  +    LDFLAGS="%{l_ldflags}" \
       ./configure \
           --prefix=%{l_prefix} \
   %if "%{with_x11}" == "yes"
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/exim/exim.spec
  ============================================================================
  $ cvs diff -u -r1.40 -r1.41 exim.spec
  --- openpkg-src/exim/exim.spec        8 Jul 2003 13:02:52 -0000       1.40
  +++ openpkg-src/exim/exim.spec        8 Jul 2003 14:25:03 -0000       1.41
  @@ -47,8 +47,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20030415, perl, gzip, tar
  -PreReq:       OpenPKG, openpkg >= 20030415, perl, gzip
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, perl, gzip, tar
  +PreReq:       OpenPKG, openpkg >= 20030708, perl, gzip
   BuildPreReq:  openssl, db >= 4.1.24
   PreReq:       openssl, db >= 4.1.24
   %if "%{with_fsl}" == "yes"
  @@ -90,11 +90,11 @@
         echo "INFO_DIRECTORY=%{l_prefix}/info"
         echo "SUPPORT_MOVE_FROZEN_MESSAGES=yes"
         echo "SUPPORT_TLS=yes"
  -      echo "TLS_INCLUDE=-I%{l_prefix}/include"
  -      echo "TLS_LIBS=-L%{l_prefix}/lib -lssl -lcrypto"
  +      echo "TLS_INCLUDE=%{l_cppflags}"
  +      echo "TLS_LIBS=%{l_ldflags} -lssl -lcrypto"
         echo "TRANSPORT_LMTP=yes"
  -      echo "INCLUDE=-I%{l_prefix}/include"
  -      echo "DBMLIB=-L%{l_prefix}/lib -ldb"
  +      echo "INCLUDE=%{l_cppflags}"
  +      echo "DBMLIB=%{l_ldflags} -ldb"
         echo "USE_DB=yes"
         echo "PERL_COMMAND=%{l_prefix}/bin/perl"
         echo "CHOWN_COMMAND=true"
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/file/file.spec
  ============================================================================
  $ cvs diff -u -r1.34 -r1.35 file.spec
  --- openpkg-src/file/file.spec        7 Jul 2003 10:16:21 -0000       1.34
  +++ openpkg-src/file/file.spec        8 Jul 2003 14:25:04 -0000       1.35
  @@ -33,7 +33,7 @@
   Group:        Filesystem
   License:      BSD
   Version:      4.03
  -Release:      20030707
  +Release:      20030708
   
   #   list of sources
   Source0:      ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20021002, gcc, make
  -PreReq:       OpenPKG, openpkg >= 20021002
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, gcc, make
  +PreReq:       OpenPKG, openpkg >= 20030708
   BuildPreReq:  zlib
   PreReq:       zlib
   AutoReq:      no
  @@ -63,7 +63,7 @@
           -e 's;AUTOHEADER=autoheader;AUTOHEADER=true;' \
           configure
       CC="%{l_cc}" \
  -    CFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \
  +    CFLAGS="%{l_cflags -O} %{l_cppflags}" \
       CPPFLAGS="%{l_cppflags}" \
       LDFLAGS="%{l_ldflags}" \
       ./configure \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/gdk-pixbuf/gdk-pixbuf.spec
  ============================================================================
  $ cvs diff -u -r1.18 -r1.19 gdk-pixbuf.spec
  --- openpkg-src/gdk-pixbuf/gdk-pixbuf.spec    28 May 2003 09:43:07 -0000      1.18
  +++ openpkg-src/gdk-pixbuf/gdk-pixbuf.spec    8 Jul 2003 14:25:05 -0000       1.19
  @@ -37,7 +37,7 @@
   Group:        XWindow
   License:      GPL
   Version:      %{V_major}.%{V_minor}
  -Release:      20030528
  +Release:      20030708
   
   #   list of sources
   Source0:      
ftp://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/%{V_major}/gdk-pixbuf-%{version}.tar.bz2
  @@ -45,8 +45,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, X11, glib, gtk, png, jpeg, tiff, make
  -PreReq:       OpenPKG, openpkg >= 20020206, X11, glib, gtk, png, jpeg, tiff
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, X11, glib, gtk, png, jpeg, tiff, make
  +PreReq:       OpenPKG, openpkg >= 20030708, X11, glib, gtk, png, jpeg, tiff
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -60,7 +60,7 @@
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
       CPPFLAGS="%{l_cppflags tiff glib}" \
  -    LDFLAGS="-L%{l_prefix}/lib" \
  +    LDFLAGS="%{l_ldflags}" \
       ./configure \
           --prefix=%{l_prefix} \
           --with-x \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/gnuplot/gnuplot.spec
  ============================================================================
  $ cvs diff -u -r1.10 -r1.11 gnuplot.spec
  --- openpkg-src/gnuplot/gnuplot.spec  8 Jul 2003 11:48:22 -0000       1.10
  +++ openpkg-src/gnuplot/gnuplot.spec  8 Jul 2003 14:25:05 -0000       1.11
  @@ -44,8 +44,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, png, zlib, readline, ncurses
  -PreReq:       OpenPKG, openpkg >= 20020206, png, zlib, readline, ncurses
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, png, zlib, readline, ncurses
  +PreReq:       OpenPKG, openpkg >= 20030708, png, zlib, readline, ncurses
   %if "%{with_x11}" == "yes"
   BuildPreReq:  X11
   PreReq:       X11
  @@ -66,8 +66,8 @@
   %build
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
  -    CPPFLAGS="-I%{l_prefix}/include" \
  -    LDFLAGS="-L%{l_prefix}/lib" \
  +    CPPFLAGS="%{l_cppflags}" \
  +    LDFLAGS="%{l_ldflags}" \
       ./configure \
           --prefix=%{l_prefix} \
           --datadir=%{l_prefix}/share/gnuplot \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/grep/grep.spec
  ============================================================================
  $ cvs diff -u -r1.32 -r1.33 grep.spec
  --- openpkg-src/grep/grep.spec        7 Jul 2003 10:19:18 -0000       1.32
  +++ openpkg-src/grep/grep.spec        8 Jul 2003 14:25:06 -0000       1.33
  @@ -33,7 +33,7 @@
   Group:        Text
   License:      GPL
   Version:      2.5.1
  -Release:      20030707
  +Release:      20030708
   
   #   list of sources
   Source0:      ftp://ftp.gnu.org/gnu/grep/grep-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, gcc, make, bison
  -PreReq:       OpenPKG, openpkg >= 20020206
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, gcc, make, bison
  +PreReq:       OpenPKG, openpkg >= 20030708
   BuildPreReq:  libiconv, pcre, gettext
   PreReq:       libiconv, pcre, gettext
   AutoReq:      no
  @@ -59,8 +59,8 @@
   %build
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
  -    CPPFLAGS="-I%{l_prefix}/include" \
  -    LDFLAGS="-L%{l_prefix}/lib" \
  +    CPPFLAGS="%{l_cppflags}" \
  +    LDFLAGS="%{l_ldflags}" \
       %{l_bash} ./configure \
           --prefix=%{l_prefix} \
           --with-included-gettext
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/gv/gv.spec
  ============================================================================
  $ cvs diff -u -r1.8 -r1.9 gv.spec
  --- openpkg-src/gv/gv.spec    9 May 2003 08:22:35 -0000       1.8
  +++ openpkg-src/gv/gv.spec    8 Jul 2003 14:25:06 -0000       1.9
  @@ -33,7 +33,7 @@
   Group:        XWindow
   License:      GPL
   Version:      3.5.8
  -Release:      20030509
  +Release:      20030708
   
   #   list of sources
   Source0:      ftp://ftpthep.physik.uni-mainz.de/pub/gv/unix/gv-%{version}.tar.gz
  @@ -43,8 +43,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, X11, xaw3d, ghostscript
  -PreReq:       OpenPKG, openpkg >= 20020206, X11, xaw3d, ghostscript
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, X11, xaw3d, ghostscript
  +PreReq:       OpenPKG, openpkg >= 20030708, X11, xaw3d, ghostscript
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -72,8 +72,8 @@
   
       #   make sure OpenPKG Xaw3d is found
       %{l_shtool} subst \
  -        -e 's;^\(DEFINES[    ]*=\)\(.*\);\1 -I%{l_prefix}/include \2;' \
  -        -e 's;^\(SYS_LIBS_1[         ]*=\)\(.*\);\1 -L%{l_prefix}/lib \2;' \
  +        -e 's;^\(DEFINES[    ]*=\)\(.*\);\1 %{l_cppflags} \2;' \
  +        -e 's;^\(SYS_LIBS_1[         ]*=\)\(.*\);\1 %{l_ldflags} \2;' \
           source/Imakefile
   
       #   generate Makefiles and build gv
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/imlib/imlib.spec
  ============================================================================
  $ cvs diff -u -r1.26 -r1.27 imlib.spec
  --- openpkg-src/imlib/imlib.spec      28 Mar 2003 10:32:08 -0000      1.26
  +++ openpkg-src/imlib/imlib.spec      8 Jul 2003 14:25:07 -0000       1.27
  @@ -37,7 +37,7 @@
   Group:        XWindow
   License:      GPL
   Version:      %{V_major}.%{V_minor}
  -Release:      20030328
  +Release:      20030708
   
   #   list of sources
   Source0:      
ftp://ftp.gnome.org/pub/GNOME/sources/imlib/%{V_major}/imlib-%{version}.tar.gz
  @@ -45,8 +45,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, glib, gtk, tiff, jpeg, png, giflib, make
  -PreReq:       OpenPKG, openpkg >= 20020206, glib, gtk, tiff, jpeg, png, giflib
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, glib, gtk, tiff, jpeg, png, giflib, make
  +PreReq:       OpenPKG, openpkg >= 20030708, glib, gtk, tiff, jpeg, png, giflib
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -58,9 +58,9 @@
   
   %build
       CC="%{l_cc}" \
  -    CPPFLAGS="-I%{l_prefix}/include -I%{l_prefix}/include/tiff" \
  -    CFLAGS="%{l_cflags -O} -I%{l_prefix}/include -I%{l_prefix}/include/tiff" \
  -    LDFLAGS="-L%{l_prefix}/lib" \
  +    CPPFLAGS="%{l_cppflags tiff}" \
  +    CFLAGS="%{l_cflags -O} %{l_cppflags tiff}" \
  +    LDFLAGS="%{l_ldflags}" \
       ./configure \
           --prefix=%{l_prefix} \
           --sysconfdir=%{l_prefix}/etc/imlib \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/ipaudit/ipaudit.spec
  ============================================================================
  $ cvs diff -u -r1.10 -r1.11 ipaudit.spec
  --- openpkg-src/ipaudit/ipaudit.spec  7 Jul 2003 10:26:50 -0000       1.10
  +++ openpkg-src/ipaudit/ipaudit.spec  8 Jul 2003 14:25:07 -0000       1.11
  @@ -33,7 +33,7 @@
   Group:        Network
   License:      GPL
   Version:      0.95
  -Release:      20030707
  +Release:      20030708
   
   #   list of sources
   Source0:      http://ipaudit.sourceforge.net/download/ipaudit-%{version}.tgz
  @@ -42,8 +42,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206
  -PreReq:       OpenPKG, openpkg >= 20020206
  +BuildPreReq:  OpenPKG, openpkg >= 20030708
  +PreReq:       OpenPKG, openpkg >= 20030708
   BuildPreReq:  libpcap
   PreReq:       libpcap
   AutoReq:      no
  @@ -71,10 +71,10 @@
   %build
       %{l_shtool} subst \
           -e 's;^\(MAKE=\).*$;\1%{l_make};' \
  -        -e 's;^\(CIDIR=\).*$;\1-I%{l_prefix}/include;' \
  +        -e 's;^\(CIDIR=\).*$;\1%{l_cppflags};' \
           Makefile
       %{l_shtool} subst \
  -        -e 's;^\(CIDIR=\).*$;\1-I%{l_prefix}/include;' \
  +        -e 's;^\(CIDIR=\).*$;\1%{l_cppflags};' \
           src/Makefile
       %{l_make} %{l_mflags -O}
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/ircd/ircd.spec
  ============================================================================
  $ cvs diff -u -r1.34 -r1.35 ircd.spec
  --- openpkg-src/ircd/ircd.spec        8 Jul 2003 09:20:39 -0000       1.34
  +++ openpkg-src/ircd/ircd.spec        8 Jul 2003 14:25:08 -0000       1.35
  @@ -49,8 +49,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20030415
  -PreReq:       OpenPKG, openpkg >= 20030415
  +BuildPreReq:  OpenPKG, openpkg >= 20030708
  +PreReq:       OpenPKG, openpkg >= 20030708
   BuildPreReq:  zlib
   PreReq:       zlib
   %if "%{with_fsl}" == "yes"
  @@ -78,9 +78,9 @@
   
   %build
       CC="%{l_cc}" \
  -    CFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \
  -    CPPFLAGS="-I%{l_prefix}/include" \
  -    LDFLAGS="-L%{l_prefix}/lib %{l_fsl_ldflags}" \
  +    CFLAGS="%{l_cflags -O} %{l_cppflags}" \
  +    CPPFLAGS="%{l_cppflags}" \
  +    LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
       LIBS="%{l_fsl_libs}" \
       ./configure \
           --prefix=%{l_prefix} \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/lbreakout/lbreakout.spec
  ============================================================================
  $ cvs diff -u -r1.14 -r1.15 lbreakout.spec
  --- openpkg-src/lbreakout/lbreakout.spec      4 Jul 2003 12:55:41 -0000       1.14
  +++ openpkg-src/lbreakout/lbreakout.spec      8 Jul 2003 14:25:08 -0000       1.15
  @@ -33,7 +33,7 @@
   Group:        Games
   License:      GPL
   Version:      2.4.1
  -Release:      20030704
  +Release:      20030708
   
   #   list of sources
   Source0:      
http://osdn.dl.sourceforge.net/sourceforge/lgames/lbreakout2-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, make, X11, sdl >= 1.2.5, png, zlib
  -PreReq:       OpenPKG, openpkg >= 20020206, X11, sdl >= 1.2.5, png, zlib
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, make, X11, sdl >= 1.2.5, png, zlib
  +PreReq:       OpenPKG, openpkg >= 20030708, X11, sdl >= 1.2.5, png, zlib
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -64,8 +64,8 @@
   %build
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
  -    CPPFLAGS="-I%{l_prefix}/include" \
  -    LDFLAGS="-L%{l_prefix}/lib" \
  +    CPPFLAGS="%{l_cppflags}" \
  +    LDFLAGS="%{l_ldflags}" \
       LIBS="-lz" \
       ./configure \
           --prefix=%{l_prefix} \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/libxml/libxml.spec
  ============================================================================
  $ cvs diff -u -r1.60 -r1.61 libxml.spec
  --- openpkg-src/libxml/libxml.spec    7 Jul 2003 11:18:14 -0000       1.60
  +++ openpkg-src/libxml/libxml.spec    8 Jul 2003 14:25:09 -0000       1.61
  @@ -33,7 +33,7 @@
   Group:        SGML
   License:      LGPL
   Version:      2.5.8
  -Release:      20030707
  +Release:      20030708
   
   #   list of sources
   Source0:      ftp://xmlsoft.org/libxml2-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, zlib, libiconv, make
  -PreReq:       OpenPKG, openpkg >= 20020206, zlib, libiconv
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, zlib, libiconv, make
  +PreReq:       OpenPKG, openpkg >= 20030708, zlib, libiconv
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -61,9 +61,9 @@
           -e 's;/etc/xml/catalog;%{l_prefix}/share/sgml/catalog.xml;g' \
           catalog.c xmlcatalog.c
       CC="%{l_cc}" \
  -    CFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \
  -    CPPFLAGS="-I%{l_prefix}/include" \
  -    LDFLAGS="-L%{l_prefix}/lib" \
  +    CFLAGS="%{l_cflags -O} %{l_cppflags}" \
  +    CPPFLAGS="%{l_cppflags}" \
  +    LDFLAGS="%{l_ldflags}" \
       LIBS="-lz -liconv" \
       ./configure \
           --prefix=%{l_prefix} \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/libxslt/libxslt.spec
  ============================================================================
  $ cvs diff -u -r1.49 -r1.50 libxslt.spec
  --- openpkg-src/libxslt/libxslt.spec  7 Jul 2003 11:18:28 -0000       1.49
  +++ openpkg-src/libxslt/libxslt.spec  8 Jul 2003 14:25:09 -0000       1.50
  @@ -33,7 +33,7 @@
   Group:        SGML
   License:      LGPL
   Version:      1.0.31
  -Release:      20030707
  +Release:      20030708
   
   #   list of sources
   Source0:      ftp://xmlsoft.org/libxslt-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, libxml >= 2.5.5, make
  -PreReq:       OpenPKG, openpkg >= 20020206, libxml >= 2.5.5
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, libxml >= 2.5.5, make
  +PreReq:       OpenPKG, openpkg >= 20030708, libxml >= 2.5.5
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -56,9 +56,9 @@
   
   %build
       CC="%{l_cc}" \
  -    CFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \
  -    CPPFLAGS="-I%{l_prefix}/include" \
  -    LDFLAGS="-L%{l_prefix}/lib" \
  +    CFLAGS="%{l_cflags -O} %{l_cppflags}" \
  +    CPPFLAGS="%{l_cppflags}" \
  +    LDFLAGS="%{l_ldflags}" \
       LIBS="-lz -liconv" \
       ./configure \
           --prefix=%{l_prefix} \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/links/links.spec
  ============================================================================
  $ cvs diff -u -r1.27 -r1.28 links.spec
  --- openpkg-src/links/links.spec      7 Jul 2003 10:32:48 -0000       1.27
  +++ openpkg-src/links/links.spec      8 Jul 2003 14:25:10 -0000       1.28
  @@ -33,7 +33,7 @@
   Group:        Web
   License:      BSD
   Version:      2.0
  -Release:      20030707
  +Release:      20030708
   
   #   list of sources
   Source0:      
http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/download/links-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206
  -PreReq:       OpenPKG, openpkg >= 20020206
  +BuildPreReq:  OpenPKG, openpkg >= 20030708
  +PreReq:       OpenPKG, openpkg >= 20030708
   PreReq:       openssl
   AutoReq:      no
   AutoReqProv:  no
  @@ -58,9 +58,9 @@
           -e 's;/usr/local/openssl;%{l_prefix};' \
           configure
       CC="%{l_cc}" \
  -    CFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \
  -    CPPFLAGS="-I%{l_prefix}/include" \
  -    LDFLAGS="-L%{l_prefix}/lib" \
  +    CFLAGS="%{l_cflags -O} %{l_cppflags}" \
  +    CPPFLAGS="%{l_cppflags}" \
  +    LDFLAGS="%{l_ldflags}" \
       ./configure \
           --prefix=%{l_prefix} \
           --sysconfdir=%{l_prefix}/etc/links \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/lout/lout.spec
  ============================================================================
  $ cvs diff -u -r1.15 -r1.16 lout.spec
  --- openpkg-src/lout/lout.spec        7 Jul 2003 10:33:35 -0000       1.15
  +++ openpkg-src/lout/lout.spec        8 Jul 2003 14:25:10 -0000       1.16
  @@ -33,7 +33,7 @@
   Group:        Text
   License:      GPL
   Version:      3.28
  -Release:      20030707
  +Release:      20030708
   
   #   list of sources
   Source0:      ftp://ftp.cs.usyd.edu.au/jeff/lout/lout-%{version}.tar.gz
  @@ -42,8 +42,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20021120
  -PreReq:       OpenPKG, openpkg >= 20021120
  +BuildPreReq:  OpenPKG, openpkg >= 20030708
  +PreReq:       OpenPKG, openpkg >= 20030708
   BuildPreReq:  zlib
   PreReq:       zlib
   AutoReq:      no
  @@ -74,10 +74,10 @@
           OSUNIX=1 DEBUGGING=0 TRACING= \
           PDF_COMPRESSION=1 \
           ZLIB="%{l_prefix}/lib/libz.a" \
  -        ZLIB_PATH="-I%{l_prefix}/include" \
  +        ZLIB_PATH="%{l_cppflags}" \
           CHARIN=1 CHAROUT=1 \
           CC="%{l_cc}" \
  -        COPTS="%{l_cflags -O} -I%{l_prefix}/include"
  +        COPTS="%{l_cflags -O} %{l_cppflags}"
   
   %install
       rm -rf $RPM_BUILD_ROOT
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/mc/mc.spec
  ============================================================================
  $ cvs diff -u -r1.26 -r1.27 mc.spec
  --- openpkg-src/mc/mc.spec    7 Jul 2003 10:41:42 -0000       1.26
  +++ openpkg-src/mc/mc.spec    8 Jul 2003 14:25:11 -0000       1.27
  @@ -33,7 +33,7 @@
   Group:        Terminal
   License:      GPL
   Version:      4.6.0
  -Release:      20030707
  +Release:      20030708
   
   #   list of sources
   Source0:      
http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, make
  -PreReq:       OpenPKG, openpkg >= 20020206
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, make
  +PreReq:       OpenPKG, openpkg >= 20030708
   BuildPreReq:  ncurses, glib
   PreReq:       ncurses, glib
   AutoReq:      no
  @@ -59,9 +59,9 @@
   
   %build
       CC="%{l_cc}" \
  -    CFLAGS="%{l_cflags -O} -I%{l_prefix}/include -I%{l_prefix}/include/ncurses" \
  -    CPPFLAGS="-I%{l_prefix}/include -I%{l_prefix}/include/ncurses" \
  -    LDFLAGS="-L%{l_prefix}/lib" \
  +    CFLAGS="%{l_cflags -O} %{l_cppflags ncurses}" \
  +    CPPFLAGS="%{l_cppflags ncurses}" \
  +    LDFLAGS="%{l_ldflags}" \
       ./configure \
           --prefix=%{l_prefix} \
           --sysconfdir=%{l_prefix}/etc/mc \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/mico/mico.spec
  ============================================================================
  $ cvs diff -u -r1.30 -r1.31 mico.spec
  --- openpkg-src/mico/mico.spec        7 Jul 2003 11:09:10 -0000       1.30
  +++ openpkg-src/mico/mico.spec        8 Jul 2003 14:25:11 -0000       1.31
  @@ -33,7 +33,7 @@
   Group:        System
   License:      LGPL/GPL
   Version:      2.3.10
  -Release:      20030707
  +Release:      20030708
   
   #   package options
   %option       with_ssl      no
  @@ -47,8 +47,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20030103, gcc, make
  -PreReq:       OpenPKG, openpkg >= 20030103
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, gcc, make
  +PreReq:       OpenPKG, openpkg >= 20030708
   %if "%{with_ssl}" == "yes"
   BuildPreReq:  openssl
   PreReq:       openssl
  @@ -82,7 +82,7 @@
       CFLAGS="%{l_cflags -O}"
       CXXFLAGS="%{l_cxxflags -O} -Wno-deprecated"
   %if "%{with_qt}" == "yes"
  -    CXXFLAGS="$CXXFLAGS -I%{l_prefix}/include/qt"
  +    CXXFLAGS="$CXXFLAGS %{l_cppflags qt}"
   %endif
       CPPFLAGS="%{l_cppflags}"
       LDFLAGS="%{l_ldflags}"
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/neon/neon.spec
  ============================================================================
  $ cvs diff -u -r1.31 -r1.32 neon.spec
  --- openpkg-src/neon/neon.spec        22 Jun 2003 16:39:26 -0000      1.31
  +++ openpkg-src/neon/neon.spec        8 Jul 2003 14:25:12 -0000       1.32
  @@ -33,7 +33,7 @@
   Group:        Web
   License:      LGPL
   Version:      0.24.0
  -Release:      20030622
  +Release:      20030708
   
   #   list of sources
   Source0:      http://www.webdav.org/neon/neon-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, libxml, openssl, zlib, libiconv
  -PreReq:       OpenPKG, openpkg >= 20020206, libxml, openssl, zlib, libiconv
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, libxml, openssl, zlib, libiconv
  +PreReq:       OpenPKG, openpkg >= 20030708, libxml, openssl, zlib, libiconv
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -58,8 +58,8 @@
   %build
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
  -    CPPFLAGS="-I%{l_prefix}/include -I%{l_prefix}/include/libxml2/libxml" \
  -    LDFLAGS="-L%{l_prefix}/lib" \
  +    CPPFLAGS="%{l_cppflags libxml2/libxml}" \
  +    LDFLAGS="%{l_ldflags}" \
       XML2_CONFIG="%{l_prefix}/bin/xml2-config" \
       ./configure \
           --prefix=%{l_prefix} \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openssl/openssl.spec
  ============================================================================
  $ cvs diff -u -r1.42 -r1.43 openssl.spec
  --- openpkg-src/openssl/openssl.spec  30 May 2003 20:33:59 -0000      1.42
  +++ openpkg-src/openssl/openssl.spec  8 Jul 2003 14:25:13 -0000       1.43
  @@ -33,7 +33,7 @@
   Group:        Cryptography
   License:      BSD-style
   Version:      0.9.7b
  -Release:      20030530
  +Release:      20030708
   
   #   package options
   %option       with_zlib     no
  @@ -46,8 +46,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20021230, perl, make, gcc
  -PreReq:       OpenPKG, openpkg >= 20021230
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, perl, make, gcc
  +PreReq:       OpenPKG, openpkg >= 20030708
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -64,8 +64,8 @@
       %setup -q
       %{l_shtool} subst \
           -e 's;-m486;-march=i486;g' \
  -        -e 's;-DZLIB;-I%{l_prefix}/include -DZLIB;' \
  -        -e 's;-lz;-L%{l_prefix}/lib -lz;' \
  +        -e 's;-DZLIB;%{l_cppflags} -DZLIB;' \
  +        -e 's;-lz;%{l_ldflags} -lz;' \
           Configure
       %{l_shtool} subst \
           -e 's;test "$OSTYPE" = msdosdjgpp;true;' \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/perl-comp/perl-comp.spec
  ============================================================================
  $ cvs diff -u -r1.7 -r1.8 perl-comp.spec
  --- openpkg-src/perl-comp/perl-comp.spec      7 Jul 2003 11:09:56 -0000       1.7
  +++ openpkg-src/perl-comp/perl-comp.spec      8 Jul 2003 14:25:14 -0000       1.8
  @@ -39,7 +39,7 @@
   Group:        Language
   License:      GPL/Artistic
   Version:      20030707
  -Release:      20030707
  +Release:      20030708
   
   #   list of sources
   Source0:      
http://www.cpan.org/modules/by-module/Compress/Compress-Zlib-%{V_compress_zlib}.tar.gz
  @@ -50,8 +50,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20030103, perl, perl-openpkg
  -PreReq:       OpenPKG, openpkg >= 20030103, perl, perl-openpkg
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, perl, perl-openpkg
  +PreReq:       OpenPKG, openpkg >= 20030708, perl, perl-openpkg
   BuildPreReq:  bzip2, zlib, lzo
   PreReq:       bzip2, zlib, lzo
   AutoReq:      no
  @@ -86,15 +86,15 @@
       )
       ( cd Compress-LZO-%{V_compress_lzo}
         %{l_shtool} subst \
  -          -e 's:^#\($LZO_INCLUDE[^=]*\)=.*:\1= "-I%{l_prefix}/include/lzo";:' \
  -          -e 's:^#\($LZO_LIB[^=]*\)=.*:\1= "-L%{l_prefix}/lib";:' \
  +          -e 's:^#\($LZO_INCLUDE[^=]*\)=.*:\1= "%{l_cppflags lzo}";:' \
  +          -e 's:^#\($LZO_LIB[^=]*\)=.*:\1= "%{l_ldflags}";:' \
             Makefile.PL
         %{l_prefix}/bin/perl-openpkg install
       )
       ( cd Compress-Bzip2-%{V_compress_bzip2}
         %{l_shtool} subst \
  -          -e 's:^#\($Bzip2_INCLUDE[^=]*\)=.*:\1= "-I%{l_prefix}/include";:' \
  -          -e 's:^#\($Bzip2_LIB[^=]*\)=.*:\1= "-L%{l_prefix}/lib";:' \
  +          -e 's:^#\($Bzip2_INCLUDE[^=]*\)=.*:\1= "%{l_cppflags}";:' \
  +          -e 's:^#\($Bzip2_LIB[^=]*\)=.*:\1= "%{l_ldflags}";:' \
             Makefile.PL
         %{l_prefix}/bin/perl-openpkg install
       )
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/perl-curses/perl-curses.spec
  ============================================================================
  $ cvs diff -u -r1.30 -r1.31 perl-curses.spec
  --- openpkg-src/perl-curses/perl-curses.spec  27 Apr 2003 18:46:07 -0000      1.30
  +++ openpkg-src/perl-curses/perl-curses.spec  8 Jul 2003 14:25:14 -0000       1.31
  @@ -41,7 +41,7 @@
   Group:        Language
   License:      GPL/Artistic
   Version:      20030427
  -Release:      20030427
  +Release:      20030708
   
   #   list of sources
   Source0:      http://www.cpan.org/modules/by-module/Curses/Curses-%{V_curses}.tar.gz
  @@ -55,8 +55,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, perl, perl-openpkg, ncurses, cdk, 
perl-term
  -PreReq:       OpenPKG, openpkg >= 20020206, perl, perl-openpkg, ncurses, cdk, 
perl-term
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, perl, perl-openpkg, ncurses, cdk, 
perl-term
  +PreReq:       OpenPKG, openpkg >= 20030708, perl, perl-openpkg, ncurses, cdk, 
perl-term
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -97,8 +97,8 @@
             cp hints/c-$hint.h c-config.h
         fi
         %{l_shtool} subst \
  -          -e 's:my $inc;:my $inc = "-I%{l_prefix}/include 
-I%{l_prefix}/include/ncurses";:' \
  -          -e 's:my $libs;:my $libs = "-L%{l_prefix}/lib -lpanel -lmenu -lform 
-lncurses";:' \
  +          -e 's:my $inc;:my $inc = "%{l_cppflags ncurses}";:' \
  +          -e 's:my $libs;:my $libs = "%{l_ldflags} -lpanel -lmenu -lform 
-lncurses";:' \
             Makefile.PL
         %{l_prefix}/bin/perl-openpkg install PANELS MENUS FORMS
       )
  @@ -118,9 +118,9 @@
       #   build Cdk
       ( cd cdk-perl-%{V_cdk_perl}
         %{l_shtool} subst \
  -          -e 's;-L/usr/local/lib;-L%{l_prefix}/lib;' \
  -          -e 's;-I/usr/include/ncurses;-I%{l_prefix}/include/ncurses;' \
  -          -e 's;-I/usr/local/include/cdk;-I%{l_prefix}/include/cdk;' \
  +          -e 's;-L/usr/local/lib;%{l_ldflags};' \
  +          -e 's;-I/usr/include/ncurses;%{l_cppflags ncurses};' \
  +          -e 's;-I/usr/local/include/cdk;%{l_cppflags cdk};' \
             Makefile.PL
         %{l_prefix}/bin/perl-openpkg install
       )
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/perl-gd/perl-gd.spec
  ============================================================================
  $ cvs diff -u -r1.51 -r1.52 perl-gd.spec
  --- openpkg-src/perl-gd/perl-gd.spec  1 Jul 2003 18:06:17 -0000       1.51
  +++ openpkg-src/perl-gd/perl-gd.spec  8 Jul 2003 14:25:15 -0000       1.52
  @@ -45,7 +45,7 @@
   Group:        Language
   License:      GPL/Artistic
   Version:      20030701
  -Release:      20030701
  +Release:      20030708
   
   #   list of sources
   Source0:      http://www.cpan.org/modules/by-module/GD/GD-%{V_gd}.tar.gz
  @@ -62,8 +62,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, perl, perl-openpkg, gd >= 2.0.7
  -PreReq:       OpenPKG, openpkg >= 20020206, perl, perl-openpkg, gd >= 2.0.7
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, perl, perl-openpkg, gd >= 2.0.7
  +PreReq:       OpenPKG, openpkg >= 20030708, perl, perl-openpkg, gd >= 2.0.7
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -103,8 +103,8 @@
       #   build and install GD glue module
       ( cd GD-%{V_gd}
         (echo "y"; echo "y") |\
  -      GD_INC="-I%{l_prefix}/include/freetype2 -I%{l_prefix}/include" \
  -      GD_LIBS="-L%{l_prefix}/lib -lfreetype" \
  +      GD_INC="%{l_cppflags . -freetype2}" \
  +      GD_LIBS="%{l_ldflags} -lfreetype" \
         %{l_prefix}/bin/perl-openpkg install
       )
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/perl-tk/perl-tk.spec
  ============================================================================
  $ cvs diff -u -r1.20 -r1.21 perl-tk.spec
  --- openpkg-src/perl-tk/perl-tk.spec  9 Jun 2003 18:31:52 -0000       1.20
  +++ openpkg-src/perl-tk/perl-tk.spec  8 Jul 2003 14:25:15 -0000       1.21
  @@ -65,7 +65,7 @@
   Group:        Language
   License:      GPL/Artistic
   Version:      20030609
  -Release:      20030609
  +Release:      20030708
   
   #   list of sources
   Source0:      http://www.cpan.org/modules/by-module/Tk/Tk-%{V_tk}.tar.gz
  @@ -102,8 +102,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, perl, perl-openpkg, X11, tiff, jpeg, 
png, zlib
  -PreReq:       OpenPKG, openpkg >= 20020206, perl, perl-openpkg, X11, tiff, jpeg, 
png, zlib
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, perl, perl-openpkg, X11, tiff, jpeg, 
png, zlib
  +PreReq:       OpenPKG, openpkg >= 20030708, perl, perl-openpkg, X11, tiff, jpeg, 
png, zlib
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -188,8 +188,8 @@
       #   build Tk::TIFF
       ( cd Tk-TIFF-%{V_tk_tiff}
         %{l_shtool} subst \
  -          -e 's;-I/usr/local/include;-I%{l_prefix}/include/tiff 
-I%{l_prefix}/include;' \
  -          -e 's;-L/usr/local/lib;-L%{l_prefix}/lib;' \
  +          -e 's;-I/usr/local/include;%{l_cppflags . -tiff};' \
  +          -e 's;-L/usr/local/lib;%{l_ldflags};' \
             Makefile.PL
         %{l_prefix}/bin/perl-openpkg install
       )
  @@ -202,8 +202,8 @@
       #   build Tk::PNG
       ( cd Tk-PNG-%{V_tk_png}
         %{l_shtool} subst \
  -          -e 's;-I/usr/local/include;-I%{l_prefix}/include;' \
  -          -e 's;-lpng -lz;-L%{l_prefix}/lib -lpng -lz;' \
  +          -e 's;-I/usr/local/include;%{l_cppflags};' \
  +          -e 's;-lpng -lz;%{l_ldflags} -lpng -lz;' \
             Makefile.PL
         %{l_prefix}/bin/perl-openpkg install
       )
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/perl/perl.spec
  ============================================================================
  $ cvs diff -u -r1.75 -r1.76 perl.spec
  --- openpkg-src/perl/perl.spec        9 Apr 2003 14:01:01 -0000       1.75
  +++ openpkg-src/perl/perl.spec        8 Jul 2003 14:25:13 -0000       1.76
  @@ -33,7 +33,7 @@
   Group:        Language
   License:      GPL/Artistic
   Version:      5.8.0
  -Release:      20030409
  +Release:      20030708
   
   #   list of sources
   Source0:      ftp://ftp.cpan.org/pub/CPAN/src/perl-%{version}.tar.gz
  @@ -42,8 +42,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20021230, gcc
  -PreReq:       OpenPKG, openpkg >= 20021230, gcc
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, gcc
  +PreReq:       OpenPKG, openpkg >= 20030708, gcc
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -74,7 +74,7 @@
           -Dcc="%{l_cc}" -Doptimize="%{l_cflags -O}" \
           -Dlocincpth="%{l_prefix}/include" \
           -Dloclibpth="%{l_prefix}/lib" \
  -        -Dldflags="-L%{l_prefix}/lib" \
  +        -Dldflags="%{l_ldflags}" \
           -Dlibpth="%{l_prefix}/lib /lib /usr/lib /usr/ccs/lib" \
           -Dglibpth="%{l_prefix}/lib /lib /usr/lib /usr/ccs/lib" \
           -Dscriptdir="%{l_prefix}/bin" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/perl56/perl56.spec
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 perl56.spec
  --- openpkg-src/perl56/perl56.spec    9 Apr 2003 14:02:10 -0000       1.2
  +++ openpkg-src/perl56/perl56.spec    8 Jul 2003 14:25:16 -0000       1.3
  @@ -33,7 +33,7 @@
   Group:        Language
   License:      GPL/Artistic
   Version:      5.6.1
  -Release:      20030409
  +Release:      20030708
   
   #   list of sources
   Source0:      ftp://ftp.cpan.org/pub/CPAN/src/perl-%{version}.tar.gz
  @@ -42,8 +42,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20021230, gcc
  -PreReq:       OpenPKG, openpkg >= 20021230, gcc
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, gcc
  +PreReq:       OpenPKG, openpkg >= 20030708, gcc
   AutoReq:      no
   AutoReqProv:  no
   Provides:     perl = %{version}-%{release}
  @@ -78,7 +78,7 @@
           -Dcc="%{l_cc}" -Doptimize="%{l_cflags -O}" \
           -Dlocincpth="%{l_prefix}/include" \
           -Dloclibpth="%{l_prefix}/lib" \
  -        -Dldflags="-L%{l_prefix}/lib" \
  +        -Dldflags="%{l_ldflags}" \
           -Dlibpth="%{l_prefix}/lib /lib /usr/lib /usr/ccs/lib" \
           -Dglibpth="%{l_prefix}/lib /lib /usr/lib /usr/ccs/lib" \
           -Dscriptdir="%{l_prefix}/bin" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/php/php.spec
  ============================================================================
  $ cvs diff -u -r1.53 -r1.54 php.spec
  --- openpkg-src/php/php.spec  7 Jul 2003 13:52:38 -0000       1.53
  +++ openpkg-src/php/php.spec  8 Jul 2003 14:25:16 -0000       1.54
  @@ -33,7 +33,7 @@
   Group:        Language
   License:      PHP
   Version:      4.3.2
  -Release:      20030707
  +Release:      20030708
   
   #   package options (analog to apache.spec)
   %option       with_calendar      no
  @@ -84,8 +84,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, gcc, sed, flex, bison
  -PreReq:       OpenPKG, openpkg >= 20020206
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, gcc, sed, flex, bison
  +PreReq:       OpenPKG, openpkg >= 20030708
   %if "%{with_mysql}" == "yes"
   BuildPreReq:  mysql
   PreReq:       mysql
  @@ -194,8 +194,8 @@
       ldflags=""
       libs=""
   %if "%{with_gdbm}" == "yes"
  -    cflags="$cflags -I%{l_prefix}/include"
  -    ldflags="$ldflags -L%{l_prefix}/lib"
  +    cflags="$cflags %{l_cppflags}"
  +    ldflags="$ldflags %{l_ldflags}"
       libs="$libs -lndbm -lgdbm"
   %endif
   %if "%{with_oci7}" == "yes" || "%{with_oci8}" == "yes"
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/popt/popt.spec
  ============================================================================
  $ cvs diff -u -r1.14 -r1.15 popt.spec
  --- openpkg-src/popt/popt.spec        7 Jul 2003 12:54:12 -0000       1.14
  +++ openpkg-src/popt/popt.spec        8 Jul 2003 14:25:17 -0000       1.15
  @@ -33,7 +33,7 @@
   Group:        System
   License:      LGPL
   Version:      1.7
  -Release:      20030707
  +Release:      20030708
   
   #   list of sources
   Source0:      ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, bison, gcc
  -PreReq:       OpenPKG, openpkg >= 20020206
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, bison, gcc
  +PreReq:       OpenPKG, openpkg >= 20030708
   BuildPreReq:  gettext
   PreReq:       gettext
   AutoReq:      no
  @@ -61,8 +61,8 @@
   %build
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
  -    CPPFLAGS="-I%{l_prefix}/include" \
  -    LDFLAGS="-L%{l_prefix}/lib" \
  +    CPPFLAGS="%{l_cppflags}" \
  +    LDFLAGS="%{l_ldflags}" \
       ./configure \
           --prefix=%{l_prefix} \
           --disable-shared \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/postfix/postfix.spec
  ============================================================================
  $ cvs diff -u -r1.145 -r1.146 postfix.spec
  --- openpkg-src/postfix/postfix.spec  8 Jul 2003 09:20:50 -0000       1.145
  +++ openpkg-src/postfix/postfix.spec  8 Jul 2003 14:25:17 -0000       1.146
  @@ -63,8 +63,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20030415, perl
  -PreReq:       OpenPKG, openpkg >= 20030415, perl, procmail, perl-time
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, perl
  +PreReq:       OpenPKG, openpkg >= 20030708, perl, procmail, perl-time
   BuildPreReq:  pcre, db
   PreReq:       pcre, db
   %if "%{with_fsl}" == "yes"
  @@ -152,20 +152,20 @@
       unset LD_LIBRARY_PATH || true
       CCARGS=""
       CCARGS="$CCARGS %{l_cflags -O}"
  -    CCARGS="$CCARGS -I%{l_prefix}/include"
  +    CCARGS="$CCARGS %{l_cppflags}"
       CCARGS="$CCARGS -DDEF_CONFIG_DIR=\\\"%{l_prefix}/etc/postfix\\\""
       AUXLIBS=""
  -    AUXLIBS="$AUXLIBS -L%{l_prefix}/lib"
  +    AUXLIBS="$AUXLIBS %{l_ldflags}"
       CCARGS="$CCARGS -DHAS_DB"
       AUXLIBS="$AUXLIBS -ldb"
       CCARGS="$CCARGS -DHAS_PCRE"
       AUXLIBS="$AUXLIBS -lpcre"
   %if "%{with_mysql}" == "yes"
  -    CCARGS="$CCARGS -DHAS_MYSQL -I%{l_prefix}/include/mysql"
  -    AUXLIBS="$AUXLIBS -L%{l_prefix}/lib/mysql -lmysqlclient -lz -lm"
  +    CCARGS="$CCARGS -DHAS_MYSQL %{l_cppflags . -mysql}"
  +    AUXLIBS="$AUXLIBS %{l_ldflags . -mysql} -lmysqlclient -lz -lm"
   %endif
   %if "%{with_sasl}" == "yes"
  -    CCARGS="$CCARGS -DUSE_SASL_AUTH -I%{l_prefix}/include/sasl"
  +    CCARGS="$CCARGS -DUSE_SASL_AUTH %{l_cppflags . -sasl}"
       AUXLIBS="$AUXLIBS -lsasl2 -lcrypt"
       if [ -f /usr/lib/libdl.so -o -f /usr/lib/libdl.a ]; then
           AUXLIBS="$AUXLIBS -ldl"
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/radius/radius.spec
  ============================================================================
  $ cvs diff -u -r1.23 -r1.24 radius.spec
  --- openpkg-src/radius/radius.spec    28 Jun 2003 19:18:26 -0000      1.23
  +++ openpkg-src/radius/radius.spec    8 Jul 2003 14:25:18 -0000       1.24
  @@ -33,7 +33,7 @@
   Group:        Network
   License:      GPL
   Version:      1.0
  -Release:      20030628
  +Release:      20030708
   
   #   list of sources
   Source0:      ftp://ftp.gnu.org/gnu/radius/radius-%{version}.tar.gz
  @@ -42,8 +42,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20030103, make, flex, bison, m4, gcc
  -PreReq:       OpenPKG, openpkg >= 20030103
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, make, flex, bison, m4, gcc
  +PreReq:       OpenPKG, openpkg >= 20030708
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -64,8 +64,8 @@
           --prefix=%{l_prefix} \
           --sysconfdir=%{l_prefix}/etc/radius \
           --localstatedir=%{l_prefix}/var/radius \
  -        --enable-add-includes="-I%{l_prefix}/include" \
  -        --enable-add-libs="-L%{l_prefix}/lib" \
  +        --enable-add-includes="%{l_cppflags}" \
  +        --enable-add-libs="%{l_ldflags}" \
           --disable-maintainer-mode \
           --without-guile \
           --without-server-guile \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/rc/rc.spec
  ============================================================================
  $ cvs diff -u -r1.22 -r1.23 rc.spec
  --- openpkg-src/rc/rc.spec    7 Jul 2003 13:06:49 -0000       1.22
  +++ openpkg-src/rc/rc.spec    8 Jul 2003 14:25:18 -0000       1.23
  @@ -33,7 +33,7 @@
   Group:        Converter
   License:      GPL
   Version:      1.7
  -Release:      20030707
  +Release:      20030708
   
   #   list of sources
   Source0:      http://www.star.le.ac.uk/~tjg/rc/release/rc-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206
  -PreReq:       OpenPKG, openpkg >= 20020206
  +BuildPreReq:  OpenPKG, openpkg >= 20030708
  +PreReq:       OpenPKG, openpkg >= 20030708
   BuildPreReq:  readline
   PreReq:       readline
   AutoReq:      no
  @@ -58,8 +58,8 @@
   
   %build
       CC="%{l_cc}" \
  -    CFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \
  -    LDFLAGS="-L%{l_prefix}/lib" \
  +    CFLAGS="%{l_cflags -O} %{l_cppflags}" \
  +    LDFLAGS="%{l_ldflags}" \
       ./configure \
           --prefix=%{l_prefix} \
           --with-readline
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/samba/samba.spec
  ============================================================================
  $ cvs diff -u -r1.41 -r1.42 samba.spec
  --- openpkg-src/samba/samba.spec      7 Jul 2003 13:11:14 -0000       1.41
  +++ openpkg-src/samba/samba.spec      8 Jul 2003 14:25:19 -0000       1.42
  @@ -33,7 +33,7 @@
   Group:        Filesystem
   License:      GPL
   Version:      2.2.8a
  -Release:      20030707
  +Release:      20030708
   
   #   package options
   %option       with_pam  no
  @@ -47,8 +47,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20030103
  -PreReq:       OpenPKG, openpkg >= 20030103
  +BuildPreReq:  OpenPKG, openpkg >= 20030708
  +PreReq:       OpenPKG, openpkg >= 20030708
   BuildPreReq:  openssl
   PreReq:       openssl
   %if "%{with_pam}" == "yes"
  @@ -69,8 +69,8 @@
       ( cd source
         CC="%{l_cc}"
         CFLAGS="%{l_cflags -O}"
  -      CPPFLAGS="-I%{l_prefix}/include -I%{l_prefix}/include/openssl"
  -      LDFLAGS="-L%{l_prefix}/lib"
  +      CPPFLAGS="%{l_cppflags openssl}"
  +      LDFLAGS="%{l_ldflags}"
   %if "%{with_pam}" == "yes"
         CPPFLAGS="$CPPFLAGS -I`%{l_prefix}/etc/rc --query pam_incdir`" \
         LDFLAGS="$LDFLAGS -L`%{l_prefix}/etc/rc --query pam_libdir`" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/scanssh/scanssh.spec
  ============================================================================
  $ cvs diff -u -r1.20 -r1.21 scanssh.spec
  --- openpkg-src/scanssh/scanssh.spec  7 Jul 2003 13:11:55 -0000       1.20
  +++ openpkg-src/scanssh/scanssh.spec  8 Jul 2003 14:25:19 -0000       1.21
  @@ -33,7 +33,7 @@
   Group:        Security
   License:      BSD
   Version:      1.6b
  -Release:      20030707
  +Release:      20030708
   
   #   list of sources
   Source0:      http://www.monkey.org/~provos/scanssh-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206
  -PreReq:       OpenPKG, openpkg >= 20020206
  +BuildPreReq:  OpenPKG, openpkg >= 20030708
  +PreReq:       OpenPKG, openpkg >= 20030708
   BuildPreReq:  openssl, libpcap
   PreReq:       openssl, libpcap
   AutoReq:      no
  @@ -61,8 +61,8 @@
   
   %build
       CC="%{l_cc}" \
  -    CFLAGS="%{l_cflags -O} -I%{l_prefix}/include/openssl -I%{l_prefix}/include" \
  -    LDFLAGS="-L%{l_prefix}/lib" \
  +    CFLAGS="%{l_cflags -O} %{l_cppflags . -openssl}" \
  +    LDFLAGS="%{l_ldflags}" \
       LIBS="-lcrypto" \
       ./configure \
           --prefix=%{l_prefix}
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/sendmail/sendmail.spec
  ============================================================================
  $ cvs diff -u -r1.79 -r1.80 sendmail.spec
  --- openpkg-src/sendmail/sendmail.spec        8 Jul 2003 09:20:56 -0000       1.79
  +++ openpkg-src/sendmail/sendmail.spec        8 Jul 2003 14:25:20 -0000       1.80
  @@ -54,8 +54,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20030516, m4, gcc, make
  -PreReq:       OpenPKG, openpkg >= 20030516, m4, make, perl, procmail
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, m4, gcc, make
  +PreReq:       OpenPKG, openpkg >= 20030708, m4, make, perl, procmail
   BuildPreReq:  db >= 4.1.25
   PreReq:       db >= 4.1.25
   %if "%{with_fsl}" == "yes"
  @@ -165,8 +165,8 @@
             echo "APPENDDEF(\`confENVDEF', 
\`-D_PATH_SENDMAILPID=\\\"%{l_prefix}/var/sendmail/sendmail.pid\\\"')dnl"
             echo "APPENDDEF(\`confENVDEF', 
\`-D_DIR_SENDMAILCF=\\\"%{l_prefix}/etc/sendmail/\\\"')dnl"
             echo "APPENDDEF(\`confENVDEF', \`-DNEWDB')dnl"
  -          echo "APPENDDEF(\`confINCDIRS', \`-I%{l_prefix}/include')dnl"
  -          echo "APPENDDEF(\`confLIBDIRS', \`-L%{l_prefix}/lib')dnl"
  +          echo "APPENDDEF(\`confINCDIRS', \`%{l_cppflags}')dnl"
  +          echo "APPENDDEF(\`confLIBDIRS', \`%{l_ldflags}')dnl"
             echo "APPENDDEF(\`confLIBS', \`%{l_fsl_libs} -ldb')dnl"
             echo "define(\`confSTDIO_TYPE', \`portable')dnl"
             echo "APPENDDEF(\`confENVDEF', \`-DDNSMAP')dnl"
  @@ -176,7 +176,7 @@
   %endif
   %if "%{with_sasl}" == "yes"
             echo "APPENDDEF(\`confENVDEF', \`-DSASL=1')dnl"
  -          echo "APPENDDEF(\`confINCDIRS', \`-I%{l_prefix}/include/sasl')dnl"
  +          echo "APPENDDEF(\`confINCDIRS', \`%{l_cppflags . -sasl')dnl}"
             echo "APPENDDEF(\`confLIBS', \`-lsasl2 -lcrypto')dnl"
   %endif
   %if "%{with_milter}" == "yes"
  @@ -190,8 +190,8 @@
   %endif
   %if "%{with_mysql}" == "yes"
             echo "APPENDDEF(\`confMAPDEF',\`-DMYSQLMAP')dnl"
  -          echo "APPENDDEF(\`confINCDIRS',\`-I%{l_prefix}/include/mysql')dnl"
  -          echo "APPENDDEF(\`confLIBS',\`-L%{l_prefix}/lib/mysql -lmysqlclient -lz 
-lm')dnl"
  +          echo "APPENDDEF(\`confINCDIRS',\`%{l_cppflags . -mysql')dnl}"
  +          echo "APPENDDEF(\`confLIBS',\`%{l_ldflags . -mysql} -lmysqlclient -lz 
-lm')dnl"
   %endif
         ) >devtools/Site/site.config.m4
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/siege/siege.spec
  ============================================================================
  $ cvs diff -u -r1.32 -r1.33 siege.spec
  --- openpkg-src/siege/siege.spec      7 Jul 2003 10:44:21 -0000       1.32
  +++ openpkg-src/siege/siege.spec      8 Jul 2003 14:25:20 -0000       1.33
  @@ -33,7 +33,7 @@
   Group:        Benchmark
   License:      GPL
   Version:      2.56
  -Release:      20030707
  +Release:      20030708
   
   #   list of sources
   Source0:      ftp://ftp.joedog.org/pub/siege/siege-%{version}.tar.gz
  @@ -42,8 +42,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, make
  -PreReq:       OpenPKG, openpkg >= 20020206
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, make
  +PreReq:       OpenPKG, openpkg >= 20030708
   BuildPreReq:  openssl
   PreReq:       openssl
   AutoReq:      no
  @@ -66,8 +66,8 @@
           -e 's;^\(SIEGERC.*=\).*;\1 $(sysconfdir)/siegerc;' \
           doc/Makefile.in
       CC="%{l_cc}" \
  -    CFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \
  -    LDFLAGS="-L%{l_prefix}/lib" \
  +    CFLAGS="%{l_cflags -O} %{l_cppflags}" \
  +    LDFLAGS="%{l_ldflags}" \
       ./configure \
           --prefix=%{l_prefix} \
           --sysconfdir=%{l_prefix}/etc/siege \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/styx/styx.spec
  ============================================================================
  $ cvs diff -u -r1.9 -r1.10 styx.spec
  --- openpkg-src/styx/styx.spec        7 Jul 2003 11:24:56 -0000       1.9
  +++ openpkg-src/styx/styx.spec        8 Jul 2003 14:25:21 -0000       1.10
  @@ -33,7 +33,7 @@
   Group:        Compiler
   License:      GPL
   Version:      1.5
  -Release:      20030707
  +Release:      20030708
   
   #   list of sources
   Source0:      http://www.speculate.de/styx/styx-%{version}.tgz
  @@ -42,8 +42,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, make, gcc
  -PreReq:       OpenPKG, openpkg >= 20020206
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, make, gcc
  +PreReq:       OpenPKG, openpkg >= 20030708
   BuildPreReq:  libiconv
   PreReq:       libiconv
   AutoReq:      no
  @@ -69,8 +69,8 @@
   %build
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
  -    CPPFLAGS="-I%{l_prefix}/include" \
  -    LDFLAGS="-L%{l_prefix}/lib" \
  +    CPPFLAGS="%{l_cppflags}" \
  +    LDFLAGS="%{l_ldflags}" \
       LIBS="-liconv" \
       ./configure \
           --prefix=%{l_prefix} \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/subversion/subversion.spec
  ============================================================================
  $ cvs diff -u -r1.17 -r1.18 subversion.spec
  --- openpkg-src/subversion/subversion.spec    7 Jul 2003 13:16:04 -0000       1.17
  +++ openpkg-src/subversion/subversion.spec    8 Jul 2003 14:25:21 -0000       1.18
  @@ -37,7 +37,7 @@
   Group:        SCM
   License:      Apache/BSD
   Version:      %{V_release}
  -Release:      20030707
  +Release:      20030708
   
   #   list of sources
   Source0:      
http://subversion.tigris.org/files/documents/%{V_subdir}/subversion-%{V_release}.tar.gz
  @@ -45,8 +45,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, diffutils, make
  -PreReq:       OpenPKG, openpkg >= 20020206, diffutils
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, diffutils, make
  +PreReq:       OpenPKG, openpkg >= 20030708, diffutils
   BuildPreReq:  libxml, db, openssl, zlib, apr
   PreReq:       libxml, db, openssl, zlib, apr
   AutoReq:      no
  @@ -63,7 +63,7 @@
   %build
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
  -    CPPFLAGS="%{l_cppflags} -I%{l_prefix}/include/libxml2" \
  +    CPPFLAGS="%{l_cppflags . -libxml2}" \
       LDFLAGS="%{l_ldflags}" \
       ./configure \
           --prefix=%{l_prefix} \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/transfig/transfig.spec
  ============================================================================
  $ cvs diff -u -r1.5 -r1.6 transfig.spec
  --- openpkg-src/transfig/transfig.spec        18 Jun 2003 12:37:10 -0000      1.5
  +++ openpkg-src/transfig/transfig.spec        8 Jul 2003 14:25:22 -0000       1.6
  @@ -33,7 +33,7 @@
   Group:        XWindow
   License:      MIT-style
   Version:      3.2.4
  -Release:      20030618
  +Release:      20030708
   
   #   list of sources
   Source0:      http://www.xfig.org/xfigdist/transfig.%{version}.tar.gz
  @@ -42,9 +42,9 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20021204, X11, gcc, make
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, X11, gcc, make
   BuildPreReq:  zlib, jpeg, png, xpm
  -PreReq:       OpenPKG, openpkg >= 20021204, X11
  +PreReq:       OpenPKG, openpkg >= 20030708, X11
   PreReq:       zlib, jpeg, png, xpm
   AutoReq:      no
   AutoReqProv:  no
  @@ -63,9 +63,9 @@
           -e 's;^\(NEED_STRERROR.*\)$;XCOMM \1;' \
           -e 's;^\(XFIGLIBDIR =\).*$;\1 %{l_prefix}/lib/X11/xfig;' \
           -e 's;^\(PNGLIBDIR =\).*$;\1 %{l_prefix}/lib;' \
  -        -e 's;^\(PNGINC =\).*$;\1 -I%{l_prefix}/include/libpng 
-I%{l_prefix}/include;' \
  +        -e 's;^\(PNGINC =\).*$;\1 %{l_cppflags . -libpng};' \
           -e 's;^\(XPMLIBDIR =\).*$;\1 %{l_prefix}/lib;' \
  -        -e 's;^\(XPMINC =\).*$;\1 -I%{l_prefix}/include/X11;' \
  +        -e 's;^\(XPMINC =\).*$;\1 %{l_cppflags . -X11};' \
           -e 's;^XCOMM \(DA4 =.*\)$;\1;' \
           -e 's;^XCOMM \(#define USEXPM.*\)$;\1;' \
           -e 's;^\(#define I18N\)$;XCOMM \1;' \
  @@ -73,7 +73,7 @@
       %{l_shtool} subst \
           -e 's;#ifdef USE_PNG;#if 1;' \
           -e 's;#ifdef USE_XPM;#if 1;' \
  -        -e 's;^\(INCLUDES = .*\);\1 -I%{l_prefix}/include/libpng 
-I%{l_prefix}/include -I%{l_prefix}/include/X11;' \
  +        -e 's;^\(INCLUDES = .*\);\1 %{l_cppflags . -libpng +X11};' \
           fig2dev/dev/Imakefile
       %{l_shtool} subst \
           -e 's;^XCOMM \(USELATEX2E = .*\)$;\1;' \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/unixodbc/unixodbc.spec
  ============================================================================
  $ cvs diff -u -r1.33 -r1.34 unixodbc.spec
  --- openpkg-src/unixodbc/unixodbc.spec        27 Feb 2003 19:00:52 -0000      1.33
  +++ openpkg-src/unixodbc/unixodbc.spec        8 Jul 2003 14:25:22 -0000       1.34
  @@ -33,7 +33,7 @@
   Group:        Database
   License:      GPL
   Version:      2.2.5
  -Release:      20030227
  +Release:      20030708
   
   #   list of sources
   Source0:      http://www.unixodbc.org/unixODBC-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, make, gcc, flex, bison
  -PreReq:       OpenPKG, openpkg >= 20020206
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, make, gcc, flex, bison
  +PreReq:       OpenPKG, openpkg >= 20030708
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -55,7 +55,7 @@
   %build
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
  -    LDFLAGS="-L%{l_prefix}/lib" \
  +    LDFLAGS="%{l_ldflags}" \
       ./configure \
           --prefix=%{l_prefix} \
           --sysconfdir=%{l_prefix}/etc/unixodbc \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/vcg/vcg.spec
  ============================================================================
  $ cvs diff -u -r1.4 -r1.5 vcg.spec
  --- openpkg-src/vcg/vcg.spec  4 Jul 2003 09:47:14 -0000       1.4
  +++ openpkg-src/vcg/vcg.spec  8 Jul 2003 14:25:23 -0000       1.5
  @@ -38,7 +38,7 @@
   Group:        Graphics
   License:      GPL
   Version:      %{V_opkg}
  -Release:      20030704
  +Release:      20030708
   
   #   list of sources
   Source0:      ftp://ftp.cs.uni-sb.de/pub/graphics/vcg/vcg.%{V_vendor}.tgz
  @@ -46,8 +46,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20030516, X11, make, gcc
  -PreReq:       OpenPKG, openpkg >= 20030516, X11
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, X11, make, gcc
  +PreReq:       OpenPKG, openpkg >= 20030708, X11
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -76,8 +76,8 @@
           -e 's;VCGNAME;vcg;' \
           -e 's;CFLAGSNAME;-c %{l_cflags -O};' \
           -e 's;CLINKFLAGSNAME;-o;' \
  -        -e "s;ADDINCLUDEPATHNAME;-I%{l_prefix}/include -I${x11inc};" \
  -        -e "s;ADDLIBPATHNAME;-L%{l_prefix}/lib -L${x11lib};" \
  +        -e "s;ADDINCLUDEPATHNAME;%{l_cppflags} -I${x11inc};" \
  +        -e "s;ADDLIBPATHNAME;%{l_ldflags} -L${x11lib};" \
           -e 's;ADDLIBSNAME;-lXext -lX11 -lm;' \
           -e 's;CCNAME;%{l_cc};' \
           -e 's;CCLINKNAME;%{l_cc};' \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/vilistextum/vilistextum.spec
  ============================================================================
  $ cvs diff -u -r1.11 -r1.12 vilistextum.spec
  --- openpkg-src/vilistextum/vilistextum.spec  7 Jul 2003 13:22:16 -0000       1.11
  +++ openpkg-src/vilistextum/vilistextum.spec  8 Jul 2003 14:25:23 -0000       1.12
  @@ -33,7 +33,7 @@
   Group:        Converter
   License:      GPL
   Version:      2.6.3
  -Release:      20030707
  +Release:      20030708
   
   #   list of sources
   Source0:      
http://www.mysunrise.ch/users/bhaak/vilistextum/vilistextum-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, gcc
  -PreReq:       OpenPKG, openpkg >= 20020206
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, gcc
  +PreReq:       OpenPKG, openpkg >= 20030708
   BuildPreReq:  libiconv
   PreReq:       libiconv
   AutoReq:      no
  @@ -58,8 +58,8 @@
   %build
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
  -    CPPFLAGS="-I%{l_prefix}/include" \
  -    LDFLAGS="-L%{l_prefix}/lib" \
  +    CPPFLAGS="%{l_cppflags}" \
  +    LDFLAGS="%{l_ldflags}" \
       ./configure \
           --prefix=%{l_prefix}
       %{l_make} %{l_mflags -O}
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/wml/wml.spec
  ============================================================================
  $ cvs diff -u -r1.31 -r1.32 wml.spec
  --- openpkg-src/wml/wml.spec  7 Jul 2003 13:24:35 -0000       1.31
  +++ openpkg-src/wml/wml.spec  8 Jul 2003 14:25:24 -0000       1.32
  @@ -33,7 +33,7 @@
   Group:        Language
   License:      GPL
   Version:      2.0.9
  -Release:      20030707
  +Release:      20030708
   
   #   list of sources
   Source0:      ftp://thewml.org/distrib/wml-%{version}.tar.gz
  @@ -45,8 +45,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, perl, gcc
  -PreReq:       OpenPKG, openpkg >= 20020206, perl
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, perl, gcc
  +PreReq:       OpenPKG, openpkg >= 20030708, perl
   BuildPreReq:  png, zlib
   PreReq:       png, zlib
   AutoReq:      no
  @@ -73,14 +73,14 @@
       cp %{SOURCE configure.iselect} wml_aux/iselect/configure
       cp %{SOURCE configure.gd} wml_common/gd/configure
       %{l_shtool} subst \
  -        -e 's;^\([    ]\{1,\}.LIBS.[  ]\{1,\}=>\).*$;\1 [\"-lm @LIBPNG@ 
-L%{l_prefix}/lib -lz\"],;' \
  +        -e 's;^\([    ]\{1,\}.LIBS.[  ]\{1,\}=>\).*$;\1 [\"-lm @LIBPNG@ 
%{l_ldflags} -lz\"],;' \
           wml_common/gd/Makefile.PL.in
   
   %build
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
  -    CPPFLAGS="-I%{l_prefix}/include" \
  -    LDFLAGS="-L%{l_prefix}/lib" \
  +    CPPFLAGS="%{l_cppflags}" \
  +    LDFLAGS="%{l_ldflags}" \
       LIBS="-lpng -lz -lm" \
       ./configure \
           --prefix=%{l_prefix} \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/xfig/xfig.spec
  ============================================================================
  $ cvs diff -u -r1.11 -r1.12 xfig.spec
  --- openpkg-src/xfig/xfig.spec        7 Jul 2003 11:31:12 -0000       1.11
  +++ openpkg-src/xfig/xfig.spec        8 Jul 2003 14:25:24 -0000       1.12
  @@ -33,7 +33,7 @@
   Group:        XWindow
   License:      MIT-style
   Version:      3.2.4
  -Release:      20030707
  +Release:      20030708
   
   #   list of sources
   Source0:      http://www.xfig.org/xfigdist/xfig.%{version}.code_only.tar.gz
  @@ -43,8 +43,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20030516, X11, make, gcc
  -PreReq:       OpenPKG, openpkg >= 20030516, X11, transfig
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, X11, make, gcc
  +PreReq:       OpenPKG, openpkg >= 20030708, X11, transfig
   BuildPreReq:  zlib, jpeg, png, xpm, xaw3d
   PreReq:       zlib, jpeg, png, xpm, xaw3d
   AutoReq:      no
  @@ -70,15 +70,15 @@
           -e 's;^XCOMM \(XAPPLOADDIR =\) .*$;\1 %{l_prefix}/etc/X11/app-defaults;' \
           -e 's;^\(XFIGLIBDIR =\) .*$;\1 %{l_prefix}/lib/X11/xfig;' \
           -e 's;^\(PNGLIBDIR =\) .*$;\1 %{l_prefix}/lib;' \
  -        -e 's;^\(PNGINC =\) .*$;\1 -I%{l_prefix}/include/libpng;' \
  +        -e 's;^\(PNGINC =\) .*$;\1 %{l_cppflags . -libpng};' \
           -e 's;^\(JPEGLIBDIR =\) .*$;\1 %{l_prefix}/lib;' \
  -        -e 's;^\(JPEGINC =\) .*$;\1 -I%{l_prefix}/include;' \
  +        -e 's;^\(JPEGINC =\) .*$;\1 %{l_cppflags};' \
           -e 's;^XCOMM \(#define USEXPM\)$;\1;' \
           -e 's;^XCOMM \(#define USEXPM_ICON\)$;\1;' \
           -e 's;^\(XPMLIBDIR =\) .*$;\1 %{l_prefix}/lib;' \
  -        -e 's;^\(XPMINC =\) .*$;\1 -I%{l_prefix}/include/X11;' \
  +        -e 's;^\(XPMINC =\) .*$;\1 %{l_cppflags . -X11};' \
           -e 's;^XCOMM \(#define XAW3D\)$;\1;' \
  -        -e 's;^\(XAW3DINC =\) .*$;\1 -I%{l_prefix}/include/X11/Xaw3d;' \
  +        -e 's;^\(XAW3DINC =\) .*$;\1 %{l_cppflags . -X11/Xaw3d};' \
           -e 's;^\(#define I18N\)$;XCOMM \1;' \
           -e 's;^XCOMM \(USEINLINE = .*\)$;\1;' \
           Imakefile
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/xmame/xmame.spec
  ============================================================================
  $ cvs diff -u -r1.37 -r1.38 xmame.spec
  --- openpkg-src/xmame/xmame.spec      7 Jul 2003 11:29:50 -0000       1.37
  +++ openpkg-src/xmame/xmame.spec      8 Jul 2003 14:25:25 -0000       1.38
  @@ -33,7 +33,7 @@
   Group:        Games
   License:      GPL
   Version:      0.70.1
  -Release:      20030707
  +Release:      20030708
   
   #   list of sources
   Source0:      http://x.mame.net/download/xmame-%{version}.tar.bz2
  @@ -42,8 +42,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, X11, gcc, make
  -PreReq:       OpenPKG, openpkg >= 20020206, X11
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, X11, gcc, make
  +PreReq:       OpenPKG, openpkg >= 20030708, X11
   BuildPreReq:  zlib
   PreReq:       zlib
   AutoReq:      no
  @@ -70,16 +70,16 @@
       %{l_make} %{l_mflags} \
           -f makefile.unix \
           CC="%{l_cc}" \
  -        CFLAGS="-I%{l_prefix}/include -I$x11_inc -pipe -O2 -funroll-loops 
-fstrength-reduce -fomit-frame-pointer -ffast-math" \
  -        LDFLAGS="-L%{l_prefix}/lib -L$x11_lib" \
  +        CFLAGS="%{l_cppflags} -I$x11_inc -pipe -O2 -funroll-loops -fstrength-reduce 
-fomit-frame-pointer -ffast-math" \
  +        LDFLAGS="%{l_ldflags} -L$x11_lib" \
           PREFIX="%{l_prefix}" \
           XMAMEROOT="%{l_prefix}/etc/xmame" \
           ARCH="$os" \
           MY_CPU="$cpu" \
           X11INC="-I$x11_inc" \
           X11LIB="-L$x11_lib" \
  -        LIBS="-L%{l_prefix}/lib" \
  -        INCLUDE="-I%{l_prefix}/include"
  +        LIBS="%{l_ldflags}" \
  +        INCLUDE="%{l_cppflags}"
   
   %install
       rm -rf $RPM_BUILD_ROOT
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/xmms/xmms.spec
  ============================================================================
  $ cvs diff -u -r1.10 -r1.11 xmms.spec
  --- openpkg-src/xmms/xmms.spec        29 Jun 2003 14:04:57 -0000      1.10
  +++ openpkg-src/xmms/xmms.spec        8 Jul 2003 14:25:25 -0000       1.11
  @@ -33,7 +33,7 @@
   Group:        Audio
   License:      GPL
   Version:      1.2.7
  -Release:      20030629
  +Release:      20030708
   
   #   list of sources
   Source0:      http://xmms.org/files/1.2.x/xmms-%{version}.tar.bz2
  @@ -42,10 +42,10 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20030114, X11
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, X11
   BuildPreReq:  gtk, glib, glib::with_threads = yes
   BuildPreReq:  libxml, libmikmod, vorbis-libs
  -PreReq:       OpenPKG, openpkg >= 20030114, X11
  +PreReq:       OpenPKG, openpkg >= 20030708, X11
   PreReq:       gtk, glib, glib::with_threads = yes
   PreReq:       libxml, libmikmod, vorbis-libs
   AutoReq:      no
  @@ -62,7 +62,7 @@
   %build
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags}" \
  -    CPPFLAGS="%{l_cppflags} -I%{l_prefix}/include/libxml2/libxml" \
  +    CPPFLAGS="%{l_cppflags libxml2/libxml}" \
       LDFLAGS="%{l_ldflags}" \
       XML_CONFIG="%{l_prefix}/bin/xml2-config" \
       ./configure \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/xplanet/xplanet.spec
  ============================================================================
  $ cvs diff -u -r1.9 -r1.10 xplanet.spec
  --- openpkg-src/xplanet/xplanet.spec  7 Jul 2003 11:25:38 -0000       1.9
  +++ openpkg-src/xplanet/xplanet.spec  8 Jul 2003 14:25:26 -0000       1.10
  @@ -33,7 +33,7 @@
   Group:        XWindow
   License:      GPL
   Version:      0.94
  -Release:      20030707
  +Release:      20030708
   
   #   list of sources
   Source0:      
http://osdn.dl.sourceforge.net/sourceforge/xplanet/xplanet-nomap-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20021204, X11, gcc
  -PreReq:       OpenPKG, openpkg >= 20021204, X11
  +BuildPreReq:  OpenPKG, openpkg >= 20030708, X11, gcc
  +PreReq:       OpenPKG, openpkg >= 20030708, X11
   BuildPreReq:  freetype, jpeg, png, tiff
   PreReq:       freetype, jpeg, png, tiff
   AutoReq:      no
  @@ -68,7 +68,7 @@
       CXX="%{l_cxx}" \
       CFLAGS="%{l_cflags -O}" \
       CXXFLAGS="%{l_cxxflags -O} -Wno-deprecated" \
  -    CPPFLAGS="%{l_cppflags} -I%{l_prefix}/include/tiff" \
  +    CPPFLAGS="%{l_cppflags tiff}" \
       LDFLAGS="%{l_ldflags}" \
       ./configure \
           --prefix=%{l_prefix} \
  @@ -87,7 +87,7 @@
           --without-glut
       CFLAGS="%{l_cflags -O}" \
       CXXFLAGS="%{l_cxxflags -O} -Wno-deprecated" \
  -    CPPFLAGS="%{l_cppflags} -I%{l_prefix}/include/tiff" \
  +    CPPFLAGS="%{l_cppflags tiff}" \
       LDFLAGS="%{l_ldflags}" \
       %{l_make} %{l_mflags -O}
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.5446 -r1.5447 news.txt
  --- openpkg-web/news.txt      8 Jul 2003 13:47:57 -0000       1.5446
  +++ openpkg-web/news.txt      8 Jul 2003 14:24:57 -0000       1.5447
  @@ -1,3 +1,48 @@
  +08-Jul-2003: Upgraded package: P<xplanet-0.94-20030708>
  +08-Jul-2003: Upgraded package: P<xmms-1.2.7-20030708>
  +08-Jul-2003: Upgraded package: P<xmame-0.70.1-20030708>
  +08-Jul-2003: Upgraded package: P<xfig-3.2.4-20030708>
  +08-Jul-2003: Upgraded package: P<wml-2.0.9-20030708>
  +08-Jul-2003: Upgraded package: P<vilistextum-2.6.3-20030708>
  +08-Jul-2003: Upgraded package: P<vcg-1.30.3.17-20030708>
  +08-Jul-2003: Upgraded package: P<unixodbc-2.2.5-20030708>
  +08-Jul-2003: Upgraded package: P<transfig-3.2.4-20030708>
  +08-Jul-2003: Upgraded package: P<subversion-0.24.2-20030708>
  +08-Jul-2003: Upgraded package: P<styx-1.5-20030708>
  +08-Jul-2003: Upgraded package: P<siege-2.56-20030708>
  +08-Jul-2003: Upgraded package: P<scanssh-1.6b-20030708>
  +08-Jul-2003: Upgraded package: P<samba-2.2.8a-20030708>
  +08-Jul-2003: Upgraded package: P<rc-1.7-20030708>
  +08-Jul-2003: Upgraded package: P<radius-1.0-20030708>
  +08-Jul-2003: Upgraded package: P<popt-1.7-20030708>
  +08-Jul-2003: Upgraded package: P<php-4.3.2-20030708>
  +08-Jul-2003: Upgraded package: P<perl56-5.6.1-20030708>
  +08-Jul-2003: Upgraded package: P<perl-tk-20030609-20030708>
  +08-Jul-2003: Upgraded package: P<perl-gd-20030701-20030708>
  +08-Jul-2003: Upgraded package: P<perl-curses-20030427-20030708>
  +08-Jul-2003: Upgraded package: P<perl-comp-20030707-20030708>
  +08-Jul-2003: Upgraded package: P<perl-5.8.0-20030708>
  +08-Jul-2003: Upgraded package: P<openssl-0.9.7b-20030708>
  +08-Jul-2003: Upgraded package: P<neon-0.24.0-20030708>
  +08-Jul-2003: Upgraded package: P<mico-2.3.10-20030708>
  +08-Jul-2003: Upgraded package: P<mc-4.6.0-20030708>
  +08-Jul-2003: Upgraded package: P<lout-3.28-20030708>
  +08-Jul-2003: Upgraded package: P<links-2.0-20030708>
  +08-Jul-2003: Upgraded package: P<libxslt-1.0.31-20030708>
  +08-Jul-2003: Upgraded package: P<libxml-2.5.8-20030708>
  +08-Jul-2003: Upgraded package: P<lbreakout-2.4.1-20030708>
  +08-Jul-2003: Upgraded package: P<ipaudit-0.95-20030708>
  +08-Jul-2003: Upgraded package: P<imlib-1.9.14-20030708>
  +08-Jul-2003: Upgraded package: P<gv-3.5.8-20030708>
  +08-Jul-2003: Upgraded package: P<grep-2.5.1-20030708>
  +08-Jul-2003: Upgraded package: P<gdk-pixbuf-0.22.0-20030708>
  +08-Jul-2003: Upgraded package: P<file-4.03-20030708>
  +08-Jul-2003: Upgraded package: P<exim-4.20-20030708>
  +08-Jul-2003: Upgraded package: P<emacs-21.3-20030708>
  +08-Jul-2003: Upgraded package: P<dialog-0.9b.20030308-20030708>
  +08-Jul-2003: Upgraded package: P<devtodo-0.1.17-20030708>
  +08-Jul-2003: Upgraded package: P<cpu-1.3.100-20030708>
  +08-Jul-2003: Upgraded package: P<aspell-0.50.3-20030708>
   08-Jul-2003: Upgraded package: P<spamassassin-2.55-20030708>
   08-Jul-2003: New package: P<gcc34-3.4s20030702-20030708>
   08-Jul-2003: Upgraded package: P<openvpn-1.4.1-20030708>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to