git: a71f3a08c430 - main - x11-toolkits/soqt: update to 1.6.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Christoph Moench-Tegeder <cmt_at_FreeBSD.org>
Date: Wed, 22 Nov 2023 19:46:51 UTC
The branch main has been updated by cmt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a71f3a08c43014f03a6e4e7fbbaccd9389ca27a3

commit a71f3a08c43014f03a6e4e7fbbaccd9389ca27a3
Author:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2023-11-22 19:46:17 +0000
Commit:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2023-11-22 19:46:17 +0000

    x11-toolkits/soqt: update to 1.6.1
    
    https://github.com/coin3d/soqt/releases/tag/v1.6.1
---
 x11-toolkits/soqt/Makefile                         |  14 +-
 x11-toolkits/soqt/distinfo                         |   6 +-
 x11-toolkits/soqt/files/patch-CMakeLists.txt       |  48 +-
 x11-toolkits/soqt/files/patch-soqt-config.cmake.in |  12 +-
 x11-toolkits/soqt/files/patch-src_CMakeLists.txt   |  14 +-
 ...tch-src_Inventor_Qt_common_spwinput__x11.cpp.in |  10 +
 ...src_Inventor_Qt_common_viewers_SoGuiViewer.h.in |  11 +
 x11-toolkits/soqt/pkg-plist                        | 908 +++++++++++----------
 8 files changed, 542 insertions(+), 481 deletions(-)

diff --git a/x11-toolkits/soqt/Makefile b/x11-toolkits/soqt/Makefile
index 829a566dfad9..415446da4c55 100644
--- a/x11-toolkits/soqt/Makefile
+++ b/x11-toolkits/soqt/Makefile
@@ -1,10 +1,9 @@
 PORTNAME=	SoQt
-PORTVERSION=	1.6.0
-PORTREVISION=	2
+PORTVERSION=	1.6.1
 PORTEPOCH=		1
 CATEGORIES=	x11-toolkits
 # cannot USE_GITHUB: submodules required, distfile built by upstream
-MASTER_SITES=	https://github.com/coin3d/soqt/releases/download/${PORTNAME}-${PORTVERSION}/
+MASTER_SITES=	https://github.com/coin3d/soqt/releases/download/v${PORTVERSION}/
 DISTNAME=	soqt-${PORTVERSION}-src
 
 MAINTAINER=	cmt@FreeBSD.org
@@ -15,15 +14,18 @@ LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libCoin.so:graphics/Coin
 
-USES=		cmake compiler:c++11-lang dos2unix gl libtool \
-		localbase:ldflags pathfix pkgconfig qmake:no_env qt:5 xorg
+USES=		cmake:noninja compiler:c++11-lang dos2unix gl libtool \
+		localbase pathfix pkgconfig qmake:no_env qt:5 xorg
 USE_QT=		buildtools core gui opengl qmake widgets
 USE_GL=		gl glu
 USE_XORG=	ice sm x11 xext xi
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${QT_INCDIR}/QtCore -I${QT_INCDIR}
-LDFLAGS+=	-L${QT_LIBDIR}
+CXXFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${QT_LIBDIR} -L${LOCALBASE}/lib
+CMAKE_ARGS+=	-DSOQT_USE_QT4=off -DSOQT_USE_QT5=on -DSOQT_USE_QT6=off
+CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include
 
 WRKSRC=		${WRKDIR}/soqt
 
diff --git a/x11-toolkits/soqt/distinfo b/x11-toolkits/soqt/distinfo
index 1795da008e27..058ffd0779e6 100644
--- a/x11-toolkits/soqt/distinfo
+++ b/x11-toolkits/soqt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669565946
-SHA256 (soqt-1.6.0-src.tar.gz) = 9f535af59f07c907022815679681bd345c9dec2f408c74833f6b1b24bca40e1f
-SIZE (soqt-1.6.0-src.tar.gz) = 1675532
+TIMESTAMP = 1700512870
+SHA256 (soqt-1.6.1-src.tar.gz) = 80289d9bd49ffe709ab85778c952573f43f1c725ea958c6d5969b2e9c77bb3ba
+SIZE (soqt-1.6.1-src.tar.gz) = 1705089
diff --git a/x11-toolkits/soqt/files/patch-CMakeLists.txt b/x11-toolkits/soqt/files/patch-CMakeLists.txt
index 83c152cfbb70..4e07aa8252fc 100644
--- a/x11-toolkits/soqt/files/patch-CMakeLists.txt
+++ b/x11-toolkits/soqt/files/patch-CMakeLists.txt
@@ -1,20 +1,46 @@
---- CMakeLists.txt.orig	2020-01-15 23:29:46 UTC
-+++ CMakeLists.txt
-@@ -123,7 +123,7 @@ report_prepare(
+--- CMakeLists.txt.orig	2023-11-20 21:47:34.494796000 +0100
++++ CMakeLists.txt	2023-11-20 23:00:36.630907000 +0100
+@@ -128,7 +128,7 @@
+ # Fail early if one of the required packages cannot be found
  
  find_package(OpenGL REQUIRED)
- # Coin is typically installed as Inventor.framework on APPLE
--find_package(Coin NAMES Inventor Coin REQUIRED)
+-find_package(Coin REQUIRED)
 +find_package(Coin3D REQUIRED)
  
- if(SO${GUI}_USE_QT5)
-   find_package(Qt5 COMPONENTS Core Gui OpenGL Widgets QUIET)
-@@ -243,7 +243,7 @@ elseif(FUNCTION)
+ set(SO${GUI}_PKG_DEPS "Coin")
+ 
+@@ -290,19 +290,22 @@
  endif()
  
  set(CMAKE_REQUIRED_INCLUDES ${OPENGL_INCLUDE_DIR})
 -set(CMAKE_REQUIRED_LIBRARIES Coin::Coin ${OPENGL_LIBRARIES})
-+# set(CMAKE_REQUIRED_LIBRARIES Coin ${OPENGL_LIBRARIES})
++set(CMAKE_REQUIRED_LIBRARIES Coin ${OPENGL_LIBRARIES})
+ 
+-check_include_files(windows.h HAVE_WINDOWS_H)
+-if(HAVE_WINDOWS_H)
+-  check_include_files("windows.h;GL/gl.h" HAVE_GL_GL_H)
+-  check_include_files("windows.h;GL/glu.h" HAVE_GL_GLU_H)
+-elseif(APPLE)
+-  check_include_files(OpenGL/gl.h HAVE_OPENGL_GL_H)
+-  check_include_files(OpenGL/glu.h HAVE_OPENGL_GLU_H)
+-else()
+-  check_include_files(GL/gl.h HAVE_GL_GL_H)
+-  check_include_files(GL/glu.h HAVE_GL_GLU_H)
+-endif()
++# that logic below does not work, so we hardcode the result
++set(HAVE_GL_GL_H "1")
++set(HAVE_GL_GLU_H "1")
++# check_include_files(windows.h HAVE_WINDOWS_H)
++# if(HAVE_WINDOWS_H)
++#   check_include_files("windows.h;GL/gl.h" HAVE_GL_GL_H)
++#   check_include_files("windows.h;GL/glu.h" HAVE_GL_GLU_H)
++# elseif(APPLE)
++#   check_include_files(OpenGL/gl.h HAVE_OPENGL_GL_H)
++#   check_include_files(OpenGL/glu.h HAVE_OPENGL_GLU_H)
++# else()
++#   check_include_file(GL/gl.h HAVE_GL_GL_H)
++#   check_include_file(GL/glu.h HAVE_GL_GLU_H)
++# endif()
  
- check_include_files(windows.h HAVE_WINDOWS_H)
- if(HAVE_WINDOWS_H)
+ check_include_files(dlfcn.h HAVE_DLFCN_H)
+ check_include_files(inttypes.h HAVE_INTTYPES_H)
diff --git a/x11-toolkits/soqt/files/patch-soqt-config.cmake.in b/x11-toolkits/soqt/files/patch-soqt-config.cmake.in
index 1b16126c222a..93a84de7c1ac 100644
--- a/x11-toolkits/soqt/files/patch-soqt-config.cmake.in
+++ b/x11-toolkits/soqt/files/patch-soqt-config.cmake.in
@@ -1,11 +1,11 @@
---- soqt-config.cmake.in.orig	2020-01-15 22:42:50 UTC
-+++ soqt-config.cmake.in
+--- soqt-config.cmake.in.orig	2023-11-20 23:22:12.026499000 +0100
++++ soqt-config.cmake.in	2023-11-20 23:22:23.359003000 +0100
 @@ -26,7 +26,7 @@
  
  include(CMakeFindDependencyMacro)
  
--find_dependency(Coin REQUIRED)
-+find_dependency(Coin3D REQUIRED)
+-find_dependency(Coin)
++find_dependency(Coin3D)
  
- set(_have_qt5 @Qt5_FOUND@)
- set(_have_qt4 @Qt4_FOUND@)
+ set(@PROJECT_NAME@_HAVE_QT6 @Qt6_FOUND@)
+ set(@PROJECT_NAME@_HAVE_QT5 @Qt5_FOUND@)
diff --git a/x11-toolkits/soqt/files/patch-src_CMakeLists.txt b/x11-toolkits/soqt/files/patch-src_CMakeLists.txt
index a6933409ade0..6fd7a21114f0 100644
--- a/x11-toolkits/soqt/files/patch-src_CMakeLists.txt
+++ b/x11-toolkits/soqt/files/patch-src_CMakeLists.txt
@@ -1,11 +1,11 @@
---- src/CMakeLists.txt.orig	2020-01-15 22:43:40 UTC
-+++ src/CMakeLists.txt
-@@ -149,7 +149,7 @@ if(NOT SO${GUI}_BUILD_MAC_FRAMEWORK)
+--- src/CMakeLists.txt.orig	2023-11-20 21:46:16.383242000 +0100
++++ src/CMakeLists.txt	2023-11-20 21:46:30.550874000 +0100
+@@ -163,7 +163,7 @@
    target_include_directories(${PROJECT_NAME} INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
  endif()
  
--target_link_libraries(${PROJECT_NAME} PUBLIC Coin::Coin ${SOQT_QT_TARGETS} ${OPENGL_LIBRARIES})
-+target_link_libraries(${PROJECT_NAME} PUBLIC Coin ${SOQT_QT_TARGETS} ${OPENGL_LIBRARIES})
+-target_link_libraries(${PROJECT_NAME} PUBLIC Coin::Coin ${SOQT_QT_TARGETS} ${OPENGL_LIBRARIES} ${SOQT_X11_LIBRARIES})
++target_link_libraries(${PROJECT_NAME} PUBLIC Coin ${SOQT_QT_TARGETS} ${OPENGL_LIBRARIES} ${SOQT_X11_LIBRARIES})
  
- if(X11_FOUND)
-   target_include_directories(${PROJECT_NAME} PUBLIC ${X11_INCLUDE_DIR})
+ # Add a target to generate API documentation with Doxygen
+ if(SO${GUI}_BUILD_DOCUMENTATION)
diff --git a/x11-toolkits/soqt/files/patch-src_Inventor_Qt_common_spwinput__x11.cpp.in b/x11-toolkits/soqt/files/patch-src_Inventor_Qt_common_spwinput__x11.cpp.in
new file mode 100644
index 000000000000..21a4ac0d490f
--- /dev/null
+++ b/x11-toolkits/soqt/files/patch-src_Inventor_Qt_common_spwinput__x11.cpp.in
@@ -0,0 +1,10 @@
+--- src/Inventor/Qt/common/spwinput_x11.cpp.in.orig	2023-11-20 22:02:11.259871000 +0100
++++ src/Inventor/Qt/common/spwinput_x11.cpp.in	2023-11-20 22:02:57.180166000 +0100
+@@ -26,6 +26,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif /* HAVE_CONFIG_H */
++#include <netinet/in.h>
+ 
+ #if SO@GUI@_DEBUG && 0 // debug
+ #define SPW_DEBUG 1
diff --git a/x11-toolkits/soqt/files/patch-src_Inventor_Qt_common_viewers_SoGuiViewer.h.in b/x11-toolkits/soqt/files/patch-src_Inventor_Qt_common_viewers_SoGuiViewer.h.in
new file mode 100644
index 000000000000..6debff1faf6b
--- /dev/null
+++ b/x11-toolkits/soqt/files/patch-src_Inventor_Qt_common_viewers_SoGuiViewer.h.in
@@ -0,0 +1,11 @@
+--- src/Inventor/Qt/common/viewers/SoGuiViewer.h.in.orig	2023-11-20 23:42:54.863005000 +0100
++++ src/Inventor/Qt/common/viewers/SoGuiViewer.h.in	2023-11-20 23:43:09.606863000 +0100
+@@ -49,7 +49,7 @@
+ // Include this first, as a workaround for building on top of SGI and
+ // TGS Inventor on some Linux distributions. (The bug is in SGI/TGS
+ // Inventor.)
+-#include <cmath>
++// #include <cmath>
+ 
+ #include <Inventor/SbTime.h>
+ #include <Inventor/SoType.h>
diff --git a/x11-toolkits/soqt/pkg-plist b/x11-toolkits/soqt/pkg-plist
index 4dfac5243d7d..49195eb812c1 100644
--- a/x11-toolkits/soqt/pkg-plist
+++ b/x11-toolkits/soqt/pkg-plist
@@ -22,468 +22,480 @@ include/Inventor/Qt/viewers/SoQtPlaneViewer.h
 include/Inventor/Qt/viewers/SoQtViewer.h
 include/Inventor/Qt/widgets/SoQtPopupMenu.h
 include/Inventor/Qt/widgets/SoQtThumbWheel.h
-lib/cmake/SoQt-1.6.0/soqt-config-version.cmake
-lib/cmake/SoQt-1.6.0/soqt-config.cmake
-lib/cmake/SoQt-1.6.0/soqt-export-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/SoQt-1.6.0/soqt-export.cmake
+lib/cmake/SoQt-1.6.1/soqt-config-version.cmake
+lib/cmake/SoQt-1.6.1/soqt-config.cmake
+lib/cmake/SoQt-1.6.1/soqt-export-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/SoQt-1.6.1/soqt-export.cmake
 lib/libSoQt.so
-lib/libSoQt.so.1.6.0
+lib/libSoQt.so.20.6.1
 lib/libSoQt.so.20
 libdata/pkgconfig/SoQt.pc
 %%DATADIR%%/materials/artdeco/artdeco.h
-%%DATADIR%%/materials/artdeco/artdeco1.h
-%%DATADIR%%/materials/artdeco/artdeco10.h
-%%DATADIR%%/materials/artdeco/artdeco11.h
-%%DATADIR%%/materials/artdeco/artdeco12.h
-%%DATADIR%%/materials/artdeco/artdeco13.h
-%%DATADIR%%/materials/artdeco/artdeco14.h
-%%DATADIR%%/materials/artdeco/artdeco15.h
-%%DATADIR%%/materials/artdeco/artdeco16.h
-%%DATADIR%%/materials/artdeco/artdeco17.h
-%%DATADIR%%/materials/artdeco/artdeco18.h
-%%DATADIR%%/materials/artdeco/artdeco19.h
-%%DATADIR%%/materials/artdeco/artdeco2.h
-%%DATADIR%%/materials/artdeco/artdeco20.h
-%%DATADIR%%/materials/artdeco/artdeco21.h
-%%DATADIR%%/materials/artdeco/artdeco22.h
-%%DATADIR%%/materials/artdeco/artdeco23.h
-%%DATADIR%%/materials/artdeco/artdeco24.h
-%%DATADIR%%/materials/artdeco/artdeco25.h
-%%DATADIR%%/materials/artdeco/artdeco26.h
-%%DATADIR%%/materials/artdeco/artdeco27.h
-%%DATADIR%%/materials/artdeco/artdeco28.h
-%%DATADIR%%/materials/artdeco/artdeco29.h
-%%DATADIR%%/materials/artdeco/artdeco3.h
-%%DATADIR%%/materials/artdeco/artdeco30.h
-%%DATADIR%%/materials/artdeco/artdeco31.h
-%%DATADIR%%/materials/artdeco/artdeco32.h
-%%DATADIR%%/materials/artdeco/artdeco33.h
-%%DATADIR%%/materials/artdeco/artdeco34.h
-%%DATADIR%%/materials/artdeco/artdeco4.h
-%%DATADIR%%/materials/artdeco/artdeco5.h
-%%DATADIR%%/materials/artdeco/artdeco6.h
-%%DATADIR%%/materials/artdeco/artdeco7.h
-%%DATADIR%%/materials/artdeco/artdeco8.h
-%%DATADIR%%/materials/artdeco/artdeco9.h
+%%DATADIR%%/materials/artdeco/artdeco_0.h
+%%DATADIR%%/materials/artdeco/artdeco_1.h
+%%DATADIR%%/materials/artdeco/artdeco_10.h
+%%DATADIR%%/materials/artdeco/artdeco_11.h
+%%DATADIR%%/materials/artdeco/artdeco_12.h
+%%DATADIR%%/materials/artdeco/artdeco_13.h
+%%DATADIR%%/materials/artdeco/artdeco_14.h
+%%DATADIR%%/materials/artdeco/artdeco_15.h
+%%DATADIR%%/materials/artdeco/artdeco_16.h
+%%DATADIR%%/materials/artdeco/artdeco_17.h
+%%DATADIR%%/materials/artdeco/artdeco_18.h
+%%DATADIR%%/materials/artdeco/artdeco_19.h
+%%DATADIR%%/materials/artdeco/artdeco_2.h
+%%DATADIR%%/materials/artdeco/artdeco_20.h
+%%DATADIR%%/materials/artdeco/artdeco_21.h
+%%DATADIR%%/materials/artdeco/artdeco_22.h
+%%DATADIR%%/materials/artdeco/artdeco_23.h
+%%DATADIR%%/materials/artdeco/artdeco_24.h
+%%DATADIR%%/materials/artdeco/artdeco_25.h
+%%DATADIR%%/materials/artdeco/artdeco_26.h
+%%DATADIR%%/materials/artdeco/artdeco_27.h
+%%DATADIR%%/materials/artdeco/artdeco_28.h
+%%DATADIR%%/materials/artdeco/artdeco_29.h
+%%DATADIR%%/materials/artdeco/artdeco_3.h
+%%DATADIR%%/materials/artdeco/artdeco_30.h
+%%DATADIR%%/materials/artdeco/artdeco_31.h
+%%DATADIR%%/materials/artdeco/artdeco_32.h
+%%DATADIR%%/materials/artdeco/artdeco_33.h
+%%DATADIR%%/materials/artdeco/artdeco_34.h
+%%DATADIR%%/materials/artdeco/artdeco_4.h
+%%DATADIR%%/materials/artdeco/artdeco_5.h
+%%DATADIR%%/materials/artdeco/artdeco_6.h
+%%DATADIR%%/materials/artdeco/artdeco_7.h
+%%DATADIR%%/materials/artdeco/artdeco_8.h
+%%DATADIR%%/materials/artdeco/artdeco_9.h
 %%DATADIR%%/materials/autumn/autumn.h
-%%DATADIR%%/materials/autumn/autumn1.h
-%%DATADIR%%/materials/autumn/autumn10.h
-%%DATADIR%%/materials/autumn/autumn11.h
-%%DATADIR%%/materials/autumn/autumn12.h
-%%DATADIR%%/materials/autumn/autumn13.h
-%%DATADIR%%/materials/autumn/autumn14.h
-%%DATADIR%%/materials/autumn/autumn15.h
-%%DATADIR%%/materials/autumn/autumn16.h
-%%DATADIR%%/materials/autumn/autumn17.h
-%%DATADIR%%/materials/autumn/autumn18.h
-%%DATADIR%%/materials/autumn/autumn19.h
-%%DATADIR%%/materials/autumn/autumn2.h
-%%DATADIR%%/materials/autumn/autumn20.h
-%%DATADIR%%/materials/autumn/autumn21.h
-%%DATADIR%%/materials/autumn/autumn22.h
-%%DATADIR%%/materials/autumn/autumn23.h
-%%DATADIR%%/materials/autumn/autumn24.h
-%%DATADIR%%/materials/autumn/autumn25.h
-%%DATADIR%%/materials/autumn/autumn26.h
-%%DATADIR%%/materials/autumn/autumn27.h
-%%DATADIR%%/materials/autumn/autumn28.h
-%%DATADIR%%/materials/autumn/autumn29.h
-%%DATADIR%%/materials/autumn/autumn3.h
-%%DATADIR%%/materials/autumn/autumn30.h
-%%DATADIR%%/materials/autumn/autumn31.h
-%%DATADIR%%/materials/autumn/autumn32.h
-%%DATADIR%%/materials/autumn/autumn33.h
-%%DATADIR%%/materials/autumn/autumn34.h
-%%DATADIR%%/materials/autumn/autumn4.h
-%%DATADIR%%/materials/autumn/autumn5.h
-%%DATADIR%%/materials/autumn/autumn6.h
-%%DATADIR%%/materials/autumn/autumn7.h
-%%DATADIR%%/materials/autumn/autumn8.h
-%%DATADIR%%/materials/autumn/autumn9.h
+%%DATADIR%%/materials/autumn/autumn_0.h
+%%DATADIR%%/materials/autumn/autumn_1.h
+%%DATADIR%%/materials/autumn/autumn_10.h
+%%DATADIR%%/materials/autumn/autumn_11.h
+%%DATADIR%%/materials/autumn/autumn_12.h
+%%DATADIR%%/materials/autumn/autumn_13.h
+%%DATADIR%%/materials/autumn/autumn_14.h
+%%DATADIR%%/materials/autumn/autumn_15.h
+%%DATADIR%%/materials/autumn/autumn_16.h
+%%DATADIR%%/materials/autumn/autumn_17.h
+%%DATADIR%%/materials/autumn/autumn_18.h
+%%DATADIR%%/materials/autumn/autumn_19.h
+%%DATADIR%%/materials/autumn/autumn_2.h
+%%DATADIR%%/materials/autumn/autumn_20.h
+%%DATADIR%%/materials/autumn/autumn_21.h
+%%DATADIR%%/materials/autumn/autumn_22.h
+%%DATADIR%%/materials/autumn/autumn_23.h
+%%DATADIR%%/materials/autumn/autumn_24.h
+%%DATADIR%%/materials/autumn/autumn_25.h
+%%DATADIR%%/materials/autumn/autumn_26.h
+%%DATADIR%%/materials/autumn/autumn_27.h
+%%DATADIR%%/materials/autumn/autumn_28.h
+%%DATADIR%%/materials/autumn/autumn_29.h
+%%DATADIR%%/materials/autumn/autumn_3.h
+%%DATADIR%%/materials/autumn/autumn_30.h
+%%DATADIR%%/materials/autumn/autumn_31.h
+%%DATADIR%%/materials/autumn/autumn_32.h
+%%DATADIR%%/materials/autumn/autumn_33.h
+%%DATADIR%%/materials/autumn/autumn_34.h
+%%DATADIR%%/materials/autumn/autumn_4.h
+%%DATADIR%%/materials/autumn/autumn_5.h
+%%DATADIR%%/materials/autumn/autumn_6.h
+%%DATADIR%%/materials/autumn/autumn_7.h
+%%DATADIR%%/materials/autumn/autumn_8.h
+%%DATADIR%%/materials/autumn/autumn_9.h
 %%DATADIR%%/materials/glass/glass.h
-%%DATADIR%%/materials/glass/glass1.h
-%%DATADIR%%/materials/glass/glass10.h
-%%DATADIR%%/materials/glass/glass11.h
-%%DATADIR%%/materials/glass/glass12.h
-%%DATADIR%%/materials/glass/glass13.h
-%%DATADIR%%/materials/glass/glass14.h
-%%DATADIR%%/materials/glass/glass15.h
-%%DATADIR%%/materials/glass/glass16.h
-%%DATADIR%%/materials/glass/glass17.h
-%%DATADIR%%/materials/glass/glass18.h
-%%DATADIR%%/materials/glass/glass19.h
-%%DATADIR%%/materials/glass/glass2.h
-%%DATADIR%%/materials/glass/glass20.h
-%%DATADIR%%/materials/glass/glass21.h
-%%DATADIR%%/materials/glass/glass22.h
-%%DATADIR%%/materials/glass/glass23.h
-%%DATADIR%%/materials/glass/glass24.h
-%%DATADIR%%/materials/glass/glass25.h
-%%DATADIR%%/materials/glass/glass26.h
-%%DATADIR%%/materials/glass/glass27.h
-%%DATADIR%%/materials/glass/glass28.h
-%%DATADIR%%/materials/glass/glass29.h
-%%DATADIR%%/materials/glass/glass3.h
-%%DATADIR%%/materials/glass/glass30.h
-%%DATADIR%%/materials/glass/glass31.h
-%%DATADIR%%/materials/glass/glass32.h
-%%DATADIR%%/materials/glass/glass33.h
-%%DATADIR%%/materials/glass/glass34.h
-%%DATADIR%%/materials/glass/glass4.h
-%%DATADIR%%/materials/glass/glass5.h
-%%DATADIR%%/materials/glass/glass6.h
-%%DATADIR%%/materials/glass/glass7.h
-%%DATADIR%%/materials/glass/glass8.h
-%%DATADIR%%/materials/glass/glass9.h
+%%DATADIR%%/materials/glass/glass_0.h
+%%DATADIR%%/materials/glass/glass_1.h
+%%DATADIR%%/materials/glass/glass_10.h
+%%DATADIR%%/materials/glass/glass_11.h
+%%DATADIR%%/materials/glass/glass_12.h
+%%DATADIR%%/materials/glass/glass_13.h
+%%DATADIR%%/materials/glass/glass_14.h
+%%DATADIR%%/materials/glass/glass_15.h
+%%DATADIR%%/materials/glass/glass_16.h
+%%DATADIR%%/materials/glass/glass_17.h
+%%DATADIR%%/materials/glass/glass_18.h
+%%DATADIR%%/materials/glass/glass_19.h
+%%DATADIR%%/materials/glass/glass_2.h
+%%DATADIR%%/materials/glass/glass_20.h
+%%DATADIR%%/materials/glass/glass_21.h
+%%DATADIR%%/materials/glass/glass_22.h
+%%DATADIR%%/materials/glass/glass_23.h
+%%DATADIR%%/materials/glass/glass_24.h
+%%DATADIR%%/materials/glass/glass_25.h
+%%DATADIR%%/materials/glass/glass_26.h
+%%DATADIR%%/materials/glass/glass_27.h
+%%DATADIR%%/materials/glass/glass_28.h
+%%DATADIR%%/materials/glass/glass_29.h
+%%DATADIR%%/materials/glass/glass_3.h
+%%DATADIR%%/materials/glass/glass_30.h
+%%DATADIR%%/materials/glass/glass_31.h
+%%DATADIR%%/materials/glass/glass_32.h
+%%DATADIR%%/materials/glass/glass_33.h
+%%DATADIR%%/materials/glass/glass_34.h
+%%DATADIR%%/materials/glass/glass_4.h
+%%DATADIR%%/materials/glass/glass_5.h
+%%DATADIR%%/materials/glass/glass_6.h
+%%DATADIR%%/materials/glass/glass_7.h
+%%DATADIR%%/materials/glass/glass_8.h
+%%DATADIR%%/materials/glass/glass_9.h
 %%DATADIR%%/materials/materials.h
 %%DATADIR%%/materials/metal/metal.h
-%%DATADIR%%/materials/metal/metal1.h
-%%DATADIR%%/materials/metal/metal10.h
-%%DATADIR%%/materials/metal/metal11.h
-%%DATADIR%%/materials/metal/metal12.h
-%%DATADIR%%/materials/metal/metal13.h
-%%DATADIR%%/materials/metal/metal14.h
-%%DATADIR%%/materials/metal/metal15.h
-%%DATADIR%%/materials/metal/metal16.h
-%%DATADIR%%/materials/metal/metal17.h
-%%DATADIR%%/materials/metal/metal18.h
-%%DATADIR%%/materials/metal/metal19.h
-%%DATADIR%%/materials/metal/metal2.h
-%%DATADIR%%/materials/metal/metal20.h
-%%DATADIR%%/materials/metal/metal21.h
-%%DATADIR%%/materials/metal/metal22.h
-%%DATADIR%%/materials/metal/metal23.h
-%%DATADIR%%/materials/metal/metal24.h
-%%DATADIR%%/materials/metal/metal25.h
-%%DATADIR%%/materials/metal/metal26.h
-%%DATADIR%%/materials/metal/metal27.h
-%%DATADIR%%/materials/metal/metal28.h
-%%DATADIR%%/materials/metal/metal29.h
-%%DATADIR%%/materials/metal/metal3.h
-%%DATADIR%%/materials/metal/metal30.h
-%%DATADIR%%/materials/metal/metal31.h
-%%DATADIR%%/materials/metal/metal32.h
-%%DATADIR%%/materials/metal/metal33.h
-%%DATADIR%%/materials/metal/metal34.h
-%%DATADIR%%/materials/metal/metal4.h
-%%DATADIR%%/materials/metal/metal5.h
-%%DATADIR%%/materials/metal/metal6.h
-%%DATADIR%%/materials/metal/metal7.h
-%%DATADIR%%/materials/metal/metal8.h
-%%DATADIR%%/materials/metal/metal9.h
+%%DATADIR%%/materials/metal/metal_0.h
+%%DATADIR%%/materials/metal/metal_1.h
+%%DATADIR%%/materials/metal/metal_10.h
+%%DATADIR%%/materials/metal/metal_11.h
+%%DATADIR%%/materials/metal/metal_12.h
+%%DATADIR%%/materials/metal/metal_13.h
+%%DATADIR%%/materials/metal/metal_14.h
+%%DATADIR%%/materials/metal/metal_15.h
+%%DATADIR%%/materials/metal/metal_16.h
+%%DATADIR%%/materials/metal/metal_17.h
+%%DATADIR%%/materials/metal/metal_18.h
+%%DATADIR%%/materials/metal/metal_19.h
+%%DATADIR%%/materials/metal/metal_2.h
+%%DATADIR%%/materials/metal/metal_20.h
+%%DATADIR%%/materials/metal/metal_21.h
+%%DATADIR%%/materials/metal/metal_22.h
+%%DATADIR%%/materials/metal/metal_23.h
+%%DATADIR%%/materials/metal/metal_24.h
+%%DATADIR%%/materials/metal/metal_25.h
+%%DATADIR%%/materials/metal/metal_26.h
+%%DATADIR%%/materials/metal/metal_27.h
+%%DATADIR%%/materials/metal/metal_28.h
+%%DATADIR%%/materials/metal/metal_29.h
+%%DATADIR%%/materials/metal/metal_3.h
+%%DATADIR%%/materials/metal/metal_30.h
+%%DATADIR%%/materials/metal/metal_31.h
+%%DATADIR%%/materials/metal/metal_32.h
+%%DATADIR%%/materials/metal/metal_33.h
+%%DATADIR%%/materials/metal/metal_34.h
+%%DATADIR%%/materials/metal/metal_4.h
+%%DATADIR%%/materials/metal/metal_5.h
+%%DATADIR%%/materials/metal/metal_6.h
+%%DATADIR%%/materials/metal/metal_7.h
+%%DATADIR%%/materials/metal/metal_8.h
+%%DATADIR%%/materials/metal/metal_9.h
 %%DATADIR%%/materials/neon/neon.h
-%%DATADIR%%/materials/neon/neon1.h
-%%DATADIR%%/materials/neon/neon10.h
-%%DATADIR%%/materials/neon/neon11.h
-%%DATADIR%%/materials/neon/neon12.h
-%%DATADIR%%/materials/neon/neon13.h
-%%DATADIR%%/materials/neon/neon14.h
-%%DATADIR%%/materials/neon/neon15.h
-%%DATADIR%%/materials/neon/neon16.h
-%%DATADIR%%/materials/neon/neon17.h
-%%DATADIR%%/materials/neon/neon18.h
-%%DATADIR%%/materials/neon/neon19.h
-%%DATADIR%%/materials/neon/neon2.h
-%%DATADIR%%/materials/neon/neon20.h
-%%DATADIR%%/materials/neon/neon21.h
-%%DATADIR%%/materials/neon/neon22.h
-%%DATADIR%%/materials/neon/neon23.h
-%%DATADIR%%/materials/neon/neon24.h
-%%DATADIR%%/materials/neon/neon25.h
-%%DATADIR%%/materials/neon/neon26.h
-%%DATADIR%%/materials/neon/neon27.h
-%%DATADIR%%/materials/neon/neon28.h
-%%DATADIR%%/materials/neon/neon29.h
-%%DATADIR%%/materials/neon/neon3.h
-%%DATADIR%%/materials/neon/neon30.h
-%%DATADIR%%/materials/neon/neon31.h
-%%DATADIR%%/materials/neon/neon32.h
-%%DATADIR%%/materials/neon/neon33.h
-%%DATADIR%%/materials/neon/neon34.h
-%%DATADIR%%/materials/neon/neon4.h
-%%DATADIR%%/materials/neon/neon5.h
-%%DATADIR%%/materials/neon/neon6.h
-%%DATADIR%%/materials/neon/neon7.h
-%%DATADIR%%/materials/neon/neon8.h
-%%DATADIR%%/materials/neon/neon9.h
+%%DATADIR%%/materials/neon/neon_0.h
+%%DATADIR%%/materials/neon/neon_1.h
+%%DATADIR%%/materials/neon/neon_10.h
+%%DATADIR%%/materials/neon/neon_11.h
+%%DATADIR%%/materials/neon/neon_12.h
+%%DATADIR%%/materials/neon/neon_13.h
+%%DATADIR%%/materials/neon/neon_14.h
+%%DATADIR%%/materials/neon/neon_15.h
+%%DATADIR%%/materials/neon/neon_16.h
+%%DATADIR%%/materials/neon/neon_17.h
+%%DATADIR%%/materials/neon/neon_18.h
+%%DATADIR%%/materials/neon/neon_19.h
+%%DATADIR%%/materials/neon/neon_2.h
+%%DATADIR%%/materials/neon/neon_20.h
+%%DATADIR%%/materials/neon/neon_21.h
+%%DATADIR%%/materials/neon/neon_22.h
+%%DATADIR%%/materials/neon/neon_23.h
+%%DATADIR%%/materials/neon/neon_24.h
+%%DATADIR%%/materials/neon/neon_25.h
+%%DATADIR%%/materials/neon/neon_26.h
+%%DATADIR%%/materials/neon/neon_27.h
+%%DATADIR%%/materials/neon/neon_28.h
+%%DATADIR%%/materials/neon/neon_29.h
+%%DATADIR%%/materials/neon/neon_3.h
+%%DATADIR%%/materials/neon/neon_30.h
+%%DATADIR%%/materials/neon/neon_31.h
+%%DATADIR%%/materials/neon/neon_32.h
+%%DATADIR%%/materials/neon/neon_33.h
+%%DATADIR%%/materials/neon/neon_34.h
+%%DATADIR%%/materials/neon/neon_4.h
+%%DATADIR%%/materials/neon/neon_5.h
+%%DATADIR%%/materials/neon/neon_6.h
+%%DATADIR%%/materials/neon/neon_7.h
+%%DATADIR%%/materials/neon/neon_8.h
+%%DATADIR%%/materials/neon/neon_9.h
 %%DATADIR%%/materials/rococo/rococo.h
-%%DATADIR%%/materials/rococo/rococo1.h
-%%DATADIR%%/materials/rococo/rococo10.h
-%%DATADIR%%/materials/rococo/rococo11.h
-%%DATADIR%%/materials/rococo/rococo12.h
-%%DATADIR%%/materials/rococo/rococo13.h
-%%DATADIR%%/materials/rococo/rococo14.h
-%%DATADIR%%/materials/rococo/rococo15.h
-%%DATADIR%%/materials/rococo/rococo16.h
-%%DATADIR%%/materials/rococo/rococo17.h
-%%DATADIR%%/materials/rococo/rococo18.h
-%%DATADIR%%/materials/rococo/rococo19.h
-%%DATADIR%%/materials/rococo/rococo2.h
-%%DATADIR%%/materials/rococo/rococo20.h
-%%DATADIR%%/materials/rococo/rococo21.h
-%%DATADIR%%/materials/rococo/rococo22.h
-%%DATADIR%%/materials/rococo/rococo23.h
-%%DATADIR%%/materials/rococo/rococo24.h
-%%DATADIR%%/materials/rococo/rococo25.h
-%%DATADIR%%/materials/rococo/rococo26.h
-%%DATADIR%%/materials/rococo/rococo27.h
-%%DATADIR%%/materials/rococo/rococo28.h
-%%DATADIR%%/materials/rococo/rococo29.h
-%%DATADIR%%/materials/rococo/rococo3.h
-%%DATADIR%%/materials/rococo/rococo30.h
-%%DATADIR%%/materials/rococo/rococo31.h
-%%DATADIR%%/materials/rococo/rococo32.h
-%%DATADIR%%/materials/rococo/rococo33.h
-%%DATADIR%%/materials/rococo/rococo34.h
-%%DATADIR%%/materials/rococo/rococo4.h
-%%DATADIR%%/materials/rococo/rococo5.h
-%%DATADIR%%/materials/rococo/rococo6.h
-%%DATADIR%%/materials/rococo/rococo7.h
-%%DATADIR%%/materials/rococo/rococo8.h
-%%DATADIR%%/materials/rococo/rococo9.h
+%%DATADIR%%/materials/rococo/rococo_0.h
+%%DATADIR%%/materials/rococo/rococo_1.h
+%%DATADIR%%/materials/rococo/rococo_10.h
+%%DATADIR%%/materials/rococo/rococo_11.h
+%%DATADIR%%/materials/rococo/rococo_12.h
+%%DATADIR%%/materials/rococo/rococo_13.h
+%%DATADIR%%/materials/rococo/rococo_14.h
+%%DATADIR%%/materials/rococo/rococo_15.h
+%%DATADIR%%/materials/rococo/rococo_16.h
+%%DATADIR%%/materials/rococo/rococo_17.h
+%%DATADIR%%/materials/rococo/rococo_18.h
+%%DATADIR%%/materials/rococo/rococo_19.h
+%%DATADIR%%/materials/rococo/rococo_2.h
+%%DATADIR%%/materials/rococo/rococo_20.h
+%%DATADIR%%/materials/rococo/rococo_21.h
+%%DATADIR%%/materials/rococo/rococo_22.h
+%%DATADIR%%/materials/rococo/rococo_23.h
+%%DATADIR%%/materials/rococo/rococo_24.h
+%%DATADIR%%/materials/rococo/rococo_25.h
+%%DATADIR%%/materials/rococo/rococo_26.h
+%%DATADIR%%/materials/rococo/rococo_27.h
+%%DATADIR%%/materials/rococo/rococo_28.h
+%%DATADIR%%/materials/rococo/rococo_29.h
+%%DATADIR%%/materials/rococo/rococo_3.h
+%%DATADIR%%/materials/rococo/rococo_30.h
+%%DATADIR%%/materials/rococo/rococo_31.h
+%%DATADIR%%/materials/rococo/rococo_32.h
+%%DATADIR%%/materials/rococo/rococo_33.h
+%%DATADIR%%/materials/rococo/rococo_34.h
+%%DATADIR%%/materials/rococo/rococo_4.h
+%%DATADIR%%/materials/rococo/rococo_5.h
+%%DATADIR%%/materials/rococo/rococo_6.h
+%%DATADIR%%/materials/rococo/rococo_7.h
+%%DATADIR%%/materials/rococo/rococo_8.h
+%%DATADIR%%/materials/rococo/rococo_9.h
 %%DATADIR%%/materials/santafe/santafe.h
-%%DATADIR%%/materials/santafe/santafe1.h
-%%DATADIR%%/materials/santafe/santafe10.h
-%%DATADIR%%/materials/santafe/santafe11.h
-%%DATADIR%%/materials/santafe/santafe12.h
-%%DATADIR%%/materials/santafe/santafe13.h
-%%DATADIR%%/materials/santafe/santafe14.h
-%%DATADIR%%/materials/santafe/santafe15.h
-%%DATADIR%%/materials/santafe/santafe16.h
-%%DATADIR%%/materials/santafe/santafe17.h
-%%DATADIR%%/materials/santafe/santafe18.h
-%%DATADIR%%/materials/santafe/santafe19.h
-%%DATADIR%%/materials/santafe/santafe2.h
-%%DATADIR%%/materials/santafe/santafe20.h
-%%DATADIR%%/materials/santafe/santafe21.h
-%%DATADIR%%/materials/santafe/santafe22.h
-%%DATADIR%%/materials/santafe/santafe23.h
-%%DATADIR%%/materials/santafe/santafe24.h
-%%DATADIR%%/materials/santafe/santafe25.h
-%%DATADIR%%/materials/santafe/santafe26.h
-%%DATADIR%%/materials/santafe/santafe27.h
-%%DATADIR%%/materials/santafe/santafe28.h
-%%DATADIR%%/materials/santafe/santafe29.h
-%%DATADIR%%/materials/santafe/santafe3.h
-%%DATADIR%%/materials/santafe/santafe30.h
-%%DATADIR%%/materials/santafe/santafe31.h
-%%DATADIR%%/materials/santafe/santafe32.h
-%%DATADIR%%/materials/santafe/santafe33.h
-%%DATADIR%%/materials/santafe/santafe34.h
-%%DATADIR%%/materials/santafe/santafe4.h
-%%DATADIR%%/materials/santafe/santafe5.h
-%%DATADIR%%/materials/santafe/santafe6.h
-%%DATADIR%%/materials/santafe/santafe7.h
-%%DATADIR%%/materials/santafe/santafe8.h
-%%DATADIR%%/materials/santafe/santafe9.h
+%%DATADIR%%/materials/santafe/santafe_0.h
+%%DATADIR%%/materials/santafe/santafe_1.h
+%%DATADIR%%/materials/santafe/santafe_10.h
+%%DATADIR%%/materials/santafe/santafe_11.h
+%%DATADIR%%/materials/santafe/santafe_12.h
+%%DATADIR%%/materials/santafe/santafe_13.h
+%%DATADIR%%/materials/santafe/santafe_14.h
+%%DATADIR%%/materials/santafe/santafe_15.h
+%%DATADIR%%/materials/santafe/santafe_16.h
+%%DATADIR%%/materials/santafe/santafe_17.h
+%%DATADIR%%/materials/santafe/santafe_18.h
+%%DATADIR%%/materials/santafe/santafe_19.h
+%%DATADIR%%/materials/santafe/santafe_2.h
+%%DATADIR%%/materials/santafe/santafe_20.h
+%%DATADIR%%/materials/santafe/santafe_21.h
+%%DATADIR%%/materials/santafe/santafe_22.h
+%%DATADIR%%/materials/santafe/santafe_23.h
+%%DATADIR%%/materials/santafe/santafe_24.h
+%%DATADIR%%/materials/santafe/santafe_25.h
+%%DATADIR%%/materials/santafe/santafe_26.h
+%%DATADIR%%/materials/santafe/santafe_27.h
+%%DATADIR%%/materials/santafe/santafe_28.h
+%%DATADIR%%/materials/santafe/santafe_29.h
+%%DATADIR%%/materials/santafe/santafe_3.h
+%%DATADIR%%/materials/santafe/santafe_30.h
+%%DATADIR%%/materials/santafe/santafe_31.h
+%%DATADIR%%/materials/santafe/santafe_32.h
+%%DATADIR%%/materials/santafe/santafe_33.h
+%%DATADIR%%/materials/santafe/santafe_34.h
+%%DATADIR%%/materials/santafe/santafe_4.h
+%%DATADIR%%/materials/santafe/santafe_5.h
+%%DATADIR%%/materials/santafe/santafe_6.h
+%%DATADIR%%/materials/santafe/santafe_7.h
+%%DATADIR%%/materials/santafe/santafe_8.h
+%%DATADIR%%/materials/santafe/santafe_9.h
 %%DATADIR%%/materials/sheen/sheen.h
-%%DATADIR%%/materials/sheen/sheen1.h
-%%DATADIR%%/materials/sheen/sheen10.h
-%%DATADIR%%/materials/sheen/sheen11.h
-%%DATADIR%%/materials/sheen/sheen12.h
-%%DATADIR%%/materials/sheen/sheen13.h
-%%DATADIR%%/materials/sheen/sheen14.h
-%%DATADIR%%/materials/sheen/sheen15.h
-%%DATADIR%%/materials/sheen/sheen16.h
-%%DATADIR%%/materials/sheen/sheen17.h
-%%DATADIR%%/materials/sheen/sheen18.h
-%%DATADIR%%/materials/sheen/sheen19.h
-%%DATADIR%%/materials/sheen/sheen2.h
-%%DATADIR%%/materials/sheen/sheen20.h
-%%DATADIR%%/materials/sheen/sheen21.h
-%%DATADIR%%/materials/sheen/sheen22.h
-%%DATADIR%%/materials/sheen/sheen23.h
-%%DATADIR%%/materials/sheen/sheen24.h
-%%DATADIR%%/materials/sheen/sheen25.h
-%%DATADIR%%/materials/sheen/sheen26.h
-%%DATADIR%%/materials/sheen/sheen27.h
-%%DATADIR%%/materials/sheen/sheen28.h
-%%DATADIR%%/materials/sheen/sheen29.h
-%%DATADIR%%/materials/sheen/sheen3.h
-%%DATADIR%%/materials/sheen/sheen30.h
-%%DATADIR%%/materials/sheen/sheen31.h
-%%DATADIR%%/materials/sheen/sheen32.h
-%%DATADIR%%/materials/sheen/sheen33.h
-%%DATADIR%%/materials/sheen/sheen34.h
-%%DATADIR%%/materials/sheen/sheen4.h
-%%DATADIR%%/materials/sheen/sheen5.h
-%%DATADIR%%/materials/sheen/sheen6.h
-%%DATADIR%%/materials/sheen/sheen7.h
-%%DATADIR%%/materials/sheen/sheen8.h
-%%DATADIR%%/materials/sheen/sheen9.h
+%%DATADIR%%/materials/sheen/sheen_0.h
+%%DATADIR%%/materials/sheen/sheen_1.h
+%%DATADIR%%/materials/sheen/sheen_10.h
+%%DATADIR%%/materials/sheen/sheen_11.h
+%%DATADIR%%/materials/sheen/sheen_12.h
+%%DATADIR%%/materials/sheen/sheen_13.h
+%%DATADIR%%/materials/sheen/sheen_14.h
+%%DATADIR%%/materials/sheen/sheen_15.h
+%%DATADIR%%/materials/sheen/sheen_16.h
+%%DATADIR%%/materials/sheen/sheen_17.h
+%%DATADIR%%/materials/sheen/sheen_18.h
+%%DATADIR%%/materials/sheen/sheen_19.h
+%%DATADIR%%/materials/sheen/sheen_2.h
+%%DATADIR%%/materials/sheen/sheen_20.h
+%%DATADIR%%/materials/sheen/sheen_21.h
+%%DATADIR%%/materials/sheen/sheen_22.h
+%%DATADIR%%/materials/sheen/sheen_23.h
+%%DATADIR%%/materials/sheen/sheen_24.h
+%%DATADIR%%/materials/sheen/sheen_25.h
+%%DATADIR%%/materials/sheen/sheen_26.h
+%%DATADIR%%/materials/sheen/sheen_27.h
+%%DATADIR%%/materials/sheen/sheen_28.h
+%%DATADIR%%/materials/sheen/sheen_29.h
+%%DATADIR%%/materials/sheen/sheen_3.h
+%%DATADIR%%/materials/sheen/sheen_30.h
+%%DATADIR%%/materials/sheen/sheen_31.h
+%%DATADIR%%/materials/sheen/sheen_32.h
+%%DATADIR%%/materials/sheen/sheen_33.h
+%%DATADIR%%/materials/sheen/sheen_34.h
+%%DATADIR%%/materials/sheen/sheen_4.h
+%%DATADIR%%/materials/sheen/sheen_5.h
+%%DATADIR%%/materials/sheen/sheen_6.h
+%%DATADIR%%/materials/sheen/sheen_7.h
+%%DATADIR%%/materials/sheen/sheen_8.h
+%%DATADIR%%/materials/sheen/sheen_9.h
 %%DATADIR%%/materials/silky/silky.h
-%%DATADIR%%/materials/silky/silky1.h
-%%DATADIR%%/materials/silky/silky10.h
-%%DATADIR%%/materials/silky/silky11.h
-%%DATADIR%%/materials/silky/silky12.h
-%%DATADIR%%/materials/silky/silky13.h
-%%DATADIR%%/materials/silky/silky14.h
-%%DATADIR%%/materials/silky/silky15.h
-%%DATADIR%%/materials/silky/silky16.h
-%%DATADIR%%/materials/silky/silky17.h
-%%DATADIR%%/materials/silky/silky18.h
-%%DATADIR%%/materials/silky/silky19.h
-%%DATADIR%%/materials/silky/silky2.h
-%%DATADIR%%/materials/silky/silky20.h
-%%DATADIR%%/materials/silky/silky21.h
-%%DATADIR%%/materials/silky/silky22.h
-%%DATADIR%%/materials/silky/silky23.h
-%%DATADIR%%/materials/silky/silky24.h
-%%DATADIR%%/materials/silky/silky25.h
-%%DATADIR%%/materials/silky/silky26.h
-%%DATADIR%%/materials/silky/silky27.h
-%%DATADIR%%/materials/silky/silky28.h
-%%DATADIR%%/materials/silky/silky29.h
-%%DATADIR%%/materials/silky/silky3.h
-%%DATADIR%%/materials/silky/silky30.h
-%%DATADIR%%/materials/silky/silky31.h
-%%DATADIR%%/materials/silky/silky32.h
-%%DATADIR%%/materials/silky/silky33.h
-%%DATADIR%%/materials/silky/silky34.h
-%%DATADIR%%/materials/silky/silky4.h
-%%DATADIR%%/materials/silky/silky5.h
-%%DATADIR%%/materials/silky/silky6.h
-%%DATADIR%%/materials/silky/silky7.h
-%%DATADIR%%/materials/silky/silky8.h
-%%DATADIR%%/materials/silky/silky9.h
+%%DATADIR%%/materials/silky/silky_0.h
+%%DATADIR%%/materials/silky/silky_1.h
+%%DATADIR%%/materials/silky/silky_10.h
+%%DATADIR%%/materials/silky/silky_11.h
+%%DATADIR%%/materials/silky/silky_12.h
+%%DATADIR%%/materials/silky/silky_13.h
+%%DATADIR%%/materials/silky/silky_14.h
+%%DATADIR%%/materials/silky/silky_15.h
+%%DATADIR%%/materials/silky/silky_16.h
+%%DATADIR%%/materials/silky/silky_17.h
+%%DATADIR%%/materials/silky/silky_18.h
+%%DATADIR%%/materials/silky/silky_19.h
+%%DATADIR%%/materials/silky/silky_2.h
+%%DATADIR%%/materials/silky/silky_20.h
+%%DATADIR%%/materials/silky/silky_21.h
+%%DATADIR%%/materials/silky/silky_22.h
+%%DATADIR%%/materials/silky/silky_23.h
+%%DATADIR%%/materials/silky/silky_24.h
+%%DATADIR%%/materials/silky/silky_25.h
+%%DATADIR%%/materials/silky/silky_26.h
+%%DATADIR%%/materials/silky/silky_27.h
+%%DATADIR%%/materials/silky/silky_28.h
+%%DATADIR%%/materials/silky/silky_29.h
+%%DATADIR%%/materials/silky/silky_3.h
+%%DATADIR%%/materials/silky/silky_30.h
+%%DATADIR%%/materials/silky/silky_31.h
+%%DATADIR%%/materials/silky/silky_32.h
+%%DATADIR%%/materials/silky/silky_33.h
+%%DATADIR%%/materials/silky/silky_34.h
+%%DATADIR%%/materials/silky/silky_4.h
+%%DATADIR%%/materials/silky/silky_5.h
+%%DATADIR%%/materials/silky/silky_6.h
+%%DATADIR%%/materials/silky/silky_7.h
+%%DATADIR%%/materials/silky/silky_8.h
+%%DATADIR%%/materials/silky/silky_9.h
 %%DATADIR%%/materials/spring/spring.h
-%%DATADIR%%/materials/spring/spring1.h
-%%DATADIR%%/materials/spring/spring10.h
-%%DATADIR%%/materials/spring/spring11.h
-%%DATADIR%%/materials/spring/spring12.h
-%%DATADIR%%/materials/spring/spring13.h
-%%DATADIR%%/materials/spring/spring14.h
-%%DATADIR%%/materials/spring/spring15.h
-%%DATADIR%%/materials/spring/spring16.h
-%%DATADIR%%/materials/spring/spring17.h
-%%DATADIR%%/materials/spring/spring18.h
-%%DATADIR%%/materials/spring/spring19.h
-%%DATADIR%%/materials/spring/spring2.h
-%%DATADIR%%/materials/spring/spring20.h
-%%DATADIR%%/materials/spring/spring21.h
-%%DATADIR%%/materials/spring/spring22.h
-%%DATADIR%%/materials/spring/spring23.h
-%%DATADIR%%/materials/spring/spring24.h
-%%DATADIR%%/materials/spring/spring25.h
-%%DATADIR%%/materials/spring/spring26.h
-%%DATADIR%%/materials/spring/spring27.h
-%%DATADIR%%/materials/spring/spring28.h
-%%DATADIR%%/materials/spring/spring29.h
-%%DATADIR%%/materials/spring/spring3.h
-%%DATADIR%%/materials/spring/spring30.h
-%%DATADIR%%/materials/spring/spring31.h
-%%DATADIR%%/materials/spring/spring32.h
-%%DATADIR%%/materials/spring/spring33.h
-%%DATADIR%%/materials/spring/spring34.h
-%%DATADIR%%/materials/spring/spring4.h
-%%DATADIR%%/materials/spring/spring5.h
-%%DATADIR%%/materials/spring/spring6.h
-%%DATADIR%%/materials/spring/spring7.h
-%%DATADIR%%/materials/spring/spring8.h
-%%DATADIR%%/materials/spring/spring9.h
+%%DATADIR%%/materials/spring/spring_0.h
+%%DATADIR%%/materials/spring/spring_1.h
+%%DATADIR%%/materials/spring/spring_10.h
+%%DATADIR%%/materials/spring/spring_11.h
+%%DATADIR%%/materials/spring/spring_12.h
+%%DATADIR%%/materials/spring/spring_13.h
+%%DATADIR%%/materials/spring/spring_14.h
+%%DATADIR%%/materials/spring/spring_15.h
+%%DATADIR%%/materials/spring/spring_16.h
+%%DATADIR%%/materials/spring/spring_17.h
+%%DATADIR%%/materials/spring/spring_18.h
+%%DATADIR%%/materials/spring/spring_19.h
+%%DATADIR%%/materials/spring/spring_2.h
+%%DATADIR%%/materials/spring/spring_20.h
+%%DATADIR%%/materials/spring/spring_21.h
+%%DATADIR%%/materials/spring/spring_22.h
+%%DATADIR%%/materials/spring/spring_23.h
+%%DATADIR%%/materials/spring/spring_24.h
+%%DATADIR%%/materials/spring/spring_25.h
+%%DATADIR%%/materials/spring/spring_26.h
+%%DATADIR%%/materials/spring/spring_27.h
+%%DATADIR%%/materials/spring/spring_28.h
+%%DATADIR%%/materials/spring/spring_29.h
+%%DATADIR%%/materials/spring/spring_3.h
+%%DATADIR%%/materials/spring/spring_30.h
+%%DATADIR%%/materials/spring/spring_31.h
+%%DATADIR%%/materials/spring/spring_32.h
+%%DATADIR%%/materials/spring/spring_33.h
+%%DATADIR%%/materials/spring/spring_34.h
+%%DATADIR%%/materials/spring/spring_4.h
+%%DATADIR%%/materials/spring/spring_5.h
+%%DATADIR%%/materials/spring/spring_6.h
+%%DATADIR%%/materials/spring/spring_7.h
+%%DATADIR%%/materials/spring/spring_8.h
+%%DATADIR%%/materials/spring/spring_9.h
 %%DATADIR%%/materials/summer/summer.h
-%%DATADIR%%/materials/summer/summer1.h
-%%DATADIR%%/materials/summer/summer10.h
-%%DATADIR%%/materials/summer/summer11.h
-%%DATADIR%%/materials/summer/summer12.h
-%%DATADIR%%/materials/summer/summer13.h
-%%DATADIR%%/materials/summer/summer14.h
-%%DATADIR%%/materials/summer/summer15.h
-%%DATADIR%%/materials/summer/summer16.h
-%%DATADIR%%/materials/summer/summer17.h
-%%DATADIR%%/materials/summer/summer18.h
-%%DATADIR%%/materials/summer/summer19.h
-%%DATADIR%%/materials/summer/summer2.h
-%%DATADIR%%/materials/summer/summer20.h
-%%DATADIR%%/materials/summer/summer21.h
-%%DATADIR%%/materials/summer/summer22.h
-%%DATADIR%%/materials/summer/summer23.h
-%%DATADIR%%/materials/summer/summer24.h
-%%DATADIR%%/materials/summer/summer25.h
-%%DATADIR%%/materials/summer/summer26.h
-%%DATADIR%%/materials/summer/summer27.h
-%%DATADIR%%/materials/summer/summer28.h
-%%DATADIR%%/materials/summer/summer29.h
-%%DATADIR%%/materials/summer/summer3.h
-%%DATADIR%%/materials/summer/summer30.h
-%%DATADIR%%/materials/summer/summer31.h
-%%DATADIR%%/materials/summer/summer32.h
-%%DATADIR%%/materials/summer/summer33.h
-%%DATADIR%%/materials/summer/summer34.h
-%%DATADIR%%/materials/summer/summer4.h
-%%DATADIR%%/materials/summer/summer5.h
-%%DATADIR%%/materials/summer/summer6.h
-%%DATADIR%%/materials/summer/summer7.h
-%%DATADIR%%/materials/summer/summer8.h
-%%DATADIR%%/materials/summer/summer9.h
+%%DATADIR%%/materials/summer/summer_0.h
+%%DATADIR%%/materials/summer/summer_1.h
+%%DATADIR%%/materials/summer/summer_10.h
+%%DATADIR%%/materials/summer/summer_11.h
+%%DATADIR%%/materials/summer/summer_12.h
+%%DATADIR%%/materials/summer/summer_13.h
+%%DATADIR%%/materials/summer/summer_14.h
+%%DATADIR%%/materials/summer/summer_15.h
+%%DATADIR%%/materials/summer/summer_16.h
+%%DATADIR%%/materials/summer/summer_17.h
+%%DATADIR%%/materials/summer/summer_18.h
+%%DATADIR%%/materials/summer/summer_19.h
+%%DATADIR%%/materials/summer/summer_2.h
+%%DATADIR%%/materials/summer/summer_20.h
+%%DATADIR%%/materials/summer/summer_21.h
*** 161 LINES SKIPPED ***