head 1.7; access; symbols pkgsrc-2026Q1:1.7.0.94 pkgsrc-2026Q1-base:1.7 pkgsrc-2025Q4:1.7.0.92 pkgsrc-2025Q4-base:1.7 pkgsrc-2025Q3:1.7.0.90 pkgsrc-2025Q3-base:1.7 pkgsrc-2025Q2:1.7.0.88 pkgsrc-2025Q2-base:1.7 pkgsrc-2025Q1:1.7.0.86 pkgsrc-2025Q1-base:1.7 pkgsrc-2024Q4:1.7.0.84 pkgsrc-2024Q4-base:1.7 pkgsrc-2024Q3:1.7.0.82 pkgsrc-2024Q3-base:1.7 pkgsrc-2024Q2:1.7.0.80 pkgsrc-2024Q2-base:1.7 pkgsrc-2024Q1:1.7.0.78 pkgsrc-2024Q1-base:1.7 pkgsrc-2023Q4:1.7.0.76 pkgsrc-2023Q4-base:1.7 pkgsrc-2023Q3:1.7.0.74 pkgsrc-2023Q3-base:1.7 pkgsrc-2023Q2:1.7.0.72 pkgsrc-2023Q2-base:1.7 pkgsrc-2023Q1:1.7.0.70 pkgsrc-2023Q1-base:1.7 pkgsrc-2022Q4:1.7.0.68 pkgsrc-2022Q4-base:1.7 pkgsrc-2022Q3:1.7.0.66 pkgsrc-2022Q3-base:1.7 pkgsrc-2022Q2:1.7.0.64 pkgsrc-2022Q2-base:1.7 pkgsrc-2022Q1:1.7.0.62 pkgsrc-2022Q1-base:1.7 pkgsrc-2021Q4:1.7.0.60 pkgsrc-2021Q4-base:1.7 pkgsrc-2021Q3:1.7.0.58 pkgsrc-2021Q3-base:1.7 pkgsrc-2021Q2:1.7.0.56 pkgsrc-2021Q2-base:1.7 pkgsrc-2021Q1:1.7.0.54 pkgsrc-2021Q1-base:1.7 pkgsrc-2020Q4:1.7.0.52 pkgsrc-2020Q4-base:1.7 pkgsrc-2020Q3:1.7.0.50 pkgsrc-2020Q3-base:1.7 pkgsrc-2020Q2:1.7.0.46 pkgsrc-2020Q2-base:1.7 pkgsrc-2020Q1:1.7.0.26 pkgsrc-2020Q1-base:1.7 pkgsrc-2019Q4:1.7.0.48 pkgsrc-2019Q4-base:1.7 pkgsrc-2019Q3:1.7.0.44 pkgsrc-2019Q3-base:1.7 pkgsrc-2019Q2:1.7.0.42 pkgsrc-2019Q2-base:1.7 pkgsrc-2019Q1:1.7.0.40 pkgsrc-2019Q1-base:1.7 pkgsrc-2018Q4:1.7.0.38 pkgsrc-2018Q4-base:1.7 pkgsrc-2018Q3:1.7.0.36 pkgsrc-2018Q3-base:1.7 pkgsrc-2018Q2:1.7.0.34 pkgsrc-2018Q2-base:1.7 pkgsrc-2018Q1:1.7.0.32 pkgsrc-2018Q1-base:1.7 pkgsrc-2017Q4:1.7.0.30 pkgsrc-2017Q4-base:1.7 pkgsrc-2017Q3:1.7.0.28 pkgsrc-2017Q3-base:1.7 pkgsrc-2017Q2:1.7.0.24 pkgsrc-2017Q2-base:1.7 pkgsrc-2017Q1:1.7.0.22 pkgsrc-2017Q1-base:1.7 pkgsrc-2016Q4:1.7.0.20 pkgsrc-2016Q4-base:1.7 pkgsrc-2016Q3:1.7.0.18 pkgsrc-2016Q3-base:1.7 pkgsrc-2016Q2:1.7.0.16 pkgsrc-2016Q2-base:1.7 pkgsrc-2016Q1:1.7.0.14 pkgsrc-2016Q1-base:1.7 pkgsrc-2015Q4:1.7.0.12 pkgsrc-2015Q4-base:1.7 pkgsrc-2015Q3:1.7.0.10 pkgsrc-2015Q3-base:1.7 pkgsrc-2015Q2:1.7.0.8 pkgsrc-2015Q2-base:1.7 pkgsrc-2015Q1:1.7.0.6 pkgsrc-2015Q1-base:1.7 pkgsrc-2014Q4:1.7.0.4 pkgsrc-2014Q4-base:1.7 pkgsrc-2014Q3:1.7.0.2 pkgsrc-2014Q3-base:1.7 pkgsrc-2014Q2:1.6.0.86 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.84 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.82 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.80 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.78 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.6.0.76 pkgsrc-2013Q1-base:1.6 pkgsrc-2012Q4:1.6.0.74 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q3:1.6.0.72 pkgsrc-2012Q3-base:1.6 pkgsrc-2012Q2:1.6.0.70 pkgsrc-2012Q2-base:1.6 pkgsrc-2012Q1:1.6.0.68 pkgsrc-2012Q1-base:1.6 pkgsrc-2011Q4:1.6.0.66 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q3:1.6.0.64 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.6.0.62 pkgsrc-2011Q2-base:1.6 pkgsrc-2011Q1:1.6.0.60 pkgsrc-2011Q1-base:1.6 pkgsrc-2010Q4:1.6.0.58 pkgsrc-2010Q4-base:1.6 pkgsrc-2010Q3:1.6.0.56 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.6.0.54 pkgsrc-2010Q2-base:1.6 pkgsrc-2010Q1:1.6.0.52 pkgsrc-2010Q1-base:1.6 pkgsrc-2009Q4:1.6.0.50 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q3:1.6.0.48 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.46 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.6.0.44 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.42 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.40 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.38 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.36 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.34 pkgsrc-2008Q1:1.6.0.32 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.30 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.28 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.26 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.24 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.22 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.20 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.18 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.16 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.14 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.12 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.10 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.8 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.6 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.4 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.2 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.5.0.4 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.5.0.2 pkgsrc-2003Q4-base:1.5 netbsd-1-6-1:1.4.0.6 netbsd-1-6-1-base:1.4 netbsd-1-6:1.4.0.8 netbsd-1-6-RELEASE-base:1.4 pkgviews:1.4.0.4 pkgviews-base:1.4 buildlink2:1.4.0.2 buildlink2-base:1.4 netbsd-1-5-PATCH003:1.4 netbsd-1-5-PATCH001:1.4 netbsd-1-5-RELEASE:1.4 netbsd-1-4-PATCH003:1.4 netbsd-1-4-PATCH002:1.2 comdex-fall-1999:1.2 netbsd-1-4-PATCH001:1.2 netbsd-1-4-RELEASE:1.2 netbsd-1-3-PATCH003:1.2; locks; strict; comment @# @; 1.7 date 2014.09.08.21.24.45; author wiz; state Exp; branches; next 1.6; commitid qhqeBT4oyK8AuAPx; 1.6 date 2004.04.24.22.06.27; author wiz; state Exp; branches; next 1.5; 1.5 date 2003.09.25.11.58.33; author tron; state Exp; branches; next 1.4; 1.4 date 2000.05.17.19.03.25; author tron; state Exp; branches; next 1.3; 1.3 date 2000.04.07.14.40.37; author hubertf; state Exp; branches; next 1.2; 1.2 date 98.09.12.17.01.59; author garbled; state Exp; branches; next 1.1; 1.1 date 98.08.24.16.55.36; author agc; state Exp; branches; next ; desc @@ 1.7 log @Bump PKGREVISION for netpbm update. Add some build fixes where necessary. @ text @$NetBSD: patch-aa,v 1.6 2004/04/24 22:06:27 wiz Exp $ --- config/urt.orig 1992-07-15 21:47:15.000000000 +0200 +++ config/urt 2003-09-25 13:55:06.000000000 +0200 @@@@ -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 USE_STDARG Use 'stdarg' instead of 'varargs' (ANSI). -##define USE_STDLIB_H You have "stdlib.h". -##define USE_UNISTD_H You have "unistd.h". +#define SYS_V_SETPGRP Your system has the SysV setpgrp() call. +#define USE_L_FLAG Use -Llibdir -lrle instead of libdir/liblre.a. +#define USE_PROTOTYPES Declare library functions with ANSI-C prototypes. +#define USE_RANDOM Your libc has the BSD random() function. +#define USE_STDARG Use 'stdarg' instead of 'varargs' (ANSI). +#define USE_STDLIB_H You have "stdlib.h". +#define USE_UNISTD_H You have "unistd.h". ##define USE_STRING_H You have "string.h", not "strings.h" -##define VOID_STAR Your C compiler understands the 'void *' declaration. +#define 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= ${LOCALBASE} -INCPBMPLUS = -I$(PBMDIR) -I$(PBMDIR)/ppm -I$(PBMDIR)/pgm -I$(PBMDIR)/pbm -LIBPBMPLUS = $(PBMDIR)/ppm/libppm.a $(PBMDIR)/pgm/libpgm.a \ - $(PBMDIR)/pbm/libpbm.a +INCPBMPLUS = -I$(PBMDIR)/include/netpbm +LIBPBMPLUS = -L$(PBMDIR)/lib -Wl,-R$(PBMDIR)/lib -lnetpbm #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 @ 1.6 log @Link against libnetpbm, since that's the only library installed by the netpbm package, instead of the previously existing libraries. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2003/09/25 11:58:33 tron Exp $ d145 1 a145 1 +INCPBMPLUS = -I$(PBMDIR)/include @ 1.5 log @Use "stdarg.h" instead of "varargs.h" to handle variable arugment list. This fixes build problems when using GCC 3.3.1. @ text @d1 1 a1 1 $NetBSD$ d146 1 a146 1 +LIBPBMPLUS = -L$(PBMDIR)/lib -Wl,-R$(PBMDIR)/lib -lppm -lpgm -lpbm @ 1.4 log @Use run time library path for PBM libraries. @ text @d3 2 a4 2 --- config/urt.orig Wed Jul 15 21:47:15 1992 +++ config/urt Wed May 17 20:58:41 2000 d70 3 d77 1 a77 3 ##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". @ 1.3 log @Require a properly installed netpbm package, instead of insisting on recompiling this each time again. @ text @d4 1 a4 1 +++ config/urt Fri Apr 7 15:56:12 2000 d145 1 a145 1 +LIBPBMPLUS = -L$(PBMDIR)/lib -lppm -lpgm -lpbm @ 1.2 log @ELF this for alpha, and make it include jpeg and zlib when using tiff. How this ever worked is beyond me.. @ text @d2 3 a4 2 --- config/urt.orig Wed Jul 15 12:47:15 1992 +++ config/urt Sat Sep 12 09:26:38 1998 d139 1 a139 1 +PBMDIR= ${PKGSRCDIR}/graphics/netpbm/${WORKINGDIRNAME}/netpbm d141 1 a141 1 INCPBMPLUS = -I$(PBMDIR) -I$(PBMDIR)/ppm -I$(PBMDIR)/pgm -I$(PBMDIR)/pbm d144 2 a145 1 +LIBPBMPLUS = $(PBMDIR)/ppm/libppm.a $(PBMDIR)/pgm/libpgm.a $(PBMDIR)/pbm/libpbm.a @ 1.1 log @Addition of Utah Raster Toolkit, version 3.1b1 (a toolkit and library for raster image processing), to the NetBSD packages collection. This was taken originally from the FreeBSD port, but hacked around by myself to make it work properly on NetBSD. @ text @d2 2 a3 5 Set up the configuration for NetBSD. --- config/urt.orig Wed Jul 15 15:47:15 1992 +++ config/urt Wed Feb 11 01:01:24 1998 d140 1 a140 1 -INCPBMPLUS = -I$(PBMDIR) -I$(PBMDIR)/ppm -I$(PBMDIR)/pgm -I$(PBMDIR)/pbm a142 1 +INCPBMPLUS = -I$(PBMDIR) -I$(PBMDIR)/ppm -I$(PBMDIR)/pgm -I$(PBMDIR)/pbm d147 1 a147 1 @@@@ -216,9 +221,9 @@@@ d156 1 a156 1 +LIBTIFF = -L${LOCALBASE}/lib -ltiff d160 1 a160 1 @@@@ -227,6 +232,6 @@@@ d166 1 a166 1 +LIBX11 = -L${X11BASE}/lib -lX11 @