View | Details | Raw Unified | Return to bug 218016
Collapse All | Expand All

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

Return to bug 218016