Add some explicit library dependencies to fix build on recent Linux.

3 files changed, 45 insertions, 11 deletions

diff --git a/www/libwww/distinfo b/www/libwww/distinfo
index 893c9baf6b3..85f38e915a2 100644
--- a/www/libwww/distinfo
+++ b/www/libwww/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2010/01/26 18:38:26 drochner Exp $
+$NetBSD: distinfo,v 1.26 2013/07/05 21:06:02 joerg Exp $
 
 SHA1 (libwww-configure-5.4.0nb2.gz) = de3292e2ec4034485b300845e7a0c0ef4ceb0199
 RMD160 (libwww-configure-5.4.0nb2.gz) = bead5840a43b85e7de79e1bf5e26fa997cf827e3
@@ -9,7 +9,7 @@ Size (w3c-libwww-5.4.0.tgz) = 1129121 bytes
 SHA1 (patch-aa) = fc0124c8995992536782e60ce67332c2dc505b10
 SHA1 (patch-ab) = 24db9ca337bd6768fa5b208186f7b55e555beb8f
 SHA1 (patch-ac) = d3b153c4360d5eb0439a9d328d259896937902df
-SHA1 (patch-ad) = a585498bace904928d18e7449a6defad82f59596
+SHA1 (patch-ad) = b3c9eaf2e9eabe2ab68b8858f6f9dbe65d650ae4
 SHA1 (patch-ae) = 4130a9a20d806553a79e04c79d652b76ec1dce34
 SHA1 (patch-af) = ce044829940b51037ff37f717dbf92e96504a391
 SHA1 (patch-ai) = 95912fb5b836e4dce01b630f9e6e9c9f41d7bb72
@@ -18,7 +18,7 @@ SHA1 (patch-ak) = fb13a43105ee252a461d20b67d5841db6d247dde
 SHA1 (patch-al) = dae1e731f7a9ff36ef1f60f2a4a6cc97e359ae63
 SHA1 (patch-am) = 8252ce567efc056daa10af39eeca314f9a915f90
 SHA1 (patch-an) = e7195c25ce08e13e0c8b64b05b737e9a5f5157a8
-SHA1 (patch-ao) = fa5c98f6c4e873f816e5a5bc48481d1462c946dc
+SHA1 (patch-ao) = b5489ae73d347c9a4e32a66344e12236e2023520
 SHA1 (patch-ap) = 506ee8ddd2e627aa6ba84b933ca39a6934b95689
 SHA1 (patch-aq) = f44086c50dfe3d5af714b6defcb40ac7a1ed36f1
 SHA1 (patch-ar) = ddbe9f7e7add849dcbdf215d0087bb3e314100c3
diff --git a/www/libwww/patches/patch-ad b/www/libwww/patches/patch-ad
index f053dbce12b..32e7f7ce1ef 100644
--- a/www/libwww/patches/patch-ad
+++ b/www/libwww/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.5 2003/04/03 18:05:34 jschauma Exp $
+$NetBSD: patch-ad,v 1.6 2013/07/05 21:06:02 joerg Exp $
 
---- Library/src/Makefile.am.orig	Wed May 29 12:09:13 2002
-+++ Library/src/Makefile.am	Thu Apr  3 12:53:38 2003
+--- Library/src/Makefile.am.orig	2002-05-29 16:09:13.000000000 +0000
++++ Library/src/Makefile.am
 @@ -1,6 +1,6 @@
  ## Process this file with Automake to create Makefile.in.
  
@@ -10,7 +10,7 @@ $NetBSD: patch-ad,v 1.5 2003/04/03 18:05:34 jschauma Exp $
  
  lib_LTLIBRARIES = \
  	libwwwutils.la \
-@@ -253,7 +253,7 @@
+@@ -253,7 +253,7 @@ libwwwhttp_la_SOURCES = \
  	HTPEP.c
  
  libwwwhttp_la_DEPENDENCIES = \
@@ -19,7 +19,32 @@ $NetBSD: patch-ad,v 1.5 2003/04/03 18:05:34 jschauma Exp $
  
  libwwwnews_la_SOURCES = \
  	WWWNews.h \
-@@ -387,9 +387,8 @@
+@@ -311,6 +311,13 @@ libwwwdir_la_SOURCES = \
+ 	HTDir.h \
+ 	HTDir.c
+ 
++libwwwapp_la_LDFLAGS = \
++	@WWWZIP@ \
++	@WWWXML@
++libwwwapp_la_DEPENDENCIES = \
++	@WWWZIP@ \
++	@WWWXML@
++
+ libwwwapp_la_SOURCES = \
+ 	WWWApp.h \
+ 	HTAccess.h \
+@@ -366,7 +373,9 @@ libwwwxml_la_DEPENDENCIES = \
+ 	../../modules/expat/xmltok/libxmltok.la \
+ 	../../modules/expat/xmlparse/libxmlparse.la
+ 
+-libwwwxml_la_LDFLAGS = -rpath $(libdir)
++libwwwxml_la_LDFLAGS = -rpath $(libdir) \
++	../../modules/expat/xmltok/libxmltok.la \
++	../../modules/expat/xmlparse/libxmlparse.la
+ 
+ libwwwzip_la_SOURCES = \
+ 	WWWZip.h \
+@@ -387,9 +396,8 @@ libwwwsql_la_SOURCES = \
  libwwwsql_la_LDFLAGS = -rpath $(libdir)
  
  INCLUDES = \
diff --git a/www/libwww/patches/patch-ao b/www/libwww/patches/patch-ao
index d089af20668..cde9bc38251 100644
--- a/www/libwww/patches/patch-ao
+++ b/www/libwww/patches/patch-ao
@@ -1,7 +1,7 @@
-$NetBSD: patch-ao,v 1.1 2003/04/03 18:05:34 jschauma Exp $
+$NetBSD: patch-ao,v 1.2 2013/07/05 21:06:02 joerg Exp $
 
---- modules/expat/xmlparse/Makefile.am.orig	Thu Apr  3 12:49:06 2003
-+++ modules/expat/xmlparse/Makefile.am	Thu Apr  3 12:49:19 2003
+--- modules/expat/xmlparse/Makefile.am.orig	2000-06-14 08:53:42.000000000 +0000
++++ modules/expat/xmlparse/Makefile.am
 @@ -1,6 +1,6 @@
  ## Process this file with Automake to create Makefile.in.
  
@@ -10,3 +10,12 @@ $NetBSD: patch-ao,v 1.1 2003/04/03 18:05:34 jschauma Exp $
  
  CFLAGS = @CFLAGS@ -DXML_NS
  
+@@ -17,7 +17,7 @@ libxmlparse_la_SOURCES = \
+ 	hashtable.c \
+ 	xmlparse.c
+ 
+-libxmlparse_la_LDFLAGS = -rpath $(libdir)
++libxmlparse_la_LDFLAGS = -rpath $(libdir) ../xmltok/libxmltok.la
+ 
+ pkginclude_HEADERS = \
+ 	xmlparse.h