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: 13-Jun-2003 09:22:10
Branch: HEAD Handle: 2003061308220901
Added files:
openpkg-src/htdig htdig.patch.pl
Modified files:
openpkg-src/htdig htdig.patch htdig.spec
openpkg-web news.txt
Log:
pastime: fix building
Summary:
Revision Changes Path
1.4 +12 -0 openpkg-src/htdig/htdig.patch
1.1 +43 -0 openpkg-src/htdig/htdig.patch.pl
1.36 +8 -7 openpkg-src/htdig/htdig.spec
1.4850 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/htdig/htdig.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 htdig.patch
--- openpkg-src/htdig/htdig.patch 14 Jan 2003 15:42:06 -0000 1.3
+++ openpkg-src/htdig/htdig.patch 13 Jun 2003 07:22:10 -0000 1.4
@@ -171,3 +171,15 @@
#if !defined(DBL_MAX) && defined(MAXFLOAT)
# define DBL_MAX MAXFLOAT
+--- htsearch/htsearch.cc.orig Fri Feb 23 01:31:35 2001
++++ htsearch/htsearch.cc Fri Jun 13 09:09:20 2003
+@@ -315,8 +315,7 @@
+ String doc_index = config["doc_index"];
+ if (access((char*)doc_index, R_OK) < 0)
+ {
+- reportError(form("Unable to read document index file '%s'\nDid you run h
+-tmerge?",
++ reportError(form("Unable to read document index file '%s'\nDid you run
htmerge?",
+ doc_index.get()));
+ }
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/htdig/htdig.patch.pl
============================================================================
$ cvs diff -u -r0 -r1.1 htdig.patch.pl
--- /dev/null 2003-06-13 09:22:10.000000000 +0200
+++ htdig.patch.pl 2003-06-13 09:22:10.000000000 +0200
@@ -0,0 +1,43 @@
+##
+## C/C++ multiline string literal breaking utility
+##
+
+use IO;
+
+# read in C/C++ source
+my $file = $ARGV[0];
+my $io = new IO::File "<$file";
+my $src = '';
+$src .= $_ while <$io>;
+$io->close;
+
+# process C/C++ source
+my $done = ''; my $this = ''; my $todo = $src;
+my $inside = 0;
+while ($todo =~ m/([\\"i]|\r?\n)/s) {
+ $done .= $`; $this = $&; $todo = $';
+ my $char = $1;
+ if ($char eq '\\') {
+ # escaped character
+ $this .= substr($todo, 0, 1);
+ $todo = substr($todo, 1);
+ }
+ elsif ($char eq '"') {
+ # toggle "inside string" mode
+ $inside = !($inside);
+ }
+ elsif ($char =~ m|^\r?\n$|s) {
+ # in "inside string" mode, break string
+ if ($inside) {
+ $this = "\\n\"" . $this . "\"";
+ }
+ }
+ $done .= $this;
+}
+$src = $done;
+
+# write out C/C++ source
+$io = new IO::File ">$file";
+$io->print($src);
+$io->close;
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/htdig/htdig.spec
============================================================================
$ cvs diff -u -r1.35 -r1.36 htdig.spec
--- openpkg-src/htdig/htdig.spec 17 Jan 2003 20:01:46 -0000 1.35
+++ openpkg-src/htdig/htdig.spec 13 Jun 2003 07:22:10 -0000 1.36
@@ -33,16 +33,17 @@
Group: Web
License: GPL
Version: 3.2.0b3
-Release: 20030117
+Release: 20030613
# list of sources
Source0: http://www.htdig.org/files/htdig-%{version}.tar.gz
+Source1: htdig.patch.pl
Patch0: htdig.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20021204, make, flex, zlib, gcc
+BuildPreReq: OpenPKG, openpkg >= 20021204, make, flex, zlib, gcc, perl
PreReq: OpenPKG, openpkg >= 20021204
AutoReq: no
AutoReqProv: no
@@ -61,14 +62,14 @@
%prep
%setup -q
%patch -p0
+ %{l_prefix}/bin/perl %{SOURCE htdig.patch.pl} htcommon/defaults.cc
%build
CC="%{l_cc}" \
- CXX="%{l_cxx}" \
- CFLAGS="%{l_cflags -O} -Wno-deprecated" \
- CPPFLAGS="%{l_cppflags} -Wno-deprecated" \
- CXXFLAGS="%{l_cxxflags -O} -Wno-deprecated" \
- CXXFLAGS="%{l_cxxflags -O} -Wno-deprecated" \
+ CXX="%{l_cxx} -Wno-deprecated" \
+ CPPFLAGS="%{l_cppflags}" \
+ CFLAGS="%{l_cflags -O}" \
+ CXXFLAGS="%{l_cxxflags -O}" \
./configure \
--prefix=%{l_prefix} \
--with-config-dir=%{l_prefix}/etc/htdig \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4849 -r1.4850 news.txt
--- openpkg-web/news.txt 13 Jun 2003 06:19:34 -0000 1.4849
+++ openpkg-web/news.txt 13 Jun 2003 07:22:09 -0000 1.4850
@@ -1,3 +1,4 @@
+13-Jun-2003: Upgraded package: P<htdig-3.2.0b3-20030613>
13-Jun-2003: Upgraded package: P<perl-www-20030613-20030613>
13-Jun-2003: Upgraded package: P<binutils-2.14-20030613>
12-Jun-2003: Upgraded package: P<dnstracer-1.7-20030612>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
