Date: Mon, 21 Oct 2013 07:29:28 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331098 - in head/graphics/inventor: . files Message-ID: <201310210729.r9L7TSdI008653@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Mon Oct 21 07:29:28 2013 New Revision: 331098 URL: http://svnweb.freebsd.org/changeset/ports/331098 Log: - Fix build with modern compilers PR: 182900 Submitted by: gahr Approved by: maintainer Added: head/graphics/inventor/files/patch-apps-demos-qmorf_quadCube.c++ (contents, props changed) head/graphics/inventor/files/patch-apps-demos-qmorf_quadSheet.c++ (contents, props changed) head/graphics/inventor/files/patch-apps-demos-qmorf_quadSphere.c++ (contents, props changed) head/graphics/inventor/files/patch-apps-demos-revo_GNUmakefile (contents, props changed) head/graphics/inventor/files/patch-apps-demos-textomatic_GNUmakefile (contents, props changed) head/graphics/inventor/files/patch-apps-samples-widgets_componentTest.c++ (contents, props changed) head/graphics/inventor/files/patch-apps-tools-ivcat_ivcat.c++ (contents, props changed) head/graphics/inventor/files/patch-apps-tools-ivfix_ivfix.c++ (contents, props changed) head/graphics/inventor/files/patch-apps-tools-ivinfo_ivinfo.c++ (contents, props changed) head/graphics/inventor/files/patch-doc-man-ivman_Main.c++ (contents, props changed) head/graphics/inventor/files/patch-tools-ppp_ppp.c++ (contents, props changed) Modified: head/graphics/inventor/Makefile head/graphics/inventor/files/patch-lib-GNUmakefile (contents, props changed) Modified: head/graphics/inventor/Makefile ============================================================================== --- head/graphics/inventor/Makefile Mon Oct 21 07:25:12 2013 (r331097) +++ head/graphics/inventor/Makefile Mon Oct 21 07:29:28 2013 (r331098) @@ -149,6 +149,8 @@ post-patch: @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ;\ s|%%CXX%%|${CXX}|g ; \ s|%%CXXFLAGS%%|${CXXFLAGS}|g' ${WRKSRC}/make/ivcommondefs + @${REINPLACE_CMD} -e 's|%%ICONV_LIB%%|${ICONV_LIB}|' \ + ${WRKSRC}/lib/GNUmakefile post-install: @${CAT} ${PKGMESSAGE} Added: head/graphics/inventor/files/patch-apps-demos-qmorf_quadCube.c++ ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/inventor/files/patch-apps-demos-qmorf_quadCube.c++ Mon Oct 21 07:29:28 2013 (r331098) @@ -0,0 +1,11 @@ +--- 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; + Added: head/graphics/inventor/files/patch-apps-demos-qmorf_quadSheet.c++ ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/inventor/files/patch-apps-demos-qmorf_quadSheet.c++ Mon Oct 21 07:29:28 2013 (r331098) @@ -0,0 +1,11 @@ +--- 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(); + Added: head/graphics/inventor/files/patch-apps-demos-qmorf_quadSphere.c++ ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/inventor/files/patch-apps-demos-qmorf_quadSphere.c++ Mon Oct 21 07:29:28 2013 (r331098) @@ -0,0 +1,11 @@ +--- 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(); + Added: head/graphics/inventor/files/patch-apps-demos-revo_GNUmakefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/inventor/files/patch-apps-demos-revo_GNUmakefile Mon Oct 21 07:29:28 2013 (r331098) @@ -0,0 +1,14 @@ +--- 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 + Added: head/graphics/inventor/files/patch-apps-demos-textomatic_GNUmakefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/inventor/files/patch-apps-demos-textomatic_GNUmakefile Mon Oct 21 07:29:28 2013 (r331098) @@ -0,0 +1,11 @@ +--- 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 + Added: head/graphics/inventor/files/patch-apps-samples-widgets_componentTest.c++ ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/inventor/files/patch-apps-samples-widgets_componentTest.c++ Mon Oct 21 07:29:28 2013 (r331098) @@ -0,0 +1,11 @@ +--- 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]); Added: head/graphics/inventor/files/patch-apps-tools-ivcat_ivcat.c++ ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/inventor/files/patch-apps-tools-ivcat_ivcat.c++ Mon Oct 21 07:29:28 2013 (r331098) @@ -0,0 +1,11 @@ +--- 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; Added: head/graphics/inventor/files/patch-apps-tools-ivfix_ivfix.c++ ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/inventor/files/patch-apps-tools-ivfix_ivfix.c++ Mon Oct 21 07:29:28 2013 (r331098) @@ -0,0 +1,11 @@ +--- 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; + Added: head/graphics/inventor/files/patch-apps-tools-ivinfo_ivinfo.c++ ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/inventor/files/patch-apps-tools-ivinfo_ivinfo.c++ Mon Oct 21 07:29:28 2013 (r331098) @@ -0,0 +1,11 @@ +--- 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; Added: head/graphics/inventor/files/patch-doc-man-ivman_Main.c++ ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/inventor/files/patch-doc-man-ivman_Main.c++ Mon Oct 21 07:29:28 2013 (r331098) @@ -0,0 +1,11 @@ +--- 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; Modified: head/graphics/inventor/files/patch-lib-GNUmakefile ============================================================================== --- head/graphics/inventor/files/patch-lib-GNUmakefile Mon Oct 21 07:25:12 2013 (r331097) +++ head/graphics/inventor/files/patch-lib-GNUmakefile Mon Oct 21 07:29:28 2013 (r331098) @@ -1,15 +1,13 @@ -*** lib/GNUmakefile Sat Dec 14 18:23:15 2002 ---- lib/GNUmakefile.new Sat Dec 14 17:30:19 2002 -*************** -*** 10,15 **** ---- 10,19 ---- - -lX11 -lm \ - -lGLU -lGL - -+ ifeq ($(usingFreeBSD), 1) -+ LLDLIBS += -lXext -liconv -+ endif -+ - OBJECTS = \ - ./database/src/sb/projectors/SbProjectors.o \ - ./database/src/sb/Sb.o \ +--- 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 += -lXext %%ICONV_LIB%% ++endif ++ + OBJECTS = \ + ./database/src/sb/projectors/SbProjectors.o \ + ./database/src/sb/Sb.o \ Added: head/graphics/inventor/files/patch-tools-ppp_ppp.c++ ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/inventor/files/patch-tools-ppp_ppp.c++ Mon Oct 21 07:29:28 2013 (r331098) @@ -0,0 +1,11 @@ +--- 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310210729.r9L7TSdI008653>