- Update to 9.5

Submitted by:	Igor Pokrovsky <ip@doom.homeunix.org> (maintainer)
PR:		ports/86835

11 files changed, 157 insertions, 219 deletions

diff --git a/graphics/irit/Makefile b/graphics/irit/Makefile
index 19961866049d..eb9c69d576b0 100644
--- a/graphics/irit/Makefile
+++ b/graphics/irit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	irit
-PORTVERSION=	9.0
+PORTVERSION=	9.5
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.cs.technion.ac.il/~irit/
 DISTNAME=	${PORTNAME}-sm
@@ -14,6 +14,7 @@ DISTNAME=	${PORTNAME}-sm
 MAINTAINER=	ip@doom.homeunix.org
 COMMENT=	Solid modeling system
 
+LIB_DEPENDS=	rle.1:${PORTSDIR}/graphics/urt
 BUILD_DEPENDS=	${LOCALBASE}/lib/libpng.a:${PORTSDIR}/graphics/png \
 		${LOCALBASE}/lib/libungif.a:${PORTSDIR}/graphics/libungif
 
@@ -26,7 +27,8 @@ USE_GL=		yes
 .endif
 INSTALLS_SHLIB=	yes
 NO_WRKSUBDIR=	yes
-MAKEFILE=	makefile.unx
+MAKEFILE=	makefile.gnux
+MAKE_ARGS=	"CFG=Rel"
 MAKE_ENV=	WRKSRC=${WRKSRC} \
 		ECHO_CMD=${ECHO_CMD} \
 		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${WRKSRC}/lib
@@ -34,15 +36,11 @@ MAKE_ENV=	WRKSRC=${WRKSRC} \
 MAKE_ENV+=	WITH_MOTIF_DEF=yes
 .endif
 
-IRIT_PROGS=	3ds2irit aisoshad dat2bin dat2irit dxf2irit igs2irit ihidden \
-		illustrt irender irit irit2dxf irit2hgl irit2igs irit2iv \
-		irit2nff irit2off irit2plg irit2pov irit2ps irit2ray irit2scn \
-		irit2stl irit2wrl irit2xfg izebra lineshad obj2irit off2irit \
-		poly3d-h skeletn1 stl2irit
-IRIT_DRVS=	nuldrvs x11drvs
-.ifdef (WITH_MOTIF)
-IRIT_DRVS+=	xmtdrvs xogldrvs
-.endif
+SUB_FILES=	pkg-message
+SUB_LIST=	"DATADIR=${DATADIR}"
+
+PORTDOCS=	irit.doc prog_man.html general.inf technion.inf update.new \
+		coding.std coding.hints
 
 .if !defined(WITH_MOTIF)
 PLIST_SUB=	WITH_MOTIF="@comment "
@@ -50,8 +48,6 @@ PLIST_SUB=	WITH_MOTIF="@comment "
 PLIST_SUB=	WITH_MOTIF=""
 .endif
 
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
 .ifndef (WITH_MOTIF)
 pre-everything::
 	@${ECHO_CMD} ""
@@ -59,10 +55,17 @@ pre-everything::
 	@${ECHO_CMD} ""
 .endif
 
+pre-build:
+	@${CP} ${WRKSRC}/makefile.gnux ${WRKSRC}/makefile.unx
+	@${CP} ${WRKSRC}/makeflag.gnux ${WRKSRC}/makeflag.unx
+
 do-install:
-.for i in ${IRIT_PROGS} ${IRIT_DRVS}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/$i ${PREFIX}/bin
-.endfor
+	FILES="`${FIND} ${WRKSRC}/bin -type f`";			\
+	for i in $${FILES}; do						\
+		if [ "`${FILE} -b $$i | ${GREP} LSB`" ]; then		\
+			${INSTALL_PROGRAM} $$i ${PREFIX}/bin;		\
+		fi;							\
+	done
 
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/libIrit*.so ${PREFIX}/lib/
 	@${MKDIR} ${PREFIX}/include/${PORTNAME}
