Add and enable Arena, the browser originally written to test HTML 3.0 and

style sheets (a subset of the current CSS1).  Now maintained by Yggdrasil.

8 files changed, 55 insertions, 105 deletions

diff --git a/www/Makefile b/www/Makefile
index b95ed9216c0..61427eba99f 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1998/07/14 16:56:50 tv Exp $
+# $NetBSD: Makefile,v 1.14 1998/07/15 01:09:21 tv Exp $
 # FreeBSD Id: Makefile,v 1.65 1997/11/17 06:31:39 fenner Exp
 #
 
@@ -9,7 +9,7 @@
 #    SUBDIR += apache-current
 #    SUBDIR += apache-php
 #    SUBDIR += apache-ssl
-#    SUBDIR += arena
+    SUBDIR += arena
 #    SUBDIR += ashe           # requires Motif
 #    SUBDIR += aswedit
 #    SUBDIR += cgiparse
diff --git a/www/arena/Makefile b/www/arena/Makefile
index d2f7d5a4315..a52b1970edc 100644
--- a/www/arena/Makefile
+++ b/www/arena/Makefile
@@ -1,35 +1,36 @@
-# New ports collection makefile for:    arena
-# Version required:     i18n beta-3b
-# Date created:         Dec 1 1995
-# Whom:                 ache
-#
-# $Id: Makefile,v 1.1.1.1 1998/07/15 01:01:35 tv Exp $
+# $NetBSD: Makefile,v 1.2 1998/07/15 01:09:21 tv Exp $
+# FreeBSD Id: Makefile,v 1.10 1998/05/04 20:22:31 jseger Exp
 #
 
-DISTNAME=       arena-CJK-beta3a
-PKGNAME=        arena-i18n-beta3b
-CATEGORIES=     www
-MASTER_SITES=   ftp://ftp-eu.w3.org/pub/Arena/beta-3/
+DISTNAME=	arena-0.3.61
+CATEGORIES=	www
+MASTER_SITES=	ftp://ftp.yggdrasil.com/pub/dist/web/arena/
 
-MAINTAINER=     ache@FreeBSD.ORG
+MAINTAINER=	tv@netbsd.org
 
-LIB_DEPENDS+=   jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg
-LIB_DEPENDS+=   png\\.2\\.:${PORTSDIR}/graphics/png
+DEPENDS=	libwww-5.1m1:../../www/libwww \
+		jpeg-6b:../../graphics/jpeg \
+		png-0.96:../../graphics/png \
+		xpm-3.4k:../../graphics/xpm
 
-BROKEN=		png upgrade
+USE_GMAKE=	yes
+MAKEFILE=	makefile
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-libwww-include=${PREFIX}/include/w3c-libwww
+CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include -I${X11BASE}/include -I${WRKDIR}" \
+		LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib"
 
-WRKSRC=         ${WRKDIR}/WWW
+WRKSRC=		${WRKDIR}/Arena-0.3.61
 
-do-build:
-	cd ${WRKSRC}/Library/freebsd; ${MAKE}
-	cd ${WRKSRC}/Arena/freebsd; \
-	${MAKE} PREFIX=${PREFIX} LFLAGS=-L${PREFIX}/lib \
-		XLIBDIR=${X11BASE}/lib \
-		JPEGDIR=${WRKSRC} PNGDIR=${WRKSRC} ZLIBDIR=${WRKSRC} \
-		JPEGLIB=-ljpeg PNGLIB=-lpng ZLIB=-lz
+# Arena requires libwww's "config.h" header - it is installed as "wwwconf.h",
+# so make a symlink in ${WRKDIR} and add it to the -I list.
+pre-configure:
+	@${LN} -sf ${PREFIX}/include/w3c-libwww/wwwconf.h ${WRKDIR}/config.h
 
 do-install:
