Don't compile/install libmd5 on solaris, there is one in /usr/lib which

seems good enouth, and using libwww's one breaks other system lib (librt).

7 files changed, 102 insertions, 28 deletions

diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index 2baa6f34088..94835033195 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2002/10/12 10:17:04 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2002/10/26 18:11:20 bouyer Exp $
 
 DISTNAME=		w3c-libwww-5.3.2
 PKGNAME=		libwww-5.3.2
@@ -33,6 +33,16 @@ pre-configure:
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${OPSYS} == "SunOS"
+# Solaris has a /usr/lib/libmd5 which seems to be enouth, and
+# /usr/local/lib/libmd5 breaks /usr/lib/librt
+CONFIGURE_ARGS+= --without-md5
+PLIST_SUBST+=	MD5LIB="@comment "
+.else
+PLIST_SUBST+=	MD5LIB=""
+.endif
+
+
 # Include SOCKS firewall support
 .if defined(USE_SOCKS) && (${USE_SOCKS} == 4 || ${USE_SOCKS} == 5)
 .if ${USE_SOCKS} == 4
diff --git a/www/libwww/PLIST b/www/libwww/PLIST
index d34cff88fd2..e92d85d3db1 100644
--- a/www/libwww/PLIST
+++ b/www/libwww/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:17:17 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/10/26 18:11:20 bouyer Exp $
 bin/libwww-config
 bin/w3c
 bin/webbot
@@ -162,11 +162,11 @@ include/w3c-libwww/WWWXML.h
 include/w3c-libwww/WWWZip.h
 include/w3c-libwww/wwwsys.h
 include/w3c-libwww/xmlparse.h
-lib/libmd5.a
-lib/libmd5.la
-lib/libmd5.so
-lib/libmd5.so.1
-lib/libmd5.so.1.0
+${MD5LIB}lib/libmd5.a
+${MD5LIB}lib/libmd5.la
+${MD5LIB}lib/libmd5.so
+${MD5LIB}lib/libmd5.so.1
+${MD5LIB}lib/libmd5.so.1.0
 lib/libpics.a
 lib/libpics.la
 lib/libpics.so
diff --git a/www/libwww/buildlink2.mk b/www/libwww/buildlink2.mk
index e77dbf5150a..d35f8fe1370 100644
--- a/www/libwww/buildlink2.mk
+++ b/www/libwww/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:22 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/10/26 18:11:20 bouyer Exp $
 
 .if !defined(LIBWWW_BUILDLINK2_MK)
 LIBWWW_BUILDLINK2_MK=	# defined
