[patch] urt-3.1b-gentoo.diff

urt-3.1b-gentoo.diff (text/plain), 5.95 KB, created by Michal Slonina on 2005-09-03 12:14:35 UTC

diff -ur urt-3.1b.old urt-3.1b
diff -ur urt-3.1b.old/config/urt urt-3.1b/config/urt
--- urt-3.1b.old/config/urt	1992-07-15 21:47:15.000000000 +0200
+++ urt-3.1b/config/urt	2005-09-03 17:42:47.434410384 +0200
@@ -37,14 +37,14 @@
 #define ALIAS		Alias conversions.
 ##define CGM		RLE to CGM conversion.
 #define CUBICOMP	Cubicomp conversions.
-#define GIF		GIF image conversions.
+##define GIF		GIF image conversions.
 #define GRAYFILES	Grayscale conversions.
 ##define SGICONV	SGI Image conversions.
 #define MACPAINT	Macpaint conversions.
 ##define PBMPLUS	PBMPLUS conversions.
 #define POSTSCRIPT	Postscript conversions.
 ##define SUNRASTER	For Sun raster conversions.
-#define TARGA		Targa format conversions.
+##define TARGA		Targa format conversions.
 ##define TIFF		TIFF image conversions.
 #define TIFF2p4		Define if libtiff is version 2.4 or greater
 #define VICAR		VICAR image conversions.
@@ -60,7 +60,7 @@
 ##define APOLLOCC	Apollo computer.
 ##define CONVEXCC	Convex C 4.0 or greater
 ##define CRAY2CC		Cray-2 running UNICOS.
-##define GCC		Gcc compiler.
+#define GCC		Gcc compiler.
 ##define HPUX300CC	HP 9000/300 running HP-UX.
 ##define HPUX800CC	HP 9000/800 running HP-UX.
 ##define IBMR6000CC	IBM RS6000.
@@ -70,13 +70,13 @@
 ##define 386IXCC		SVr3 386/ix 2.2
 
 # You can put any system dependent flags here.
-ExtraCFLAGS = 
+# ExtraCFLAGS = 
 
 # System specific or configuration parameters.  Define according to your
 # environment and desires.
 
 ##define ABEKAS_PAL	Convert to PAL format in Abekas A60 tool.
-##define ALL_MAN	Print/install all man pages.
+#define ALL_MAN	Print/install all man pages.
 ##define CONST_DECL	If your compiler understands 'const' (ANSI)
 ##define FILE_NAME_14_CHARS	If filenames are limited to 14 characters.
 ##define HAVE_CPROTO	If you have the cproto command.  Not normally required.
@@ -89,19 +89,19 @@
 ##define NO_RANLIB	You don't have the ranlib program (Sys V)
 ##define NO_ITIMER	You don't have setitimer (e.g., Cray 2).
 ##define NO_TOOLS	Don't build tool directory.
-##define STDIO_NEEDS_BINARY	Your fopen() needs "b" specified for binary io
-##define USE_TIME_H	You need to include time.h for time_t (Sys V)
+#define STDIO_NEEDS_BINARY	Your fopen() needs "b" specified for binary io
+#define USE_TIME_H	You need to include time.h for time_t (Sys V)
 ##define SYS_V_SETPGRP	Your system has the SysV setpgrp() call.
 ##define USE_L_FLAG	Use -Llibdir -lrle instead of libdir/liblre.a.
-##define USE_PROTOTYPES	Declare library functions with ANSI-C prototypes.
-##define USE_RANDOM	Your libc has the BSD random() function.
-##define USE_STDARG	Use 'stdarg' instead of 'varargs' (ANSI).
-##define USE_STDLIB_H	You have "stdlib.h".
-##define USE_UNISTD_H	You have "unistd.h".
-##define USE_STRING_H	You have "string.h", not "strings.h"
-##define VOID_STAR	Your C compiler understands the 'void *' declaration.
-##define USE_XLIBINT_H	You have the include file <X11/Xlibint.h>.
-##define X_SHARED_MEMORY	You have the XShm extension.
+#define USE_PROTOTYPES	Declare library functions with ANSI-C prototypes.
+#define USE_RANDOM	Your libc has the BSD random() function.
+#define USE_STDARG	Use 'stdarg' instead of 'varargs' (ANSI).
+#define USE_STDLIB_H	You have "stdlib.h".
+#define USE_UNISTD_H	You have "unistd.h".
+#define USE_STRING_H	You have "string.h", not "strings.h"
+#define VOID_STAR	Your C compiler understands the 'void *' declaration.
+#define USE_XLIBINT_H	You have the include file <X11/Xlibint.h>.
+#define X_SHARED_MEMORY	You have the XShm extension.
 
 # DEST is where all programs will be put.  Can be overridden for specific
 # directories below.
