Make this compile and install on Linux.

5 files changed, 45 insertions, 8 deletions

diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index a96073b8a97..f233bbbb7b9 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2002/11/19 21:50:54 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2003/04/03 18:05:33 jschauma Exp $
 
 DISTNAME=		w3c-libwww-5.4.0
 PKGNAME=		libwww-5.4.0
@@ -39,6 +39,9 @@ pre-configure:
 CONFIGURE_ARGS+= --without-md5
 PLIST_SUBST+=	MD5LIB="@comment "
 .else
+.  if !exists(/usr/include/md5.h)
+CONFIGURE_ARGS+=	--with-md5="${SSLBASE}"
+.  endif
 PLIST_SUBST+=	MD5LIB=""
 .endif
 
diff --git a/www/libwww/distinfo b/www/libwww/distinfo
index 36ce701bf1b..a5d1b35df4b 100644
--- a/www/libwww/distinfo
+++ b/www/libwww/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.13 2002/12/04 11:34:13 rearnsha Exp $
+$NetBSD: distinfo,v 1.14 2003/04/03 18:05:33 jschauma Exp $
 
 SHA1 (w3c-libwww-5.4.0.tgz) = 2394cb4e0dc4e2313a9a0ddbf508e4b726e9af63
 Size (w3c-libwww-5.4.0.tgz) = 1129121 bytes
 SHA1 (patch-aa) = fc0124c8995992536782e60ce67332c2dc505b10
 SHA1 (patch-ab) = 24db9ca337bd6768fa5b208186f7b55e555beb8f
 SHA1 (patch-ac) = d3b153c4360d5eb0439a9d328d259896937902df
-SHA1 (patch-ad) = d1ba0e5206dbe6347de9b72c653a587e10b6a646
+SHA1 (patch-ad) = a585498bace904928d18e7449a6defad82f59596
 SHA1 (patch-ae) = 4130a9a20d806553a79e04c79d652b76ec1dce34
 SHA1 (patch-af) = 9b982568c52f4685862be2192612ce3d795ac813
 SHA1 (patch-ai) = 95912fb5b836e4dce01b630f9e6e9c9f41d7bb72
@@ -13,3 +13,5 @@ SHA1 (patch-aj) = 6148ae393aefcce54477b289835038b01a26a0ed
 SHA1 (patch-ak) = fb13a43105ee252a461d20b67d5841db6d247dde
 SHA1 (patch-al) = dae1e731f7a9ff36ef1f60f2a4a6cc97e359ae63
 SHA1 (patch-am) = fdc5e1a22814d9fd87d96e7bca1aadaebebdb71f
+SHA1 (patch-an) = e7195c25ce08e13e0c8b64b05b737e9a5f5157a8
+SHA1 (patch-ao) = fa5c98f6c4e873f816e5a5bc48481d1462c946dc
diff --git a/www/libwww/patches/patch-ad b/www/libwww/patches/patch-ad
index 81be66c6c2c..f053dbce12b 100644
--- a/www/libwww/patches/patch-ad
+++ b/www/libwww/patches/patch-ad
@@ -1,8 +1,16 @@
-$NetBSD: patch-ad,v 1.4 2002/10/26 18:11:20 bouyer Exp $
+$NetBSD: patch-ad,v 1.5 2003/04/03 18:05:34 jschauma Exp $
 
---- Library/src/Makefile.am.orig	Tue Jun 20 13:01:34 2000
-+++ Library/src/Makefile.am	Mon Oct 21 22:33:59 2002
-@@ -251,7 +251,7 @@
+--- Library/src/Makefile.am.orig	Wed May 29 12:09:13 2002
++++ Library/src/Makefile.am	Thu Apr  3 12:53:38 2003
+@@ -1,6 +1,6 @@
+ ## Process this file with Automake to create Makefile.in.
+ 
+-LDFLAGS = -version-info "1:0:1"
++LDFLAGS = @LDFLAGS@ -version-info "1:0:1"
+ 
+ lib_LTLIBRARIES = \
+ 	libwwwutils.la \
+@@ -253,7 +253,7 @@
  	HTPEP.c
  
  libwwwhttp_la_DEPENDENCIES = \
@@ -11,7 +19,7 @@ $NetBSD: patch-ad,v 1.4 2002/10/26 18:11:20 bouyer Exp $
  
  libwwwnews_la_SOURCES = \
  	WWWNews.h \
-@@ -379,9 +379,8 @@
+@@ -387,9 +387,8 @@
  libwwwsql_la_LDFLAGS = -rpath $(libdir)
  
  INCLUDES = \
diff --git a/www/libwww/patches/patch-an b/www/libwww/patches/patch-an
new file mode 100644
index 00000000000..6f1ef4ce614
--- /dev/null
+++ b/www/libwww/patches/patch-an
@@ -0,0 +1,12 @@
+$NetBSD: patch-an,v 1.1 2003/04/03 18:05:34 jschauma Exp $
+
+--- modules/expat/xmltok/Makefile.am.orig	Thu Apr  3 12:50:10 2003
++++ modules/expat/xmltok/Makefile.am	Thu Apr  3 12:50:20 2003
+@@ -1,6 +1,6 @@
+ ## Process this file with Automake to create Makefile.in.
+ 
+-LDFLAGS = -version-info "1:0:1"
++LDFLAGS = @LDFLAGS@ -version-info "1:0:1"
+ 
+ CFLAGS = @CFLAGS@ -DXML_NS
+ 
diff --git a/www/libwww/patches/patch-ao b/www/libwww/patches/patch-ao
new file mode 100644
index 00000000000..d089af20668
--- /dev/null
+++ b/www/libwww/patches/patch-ao
@@ -0,0 +1,12 @@
+$NetBSD: patch-ao,v 1.1 2003/04/03 18:05:34 jschauma 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
+@@ -1,6 +1,6 @@
+ ## Process this file with Automake to create Makefile.in.
+ 
+-LDFLAGS = -version-info "1:0:1"
++LDFLAGS = @LDFLAGS@ -version-info "1:0:1"
+ 
+ CFLAGS = @CFLAGS@ -DXML_NS
+