OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 19-Feb-2006 09:21:53
Branch: HEAD Handle: 2006021908215300
Added files:
openpkg-src/w3m w3m.patch
Modified files:
openpkg-src/w3m w3m.spec
Log:
apply a patch from the FreeBSD ports which closes the pipe for gzipped
stream properly; move substitution into patch file, too
Summary:
Revision Changes Path
1.4 +24 -0 openpkg-src/w3m/w3m.patch
1.59 +3 -3 openpkg-src/w3m/w3m.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/w3m/w3m.patch
============================================================================
$ cvs diff -u -r0 -r1.4 w3m.patch
--- /dev/null 2006-02-19 09:21:07 +0100
+++ w3m.patch 2006-02-19 09:21:53 +0100
@@ -0,0 +1,24 @@
+Index: Makefile.in
+--- Makefile.in.orig 2004-04-26 19:04:48 +0200
++++ Makefile.in 2006-02-19 09:17:44 +0100
+@@ -117,7 +117,7 @@
+
+ DEFUNS=$(top_srcdir)/main.c $(top_srcdir)/menu.c
+ SCRIPTSUBDIRS= scripts
+-SUBDIRS = $(SCRIPTSUBDIRS) w3mimg libwc po
++SUBDIRS = $(SCRIPTSUBDIRS) w3mimg libwc
+ .PHONY: $(SUBDIRS)
+
+ all: $(TARGETS) all-scripts $(NLSTARGET)
+Index: file.c
+--- file.c.orig 2004-04-16 20:47:19 +0200
++++ file.c 2006-02-19 09:16:54 +0100
+@@ -7891,7 +7892,7 @@
+ uf->scheme = SCM_LOCAL;
+ }
+ UFhalfclose(uf);
+- uf->stream = newFileStream(f1, (void (*)())pclose);
++ uf->stream = newFileStream(f1, (void (*)())fclose);
+ }
+
+ static FILE *
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/w3m/w3m.spec
============================================================================
$ cvs diff -u -r1.58 -r1.59 w3m.spec
--- openpkg-src/w3m/w3m.spec 1 Jan 2006 13:23:50 -0000 1.58
+++ openpkg-src/w3m/w3m.spec 19 Feb 2006 08:21:53 -0000 1.59
@@ -33,10 +33,11 @@
Group: Web
License: BSD
Version: 0.5.1
-Release: 20050726
+Release: 20060219
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/w3m/w3m-%{version}.tar.gz
+Patch0: w3m.patch
# build information
Prefix: %{l_prefix}
@@ -64,6 +65,7 @@
%prep
%setup -q
+ %patch -p0
%build
CC="%{l_cc}" \
@@ -105,8 +107,6 @@
--disable-unicode \
--disable-m17n \
--disable-nls
- %{l_shtool} subst \
- -e 's; [^ ]*po$;;' Makefile
%{l_make} %{l_mflags -O}
%install
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
