$NetBSD: patch-aa,v 1.2 1998/09/12 17:01:59 garbled Exp $ --- config/urt.orig Wed Jul 15 12:47:15 1992 +++ config/urt Sat Sep 12 09:26:38 1998 @@ -1,3 +1,7 @@ +# Configuration for HP 9000/300 series running BSD4.3 + +#quiet on + # Configuration file for the URT raster toolkit package. Modify all # entries in this file. @@ -29,7 +33,7 @@ ##define SUNTOOLS For Suns running SunTools. ##define TAAC1 Suns with TAAC-1 board. ##define X10 X10 Window system. -##define X11 X11 Window system. +#define X11 X11 Window system. # Conversion programs #define ABEKASA60 Abekas A60 conversions. @@ -41,11 +45,11 @@ #define GRAYFILES Grayscale conversions. ##define SGICONV SGI Image conversions. #define MACPAINT Macpaint conversions. -##define PBMPLUS PBMPLUS conversions. +#define PBMPLUS PBMPLUS conversions. #define POSTSCRIPT Postscript conversions. ##define SUNRASTER For Sun raster conversions. #define TARGA Targa format conversions. -##define TIFF TIFF image conversions. +#define TIFF TIFF image conversions. #define TIFF2p4 Define if libtiff is version 2.4 or greater #define VICAR VICAR image conversions. #define WASATCH Wasatch Paintbox conversions. @@ -60,7 +64,7 @@ ##define APOLLOCC Apollo computer. ##define CONVEXCC Convex C 4.0 or greater ##define CRAY2CC Cray-2 running UNICOS. -##define GCC Gcc compiler. +#define GCC Gcc compiler. ##define HPUX300CC HP 9000/300 running HP-UX. ##define HPUX800CC HP 9000/800 running HP-UX. ##define IBMR6000CC IBM RS6000. @@ -70,14 +74,14 @@ ##define 386IXCC SVr3 386/ix 2.2 # You can put any system dependent flags here. -ExtraCFLAGS = +ExtraCFLAGS = -O2 # System specific or configuration parameters. Define according to your # environment and desires. ##define ABEKAS_PAL Convert to PAL format in Abekas A60 tool. ##define ALL_MAN Print/install all man pages. -##define CONST_DECL If your compiler understands 'const' (ANSI) +#define CONST_DECL If your compiler understands 'const' (ANSI) ##define FILE_NAME_14_CHARS If filenames are limited to 14 characters. ##define HAVE_CPROTO If you have the cproto command. Not normally required. ##define NEED_BSTRING Your libc does not have bcopy or bzero (Sys V probably) @@ -91,17 +95,17 @@ ##define NO_TOOLS Don't build tool directory. ##define STDIO_NEEDS_BINARY Your fopen() needs "b" specified for binary io ##define USE_TIME_H You need to include time.h for time_t (Sys V) -##define SYS_V_SETPGRP Your system has the SysV setpgrp() call. -##define USE_L_FLAG Use -Llibdir -lrle instead of libdir/liblre.a. -##define USE_PROTOTYPES Declare library functions with ANSI-C prototypes. -##define USE_RANDOM Your libc has the BSD random() function. +#define 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_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 VOID_STAR Your C compiler understands the 'void *' declaration. ##define USE_XLIBINT_H You have the include file . -##define X_SHARED_MEMORY You have the XShm extension. +#define X_SHARED_MEMORY You have the XShm extension. # DEST is where all programs will be put. Can be overridden for specific # directories below. @@ -121,12 +125,12 @@ # library, include files, or manual pages, respectively, to be # installed anywhere. -##defpath MAN_DEST /usr/site/man -##defpath LIB_DEST -##defpath GET_DEST -##defpath CNV_DEST -##defpath TOOLS_DEST -##defpath INC_DEST +#defpath MAN_DEST /$(PREFIX)/man +#defpath LIB_DEST /$(PREFIX)/lib +#defpath GET_DEST /$(PREFIX)/bin +#defpath CNV_DEST /$(PREFIX)/bin +#defpath TOOLS_DEST /$(PREFIX)/bin +#defpath INC_DEST /$(PREFIX)/include # Control of formatting. If your "roff" program needs to be piped to # something to print, set ROFFPIPE to (e.g.) "| lpr" @@ -145,9 +149,9 @@ #ifdef CGM # Path to directory where CGM library and include files may be found # Absolute or relative to URT root -#defpath CGMDIR -INCCGM = -I$(CGMDIR) -LIBCGM = $(CGMDIR)/libcgm.a +#defpath CGMDIR $(LOCALBASE) +INCCGM = -I$(CGMDIR)/include +LIBCGM = $(CGMDIR)/lib/libcgm.a #endif #ifdef CX3D @@ -163,11 +167,11 @@ # Where to find the MC-TeX include files. INCMCTEX = h # Note! relative to cnv/tex directory # where to find the font description file -CONFFILE = /usr/local/lib/tex/fontdesc +CONFFILE = $(LOCALBASE)/lib/tex/fontdesc #endif #ifdef FB -LIBFB = /usr/brl/lib/libfb.a +LIBFB = $(X11BASE)/lib/brl/libfb.a #endif #ifdef GRINNELL @@ -191,11 +195,10 @@ #ifdef PBMPLUS # PBMDIR should refer to the root of your PBM source tree. # If relative, it's relative to root of URT source tree. -#defpath PBMDIR +PBMDIR= ${PKGSRCDIR}/graphics/netpbm/${WORKINGDIRNAME}/netpbm INCPBMPLUS = -I$(PBMDIR) -I$(PBMDIR)/ppm -I$(PBMDIR)/pgm -I$(PBMDIR)/pbm -LIBPBMPLUS = $(PBMDIR)/ppm/libppm.a $(PBMDIR)/pgm/libpgm.a \ - $(PBMDIR)/pbm/libpbm.a +LIBPBMPLUS = $(PBMDIR)/ppm/libppm.a $(PBMDIR)/pgm/libpgm.a $(PBMDIR)/pbm/libpbm.a #endif #ifdef SUNRASTER|SUNTOOLS|TAAC1 @@ -216,9 +219,9 @@ #ifdef TIFF # Location of tiff library and include files. Relative to URT root directory. -#defpath TIFFDIR -INCTIFF = -I$(TIFFDIR) -LIBTIFF = $(TIFFDIR)/libtiff.a +##defpath TIFFDIR +INCTIFF = -I${LOCALBASE}/include +LIBTIFF = -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -ltiff -ljpeg -lz #endif #ifdef X10 @@ -227,6 +230,6 @@ #endif #ifdef X11 -LIBX11 = -lX11 -INCX11 = +LIBX11 = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lX11 +INCX11 = -I${X11BASE}/include #endif