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                      Date:   25-Jul-2004 10:13:08
  Branch: OPENPKG_2_1_SOLID                Handle: 2004072509130700

  Added files:              (Branch: OPENPKG_2_1_SOLID)
    openpkg-src/lynx        lynx.patch
  Modified files:           (Branch: OPENPKG_2_1_SOLID)
    openpkg-src/lynx        lynx.spec

  Log:
    MFC: fix building

  Summary:
    Revision    Changes     Path
    1.1.2.1     +55 -0      openpkg-src/lynx/lynx.patch
    1.30.4.2    +4  -2      openpkg-src/lynx/lynx.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/lynx/lynx.patch
  ============================================================================
  $ cvs diff -u -r0 -r1.1.2.1 lynx.patch
  --- /dev/null 2004-07-25 10:13:07 +0200
  +++ lynx.patch        2004-07-25 10:13:07 +0200
  @@ -0,0 +1,55 @@
  +Index: WWW/Library/Implementation/makefile.in
  +--- WWW/Library/Implementation/makefile.in.orig      2004-01-25 02:51:04 +0100
  ++++ WWW/Library/Implementation/makefile.in   2004-07-19 10:42:02 +0200
  +@@ -25,11 +25,12 @@
  + INTLDIR_CPPFLAGS= @INTLDIR_CPPFLAGS@ -I$(top_srcdir)/intl
  + 
  + CPP         = @CPP@
  +-CPPOPTS             = $(DEFS) $(CPPFLAGS) $(LYFLAGS) \
  ++CPPOPTS             = \
  +             -I../../.. \
  +             -I../../../src \
  +             -I$(top_srcdir) \
  +             -I$(top_srcdir)/src \
  ++            $(DEFS) $(CPPFLAGS) $(LYFLAGS) \
  +             $(INTLDIR_CPPFLAGS) -I$(WWWINC)
  + 
  + LY_CFLAGS   = @CFLAGS@
  +Index: src/chrtrans/makefile.in
  +--- src/chrtrans/makefile.in.orig    2004-01-08 03:03:09 +0100
  ++++ src/chrtrans/makefile.in 2004-07-19 10:41:39 +0200
  +@@ -31,12 +31,13 @@
  + x           = @EXEEXT@
  + o           = [EMAIL PROTECTED]@
  + 
  +-CPP_OPTS    = @DEFS@ @CPPFLAGS@ \
  ++CPP_OPTS    = \
  +             -I$(top_builddir) \
  +             -I$(top_srcdir)/src \
  +             -I$(top_srcdir)/src/chrtrans \
  +             -I$(top_srcdir)/$(WWWINC) \
  +             -I$(top_srcdir)/ \
  ++            @DEFS@ @CPPFLAGS@ \
  +             $(INTLDIR_CPPFLAGS) $(SITE_DEFS)
  + CC_OPTS             = $(CPP_OPTS) $(CFLAGS)
  + 
  +Index: src/makefile.in
  +--- src/makefile.in.orig     2004-01-08 03:03:09 +0100
  ++++ src/makefile.in  2004-07-19 10:40:37 +0200
  +@@ -41,7 +41,7 @@
  + INTLLIB             = @INTLLIBS@
  + INTLDIR_CPPFLAGS= @[EMAIL PROTECTED](top_srcdir)/intl
  + 
  +-CPP_OPTS    = $(CPPFLAGS) $(DEFS) $(CHARSET_DEFS) \
  ++CPP_OPTS    = \
  +             -DLOCALEDIR=\"$(localedir)\" \
  +             -I. \
  +             -I$(top_builddir) \
  +@@ -50,6 +50,7 @@
  +             -I$(top_srcdir) \
  +             -I$(top_srcdir)/src \
  +             -I$(top_srcdir)/$(WWWINC) \
  ++            $(CPPFLAGS) $(DEFS) $(CHARSET_DEFS) \
  +             $(INTLDIR_CPPFLAGS) $(SITE_DEFS)
  + CC_OPTS             = $(CPP_OPTS) $(CFLAGS)
  + 
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/lynx/lynx.spec
  ============================================================================
  $ cvs diff -u -r1.30.4.1 -r1.30.4.2 lynx.spec
  --- openpkg-src/lynx/lynx.spec        2 Jul 2004 15:26:06 -0000       1.30.4.1
  +++ openpkg-src/lynx/lynx.spec        25 Jul 2004 08:13:07 -0000      1.30.4.2
  @@ -38,10 +38,11 @@
   Group:        Web
   License:      BSD
   Version:      %{V_real}
  -Release:      2.1.0
  +Release:      2.1.1
   
   #   list of sources
   Source0:      http://lynx.isc.org/release/lynx%{V_real}.tar.bz2
  +Patch0:       lynx.patch
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -65,10 +66,11 @@
   
   %prep
       %setup -q -n lynx%{V_file}
  +    %patch -p0
   
   %build
       CC="%{l_cc}" \
  -    CFLAGS="%{l_cflags -O} %{l_cppflags}" \
  +    CFLAGS="%{l_cflags -O}" \
       CPPFLAGS="%{l_cppflags}" \
       LDFLAGS="%{l_ldflags}" \
       ./configure \
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to