* now handles integrated/package version of the openssl properly. problem

  found and noticed by IWAMOTO Toshihiro via private message.  Thanks!
* by above fix, bump the package version to 0.2.5-m17n-20020216nb1.

3 files changed, 26 insertions, 2 deletions

diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 2411830db4b..64dd4f62bb3 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2002/03/02 00:08:15 kei Exp $
+# $NetBSD: Makefile,v 1.31 2002/03/04 15:55:33 kei Exp $
 #
 
 DISTNAME=	w3m-0.2.5-m17n-20020216
 PKGNAME=	w3m-0.2.5
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
 
diff --git a/www/w3m/distinfo b/www/w3m/distinfo
index feead70fe25..be775be2d91 100644
--- a/www/w3m/distinfo
+++ b/www/w3m/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/03/02 00:08:15 kei Exp $
+$NetBSD: distinfo,v 1.6 2002/03/04 15:55:33 kei Exp $
 
 SHA1 (w3m-0.2.5-m17n-20020216.tar.gz) = 7e754c61586818e731dc2a26f69a7c9505d2e640
 Size (w3m-0.2.5-m17n-20020216.tar.gz) = 2241365 bytes
+SHA1 (patch-aa) = e40ad9fa0765041b605e86febd71d399b92fc4d1
 SHA1 (patch-ab) = c0c21616d1d3557453648107eca26eaa91af4741
diff --git a/www/w3m/patches/patch-aa b/www/w3m/patches/patch-aa
new file mode 100644
index 00000000000..ac6544c92c2
--- /dev/null
+++ b/www/w3m/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.11 2002/03/04 15:55:34 kei Exp $
+
+--- configure.orig	Sat Feb 16 00:48:01 2002
++++ configure	Tue Mar  5 00:33:09 2002
+@@ -381,7 +381,7 @@
+ 
+ find_ssl() {
+   sslinclude=""
+-  for i1 in $ssl_includedir /usr /usr/local $prefix
++  for i1 in $ssl_includedir
+   do
+     for i2 in /openssl /ssl / 
+     do
+@@ -391,6 +391,8 @@
+         sslinclude="-I${dirname}/include"
+       elif [ -f $dirname/include/openssl/ssl.h ]; then
+         sslinclude="-I${dirname}/include/openssl -I${dirname}/include"
++      elif [ -f $dirname/ssl.h ]; then
++        sslinclude="-I${dirname}"
+       fi
+       for i3 in lib/openssl lib
+       do