From aef3577672b469ed915a7b0680d5e1ccf36347ed Mon Sep 17 00:00:00 2001
From: Mikhail Paulyshka <me@mixaill.tk>
Date: Mon, 4 Sep 2017 00:33:41 +0300
Subject: [vcpkg] allow underscores in package name

---
 toolsrc/src/PackageSpec.cpp            | 2 +-
 toolsrc/src/PackageSpecParseResult.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/toolsrc/src/PackageSpec.cpp b/toolsrc/src/PackageSpec.cpp
index 890de8899..2baf3181b 100644
--- a/toolsrc/src/PackageSpec.cpp
+++ b/toolsrc/src/PackageSpec.cpp
@@ -10,7 +10,7 @@ namespace vcpkg
 {
     static bool is_valid_package_spec_char(char c)
     {
-        return (c == '-') || isdigit(c) || (isalpha(c) && islower(c)) || (c == '[') || (c == ']');
+        return (c == '-') || (c == '_')  || isdigit(c) || (isalpha(c) && islower(c)) || (c == '[') || (c == ']');
     }
 
     std::string FeatureSpec::to_string() const
diff --git a/toolsrc/src/PackageSpecParseResult.cpp b/toolsrc/src/PackageSpecParseResult.cpp
index 838c788ba..34398cff9 100644
--- a/toolsrc/src/PackageSpecParseResult.cpp
+++ b/toolsrc/src/PackageSpecParseResult.cpp
@@ -12,8 +12,8 @@ namespace vcpkg
             case PackageSpecParseResult::SUCCESS: return "OK";
             case PackageSpecParseResult::TOO_MANY_COLONS: return "Too many colons";
             case PackageSpecParseResult::INVALID_CHARACTERS:
-                return "Contains invalid characters. Only alphanumeric lowercase ASCII characters and dashes are "
-                       "allowed";
+                return "Contains invalid characters. Only alphanumeric lowercase ASCII characters, dashes and"
+                       "underscores are allowed";
             default: Checks::unreachable(VCPKG_LINE_INFO);
         }
     }
-- 
cgit v1.2.3


From f9eda00cdaca57f23f01d528b634465e5b3ecd70 Mon Sep 17 00:00:00 2001
From: Mikhail Paulyshka <me@mixaill.tk>
Date: Mon, 4 Sep 2017 00:34:01 +0300
Subject: [urdfdom_headers] add version 1.0.0

---
 ports/urdfdom_headers/CONTROL        |  3 +++
 ports/urdfdom_headers/portfile.cmake | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 ports/urdfdom_headers/CONTROL
 create mode 100644 ports/urdfdom_headers/portfile.cmake

diff --git a/ports/urdfdom_headers/CONTROL b/ports/urdfdom_headers/CONTROL
new file mode 100644
index 000000000..a389d162c
--- /dev/null
+++ b/ports/urdfdom_headers/CONTROL
@@ -0,0 +1,3 @@
+Source: urdfdom_headers
+Version: 1.0.0-1
+Description: The URDF (U-Robot Description Format) headers provides core data structure headers for URDF.
diff --git a/ports/urdfdom_headers/portfile.cmake b/ports/urdfdom_headers/portfile.cmake
new file mode 100644
index 000000000..495328627
--- /dev/null
+++ b/ports/urdfdom_headers/portfile.cmake
@@ -0,0 +1,22 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ros/urdfdom_headers
+    REF 1.0.0
+    SHA512 b1f63c1a13f062c987d6be4fcea5eea903577a710d44fdce077722b70d72eb65a265131beac1fdeba576bde189ebf51ac0eb19b2b06a34b0f9fb9dcbd437291a
+    HEAD_REF master
+  )
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake")
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/urdfdom_headers RENAME copyright)
-- 
cgit v1.2.3


From eec908a7f6ddad82eb346c107e141b4a09b3d17c Mon Sep 17 00:00:00 2001
From: Mikhail Paulyshka <me@mixaill.tk>
Date: Mon, 4 Sep 2017 00:34:31 +0300
Subject: [console_bridge] add version 0.3.2

