pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

freecad: get rid of carriage return problems



Module Name:	pkgsrc-wip
Committed By:	Rumko <rumko%NetBSD.org@localhost>
Pushed By:	rumko
Date:		Mon Oct 24 19:17:23 2016 +0200
Changeset:	bb5d2648d9b6165aa411e53d8d3b93d8ba10a855

Modified Files:
	freecad/Makefile
	freecad/distinfo

Log Message:
freecad: get rid of carriage return problems

Ensure everything (the patches and files being patches) do not contain
DOS style line endings.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bb5d2648d9b6165aa411e53d8d3b93d8ba10a855

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 freecad/Makefile |  6 ++++++
 freecad/distinfo | 14 +++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diffs:
diff --git a/freecad/Makefile b/freecad/Makefile
index 0fc88f3..044f441 100644
--- a/freecad/Makefile
+++ b/freecad/Makefile
@@ -27,6 +27,12 @@ CMAKE_ARGS+=		-DCMAKE_SHARED_LINKER_FLAGS=${LDFLAGS:Q}
 
 CMAKE_ARGS+=		-DFREECAD_USE_EXTERNAL_KDL=ON
 
+SUBST_CLASSES+=		eol
+SUBST_MESSAGE.eol=	Removing DOS line-ends
+SUBST_STAGE.eol=	post-extract
+SUBST_FILES.eol=	src/App/Application.cpp src/App/FreeCADInit.py src/Main/CMakeLists.txt src/Main/Main*.cpp src/Mod/Inspection/CMakeLists.txt src/Mod/Start/StartPage/CMakeLists.txt
+SUBST_FILTER_CMD.eol=	${TR} -d '\r'
+
 
 REPLACE_PYTHON+=	src/Tools/wiki2qhelp.py src/Tools/PythonToCPP.py src/Tools/githubstats.py src/Tools/updatefromcrowdin.py src/Tools/updatecrowdin.py src/Tools/updateppa.py
 REPLACE_PYTHON+=	src/Tools/generateBase/generateModel_Module.py src/Tools/generateBase/generateDS.py
diff --git a/freecad/distinfo b/freecad/distinfo
index 7e41fcf..d3b9984 100644
--- a/freecad/distinfo
+++ b/freecad/distinfo
@@ -7,13 +7,13 @@ Size (freecad-0.16.tar.gz) = 111706127 bytes
 SHA1 (patch-CMakeLists.txt) = 7a89a8ea491b8cb234c768a3e8b82878bd1bbf9e
 SHA1 (patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__MemoryLimit.cpp) = 38bed1dd4708a83dd06fea2fbc5547513f7156cd
 SHA1 (patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__Mesh.cpp) = ebef7e0abdd3ada326e607c931a46099ad93cefc
-SHA1 (patch-src_App_Application.cpp) = a7b24fdc5b229892bbc6cf73400b0df901da97c8
+SHA1 (patch-src_App_Application.cpp) = 7f23ee068ae97695c81a847ebf93abce9f8db2c7
 SHA1 (patch-src_App_CMakeLists.txt) = c73a2a69235bf62ae0a1d45101fd021826aed9cf
-SHA1 (patch-src_App_FreeCADInit.py) = bf7051075012c97bcd7fc27649e4c17306cffb80
+SHA1 (patch-src_App_FreeCADInit.py) = 81ff70632cdb15ab4ebd744da64f691bf621f3d2
 SHA1 (patch-src_Main_CMakeLists.txt) = c10d5b97eb8fb840360681c4a5a38b14b8c1c0bb
-SHA1 (patch-src_Main_MainCmd.cpp) = f07f0b87c588523bcadb8e917429704dbb33a596
-SHA1 (patch-src_Main_MainGui.cpp) = 711279ff967d64f9f69d5c294f0fcb62ec64a223
-SHA1 (patch-src_Main_MainPy.cpp) = 0efbc10a9c773717b30c585577440986b5124530
+SHA1 (patch-src_Main_MainCmd.cpp) = 1554fd69e21627889fd4e0802e16dbd8f057f21d
+SHA1 (patch-src_Main_MainGui.cpp) = 482dafad3dbfd80661870d9230bbad2f05a4b950
+SHA1 (patch-src_Main_MainPy.cpp) = f92b2ab54d81e293e5ce737f12c7811e1ec131b0
 SHA1 (patch-src_Mod_Arch_CMakeLists.txt) = 35672c3b78f087124869679a8f4af88982f9a44c
 SHA1 (patch-src_Mod_Assembly_CMakeLists.txt) = 8adef0162d47b6a203c24018b296730df7b16b89
 SHA1 (patch-src_Mod_Cam_CMakeLists.txt) = 2e668657c69109e5c6dbe603e8bbd153a170add5
@@ -24,7 +24,7 @@ SHA1 (patch-src_Mod_Fem_CMakeLists.txt) = 87fc20ccd88f1f7940eaeba16c06e67b9c3104
 SHA1 (patch-src_Mod_Idf_CMakeLists.txt) = df1ba2867bc7174b32cb0699a1013c267db2c916
 SHA1 (patch-src_Mod_Image_CMakeLists.txt) = 07d261f8e49d06910d9c4a8ba881389bd2474367
 SHA1 (patch-src_Mod_Import_CMakeLists.txt) = 92a3c2fff62d9c7cef7be631251add36c859dd0f
-SHA1 (patch-src_Mod_Inspection_CMakeLists.txt) = 9fd6f1027154359b718b08460eacd9bdf5d0faed
+SHA1 (patch-src_Mod_Inspection_CMakeLists.txt) = c7f645afc0bdfae0ac030b9aea9a69a68e81b7da
 SHA1 (patch-src_Mod_Material_CMakeLists.txt) = 546b1822a8b51c222d1765884ff4a79706ffb78a
 SHA1 (patch-src_Mod_MeshPart_CMakeLists.txt) = 1d8d1efc74126a14a8c23b0d7ecbf688f91db350
 SHA1 (patch-src_Mod_Mesh_CMakeLists.txt) = b580829859fa5080a3e2a09f079c4a9a06c83150
@@ -42,7 +42,7 @@ SHA1 (patch-src_Mod_Ship_CMakeLists.txt) = f1b0e2b63debdb68b0bc1ef089cd320b07a66
 SHA1 (patch-src_Mod_Sketcher_CMakeLists.txt) = 945f25b63f3daaa0a486f4eff872ecf4e5d325d0
 SHA1 (patch-src_Mod_Spreadsheet_CMakeLists.txt) = d5a60194230277067725b31cd3c81727e9f2f949
 SHA1 (patch-src_Mod_Start_CMakeLists.txt) = da034166f31ceceb63fdebd2cee42111c0386752
-SHA1 (patch-src_Mod_Start_StartPage_CMakeLists.txt) = 8d42a4c7db4b59f52c2fe91259a90177efc79197
+SHA1 (patch-src_Mod_Start_StartPage_CMakeLists.txt) = 25b0fe2b85e09be847d757d2f0e4216d338fb148
 SHA1 (patch-src_Mod_TemplatePyMod_CMakeLists.txt) = 2f8d22a17a23be81c5eea01833b05efa6a49a66f
 SHA1 (patch-src_Mod_Test_CMakeLists.txt) = a9718679984dd74c058c3c1a6b25be098e46504e
 SHA1 (patch-src_Mod_Test_Gui_CMakeLists.txt) = 9c046603d858113608ae8285d88f46fe4cec3216


Home | Main Index | Thread Index | Old Index