@@ -11,7 +11,6 @@ EVAL_PREFIX+=			BUILDLINK_PREFIX.libwww=libwww
 BUILDLINK_PREFIX.libwww_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.libwww=		include/wwwconf.h
 BUILDLINK_FILES.libwww+=	include/w3c-libwww/*
-BUILDLINK_FILES.libwww+=	lib/libmd5.*
 BUILDLINK_FILES.libwww+=	lib/libpics.*
 BUILDLINK_FILES.libwww+=	lib/libwwwapp.*
 BUILDLINK_FILES.libwww+=	lib/libwwwcache.*
@@ -35,6 +34,10 @@ BUILDLINK_FILES.libwww+=	lib/libwwwxml.*
 BUILDLINK_FILES.libwww+=	lib/libwwwzip.*
 BUILDLINK_FILES.libwww+=	lib/libxmlparse.*
 BUILDLINK_FILES.libwww+=	lib/libxmltok.*
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} != "SunOS"
+BUILDLINK_FILES.libwww+=	lib/libmd5.*
+.endif
 
 .include "../../devel/zlib/buildlink2.mk"
 
diff --git a/www/libwww/distinfo b/www/libwww/distinfo
index 5c1d8a927e9..ba3aa87a261 100644
--- a/www/libwww/distinfo
+++ b/www/libwww/distinfo
@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.9 2002/09/23 13:52:15 markd Exp $
+$NetBSD: distinfo,v 1.10 2002/10/26 18:11:20 bouyer Exp $
 
 SHA1 (w3c-libwww-5.3.2.tar.gz) = c50f3624889b3a0ebc720264a1b9b64990457516
 Size (w3c-libwww-5.3.2.tar.gz) = 1956340 bytes
 SHA1 (patch-aa) = fc0124c8995992536782e60ce67332c2dc505b10
 SHA1 (patch-ab) = 24db9ca337bd6768fa5b208186f7b55e555beb8f
 SHA1 (patch-ac) = d3b153c4360d5eb0439a9d328d259896937902df
-SHA1 (patch-ad) = 3dbc185d083b655f4157055b13563b5b123931f5
+SHA1 (patch-ad) = d1ba0e5206dbe6347de9b72c653a587e10b6a646
 SHA1 (patch-ae) = 4130a9a20d806553a79e04c79d652b76ec1dce34
 SHA1 (patch-af) = 9b982568c52f4685862be2192612ce3d795ac813
 SHA1 (patch-ag) = b3b0ca974d4dfccf4aaebc2ee65f0938525eb51b
-SHA1 (patch-ah) = 144d1e775bd7dd250d19decfd1e2a331b1c3c02c
+SHA1 (patch-ah) = 064eeb155536ac7b913b003f85ed459be2784d2b
 SHA1 (patch-ai) = 95912fb5b836e4dce01b630f9e6e9c9f41d7bb72
 SHA1 (patch-aj) = 6148ae393aefcce54477b289835038b01a26a0ed
+SHA1 (patch-ak) = fb13a43105ee252a461d20b67d5841db6d247dde
diff --git a/www/libwww/patches/patch-ad b/www/libwww/patches/patch-ad
index 73f8499ce80..81be66c6c2c 100644
--- a/www/libwww/patches/patch-ad
+++ b/www/libwww/patches/patch-ad
@@ -1,12 +1,25 @@
-$NetBSD: patch-ad,v 1.3 2001/04/20 12:33:53 fredb Exp $
+$NetBSD: patch-ad,v 1.4 2002/10/26 18:11:20 bouyer Exp $
 
---- Library/src/Makefile.am.orig	Tue Jun 20 06:01:34 2000
-+++ Library/src/Makefile.am
-@@ -379,7 +379,6 @@
+--- 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 @@
+ 	HTPEP.c
+ 
+ libwwwhttp_la_DEPENDENCIES = \
+-	../../modules/md5/libmd5.la
++	@LIBMD5DEP@
+ 
+ libwwwnews_la_SOURCES = \
+ 	WWWNews.h \
+@@ -379,9 +379,8 @@
  libwwwsql_la_LDFLAGS = -rpath $(libdir)
  
  INCLUDES = \
 -	-I/usr/local/include \
- 	-I${top_srcdir}/modules/md5 \
- 	-I${top_srcdir}/modules/expat/xmlparse
+-	-I${top_srcdir}/modules/md5 \
+-	-I${top_srcdir}/modules/expat/xmlparse
++	-I${top_srcdir}/modules/expat/xmlparse \
++	@LIBMD5INC@
  
+ BUILT_SOURCES = \
+ 	wwwsys.h \
diff --git a/www/libwww/patches/patch-ah b/www/libwww/patches/patch-ah
index 408226959cb..7313691f2b3 100644
--- a/www/libwww/patches/patch-ah
+++ b/www/libwww/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.7 2002/09/23 13:52:16 markd Exp $
---- configure.in.orig	Thu Dec 14 11:49:06 2000
-+++ configure.in	Tue Aug 28 17:09:57 2001
-@@ -213,7 +213,12 @@
+$NetBSD: patch-ah,v 1.8 2002/10/26 18:11:20 bouyer Exp $
+--- configure.in.orig	Thu Dec 14 12:49:06 2000
++++ configure.in	Mon Oct 21 22:40:58 2002
+@@ -213,8 +213,13 @@
  		getlogin getpass fcntl readdir sysinfo ioctl chdir tempnam \
  		getsockopt setsockopt \
  		gettimeofday mktime timegm tzset)
@@ -10,11 +10,12 @@ $NetBSD: patch-ah,v 1.7 2002/09/23 13:52:16 markd Exp $
 +if test "$ac_cv_func_unlink" != yes; then
 +  AC_CHECK_FUNC(remove)
 +fi
-+
-+dnl AC_CHECK_FUNC(unlink, , AC_CHECK_FUNC(remove, AC_DEFINE(unlink, remove)))
  
++dnl AC_CHECK_FUNC(unlink, , AC_CHECK_FUNC(remove, AC_DEFINE(unlink, remove)))
++
  dnl Checks for configuration arguments
  AC_MSG_CHECKING(whether to support direct WAIS access.)
+ AC_ARG_WITH(wais,
 @@ -307,7 +312,10 @@
      AC_MSG_RESULT(yes)
      AC_DEFINE(HT_POSIX_REGEX)
@@ -27,9 +28,45 @@ $NetBSD: patch-ah,v 1.7 2002/09/23 13:52:16 markd Exp $
      else
        AC_ADDLIB($withval)
        AC_TRY_LINK([],
-@@ -532,31 +540,9 @@
+@@ -510,53 +518,45 @@
+ [ case "$withval" in
+   no)
+     AC_MSG_RESULT(no)
++    MD5DIR=""
+     WWWMD5=""
+     LWWWMD5=""
+     LIBWWWMD5=""
++    LIBMD5DEP=""
++    LIBMD5INC=""
++    AC_CHECK_LIB(c, MD5Init, [ ], 
++	[ AC_CHECK_LIB(md5, MD5Init, [ LWWWMD5="-lmd5"; LIBWWWMD5="-lmd5"], [ AC_MSG_ERROR(Could not find md5 functions. You need to compile in the md5 library.) ] ) ] )
+     ;;
+   *)
+     AC_MSG_RESULT(yes)
+     AC_DEFINE(HT_MD5)
++    MD5DIR="md5"
+     WWWMD5="libmd5.la"
+     LWWWMD5="-lmd5"
+     LIBWWWMD5='${top_builddir}/modules/md5/libmd5.la'
++    LIBMD5INC='-I${top_srcdir}/modules/md5'
++    LIBMD5DEP="../../modules/md5/libmd5.la"
+     ;;
+   esac ],
+   AC_MSG_RESULT(yes)
+   AC_DEFINE(HT_MD5)
++  MD5DIR="md5"
+   WWWMD5="libmd5.la"
+   LWWWMD5="-lmd5"
+   LIBWWWMD5='${top_builddir}/modules/md5/libmd5.la'
++  LIBMD5INC='-I${top_srcdir}/modules/md5'
++  LIBMD5DEP="../../modules/md5/libmd5.la"
+ )
++AC_SUBST(MD5DIR)
+ AC_SUBST(WWWMD5)
  AC_SUBST(LWWWMD5)
  AC_SUBST(LIBWWWMD5)
++AC_SUBST(LIBMD5INC)
++AC_SUBST(LIBMD5DEP)
  
 -dnl Checks for libwww and OpenSSL:
 -AC_MSG_CHECKING(whether we can find OpenSSL)
@@ -61,7 +98,7 @@ $NetBSD: patch-ah,v 1.7 2002/09/23 13:52:16 markd Exp $
  LWWWSSL=""
  LIBWWWSSL=""
  WWWSSLEX=""
-@@ -568,14 +554,39 @@
+@@ -568,14 +568,39 @@
      ;;
    *)
      if test "x$withval" = "xyes"; then
@@ -104,7 +141,7 @@ $NetBSD: patch-ah,v 1.7 2002/09/23 13:52:16 markd Exp $
      AC_MSG_RESULT(yes)
      WWWSSL="libwwwssl.la"
      LWWWSSL="-lwwwssl" 
-@@ -586,6 +597,7 @@
+@@ -586,6 +611,7 @@
  [ AC_MSG_RESULT(no) ])
  AC_SUBST(WWWSSL)
  AC_SUBST(SSLINC)
@@ -112,7 +149,7 @@ $NetBSD: patch-ah,v 1.7 2002/09/23 13:52:16 markd Exp $
  AC_SUBST(LWWWSSL)
  AC_SUBST(LIBWWWSSL)
  AC_SUBST(WWWSSLEX)
-@@ -1006,7 +1018,6 @@
+@@ -1006,7 +1032,6 @@
  Library/Makefile Library/User/Makefile Library/User/Patch/Makefile
  Library/User/Architecture/Makefile Library/User/Using/Makefile Library/User/Guide/Makefile
  Library/User/Style/Makefile Library/User/Platform/Makefile
diff --git a/www/libwww/patches/patch-ak b/www/libwww/patches/patch-ak
new file mode 100644
index 00000000000..d9e85f4aacb
--- /dev/null
+++ b/www/libwww/patches/patch-ak
@@ -0,0 +1,10 @@
+$NetBSD: patch-ak,v 1.1 2002/10/26 18:11:20 bouyer Exp $
+--- modules/Makefile.am.orig	Mon Oct 21 22:13:28 2002
++++ modules/Makefile.am	Mon Oct 21 22:13:45 2002
+@@ -5,5 +5,5 @@
+ EXTRA_DIST = \
+ 	$(DOCS)
+ 
+-SUBDIRS = expat md5
++SUBDIRS = expat @MD5DIR@
+