testing/w3m: parallel build fix

2 files changed, 218 insertions, 14 deletions

diff --git a/testing/w3m/APKBUILD b/testing/w3m/APKBUILD
index 1576bd3c52..25081ee429 100644
--- a/testing/w3m/APKBUILD
+++ b/testing/w3m/APKBUILD
@@ -3,14 +3,16 @@ pkgver=0.5.3
 pkgrel=0
 pkgdesc='Text-based Web browser, as well as pager'
 url='http://w3m.sourceforge.net/'
-license='custom'
-arch='i686 x86_64'
-makedepends="imlib2-dev openssl-dev gc-dev ncurses-dev"
+license='MIT UCD'
+arch='all'
+makedepends="imlib2-dev openssl-dev gc-dev ncurses-dev linux-headers"
 source="http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz
-        form_unknown.patch
-        file_handle.patch
-        https.patch
-        gc72.patch"
+	form_unknown.patch
+	file_handle.patch
+	https.patch
+	gc72.patch
+	w3m-0.5.3-parallel-make.patch
+	"
 
 prepare() {
 	local i
@@ -29,15 +31,15 @@ build() {
 		--libexecdir=/usr/lib \
 		--enable-image=fb \
 		--with-ssl \
-      --disable-nntp \
-      --disable-dict \
-      --disable-help-cgi \
+		--disable-nntp \
+		--disable-dict \
+		--disable-help-cgi \
 		--with-imagelib=imlib2 \
 		--with-termlib=ncurses \
 		--disable-w3mmailer \
 		--disable-mouse \
+		|| return 1
 
-	#sed 's/@my_libs@/-lX11/g' -i Makefile
 	make
 }
 
@@ -54,14 +56,17 @@ md5sums="1b845a983a50b8dec0169ac48479eacc  w3m-0.5.3.tar.gz
 4db72a234824f8b5d45eb78fe3e1f526  form_unknown.patch
 d1bbc652a9e63f5e65b4112e88037ded  file_handle.patch
 a5e1038b5fb36ac1465700433ae00d0b  https.patch
-46ca1e8264a3a521b073453600fb3c5f  gc72.patch"
+46ca1e8264a3a521b073453600fb3c5f  gc72.patch
+6684eb14831aa9b79bc230a9a9949351  w3m-0.5.3-parallel-make.patch"
 sha256sums="e994d263f2fd2c22febfbe45103526e00145a7674a0fda79c822b97c2770a9e3  w3m-0.5.3.tar.gz
 7d2f4ff43eeb1b81fb6126063cf091902205c375fdcdffe0998ff51e73ff9d27  form_unknown.patch
 dbf746808b64cd163dbcc6d299d80abdbbb7b5eff633d39c3f73dd42370633bc  file_handle.patch
 ab8f2b6c7e1cf2d8485fa9928784c8dbd2f0d8cd26a5c32384543eea173de986  https.patch
-1e0e573e5fc6c0938b1941a81cffdd604a0167f7cf46e1a8479e2e10969e1d04  gc72.patch"
+1e0e573e5fc6c0938b1941a81cffdd604a0167f7cf46e1a8479e2e10969e1d04  gc72.patch
+249e8e0e8469daa1d33d2154ed78b604e8bb6cefc68f02cc5cf10b56e8890d42  w3m-0.5.3-parallel-make.patch"
 sha512sums="43508c76d07b4d8f19c19f975c0b870aeb94abf0744b6128ee01c759d4e409a8b57bc866baeaf990f309ff73e9a7b02ca455d272b1dd0a93fafb8c72b1fe6d14  w3m-0.5.3.tar.gz
 fd7e4d1bf05d5109e64cc2971d3f98ad28ba4404dfa6510953150550590991b910ca6b96bf66993f63e77ff59ffe1e266eed8f1dde43efd8272825d9de36948a  form_unknown.patch
 b67c1ddb37536838fa753a5171801fa170d77c1b4bce5d5de1fcb119cd6d3c158267d472a75940a6fbe6169365ad45963f64050cbb56440613df33ab66a20d4e  file_handle.patch
 3844b3a079524ad403da7fe03461210a433ff1cd562862c4df55c3be250ccba0c34eb61bcc8df1973d70e2ef034edaf1804bb2fa682b01723322f108f523932a  https.patch
-31989443973af87672cdc00ac04533530c40c5cc393703db79ce5836ae56300baa898ee21e9bebcd77cce623321d6194665d965be89c3eed1990f5b984375ccd  gc72.patch"
+31989443973af87672cdc00ac04533530c40c5cc393703db79ce5836ae56300baa898ee21e9bebcd77cce623321d6194665d965be89c3eed1990f5b984375ccd  gc72.patch
+b2df0847cef329b0b1a00c34f298d2f317837b0cb490ea2f6a3a358a723200dd0388a4cf9fa43d04b512073aba219b7db3fdeae3d6d21fba9d3c40cde306790a  w3m-0.5.3-parallel-make.patch"
diff --git a/testing/w3m/w3m-0.5.3-parallel-make.patch b/testing/w3m/w3m-0.5.3-parallel-make.patch
new file mode 100644
index 0000000000..231a595805
--- /dev/null
+++ b/testing/w3m/w3m-0.5.3-parallel-make.patch
@@ -0,0 +1,199 @@
+This patch will help to build w3m with paralle make enabled
+
+diff -urN w3m-0.5.3.patched/Makefile.in w3m-0.5.3/Makefile.in
+--- w3m-0.5.3.patched/Makefile.in	2012-12-21 19:27:52.768916831 +0530
++++ w3m-0.5.3/Makefile.in	2012-12-24 18:13:07.660895921 +0530
+@@ -34,6 +34,7 @@
+ RC_DIR = @RC_DIR@
+ ETC_DIR = $(sysconfdir)
+ CONF_DIR = $(sysconfdir)/$(PACKAGE)
++DOCDIRS = @DOCDIRS@
+ 
+ CFLAGS = $(OPTS) -I. -I$(top_srcdir) @CFLAGS@ $(CPPFLAGS) $(DEFS)
+ WCCFLAGS = @WCCFLAGS@
+@@ -50,6 +51,7 @@
+ W3M_LIBS = @W3M_LIBS@
+ WCTARGET = @WCTARGET@
+ NLSTARGET = @NLSTARGET@
++HELP_TARGETS	= w3mhelp-funcname.pl w3mhelp-funcdesc-stamp
+ 
+ MAKE_ARGS = PERL='$(PERL)' MKDIR='$(MKDIR)' \
+ 	BIN_DIR='$(bindir)' AUXBIN_DIR='$(AUXBIN_DIR)' \
+@@ -124,7 +126,7 @@
+ SUBDIRS = $(SCRIPTSUBDIRS) w3mimg libwc po
+ .PHONY: $(SUBDIRS)
+ 
+-all: $(TARGETS) all-scripts $(NLSTARGET)
++all: funcname.tab $(TARGETS) all-scripts $(NLSTARGET) $(HELP_TARGETS)
+ 
+ $(TARGET): $(ALLOBJS) $(ALIB) $(WCTARGET)
+ 	$(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LDFLAGS) $(LIBS) $(EXT_LIBS) $(W3M_LIBS)
+@@ -176,6 +178,31 @@
+ 	./mktable$(EXT) 100 functable.tab > $@
+ 	-rm -f functable.tab
+ 
++w3mhelp-funcname.pl: scripts/w3mhelp-funcname.pl.in funcname.tab $(top_srcdir)/doc/keymap.default $(top_srcdir)/doc/keymap.lynx
++	@echo "generating w3mhelp-funcname.pl..."
++	@echo '%funcname = (' > scripts/w3mhelp-funcname.pl
++	@sed -ne "/^[a-zA-Z@]/s/\([a-zA-Z@][a-zA-Z0-9@_]*\)[ 	][ 	]*\([^ 	]*\)/'\1', '\2',/p" < $(top_srcdir)/funcname.tab >> scripts/w3mhelp-funcname.pl
++	@echo ');' >> scripts/w3mhelp-funcname.pl
++	@echo '%keyfunc = (' >> scripts/w3mhelp-funcname.pl
++	@case "$(KEYBIND_SRC)" in *lynx*) keymap=keymap.lynx;; *) keymap=keymap.default;; esac; \
++	sed -ne "/^keymap/s/^keymap[ 	][ 	]*\([^ 	]*\)[ 	][ 	]*\([a-zA-Z@][a-zA-Z0-9@_]*\)/'\1', '\2', /p" < $(top_srcdir)/doc/$$keymap >> scripts/w3mhelp-funcname.pl
++	@echo ');' >> scripts/w3mhelp-funcname.pl
++	@cat scripts/w3mhelp-funcname.pl.in >> scripts/w3mhelp-funcname.pl
++	@echo "done"
++
++w3mhelp-funcdesc-stamp: $(top_srcdir)/doc/README.func $(top_srcdir)/doc-jp/README.func scripts/w3mhelp-funcdesc.en.pl.in scripts/w3mhelp-funcdesc.ja.pl.in
++	@echo "generating w3mhelp-funcdesc*.pl..."
++	@for dirlang in $(DOCDIRS); do \
++	  dir=`expr "$$dirlang" : "\(.*\):.*"`; \
++	  lang=`expr "$$dirlang" : ".*:\(.*\)_.*"`; \
++	  echo '%funcdesc = (' > scripts/w3mhelp-funcdesc.$$lang.pl; \
++	  sed -ne "/^[a-zA-Z@]/s/\([a-zA-Z@][a-zA-Z0-9@_]*\)[ 	][ 	]*\(.*\)/'\1', '\2',/p" < $(top_srcdir)/$$dir/README.func >> scripts/w3mhelp-funcdesc.$$lang.pl; \
++	  echo ');' >> scripts/w3mhelp-funcdesc.$$lang.pl; \
++	  cat scripts/w3mhelp-funcdesc.$$lang.pl.in >> scripts/w3mhelp-funcdesc.$$lang.pl; \
++	done
++	@echo done
++	@touch scripts/w3mhelp-funcdesc-stamp
++
+ mktable$(EXT): mktable.o dummy.o Str.o hash.o myctype.o
+ 	$(CC) $(CFLAGS) -o mktable mktable.o dummy.o Str.o hash.o myctype.o $(LDFLAGS) $(LIBS) $(GC_LIBS)
+ 
+@@ -213,7 +240,7 @@
+ 
+ install: install-core install-scripts install-po
+ 
+-install-core: $(TARGETS)
++install-core: $(TARGETS) $(HELP_TARGETS)
+ 	-$(MKDIR) $(DESTDIR)$(bindir)
+ 	-$(MKDIR) $(DESTDIR)$(AUXBIN_DIR)
+ 	-$(MKDIR) $(DESTDIR)$(CGIBIN_DIR)
+@@ -236,6 +263,10 @@
+ 	do \
+ 		$(INSTALL_PROGRAM) $$file $(DESTDIR)$(CGIBIN_DIR)/$$file; \
+ 	done
++	for file in scripts/w3mhelp-*.pl; \
++	do \
++		$(INSTALL_DATA) $$file $(DESTDIR)$(HELP_DIR); \
++	done
+ 
+ install-helpfile:
+ 	-$(MKDIR) $(DESTDIR)$(HELP_DIR)
+@@ -277,6 +308,10 @@
+ 	do \
+ 		$(RM) -f $(HELP_DIR)/$$file; \
+ 	done
++	-for file in scripts/w3mhelp-*.pl; \
++	do \
++		rm -f $(HELP_DIR)/$$file; \
++	done
+ 	-$(RM) -f $(HELP_DIR)/$(HELP_TARGET)
+ 	-$(RM) -f $(mandir)/man1/$(MAN1_TARGET)
+ 	-$(RM) -f $(mandir)/ja/man1/$(MAN1_TARGET)
+@@ -289,6 +324,7 @@
+ 	-$(RM) -f *.o *.a $(TARGETS) mktable$(EXT)
+ 	-$(RM) -f funcname.tab
+ 	-$(RM) -f funcname.c funcname1.h funcname2.h tagtable.c functable.c
++	-rm -f $(HELP_TARGETS) w3mhelp-*.pl
+ 	-for dir in w3mimg libwc; \
+ 	do \
+ 		(cd $$dir && $(MAKE) clean RM="$(RM)"); \
+diff -urN w3m-0.5.3.patched/scripts/Makefile.in w3m-0.5.3/scripts/Makefile.in
+--- w3m-0.5.3.patched/scripts/Makefile.in	2011-01-04 14:52:28.000000000 +0530
++++ w3m-0.5.3/scripts/Makefile.in	2012-12-24 18:18:36.546170726 +0530
+@@ -31,11 +31,9 @@
+ RC_DIR = @RC_DIR@
+ ETC_DIR = $(sysconfdir)
+ CONF_DIR = $(sysconfdir)/$(PACKAGE)
+-DOCDIRS = @DOCDIRS@
+ 
+ AUXBIN_TARGETS	= xface2xpm
+ LIB_TARGETS	= dirlist.cgi w3mhelp.cgi w3mmail.cgi
+-HELP_TARGETS	= w3mhelp-funcname.pl w3mhelp-funcdesc-stamp
+ SUBDIRS = multipart w3mman
+ .PHONY: $(SUBDIRS)
+ 
+@@ -46,32 +44,7 @@
+ 
+ PERL		= @PERL@
+ 
+-all: $(LIB_TARGETS) $(AUXBIN_TARGETS) $(HELP_TARGETS) $(SUBDIRS)
+-
+-w3mhelp-funcname.pl: w3mhelp-funcname.pl.in ../funcname.tab $(top_srcdir)/doc/keymap.default $(top_srcdir)/doc/keymap.lynx
+-	@echo "generating w3mhelp-funcname.pl..."
+-	@echo '%funcname = (' > w3mhelp-funcname.pl
+-	@sed -ne "/^[a-zA-Z@]/s/\([a-zA-Z@][a-zA-Z0-9@_]*\)[ 	][ 	]*\([^ 	]*\)/'\1', '\2',/p" < ../funcname.tab >> w3mhelp-funcname.pl
+-	@echo ');' >> w3mhelp-funcname.pl
+-	@echo '%keyfunc = (' >> w3mhelp-funcname.pl
+-	@case "$(KEYBIND_SRC)" in *lynx*) keymap=keymap.lynx;; *) keymap=keymap.default;; esac; \
+-	sed -ne "/^keymap/s/^keymap[ 	][ 	]*\([^ 	]*\)[ 	][ 	]*\([a-zA-Z@][a-zA-Z0-9@_]*\)/'\1', '\2', /p" < $(top_srcdir)/doc/$$keymap >> w3mhelp-funcname.pl
+-	@echo ');' >> w3mhelp-funcname.pl
+-	@cat $(srcdir)/w3mhelp-funcname.pl.in >> w3mhelp-funcname.pl
+-	@echo "done"
+-
+-w3mhelp-funcdesc-stamp: $(top_srcdir)/doc/README.func $(top_srcdir)/doc-jp/README.func w3mhelp-funcdesc.en.pl.in w3mhelp-funcdesc.ja.pl.in
+-	@echo "generating w3mhelp-funcdesc*.pl..."
+-	@for dirlang in $(DOCDIRS); do \
+-	  dir=`expr "$$dirlang" : "\(.*\):.*"`; \
+-	  lang=`expr "$$dirlang" : ".*:\(.*\)_.*"`; \
+-	  echo '%funcdesc = (' > w3mhelp-funcdesc.$$lang.pl; \
+-	  sed -ne "/^[a-zA-Z@]/s/\([a-zA-Z@][a-zA-Z0-9@_]*\)[ 	][ 	]*\(.*\)/'\1', '\2',/p" < $(top_srcdir)/$$dir/README.func >> w3mhelp-funcdesc.$$lang.pl; \
+-	  echo ');' >> w3mhelp-funcdesc.$$lang.pl; \
+-	  cat $(srcdir)/w3mhelp-funcdesc.$$lang.pl.in >> w3mhelp-funcdesc.$$lang.pl; \
+-	done
+-	@echo done
+-	@touch w3mhelp-funcdesc-stamp
++all: $(LIB_TARGETS) $(AUXBIN_TARGETS) $(SUBDIRS)
+ 
+ $(SUBDIRS):
+ 	for subdir in $(SUBDIRS); \
+@@ -82,7 +55,6 @@
+ install: $(LIB_TARGETS) $(HELP_TARGETS)
+ 	-$(MKDIR) $(DESTDIR)$(AUXBIN_DIR)
+ 	-$(MKDIR) $(DESTDIR)$(CGIBIN_DIR)
+-	-$(MKDIR) $(DESTDIR)$(HELP_DIR)
+ 	for file in $(AUXBIN_TARGETS);     \
+ 	do      \
+ 		$(INSTALL_SCRIPT) $$file $(DESTDIR)$(AUXBIN_DIR);  \
+@@ -91,10 +63,6 @@
+ 	do      \
+ 		$(INSTALL_SCRIPT) $$file $(DESTDIR)$(CGIBIN_DIR);  \
+ 	done
+-	for file in w3mhelp-*.pl; \
+-	do \
+-		$(INSTALL_DATA) $$file $(DESTDIR)$(HELP_DIR); \
+-	done
+ 	for subdir in $(SUBDIRS); \
+ 	do \
+ 		(cd $$subdir && $(MAKE) install); \
+@@ -109,17 +77,12 @@
+ 	do      \
+ 		rm -f $(LIB_DIR)/$$file; \
+ 	done
+-	-for file in w3mhelp-*.pl; \
+-	do \
+-		rm -f $(HELP_DIR)/$$file; \
+-	done
+ 	-for subdir in $(SUBDIRS); \
+ 	do \
+ 		(cd $$subdir && $(MAKE) uninstall); \
+ 	done
+ 
+ clean:
+-	-rm -f $(HELP_TARGETS) w3mhelp-*.pl
+ 	-for subdir in $(SUBDIRS); \
+ 	do \
+ 	  (cd $$subdir && $(MAKE) clean); \
+diff -urN w3m-0.5.3.patched/w3mimg/Makefile.in w3m-0.5.3/w3mimg/Makefile.in
+--- w3m-0.5.3.patched/w3mimg/Makefile.in	2011-01-04 14:52:28.000000000 +0530
++++ w3m-0.5.3/w3mimg/Makefile.in	2012-12-24 18:14:49.836980207 +0530
+@@ -18,6 +18,8 @@
+ .PHONY: $(SUBDIRS)
+ all: @IMGTARGETS@ w3mimg.a
+ 
++$(IMGOBJS): @IMGTARGETS@
++
+ w3mimg.a: $(IMGOBJS)
+ 	$(AR) rv $@ $(IMGOBJS)
+ 	$(RANLIB) $@