@@ -76,21 +79,17 @@ do-install:
 	@${MKDIR} ${EXAMPLESDIR}
 	@${MKDIR} ${EXAMPLESDIR}/data
 	${INSTALL_DATA} ${WRKSRC}/data/* ${EXAMPLESDIR}/data
+	@${MKDIR} ${EXAMPLESDIR}/emacs
+	${INSTALL_DATA} ${WRKSRC}/emacs/irit.el ${EXAMPLESDIR}/emacs
 	@${MKDIR} ${EXAMPLESDIR}/scripts
-	${INSTALL_DATA} ${WRKSRC}/scripts/* ${EXAMPLESDIR}/scripts
+	${INSTALL_DATA} ${WRKSRC}/scripts/*.irt ${EXAMPLESDIR}/scripts
 
 .ifndef (NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/irit.doc ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/prog_man.html ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/general.inf ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/technion.inf ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/update.new ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/coding.std ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}
 .endif
 
 post-install:
-	@(${SED} -e 's|%%DATADIR%%|${DATADIR}|' \
-		<pkg-message >${PKGMESSAGE} && ${CAT} ${PKGMESSAGE})
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/graphics/irit/distinfo b/graphics/irit/distinfo
index 8d52a2d83698..1a1c10062cd0 100644
--- a/graphics/irit/distinfo
+++ b/graphics/irit/distinfo
@@ -1,2 +1,2 @@
-MD5 (irit-sm.zip) = e57cfb11aec94f1e592fc57b4bbdc7e2
-SIZE (irit-sm.zip) = 3128944
+MD5 (irit-sm.zip) = bf75f41538fa73fee186e7a385af80bb
+SIZE (irit-sm.zip) = 3518280
diff --git a/graphics/irit/files/patch-irender_main.c b/graphics/irit/files/patch-irender_main.c
deleted file mode 100644
index f247ad4fcb92..000000000000
--- a/graphics/irit/files/patch-irender_main.c
+++ /dev/null
@@ -1,49 +0,0 @@
---- irender/main.c.orig	Thu Dec 25 18:34:39 2003
-+++ irender/main.c	Fri Mar 26 08:51:39 2004
-@@ -12,9 +12,9 @@
- #include "parser.h"
- #include "config.h"
- 
--#ifdef __FreeBSD__
--#include <floatingpoint.h>
--#endif
-+#if (defined(__FreeBSD__) && defined(__i386__))
-+#include <ieeefp.h>
-+#endif /* __FreeBSD__ && __i386__ */
- 
- /* Contains all configuration options. Subject to change by config file and  */
- /* and command line parameters.                                              */
-@@ -48,16 +48,16 @@
- *****************************************************************************/
- int main(int argc, char *argv[])
- {
--#ifdef __FreeBSD__
--    fpsetmask(FP_X_INV | FP_X_DZ);
--#endif /* __FreeBSD__ */
--
-     IPObjectStruct *Objects, *MatrixObjects;
-     char *BaseDirectory,
- 	*MatrixFiles[] = {NULL, NULL};
-     IRndrPtrType Rend;
-     BoolType DoClipping;
- 
-+#if (defined(__FreeBSD__) && defined(__i386__))
-+	fpsetmask(FP_X_INV | FP_X_DZ);
-+#endif /* __FreeBSD__ && __i386__ */
-+
-     DoClipping = TRUE;
-     GlblLastTime = IritCPUTime(FALSE);
-     InitOptions();
-@@ -129,10 +129,10 @@
-     IRndrDestroy(Rend);
-     TakeTime("Z-Buffer dump");
- 
--#ifdef __FreeBSD__
-+#if (defined(__FreeBSD__) && defined(__i386__))
-     fpresetsticky(FP_X_INV | FP_X_OFL | FP_X_UFL |
- 		  FP_X_DZ | FP_X_IMP | FP_X_DNML);
--#endif /* __FreeBSD__ */
-+#endif /* __FreeBSD__ && __i386__ */
- 
-     return 0;
- }
diff --git a/graphics/irit/files/patch-irit_irit.c b/graphics/irit/files/patch-irit_irit.c
deleted file mode 100644
index 1153b03d997d..000000000000
--- a/graphics/irit/files/patch-irit_irit.c
+++ /dev/null
@@ -1,62 +0,0 @@
---- irit/irit.c.orig	Mon Feb  2 10:51:52 2004
-+++ irit/irit.c	Mon Feb  2 11:00:42 2004
-@@ -40,8 +40,13 @@
- #include "intr_gr.h"
- #endif /* DJGCC */
- #ifdef __UNIX__
-+#if defined (__FreeBSD__)
-+#include <term.h>
-+STATIC_DATA struct termios GlblOrigTermio;
-+#else
- #include <termio.h>
- STATIC_DATA struct termio GlblOrigTermio;
-+#endif /* !__FreeBSD__ */
- #endif /* __UNIX__ */
- 
- #ifdef NO_CONCAT_STR
-@@ -285,20 +290,33 @@
- 
- #   ifdef __UNIX__
-     {
-+#if defined (__FreeBSD__)
-+	struct termios Termio;
-+#else
- 	struct termio Termio;
-+#endif /* !__FreeBSD__ */
- 
- 	/* We read stdin on a char by char basis with a 0.1 second timer so  */
- 	/* we could simultaneously handle other requests (for example, from  */
- 	/* display devices).						     */
-+#if defined (__FreeBSD__)
-+	tcgetattr(0, &GlblOrigTermio);
-+	tcgetattr(0, &Termio);
-+#else
- 	ioctl(0, TCGETA, &GlblOrigTermio);
- 	ioctl(0, TCGETA, &Termio);
-+#endif /* !__FreeBSD__ */
- 	Termio.c_lflag &= ~ICANON;	     /* Clear the canonical editing. */
- 	Termio.c_cc[VEOF] = 0;    /* MIN = 0, no minimal length to wait for. */
- 	Termio.c_cc[VEOL] = 1;    /* TIME - 1 tenth of a second as time out. */
- #       ifdef VSUSP
- 	    Termio.c_cc[VSUSP] = 0;		   /* Disable ^Z suspension. */
- #       endif /* VSUSP */
-+#if defined (__FreeBSD__)
-+	tcsetattr(0, TCSANOW, &Termio);
-+#else
- 	ioctl(0, TCSETA, &Termio);
-+#endif /* !__FreeBSD__ */
-     }
- #   endif /* __UNIX__ */
- 
-@@ -819,7 +837,11 @@
- 	fclose(GlblLogFile);		      /* Close log file if was open. */
- 
- #   ifdef __UNIX__    
-+#if defined (__FreeBSD__)
-+	tcsetattr(0, TCSANOW, &GlblOrigTermio);
-+#else
- 	ioctl(0, TCSETA, &GlblOrigTermio);
-+#endif /* !__FreeBSD__ */
- #   endif /* __UNIX__ */
- 
- #   ifdef __WINNT__
diff --git a/graphics/irit/files/patch-makefile.gnux b/graphics/irit/files/patch-makefile.gnux
new file mode 100644
index 000000000000..8abcfaafc727
--- /dev/null
+++ b/graphics/irit/files/patch-makefile.gnux
@@ -0,0 +1,11 @@
+--- makefile.gnux.orig
++++ makefile.gnux
+@@ -28,7 +28,7 @@
+ 
+ SHELL = /bin/sh
+ 
+-all: 	binaries doc init
++all: 	binaries doc #init
+ 
+ #
+ # Print info regarding initialization.
diff --git a/graphics/irit/files/patch-makefile.unx b/graphics/irit/files/patch-makefile.unx
deleted file mode 100644
index c9c6de102c3b..000000000000
--- a/graphics/irit/files/patch-makefile.unx
+++ /dev/null
@@ -1,11 +0,0 @@
---- makefile.unx.orig	Mon Feb  2 17:15:56 2004
-+++ makefile.unx	Mon Feb  2 17:16:27 2004
-@@ -23,7 +23,7 @@
- 
- SHELL = /bin/sh
- 
--all: 	binaries doc init
-+all: 	binaries doc
- 
- #
- # Print info regarding initialization.
diff --git a/graphics/irit/files/patch-makeflag.unx b/graphics/irit/files/patch-makeflag.gnux
index 506d42cb97f6..93ae1aa4aef2 100644
--- a/graphics/irit/files/patch-makeflag.unx
+++ b/graphics/irit/files/patch-makeflag.gnux
@@ -1,93 +1,82 @@
---- makeflag.unx.orig	Thu Dec 18 16:52:16 2003
-+++ makeflag.unx	Mon Feb  2 17:11:51 2004
+--- makeflag.gnux.orig
++++ makeflag.gnux
 @@ -9,7 +9,7 @@
  # be simple wrong.
  #
  
