- Fix build with clang.

- Add MAKE_JOBS_SAFE.
- Trim header.
- Convert to optionsNG.

PR:		ports/172717
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

85 files changed, 1049 insertions, 81 deletions

diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile
index d50e361d5007..37b78d1f8d02 100644
--- a/graphics/urt/Makefile
+++ b/graphics/urt/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	urt
-# Date created:		Jan 5 1997
-# Whom:			cfs@ing.puc.cl (original)
-#
+# Created by: cfs@ing.puc.cl (original)
 # $FreeBSD$
-#
 
 PORTNAME=	urt
 PORTVERSION=	3.1b1
@@ -20,19 +16,21 @@ PATCH_DIST_STRIP=-p1
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Toolkit and library for raster image processing
 
-LIB_DEPENDS=	netpbm.1:${PORTSDIR}/graphics/netpbm
+LIB_DEPENDS=	netpbm:${PORTSDIR}/graphics/netpbm
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 NO_WRKSUBDIR=	yes
 
-USE_GCC=	any
 USE_XORG=	x11 xext
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=Configure
 CONFIGURE_ARGS=	config/urt
-MAKEFILE=	makefile
 USE_GMAKE=	yes
+MAKEFILE=	makefile
 ALL_TARGET=	# none
 USE_LDCONFIG=	yes
+MAKE_JOBS_SAFE=	yes
 
 MAN1=	aliastorle.1 applymap.1 avg4.1 crop.1 cubitorle.1 dvirle.1	\
 	fant.1 getx11.1 giftorle.1 graytorle.1 into.1 mcut.1 mergechan.1\
@@ -61,14 +59,16 @@ MAN3=	buildmap.3 bwdithermap.3 colorquant.3 dither.3 ditherbw.3	\
 MAN5=	rle.5
 MLINKS=	rle.5 RLE.5
 
+.include <bsd.port.options.mk>
+
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	cd ${WRKDIR}/doc && ${FIND} . | \
-		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
-	@${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKDIR} && ${FIND} img | \
-		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
+	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR})
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}/img
+	@(cd ${WRKSRC}/img && ${COPYTREE_SHARE} . ${EXAMPLESDIR}/img)
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/urt/files/patch-cnv::gif2rle.c b/graphics/urt/files/patch-cnv::gif2rle.c
index c2f9cd8b49f5..da3bf2435cb4 100644
--- a/graphics/urt/files/patch-cnv::gif2rle.c
+++ b/graphics/urt/files/patch-cnv::gif2rle.c
@@ -1,17 +1,17 @@
---- cnv/giftorle.c.orig	Mon Oct 18 08:59:37 1993
-+++ cnv/giftorle.c	Thu Nov 29 10:42:17 2007
-@@ -21,7 +21,10 @@
- /* |   don't try to make money off it, or pretend that you wrote it.  | */
+--- 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	<stdlib.h>
  #include	<stdio.h>
++#include	<stdlib.h>
++#include	<string.h>
 +#include	<unistd.h>
 +
  #include	"rle.h"
  
  #ifndef lint
-@@ -69,7 +72,7 @@
+@@ -69,7 +73,7 @@
  
  static int output_colormap = FALSE;
  
@@ -20,7 +20,7 @@
  main(argc,argv)
  int	argc;
  char	**argv;
-@@ -96,7 +99,7 @@
+@@ -96,7 +100,7 @@
  
      while ( nfname-- > 0 )
  	(void)ReadGIF( *infname++ );
@@ -29,7 +29,7 @@
  }
  
  int
-@@ -203,7 +206,7 @@
+@@ -203,7 +207,7 @@
  	    EasyFail("EOF in extention\n",TRUE);
  	if (c == 0)
  	    return FALSE;
@@ -38,7 +38,7 @@
  	    EasyFail("EOF in extention\n",TRUE);
      }
  }
-@@ -278,7 +281,7 @@
+@@ -278,7 +282,7 @@
  	max_code_size = 2*clear_code;
  	max_code = clear_code+2;
  