@@ -113,7 +113,7 @@
 # Path names not starting with a / are relative to this directory.
 # Path names starting with a / are absolute.
 
-#defpath DEST	bin
+#defpath DEST	/${D}/usr/bin
 #defpath RI	include
 #defpath RL	lib
 
@@ -121,12 +121,12 @@
 # library, include files, or manual pages, respectively, to be
 # installed anywhere.
 
-##defpath MAN_DEST /usr/site/man
-##defpath LIB_DEST
-##defpath GET_DEST
-##defpath CNV_DEST
-##defpath TOOLS_DEST
-##defpath INC_DEST
+#defpath MAN_DEST /${D}/usr/share/man
+#defpath LIB_DEST /${D}/usr/lib
+#defpath GET_DEST /${D}/usr/bin
+#defpath CNV_DEST /${D}/usr/bin
+#defpath TOOLS_DEST /${D}/usr/bin
+#defpath INC_DEST /${D}/usr/include
 
 # Control of formatting.  If your "roff" program needs to be piped to
 # something to print, set ROFFPIPE to (e.g.) "| lpr"
@@ -217,8 +217,8 @@
 #ifdef TIFF
 # Location of tiff library and include files.  Relative to URT root directory.
 #defpath TIFFDIR
-INCTIFF = -I$(TIFFDIR)
-LIBTIFF = $(TIFFDIR)/libtiff.a
+INCTIFF = -I/usr/include
+LIBTIFF = /usr/lib/libtiff.a /usr/lib/libjpeg.a /usr/lib/libz.a
 #endif
 
 #ifdef X10
diff -ur urt-3.1b.old/get/getx11/XGetHClrs.c urt-3.1b/get/getx11/XGetHClrs.c
--- urt-3.1b.old/get/getx11/XGetHClrs.c	1992-04-30 16:16:23.000000000 +0200
+++ urt-3.1b/get/getx11/XGetHClrs.c	2005-09-03 16:44:21.003468912 +0200
@@ -1,5 +1,4 @@
 #ifndef XLIBINT_H_NOT_AVAILABLE
-#include <X11/copyright.h>
 
 /* $XConsortium: XGetHClrs.c,v 11.10 88/09/06 16:07:50 martin Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1986	*/
diff -ur urt-3.1b.old/lib/rle_global.c urt-3.1b/lib/rle_global.c
--- urt-3.1b.old/lib/rle_global.c	1992-01-28 19:23:03.000000000 +0100
+++ urt-3.1b/lib/rle_global.c	2005-09-03 16:51:28.054547280 +0200
@@ -76,7 +76,7 @@
     8,				/* cmaplen (log2 of length of color map) */
     NULL,			/* pointer to color map */
     NULL,			/* pointer to comment strings */
-    stdout,			/* output file */
+    0,				/* output file */
     { 7 },			/* RGB channels only */
     0L,				/* Can't free name and file fields. */
     "Urt",			/* Default "program name". */
Only in urt-3.1b/lib: stdout
diff -ur urt-3.1b.old/tools/into.c urt-3.1b/tools/into.c
--- urt-3.1b.old/tools/into.c	1992-04-30 16:10:15.000000000 +0200
+++ urt-3.1b/tools/into.c	2005-09-03 16:57:31.618277192 +0200
@@ -41,7 +41,6 @@
 short forceflg;				/* overwrite an unwritable file? */
 
 extern int errno;
-extern char *sys_errlist[];
 
 void
 main(argc, argv)