add W3M_USE_{SSL,COOKIE} compilation switch.

both are on by default.  there can be some comment on what should be
the defalult value, I'm open to your input...

3 files changed, 89 insertions, 27 deletions

diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index dc66c114aae..7af5c5b0627 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2000/07/15 00:36:28 itojun Exp $
+# $NetBSD: Makefile,v 1.15 2000/08/15 03:19:10 itojun Exp $
 
 DISTNAME=	w3m-0.1.10
 CATEGORIES=	www
@@ -30,7 +30,28 @@ W3M_USE_JAPANESE?=	YES
 W3M_USE_JAPANESE_SYMBOL?=NO
 # Set this to YES to use lynx like key binding.
 W3M_USE_LYNX_KEY?=	NO
+# set this to YES if you want HTTPS support.
+W3M_USE_SSL?=		YES
+# set this to YES if you want HTTP cookie support.
+W3M_USE_COOKIE?=	YES
 
+.if defined(W3M_USE_COOKIE) && ${W3M_USE_COOKIE} == YES
+CONFIGURE_ENV+=	use_cookie=y
+.else
+CONFIGURE_ENV+=	use_cookie=n
+.endif
+.if defined(W3M_USE_SSL) && ${W3M_USE_SSL} == YES
+.if !defined(PATENTEDOPENSSLSRC) && !exists(/usr/include/openssl/rsa.h)
+# openssl is necessary for HTTPS support.
+# if PATENTEDOPENSSLSRC is defined, then we assume that
+# RSA already exists in the OpenSSL built as part of the
+# base distribution.
+DEPENDS+=	openssl-0.9.*:../../security/openssl
+.endif
+CONFIGURE_ENV+=	use_ssl=y
+.else
+CONFIGURE_ENV+=	use_ssl=n
+.endif
 .if defined(W3M_USE_JAPANESE) && ${W3M_USE_JAPANESE} == YES
 CONFIGURE_ENV+=	def_lg=1
 CONFIGURE_ENV+=	def_dcode=n
@@ -56,7 +77,6 @@ CONFIGURE_ENV+=	def_libdir=${LOCALBASE}/${HELPERDIR}
 CONFIGURE_ENV+=	def_helpdir=${LOCALBASE}/${HELPDIR}
 CONFIGURE_ENV+=	use_color=n use_mouse=n
 CONFIGURE_ENV+=	use_menu=n use_matrix=n
-CONFIGURE_ENV+=	use_cookie=n use_ssl=n
 CONFIGURE_ENV+=	ded=vi dmail=Mail dbrowser=
 CONFIGURE_ENV+=	dcc="${CC}" dtermlib="-ltermcap"
 CONFIGURE_ENV+=	dldflags="-Wl,-rpath,${LOCALBASE}/lib -L${LOCALBASE}/lib"
diff --git a/www/w3m/files/patch-sum b/www/w3m/files/patch-sum
index fe0497d4170..9d228b0efc2 100644
--- a/www/w3m/files/patch-sum
+++ b/www/w3m/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.8 2000/06/21 08:22:11 itohy Exp $
+$NetBSD: patch-sum,v 1.9 2000/08/15 03:19:10 itojun Exp $
 
-MD5 (patch-aa) = 1d08dd8ea8ea250ec0a7bef5f86ac75f
+MD5 (patch-aa) = 3ccbeddf351f50166ce6797accc92fac
 MD5 (patch-ab) = d88798980e1985d3e3f71669d57d9a4a
diff --git a/www/w3m/patches/patch-aa b/www/w3m/patches/patch-aa
index 95ae67b1b44..f385462ed01 100644
--- a/www/w3m/patches/patch-aa
+++ b/www/w3m/patches/patch-aa
@@ -1,10 +1,12 @@
-$NetBSD: patch-aa,v 1.5 2000/06/21 08:22:11 itohy Exp $
-
+$NetBSD: patch-aa,v 1.6 2000/08/15 03:19:10 itojun Exp $
 --- configure.orig	Mon Jun  5 18:41:35 2000
-+++ configure	Tue Jun 20 21:19:13 2000
-@@ -310,13 +310,13 @@
- echo "Which language do you prefer?"
- echo "  1 - Japanese (charset ISO-2022-JP, EUC-JP, Shift_JIS)"
++++ configure	Tue Aug 15 12:14:03 2000
+@@ -190,3 +190,3 @@
+   sslinclude=""
+-  for i1 in /usr /usr/local
++  for i1 in /usr /usr/local /usr/pkg
+   do
+@@ -312,9 +312,9 @@
  echo "  2 - English (charset US_ASCII, ISO-8859-1, etc.)"
 -if [ "$pref_lang" = 2 ]; then
 -  Echo '[2]? '