diff --git a/graphics/urt/files/patch-cnv::rletops.c b/graphics/urt/files/patch-cnv::rletops.c
index 19d1898d8772..33c06ea787d9 100644
--- a/graphics/urt/files/patch-cnv::rletops.c
+++ b/graphics/urt/files/patch-cnv::rletops.c
@@ -1,5 +1,14 @@
---- cnv/rletops.c.orig	Thu Mar 10 20:09:59 2005
-+++ cnv/rletops.c	Thu Mar 10 20:13:29 2005
+--- 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, 
diff --git a/graphics/urt/files/patch-cnv::rletorla.c b/graphics/urt/files/patch-cnv::rletorla.c
index 9c52b427891e..d242530e2af2 100644
--- a/graphics/urt/files/patch-cnv::rletorla.c
+++ b/graphics/urt/files/patch-cnv::rletorla.c
@@ -1,6 +1,28 @@
---- cnv/rletorla.c.orig	Thu Mar 10 23:41:56 2005
-+++ cnv/rletorla.c	Thu Mar 10 23:39:39 2005
-@@ -312,7 +312,7 @@
+--- 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 <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
+ #include "rlb_header.h"
+ #include "rle.h"
+ 
++#if 0
+ #ifdef USE_STDLIB_H
+ #include <stdlib.h>
+ #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;
@@ -9,7 +31,7 @@
     short	len;
     long		offptr;
  /*
-@@ -348,7 +348,7 @@
+@@ -348,7 +353,7 @@
        exit(-1);
        }
     for (scan = 0; scan < height; scan++) {
diff --git a/graphics/urt/files/patch-cnv__aliastorle.c b/graphics/urt/files/patch-cnv__aliastorle.c
new file mode 100644
index 000000000000..94d6c0b1e8cd
--- /dev/null
+++ b/graphics/urt/files/patch-cnv__aliastorle.c
@@ -0,0 +1,11 @@
+--- 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;
diff --git a/graphics/urt/files/patch-cnv__cubitorle.c b/graphics/urt/files/patch-cnv__cubitorle.c
new file mode 100644
index 000000000000..a3a75c6e9565
--- /dev/null
+++ b/graphics/urt/files/patch-cnv__cubitorle.c
@@ -0,0 +1,11 @@
+--- 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[];
diff --git a/graphics/urt/files/patch-cnv__graytorle.c b/graphics/urt/files/patch-cnv__graytorle.c
new file mode 100644
index 000000000000..795e6bcceada
--- /dev/null
+++ b/graphics/urt/files/patch-cnv__graytorle.c
@@ -0,0 +1,11 @@
+--- 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[];
diff --git a/graphics/urt/files/patch-cnv__painttorle.c b/graphics/urt/files/patch-cnv__painttorle.c
new file mode 100644
index 000000000000..587e7d426a8b
--- /dev/null
+++ b/graphics/urt/files/patch-cnv__painttorle.c
@@ -0,0 +1,11 @@
+--- 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[];
diff --git a/graphics/urt/files/patch-cnv__pgmtorle.c b/graphics/urt/files/patch-cnv__pgmtorle.c
new file mode 100644
index 000000000000..3d6ca174cf6e
--- /dev/null
+++ b/graphics/urt/files/patch-cnv__pgmtorle.c
@@ -0,0 +1,10 @@
+--- 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 <stdio.h>
++#include <string.h>
+ #include <pgm.h>
+ #undef abs			/* Screws up stdlib.h. */
+ #define NO_DECLARE_MALLOC
diff --git a/graphics/urt/files/patch-cnv__ppmtorle.c b/graphics/urt/files/patch-cnv__ppmtorle.c
new file mode 100644
index 000000000000..5eda6ba1d7d4
--- /dev/null
+++ b/graphics/urt/files/patch-cnv__ppmtorle.c
@@ -0,0 +1,10 @@
+--- 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 <stdio.h>
++#include <string.h>
+ #include <ppm.h>
+ 
+ #define VPRINTF if (verbose || header) fprintf
diff --git a/graphics/urt/files/patch-cnv__rastorle.c b/graphics/urt/files/patch-cnv__rastorle.c
new file mode 100644
index 000000000000..767cdad78a12
--- /dev/null
+++ b/graphics/urt/files/patch-cnv__rastorle.c
@@ -0,0 +1,11 @@
+--- 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[];
diff --git a/graphics/urt/files/patch-cnv__rawtorle.c b/graphics/urt/files/patch-cnv__rawtorle.c
new file mode 100644
index 000000000000..2f988aaab05d
--- /dev/null
+++ b/graphics/urt/files/patch-cnv__rawtorle.c
@@ -0,0 +1,11 @@
+--- 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[];
diff --git a/graphics/urt/files/patch-cnv__rlesplice.c b/graphics/urt/files/patch-cnv__rlesplice.c
new file mode 100644
index 000000000000..5ecd89bdc89d
--- /dev/null
+++ b/graphics/urt/files/patch-cnv__rlesplice.c
@@ -0,0 +1,19 @@
+--- 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 <stdio.h>
++#include <string.h>
+ #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[];
diff --git a/graphics/urt/files/patch-cnv__rletoabA60.c b/graphics/urt/files/patch-cnv__rletoabA60.c
new file mode 100644
index 000000000000..d1ed37e12ab0
--- /dev/null
+++ b/graphics/urt/files/patch-cnv__rletoabA60.c
@@ -0,0 +1,11 @@
+--- 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;
diff --git a/graphics/urt/files/patch-cnv__rletoabA62__rletoabA62.c b/graphics/urt/files/patch-cnv__rletoabA62__rletoabA62.c
new file mode 100644
index 000000000000..5cbbab3c5249
--- /dev/null
+++ b/graphics/urt/files/patch-cnv__rletoabA62__rletoabA62.c
@@ -0,0 +1,22 @@
+--- 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 <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
++#include <fcntl.h>
+ 
+ #ifndef TRUE
+ #define TRUE 1
+@@ -101,7 +105,7 @@
+  * Main entry...
+  */
+ 
+-void
++int
+ main(argc,argv)
+ int argc;
+ char **argv;
diff --git a/graphics/urt/files/patch-cnv__rletoalias.c b/graphics/urt/files/patch-cnv__rletoalias.c
new file mode 100644
index 000000000000..fe1daefed07e
--- /dev/null
+++ b/graphics/urt/files/patch-cnv__rletoalias.c
@@ -0,0 +1,11 @@
+--- 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;
diff --git a/graphics/urt/files/patch-cnv__rletocgm.c b/graphics/urt/files/patch-cnv__rletocgm.c
new file mode 100644
index 000000000000..ccf5761fda14
--- /dev/null
+++ b/graphics/urt/files/patch-cnv__rletocgm.c
@@ -0,0 +1,10 @@
+--- 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;
diff --git a/graphics/urt/files/patch-cnv__rletogif__rletogif.c b/graphics/urt/files/patch-cnv__rletogif__rletogif.c
new file mode 100644
index 000000000000..9989466260b4
--- /dev/null
+++ b/graphics/urt/files/patch-cnv__rletogif__rletogif.c
@@ -0,0 +1,19 @@
+--- 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 <stdio.h>
++#include <string.h>
+ #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[];
diff --git a/graphics/urt/files/patch-cnv__rletogray.c b/graphics/urt/files/patch-cnv__rletogray.c
new file mode 100644
index 000000000000..f6ce5149ad55
--- /dev/null
+++ b/graphics/urt/files/patch-cnv__rletogray.c
@@ -0,0 +1,19 @@
+--- 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 <stdio.h>
++#include <string.h>
+ #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[];
diff --git a/graphics/urt/files/patch-cnv__rletoiris.c b/graphics/urt/files/patch-cnv__rletoiris.c
new file mode 100644
index 000000000000..b86eea8c2214
--- /dev/null
+++ b/graphics/urt/files/patch-cnv__rletoiris.c
@@ -0,0 +1,10 @@
+--- 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[];
diff --git a/graphics/urt/files/patch-cnv__rletopaint.c b/graphics/urt/files/patch-cnv__rletopaint.c
new file mode 100644
index 000000000000..08fceeef1f8c
--- /dev/null
+++ b/graphics/urt/files/patch-cnv__rletopaint.c
@@ -0,0 +1,11 @@
+--- 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[];
diff --git a/graphics/urt/files/patch-cnv__rletorast.c b/graphics/urt/files/patch-cnv__rletorast.c
new file mode 100644
index 000000000000..5405c08ee723
--- /dev/null
+++ b/graphics/urt/files/patch-cnv__rletorast.c
@@ -0,0 +1,11 @@
+--- 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;
diff --git a/graphics/urt/files/patch-cnv__rletoraw.c b/graphics/urt/files/patch-cnv__rletoraw.c
new file mode 100644
index 000000000000..6d930c96c121
--- /dev/null
+++ b/graphics/urt/files/patch-cnv__rletoraw.c
@@ -0,0 +1,11 @@
+--- 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[];
diff --git a/graphics/urt/files/patch-cnv__rletotarga.c b/graphics/urt/files/patch-cnv__rletotarga.c
new file mode 100644
index 000000000000..41bde4160045
--- /dev/null
+++ b/graphics/urt/files/patch-cnv__rletotarga.c
@@ -0,0 +1,11 @@
+--- 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[];
diff --git a/graphics/urt/files/patch-cnv__rletotiff.c b/graphics/urt/files/patch-cnv__rletotiff.c
new file mode 100644
index 000000000000..c2b31f5300f7
--- /dev/null
+++ b/graphics/urt/files/patch-cnv__rletotiff.c
@@ -0,0 +1,11 @@
+--- 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[];
diff --git a/graphics/urt/files/patch-cnv__targatorle.c b/graphics/urt/files/patch-cnv__targatorle.c
new file mode 100644
index 000000000000..3dcb5331076e
--- /dev/null
+++ b/graphics/urt/files/patch-cnv__targatorle.c
@@ -0,0 +1,11 @@
+--- 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[];
diff --git a/graphics/urt/files/patch-cnv__tifftorle.c b/graphics/urt/files/patch-cnv__tifftorle.c
new file mode 100644
index 000000000000..9a4f2416e495
--- /dev/null
+++ b/graphics/urt/files/patch-cnv__tifftorle.c
@@ -0,0 +1,11 @@
+--- 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[];
diff --git a/graphics/urt/files/patch-cnv__wasatchrle.c b/graphics/urt/files/patch-cnv__wasatchrle.c
new file mode 100644
index 000000000000..f18e1c598f33
--- /dev/null
+++ b/graphics/urt/files/patch-cnv__wasatchrle.c
@@ -0,0 +1,19 @@
+--- 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 <stdio.h>
++#include <string.h>
+ #include <ctype.h>
+ #include <errno.h>
+ #include "rle.h"
+@@ -51,7 +52,7 @@
+     rle_pixel count, data;
+ } was_op;
+ 
+-void
++int
+ main(argc, argv)
+ int argc;
+ char **argv;
diff --git a/graphics/urt/files/patch-cnv__xbmtorle.c b/graphics/urt/files/patch-cnv__xbmtorle.c
new file mode 100644
index 000000000000..77787953e2f6
--- /dev/null
+++ b/graphics/urt/files/patch-cnv__xbmtorle.c
@@ -0,0 +1,19 @@
+--- 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 <string.h>
+ #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;
diff --git a/graphics/urt/files/patch-config::urt b/graphics/urt/files/patch-config::urt
index bde1fb8ace6e..9b0cbd2b23c9 100644
--- a/graphics/urt/files/patch-config::urt
+++ b/graphics/urt/files/patch-config::urt
@@ -60,7 +60,7 @@
 -##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 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.
