From 67f3fb6211df2a81605cfb4221a857034d532841 Mon Sep 17 00:00:00 2001 From: kristerw Date: Tue, 1 Jun 2004 21:53:00 +0000 Subject: Remove obsolete packages, per discussion on tech-pkg. --- www/Makefile | 4 +- www/Mosaic/DESCR | 6 -- www/Mosaic/Makefile | 49 ------------ www/Mosaic/PLIST | 6 -- www/Mosaic/distinfo | 23 ------ www/Mosaic/patches/patch-aa | 47 ----------- www/Mosaic/patches/patch-ab | 14 ---- www/Mosaic/patches/patch-ac | 14 ---- www/Mosaic/patches/patch-ad | 13 --- www/Mosaic/patches/patch-ae | 22 ----- www/Mosaic/patches/patch-af | 17 ---- www/Mosaic/patches/patch-ag | 21 ----- www/Mosaic/patches/patch-ah | 13 --- www/Mosaic/patches/patch-ai | 103 ------------------------ www/Mosaic/patches/patch-aj | 65 --------------- www/Mosaic/patches/patch-ak | 12 --- www/Mosaic/patches/patch-al | 12 --- www/Mosaic/patches/patch-am | 12 --- www/Mosaic/patches/patch-an | 12 --- www/Mosaic/patches/patch-ao | 49 ------------ www/Mosaic/patches/patch-ap | 22 ----- www/Mosaic/patches/patch-aq | 27 ------- www/Mosaic/patches/patch-ar | 13 --- www/Mosaic/patches/patch-as | 35 -------- www/arena/DESCR | 12 --- www/arena/Makefile | 71 ----------------- www/arena/PLIST | 6 -- www/arena/distinfo | 15 ---- www/arena/patches/patch-aa | 12 --- www/arena/patches/patch-ab | 72 ----------------- www/arena/patches/patch-ac | 23 ------ www/arena/patches/patch-ad | 76 ------------------ www/arena/patches/patch-ae | 47 ----------- www/arena/patches/patch-af | 19 ----- www/arena/patches/patch-ag | 123 ---------------------------- www/arena/patches/patch-ah | 15 ---- www/arena/patches/patch-ai | 15 ---- www/arena/patches/patch-aj | 26 ------ www/arena/patches/patch-ak | 190 -------------------------------------------- 39 files changed, 1 insertion(+), 1332 deletions(-) delete mode 100644 www/Mosaic/DESCR delete mode 100644 www/Mosaic/Makefile delete mode 100644 www/Mosaic/PLIST delete mode 100644 www/Mosaic/distinfo delete mode 100644 www/Mosaic/patches/patch-aa delete mode 100644 www/Mosaic/patches/patch-ab delete mode 100644 www/Mosaic/patches/patch-ac delete mode 100644 www/Mosaic/patches/patch-ad delete mode 100644 www/Mosaic/patches/patch-ae delete mode 100644 www/Mosaic/patches/patch-af delete mode 100644 www/Mosaic/patches/patch-ag delete mode 100644 www/Mosaic/patches/patch-ah delete mode 100644 www/Mosaic/patches/patch-ai delete mode 100644 www/Mosaic/patches/patch-aj delete mode 100644 www/Mosaic/patches/patch-ak delete mode 100644 www/Mosaic/patches/patch-al delete mode 100644 www/Mosaic/patches/patch-am delete mode 100644 www/Mosaic/patches/patch-an delete mode 100644 www/Mosaic/patches/patch-ao delete mode 100644 www/Mosaic/patches/patch-ap delete mode 100644 www/Mosaic/patches/patch-aq delete mode 100644 www/Mosaic/patches/patch-ar delete mode 100644 www/Mosaic/patches/patch-as delete mode 100644 www/arena/DESCR delete mode 100644 www/arena/Makefile delete mode 100644 www/arena/PLIST delete mode 100644 www/arena/distinfo delete mode 100644 www/arena/patches/patch-aa delete mode 100644 www/arena/patches/patch-ab delete mode 100644 www/arena/patches/patch-ac delete mode 100644 www/arena/patches/patch-ad delete mode 100644 www/arena/patches/patch-ae delete mode 100644 www/arena/patches/patch-af delete mode 100644 www/arena/patches/patch-ag delete mode 100644 www/arena/patches/patch-ah delete mode 100644 www/arena/patches/patch-ai delete mode 100644 www/arena/patches/patch-aj delete mode 100644 www/arena/patches/patch-ak (limited to 'www') diff --git a/www/Makefile b/www/Makefile index 353cb5f6df7..78390b71f78 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.324 2004/05/30 13:29:04 xtraeme Exp $ +# $NetBSD: Makefile,v 1.325 2004/06/01 21:53:00 kristerw Exp $ # COMMENT= Packages related to the World Wide Web -SUBDIR+= Mosaic SUBDIR+= adzap SUBDIR+= amaya SUBDIR+= analog @@ -43,7 +42,6 @@ SUBDIR+= apache2 SUBDIR+= apache6 SUBDIR+= apachetop SUBDIR+= apc-gui -SUBDIR+= arena SUBDIR+= asWedit SUBDIR+= asp2php SUBDIR+= awstats diff --git a/www/Mosaic/DESCR b/www/Mosaic/DESCR deleted file mode 100644 index dcdf98564f0..00000000000 --- a/www/Mosaic/DESCR +++ /dev/null @@ -1,6 +0,0 @@ -Mosaic - a World Wide Web browser from www.ncsa.uiuc.edu - -Mosaic is the original graphical WWW browser from NCSA. Its source code -base was used to create Netscape, among other browsers. It is now -unsupported, but still functions as a small, usable graphical browser in -many environments. diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile deleted file mode 100644 index 8220fa8b3b9..00000000000 --- a/www/Mosaic/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# $NetBSD: Makefile,v 1.40 2004/05/03 23:30:00 wiz Exp $ -# FreeBSD Id: Makefile,v 1.15 1998/05/27 08:44:56 dburr Exp -# - -DISTNAME= Mosaic-src-2.7b5 -PKGNAME= mosaic-2.7b5 -PKGREVISION= 1 -CATEGORIES= www -MASTER_SITES= ftp://ftp.ncsa.uiuc.edu/Web/Mosaic/Unix/source/ - -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/ -COMMENT= World Wide Web browser - -LICENSE= mosaic-license - -NOT_FOR_PLATFORM= *-*-alpha #LP64 problems - -WRKSRC= ${WRKDIR}/Mosaic-src -USE_BUILDLINK3= YES -USE_X11BASE= YES -USE_MOTIF12= YES - -GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-jpegdir=${BUILDLINK_PREFIX.jpeg} -CONFIGURE_ARGS+= --with-pngdir=${BUILDLINK_PREFIX.png} -CONFIGURE_ARGS+= --with-zdir=${BUILDLINK_PREFIX.zlib} - -CPPFLAGS+= -Dunix -I${LOCALBASE}/LessTif/Motif1.2/include -LDFLAGS+= -L${LOCALBASE}/LessTif/Motif1.2/lib -LDFLAGS+= -Wl,-R${LOCALBASE}/LessTif/Motif1.2/lib - -post-configure: - @${ECHO} '' >>${WRKSRC}/config.h - @${ECHO} '#define PREFIX "${PREFIX}"' >>${WRKSRC}/config.h - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/Mosaic ${PREFIX}/bin - ${LN} -sf Mosaic ${PREFIX}/bin/mosaic - ${INSTALL_DATA} ${WRKSRC}/app-defaults.color \ - ${PREFIX}/lib/X11/app-defaults/Mosaic - ${INSTALL_DATA_DIR} ${PREFIX}/share/mosaic - -.include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" -.include "../../graphics/xpm/buildlink3.mk" -.include "../../mk/motif.buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/www/Mosaic/PLIST b/www/Mosaic/PLIST deleted file mode 100644 index c6dd2055419..00000000000 --- a/www/Mosaic/PLIST +++ /dev/null @@ -1,6 +0,0 @@ -@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:51:41 jlam Exp $ -bin/Mosaic -bin/mosaic -lib/X11/app-defaults/Mosaic -@exec ${MKDIR} %D/share/mosaic -@unexec ${RM} -rf %D/share/mosaic diff --git a/www/Mosaic/distinfo b/www/Mosaic/distinfo deleted file mode 100644 index 998605fbcb9..00000000000 --- a/www/Mosaic/distinfo +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: distinfo,v 1.6 2004/05/03 23:30:00 wiz Exp $ - -SHA1 (Mosaic-src-2.7b5.tar.gz) = 69705268cf8139ac51f394747e681c1bd8296fee -Size (Mosaic-src-2.7b5.tar.gz) = 980929 bytes -SHA1 (patch-aa) = 487e79e9756942d9ca67738c1676753e6d92b202 -SHA1 (patch-ab) = 072c393337032c2734562f07a9443dbf84ebab96 -SHA1 (patch-ac) = b87dfef54891950803a9f940ef98147f9a3bbe21 -SHA1 (patch-ad) = b39d04073ca7493fcce22e6dddf450ab8240877a -SHA1 (patch-ae) = 808c7b715e3f7eacb3080e2c06955f96789ea331 -SHA1 (patch-af) = 95baf170eea4e70ec9a68f53cb7ae1243426dfcb -SHA1 (patch-ag) = b178d56ff81f3a65a565d04f0999defffb61f773 -SHA1 (patch-ah) = 836b462559295232b553fa2714edf4ce0f5a4bed -SHA1 (patch-ai) = 3e38539760dbebc66d75b6f4f8510972dd739f47 -SHA1 (patch-aj) = 5a5c4afe02ed464873f05d5010259652e44ef11d -SHA1 (patch-ak) = d7ddc0e984fb8fdd3272f052d35910f4bb4e276a -SHA1 (patch-al) = 6cf33d9bad1001f14e62f8a6dba114ee46384652 -SHA1 (patch-am) = 275e64a2abfca3ef851a2c5d8d7874d8e7072f85 -SHA1 (patch-an) = 9eca7442f5cb8b2f9c6ad85c6dffa2dd473ecb30 -SHA1 (patch-ao) = eb672cea24c0695ac9a0e67eb2e18cbc801f2f14 -SHA1 (patch-ap) = 4166b3381736fe52db364fa62679a099415cc992 -SHA1 (patch-aq) = 019a9c01857209a924002fc30d0f6194d6ad2fc6 -SHA1 (patch-ar) = cb5a69ff6e14ae95b59cc3c6352920a405428137 -SHA1 (patch-as) = b87806ef8423f375f2240bb880baa488e26dc6e6 diff --git a/www/Mosaic/patches/patch-aa b/www/Mosaic/patches/patch-aa deleted file mode 100644 index 3397822d943..00000000000 --- a/www/Mosaic/patches/patch-aa +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD: patch-aa,v 1.3 1999/06/07 20:47:24 tron Exp $ - ---- libhtmlw/HTMLimages.c.orig Thu Jun 27 01:37:01 1996 -+++ libhtmlw/HTMLimages.c Mon Jun 7 22:27:36 1999 -@@ -511,6 +511,11 @@ - bshift = highbit(theVisual->blue_mask) - 7; - bmap_order = BitmapBitOrder(dsp); - -+ newimage = XCreateImage(dsp, -+ DefaultVisual(dsp, DefaultScreen(dsp)), -+ depth, ZPixmap, 0, (char *)bit_data, -+ width, height, 8, 0); -+ - bitp = bit_data; - datap = data; - for (w = (width * height); w > 0; w--) -@@ -524,7 +529,10 @@ - - if (bmap_order == MSBFirst) - { -- *bitp++ = (unsigned char)((c >> 24) & 0xff); -+ if (newimage->bits_per_pixel == 32) -+ { -+ *bitp++ = (unsigned char)((c >> 24) & 0xff); -+ } - *bitp++ = (unsigned char)((c >> 16) & 0xff); - *bitp++ = (unsigned char)((c >> 8) & 0xff); - *bitp++ = (unsigned char)(c & 0xff); -@@ -534,14 +542,13 @@ - *bitp++ = (unsigned char)(c & 0xff); - *bitp++ = (unsigned char)((c >> 8) & 0xff); - *bitp++ = (unsigned char)((c >> 16) & 0xff); -- *bitp++ = (unsigned char)((c >> 24) & 0xff); -+ if (newimage->bits_per_pixel == 32) -+ { -+ *bitp++ = (unsigned char)((c >> 24) & 0xff); -+ } - } - } - -- newimage = XCreateImage(dsp, -- DefaultVisual(dsp, DefaultScreen(dsp)), -- depth, ZPixmap, 0, (char *)bit_data, -- width, height, 32, 0); - break; - default: - #ifndef DISABLE_TRACE diff --git a/www/Mosaic/patches/patch-ab b/www/Mosaic/patches/patch-ab deleted file mode 100644 index 331fe326425..00000000000 --- a/www/Mosaic/patches/patch-ab +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2004/05/03 23:30:00 wiz Exp $ - ---- libwww2/HTTCP.c.orig 1996-06-27 02:22:48.000000000 +0200 -+++ libwww2/HTTCP.c -@@ -72,9 +72,6 @@ PRIVATE char *hostname=0; /* The name o - extern int errno; - #endif /* errno */ - --extern char *sys_errlist[]; /* see man perror on cernvax */ --extern int sys_nerr; -- - /* Report Internet Error - ** --------------------- - */ diff --git a/www/Mosaic/patches/patch-ac b/www/Mosaic/patches/patch-ac deleted file mode 100644 index b8e013ca4ea..00000000000 --- a/www/Mosaic/patches/patch-ac +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2004/05/03 23:30:00 wiz Exp $ - ---- src/gui-dialogs.c.orig 1996-07-18 09:49:41.000000000 +0200 -+++ src/gui-dialogs.c -@@ -87,9 +87,6 @@ extern int is_uncompressed; - - /*swp -- for ~ expansion*/ - #include --extern int sys_nerr; --extern char *sys_errlist[]; --extern int errno; - #define __MAX_HOME_LEN__ 256 - int pathEval(char *dest, char *src); - char *getFileName(char *file_src); diff --git a/www/Mosaic/patches/patch-ad b/www/Mosaic/patches/patch-ad deleted file mode 100644 index b8820d152af..00000000000 --- a/www/Mosaic/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.4 2004/05/03 23:30:00 wiz Exp $ - ---- src/xresources.h.org Tue Apr 9 21:41:26 1996 -+++ src/xresources.h Tue Apr 9 21:43:12 1996 -@@ -94,7 +94,7 @@ - { "confirmExit", "ConfirmExit", XtRBoolean, sizeof (Boolean), - offset (confirm_exit), XtRString, "True" }, - /* THIS USED TO BE mailCommand BUT IS NOW sendmailCommand. */ --#ifdef __bsdi__ -+#if defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__) - { "sendmailCommand", "SendmailCommand", XtRString, sizeof (char *), - offset (sendmail_command), XtRString, "/usr/sbin/sendmail -t" }, - #else diff --git a/www/Mosaic/patches/patch-ae b/www/Mosaic/patches/patch-ae deleted file mode 100644 index 8cebdcad3d6..00000000000 --- a/www/Mosaic/patches/patch-ae +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2004/05/03 23:30:00 wiz Exp $ - ---- src/comment.h.orig 1996-06-06 22:01:43.000000000 +0200 -+++ src/comment.h -@@ -67,7 +67,7 @@ - #ifndef _COMMENT_H - #define _COMMENT_H - --char *comment_card_html_top= \ -+static char *comment_card_html_top= \ - "\n" \ - " Comment Card for Mosaic 2.6\n" \ - "\n" \ -@@ -103,7 +103,7 @@ char *comment_card_html_top= \ - "

