Index: head/graphics/urt/Makefile =================================================================== --- head/graphics/urt/Makefile (revision 126308) +++ head/graphics/urt/Makefile (revision 126309) @@ -1,72 +1,72 @@ # New ports collection makefile for: urt # Date created: Jan 5 1997 # Whom: cfs@ing.puc.cl (original) # # $FreeBSD$ # PORTNAME= urt PORTVERSION= 3.1b1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ftp://ftp.iastate.edu/pub/utah-raster/ DISTNAME= urt DISTFILES= urt-3.1b.tar.Z urt-doc.tar.Z urt-img.tar.Z PATCH_SITES= http://www.funet.fi/pub/graphics/packages/urt/rel2/ PATCHFILES= urt-3.1b-3.1b1.patch PATCH_DIST_STRIP=-p1 MAINTAINER= ports@FreeBSD.org COMMENT= Toolkit and library for raster image processing LIB_DEPENDS= netpbm.1:${PORTSDIR}/graphics/netpbm NO_WRKSUBDIR= yes USE_XLIB= yes HAS_CONFIGURE= yes CONFIGURE_SCRIPT=Configure CONFIGURE_ARGS= config/urt MAKEFILE= makefile ALL_TARGET= # none INSTALLS_SHLIB= 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\ painttorle.1 pgmtorle.1 ppmtorle.1 pyrmask.1 rawtorle.1 \ repos.1 rlatorle.1 rleClock.1 rleaddcom.1 rleaddeof.1 rlebg.1 \ rlebox.1 rlecat.1 rleccube.1 rlecomp.1 rledither.1 rleflip.1 \ rlegrid.1 rlehdr.1 rlehisto.1 rleinterp.1 rleldmap.1 rlemandl.1 \ rlenoise.1 rlepatch.1 rleprint.1 rlequant.1 rlescale.1 \ rleselect.1 rlesetbg.1 rlespiff.1 rlesplice.1 rlesplit.1 \ rlestereo.1 rleswap.1 rletoabA60.1 rletoabA62.1 rletoalias.1 \ rletoascii.1 rletogif.1 rletogray.1 rletopaint.1 rletoppm.1 \ rletops.1 rletoraw.1 rletorla.1 rletotarga.1 rletotiff.1 \ rlezoom.1 smush.1 targatorle.1 tifftorle.1 to8.1 tobw.1 unexp.1 \ unslice.1 urt.1 wasatchrle.1 MAN3= buildmap.3 bwdithermap.3 colorquant.3 dither.3 ditherbw.3 \ dithergb.3 dithermap.3 float_to_exp.3 hilbert.3 hilbert_c2i.3 \ hilbert_i2c.3 inv_cmap.3 librle.3 make_square.3 rgb_to_bw.3 \ rle_addhist.3 rle_cp.3 rle_debug.3 rle_delcom.3 rle_freeraw.3 \ rle_get_error.3 rle_get_set.3 rle_get_setup.3 \ rle_get_setup_ok.3 rle_getcom.3 rle_getraw.3 rle_getrow.3 \ rle_getskip.3 rle_hdr.3 rle_op.3 rle_open_f.3 \ rle_open_f_noexit.3 rle_put_init.3 rle_put_setup.3 rle_putcom.3 \ rle_puteof.3 rle_putraw.3 rle_putrow.3 rle_raw_alloc.3 \ rle_raw_free.3 rle_rawtorow.3 rle_row_alloc.3 rle_row_free.3 \ rle_skiprow.3 MAN5= rle.5 MLINKS= rle.5 RLE.5 post-install: .if !defined(NOPORTDOCS) @${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} .endif .include Property changes on: head/graphics/urt/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.37 \ No newline at end of property +1.38 \ No newline at end of property Index: head/graphics/urt/files/patch-lib-scanargs.c =================================================================== --- head/graphics/urt/files/patch-lib-scanargs.c (revision 126308) +++ head/graphics/urt/files/patch-lib-scanargs.c (nonexistent) @@ -1,10 +0,0 @@ ---- lib/scanargs.c.orig Tue Oct 28 07:54:53 2003 -+++ lib/scanargs.c Tue Oct 28 07:55:14 2003 -@@ -43,6 +43,7 @@ - #include "rle_config.h" - #include - #include -+#define USE_STDARG - #ifndef USE_STDARG - #include - #else Property changes on: head/graphics/urt/files/patch-lib-scanargs.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/graphics/urt/files/patch-config::urt =================================================================== --- head/graphics/urt/files/patch-config::urt (revision 126308) +++ head/graphics/urt/files/patch-config::urt (revision 126309) @@ -1,171 +1,173 @@ ---- config/urt.orig Thu Jul 16 04:47:15 1992 -+++ config/urt Fri Dec 27 23:19:11 2002 +--- config/urt.orig Wed Jul 15 19:47:15 1992 ++++ config/urt Wed Jan 12 17:22:42 2005 @@ -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 = -fno-strength-reduce ++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 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_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 USE_XLIBINT_H You have the include file . -##define X_SHARED_MEMORY You have the XShm extension. ++#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. # 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 ++LIBFB = $(LOCALBASE)/lib/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 +##defpath PBMDIR -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${LOCALBASE}/include +LIBPBMPLUS = -L${LOCALBASE}/lib -lnetpbm #endif #ifdef SUNRASTER|SUNTOOLS|TAAC1 @@ -216,9 +219,12 @@ #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 = -L${LOCALBASE}/lib -ltiff +.if ${PORTOBJFORMAT} == "elf" +LIBTIFF +=-Wl,-rpath,${LOCALBASE}/lib +.endif #endif #ifdef X10 @@ -227,6 +233,6 @@ #endif #ifdef X11 -LIBX11 = -lX11 -INCX11 = +LIBX11 = -L${X11BASE}/lib -lX11 +INCX11 = -I${X11BASE}/include #endif Property changes on: head/graphics/urt/files/patch-config::urt ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/graphics/urt/files/patch-get::getx11::XGetHClrs.c =================================================================== --- head/graphics/urt/files/patch-get::getx11::XGetHClrs.c (nonexistent) +++ head/graphics/urt/files/patch-get::getx11::XGetHClrs.c (revision 126309) @@ -0,0 +1,8 @@ +--- get/getx11/XGetHClrs.c.orig Wed Jan 12 17:03:11 2005 ++++ get/getx11/XGetHClrs.c Wed Jan 12 17:06:40 2005 +@@ -1,5 +1,4 @@ + #ifndef XLIBINT_H_NOT_AVAILABLE +-#include + + /* $XConsortium: XGetHClrs.c,v 11.10 88/09/06 16:07:50 martin Exp $ */ + /* Copyright Massachusetts Institute of Technology 1986 */ Property changes on: head/graphics/urt/files/patch-get::getx11::XGetHClrs.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/graphics/urt/files/patch-lib-rle_open_f.c =================================================================== --- head/graphics/urt/files/patch-lib-rle_open_f.c (nonexistent) +++ head/graphics/urt/files/patch-lib-rle_open_f.c (revision 126309) @@ -0,0 +1,44 @@ +--- lib/rle_open_f.c.orig Thu May 13 21:28:51 1993 ++++ lib/rle_open_f.c Wed Jan 12 16:06:07 2005 +@@ -56,6 +56,7 @@ + CONST_DECL char *err_str; + register char *cp; + char *combuf; ++ size_t combuf_size; + + #ifdef STDIO_NEEDS_BINARY + char mode_string[32]; /* Should be enough. */ +@@ -63,7 +64,7 @@ + /* Concatenate a 'b' onto the mode. */ + mode_string[0] = mode[0]; + mode_string[1] = 'b'; +- strcpy( mode_string + 2, mode + 1 ); ++ strncpy( mode_string + 2, mode + 1, sizeof(mode_string + 2) ); + mode = mode_string; + #endif + +@@ -150,7 +151,8 @@ + else if ( cp > file_name && *cp == '.' && *(cp + 1) == 'Z' ) + { + int thepid; /* PID from my_popen. */ +- combuf = (char *)malloc( 20 + strlen( file_name ) ); ++ combuf_size = 20 + strlen( file_name ); ++ combuf = (char *)malloc( combuf_size ); + if ( combuf == NULL ) + { + err_str = "%s: out of memory opening (compressed) %s for %s"; +@@ -158,11 +160,11 @@ + } + + if ( *mode == 'w' ) +- sprintf( combuf, "compress > %s", file_name ); ++ snprintf( combuf, combuf_size, "compress > %s", file_name ); + else if ( *mode == 'a' ) +- sprintf( combuf, "compress >> %s", file_name ); ++ snprintf( combuf, combuf_size, "compress >> %s", file_name ); + else +- sprintf( combuf, "compress -d < %s", file_name ); ++ snprintf( combuf, combuf_size, "compress -d < %s", file_name ); + + fp = my_popen( combuf, mode, &thepid ); + free( combuf ); Property changes on: head/graphics/urt/files/patch-lib-rle_open_f.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/graphics/urt/pkg-plist =================================================================== --- head/graphics/urt/pkg-plist (revision 126308) +++ head/graphics/urt/pkg-plist (revision 126309) @@ -1,105 +1,105 @@ bin/aliastorle bin/applymap bin/avg4 bin/crop bin/cubitorle bin/fant bin/getx11 bin/giftorle bin/graytorle bin/into bin/mcut bin/mergechan bin/painttorle bin/pgmtorle bin/ppmtorle bin/pyrmask bin/rawtorle bin/repos bin/rlatorle bin/rleClock bin/rleaddcom bin/rlebg bin/rlebox bin/rlecat bin/rleccube bin/rlecomp bin/rledither bin/rleflip bin/rlegrid bin/rlehdr bin/rlehisto bin/rleldmap bin/rlemandl bin/rlenoise bin/rlepatch bin/rleprint bin/rlequant bin/rlescale bin/rleselect bin/rlesetbg bin/rlespiff bin/rlesplice bin/rlesplit bin/rlestereo bin/rleswap bin/rletoabA60 bin/rletoabA62 bin/rletoalias bin/rletoascii bin/rletogif bin/rletogray bin/rletopaint bin/rletoppm bin/rletops bin/rletoraw bin/rletorla bin/rletotarga bin/rletotiff bin/rlezoom bin/smush bin/targatorle bin/tifftorle bin/to8 bin/tobw bin/unexp bin/unslice bin/wasatchrle bin/xbmtorle include/exit_status.h include/pyramid.h include/rle.h include/rle_code.h include/rle_config.h include/rle_put.h include/rle_raw.h lib/librle.a lib/librle.so lib/librle.so.1 -%%PORTDOCS%%share/doc/urt/README -%%PORTDOCS%%share/doc/urt/pics/README -%%PORTDOCS%%share/doc/urt/pics/bullet_holes_and_shot_turb.ps.Z -%%PORTDOCS%%share/doc/urt/pics/center_masks_and_fin_turb.ps.Z -%%PORTDOCS%%share/doc/urt/pics/dart_and_strtch.ps.Z -%%PORTDOCS%%share/doc/urt/pics/dart_shadow_and_monkey.ps.Z -%%PORTDOCS%%share/doc/urt/pics/pahriah_final.ps.Z -%%PORTDOCS%%share/doc/urt/pics/scanned_and_cropped.ps.Z -%%PORTDOCS%%share/doc/urt/rle.doc -%%PORTDOCS%%share/doc/urt/rle.mss -%%PORTDOCS%%share/doc/urt/rle.ps -%%PORTDOCS%%share/doc/urt/rle_head.ps -%%PORTDOCS%%share/doc/urt/rleops.ps -%%PORTDOCS%%share/doc/urt/toolkit.bib -%%PORTDOCS%%share/doc/urt/toolkit.doc -%%PORTDOCS%%share/doc/urt/toolkit.mss -%%PORTDOCS%%share/doc/urt/toolkit.ps -%%PORTDOCS%%share/examples/urt/img/README -%%PORTDOCS%%share/examples/urt/img/christmas_ball.rle -%%PORTDOCS%%share/examples/urt/img/dart.rle -%%PORTDOCS%%share/examples/urt/img/lenna.rle -%%PORTDOCS%%share/examples/urt/img/mandrill.rle -%%PORTDOCS%%share/examples/urt/img/tack_w_shadow.rle -%%PORTDOCS%%@dirrm share/doc/urt/pics -%%PORTDOCS%%@dirrm share/doc/urt -%%PORTDOCS%%@dirrm share/examples/urt/img -%%PORTDOCS%%@dirrm share/examples/urt +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/pics/README +%%PORTDOCS%%%%DOCSDIR%%/pics/bullet_holes_and_shot_turb.ps.Z +%%PORTDOCS%%%%DOCSDIR%%/pics/center_masks_and_fin_turb.ps.Z +%%PORTDOCS%%%%DOCSDIR%%/pics/dart_and_strtch.ps.Z +%%PORTDOCS%%%%DOCSDIR%%/pics/dart_shadow_and_monkey.ps.Z +%%PORTDOCS%%%%DOCSDIR%%/pics/pahriah_final.ps.Z +%%PORTDOCS%%%%DOCSDIR%%/pics/scanned_and_cropped.ps.Z +%%PORTDOCS%%%%DOCSDIR%%/rle.doc +%%PORTDOCS%%%%DOCSDIR%%/rle.mss +%%PORTDOCS%%%%DOCSDIR%%/rle.ps +%%PORTDOCS%%%%DOCSDIR%%/rle_head.ps +%%PORTDOCS%%%%DOCSDIR%%/rleops.ps +%%PORTDOCS%%%%DOCSDIR%%/toolkit.bib +%%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 +%%PORTDOCS%%@dirrm %%DOCSDIR%%/pics +%%PORTDOCS%%@dirrm %%DOCSDIR%% +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/img +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% Property changes on: head/graphics/urt/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property