--SRC_DIR = /cygdriver/c/irit/irit
+-SRC_DIR = /home/gershon/irit/sun
 +SRC_DIR = ${WRKSRC}
  
  #
  # All libraries created will be installed into the LIB_DIR directory.
-@@ -31,10 +31,10 @@
- # Invoke this make file as 'make CFG=Rel makefile.unx' for release mode:
- #
+@@ -34,7 +34,7 @@
+ 	IRITOBJPF =
+ 	IRITLIBPF =
+ 	IRITEXEPF = 
+-	STRIPEXE = strip
++	STRIPEXE = ${ECHO_CMD}	# ${INSTALL_PROGRAM} takes care of stripping
  
--IRITOBJPF = D
--IRITLIBPF = D
--IRITEXEPF = D
--STRIPEXE = ls
-+#IRITOBJPF = D
-+#IRITLIBPF = D
-+#IRITEXEPF = D
-+#STRIPEXE = ls
+ else
+ 	IRITOBJPF = D
+@@ -54,27 +54,27 @@
+ #
+ #   Make these empty if you would like to give up on irender's compilation.
+ #
+-#URT = /b/d2/gershon/urt/onyx64
+-#URT_INC = -I$(URT)/include
+-#URT_LIB = -L$(URT)/lib -lrle
+-#URT_FLAGS = -DHAVE_URT_RLE -DURT_OLD_COMPAT
++URT = ${LOCALBASE}
++URT_INC = -I$(URT)/include
++URT_LIB = -L$(URT)/lib -lrle
++URT_FLAGS = -DHAVE_URT_RLE -DURT_OLD_COMPAT
  
  #
