diff options
Diffstat (limited to 'graphics/inventor/files')
48 files changed, 0 insertions, 986 deletions
diff --git a/graphics/inventor/files/patch-Interface.c++ b/graphics/inventor/files/patch-Interface.c++ deleted file mode 100644 index a8a0ad30745d..000000000000 --- a/graphics/inventor/files/patch-Interface.c++ +++ /dev/null @@ -1,35 +0,0 @@ ---- apps/demos/noodle/Interface.c++~ Sat Jun 1 11:22:20 2002 -+++ apps/demos/noodle/Interface.c++ Sun Aug 3 14:50:36 2003 -@@ -67,6 +67,12 @@ - #include "NoodleTextureGizmo.h" - #include "NoodleSurfaceGizmo.h" - -+#ifdef __FreeBSD__ -+#define PDF_READER "xpdf" -+#else -+#define PDF_READER "acroread" -+#endif -+ - #define SCREEN(w) XScreenNumberOfScreen(XtScreen(w)) - - extern SoNode *createProfileGraph( Widget, GeneralizedCylinder *); -@@ -406,16 +412,16 @@ - } - - char command[100]; -- sprintf(command, "which acroread > /dev/null"); -+ sprintf(command, "which " PDF_READER " > /dev/null"); - - int err = system(command); - if (err) { -- system("xmessage 'You must install acroread" -+ system("xmessage 'You must install " PDF_READER - " for this function to work' > /dev/null"); - return; - } - -- sprintf(command, "acroread " IVPREFIX "/demos/Inventor/noodle.about &"); -+ sprintf(command, PDF_READER " " IVPREFIX "/demos/Inventor/noodle.about &"); - system(command); - } - diff --git a/graphics/inventor/files/patch-SbTime.c++ b/graphics/inventor/files/patch-SbTime.c++ deleted file mode 100644 index b9b6f97203a9..000000000000 --- a/graphics/inventor/files/patch-SbTime.c++ +++ /dev/null @@ -1,86 +0,0 @@ ---- lib/database/src/sb/SbTime.c++.orig 2018-11-05 18:10:14 UTC -+++ lib/database/src/sb/SbTime.c++ -@@ -190,52 +190,52 @@ SbTime::format(const char *fmt) const - - case 'D': - if (negative) *s++ = '-'; -- s += sprintf(s, "%ld", tday); -+ s += sprintf(s, "%d", tday); - break; - - case 'H': - if (negative) *s++ = '-'; -- s += sprintf(s, "%ld", thour); -+ s += sprintf(s, "%d", thour); - break; - - case 'M': - if (negative) *s++ = '-'; -- s += sprintf(s, "%ld", tmin); -+ s += sprintf(s, "%d", tmin); - break; - - case 'S': - if (negative) *s++ = '-'; -- s += sprintf(s, "%ld", tsec); -+ s += sprintf(s, "%d", tsec); - break; - - case 'I': - if (negative) *s++ = '-'; -- s += sprintf(s, "%ld", tmilli); -+ s += sprintf(s, "%d", tmilli); - break; - - case 'U': - if (negative) *s++ = '-'; -- s += sprintf(s, "%ld", tmicro); -+ s += sprintf(s, "%d", tmicro); - break; - - case 'h': -- s += sprintf(s, "%.2ld", rhour); -+ s += sprintf(s, "%.2d", rhour); - break; - - case 'm': -- s += sprintf(s, "%.2ld", rmin); -+ s += sprintf(s, "%.2d", rmin); - break; - - case 's': -- s += sprintf(s, "%.2ld", rsec); -+ s += sprintf(s, "%.2d", rsec); - break; - - case 'i': -- s += sprintf(s, "%.3ld", rmilli); -+ s += sprintf(s, "%.3d", rmilli); - break; - - case 'u': -- s += sprintf(s, "%.6ld", rmicro); -+ s += sprintf(s, "%.6d", rmicro); - break; - - default: - -*** lib/database/src/sb/SbTime.c++ Sat Dec 14 18:06:53 2002 ---- lib/database/src/sb/SbTime.c++.new Sat Dec 14 17:15:06 2002 -*************** -*** 269,275 **** - seconds = (int) t.tv_sec; - strftime(buf, sizeof(buf), fmt, localtime((const time_t *) &seconds)); - #else -! strftime(buf, sizeof(buf), fmt, localtime(&t.tv_sec)); - #endif - - return buf; ---- 269,275 ---- - seconds = (int) t.tv_sec; - strftime(buf, sizeof(buf), fmt, localtime((const time_t *) &seconds)); - #else -! strftime(buf, sizeof(buf), fmt, localtime((const time_t *) &t.tv_sec)); - #endif - - return buf; diff --git a/graphics/inventor/files/patch-SceneViewer-GNUmakefile b/graphics/inventor/files/patch-SceneViewer-GNUmakefile deleted file mode 100644 index 3b44c7e4aff6..000000000000 --- a/graphics/inventor/files/patch-SceneViewer-GNUmakefile +++ /dev/null @@ -1,13 +0,0 @@ -*** apps/demos/SceneViewer/GNUmakefile.orig Thu Jan 2 15:06:49 2003 ---- apps/demos/SceneViewer/GNUmakefile Thu Jan 2 15:07:07 2003 -*************** -*** 6,11 **** ---- 6,13 ---- - - CXXFILES = SceneViewer.c++ SoSceneViewer.c++ SvManipList.c++ - -+ CXXFLAGS += -DXTSTRINGDEFINES -+ - LLDOPTS += -L../../samples/widgets - - LLDLIBS = -lInventorWidget -lInventor -lInventorXt diff --git a/graphics/inventor/files/patch-SoCalcParse.y b/graphics/inventor/files/patch-SoCalcParse.y deleted file mode 100644 index 10ad4722fa73..000000000000 --- a/graphics/inventor/files/patch-SoCalcParse.y +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/database/src/so/engines/SoCalcParse.y.old Sun Aug 3 14:03:28 2003 -+++ lib/database/src/so/engines/SoCalcParse.y Sun Aug 3 14:09:13 2003 -@@ -20,10 +20,14 @@ - #include <Inventor/errors/SoDebugError.h> - #include "SoCalcExpr.h" - #include <stdio.h> -+ - #ifdef __APPLE__ - #include <float.h> - #include <limits.h> --#else -+#elif defined __FreeBSD__ -+#include <float.h> -+#define MINFLOAT FLT_MIN -+#else // __FreeBSD__ - #include <values.h> - #endif - #include <math.h> diff --git a/graphics/inventor/files/patch-SoDragger.c++ b/graphics/inventor/files/patch-SoDragger.c++ deleted file mode 100644 index cead07ba5e21..000000000000 --- a/graphics/inventor/files/patch-SoDragger.c++ +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/interaction/src/draggers/SoDragger.c++.orig 2011-06-08 14:34:05.000000000 +0200 -+++ lib/interaction/src/draggers/SoDragger.c++ 2011-06-08 14:34:13.000000000 +0200 -@@ -686,7 +686,7 @@ - int indexInPath = tempPathToThis->getIndex(numFmHead+1); - - int numKidsNow = children->getLength(); --#if (_MIPS_SZPTR == 64 || __ia64) -+#if (_MIPS_SZPTR == 64 || __ia64 || __amd64__) - int numKidsBefore = (int) ((long) (*tempPathNumKidsHack)[numFmHead]); - #else - int numKidsBefore = (int) (*tempPathNumKidsHack)[numFmHead]; diff --git a/graphics/inventor/files/patch-SoNkCatalog.c++ b/graphics/inventor/files/patch-SoNkCatalog.c++ deleted file mode 100644 index 2d68b1509d38..000000000000 --- a/graphics/inventor/files/patch-SoNkCatalog.c++ +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/nodekits/src/nodekits/SoNkCatalog.c++.orig 2011-06-08 14:36:19.000000000 +0200 -+++ lib/nodekits/src/nodekits/SoNkCatalog.c++ 2011-06-08 14:36:30.000000000 +0200 -@@ -336,7 +336,7 @@ - void *castPNum; - - if ( partNameDict.find( (unsigned long) theName.getString(), castPNum ) ) --#if (_MIPS_SZPTR == 64 || __ia64) -+#if (_MIPS_SZPTR == 64 || __ia64 || __amd64__) - return ( (int) ((long) castPNum) ); // System long - #else - return ( (int) castPNum ); diff --git a/graphics/inventor/files/patch-SoOutput.c++ b/graphics/inventor/files/patch-SoOutput.c++ deleted file mode 100644 index a2a2f08e5fad..000000000000 --- a/graphics/inventor/files/patch-SoOutput.c++ +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/database/src/so/SoOutput.c++.orig 2011-06-08 14:31:06.000000000 +0200 -+++ lib/database/src/so/SoOutput.c++ 2011-06-08 14:31:15.000000000 +0200 -@@ -1462,7 +1462,7 @@ - - // Generates a CC warning. Ho hum. - if (refDict->find((unsigned long) base, ref)) --#if (_MIPS_SZPTR == 64 || __ia64) -+#if (_MIPS_SZPTR == 64 || __ia64 || __amd64__) - referenceId = (int) ((unsigned long) ref); - #else - referenceId = (int)ref; diff --git a/graphics/inventor/files/patch-SoPath.h b/graphics/inventor/files/patch-SoPath.h deleted file mode 100644 index 266e2ea0a11f..000000000000 --- a/graphics/inventor/files/patch-SoPath.h +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/database/include/Inventor/SoPath.h.orig Tue Sep 25 00:45:33 2001 -+++ lib/database/include/Inventor/SoPath.h Fri Dec 15 20:59:44 2006 -@@ -61,6 +61,8 @@ - #include <Inventor/nodes/SoNode.h> - #include <Inventor/SoLists.h> - -+class SoTempPath; -+ - ////////////////////////////////////////////////////////////////////////////// - // - // Class: SoPath diff --git a/graphics/inventor/files/patch-SoSceneViewer.c++ b/graphics/inventor/files/patch-SoSceneViewer.c++ deleted file mode 100644 index 2612ff041e76..000000000000 --- a/graphics/inventor/files/patch-SoSceneViewer.c++ +++ /dev/null @@ -1,53 +0,0 @@ -*** apps/demos/SceneViewer/SoSceneViewer.c++.orig Fri Jan 3 09:59:15 2003 ---- apps/demos/SceneViewer/SoSceneViewer.c++ Fri Jan 3 10:01:02 2003 -*************** -*** 141,146 **** ---- 141,151 ---- - #include <assert.h> - #endif - -+ #ifdef __FreeBSD__ -+ #define PDF_READER "xpdf" -+ #else -+ #define PDF_READER "acroread" -+ #endif - - // - // Macros and constants -*************** -*** 4739,4755 **** - } - - char command[100]; -! sprintf(command, "which acroread > /dev/null"); - - int err = system(command); - if (err) - { -! system("xmessage 'You must install acroread" - " for this function to work' > /dev/null"); - return; - } - -! sprintf(command, "acroread " - IVPREFIX "/demos/Inventor/SceneViewer.about &"); - system(command); - } ---- 4744,4760 ---- - } - - char command[100]; -! sprintf(command, "which " PDF_READER " > /dev/null"); - - int err = system(command); - if (err) - { -! system("xmessage 'You must install " PDF_READER - " for this function to work' > /dev/null"); - return; - } - -! sprintf(command, PDF_READER " " - IVPREFIX "/demos/Inventor/SceneViewer.about &"); - system(command); - } diff --git a/graphics/inventor/files/patch-SoSensorMgr.c++ b/graphics/inventor/files/patch-SoSensorMgr.c++ deleted file mode 100644 index f5c59d46e3ff..000000000000 --- a/graphics/inventor/files/patch-SoSensorMgr.c++ +++ /dev/null @@ -1,15 +0,0 @@ -*** lib/database/src/so/sensors/SoSensorMgr.c++.orig Sat Jul 12 00:40:53 2003 ---- lib/database/src/so/sensors/SoSensorMgr.c++ Sun Feb 22 17:11:52 2004 -*************** -*** 61,66 **** ---- 61,70 ---- - #include <unistd.h> - #endif // __APPLE__ - -+ #ifdef __FreeBSD__ -+ #include <sys/select.h> -+ #endif -+ - #ifdef DEBUG - #include <SoDebug.h> - static SbTime startTime; diff --git a/graphics/inventor/files/patch-SoText2.c++ b/graphics/inventor/files/patch-SoText2.c++ deleted file mode 100644 index 4258bddfb534..000000000000 --- a/graphics/inventor/files/patch-SoText2.c++ +++ /dev/null @@ -1,12 +0,0 @@ -*** lib/database/src/so/nodes/SoText2.c++.orig Tue Sep 25 00:45:41 2001 ---- lib/database/src/so/nodes/SoText2.c++ Mon Dec 23 13:28:11 2002 -*************** -*** 1498,1503 **** ---- 1498,1504 ---- - // And some font library stuff: - static FLcontext flContext; - FLfontNumber fontId; -+ GLubyte* fontNumList; - }; - - SO_NODE_SOURCE(SoText2); diff --git a/graphics/inventor/files/patch-SoText3V2.c++ b/graphics/inventor/files/patch-SoText3V2.c++ deleted file mode 100644 index 2610652afe5c..000000000000 --- a/graphics/inventor/files/patch-SoText3V2.c++ +++ /dev/null @@ -1,30 +0,0 @@ -*** apps/converters/ivdowngrade/SoText3V2.c++.orig Thu Jan 2 20:38:57 2003 ---- apps/converters/ivdowngrade/SoText3V2.c++ Thu Jan 2 20:39:28 2003 -*************** -*** 50,55 **** ---- 50,57 ---- - */ - - #include <Inventor/actions/SoWriteAction.h> -+ #include <Inventor/errors/SoDebugError.h> -+ - #include "SoText3V2.h" - - char* convToAscii(const SbString& str); -*************** -*** 150,156 **** - } - } - #ifdef DEBUG -! if (trunc) SoDebugWarning::post("SoText3V2", - "Note that conversion modified an international text string"); - #endif /*DEBUG*/ - return newStr; ---- 152,158 ---- - } - } - #ifdef DEBUG -! if (trunc) SoDebugError::post("SoText3V2", - "Note that conversion modified an international text string"); - #endif /*DEBUG*/ - return newStr; diff --git a/graphics/inventor/files/patch-SoType.c++ b/graphics/inventor/files/patch-SoType.c++ deleted file mode 100644 index 4cf86ebcce66..000000000000 --- a/graphics/inventor/files/patch-SoType.c++ +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/database/src/so/SoType.c++.orig 2011-06-08 14:29:24.000000000 +0200 -+++ lib/database/src/so/SoType.c++ 2011-06-08 14:29:37.000000000 +0200 -@@ -331,7 +331,7 @@ - if (b == NULL) - return SoType::badType(); - --#if (_MIPS_SZPTR == 64 || __ia64) -+#if (_MIPS_SZPTR == 64 || __ia64 || __amd64__) - SoType result = typeData[(int) ((unsigned long) b)].type; - #else - SoType result = typeData[(int)b].type; diff --git a/graphics/inventor/files/patch-SoV1NkCatalog.c++ b/graphics/inventor/files/patch-SoV1NkCatalog.c++ deleted file mode 100644 index 2a4d8d871f30..000000000000 --- a/graphics/inventor/files/patch-SoV1NkCatalog.c++ +++ /dev/null @@ -1,21 +0,0 @@ ---- lib/nodekits/src/upgraders/SoV1NkCatalog.c++.orig 2001-09-25 02:45:47.000000000 +0200 -+++ lib/nodekits/src/upgraders/SoV1NkCatalog.c++ 2011-06-08 14:38:38.000000000 +0200 -@@ -51,6 +51,9 @@ - _______________________________________________________________________ - */ - -+#ifdef __FreeBSD__ -+#include <stdlib.h> -+#endif - - #include <Inventor/misc/upgraders/SoV1NodekitCatalog.h> - #include <Inventor/SoDB.h> -@@ -330,7 +333,7 @@ - void *castPNum; - - if ( partNameDict.find( (unsigned long) theName.getString(), castPNum ) ) --#if (_MIPS_SZPTR == 64 || __ia64) -+#if (_MIPS_SZPTR == 64 || __ia64 || __amd64__) - return ( (int) ((long) castPNum) ); // System long - #else - return ( (int) castPNum ); diff --git a/graphics/inventor/files/patch-SoXtRsrc.c++ b/graphics/inventor/files/patch-SoXtRsrc.c++ deleted file mode 100644 index d5701eca5cee..000000000000 --- a/graphics/inventor/files/patch-SoXtRsrc.c++ +++ /dev/null @@ -1,11 +0,0 @@ ---- libSoXt/src/SoXtRsrc.c++.orig 2011-06-08 14:39:34.000000000 +0200 -+++ libSoXt/src/SoXtRsrc.c++ 2011-06-08 14:39:43.000000000 +0200 -@@ -145,7 +145,7 @@ - classList = new XrmQuark[listSize]; - for (q = 0, s = len - 1; - s >= 0; q++, s--) { --#if (_MIPS_SZPTR == 64 || __ia64) -+#if (_MIPS_SZPTR == 64 || __ia64 || __amd64__) - nameList[q] = (XrmQuark) ((long) nameplist[s]); - classList[q] = (XrmQuark) ((long) classplist[s]); - #else diff --git a/graphics/inventor/files/patch-apps-demos-qmorf_quadCube.c++ b/graphics/inventor/files/patch-apps-demos-qmorf_quadCube.c++ deleted file mode 100644 index 72462e2b3c16..000000000000 --- a/graphics/inventor/files/patch-apps-demos-qmorf_quadCube.c++ +++ /dev/null @@ -1,11 +0,0 @@ ---- apps/demos/qmorf/quadCube.c++.orig 2013-10-10 14:58:48.000000000 +0200 -+++ apps/demos/qmorf/quadCube.c++ 2013-10-10 14:58:56.000000000 +0200 -@@ -182,7 +182,7 @@ - return result; - } - --main(int argc, char **argv) -+int main(int argc, char **argv) - { - if (argc > 1) diagonalFlag = 0; - diff --git a/graphics/inventor/files/patch-apps-demos-qmorf_quadSheet.c++ b/graphics/inventor/files/patch-apps-demos-qmorf_quadSheet.c++ deleted file mode 100644 index 12c832de0d15..000000000000 --- a/graphics/inventor/files/patch-apps-demos-qmorf_quadSheet.c++ +++ /dev/null @@ -1,11 +0,0 @@ ---- apps/demos/qmorf/quadSheet.c++.orig 2013-10-10 14:59:43.000000000 +0200 -+++ apps/demos/qmorf/quadSheet.c++ 2013-10-10 14:59:47.000000000 +0200 -@@ -68,7 +68,7 @@ - return result; - } - --main(int argc, char **argv) -+int main(int argc, char **argv) - { - SoDB::init(); - diff --git a/graphics/inventor/files/patch-apps-demos-qmorf_quadSphere.c++ b/graphics/inventor/files/patch-apps-demos-qmorf_quadSphere.c++ deleted file mode 100644 index 74379bbaba37..000000000000 --- a/graphics/inventor/files/patch-apps-demos-qmorf_quadSphere.c++ +++ /dev/null @@ -1,11 +0,0 @@ ---- apps/demos/qmorf/quadSphere.c++.orig 2013-10-10 14:58:13.000000000 +0200 -+++ apps/demos/qmorf/quadSphere.c++ 2013-10-10 14:58:20.000000000 +0200 -@@ -76,7 +76,7 @@ - return result; - } - --main(int argc, char **argv) -+int main(int argc, char **argv) - { - SoDB::init(); - diff --git a/graphics/inventor/files/patch-apps-demos-revo_GNUmakefile b/graphics/inventor/files/patch-apps-demos-revo_GNUmakefile deleted file mode 100644 index d972247745e9..000000000000 --- a/graphics/inventor/files/patch-apps-demos-revo_GNUmakefile +++ /dev/null @@ -1,14 +0,0 @@ ---- apps/demos/revo/GNUmakefile.orig 2013-10-10 15:00:56.000000000 +0200 -+++ apps/demos/revo/GNUmakefile 2013-10-10 15:01:29.000000000 +0200 -@@ -8,9 +8,9 @@ - - CXXFILES = revo.c++ RevClass.c++ profile.c++ - --LLDOPTS += -L../../samples/common -+LLDOPTS += - --LLDLIBS = -lcommon -lInventor -lInventorXt -+LLDLIBS = ../../samples/common/libcommon.a -lInventor -lInventorXt - - all: all_ivbin - diff --git a/graphics/inventor/files/patch-apps-demos-textomatic_GNUmakefile b/graphics/inventor/files/patch-apps-demos-textomatic_GNUmakefile deleted file mode 100644 index b63bcc4a33a5..000000000000 --- a/graphics/inventor/files/patch-apps-demos-textomatic_GNUmakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- apps/demos/textomatic/GNUmakefile.orig 2013-10-10 15:01:55.000000000 +0200 -+++ apps/demos/textomatic/GNUmakefile 2013-10-10 15:02:12.000000000 +0200 -@@ -8,7 +8,7 @@ - - LLDOPTS += -L../../samples/common - --LLDLIBS = -lcommon -lInventor -lInventorXt -+LLDLIBS = ../../samples/common/libcommon.a -lInventor -lInventorXt - - all: all_ivbin - diff --git a/graphics/inventor/files/patch-apps-samples-widgets_componentTest.c++ b/graphics/inventor/files/patch-apps-samples-widgets_componentTest.c++ deleted file mode 100644 index e0cfa920cfae..000000000000 --- a/graphics/inventor/files/patch-apps-samples-widgets_componentTest.c++ +++ /dev/null @@ -1,11 +0,0 @@ ---- apps/samples/widgets/componentTest.c++.orig 2013-10-10 14:53:45.000000000 +0200 -+++ apps/samples/widgets/componentTest.c++ 2013-10-10 14:53:54.000000000 +0200 -@@ -60,7 +60,7 @@ - } - - int --main(unsigned int argc, char *argv[]) -+main(int argc, char *argv[]) - { - if (argc != 2) - usage(argv[0]); diff --git a/graphics/inventor/files/patch-apps-tools-ivcat_ivcat.c++ b/graphics/inventor/files/patch-apps-tools-ivcat_ivcat.c++ deleted file mode 100644 index 3d3a4692aa73..000000000000 --- a/graphics/inventor/files/patch-apps-tools-ivcat_ivcat.c++ +++ /dev/null @@ -1,11 +0,0 @@ ---- apps/tools/ivcat/ivcat.c++.orig 2013-10-10 14:54:27.000000000 +0200 -+++ apps/tools/ivcat/ivcat.c++ 2013-10-10 14:54:37.000000000 +0200 -@@ -215,7 +215,7 @@ - } - } - --main(int argc, char **argv) -+int main(int argc, char **argv) - { - int expandFileNodes = 0; - int expandTextureNodes = 0; diff --git a/graphics/inventor/files/patch-apps-tools-ivfix_ivfix.c++ b/graphics/inventor/files/patch-apps-tools-ivfix_ivfix.c++ deleted file mode 100644 index 9d16e37a0bc0..000000000000 --- a/graphics/inventor/files/patch-apps-tools-ivfix_ivfix.c++ +++ /dev/null @@ -1,11 +0,0 @@ ---- apps/tools/ivfix/ivfix.c++.orig 2013-10-10 14:55:27.000000000 +0200 -+++ apps/tools/ivfix/ivfix.c++ 2013-10-10 14:55:33.000000000 +0200 -@@ -80,7 +80,7 @@ - // - ///////////////////////////////////////////////////////////////////////////// - --main(int argc, char **argv) -+int main(int argc, char **argv) - { - OptionInfo options; - diff --git a/graphics/inventor/files/patch-apps-tools-ivinfo_ivinfo.c++ b/graphics/inventor/files/patch-apps-tools-ivinfo_ivinfo.c++ deleted file mode 100644 index 5c401bbede28..000000000000 --- a/graphics/inventor/files/patch-apps-tools-ivinfo_ivinfo.c++ +++ /dev/null @@ -1,11 +0,0 @@ ---- apps/tools/ivinfo/ivinfo.c++.orig 2013-10-10 14:56:40.000000000 +0200 -+++ apps/tools/ivinfo/ivinfo.c++ 2013-10-10 14:56:45.000000000 +0200 -@@ -159,7 +159,7 @@ - } - } - --main(int argc, char *argv[]) -+int main(int argc, char *argv[]) - { - SoInput in; - SoNode *root; diff --git a/graphics/inventor/files/patch-arc.c++ b/graphics/inventor/files/patch-arc.c++ deleted file mode 100644 index e47ddf7b4cdf..000000000000 --- a/graphics/inventor/files/patch-arc.c++ +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/database/src/so/nodes/nurbs/libnurbs/arc.c++.orig 2000-08-15 12:56:22 UTC -+++ lib/database/src/so/nodes/nurbs/libnurbs/arc.c++ -@@ -332,7 +332,7 @@ Arc::check( void ) - - inline long tooclose( REAL x, REAL y ) - { -- return (abs(x-y) < TOL) ? 1 : 0; -+ return (absr(x-y) < TOL) ? 1 : 0; - } - - diff --git a/graphics/inventor/files/patch-arctess.c++ b/graphics/inventor/files/patch-arctess.c++ deleted file mode 100644 index 03449735dee6..000000000000 --- a/graphics/inventor/files/patch-arctess.c++ +++ /dev/null @@ -1,35 +0,0 @@ ---- lib/database/src/so/nodes/nurbs/libnurbs/arctess.c++.orig 2000-08-15 12:56:22 UTC -+++ lib/database/src/so/nodes/nurbs/libnurbs/arctess.c++ -@@ -247,8 +247,8 @@ ArcTessellator::pwl( Arc *arc, REAL s1, - - /* if(rate <= 0.06) rate = 0.06;*/ - -- int snsteps = 1 + (int) (abs(s2 - s1) / rate ); -- int tnsteps = 1 + (int) (abs(t2 - t1) / rate ); -+ int snsteps = 1 + (int) (absr(s2 - s1) / rate ); -+ int tnsteps = 1 + (int) (absr(t2 - t1) / rate ); - int nsteps = max(1,max( snsteps, tnsteps )); - - REAL sstepsize = (s2 - s1) / (REAL) nsteps; -@@ -395,8 +395,8 @@ ArcTessellator::tessellateNonlinear( Arc - vert->param[0] = u/w; - vert->param[1] = v/w; - #ifndef NOELIMINATION -- REAL ds = abs(vert[0].param[0] - vert[-1].param[0]); -- REAL dt = abs(vert[0].param[1] - vert[-1].param[1]); -+ REAL ds = absr(vert[0].param[0] - vert[-1].param[0]); -+ REAL dt = absr(vert[0].param[1] - vert[-1].param[1]); - int canremove = (ds<geo_stepsize && dt<geo_stepsize) ? 1 : 0; - REAL ods=0.0, odt=0.0; - -@@ -454,8 +454,8 @@ ArcTessellator::tessellateNonlinear( Arc - vert->param[0] = u; - vert->param[1] = v; - #ifndef NOELIMINATION -- REAL ds = abs(vert[0].param[0] - vert[-1].param[0]); -- REAL dt = abs(vert[0].param[1] - vert[-1].param[1]); -+ REAL ds = absr(vert[0].param[0] - vert[-1].param[0]); -+ REAL dt = absr(vert[0].param[1] - vert[-1].param[1]); - int canremove = (ds<geo_stepsize && dt<geo_stepsize) ? 1 : 0; - REAL ods=0.0, odt=0.0; - diff --git a/graphics/inventor/files/patch-ccw.c++ b/graphics/inventor/files/patch-ccw.c++ deleted file mode 100644 index 4ab1bbe6909b..000000000000 --- a/graphics/inventor/files/patch-ccw.c++ +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/database/src/so/nodes/nurbs/libnurbs/ccw.c++.orig 2000-08-15 12:56:22 UTC -+++ lib/database/src/so/nodes/nurbs/libnurbs/ccw.c++ -@@ -508,6 +508,6 @@ int - Subdivider::ccw( TrimVertex *a, TrimVertex *b, TrimVertex *c ) - { - REAL d = det3( a, b, c ); -- if( abs(d) < 0.0001 ) return -1; -+ if( absr(d) < 0.0001 ) return -1; - return (d < 0.0) ? 0 : 1; - } diff --git a/graphics/inventor/files/patch-doc-man-ivman_Main.c++ b/graphics/inventor/files/patch-doc-man-ivman_Main.c++ deleted file mode 100644 index ef23d5452277..000000000000 --- a/graphics/inventor/files/patch-doc-man-ivman_Main.c++ +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/man/ivman/Main.c++.orig 2013-10-10 14:52:11.000000000 +0200 -+++ doc/man/ivman/Main.c++ 2013-10-10 14:52:17.000000000 +0200 -@@ -89,7 +89,7 @@ - // - ///////////////////////////////////////////////////////////////////////////// - --main(int argc, char *argv[]) -+int main(int argc, char *argv[]) - { - SbBool ok = TRUE; - int c, curArg; diff --git a/graphics/inventor/files/patch-doc-man1-GNUmakefile b/graphics/inventor/files/patch-doc-man1-GNUmakefile deleted file mode 100644 index fecac315e5ec..000000000000 --- a/graphics/inventor/files/patch-doc-man1-GNUmakefile +++ /dev/null @@ -1,19 +0,0 @@ -*** doc/man/man1/GNUmakefile.orig Fri Dec 24 07:50:05 2004 ---- doc/man/man1/GNUmakefile Fri Dec 24 07:52:36 2004 -*************** -*** 11,16 **** - ivinfo.1 \ - ivview.1 - -! all install: install_man1 - - include $(IVCOMMONRULES) ---- 11,18 ---- - ivinfo.1 \ - ivview.1 - -! all: -! -! install: install_man1 - - include $(IVCOMMONRULES) diff --git a/graphics/inventor/files/patch-fl.c b/graphics/inventor/files/patch-fl.c deleted file mode 100644 index 628a9ba4a4b0..000000000000 --- a/graphics/inventor/files/patch-fl.c +++ /dev/null @@ -1,16 +0,0 @@ -*** libFL/ang/fl.c.orig Thu Jan 2 16:28:23 2003 ---- libFL/ang/fl.c Thu Jan 2 16:32:25 2003 -*************** -*** 95,101 **** ---- 95,105 ---- - NULL - }; - -+ #ifdef __FreeBSD__ -+ static char *fontPath = IVPREFIX "/share/fonts/TTF"; -+ #else - static char *fontPath = IVPREFIX "/share/data/fonts"; -+ #endif - int fl_debug = FALSE; - - /* diff --git a/graphics/inventor/files/patch-flfreetype.c b/graphics/inventor/files/patch-flfreetype.c deleted file mode 100644 index 63f432326ff1..000000000000 --- a/graphics/inventor/files/patch-flfreetype.c +++ /dev/null @@ -1,30 +0,0 @@ -*** libFL/ang/flfreetype.c.orig Thu Jan 2 17:04:33 2003 ---- libFL/ang/flfreetype.c Thu Jan 2 17:11:09 2003 -*************** -*** 318,324 **** ---- 318,328 ---- - { - FLfontStruct *fs; - FLbitmap *bitmap; -+ #if BYTE_ORDER == LITTLE_ENDIAN -+ GLuint c = (UCS2[1] << 8) | UCS2[0]; -+ #else - GLuint c = (UCS2[0] << 8) | UCS2[1]; -+ #endif - - TRACE(("_flFTUniGetBitmap: 0x%04x\n", c)); - while ((fs = *fsList++)) -*************** -*** 333,339 **** ---- 337,347 ---- - { - FLfontStruct *fs; - FLoutline *outline; -+ #if BYTE_ORDER == LITTLE_ENDIAN -+ GLuint c = (UCS2[1] << 8) | UCS2[0]; -+ #else - GLuint c = (UCS2[0] << 8) | UCS2[1]; -+ #endif - - TRACE(("_flFTUniGetOutline: 0x%04x\n", c)); - while ((fs = *fsList++)) diff --git a/graphics/inventor/files/patch-ivcommondefs b/graphics/inventor/files/patch-ivcommondefs deleted file mode 100644 index 52404fcd9fdc..000000000000 --- a/graphics/inventor/files/patch-ivcommondefs +++ /dev/null @@ -1,30 +0,0 @@ ---- make/ivcommondefs.orig 2003-07-11 22:40:54 UTC -+++ make/ivcommondefs -@@ -131,9 +131,9 @@ endif - # Determine optimization from LIBTYPE. - # - --OPTIMIZER = -O -DNDEBUG -+OPTIMIZER = -DNDEBUG - ifneq (, $(findstring debug, $(LIBTYPE))) --OPTIMIZER = -g -+OPTIMIZER = -DDEBUG - endif - - -@@ -206,12 +206,6 @@ IVDEMODATADIR = $(IVDEMODIR)/data/Invent - # Locate installed Inventor libraries when linking applications. - # - --ifneq (, $(findstring debug, $(LIBTYPE))) --LLDDSOOPTS += -L$(IVDLIBDIR) --LLDOPTS += -L$(IVDLIBDIR) --CXXDSOOPTS += -L$(IVDLIBDIR) --else --LLDDSOOPTS += -L$(IVLIBDIR) --LLDOPTS += -L$(IVLIBDIR) --CXXDSOOPTS += -L$(IVLIBDIR) --endif -+LLDDSOOPTS += -L$(IVDEPTH)/lib -L$(IVDEPTH)/libSoXt -+LLDOPTS += -L$(IVDEPTH)/lib -L$(IVDEPTH)/libSoXt -+CXXDSOOPTS += -L$(IVDEPTH)/lib -L$(IVDEPTH)/libSoXt diff --git a/graphics/inventor/files/patch-lib-GNUmakefile b/graphics/inventor/files/patch-lib-GNUmakefile deleted file mode 100644 index 46ef35ed0981..000000000000 --- a/graphics/inventor/files/patch-lib-GNUmakefile +++ /dev/null @@ -1,13 +0,0 @@ ---- lib/GNUmakefile.orig 2001-09-25 02:45:32.000000000 +0200 -+++ lib/GNUmakefile 2013-10-10 14:49:54.000000000 +0200 -@@ -10,6 +10,10 @@ - -lX11 -lm \ - -lGLU -lGL - -+ifeq ($(usingFreeBSD), 1) -+LLDLIBS += %%ICONV_LIB%% -+endif -+ - OBJECTS = \ - ./database/src/sb/projectors/SbProjectors.o \ - ./database/src/sb/Sb.o \ diff --git a/graphics/inventor/files/patch-libFL_ang_flfreetype.h b/graphics/inventor/files/patch-libFL_ang_flfreetype.h deleted file mode 100644 index 118b2d2c50d0..000000000000 --- a/graphics/inventor/files/patch-libFL_ang_flfreetype.h +++ /dev/null @@ -1,12 +0,0 @@ ---- libFL/ang/flfreetype.h.orig Sat Apr 3 02:18:41 2004 -+++ libFL/ang/flfreetype.h Sat Apr 3 02:19:07 2004 -@@ -1,7 +1,8 @@ - #ifndef __flfreetype_h_ - #define __flfreetype_h_ - --#include <freetype/freetype.h> -+#include <ft2build.h> -+#include FT_FREETYPE_H - - #ifndef __fl_h_ - #include "fl.h" diff --git a/graphics/inventor/files/patch-lib_database_src_so_SoInput.c++ b/graphics/inventor/files/patch-lib_database_src_so_SoInput.c++ deleted file mode 100644 index 24660da409f6..000000000000 --- a/graphics/inventor/files/patch-lib_database_src_so_SoInput.c++ +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/database/src/so/SoInput.c++.orig 2000-10-25 23:47:47 UTC -+++ lib/database/src/so/SoInput.c++ -@@ -2810,7 +2810,7 @@ SoInput::addReference(const SbName &name - - if (addToGlobalDict) { - // Look for the first '+': -- char *firstPlus = strchr(n, '+'); -+ const char *firstPlus = strchr(n, '+'); - - if (firstPlus == NULL) { - base->setName(name); diff --git a/graphics/inventor/files/patch-lib_interaction_src_nodekits_SoInteractionKit.c++ b/graphics/inventor/files/patch-lib_interaction_src_nodekits_SoInteractionKit.c++ deleted file mode 100644 index 6f3b1a7a6307..000000000000 --- a/graphics/inventor/files/patch-lib_interaction_src_nodekits_SoInteractionKit.c++ +++ /dev/null @@ -1,13 +0,0 @@ ---- lib/interaction/src/nodekits/SoInteractionKit.c++.orig 2000-08-15 12:56:25 UTC -+++ lib/interaction/src/nodekits/SoInteractionKit.c++ -@@ -854,8 +854,8 @@ SoInteractionKit::setAnySurrogatePath( c - // (as in "childList[0].appearance") - // If so, get the string up to whichever came first. - // This will be the 'intermediary' we look for. -- char *dotPtr = strchr( partName.getString(), '.' ); -- char *brackPtr = strchr( partName.getString(), '[' ); -+ const char *dotPtr = strchr( partName.getString(), '.' ); -+ const char *brackPtr = strchr( partName.getString(), '[' ); - - if ( dotPtr != NULL || brackPtr != NULL ) { - char *nameCopy = strdup( partName.getString() ); diff --git a/graphics/inventor/files/patch-machine.h b/graphics/inventor/files/patch-machine.h deleted file mode 100644 index 1279ab8c1380..000000000000 --- a/graphics/inventor/files/patch-machine.h +++ /dev/null @@ -1,20 +0,0 @@ ---- lib/database/include/machine.h.orig 2003-07-12 00:40:53.000000000 +0200 -+++ lib/database/include/machine.h 2011-06-08 14:30:26.000000000 +0200 -@@ -143,7 +143,7 @@ - * Linux i386/ia64 machine dependent setup - */ - --#if __i386__ || __ia64__ -+#if __i386__ || __ia64__ || __amd64__ - - #define MACHINE_WORD_FORMAT DGL_LITTLE_ENDIAN - #define MACHINE_FLOAT_FORMAT DGL_NON_IEEE -@@ -321,7 +321,7 @@ - */ - - #if MACHINE_FLOAT_FORMAT == DGL_NON_IEEE --#if __i386__ || __ia64__ -+#if __i386__ || __ia64__ || __amd64__ - void mem_hton_float(float *t, float *f); - void mem_ntoh_float(float *t, float *f); - void mem_hton_double(double *t, double *f); diff --git a/graphics/inventor/files/patch-make__ivcommonrules b/graphics/inventor/files/patch-make__ivcommonrules deleted file mode 100644 index 1a7dd89343c9..000000000000 --- a/graphics/inventor/files/patch-make__ivcommonrules +++ /dev/null @@ -1,34 +0,0 @@ ---- ./make/ivcommonrules.orig 2014-06-25 10:16:42.000000000 -0400 -+++ ./make/ivcommonrules 2014-06-25 10:26:35.000000000 -0400 -@@ -31,11 +31,11 @@ - - install_ivlibdso: $(LIBDSO) - mkdir -p $(IVLIBDIR) -- $(INSTALL) -m 755 $< $(IVLIBDIR) -+ $(INSTALL) $(INSTALL_STRIP) -m 755 $< $(IVLIBDIR) - - if [ "$(LIBTYPE)" = "debug" ]; then \ - mkdir -p $(IVDLIBDIR); \ -- $(INSTALL) -m 755 $< $(IVDLIBDIR); \ -+ $(INSTALL) $(INSTALL_STRIP) -m 755 $< $(IVDLIBDIR); \ - fi - - install_ivheaders: -@@ -96,7 +96,7 @@ - - install_ivbin: $(PROGRAM) - mkdir -p $(IVBINDIR) -- $(INSTALL) -m 755 $(PROGRAM) $(IVBINDIR) -+ $(INSTALL) $(INSTALL_STRIP) -m 755 $(PROGRAM) $(IVBINDIR) - - install_ivscript: - mkdir -p $(IVBINDIR) -@@ -109,7 +109,7 @@ - - install_ivdemo: $(DEMO) - mkdir -p $(IVDEMOBINDIR) $(IVDEMODATADIR) -- $(INSTALL) -m 755 $(DEMO) $(IVDEMOBINDIR) -+ $(INSTALL) $(INSTALL_STRIP) -m 755 $(DEMO) $(IVDEMOBINDIR) - if [ -e $(DEMO).RUNME ]; then \ - $(INSTALL) -m 755 $(DEMO).RUNME $(IVDEMOBINDIR); \ - if [ "$(IVPREFIX)" != "/usr" ]; then \ diff --git a/graphics/inventor/files/patch-open.c b/graphics/inventor/files/patch-open.c deleted file mode 100644 index a9a735a84e55..000000000000 --- a/graphics/inventor/files/patch-open.c +++ /dev/null @@ -1,29 +0,0 @@ ---- libimage/open.c.orig Sat Oct 14 12:46:09 2000 -+++ libimage/open.c Sat Mar 24 20:27:50 2007 -@@ -8,6 +8,17 @@ - #include <stdlib.h> - #include "image.h" - -+#ifdef __FreeBSD__ -+ #include <machine/endian.h> -+ #if BYTE_ORDER == LITTLE_ENDIAN -+ #define DOREV 1 -+ #else -+ #define DOREV 0 -+ #endif -+#else -+ #define DOREV 0 -+#endif -+ - void cvtlongs(int buffer[],int n); - void cvtimage(int buffer[]); - void i_seterror(void (*func)()); -@@ -80,7 +91,7 @@ - image->max = 0; - isetname(image,"no name"); - image->wastebytes = 0; -- image->dorev = 0; -+ image->dorev = DOREV; - if (write(f,image,sizeof(IMAGE)) != sizeof(IMAGE)) { - free(image); - close(f); diff --git a/graphics/inventor/files/patch-qmorf.c++ b/graphics/inventor/files/patch-qmorf.c++ deleted file mode 100644 index 4ae51a0bf877..000000000000 --- a/graphics/inventor/files/patch-qmorf.c++ +++ /dev/null @@ -1,54 +0,0 @@ -*** apps/demos/qmorf/qmorf.c++.orig Fri Jan 3 10:06:23 2003 ---- apps/demos/qmorf/qmorf.c++ Fri Jan 3 10:07:59 2003 -*************** -*** 81,86 **** ---- 81,92 ---- - #include <Xm/PushBG.h> - #include <Xm/ToggleBG.h> - -+ #ifdef __FreeBSD__ -+ #define PDF_READER "xpdf" -+ #else -+ #define PDF_READER "acroread" -+ #endif -+ - // - // The list of things we'll morph between - // -*************** -*** 443,459 **** - return; - } - char command[100]; -! sprintf(command, "which acroread > /dev/null"); - - int err = system(command); - if (err) - { -! system("xmessage 'You must install acroread" - " for this function to work' > /dev/null"); - return; - } - -! sprintf(command, "acroread " IVPREFIX "/demos/Inventor/qmorf.about &"); - system(command); - } - ---- 449,465 ---- - return; - } - char command[100]; -! sprintf(command, "which " PDF_READER " > /dev/null"); - - int err = system(command); - if (err) - { -! system("xmessage 'You must install " PDF_READER - " for this function to work' > /dev/null"); - return; - } - -! sprintf(command, PDF_READER " " IVPREFIX "/demos/Inventor/qmorf.about &"); - system(command); - } - diff --git a/graphics/inventor/files/patch-revo.c++ b/graphics/inventor/files/patch-revo.c++ deleted file mode 100644 index e69d6aff3ba1..000000000000 --- a/graphics/inventor/files/patch-revo.c++ +++ /dev/null @@ -1,54 +0,0 @@ -*** apps/demos/revo/revo.c++.orig Fri Jan 3 10:09:04 2003 ---- apps/demos/revo/revo.c++ Fri Jan 3 10:11:20 2003 -*************** -*** 66,71 **** ---- 66,77 ---- - #include "LineManip.h" - #include "RevClass.h" - -+ #ifdef __FreeBSD__ -+ #define PDF_READER "xpdf" -+ #else -+ #define PDF_READER "acroread" -+ #endif -+ - // - // These are defined in profile.c++ - // -*************** -*** 86,102 **** - } - - char command[100]; -! sprintf(command, "which acroread >& /dev/null"); - - int err = system(command); - if (err) - { -! system("xmessage 'You must install acroread" - " for this function to work' > /dev/null"); - return; - } - -! sprintf(command, "acroread " IVPREFIX "/demos/Inventor/revo.about &"); - system(command); - } - ---- 92,108 ---- - } - - char command[100]; -! sprintf(command, "which " PDF_READER " >& /dev/null"); - - int err = system(command); - if (err) - { -! system("xmessage 'You must install " PDF_READER - " for this function to work' > /dev/null"); - return; - } - -! sprintf(command, PDF_READER " " IVPREFIX "/demos/Inventor/revo.about &"); - system(command); - } - diff --git a/graphics/inventor/files/patch-simplemath.h b/graphics/inventor/files/patch-simplemath.h deleted file mode 100644 index f63ed5d93e7d..000000000000 --- a/graphics/inventor/files/patch-simplemath.h +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/database/src/so/nodes/nurbs/head/simplemath.h.orig 2000-08-15 12:56:22 UTC -+++ lib/database/src/so/nodes/nurbs/head/simplemath.h -@@ -54,6 +54,6 @@ inline int - absi( int x ) { return ( x < 0 ) ? -x : x; } - - inline REAL --abs( REAL x ) { return ( x < 0.0 ) ? -x : x; } -+absr( REAL x ) { return ( x < 0.0 ) ? -x : x; } - - #endif /* __glusimplemath_h_ */ diff --git a/graphics/inventor/files/patch-softsurfeval.c++ b/graphics/inventor/files/patch-softsurfeval.c++ deleted file mode 100644 index f3d37d317f1d..000000000000 --- a/graphics/inventor/files/patch-softsurfeval.c++ +++ /dev/null @@ -1,13 +0,0 @@ ---- lib/database/src/so/nodes/nurbs/clients/softsurfeval.c++.orig 2000-08-15 12:56:22 UTC -+++ lib/database/src/so/nodes/nurbs/clients/softsurfeval.c++ -@@ -50,8 +50,8 @@ - #include "softsurfeval.h" - #include "nurbsconsts.h" - --inline REAL abs( REAL x ) { return (x < 0.0) ? -x : x; } --inline int equal( REAL x, REAL y ) { return (abs(x-y) < 1.0E-6) ? 1 : 0; } -+inline REAL absr( REAL x ) { return (x < 0.0) ? -x : x; } -+inline int equal( REAL x, REAL y ) { return (absr(x-y) < 1.0E-6) ? 1 : 0; } - - _SoNurbsSurfaceEvaluator::~_SoNurbsSurfaceEvaluator() - { diff --git a/graphics/inventor/files/patch-src__so_nodes-SoText2.c++ b/graphics/inventor/files/patch-src__so_nodes-SoText2.c++ deleted file mode 100644 index 905b5503a76b..000000000000 --- a/graphics/inventor/files/patch-src__so_nodes-SoText2.c++ +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/database/src/so/nodes/SoText2.c++.orig 2018-11-05 17:54:41 UTC -+++ lib/database/src/so/nodes/SoText2.c++ -SoText2.c++ -@@ -889,7 +889,7 @@ SoBitmapFontCache::createUniFontList(con - fontNums = new SbPList; - - while (s1 = (char *)strchr(s, ';')) { -- *s1 = (char)NULL; /* font name is pointed to s */ -+ *s1 = 0; /* font name is pointed to s */ - - if ((fn = flCreateFont((const GLubyte*)s, mat, 0, NULL)) == (FLfontNumber)0) { - #ifdef DEBUG diff --git a/graphics/inventor/files/patch-src__so_nodes-SoText3.c++ b/graphics/inventor/files/patch-src__so_nodes-SoText3.c++ deleted file mode 100644 index de1c6e718036..000000000000 --- a/graphics/inventor/files/patch-src__so_nodes-SoText3.c++ +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/database/src/so/nodes/SoText3.c++.orig 2018-11-05 17:54:33 UTC -+++ lib/database/src/so/nodes/SoText3.c++ -@@ -1473,7 +1473,7 @@ SoOutlineFontCache::createUniFontList(co - fontNums = new SbPList; - - while (s1 = (char *)strchr(s, ';')) { -- *s1 = (char)NULL; /* font name is pointed to s */ -+ *s1 = 0; /* font name is pointed to s */ - - if ((fn = flCreateFont((const GLubyte*)s, mat, 0, NULL)) == (FLfontNumber)0) { - #ifdef DEBUG diff --git a/graphics/inventor/files/patch-textomatic.c++ b/graphics/inventor/files/patch-textomatic.c++ deleted file mode 100644 index ab09892aaa49..000000000000 --- a/graphics/inventor/files/patch-textomatic.c++ +++ /dev/null @@ -1,53 +0,0 @@ -*** apps/demos/textomatic/textomatic.c++.orig Fri Jan 3 10:12:24 2003 ---- apps/demos/textomatic/textomatic.c++ Fri Jan 3 10:13:33 2003 -*************** -*** 69,74 **** ---- 69,80 ---- - #include "../../samples/common/Useful.h" - #include "./labels.h" - -+ #ifdef __FreeBSD__ -+ #define PDF_READER "xpdf" -+ #else -+ #define PDF_READER "acroread" -+ #endif -+ - // - // Some evil variables global to this file. I should pass them around - // as paramaters or encapsulate them in a class, but this is easier. -*************** -*** 164,179 **** - } - - char command[100]; -! sprintf(command, "which acroread > /dev/null"); - - int err = system(command); - if (err) { -! system("xmessage 'You must install acroread" - " for this function to work' > /dev/null"); - return; - } - -! sprintf(command, "acroread " IVPREFIX "/demos/Inventor/textomatic.about &"); - system(command); - } - ---- 170,186 ---- - } - - char command[100]; -! sprintf(command, "which " PDF_READER "> /dev/null"); - - int err = system(command); - if (err) { -! system("xmessage 'You must install " PDF_READER - " for this function to work' > /dev/null"); - return; - } - -! sprintf(command, PDF_READER " " -! IVPREFIX "/demos/Inventor/textomatic.about &"); - system(command); - } - diff --git a/graphics/inventor/files/patch-tools-ppp_ppp.c++ b/graphics/inventor/files/patch-tools-ppp_ppp.c++ deleted file mode 100644 index e054e42b9d8b..000000000000 --- a/graphics/inventor/files/patch-tools-ppp_ppp.c++ +++ /dev/null @@ -1,11 +0,0 @@ ---- tools/ppp/ppp.c++.orig 2013-10-10 14:43:30.000000000 +0200 -+++ tools/ppp/ppp.c++ 2013-10-10 14:48:56.000000000 +0200 -@@ -627,7 +627,7 @@ - // - ////////////////////////////////////////////////////////////////////////////// - --main(int, char *argv[]) -+int main(int, char *argv[]) - { - char buf[1024]; - Line line; diff --git a/graphics/inventor/files/pkg-message.in b/graphics/inventor/files/pkg-message.in deleted file mode 100644 index 18eeff6fcb89..000000000000 --- a/graphics/inventor/files/pkg-message.in +++ /dev/null @@ -1,23 +0,0 @@ -[ -{ type: install - message: <<EOM -Please set the environment variable FL_FONT_PATH to the directory where your -TrueType fonts are installed. If you do not set this variable, Open Inventor(TM) -will use %%PREFIX%%/share/fonts/TTF as default. - -Open Inventor (TM) needs the following TrueType fonts: - - - Times-Roman - - Helvetica - - Utopia-Regular - -You should make symbolic links of the TrueType fonts to the OpenInventor (TM) -font names if they are not available: - - # cd %%PREFIX%%/share/fonts/TTF - # ln -s times.ttf Times-Roman - # ln -s arial.ttf Helvetica - # ln -s cour.ttf Utopia-Regular -EOM -} -] |