Some shells don't like:

if test -x /bin/true; then
else

so replace with:

if test -x /bin/true; then
  :
else

From Roland Illig in a posting to "tech-pkg"

Also add missing openssl/buildlink2.mk to buildlink2.mk.

4 files changed, 12 insertions, 11 deletions

diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index a94184f7662..316951241d2 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2004/02/17 22:28:47 kristerw Exp $
+# $NetBSD: Makefile,v 1.53 2004/02/29 11:49:54 markd Exp $
 
 DISTNAME=		w3c-libwww-5.4.0
 PKGNAME=		libwww-5.4.0
@@ -7,14 +7,14 @@ CATEGORIES=		www devel
 MASTER_SITES=		http://www.w3.org/Library/Distribution/ \
 			ftp://ftp.uni-hannover.de/pub/mirror/info-systems/WWW/libwww/
 EXTRACT_SUFX=		.tgz
-DISTFILES=		${DISTNAME}${EXTRACT_SUFX} libwww-configure-5.4.0.gz
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX} libwww-configure-5.4.0nb1.gz
 
 MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.w3.org/Library/
 COMMENT=		The W3C Reference Library
 
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
-SITES_libwww-configure-5.4.0.gz=	${MASTER_SITE_LOCAL}
+SITES_libwww-configure-5.4.0nb1.gz=	${MASTER_SITE_LOCAL}
 
 USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+=	--with-ssl="${SSLBASE}"
 DOCDIR=			${PREFIX}/share/doc/libwww
 
 pre-configure:
-	${GZCAT} ${DISTDIR}/libwww-configure-5.4.0.gz > ${WRKSRC}/configure
+	${GZCAT} ${DISTDIR}/libwww-configure-5.4.0nb1.gz > ${WRKSRC}/configure
 	${CHMOD} a+x ${WRKSRC}/configure
 .for f in aclocal.m4 configure stamp-h.in
 	${TOUCH} ${WRKSRC}/$f
diff --git a/www/libwww/buildlink2.mk b/www/libwww/buildlink2.mk
index 42975cc0755..fc4d85cbad5 100644
--- a/www/libwww/buildlink2.mk
+++ b/www/libwww/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2002/12/03 16:47:32 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2004/02/29 11:49:55 markd Exp $
 
 .if !defined(LIBWWW_BUILDLINK2_MK)
 LIBWWW_BUILDLINK2_MK=	# defined
@@ -40,6 +40,7 @@ BUILDLINK_FILES.libwww+=	lib/libmd5.*
 .endif
 
 .include "../../devel/zlib/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	libwww-buildlink
 
diff --git a/www/libwww/distinfo b/www/libwww/distinfo
index f4f822edab4..1cfbcb57c28 100644
--- a/www/libwww/distinfo
+++ b/www/libwww/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.17 2004/02/12 21:15:07 minskim Exp $
+$NetBSD: distinfo,v 1.18 2004/02/29 11:49:55 markd Exp $
 
 SHA1 (w3c-libwww-5.4.0.tgz) = 2394cb4e0dc4e2313a9a0ddbf508e4b726e9af63
 Size (w3c-libwww-5.4.0.tgz) = 1129121 bytes
-SHA1 (libwww-configure-5.4.0.gz) = fef99e7a600f650a631b848bde20add44ddfea6b
-Size (libwww-configure-5.4.0.gz) = 155697 bytes
+SHA1 (libwww-configure-5.4.0nb1.gz) = c11e03ddfc03a114e0d802ef9e07e8be0738969d
+Size (libwww-configure-5.4.0nb1.gz) = 155713 bytes
 SHA1 (patch-aa) = fc0124c8995992536782e60ce67332c2dc505b10
 SHA1 (patch-ab) = 24db9ca337bd6768fa5b208186f7b55e555beb8f
 SHA1 (patch-ac) = d3b153c4360d5eb0439a9d328d259896937902df
@@ -14,6 +14,6 @@ SHA1 (patch-ai) = 95912fb5b836e4dce01b630f9e6e9c9f41d7bb72
 SHA1 (patch-aj) = 6148ae393aefcce54477b289835038b01a26a0ed
 SHA1 (patch-ak) = fb13a43105ee252a461d20b67d5841db6d247dde
 SHA1 (patch-al) = dae1e731f7a9ff36ef1f60f2a4a6cc97e359ae63
-SHA1 (patch-am) = cfa44de105eeed62d933ed040b447290d641570d
+SHA1 (patch-am) = 8252ce567efc056daa10af39eeca314f9a915f90
 SHA1 (patch-an) = e7195c25ce08e13e0c8b64b05b737e9a5f5157a8
 SHA1 (patch-ao) = fa5c98f6c4e873f816e5a5bc48481d1462c946dc
diff --git a/www/libwww/patches/patch-am b/www/libwww/patches/patch-am
index 87e8cc11c80..d333810d112 100644
--- a/www/libwww/patches/patch-am
+++ b/www/libwww/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.2 2004/02/12 20:31:35 minskim Exp $
+$NetBSD: patch-am,v 1.3 2004/02/29 11:49:55 markd Exp $
 
 --- configure.in.orig	2002-06-12 04:26:46.000000000 -0500
 +++ configure.in
@@ -33,7 +33,7 @@ $NetBSD: patch-am,v 1.2 2004/02/12 20:31:35 minskim Exp $
      LIBWWWMD5=""
 +    LIBMD5DEP=""
 +    LIBMD5INC=""
-+    AC_CHECK_LIB(c, MD5Init, [ ], 
++    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.) ] ) ] )
      ;;
    *)