- # Location of object file to resolve circularities in libraries.
-@@ -56,35 +56,35 @@
  # Support for GIF image read/write using the giflib toolkit library.
- # You can ftp it from http://catb.org/~esr/giflib/doc/gif_lib.html
+ # You can ftp it from 
  #
--# GIF = /net/cel2-3/labs/cggc/gershon/c/gif_lib
--# GIF_INC = -I$(GIF)/lib
--# GIF_LIB = $(GIF)/sun4/lib/libgif.a
--# GIF_FLAGS = -DHAVE_GIF_LIB
+-#GIF = /b/d2/gershon/gif_lib
+-#GIF_INC = -I$(GIF)/lib
+-#GIF_LIB = $(GIF)/onyx64/lib/libgif.a
+-#GIF_FLAGS = -DHAVE_GIF_LIB
 +GIF = ${LOCALBASE}
 +GIF_INC = -I$(GIF)/include
 +GIF_LIB = $(GIF)/lib/libungif.a
 +GIF_FLAGS = -DHAVE_GIF_LIB
  
  #
- # Support for PNG image read/write using the pnglib toolkit library.
- # You can ftp it from http://www.libpng.org/pub/png/libpng.html
- #
--# PNG = /net/cel2-3/labs/cggc/gershon/c/libpng/lpng125
--# PNG_INC = -I$(PNG) 
--# PNG_LIB = $(PNG)/sun4/libpng.a
--# PNG_FLAGS = -DHAVE_PNG_LIB
-+PNG = ${LOCALBASE}
-+PNG_INC = -I$(PNG)/include 
-+PNG_LIB = $(PNG)/lib/libpng.a
-+PNG_FLAGS = -DHAVE_PNG_LIB
- 
- #
- # Support for GZIP read/write using the gzip toolkit library.
- #
--# GZIP = /net/cel2-3/labs/cggc/gershon/c/zlib/zlib-1.2.1
--# GZIP_INC = -I$(GZIP)
--# GZIP_LIB = $(GZIP)/sun4/libz.a
--# GZIP_FLAGS = -DHAVE_GZIP_LIB
-+GZIP = /usr
-+GZIP_INC = -I$(GZIP)/include
-+GZIP_LIB = $(GZIP)/lib/libz.a
-+GZIP_FLAGS = -DHAVE_GZIP_LIB
- 
- #
  # If you would like to use Mesa emulation of Open GL and compile Open GL
  # code using it (see http://www.ssec.wisc.edu/~brianp/Mesa.html for info
  # on Mesa), define the following:
  #
 -# MESA_INC = -I/mach/emc2-32/isl/gershon/c/mesa/MesaLib-2.4/include -D__MESA__ -D__OPENGL__
 -# MESA_LIB = -L/mach/emc2-32/isl/gershon/c/mesa/MesaLib-2.4/lib -lGLU -lGL
-+MESA_INC = -I${X11BASE}/include #-D__MESA__ -D__OPENGL__
++MESA_INC = -I${X11BASE}/include -D__MESA__ -D__OPENGL__
 +MESA_LIB = -L${X11BASE}/lib -lGLU -lGL
  
  #
  # Support of (shared) libraries.  You will need to set the proper suffix
-@@ -337,22 +337,22 @@
+@@ -340,25 +340,25 @@
  # Note you cannot use SUN's native cc compiler since it does not support
  # Ansi C. If you use mesa emulation of Open GL, uncomment xogldrvs 
  #
 -CC = gcc
 -DFLAGS = -DSUN4 -DTIMES -DRAND48 -DNANOSLEEP -D__UNIX__ -D__X11__ -I/usr/openwin/share/include -I/opt/SUNWmotif/share/include $(MESA_INC)
