Initial import of chimera-2.0a19, a WWW browser for X Windows.

11 files changed, 222 insertions, 0 deletions

diff --git a/www/chimera/Makefile b/www/chimera/Makefile
new file mode 100644
index 00000000000..cead02206f4
--- /dev/null
+++ b/www/chimera/Makefile
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile,v 1.1.1.1 2000/10/19 14:23:00 fredb Exp $
+#
+
+DISTNAME=	chimera-2.0a19
+CATEGORIES=	www
+MASTER_SITES=	ftp://ftp.cs.unlv.edu/pub/chimera-alpha/
+
+MAINTAINER=	fredb@netbsd.org
+HOMEPAGE=	http://www.cs.unlv.edu/chimera/
+
+DEPENDS+=	jpeg-6b:../../graphics/jpeg
+DEPENDS+=	png>=1.0.8:../../graphics/png
+
+USE_IMAKE=	yes
+
+pre-configure:
+	cd ${WRKSRC} && ${SED}					\
+	    -e 's|@@LOCALBASE@@|${LOCALBASE}|'			\
+	    -e 's|@@PREFIX@@|${PREFIX}|'			\
+	    -e 's|@@X11BASE@@|${X11BASE}|'			\
+	    < Common.tmpl.dist > Common.tmpl
+
+post-install:
+	${INSTALL_DATA_DIR} ${X11PREFIX}/share/doc/chimera
+	cd ${WRKSRC}/doc && ${INSTALL_DATA}			\
+	    HINTS INFO LICENSE ${X11PREFIX}/share/doc/chimera
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/chimera/files/md5 b/www/chimera/files/md5
new file mode 100644
index 00000000000..e0a495eae9f
--- /dev/null
+++ b/www/chimera/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.1.1.1 2000/10/19 14:23:00 fredb Exp $
+
+MD5 (chimera-2.0a19.tar.gz) = da728eb8ad7689232d104bfee21c8ca7
diff --git a/www/chimera/files/patch-sum b/www/chimera/files/patch-sum
new file mode 100644
index 00000000000..11065df3d80
--- /dev/null
+++ b/www/chimera/files/patch-sum
@@ -0,0 +1,7 @@
+$NetBSD: patch-sum,v 1.1.1.1 2000/10/19 14:23:00 fredb Exp $
+
+MD5 (patch-aa) = 5673433604b405513b866a8a4bdd9134
+MD5 (patch-ab) = b75eeb92932caffd7f41d556cd2cd562
+MD5 (patch-ac) = 71685ef677c3076e266a20827209275f
+MD5 (patch-ad) = f04f6751484cc62adc8006924d3a295f
+MD5 (patch-ae) = 8d00cf061197698821ca4adf610f9ab5
diff --git a/www/chimera/patches/patch-aa b/www/chimera/patches/patch-aa
new file mode 100644
index 00000000000..367ed83042f
--- /dev/null
+++ b/www/chimera/patches/patch-aa
@@ -0,0 +1,62 @@
+$NetBSD: patch-aa,v 1.1.1.1 2000/10/19 14:23:00 fredb Exp $
+
+--- Common.tmpl.dist.orig	Sun May 30 16:43:52 1999
++++ Common.tmpl.dist	Mon Mar 20 22:28:13 2000
+@@ -9,12 +9,12 @@
+  * CHIMERA_LIBDIR  - configuration files.  someday.
+  * CHIMERA_MANDIR  - directory to hold the outdated man page.
+  */
+-/*
+-CHIMERA_PREFIX = /usr/local
++
++CHIMERA_PREFIX = @@PREFIX@@
+ CHIMERA_BINDIR = $(CHIMERA_PREFIX)/bin
+-CHIMERA_LIBDIR = $(CHIMERA_PREFIX)/lib/chimera
+-CHIMERA_MANDIR = $(CHIMERA_PREFIX)/man
+-*/
++CHIMERA_LIBDIR = $(CHIMERA_PREFIX)/share/chimera
++CHIMERA_MANDIR = $(CHIMERA_PREFIX)/man/cat1
++
+ 
+ #if !defined(__QNX__)
+ LIBPRE=lib
+@@ -35,22 +35,22 @@
+ */
+ 
+ /* Uncomment and modify if you have the JPEG 6 library */
+-/*
++
+ #define Use_JPEG
+-JPEGDIR = /usr/local
++JPEGDIR = @@LOCALBASE@@
+ JPEGINCLUDE = -I$(JPEGDIR)/include
+-JPEGLIB = -L$(JPEGDIR)/lib -ljpeg$(IMGLEXT)
++JPEGLIB = -L$(JPEGDIR)/lib -ljpeg$(IMGLEXT) -Wl,-R$(JPEGDIR)/lib
+ JPEGDEPLIB = $(JPEGDIR)/lib/libjpeg$(IMGLEXT).a
+-*/
++
+ 
+ /* Uncomment and modify if you have the PNG library */
+-/*
++
+ #define Use_PNG
+-PNGDIR = /usr/local
++PNGDIR = @@LOCALBASE@@
+ PNGINCLUDE = -I$(PNGDIR)/include
+-PNGLIB = -L$(PNGDIR)/lib -lpng$(IMGLEXT) -lz$(IMGLEXT)
+-PNGDEPLIB = $(PNGDIR)/lib/libpng$(IMGLEXT).a $(PNGDIR)/lib/libz$(IMGLEXT).a
+-*/
++PNGLIB = -L$(PNGDIR)/lib -lpng$(IMGLEXT) -lz$(IMGLEXT) -Wl,-R$(PNGDIR)/lib
++PNGDEPLIB = $(PNGDIR)/lib/libpng$(IMGLEXT).a /usr/lib/libz$(IMGLEXT).a
++
+ 
+ /* Tells Imakefile to set the flags for debugging.  Comment for -O. */
+ #define CDebugging 1
+@@ -119,6 +119,7 @@
+              -DHAVE_UNAME -DHAVE_MKTIME -DHAVE_SIZE_T -DHAVE_SSIZE_T \
+              -DHAVE_STDARG_H -DHAVE_SNPRINTF
+ OS_LIBS =
++OS_LDFLAGS = -Wl,-R@@X11BASE@@/lib
+ #define CConfigSet 1
+ #endif
+ 
diff --git a/www/chimera/patches/patch-ab b/www/chimera/patches/patch-ab
new file mode 100644
index 00000000000..6a799917d76
--- /dev/null
+++ b/www/chimera/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.1.1.1 2000/10/19 14:23:00 fredb Exp $
+
+--- common/uproc.c.orig	Sun Mar 28 20:27:05 1999
++++ common/uproc.c	Wed Oct 18 18:48:19 2000
+@@ -38,7 +38,9 @@
+ #if defined(WNOHANG) && !defined(SYSV) && !defined(SVR4)
+   int pid;
+ #endif
++#ifndef errno
+   extern int errno;
++#endif
+   int old_errno = errno;
+ 
+  /*
+@@ -51,7 +53,7 @@
+   do 
+   {
+     errno = 0;
+-    pid = wait3(&st, WNOHANG, 0);
++    pid = wait3((int *) &st, WNOHANG, 0);
+   }
+   while (pid <= 0 && errno == EINTR);
+ #else
diff --git a/www/chimera/patches/patch-ac b/www/chimera/patches/patch-ac
new file mode 100644
index 00000000000..12edbc6bf91
--- /dev/null
+++ b/www/chimera/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1.1.1 2000/10/19 14:23:00 fredb Exp $
+
+--- port/getcwd.c.orig	Sun Mar 28 20:22:30 1999
++++ port/getcwd.c	Wed Oct 18 18:35:25 2000
+@@ -34,7 +34,9 @@
+ #include <sys/param.h>
+ 
+ extern char *getwd();
++#ifndef errno
+ extern int errno;
++#endif
+ 
+ char *
+ getcwd(buf, size)
diff --git a/www/chimera/patches/patch-ad b/www/chimera/patches/patch-ad
new file mode 100644
index 00000000000..d27ada4d799
--- /dev/null
+++ b/www/chimera/patches/patch-ad
@@ -0,0 +1,57 @@
+$NetBSD: patch-ad,v 1.1.1.1 2000/10/19 14:23:01 fredb Exp $
+
+--- image/png.c.orig	Sun Mar 28 20:23:46 1999
++++ image/png.c	Wed Oct 18 22:56:45 2000
+@@ -222,17 +222,11 @@
+     if (setjmp(png->state->jmpbuf))
+         return;
+ 
+-    if (png->state) {
+-        png_read_destroy(png->state, png->info, (png_info *) 0);
+-        free_mem(png->state);
++    if ((png->state) && (png->info)) {
++        png_destroy_read_struct(&png->state, &png->info, (png_info **)NULL);
+         png->state = 0;
+     }
+ 
+-    if (png->info) {
+-        free_mem(png->info);
+-        png->info = 0;
+-    }
+-
+     if (png->image) {
+         freeImage(png->image);
+         png->image = 0;
+@@ -275,27 +269,21 @@
+     memset(png, 0, sizeof(pngState));
+     png->lineProc = lineProc;
+     png->closure = closure;
+-    png->state = (png_struct *) alloc_mem(sizeof(png_struct));
++    png->state = (png_struct *) png_create_read_struct(PNG_LIBPNG_VER_STRING,
++        NULL, NULL, NULL);
+     if (!png->state)
+         return;
+ 
+-    png->info = (png_info *) alloc_mem(sizeof(png_info));
++    png->info = (png_info *) png_create_info_struct(png->state);
+     if (!png->info) {
+-        free_mem(png->state);
++        png_destroy_read_struct(&png->state, &png->info, (png_info **)NULL);
+         return;
+     }
+ 
+     if (setjmp(png->state->jmpbuf)) {
+-        png_read_destroy(png->state, png->info, (png_info *) 0);
+-        free_mem(png->state);
+-        free_mem(png->info);
+-        png->state = 0;
+-        png->info = 0;
++        png_destroy_read_struct(&png->state, &png->info, (png_info **)NULL);
+         return;
+     }
+-
+-    png_info_init(png->info);
+-    png_read_init(png->state);
+ 
+     png_set_progressive_read_fn(png->state, (void *) png, lf_info_callback,
+         lf_row_callback, lf_end_callback);
diff --git a/www/chimera/patches/patch-ae b/www/chimera/patches/patch-ae
new file mode 100644
index 00000000000..b86e90707b5
--- /dev/null
+++ b/www/chimera/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1.1.1 2000/10/19 14:23:01 fredb Exp $
+
+--- mxw/TextField.c.orig	Sun Mar 28 20:19:56 1999
++++ mxw/TextField.c	Wed Oct 18 19:29:15 2000
+@@ -943,7 +943,8 @@
+   XSelectionRequestEvent *req = XtGetSelectionRequest(aw, *selection, NULL);
+ 
+   if (*target == XA_TARGETS(XtDisplay(aw))) {
+-    Atom *targetP, *std_targets;
++    Atom *targetP;
++    XPointer std_targets;
+     unsigned long std_length;
+ 
+     XmuConvertStandardSelection(aw, req->time, selection,
diff --git a/www/chimera/pkg/COMMENT b/www/chimera/pkg/COMMENT
new file mode 100644
index 00000000000..869fce8bc13
--- /dev/null
+++ b/www/chimera/pkg/COMMENT
@@ -0,0 +1 @@
+World Wide Web Browser for X Windows
diff --git a/www/chimera/pkg/DESCR b/www/chimera/pkg/DESCR
new file mode 100644
index 00000000000..4170977a401
--- /dev/null
+++ b/www/chimera/pkg/DESCR
@@ -0,0 +1,7 @@
+Chimera, Version 2, is a World Wide Web browser that runs under X.
+This incarnation, though outwardly similar, is a complete re-write
+of the venerable Chimera, Version 1. For one thing, Chimera now uses
+the jpeg and png shared libraries. [The old Chimera called external
+binaries to render inline images.] Chimera supports jpeg, gif, and
+png images, persistent caching, bookmarks, and Chimera may also be
+extended using the standard mailcap mechanism.
diff --git a/www/chimera/pkg/PLIST b/www/chimera/pkg/PLIST
new file mode 100644
index 00000000000..24cfe6ac1e2
--- /dev/null
+++ b/www/chimera/pkg/PLIST
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2000/10/19 14:23:01 fredb Exp $
+bin/chimera
+man/cat1/chimera.0
+share/doc/chimera/HINTS
+share/doc/chimera/INFO
+share/doc/chimera/LICENSE