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:   30-Jul-2003 20:17:53
  Branch: OPENPKG_1_STABLE HEAD            Handle: 2003073019175101

  Added files:              (Branch: OPENPKG_1_STABLE)
    openpkg-src/expect      expect.patch
  Modified files:
    openpkg-web             news.txt
  Modified files:           (Branch: OPENPKG_1_STABLE)
    openpkg-src/expect      expect.spec

  Log:
    MFC: changes since last merge

  Summary:
    Revision    Changes     Path
    1.1.2.1     +23 -0      openpkg-src/expect/expect.patch
    1.15.2.3    +3  -1      openpkg-src/expect/expect.spec
    1.5915      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/expect/expect.patch
  ============================================================================
  $ cvs diff -u -r0 -r1.1.2.1 expect.patch
  --- /dev/null 2003-07-30 20:17:53.000000000 +0200
  +++ expect.patch      2003-07-30 20:17:53.000000000 +0200
  @@ -0,0 +1,23 @@
  +--- tcl8.4.4/unix/Makefile.in.dist   2003-07-22 10:32:06.000000000 +0200
  ++++ tcl8.4.4/unix/Makefile.in        2003-07-22 10:33:10.000000000 +0200
  +@@ -1343,12 +1343,15 @@
  + # TOOL_DIR.
  + #
  + 
  +-html-tcl: EXTRA_HTML_ARGS=--tcl
  +-html-tk:  EXTRA_HTML_ARGS=--tk
  +-
  +-html html-tcl html-tk: 
  ++html:
  ++    $(TCL_EXE) $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(DISTDIR)/html \
  ++            --srcdir=$(TOP_DIR)/..
  ++html-tcl:
  ++    $(TCL_EXE) $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(DISTDIR)/html \
  ++            --srcdir=$(TOP_DIR)/.. --tcl
  ++html-tk:
  +     $(TCL_EXE) $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(DISTDIR)/html \
  +-            --srcdir=$(TOP_DIR)/.. $(EXTRA_HTML_ARGS)
  ++            --srcdir=$(TOP_DIR)/.. --tk
  + 
  + #
  + # Target to create a Macintosh version of the distribution.  This will
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/expect/expect.spec
  ============================================================================
  $ cvs diff -u -r1.15.2.2 -r1.15.2.3 expect.spec
  --- openpkg-src/expect/expect.spec    24 Jul 2003 20:44:03 -0000      1.15.2.2
  +++ openpkg-src/expect/expect.spec    30 Jul 2003 18:17:52 -0000      1.15.2.3
  @@ -46,11 +46,12 @@
   Group:        Language
   License:      GPL
   Version:      %{V_expect}
  -Release:      1.20030724
  +Release:      1.20030730
   
   #   list of sources
   Source0:      http://expect.nist.gov/expect.tar.gz
   Source1:      ftp://ftp.scriptics.com/pub/tcl/tcl8_4/tcl%{V_tcl}-src.tar.gz
  +Patch0:       expect.patch
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -69,6 +70,7 @@
   %prep
       %setup0 -q -c -n expect-%{version}
       %setup1 -q -T -D -a 1
  +    %patch0 -p0
   
   %build
       ( cd tcl%{V_tcl}/unix
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.5914 -r1.5915 news.txt
  --- openpkg-web/news.txt      30 Jul 2003 18:13:31 -0000      1.5914
  +++ openpkg-web/news.txt      30 Jul 2003 18:17:51 -0000      1.5915
  @@ -1,3 +1,4 @@
  +30-Jul-2003: Upgraded package: P<expect-5.38-1.20030730>
   30-Jul-2003: Upgraded package: P<openpkg-1.20030730-1.20030730>
   30-Jul-2003: Upgraded package: P<pgp-6.5.8-1.20030730>
   30-Jul-2003: Upgraded package: P<uucp-1.07-1.20030730>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to