-+#CC = gcc
-+#DFLAGS = -DSUN4 -DTIMES -DRAND48 -DNANOSLEEP -D__UNIX__ -D__X11__ -I/usr/openwin/share/include -I/opt/SUNWmotif/share/include $(MESA_INC)
- # CFLAGS = -O2 $(DFLAGS)
--CFLAGS = -g -DDEBUG $(DFLAGS)
+-ifeq ($(CFG), Rel)
+-    CFLAGS = -O2 $(DFLAGS)
+-else
+-    CFLAGS = -g -DDEBUG $(DFLAGS)
+-endif
 -MORELIBS = -lsocket -lnsl -lposix4
 -GRAPX11LIBS = -L/usr/openwin/lib -lX11
 -GRAPXMTLIBS = -L/opt/SUNWmotif/lib -L/usr/ccs/lib -lXm -L/usr/openwin/lib -lXt -lX11 -lgen
-+#CFLAGS = -g -DDEBUG $(DFLAGS)
++#CC = gcc
++#DFLAGS = -DSUN4 -DTIMES -DRAND48 -DNANOSLEEP -D__UNIX__ -D__X11__ -I/usr/openwin/share/include -I/opt/SUNWmotif/share/include $(MESA_INC)
++#ifeq ($(CFG), Rel)
++#    CFLAGS = -O2 $(DFLAGS)
++#else
++#    CFLAGS = -g -DDEBUG $(DFLAGS)
++#endif
 +#MORELIBS = -lsocket -lnsl -lposix4
 +#GRAPX11LIBS = -L/usr/openwin/lib -lX11
 +#GRAPXMTLIBS = -L/opt/SUNWmotif/lib -L/usr/ccs/lib -lXm -L/usr/openwin/lib -lXt -lX11 -lgen
@@ -107,20 +96,23 @@
  
  #
  # Flags for SUN Solaris 5.3 using cc SC3.0.1 and X11 (uncomment xogldrvs if
-@@ -534,20 +534,29 @@
+@@ -570,23 +570,33 @@
  #
  # Flags for i386 FreeBSD using X11R6
  #
 -# DFLAGS = -D__UNIX__ -DX11R6 -D__X11__ -DTIMES -DRAND48 -DUSLEEP
--# CFLAGS = -O2 -pipe -m486 -fomit-frame-pointer $(DFLAGS)
-+DFLAGS = -D__UNIX__ -DX11R6 -DTIMES -DRAND48 -DUSLEEP
++DFLAGS = -D__UNIX__ -DX11R6 -D__X11__ -DTIMES -DRAND48 -DUSLEEP
 +ifeq ($(WITH_MOTIF_DEF),yes)
-+DFLAGS+=	-D__GL__ ${MESA_INC}
++DFLAGS+=	${MESA_INC}
 +else
 +DFLAGS+=	-D__X11__ -I${X11BASE}/include
 +endif
-+CFLAGS += -fPIC -fomit-frame-pointer $(DFLAGS)
- # CFLAGS = -g -DDEBUG $(DFLAGS) 
++CFLAGS += -fPIC $(DFLAGS)
+ # ifeq ($(CFG), Rel)
+ #     CFLAGS = -O2 -pipe -m486 -fomit-frame-pointer $(DFLAGS)
+ # else
+ #     CFLAGS = -g -DDEBUG $(DFLAGS) 
+ # endif
 -# MORELIBS =  -lc
 -# GRAPX11LIBS = -L/usr/X11R6/lib -lX11
 -# GRAPXMTLIBS = -L/usr/X11R6/lib -lXm -lXt -lX11
@@ -129,9 +121,9 @@
 +GRAPX11LIBS = -L${X11BASE}/lib -lX11
 +GRAPDRVS = nuldrvs$(IRITEXEPF) x11drvs$(IRITEXEPF)
 +ifeq ($(WITH_MOTIF_DEF),yes)
-+GRAPXMTLIBS = -L${X11BASE}/lib ${MOTIFLIB} -lXt -lX11
++GRAPXMTLIBS = -L${X11BASE}/lib -lXm -lXt -lX11
 +GRAPOGLLIBS = ${MESA_LIB} ${GRAPXMTLIBS}
-+GRAPDRVS+=	xmtdrvs$(IRITEXEPF) xogldrvs$(IRITEXEPF)
++GRAPDRVS+= xmtdrvs$(IRITEXEPF) xogldrvs$(IRITEXEPF)
 +endif
  #
  #
@@ -146,3 +138,9 @@
  
  #
  # Default rule for compilation.
+@@ -612,4 +622,4 @@
+ 	-lIritCagd$(IRITLIBPF) \
+ 	-lIritGeom$(IRITLIBPF) \
+ 	-lIritMisc$(IRITLIBPF) \
+-	-lIritXtra$(IRITLIBPF) $(URT_LIB) $(GIF_LIB) # -l gif
++	-lIritXtra$(IRITLIBPF) $(URT_LIB) $(GIF_LIB) $(GRAPOGLLIBS) # -l gif
diff --git a/graphics/irit/files/patch-mvar__lib_makefile.unx b/graphics/irit/files/patch-mvar__lib_makefile.unx
new file mode 100644
index 000000000000..17289ac93dfc
--- /dev/null
+++ b/graphics/irit/files/patch-mvar__lib_makefile.unx
@@ -0,0 +1,22 @@
+--- mvar_lib/makefile.unx.orig
++++ mvar_lib/makefile.unx
+@@ -31,19 +31,12 @@
+ 	mvarrais.o$(IRITOBJPF) \
+ 	mvartopo.o$(IRITOBJPF) \
+ 	mvarzero.o$(IRITOBJPF) \
+-	mvbiscon.o$(IRITOBJPF) \
+ 	mvbisect.o$(IRITOBJPF) \
+ 	mvbspsym.o$(IRITOBJPF) \
+ 	mvbzrpwr.o$(IRITOBJPF) \
+ 	mvbzrsym.o$(IRITOBJPF) \
+ 	mvcones.o$(IRITOBJPF) \
+-	mvlowenv.o$(IRITOBJPF) \
+-	mvsplmon.o$(IRITOBJPF) \
+ 	mvtangnt.o$(IRITOBJPF) \
+-	mvtrmbis.o$(IRITOBJPF) \
+-	mvtrmpcr.o$(IRITOBJPF) \
+-	mvvorcel.o$(IRITOBJPF) \
+-	mvvorcrv.o$(IRITOBJPF) \
+ 	ray-trap.o$(IRITOBJPF) \
+ 	skel2d.o$(IRITOBJPF)
+ 
diff --git a/graphics/irit/files/patch-prsr__lib_ipc__loc.h b/graphics/irit/files/patch-prsr__lib_ipc__loc.h
new file mode 100644
index 000000000000..4b81e7b85fef
--- /dev/null
+++ b/graphics/irit/files/patch-prsr__lib_ipc__loc.h
@@ -0,0 +1,20 @@
+--- prsr_lib/ipc_loc.h.orig
++++ prsr_lib/ipc_loc.h
+@@ -338,7 +338,7 @@
+ /* General file pointer for varios compression tools. */ 
+ typedef gzFile IpcFile; 
+ #define _IPC_OPEN_FILE(FileName, Mode) (gzopen(FileName, Mode)) 
+-#define _IPC_DOPEN_FILE(f, Mode)       (gzdopen(_fileno(f), Mode))
++#define _IPC_DOPEN_FILE(f, Mode)       (gzdopen(fileno(f), Mode))
+ #define _IPC_INIT(f) { \
+           if (gzsetparams(f, IPC_COMPRESS_LEVEL, Z_DEFAULT_STRATEGY) != Z_OK) \
+ 	                   return IPC_ERROR_ZLIB;}
+@@ -353,7 +353,7 @@
+ /* General file pointer for varios compression tools. */ 
+ typedef FILE IpcFile; 
+ #define _IPC_OPEN_FILE(FileName, Mode) (fopen(FileName, Mode))
+-#define _IPC_DOPEN_FILE(f, Mode)       (fdopen(_fileno(f), Mode))
++#define _IPC_DOPEN_FILE(f, Mode)       (fdopen(fileno(f), Mode))
+ #define _IPC_INIT(f)
+ #define _IPC_CLOSE_FILE(f) fclose(f)
+ /* In Debug mode if used extern console compressor, */
diff --git a/graphics/irit/pkg-message b/graphics/irit/files/pkg-message.in
index cf9ff1ef1bb3..5809c2d31575 100644
--- a/graphics/irit/pkg-message
+++ b/graphics/irit/files/pkg-message.in
@@ -14,6 +14,7 @@ and optionally:
 
 IRIT_BIN_IPC=1
 IRIT_SERVER_HOST=`hostname`
+IRIT_SERVER_PORT=5432
 
-For more information consult IRIT documentation
+For more information please consult IRIT documentation
 *******************************************************************************
diff --git a/graphics/irit/pkg-plist b/graphics/irit/pkg-plist
index 35f97da029cc..b845e2ef4370 100644
--- a/graphics/irit/pkg-plist
+++ b/graphics/irit/pkg-plist
@@ -71,11 +71,6 @@ lib/libIritTriv.so
 lib/libIritTrng.so
 lib/libIritUser.so
 lib/libIritXtra.so