diff --git a/graphics/urt/files/patch-get__getx11__getx11.c b/graphics/urt/files/patch-get__getx11__getx11.c
new file mode 100644
index 000000000000..d3fd9abf0bd2
--- /dev/null
+++ b/graphics/urt/files/patch-get__getx11__getx11.c
@@ -0,0 +1,11 @@
+--- 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;
diff --git a/graphics/urt/files/patch-get__getx11__getx11.h b/graphics/urt/files/patch-get__getx11__getx11.h
new file mode 100644
index 000000000000..31dea06ae404
--- /dev/null
+++ b/graphics/urt/files/patch-get__getx11__getx11.h
@@ -0,0 +1,12 @@
+--- 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 <stdio.h>
++#include <string.h>
++#include <sys/types.h>
++#include <unistd.h>
+ #include <math.h>
+ #include <ctype.h>
+ #include <X11/X.h>
diff --git a/graphics/urt/files/patch-get__getx11__prototypes.h b/graphics/urt/files/patch-get__getx11__prototypes.h
new file mode 100644
index 000000000000..9e0315afd1eb
--- /dev/null
+++ b/graphics/urt/files/patch-get__getx11__prototypes.h
@@ -0,0 +1,9 @@
+--- 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);
diff --git a/graphics/urt/files/patch-lib-rle_hdr.c b/graphics/urt/files/patch-lib-rle_hdr.c
index ffe4250a375b..0bf9d396a844 100644
--- a/graphics/urt/files/patch-lib-rle_hdr.c
+++ b/graphics/urt/files/patch-lib-rle_hdr.c
@@ -1,6 +1,14 @@
---- lib/rle_hdr.c.orig	Thu Nov 29 21:57:53 2007
-+++ lib/rle_hdr.c	Thu Nov 29 21:59:23 2007
-@@ -269,6 +269,8 @@
+--- 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 <string.h>
+ #include "rle.h"
+ 
+ /*****************************************************************
+@@ -269,6 +270,8 @@
  {
      rle_hdr *ret_hdr;
  
diff --git a/graphics/urt/files/patch-lib-rle_open_f.c b/graphics/urt/files/patch-lib-rle_open_f.c
index 516da13be440..1743693a7a2c 100644
--- a/graphics/urt/files/patch-lib-rle_open_f.c
+++ b/graphics/urt/files/patch-lib-rle_open_f.c
@@ -1,6 +1,16 @@
---- lib/rle_open_f.c.orig	Thu May 13 16:28:51 1993
-+++ lib/rle_open_f.c	Thu Nov 29 23:38:49 2007
-@@ -56,6 +56,7 @@
+--- 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 <stdio.h>
++#include <string.h>
++#include <sys/types.h>
++#include <unistd.h>
+ 
+ #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;
@@ -8,7 +18,7 @@
  
  #ifdef STDIO_NEEDS_BINARY
      char mode_string[32];	/* Should be enough. */
