Remove chimera. Last update from 2002, and that's a long time for a web

browser.

No dissent on pkgsrc-users.

11 files changed, 1 insertions, 434 deletions

diff --git a/www/Makefile b/www/Makefile
index 2ae85d78f93..806e7e1da2f 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.800 2011/05/26 22:19:11 minskim Exp $
+# $NetBSD: Makefile,v 1.801 2011/06/15 17:44:52 wiz Exp $
 #
 
 COMMENT=	Packages related to the World Wide Web
@@ -97,7 +97,6 @@ SUBDIR+=	cgicc
 SUBDIR+=	cgilib
 SUBDIR+=	checkbot
 SUBDIR+=	cherokee
-SUBDIR+=	chimera
 SUBDIR+=	clearsilver
 SUBDIR+=	clearsilver-base
 SUBDIR+=	clisp-fastcgi
diff --git a/www/chimera/DESCR b/www/chimera/DESCR
deleted file mode 100644
index 4170977a401..00000000000
--- a/www/chimera/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-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/Makefile b/www/chimera/Makefile
deleted file mode 100644
index 6aa98aa8a65..00000000000
--- a/www/chimera/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.28 2011/06/11 08:26:09 obache Exp $
-#
-
-DISTNAME=	chimera-2.0a19
-PKGREVISION=	10
-CATEGORIES=	www
-MASTER_SITES=	http://www.chimera.org/download/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.chimera.org/
-COMMENT=	World Wide Web Browser for X Windows
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-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} ${DESTDIR}${PREFIX}/share/doc/chimera
-	cd ${WRKSRC}/doc && ${INSTALL_DATA}			\
-	    HINTS INFO LICENSE ${DESTDIR}${PREFIX}/share/doc/chimera
-
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/chimera/PLIST b/www/chimera/PLIST
deleted file mode 100644
index ab720249ad8..00000000000
--- a/www/chimera/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/03 03:33:59 jschauma Exp $
-bin/chimera
-${IMAKE_MAN_DIR}/chimera.${IMAKE_MANNEWSUFFIX}
-share/doc/chimera/HINTS
-share/doc/chimera/INFO
-share/doc/chimera/LICENSE
diff --git a/www/chimera/distinfo b/www/chimera/distinfo
deleted file mode 100644
index 923e7b270a2..00000000000
--- a/www/chimera/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.9 2011/04/05 12:16:39 wiz Exp $
-
-SHA1 (chimera-2.0a19.tar.gz) = c69b70b11cf12837e260eaa20e548bf9eb9ce309
-RMD160 (chimera-2.0a19.tar.gz) = d3f4d2ff3328c3bf5020490ed851b281e0492fe2
-Size (chimera-2.0a19.tar.gz) = 248431 bytes
-SHA1 (patch-aa) = a49455c9e2ce2a9bd3b276ae870739ece6249373
-SHA1 (patch-ab) = 1fc2f5f97f46403359a00e42cc25f4cbf9bc5331
-SHA1 (patch-ac) = 5f18afd9a1452bfba010fe3eb4e773f5395789c6
-SHA1 (patch-ad) = 0f7e49c81761e4f9ace49163f550eef8723df933
-SHA1 (patch-ae) = 8b8e1bc50791b635e5e87860302d0e758d159ed9
-SHA1 (patch-af) = 76256ccb4b5183a8d30a46a89a0cd75b113122fc
diff --git a/www/chimera/patches/patch-aa b/www/chimera/patches/patch-aa
deleted file mode 100644
index 3f5d6138645..00000000000
--- a/www/chimera/patches/patch-aa
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2011/01/13 13:52:54 wiz Exp $
-
---- Common.tmpl.dist.orig	1999-05-30 21:43:52.000000000 +0000
-+++ Common.tmpl.dist
-@@ -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 = $(MANDIR)
-+
- 
- #if !defined(__QNX__)
- LIBPRE=lib
-@@ -35,22 +35,22 @@ IMGLEXT = _local
- */
- 
- /* 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/libpng15$(IMGLEXT).a
-+
- 
- /* Tells Imakefile to set the flags for debugging.  Comment for -O. */
- #define CDebugging 1
-@@ -119,6 +119,7 @@ OS_DEFINES = -DHAVE_STDLIB_H -DHAVE_STRI
-              -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
deleted file mode 100644
index b0c692d72f4..00000000000
--- a/www/chimera/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2000/10/26 11:17:35 abs Exp $
-
---- common/uproc.c.orig	Mon Mar 29 03:27:05 1999
-+++ common/uproc.c
-@@ -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
deleted file mode 100644
index 40cf715f176..00000000000
--- a/www/chimera/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2000/12/01 16:22:54 fredb Exp $
-
---- image/image_endian.h.orig	Sat Oct 21 11:36:58 2000
-+++ image/image_endian.h
-@@ -48,6 +48,17 @@
- #define __VAX__ 1
- #endif
- 
-+#if defined(__NetBSD__)
-+#include <machine/endian.h>
-+#if BYTE_ORDER == BIG_ENDIAN
-+#undef CHIMERA_LITTLE_ENDIAN
-+#define  CHIMERA_BIG_ENDIAN
-+#else
-+#undef  CHIMERA_BIG_ENDIAN
-+#define CHIMERA_LITTLE_ENDIAN
-+#endif
-+#endif
-+
- #if defined(__i386__) || defined(__VAX__) || defined(__MIPSEL__) || defined(__alpha__) || defined(__QNX__)
- #undef  CHIMERA_BIG_ENDIAN
- #define CHIMERA_LITTLE_ENDIAN
diff --git a/www/chimera/patches/patch-ad b/www/chimera/patches/patch-ad
deleted file mode 100644
index af0e40814da..00000000000
--- a/www/chimera/patches/patch-ad
+++ /dev/null
@@ -1,239 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2011/04/05 12:16:39 wiz Exp $
-
-Fix build with png-1.5.
-
---- image/png.c.orig	1999-03-29 02:23:46.000000000 +0000
-+++ image/png.c
-@@ -60,33 +60,33 @@ lf_info_callback(png_struct *state, png_
-     int orig_depth = 0;
-     pngState *png = (pngState *) png_get_progressive_ptr(state);
- 
--    if (info->bit_depth < 8 && (PNG_COLOR_TYPE_RGB == info->color_type ||
--            PNG_COLOR_TYPE_RGB_ALPHA == info->color_type))
-+    if (png_get_bit_depth(state, info) < 8 && (PNG_COLOR_TYPE_RGB == png_get_color_type(state, info) ||
-+            PNG_COLOR_TYPE_RGB_ALPHA == png_get_color_type(state, info)))
-         png_set_expand(state);
- 
-     /* I wish the frame's background colour was available here */
--    if (info->color_type & PNG_COLOR_MASK_ALPHA) {
-+    if (png_get_color_type(state, info) & PNG_COLOR_MASK_ALPHA) {
-         png_color_16 bg;
-         int gflag = PNG_BACKGROUND_GAMMA_SCREEN;
-         double gval = 1.0;
-         int expand = 0;
- 
-         bg.red = bg.green = bg.blue = bg.gray = 0;
--        if (PNG_COLOR_TYPE_PALETTE == info->color_type)
-+        if (PNG_COLOR_TYPE_PALETTE == png_get_color_type(state, info))
-             png_set_expand(state);
- 
-         png_set_background(state, &bg, gflag, expand, gval);
-     }
- 
--    if (info->bit_depth < 8 && (info->bit_depth > 1 ||
--            PNG_COLOR_TYPE_GRAY != info->color_type)) {
--        if (PNG_COLOR_TYPE_GRAY == info->color_type)
--            orig_depth = info->bit_depth;
-+    if (png_get_bit_depth(state, info) < 8 && (png_get_bit_depth(state, info) > 1 ||
-+            PNG_COLOR_TYPE_GRAY != png_get_color_type(state, info))) {
-+        if (PNG_COLOR_TYPE_GRAY == png_get_color_type(state, info))
-+            orig_depth = png_get_bit_depth(state, info);
-         png_set_packing(state);
-     }
-  
-     /* tell libpng to strip 16 bit depth files down to 8 bits */
--    if (info->bit_depth > 8)
-+    if (png_get_bit_depth(state, info) > 8)
-         png_set_strip_16(state);
- 
-     png_set_interlace_handling(state);
-@@ -95,18 +95,21 @@ lf_info_callback(png_struct *state, png_
-     png_read_update_info(state, info);
- 
-     /* allocate the memory to hold the image using the fields of png_info. */
--    if (PNG_COLOR_TYPE_GRAY == info->color_type && 1 == info->bit_depth) {
--        png->image = newBitImage(info->width, info->height);
-+    if (PNG_COLOR_TYPE_GRAY == png_get_color_type(state, info) && 1 == png_get_bit_depth(state, info)) {
-+        png->image = newBitImage(png_get_image_width(state, info), png_get_image_height(state, info));
-        if (!png->image) {
-            png->done = image_error;
-            return;
-        }
- 
-         png_set_invert_mono(state);
--    } else if (PNG_COLOR_TYPE_PALETTE == info->color_type) {
-+    } else if (PNG_COLOR_TYPE_PALETTE == png_get_color_type(state, info)) {
-         int i;
-+	png_colorp palette;
-+	int num_palette;
- 
--        png->image = newRGBImage(info->width, info->height, info->bit_depth);
-+	png_get_PLTE(state, info, &palette, &num_palette);
-+        png->image = newRGBImage(png_get_image_width(state, info), png_get_image_height(state, info), png_get_bit_depth(state, info));
-        if (!png->image) {
-            png->done = image_error;
-            return;
-@@ -115,28 +118,32 @@ lf_info_callback(png_struct *state, png_
-         png->image->rgb.red = png->cmap[0];
-         png->image->rgb.green = png->cmap[1];
-         png->image->rgb.blue = png->cmap[2];
--        for (i = 0; i < info->num_palette; ++i) {
--            png->image->rgb.red[i] = info->palette[i].red << 8;
--            png->image->rgb.green[i] = info->palette[i].green << 8;
--            png->image->rgb.blue[i] = info->palette[i].blue << 8;
-+        for (i = 0; i < num_palette; ++i) {
-+            png->image->rgb.red[i] = palette[i].red << 8;
-+            png->image->rgb.green[i] = palette[i].green << 8;
-+            png->image->rgb.blue[i] = palette[i].blue << 8;
-         }
--        png->image->rgb.used = info->num_palette;
--        if (info->valid & PNG_INFO_tRNS) {
-+        png->image->rgb.used = num_palette;
-+        if (png_get_valid(state, info, PNG_INFO_tRNS)) {
-             int val, i;
-+	    png_bytep trans_alpha;
-+	    int num_trans;
-+	    png_color_16p trans_color;
- 
-+	    png_get_tRNS(state, info, &trans_alpha, &num_trans, &trans_color);
-             val = 0;
--            for (i = 0; i < info->num_trans; ++i) {
--                if (info->trans[i] < info->trans[val])
-+            for (i = 0; i < num_trans; ++i) {
-+                if (trans_alpha[i] < trans_alpha[val])
-                     val = i;
-             }
-             png->image->transparent = val;
-         }
--    } else if (PNG_COLOR_TYPE_GRAY == info->color_type) {
-+    } else if (PNG_COLOR_TYPE_GRAY == png_get_color_type(state, info)) {
-         int i;
--        int depth = orig_depth ? orig_depth : info->bit_depth;
-+        int depth = orig_depth ? orig_depth : png_get_bit_depth(state, info);
-         int maxval = (1 << depth) - 1;
- 
--        png->image = newRGBImage(info->width, info->height, depth);
-+        png->image = newRGBImage(png_get_image_width(state, info), png_get_image_height(state, info), depth);
-        if (!png->image) {
-            png->done = image_error;
-            return;
-@@ -153,10 +160,16 @@ lf_info_callback(png_struct *state, png_
-         }
-         png->image->rgb.used = maxval + 1;
- 
--        if (info->valid & PNG_INFO_tRNS)
--            png->image->transparent = info->trans_values.gray;
-+        if (png_get_valid(state, info, PNG_INFO_tRNS)) {
-+	    png_bytep trans_alpha;
-+	    int num_trans;
-+	    png_color_16p trans_color;
-+
-+	    png_get_tRNS(state, info, &trans_alpha, &num_trans, &trans_color);
-+            png->image->transparent = trans_color->gray;
-+	}
-     } else {
--        png->image = newTrueImage(info->width, info->height);
-+        png->image = newTrueImage(png_get_image_width(state, info), png_get_image_height(state, info));
-        if (!png->image) {
-            png->done = image_error;
-            return;
-@@ -164,10 +177,13 @@ lf_info_callback(png_struct *state, png_
- 
-     }
- 
--    if (info->valid & PNG_INFO_gAMA && png->image->type != IBITMAP)
--        png->image->gamma = 1.0 / info->gamma;
-+    if (png_get_valid(state, info, PNG_INFO_gAMA) && png->image->type != IBITMAP) {
-+	double gamma;
-+	png_get_gAMA(state, info, &gamma);
-+        png->image->gamma = 1.0 / gamma;
-+    }
- 
--    assert((png->image->width * png->image->pixlen + 7) / 8 == info->rowbytes);
-+    assert((png->image->width * png->image->pixlen + 7) / 8 == png_get_rowbytes(state, info));
- }
- 
- 
-@@ -192,12 +208,12 @@ lf_row_callback(png_struct *state, png_b
-         /* I can't say I'm too fond of this endian business. */
- #ifdef CHIMERA_LITTLE_ENDIAN
-         if (IBITMAP == png->image->type)
--           lc_reverse_byte(old_row, png->info->rowbytes);
-+           lc_reverse_byte(old_row, png_get_rowbytes(png->state, png->info));
- #endif
-         (png->lineProc)(png->closure, row_num, row_num);
- #ifdef CHIMERA_LITTLE_ENDIAN
-         if (IBITMAP == png->image->type)
--           lc_reverse_byte(old_row,png->info->rowbytes);
-+           lc_reverse_byte(old_row,png_get_rowbytes(png->state, png->info));
- #endif
-     }
- }
-@@ -219,20 +235,14 @@ pngDestroy(void *pointer)
-     if (!png)
-         return;
- 
--    if (setjmp(png->state->jmpbuf))
-+    if (setjmp(png_jmpbuf(png->state)))
-         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;
-@@ -246,7 +256,7 @@ pngAddData(void *pointer, byte *data, in
- {
-     pngState *png = (pngState *) pointer;
- 
--    if (setjmp(png->state->jmpbuf))
-+    if (setjmp(png_jmpbuf(png->state)))
-         return image_error;
- 
-     if (len > png->lenSoFar) {
-@@ -275,28 +285,22 @@ pngInit(void (*lineProc)(void *, int, in
-     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, NULL, (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;
-+    if (setjmp(png_jmpbuf(png->state))) {
-+        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);
-     png->done = image_need_data;
diff --git a/www/chimera/patches/patch-ae b/www/chimera/patches/patch-ae
deleted file mode 100644
index 928b715c314..00000000000
--- a/www/chimera/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2000/10/26 11:17:35 abs Exp $
-
---- mxw/TextField.c.orig	Mon Mar 29 03:19:56 1999
-+++ mxw/TextField.c
-@@ -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/patches/patch-af b/www/chimera/patches/patch-af
deleted file mode 100644
index 7a8c1f1d227..00000000000
--- a/www/chimera/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1 2000/10/26 11:17:59 abs Exp $
-
---- port/getcwd.c.orig	Mon Mar 29 03:22:30 1999
-+++ port/getcwd.c
-@@ -34,7 +34,9 @@
- #include <sys/param.h>
- 
- extern char *getwd();
-+#ifndef errno
- extern int errno;
-+#endif
- 
- char *
- getcwd(buf, size)