Make this build again.

8 files changed, 186 insertions, 16 deletions

diff --git a/www/arena/Makefile b/www/arena/Makefile
index 9b11c12e5e3..1e2d6748be7 100644
--- a/www/arena/Makefile
+++ b/www/arena/Makefile
@@ -1,23 +1,23 @@
-# $NetBSD: Makefile,v 1.13 1999/05/24 20:39:49 tv Exp $
+# $NetBSD: Makefile,v 1.14 1999/10/14 07:27:35 fredb Exp $
 # FreeBSD Id: Makefile,v 1.10 1998/05/04 20:22:31 jseger Exp
 #
 
-DISTNAME=		arena-0.3.61
-WRKSRC=			${WRKDIR}/Arena-0.3.61
+DISTNAME=		arena-0.3.62
+WRKSRC=			${WRKDIR}/Arena-0.3.62
 CATEGORIES=		www
 MASTER_SITES=		ftp://ftp.yggdrasil.com/pub/dist/web/arena/
 
 MAINTAINER=		tv@netbsd.org
 HOMEPAGE=		http://www.yggdrasil.com/Products/Arena/
 
-DEPENDS=		libwww-5.1m1:../../www/libwww \
+DEPENDS=		gettext-0.10.35:../../devel/gettext \
 			jpeg-6b:../../graphics/jpeg \
+			libwww-5.2.8:../../www/libwww \
 			png-1.0.3:../../graphics/png \
 			xpm-3.4k:../../graphics/xpm
 
 NOT_FOR_PLATFORM=	*-*-alpha	#Runs, displays black screen
 
-LDFLAGS+=		-L${LOCALBASE}/lib -L${X11BASE}/lib
 USE_GMAKE=		yes
 MAKEFILE=		makefile
 GNU_CONFIGURE=		yes
@@ -25,7 +25,7 @@ USE_X11BASE=		yes
 CONFIGURE_ARGS+=	--without-debug
 CONFIGURE_ARGS+=	--with-libwww-include=${LOCALBASE}/include/w3c-libwww
 CONFIGURE_ARGS+=	--with-libwww-libdir=${LOCALBASE}/lib
-CONFIGURE_ARGS+=	--with-libwww-config-h-dir=${LOCALBASE}/include/w3c-libwww
+CONFIGURE_ARGS+=	--with-libwww-config-h-dir=${WRKDIR}
 CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -I${WRKDIR}"
 
 # Arena requires libwww's "config.h" header - it is installed as "wwwconf.h",
@@ -37,7 +37,21 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Arena/netbsd/arena ${PREFIX}/bin/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/Arena
 # XXX not quite right, breaks on some platforms
-#	${INSTALL_DATA} ${WRKSRC}/Arena/Source/arenarc ${PREFIX}/share/Arena/
+	${INSTALL_DATA} ${WRKSRC}/Arena/Source/arenarc ${PREFIX}/share/Arena/
+	${INSTALL_DATA_DIR} ${PREFIX}/share/locale/en/LC_MESSAGES
+	msgfmt --output-file=${WRKDIR}/Arena.gmo ${WRKSRC}/Arena/LC_MESSAGES/en/Arena.po
+	$(INSTALL_DATA) ${WRKDIR}/Arena.gmo ${PREFIX}/share/locale/en/LC_MESSAGES/
 	${INSTALL_DATA} ${WRKSRC}/Arena/doc/arena.man ${PREFIX}/man/man1/arena.1
 
+.include "../../mk/bsd.prefs.mk"
+.if defined(EXTRACT_USING_PAX)
+GLOBAL_EXCLUDE_ARG=	-c
+.else
+EXCLUDE_ARG=		--exclude
+.endif
+EXTRACT_ELEMENTS=	${GLOBAL_EXCLUDE_ARG}
+.for DONT_EXTRACT_SUBDIR in jpeg-* libpng-* zlib-*
+EXTRACT_ELEMENTS+=	${EXCLUDE_ARG} Arena-*/Auxiliary/${DONT_EXTRACT_SUBDIR}
+.endfor
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/arena/files/md5 b/www/arena/files/md5
index cb8d3ffdca8..8055f22b3ad 100644
--- a/www/arena/files/md5
+++ b/www/arena/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1998/08/07 13:27:41 agc Exp $
+$NetBSD: md5,v 1.4 1999/10/14 07:27:35 fredb Exp $
 
-MD5 (arena-0.3.61.tar.gz) = 62e9c750f4b56797b492f6e47fe58df0
+MD5 (arena-0.3.62.tar.gz) = 88f896bb7e367734d477af0e6d686ea5
diff --git a/www/arena/files/patch-sum b/www/arena/files/patch-sum
index 5de0ffd1d90..393ae074b3d 100644
--- a/www/arena/files/patch-sum
+++ b/www/arena/files/patch-sum
@@ -1,4 +1,8 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:16 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/10/14 07:27:35 fredb Exp $
 
 MD5 (patch-aa) = 0e622e0708e094ab8df8c846ba74a49d
-MD5 (patch-ab) = f01720605ff44cf878fc6d8fd472e5cc
+MD5 (patch-ab) = 6cf33eefd79e0573ac6ac8bc907eb2bb
+MD5 (patch-ac) = 40905e3365148fe285587c3486b9f2dd
+MD5 (patch-ad) = 8cceb647b902faea6bbbdf0c895b32fc
+MD5 (patch-ae) = abe39f7487e08b2faad6e3db6870f5f6
+MD5 (patch-af) = ff3e759482b7a51afa19a641821b422e
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;
diff --git a/www/arena/pkg/PLIST b/www/arena/pkg/PLIST
index 116587f3058..2545e2ddfff 100644
--- a/www/arena/pkg/PLIST
+++ b/www/arena/pkg/PLIST
@@ -1,5 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 1998/07/15 01:27:42 tv Exp $
+@comment $NetBSD: PLIST,v 1.4 1999/10/14 07:27:36 fredb Exp $
 bin/arena
 man/man1/arena.1
-@comment share/Arena/arenarc -- something prevents this from working
+share/Arena/arenarc
 @dirrm share/Arena
+share/locale/en/LC_MESSAGES/Arena.gmo
+@unexec (rmdir %D/share/locale/en/LC_MESSAGES 2>/dev/null || true)
+@unexec (rmdir %D/share/locale/en 2>/dev/null || true)