Make this build again.

4 files changed, 152 insertions, 3 deletions

diff --git a/www/arena/patches/patch-ab b/www/arena/patches/patch-ab
index f11e1fb0b37..67a6fde4e24 100644
--- a/www/arena/patches/patch-ab
+++ b/www/arena/patches/patch-ab
@@ -1,6 +1,7 @@
-$NetBSD: patch-ab,v 1.1 1998/09/15 05:38:45 garbled Exp $
---- configure.orig	Mon Sep 14 20:20:15 1998
-+++ configure	Mon Sep 14 20:20:28 1998
+$NetBSD: patch-ab,v 1.2 1999/10/14 07:27:35 fredb Exp $
+
+--- configure.orig	Wed Nov 25 05:21:07 1998
++++ configure	Sun Oct 10 12:01:16 1999
 @@ -2517,7 +2517,7 @@
  #
  LibWWW_headers="WWWLib.h WWWApp.h WWWFile.h WWWHTTP.h WWWMIME.h WWWNews.h WWWTrans.h"
@@ -10,3 +11,42 @@ $NetBSD: patch-ab,v 1.1 1998/09/15 05:38:45 garbled Exp $
  
  
  #
+@@ -2853,22 +2853,22 @@
+   #
+   # If not all defined yet, then we've failed with it.
+   #
+-  if eval ${libwww_not_defined_yet} ;
+-   then
+-    ac_path_libwww=missing
+-    libwww_dir=""
+-    libwww_version=""
+-    libwww_distribution=""
+-    libwww_library_dir=""
+-    libwww_include=""
+-    libwww_config_h_dir=""
+-    libwww_suffix=""
+-    libwww_library=""
+-    libwww_make_dir=""
+-    libwww_make_target=""
+-    echo "$ac_t""no" 1>&6
+-    { echo "configure: error: Cannot find W3C libwww. Do worry! Arena cannot be built." 1>&2; exit 1; }
+-  fi
++#  if eval ${libwww_not_defined_yet} ;
++#   then
++#    ac_path_libwww=missing
++#    libwww_dir=""
++#    libwww_version=""
++#    libwww_distribution=""
++#    libwww_library_dir=""
++#    libwww_include=""
++#    libwww_config_h_dir=""
++#    libwww_suffix=""
++#    libwww_library=""
++#    libwww_make_dir=""
++#    libwww_make_target=""
++#    echo "$ac_t""no" 1>&6
++#    { echo "configure: error: Cannot find W3C libwww. Do worry! Arena cannot be built." 1>&2; exit 1; }
++#  fi
+   #
+   # If we get managed to reach this point,
+   # then all the libwww stuff has been already found.
diff --git a/www/arena/patches/patch-ad b/www/arena/patches/patch-ad
new file mode 100644
index 00000000000..4c3c8ce40b9
--- /dev/null
+++ b/www/arena/patches/patch-ad
@@ -0,0 +1,76 @@
+$NetBSD: patch-ad,v 1.1 1999/10/14 07:27:35 fredb Exp $
+
+--- makefile.in.orig	Mon Mar 23 17:16:21 1998
++++ makefile.in	Mon Oct 11 05:36:40 1999
+@@ -138,8 +138,8 @@
+ MSGFMT  = @MSGFMT@
+ XGETTEXT= @XGETTEXT@
+ INSTALL = @INSTALL@
+-INSTALL_data   = $(INSTALL) -o root -g root -m 644
+-INSTALL_binary = $(INSTALL) -o root -g root -m 755
++INSTALL_data   = $(INSTALL) -m 644
++INSTALL_binary = $(INSTALL) -m 755
+ 
+ #
+ # If we need to force debug stuff inclusion.
+@@ -262,15 +262,18 @@
+ #
+ 
+ # W3C reference library (libwww).
+-libwww = @libwww@
+-libwww_dep = @libwww_dep@
++libwww = libwwwapp libwwwcache libwwwcore libwwwdir libwwwfile libwwwftp \
++	libwwwgopher libwwwhtml libwwwhttp libwwwinit libwwwmime libwwwmux \
++	libwwwnews libwwwstream libwwwtelnet libwwwtrans libwwwutils libwwwxml \
++	libwwwzip libxmltok libxmlparse
++libwww_dep =
+ libwww_dir = @libwww_dir@
+ libwww_version = @libwww_version@
+ libwww_include = @libwww_include@
+ libwww_config_h_dir = @libwww_config_h_dir@
+ libwww_library = @libwww_library@
+ libwww_make_dir = @libwww_make_dir@
+-libwww_make_target = @libwww_make_target@
++libwww_make_target =
+ #
+ 
+ 
+@@ -384,9 +387,9 @@
+ $(sort Library library LibWWW libwww $(libwww) $(libwww_dep)): $(libwww_library)
+ 
+ $(libwww_library):
+-	@$(ECHO)
+-	@$(ECHO) "You should build the W3C WWW reference library first!"
+-	@$(ECHO)
++#	@$(ECHO)
++#	@$(ECHO) "You should build the W3C WWW reference library first!"
++#	@$(ECHO)
+ 
+ endif
+ 
+@@ -484,11 +487,11 @@
+ install: $(ArenaBinary) $(ArenaIntlDir)/en/Arena.gmo
+ 	$(INSTALL_binary) $(ArenaBinary) $(ArenaBinaryINSTALLDir)/$(Arena)
+ 	$(INSTALL_data) $(ArenaSourceDir)/arenarc $(arenarc_dir)
+-ifneq ($(strip $(XGETTEXT)),)
+-  ifneq ($(strip $(MSGFMT)),)
+-	$(INSTALL_data) $(ArenaIntlDir)/en/Arena_debug.gmo $(locale_dir)/en/LC_MESSAGES/Arena.mo
+-  endif
+-endif
++#ifneq ($(strip $(XGETTEXT)),)
++#  ifneq ($(strip $(MSGFMT)),)
++#	$(INSTALL_data) $(ArenaIntlDir)/en/Arena_debug.gmo $(locale_dir)/en/LC_MESSAGES/Arena.mo
++#  endif
++#endif
+ 
+ uninstall:
+ 	$(RM) $(ArenaBinaryINSTALLDir)/$(Arena)
+@@ -708,7 +711,7 @@
+ #
+ # Flags for $(LD)
+ # ~~~~~~~~~~~~~~~
+-Libraries = libwww libjpeg libpng libz
++Libraries = $(libwww) libjpeg libpng libz
+ LibraryDirs = $(foreach lib, $(Libraries), $(dir $($(lib)_library)))
+ ArenaLibraryDirsLDFLAGS = $(foreach libdir, $(LibraryDirs), -L$(libdir))
+ L = $(foreach lib, $(Libraries), -l$(basename $(notdir $(lib))-))
diff --git a/www/arena/patches/patch-ae b/www/arena/patches/patch-ae
new file mode 100644
index 00000000000..381966b4630
--- /dev/null
+++ b/www/arena/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.3 1999/10/14 07:27:35 fredb Exp $
+
+--- arena.h.in.orig	Sun Mar  8 11:35:06 1998
++++ arena.h.in	Sun Oct 10 13:46:21 1999
+@@ -60,6 +60,9 @@
+ #  define  ARENA_TRACE_MASK 0xffffffff
+           /* Default mask for libwww debug tracing */
+ #  define LIBWWW_TRACE_MASK SHOW_ALL_TRACE
++#else
++          /* Needed to unset HTDEBUG in HTUtils.h */
++#  define NODEBUG   1
+ #endif
+ 
+ /* Persistent cache location.
diff --git a/www/arena/patches/patch-af b/www/arena/patches/patch-af
new file mode 100644
index 00000000000..fd86dfb26a4
--- /dev/null
+++ b/www/arena/patches/patch-af
@@ -0,0 +1,19 @@
+$NetBSD: patch-af,v 1.1 1999/10/14 07:27:36 fredb Exp $
+
+--- Arena/Source/bridge.c.orig	Mon Mar 23 20:29:54 1998
++++ Arena/Source/bridge.c	Sun Oct 10 14:00:48 1999
+@@ -227,14 +227,6 @@
+       }
+       break;
+ 
+-    case HT_PROG_WAIT:
+-      Announce(_("Waiting for free socket..."));
+-      break;
+-
+-    case HT_PROG_GC:
+-      Announce(_("Collecting cache garbage..."));
+-      break;
+-
+     default:
+       Announce(_("UNKNOWN PROGRESS STATE"));
+       break;