From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Oct 2 16:20:19 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 99E1A16A420 for ; Sun, 2 Oct 2005 16:20:19 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B858143D46 for ; Sun, 2 Oct 2005 16:20:18 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j92GKI2c027624 for ; Sun, 2 Oct 2005 16:20:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j92GKIJW027623; Sun, 2 Oct 2005 16:20:18 GMT (envelope-from gnats) Resent-Date: Sun, 2 Oct 2005 16:20:18 GMT Resent-Message-Id: <200510021620.j92GKIJW027623@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Igor Pokrovsky Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CBD3C16A41F for ; Sun, 2 Oct 2005 16:16:05 +0000 (GMT) (envelope-from igor@doom.homeunix.org) Received: from mail.ecolines.ru (ns.ecolines.ru [81.3.181.213]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F3DF43D45 for ; Sun, 2 Oct 2005 16:16:03 +0000 (GMT) (envelope-from igor@doom.homeunix.org) Received: (qmail 770 invoked from network); 2 Oct 2005 16:18:21 -0000 Received: from dialup84122-115.ip.peterstar.net (HELO doom.homeunix.org) (ip@84.204.122.115) by mail.ecolines.ru with ESMTPA; 2 Oct 2005 16:18:21 -0000 Received: from doom.homeunix.org (localhost [127.0.0.1]) by doom.homeunix.org (8.13.4/8.13.4) with ESMTP id j92GFMLm036070 for ; Sun, 2 Oct 2005 20:15:22 +0400 (MSD) (envelope-from igor@doom.homeunix.org) Received: (from igor@localhost) by doom.homeunix.org (8.13.4/8.13.4/Submit) id j92GFMc6036069; Sun, 2 Oct 2005 20:15:22 +0400 (MSD) (envelope-from igor) Message-Id: <200510021615.j92GFMc6036069@doom.homeunix.org> Date: Sun, 2 Oct 2005 20:15:22 +0400 (MSD) From: Igor Pokrovsky To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/86835: Update port: graphics/irit 9.0 -> 9.5 (fixes pointyhat error) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Igor Pokrovsky List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Oct 2005 16:20:19 -0000 >Number: 86835 >Category: ports >Synopsis: Update port: graphics/irit 9.0 -> 9.5 (fixes pointyhat error) >Confidential: no >Severity: non-critical >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Oct 02 16:20:18 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Igor Pokrovsky >Release: FreeBSD 4.11-STABLE i386 >Organization: >Environment: System: FreeBSD doom.homeunix.org 4.11-STABLE FreeBSD 4.11-STABLE #0: Wed Sep 7 09:26:18 MSD 2005 root@doom.homeunix.org:/usr/obj/usr/src/sys/KERNEL-p3 i386 >Description: Update to 9.5. Removed files: files/patch-irender_main.c files/patch-irit_irit.c files/patch-makefile.unx files/patch-makeflag.unx pkg-message Added files: files/patch-makefile.gnux files/patch-makeflag.gnux files/patch-mvar__lib_makefile.unx files/patch-prsr__lib_ipc__loc.h files/pkg-message.in >How-To-Repeat: >Fix: --- irit.diff begins here --- diff -ruN /usr/ports/graphics/irit/Makefile irit/Makefile --- /usr/ports/graphics/irit/Makefile Wed Jul 21 21:47:51 2004 +++ irit/Makefile Sun Oct 2 19:40:25 2005 @@ -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 @@ 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 @@ .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+= 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="" .endif -PKGMESSAGE= ${WRKDIR}/pkg-message - .ifndef (WITH_MOTIF) pre-everything:: @${ECHO_CMD} "" @@ -59,10 +55,17 @@ @${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 @@ @${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}|' \ - ${PKGMESSAGE} && ${CAT} ${PKGMESSAGE}) + @${CAT} ${PKGMESSAGE} .include diff -ruN /usr/ports/graphics/irit/distinfo irit/distinfo --- /usr/ports/graphics/irit/distinfo Sun Mar 28 16:29:00 2004 +++ irit/distinfo Mon Sep 26 22:46:12 2005 @@ -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 -ruN /usr/ports/graphics/irit/files/patch-irender_main.c irit/files/patch-irender_main.c --- /usr/ports/graphics/irit/files/patch-irender_main.c Sun Mar 28 16:29:00 2004 +++ irit/files/patch-irender_main.c Thu Jan 1 03:00:00 1970 @@ -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 --#endif -+#if (defined(__FreeBSD__) && defined(__i386__)) -+#include -+#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 -ruN /usr/ports/graphics/irit/files/patch-irit_irit.c irit/files/patch-irit_irit.c --- /usr/ports/graphics/irit/files/patch-irit_irit.c Tue Feb 24 01:10:39 2004 +++ irit/files/patch-irit_irit.c Thu Jan 1 03:00:00 1970 @@ -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 -+STATIC_DATA struct termios GlblOrigTermio; -+#else - #include - 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 -ruN /usr/ports/graphics/irit/files/patch-makefile.gnux irit/files/patch-makefile.gnux --- /usr/ports/graphics/irit/files/patch-makefile.gnux Thu Jan 1 03:00:00 1970 +++ irit/files/patch-makefile.gnux Sun Oct 2 17:49:43 2005 @@ -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 -ruN /usr/ports/graphics/irit/files/patch-makefile.unx irit/files/patch-makefile.unx --- /usr/ports/graphics/irit/files/patch-makefile.unx Tue Feb 24 01:10:39 2004 +++ irit/files/patch-makefile.unx Thu Jan 1 03:00:00 1970 @@ -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 -ruN /usr/ports/graphics/irit/files/patch-makeflag.gnux irit/files/patch-makeflag.gnux --- /usr/ports/graphics/irit/files/patch-makeflag.gnux Thu Jan 1 03:00:00 1970 +++ irit/files/patch-makeflag.gnux Sun Oct 2 18:50:49 2005 @@ -0,0 +1,146 @@ +--- makeflag.gnux.orig ++++ makeflag.gnux +@@ -9,7 +9,7 @@ + # be simple wrong. + # + +-SRC_DIR = /home/gershon/irit/sun ++SRC_DIR = ${WRKSRC} + + # + # All libraries created will be installed into the LIB_DIR directory. +@@ -34,7 +34,7 @@ + IRITOBJPF = + IRITLIBPF = + IRITEXEPF = +- STRIPEXE = strip ++ STRIPEXE = ${ECHO_CMD} # ${INSTALL_PROGRAM} takes care of stripping + + 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 + + # + # Support for GIF image read/write using the giflib toolkit library. + # You can ftp it from + # +-#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 + + # + # 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_LIB = -L${X11BASE}/lib -lGLU -lGL + + # + # Support of (shared) libraries. You will need to set the proper suffix +@@ -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) +-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 ++#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 + # GRAPOGLLIBS = $(MESA_LIB) -lXext $(GRAPXMTLIBS) + # GRAPOGLLIBS = -lGLU -lGL $(GRAPXMTLIBS) +-GRAPDRVS = nuldrvs$(IRITEXEPF) x11drvs$(IRITEXEPF) xmtdrvs$(IRITEXEPF) # xogldrvs$(IRITEXEPF) ++#GRAPDRVS = nuldrvs$(IRITEXEPF) x11drvs$(IRITEXEPF) xmtdrvs$(IRITEXEPF) # xogldrvs$(IRITEXEPF) + # + # For shared libraries add: + # +-LIB_SUFFIX = so +-LIB_MAKE = ld -G -o +-LIB_RAN = echo ++#LIB_SUFFIX = so ++#LIB_MAKE = ld -G -o ++#LIB_RAN = echo + + # + # Flags for SUN Solaris 5.3 using cc SC3.0.1 and X11 (uncomment xogldrvs if +@@ -570,23 +570,33 @@ + # + # Flags for i386 FreeBSD using X11R6 + # +-# DFLAGS = -D__UNIX__ -DX11R6 -D__X11__ -DTIMES -DRAND48 -DUSLEEP ++DFLAGS = -D__UNIX__ -DX11R6 -D__X11__ -DTIMES -DRAND48 -DUSLEEP ++ifeq ($(WITH_MOTIF_DEF),yes) ++DFLAGS+= ${MESA_INC} ++else ++DFLAGS+= -D__X11__ -I${X11BASE}/include ++endif ++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 +-# GRAPDRVS = nuldrvs$(IRITEXEPF) x11drvs$(IRITEXEPF) xmtdrvs$(IRITEXEPF) ++MORELIBS = -lc ++GRAPX11LIBS = -L${X11BASE}/lib -lX11 ++GRAPDRVS = nuldrvs$(IRITEXEPF) x11drvs$(IRITEXEPF) ++ifeq ($(WITH_MOTIF_DEF),yes) ++GRAPXMTLIBS = -L${X11BASE}/lib -lXm -lXt -lX11 ++GRAPOGLLIBS = ${MESA_LIB} ${GRAPXMTLIBS} ++GRAPDRVS+= xmtdrvs$(IRITEXEPF) xogldrvs$(IRITEXEPF) ++endif + # + # + # For shared libraries add: + # +-# LIB_SUFFIX = so +-# LIB_MAKE = cc -shared -o +-# LIB_RAN = ranlib ++LIB_SUFFIX = so ++LIB_MAKE = ${LD} -shared -o ++LIB_RAN = ${ECHO_CMD} + + # + # 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 -ruN /usr/ports/graphics/irit/files/patch-makeflag.unx irit/files/patch-makeflag.unx --- /usr/ports/graphics/irit/files/patch-makeflag.unx Tue Feb 24 01:10:39 2004 +++ irit/files/patch-makeflag.unx Thu Jan 1 03:00:00 1970 @@ -1,148 +0,0 @@ ---- makeflag.unx.orig Thu Dec 18 16:52:16 2003 -+++ makeflag.unx Mon Feb 2 17:11:51 2004 -@@ -9,7 +9,7 @@ - # be simple wrong. - # - --SRC_DIR = /cygdriver/c/irit/irit -+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: - # - --IRITOBJPF = D --IRITLIBPF = D --IRITEXEPF = D --STRIPEXE = ls -+#IRITOBJPF = D -+#IRITLIBPF = D -+#IRITEXEPF = D -+#STRIPEXE = ls - - # - # 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 - # --# 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 = ${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_LIB = -L${X11BASE}/lib -lGLU -lGL - - # - # Support of (shared) libraries. You will need to set the proper suffix -@@ -337,22 +337,22 @@ - # 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) --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) -+#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 - # GRAPOGLLIBS = $(MESA_LIB) -lXext $(GRAPXMTLIBS) - # GRAPOGLLIBS = -lGLU -lGL $(GRAPXMTLIBS) --GRAPDRVS = nuldrvs$(IRITEXEPF) x11drvs$(IRITEXEPF) xmtdrvs$(IRITEXEPF) # xogldrvs$(IRITEXEPF) -+#GRAPDRVS = nuldrvs$(IRITEXEPF) x11drvs$(IRITEXEPF) xmtdrvs$(IRITEXEPF) # xogldrvs$(IRITEXEPF) - # - # For shared libraries add: - # --LIB_SUFFIX = so --LIB_MAKE = ld -G -o --LIB_RAN = echo -+#LIB_SUFFIX = so -+#LIB_MAKE = ld -G -o -+#LIB_RAN = echo - - # - # Flags for SUN Solaris 5.3 using cc SC3.0.1 and X11 (uncomment xogldrvs if -@@ -534,20 +534,29 @@ - # - # 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 -+ifeq ($(WITH_MOTIF_DEF),yes) -+DFLAGS+= -D__GL__ ${MESA_INC} -+else -+DFLAGS+= -D__X11__ -I${X11BASE}/include -+endif -+CFLAGS += -fPIC -fomit-frame-pointer $(DFLAGS) - # CFLAGS = -g -DDEBUG $(DFLAGS) --# MORELIBS = -lc --# GRAPX11LIBS = -L/usr/X11R6/lib -lX11 --# GRAPXMTLIBS = -L/usr/X11R6/lib -lXm -lXt -lX11 --# GRAPDRVS = nuldrvs$(IRITEXEPF) x11drvs$(IRITEXEPF) xmtdrvs$(IRITEXEPF) -+MORELIBS = -lc -+GRAPX11LIBS = -L${X11BASE}/lib -lX11 -+GRAPDRVS = nuldrvs$(IRITEXEPF) x11drvs$(IRITEXEPF) -+ifeq ($(WITH_MOTIF_DEF),yes) -+GRAPXMTLIBS = -L${X11BASE}/lib ${MOTIFLIB} -lXt -lX11 -+GRAPOGLLIBS = ${MESA_LIB} ${GRAPXMTLIBS} -+GRAPDRVS+= xmtdrvs$(IRITEXEPF) xogldrvs$(IRITEXEPF) -+endif - # - # - # For shared libraries add: - # --# LIB_SUFFIX = so --# LIB_MAKE = cc -shared -o --# LIB_RAN = ranlib -+LIB_SUFFIX = so -+LIB_MAKE = ${LD} -shared -o -+LIB_RAN = ${ECHO_CMD} - - # - # Default rule for compilation. diff -ruN /usr/ports/graphics/irit/files/patch-mvar__lib_makefile.unx irit/files/patch-mvar__lib_makefile.unx --- /usr/ports/graphics/irit/files/patch-mvar__lib_makefile.unx Thu Jan 1 03:00:00 1970 +++ irit/files/patch-mvar__lib_makefile.unx Sat Oct 1 22:36:23 2005 @@ -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 -ruN /usr/ports/graphics/irit/files/patch-prsr__lib_ipc__loc.h irit/files/patch-prsr__lib_ipc__loc.h --- /usr/ports/graphics/irit/files/patch-prsr__lib_ipc__loc.h Thu Jan 1 03:00:00 1970 +++ irit/files/patch-prsr__lib_ipc__loc.h Sat Oct 1 22:46:35 2005 @@ -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 -ruN /usr/ports/graphics/irit/files/pkg-message.in irit/files/pkg-message.in --- /usr/ports/graphics/irit/files/pkg-message.in Thu Jan 1 03:00:00 1970 +++ irit/files/pkg-message.in Sun Oct 2 17:29:46 2005 @@ -0,0 +1,20 @@ +******************************************************************************* +In order to use IRIT you should set the following environment variables: + +IRIT_PATH=%%DATADIR%% +IRIT_DISPLAY="${DRV} -s-" + +where DRV is one of the following: + x11drvs - X11 display driver +and if IRIT has been built with Motif support: + xmtdrvs - X11/Motif display driver + xogldrvs - OpenGL/Motif display driver + +and optionally: + +IRIT_BIN_IPC=1 +IRIT_SERVER_HOST=`hostname` +IRIT_SERVER_PORT=5432 + +For more information please consult IRIT documentation +******************************************************************************* diff -ruN /usr/ports/graphics/irit/pkg-message irit/pkg-message --- /usr/ports/graphics/irit/pkg-message Tue Feb 24 01:10:39 2004 +++ irit/pkg-message Thu Jan 1 03:00:00 1970 @@ -1,19 +0,0 @@ -******************************************************************************* -In order to use IRIT you should set the following environment variables: - -IRIT_PATH=%%DATADIR%% -IRIT_DISPLAY="${DRV} -s-" - -where DRV is one of the following: - x11drvs - X11 display driver -and if IRIT has been built with Motif support: - xmtdrvs - X11/Motif display driver - xogldrvs - OpenGL/Motif display driver - -and optionally: - -IRIT_BIN_IPC=1 -IRIT_SERVER_HOST=`hostname` - -For more information consult IRIT documentation -******************************************************************************* diff -ruN /usr/ports/graphics/irit/pkg-plist irit/pkg-plist --- /usr/ports/graphics/irit/pkg-plist Tue Feb 24 01:10:39 2004 +++ irit/pkg-plist Sun Oct 2 19:37:46 2005 @@ -71,11 +71,6 @@ 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 @@ %%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 @@ %%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 @@ %%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 @@ %%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 @@ %%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 @@ %%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 @@ %%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 @@ %%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 @@ %%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 @@ %%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 @@ %%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 @@ %%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 @@ %%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 @@ %%DATADIR%%/x11drvs.cfg @dirrm %%DATADIR%% @dirrm %%EXAMPLESDIR%%/scripts +@dirrm %%EXAMPLESDIR%%/emacs @dirrm %%EXAMPLESDIR%%/data @dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm include/irit --- irit.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: