use "dmodel=6" and environment variable to configure w3m.

need to synchronize CONFIGURE_ENV to w3m/configure carefully,
on future upgrade.  suggested by enami.

3 files changed, 15 insertions, 65 deletions

diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 7af5c5b0627..9439a390971 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2000/08/15 03:19:10 itojun Exp $
+# $NetBSD: Makefile,v 1.16 2000/08/15 03:57:47 itojun Exp $
 
 DISTNAME=	w3m-0.1.10
 CATEGORIES=	www
@@ -48,9 +48,9 @@ CONFIGURE_ENV+=	use_cookie=n
 # base distribution.
 DEPENDS+=	openssl-0.9.*:../../security/openssl
 .endif
-CONFIGURE_ENV+=	use_ssl=y
+CONFIGURE_ENV+=	use_ssl=y use_ssl_verify=n
 .else
-CONFIGURE_ENV+=	use_ssl=n
+CONFIGURE_ENV+=	use_ssl=n use_ssl_verify=n
 .endif
 .if defined(W3M_USE_JAPANESE) && ${W3M_USE_JAPANESE} == YES
 CONFIGURE_ENV+=	def_lg=1
@@ -80,13 +80,17 @@ CONFIGURE_ENV+=	use_menu=n use_matrix=n
 CONFIGURE_ENV+=	ded=vi dmail=Mail dbrowser=
 CONFIGURE_ENV+=	dcc="${CC}" dtermlib="-ltermcap"
 CONFIGURE_ENV+=	dldflags="-Wl,-rpath,${LOCALBASE}/lib -L${LOCALBASE}/lib"
-CONFIGURE_ENV+=	dmodel=1
+CONFIGURE_ENV+=	dmodel=6
 CONFIGURE_ENV+=	LOCALBASE="${LOCALBASE}"
 
 post-extract:
 	@(cd ${WRKSRC}/doc; ${RM} -fr CVS)
 	@(cd ${WRKSRC}/doc-jp; ${RM} -fr CVS)
 
+# do not look at previous configuration
+pre-configure:
+	${RM} ${WRKSRC}/config.param
+
 do-configure:
 	@yes '' | (cd ${WRKSRC} && CC="${CC}" ac_cv_path_CC="${CC}" \
 	    INSTALL="${INSTALL_SCRIPT}"                             \
diff --git a/www/w3m/files/patch-sum b/www/w3m/files/patch-sum
index 3e4ebebddf5..431e92fd0b9 100644
--- a/www/w3m/files/patch-sum
+++ b/www/w3m/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.10 2000/08/15 03:42:21 itojun Exp $
+$NetBSD: patch-sum,v 1.11 2000/08/15 03:57:48 itojun Exp $
 
-MD5 (patch-aa) = 3ccbeddf351f50166ce6797accc92fac
+MD5 (patch-aa) = 233ec21f2f46d880ae75b782d228c4ad
 MD5 (patch-ab) = d88798980e1985d3e3f71669d57d9a4a
 MD5 (patch-ac) = 1d91f0e3b4b67698999c470723fb7132
 MD5 (patch-ad) = 3d07f5d56a7655cc636b1c9823181e5a
diff --git a/www/w3m/patches/patch-aa b/www/w3m/patches/patch-aa
index f385462ed01..b1d566646a5 100644
--- a/www/w3m/patches/patch-aa
+++ b/www/w3m/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2000/08/15 03:19:10 itojun Exp $
+$NetBSD: patch-aa,v 1.7 2000/08/15 03:57:48 itojun Exp $
 --- configure.orig	Mon Jun  5 18:41:35 2000
-+++ configure	Tue Aug 15 12:14:03 2000
++++ configure	Tue Aug 15 12:43:25 2000
 @@ -190,3 +190,3 @@
    sslinclude=""
 -  for i1 in /usr /usr/local
@@ -23,71 +23,17 @@ $NetBSD: patch-aa,v 1.6 2000/08/15 03:19:10 itojun Exp $
 +#  def_lg=1
 +#fi
  while :
-@@ -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 @@
+@@ -786,3 +786,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
-@@ -794,3 +808,3 @@
+@@ -794,3 +794,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
-@@ -1555,2 +1569,3 @@
+@@ -1555,2 +1555,3 @@
  fi
 +perl=/usr/pkg/bin/perl
  if [ $sysname = CYGWIN ]; then