-	cd ${WRKSRC}/Arena/freebsd; \
-	${INSTALL} -c -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} -s arena ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/Arena/netbsd/arena ${PREFIX}/bin/
+	${INSTALL_DATA_DIR} ${PREFIX}/share/Arena
+	${INSTALL_DATA} ${WRKSRC}/Arena/Source/arenarc ${PREFIX}/share/Arena/
+	${INSTALL_DATA} ${WRKSRC}/Arena/doc/arena.man ${PREFIX}/man/man1/arena.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/arena/files/md5 b/www/arena/files/md5
index 867f1e54575..c5271f2685a 100644
--- a/www/arena/files/md5
+++ b/www/arena/files/md5
@@ -1 +1 @@
-MD5 (arena-CJK-beta3a.tar.gz) = 9d9c5b45ac56bfa55ba6016cca03eb18
+MD5 (arena-0.3.61.tar.gz) = 62e9c750f4b56797b492f6e47fe58df0
diff --git a/www/arena/patches/patch-aa b/www/arena/patches/patch-aa
index 2eb52fe737e..9c164dbd07b 100644
--- a/www/arena/patches/patch-aa
+++ b/www/arena/patches/patch-aa
@@ -1,29 +1,10 @@
-*** Arena/freebsd/Makefile.orig	Thu Apr 25 06:39:15 1996
---- Arena/freebsd/Makefile	Sat Nov 16 04:46:01 1996
-***************
-*** 8,19 ****
-  ASIS_MACH = hardware/os
-  
-  
-! CFLAGS =  -DDEBUG -D__BSD__ -I/usr/X11/include \
-  	  -DCALL_CLIENT_BUG \
-  	  -DCLONE -DFIND -DJPEG \
-! 	  -O -g -fwritable-strings -DI18N -DSTYLE_BACKGROUND -DSTYLE_COLOR
-  LFLAGS =
-! CC = gcc
-  
-  # Directory for installed binary:
-  BINDIR = /usr/local/bin
---- 8,19 ----
-  ASIS_MACH = hardware/os
-  
-  
-! CFLAGS+=  -DDEBUG -D__BSD__ -I${X11BASE}/include -I${PREFIX}/include \
-  	  -DCALL_CLIENT_BUG \
-  	  -DCLONE -DFIND -DJPEG \
-! 	  -fwritable-strings -DI18N -DSTYLE_BACKGROUND -DSTYLE_COLOR
-  LFLAGS =
-! #CC = gcc
-  
-  # Directory for installed binary:
-  BINDIR = /usr/local/bin
+--- Arena/Source/spawn.c.orig	Tue Jul 14 19:15:17 1998
++++ Arena/Source/spawn.c	Tue Jul 14 19:15:28 1998
+@@ -8,7 +8,6 @@
+ #include <limits.h>
+ #include <signal.h>
+ #include <stdarg.h>
+-#include <waitflags.h>
+ 
+ #include "arena.h"
+ #ifdef ARENA_DEBUG
diff --git a/www/arena/patches/patch-ac b/www/arena/patches/patch-ac
deleted file mode 100644
index 0079bbe2977..00000000000
--- a/www/arena/patches/patch-ac
+++ /dev/null
@@ -1,29 +0,0 @@
-*** Library/freebsd/Makefile.bak	Thu Apr 25 05:56:24 1996
---- Library/freebsd/Makefile	Sat Nov 16 04:34:05 1996
-***************
-*** 8,19 ****
-  ASIS_MACH = hardware/os
-  
-  
-! CFLAGS =  -DDEBUG -D__BSD__ -I/usr/X11/include \
-  	  -DCALL_CLIENT_BUG \
-  	  -DCLONE -DFIND -DJPEG \
-! 	  -O -g -fwritable-strings -DI18N -DSTYLE_BACKGROUND -DSTYLE_COLOR
-  LFLAGS =
-! CC = gcc
-  
-  # Directory for installed binary:
-  BINDIR = /usr/local/bin
---- 8,19 ----
-  ASIS_MACH = hardware/os
-  
-  
-! CFLAGS+=  -DDEBUG -D__BSD__ -I${X11BASE}/include \
-  	  -DCALL_CLIENT_BUG \
-  	  -DCLONE -DFIND -DJPEG \
-! 	  -fwritable-strings -DI18N -DSTYLE_BACKGROUND -DSTYLE_COLOR
-  LFLAGS =
-! #CC = gcc
-  
-  # Directory for installed binary:
-  BINDIR = /usr/local/bin
diff --git a/www/arena/patches/patch-ae b/www/arena/patches/patch-ae
deleted file mode 100644
index a6b215204ee..00000000000
--- a/www/arena/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./Arena/Implementation/icon.c.org	Thu Mar 21 07:28:53 1996
-+++ ./Arena/Implementation/icon.c	Tue Apr 30 00:22:54 1996
-@@ -46,7 +46,9 @@
- #if defined __QNX__ || (defined(sco) && !defined(sco_os5))
- #define index strchr
- #else
-+#if !defined(index)
- extern char *index();
-+#endif
- #endif
- 
- static char basis_64[] =
diff --git a/www/arena/pkg/DESCR b/www/arena/pkg/DESCR
index 1ce114e00e7..fa5420c2930 100644
--- a/www/arena/pkg/DESCR
+++ b/www/arena/pkg/DESCR
@@ -1,7 +1,12 @@
-Arena's primary purpose is to be a testbed for new features of the
-web. In the past, we have implemented HTML3 features including tables
-and math. Currently, style sheets are in focus along with new graphics
-formats such as PNG. Also, Arena is a testing tool for the W3C
-Reference Library. The library provides a common platform which
-will ensure future compatibility on the web. If you are a
-browser vendor, it will save you time.
+Arena was the testbed browser for HTML 3.0 created by the W3C
+(www.w3.org).  It is now being maintained and improved by Yggdrasil
+Computing (www.yggdrasil.com).
+
+The original description from the W3C: 
+
+Arena's primary purpose is to be a testbed for new features of the web. In
+the past, we have implemented HTML3 features including tables and math.
+Currently, style sheets are in focus along with new graphics formats such
+as PNG. Also, Arena is a testing tool for the W3C Reference Library. The
+library provides a common platform which will ensure future compatibility
+on the web. If you are a browser vendor, it will save you time. 
diff --git a/www/arena/pkg/PLIST b/www/arena/pkg/PLIST
index 6771154b96d..c60ac578a65 100644
--- a/www/arena/pkg/PLIST
+++ b/www/arena/pkg/PLIST
@@ -1 +1,5 @@
+@comment $NetBSD: PLIST,v 1.2 1998/07/15 01:09:22 tv Exp $
 bin/arena
+man/man1/arena.1
+share/Arena/arenarc
+@dirrm share/Arena