Index: urt/Makefile =================================================================== --- urt/Makefile (revision 436707) +++ urt/Makefile (working copy) @@ -3,25 +3,22 @@ PORTNAME= urt PORTVERSION= 3.1b1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics -MASTER_SITES= ftp://ftp.iastate.edu/pub/utah-raster/ -DISTNAME= urt -DISTFILES= urt-3.1b.tar.Z urt-doc.tar.Z urt-img.tar.Z +MASTER_SITES= http://BSDforge.com/projects/source/graphics/utah-raster/ +EXTRACT_SUFX= .tar.xz -PATCH_SITES= http://www.funet.fi/pub/graphics/packages/urt/rel2/ -PATCHFILES= urt-3.1b-3.1b1.patch -PATCH_DIST_STRIP=-p1 - -MAINTAINER= ports@FreeBSD.org +MAINTAINER= portmaster@bsdforge.com COMMENT= Toolkit and library for raster image processing -LIB_DEPENDS= libnetpbm.so:graphics/netpbm +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/copyright -BROKEN= unfetchable -DEPRECATED= mastersite disappeared, last release 1996 -EXPIRATION_DATE= 2016-12-31 +LIB_DEPENDS= libnetpbm.so:graphics/netpbm \ + libtiff.so:graphics/tiff +USES= tar:xz + OPTIONS_DEFINE= DOCS EXAMPLES NO_WRKSUBDIR= yes Index: urt/distinfo =================================================================== --- urt/distinfo (revision 436707) +++ urt/distinfo (working copy) @@ -1,8 +1,3 @@ -SHA256 (urt-3.1b.tar.Z) = 6d8b67f03507818ebdca3a342c96454780cc5eadcc58ac2713cbcdfdb61a6b41 -SIZE (urt-3.1b.tar.Z) = 1016405 -SHA256 (urt-doc.tar.Z) = 5cd7c26af15a54df9b206f0c99651d4f7b507083dcdc36cda37882a46a87b0c3 -SIZE (urt-doc.tar.Z) = 491431 -SHA256 (urt-img.tar.Z) = 52e7c474ab7d1381ce989bfed17b7c3809ddfafd47df569fe341fd17952b2b81 -SIZE (urt-img.tar.Z) = 1740307 -SHA256 (urt-3.1b-3.1b1.patch) = 726af8be834d3813a757bf0f0e2f00c958745c3be6d490f54da5ddd15855e112 -SIZE (urt-3.1b-3.1b1.patch) = 18264 +TIMESTAMP = 1490200727 +SHA256 (urt-3.1b1.tar.xz) = 95fd70febb467faba1570504d17cf0dc2bf9bca79bc41cb0c1549a8af1f0a0c2 +SIZE (urt-3.1b1.tar.xz) = 2088344 Index: urt/files/patch-cnv-rlatorle.c =================================================================== --- urt/files/patch-cnv-rlatorle.c (revision 436707) +++ urt/files/patch-cnv-rlatorle.c (nonexistent) @@ -1,11 +0,0 @@ ---- cnv/rlatorle.c.orig Thu Nov 29 22:14:43 2007 -+++ cnv/rlatorle.c Thu Nov 29 22:15:43 2007 -@@ -162,7 +162,7 @@ - } - VPRINTF(stderr, "Channel color space %s\n", head.rla_head.chan); - if ( rlb_flag ) -- VPRINTF(stderr, "Interlaced? %s\n", head.rlb_head.filter_type); -+ VPRINTF(stderr, "Interlaced? %hd\n", head.rlb_head.filter_type); - else - VPRINTF(stderr, "Interlaced? %s\n", "-unused-"); - if (do_matte) Index: urt/files/patch-cnv__aliastorle.c =================================================================== --- urt/files/patch-cnv__aliastorle.c (revision 436707) +++ urt/files/patch-cnv__aliastorle.c (nonexistent) @@ -1,11 +0,0 @@ ---- cnv/aliastorle.c.orig 1992-04-30 05:01:13.000000000 +0900 -+++ cnv/aliastorle.c 2012-10-15 22:22:54.000000000 +0900 -@@ -117,7 +117,7 @@ - * [None] - */ - --void -+int - main( argc, argv ) - int argc; - char **argv; Index: urt/files/patch-cnv__cubitorle.c =================================================================== --- urt/files/patch-cnv__cubitorle.c (revision 436707) +++ urt/files/patch-cnv__cubitorle.c (nonexistent) @@ -1,11 +0,0 @@ ---- cnv/cubitorle.c.orig 1992-01-29 02:51:35.000000000 +0900 -+++ cnv/cubitorle.c 2012-10-15 22:27:30.000000000 +0900 -@@ -31,7 +31,7 @@ - - void read_cubi_hdr(), read_cubi_row(), read_cubi_chan(), bit_read(); - --void -+int - main(argc, argv) - int argc; - char *argv[]; Index: urt/files/patch-cnv__gif2rle.c =================================================================== --- urt/files/patch-cnv__gif2rle.c (revision 436707) +++ urt/files/patch-cnv__gif2rle.c (nonexistent) @@ -1,49 +0,0 @@ ---- cnv/giftorle.c.orig 1993-10-18 22:59:37.000000000 +0900 -+++ cnv/giftorle.c 2012-10-16 00:54:53.000000000 +0900 -@@ -22,6 +22,10 @@ - /* +------------------------------------------------------------------+ */ - - #include -+#include -+#include -+#include -+ - #include "rle.h" - - #ifndef lint -@@ -69,7 +73,7 @@ - - static int output_colormap = FALSE; - --void -+int - main(argc,argv) - int argc; - char **argv; -@@ -96,7 +100,7 @@ - - while ( nfname-- > 0 ) - (void)ReadGIF( *infname++ ); -- exit( 0 ); -+ return( 0 ); - } - - int -@@ -203,7 +207,7 @@ - EasyFail("EOF in extention\n",TRUE); - if (c == 0) - return FALSE; -- if (read(fd,buf,(int) c)!=(int) c) -+ if (read(fileno(fd),buf,(int) c)!=(int) c) - EasyFail("EOF in extention\n",TRUE); - } - } -@@ -278,7 +282,7 @@ - max_code_size = 2*clear_code; - max_code = clear_code+2; - -- GetCode(fd,NULL,TRUE); -+ GetCode(fd,0,TRUE); - - fresh=TRUE; - Index: urt/files/patch-cnv__graytorle.c =================================================================== --- urt/files/patch-cnv__graytorle.c (revision 436707) +++ urt/files/patch-cnv__graytorle.c (nonexistent) @@ -1,11 +0,0 @@ ---- cnv/graytorle.c.orig 1993-04-21 23:42:40.000000000 +0900 -+++ cnv/graytorle.c 2012-10-15 22:31:19.000000000 +0900 -@@ -39,7 +39,7 @@ - * -a Uses first input file as alpha channel. - */ - --void -+int - main(argc, argv) - int argc; - char *argv[]; Index: urt/files/patch-cnv__painttorle.c =================================================================== --- urt/files/patch-cnv__painttorle.c (revision 436707) +++ urt/files/patch-cnv__painttorle.c (nonexistent) @@ -1,11 +0,0 @@ ---- cnv/painttorle.c.orig 1992-01-17 06:44:02.000000000 +0900 -+++ cnv/painttorle.c 2012-10-15 22:40:22.000000000 +0900 -@@ -46,7 +46,7 @@ - - void init(), read_scan(), write_scan(); - --void -+int - main(argc,argv) - int argc; - char *argv[]; Index: urt/files/patch-cnv__pgmtorle.c =================================================================== --- urt/files/patch-cnv__pgmtorle.c (revision 436707) +++ urt/files/patch-cnv__pgmtorle.c (nonexistent) @@ -1,10 +0,0 @@ ---- cnv/pgmtorle.c.orig 1992-04-30 22:57:30.000000000 +0900 -+++ cnv/pgmtorle.c 2012-10-16 00:55:59.000000000 +0900 -@@ -35,6 +35,7 @@ - * System includes. - */ - #include -+#include - #include - #undef abs /* Screws up stdlib.h. */ - #define NO_DECLARE_MALLOC Index: urt/files/patch-cnv__ppmtorle.c =================================================================== --- urt/files/patch-cnv__ppmtorle.c (revision 436707) +++ urt/files/patch-cnv__ppmtorle.c (nonexistent) @@ -1,10 +0,0 @@ ---- cnv/ppmtorle.c.orig 1992-03-05 04:29:44.000000000 +0900 -+++ cnv/ppmtorle.c 2012-10-16 01:05:15.000000000 +0900 -@@ -37,6 +37,7 @@ - #define NO_DECLARE_MALLOC /* ppm.h does it */ - #include "rle.h" - #include -+#include - #include - - #define VPRINTF if (verbose || header) fprintf Index: urt/files/patch-cnv__rastorle.c =================================================================== --- urt/files/patch-cnv__rastorle.c (revision 436707) +++ urt/files/patch-cnv__rastorle.c (nonexistent) @@ -1,11 +0,0 @@ ---- cnv/rastorle.c.orig 1992-04-30 22:58:02.000000000 +0900 -+++ cnv/rastorle.c 2012-10-16 00:16:45.000000000 +0900 -@@ -72,7 +72,7 @@ - green[CMAPSIZE], /* Green ditto */ - blue[CMAPSIZE]; /* see a pattern? */ - --void -+int - main(argc, argv) - int argc; - char *argv[]; Index: urt/files/patch-cnv__rawtorle.c =================================================================== --- urt/files/patch-cnv__rawtorle.c (revision 436707) +++ urt/files/patch-cnv__rawtorle.c (nonexistent) @@ -1,11 +0,0 @@ ---- cnv/rawtorle.c.orig 1992-03-24 12:53:43.000000000 +0900 -+++ cnv/rawtorle.c 2012-10-16 00:15:58.000000000 +0900 -@@ -66,7 +66,7 @@ - }\ - } - --void -+int - main(argc,argv) - int argc; - char *argv[]; Index: urt/files/patch-cnv__rlesplice.c =================================================================== --- urt/files/patch-cnv__rlesplice.c (revision 436707) +++ urt/files/patch-cnv__rlesplice.c (nonexistent) @@ -1,19 +0,0 @@ ---- cnv/rletoascii.c.orig 1992-01-21 02:29:09.000000000 +0900 -+++ cnv/rletoascii.c 2012-10-16 00:21:43.000000000 +0900 -@@ -21,6 +21,7 @@ - */ - - #include -+#include - #include "rle.h" - - typedef FILE *FILPTR; -@@ -59,7 +60,7 @@ - */ - static char default_asciistr[] = "@BR*#$PX0woIcv:+!~\"., "; - --void -+int - main(argc, argv) - int argc; - char *argv[]; Index: urt/files/patch-cnv__rletoabA60.c =================================================================== --- urt/files/patch-cnv__rletoabA60.c (revision 436707) +++ urt/files/patch-cnv__rletoabA60.c (nonexistent) @@ -1,11 +0,0 @@ ---- cnv/rletoabA60.c.orig 1992-01-29 02:54:36.000000000 +0900 -+++ cnv/rletoabA60.c 2012-10-13 07:03:23.000000000 +0900 -@@ -52,7 +52,7 @@ - rle_pixel scanblu[FRAME_LENGTH][LINE_LENGTH]; - rle_pixel scangrn[FRAME_LENGTH][LINE_LENGTH]; - --void -+int - main(argc,argv) - int argc; - char **argv; Index: urt/files/patch-cnv__rletoabA62__rletoabA62.c =================================================================== --- urt/files/patch-cnv__rletoabA62__rletoabA62.c (revision 436707) +++ urt/files/patch-cnv__rletoabA62__rletoabA62.c (nonexistent) @@ -1,22 +0,0 @@ ---- cnv/rletoabA62/rletoabA62.c.orig 1992-04-30 23:15:19.000000000 +0900 -+++ cnv/rletoabA62/rletoabA62.c 2012-10-16 00:25:35.000000000 +0900 -@@ -42,6 +42,10 @@ - */ - - #include -+#include -+#include -+#include -+#include - - #ifndef TRUE - #define TRUE 1 -@@ -101,7 +105,7 @@ - * Main entry... - */ - --void -+int - main(argc,argv) - int argc; - char **argv; Index: urt/files/patch-cnv__rletoalias.c =================================================================== --- urt/files/patch-cnv__rletoalias.c (revision 436707) +++ urt/files/patch-cnv__rletoalias.c (nonexistent) @@ -1,11 +0,0 @@ ---- cnv/rletoalias.c.orig 1992-04-30 22:58:47.000000000 +0900 -+++ cnv/rletoalias.c 2012-10-13 07:07:29.000000000 +0900 -@@ -108,7 +108,7 @@ - * [None] - */ - --void -+int - main( argc, argv ) - int argc; - char **argv; Index: urt/files/patch-cnv__rletocgm.c =================================================================== --- urt/files/patch-cnv__rletocgm.c (revision 436707) +++ urt/files/patch-cnv__rletocgm.c (nonexistent) @@ -1,10 +0,0 @@ ---- cnv/rletocgm.c.orig 1992-04-30 22:59:08.000000000 +0900 -+++ cnv/rletocgm.c 2012-10-16 00:17:32.000000000 +0900 -@@ -449,6 +449,7 @@ - * Repeatedly read from the input until the file EOF or an - * error is encountered. - */ -+int - main( argc, argv ) - int argc; - char **argv; Index: urt/files/patch-cnv__rletogif__rletogif.c =================================================================== --- urt/files/patch-cnv__rletogif__rletogif.c (revision 436707) +++ urt/files/patch-cnv__rletogif__rletogif.c (nonexistent) @@ -1,19 +0,0 @@ ---- cnv/rletogif/rletogif.c.orig 1992-04-30 23:15:57.000000000 +0900 -+++ cnv/rletogif/rletogif.c 2012-10-16 00:28:02.000000000 +0900 -@@ -29,6 +29,7 @@ - */ - - #include -+#include - #include "rle.h" - #include "rletogif.h" - -@@ -44,7 +45,7 @@ - int get_color_bits(); - void GIFEncode(); - --void -+int - main(argc, argv) - int argc; - char *argv[]; Index: urt/files/patch-cnv__rletogray.c =================================================================== --- urt/files/patch-cnv__rletogray.c (revision 436707) +++ urt/files/patch-cnv__rletogray.c (nonexistent) @@ -1,19 +0,0 @@ ---- cnv/rletogray.c.orig 1992-04-30 22:59:30.000000000 +0900 -+++ cnv/rletogray.c 2012-10-15 22:37:09.000000000 +0900 -@@ -30,6 +30,7 @@ - */ - - #include -+#include - #include "rle.h" - - typedef FILE *FILPTR; -@@ -41,7 +42,7 @@ - * infile File to split. If none, uses stdin. - */ - --void -+int - main(argc, argv) - int argc; - char *argv[]; Index: urt/files/patch-cnv__rletoiris.c =================================================================== --- urt/files/patch-cnv__rletoiris.c (revision 436707) +++ urt/files/patch-cnv__rletoiris.c (nonexistent) @@ -1,10 +0,0 @@ ---- cnv/rletoiris.c.orig 1992-04-30 22:59:53.000000000 +0900 -+++ cnv/rletoiris.c 2012-10-16 00:19:07.000000000 +0900 -@@ -32,6 +32,7 @@ - - rle_hdr hdr; - -+int - main(argc,argv) - int argc; - char *argv[]; Index: urt/files/patch-cnv__rletopaint.c =================================================================== --- urt/files/patch-cnv__rletopaint.c (revision 436707) +++ urt/files/patch-cnv__rletopaint.c (nonexistent) @@ -1,11 +0,0 @@ ---- cnv/rletopaint.c.orig 1992-05-22 00:11:41.000000000 +0900 -+++ cnv/rletopaint.c 2012-10-15 22:42:40.000000000 +0900 -@@ -74,7 +74,7 @@ - int compress_line(); - void write_paint_line(), bytes_to_bits(); - --void -+int - main(argc, argv) - int argc; - char *argv[]; Index: urt/files/patch-cnv__rletops.c =================================================================== --- urt/files/patch-cnv__rletops.c (revision 436707) +++ urt/files/patch-cnv__rletops.c (nonexistent) @@ -1,39 +0,0 @@ ---- cnv/rletops.c.orig 1992-01-21 03:04:10.000000000 +0900 -+++ cnv/rletops.c 2012-10-15 22:45:15.000000000 +0900 -@@ -58,7 +58,7 @@ - - static int gencps = 0; /* generate color PostScript? */ - --void -+int - main( argc, argv ) - int argc; - char **argv; -@@ -74,7 +74,7 @@ - float heightinch = 3.0, - center = 3.25, - aspect = 1.0; -- int y, nrow, nscan, i, pix, dummy; -+ int nrow, nscan, i, pix, dummy; - float x1, y1, x2, y2, widthinch; - unsigned char ** scan; - unsigned char * buffer; -@@ -154,8 +154,7 @@ - y2 = y1 + heightinch; - prologue(outfile,sflag,nscan,nrow,x1,y1,x2,y2); - -- while ( (y = rle_getrow( &hdr, scan )) <= -- hdr.ymax ) -+ while ( ( rle_getrow( &hdr, scan )) <= hdr.ymax ) - { - if (gencps) { - /* generate a color line */ -@@ -231,7 +230,7 @@ - FILE *outfile; - unsigned char p; - { -- static npixo = 0; -+ static int npixo = 0; - static char tohex[] = "0123456789ABCDEF"; - - putc(tohex[(p>>4)&0xF],outfile); Index: urt/files/patch-cnv__rletorast.c =================================================================== --- urt/files/patch-cnv__rletorast.c (revision 436707) +++ urt/files/patch-cnv__rletorast.c (nonexistent) @@ -1,11 +0,0 @@ ---- cnv/rletorast.c.orig 1992-01-21 03:11:32.000000000 +0900 -+++ cnv/rletorast.c 2012-10-16 00:15:02.000000000 +0900 -@@ -41,7 +41,7 @@ - - typedef enum { GREY, GREY_ALPHA, COLOR, COLOR_ALPHA } Input_Type ; - --void -+int - main( argc, argv ) - int argc; - char **argv; Index: urt/files/patch-cnv__rletoraw.c =================================================================== --- urt/files/patch-cnv__rletoraw.c (revision 436707) +++ urt/files/patch-cnv__rletoraw.c (nonexistent) @@ -1,11 +0,0 @@ ---- cnv/rletoraw.c.orig 1992-04-30 23:00:21.000000000 +0900 -+++ cnv/rletoraw.c 2012-10-16 00:14:10.000000000 +0900 -@@ -65,7 +65,7 @@ - }\ - - --void -+int - main(argc,argv) - int argc; - char *argv[]; Index: urt/files/patch-cnv__rletorla.c =================================================================== --- urt/files/patch-cnv__rletorla.c (revision 436707) +++ urt/files/patch-cnv__rletorla.c (nonexistent) @@ -1,42 +0,0 @@ ---- cnv/rletorla.c.orig 2012-10-16 00:51:43.000000000 +0900 -+++ cnv/rletorla.c 2012-10-16 01:00:52.000000000 +0900 -@@ -29,9 +29,13 @@ - * System includes. - */ - #include -+#include -+#include -+#include - #include "rlb_header.h" - #include "rle.h" - -+#if 0 - #ifdef USE_STDLIB_H - #include - #else -@@ -52,6 +56,7 @@ - extern void free(); - - #endif /* USE_STDLIB_H */ -+#endif - - #define VPRINTF if (verbose || header) fprintf - #define GRAYSCALE 001 /* 8 bits, no colormap */ -@@ -312,7 +317,7 @@ - U_CHAR *buf; - int *offset; - int width, height; -- int scan, x, y; -+ int scan, x; - short len; - long offptr; - /* -@@ -348,7 +353,7 @@ - exit(-1); - } - for (scan = 0; scan < height; scan++) { -- y = rle_getrow(&rle_dflt_hdr, scanline); -+ (void)rle_getrow(&rle_dflt_hdr, scanline); - switch (visual) { - case GRAYSCALE: /* 8 bits without colormap */ - red = scanline[0]; Index: urt/files/patch-cnv__rletotarga.c =================================================================== --- urt/files/patch-cnv__rletotarga.c (revision 436707) +++ urt/files/patch-cnv__rletotarga.c (nonexistent) @@ -1,11 +0,0 @@ ---- cnv/rletotarga.c.orig 1992-01-22 04:37:07.000000000 +0900 -+++ cnv/rletotarga.c 2012-10-15 22:47:54.000000000 +0900 -@@ -62,7 +62,7 @@ - image_descriptor; /* Image Descriptor Byte */ - }; - --void -+int - main(argc,argv) - int argc; - char *argv[]; Index: urt/files/patch-cnv__rletotiff.c =================================================================== --- urt/files/patch-cnv__rletotiff.c (revision 436707) +++ urt/files/patch-cnv__rletotiff.c (nonexistent) @@ -1,11 +0,0 @@ ---- cnv/rletotiff.c.orig 1992-04-30 23:01:10.000000000 +0900 -+++ cnv/rletotiff.c 2012-10-15 22:53:31.000000000 +0900 -@@ -48,7 +48,7 @@ - static unsigned short compression = COMPRESSION_LZW; - static int flip = 0; - --void -+int - main(argc, argv) - int argc; - char *argv[]; Index: urt/files/patch-cnv__rletovcr.c =================================================================== --- urt/files/patch-cnv__rletovcr.c (revision 436707) +++ urt/files/patch-cnv__rletovcr.c (nonexistent) @@ -1,24 +0,0 @@ ---- cnv/rletovcr.c.orig Thu Mar 10 20:17:23 2005 -+++ cnv/rletovcr.c Thu Mar 10 20:20:49 2005 -@@ -83,11 +83,10 @@ - static char COMMENT[80]; /* comment! */ - #endif - --WriteVICARHeader(fd, width, height, BandsPerPixel) -+void WriteVICARHeader(fd, width, height, BandsPerPixel) - FILE *fd; - int width, height, BandsPerPixel; - { -- int pad; - char *buffer, *bp; - - /* -@@ -254,7 +253,7 @@ - int argc; - char *argv[]; - { -- char *infname = NULL, outfname = NULL; -+ char *infname = NULL, *outfname = NULL; - int oflag = 0; - unsigned char *VICARImage; - rle_hdr the_hdr; Index: urt/files/patch-cnv__targatorle.c =================================================================== --- urt/files/patch-cnv__targatorle.c (revision 436707) +++ urt/files/patch-cnv__targatorle.c (nonexistent) @@ -1,11 +0,0 @@ ---- cnv/targatorle.c.orig 1992-02-28 06:11:12.000000000 +0900 -+++ cnv/targatorle.c 2012-10-15 22:51:12.000000000 +0900 -@@ -119,7 +119,7 @@ - void init_comp(); - unsigned char getbyte(); - --void -+int - main(argc,argv) - int argc; - char *argv[]; Index: urt/files/patch-cnv__tex__makefile.src =================================================================== --- urt/files/patch-cnv__tex__makefile.src (revision 436707) +++ urt/files/patch-cnv__tex__makefile.src (nonexistent) @@ -1,11 +0,0 @@ ---- cnv/tex/makefile.src.orig Sat Jun 8 00:57:32 1991 -+++ cnv/tex/makefile.src Sat Dec 28 00:47:13 2002 -@@ -39,7 +39,7 @@ - - install-scripts: $(SCRIPTS) - for pgm in $?; do d=$(DEST)/`basename $$pgm .sh`; \ -- cp $$pgm $$d; chmod +x $$d; done -+ ${BSD_INSTALL_SCRIPT} $$pgm $$d; chmod +x $$d; done - touch install-scripts - - # Default rule for making a program from its .c file. Index: urt/files/patch-cnv__tifftorle.c =================================================================== --- urt/files/patch-cnv__tifftorle.c (revision 436707) +++ urt/files/patch-cnv__tifftorle.c (nonexistent) @@ -1,11 +0,0 @@ ---- cnv/tifftorle.c.orig 1992-08-07 04:44:25.000000000 +0900 -+++ cnv/tifftorle.c 2012-10-16 00:13:07.000000000 +0900 -@@ -47,7 +47,7 @@ - unsigned char bc2[4] = { 0, 0x55, 0xaa, 0xff }; - unsigned char bc1[2] = { 0, 0xff }; - --void -+int - main(argc, argv) - int argc; - char *argv[]; Index: urt/files/patch-cnv__vcrtorele.c =================================================================== --- urt/files/patch-cnv__vcrtorele.c (revision 436707) +++ urt/files/patch-cnv__vcrtorele.c (nonexistent) @@ -1,81 +0,0 @@ ---- cnv/vcrtorle.c.orig Thu Mar 10 20:22:42 2005 -+++ cnv/vcrtorle.c Thu Mar 10 20:30:16 2005 -@@ -94,9 +94,6 @@ - - - static int VERBOSE = 0; --static char *RoutineName; -- --static long int VICARpos; /* Position in file for reading w/o fseek. */ - - static void FatalError(s) - char *s; -@@ -109,20 +106,10 @@ - static int LBLSIZE; /* size of header, must be int mult of NS */ - static char FORMAT[80]; /* 'BYTE' is OK */ - static char TYPE[80]; /* 'IMAGE' is OK */ --static int BUFSIZe; /* integer multiple of NS ? */ --static int DIM; /* == 3? */ --static int EOL; /* == 0? */ --static int RECSIZE; /* == LBLSIZE? */ - static char ORG[80]; /* `BSQ` is OK */ - static int NL; /* height */ - static int NS; /* width */ - static int NB; /* samples per pixel? */ --static int N1; /* == NL? */ --static int N2; /* == NS? */ --static int N3; /* == NB? */ --static int N4; /* 0 is OK */ --static int NBB; /* 0 is OK */ --static int NLB; /* 0 is OK */ - static char HOST[80]; /* machine type? */ - static char INTFMT[80]; /* integer format? */ - static char REALFMT[80]; /* real format? */ -@@ -218,20 +205,20 @@ - - if (0 == strcmp("FORMAT" ,Name)) {strcpy(FORMAT ,Value); continue;} - if (0 == strcmp("TYPE" ,Name)) {strcpy(TYPE ,Value); continue;} -- if (0 == strcmp("BUFSIZ" ,Name)) {BUFSIZe = atoi(Value); continue;} -- if (0 == strcmp("DIM" ,Name)) {DIM = atoi(Value); continue;} -- if (0 == strcmp("EOL" ,Name)) {EOL = atoi(Value); continue;} -- if (0 == strcmp("RECSIZE",Name)) {RECSIZE = atoi(Value); continue;} -+ if (0 == strcmp("BUFSIZ" ,Name)) { (void) atoi(Value); continue;} -+ if (0 == strcmp("DIM" ,Name)) { (void) atoi(Value); continue;} -+ if (0 == strcmp("EOL" ,Name)) { (void) atoi(Value); continue;} -+ if (0 == strcmp("RECSIZE",Name)) { (void) atoi(Value); continue;} - if (0 == strcmp("ORG" ,Name)) {strcpy(ORG ,Value); continue;} - if (0 == strcmp("NL" ,Name)) {NL = atoi(Value); continue;} - if (0 == strcmp("NS" ,Name)) {NS = atoi(Value); continue;} - if (0 == strcmp("NB" ,Name)) {NB = atoi(Value); continue;} -- if (0 == strcmp("N1" ,Name)) {N1 = atoi(Value); continue;} -- if (0 == strcmp("N2" ,Name)) {N2 = atoi(Value); continue;} -- if (0 == strcmp("N3" ,Name)) {N3 = atoi(Value); continue;} -- if (0 == strcmp("N4" ,Name)) {N4 = atoi(Value); continue;} -- if (0 == strcmp("NBB" ,Name)) {NBB = atoi(Value); continue;} -- if (0 == strcmp("NLB" ,Name)) {NLB = atoi(Value); continue;} -+ if (0 == strcmp("N1" ,Name)) { (void) atoi(Value); continue;} -+ if (0 == strcmp("N2" ,Name)) { (void) atoi(Value); continue;} -+ if (0 == strcmp("N3" ,Name)) { (void) atoi(Value); continue;} -+ if (0 == strcmp("N4" ,Name)) { (void) atoi(Value); continue;} -+ if (0 == strcmp("NBB" ,Name)) { (void) atoi(Value); continue;} -+ if (0 == strcmp("NLB" ,Name)) { (void) atoi(Value); continue;} - if (0 == strcmp("HOST" ,Name)) {strcpy(HOST ,Value); continue;} - if (0 == strcmp("INTFMT" ,Name)) {strcpy(INTFMT ,Value); continue;} - if (0 == strcmp("REALFMT",Name)) {strcpy(REALFMT,Value); continue;} -@@ -249,7 +236,6 @@ - n++; - } - -- VICARpos = n; - } - - /* RLE stuff */ -@@ -297,7 +283,7 @@ - unsigned char *VICARImage; - char *outfname = NULL; - int oflag = 0; -- int x,y,z; -+ int y; - long int nread; - rle_hdr the_hdr; - rle_pixel **rows; Index: urt/files/patch-cnv__wasatchrle.c =================================================================== --- urt/files/patch-cnv__wasatchrle.c (revision 436707) +++ urt/files/patch-cnv__wasatchrle.c (nonexistent) @@ -1,19 +0,0 @@ ---- cnv/wasatchrle.c.orig 1992-01-21 03:33:32.000000000 +0900 -+++ cnv/wasatchrle.c 2012-10-16 00:57:04.000000000 +0900 -@@ -28,6 +28,7 @@ - */ - - #include -+#include - #include - #include - #include "rle.h" -@@ -51,7 +52,7 @@ - rle_pixel count, data; - } was_op; - --void -+int - main(argc, argv) - int argc; - char **argv; Index: urt/files/patch-cnv__xbmtorle.c =================================================================== --- urt/files/patch-cnv__xbmtorle.c (revision 436707) +++ urt/files/patch-cnv__xbmtorle.c (nonexistent) @@ -1,19 +0,0 @@ ---- cnv/xbmtorle.c.orig 1992-04-30 23:01:54.000000000 +0900 -+++ cnv/xbmtorle.c 2012-10-16 01:02:29.000000000 +0900 -@@ -29,6 +29,7 @@ - xbmtorle() Tag the file. - */ - -+#include - #include "rle.h" - - #define MAX_LINE 500 -@@ -65,7 +66,7 @@ - * Reads the bitmap, then builds an RLE image with one pixel per - * bit in the input. - */ --void -+int - main( argc, argv ) - int argc; - char **argv; Index: urt/files/patch-config__hp700-hpux10 =================================================================== --- urt/files/patch-config__hp700-hpux10 (revision 436707) +++ urt/files/patch-config__hp700-hpux10 (nonexistent) @@ -1,253 +0,0 @@ ---- config/hp700-hpux10.orig Fri Dec 27 23:02:36 2002 -+++ config/hp700-hpux10 Fri Dec 27 23:02:36 2002 -@@ -0,0 +1,250 @@ -+# Configuration file for HP 9000/700 series running HP-UX 10.01 with gcc -+# Note that you will probably need to change the INCX11 directive at the -+# end of this file -+ -+#quiet on -+ -+# Configuration file for the URT raster toolkit package. Modify all -+# entries in this file. -+ -+# This file should be the only thing you have to edit to configure the -+# toolkit for a new system. If you are adding capabilities, please -+# keep this in mind and be sure to make those capabilities configurable -+# from this file. -+ -+# The file "makefile.hdr" contains code common to all makefiles. It -+# should not be necessary to edit that file. -+ -+# The following define the available "hardware" display configuration. -+# Remove one # sign to define a symbol (i.e., leaving #define at the -+# beginning of the line.) -+ -+# Displays -+##define AMIGA Amiga computer display. -+##define APOLLO Apollo computer display. -+##define BOBCAT HP "bobcat" 9000 series (with Starbase). -+##define CX3D Chromatics CX3D system. -+##define FB BRL extended frame buffer library. -+##define GETICR Display for NCSA telnet. Requires PBMPLUS tools. -+##define GRINNELL Grinnell GMR27 frame buffer. -+##define HPQCR Matrix QCR-Z attached to HP series 300. -+##define IRIS Silicon Graphics Iris 2000/3000. -+##define IRIS4D Silicon Graphics Iris/4D. -+##define NEXT NeXT computer display. -+##define ORION High-Level Hardware Orion display. -+##define SUNTOOLS For Suns running SunTools. -+##define TAAC1 Suns with TAAC-1 board. -+##define X10 X10 Window system. -+#define X11 X11 Window system. -+ -+# Conversion programs -+#define ABEKASA60 Abekas A60 conversions. -+#define ABEKASA62 Abekas A62 conversions. -+#define ALIAS Alias conversions. -+##define CGM RLE to CGM conversion. -+#define CUBICOMP Cubicomp conversions. -+#define GIF GIF image conversions. -+#define GRAYFILES Grayscale conversions. -+##define SGICONV SGI Image conversions. -+#define MACPAINT Macpaint conversions. -+##define PBMPLUS PBMPLUS conversions. -+#define POSTSCRIPT Postscript conversions. -+##define SUNRASTER For Sun raster conversions. -+#define TARGA Targa format conversions. -+##define TIFF TIFF image conversions. -+#define TIFF2p4 Define if libtiff is version 2.4 or greater -+#define VICAR VICAR image conversions. -+#define WASATCH Wasatch Paintbox conversions. -+#define WAVEFRONT Wavefront RLA file conversions. -+ -+# The dvirle program requires the Maryland MC-TeX library. See the -+# README file in the cnv/tex subdirectory. -+##define DVIRLE Compile dvirle program -+ -+# Control C compilation flags. Define according to your compiler. -+ -+##define APOLLOCC Apollo computer. -+##define CONVEXCC Convex C 4.0 or greater -+##define CRAY2CC Cray-2 running UNICOS. -+#define GCC Gcc compiler. -+##define HPUX300CC HP 9000/300 running HP-UX. -+#define HPUX800CC HP 9000/800 running HP-UX. -+##define IBMR6000CC IBM RS6000. -+##define IRIS4DCC Silicon Graphics Iris 4D. -+##define IRISCC Silicon Graphics Iris 2400/3000. -+##define SUNCC Sun 3 computers. -+##define 386IXCC SVr3 386/ix 2.2 -+ -+# You can put any system dependent flags here. -+ExtraCFLAGS = -+ -+# System specific or configuration parameters. Define according to your -+# environment and desires. -+ -+##define ABEKAS_PAL Convert to PAL format in Abekas A60 tool. -+##define ALL_MAN Print/install all man pages. -+##define CONST_DECL If your compiler understands 'const' (ANSI) -+##define FILE_NAME_14_CHARS If filenames are limited to 14 characters. -+##define HAVE_CPROTO If you have the cproto command. Not normally required. -+##define NEED_BSTRING Your libc does not have bcopy or bzero (Sys V probably) -+##define NEED_GETOPT Your libc does not have the getopt function (BSD) -+##define NEED_RENAME Your libc does not have the rename function (Sys V) -+#define NEED_SETLINEBUF Your stdio does not have setlinebuf (Sys V) -+##define NO_MAKE_MAKEFILE If you don't want a "makefile" action. -+##define NO_OPEN_PIPES If file "names" "|..." and "*.Z" are not special. -+#define NO_RANLIB You don't have the ranlib program (Sys V) -+##define NO_ITIMER You don't have setitimer (e.g., Cray 2). -+##define NO_TOOLS Don't build tool directory. -+##define STDIO_NEEDS_BINARY Your fopen() needs "b" specified for binary io -+##define USE_TIME_H You need to include time.h for time_t (Sys V) -+#define SYS_V_SETPGRP Your system has the SysV setpgrp() call. -+##define USE_L_FLAG Use -Llibdir -lrle instead of libdir/liblre.a. -+#define USE_PROTOTYPES Declare library functions with ANSI-C prototypes. -+##define USE_RANDOM Your libc has the BSD random() function. -+#define USE_SHARED_LIB You want to link to shared libraries as possible. -+##define USE_STDARG Use 'stdarg' instead of 'varargs' (ANSI). -+##define USE_STDLIB_H You have "stdlib.h". -+##define USE_UNISTD_H You have "unistd.h". -+#define USE_STRING_H You have "string.h", not "strings.h" -+#define VOID_STAR Your C compiler understands the 'void *' declaration. -+##define USE_XLIBINT_H You have the include file . -+##define X_SHARED_MEMORY You have the XShm extension. -+ -+# DEST is where all programs will be put. Can be overridden for specific -+# directories below. -+# RI is where the include files live. You probably shouldn't change this. -+# RL is where the tool directories find the RLE library. You can change -+# this, but see the README instructions about making the toolkit in this -+# case. -+ -+# Path names not starting with a / are relative to this directory. -+# Path names starting with a / are absolute. -+ -+#defpath DEST bin -+#defpath RI include -+#defpath RL lib -+ -+# Note! LIB_DEST, INC_DEST, and MAN_DEST must be defined for the -+# library, include files, or manual pages, respectively, to be -+# installed anywhere. -+ -+##defpath MAN_DEST /usr/site/man -+##defpath LIB_DEST -+##defpath GET_DEST -+##defpath CNV_DEST -+##defpath TOOLS_DEST -+##defpath INC_DEST -+ -+# Control of formatting. If your "roff" program needs to be piped to -+# something to print, set ROFFPIPE to (e.g.) "| lpr" -+ROFF = nroff -+ROFFOPT = -man -+ROFFPIPE = | lpr -+ -+# Stuff you like to have removed from directories to "make clean" -+OTHERJUNK = core *~ #*# -+ -+# Files needed for the various options above. -+#ifdef BOBCAT -+#ifdef USE_SHARED_LIB -+LDOPTS = -a shared -+LIBBOBCAT = -L /usr/lib/X11R4 -lXwindow -lsb -ldld -lXhp11 -lX11 -+# #endif /* shared library */ -+# #ifndef USE_SHARED_LIB -+#else -+LDOPTS = -a archive -+LIBBOBCAT = -L /usr/lib/X11R4 -lXwindow -ldd98705 -ldd98721 -ldd98731 -ldd98736 -+-lddgcrx -lddbyte -lddsox11 -lsb1 -lsb2 -lXhp11 -lX11 -+#endif /* archive library */ -+#endif /* BOBCAT */ -+ -+#ifdef CGM -+# Path to directory where CGM library and include files may be found -+# Absolute or relative to URT root -+#defpath CGMDIR -+INCCGM = -I$(CGMDIR) -+LIBCGM = $(CGMDIR)/libcgm.a -+#endif -+ -+#ifdef CX3D -+# Where are the include files for the CX3D -+INCCX3D = /usr/site/include -+LIBCX3D = -lcx3d -+#endif -+ -+#ifdef DVIRLE -+#define DVIRLE_LIBSUBDIR Defined if LIBMCTEX is under cnv/tex directory -+# The MC-TeX library. -+LIBMCTEX = lib/lib.a # Note! relative to cnv/tex directory -+# Where to find the MC-TeX include files. -+INCMCTEX = h # Note! relative to cnv/tex directory -+# where to find the font description file -+CONFFILE = /usr/local/lib/tex/fontdesc -+#endif -+ -+#ifdef FB -+LIBFB = /usr/brl/lib/libfb.a -+#endif -+ -+#ifdef GRINNELL -+# Library containing GMR27 functions. -+LIBGRINNELL = -lfb -+#endif -+ -+#ifdef HPQCR -+# HP device io library. -+LIBHPQCR = -ldvio -+#endif -+ -+#ifdef IRIS -+LIBIRIS = -Zg -+#endif -+ -+#ifdef IRIS4D -+LIBIRIS4D = -lgl_s -+#endif -+ -+#ifdef PBMPLUS -+# PBMDIR should refer to the root of your PBM source tree. -+# If relative, it's relative to root of URT source tree. -+#defpath PBMDIR -+ -+INCPBMPLUS = -I$(PBMDIR) -I$(PBMDIR)/ppm -I$(PBMDIR)/pgm -I$(PBMDIR)/pbm -+LIBPBMPLUS = $(PBMDIR)/ppm/libppm.a $(PBMDIR)/pgm/libpgm.a \ -+ $(PBMDIR)/pbm/libpbm.a -+#endif -+ -+#ifdef SUNRASTER|SUNTOOLS|TAAC1 -+LIBSUNTOOLS_COM = -lsuntool -lsunwindow -lpixrect -+#endif -+ -+#ifdef SUNRASTER -+LIBSUNRASTER = $(LIBSUNTOOLS_COM) -+#endif -+ -+#ifdef SUNTOOLS -+LIBSUNTOOLS = $(LIBSUNTOOLS_COM) -+#endif -+ -+#ifdef TAAC1 -+LIBTAAC1 = -ltaac1 $(LIBSUNTOOLS_COM) -+#endif -+ -+#ifdef TIFF -+# Location of tiff library and include files. Relative to URT root directory. -+#defpath TIFFDIR -+INCTIFF = -I$(TIFFDIR) -+LIBTIFF = $(TIFFDIR)/libtiff.a -+#endif -+ -+#ifdef X10 -+LIBX10 = -lX -+INCX10 = -+#endif -+ -+#ifdef X11 -+# Fetch the X11 library from /usr/lib/X11R4/libX11.sl -+LIBX11 = /usr/lib/X11R4/libX11.sl -+# You will probably need to change this -+INCX11 = -I/usr/sww/X11/include -+#endif Index: urt/files/patch-config__sol2-5 =================================================================== --- urt/files/patch-config__sol2-5 (revision 436707) +++ urt/files/patch-config__sol2-5 (nonexistent) @@ -1,243 +0,0 @@ ---- config/sol2-5.orig Fri Dec 27 23:02:36 2002 -+++ config/sol2-5 Fri Dec 27 23:02:36 2002 -@@ -0,0 +1,240 @@ -+# Solaris 2.x configuration file. (Tested on Solaris2.4 and 2.5) -+# With X11 -+# All conversion programs compiled. -+ -+##quiet on -+ -+# Configuration file for the URT raster toolkit package. Modify all -+# entries in this file. -+ -+# This file should be the only thing you have to edit to configure the -+# toolkit for a new system. If you are adding capabilities, please -+# keep this in mind and be sure to make those capabilities configurable -+# from this file. -+ -+# The file "makefile.hdr" contains code common to all makefiles. It -+# should not be necessary to edit that file. -+ -+# The following define the available "hardware" display configuration. -+# Remove one # sign to define a symbol (i.e., leaving #define at the -+# beginning of the line.) -+ -+# Displays -+##define AMIGA Amiga computer display. -+##define APOLLO Apollo computer display. -+##define BOBCAT HP "bobcat" 9000 series (with Starbase). -+##define CX3D Chromatics CX3D system. -+##define FB BRL extended frame buffer library. -+##define GETICR Display for NCSA telnet. Requires PBMPLUS tools. -+##define GRINNELL Grinnell GMR27 frame buffer. -+##define HPQCR Matrix QCR-Z attached to HP series 300. -+##define IRIS Silicon Graphics Iris 2000/3000. -+##define IRIS4D Silicon Graphics Iris/4D. -+##define NEXT NeXT computer display. -+##define ORION High-Level Hardware Orion display. -+##define SUNTOOLS For Suns running SunTools. -+##define TAAC1 Suns with TAAC-1 board. -+##define X10 X10 Window system. -+#define X11 X11 Window system. -+ -+# Conversion programs -+#define ABEKASA60 Abekas A60 conversions. -+#define ABEKASA62 Abekas A62 conversions. -+#define ALIAS Alias conversions. -+##define CGM RLE to CGM conversion. -+#define CUBICOMP Cubicomp conversions. -+#define GIF GIF image conversions. -+#define GRAYFILES Grayscale conversions. -+##define SGICONV SGI Image conversions. -+#define MACPAINT Macpaint conversions. -+##define PBMPLUS PBMPLUS conversions. -+#define POSTSCRIPT Postscript conversions. -+##define SUNRASTER For Sun raster conversions. -+#define TARGA Targa format conversions. -+##define TIFF TIFF image conversions. -+#define TIFF2p4 Define if libtiff is version 2.4 or greater -+#define VICAR VICAR image conversions. -+#define WASATCH Wasatch Paintbox conversions. -+##define WAVEFRONT Wavefront RLA file conversions. -+ -+# The dvirle program requires the Maryland MC-TeX library. See the -+# README file in the cnv/tex subdirectory. -+##define DVIRLE Compile dvirle program -+ -+# Control C compilation flags. Define according to your compiler. -+ -+##define APOLLOCC Apollo computer. -+##define CONVEXCC Convex C 4.0 or greater -+##define CRAY2CC Cray-2 running UNICOS. -+#define GCC Gcc compiler. -+##define HPUX300CC HP 9000/300 running HP-UX. -+##define HPUX800CC HP 9000/800 running HP-UX. -+##define IBMR6000CC IBM RS6000. -+##define IRIS4DCC Silicon Graphics Iris 4D. -+##define IRISCC Silicon Graphics Iris 2400/3000. -+##define SUNCC Sun 3 computers. -+##define 386IXCC SVr3 386/ix 2.2 -+ -+# You can put any system dependent flags here. -+ExtraCFLAGS = -+ -+# System specific or configuration parameters. Define according to your -+# environment and desires. -+ -+##define ABEKAS_PAL Convert to PAL format in Abekas A60 tool. -+##define ALL_MAN Print/install all man pages. -+##define CONST_DECL If your compiler understands 'const' (ANSI) -+##define FILE_NAME_14_CHARS If filenames are limited to 14 characters. -+##define HAVE_CPROTO If you have the cproto command. Not normally required. -+#define NEED_BSTRING Your libc does not have bcopy or bzero (Sys V probably) -+##define NEED_GETOPT Your libc does not have the getopt function (BSD) -+##define NEED_RENAME Your libc does not have the rename function (Sys V) -+#define NEED_SETLINEBUF Your stdio does not have setlinebuf (Sys V) -+#define NO_MAKE_MAKEFILE If you don't want a "makefile" action. -+##define NO_OPEN_PIPES If file "names" "|..." and "*.Z" are not special. -+#define NO_RANLIB You don't have the ranlib program (Sys V) -+##define NO_ITIMER You don't have setitimer (e.g., Cray 2). -+##define NO_TOOLS Don't build tool directory. -+##define STDIO_NEEDS_BINARY Your fopen() needs "b" specified for binary io -+##define USE_TIME_H You need to include time.h for time_t (Sys V) -+##define SYS_V_SETPGRP Your system has the SysV setpgrp() call. -+##define USE_L_FLAG Use -Llibdir -lrle instead of libdir/liblre.a. -+##define USE_PROTOTYPES Declare library functions with ANSI-C prototypes. -+##define USE_RANDOM Your libc has the BSD random() function. -+##define USE_STDARG Use 'stdarg' instead of 'varargs' (ANSI). -+#define USE_STDLIB_H You have "stdlib.h". -+#define USE_UNISTD_H You have "unistd.h". -+#define USE_STRING_H You have "string.h", not "strings.h" -+#define VOID_STAR Your C compiler understands the 'void *' declaration. -+#define USE_XLIBINT_H You have the include file . -+#define X_SHARED_MEMORY You have the XShm extension. -+ -+#define NO_GETHOSTNAME You don't have gethostnamem, use sysinfo() (Sys V) -+ -+# directories below. -+# RI is where the include files live. You probably shouldn't change this. -+# RL is where the tool directories find the RLE library. You can change -+# this, but see the README instructions about making the toolkit in this -+# case. -+ -+# Path names not starting with a / are relative to this directory. -+# Path names starting with a / are absolute. -+ -+#defpath DEST bin -+#defpath RI include -+#defpath RL lib -+ -+# Note! LIB_DEST, INC_DEST, and MAN_DEST must be defined for the -+# library, include files, or manual pages, respectively, to be -+# installed anywhere. -+ -+#defpath MAN_DEST -+#defpath LIB_DEST -+##defpath GET_DEST -+#defpath CNV_DEST -+#defpath TOOLS_DEST -+#defpath INC_DEST -+ -+# Control of formatting. If your "roff" program needs to be piped to -+# something to print, set ROFFPIPE to (e.g.) "| lpr" -+ROFF = nroff -+ROFFOPT = -man -+ROFFPIPE = | lpr -+ -+# Stuff you like to have removed from directories to "make clean" -+OTHERJUNK = core *~ #*# -+ -+# Files needed for the various options above. -+#ifdef BOBCAT -+LIBBOBCAT = -ldd98700 -ldd98710 -ldd98721 -ldd98731 -ldd98736 -ldd300h -lddbyte -lsb1 -lsb2 -+#endif -+ -+#ifdef CGM -+# Path to directory where CGM library and include files may be found -+# Absolute or relative to URT root -+#defpath CGMDIR -+INCCGM = -I$(CGMDIR) -+LIBCGM = $(CGMDIR)/libcgm.a -+#endif -+ -+#ifdef CX3D -+# Where are the include files for the CX3D -+INCCX3D = /usr/site/include -+LIBCX3D = -lcx3d -+#endif -+ -+#ifdef DVIRLE -+#define DVIRLE_LIBSUBDIR Defined if LIBMCTEX is under cnv/tex directory -+# The MC-TeX library. -+LIBMCTEX = lib/lib.a # Note! relative to cnv/tex directory -+# Where to find the MC-TeX include files. -+INCMCTEX = h # Note! relative to cnv/tex directory -+# where to find the font description file -+CONFFILE = /usr/local/lib/tex/fontdesc -+#endif -+ -+#ifdef FB -+LIBFB = /usr/brl/lib/libfb.a -+#endif -+ -+#ifdef GRINNELL -+# Library containing GMR27 functions. -+LIBGRINNELL = -lfb -+#endif -+ -+#ifdef HPQCR -+# HP device io library. -+LIBHPQCR = -ldvio -+#endif -+ -+#ifdef IRIS -+LIBIRIS = -Zg -+#endif -+ -+#ifdef IRIS4D -+LIBIRIS4D = -lgl_s -+#endif -+ -+#ifdef PBMPLUS -+# PBMDIR should refer to the root of your PBM source tree. -+# If relative, it's relative to root of URT source tree. -+#defpath PBMDIR -+ -+INCPBMPLUS = -I$(PBMDIR) -I$(PBMDIR)/ppm -I$(PBMDIR)/pgm -I$(PBMDIR)/pbm -+LIBPBMPLUS = $(PBMDIR)/ppm/libppm.a $(PBMDIR)/pgm/libpgm.a \ -+ $(PBMDIR)/pbm/libpbm.a -+#endif -+ -+#ifdef SUNRASTER|SUNTOOLS|TAAC1 -+LIBSUNTOOLS_COM = -lsuntool -lsunwindow -lpixrect -+#endif -+ -+#ifdef SUNRASTER -+LIBSUNRASTER = $(LIBSUNTOOLS_COM) -+#endif -+ -+#ifdef SUNTOOLS -+LIBSUNTOOLS = $(LIBSUNTOOLS_COM) -+#endif -+ -+#ifdef TAAC1 -+LIBTAAC1 = -ltaac1 $(LIBSUNTOOLS_COM) -+#endif -+ -+#ifdef TIFF -+# Location of tiff library and include files. Relative to URT root directory. -+#defpath TIFFDIR -+INCTIFF = -I$(TIFFDIR) -+LIBTIFF = $(TIFFDIR)/libtiff.a -+#endif -+ -+#ifdef X10 -+LIBX10 = -lX -+INCX10 = -+#endif -+ -+#ifdef X11 -+LIBX11 = -lX11 -+# Sun Specific -+INCX11 = -I/usr/openwin/include -+#endif Index: urt/files/patch-config__urt =================================================================== --- urt/files/patch-config__urt (revision 436707) +++ urt/files/patch-config__urt (nonexistent) @@ -1,163 +0,0 @@ ---- config/urt.orig Wed Jul 15 19:47:15 1992 -+++ config/urt Thu Mar 10 23:52:07 2005 -@@ -1,3 +1,7 @@ -+# Configuration for HP 9000/300 series running BSD4.3 -+ -+#quiet on -+ - # Configuration file for the URT raster toolkit package. Modify all - # entries in this file. - -@@ -29,7 +33,7 @@ - ##define SUNTOOLS For Suns running SunTools. - ##define TAAC1 Suns with TAAC-1 board. - ##define X10 X10 Window system. --##define X11 X11 Window system. -+#define X11 X11 Window system. - - # Conversion programs - #define ABEKASA60 Abekas A60 conversions. -@@ -41,11 +45,11 @@ - #define GRAYFILES Grayscale conversions. - ##define SGICONV SGI Image conversions. - #define MACPAINT Macpaint conversions. --##define PBMPLUS PBMPLUS conversions. -+#define PBMPLUS PBMPLUS conversions. - #define POSTSCRIPT Postscript conversions. - ##define SUNRASTER For Sun raster conversions. - #define TARGA Targa format conversions. --##define TIFF TIFF image conversions. -+#define TIFF TIFF image conversions. - #define TIFF2p4 Define if libtiff is version 2.4 or greater - #define VICAR VICAR image conversions. - #define WASATCH Wasatch Paintbox conversions. -@@ -60,7 +64,7 @@ - ##define APOLLOCC Apollo computer. - ##define CONVEXCC Convex C 4.0 or greater - ##define CRAY2CC Cray-2 running UNICOS. --##define GCC Gcc compiler. -+#define GCC Gcc compiler. - ##define HPUX300CC HP 9000/300 running HP-UX. - ##define HPUX800CC HP 9000/800 running HP-UX. - ##define IBMR6000CC IBM RS6000. -@@ -77,7 +81,7 @@ - - ##define ABEKAS_PAL Convert to PAL format in Abekas A60 tool. - ##define ALL_MAN Print/install all man pages. --##define CONST_DECL If your compiler understands 'const' (ANSI) -+#define CONST_DECL If your compiler understands 'const' (ANSI) - ##define FILE_NAME_14_CHARS If filenames are limited to 14 characters. - ##define HAVE_CPROTO If you have the cproto command. Not normally required. - ##define NEED_BSTRING Your libc does not have bcopy or bzero (Sys V probably) -@@ -91,17 +95,17 @@ - ##define NO_TOOLS Don't build tool directory. - ##define STDIO_NEEDS_BINARY Your fopen() needs "b" specified for binary io - ##define USE_TIME_H You need to include time.h for time_t (Sys V) --##define SYS_V_SETPGRP Your system has the SysV setpgrp() call. --##define USE_L_FLAG Use -Llibdir -lrle instead of libdir/liblre.a. --##define USE_PROTOTYPES Declare library functions with ANSI-C prototypes. --##define USE_RANDOM Your libc has the BSD random() function. --##define USE_STDARG Use 'stdarg' instead of 'varargs' (ANSI). --##define USE_STDLIB_H You have "stdlib.h". --##define USE_UNISTD_H You have "unistd.h". -+##define SYS_V_SETPGRP Your system has the SysV setpgrp() call. -+#define USE_L_FLAG Use -Llibdir -lrle instead of libdir/liblre.a. -+#define USE_PROTOTYPES Declare library functions with ANSI-C prototypes. -+#define USE_RANDOM Your libc has the BSD random() function. -+#define USE_STDARG Use 'stdarg' instead of 'varargs' (ANSI). -+#define USE_STDLIB_H You have "stdlib.h". -+#define USE_UNISTD_H You have "unistd.h". - ##define USE_STRING_H You have "string.h", not "strings.h" --##define VOID_STAR Your C compiler understands the 'void *' declaration. --##define USE_XLIBINT_H You have the include file . --##define X_SHARED_MEMORY You have the XShm extension. -+#define VOID_STAR Your C compiler understands the 'void *' declaration. -+#define USE_XLIBINT_H You have the include file . -+#define X_SHARED_MEMORY You have the XShm extension. - - # DEST is where all programs will be put. Can be overridden for specific - # directories below. -@@ -121,12 +125,12 @@ - # library, include files, or manual pages, respectively, to be - # installed anywhere. - --##defpath MAN_DEST /usr/site/man --##defpath LIB_DEST --##defpath GET_DEST --##defpath CNV_DEST --##defpath TOOLS_DEST --##defpath INC_DEST -+#defpath MAN_DEST /$(PREFIX)/man -+#defpath LIB_DEST /$(PREFIX)/lib -+#defpath GET_DEST /$(PREFIX)/bin -+#defpath CNV_DEST /$(PREFIX)/bin -+#defpath TOOLS_DEST /$(PREFIX)/bin -+#defpath INC_DEST /$(PREFIX)/include - - # Control of formatting. If your "roff" program needs to be piped to - # something to print, set ROFFPIPE to (e.g.) "| lpr" -@@ -145,9 +149,9 @@ - #ifdef CGM - # Path to directory where CGM library and include files may be found - # Absolute or relative to URT root --#defpath CGMDIR --INCCGM = -I$(CGMDIR) --LIBCGM = $(CGMDIR)/libcgm.a -+#defpath CGMDIR $(LOCALBASE) -+INCCGM = -I$(CGMDIR)/include -+LIBCGM = $(CGMDIR)/lib/libcgm.a - #endif - - #ifdef CX3D -@@ -163,11 +167,11 @@ - # Where to find the MC-TeX include files. - INCMCTEX = h # Note! relative to cnv/tex directory - # where to find the font description file --CONFFILE = /usr/local/lib/tex/fontdesc -+CONFFILE = $(LOCALBASE)/lib/tex/fontdesc - #endif - - #ifdef FB --LIBFB = /usr/brl/lib/libfb.a -+LIBFB = $(LOCALBASE)/share/brlcad/lib/libfb.a $(LOCALBASE)/brlcad/lib/libpkg.a - #endif - - #ifdef GRINNELL -@@ -191,11 +195,10 @@ - #ifdef PBMPLUS - # PBMDIR should refer to the root of your PBM source tree. - # If relative, it's relative to root of URT source tree. --#defpath PBMDIR -+##defpath PBMDIR - --INCPBMPLUS = -I$(PBMDIR) -I$(PBMDIR)/ppm -I$(PBMDIR)/pgm -I$(PBMDIR)/pbm --LIBPBMPLUS = $(PBMDIR)/ppm/libppm.a $(PBMDIR)/pgm/libpgm.a \ -- $(PBMDIR)/pbm/libpbm.a -+INCPBMPLUS = -I${LOCALBASE}/include -+LIBPBMPLUS = -L${LOCALBASE}/lib -lnetpbm - #endif - - #ifdef SUNRASTER|SUNTOOLS|TAAC1 -@@ -216,9 +219,10 @@ - - #ifdef TIFF - # Location of tiff library and include files. Relative to URT root directory. --#defpath TIFFDIR --INCTIFF = -I$(TIFFDIR) --LIBTIFF = $(TIFFDIR)/libtiff.a -+##defpath TIFFDIR -+INCTIFF = -I${LOCALBASE}/include -+LIBTIFF = -L${LOCALBASE}/lib -ltiff -+LIBTIFF +=-Wl,-rpath,${LOCALBASE}/lib - #endif - - #ifdef X10 -@@ -227,6 +233,6 @@ - #endif - - #ifdef X11 --LIBX11 = -lX11 --INCX11 = -+LIBX11 = -L${LOCALBASE}/lib -lX11 -+INCX11 = -I${LOCALBASE}/include - #endif Index: urt/files/patch-get-getx11-map_scan.c =================================================================== --- urt/files/patch-get-getx11-map_scan.c (revision 436707) +++ urt/files/patch-get-getx11-map_scan.c (nonexistent) @@ -1,11 +0,0 @@ ---- get/getx11/map_scan.c.orig Thu Nov 29 22:24:53 2007 -+++ get/getx11/map_scan.c Thu Nov 29 22:26:37 2007 -@@ -2195,7 +2195,7 @@ - - if (!img->divN || !img->modN || !img->dm16 ) - { -- fprintf( stderr, "%s: malloc error getting dither arrays\n"); -+ fprintf( stderr, "%s: malloc error getting dither arrays\n", progname); - exit (1); - } - } Index: urt/files/patch-get-getx11-x11_stuff.c =================================================================== --- urt/files/patch-get-getx11-x11_stuff.c (revision 436707) +++ urt/files/patch-get-getx11-x11_stuff.c (nonexistent) @@ -1,36 +0,0 @@ ---- get/getx11/x11_stuff.c.orig Fri May 13 20:05:44 1994 -+++ get/getx11/x11_stuff.c Thu Nov 29 22:48:26 2007 -@@ -40,7 +40,7 @@ - */ - #include "getx11.h" - #ifdef X_SHARED_MEMORY --#include -+#include - #endif - - #include "circle.bitmap" -@@ -155,7 +155,6 @@ - IPC_CREAT|0777 ); - if ( img->shm_img.shmid < 0 ) - { -- extern int errno; - if ( errno == ENOSPC ) - { - if ( !no_shared_space ) -@@ -333,7 +332,7 @@ - - if (( img->pixmap != NULL && reallocate ) || - ( img->pixmap != NULL && (img->pix_w < iw || img->pix_h < ih ))){ -- free_X_pixmap( dpy, img->pixmap ); -+ free_X_pixmap( img, img->pixmap ); - img->pixmap = NULL; - } - -@@ -361,7 +360,6 @@ - XDestroyImage( image ); - if ( img->shm_pix.shmid < 0 ) - { -- extern int errno; - if ( errno == ENOSPC ) - { - if ( !no_shared_space ) Index: urt/files/patch-get__getfb.c =================================================================== --- urt/files/patch-get__getfb.c (revision 436707) +++ urt/files/patch-get__getfb.c (nonexistent) @@ -1,11 +0,0 @@ ---- get/getfb.c.orig Mon Mar 7 23:33:32 2005 -+++ get/getfb.c Mon Mar 7 23:44:28 2005 -@@ -47,7 +47,7 @@ - } - - rle_file = argv[0]; -- rle_names( &hdr, hdr.cmd, rle_file ); -+ rle_names( &hdr, hdr.cmd, rle_file, 0 ); - hdr.rle_file = rle_open_f(hdr.cmd, rle_file, "r"); - if( rle_get_setup( &hdr ) < 0 ) { - fprintf(stderr, "getfb: Error reading setup information\n"); Index: urt/files/patch-get__getx11__XGetHClrs.c =================================================================== --- urt/files/patch-get__getx11__XGetHClrs.c (revision 436707) +++ urt/files/patch-get__getx11__XGetHClrs.c (nonexistent) @@ -1,8 +0,0 @@ ---- get/getx11/XGetHClrs.c.orig Sun Jan 30 15:48:57 2005 -+++ get/getx11/XGetHClrs.c Sun Jan 30 15:49:38 2005 -@@ -1,5 +1,4 @@ - #ifndef XLIBINT_H_NOT_AVAILABLE --#include - - /* $XConsortium: XGetHClrs.c,v 11.10 88/09/06 16:07:50 martin Exp $ */ - /* Copyright Massachusetts Institute of Technology 1986 */ Index: urt/files/patch-get__getx11__getx11.c =================================================================== --- urt/files/patch-get__getx11__getx11.c (revision 436707) +++ urt/files/patch-get__getx11__getx11.c (nonexistent) @@ -1,11 +0,0 @@ ---- get/getx11/getx11.c.orig 1995-01-11 06:16:18.000000000 +0900 -+++ get/getx11/getx11.c 2012-10-13 07:08:08.000000000 +0900 -@@ -218,7 +218,7 @@ - * [None] - */ - --void -+int - main (argc, argv) - int argc; - char ** argv; Index: urt/files/patch-get__getx11__getx11.h =================================================================== --- urt/files/patch-get__getx11__getx11.h (revision 436707) +++ urt/files/patch-get__getx11__getx11.h (nonexistent) @@ -1,12 +0,0 @@ ---- get/getx11/getx11.h.orig 1994-05-14 10:09:37.000000000 +0900 -+++ get/getx11/getx11.h 2012-10-15 22:14:16.000000000 +0900 -@@ -27,6 +27,9 @@ - */ - - #include -+#include -+#include -+#include - #include - #include - #include Index: urt/files/patch-get__getx11__in_cmap.c =================================================================== --- urt/files/patch-get__getx11__in_cmap.c (revision 436707) +++ urt/files/patch-get__getx11__in_cmap.c (nonexistent) @@ -1,15 +0,0 @@ ---- get/getx11/in_cmap.c.orig Thu Apr 30 23:17:16 1992 -+++ get/getx11/in_cmap.c Fri Dec 27 23:02:36 2002 -@@ -70,10 +70,10 @@ - if ( img->sep_colors || - (img->img_channels == 1 && img->ncmap == 3 && img->cmlen) ) - /* If using color map directly, apply display gamma, too. */ -- img->in_cmap = buildmap( img_hdr, 3, img->gamma, -+ img->in_cmap = buildmap( img_hdr, 3, (double) img->gamma, - display_gamma ); - else -- img->in_cmap = buildmap( img_hdr, 3, img->gamma, 1.0 ); -+ img->in_cmap = buildmap( img_hdr, 3, (double) img->gamma, 1.0 ); - - for (i = 0; i < 3; i++ ) { - for (j = 0; j < 256; j++) Index: urt/files/patch-get__getx11__prototypes.h =================================================================== --- urt/files/patch-get__getx11__prototypes.h (revision 436707) +++ urt/files/patch-get__getx11__prototypes.h (nonexistent) @@ -1,9 +0,0 @@ ---- get/getx11/prototypes.h.orig 1993-01-12 06:56:21.000000000 +0900 -+++ get/getx11/prototypes.h 2012-10-13 07:04:08.000000000 +0900 -@@ -1,5 +1,5 @@ - extern void init_img_info(image_information *i); --extern void main(int argc, char **argv); -+extern int main(int argc, char **argv); - extern void handle_exposure(register image_information *img, int x, int y, int width, int height, int img_h); - extern image_information *action_flip_forward(image_information *img, image_information *img_info, int flip_book_udelay, int n, unsigned long mask, XEvent *event, Boolean *found_event); - extern image_information *action_flip_backward(image_information *img, image_information *img_info, int flip_book_udelay, int n, unsigned long mask, XEvent *event, Boolean *found_event); Index: urt/files/patch-get__makefile.src =================================================================== --- urt/files/patch-get__makefile.src (revision 436707) +++ urt/files/patch-get__makefile.src (nonexistent) @@ -1,11 +0,0 @@ ---- get/makefile.src.orig Thu Feb 27 21:13:33 1992 -+++ get/makefile.src Tue Mar 8 00:10:02 2005 -@@ -54,7 +54,7 @@ - #ifdef FB - # getfb - get to a BRL libfb display - #@getfb.out: getfb.c --#@ $(CC) $(CFLAGS) $*.c $(LIBS) $(LIBFB) -lm -o $*.new -+#@ $(CC) $(CFLAGS) $(INCFB) $*.c $(LIBS) $(LIBFB) $(LIBX11) -lm -o $*.new - #@ mv $*.new $@ - #endif - Index: urt/files/patch-include__makefile.src =================================================================== --- urt/files/patch-include__makefile.src (revision 436707) +++ urt/files/patch-include__makefile.src (nonexistent) @@ -1,21 +0,0 @@ ---- include/makefile.src.orig Sat Jun 8 00:56:22 1991 -+++ include/makefile.src Sat Dec 28 00:45:11 2002 -@@ -35,8 +35,8 @@ - @sh -c "if test 'x$(DEST)' != x ; then \ - if test 'x$(HDRS)' != x ; then eval \ - 'for hdr in $?; do \ -- echo cp \$$hdr $(DEST)/\$$hdr ; \ -- cp \$$hdr $(DEST)/\$$hdr; \ -+ echo install \$$hdr $(DEST)/\$$hdr ; \ -+ ${BSD_INSTALL_DATA} \$$hdr $(DEST)/\$$hdr; \ - done' ; \ - else \ - true ; \ -@@ -44,7 +44,6 @@ - else \ - true ; \ - fi" -- touch install - - # Nothing to clean - clean: Index: urt/files/patch-include__rle_config.tlr =================================================================== --- urt/files/patch-include__rle_config.tlr (revision 436707) +++ urt/files/patch-include__rle_config.tlr (nonexistent) @@ -1,11 +0,0 @@ ---- include/rle_config.tlr.orig Thu Apr 30 23:06:23 1992 -+++ include/rle_config.tlr Fri Dec 27 23:02:36 2002 -@@ -48,7 +48,7 @@ - #endif /* NO_DECLARE_MALLOC */ - - #ifdef USE_PROTOTYPES --extern char *getenv( CONST_DECL char *name ); -+extern char *getenv( CONST_DECL char *CONST_DECL name); - #else - extern char *getenv(); - #endif Index: urt/files/patch-lib-rle_hdr.c =================================================================== --- urt/files/patch-lib-rle_hdr.c (revision 436707) +++ urt/files/patch-lib-rle_hdr.c (nonexistent) @@ -1,19 +0,0 @@ ---- lib/rle_hdr.c.orig 1992-06-27 05:44:20.000000000 +0900 -+++ lib/rle_hdr.c 2012-10-15 22:05:32.000000000 +0900 -@@ -26,6 +26,7 @@ - */ - static char rcsid[] = "$Header: /tmp_mnt/n/itn/hendrix/u/spencer/RCS/rle_hdr.c,v 3.0.1.1 1992/04/30 14:08:07 spencer Exp spencer $"; - -+#include - #include "rle.h" - - /***************************************************************** -@@ -269,6 +270,8 @@ - { - rle_hdr *ret_hdr; - -+ if ( rle_dflt_hdr.rle_file == NULL) -+ rle_dflt_hdr.rle_file = stdout; - if ( the_hdr == &rle_dflt_hdr ) - return the_hdr; - Index: urt/files/patch-lib-rle_open_f.c =================================================================== --- urt/files/patch-lib-rle_open_f.c (revision 436707) +++ urt/files/patch-lib-rle_open_f.c (nonexistent) @@ -1,53 +0,0 @@ ---- lib/rle_open_f.c.orig 1993-05-14 06:28:51.000000000 +0900 -+++ lib/rle_open_f.c 2012-10-15 22:07:34.000000000 +0900 -@@ -10,6 +10,9 @@ - - #include "rle_config.h" - #include -+#include -+#include -+#include - - #ifndef NO_OPEN_PIPES - /* Need to have a SIGCLD signal catcher. */ -@@ -56,6 +59,7 @@ - CONST_DECL char *err_str; - register char *cp; - char *combuf; -+ size_t combuf_size; - - #ifdef STDIO_NEEDS_BINARY - char mode_string[32]; /* Should be enough. */ -@@ -150,7 +154,8 @@ - else if ( cp > file_name && *cp == '.' && *(cp + 1) == 'Z' ) - { - int thepid; /* PID from my_popen. */ -- combuf = (char *)malloc( 20 + strlen( file_name ) ); -+ combuf_size = 20 + strlen( file_name ); -+ combuf = (char *)malloc( combuf_size ); - if ( combuf == NULL ) - { - err_str = "%s: out of memory opening (compressed) %s for %s"; -@@ -158,11 +163,11 @@ - } - - if ( *mode == 'w' ) -- sprintf( combuf, "compress > %s", file_name ); -+ snprintf( combuf, combuf_size, "compress > %s", file_name ); - else if ( *mode == 'a' ) -- sprintf( combuf, "compress >> %s", file_name ); -+ snprintf( combuf, combuf_size, "compress >> %s", file_name ); - else -- sprintf( combuf, "compress -d < %s", file_name ); -+ snprintf( combuf, combuf_size, "compress -d < %s", file_name ); - - fp = my_popen( combuf, mode, &thepid ); - free( combuf ); -@@ -256,7 +261,6 @@ - int pipefd[2]; - int i; - char *argv[4]; -- extern int errno; - - /* Check args. */ - if ( *mode != 'r' && *mode != 'w' ) Index: urt/files/patch-lib__Runput.c =================================================================== --- urt/files/patch-lib__Runput.c (revision 436707) +++ urt/files/patch-lib__Runput.c (nonexistent) @@ -1,12 +0,0 @@ ---- lib/Runput.c.orig 1992-01-29 03:17:40.000000000 +0900 -+++ lib/Runput.c 2012-10-15 21:59:43.000000000 +0900 -@@ -90,7 +90,8 @@ - * follow the last byte in the run. - */ - --#include "stdio.h" -+#include -+#include - #include "rle_put.h" - #include "rle.h" - #include "rle_code.h" Index: urt/files/patch-lib__buildmap.c =================================================================== --- urt/files/patch-lib__buildmap.c (revision 436707) +++ urt/files/patch-lib__buildmap.c (nonexistent) @@ -1,10 +0,0 @@ ---- lib/buildmap.c.orig Fri Feb 28 06:17:01 1992 -+++ lib/buildmap.c Fri Dec 27 23:02:36 2002 -@@ -26,6 +26,7 @@ - */ - - #include -+#include - #include "rle.h" - #include - Index: urt/files/patch-lib__inv_cmap.c =================================================================== --- urt/files/patch-lib__inv_cmap.c (revision 436707) +++ urt/files/patch-lib__inv_cmap.c (nonexistent) @@ -1,11 +0,0 @@ ---- lib/inv_cmap.c.orig Thu Mar 10 21:28:37 2005 -+++ lib/inv_cmap.c Thu Mar 10 21:29:06 2005 -@@ -42,7 +42,7 @@ - static long cbinc, cginc, crinc; - static unsigned long *gdp, *rdp, *cdp; - static unsigned char *grgbp, *rrgbp, *crgbp; --static gstride, rstride; -+static int gstride, rstride; - static long x, xsqr, colormax; - static int cindex; - #ifdef INSTRUMENT_IT Index: urt/files/patch-lib__makefile.src =================================================================== --- urt/files/patch-lib__makefile.src (revision 436707) +++ urt/files/patch-lib__makefile.src (nonexistent) @@ -1,93 +0,0 @@ ---- lib/makefile.src.orig Thu Mar 5 04:32:53 1992 -+++ lib/makefile.src Sat Dec 28 00:41:59 2002 -@@ -26,7 +26,10 @@ - vaxshort.o \ - $(OPT_OBJS) - --LIBNAME = librle.a -+SOOBJS = $(OBJS:.o=.so) -+ -+LIBANAME = librle.a -+LIBSONAME = librle.so.1 - - # Just rebuild the object files. - objs: $(OBJS) -@@ -37,40 +44,40 @@ - # Do nothing if $(DEST) is empty (or not defined) - install: buildlib - @sh -c "if test '$(DEST)x' != x ; then \ -- echo cp $(LIBNAME) $(DEST)/$(LIBNAME) ; \ -- cp $(LIBNAME) $(DEST)/$(LIBNAME) ; \ -+ echo install $(LIBANAME) $(DEST)/$(LIBANAME) ; \ -+ ${BSD_INSTALL_DATA} $(LIBANAME) $(DEST)/$(LIBANAME) ; \ -+ echo install $(LIBSONAME) $(DEST)/$(LIBSONAME) ; \ -+ ${BSD_INSTALL_DATA} $(LIBSONAME) $(DEST)/$(LIBSONAME) ; \ -+ ln -sf $(LIBSONAME) $(DEST)/librle.so ; \ - if test x$(RANLIB) != x ; then \ -- echo ranlib $(DEST)/$(LIBNAME) ; \ -- ranlib $(DEST)/$(LIBNAME) ; \ -- else \ -- true ; \ -- fi ; \ -- if test -d $(DEST)/debug ; then \ -- echo cp $(LIBNAME) $(DEST)/debug/$(LIBNAME) ; \ -- if test x$(RANLIB) != x ; then \ -- cp $(LIBNAME) $(DEST)/debug/$(LIBNAME) ; \ -- echo ranlib $(DEST)/debug/$(LIBNAME) ; \ -- else \ -- true ; \ -- fi ; \ -- ranlib $(DEST)/debug/$(LIBNAME) ; \ -+ echo ranlib $(DEST)/$(LIBANAME) ; \ -+ ranlib $(DEST)/$(LIBANAME) ; \ - else \ - true ; \ - fi ; \ - else \ - true ; \ - fi" -- touch install - - # Rebuild the library from all the .o files. --buildlib: $(OBJS) -- -rm -f $(LIBNAME) -- ar rc $(LIBNAME) -- ar q $(LIBNAME) $(OBJS) -+buildlib: $(LIBANAME) $(LIBSONAME) -+ -+$(LIBANAME): $(OBJS) -+ -rm -f $@ -+ ar rc $@ $(OBJS) - #ifndef NO_RANLIB -- ranlib $(LIBNAME) -+ ranlib $@ - #endif -- touch buildlib -+ -+.SUFFIXES: .so .o -+ -+.c.so: -+ $(CC) -fPIC -DPIC $(CFLAGS) -c $*.c -o $*.so -+ $(LD) -X -r $*.so -+ -+$(LIBSONAME): $(SOOBJS) -+ -rm -f $@ -+ ld -shared -soname $@ -o $@ $(SOOBJS) - - # Clean up installed stuff and binaries - pristine: clean -@@ -86,9 +99,12 @@ - # Get rid of everything which must be recompiled on a different computer. - clean: - -rm -f *.o -+ -rm -f *.so - -@if test x$(DEST) != x ; then \ -- echo rm -f $(LIBNAME) ; \ -- rm -f $(LIBNAME) ; \ -+ echo rm -f $(LIBANAME) ; \ -+ rm -f $(LIBANAME) ; \ -+ echo rm -f $(LIBSONAME) ; \ -+ rm -f $(LIBSONAME) ; \ - else \ - true ; \ - fi Index: urt/files/patch-lib__rle_addhist.c =================================================================== --- urt/files/patch-lib__rle_addhist.c (revision 436707) +++ urt/files/patch-lib__rle_addhist.c (nonexistent) @@ -1,10 +0,0 @@ ---- lib/rle_addhist.c.orig 1992-04-30 23:07:45.000000000 +0900 -+++ lib/rle_addhist.c 2012-10-15 22:01:16.000000000 +0900 -@@ -27,6 +27,7 @@ - - #include "rle.h" - #include -+#include - - #ifdef USE_TIME_H - #include Index: urt/files/patch-lib__rle_error.c =================================================================== --- urt/files/patch-lib__rle_error.c (revision 436707) +++ urt/files/patch-lib__rle_error.c (nonexistent) @@ -1,10 +0,0 @@ ---- lib/rle_error.c.orig 1992-03-05 04:33:27.000000000 +0900 -+++ lib/rle_error.c 2012-10-16 01:18:15.000000000 +0900 -@@ -28,6 +28,7 @@ - static char rcs_id[] = "$Header: /l/spencer/src/urt/lib/RCS/rle_error.c,v 3.0.1.1 1992/03/04 19:33:27 spencer Exp $"; - #endif - -+#include - #include "rle.h" - - /***************************************************************** Index: urt/files/patch-lib__rle_global.c =================================================================== --- urt/files/patch-lib__rle_global.c (revision 436707) +++ urt/files/patch-lib__rle_global.c (nonexistent) @@ -1,11 +0,0 @@ ---- lib/rle_global.c.orig Tue Jan 28 18:23:03 1992 -+++ lib/rle_global.c Sun Jan 30 15:19:36 2005 -@@ -76,7 +76,7 @@ - 8, /* cmaplen (log2 of length of color map) */ - NULL, /* pointer to color map */ - NULL, /* pointer to comment strings */ -- stdout, /* output file */ -+ 0, /* stdout, output file */ - { 7 }, /* RGB channels only */ - 0L, /* Can't free name and file fields. */ - "Urt", /* Default "program name". */ Index: urt/files/patch-lib__scanargs.c =================================================================== --- urt/files/patch-lib__scanargs.c (revision 436707) +++ urt/files/patch-lib__scanargs.c (nonexistent) @@ -1,33 +0,0 @@ ---- lib/scanargs.c.orig 1992-02-28 06:18:15.000000000 +0900 -+++ lib/scanargs.c 2012-10-15 22:09:52.000000000 +0900 -@@ -42,6 +42,7 @@ - - #include "rle_config.h" - #include -+#include - #include - #ifndef USE_STDARG - #include -@@ -128,10 +129,10 @@ - va_list argl; - { - -- register check; /* check counter to be sure all argvs -+ register int check; /* check counter to be sure all argvs - are processed */ - register CONST_DECL char *cp; -- register cnt; -+ register int cnt; - int optarg = 0; /* where optional args start */ - int nopt = 0; - char tmpflg, /* temp flag */ -@@ -408,7 +409,8 @@ - * Copy the string so we remain nondestructive - */ - s = NEW( char, strlen(argp)+1 ); -- strcpy( s, argp ); -+ strncpy( s, argp, sizeof(s)-1 ); -+ s[sizeof(s) - 1] = '\0'; - argp = s; - - /* Index: urt/files/patch-makefile.hdr =================================================================== --- urt/files/patch-makefile.hdr (revision 436707) +++ urt/files/patch-makefile.hdr (nonexistent) @@ -1,16 +0,0 @@ ---- makefile.hdr.orig Fri Mar 6 23:04:57 1992 -+++ makefile.hdr Fri Dec 27 23:15:13 2002 -@@ -45,11 +45,11 @@ - #emit MachFLAGS - MachFLAGS = - --CFLAGS = -O $(DFLAGS) $(DIRFLAGS) $(ExtraCFLAGS) $(IFLAGS) $(MachFLAGS) -+CFLAGS += $(DFLAGS) $(DIRFLAGS) $(ExtraCFLAGS) $(IFLAGS) $(MachFLAGS) - IFLAGS = -I. -I$(RI) - - #ifdef GCC --CC=gcc -+CC ?= gcc - #endif - - Index: urt/files/patch-makefile.src =================================================================== --- urt/files/patch-makefile.src (revision 436707) +++ urt/files/patch-makefile.src (nonexistent) @@ -1,20 +0,0 @@ ---- makefile.src.orig Sat Jun 8 00:58:13 1991 -+++ makefile.src Fri Dec 27 23:02:36 2002 -@@ -17,7 +17,7 @@ - # clean deletes all but source, pristine (below) deletes installed stuff, too - default clean: doit - @for d in $(DIRS) ; do \ -- ( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \ -+ ( cd $$d ; echo make $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \ - done - - # install puts library, binaries and documentation into global location -@@ -29,7 +29,7 @@ - - install $(MAKE_TARGET) pristine depend:: doit - @for d in $(ALLDIRS) ; do \ -- ( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \ -+ ( cd $$d ; echo make $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \ - done - - Index: urt/files/patch-makefile.tlr =================================================================== --- urt/files/patch-makefile.tlr (revision 436707) +++ urt/files/patch-makefile.tlr (nonexistent) @@ -1,70 +0,0 @@ ---- makefile.tlr.orig Wed Aug 5 02:17:57 1992 -+++ makefile.tlr Sat Dec 28 00:48:28 2002 -@@ -7,7 +7,7 @@ - @sh -c "if test 'x$(DIRS)' != x ; then eval \ - 'set -e ; for dir in $(DIRS) ; do \ - (cd \$$dir ; echo Make ${HERE}\$$dir ; \ -- make $(MFLAGS) $(DIRMFLAGS) ) ; \ -+ $(MAKE) $(MFLAGS) $(DIRMFLAGS) ) ; \ - done' ; \ - else \ - true ; \ -@@ -18,35 +18,31 @@ - @sh -c "if test 'x$?' != x ; then eval \ - 'for pgm in $? ; do \ - dpgm=\`basename \$$pgm .out\` ; \ -- echo cp \$$pgm $(DEST)/\$$dpgm ; \ -- cp \$$pgm $(DEST)/\$$dpgm; \ -+ echo install \$$pgm $(DEST)/\$$dpgm ; \ -+ ${BSD_INSTALL_PROGRAM} \$$pgm $(DEST)/\$$dpgm; \ - done' ; \ - else \ - true ; \ - fi" -- touch install-pgm - - # Install all scripts - install-script: $(SCRIPTS) - @sh -c "if test 'x$?' != x ; then eval \ - 'for pgm in $? ; do \ - dpgm=\`basename \$$pgm .sh\` ; \ -- echo cp \$$pgm $(DEST)/\$$dpgm ; \ -- cp \$$pgm $(DEST)/\$$dpgm; \ -- echo chmod a+rx $(DEST)/\$$dpgm ; \ -- chmod a+rx $(DEST)/\$$dpgm; \ -+ echo install \$$pgm $(DEST)/\$$dpgm ; \ -+ ${BSD_INSTALL_SCRIPT} \$$pgm $(DEST)/\$$dpgm; \ - done' ; \ - else \ - true ; \ - fi" -- touch install-pgm - - # Install subdirectories - install-subdirs: subdirs - @sh -c "if test 'x$(DIRS)' != x ; then eval \ - 'for dir in $(DIRS) ; do \ - (cd \$$dir ; echo Install ${HERE}\$$dir ; \ -- make $(MFLAGS) $(DIRMFLAGS) install) ; \ -+ $(MAKE) $(MFLAGS) $(DIRMFLAGS) install) ; \ - done' ; \ - else \ - true ; \ -@@ -105,7 +101,7 @@ - 'for dir in $(ALLDIRS); do \ - if test -d $$dir ; then \ - (cd $$dir; echo Make ${HERE}$$dir pristine ; \ -- make $(MFLAGS) pristine); \ -+ $(MAKE) $(MFLAGS) pristine); \ - else \ - true; \ - fi; \ -@@ -124,7 +120,7 @@ - 'for dir in $(ALLDIRS); do \ - if test -d $$dir ; then \ - (cd $$dir; echo Clean ${HERE}$$dir ; \ -- make $(MFLAGS) clean); \ -+ $(MAKE) $(MFLAGS) clean); \ - else \ - true; \ - fi; \ Index: urt/files/patch-man__makefile.src =================================================================== --- urt/files/patch-man__makefile.src (revision 436707) +++ urt/files/patch-man__makefile.src (nonexistent) @@ -1,48 +0,0 @@ ---- man/makefile.src.orig Fri Feb 28 06:26:52 1992 -+++ man/makefile.src Sat Dec 28 00:43:57 2002 -@@ -211,39 +211,35 @@ - - # Put the manual pages into a global location - install: install-1 install-3 install-5 -- touch install - - install-1: $(PAGES1) - @-sh -c "if test '$(DEST)X' != X ; then \ - for i in $? ; do \ - dpgm=\`basename \$$i .1\`.$(SUFF1) ; \ -- echo cp \$$i $(DEST1)/\$$dpgm ; \ -- cp \$$i $(DEST1)/\$$dpgm ; \ -+ echo install \$$i $(DEST1)/\$$dpgm ; \ -+ ${BSD_INSTALL_MAN} \$$i $(DEST1)/\$$dpgm ; \ - done ; \ - else \ - true ; \ - fi" -- touch install-1 - - install-3: $(PAGES3) - @-sh -c "if test '$(DEST)X' != X ; then \ - for i in $? ; do \ - dpgm=${PAGE3_INSTALL_NAME} ; \ -- echo cp \$$i $(DEST3)/\$$dpgm ; \ -- cp \$$i $(DEST3)/\$$dpgm ; \ -+ echo install \$$i $(DEST3)/\$$dpgm ; \ -+ ${BSD_INSTALL_MAN} \$$i $(DEST3)/\$$dpgm ; \ - done ; \ - else \ - true ; \ - fi" -- touch install-3 - - install-5: man5/*.5 - @-sh -c "if test $(DEST)X != X; then \ -- echo cp $? $(DEST5); \ -- cp $? $(DEST5); \ -+ echo install $? $(DEST5); \ -+ ${BSD_INSTALL_MAN} $? $(DEST5); \ - else true; \ - fi" -- touch install-5 - - # Clean up installed man pages - pristine: Index: urt/files/patch-tools-rleaddcom.c =================================================================== --- urt/files/patch-tools-rleaddcom.c (revision 436707) +++ urt/files/patch-tools-rleaddcom.c (nonexistent) @@ -1,29 +0,0 @@ ---- tools/rleaddcom.c.orig 1992-04-30 23:11:00.000000000 +0900 -+++ tools/rleaddcom.c 2012-10-16 01:10:13.000000000 +0900 -@@ -26,6 +26,8 @@ - */ - - #include -+#include -+#include - #include "rle.h" - #include - #include /* for MAXPATHLEN */ -@@ -60,7 +62,7 @@ - * Algorithm: - * [None] - */ --void -+int - main( argc, argv ) - int argc; - char **argv; -@@ -118,7 +120,7 @@ - } - else - strcpy( buf, temp ); -- mktemp( buf ); -+ mkstemp( buf ); - #ifndef NO_OPEN_PIPES - /* Compressed file special case. */ - cp = i_fname + strlen( i_fname ) - 2; Index: urt/files/patch-tools-rlecat.c =================================================================== --- urt/files/patch-tools-rlecat.c (revision 436707) +++ urt/files/patch-tools-rlecat.c (nonexistent) @@ -1,28 +0,0 @@ ---- tools/rlecat.c.orig 1992-04-30 23:11:44.000000000 +0900 -+++ tools/rlecat.c 2012-10-16 00:43:29.000000000 +0900 -@@ -15,6 +15,7 @@ - */ - - #include -+#include - #include "rle.h" - #include "rle_raw.h" - -@@ -62,7 +63,7 @@ - * repeat count. If the collation flag (-c) is specified, then - * all images will be read before starting to repeat. - */ --void -+int - main( argc, argv ) - int argc; - char **argv; -@@ -110,7 +111,7 @@ - nflag = 0; /* Not really repeating! */ - else - { -- mktemp( temp ); /* Make a temporary file name */ -+ mkstemp( temp ); /* Make a temporary file name */ - tmpfile = rle_open_f( cmd_name( argv ), temp, "w+" ); - } - } Index: urt/files/patch-tools__applymap.c =================================================================== --- urt/files/patch-tools__applymap.c (revision 436707) +++ urt/files/patch-tools__applymap.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/applymap.c.orig 1995-05-03 01:51:29.000000000 +0900 -+++ tools/applymap.c 2012-10-15 22:52:09.000000000 +0900 -@@ -62,7 +62,7 @@ - * Algorithm: - * [None] - */ --void -+int - main( argc, argv ) - int argc; - char **argv; Index: urt/files/patch-tools__avg4.c =================================================================== --- urt/files/patch-tools__avg4.c (revision 436707) +++ urt/files/patch-tools__avg4.c (nonexistent) @@ -1,15 +0,0 @@ ---- tools/avg4.c.orig 1992-04-30 23:08:43.000000000 +0900 -+++ tools/avg4.c 2012-10-15 22:52:09.000000000 +0900 -@@ -34,10 +34,10 @@ - #include - #include "rle.h" - --static bit_count[16] = {0, 63, 63, 127, 63, 127, 127, -+static int bit_count[16] = {0, 63, 63, 127, 63, 127, 127, - 192, 63, 127, 127, 192, 127, 192, 192, 255}; - --void -+int - main(argc, argv) - int argc; - char *argv[]; Index: urt/files/patch-tools__clock__rleClock.c =================================================================== --- urt/files/patch-tools__clock__rleClock.c (revision 436707) +++ urt/files/patch-tools__clock__rleClock.c (nonexistent) @@ -1,37 +0,0 @@ ---- tools/clock/rleClock.c.orig 1992-04-30 23:19:39.000000000 +0900 -+++ tools/clock/rleClock.c 2012-10-16 00:38:03.000000000 +0900 -@@ -33,6 +33,7 @@ - */ - - #include -+#include - #include - #include - #include "rle.h" -@@ -133,7 +134,7 @@ - */ - - #ifdef USE_PROTOTYPES --void main(int argc, char *argv[]); -+int main(int argc, char *argv[]); - void ifImageSet(int i, int j, int value, color_t *color); - void drawHand(double place, double scale, double radius, int mask, int edge); - void rasterAddBits(int mask, int match, int value); -@@ -156,7 +157,7 @@ - void stackPush(int x, int y, int dir); - int stackPop(void); - #else --void main(); -+int main(); - void ifImageSet(); - void drawHand(); - void rasterAddBits(); -@@ -181,7 +182,7 @@ - #endif - char **gargv; - --void -+int - main (argc, argv) - int argc; - char *argv[]; Index: urt/files/patch-tools__crop.c =================================================================== --- urt/files/patch-tools__crop.c (revision 436707) +++ urt/files/patch-tools__crop.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/crop.c.orig 1992-04-30 23:09:41.000000000 +0900 -+++ tools/crop.c 2012-10-15 22:52:09.000000000 +0900 -@@ -35,7 +35,7 @@ - extern void rle_box(); - int pos_box_vals(); - --void -+int - main(argc, argv) - int argc; - char *argv[]; Index: urt/files/patch-tools__fant.c =================================================================== --- urt/files/patch-tools__fant.c (revision 436707) +++ urt/files/patch-tools__fant.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/fant.c.orig 1992-04-30 23:09:59.000000000 +0900 -+++ tools/fant.c 2012-10-15 22:52:09.000000000 +0900 -@@ -116,7 +116,7 @@ - void getraster(), xform_image(), putraster(), clear_raster(), xform_points(); - - --void -+int - main(argc,argv) - int argc; - char *argv[]; Index: urt/files/patch-tools__into.c =================================================================== --- urt/files/patch-tools__into.c (revision 436707) +++ urt/files/patch-tools__into.c (nonexistent) @@ -1,34 +0,0 @@ ---- tools/into.c.orig 1992-04-30 23:10:15.000000000 +0900 -+++ tools/into.c 2012-10-16 01:10:25.000000000 +0900 -@@ -27,6 +27,8 @@ - - #include "rle_config.h" - #include -+#include -+#include - #include - #include - #include /* for MAXPATHLEN */ -@@ -41,9 +43,12 @@ - short forceflg; /* overwrite an unwritable file? */ - - extern int errno; -+ -+#ifndef BSD - extern char *sys_errlist[]; -+#endif - --void -+int - main(argc, argv) - int argc; - char **argv; -@@ -82,7 +87,7 @@ - } - else - strcpy( buf, temp ); -- mktemp( buf ); -+ mkstemp( buf ); - - if ( (outf = fopen( buf, "w" )) == NULL ) - { Index: urt/files/patch-tools__makefile.src =================================================================== --- urt/files/patch-tools__makefile.src (revision 436707) +++ urt/files/patch-tools__makefile.src (nonexistent) @@ -1,20 +0,0 @@ ---- tools/makefile.src.orig Wed Jan 29 03:47:42 1992 -+++ tools/makefile.src Fri Dec 27 23:02:36 2002 -@@ -68,7 +68,7 @@ - fant.out: fant.o mallocNd.o - $(CC) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new - mv fant.new fant.out -- -+ - # rlebox and crop use some common code. - rle_box.o: $(RI)/rle.h $(RI)/rle_config.h $(RI)/rle_raw.h - -@@ -82,7 +82,7 @@ - # rleClock has it's own directory, must be built special - - rleClock.out: clock/font.c clock/font.h clock/font.src clock/rleClock.c -- (cd clock ; make) -+ (cd clock ; $(MAKE)) - - # Incremental install, copies everything ("$?") since last install to DEST dir. - install: $(PGMS) install-pgm Index: urt/files/patch-tools__mallocNd.c =================================================================== --- urt/files/patch-tools__mallocNd.c (revision 436707) +++ urt/files/patch-tools__mallocNd.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/mallocNd.c.orig 1992-04-30 23:10:24.000000000 +0900 -+++ tools/mallocNd.c 2012-10-16 00:32:49.000000000 +0900 -@@ -67,7 +67,7 @@ - - /* Imports */ - #include --extern char *malloc(); -+#include - - /* Forward declarations */ - char *BuildIndirectionTable(); Index: urt/files/patch-tools__mcut.c =================================================================== --- urt/files/patch-tools__mcut.c (revision 436707) +++ urt/files/patch-tools__mcut.c (nonexistent) @@ -1,29 +0,0 @@ ---- tools/mcut.c.orig 1992-01-24 01:24:41.000000000 +0900 -+++ tools/mcut.c 2012-10-15 22:52:09.000000000 +0900 -@@ -232,7 +232,7 @@ - * has a slot for a color map index, so the back pointer it followed - * only once. - */ --void -+int - main ( argc, argv ) - int argc; - char ** argv; -@@ -791,7 +791,7 @@ - TRACE( tmp_cb, cb_list ) - { - register color_t *newcol = &tmp_cb->color; -- register newdist = DISTANCE( ref_col, *newcol ); -+ register int newdist = DISTANCE( ref_col, *newcol ); - - if ( newdist < dist ) - { -@@ -963,7 +963,7 @@ - cmp_radices ( h1, h2 ) - histogram_t **h1, **h2; - { -- register c1 = -1, c2 = -1; -+ register int c1 = -1, c2 = -1; - - if ( *h1 ) - c1 = (*h1)->color & mask; Index: urt/files/patch-tools__mergechan.c =================================================================== --- urt/files/patch-tools__mergechan.c (revision 436707) +++ urt/files/patch-tools__mergechan.c (nonexistent) @@ -1,20 +0,0 @@ ---- tools/mergechan.c.orig 1992-01-24 01:25:19.000000000 +0900 -+++ tools/mergechan.c 2012-10-15 23:22:24.000000000 +0900 -@@ -19,7 +19,7 @@ - - #define RLE_END 32768 /* This should be in rle.h */ - --void -+int - main( argc, argv ) - int argc; - char ** argv; -@@ -79,7 +79,7 @@ - { - fprintf( stderr, - "%s: Images %d and %d are both from the standard input\n", -- stdin_used, i ); -+ argv[0], stdin_used, i ); - exit( -1 ); - } - } Index: urt/files/patch-tools__pyrmask.c =================================================================== --- urt/files/patch-tools__pyrmask.c (revision 436707) +++ urt/files/patch-tools__pyrmask.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/pyrmask.c.orig 1992-01-24 01:26:23.000000000 +0900 -+++ tools/pyrmask.c 2012-10-15 22:52:09.000000000 +0900 -@@ -20,7 +20,7 @@ - void alloc_pyramid(), copy_mask_bands(), rebuild_image(), dump_pyramid(); - void copy_half_bands(); - --void -+int - main(argc, argv) - int argc; - char *argv[]; Index: urt/files/patch-tools__repos.c =================================================================== --- urt/files/patch-tools__repos.c (revision 436707) +++ urt/files/patch-tools__repos.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/repos.c.orig 1992-01-24 01:26:40.000000000 +0900 -+++ tools/repos.c 2012-10-15 22:52:09.000000000 +0900 -@@ -34,7 +34,7 @@ - - char buffer[4096]; - --void -+int - main(argc, argv) - int argc; - char *argv[]; Index: urt/files/patch-tools__rlebg.c =================================================================== --- urt/files/patch-tools__rlebg.c (revision 436707) +++ urt/files/patch-tools__rlebg.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/rlebg.c.orig 1992-04-30 23:11:09.000000000 +0900 -+++ tools/rlebg.c 2012-10-15 22:52:09.000000000 +0900 -@@ -29,7 +29,7 @@ - #include "rle.h" - #include "rle_raw.h" - --void -+int - main(argc, argv) - int argc; - char *argv[]; Index: urt/files/patch-tools__rlebox.c =================================================================== --- urt/files/patch-tools__rlebox.c (revision 436707) +++ urt/files/patch-tools__rlebox.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/rlebox.c.orig 1992-04-30 23:11:25.000000000 +0900 -+++ tools/rlebox.c 2012-10-15 22:52:09.000000000 +0900 -@@ -40,7 +40,7 @@ - * Read the image file and find the smallest and largest X and Y - * coordinates of real image data. Use raw interface for speed. - */ --void -+int - main( argc, argv ) - int argc; - char **argv; Index: urt/files/patch-tools__rleccube.c =================================================================== --- urt/files/patch-tools__rleccube.c (revision 436707) +++ urt/files/patch-tools__rleccube.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/rleccube.c.orig 1992-04-30 23:11:54.000000000 +0900 -+++ tools/rleccube.c 2012-10-15 22:52:09.000000000 +0900 -@@ -66,7 +66,7 @@ - * Algorithm: - * Pretty simple. - */ --void -+int - main( argc, argv) - int argc; - char **argv; Index: urt/files/patch-tools__rlecomp.c =================================================================== --- urt/files/patch-tools__rlecomp.c (revision 436707) +++ urt/files/patch-tools__rlecomp.c (nonexistent) @@ -1,19 +0,0 @@ ---- tools/rlecomp.c.orig 1992-07-15 05:33:31.000000000 +0900 -+++ tools/rlecomp.c 2012-10-15 22:52:09.000000000 +0900 -@@ -30,6 +30,7 @@ - */ - - #include -+#include - #include "rle.h" - #include "rle_raw.h" - -@@ -63,7 +64,7 @@ - int * Anraw, *Bnraw; - rle_pixel * non_zero_pixels; - --void -+int - main(argc, argv) - int argc; - char *argv[]; Index: urt/files/patch-tools__rledither.c =================================================================== --- urt/files/patch-tools__rledither.c (revision 436707) +++ urt/files/patch-tools__rledither.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/rledither.c.orig 1992-01-24 01:42:22.000000000 +0900 -+++ tools/rledither.c 2012-10-15 22:52:09.000000000 +0900 -@@ -47,7 +47,7 @@ - - char *progname; - --void -+int - main(argc, argv) - int argc; - char *argv[]; Index: urt/files/patch-tools__rleflip.c =================================================================== --- urt/files/patch-tools__rleflip.c (revision 436707) +++ urt/files/patch-tools__rleflip.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/rleflip.c.orig 1992-01-24 01:45:49.000000000 +0900 -+++ tools/rleflip.c 2012-10-15 22:53:02.000000000 +0900 -@@ -44,7 +44,7 @@ - #define LEFT_FLAG 0x04 - #define RIGHT_FLAG 0x08 - --void -+int - main(argc, argv) - int argc; - char *argv[]; Index: urt/files/patch-tools__rlegrid.c =================================================================== --- urt/files/patch-tools__rlegrid.c (revision 436707) +++ urt/files/patch-tools__rlegrid.c (nonexistent) @@ -1,28 +0,0 @@ ---- tools/rlegrid.c.orig 1992-04-30 23:12:02.000000000 +0900 -+++ tools/rlegrid.c 2012-10-15 22:55:35.000000000 +0900 -@@ -51,7 +51,7 @@ - * [None] - * Algorithm: - */ --void -+int - main( argc, argv ) - int argc; - char **argv; -@@ -65,7 +65,7 @@ - rle_op **scanraw[2]; /* space for two raw scanline buffers */ - rle_op *p, *q; - int *nrawp[2]; -- unsigned char fg, bg; -+ unsigned char fg; - - out_hdr = *rle_hdr_init( NULL ); - -@@ -81,7 +81,6 @@ - exit( 1 ); - - fg = fg_color; -- bg = bg_color; - - outfile = rle_open_f( cmd_name( argv ), outfname, "w" ); - Index: urt/files/patch-tools__rlehdr.c =================================================================== --- urt/files/patch-tools__rlehdr.c (revision 436707) +++ urt/files/patch-tools__rlehdr.c (nonexistent) @@ -1,28 +0,0 @@ ---- tools/rlehdr.c.orig 1992-04-30 23:12:10.000000000 +0900 -+++ tools/rlehdr.c 2012-10-16 01:10:34.000000000 +0900 -@@ -32,6 +32,7 @@ - */ - - #include -+#include - #include "rle.h" - #include "../patchlevel.h" - -@@ -65,7 +66,7 @@ - * [None] - */ - --void -+int - main( argc, argv ) - int argc; - char **argv; -@@ -289,7 +290,7 @@ - { - if ( (cp = index( the_comment, '\n' )) ) - printf( ", %s=%.*s", *comment_names, -- cp - the_comment - 1, the_comment ); -+ *comment_names,cp - the_comment - 1, the_comment ); - else - printf( ", %s=%s", *comment_names, the_comment ); - break; Index: urt/files/patch-tools__rlehisto.c =================================================================== --- urt/files/patch-tools__rlehisto.c (revision 436707) +++ urt/files/patch-tools__rlehisto.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/rlehisto.c.orig 1992-02-12 06:36:14.000000000 +0900 -+++ tools/rlehisto.c 2012-10-15 22:56:16.000000000 +0900 -@@ -30,7 +30,7 @@ - - #define MAXCHAN 10 - --void -+int - main(argc, argv) - int argc; - char *argv[]; Index: urt/files/patch-tools__rleinterp.c =================================================================== --- urt/files/patch-tools__rleinterp.c (revision 436707) +++ urt/files/patch-tools__rleinterp.c (nonexistent) @@ -1,21 +0,0 @@ ---- tools/rleinterp.c.orig 1992-04-30 23:12:20.000000000 +0900 -+++ tools/rleinterp.c 2012-10-15 22:56:39.000000000 +0900 -@@ -38,6 +38,7 @@ - extern char *optarg; - extern int optind; - -+int - main( argc, argv ) - int argc; - char **argv; -@@ -48,8 +49,8 @@ - nom_sortie[BUFSIZ], - extension[80] , - *basenom, *rep ; -- int i, ni, n, nbimage=1; -- int rle_err, width, y, x ; -+ int i, n, nbimage=1; -+ int width, y, x ; - int iflag1 = 0 , iflag2 = 0, oflag = 0, fd ; - double alpha, beta ; - FILE * outfile; Index: urt/files/patch-tools__rleldmap.c =================================================================== --- urt/files/patch-tools__rleldmap.c (revision 436707) +++ urt/files/patch-tools__rleldmap.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/rleldmap.c.orig 1992-08-06 23:11:41.000000000 +0900 -+++ tools/rleldmap.c 2012-10-15 22:57:06.000000000 +0900 -@@ -135,7 +135,7 @@ - * the input file to the output file. If stdin is empty (no input at - * all, an output RLE file with just a color map will be generated). - */ --void -+int - main( argc, argv ) - int argc; - char **argv; Index: urt/files/patch-tools__rlemandl.c =================================================================== --- urt/files/patch-tools__rlemandl.c (revision 436707) +++ urt/files/patch-tools__rlemandl.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/rlemandl.c.orig 1992-01-24 03:31:20.000000000 +0900 -+++ tools/rlemandl.c 2012-10-15 22:57:29.000000000 +0900 -@@ -12,7 +12,7 @@ - #include - #include "rle.h" - --void -+int - main( argc, argv ) - int argc; - char **argv; Index: urt/files/patch-tools__rlenoise.c =================================================================== --- urt/files/patch-tools__rlenoise.c (revision 436707) +++ urt/files/patch-tools__rlenoise.c (nonexistent) @@ -1,19 +0,0 @@ ---- tools/rlenoise.c.orig 1992-01-24 03:31:37.000000000 +0900 -+++ tools/rlenoise.c 2012-10-16 00:48:26.000000000 +0900 -@@ -20,6 +20,7 @@ - */ - - #include -+#include - #include "rle.h" - - /* Change this according the value on your system. This is a crock. */ -@@ -27,7 +28,7 @@ - - #define MALLOC_ERR RLE_CHECK_ALLOC( cmd_name( argv ), 0, 0 ) - --void -+int - main( argc, argv ) - int argc; - char ** argv; Index: urt/files/patch-tools__rlepatch.c =================================================================== --- urt/files/patch-tools__rlepatch.c (revision 436707) +++ urt/files/patch-tools__rlepatch.c (nonexistent) @@ -1,29 +0,0 @@ ---- tools/rlepatch.c.orig 1992-01-24 03:33:19.000000000 +0900 -+++ tools/rlepatch.c 2012-10-15 22:58:01.000000000 +0900 -@@ -33,7 +33,7 @@ - - #define IN_WINDOW(y,wind) ((y >= wind.ymin) && (y <= wind.ymax)) - --void -+int - main( argc, argv ) - int argc; - char **argv; -@@ -46,7 +46,7 @@ - rle_pixel ** im_rows, **patch_rows, ** outrows; - int stdin_used = 0; - int patches = 0, oflag = 0, i, y, c, xlen, width; -- int rle_cnt, rle_err; -+ int rle_cnt; - - im_hdr = *rle_hdr_init( NULL ); - out_hdr = *rle_hdr_init( NULL ); -@@ -86,7 +86,7 @@ - } - - for ( rle_cnt = 0; -- (rle_err = rle_get_setup( &im_hdr )) == RLE_SUCCESS; -+ rle_get_setup( &im_hdr ) == RLE_SUCCESS; - rle_cnt++ ) - { - /* Get the patch files set up */ Index: urt/files/patch-tools__rleprint.c =================================================================== --- urt/files/patch-tools__rleprint.c (revision 436707) +++ urt/files/patch-tools__rleprint.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/rleprint.c.orig 1992-08-06 06:39:52.000000000 +0900 -+++ tools/rleprint.c 2012-10-15 22:58:20.000000000 +0900 -@@ -31,7 +31,7 @@ - - #define MALLOC_ERR RLE_CHECK_ALLOC( cmd_name( argv ), 0, 0 ) - --void -+int - main(argc, argv) - int argc; - char *argv[]; Index: urt/files/patch-tools__rlequant.c =================================================================== --- urt/files/patch-tools__rlequant.c (revision 436707) +++ urt/files/patch-tools__rlequant.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/rlequant.c.orig 1993-11-20 04:13:48.000000000 +0900 -+++ tools/rlequant.c 2012-10-15 22:58:46.000000000 +0900 -@@ -136,7 +136,7 @@ - * images. Because of this, the input cannot be coming from a - * pipe. - */ --void -+int - main( argc, argv ) - int argc; - char **argv; Index: urt/files/patch-tools__rlescale.c =================================================================== --- urt/files/patch-tools__rlescale.c (revision 436707) +++ urt/files/patch-tools__rlescale.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/rlescale.c.orig 1992-01-24 05:37:33.000000000 +0900 -+++ tools/rlescale.c 2012-10-15 22:59:09.000000000 +0900 -@@ -22,7 +22,7 @@ - #include "rle_raw.h" - #include - --void -+int - main( argc, argv ) - int argc; - char ** argv; Index: urt/files/patch-tools__rleselect.c =================================================================== --- urt/files/patch-tools__rleselect.c (revision 436707) +++ urt/files/patch-tools__rleselect.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/rleselect.c.orig 1992-04-30 23:13:32.000000000 +0900 -+++ tools/rleselect.c 2012-10-15 22:59:31.000000000 +0900 -@@ -78,7 +78,7 @@ - * specially.) Read images, skipping if they are not in the - * list, and copying if they are. - */ --void -+int - main( argc, argv ) - int argc; - char **argv; Index: urt/files/patch-tools__rlesetbg.c =================================================================== --- urt/files/patch-tools__rlesetbg.c (revision 436707) +++ urt/files/patch-tools__rlesetbg.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/rlesetbg.c.orig 1992-01-24 05:44:33.000000000 +0900 -+++ tools/rlesetbg.c 2012-10-15 22:59:51.000000000 +0900 -@@ -34,7 +34,7 @@ - - char buffer[4096]; - --void -+int - main(argc, argv) - int argc; - char *argv[]; Index: urt/files/patch-tools__rleskel.c =================================================================== --- urt/files/patch-tools__rleskel.c (revision 436707) +++ urt/files/patch-tools__rleskel.c (nonexistent) @@ -1,10 +0,0 @@ ---- tools/rleskel.c.orig 1992-01-24 05:45:50.000000000 +0900 -+++ tools/rleskel.c 2012-10-15 23:00:23.000000000 +0900 -@@ -51,6 +51,7 @@ - * Repeatedly read from the input until the file EOF or an - * error is encountered. - */ -+int - main( argc, argv ) - int argc; - char **argv; Index: urt/files/patch-tools__rlesortmap.c =================================================================== --- urt/files/patch-tools__rlesortmap.c (revision 436707) +++ urt/files/patch-tools__rlesortmap.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/rlesortmap.c.orig 1992-02-12 06:37:12.000000000 +0900 -+++ tools/rlesortmap.c 2012-10-15 23:00:51.000000000 +0900 -@@ -42,7 +42,7 @@ - * sense for pseudo-color input files, but the program will work - * on any input file. - */ --void -+int - main( argc, argv ) - int argc; - char **argv; Index: urt/files/patch-tools__rlespiff.c =================================================================== --- urt/files/patch-tools__rlespiff.c (revision 436707) +++ urt/files/patch-tools__rlespiff.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/rlespiff.c.orig 1992-04-30 23:13:47.000000000 +0900 -+++ tools/rlespiff.c 2012-10-15 23:01:13.000000000 +0900 -@@ -56,7 +56,7 @@ - * Then "rerun" the input, mapping the pixel values and writing - * them to the output file. - */ --void -+int - main( argc, argv ) - int argc; - char **argv; Index: urt/files/patch-tools__rlesplice.c =================================================================== --- urt/files/patch-tools__rlesplice.c (revision 436707) +++ urt/files/patch-tools__rlesplice.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/rlesplice.c.orig 1992-01-24 05:47:46.000000000 +0900 -+++ tools/rlesplice.c 2012-10-16 00:20:54.000000000 +0900 -@@ -77,7 +77,7 @@ - } - } - --void -+int - main(argc, argv) - int argc; - char *argv[]; Index: urt/files/patch-tools__rlesplit.c =================================================================== --- urt/files/patch-tools__rlesplit.c (revision 436707) +++ urt/files/patch-tools__rlesplit.c (nonexistent) @@ -1,19 +0,0 @@ ---- tools/rlesplit.c.orig 1992-11-10 05:33:51.000000000 +0900 -+++ tools/rlesplit.c 2012-10-16 00:51:06.000000000 +0900 -@@ -15,6 +15,7 @@ - */ - - #include -+#include - #include "rle.h" - #include "rle_raw.h" - -@@ -56,7 +57,7 @@ - * [None] - */ - --void -+int - main( argc, argv ) - int argc; - char **argv; Index: urt/files/patch-tools__rlestereo.c =================================================================== --- urt/files/patch-tools__rlestereo.c (revision 436707) +++ urt/files/patch-tools__rlestereo.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/rlestereo.c.orig 1992-04-30 23:14:08.000000000 +0900 -+++ tools/rlestereo.c 2012-10-15 23:02:05.000000000 +0900 -@@ -79,7 +79,7 @@ - * -r scale Scale factor for right-eye image (default 1.0). - */ - --void -+int - main(argc, argv) - int argc; - char **argv; Index: urt/files/patch-tools__rleswap.c =================================================================== --- urt/files/patch-tools__rleswap.c (revision 436707) +++ urt/files/patch-tools__rleswap.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/rleswap.c.orig 1992-07-06 13:50:59.000000000 +0900 -+++ tools/rleswap.c 2012-10-15 23:02:27.000000000 +0900 -@@ -99,7 +99,7 @@ - * Algorithm: - * [None] - */ --void -+int - main( argc, argv ) - int argc; - char **argv; Index: urt/files/patch-tools__rlezoom.c =================================================================== --- urt/files/patch-tools__rlezoom.c (revision 436707) +++ urt/files/patch-tools__rlezoom.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/rlezoom.c.orig 1992-01-24 05:56:16.000000000 +0900 -+++ tools/rlezoom.c 2012-10-15 23:02:47.000000000 +0900 -@@ -61,7 +61,7 @@ - * into runs. Write each line a number of times equal to the Y - * factor. - */ --void -+int - main( argc, argv ) - int argc; - char **argv; Index: urt/files/patch-tools__smush.c =================================================================== --- urt/files/patch-tools__smush.c (revision 436707) +++ urt/files/patch-tools__smush.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/smush.c.orig 1992-01-24 05:56:39.000000000 +0900 -+++ tools/smush.c 2012-10-15 23:03:11.000000000 +0900 -@@ -18,7 +18,7 @@ - - char *progname; - --void -+int - main(argc, argv) - int argc; - char *argv[]; Index: urt/files/patch-tools__to8.c =================================================================== --- urt/files/patch-tools__to8.c (revision 436707) +++ urt/files/patch-tools__to8.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/to8.c.orig 1994-01-20 00:35:24.000000000 +0900 -+++ tools/to8.c 2012-10-15 23:03:35.000000000 +0900 -@@ -73,7 +73,7 @@ - * [None] - */ - --void -+int - main( argc, argv ) - int argc; - char **argv; Index: urt/files/patch-tools__tobw.c =================================================================== --- urt/files/patch-tools__tobw.c (revision 436707) +++ urt/files/patch-tools__tobw.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/tobw.c.orig 1995-04-15 06:55:37.000000000 +0900 -+++ tools/tobw.c 2012-10-15 23:03:56.000000000 +0900 -@@ -64,7 +64,7 @@ - * Algorithm: - * [None] - */ --void -+int - main( argc, argv ) - int argc; - char **argv; Index: urt/files/patch-tools__unexp.c =================================================================== --- urt/files/patch-tools__unexp.c (revision 436707) +++ urt/files/patch-tools__unexp.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/unexp.c.orig 1992-01-24 05:58:37.000000000 +0900 -+++ tools/unexp.c 2012-10-15 23:04:14.000000000 +0900 -@@ -24,7 +24,7 @@ - rle_hdr in_hdr, out_hdr; - rle_pixel r_in, g_in, b_in; - --void -+int - main(argc,argv) - int argc; - char *argv[]; Index: urt/files/patch-tools__unslice.c =================================================================== --- urt/files/patch-tools__unslice.c (revision 436707) +++ urt/files/patch-tools__unslice.c (nonexistent) @@ -1,11 +0,0 @@ ---- tools/unslice.c.orig 1992-04-30 23:14:55.000000000 +0900 -+++ tools/unslice.c 2012-10-15 23:04:35.000000000 +0900 -@@ -51,7 +51,7 @@ - char *progname; - char **gargv; - --void -+int - main (argc, argv) - int argc; - char **argv;