-%%PORTDOCS%%%%DOCSDIR%%/coding.std
-%%PORTDOCS%%%%DOCSDIR%%/general.inf
-%%PORTDOCS%%%%DOCSDIR%%/prog_man.html
-%%PORTDOCS%%%%DOCSDIR%%/technion.inf
-%%PORTDOCS%%%%DOCSDIR%%/update.new
 %%EXAMPLESDIR%%/data/3dhead.32
 %%EXAMPLESDIR%%/data/3dhead.inf
 %%EXAMPLESDIR%%/data/ai_b58.itd
@@ -105,6 +100,7 @@ lib/libIritXtra.so
 %%EXAMPLESDIR%%/data/ir_b58.itd
 %%EXAMPLESDIR%%/data/ir_chckr.irt
 %%EXAMPLESDIR%%/data/ir_chckr.itd
+%%EXAMPLESDIR%%/data/ir_cube.itd
 %%EXAMPLESDIR%%/data/ir_eggs.itd
 %%EXAMPLESDIR%%/data/ir_isogls.itd
 %%EXAMPLESDIR%%/data/ir_l3ort.itd
@@ -128,8 +124,10 @@ lib/libIritXtra.so
 %%EXAMPLESDIR%%/data/pl_sold1.itd
 %%EXAMPLESDIR%%/data/pl_sold3.itd
 %%EXAMPLESDIR%%/data/pl_wiggl.itd
+%%EXAMPLESDIR%%/data/plystrip.itd
 %%EXAMPLESDIR%%/data/sphere16.itd
 %%EXAMPLESDIR%%/data/sphere8.itd
+%%EXAMPLESDIR%%/emacs/irit.el
 %%EXAMPLESDIR%%/scripts/adap_iso.irt
 %%EXAMPLESDIR%%/scripts/algsum.irt
 %%EXAMPLESDIR%%/scripts/alphsec2.irt
@@ -140,6 +138,7 @@ lib/libIritXtra.so
 %%EXAMPLESDIR%%/scripts/animdemo.irt
 %%EXAMPLESDIR%%/scripts/ant.irt
 %%EXAMPLESDIR%%/scripts/arc_len.irt
+%%EXAMPLESDIR%%/scripts/art_glry.irt
 %%EXAMPLESDIR%%/scripts/aspct_gr.irt
 %%EXAMPLESDIR%%/scripts/b58.irt
 %%EXAMPLESDIR%%/scripts/bed.irt
@@ -167,6 +166,7 @@ lib/libIritXtra.so
 %%EXAMPLESDIR%%/scripts/closloop.irt
 %%EXAMPLESDIR%%/scripts/cmorph.irt
 %%EXAMPLESDIR%%/scripts/cmorph2.irt
+%%EXAMPLESDIR%%/scripts/cmp_itd.irt
 %%EXAMPLESDIR%%/scripts/colors.irt
 %%EXAMPLESDIR%%/scripts/cone-cyl.irt
 %%EXAMPLESDIR%%/scripts/cone2cyl.irt
@@ -177,12 +177,15 @@ lib/libIritXtra.so
 %%EXAMPLESDIR%%/scripts/coords.irt
 %%EXAMPLESDIR%%/scripts/coplanar.irt
 %%EXAMPLESDIR%%/scripts/corkplug.irt
+%%EXAMPLESDIR%%/scripts/cort_map.irt
 %%EXAMPLESDIR%%/scripts/cos_sphr.irt
 %%EXAMPLESDIR%%/scripts/crosplug.irt
 %%EXAMPLESDIR%%/scripts/crv_dist.irt
 %%EXAMPLESDIR%%/scripts/crv_krnl.irt
 %%EXAMPLESDIR%%/scripts/crv_tan.irt
+%%EXAMPLESDIR%%/scripts/crvarrng.irt
 %%EXAMPLESDIR%%/scripts/crvdecmp.irt
+%%EXAMPLESDIR%%/scripts/crvtrrec.irt
 %%EXAMPLESDIR%%/scripts/cslogo.irt
 %%EXAMPLESDIR%%/scripts/cube.irt
 %%EXAMPLESDIR%%/scripts/cube2.irt
@@ -190,6 +193,7 @@ lib/libIritXtra.so
 %%EXAMPLESDIR%%/scripts/cubes.irt
 %%EXAMPLESDIR%%/scripts/cup.irt
 %%EXAMPLESDIR%%/scripts/curvatur.irt
+%%EXAMPLESDIR%%/scripts/cvisible.irt
 %%EXAMPLESDIR%%/scripts/cylin3.irt
 %%EXAMPLESDIR%%/scripts/decimate.irt
 %%EXAMPLESDIR%%/scripts/demo.irt