@@ -21,31 +23,71 @@ $NetBSD: patch-aa,v 1.5 2000/06/21 08:22:11 itohy Exp $
 +#  def_lg=1
 +#fi
  while :
- do
-   readanswer lg_ans "$def_lg"
-@@ -784,7 +784,7 @@
- gclib=''
- gcinclude=''
+@@ -462,4 +462,4 @@
+     use_mouse=n; def_mouse="#undef MOUSE"
+-    use_cookie=n; def_cookie="#undef USE_COOKIE"
+-    use_ssl=n; def_ssl="#undef USE_SSL"
++#   use_cookie=n; def_cookie="#undef USE_COOKIE"
++#   use_ssl=n; def_ssl="#undef USE_SSL"
+     save_params
+@@ -471,4 +471,4 @@
+     use_mouse=n; def_mouse="#undef MOUSE"
+-    use_cookie=n; def_cookie="#undef USE_COOKIE"
+-    use_ssl=n; def_ssl="#undef USE_SSL"
++#   use_cookie=n; def_cookie="#undef USE_COOKIE"
++#   use_ssl=n; def_ssl="#undef USE_SSL"
+     save_params
+@@ -480,4 +480,4 @@
+     use_mouse=y; def_mouse="#define MOUSE"
+-    use_cookie=n; def_cookie="#undef USE_COOKIE"
+-    use_ssl=n; def_ssl="#undef USE_SSL"
++#   use_cookie=n; def_cookie="#undef USE_COOKIE"
++#   use_ssl=n; def_ssl="#undef USE_SSL"
+     save_params
+@@ -489,4 +489,4 @@
+     use_mouse=y; def_mouse="#define MOUSE"
+-    use_cookie=y; def_cookie="#define USE_COOKIE"
+-    use_ssl=n; def_ssl="#undef USE_SSL"
++#   use_cookie=y; def_cookie="#define USE_COOKIE"
++#   use_ssl=n; def_ssl="#undef USE_SSL"
+     save_params
+@@ -498,5 +498,5 @@
+     use_mouse=y; def_mouse="#define MOUSE"
+-    use_cookie=y; def_cookie="#define USE_COOKIE"
+-    use_ssl=y; def_ssl="#define USE_SSL"
+-    find_ssl
++#   use_cookie=y; def_cookie="#define USE_COOKIE"
++#   use_ssl=y; def_ssl="#define USE_SSL"
++#   find_ssl
+     save_params
+@@ -515,2 +515,16 @@
+ 
++# these are made independent from "model"
++if [ "$use_cookie" = y ]; then
++    def_cookie="#define USE_COOKIE"
++else
++    def_cookie="#undef USE_COOKIE"
++fi
++
++if [ "$use_ssl" = y ]; then
++    def_ssl="#define USE_SSL"
++    find_ssl
++else
++    def_ssl="#undef USE_SSL"
++fi
++
+ if [ "$customized" != y ]; then
+@@ -786,3 +800,3 @@
  gctarget=''
 -for libdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib ${HOME}/lib
 +for libdir in /lib /usr/lib ${LOCALBASE}/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib ${HOME}/lib
  do
-   if [ -f $libdir/libgc.a -o -f $libdir/libgc.so ] ; then 
-     echo "$libdir/libgc found"
-@@ -792,7 +792,7 @@
-     break
-   fi
+@@ -794,3 +808,3 @@
  done
 -for inc in /usr/include /usr/include/gc /usr/local/include /usr/local/include/gc ${HOME}/include
 +for inc in /usr/include /usr/include/gc ${LOCALBASE}/include /usr/local/include /usr/local/include/gc ${HOME}/include
  do
-   if [ -f $inc/gc.h ]; then
-     echo "$inc/gc.h found"
-@@ -1553,6 +1553,7 @@
- if [ `expr "$perl" : 'not found'` != 0 ]; then
-   perl=/usr/local/bin/perl
+@@ -1555,2 +1569,3 @@
  fi
 +perl=/usr/pkg/bin/perl
  if [ $sysname = CYGWIN ]; then
-   cygwin=1
- else