---
 ports/console_bridge/CONTROL        |  3 +++
 ports/console_bridge/License.txt    | 31 +++++++++++++++++++++++++++++++
 ports/console_bridge/portfile.cmake | 23 +++++++++++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 ports/console_bridge/CONTROL
 create mode 100644 ports/console_bridge/License.txt
 create mode 100644 ports/console_bridge/portfile.cmake

diff --git a/ports/console_bridge/CONTROL b/ports/console_bridge/CONTROL
new file mode 100644
index 000000000..aa6fe0882
--- /dev/null
+++ b/ports/console_bridge/CONTROL
@@ -0,0 +1,3 @@
+Source: console_bridge
+Version: 0.3.2-1
+Description: a ROS-independent package for logging that seamlessly pipes into rosconsole/rosout for ROS-dependent packages.
diff --git a/ports/console_bridge/License.txt b/ports/console_bridge/License.txt
new file mode 100644
index 000000000..affcb8568
--- /dev/null
+++ b/ports/console_bridge/License.txt
@@ -0,0 +1,31 @@
+Software License Agreement (BSD License)
+
+Copyright (c) 2008, Willow Garage, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the following
+  disclaimer in the documentation and/or other materials provided
+  with the distribution.
+* Neither the name of the Willow Garage nor the names of its
+  contributors may be used to endorse or promote products derived
+  from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/ports/console_bridge/portfile.cmake b/ports/console_bridge/portfile.cmake
new file mode 100644
index 000000000..ca5502aa9
--- /dev/null
+++ b/ports/console_bridge/portfile.cmake
@@ -0,0 +1,23 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ros/console_bridge
+    REF 0.3.2
+    SHA512 41fa5340d7ba79c887ef73eb4fda7b438ed91febd224934ae4658697e4c9e43357207e1b3e191ecce3c97cb9a87b0556372832735a268261bc798cc7683aa207
+    HEAD_REF master
+  )
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake")
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/console_bridge RENAME copyright)
-- 
cgit v1.2.3


From 5e73df3a02d82d948635ac4caa54657c0c193f2e Mon Sep 17 00:00:00 2001
From: Mikhail Paulyshka <me@mixaill.tk>
Date: Mon, 4 Sep 2017 00:34:47 +0300
Subject: [urdfdom] add version 1.0.0

---
 ports/urdfdom/0001_use_math_defines.patch | 26 ++++++++++++++++
 ports/urdfdom/0002_fix_exports.patch      | 29 ++++++++++++++++++
 ports/urdfdom/CONTROL                     |  4 +++
 ports/urdfdom/portfile.cmake              | 51 +++++++++++++++++++++++++++++++
 4 files changed, 110 insertions(+)
 create mode 100644 ports/urdfdom/0001_use_math_defines.patch
 create mode 100644 ports/urdfdom/0002_fix_exports.patch
 create mode 100644 ports/urdfdom/CONTROL
 create mode 100644 ports/urdfdom/portfile.cmake