-@@ -150,7 +151,8 @@
+@@ -150,7 +154,8 @@
  	else if ( cp > file_name && *cp == '.' && *(cp + 1) == 'Z' )
  	{
  	    int thepid;		/* PID from my_popen. */
@@ -18,7 +28,7 @@
  	    if ( combuf == NULL )
  	    {
  		err_str = "%s: out of memory opening (compressed) %s for %s";
-@@ -158,11 +160,11 @@
+@@ -158,11 +163,11 @@
  	    }
  
  	    if ( *mode == 'w' )
@@ -33,7 +43,7 @@
  
  	    fp = my_popen( combuf, mode, &thepid );
  	    free( combuf );
-@@ -256,7 +258,6 @@
+@@ -256,7 +261,6 @@
      int pipefd[2];
      int i;
      char *argv[4];
diff --git a/graphics/urt/files/patch-lib::scanargs.c b/graphics/urt/files/patch-lib::scanargs.c
index 45b45d027697..86a3d3c6a4c2 100644
--- a/graphics/urt/files/patch-lib::scanargs.c
+++ b/graphics/urt/files/patch-lib::scanargs.c
@@ -1,6 +1,14 @@
---- lib/scanargs.c.orig	Thu Feb 27 16:18:15 1992
-+++ lib/scanargs.c	Thu Nov 29 23:22:40 2007
-@@ -128,10 +128,10 @@
+--- 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 <stdio.h>
++#include <string.h>
+ #include <ctype.h>
+ #ifndef USE_STDARG
+ #include <varargs.h>
+@@ -128,10 +129,10 @@
  va_list argl;
  {
  
@@ -13,7 +21,7 @@
      int	    optarg = 0;			/* where optional args start */
      int	    nopt = 0;
      char    tmpflg,			/* temp flag */
-@@ -408,7 +408,8 @@
+@@ -408,7 +409,8 @@
  				 * Copy the string so we remain nondestructive
  				 */
  				s = NEW( char, strlen(argp)+1 );
diff --git a/graphics/urt/files/patch-lib__Runput.c b/graphics/urt/files/patch-lib__Runput.c
new file mode 100644
index 000000000000..7e53cfe48bb2
--- /dev/null
+++ b/graphics/urt/files/patch-lib__Runput.c
@@ -0,0 +1,12 @@
+--- 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	<stdio.h>
++#include	<string.h>
+ #include	"rle_put.h"
+ #include	"rle.h"
+ #include	"rle_code.h"
diff --git a/graphics/urt/files/patch-lib__rle_addhist.c b/graphics/urt/files/patch-lib__rle_addhist.c
new file mode 100644
index 000000000000..da64668183a1
--- /dev/null
+++ b/graphics/urt/files/patch-lib__rle_addhist.c
@@ -0,0 +1,10 @@
+--- 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 <stdio.h>
++#include <string.h>
+ 
+ #ifdef	USE_TIME_H
+ #include <time.h>
diff --git a/graphics/urt/files/patch-lib__rle_error.c b/graphics/urt/files/patch-lib__rle_error.c
new file mode 100644
index 000000000000..534ffa8e757e
--- /dev/null
+++ b/graphics/urt/files/patch-lib__rle_error.c
@@ -0,0 +1,10 @@
+--- 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 <string.h>
+ #include "rle.h"
+ 
+ /*****************************************************************
diff --git a/graphics/urt/files/patch-tools-rleaddcom.c b/graphics/urt/files/patch-tools-rleaddcom.c
index 8421d7f718ae..360c20b9c496 100644
--- a/graphics/urt/files/patch-tools-rleaddcom.c
+++ b/graphics/urt/files/patch-tools-rleaddcom.c
@@ -1,6 +1,15 @@
---- tools/rleaddcom.c.orig	Thu Nov 29 16:12:38 2007
-+++ tools/rleaddcom.c	Thu Nov 29 16:25:14 2007
-@@ -60,7 +60,7 @@
+--- 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 <stdio.h>
++#include <string.h>
++#include <unistd.h>
+ #include "rle.h"
+ #include <sys/types.h>
+ #include <sys/param.h>			/* for MAXPATHLEN */
+@@ -60,7 +62,7 @@
   * Algorithm:
   *	[None]
   */
@@ -9,7 +18,7 @@
  main( argc, argv )
  int argc;
  char **argv;
-@@ -118,7 +118,7 @@
+@@ -118,7 +120,7 @@
  	}
  	else
  	    strcpy( buf, temp );
diff --git a/graphics/urt/files/patch-tools-rlecat.c b/graphics/urt/files/patch-tools-rlecat.c
index ea47498d162d..d2b3e89f669f 100644
--- a/graphics/urt/files/patch-tools-rlecat.c
+++ b/graphics/urt/files/patch-tools-rlecat.c
@@ -1,6 +1,14 @@
---- tools/rlecat.c.orig	Thu Nov 29 16:39:51 2007
-+++ tools/rlecat.c	Thu Nov 29 16:40:44 2007
-@@ -62,7 +62,7 @@
+--- 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 <stdio.h>
++#include <unistd.h>
+ #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.
   */
@@ -9,7 +17,7 @@
  main( argc, argv )
  int argc;
  char **argv;
-@@ -110,7 +110,7 @@
+@@ -110,7 +111,7 @@
  	    nflag = 0;		/* Not really repeating! */
  	else
  	{
diff --git a/graphics/urt/files/patch-tools::avg4.c b/graphics/urt/files/patch-tools::avg4.c
index d30e7ee57c9e..aabf0b37e01c 100644
--- a/graphics/urt/files/patch-tools::avg4.c
+++ b/graphics/urt/files/patch-tools::avg4.c
@@ -1,6 +1,6 @@
---- tools/avg4.c.orig	Thu Mar 10 20:47:48 2005
-+++ tools/avg4.c	Thu Mar 10 20:48:11 2005
-@@ -34,7 +34,7 @@
+--- 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 <stdio.h>
  #include "rle.h"
  
@@ -8,4 +8,8 @@
 +static int bit_count[16] = {0, 63, 63, 127, 63, 127, 127,
      192, 63, 127, 127, 192, 127, 192, 192, 255};
  
- void
+-void
++int
+ main(argc, argv)
+ int	argc;
+ char	*argv[];
diff --git a/graphics/urt/files/patch-tools::into.c b/graphics/urt/files/patch-tools::into.c
index 387c0c71b01e..8440ec8aa256 100644
--- a/graphics/urt/files/patch-tools::into.c
+++ b/graphics/urt/files/patch-tools::into.c
@@ -1,6 +1,15 @@
---- tools/into.c.orig	Thu Apr 30 09:10:15 1992
-+++ tools/into.c	Thu Nov 29 16:17:55 2007
-@@ -41,9 +41,12 @@
+--- 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 <stdio.h>
++#include <string.h>
++#include <unistd.h>
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <sys/param.h>			/* for MAXPATHLEN */
+@@ -41,9 +43,12 @@
  short forceflg;				/* overwrite an unwritable file? */
  
  extern int errno;
@@ -14,7 +23,7 @@
  main(argc, argv)
  int argc;
  char **argv;
-@@ -82,7 +85,7 @@
+@@ -82,7 +87,7 @@
      }
      else
  	strcpy( buf, temp );
diff --git a/graphics/urt/files/patch-tools::mcut.c b/graphics/urt/files/patch-tools::mcut.c
index 3f33abf8b6f0..b7268b3145d4 100644
--- a/graphics/urt/files/patch-tools::mcut.c
+++ b/graphics/urt/files/patch-tools::mcut.c
@@ -1,5 +1,14 @@
---- tools/mcut.c.orig	Thu Mar 10 20:54:44 2005
-+++ tools/mcut.c	Thu Mar 10 20:56:44 2005
+--- 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 )
  		    {
diff --git a/graphics/urt/files/patch-tools::mergechan.c b/graphics/urt/files/patch-tools::mergechan.c
index 254a0f75d480..bf2a7239bbfc 100644
--- a/graphics/urt/files/patch-tools::mergechan.c
+++ b/graphics/urt/files/patch-tools::mergechan.c
@@ -1,5 +1,14 @@
---- tools/mergechan.c.orig	Thu Mar 10 20:58:34 2005
-+++ tools/mergechan.c	Thu Mar 10 21:00:31 2005
+--- 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,
diff --git a/graphics/urt/files/patch-tools::rlegrid.c b/graphics/urt/files/patch-tools::rlegrid.c
index 89a7d4c971ff..4ea848aebb0e 100644
--- a/graphics/urt/files/patch-tools::rlegrid.c
+++ b/graphics/urt/files/patch-tools::rlegrid.c
@@ -1,5 +1,14 @@
---- tools/rlegrid.c.orig	Thu Mar 10 21:01:59 2005
-+++ tools/rlegrid.c	Thu Mar 10 21:03:02 2005
+--- 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;
diff --git a/graphics/urt/files/patch-tools::rlehdr.c b/graphics/urt/files/patch-tools::rlehdr.c
index d8805d6389bb..112055bcd8f5 100644
--- a/graphics/urt/files/patch-tools::rlehdr.c
+++ b/graphics/urt/files/patch-tools::rlehdr.c
@@ -1,6 +1,23 @@
---- tools/rlehdr.c.orig	Thu Mar 10 21:04:49 2005
-+++ tools/rlehdr.c	Thu Mar 10 21:13:14 2005
-@@ -289,7 +289,7 @@
+--- 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 <stdio.h>
++#include <string.h>
+ #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,
diff --git a/graphics/urt/files/patch-tools::rleinterp.c b/graphics/urt/files/patch-tools::rleinterp.c
index cfd7e41415d1..043153dc74fb 100644
--- a/graphics/urt/files/patch-tools::rleinterp.c
+++ b/graphics/urt/files/patch-tools::rleinterp.c
@@ -1,6 +1,14 @@
---- tools/rleinterp.c.orig	Thu Mar 10 21:14:52 2005
-+++ tools/rleinterp.c	Thu Mar 10 21:15:40 2005
-@@ -48,8 +48,8 @@
+--- 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 ;
diff --git a/graphics/urt/files/patch-tools::rlepatch.c b/graphics/urt/files/patch-tools::rlepatch.c
index 2befeafd507d..8c4f71540109 100644
--- a/graphics/urt/files/patch-tools::rlepatch.c
+++ b/graphics/urt/files/patch-tools::rlepatch.c
@@ -1,5 +1,14 @@
---- tools/rlepatch.c.orig	Thu Mar 10 21:17:33 2005
-+++ tools/rlepatch.c	Thu Mar 10 21:18:56 2005
+--- 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;
diff --git a/graphics/urt/files/patch-tools__applymap.c b/graphics/urt/files/patch-tools__applymap.c
new file mode 100644
index 000000000000..2acc820004ce
--- /dev/null
+++ b/graphics/urt/files/patch-tools__applymap.c
@@ -0,0 +1,11 @@
+--- 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;
diff --git a/graphics/urt/files/patch-tools__clock__rleClock.c b/graphics/urt/files/patch-tools__clock__rleClock.c
new file mode 100644
index 000000000000..138771439d2a
--- /dev/null
+++ b/graphics/urt/files/patch-tools__clock__rleClock.c
@@ -0,0 +1,37 @@
+--- 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 <stdio.h>
++#include <string.h>
+ #include <math.h>
+ #include <ctype.h>
+ #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[];
diff --git a/graphics/urt/files/patch-tools__crop.c b/graphics/urt/files/patch-tools__crop.c
new file mode 100644
index 000000000000..3d0e0b9a3c33
--- /dev/null
+++ b/graphics/urt/files/patch-tools__crop.c
@@ -0,0 +1,11 @@
+--- 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[];
diff --git a/graphics/urt/files/patch-tools__fant.c b/graphics/urt/files/patch-tools__fant.c
new file mode 100644
index 000000000000..4a496a24a708
--- /dev/null
+++ b/graphics/urt/files/patch-tools__fant.c
@@ -0,0 +1,11 @@
+--- 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[];
diff --git a/graphics/urt/files/patch-tools__mallocNd.c b/graphics/urt/files/patch-tools__mallocNd.c
new file mode 100644
index 000000000000..fdd974a026e7
--- /dev/null
+++ b/graphics/urt/files/patch-tools__mallocNd.c
@@ -0,0 +1,11 @@
+--- 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 <stdio.h>
+-extern char *malloc();
++#include <stdlib.h>
+ 
+ /* Forward declarations */
+ char *BuildIndirectionTable();
diff --git a/graphics/urt/files/patch-tools__pyrmask.c b/graphics/urt/files/patch-tools__pyrmask.c
new file mode 100644
index 000000000000..491707e092ad
--- /dev/null
+++ b/graphics/urt/files/patch-tools__pyrmask.c
@@ -0,0 +1,11 @@
+--- 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[];
diff --git a/graphics/urt/files/patch-tools__repos.c b/graphics/urt/files/patch-tools__repos.c
new file mode 100644
index 000000000000..2dbcbbaff312
--- /dev/null
+++ b/graphics/urt/files/patch-tools__repos.c
@@ -0,0 +1,11 @@
+--- 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[];
diff --git a/graphics/urt/files/patch-tools__rlebg.c b/graphics/urt/files/patch-tools__rlebg.c
new file mode 100644
index 000000000000..b7c83e7ebb98
--- /dev/null
+++ b/graphics/urt/files/patch-tools__rlebg.c
@@ -0,0 +1,11 @@
+--- 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[];
diff --git a/graphics/urt/files/patch-tools__rlebox.c b/graphics/urt/files/patch-tools__rlebox.c
new file mode 100644
index 000000000000..92bc587bf01e
--- /dev/null
+++ b/graphics/urt/files/patch-tools__rlebox.c
@@ -0,0 +1,11 @@
+--- 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;
diff --git a/graphics/urt/files/patch-tools__rleccube.c b/graphics/urt/files/patch-tools__rleccube.c
new file mode 100644
index 000000000000..6462de6d07bf
--- /dev/null
+++ b/graphics/urt/files/patch-tools__rleccube.c
@@ -0,0 +1,11 @@
+--- 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;
diff --git a/graphics/urt/files/patch-tools__rlecomp.c b/graphics/urt/files/patch-tools__rlecomp.c
new file mode 100644
index 000000000000..115733cd7b9a
--- /dev/null
+++ b/graphics/urt/files/patch-tools__rlecomp.c
@@ -0,0 +1,19 @@
+--- 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 <stdio.h>
++#include <string.h>
+ #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[];
diff --git a/graphics/urt/files/patch-tools__rledither.c b/graphics/urt/files/patch-tools__rledither.c
new file mode 100644
index 000000000000..a821e9434be6
--- /dev/null
+++ b/graphics/urt/files/patch-tools__rledither.c
@@ -0,0 +1,11 @@
+--- 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[];
diff --git a/graphics/urt/files/patch-tools__rleflip.c b/graphics/urt/files/patch-tools__rleflip.c
new file mode 100644
index 000000000000..b0d76b569903
--- /dev/null
+++ b/graphics/urt/files/patch-tools__rleflip.c
@@ -0,0 +1,11 @@
+--- 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[];
diff --git a/graphics/urt/files/patch-tools__rlehisto.c b/graphics/urt/files/patch-tools__rlehisto.c
new file mode 100644
index 000000000000..dfe150a4784a
--- /dev/null
+++ b/graphics/urt/files/patch-tools__rlehisto.c
@@ -0,0 +1,11 @@
+--- 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[];
diff --git a/graphics/urt/files/patch-tools__rleldmap.c b/graphics/urt/files/patch-tools__rleldmap.c
new file mode 100644
index 000000000000..e09b71b17a32
--- /dev/null
+++ b/graphics/urt/files/patch-tools__rleldmap.c
@@ -0,0 +1,11 @@
+--- 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;
diff --git a/graphics/urt/files/patch-tools__rlemandl.c b/graphics/urt/files/patch-tools__rlemandl.c
new file mode 100644
index 000000000000..4f1c601ec177
--- /dev/null
+++ b/graphics/urt/files/patch-tools__rlemandl.c
@@ -0,0 +1,11 @@
+--- 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 <math.h>
+ #include "rle.h"
+ 
+-void
++int
+ main( argc, argv )
+ int argc;
+ char **argv;
diff --git a/graphics/urt/files/patch-tools__rlenoise.c b/graphics/urt/files/patch-tools__rlenoise.c
new file mode 100644
index 000000000000..43b8a7c18e8a
--- /dev/null
+++ b/graphics/urt/files/patch-tools__rlenoise.c
@@ -0,0 +1,19 @@
+--- 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 <stdio.h>
++#include <time.h>
+ #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;
diff --git a/graphics/urt/files/patch-tools__rleprint.c b/graphics/urt/files/patch-tools__rleprint.c
new file mode 100644
index 000000000000..1f64ef8aa636
--- /dev/null
+++ b/graphics/urt/files/patch-tools__rleprint.c
@@ -0,0 +1,11 @@
+--- 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[];
diff --git a/graphics/urt/files/patch-tools__rlequant.c b/graphics/urt/files/patch-tools__rlequant.c
new file mode 100644
index 000000000000..3063e6baadba
--- /dev/null
+++ b/graphics/urt/files/patch-tools__rlequant.c
@@ -0,0 +1,11 @@
+--- 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;
diff --git a/graphics/urt/files/patch-tools__rlescale.c b/graphics/urt/files/patch-tools__rlescale.c
new file mode 100644
index 000000000000..36b830b7fad3
--- /dev/null
+++ b/graphics/urt/files/patch-tools__rlescale.c
@@ -0,0 +1,11 @@
+--- 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 <math.h>
+ 
+-void
++int
+ main( argc, argv )
+ int argc;
+ char ** argv;
diff --git a/graphics/urt/files/patch-tools__rleselect.c b/graphics/urt/files/patch-tools__rleselect.c
new file mode 100644
index 000000000000..c712fce4978c
--- /dev/null
+++ b/graphics/urt/files/patch-tools__rleselect.c
@@ -0,0 +1,11 @@
+--- 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;
diff --git a/graphics/urt/files/patch-tools__rlesetbg.c b/graphics/urt/files/patch-tools__rlesetbg.c
new file mode 100644
index 000000000000..a3f64e60ceb9
--- /dev/null
+++ b/graphics/urt/files/patch-tools__rlesetbg.c
@@ -0,0 +1,11 @@
+--- 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[];
diff --git a/graphics/urt/files/patch-tools__rleskel.c b/graphics/urt/files/patch-tools__rleskel.c
new file mode 100644
index 000000000000..fd4166f741fc
--- /dev/null
+++ b/graphics/urt/files/patch-tools__rleskel.c
@@ -0,0 +1,10 @@
+--- 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;
diff --git a/graphics/urt/files/patch-tools__rlesortmap.c b/graphics/urt/files/patch-tools__rlesortmap.c
new file mode 100644
index 000000000000..b86d4ff2e234
--- /dev/null
+++ b/graphics/urt/files/patch-tools__rlesortmap.c
@@ -0,0 +1,11 @@
+--- 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;
diff --git a/graphics/urt/files/patch-tools__rlespiff.c b/graphics/urt/files/patch-tools__rlespiff.c
new file mode 100644
index 000000000000..970ff7cd2a00
--- /dev/null
+++ b/graphics/urt/files/patch-tools__rlespiff.c
@@ -0,0 +1,11 @@
+--- 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;
diff --git a/graphics/urt/files/patch-tools__rlesplice.c b/graphics/urt/files/patch-tools__rlesplice.c
new file mode 100644
index 000000000000..4ccd6ee8816e
--- /dev/null
+++ b/graphics/urt/files/patch-tools__rlesplice.c
@@ -0,0 +1,11 @@
+--- 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[];
diff --git a/graphics/urt/files/patch-tools__rlesplit.c b/graphics/urt/files/patch-tools__rlesplit.c
new file mode 100644
index 000000000000..bd9cace5244c
--- /dev/null
+++ b/graphics/urt/files/patch-tools__rlesplit.c
@@ -0,0 +1,19 @@
+--- 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 <stdio.h>
++#include <string.h>
+ #include "rle.h"
+ #include "rle_raw.h"
+ 
+@@ -56,7 +57,7 @@
+  *	[None]
+  */
+ 
+-void
++int
+ main( argc, argv )
+ int argc;
+ char **argv;
diff --git a/graphics/urt/files/patch-tools__rlestereo.c b/graphics/urt/files/patch-tools__rlestereo.c
new file mode 100644
index 000000000000..f261e80d9a2c
--- /dev/null
+++ b/graphics/urt/files/patch-tools__rlestereo.c
@@ -0,0 +1,11 @@
+--- 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;
diff --git a/graphics/urt/files/patch-tools__rleswap.c b/graphics/urt/files/patch-tools__rleswap.c
new file mode 100644
index 000000000000..8afe2c920618
--- /dev/null
+++ b/graphics/urt/files/patch-tools__rleswap.c
@@ -0,0 +1,11 @@
+--- 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;
diff --git a/graphics/urt/files/patch-tools__rlezoom.c b/graphics/urt/files/patch-tools__rlezoom.c
new file mode 100644
index 000000000000..4178c36fd2e0
--- /dev/null
+++ b/graphics/urt/files/patch-tools__rlezoom.c
@@ -0,0 +1,11 @@
+--- 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;
diff --git a/graphics/urt/files/patch-tools__smush.c b/graphics/urt/files/patch-tools__smush.c
new file mode 100644
index 000000000000..01ec1edfbc72
--- /dev/null
+++ b/graphics/urt/files/patch-tools__smush.c
@@ -0,0 +1,11 @@
+--- 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[];
diff --git a/graphics/urt/files/patch-tools__to8.c b/graphics/urt/files/patch-tools__to8.c
new file mode 100644
index 000000000000..69b59d97629f
--- /dev/null
+++ b/graphics/urt/files/patch-tools__to8.c
@@ -0,0 +1,11 @@
+--- 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;
diff --git a/graphics/urt/files/patch-tools__tobw.c b/graphics/urt/files/patch-tools__tobw.c
new file mode 100644
index 000000000000..a1bc2efb279f
--- /dev/null
+++ b/graphics/urt/files/patch-tools__tobw.c
@@ -0,0 +1,11 @@
+--- 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;
diff --git a/graphics/urt/files/patch-tools__unexp.c b/graphics/urt/files/patch-tools__unexp.c
new file mode 100644
index 000000000000..45029bf818d3
--- /dev/null
+++ b/graphics/urt/files/patch-tools__unexp.c
@@ -0,0 +1,11 @@
+--- 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[];
diff --git a/graphics/urt/files/patch-tools__unslice.c b/graphics/urt/files/patch-tools__unslice.c
new file mode 100644
index 000000000000..d091cdcd5c3c
--- /dev/null
+++ b/graphics/urt/files/patch-tools__unslice.c
@@ -0,0 +1,11 @@
+--- 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;
diff --git a/graphics/urt/pkg-plist b/graphics/urt/pkg-plist
index 2d8a545670ff..753ae0a00366 100644
--- a/graphics/urt/pkg-plist
+++ b/graphics/urt/pkg-plist
@@ -93,13 +93,13 @@ lib/librle.so.1
 %%PORTDOCS%%%%DOCSDIR%%/toolkit.doc
 %%PORTDOCS%%%%DOCSDIR%%/toolkit.mss
 %%PORTDOCS%%%%DOCSDIR%%/toolkit.ps
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/christmas_ball.rle
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/dart.rle
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/lenna.rle
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/mandrill.rle
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/tack_w_shadow.rle
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/christmas_ball.rle
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/dart.rle
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/lenna.rle
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/mandrill.rle
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/tack_w_shadow.rle
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/img
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/pics
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/img
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%