Index: head/graphics/inventor/Makefile =================================================================== --- head/graphics/inventor/Makefile (revision 485898) +++ head/graphics/inventor/Makefile (revision 485899) @@ -1,59 +1,58 @@ # Created by: Christian Gusenbauer # $FreeBSD$ PORTNAME= inventor PORTVERSION= 2.1.5.p10 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= graphics MASTER_SITES= ftp://oss.sgi.com/projects/inventor/download/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/-/} EXTRACT_SUFX= .src.tar.gz MAINTAINER= ports@FreeBSD.org COMMENT= SGI's Open Inventor (TM) LICENSE= LGPL21 -BROKEN= fails to build +ONLY_FOR_ARCHS= amd64 i386 +CONFLICTS= Coin-[0-9]* SoXt-[0-9]* LIB_DEPENDS= libfreetype.so:print/freetype2 -CONFLICTS= Coin-[0-9]* SoXt-[0-9]* - +USES= gl gmake iconv jpeg motif USE_XORG= x11 xext xi xp xt -USE_GL= glu glw -USES= gmake iconv jpeg motif +USE_GL= gl glu glw USE_LDCONFIG= yes -ONLY_FOR_ARCHS= i386 amd64 + MAKE_JOBS_UNSAFE= yes WRKSRC= ${WRKDIR}/${PORTNAME} MAKE_ARGS= CC="${CC}" CXX="${CXX}" LD="${CXX}" \ VCOPTS="${CFLAGS}" VCXXOPTS="${CXXFLAGS}" \ VLDOPTS="${LDFLAGS}" VLDDSOOPTS="${LDFLAGS}" \ IVPREFIX="${PREFIX}" X11DIR="${LOCALBASE}" MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/lib:${WRKSRC}/libSoXt \ FREETYPE=1 \ INSTALL_STRIP=${STRIP} \ IVROOT=${STAGEDIR} MAKEFILE= GNUmakefile SUB_FILES= pkg-message OPTIONS_DEFINE= DEBUG DEBUG_MAKE_ENV= LIBTYPE=debug LDFLAGS+= -Wl,--add-needed LLD_UNSAFE= yes +CFLAGS+= -Wno-c++11-narrowing # cause of "lib/interaction/src/draggers/geom/SoCenterballDraggerGeom.h" post-patch: # Fix for print/freetype2 v2.7, where FT_Done_GlyphSlot function is not exported @${REINPLACE_CMD} -e '/FT_Done_GlyphSlot/s|^|//|' \ ${WRKSRC}/libFL/ang/flfreetype.c @${REINPLACE_CMD} 's|/usr\(/include/freetype2\)|${LOCALBASE}\1|' \ ${WRKSRC}/libFL/ang/GNUmakefile @${REINPLACE_CMD} -e 's|%%ICONV_LIB%%|${ICONV_LIB}|' \ ${WRKSRC}/lib/GNUmakefile - .include Index: head/graphics/inventor/files/patch-SbTime.c++ =================================================================== --- head/graphics/inventor/files/patch-SbTime.c++ (revision 485898) +++ head/graphics/inventor/files/patch-SbTime.c++ (revision 485899) @@ -1,19 +1,86 @@ +--- 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; Index: head/graphics/inventor/files/patch-src__so_nodes-SoText2.c++ =================================================================== --- head/graphics/inventor/files/patch-src__so_nodes-SoText2.c++ (nonexistent) +++ head/graphics/inventor/files/patch-src__so_nodes-SoText2.c++ (revision 485899) @@ -0,0 +1,12 @@ +--- 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 Property changes on: head/graphics/inventor/files/patch-src__so_nodes-SoText2.c++ ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/inventor/files/patch-src__so_nodes-SoText3.c++ =================================================================== --- head/graphics/inventor/files/patch-src__so_nodes-SoText3.c++ (nonexistent) +++ head/graphics/inventor/files/patch-src__so_nodes-SoText3.c++ (revision 485899) @@ -0,0 +1,11 @@ +--- 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 Property changes on: head/graphics/inventor/files/patch-src__so_nodes-SoText3.c++ ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property