diff --git a/ports/urdfdom/0001_use_math_defines.patch b/ports/urdfdom/0001_use_math_defines.patch
new file mode 100644
index 000000000..b791533aa
--- /dev/null
+++ b/ports/urdfdom/0001_use_math_defines.patch
@@ -0,0 +1,26 @@
+From a374a5b04db27fde58a11cc2ba5ea10a0d0a7dad Mon Sep 17 00:00:00 2001
+From: Mikhail Paulyshka <me@mixaill.tk>
+Date: Sun, 3 Sep 2017 23:24:55 +0300
+Subject: [PATCH] define _USE_MATH_DEFINES
+
+---
+ urdf_parser/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/urdf_parser/CMakeLists.txt b/urdf_parser/CMakeLists.txt
+index 333226e..2158965 100644
+--- a/urdf_parser/CMakeLists.txt
++++ b/urdf_parser/CMakeLists.txt
+@@ -1,5 +1,9 @@
+ include_directories(include)
+ 
++if(MSVC)
++add_definitions(-D_USE_MATH_DEFINES)
++endif()
++
+ add_library(urdfdom_world SHARED src/pose.cpp src/model.cpp src/link.cpp src/joint.cpp src/world.cpp)
+ target_link_libraries(urdfdom_world ${TinyXML_LIBRARIES} ${console_bridge_LIBRARIES})
+ set_target_properties(urdfdom_world PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERSION})
+-- 
+2.12.2.windows.2
+
diff --git a/ports/urdfdom/0002_fix_exports.patch b/ports/urdfdom/0002_fix_exports.patch
new file mode 100644
index 000000000..727883f8d
--- /dev/null
+++ b/ports/urdfdom/0002_fix_exports.patch
@@ -0,0 +1,29 @@
+From 06aa5a06ee543102bf1a4057601adba3490dad60 Mon Sep 17 00:00:00 2001
+From: Mikhail Paulyshka <me@mixaill.tk>
+Date: Sun, 3 Sep 2017 23:55:11 +0300
+Subject: [PATCH] fix exports
+
+---
+ urdf_parser/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/urdf_parser/CMakeLists.txt b/urdf_parser/CMakeLists.txt
+index 2158965..c209228 100644
+--- a/urdf_parser/CMakeLists.txt
++++ b/urdf_parser/CMakeLists.txt
+@@ -15,10 +15,12 @@ set_target_properties(urdfdom_model PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERS
+ add_library(urdfdom_sensor SHARED src/urdf_sensor.cpp)
+ target_link_libraries(urdfdom_sensor urdfdom_model ${TinyXML_LIBRARIES} ${console_bridge_LIBRARIES})
+ set_target_properties(urdfdom_sensor PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERSION})
++set_target_properties(urdfdom_sensor PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
+ 
+ add_library(urdfdom_model_state SHARED src/urdf_model_state.cpp src/twist.cpp)
+ target_link_libraries(urdfdom_model_state ${TinyXML_LIBRARIES} ${console_bridge_LIBRARIES})
+ set_target_properties(urdfdom_model_state PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERSION})
++set_target_properties(urdfdom_model_state PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
+ 
+ # --------------------------------
+ 
+-- 
+2.12.2.windows.2
+
diff --git a/ports/urdfdom/CONTROL b/ports/urdfdom/CONTROL
new file mode 100644
index 000000000..76e8b86a5
--- /dev/null
+++ b/ports/urdfdom/CONTROL
@@ -0,0 +1,4 @@
+Source: urdfdom
+Version: 1.0.0-1
+Description: Provides core data structures and a simple XML parsers for populating the class data structures from an URDF file.
+Build-Depends: console_bridge, tinyxml, urdfdom_headers
\ No newline at end of file
diff --git a/ports/urdfdom/portfile.cmake b/ports/urdfdom/portfile.cmake
new file mode 100644
index 000000000..bf0568f8c
--- /dev/null
+++ b/ports/urdfdom/portfile.cmake
@@ -0,0 +1,51 @@
+include(vcpkg_common_functions)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+  message(STATUS "urdfdom does not support static linkage. Building dynamically.")
+  set(VCPKG_LIBRARY_LINKAGE dynamic)
+endif()
+
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO ros/urdfdom
+  REF 1.0.0
+  SHA512 50a218e596bcc0cecff904db2fa626bebc3902c4fe1f5ff8e08195e462b4d9a8c416a41f4773cabbcc71490060d3feff7e8528a76b824569dc7fdb0bda01ec3f
+  HEAD_REF master
+)
+
+vcpkg_apply_patches(
+  SOURCE_PATH ${SOURCE_PATH}
+  PATCHES
+    ${CMAKE_CURRENT_LIST_DIR}/0001_use_math_defines.patch
+    ${CMAKE_CURRENT_LIST_DIR}/0002_fix_exports.patch
+)
+
+vcpkg_configure_cmake(
+  SOURCE_PATH ${SOURCE_PATH}
+  PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake")
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
+
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/)
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin/ ${CURRENT_PACKAGES_DIR}/tools/urdfdom/)
+
+file(GLOB URDFDOM_DLLS_DEBUG ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll)
+foreach(URDFDOM_DLL_DEBUG ${URDFDOM_DLLS_DEBUG})
+  file(COPY ${URDFDOM_DLL_DEBUG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+  file(REMOVE ${URDFDOM_DLL_DEBUG})
+endforeach()
+
+file(GLOB URDFDOM_DLLS_RELEASE ${CURRENT_PACKAGES_DIR}/lib/*.dll)
+foreach(URDFDOM_DLL_RELEASE ${URDFDOM_DLLS_RELEASE})
+  file(COPY ${URDFDOM_DLL_RELEASE} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
+  file(REMOVE ${URDFDOM_DLL_RELEASE})
+endforeach()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/urdfdom RENAME copyright)
-- 
cgit v1.2.3


From 93ab504488eed81e62dd0080b993c5b7dcb49f4a Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Wed, 6 Sep 2017 17:49:33 -0700
Subject: Revert "[vcpkg] allow underscores in package name"

This reverts commit aef3577672b469ed915a7b0680d5e1ccf36347ed.
---
 toolsrc/src/PackageSpec.cpp            | 2 +-
 toolsrc/src/PackageSpecParseResult.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/toolsrc/src/PackageSpec.cpp b/toolsrc/src/PackageSpec.cpp
index 2baf3181b..890de8899 100644
--- a/toolsrc/src/PackageSpec.cpp
+++ b/toolsrc/src/PackageSpec.cpp
@@ -10,7 +10,7 @@ namespace vcpkg
 {
     static bool is_valid_package_spec_char(char c)
     {
-        return (c == '-') || (c == '_')  || isdigit(c) || (isalpha(c) && islower(c)) || (c == '[') || (c == ']');
+        return (c == '-') || isdigit(c) || (isalpha(c) && islower(c)) || (c == '[') || (c == ']');
     }
 
     std::string FeatureSpec::to_string() const
diff --git a/toolsrc/src/PackageSpecParseResult.cpp b/toolsrc/src/PackageSpecParseResult.cpp
index 34398cff9..838c788ba 100644
--- a/toolsrc/src/PackageSpecParseResult.cpp
+++ b/toolsrc/src/PackageSpecParseResult.cpp
@@ -12,8 +12,8 @@ namespace vcpkg
             case PackageSpecParseResult::SUCCESS: return "OK";
             case PackageSpecParseResult::TOO_MANY_COLONS: return "Too many colons";
             case PackageSpecParseResult::INVALID_CHARACTERS:
-                return "Contains invalid characters. Only alphanumeric lowercase ASCII characters, dashes and"
-                       "underscores are allowed";
+                return "Contains invalid characters. Only alphanumeric lowercase ASCII characters and dashes are "
+                       "allowed";
             default: Checks::unreachable(VCPKG_LINE_INFO);
         }
     }
-- 
cgit v1.2.3


From cc89fc78031073f697228aa3069410a5e1b51d7d Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Wed, 6 Sep 2017 17:51:10 -0700
Subject: [urdfdom-headers] [console-bridge] Rename to remove underscores

---
 ports/console-bridge/CONTROL         |  3 +++
 ports/console-bridge/License.txt     | 31 +++++++++++++++++++++++++++++++
 ports/console-bridge/portfile.cmake  | 23 +++++++++++++++++++++++
 ports/console_bridge/CONTROL         |  3 ---
 ports/console_bridge/License.txt     | 31 -------------------------------
 ports/console_bridge/portfile.cmake  | 23 -----------------------
 ports/urdfdom-headers/CONTROL        |  3 +++
 ports/urdfdom-headers/portfile.cmake | 22 ++++++++++++++++++++++
 ports/urdfdom_headers/CONTROL        |  3 ---
 ports/urdfdom_headers/portfile.cmake | 22 ----------------------
 10 files changed, 82 insertions(+), 82 deletions(-)
 create mode 100644 ports/console-bridge/CONTROL
 create mode 100644 ports/console-bridge/License.txt
 create mode 100644 ports/console-bridge/portfile.cmake
 delete mode 100644 ports/console_bridge/CONTROL
 delete mode 100644 ports/console_bridge/License.txt
 delete mode 100644 ports/console_bridge/portfile.cmake
 create mode 100644 ports/urdfdom-headers/CONTROL
 create mode 100644 ports/urdfdom-headers/portfile.cmake
 delete mode 100644 ports/urdfdom_headers/CONTROL
 delete mode 100644 ports/urdfdom_headers/portfile.cmake

diff --git a/ports/console-bridge/CONTROL b/ports/console-bridge/CONTROL
new file mode 100644
index 000000000..1f4ba275c
--- /dev/null
+++ b/ports/console-bridge/CONTROL
@@ -0,0 +1,3 @@
+Source: console-bridge
+Version: 0.3.2-1
+Description: a ROS-independent package for logging that seamlessly pipes into rosconsole/rosout for ROS-dependent packages.
diff --git a/ports/console-bridge/License.txt b/ports/console-bridge/License.txt
new file mode 100644
index 000000000..affcb8568
--- /dev/null
+++ b/ports/console-bridge/License.txt
@@ -0,0 +1,31 @@
+Software License Agreement (BSD License)
+
+Copyright (c) 2008, Willow Garage, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the following
+  disclaimer in the documentation and/or other materials provided
+  with the distribution.
+* Neither the name of the Willow Garage nor the names of its
+  contributors may be used to endorse or promote products derived
+  from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/ports/console-bridge/portfile.cmake b/ports/console-bridge/portfile.cmake
new file mode 100644
index 000000000..ca5502aa9
--- /dev/null
+++ b/ports/console-bridge/portfile.cmake
@@ -0,0 +1,23 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ros/console_bridge
+    REF 0.3.2
+    SHA512 41fa5340d7ba79c887ef73eb4fda7b438ed91febd224934ae4658697e4c9e43357207e1b3e191ecce3c97cb9a87b0556372832735a268261bc798cc7683aa207
+    HEAD_REF master
+  )
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake")
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/console_bridge RENAME copyright)
diff --git a/ports/console_bridge/CONTROL b/ports/console_bridge/CONTROL
deleted file mode 100644
index aa6fe0882..000000000
--- a/ports/console_bridge/CONTROL
+++ /dev/null
@@ -1,3 +0,0 @@
-Source: console_bridge
-Version: 0.3.2-1
-Description: a ROS-independent package for logging that seamlessly pipes into rosconsole/rosout for ROS-dependent packages.
diff --git a/ports/console_bridge/License.txt b/ports/console_bridge/License.txt
deleted file mode 100644
index affcb8568..000000000
--- a/ports/console_bridge/License.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Software License Agreement (BSD License)
-
-Copyright (c) 2008, Willow Garage, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-* Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-  copyright notice, this list of conditions and the following
-  disclaimer in the documentation and/or other materials provided
-  with the distribution.
-* Neither the name of the Willow Garage nor the names of its
-  contributors may be used to endorse or promote products derived
-  from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/ports/console_bridge/portfile.cmake b/ports/console_bridge/portfile.cmake
deleted file mode 100644
index ca5502aa9..000000000
--- a/ports/console_bridge/portfile.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-include(vcpkg_common_functions)
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO ros/console_bridge
-    REF 0.3.2
-    SHA512 41fa5340d7ba79c887ef73eb4fda7b438ed91febd224934ae4658697e4c9e43357207e1b3e191ecce3c97cb9a87b0556372832735a268261bc798cc7683aa207
-    HEAD_REF master
-  )
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-)
-
-vcpkg_install_cmake()
-vcpkg_copy_pdbs()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake")
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
-file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/console_bridge RENAME copyright)
diff --git a/ports/urdfdom-headers/CONTROL b/ports/urdfdom-headers/CONTROL
new file mode 100644
index 000000000..9c69bf975
--- /dev/null
+++ b/ports/urdfdom-headers/CONTROL
@@ -0,0 +1,3 @@
+Source: urdfdom-headers
+Version: 1.0.0-1
+Description: The URDF (U-Robot Description Format) headers provides core data structure headers for URDF.
diff --git a/ports/urdfdom-headers/portfile.cmake b/ports/urdfdom-headers/portfile.cmake
new file mode 100644
index 000000000..495328627
--- /dev/null
+++ b/ports/urdfdom-headers/portfile.cmake
@@ -0,0 +1,22 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ros/urdfdom_headers
+    REF 1.0.0
+    SHA512 b1f63c1a13f062c987d6be4fcea5eea903577a710d44fdce077722b70d72eb65a265131beac1fdeba576bde189ebf51ac0eb19b2b06a34b0f9fb9dcbd437291a
+    HEAD_REF master
+  )
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake")
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/urdfdom_headers RENAME copyright)
diff --git a/ports/urdfdom_headers/CONTROL b/ports/urdfdom_headers/CONTROL
deleted file mode 100644
index a389d162c..000000000
--- a/ports/urdfdom_headers/CONTROL
+++ /dev/null
@@ -1,3 +0,0 @@
-Source: urdfdom_headers
-Version: 1.0.0-1
-Description: The URDF (U-Robot Description Format) headers provides core data structure headers for URDF.
diff --git a/ports/urdfdom_headers/portfile.cmake b/ports/urdfdom_headers/portfile.cmake
deleted file mode 100644
index 495328627..000000000
--- a/ports/urdfdom_headers/portfile.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-include(vcpkg_common_functions)
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO ros/urdfdom_headers
-    REF 1.0.0
-    SHA512 b1f63c1a13f062c987d6be4fcea5eea903577a710d44fdce077722b70d72eb65a265131beac1fdeba576bde189ebf51ac0eb19b2b06a34b0f9fb9dcbd437291a
-    HEAD_REF master
-  )
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-)
-
-vcpkg_install_cmake()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake")
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/)
-
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/urdfdom_headers RENAME copyright)
-- 
cgit v1.2.3


From cd76396de38f80245f101f04549be3658822a7a6 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Wed, 6 Sep 2017 18:02:18 -0700
Subject: [console-bridge] [urdfdom-headers] Move copyright location

---
 ports/console-bridge/portfile.cmake  | 2 +-
 ports/urdfdom-headers/portfile.cmake | 2 +-
 ports/urdfdom/CONTROL                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/console-bridge/portfile.cmake b/ports/console-bridge/portfile.cmake
index ca5502aa9..2e5b0872f 100644
--- a/ports/console-bridge/portfile.cmake
+++ b/ports/console-bridge/portfile.cmake
@@ -20,4 +20,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake")
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/console_bridge RENAME copyright)
+file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/console-bridge RENAME copyright)
diff --git a/ports/urdfdom-headers/portfile.cmake b/ports/urdfdom-headers/portfile.cmake
index 495328627..02a02d226 100644
--- a/ports/urdfdom-headers/portfile.cmake
+++ b/ports/urdfdom-headers/portfile.cmake
@@ -19,4 +19,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake")
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/)
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/urdfdom_headers RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/urdfdom-headers RENAME copyright)
diff --git a/ports/urdfdom/CONTROL b/ports/urdfdom/CONTROL
index 76e8b86a5..69e53f215 100644
--- a/ports/urdfdom/CONTROL
+++ b/ports/urdfdom/CONTROL
@@ -1,4 +1,4 @@
 Source: urdfdom
 Version: 1.0.0-1
 Description: Provides core data structures and a simple XML parsers for populating the class data structures from an URDF file.
-Build-Depends: console_bridge, tinyxml, urdfdom_headers
\ No newline at end of file
+Build-Depends: console-bridge, tinyxml, urdfdom-headers
\ No newline at end of file
-- 
cgit v1.2.3


From 76f195dd85c9f3807849e92a89ca2290ab3c9645 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Thu, 7 Sep 2017 14:25:03 -0700
Subject: [console-bridge] [urdfdom-headers] Move copyright location. Move
 CMake config location

---
 ports/console-bridge/portfile.cmake  | 1 +
 ports/urdfdom-headers/portfile.cmake | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/ports/console-bridge/portfile.cmake b/ports/console-bridge/portfile.cmake
index 2e5b0872f..d88308e5c 100644
--- a/ports/console-bridge/portfile.cmake
+++ b/ports/console-bridge/portfile.cmake
@@ -17,6 +17,7 @@ vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
 vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake")
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/console-bridge ${CURRENT_PACKAGES_DIR}/share/console_bridge)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
diff --git a/ports/urdfdom-headers/portfile.cmake b/ports/urdfdom-headers/portfile.cmake
index 02a02d226..eb2c9020e 100644
--- a/ports/urdfdom-headers/portfile.cmake
+++ b/ports/urdfdom-headers/portfile.cmake
@@ -17,6 +17,9 @@ vcpkg_install_cmake()
 
 vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake")
 
+# The config files for this project use underscore
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/urdfdom-headers ${CURRENT_PACKAGES_DIR}/share/urdfdom_headers)
+
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/)
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/urdfdom-headers RENAME copyright)
-- 
cgit v1.2.3