@@ -203,9 +207,11 @@ lib/libIritXtra.so
 %%EXAMPLESDIR%%/scripts/domino.irt
 %%EXAMPLESDIR%%/scripts/duality.irt
 %%EXAMPLESDIR%%/scripts/duck.irt
+%%EXAMPLESDIR%%/scripts/ellipses.irt
 %%EXAMPLESDIR%%/scripts/escher.irt
 %%EXAMPLESDIR%%/scripts/f16.irt
 %%EXAMPLESDIR%%/scripts/facemask.irt
+%%EXAMPLESDIR%%/scripts/ffcmpcrv.irt
 %%EXAMPLESDIR%%/scripts/ffcnvhul.irt
 %%EXAMPLESDIR%%/scripts/ffloops.irt
 %%EXAMPLESDIR%%/scripts/ffmatch4.irt
@@ -222,6 +228,7 @@ lib/libIritXtra.so
 %%EXAMPLESDIR%%/scripts/handset.irt
 %%EXAMPLESDIR%%/scripts/hermite.irt
 %%EXAMPLESDIR%%/scripts/interpol.irt
+%%EXAMPLESDIR%%/scripts/isocline.irt
 %%EXAMPLESDIR%%/scripts/knight.irt
 %%EXAMPLESDIR%%/scripts/knotrmvl.irt
 %%EXAMPLESDIR%%/scripts/knots.irt
@@ -255,9 +262,11 @@ lib/libIritXtra.so
 %%EXAMPLESDIR%%/scripts/polypris.irt
 %%EXAMPLESDIR%%/scripts/polyprop.irt
 %%EXAMPLESDIR%%/scripts/polytrnc.irt
+%%EXAMPLESDIR%%/scripts/pp_apprx.irt
 %%EXAMPLESDIR%%/scripts/prim_fit.irt
 %%EXAMPLESDIR%%/scripts/primitiv.irt
 %%EXAMPLESDIR%%/scripts/primsrfs.irt
+%%EXAMPLESDIR%%/scripts/print_it.irt
 %%EXAMPLESDIR%%/scripts/printf.irt
 %%EXAMPLESDIR%%/scripts/prisa.irt
 %%EXAMPLESDIR%%/scripts/prisanim.irt
@@ -308,6 +317,7 @@ lib/libIritXtra.so
 %%EXAMPLESDIR%%/scripts/solid8h.irt
 %%EXAMPLESDIR%%/scripts/solid9.irt
 %%EXAMPLESDIR%%/scripts/sphercon.irt
+%%EXAMPLESDIR%%/scripts/srf_dist.irt
 %%EXAMPLESDIR%%/scripts/srf_krnl.irt
 %%EXAMPLESDIR%%/scripts/srf_ssi.irt
 %%EXAMPLESDIR%%/scripts/srf_tan.irt
@@ -321,7 +331,6 @@ lib/libIritXtra.so
 %%EXAMPLESDIR%%/scripts/teapot2.irt
 %%EXAMPLESDIR%%/scripts/techlogo.irt
 %%EXAMPLESDIR%%/scripts/test_all.irt
-%%EXAMPLESDIR%%/scripts/testmost.csh
 %%EXAMPLESDIR%%/scripts/testmost.irt
 %%EXAMPLESDIR%%/scripts/textgeom.irt
 %%EXAMPLESDIR%%/scripts/textwarp.irt
@@ -332,6 +341,7 @@ lib/libIritXtra.so
 %%EXAMPLESDIR%%/scripts/trimsrfs.irt
 %%EXAMPLESDIR%%/scripts/trisrfs.irt
 %%EXAMPLESDIR%%/scripts/trivars.irt
+%%EXAMPLESDIR%%/scripts/turbine.irt
 %%EXAMPLESDIR%%/scripts/tvcover.irt
 %%EXAMPLESDIR%%/scripts/warp2trv.irt
 %%EXAMPLESDIR%%/scripts/warp_tea.irt
@@ -343,7 +353,6 @@ lib/libIritXtra.so
 %%DATADIR%%/illustrt.cfg
 %%DATADIR%%/irender.cfg
 %%DATADIR%%/irit.cfg
-%%DATADIR%%/irit.doc
 %%DATADIR%%/iritfont.itd
 %%DATADIR%%/iritinit.irt
 %%DATADIR%%/izebra.cfg
@@ -352,7 +361,7 @@ lib/libIritXtra.so
 %%DATADIR%%/x11drvs.cfg
 @dirrm %%DATADIR%%
 @dirrm %%EXAMPLESDIR%%/scripts
+@dirrm %%EXAMPLESDIR%%/emacs
 @dirrm %%EXAMPLESDIR%%/data
 @dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/irit