\n" \ - "\n"; - --char *comment_card_html_bot= \ -+static char *comment_card_html_bot= \ - "

\n" \ - " \n" \ - "
\n" \ diff --git a/www/Mosaic/patches/patch-af b/www/Mosaic/patches/patch-af deleted file mode 100644 index 12d54a8df32..00000000000 --- a/www/Mosaic/patches/patch-af +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-af,v 1.4 2004/05/03 23:30:00 wiz Exp $ - ---- libnut/system.c.orig 1996-06-27 03:08:52.000000000 +0200 -+++ libnut/system.c -@@ -101,12 +101,6 @@ - extern char *strdup(char *str); - #endif - --#ifndef VMS --extern int sys_nerr; --extern char *sys_errlist[]; --extern int errno; --#endif -- - - #ifndef DISABLE_TRACE - int nutTrace=0; diff --git a/www/Mosaic/patches/patch-ag b/www/Mosaic/patches/patch-ag deleted file mode 100644 index e54fe93c26f..00000000000 --- a/www/Mosaic/patches/patch-ag +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ag,v 1.3 1999/06/07 21:40:20 tron Exp $ - ---- src/gui.c.orig Thu Jul 18 21:26:56 1996 -+++ src/gui.c Mon Jun 7 23:25:44 1999 -@@ -173,6 +173,7 @@ - - - #include "libhtmlw/HTML.h" -+#include "config.h" - #include "xresources.h" - #include "cci.h" - -@@ -3963,7 +3964,7 @@ - return 0; - else - { --{char ans[10]; printf("Press RETURN\n"); gets(ans);} -+{char ans[10]; printf("Press RETURN\n"); fgets(ans, sizeof(ans), stdin);} - /* All other errors are 'fatal'. */ - XGetErrorText (dsp, event->error_code, buf, 128); - fprintf (stderr, "X Error: %s\n", buf); diff --git a/www/Mosaic/patches/patch-ah b/www/Mosaic/patches/patch-ah deleted file mode 100644 index d2a1b65e4b7..00000000000 --- a/www/Mosaic/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.3 2004/05/03 23:30:00 wiz Exp $ - ---- src/readJPEG.c.orig 1996-06-27 00:57:16.000000000 +0200 -+++ src/readJPEG.c -@@ -127,7 +127,7 @@ int i; - fprintf(stderr,"cinfo.actual_number_of_colors=%d\n",cinfo.actual_number_of_colors); - fprintf(stderr,"colrs[0].red=%d colrs[99].red=%d\n",colrs[0].red,colrs[99].red); - fprintf(stderr,"cinfo.colormap[0][0]=%d\n",cinfo.colormap[0][0]); -- {char dummy[80]; fprintf(stderr,"RETURN\n"); gets(dummy);} -+ {char dummy[80]; fprintf(stderr,"RETURN\n"); fgets(dummy, sizeof(dummy), stdin);} - } - #endif - diff --git a/www/Mosaic/patches/patch-ai b/www/Mosaic/patches/patch-ai deleted file mode 100644 index d28c7f0d08b..00000000000 --- a/www/Mosaic/patches/patch-ai +++ /dev/null @@ -1,103 +0,0 @@ -$NetBSD: patch-ai,v 1.3 2001/08/05 23:43:12 fredb Exp $ - ---- src/readPNG.c.orig Sun Jun 30 07:30:00 1996 -+++ src/readPNG.c -@@ -91,8 +91,8 @@ - unsigned char *p; - png_byte *q; - -- png_struct *png_ptr; -- png_info *info_ptr; -+ png_struct *png_ptr = NULL; -+ png_info *info_ptr = NULL; - - double screen_gamma; - -@@ -125,19 +125,20 @@ - decoding it */ - rewind(infile); - -- /* allocate the structures */ -- png_ptr = (png_struct *)malloc(sizeof(png_struct)); -+ /* allocate and initialize the structures */ -+ png_ptr = (png_struct *)png_create_read_struct(PNG_LIBPNG_VER_STRING, -+ NULL, NULL, NULL); - if(!png_ptr) - return 0; - -- info_ptr = (png_info *)malloc(sizeof(png_info)); -+ info_ptr = (png_info *)png_create_info_struct(png_ptr); - if(!info_ptr) { -- free(png_ptr); -+ png_destroy_read_struct(&png_ptr, NULL, NULL); - return 0; - } - - /* Establish the setjmp return context for png_error to use. */ -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - - #ifndef DISABLE_TRACE - if (srcTrace) { -@@ -145,26 +146,19 @@ - } - #endif - -- png_read_destroy(png_ptr, info_ptr, (png_info *)0); -- - if(png_pixels != NULL) - free((char *)png_pixels); - if(row_pointers != NULL) - free((png_byte **)row_pointers); -- -- free((char *)png_ptr); -- free((char *)info_ptr); - -+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); -+ - return 0; - } - - /* SWP -- Hopefully to fix cores on bad PNG files */ -- png_set_message_fn(png_ptr,png_get_msg_ptr(png_ptr),NULL,NULL); -+ png_set_error_fn(png_ptr,png_get_error_ptr(png_ptr),NULL,NULL); - -- /* initialize the structures */ -- png_info_init(info_ptr); -- png_read_init(png_ptr); -- - /* set up the input control */ - png_init_io(png_ptr, infile); - -@@ -316,13 +310,14 @@ - png_read_image(). */ - png_pixels = (png_byte *)malloc(info_ptr->rowbytes * - (*height) * sizeof(png_byte)); -- - - row_pointers = (png_byte **) malloc((*height) * sizeof(png_byte *)); - for (i=0; i < *height; i++) - row_pointers[i]=png_pixels+(info_ptr->rowbytes*i); - -- -+ png_set_rows(png_ptr, info_ptr, row_pointers); -+ -+ - /* FINALLY - read the darn thing. */ - png_read_image(png_ptr, row_pointers); - -@@ -409,13 +404,8 @@ - free((png_byte **)row_pointers); - - /* clean up after the read, and free any memory allocated */ -- png_read_destroy(png_ptr, info_ptr, (png_info *)0); -- -+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - -- /* free the structures */ -- free((char *)png_ptr); -- free((char *)info_ptr); -- - return pixmap; - } - diff --git a/www/Mosaic/patches/patch-aj b/www/Mosaic/patches/patch-aj deleted file mode 100644 index 3a95749fe48..00000000000 --- a/www/Mosaic/patches/patch-aj +++ /dev/null @@ -1,65 +0,0 @@ -$NetBSD: patch-aj,v 1.3 2001/08/05 17:02:25 fredb Exp $ - ---- configure.orig Wed Jul 10 20:34:39 1996 -+++ configure -@@ -1887,7 +1887,7 @@ - fi - - echo $ac_n "checking for -lXpm""... $ac_c" 1>&6 --ac_lib_var=`echo Xpm'_'_XpmFreeXpmImage | tr './+\055' '__p_'` -+ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | tr './+\055' '__p_'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1899,11 +1899,11 @@ - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char _XpmFreeXpmImage(); -+char XpmFreeXpmImage(); - - int main() { return 0; } - int t() { --_XpmFreeXpmImage() -+XpmFreeXpmImage() - ; return 0; } - EOF - if { (eval echo configure:1910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then -@@ -3038,7 +3038,7 @@ - LIBS="${withval}/libjpeg.a ${LIBS}" - else - if test -r ${withval}/lib/libjpeg.a ; then -- LIBS="${withval}/lib/libjpeg.a ${LIBS}" -+ LIBS="-L${withval}/lib -ljpeg ${LIBS}" - else - { echo "configure: error: Could not find libjpeg.a in ${withval}" 1>&2; exit 1; } - fi -@@ -3125,8 +3125,8 @@ - libz="${withval}/libz.a" - else - if test -r ${withval}/lib/libz.a ; then -- LIBS="${withval}/lib/libz.a ${LIBS}" -- libz="${withval}/lib/libz.a" -+ LIBS="-L${withval}/lib -lz ${LIBS}" -+ libz="-L${withval}/lib -lz" - else - { echo "configure: error: Could not find libz.a in ${withval}" 1>&2; exit 1; } - fi -@@ -3180,7 +3180,7 @@ - LIBS="${withval}/libpng.a ${libz} ${LIBS}" - else - if test -r ${withval}/lib/libpng.a ; then -- LIBS="${withval}/lib/libpng.a ${libz} ${LIBS}" -+ LIBS="-L${withval}/lib -lpng ${libz} ${LIBS}" - else - { echo "configure: error: Could not find libpng.a in ${withval}" 1>&2; exit 1; } - fi -@@ -3288,7 +3288,7 @@ - #line 3289 "configure" - #include "confdefs.h" - -- #include -+ #include - - int main() { return 0; } - int t() { diff --git a/www/Mosaic/patches/patch-ak b/www/Mosaic/patches/patch-ak deleted file mode 100644 index 40cb0ea7725..00000000000 --- a/www/Mosaic/patches/patch-ak +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ak,v 1.2 1998/08/07 11:14:19 agc Exp $ - ---- src/Makefile.in.orig Fri Jun 28 01:42:15 1996 -+++ src/Makefile.in Sat Jul 11 21:40:17 1998 -@@ -7,6 +7,7 @@ - CC= @CC@ - LIBS = ../libhtmlw/libhtmlw.a ../libwww2/libwww.a ../libnut/libnut.a ../libXmx/libXmx.a @LIBS@ - CPPFLAGS = @CPPFLAGS@ -I.. -I../libwww2 -+LDFLAGS = @LDFLAGS@ - CFLAGS = @CFLAGS@ - - LIBHTMLW_DIR = ../libhtmlw diff --git a/www/Mosaic/patches/patch-al b/www/Mosaic/patches/patch-al deleted file mode 100644 index 268c6a98914..00000000000 --- a/www/Mosaic/patches/patch-al +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-al,v 1.2 1998/08/07 11:14:20 agc Exp $ - ---- libwww2/Makefile.in.orig Sat Jul 11 21:41:11 1998 -+++ libwww2/Makefile.in Sat Jul 11 21:41:30 1998 -@@ -7,6 +7,7 @@ - CC= @CC@ - LIBS = @LIBS@ - CFLAGS = @CFLAGS@ -+CPPFLAGS = @CPPFLAGS@ - - RANLIB = @RANLIB@ - diff --git a/www/Mosaic/patches/patch-am b/www/Mosaic/patches/patch-am deleted file mode 100644 index e69a6d709c4..00000000000 --- a/www/Mosaic/patches/patch-am +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-am,v 1.2 1998/08/07 11:14:20 agc Exp $ - ---- libXmx/Makefile.in.orig Tue Jun 25 04:29:07 1996 -+++ libXmx/Makefile.in Sat Jul 11 22:44:05 1998 -@@ -7,6 +7,7 @@ - CC= @CC@ - LIBS = @LIBS@ - CFLAGS = @CFLAGS@ -+CPPFLAGS = @CPPFLAGS@ - RANLIB = @RANLIB@ - - # You shouldn't need to edit below here. diff --git a/www/Mosaic/patches/patch-an b/www/Mosaic/patches/patch-an deleted file mode 100644 index 5b8d6676c38..00000000000 --- a/www/Mosaic/patches/patch-an +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-an,v 1.2 1998/08/07 11:14:21 agc Exp $ - ---- libhtmlw/Makefile.in.orig Sat Jul 11 23:07:57 1998 -+++ libhtmlw/Makefile.in Sat Jul 11 23:19:38 1998 -@@ -6,6 +6,7 @@ - - CC= @CC@ - LIBS = @LIBS@ -+CPPFLAGS = @CPPFLAGS@ - CFLAGS = @CFLAGS@ - - RANLIB = @RANLIB@ diff --git a/www/Mosaic/patches/patch-ao b/www/Mosaic/patches/patch-ao deleted file mode 100644 index a1d8f8691f8..00000000000 --- a/www/Mosaic/patches/patch-ao +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-ao,v 1.1 1999/06/07 20:47:25 tron Exp $ - ---- src/pixmaps.c.orig Tue Jun 25 23:53:50 1996 -+++ src/pixmaps.c Mon Jun 7 22:34:53 1999 -@@ -685,6 +685,12 @@ - bshift = highbit(theVisual->blue_mask) - 7; - bmap_order = BitmapBitOrder(XtDisplay(wid)); - -+ newimage = XCreateImage(XtDisplay(wid), -+ DefaultVisual(XtDisplay(wid), -+ DefaultScreen(XtDisplay(wid))), -+ depth, ZPixmap, 0, (char *)bit_data, -+ width, height, 8, 0); -+ - bitp = bit_data; - datap = data; - for (w = size; w > 0; w--) -@@ -698,7 +704,10 @@ - - if (bmap_order == MSBFirst) - { -- *bitp++ = (unsigned char)((c >> 24) & 0xff); -+ if (newimage->bits_per_pixel == 32) -+ { -+ *bitp++ = (unsigned char)((c >> 24) & 0xff); -+ } - *bitp++ = (unsigned char)((c >> 16) & 0xff); - *bitp++ = (unsigned char)((c >> 8) & 0xff); - *bitp++ = (unsigned char)(c & 0xff); -@@ -708,15 +717,13 @@ - *bitp++ = (unsigned char)(c & 0xff); - *bitp++ = (unsigned char)((c >> 8) & 0xff); - *bitp++ = (unsigned char)((c >> 16) & 0xff); -- *bitp++ = (unsigned char)((c >> 24) & 0xff); -+ if (newimage->bits_per_pixel == 32) -+ { -+ *bitp++ = (unsigned char)((c >> 24) & 0xff); -+ } - } - } - -- newimage = XCreateImage(XtDisplay(wid), -- DefaultVisual(XtDisplay(wid), -- DefaultScreen(XtDisplay(wid))), -- depth, ZPixmap, 0, (char *)bit_data, -- width, height, 32, 0); - break; - default: - newimage = NULL; diff --git a/www/Mosaic/patches/patch-ap b/www/Mosaic/patches/patch-ap deleted file mode 100644 index 63ed3e3d65f..00000000000 --- a/www/Mosaic/patches/patch-ap +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ap,v 1.1 1999/06/07 21:40:20 tron Exp $ - ---- src/mosaic.h.orig Fri Jun 28 06:23:54 1996 -+++ src/mosaic.h Mon Jun 7 23:02:35 1999 -@@ -170,14 +170,14 @@ - - #ifndef DOCUMENTS_MENU_SPECFILE - #define DOCUMENTS_MENU_SPECFILE \ -- "/usr/local/lib/mosaic/documents.menu" -+ PREFIX "/share/mosaic/documents.menu" - #endif /* not DOCUMENTS_MENU_SPECFILE */ - - #ifndef GLOBAL_EXTENSION_MAP --#define GLOBAL_EXTENSION_MAP "/usr/local/lib/mosaic/mime.types" -+#define GLOBAL_EXTENSION_MAP PREFIX "/lib/mosaic/mime.types" - #endif - #ifndef GLOBAL_TYPE_MAP --#define GLOBAL_TYPE_MAP "/usr/local/lib/mosaic/mailcap" -+#define GLOBAL_TYPE_MAP PREFIX "/lib/mosaic/mailcap" - #endif - - diff --git a/www/Mosaic/patches/patch-aq b/www/Mosaic/patches/patch-aq deleted file mode 100644 index 22d431b3f61..00000000000 --- a/www/Mosaic/patches/patch-aq +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-aq,v 1.1 1999/06/07 21:40:21 tron Exp $ - ---- src/xresources.h.orig Mon Jun 7 22:56:02 1999 -+++ src/xresources.h Mon Jun 7 23:04:36 1999 -@@ -263,7 +263,7 @@ - - { "documentsMenuSpecfile", "DocumentsMenuSpecfile", XtRString, sizeof (char *), - offset (documents_menu_specfile), XtRString, -- "/usr/local/lib/mosaic/documents.menu" }, -+ PREFIX "/share/mosaic/documents.menu" }, - - { "reloadReloadsImages", "ReloadReloadsImages", XtRBoolean, sizeof (Boolean), - offset (reload_reloads_images), XtRString, "False" }, -@@ -477,11 +477,11 @@ - - { "proxySpecfile", "ProxySpecfile", XtRString, sizeof (char *), - offset (proxy_specfile), XtRString, -- "/usr/local/lib/mosaic/proxy" }, -+ PREFIX "/share/mosaic/proxy" }, - - { "noproxySpecfile", "NoproxySpecfile", XtRString, sizeof (char *), - offset (noproxy_specfile), XtRString, -- "/usr/local/lib/mosaic/no_proxy" }, -+ PREFIX "/share/mosaic/no_proxy" }, - - { "useScreenGamma", "UseScreenGamma", XtRBoolean, sizeof (Boolean), - offset (useScreenGamma), XtRString, "False" }, diff --git a/www/Mosaic/patches/patch-ar b/www/Mosaic/patches/patch-ar deleted file mode 100644 index bf229763c94..00000000000 --- a/www/Mosaic/patches/patch-ar +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ar,v 1.1 1999/06/07 21:40:21 tron Exp $ - ---- libwww2/HTNews.c.orig Thu Jun 27 02:22:42 1996 -+++ libwww2/HTNews.c Mon Jun 7 23:05:58 1999 -@@ -38,7 +38,7 @@ - #define DEFAULT_NEWS_HOST "news" - #endif - #ifndef SERVER_FILE --#define SERVER_FILE "/usr/local/lib/rn/server" -+#define SERVER_FILE PREFIX "/etc/nntp/domainname" - #endif - - #define FAST_THRESHOLD 100 /* Above this, read IDs fast */ diff --git a/www/Mosaic/patches/patch-as b/www/Mosaic/patches/patch-as deleted file mode 100644 index b8d07d6ed2a..00000000000 --- a/www/Mosaic/patches/patch-as +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-as,v 1.1 2004/05/03 23:30:00 wiz Exp $ - ---- libhtmlw/HTML-PSformat.c.orig 1996-06-27 01:36:53.000000000 +0200 -+++ libhtmlw/HTML-PSformat.c -@@ -59,9 +59,9 @@ - * - */ - #include "../config.h" --#include - - #include -+#include - #include - #include - #include -@@ -229,9 +229,7 @@ GetDpi(HTMLWidget hw) - * - */ - static int --PSprintf(format, va_alist) -- char* format; -- va_dcl -+PSprintf(char *format, ...) - { - int len; - char *s; -@@ -251,7 +249,7 @@ PSprintf(format, va_alist) - } - PS_string = s; - } -- va_start(args); -+ va_start(args, format); - len = vsprintf(PS_string+PS_len, format, args); - /* this is a hack to make it work on systems were vsprintf(s,...) - * returns s, instead of the len. diff --git a/www/arena/DESCR b/www/arena/DESCR deleted file mode 100644 index 2d82d3e3629..00000000000 --- a/www/arena/DESCR +++ /dev/null @@ -1,12 +0,0 @@ -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/Makefile b/www/arena/Makefile deleted file mode 100644 index 1ab24b11189..00000000000 --- a/www/arena/Makefile +++ /dev/null @@ -1,71 +0,0 @@ -# $NetBSD: Makefile,v 1.54 2004/04/25 05:54:15 snj Exp $ - -DISTNAME= arena-0.3.62 -PKGREVISION= 4 -CATEGORIES= www -MASTER_SITES= ftp://ftp.yggdrasil.com/pub/dist/web/arena/ - -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.yggdrasil.com/Products/Arena/ -COMMENT= Experimental HTML 3 browser, supports math and style sheets - -WRKSRC= ${WRKDIR}/Arena-0.3.62 -BUILD_USES_MSGFMT= YES -GNU_CONFIGURE= YES -USE_BUILDLINK3= YES -USE_GNU_TOOLS+= make -USE_PKGLOCALEDIR= YES -USE_X11= YES - -# Comment out the following to build in the debugging symbols. -CONFIGURE_ARGS+= --without-debug - -CONFIGURE_ARGS+= --with-arenarc-dir=${LOCALBASE}/etc -CONFIGURE_ARGS+= --with-libwww-config-h-dir=${WRKDIR} -CONFIGURE_ARGS+= --with-libwww-include=${BUILDLINK_PREFIX.libwww}/include/w3c-libwww -CONFIGURE_ARGS+= --with-libwww-libdir=${BUILDLINK_PREFIX.libwww}/lib - -MAKEFILE= makefile - -# Arena requires libwww's "config.h" header - it is installed as "wwwconf.h", -# so make a symlink in ${WRKSRC} -pre-configure: - for c in ${LOCALBASE}/include/w3c-libwww/wwwconf.h ${LOCALBASE}/include/wwwconf.h; do \ - if [ -f $$c ]; then \ - ${LN} -sf $$c ${WRKSRC}/config.h; \ - fi; \ - done - -do-install: - ${INSTALL_PROGRAM} \ - ${WRKSRC}/Arena/${MACHINE_GNU_PLATFORM:C/.*-.*-//}/arena \ - ${PREFIX}/bin/ - ${INSTALL_DATA} ${WRKSRC}/Arena/Source/arenarc ${PREFIX}/share/examples/ - if [ ! -f ${LOCALBASE}/etc/arenarc ]; then \ - ${CP} ${PREFIX}/share/examples/arenarc ${LOCALBASE}/etc/; \ - fi - ${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 "../../devel/gettext-lib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" -.include "../../graphics/xpm/buildlink3.mk" -.include "../../www/libwww/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/www/arena/PLIST b/www/arena/PLIST deleted file mode 100644 index 2e89e32bea1..00000000000 --- a/www/arena/PLIST +++ /dev/null @@ -1,6 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2003/04/27 14:57:56 cjep Exp $ -bin/arena -share/examples/arenarc -@exec if [ ! -f ${LOCALBASE}/etc/arenarc ]; then cp %D/share/examples/arenarc ${LOCALBASE}/etc/; fi -man/man1/arena.1 -${PKGLOCALEDIR}/locale/en/LC_MESSAGES/Arena.gmo diff --git a/www/arena/distinfo b/www/arena/distinfo deleted file mode 100644 index 9575f683d1c..00000000000 --- a/www/arena/distinfo +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: distinfo,v 1.3 2002/10/21 13:27:24 wiz Exp $ - -SHA1 (arena-0.3.62.tar.gz) = 21a28049c519630f7a2c0a759568316102f07410 -Size (arena-0.3.62.tar.gz) = 1277043 bytes -SHA1 (patch-aa) = 43382f6bf4444bbbdae50d0d204fadf3ca392292 -SHA1 (patch-ab) = 48eef083cdaf34b3570986efc61e577cbf392b1f -SHA1 (patch-ac) = 7a5fa61c05725af16be886a4da6faab394253fd2 -SHA1 (patch-ad) = 39e04521500752798c452c60c7aa66c603438414 -SHA1 (patch-ae) = 48969e4e577902369801a419165bc6cc36c6f094 -SHA1 (patch-af) = 77a7c46de8cd7c15eced442fa44081163920dd00 -SHA1 (patch-ag) = 8d9b6181ca38c37c60124ddece89c26a64fe1737 -SHA1 (patch-ah) = 1e7907dc79a394f3f3adf138d0721a8fb67c8d66 -SHA1 (patch-ai) = 8e943f47afd8dbd268e34e52e854f8028ec028c5 -SHA1 (patch-aj) = 6c4f011abfb08d5e0b84aa8dbc3d4d3941eb81c1 -SHA1 (patch-ak) = eac8655c6e5e594c869f0d18e2bcb2f30ea19a45 diff --git a/www/arena/patches/patch-aa b/www/arena/patches/patch-aa deleted file mode 100644 index 99ba45b7732..00000000000 --- a/www/arena/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aa,v 1.3 1998/08/07 11:14:22 agc Exp $ - ---- 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 - #include - #include --#include - - #include "arena.h" - #ifdef ARENA_DEBUG diff --git a/www/arena/patches/patch-ab b/www/arena/patches/patch-ab deleted file mode 100644 index 0dde5804cf1..00000000000 --- a/www/arena/patches/patch-ab +++ /dev/null @@ -1,72 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2000/02/06 03:49:49 fredb Exp $ - ---- configure.in.orig Wed Nov 25 05:20:37 1998 -+++ configure.in Sun Oct 31 00:59:09 1999 -@@ -333,13 +333,13 @@ - ) - AC_ARG_WITH(libwww_libdir, - [ --with-libwww-libdir=DIR -- Specify directory where the libwww.a resides.], -+ Specify directory where the libwww modules reside.], - [ - if test "${with_libwww_libdir+set}" = "set" ; - then - if test "${with_libwww_libdir}" = "no" ; - then -- AC_MSG_WARN(Without libwww.a library? =O) -+ AC_MSG_WARN(Without libwww modules? =O) - else - libwww_library_dir="${with_libwww_libdir}" - if test -d ${libwww_library_dir} ; -@@ -395,7 +395,7 @@ - ] - ) - --libwww="libwww" -+libwww="libwwwinit" - - # - if test "${libwww_include+set}" = "set" && \ -@@ -474,7 +474,7 @@ - fi - fi - # -- libwww_dep="$libwww" -+ libwww_dep="$libwwwinit" - # - # Aren't all the necessary symbols already defined? - # -@@ -531,7 +531,7 @@ - # - for ac_dir in $LibWWWPATH ; - do -- if test -f ${ac_dir}/libwww.a && \ -+ if test -f ${ac_dir}/libwwwinit.a && \ - test -f ${ac_dir}/include/WWWLib.h && \ - test -f ${ac_dir}/config.h ; - then -@@ -566,7 +566,7 @@ - test -f ${ac_dir}/config.h.in ; - then - ac_dir_f="`cd $ac_dir ; $BINPWD`" -- libwww_dep="libwww" -+ libwww_dep="libwwwinit" - : ${libwww_dir:="$ac_dir_f"} - libwww_version="5" - libwww_distribution="source" -@@ -897,6 +897,15 @@ - - AC_CHECK_FUNCS(snprintf vsnprintf strerror strncpy strndup strdup strstr) - -+if test "${ac_cv_header_sys_time_h}" = "yes" ; -+ then -+ AC_CHECK_FUNCS(setitimer) -+ if test "${ac_cv_func_setitimer}" = "yes" ; -+ then -+dnl XXX Need to actually test for itimerval in sys/time.h! -+ AC_DEFINE(SETITIMER_USES_TIMEVAL) -+ fi -+fi - - # - # Check if we want to use index or strchr diff --git a/www/arena/patches/patch-ac b/www/arena/patches/patch-ac deleted file mode 100644 index f852ea6545f..00000000000 --- a/www/arena/patches/patch-ac +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ac,v 1.3 1999/10/14 07:27:13 fredb Exp $ - ---- Arena/Source/toolbar.c.orig Wed Nov 25 05:26:52 1998 -+++ Arena/Source/toolbar.c Mon Oct 4 01:47:53 1999 -@@ -1010,14 +1010,15 @@ - * and proceed if looks valid - */ - if (Printer != NULL) -+ { - argv = SpawnStringToRagged(Printer, &argc); -- -- if (Printer == NULL || argv == NULL || argc == 0) -+ if (argv == NULL || argc == 0) return; -+ } -+ else - { - Announce(_("No printer specified")); - XUndefineCursor(display, win); - XFlush(display); -- SpawnFreeRagged(&argc, &argv); - SpawnUnBlock(&PrintBlocker); - return; - } diff --git a/www/arena/patches/patch-ad b/www/arena/patches/patch-ad deleted file mode 100644 index 4c3c8ce40b9..00000000000 --- a/www/arena/patches/patch-ad +++ /dev/null @@ -1,76 +0,0 @@ -$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 deleted file mode 100644 index 7892eaf5cac..00000000000 --- a/www/arena/patches/patch-ae +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD: patch-ae,v 1.5 2000/02/10 12:05:28 fredb Exp $ - ---- arena.h.in.orig Sun Mar 8 11:35:06 1998 -+++ arena.h.in Thu Feb 10 05:20:53 2000 -@@ -62,6 +64,9 @@ - # define LIBWWW_TRACE_MASK SHOW_ALL_TRACE - #endif - -+ /* Needed to unset HTDEBUG in HTUtils.h */ -+# define NODEBUG 1 -+ - /* Persistent cache location. - * If defined as "" (i.e. null), then NO Caching will be done... - * Then the defaults will be taken from Xdefaults or ARENA_DEFAULT_CACHE_ROOT -@@ -267,9 +272,9 @@ - # define ARENA_FLYBY_HINT 1 - # define ARENA_FLYBY_TERSE 2 - # define ARENA_FLYBY_VERBOSE 3 --# define ARENA_FLYBY_HOW_MUCH ARENA_FLYBY_HINT -+# define ARENA_FLYBY_HOW_MUCH ARENA_FLYBY_VERBOSE - --# define ARENA_FLYBY_TIMER_INCREMENT 2 -+# define ARENA_FLYBY_TIMER_INCREMENT 0 - #endif - - -@@ -445,6 +450,20 @@ - */ - #ifndef HAVE_STRSTR - # undef HAVE_STRSTR -+#endif -+ -+/* Define the HAVE_SETITIMER preprocessor variable, -+ * if you have setitimer(). -+ */ -+#ifndef HAVE_SETITIMER -+# undef HAVE_SETITIMER -+#endif -+ -+/* Define the SETITIMER_USES_TIMEVAL preprocessor variable, -+ * if your setitimer() uses timevals (uS resolution). -+ */ -+#ifndef SETITIMER_USES_TIMEVAL -+# undef SETITIMER_USES_TIMEVAL - #endif - - diff --git a/www/arena/patches/patch-af b/www/arena/patches/patch-af deleted file mode 100644 index fd86dfb26a4..00000000000 --- a/www/arena/patches/patch-af +++ /dev/null @@ -1,19 +0,0 @@ -$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/patches/patch-ag b/www/arena/patches/patch-ag deleted file mode 100644 index b36760e346a..00000000000 --- a/www/arena/patches/patch-ag +++ /dev/null @@ -1,123 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2000/02/06 03:49:49 fredb Exp $ - ---- Arena/Source/main.c.orig Sun Mar 8 11:22:20 1998 -+++ Arena/Source/main.c Sat Oct 30 09:42:10 1999 -@@ -80,7 +80,31 @@ - static int FlyByStoredX = -2; - static int FlyByStoredY = -2; - static int FlyByShowing = 0; -+#if defined(HAVE_SETITIMER) -+/* -+ * Actual time to activate the "fly by" roll-overs is at least twice the value -+ * set in TIMER_ON, i.e. 2*180000uS = 0.36 seconds. SET_TIMER and DISABLE_TIMER -+ * are fashioned as macros to make it easier to add code to allow for -+ * implementation differences. -+ * -+ * Enabling this completely disables the misbegotten FlyByTimerIncrement. -+ * It would not be difficult to fix it, and it could even benefit from -+ * the smaller timeval/timespec increments, but to me, it's just not worth -+ * the trouble. -+ * -+ * October 30, 1999 -- Frederick Bruckman -+ */ -+#if defined(SETITIMER_USES_TIMEVAL) -+const struct itimerval TIMER_ON = {{0, 0}, {0, 180000}}; -+#else /* assume timespec */ -+const struct itimerval TIMER_ON = {{0, 0}, {0, 180000000}}; -+#endif /* SETITIMER_USES_TIMEVAL */ -+const struct itimerval TIMER_OFF = {{0, 0}, {0, 0}}; -+#define SET_TIMER setitimer(ITIMER_REAL, &TIMER_ON, 0); -+#define DISABLE_TIMER setitimer(ITIMER_REAL, &TIMER_OFF, 0); -+#else - static int FlyByAlarm = 0; -+#endif /* HAVE_SETITIMER */ - static Window FlyByWindow; - static GC FlyByGC; - static XFontStruct *FlyByFont = NULL; -@@ -702,8 +726,12 @@ - static int Lx, Ly; - - -+#if defined(HAVE_SETITIMER) -+ DISABLE_TIMER -+#else - FlyByAlarm = 0; - alarm(FlyByAlarm); -+#endif - signal(SIGALRM, SIG_DFL); - if (FlyByHints == ARENA_FLYBY_NONE) return; - -@@ -720,7 +748,9 @@ - char *text = ToolBarFlyByText(i); - FlyByCreate(FlyByStoredX, FlyByStoredY+20, text ? text :"(null)"); - FlyByShowing = i; -+#if !defined(HAVE_SETITIMER) - FlyByData[i-1].displayed_times += FlyByTimerIncrement; -+#endif - } - else - { -@@ -728,12 +758,16 @@ - * and it's the same, we'll diplay it then! Use "last" timer - * delay... but NOT zero! - */ -- FlyByAlarm = 1; - signal(SIGALRM, ArenaSIGALRMHandler); - -+#if defined(HAVE_SETITIMER) -+ SET_TIMER -+#else -+ FlyByAlarm = 1; - if (FlyByData[i-1].displayed_times == 0) - FlyByData[i-1].displayed_times = 1; - alarm(FlyByData[i-1].displayed_times); -+#endif - } - } - } -@@ -820,8 +854,8 @@ - h = SPACING(FlyByFont) * nline; - - /* decide whether x and y are ok or need to be modified */ -- x = (x + w > display_width ? display_width - w - 1 : x); -- y = (y + h > display_height ? display_height - h - 1 : y); -+ x = (x + w > win_width ? win_width - w - 20 : x); -+ y = (y + h > win_height ? win_height - h - 20 : y); - - /* create window */ - FlyByWindow = XCreateSimpleWindow(display, win, x, y, w, h, 1, -@@ -879,6 +913,11 @@ - */ - void FlyByDestroy(void) - { -+#if defined(HAVE_SETITIMER) -+ DISABLE_TIMER -+ signal(SIGALRM, SIG_DFL); -+ FlyByStoredX = FlyByStoredY = -1; -+#else - if (FlyByAlarm != 0) - { - FlyByAlarm = 0; -@@ -886,6 +926,7 @@ - FlyByStoredX = FlyByStoredY = -1; - signal(SIGALRM, SIG_DFL); - } -+#endif - - if (FlyByShowing) - { -@@ -1286,9 +1326,13 @@ - int i = ToolBarWhichButton(FlyByStoredX, FlyByStoredY); - if (i > 0) - { -- FlyByAlarm = 1; - signal(SIGALRM, ArenaSIGALRMHandler); -+#if defined(HAVE_SETITIMER) -+ SET_TIMER -+#else -+ FlyByAlarm = 1; - alarm(FlyByAlarm); -+#endif - } - } - } diff --git a/www/arena/patches/patch-ah b/www/arena/patches/patch-ah deleted file mode 100644 index 82f0b364c95..00000000000 --- a/www/arena/patches/patch-ah +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2000/02/09 01:01:21 fredb Exp $ - ---- Arena/Source/image.c.orig Tue Mar 3 14:27:02 1998 -+++ Arena/Source/image.c Tue Feb 8 16:55:47 2000 -@@ -969,8 +969,8 @@ - - GetColour(r, g, b, &ulp); - -- *p++ = ((char*)&ulp)[0]; /* LSB first! */ -- *p++ = ((char*)&ulp)[1]; -+ *p++ = (ulp ) & 0xFF; /* LSB first! */ -+ *p++ = (ulp >> 8) & 0xFF; - } - } - diff --git a/www/arena/patches/patch-ai b/www/arena/patches/patch-ai deleted file mode 100644 index d3946c7bf07..00000000000 --- a/www/arena/patches/patch-ai +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2000/02/09 01:01:22 fredb Exp $ - ---- Arena/Source/gif.c.orig Sun Feb 15 10:09:16 1998 -+++ Arena/Source/gif.c Tue Feb 8 18:31:08 2000 -@@ -1121,8 +1121,8 @@ - - if (bpp == 2) - { -- *pp++ = ((char*)&ulp)[0]; /* LSB first! */ -- *pp++ = ((char*)&ulp)[1]; -+ *pp++ = (ulp ) & 0xff; /* LSB first! */ -+ *pp++ = (ulp >> 8) & 0xff; - } - else - { diff --git a/www/arena/patches/patch-aj b/www/arena/patches/patch-aj deleted file mode 100644 index e19d55da02a..00000000000 --- a/www/arena/patches/patch-aj +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2000/02/09 01:01:22 fredb Exp $ - ---- Arena/Source/jpeg.c.orig Thu Feb 19 09:57:26 1998 -+++ Arena/Source/jpeg.c Tue Feb 8 18:33:17 2000 -@@ -531,8 +531,8 @@ - case 1: - cr = cg = cb = scan_buffer[xpos]; - GetColour(cr, cg, cb, &ulp); -- *dp++ = ((char*)&ulp)[0]; /* LSB first! */ -- *dp++ = ((char*)&ulp)[1]; -+ *dp++ = (ulp ) & 0xFF; /* LSB first! */ -+ *dp++ = (ulp >> 8) & 0xFF; - break; - - case 3: -@@ -540,8 +540,8 @@ - cg = scan_buffer[1+(xpos * 3)]; - cb = scan_buffer[2+(xpos * 3)]; - GetColour(cr, cg, cb, &ulp); -- *dp++ = ((char*)&ulp)[0]; /* LSB first! */ -- *dp++ = ((char*)&ulp)[1]; -+ *dp++ = (ulp ) & 0xFF; /* LSB first! */ -+ *dp++ = (ulp >> 8) & 0xFF; - break; - - default: diff --git a/www/arena/patches/patch-ak b/www/arena/patches/patch-ak deleted file mode 100644 index 6eb98cb9473..00000000000 --- a/www/arena/patches/patch-ak +++ /dev/null @@ -1,190 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2002/10/21 13:27:25 wiz Exp $ - ---- configure.orig Wed Nov 25 12:21:07 1998 -+++ configure -@@ -19,7 +19,7 @@ ac_help="$ac_help - --with-libwww=DIR Specify path to W3C Reference Library distribution." - ac_help="$ac_help - --with-libwww-libdir=DIR -- Specify directory where the libwww.a resides." -+ Specify directory where the libwww modules reside." - ac_help="$ac_help - --with-libwww-include=DIR - Specify the libwww header files location." -@@ -740,6 +745,40 @@ else - echo "$ac_t""no" 1>&6 - fi - -+ if test -z "$CC"; then -+ case "`uname -s`" in -+ *win32* | *WIN32*) -+ # Extract the first word of "cl", so it can be a program name with args. -+set dummy cl; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:755: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_CC="cl" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+CC="$ac_cv_prog_CC" -+if test -n "$CC"; then -+ echo "$ac_t""$CC" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ ;; -+ esac -+ fi - test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } - fi - -@@ -2560,7 +2654,7 @@ if test "${with_libwww_libdir+set}" = se - then - if test "${with_libwww_libdir}" = "no" ; - then -- echo "configure: warning: Without libwww.a library? =O" 1>&2 -+ echo "configure: warning: Without libwww modules? =O" 1>&2 - else - libwww_library_dir="${with_libwww_libdir}" - if test -d ${libwww_library_dir} ; -@@ -2622,7 +2716,7 @@ if test "${with_libwww_config_h_dir+set} - fi - - --libwww="libwww" -+libwww="libwwwinit" - - # - if test "${libwww_include+set}" = "set" && \ -@@ -2742,7 +2836,7 @@ if test "${libwww_standard}" = "no" ; - fi - fi - # -- libwww_dep="$libwww" -+ libwww_dep="$libwwwinit" - # - # Aren't all the necessary symbols already defined? - # -@@ -2800,7 +2894,7 @@ echo "configure:2766: checking for W3C R - # - for ac_dir in $LibWWWPATH ; - do -- if test -f ${ac_dir}/libwww.a && \ -+ if test -f ${ac_dir}/libwwwinit.a && \ - test -f ${ac_dir}/include/WWWLib.h && \ - test -f ${ac_dir}/config.h ; - then -@@ -2835,7 +2929,7 @@ echo "configure:2766: checking for W3C R - test -f ${ac_dir}/config.h.in ; - then - ac_dir_f="`cd $ac_dir ; $BINPWD`" -- libwww_dep="libwww" -+ libwww_dep="libwwwinit" - : ${libwww_dir:="$ac_dir_f"} - libwww_version="5" - libwww_distribution="source" -@@ -2994,7 +3088,7 @@ else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- ARENA_cv_VERSION_LibWWW_version_is_501=yes -+ ARENA_cv_VERSION_LibWWW_version_is_501=no - fi - rm -f conftest* - echo "$ac_t""$ARENA_cv_VERSION_LibWWW_version_is_501" 1>&6 -@@ -4736,7 +4830,65 @@ fi - for ac_func in snprintf vsnprintf strerror strncpy strndup strdup strstr - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:4740: checking for $ac_func" >&5 -+echo "configure:4834: checking for $ac_func" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:4862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.h <&6 -+fi -+done -+ -+ -+if test "${ac_cv_header_sys_time_h}" = "yes" ; -+ then -+ for ac_func in setitimer -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:4892: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4788,7 +4940,14 @@ else - fi - done - -+ if test "${ac_cv_func_setitimer}" = "yes" ; -+ then -+ cat >> confdefs.h <<\EOF -+#define SETITIMER_USES_TIMEVAL 1 -+EOF - -+ fi -+fi - - # - # Check if we want to use index or strchr -- cgit v1.2.3